X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=functions%2Fstrings.php;h=9f4324102f251ebd7001fbbe01ebda229e8a6d91;hb=48f8ce2f86509967b2e498594dd3d56880718c47;hp=33d01527c738d28b1f6a14e2a4abd10293c6b558;hpb=7bfd404426ec2bc833ccaa70eeda50fd9eb1ab46;p=squirrelmail.git

diff --git a/functions/strings.php b/functions/strings.php
index 33d01527..9f432410 100644
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -1,4 +1,6 @@
 <?php
+   
+   /* $Id$ */
 
    $strings_php = true;
 
@@ -6,29 +8,29 @@
    // Count the number of occurances of $needle are in $haystack.
    //*************************************************************************
    function countCharInString($haystack, $needle) {
-      $len = strlen($haystack);
-      for ($i = 0; $i < $len; $i++) {
-         if ($haystack[$i] == $needle)
-            $count++;
-      }
-      return $count;
+      $haystack = ereg_replace("[^$needle]","",$haystack);
+      return strlen($haystack);
    }
 
    //*************************************************************************
    // Read from the back of $haystack until $needle is found, or the begining
-   //    of the $haystack is reached.
+   //    of the $haystack is reached.  $needle is a single character
    //*************************************************************************
    function readShortMailboxName($haystack, $needle) {
-      if (substr($haystack, -1) == $needle)
-         $haystack = substr($haystack, 0, strlen($haystack) - 1);
+      if ($needle == "") return $haystack;
+      if ($needle == ".") $needle = "\.";
+      ereg("([^$needle]+)$needle?$", $haystack, $regs);
+      return $regs[1];
+   }
 
-      if (strrpos($haystack, $needle)) {
-         $pos = strrpos($haystack, $needle) + 1;
-         $data = substr($haystack, $pos, strlen($haystack));
-      } else {
-         $data = $haystack;
-      }
-      return $data;
+   //*************************************************************************
+   // Read from the back of $haystack until $needle is found, or the begining
+   //    of the $haystack is reached.  $needle is a single character
+   //*************************************************************************
+   function readMailboxParent($haystack, $needle) {
+      if ($needle == ".") $needle = "\.";
+      ereg("^(.+)$needle([^$needle]+)$needle?$", $haystack, $regs);
+      return $regs[1];
    }
 
    // Searches for the next position in a string minus white space
@@ -45,66 +47,90 @@
    }
 
    // 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] ";
-               $i++;
-               $line_len = $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]);
-            }
+   // 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.
+   // This should not add newlines to the end of lines.
+   function sqWordWrap(&$line, $wrap) {
+      preg_match("/^([\s>]*)([^\s>].*)?$/", $line, $regs);
+      $beginning_spaces = $regs[1];
+      $words = explode(" ", $regs[2]);
+
+      $i = 0;
+      $line = $beginning_spaces;
+      
+      while ($i < count($words)) {
+         // Force one word to be on a line (minimum)
+         $line .= $words[$i];
+         $line_len = strlen($beginning_spaces) + strlen($words[$i]) + 2;
+	 if (isset($words[$i + 1]))
+	     $line_len += strlen($words[$i + 1]);
+         $i ++;
+            
+         // Add more words (as long as they fit)
+         while ($line_len < $wrap && $i < count($words)) {
+            $line .= ' ' . $words[$i];
+            $i++;
+	    if (isset($words[$i]))
+                $line_len += strlen($words[$i]) + 1;
+	    else
+	        $line_len += 1;
+         }
+            
+         // Skip spaces if they are the first thing on a continued line
+         while (!isset($words[$i]) && $i < count($words)) {
+            $i ++;
          }
-      } else {
-         $line = $words[0];
-      }
 
-      $line = str_replace(">", "&gt;", $line);
-      $line = str_replace("<", "&lt;", $line);
-      return $line;
+         // Go to the next line if we have more to process            
+         if ($i < count($words)) {
+            $line .= "\n$beginning_spaces";
+         }
+      }
+   }
+   
+   
+   // Does the opposite of sqWordWrap()
+   function sqUnWordWrap(&$body)
+   {
+       $lines = explode("\n", $body);
+       $body = "";
+       $PreviousSpaces = "";
+       for ($i = 0; $i < count($lines); $i ++)
+       {
+           preg_match("/^([\s>]*)([^\s>].*)?$/", $lines[$i], $regs);
+           $CurrentSpaces = $regs[1];
+	   if (isset($regs[2]))
+               $CurrentRest = $regs[2];
+           if ($i == 0)
+           {
+               $PreviousSpaces = $CurrentSpaces;
+               $body = $lines[$i];
+           }
+           else if ($PreviousSpaces == $CurrentSpaces &&  // Do the beginnings match
+               strlen($lines[$i - 1]) > 65 &&             // Over 65 characters long
+               strlen($CurrentRest))                      // and there's a line to continue with
+           {
+               $body .= ' ' . $CurrentRest;
+           }
+           else
+           {
+               $body .= "\n" . $lines[$i];
+               $PreviousSpaces = $CurrentSpaces;
+           }
+       }
+       $body .= "\n";
    }
+   
 
    /** Returns an array of email addresses **/
+   /* Be cautious of "user@host.com" */
    function parseAddrs($text) {
-      if (trim($text) == "") {
-         return;
-      }
+      if (trim($text) == "")
+         return array();
       $text = str_replace(" ", "", $text);
-      $text = ereg_replace( '"[^"]*"', "", $text);
+      $text = ereg_replace('"[^"]*"', "", $text);
+      $text = ereg_replace("\([^\)]*\)", "", $text);
       $text = str_replace(",", ";", $text);
       $array = explode(";", $text);
       for ($i = 0; $i < count ($array); $i++) {
@@ -125,55 +151,61 @@
       return $to_line;
    }
 
-   function translateText($body, $wrap_at, $charset) {
+   function translateText(&$body, $wrap_at, $charset) {
       global $where, $what; // from searching
+		global $url_parser_php;
 
       if (!isset($url_parser_php)) {
          include "../functions/url_parser.php";
       }
       
       $body_ary = explode("\n", $body);
+      $PriorQuotes = 0;
       for ($i=0; $i < count($body_ary); $i++) {
          $line = $body_ary[$i];
+         if (strlen($line) - 2 >= $wrap_at) {
+            sqWordWrap($line, $wrap_at);  
+         }
          $line = charset_decode($charset, $line);
          $line = str_replace("\t", '        ', $line);
          
-         if (strlen($line) - 2 >= $wrap_at) {
-            $line = sqWordWrap($line, $wrap_at);  
-         }
+         parseUrl ($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);
-         
-         $test_line = str_replace('&nbsp;', '', $line);
-         if (strpos($test_line, '&gt;&gt;') === 0) {
-            $line = "<FONT COLOR=FF0000>$line</FONT>\n";
-         } else if (strpos($test_line, '&gt;') === 0) {
-            $line = "<FONT COLOR=800000>$line</FONT>\n";
-         }
-
-         if ($line)
+         $Quotes = 0;
+         $pos = 0;
+         while (1)
          {
-             $line = '<tt>' . $line . '</tt>';
+             if ($line[$pos] == ' ')
+             {
+                $pos ++;
+             }
+             else if (strpos($line, '&gt;', $pos) === $pos)
+             {
+                $pos += 4;
+                $Quotes ++;
+             }
+             else
+             {
+                 break;
+             }
          }
+         
+         if ($Quotes > 1)
+            $line = "<FONT COLOR=FF0000>$line</FONT>";
+         elseif ($Quotes)
+            $line = "<FONT COLOR=800000>$line</FONT>";
 
-         $body_ary[$i] = $line . '<br>';
+         $body_ary[$i] = $line;
       }
-      $body = implode("\n", $body_ary);
-            
-      return $body;
+      $body = "<pre>" . implode("\n", $body_ary) . "</pre>";
    }
 
    /* SquirrelMail version number -- DO NOT CHANGE */
-   $version = "0.6pre1 (cvs)";
+   $version = "1.0pre3 [cvs]";
 
 
    function find_mailbox_name ($mailbox) {
+/*
       $mailbox = trim($mailbox);
       if (substr($mailbox, strlen($mailbox)-1, strlen($mailbox)) == "\"") {
          $mailbox = substr($mailbox, 0, strlen($mailbox) - 1);
@@ -183,6 +215,13 @@
          $box = substr($mailbox, strrpos($mailbox, " ")+1, strlen($mailbox));
       }
       return $box;
+*/      
+
+      if (ereg(" *\"([^\r\n\"]*)\"[ \r\n]*$", $mailbox, $regs))
+          return $regs[1];
+      ereg(" *([^ \r\n\"]*)[ \r\n]*$",$mailbox,$regs);
+      return $regs[1];
+
    }
 
    function replace_spaces ($string) {
@@ -210,28 +249,38 @@
    
       // Check if this is a HTTPS or regular HTTP request
       $proto = "http://";
-      if(isset($HTTPS) && $HTTPS == 'on' ) {
+      if(isset($HTTPS) && !strcasecmp($HTTPS, 'on') ) {
         $proto = "https://";
       }
    
-      $port = "";
-      if (isset($SERVER_PORT)) {
-        if ($SERVER_PORT != 80) {
-            $port = sprintf(':%d', $SERVER_PORT);
-        }
-      }
-          
       // Get the hostname from the Host header or server config.
+      $host = "";
+      if (isset($HTTP_HOST) && !empty($HTTP_HOST))
+      {
+          $host = $HTTP_HOST;
+      }
+      else if (isset($SERVER_NAME) && !empty($SERVER_NAME))
+      {
+          $host = $SERVER_NAME;
+      }
+      
+      $port = '';
+      if (! strstr($host, ':'))
+      {
+          if (isset($SERVER_PORT)) {
+              if (($SERVER_PORT != 80 && $proto == "http://")
+                      || ($SERVER_PORT != 443 && $proto == "https://")) {
+                  $port = sprintf(':%d', $SERVER_PORT);
+              }
+          }
+      }
+      
+      if ($host)
+          return $proto . $host . $port . $path;
+
       // Fallback is to omit the server name and use a relative URI,
       // although this is not RFC 2616 compliant.
-      if(isset($HTTP_HOST) && !empty($HTTP_HOST)) {
-        $location = $proto . $HTTP_HOST . $port . $path;
-      } else if(isset($SERVER_NAME) && !empty($SERVER_NAME)) {
-        $location = $proto . $SERVER_NAME . $port . $path;
-      } else {
-        $location = $path;
-      }
-      return $location;
+      return $path;    
    }   
 
    function sqStripSlashes($string) {
@@ -244,7 +293,9 @@
 
    // These functions are used to encrypt the passowrd before it is
    // stored in a cookie.
-   function OneTimePadEncrypt ($string, $pad) {
+   function OneTimePadEncrypt ($string, $epad) {
+      $pad = base64_decode($epad);
+      $encrypted = "";
       for ($i = 0; $i < strlen ($string); $i++) {
 	 $encrypted .= chr (ord($string[$i]) ^ ord($pad[$i]));
       }
@@ -252,9 +303,10 @@
       return base64_encode($encrypted);
    }
 
-   function OneTimePadDecrypt ($string, $pad) {
+   function OneTimePadDecrypt ($string, $epad) {
+      $pad = base64_decode($epad);
       $encrypted = base64_decode ($string);
-      
+      $decrypted = "";
       for ($i = 0; $i < strlen ($encrypted); $i++) {
 	 $decrypted .= chr (ord($encrypted[$i]) ^ ord($pad[$i]));
       }
@@ -329,8 +381,12 @@
       // getrusage
       if (function_exists("getrusage")) {
          $dat = getrusage();
-	 sq_mt_seed(md5($dat["ru_nswap"] . $dat["ru_majflt"] . 
-	    $dat["ru_utime.tv_sec"] . $dat["ru_utime.tv_usec"]));
+	 $Str = "";
+	 foreach ($dat as $k => $v)
+	 {
+	     $Str .= "$k = $v\n";
+	 }
+	 sq_mt_seed(md5($Str));
       }
       
       // Apache-specific
@@ -341,12 +397,13 @@
    
    function OneTimePadCreate ($length=100) {
       sq_mt_randomize();
-      
+
+      $pad = "";
       for ($i = 0; $i < $length; $i++) {
 	 $pad .= chr(mt_rand(0,255));
       }
 
-      return $pad;
+      return base64_encode($pad);
    }
 
    // Check if we have a required PHP-version. Return TRUE if we do,
@@ -392,5 +449,58 @@
       
       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>';
+   }
+
+   /* Generates a random string from the caracter set you pass in
+    *
+    * Flags:
+    *   1 = add lowercase a-z to $chars
+    *   2 = add uppercase A-Z to $chars
+    *   4 = add numbers 0-9 to $chars
+    */
+  
+   function GenerateRandomString($size, $chars, $flags = 0)
+   {
+      if ($flags & 0x1)
+          $chars .= 'abcdefghijklmnopqrstuvwxyz';
+      if ($flags & 0x2)
+          $chars .= 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+      if ($flags & 0x4)
+          $chars .= '0123456789';
+          
+      if ($size < 1 || strlen($chars) < 1)
+          return "";
+          
+      sq_mt_randomize(); // Initialize the random number generator
+    
+      while (strlen($String) < $size) {
+         $String .= $chars[mt_rand(0, strlen($chars))];
+      }
+      
+      return $String;
+   }
 
 ?>