[SM-CVS] SF.net SVN: squirrelmail:[13406] branches/SM-1_4-STABLE/squirrelmail/ functions/addressbook.php

[<pdo...@us...>]

Revision: 13406
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13406&view=rev
Author:   pdontthink
Date:     2009-02-19 23:33:54 +0000 (Thu, 19 Feb 2009)

Log Message:
-----------
Allow multiple addresses in one abook entry (separate with commas), although we HIGHLY DISCOURAGE grouping in this manner - note amongst other issues that can come up, sizing for large groups will be a problem

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

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php	2009-02-19 22:32:50 UTC (rev 13405)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php	2009-02-19 23:33:54 UTC (rev 13406)
@@ -352,12 +352,26 @@
     function full_address($row) {
         global $data_dir, $username;
         $addrsrch_fullname = getPref($data_dir, $username, 'addrsrch_fullname', 'fullname');
-        if ($addrsrch_fullname == 'fullname')
-            return '"' . $row['name'] . '" <' . trim($row['email']) . '>';
-        else if ($addrsrch_fullname == 'nickname')
-            return '"' . $row['nickname'] . '" <' . trim($row['email']) . '>';
-        else // "noprefix"
-            return trim($row['email']);
+
+        // allow multiple addresses in one row (poor person's grouping - bah)
+        // (separate with commas)
+        //
+        $return = '';
+        $addresses = explode(',', $row['email']);
+        foreach ($addresses as $address) {
+
+            if (!empty($return)) $return .= ', ';
+
+            if ($addrsrch_fullname == 'fullname')
+                $return .= '"' . $row['name'] . '" <' . trim($address) . '>';
+            else if ($addrsrch_fullname == 'nickname')
+                $return .= '"' . $row['nickname'] . '" <' . trim($address) . '>';
+            else // "noprefix"
+                $return .= trim($address);
+
+        }
+
+        return $return;
     }
 
     /*


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