Changeset 2887 in subversion

Timestamp:

Aug 28, 2009 9:00:51 AM (4 years ago)

Author:

alec

Message:

• Fix LDAP addressbook browsing when only one directory is used (#1486022)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_ldap.php (modified) (1 diff)
• program/steps/addressbook/func.inc (modified) (2 diffs)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix LDAP addressbook browsing when only one directory is used (#1486022)
 - Fix endless loop on error response for APPEND command (#1486060)
 - Don't require date.timezone setting in installer (#1485989)

trunk/roundcubemail/program/include/rcube_ldap.php

@@ -53 +53 @@
   {
     $this->prop = $p;
-    
+
     foreach ($p as $prop => $value)
       if (preg_match('/^(.+)_field$/', $prop, $matches))

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

@@ -20 +20 @@
 */
 
-// instantiate a contacts object according to the given source
-$CONTACTS = $RCMAIL->get_address_book(($source = get_input_value('_source', RCUBE_INPUT_GPC)));
-
-$CONTACTS->set_pagesize($CONFIG['pagesize']);
-
-// set list properties and session vars
-if (!empty($_GET['_page']))
-  $CONTACTS->set_page(($_SESSION['page'] = intval($_GET['_page'])));
-else
-  $CONTACTS->set_page(isset($_SESSION['page']) ?$_SESSION['page'] : 1);
-
-// 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);
-
 // add list of address sources to client env
 $js_list = array();
@@ -51 +32 @@
 
 $plugin = $RCMAIL->plugins->exec_hook('address_sources', array('sources' => $js_list));
-$OUTPUT->set_env('address_sources', $plugin['sources']);
+$js_list = $plugin['sources'];
+
+// select source
+$source = get_input_value('_source', RCUBE_INPUT_GPC);
+
+// if source is not set use first directory
+if (empty($source))
+  $source = $js_list[key($js_list)]['id'];
+
+
+// instantiate a contacts object according to the given source
+$CONTACTS = $RCMAIL->get_address_book($source);
+
+$CONTACTS->set_pagesize($CONFIG['pagesize']);
+
+// set list properties and session vars
+if (!empty($_GET['_page']))
+  $CONTACTS->set_page(($_SESSION['page'] = intval($_GET['_page'])));
+else
+  $CONTACTS->set_page(isset($_SESSION['page']) ?$_SESSION['page'] : 1);
+
+// 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('address_sources', $js_list);