Aleksander Machniak
2014-10-30 8cbebcac6aba53860a022c699a5384cbabc06a87
CS fixes and bump version number after PR merge
3 files modified
28 ■■■■■ changed files
plugins/new_user_identity/composer.json 2 ●●● patch | view | raw | blame | history
plugins/new_user_identity/new_user_identity.php 22 ●●●●● patch | view | raw | blame | history
plugins/new_user_identity/package.xml 4 ●●●● patch | view | raw | blame | history
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",
plugins/new_user_identity/new_user_identity.php
@@ -67,21 +67,27 @@
            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']));
        $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) {
        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']) {
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>