[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squirrelmail-cvs
Subject:    [SM-CVS] CVS: squirrelmail/functions mime.php, 1.265.2.67,
From:       Fredrik Jervfors <jervfors () users ! sourceforge ! net>
Date:       2006-06-20 6:14:56
Message-ID: E1FsZVo-0006tJ-De () sc8-pr-cvs8 ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/squirrelmail/squirrelmail/functions
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv26349/stable-uad_link/squirrelmail/functions


Modified Files:
      Tag: SM-1_4-STABLE
	mime.php 
Log Message:
Moving the links "Download this as a file" and "View Unsafe Images" to the "Options" \
field, where they belong. This has also been requested at the mailing lists. This \
change has been in DEVEL since 2006-02-07 and has been approved by jangliss.


Index: mime.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/mime.php,v
retrieving revision 1.265.2.67
retrieving revision 1.265.2.68
diff -u -w -r1.265.2.67 -r1.265.2.68
--- mime.php	24 Apr 2006 17:59:36 -0000	1.265.2.67
+++ mime.php	20 Jun 2006 06:14:53 -0000	1.265.2.68
@@ -302,9 +302,10 @@
      * primary message. To add more of them, just put them in the
      * order that is their priority.
      */
-    global $startMessage, $username, $key, $imapServerAddress, $imapPort,
-           $show_html_default, $sort, $has_unsafe_images, $passed_ent_id;
-    global $languages, $squirrelmail_language;
+    global $startMessage, $languages, $squirrelmail_language,
+           $show_html_default, $sort, $has_unsafe_images, $passed_ent_id,
+           $username, $key, $imapServerAddress, $imapPort,
+           $download_and_unsafe_link;
 
     if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) {
         $view_unsafe_images = false;
@@ -361,13 +362,15 @@
             return $body;
         }
 
+        $download_and_unsafe_link = '';
+
         $link = 'passed_id=' . $id . '&amp;ent_id='.$ent_num.
             '&amp;mailbox=' . $urlmailbox .'&amp;sort=' . $sort .
             '&amp;startMessage=' . $startMessage . '&amp;show_more=0';
         if (isset($passed_ent_id)) {
             $link .= '&amp;passed_ent_id='.$passed_ent_id;
         }
-        $body .= '<center><small><a href="download.php?absolute_dl=true&amp;' .
+        $download_and_unsafe_link .= '&nbsp;|&nbsp;<a \
href="download.php?absolute_dl=true&amp;' .  $link . '">' . _("Download this as a \
file") .  '</a>';  if ($view_unsafe_images) {
             $text = _("Hide Unsafe Images");
@@ -380,9 +383,8 @@
             }
         }
         if($text != '') {
-            $body .= '&nbsp;|&nbsp;<a href="read_body.php?' . $link . '">' . $text . \
'</a>'; +            $download_and_unsafe_link .= '&nbsp;|&nbsp;<a \
href="read_body.php?' . $link . '">' . $text . '</a>';  }
-        $body .= '</small></center><br />' . "\n";
     }
     return $body;
 }



--
squirrelmail-cvs mailing list
List Address: squirrelmail-cvs@lists.sourceforge.net
List Info: https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
http://squirrelmail.org/cvs


[prev in list] [next in list] [prev in thread] [next in thread]