From 6ddb16d181e285d4f0ef0ef55bdd0ba787f1b583 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sat, 17 Nov 2012 10:24:09 -0500
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
program/include/rcube_user.php | 142 ++++++++++++++++++++++++++++++----------------
1 files changed, 92 insertions(+), 50 deletions(-)
diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
index 7a00c21..5a8e900 100644
--- a/program/include/rcube_user.php
+++ b/program/include/rcube_user.php
@@ -5,7 +5,7 @@
| program/include/rcube_user.inc |
| |
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2005-2010, The Roundcube Dev Team |
+ | Copyright (C) 2005-2012, The Roundcube Dev Team |
| |
| Licensed under the GNU General Public License version 3 or |
| any later version with exceptions for skins & plugins. |
@@ -17,18 +17,16 @@
| |
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+ | Author: Aleksander Machniak <alec@alec.pl> |
+-----------------------------------------------------------------------+
-
- $Id$
-
*/
/**
* Class representing a system user
*
- * @package Core
- * @author Thomas Bruederli <roundcube@gmail.com>
+ * @package Framework
+ * @subpackage Core
*/
class rcube_user
{
@@ -39,7 +37,7 @@
/**
* Holds database connection.
*
- * @var rcube_mdb2
+ * @var rcube_db
*/
private $db;
@@ -49,6 +47,13 @@
* @var rcube
*/
private $rc;
+
+ /**
+ * Internal identities cache
+ *
+ * @var array
+ */
+ private $identities = array();
const SEARCH_ADDRESSBOOK = 1;
const SEARCH_MAIL = 2;
@@ -216,8 +221,14 @@
*/
function get_identity($id = null)
{
- $result = $this->list_identities($id ? sprintf('AND identity_id = %d', $id) : '');
- return $result[0];
+ $id = (int)$id;
+ // cache identities for better performance
+ if (!array_key_exists($id, $this->identities)) {
+ $result = $this->list_identities($id ? 'AND identity_id = ' . $id : '');
+ $this->identities[$id] = $result[0];
+ }
+
+ return $this->identities[$id];
}
@@ -276,6 +287,8 @@
call_user_func_array(array($this->db, 'query'),
array_merge(array($sql), $query_params));
+ $this->identities = array();
+
return $this->db->affected_rows();
}
@@ -307,6 +320,8 @@
call_user_func_array(array($this->db, 'query'),
array_merge(array($sql), $insert_values));
+
+ $this->identities = array();
return $this->db->insert_id('identities');
}
@@ -342,6 +357,8 @@
$this->ID,
$iid);
+ $this->identities = array();
+
return $this->db->affected_rows();
}
@@ -362,6 +379,8 @@
" AND del <> 1",
$this->ID,
$iid);
+
+ unset($this->identities[0]);
}
}
@@ -400,15 +419,22 @@
*/
static function query($user, $host)
{
- $dbh = rcube::get_instance()->get_dbh();
+ $dbh = rcube::get_instance()->get_dbh();
+ $config = rcube::get_instance()->config;
// query for matching user name
- $query = "SELECT * FROM ".$dbh->table_name('users')." WHERE mail_host = ? AND %s = ?";
- $sql_result = $dbh->query(sprintf($query, 'username'), $host, $user);
+ $sql_result = $dbh->query("SELECT * FROM " . $dbh->table_name('users')
+ ." WHERE mail_host = ? AND username = ?", $host, $user);
- // query for matching alias
- if (!($sql_arr = $dbh->fetch_assoc($sql_result))) {
- $sql_result = $dbh->query(sprintf($query, 'alias'), $host, $user);
+ $sql_arr = $dbh->fetch_assoc($sql_result);
+
+ // username not found, try aliases from identities
+ if (empty($sql_arr) && $config->get('user_aliases') && strpos($user, '@')) {
+ $sql_result = $dbh->limitquery("SELECT u.*"
+ ." FROM " . $dbh->table_name('users') . " u"
+ ." JOIN " . $dbh->table_name('identities') . " i ON (i.user_id = u.user_id)"
+ ." WHERE email = ? AND del <> 1", 0, 1, $user);
+
$sql_arr = $dbh->fetch_assoc($sql_result);
}
@@ -431,74 +457,90 @@
{
$user_name = '';
$user_email = '';
- $rcube = rcube::get_instance();
+ $rcube = rcube::get_instance();
+ $dbh = $rcube->get_dbh();
// 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]['email'] : $email_list[0];
}
- $data = $rcube->plugins->exec_hook('user_create',
- array('user'=>$user, 'user_name'=>$user_name, 'user_email'=>$user_email, 'host'=>$host));
+ $data = $rcube->plugins->exec_hook('user_create', array(
+ 'host' => $host,
+ 'user' => $user,
+ 'user_name' => $user_name,
+ 'user_email' => $user_email,
+ 'email_list' => $email_list,
+ 'language' => $_SESSION['language'],
+ ));
// plugin aborted this operation
- if ($data['abort'])
+ if ($data['abort']) {
return false;
-
- $user_name = $data['user_name'];
- $user_email = $data['user_email'];
-
- $dbh = $rcube->get_dbh();
+ }
$dbh->query(
"INSERT INTO ".$dbh->table_name('users').
- " (created, last_login, username, mail_host, alias, 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']));
+ " (created, last_login, username, mail_host, language)".
+ " VALUES (".$dbh->now().", ".$dbh->now().", ?, ?, ?)",
+ strip_newlines($data['user']),
+ strip_newlines($data['host']),
+ strip_newlines($data['language']));
if ($user_id = $dbh->insert_id('users')) {
// create rcube_user instance to make plugin hooks work
- $user_instance = new rcube_user($user_id);
- $rcube->user = $user_instance;
+ $user_instance = new rcube_user($user_id, array(
+ 'user_id' => $user_id,
+ 'username' => $data['user'],
+ 'mail_host' => $data['host'],
+ 'language' => $data['language'],
+ ));
+ $rcube->user = $user_instance;
+ $mail_domain = $rcube->config->mail_domain($data['host']);
+ $user_name = $data['user_name'];
+ $user_email = $data['user_email'];
+ $email_list = $data['email_list'];
- $mail_domain = $rcube->config->mail_domain($host);
-
- if ($user_email == '') {
- $user_email = strpos($user, '@') ? $user : sprintf('%s@%s', $user, $mail_domain);
- }
- if ($user_name == '') {
- $user_name = $user != $user_email ? $user : '';
- }
-
- if (empty($email_list))
+ if (empty($email_list)) {
+ if (empty($user_email)) {
+ $user_email = strpos($data['user'], '@') ? $user : sprintf('%s@%s', $data['user'], $mail_domain);
+ }
$email_list[] = strip_newlines($user_email);
+ }
// identities_level check
- else if (count($email_list) > 1 && $rcube->config->get('identities_level', 0) > 1)
+ else if (count($email_list) > 1 && $rcube->config->get('identities_level', 0) > 1) {
$email_list = array($email_list[0]);
+ }
+
+ if (empty($user_name)) {
+ $user_name = $data['user'];
+ }
// create new identities records
$standard = 1;
foreach ($email_list as $row) {
- $record = array();
+ $record = array();
if (is_array($row)) {
- $record = $row;
+ if (empty($row['email'])) {
+ continue;
+ }
+ $record = $row;
}
else {
$record['email'] = $row;
}
- if (empty($record['name']))
- $record['name'] = $user_name;
- $record['name'] = strip_newlines($record['name']);
- $record['user_id'] = $user_id;
+ if (empty($record['name'])) {
+ $record['name'] = $user_name != $record['email'] ? $user_name : '';
+ }
+
+ $record['name'] = strip_newlines($record['name']);
+ $record['user_id'] = $user_id;
$record['standard'] = $standard;
$plugin = $rcube->plugins->exec_hook('identity_create',
- array('login' => true, 'record' => $record));
+ array('login' => true, 'record' => $record));
if (!$plugin['abort'] && $plugin['record']['email']) {
$rcube->user->insert_identity($plugin['record']);
--
Gitblit v1.9.1