From 193a0dddded2657628b2007da598b6779e513541 Mon Sep 17 00:00:00 2001
From: Bartlomiej Nogas <bart.nogas@gmail.com>
Date: Tue, 28 Oct 2014 17:09:04 +0100
Subject: Add support for updating identities on each login

---
 plugins/new_user_identity/config.inc.php.dist   |  9 +++++--
 plugins/new_user_identity/new_user_identity.php | 35 +++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/new_user_identity/config.inc.php.dist b/plugins/new_user_identity/config.inc.php.dist
index b2fd76408..87f28166b 100644
--- a/plugins/new_user_identity/config.inc.php.dist
+++ b/plugins/new_user_identity/config.inc.php.dist
@@ -1,10 +1,15 @@
 <?php
 
-// The id of the address book to use to automatically set a new
+// The id of the address book to use to automatically set a
 // user's full name in their new identity. (This should be an
 // string, which refers to the $config['ldap_public'] array.)
 $config['new_user_identity_addressbook'] = 'People';
 
-// When automatically setting a new users's full name in their
+// When automatically setting a user's full name in their
 // new identity, match the user's login name against this field.
 $config['new_user_identity_match'] = 'uid';
+
+// Determine whether to import user's identities on each login.
+// New user identity will be created for each e-mail address
+// present in address book, but not assigned to any identity.
+$config['new_user_identity_onlogin'] = false;
diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php
index d1d1d9f24..a337a5475 100644
--- a/plugins/new_user_identity/new_user_identity.php
+++ b/plugins/new_user_identity/new_user_identity.php
@@ -18,7 +18,13 @@ class new_user_identity extends rcube_plugin
 
     function init()
     {
+        $rcmail = rcmail::get_instance();
+        $this->load_config();
+
         $this->add_hook('user_create', array($this, 'lookup_user_name'));
+        if ($rcmail->config->get('new_user_identity_onlogin')) {
+            $this->add_hook('login_after', array($this, 'login_after'));
+        }
     }
 
     function lookup_user_name($args)
@@ -55,6 +61,35 @@ class new_user_identity extends rcube_plugin
         return $args;
     }
 
+    function login_after($args)
+    {
+        $rcmail = rcmail::get_instance();
+
+        $identities   = $rcmail->user->list_identities();
+        $ldap_entery  = $this->lookup_user_name(array('user' => $rcmail->user->data['username'],
+            'host' => $rcmail->user->data['mail_host']));
+
+        foreach ($ldap_entery['email_list'] as $email)
+        {
+            foreach($identities as $identity) {
+                if ($identity['email'] == $email ) {
+                    continue 2;
+                }
+            }
+
+            $plugin = $rcmail->plugins->exec_hook('identity_create', array(
+                'login' => true,
+                'record' => array('user_id' => $rcmail->user->ID, 'standard' => 0,
+                    'email' => $email, 'name' => $ldap_entery['user_name']),
+            ));
+
+            if (!$plugin['abort'] && $plugin['record']['email']) {
+                $rcmail->user->insert_identity($plugin['record']);
+            }
+        }
+        return $args;
+    }
+
     private function init_ldap($host)
     {
         if ($this->ldap) {
-- 
cgit v1.2.3


From 1e89a627e0247f0076c4c6c6f927a7e0616a02eb Mon Sep 17 00:00:00 2001
From: Bartlomiej Nogas <bart.nogas@gmail.com>
Date: Wed, 29 Oct 2014 12:32:57 +0100
Subject: Correcting for PR comments + change rcmail to rc

---
 plugins/new_user_identity/new_user_identity.php | 48 +++++++++++++------------
 1 file changed, 25 insertions(+), 23 deletions(-)

(limited to 'plugins')

diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php
index a337a5475..296020759 100644
--- a/plugins/new_user_identity/new_user_identity.php
+++ b/plugins/new_user_identity/new_user_identity.php
@@ -14,21 +14,23 @@ class new_user_identity extends rcube_plugin
 {
     public $task = 'login';
 
+    private $rc;
     private $ldap;
 
     function init()
     {
-        $rcmail = rcmail::get_instance();
-        $this->load_config();
+        $this->rc = rcmail::get_instance();
 
         $this->add_hook('user_create', array($this, 'lookup_user_name'));
-        if ($rcmail->config->get('new_user_identity_onlogin')) {
-            $this->add_hook('login_after', array($this, 'login_after'));
-        }
+        $this->add_hook('login_after', array($this, 'login_after'));
     }
 
     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);
 
@@ -63,28 +65,31 @@ class new_user_identity extends rcube_plugin
 
     function login_after($args)
     {
-        $rcmail = rcmail::get_instance();
+        $this->load_config();
 
-        $identities   = $rcmail->user->list_identities();
-        $ldap_entery  = $this->lookup_user_name(array('user' => $rcmail->user->data['username'],
-            'host' => $rcmail->user->data['mail_host']));
+        if (!$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));
 
-        foreach ($ldap_entery['email_list'] as $email)
-        {
+        foreach ($ldap_entry['email_list'] as $email) {
             foreach($identities as $identity) {
                 if ($identity['email'] == $email ) {
                     continue 2;
                 }
             }
 
-            $plugin = $rcmail->plugins->exec_hook('identity_create', array(
+            $plugin = $this->rc->plugins->exec_hook('identity_create', array(
                 'login' => true,
-                'record' => array('user_id' => $rcmail->user->ID, 'standard' => 0,
-                    'email' => $email, 'name' => $ldap_entery['user_name']),
+                'record' => array('user_id' => $this->rc->user->ID, 'standard' => 0,
+                    'email' => $email, 'name' => $ldap_entry['user_name']),
             ));
 
             if (!$plugin['abort'] && $plugin['record']['email']) {
-                $rcmail->user->insert_identity($plugin['record']);
+                $this->rc->user->insert_identity($plugin['record']);
             }
         }
         return $args;
@@ -96,12 +101,9 @@ class new_user_identity extends rcube_plugin
             return $this->ldap->ready;
         }
 
-        $rcmail = rcmail::get_instance();
-        $this->load_config();
-
-        $addressbook = $rcmail->config->get('new_user_identity_addressbook');
-        $ldap_config = (array)$rcmail->config->get('ldap_public');
-        $match       = $rcmail->config->get('new_user_identity_match');
+        $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');
 
         if (empty($addressbook) || empty($match) || empty($ldap_config[$addressbook])) {
             return false;
@@ -109,8 +111,8 @@ class new_user_identity extends rcube_plugin
 
         $this->ldap = new new_user_identity_ldap_backend(
             $ldap_config[$addressbook],
-            $rcmail->config->get('ldap_debug'),
-            $rcmail->config->mail_domain($host),
+            $this->rc->config->get('ldap_debug'),
+            $this->rc->config->mail_domain($host),
             $match);
 
         return $this->ldap->ready;
-- 
cgit v1.2.3


From 385bb6c1e69b82551a1168abb8fd80e37ecb96a3 Mon Sep 17 00:00:00 2001
From: Bartlomiej Nogas <bart.nogas@gmail.com>
Date: Thu, 30 Oct 2014 12:37:53 +0100
Subject: Another correction for PR comments

---
 plugins/new_user_identity/new_user_identity.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'plugins')

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');
-- 
cgit v1.2.3