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

Merge branch 'master' of ssh://git.kolab.org/git/roundcubemail-plugins-kolab

Browse source
This commit is contained in:
Thomas Bruederli 2014-04-14 18:25:53 +02:00
commit ee269df7ae
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/kolab_delegation/kolab_delegation.php
View file

@ -320,7 +320,7 @@ class kolab_delegation extends rcube_plugin
*/ */
public function controller_action() public function controller_action()
{ {
$this->add_texts('localization/', true); $this->add_texts('localization/');
$engine = $this->engine(); $engine = $this->engine();
@ -376,10 +376,10 @@ class kolab_delegation extends rcube_plugin
// Delegate autocompletion // Delegate autocompletion
else if ($this->rc->action == 'plugin.delegation-autocomplete') { else if ($this->rc->action == 'plugin.delegation-autocomplete') {
$search = get_input_value('_search', RCUBE_INPUT_GPC, true); $search = get_input_value('_search', RCUBE_INPUT_GPC, true);
$sid = get_input_value('_id', RCUBE_INPUT_GPC); $reqid = get_input_value('_reqid', RCUBE_INPUT_GPC);
$users = $engine->list_users($search); $users = $engine->list_users($search);
$this->rc->output->command('ksearch_query_results', $users, $search, $sid); $this->rc->output->command('ksearch_query_results', $users, $search, $reqid);
} }
$this->rc->output->send(); $this->rc->output->send();

5
plugins/kolab_delegation/kolab_delegation_engine.php
View file

@ -427,6 +427,11 @@ class kolab_delegation_engine
$result = $ldap->search($fields, $search, $mode, (array)$this->ldap_login_field, $max); $result = $ldap->search($fields, $search, $mode, (array)$this->ldap_login_field, $max);
foreach ($result as $record) { foreach ($result as $record) {
// skip self
if ($record['dn'] == $_SESSION['kolab_dn']) {
continue;
}
$user = $this->parse_ldap_record($record); $user = $this->parse_ldap_record($record);
if ($user['name']) { if ($user['name']) {