X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fstrings.php;h=9f4324102f251ebd7001fbbe01ebda229e8a6d91;hp=8903155f73f68e98e331b9d8d2b5e1a64b5e3b79;hb=48f8ce2f86509967b2e498594dd3d56880718c47;hpb=c5edd369fee64e51d97aa7d35751edaac083864f

diff --git a/functions/strings.php b/functions/strings.php
index 8903155f..9f432410 100644
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -1,4 +1,6 @@
 <?php
+   
+   /* $Id$ */
 
    $strings_php = true;
 
@@ -60,19 +62,23 @@
       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 ++;
          }
 
@@ -94,7 +100,8 @@
        {
            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;
@@ -288,6 +295,7 @@
    // stored in a cookie.
    function OneTimePadEncrypt ($string, $epad) {
       $pad = base64_decode($epad);
+      $encrypted = "";
       for ($i = 0; $i < strlen ($string); $i++) {
 	 $encrypted .= chr (ord($string[$i]) ^ ord($pad[$i]));
       }
@@ -298,7 +306,7 @@
    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]));
       }
@@ -373,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
@@ -385,7 +397,8 @@
    
    function OneTimePadCreate ($length=100) {
       sq_mt_randomize();
-      
+
+      $pad = "";
       for ($i = 0; $i < $length; $i++) {
 	 $pad .= chr(mt_rand(0,255));
       }