Changeset ee2187e in github

Timestamp:

Aug 7, 2012 5:54:37 AM (10 months ago)

Author:

Aleksander Machniak <alec@…>

Children:

024f2ab8

Parents:

887838d

Message:

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

Files:

• plugins/new_user_identity/new_user_identity.php (modified) (3 diffs)
• plugins/new_user_identity/package.xml (modified) (1 diff)
• plugins/password/drivers/virtualmin.php (modified) (1 diff)
• program/include/rcube_user.php (modified) (1 diff)

plugins/new_user_identity/new_user_identity.php

@@ -20 +20 @@
  *  // 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
@@ -39 +35 @@
     {
         $rcmail = rcmail::get_instance();
-        
+
         if ($this->init_ldap($args['host'])) {
             $results = $this->ldap->search('*', $args['user'], TRUE);
@@ -46 +42 @@
                 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

@@ -16 +16 @@
                 <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>

plugins/password/drivers/virtualmin.php

@@ -49 +49 @@
             $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);

program/include/rcube_user.php

@@ -457 +457 @@
         $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']));