X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fstrings.php;h=9b7371deb2dd7504132066adbd34cec68460a75d;hb=0bb7ad5eb668cfbcb9d958899075129a2182bcda;hp=10f896f4b067084a18a10fb3e6af4221b8ff2704;hpb=5ff8453303df6d2c585aea49fe83663498f4801c;p=squirrelmail.git

diff --git a/functions/strings.php b/functions/strings.php
index 10f896f4..9b7371de 100644
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -1,4 +1,6 @@
 <?php
+   
+   /* $Id$ */
 
    $strings_php = true;
 
@@ -6,34 +8,34 @@
    // 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
    function next_pos_minus_white ($haystack, $pos) {
-      while (substr($haystack, $pos, 1) == " " ||
+      while (substr($haystack, $pos, 1) == ' ' ||
              substr($haystack, $pos, 1) == "\t" ||
              substr($haystack, $pos, 1) == "\n" ||
              substr($haystack, $pos, 1) == "\r") {
@@ -50,9 +52,13 @@
    // 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);
+      preg_match('/^([\\s>]*)([^\\s>].*)?$/', $line, $regs);
       $beginning_spaces = $regs[1];
-      $words = explode(" ", $regs[2]);
+	  if (isset($regs[2])) {
+         $words = explode(' ', $regs[2]);
+      } else {
+         $words = "";
+	  }
 
       $i = 0;
       $line = $beginning_spaces;
@@ -60,24 +66,29 @@
       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;
+         $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++;
-            $line_len += strlen($words[$i]) + 1;
+	    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 (!$words[$i] && $i < count($words)) {
+         while (!isset($words[$i]) && $i < count($words)) {
             $i ++;
          }
-            
+
+         // Go to the next line if we have more to process            
          if ($i < count($words)) {
-            $line .= "\n$beginning_spaces";
+            $line .= "\n" . $beginning_spaces;
          }
       }
    }
@@ -91,9 +102,10 @@
        $PreviousSpaces = "";
        for ($i = 0; $i < count($lines); $i ++)
        {
-           preg_match("/^([\s>]*)([^\s>].*)?$/", $lines[$i], $regs);
+           preg_match('/^([\\s>]*)([^\\s>].*)?$/', $lines[$i], $regs);
            $CurrentSpaces = $regs[1];
-           $CurrentRest = $regs[2];
+	   if (isset($regs[2]))
+               $CurrentRest = $regs[2];
            if ($i == 0)
            {
                $PreviousSpaces = $CurrentSpaces;
@@ -116,17 +128,18 @@
    
 
    /** Returns an array of email addresses **/
+   /* Be cautious of "user@host.com" */
    function parseAddrs($text) {
-      if (trim($text) == "") {
-         return;
-      }
-      $text = str_replace(" ", "", $text);
-      $text = ereg_replace( '"[^"]*"', "", $text);
-      $text = str_replace(",", ";", $text);
-      $array = explode(";", $text);
+      if (trim($text) == "")
+         return array();
+      $text = str_replace(' ', '', $text);
+      $text = ereg_replace('"[^"]*"', '', $text);
+      $text = ereg_replace('\\([^\\)]*\\)', '', $text);
+      $text = str_replace(',', ';', $text);
+      $array = explode(';', $text);
       for ($i = 0; $i < count ($array); $i++) {
-			    $array[$i] = eregi_replace ("^.*[<]", "", $array[$i]);
-			    $array[$i] = eregi_replace ("[>].*$", "", $array[$i]);
+			    $array[$i] = eregi_replace ("^.*[<]", '', $array[$i]);
+			    $array[$i] = eregi_replace ("[>].*$", '', $array[$i]);
 		  }
       return $array;
    }
@@ -134,22 +147,24 @@
    /** Returns a line of comma separated email addresses from an array **/
    function getLineOfAddrs($array) {
       if (is_array($array)) {
-        $to_line = implode(", ", $array);
-        $to_line = trim(ereg_replace(",,+", ",", $to_line));
+        $to_line = implode(', ', $array);
+        $to_line = trim(ereg_replace(',,+', ',', $to_line));
       } else {
-        $to_line = "";
+        $to_line = '';
       }
       return $to_line;
    }
 
    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";
+         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) {
@@ -158,21 +173,15 @@
          $line = charset_decode($charset, $line);
          $line = str_replace("\t", '        ', $line);
          
-         // We need to do it twice to catch times where there
-         // are an odd number of spaces
-         $line = str_replace('  ', '&nbsp; ', $line);
-         $line = str_replace('  ', '&nbsp; ', $line);
-         $line = nl2br($line);
-
          parseUrl ($line);
          
          $Quotes = 0;
          $pos = 0;
          while (1)
          {
-             if (strpos($line, '&nbsp;', $pos) === $pos)
+             if ($line[$pos] == ' ')
              {
-                $pos += 6;
+                $pos ++;
              }
              else if (strpos($line, '&gt;', $pos) === $pos)
              {
@@ -185,44 +194,34 @@
              }
          }
          
-         if ($Quotes > 1) {
-            $line = "<FONT COLOR=FF0000>$line</FONT>\n";
-         } else if ($Quotes) {
-            $line = "<FONT COLOR=800000>$line</FONT>\n";
-         }
-
-         if ($line)
-         {
-             $line = '<tt>' . $line . '</tt>';
-         }
+         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);
+      $body = '<pre>' . implode("\n", $body_ary) . '</pre>';
    }
 
    /* SquirrelMail version number -- DO NOT CHANGE */
-   $version = "0.6pre1 (cvs)";
+   $version = '1.0.1 [cvs]';
 
 
    function find_mailbox_name ($mailbox) {
-      $mailbox = trim($mailbox);
-      if (substr($mailbox, strlen($mailbox)-1, strlen($mailbox)) == "\"") {
-         $mailbox = substr($mailbox, 0, strlen($mailbox) - 1);
-         $pos = strrpos ($mailbox, "\"")+1;
-         $box = substr($mailbox, $pos);
-      } else {
-         $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) {
-      return str_replace(" ", "&nbsp;", $string);
+      return str_replace(' ', '&nbsp;', $string);
    }
 
    function replace_escaped_spaces ($string) {
-      return str_replace("&nbsp;", " ", $string);
+      return str_replace('&nbsp;', ' ', $string);
    }
 
    function get_location () {
@@ -241,13 +240,13 @@
       $path = substr($PHP_SELF, 0, strrpos($PHP_SELF, '/'));
    
       // Check if this is a HTTPS or regular HTTP request
-      $proto = "http://";
-      if(isset($HTTPS) && $HTTPS == 'on' ) {
-        $proto = "https://";
+      $proto = 'http://';
+      if(isset($HTTPS) && !strcasecmp($HTTPS, 'on') ) {
+        $proto = 'https://';
       }
    
       // Get the hostname from the Host header or server config.
-      $host = "";
+      $host = '';
       if (isset($HTTP_HOST) && !empty($HTTP_HOST))
       {
           $host = $HTTP_HOST;
@@ -261,7 +260,8 @@
       if (! strstr($host, ':'))
       {
           if (isset($SERVER_PORT)) {
-              if ($SERVER_PORT != 80) {
+              if (($SERVER_PORT != 80 && $proto == 'http://')
+                      || ($SERVER_PORT != 443 && $proto == 'https://')) {
                   $port = sprintf(':%d', $SERVER_PORT);
               }
           }
@@ -285,7 +285,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]));
       }
@@ -293,9 +295,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]));
       }
@@ -316,7 +319,7 @@
        
        if (! is_int($Val))
        {
-           if (function_exists("crc32"))
+           if (function_exists('crc32'))
            {
                $Val = crc32($Val);
            }
@@ -368,10 +371,14 @@
       sq_mt_seed(md5($REMOTE_PORT . $REMOTE_ADDR . getmypid()));
       
       // getrusage
-      if (function_exists("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;
+	 }
+	 sq_mt_seed(md5($Str));
       }
       
       // Apache-specific
@@ -382,12 +389,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,
@@ -398,7 +406,7 @@
    function sqCheckPHPVersion($major, $minor, $release) {
 
       $ver = phpversion();
-      eregi("^([0-9]+)\.([0-9]+)(.*)", $ver, $regs);
+      eregi('^([0-9]+)\\.([0-9]+)(.*)', $ver, $regs);
 
       // Parse the version string
       $vmajor  = strval($regs[1]);
@@ -406,9 +414,9 @@
       $vrel    = $regs[3];
       if($vrel[0] == ".") 
 	 $vrel = strval(substr($vrel, 1));
-      if($vrel[0] == "b" || $vrel[0] == "B") 
+      if($vrel[0] == 'b' || $vrel[0] == 'B') 
 	 $vrel = - strval(substr($vrel, 1));
-      if($vrel[0] == "r" || $vrel[0] == "R") 
+      if($vrel[0] == 'r' || $vrel[0] == 'R') 
 	 $vrel = - strval(substr($vrel, 2))/10;
       
       // Compare major version
@@ -449,11 +457,11 @@
        if ($bytes < 10)
        {
            $bytes *= 10;
-           settype($bytes, "integer");
+           settype($bytes, 'integer');
            $bytes /= 10;
        }
        else
-           settype($bytes, "integer");
+           settype($bytes, 'integer');
        
        return $bytes . '<small>&nbsp;' . $type . '</small>';
    }
@@ -476,10 +484,11 @@
           $chars .= '0123456789';
           
       if ($size < 1 || strlen($chars) < 1)
-          return "";
+          return '';
           
       sq_mt_randomize(); // Initialize the random number generator
     
+	  $String = "";
       while (strlen($String) < $size) {
          $String .= $chars[mt_rand(0, strlen($chars))];
       }