From 48f8ce2f86509967b2e498594dd3d56880718c47 Mon Sep 17 00:00:00 2001
From: fidian <fidian@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Tue, 30 Jan 2001 17:34:51 +0000
Subject: [PATCH] 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
---
 functions/strings.php        | 15 ++++++++++-----
 src/addrbook_search_html.php |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/functions/strings.php b/functions/strings.php
index 9d514b29..9f432410 100644
--- 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 3a89f089..d7407d8b 100644
--- 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;
 
-- 
2.25.1