From: jangliss <jangliss@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Wed, 9 Nov 2005 20:15:45 +0000 (+0000)
Subject: Undefined index in addressbook backends.  Possible trigger is import plugins.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8419c13b11aa46e10cf040cb00b68cdfbd0702cc;p=squirrelmail.git

Undefined index in addressbook backends.  Possible trigger is import plugins.


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

diff --git a/ChangeLog b/ChangeLog
index 9606c7b5..f39db56d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -472,6 +472,7 @@ Version 1.5.1 -- CVS
     before compose page has reloaded.
   - Undefined variable in rare case in view_header.php
   - Variable by reference fix in printer_friendly_bottom.php.
+  - Undefined index in addressbook backends.
 
 
 Version 1.5.0 - 2 February 2004
diff --git a/functions/abook_database.php b/functions/abook_database.php
index bae187bc..51cdbb69 100644
--- a/functions/abook_database.php
+++ b/functions/abook_database.php
@@ -327,9 +327,9 @@ class abook_database extends addressbook_backend {
                          $this->table, $this->owner,
                          $this->dbh->quoteString($userdata['nickname']),
                          $this->dbh->quoteString($userdata['firstname']),
-                         $this->dbh->quoteString($userdata['lastname']),
+                         $this->dbh->quoteString((!empty($userdata['lastname'])?$userdata['lastname']:'')),
                          $this->dbh->quoteString($userdata['email']),
-                         $this->dbh->quoteString($userdata['label']) );
+                         $this->dbh->quoteString((!empty($userdata['label'])?$userdata['label']:'')) );
 
          /* Do the insert */
          $r = $this->dbh->simpleQuery($query);
@@ -407,9 +407,9 @@ class abook_database extends addressbook_backend {
                          $this->table,
                          $this->dbh->quoteString($userdata['nickname']),
                          $this->dbh->quoteString($userdata['firstname']),
-                         $this->dbh->quoteString($userdata['lastname']),
+                         $this->dbh->quoteString((!empty($userdata['lastname'])?$userdata['lastname']:'')),
                          $this->dbh->quoteString($userdata['email']),
-                         $this->dbh->quoteString($userdata['label']),
+                         $this->dbh->quoteString((!empty($userdata['label'])?$userdata['label']:'')),
                          $this->owner,
                          $this->dbh->quoteString($alias) );
 
@@ -426,4 +426,4 @@ class abook_database extends addressbook_backend {
 } /* End of class abook_database */
 
 // vim: et ts=4
-?>
\ No newline at end of file
+?>
diff --git a/functions/abook_local_file.php b/functions/abook_local_file.php
index a7d4836a..762377c3 100644
--- a/functions/abook_local_file.php
+++ b/functions/abook_local_file.php
@@ -368,9 +368,9 @@ class abook_local_file extends addressbook_backend {
         /* Here is the data to write */
         $data = $this->quotevalue($userdata['nickname']) . '|' .
                 $this->quotevalue($userdata['firstname']) . '|' .
-                $this->quotevalue($userdata['lastname']) . '|' .
+                $this->quotevalue((!empty($userdata['lastname'])?$userdata['lastname']:'')) . '|' .
                 $this->quotevalue($userdata['email']) . '|' .
-                $this->quotevalue($userdata['label']);
+                $this->quotevalue((!empty($userdata['label'])?$userdata['label']:''));
 
         /* Strip linefeeds */
         $data = ereg_replace("[\r\n]", ' ', $data);
@@ -476,9 +476,9 @@ class abook_local_file extends addressbook_backend {
             } else {
                 $rows[$i++] = array(0 => $userdata['nickname'],
                                     1 => $userdata['firstname'],
-                                    2 => $userdata['lastname'],
+                                    2 => (!empty($userdata['lastname'])?$userdata['lastname']:''),
                                     3 => $userdata['email'],
-                                    4 => $userdata['label']);
+                                    4 => (!empty($userdata['label'])?$userdata['label']:''));
             }
         }
 
@@ -507,4 +507,4 @@ class abook_local_file extends addressbook_backend {
     }
 
 } /* End of class abook_local_file */
-?>
\ No newline at end of file
+?>