X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=plugins%2Fnew_user_identity%2Fnew_user_identity.php;h=32c2c9d03443573b3013b596f0865da86797993e;hb=a2dd2e41259a5e90016efcd7d083020b95e25527;hp=ecdf7c137830bbc00289e5510b1cd1c4d7b63b8e;hpb=4212156c5c79d2f58342feb0d3ed1893f177bcab;p=roundcube.git

diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php
index ecdf7c1..32c2c9d 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 1.05
  * @author Kris Steinhoff
  *
  * Example configuration:
@@ -15,15 +15,21 @@
  *  // 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';
+ *
+ *  // Use this field (from fieldmap configuration) to fill alias col of
+ *  // the new user record.
+ *  $rcmail_config['new_user_identity_alias'] = 'alias';
  */
 class new_user_identity extends rcube_plugin
 {
     public $task = 'login';
 
+    private $ldap;
+
     function init()
     {
         $this->add_hook('user_create', array($this, 'lookup_user_name'));
@@ -32,19 +38,52 @@ class new_user_identity extends rcube_plugin
     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'];
                 if (!$args['user_email'] && strpos($results->records[0]['email'], '@')) {
-                    $args['user_email'] = idn_to_ascii($results->records[0]['email']);
+                    $args['user_email'] = rcube_idn_to_ascii($results->records[0]['email']);
+                }
+                if (($alias_col = $rcmail->config->get('new_user_identity_alias')) && $results->records[0][$alias_col]) {
+                  $args['alias'] = $results->records[0][$alias_col];
                 }
             }
         }
         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;
+    }
 }
-?>