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 | 146 ++++++++++++++++++++++++++++++------------------
1 files changed, 90 insertions(+), 56 deletions(-)
diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
index b68c56c..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;
}
@@ -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];
}
@@ -154,13 +154,17 @@
// 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);
- return $sql_result;
+ $result = array();
+ while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
+ $result[] = $sql_arr;
+ }
+
+ return $result;
}
@@ -176,23 +180,24 @@
if (!$this->ID)
return false;
- $write_sql = array();
+ $query_cols = $query_params = array();
foreach ((array)$data as $col => $value)
{
- $write_sql[] = sprintf("%s=%s",
- $this->db->quoteIdentifier($col),
- $this->db->quote($value));
+ $query_cols[] = $this->db->quoteIdentifier($col) . '=?';
+ $query_params[] = $value;
}
-
- $this->db->query(
- "UPDATE ".get_table_name('identities')."
- SET ".join(', ', $write_sql)."
+ $query_params[] = $iid;
+ $query_params[] = $this->ID;
+
+ $sql = "UPDATE ".get_table_name('identities')."
+ SET ".join(', ', $query_cols)."
WHERE identity_id=?
AND user_id=?
- AND del<>1",
- $iid,
- $this->ID);
+ AND del<>1";
+
+ call_user_func_array(array($this->db, 'query'),
+ array_merge(array($sql), $query_params));
return $this->db->affected_rows();
}
@@ -209,20 +214,25 @@
if (!$this->ID)
return false;
+ unset($data['user_id']);
+
$insert_cols = $insert_values = array();
foreach ((array)$data as $col => $value)
{
$insert_cols[] = $this->db->quoteIdentifier($col);
- $insert_values[] = $this->db->quote($value);
+ $insert_values[] = $value;
}
+ $insert_cols[] = 'user_id';
+ $insert_values[] = $this->ID;
- $this->db->query(
- "INSERT INTO ".get_table_name('identities')."
- (user_id, ".join(', ', $insert_cols).")
- VALUES (?, ".join(', ', $insert_values).")",
- $this->ID);
+ $sql = "INSERT INTO ".get_table_name('identities')."
+ (".join(', ', $insert_cols).")
+ VALUES (".join(', ', array_pad(array(), sizeof($insert_values), '?')).")";
- return $this->db->insert_id(get_sequence_name('identities'));
+ call_user_func_array(array($this->db, 'query'),
+ array_merge(array($sql), $insert_values));
+
+ return $this->db->insert_id('identities');
}
@@ -235,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 " .
@@ -350,17 +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));
+ // 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;
+
$user_name = $data['user_name'];
$user_email = $data['user_email'];
$dbh = $rcmail->get_dbh();
-
- // try to resolve user in virtuser table and file
- if ($user_email != '' && !strpos($user, '@')) {
- if ($email_list = self::user2email($user, false))
- $user_email = $email_list[0];
- }
$dbh->query(
"INSERT INTO ".get_table_name('users')."
@@ -368,11 +380,15 @@
VALUES (".$dbh->now().", ".$dbh->now().", ?, ?, ?, ?)",
strip_newlines($user),
strip_newlines($host),
- strip_newlines($user_email),
+ 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=='')
@@ -383,19 +399,36 @@
}
if (empty($email_list))
- $email_list[] = strip_newlines($user_email);
+ $email_list[] = strip_newlines($user_email);
+ // identities_level check
+ else if (count($email_list) > 1 && $rcmail->config->get('identities_level', 0) > 1)
+ $email_list = array($email_list[0]);
- // also create new identity records
+ // create new identities records
$standard = 1;
- foreach ($email_list as $email) {
- $dbh->query(
- "INSERT INTO ".get_table_name('identities')."
- (user_id, del, standard, name, email)
- VALUES (?, 0, ?, ?, ?)",
- $user_id,
- $standard,
- strip_newlines($user_name),
- preg_replace('/^@/', $user . '@', $email));
+ 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(
+ 'login' => true,
+ 'record' => array(
+ 'user_id' => $user_id,
+ 'name' => strip_newlines($name),
+ 'email' => $email,
+ 'standard' => $standard,
+ ),
+ ));
+
+ if (!$plugin['abort'] && $plugin['record']['email']) {
+ $rcmail->user->insert_identity($plugin['record']);
+ }
$standard = 0;
}
}
@@ -409,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;
}
@@ -421,7 +454,7 @@
*/
static function email2user($email)
{
- $r = self::findinvirtual('^' . quotemeta($email) . '[[:space:]]');
+ $r = self::findinvirtual('/^' . preg_quote($email, '/') . '\s/');
for ($i=0; $i<count($r); $i++)
{
@@ -440,9 +473,10 @@
*
* @param string User name
* @param boolean If true returns first found entry
+ * @param boolean If true returns email as array (email and name for identity)
* @return mixed Resolved e-mail address string or array of strings
*/
- static function user2email($user, $first=true)
+ static function user2email($user, $first=true, $extended=false)
{
$result = array();
$rcmail = rcmail::get_instance();
@@ -453,13 +487,13 @@
$sql_result = $dbh->query(preg_replace('/%u/', $dbh->escapeSimple($user), $virtuser_query));
while ($sql_arr = $dbh->fetch_array($sql_result))
if (strpos($sql_arr[0], '@')) {
- $result[] = $sql_arr[0];
+ $result[] = ($extended && count($sql_arr) > 1) ? $sql_arr : $sql_arr[0];
if ($first)
return $result[0];
}
}
// File lookup
- $r = self::findinvirtual('[[:space:]]' . quotemeta($user) . '[[:space:]]*$');
+ $r = self::findinvirtual('/\s' . preg_quote($user, '/') . '\s*$/');
for ($i=0; $i<count($r); $i++)
{
$data = $r[$i];
@@ -501,7 +535,7 @@
if (empty($line) || $line{0}=='#')
continue;
- if (eregi($pattern, $line))
+ if (preg_match($pattern, $line))
$result[] = $line;
}
--
Gitblit v1.9.1