From a075df6f086656f9a01f0023111be6eb83c9d0db Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 30 Oct 2014 07:54:18 -0400
Subject: [PATCH] Merge pull request #243 from bnogas/master-p6
---
plugins/new_user_identity/new_user_identity.php | 47 +++++++++++++++++++++++++++++++++++++++++------
plugins/new_user_identity/config.inc.php.dist | 9 +++++++--
2 files changed, 48 insertions(+), 8 deletions(-)
diff --git a/plugins/new_user_identity/config.inc.php.dist b/plugins/new_user_identity/config.inc.php.dist
index b2fd764..87f2816 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 d1d1d9f..9764722 100644
--- a/plugins/new_user_identity/new_user_identity.php
+++ b/plugins/new_user_identity/new_user_identity.php
@@ -14,11 +14,15 @@
{
public $task = 'login';
+ private $rc;
private $ldap;
function init()
{
+ $this->rc = rcmail::get_instance();
+
$this->add_hook('user_create', array($this, 'lookup_user_name'));
+ $this->add_hook('login_after', array($this, 'login_after'));
}
function lookup_user_name($args)
@@ -55,18 +59,49 @@
return $args;
}
+ function login_after($args)
+ {
+ $this->load_config();
+
+ 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']));
+
+ foreach ($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']),
+ ));
+
+ if (!$plugin['abort'] && $plugin['record']['email']) {
+ $this->rc->user->insert_identity($plugin['record']);
+ }
+ }
+ return $args;
+ }
+
private function init_ldap($host)
{
if ($this->ldap) {
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;
@@ -74,8 +109,8 @@
$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;
--
Gitblit v1.9.1