CS fixes and bump version number after PR merge

pull/245/head
Aleksander Machniak 10 years ago
parent a075df6f08
commit 8cbebcac6a

@ -3,7 +3,7 @@
"type": "roundcube-plugin", "type": "roundcube-plugin",
"description": "Populates a new user's default identity from LDAP on their first visit.", "description": "Populates a new user's default identity from LDAP on their first visit.",
"license": "GNU GPLv3+", "license": "GNU GPLv3+",
"version": "1.0.7", "version": "1.1",
"authors": [ "authors": [
{ {
"name": "Aleksander Machniak", "name": "Aleksander Machniak",

@ -67,21 +67,27 @@ class new_user_identity extends rcube_plugin
return $args; return $args;
} }
$identities = $this->rc->user->list_identities(); $identities = $this->rc->user->list_identities();
$ldap_entry = $this->lookup_user_name(array('user' => $this->rc->user->data['username'], $ldap_entry = $this->lookup_user_name(array(
'host' => $this->rc->user->data['mail_host'])); 'user' => $this->rc->user->data['username'],
'host' => $this->rc->user->data['mail_host'],
foreach ($ldap_entry['email_list'] as $email) { ));
foreach($identities as $identity) {
foreach ((array) $ldap_entry['email_list'] as $email) {
foreach ($identities as $identity) {
if ($identity['email'] == $email ) { if ($identity['email'] == $email ) {
continue 2; continue 2;
} }
} }
$plugin = $this->rc->plugins->exec_hook('identity_create', array( $plugin = $this->rc->plugins->exec_hook('identity_create', array(
'login' => true, 'login' => true,
'record' => array('user_id' => $this->rc->user->ID, 'standard' => 0, 'record' => array(
'email' => $email, 'name' => $ldap_entry['user_name']), 'user_id' => $this->rc->user->ID,
'standard' => 0,
'email' => $email,
'name' => $ldap_entry['user_name']
),
)); ));
if (!$plugin['abort'] && $plugin['record']['email']) { if (!$plugin['abort'] && $plugin['record']['email']) {

@ -15,9 +15,9 @@
<email>alec@alec.pl</email> <email>alec@alec.pl</email>
<active>yes</active> <active>yes</active>
</lead> </lead>
<date>2012-08-13</date> <date>2014-10-30</date>
<version> <version>
<release>1.0.7</release> <release>1.1</release>
<api>1.1</api> <api>1.1</api>
</version> </version>
<stability> <stability>

Loading…
Cancel
Save