summaryrefslogtreecommitdiff
path: root/plugins/new_user_identity
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-08-07 11:54:37 +0200
committerAleksander Machniak <alec@alec.pl>2012-08-07 11:54:37 +0200
commitee2187e1b151c27fbf2b6854634fc4fd90f0ebd1 (patch)
treefd7f5c2c52288e6c31295fc17f2353d45eea0c79 /plugins/new_user_identity
parent887838da08c56265145400a4513a51c7cc79ec5b (diff)
Fix errors after removing users.alias column (#1488581)
Diffstat (limited to 'plugins/new_user_identity')
-rw-r--r--plugins/new_user_identity/new_user_identity.php9
-rw-r--r--plugins/new_user_identity/package.xml6
2 files changed, 4 insertions, 11 deletions
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;
diff --git a/plugins/new_user_identity/package.xml b/plugins/new_user_identity/package.xml
index 95f1dc0dc..7d9d20d39 100644
--- a/plugins/new_user_identity/package.xml
+++ b/plugins/new_user_identity/package.xml
@@ -15,10 +15,10 @@
<email>alec@alec.pl</email>
<active>yes</active>
</lead>
- <date>2011-11-21</date>
+ <date>2012-08-07</date>
<version>
- <release>1.0.5</release>
- <api>1.0</api>
+ <release>1.0.6</release>
+ <api>1.1</api>
</version>
<stability>
<release>stable</release>