Changeset 1712 in subversion for trunk/roundcubemail/program/steps/addressbook/func.inc

Timestamp:

Sep 2, 2008 3:42:46 AM (5 years ago)

Author:

thomasb

Message:

Let rcmail class create address book instances

File:

• trunk/roundcubemail/program/steps/addressbook/func.inc (modified) (1 diff)

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

@@ -21 +21 @@
 
 // instantiate a contacts object according to the given source
-if (($source = get_input_value('_source', RCUBE_INPUT_GPC)) && isset($CONFIG['ldap_public'][$source]))
-  $CONTACTS = new rcube_ldap($CONFIG['ldap_public'][$source]);
-else if (strtolower($CONFIG['address_book_type']) == 'ldap') {
-    // Get the first LDAP address book.
-    $source = key((array)$CONFIG['ldap_public']);
-    $prop = current((array)$CONFIG['ldap_public']);
-    $CONTACTS = new rcube_ldap($prop);
-} else {
-    $CONTACTS = new rcube_contacts($DB, $_SESSION['user_id']);
-} // end else
+$CONTACTS = $RCMAIL->get_address_book(($source = get_input_value('_source', RCUBE_INPUT_GPC)));
 
 $CONTACTS->set_pagesize($CONFIG['pagesize']);