Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set autocomplete_addressbooks using new config_get hook

Browse source
This commit is contained in:
Aleksander Machniak (Kolab Systems) 2011-07-25 12:49:46 +02:00
parent b2a873008a
commit dc0f7261ad
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
plugins/kolab_addressbook/kolab_addressbook.php
View file

@ -27,7 +27,7 @@
*/
class kolab_addressbook extends rcube_plugin
{
public $task = 'mail|settings|addressbook';
public $task = 'mail|settings|addressbook|calendar';
private $folders;
private $sources;
@ -54,6 +54,7 @@ class kolab_addressbook extends rcube_plugin
// register hooks
$this->add_hook('addressbooks_list', array($this, 'address_sources'));
$this->add_hook('addressbook_get', array($this, 'get_address_book'));
$this->add_hook('config_get', array($this, 'config_get'));
if ($this->rc->task == 'addressbook') {
$this->add_texts('localization');
@ -74,10 +75,6 @@ class kolab_addressbook extends rcube_plugin
$this->add_hook('preferences_list', array($this, 'prefs_list'));
$this->add_hook('preferences_save', array($this, 'prefs_save'));
}
// extend list of address sources to be used for autocompletion
else if ($this->rc->task == 'mail' && $this->rc->action == 'autocomplete') {
$this->autocomplete_sources();
}
}
@ -149,16 +146,22 @@ class kolab_addressbook extends rcube_plugin
/**
* Setts autocomplete_addressbooks option according to
* kolab_addressbook_prio setting.
* Sets autocomplete_addressbooks option according to
* kolab_addressbook_prio setting extending list of address sources
* to be used for autocompletion.
*/
public function autocomplete_sources()
public function config_get($args)
{
if ($args['name'] != 'autocomplete_addressbooks') {
return $args;
}
// Load configuration
$this->load_config();
$abook_prio = (int) $this->rc->config->get('kolab_addressbook_prio');
$sources = (array) $this->rc->config->get('autocomplete_addressbooks', array());
// here we cannot use rc->config->get()
$sources = $GLOBALS['CONFIG']['autocomplete_addressbooks'];
// Disable all global address books
// Assumes that all non-kolab_addressbook sources are global
@ -166,6 +169,10 @@ class kolab_addressbook extends rcube_plugin
$sources = array();
}
if (!is_array($sources)) {
$sources = array();
}
$kolab_sources = array();
foreach ($this->_list_sources() as $abook_id => $abook) {
if (!in_array($abook_id, $sources))
@ -180,9 +187,11 @@ class kolab_addressbook extends rcube_plugin
else {
$sources = array_merge($sources, $kolab_sources);
}
$this->rc->config->set('autocomplete_addressbooks', $sources);
}
$args['result'] = $sources;
return $args;
}