Changeset 4374 in subversion

Timestamp:

Dec 28, 2010 3:31:19 AM (2 years ago)

Author:

thomasb

Message:

Only parse vcards if necessary; refresh saved search set after contact deletion

Location:

branches/devel-addressbook/program

Files:

• include/main.inc (modified) (1 diff)
• include/rcube_addressbook.php (modified) (1 diff)
• include/rcube_contacts.php (modified) (2 diffs)
• steps/addressbook/delete.inc (modified) (1 diff)
• steps/addressbook/func.inc (modified) (1 diff)
• steps/addressbook/list.inc (modified) (1 diff)
• steps/addressbook/search.inc (modified) (2 diffs)

branches/devel-addressbook/program/include/main.inc

@@ -798 +798 @@
       // format each col
       foreach ($a_show_cols as $col)
-        $table->add($col, Q($row_data[$col]));
+        $table->add($col, Q(is_array($row_data[$col]) ? $row_data[$col][0] : $row_data[$col]));
         
       $c++;

branches/devel-addressbook/program/include/rcube_addressbook.php

@@ -65 +65 @@
 
     /**
+     * Refresh saved search set after data has changed
+     *
+     * @return mixed New search set
+     */
+    function refresh_search()
+    {
+        return $this->get_search_set();
+    }
+
+    /**
      * List the current set of contact records
      *

branches/devel-addressbook/program/include/rcube_contacts.php

@@ -156 +156 @@
      * List the current set of contact records
      *
-     * @param  array   List of cols to show
+     * @param  array   List of cols to show, Null means all
      * @param  int     Only return this number of records, use negative values for tail
      * @param  boolean True to skip the count query (select only)
@@ -191 +191 @@
             $this->group_id);
 
+        // determine whether we have to parse the vcard or if only db cols are requested
+        $read_vcard = !$cols || count(array_intersect($cols, array_keys($sql_arr))) < count($cols);
+        
         while ($sql_result && ($sql_arr = $this->db->fetch_assoc($sql_result))) {
             $sql_arr['ID'] = $sql_arr[$this->primary_key];
-            $sql_arr['email'] = preg_split('/,\s*/', $sql_arr['email']);
+
+            if ($read_vcard)
+                $sql_arr = $this->convert_db_data($sql_arr);
+            else
+                $sql_arr['email'] = preg_split('/,\s*/', $sql_arr['email']);
+            
             // make sure we have a name to display
             if (empty($sql_arr['name']))
                 $sql_arr['name'] = $sql_arr['email'][0];
+
             $this->result->add($sql_arr);
         }

branches/devel-addressbook/program/steps/addressbook/delete.inc

@@ -39 +39 @@
         $result = $CONTACTS->count();
 
+        // update saved search after data changed
+        if (($search_request = $_REQUEST['_search']) && isset($_SESSION['search'][$search_request]))
+            $_SESSION['search'][$search_request] = $CONTACTS->refresh_search();
+
         // update message count display
         $OUTPUT->set_env('pagecount', ceil($result->count / $CONTACTS->page_size));

branches/devel-addressbook/program/steps/addressbook/func.inc

@@ -175 +175 @@
     global $CONTACTS, $OUTPUT;
 
+    // define list of cols to be displayed
+    $a_show_cols = array('name');
+
     // count contacts for this user
-    $result = $CONTACTS->list_records();
+    $result = $CONTACTS->list_records($a_show_cols);
 
     // add id to message list table if not specified
     if (!strlen($attrib['id']))
         $attrib['id'] = 'rcmAddressList';
-
-    // define list of cols to be displayed
-    $a_show_cols = array('name');
 
     // create XHTML table

branches/devel-addressbook/program/steps/addressbook/list.inc

@@ -21 +21 @@
 
 // get contacts for this user
-$result = $CONTACTS->list_records();
+$result = $CONTACTS->list_records(array('name'));
 
 // update message count display

branches/devel-addressbook/program/steps/addressbook/search.inc

@@ -6 +6 @@
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2007, Roundcube Dev. - Switzerland                 |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
@@ -29 +29 @@
 $result = $CONTACTS->search(array('name','email'), $search);
 
+// save search settings in session
+$_SESSION['search'][$search_request] = $CONTACTS->get_search_set();
+
 if ($result->count > 0)
 {
-  // save search settings in session
-  $_SESSION['search'][$search_request] = $CONTACTS->get_search_set();
-
   // create javascript list
   rcmail_js_contacts_list($result);