[SM-CVS] SF.net SVN: squirrelmail:[13401] branches/SM-1_4-STABLE/squirrelmail

[<av...@us...>]

Revision: 13401
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13401&view=rev
Author:   avel
Date:     2009-02-09 09:19:29 +0000 (Mon, 09 Feb 2009)

Log Message:
-----------
If there were addressbook nicknames with the : character, they could not be
operated upon. Devel tree is not affected. Note that default addressbook backend
add() method doesn't allow the : character in nickname, but some other plugin,
a 3rd party addressbook backend or previously imported addresses might result in
entries _with_ ':' character in nickname. And it's a trivial fix. :-)

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/ChangeLog
    branches/SM-1_4-STABLE/squirrelmail/src/addressbook.php

Modified: branches/SM-1_4-STABLE/squirrelmail/ChangeLog
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2009-02-01 19:10:10 UTC (rev 13400)
+++ branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2009-02-09 09:19:29 UTC (rev 13401)
@@ -22,6 +22,7 @@
   - Migrated some fetch handling code from dev branch in plans to
     update some core functionality to allow reusability of code.
   - Make address book file permissions 0600 - same as preference files.
+  - Fix for address book nicknames that contain the : character.
 
 Version 1.4.17 - 03 December 2008
 ---------------------------------

Modified: branches/SM-1_4-STABLE/squirrelmail/src/addressbook.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/addressbook.php	2009-02-01 19:10:10 UTC (rev 13400)
+++ branches/SM-1_4-STABLE/squirrelmail/src/addressbook.php	2009-02-09 09:19:29 UTC (rev 13401)
@@ -216,7 +216,7 @@
             $delfailed = false;
 
             for ($i = 0 ; (($i < sizeof($sel)) && !$delfailed) ; $i++) {
-                list($sbackend, $snick) = explode(':', $sel[$i]);
+                list($sbackend, $snick) = explode(':', $sel[$i], 2);
 
                 /* When we get to a new backend, process addresses in *
                  * previous one.                                      */
@@ -262,7 +262,7 @@
             $send_to = '';
 
             for ($i = 0 ; (($i < sizeof($sel)) && !$lookup_failed) ; $i++) {
-                list($sbackend, $snick) = explode(':', $sel[$i]);
+                list($sbackend, $snick) = explode(':', $sel[$i], 2);
 
                 $data = $abook->lookup($snick, $sbackend);
 
@@ -309,7 +309,7 @@
                         $defselected = $sel;
                     } else {
                         $abortform = true;
-                        list($ebackend, $enick) = explode(':', $sel[0]);
+                        list($ebackend, $enick) = explode(':', $sel[0], 2);
                         $olddata = $abook->lookup($enick, $ebackend);
 
                         /* Display the "new address" form */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.