Fix errors after removing users.alias column (#1488581)

Aleksander Machniak

2012-08-07 ee2187e1b151c27fbf2b6854634fc4fd90f0ebd1

Fix errors after removing users.alias column (#1488581)

 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];
                }
            }
        }

 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>

 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);
        }

 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;

 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')) {