Changeset 5967 in subversion

Timestamp:

Mar 5, 2012 2:59:07 PM (15 months ago)

Author:

alec

Message:

• Merge r5966 from trunk (#1488375)

Location:

branches/release-0.7

Files:

• CHANGELOG (modified) (1 diff)
• program/steps/addressbook/delete.inc (modified) (2 diffs)
• program/steps/addressbook/export.inc (modified) (2 diffs)
• program/steps/addressbook/func.inc (modified) (1 diff)
• program/steps/addressbook/list.inc (modified) (1 diff)
• program/steps/addressbook/search.inc (modified) (2 diffs)
• program/steps/addressbook/undo.inc (modified) (1 diff)

branches/release-0.7/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix duplicate names handling in addressbook searches (#1488375)
 - Fix displaying of HTML messages from Disqus (#1488372)
 - Disable E_STRICT warnings on PHP 5.4

branches/release-0.7/program/steps/addressbook/delete.inc

@@ -70 +70 @@
 // update saved search after data changed
 if (($search_request = $_REQUEST['_search']) && isset($_SESSION['search'][$search_request])) {
+    $sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name');
     $search  = (array)$_SESSION['search'][$search_request];
     $records = array();
@@ -92 +93 @@
         while ($row = $result->next()) {
             $row['sourceid'] = $s;
-            $key = $row['name'] . ':' . $row['sourceid'];
+            $key = rcmail_contact_key($row, $sort_col);
             $records[$key] = $row;
         }

branches/release-0.7/program/steps/addressbook/export.inc

@@ -25 +25 @@
 if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']]))
 {
+    $sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name');
     $search  = (array)$_SESSION['search'][$_REQUEST['_search']];
     $records = array();
@@ -42 +43 @@
         while ($row = $result->next()) {
             $row['sourceid'] = $s;
-            $key = $row['name'] . ':' . $row['sourceid'];
+            $key = rcmail_contact_key($row, $sort_col);
             $records[$key] = $row;
         }

branches/release-0.7/program/steps/addressbook/func.inc

@@ -729 +729 @@
 
 
+function rcmail_contact_key($row, $sort_col)
+{
+    $key = $row[$sort_col] . ':' . $row['sourceid'];
+
+    // add email to a key to not skip contacts with the same name (#1488375)
+    if (!empty($row['email'])) {
+         if (is_array($row['email'])) {
+             $key .= ':' . implode(':', $row['email']);
+         }
+         else {
+             $key .= ':' . $row['email'];
+         }
+     }
+
+     return $key;
+}
+
+
 /**
  * Returns contact ID(s) and source(s) from GET/POST data

branches/release-0.7/program/steps/addressbook/list.inc

@@ -48 +48 @@
         while ($row = $result->next()) {
             $row['sourceid'] = $s;
-            $key = $row[$sort_col] . ':' . $row['sourceid'];
+            $key = rcmail_contact_key($row, $sort_col);
             $records[$key] = $row;
         }

branches/release-0.7/program/steps/addressbook/search.inc

@@ -145 +145 @@
     $search_set = array();
     $records    = array();
+    $sort_col   = $RCMAIL->config->get('addressbook_sort_col', 'name');
 
     foreach ($sources as $s) {
@@ -183 +184 @@
         while ($row = $result->next()) {
             $row['sourceid'] = $s['id'];
-            $key = $row['name'] . ':' . $row['sourceid'];
+            $key = rcmail_contact_key($row, $sort_col);
             $records[$key] = $row;
         }

branches/release-0.7/program/steps/addressbook/undo.inc

@@ -66 +66 @@
         }
 
-        while ($row = $result->next()) {
-            $row['sourceid'] = $s;
-            $key = $row['name'] . ':' . $row['sourceid'];
-            $records[$key] = $row;
-        }
-        unset($result);
-
         $search[$s] = $source->get_search_set();
     }