More changes to remove warnings when all are enabled.

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

diff --git a/functions/strings.php b/functions/strings.php
index 9d514b29514c8f615587e3bf2eb1489cc9e727b2..9f4324102f251ebd7001fbbe01ebda229e8a6d91 100644 (file)
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -62,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 ++;
          }
 
@@ -96,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;

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 3a89f08980fb62685e882cbf8b512da58424ec8d..d7407d8b6aea5b1a4a5d2c7261a3b1d764a070ef 100644 (file)
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -173,7 +173,7 @@
    // Show personal addressbook
    if(!isset($addrquery) || !empty($listall)) {
 
-      if((isset($backend) && $backend != -1) || !isset($addrquery)) {
+      if(! isset($backend) || $backend != -1 || !isset($addrquery)) {
          if(!isset($addrquery)) 
             $backend = $abook->localbackend;