summaryrefslogtreecommitdiff
path: root/program/steps
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-03-02 14:35:53 +0000
committeralecpl <alec@alec.pl>2010-03-02 14:35:53 +0000
commit3704b78841ba05c31a2acaeabdffb9c471bb6610 (patch)
tree34dd713257589d0fc39285945e046c8c07722afd /program/steps
parent47ad83f337c9eeb4bc53afb85a71cf90a8a34106 (diff)
- Added function to get addressbooks list rcmail::get_address_sources() (#1486248)
Diffstat (limited to 'program/steps')
-rw-r--r--program/steps/addressbook/func.inc14
1 files changed, 1 insertions, 13 deletions
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index ebf5546db..ca1fd03fc 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -20,18 +20,7 @@
*/
// add list of address sources to client env
-$js_list = array();
-if (strtolower($CONFIG['address_book_type']) != 'ldap') {
- // We are using the DB address book, add it.
- $js_list['0'] = array('id' => 0, 'name' => rcube_label('personaladrbook'), 'readonly' => false);
-}
-if (is_array($CONFIG['ldap_public'])) {
- foreach ($CONFIG['ldap_public'] as $id => $prop)
- $js_list[$id] = array('id' => $id, 'name' => $prop['name'], 'readonly' => !$prop['writable']);
-}
-
-$plugin = $RCMAIL->plugins->exec_hook('address_sources', array('sources' => $js_list));
-$js_list = $plugin['sources'];
+$js_list = $RCMAIL->get_address_sources();
// select source
$source = get_input_value('_source', RCUBE_INPUT_GPC);
@@ -40,7 +29,6 @@ $source = get_input_value('_source', RCUBE_INPUT_GPC);
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);