Changeset 4841 in subversion

Timestamp:

Jun 5, 2011 3:42:45 AM (2 years ago)

Author:

alec

Message:

• Fix contacts import (#1487947)

Location:

trunk/roundcubemail/program

Files:

• js/app.js (modified) (2 diffs)
• steps/addressbook/func.inc (modified) (1 diff)
• steps/addressbook/search.inc (modified) (1 diff)

trunk/roundcubemail/program/js/app.js

@@ -305 +305 @@
             $(this.gui_objects.qsearchbox).focusin(function() { rcmail.contact_list.blur(); });
           }
+
+          this.enable_command('group-create', this.env.address_sources[this.env.source].groups);
         }
 
         this.set_page_buttons();
-
-        if (this.env.address_sources && this.env.address_sources[this.env.source] && !this.env.address_sources[this.env.source].readonly) {
-          this.enable_command('add', 'import', true);
-          this.enable_command('group-create', this.env.address_sources[this.env.source].groups);
-        }
 
         if (this.env.cid) {
@@ -340 +337 @@
           this.enable_command('export', true);
 
+        this.enable_command('add', 'import', !this.env.readonly);
         this.enable_command('list', 'listgroup', 'advanced-search', true);
         break;

trunk/roundcubemail/program/steps/addressbook/func.inc

@@ -51 +51 @@
 if (!empty($_REQUEST['_gid']))
     $CONTACTS->set_group(get_input_value('_gid', RCUBE_INPUT_GPC));
-/*
-// set message set for search result
-if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']]))
-    $CONTACTS->set_search_set($_SESSION['search'][$_REQUEST['_search']]);
-*/
+
 // set data source env
 $OUTPUT->set_env('source', $source ? $source : '0');
-$OUTPUT->set_env('readonly', $CONTACTS->readonly, false);
+$OUTPUT->set_env('readonly', $CONTACTS->readonly);
 if (!$OUTPUT->ajax_call) {
     $search_mods = $RCMAIL->config->get('addressbook_search_mods', $SEARCH_MODS_DEFAULT);

trunk/roundcubemail/program/steps/addressbook/search.inc

@@ -73 +73 @@
 
     // search request ID
-    $search_request = md5('addr'.implode($fields, ',')
+    $search_request = md5('addr'
+        .(is_array($fields) ? implode($fields, ',') : $fields)
         .(is_array($search) ? implode($search, ',') : $search));