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 | 21 +++++----------------
1 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
index 41a8bb5..ab44cdc 100644
--- a/program/include/rcube_user.php
+++ b/program/include/rcube_user.php
@@ -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);
}
@@ -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)
{
@@ -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 " .
@@ -425,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;
}
--
Gitblit v1.9.1