Changed size display:

 - Change to megs if over 1024 k
 - if x < 10, show first digit after decimal point
Created new function (in strings.php) in case sizes should be shown elsewhere.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@790 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index 9f147d2d233bd9a28b1e32134365b0afd57a9ff7..c08504434a4800f34aace6a49c47d437b2a948c0 100755 (executable)
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -95,8 +95,7 @@
       fputs ($imap_stream, "a003 FETCH $id RFC822.SIZE\r\n");
       $read = sqimap_read_data($imap_stream, "a003", true, $r, $m);
       preg_match("/([0-9]+)\)\s*$/i", $read[0], $regs);
-      $size = $regs[1] / 1024;
-      settype($size, "integer");
+      $size = $regs[1];
       
       $header = new small_header;
       if ($sent == true)

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index e23eff6a52e1e70c5801a544464f4a8ff4f0fc39..6d29d7c512e32bbd6e435111d9b8353b539200fd 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -71,7 +71,7 @@
                else    echo "   <td bgcolor=$hlt_color width=1%>&nbsp;</td>\n";
                break;
             case 6: # size   
-               echo "   <td bgcolor=$hlt_color width=1%>$bold".$msg["SIZE"]."k$bold_end</td>\n";
+               echo "   <td bgcolor=$hlt_color width=1%>$bold".show_readable_size($msg['SIZE'])."$bold_end</td>\n";
                break;
          }
       }

diff --git a/functions/mime.php b/functions/mime.php
index ff5bf65baae0d6ec67251461ee4c9ec61027c258..dd4d0eb03f41ff76421fc2383dc592be5a652ac8 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -528,9 +528,8 @@
 
                $body .= '<TR><TD>&nbsp;&nbsp;</TD><TD>';
                $body .= "<A HREF=\"$DefaultLink\">$display_filename</A>&nbsp;</TD>";
-               $size = $message->header->size / 1024;
-               settype($size, "integer");
-               $body .= "<TD><SMALL><b>" . $size . "k</b>&nbsp;&nbsp;</small></TD>";
+               $body .= '<TD><SMALL><b>' . show_readable_size($message->header->size) . 
+                   '</b>&nbsp;&nbsp;</small></TD>';
                $body .= "<TD><SMALL>[ $type0/$type1 ]&nbsp;</SMALL></TD>";
                $body .= '<TD><SMALL>';
                if ($message->header->description)

diff --git a/functions/strings.php b/functions/strings.php
index 6d82b88d2cbd8379afc5fbf8d6eb0c6379125d38..b293a6c934e734f37592f140c1d40b0345e59b9d 100644 (file)
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -59,14 +59,14 @@
       if (count($words) > 1) {
          while ($i < count($words)) {
             // Force one word to be on a line (minimum)
-            $line .= $words[$i] . ' ';
+            $line .= $words[$i];
             $line_len = strlen($beginning_spaces) + strlen($words[$i]) +
                 strlen($words[$i + 1]) + 2;
             $i ++;
             
             // Add more words (as long as they fit)
             while ($line_len < $wrap && $i < count($words)) {
-               $line .= $words[$i] . ' ';
+               $line .= ' ' . $words[$i];
                $i++;
                $line_len += strlen($words[$i]) + 1;
             }
@@ -392,5 +392,29 @@
       
       return true;
    }
+   
+   /* Returns a string showing the size of the message/attachment */
+   function show_readable_size($bytes)
+   {
+       $bytes /= 1024;
+       $type = 'k';
+       
+       if ($bytes / 1024 > 1)
+       {
+           $bytes /= 1024;
+           $type = 'm';
+       }
+       
+       if ($bytes < 10)
+       {
+           $bytes *= 10;
+           settype($bytes, "integer");
+           $bytes /= 10;
+       }
+       else
+           settype($bytes, "integer");
+       
+       return $bytes . '<small>&nbsp;' . $type . '</small>';
+   }
 
 ?>