From ee2187e1b151c27fbf2b6854634fc4fd90f0ebd1 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 7 Aug 2012 11:54:37 +0200
Subject: Fix errors after removing users.alias column (#1488581)

---
 plugins/new_user_identity/new_user_identity.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'plugins/new_user_identity/new_user_identity.php')

diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php
index 7b67578bf..f3dae20a3 100644
--- a/plugins/new_user_identity/new_user_identity.php
+++ b/plugins/new_user_identity/new_user_identity.php
@@ -19,10 +19,6 @@
  *  // 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
 {
@@ -38,7 +34,7 @@ class new_user_identity extends rcube_plugin
     function lookup_user_name($args)
     {
         $rcmail = rcmail::get_instance();
-        
+
         if ($this->init_ldap($args['host'])) {
             $results = $this->ldap->search('*', $args['user'], TRUE);
             if (count($results->records) == 1) {
@@ -46,9 +42,6 @@ class new_user_identity extends rcube_plugin
                 if (!$args['user_email'] && strpos($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;
-- 
cgit v1.2.3