diff options
Diffstat (limited to 'plugins/new_user_identity')
| -rw-r--r-- | plugins/new_user_identity/composer.json | 2 | ||||
| -rw-r--r-- | plugins/new_user_identity/new_user_identity.php | 4 | ||||
| -rw-r--r-- | plugins/new_user_identity/package.xml | 49 |
3 files changed, 3 insertions, 52 deletions
diff --git a/plugins/new_user_identity/composer.json b/plugins/new_user_identity/composer.json index a2e9e95dc..8378ae50c 100644 --- a/plugins/new_user_identity/composer.json +++ b/plugins/new_user_identity/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/new_user_identity", "type": "roundcube-plugin", "description": "Populates a new user's default identity from LDAP on their first visit.", - "license": "GNU GPLv3+", + "license": "GPLv3+", "version": "1.1", "authors": [ { diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php index f7d60d4fa..b9054880e 100644 --- a/plugins/new_user_identity/new_user_identity.php +++ b/plugins/new_user_identity/new_user_identity.php @@ -67,7 +67,7 @@ class new_user_identity extends rcube_plugin return $args; } - $identities = $this->rc->user->list_identities(); + $identities = $this->rc->user->list_emails(); $ldap_entry = $this->lookup_user_name(array( 'user' => $this->rc->user->data['username'], 'host' => $this->rc->user->data['mail_host'], @@ -75,7 +75,7 @@ class new_user_identity extends rcube_plugin foreach ((array) $ldap_entry['email_list'] as $email) { foreach ($identities as $identity) { - if ($identity['email'] == $email ) { + if ($identity['email'] == $email) { continue 2; } } diff --git a/plugins/new_user_identity/package.xml b/plugins/new_user_identity/package.xml deleted file mode 100644 index 12409392b..000000000 --- a/plugins/new_user_identity/package.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 - http://pear.php.net/dtd/tasks-1.0.xsd - http://pear.php.net/dtd/package-2.0 - http://pear.php.net/dtd/package-2.0.xsd"> - <name>new_user_identity</name> - <channel>pear.roundcube.net</channel> - <summary>Populates a new user's default identity from LDAP on their first visit.</summary> - <description> - Populates a new user's default identity from LDAP on their first visit. - </description> - <lead> - <name>Aleksander Machniak</name> - <user>alec</user> - <email>alec@alec.pl</email> - <active>yes</active> - </lead> - <date>2014-10-30</date> - <version> - <release>1.1</release> - <api>1.1</api> - </version> - <stability> - <release>stable</release> - <api>stable</api> - </stability> - <license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license> - <notes>-</notes> - <contents> - <dir baseinstalldir="/" name="/"> - <file name="new_user_identity.php" role="php"> - <tasks:replace from="@name@" to="name" type="package-info"/> - <tasks:replace from="@package_version@" to="version" type="package-info"/> - </file> - </dir> - <!-- / --> - </contents> - <dependencies> - <required> - <php> - <min>5.2.1</min> - </php> - <pearinstaller> - <min>1.7.0</min> - </pearinstaller> - </required> - </dependencies> - <phprelease/> -</package> |