diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-10-30 12:57:43 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-10-30 12:57:43 +0100 |
| commit | 8cbebcac6aba53860a022c699a5384cbabc06a87 (patch) | |
| tree | 10ef6c6f32c5c4bd475af665c925d14ae6858fbf /plugins | |
| parent | a075df6f086656f9a01f0023111be6eb83c9d0db (diff) | |
CS fixes and bump version number after PR merge
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/new_user_identity/composer.json | 2 | ||||
| -rw-r--r-- | plugins/new_user_identity/new_user_identity.php | 24 | ||||
| -rw-r--r-- | plugins/new_user_identity/package.xml | 4 |
3 files changed, 18 insertions, 12 deletions
diff --git a/plugins/new_user_identity/composer.json b/plugins/new_user_identity/composer.json index 11a0af7cd..a2e9e95dc 100644 --- a/plugins/new_user_identity/composer.json +++ b/plugins/new_user_identity/composer.json @@ -3,7 +3,7 @@ "type": "roundcube-plugin", "description": "Populates a new user's default identity from LDAP on their first visit.", "license": "GNU GPLv3+", - "version": "1.0.7", + "version": "1.1", "authors": [ { "name": "Aleksander Machniak", diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php index 976472210..f7d60d4fa 100644 --- a/plugins/new_user_identity/new_user_identity.php +++ b/plugins/new_user_identity/new_user_identity.php @@ -67,21 +67,27 @@ class new_user_identity extends rcube_plugin 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'])); - - foreach ($ldap_entry['email_list'] as $email) { - foreach($identities as $identity) { + $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'], + )); + + foreach ((array) $ldap_entry['email_list'] as $email) { + foreach ($identities as $identity) { if ($identity['email'] == $email ) { continue 2; } } $plugin = $this->rc->plugins->exec_hook('identity_create', array( - 'login' => true, - 'record' => array('user_id' => $this->rc->user->ID, 'standard' => 0, - 'email' => $email, 'name' => $ldap_entry['user_name']), + 'login' => true, + 'record' => array( + 'user_id' => $this->rc->user->ID, + 'standard' => 0, + 'email' => $email, + 'name' => $ldap_entry['user_name'] + ), )); if (!$plugin['abort'] && $plugin['record']['email']) { diff --git a/plugins/new_user_identity/package.xml b/plugins/new_user_identity/package.xml index 45a3c4c8d..12409392b 100644 --- a/plugins/new_user_identity/package.xml +++ b/plugins/new_user_identity/package.xml @@ -15,9 +15,9 @@ <email>alec@alec.pl</email> <active>yes</active> </lead> - <date>2012-08-13</date> + <date>2014-10-30</date> <version> - <release>1.0.7</release> + <release>1.1</release> <api>1.1</api> </version> <stability> |