From b545d3e8388d18a64d50b6f7879804cf4e7812ca Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 18 Feb 2010 13:01:53 -0500
Subject: [PATCH] Fix loading of plugin configs: user prefs will always survive (#1486368)
---
program/include/rcube_user.php | 90 ++++++++++++++++++++++++++-------------------
1 files changed, 52 insertions(+), 38 deletions(-)
diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
index c84652b..41a8bb5 100644
--- a/program/include/rcube_user.php
+++ b/program/include/rcube_user.php
@@ -16,7 +16,7 @@
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
- $Id: rcube_user.inc 933 2007-11-29 14:17:32Z thomasb $
+ $Id$
*/
@@ -123,7 +123,7 @@
$this->language = $_SESSION['language'];
if ($this->db->affected_rows()) {
- $config->merge($a_user_prefs);
+ $config->set_user_prefs($a_user_prefs);
return true;
}
@@ -135,12 +135,12 @@
* Get default identity of this user
*
* @param int Identity ID. If empty, the default identity is returned
- * @return array Hash array with all cols of the
+ * @return array Hash array with all cols of the identity record
*/
function get_identity($id = null)
{
- $sql_result = $this->list_identities($id ? sprintf('AND identity_id=%d', $id) : '');
- return $this->db->fetch_assoc($sql_result);
+ $result = $this->list_identities($id ? sprintf('AND identity_id=%d', $id) : '');
+ return $result[0];
}
@@ -160,7 +160,12 @@
ORDER BY ".$this->db->quoteIdentifier('standard')." DESC, name ASC, identity_id ASC",
$this->ID);
- return $sql_result;
+ $result = array();
+ while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
+ $result[] = $sql_arr;
+ }
+
+ return $result;
}
@@ -226,7 +231,7 @@
call_user_func_array(array($this->db, 'query'),
array_merge(array($sql), $insert_values));
- return $this->db->insert_id(get_sequence_name('identities'));
+ return $this->db->insert_id('identities');
}
@@ -354,21 +359,22 @@
$user_email = '';
$rcmail = rcmail::get_instance();
- $data = $rcmail->plugins->exec_hook('create_user', array('user'=>$user, 'user_name'=>$user_name, 'user_email'=>$user_email));
- $user_name = $data['user_name'];
- $user_email = $data['user_email'];
-
+ // try to resolve user in virtuser table and file
+ if ($email_list = self::user2email($user, false, true)) {
+ $user_email = is_array($email_list[0]) ? $email_list[0][0] : $email_list[0];
+ }
+
+ $data = $rcmail->plugins->exec_hook('create_user',
+ array('user'=>$user, 'user_name'=>$user_name, 'user_email'=>$user_email));
+
// plugin aborted this operation
if ($data['abort'])
return false;
- $dbh = $rcmail->get_dbh();
+ $user_name = $data['user_name'];
+ $user_email = $data['user_email'];
- // try to resolve user in virtuser table and file
- if ($user_email != '' && !strpos($user, '@')) {
- if ($email_list = self::user2email($user, false, true))
- $user_email = is_array($email_list[0]) ? $email_list[0][0] : $email_list[0];
- }
+ $dbh = $rcmail->get_dbh();
$dbh->query(
"INSERT INTO ".get_table_name('users')."
@@ -379,8 +385,12 @@
strip_newlines($data['alias'] ? $data['alias'] : $user_email),
$_SESSION['language']);
- if ($user_id = $dbh->insert_id(get_sequence_name('users')))
+ if ($user_id = $dbh->insert_id('users'))
{
+ // create rcube_user instance to make plugin hooks work
+ $user_instance = new rcube_user($user_id);
+ $rcmail->user = $user_instance;
+
$mail_domain = $rcmail->config->mail_domain($host);
if ($user_email=='')
@@ -391,40 +401,44 @@
}
if (empty($email_list))
- $email_list[] = strip_newlines($user_email);
-
+ $email_list[] = strip_newlines($user_email);
// identities_level check
- if (count($email_list) > 1 && $rcmail->config->get('identities_level', 0) > 1)
+ else if (count($email_list) > 1 && $rcmail->config->get('identities_level', 0) > 1)
$email_list = array($email_list[0]);
// create new identities records
$standard = 1;
foreach ($email_list as $row) {
-
if (is_array($row)) {
$email = $row[0];
$name = $row[1] ? $row[1] : $user_name;
- } else {
- $email = $row;
- $name = $user_name;
- }
-
- $plugin = $rcmail->plugins->exec_hook('create_identity', array('record' => array(
+ }
+ else {
+ $email = $row;
+ $name = $user_name;
+ }
+
+ $plugin = $rcmail->plugins->exec_hook('create_identity', array(
'login' => true,
- 'user_id' => $user_id,
- 'name' => strip_newlines($name),
- 'email' => $email,
- 'standard' => $standard)));
+ 'record' => array(
+ 'user_id' => $user_id,
+ 'name' => strip_newlines($name),
+ 'email' => $email,
+ 'standard' => $standard,
+ 'signature' => '',
+ ),
+ ));
- if (!$plugin['abort'] && $plugin['record']['name'] && $plugin['record']['email']) {
+ if (!$plugin['abort'] && $plugin['record']['email']) {
$dbh->query(
"INSERT INTO ".get_table_name('identities')."
- (user_id, del, standard, name, email)
- VALUES (?, 0, ?, ?, ?)",
+ (user_id, del, standard, name, email, signature)
+ VALUES (?, 0, ?, ?, ?, ?)",
$user_id,
$plugin['record']['standard'],
- $plugin['record']['name'],
- $plugin['record']['email']);
+ $plugin['record']['name'] != NULL ? $plugin['record']['name'] : '',
+ $plugin['record']['email'],
+ $plugin['record']['signature']);
}
$standard = 0;
}
@@ -439,7 +453,7 @@
'message' => "Failed to create new user"), true, false);
}
- return $user_id ? new rcube_user($user_id) : false;
+ return $user_id ? $user_instance : false;
}
--
Gitblit v1.9.1