From 7c9d922b96f9a88b350d6e07f5bde84ccc40f9b0 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 02 Mar 2010 16:27:53 -0500
Subject: [PATCH] New recent check based on UIDs
---
program/include/rcube_user.php | 61 +++++++++++++-----------------
1 files changed, 27 insertions(+), 34 deletions(-)
diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
index 8c77a03..ab44cdc 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$
*/
@@ -47,7 +47,7 @@
if ($id && !$sql_arr)
{
- $sql_result = $this->db->query("SELECT * FROM ".get_table_name('users')." WHERE user_id=?", $id);
+ $sql_result = $this->db->query("SELECT * FROM ".get_table_name('users')." WHERE user_id=?", $id);
$sql_arr = $this->db->fetch_assoc($sql_result);
}
@@ -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;
}
@@ -154,8 +154,7 @@
// get contacts from DB
$sql_result = $this->db->query(
"SELECT * FROM ".get_table_name('identities')."
- WHERE del<>1
- AND user_id=?
+ WHERE del<>1 AND user_id=?
$sql_add
ORDER BY ".$this->db->quoteIdentifier('standard')." DESC, name ASC, identity_id ASC",
$this->ID);
@@ -215,6 +214,8 @@
if (!$this->ID)
return false;
+ unset($data['user_id']);
+
$insert_cols = $insert_values = array();
foreach ((array)$data as $col => $value)
{
@@ -231,7 +232,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');
}
@@ -244,9 +245,6 @@
function delete_identity($iid)
{
if (!$this->ID)
- return false;
-
- if (!$this->ID || $this->ID == '')
return false;
$sql_result = $this->db->query("SELECT count(*) AS ident_count FROM " .
@@ -359,21 +357,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')."
@@ -384,8 +383,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=='')
@@ -396,10 +399,9 @@
}
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
@@ -421,20 +423,11 @@
'name' => strip_newlines($name),
'email' => $email,
'standard' => $standard,
- 'signature' => '',
),
));
if (!$plugin['abort'] && $plugin['record']['email']) {
- $dbh->query(
- "INSERT INTO ".get_table_name('identities')."
- (user_id, del, standard, name, email, signature)
- VALUES (?, 0, ?, ?, ?, ?)",
- $user_id,
- $plugin['record']['standard'],
- $plugin['record']['name'] != NULL ? $plugin['record']['name'] : '',
- $plugin['record']['email'],
- $plugin['record']['signature']);
+ $rcmail->user->insert_identity($plugin['record']);
}
$standard = 0;
}
@@ -449,7 +442,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