From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop
---
plugins/new_user_identity/new_user_identity.php | 61 +++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 10 deletions(-)
diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php
index 78c9952..200d9ac 100644
--- a/plugins/new_user_identity/new_user_identity.php
+++ b/plugins/new_user_identity/new_user_identity.php
@@ -6,7 +6,7 @@
*
* This plugin requires that a working public_ldap directory be configured.
*
- * @version 1.0
+ * @version @package_version@
* @author Kris Steinhoff
*
* Example configuration:
@@ -15,31 +15,72 @@
* // user's full name in their new identity. (This should be an
* // string, which refers to the $rcmail_config['ldap_public'] array.)
* $rcmail_config['new_user_identity_addressbook'] = 'People';
- *
+ *
* // When automatically setting a new users's full name in their
* // new identity, match the user's login name against this field.
* $rcmail_config['new_user_identity_match'] = 'uid';
*/
class new_user_identity extends rcube_plugin
{
+ public $task = 'login';
+
+ private $ldap;
+
function init()
{
- $this->add_hook('create_user', array($this, 'lookup_user_name'));
+ $this->add_hook('user_create', array($this, 'lookup_user_name'));
}
function lookup_user_name($args)
{
$rcmail = rcmail::get_instance();
- if ($addressbook = $rcmail->config->get('new_user_identity_addressbook')) {
- $match = $rcmail->config->get('new_user_identity_match');
- $ldap = $rcmail->get_address_book($addressbook);
- $ldap->prop['search_fields'] = array($match);
- $results = $ldap->search($match, $args['user'], TRUE);
+
+ if ($this->init_ldap($args['host'])) {
+ $results = $this->ldap->search('*', $args['user'], true);
if (count($results->records) == 1) {
- $args['user_name'] = $results->records[0]['name'];
+ $user_name = is_array($results->records[0]['name']) ? $results->records[0]['name'][0] : $results->records[0]['name'];
+ $user_email = is_array($results->records[0]['email']) ? $results->records[0]['email'][0] : $results->records[0]['email'];
+
+ $args['user_name'] = $user_name;
+ if (!$args['user_email'] && strpos($user_email, '@')) {
+ $args['user_email'] = rcube_idn_to_ascii($user_email);
+ }
}
}
return $args;
}
+
+ private function init_ldap($host)
+ {
+ if ($this->ldap) {
+ return $this->ldap->ready;
+ }
+
+ $rcmail = rcmail::get_instance();
+
+ $addressbook = $rcmail->config->get('new_user_identity_addressbook');
+ $ldap_config = (array)$rcmail->config->get('ldap_public');
+ $match = $rcmail->config->get('new_user_identity_match');
+
+ if (empty($addressbook) || empty($match) || empty($ldap_config[$addressbook])) {
+ return false;
+ }
+
+ $this->ldap = new new_user_identity_ldap_backend(
+ $ldap_config[$addressbook],
+ $rcmail->config->get('ldap_debug'),
+ $rcmail->config->mail_domain($host),
+ $match);
+
+ return $this->ldap->ready;
+ }
}
-?>
+
+class new_user_identity_ldap_backend extends rcube_ldap
+{
+ function __construct($p, $debug, $mail_domain, $search)
+ {
+ parent::__construct($p, $debug, $mail_domain);
+ $this->prop['search_fields'] = (array)$search;
+ }
+}
--
Gitblit v1.9.1