From ee2187e1b151c27fbf2b6854634fc4fd90f0ebd1 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 07 Aug 2012 05:54:37 -0400
Subject: [PATCH] Fix errors after removing users.alias column (#1488581)
---
plugins/password/drivers/virtualmin.php | 4 ----
program/include/rcube_user.php | 5 ++---
plugins/new_user_identity/package.xml | 6 +++---
plugins/squirrelmail_usercopy/config.inc.php.dist | 2 +-
plugins/new_user_identity/new_user_identity.php | 9 +--------
5 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php
index 7b67578..f3dae20 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,16 +34,13 @@
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) {
$args['user_name'] = $results->records[0]['name'];
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];
}
}
}
diff --git a/plugins/new_user_identity/package.xml b/plugins/new_user_identity/package.xml
index 95f1dc0..7d9d20d 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>
diff --git a/plugins/password/drivers/virtualmin.php b/plugins/password/drivers/virtualmin.php
index f6b9bd4..b2547e0 100644
--- a/plugins/password/drivers/virtualmin.php
+++ b/plugins/password/drivers/virtualmin.php
@@ -48,10 +48,6 @@
$pieces = explode("_", $username);
$domain = $pieces[0];
break;
- case 8: // domain taken from alias, username left as it was
- $email = $rcmail->user->data['alias'];
- $domain = substr(strrchr($email, "@"), 1);
- break
default: // username@domain
$domain = substr(strrchr($username, "@"), 1);
}
diff --git a/plugins/squirrelmail_usercopy/config.inc.php.dist b/plugins/squirrelmail_usercopy/config.inc.php.dist
index 0dc0abb..cb62b1b 100644
--- a/plugins/squirrelmail_usercopy/config.inc.php.dist
+++ b/plugins/squirrelmail_usercopy/config.inc.php.dist
@@ -22,4 +22,4 @@
// Set to false if you don't want the email address of the default identity
// (squirrelmail preference "email_address") to be saved as alias.
// Recommended: set to false if your squirrelmail config setting $edit_identity has been true.
-$rcmail_config['squirrelmail_set_alias'] = true;
+$rcmail_config['squirrelmail_set_alias'] = true;
\ No newline at end of file
diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
index d542152..a54cbd7 100644
--- a/program/include/rcube_user.php
+++ b/program/include/rcube_user.php
@@ -456,11 +456,10 @@
$dbh->query(
"INSERT INTO ".$dbh->table_name('users').
- " (created, last_login, username, mail_host, alias, language)".
- " VALUES (".$dbh->now().", ".$dbh->now().", ?, ?, ?, ?)",
+ " (created, last_login, username, mail_host, language)".
+ " VALUES (".$dbh->now().", ".$dbh->now().", ?, ?, ?)",
strip_newlines($user),
strip_newlines($host),
- strip_newlines($data['alias'] ? $data['alias'] : $user_email),
strip_newlines($data['language'] ? $data['language'] : $_SESSION['language']));
if ($user_id = $dbh->insert_id('users')) {
--
Gitblit v1.9.1