Changed size display:

[squirrelmail.git] / functions / strings.php

diff --git a/functions/strings.php b/functions/strings.php
index 33d01527c738d28b1f6a14e2a4abd10293c6b558..b293a6c934e734f37592f140c1d40b0345e59b9d 100644 (file)
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -45,57 +45,45 @@
    }
 
    // Wraps text at $wrap characters
-   function sqWordWrap($passed, $wrap) {
-      $passed = str_replace("&lt;", "<", $passed);
-      $passed = str_replace("&gt;", ">", $passed);
-
-      preg_match("/^(\s|>)+/", $passed, $regs);
-      $beginning_spaces = $regs[0];
-
-      $words = explode(" ", $passed);
-      $i = -1;
-      $line_len = strlen($words[0])+1;
-      $line = "";
-      if (count($words) > 1) {   
-         while ($i++ < count($words)) {
-            while ($line_len < $wrap) {
-               $line = "$line$words[$i] ";
+   // Has a problem with special HTML characters, so call this before
+   // you do character translation.
+   // Specifically, &#039 comes up as 5 characters instead of 1.
+   function sqWordWrap(&$line, $wrap) {
+      preg_match("/^([\s>]*)([^\s>].*)$/", $line, $regs);
+      $beginning_spaces = $regs[1];
+      $words = explode(" ", $regs[2]);
+
+      $i = 0;
+      $line = $beginning_spaces;
+      
+      if (count($words) > 1) {
+         while ($i < count($words)) {
+            // Force one word to be on a line (minimum)
+            $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];
                $i++;
-               $line_len = $line_len + strlen($words[$i]) + 1;
+               $line_len += strlen($words[$i]) + 1;
             }
-            $line_len = strlen($words[$i])+1;
-            if ($line_len <= $wrap) {
-               if (strlen($beginning_spaces) +2 >= $wrap)
-                  $beginning_spaces = "";
-               if ($i < count($words)) { // don't <BR> the last line
-                  $line = "$line\n$beginning_spaces";
-               }   
-               $line = "$line$words[$i] ";
-               $line_len = strlen($beginning_spaces) + strlen($words[$i]) + 1;
-            } else {
-               /*
-               $endline = $words[$i];
-               while ($line_len >= $wrap) {
-                  $bigline = substr($endline, 0, $wrap);
-                  $endline = substr($endline, $wrap, strlen($endline));
-                  $line_len = strlen($endline);
-                  $line = "$line$bigline<BR>";
-               }
-               */
-               if (strlen($line) > $wrap)
-                  $line = "$line\n$words[$i]";
-               else
-                  $line = "$line$words[$i]";
-               $line_len = strlen($words[$i]);
+            
+            // Skip spaces if they are the first thing on a continued line
+            while (!$words[$i] && $i < count($words))
+            {
+               $i ++;
+            }
+            
+            if ($i < count($words)) {
+               $line .= "\n$beginning_spaces";
             }
          }
       } else {
-         $line = $words[0];
+         $line .= $words[0];
       }
-
-      $line = str_replace(">", "&gt;", $line);
-      $line = str_replace("<", "&lt;", $line);
-      return $line;
    }
 
    /** Returns an array of email addresses **/
@@ -125,7 +113,7 @@
       return $to_line;
    }
 
-   function translateText($body, $wrap_at, $charset) {
+   function translateText(&$body, $wrap_at, $charset) {
       global $where, $what; // from searching
 
       if (!isset($url_parser_php)) {
@@ -135,25 +123,39 @@
       $body_ary = explode("\n", $body);
       for ($i=0; $i < count($body_ary); $i++) {
          $line = $body_ary[$i];
-         $line = charset_decode($charset, $line);
-         $line = str_replace("\t", '        ', $line);
-         
          if (strlen($line) - 2 >= $wrap_at) {
-            $line = sqWordWrap($line, $wrap_at);  
+            sqWordWrap($line, $wrap_at);  
          }
+         $line = charset_decode($charset, $line);
+         $line = str_replace("\t", '        ', $line);
          
          $line = str_replace(' ', '&nbsp;', $line);
          $line = nl2br($line);
 
-         // Removed parseEmail and integrated it into parseUrl
-         // This line is no longer needed.
-         // $line = parseEmail ($line);
-         $line = parseUrl ($line);
+         parseUrl ($line);
+         
+         $Quotes = 0;
+         $pos = 0;
+         while (1)
+         {
+             if (strpos($line, '&nbsp;', $pos) === $pos)
+             {
+                $pos += 6;
+             }
+             else if (strpos($line, '&gt;', $pos) === $pos)
+             {
+                $pos += 4;
+                $Quotes ++;
+             }
+             else
+             {
+                 break;
+             }
+         }
          
-         $test_line = str_replace('&nbsp;', '', $line);
-         if (strpos($test_line, '&gt;&gt;') === 0) {
+         if ($Quotes > 1) {
             $line = "<FONT COLOR=FF0000>$line</FONT>\n";
-         } else if (strpos($test_line, '&gt;') === 0) {
+         } else if ($Quotes) {
             $line = "<FONT COLOR=800000>$line</FONT>\n";
          }
 
@@ -165,8 +167,6 @@
          $body_ary[$i] = $line . '<br>';
       }
       $body = implode("\n", $body_ary);
-            
-      return $body;
    }
 
    /* SquirrelMail version number -- DO NOT CHANGE */
@@ -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>';
+   }
 
 ?>