summaryrefslogtreecommitdiff
path: root/plugins/new_user_identity
diff options
context:
space:
mode:
authorBartlomiej Nogas <bart.nogas@gmail.com>2014-10-30 12:37:53 +0100
committerBartlomiej Nogas <bart.nogas@gmail.com>2014-10-30 12:37:53 +0100
commit385bb6c1e69b82551a1168abb8fd80e37ecb96a3 (patch)
tree070277cb972bedc0a434e5f2d329378adaabaa56 /plugins/new_user_identity
parent1e89a627e0247f0076c4c6c6f927a7e0616a02eb (diff)
Another correction for PR comments
Diffstat (limited to 'plugins/new_user_identity')
-rw-r--r--plugins/new_user_identity/new_user_identity.php10
1 files changed, 4 insertions, 6 deletions
diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php
index 296020759..976472210 100644
--- a/plugins/new_user_identity/new_user_identity.php
+++ b/plugins/new_user_identity/new_user_identity.php
@@ -27,10 +27,6 @@ class new_user_identity extends rcube_plugin
function lookup_user_name($args)
{
- if (!$args['login_after']) {
- $this->load_config();
- }
-
if ($this->init_ldap($args['host'])) {
$results = $this->ldap->search('*', $args['user'], true);
@@ -67,13 +63,13 @@ class new_user_identity extends rcube_plugin
{
$this->load_config();
- if (!$this->rc->config->get('new_user_identity_onlogin')) {
+ if ($this->ldap || !$this->rc->config->get('new_user_identity_onlogin')) {
return $args;
}
$identities = $this->rc->user->list_identities();
$ldap_entry = $this->lookup_user_name(array('user' => $this->rc->user->data['username'],
- 'host' => $this->rc->user->data['mail_host'], 'login_after' => true));
+ 'host' => $this->rc->user->data['mail_host']));
foreach ($ldap_entry['email_list'] as $email) {
foreach($identities as $identity) {
@@ -101,6 +97,8 @@ class new_user_identity extends rcube_plugin
return $this->ldap->ready;
}
+ $this->load_config();
+
$addressbook = $this->rc->config->get('new_user_identity_addressbook');
$ldap_config = (array)$this->rc->config->get('ldap_public');
$match = $this->rc->config->get('new_user_identity_match');