From b79cc545ec020f7dd4bd83dcd06af3cf2b1fcaff Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 28 Aug 2012 05:20:20 -0400
Subject: [PATCH] Improvements/fixes for Larry skin
---
program/include/rcube_user.php | 71 ++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
index 8042674..29eb0f2 100644
--- a/program/include/rcube_user.php
+++ b/program/include/rcube_user.php
@@ -18,9 +18,6 @@
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
-
- $Id$
-
*/
@@ -39,14 +36,14 @@
/**
* Holds database connection.
*
- * @var rcube_mdb2
+ * @var rcube_db
*/
private $db;
/**
- * rcmail object.
+ * Framework object.
*
- * @var rcmail
+ * @var rcube
*/
private $rc;
@@ -61,7 +58,7 @@
*/
function __construct($id = null, $sql_arr = null)
{
- $this->rc = rcmail::get_instance();
+ $this->rc = rcube::get_instance();
$this->db = $this->rc->get_dbh();
if ($id && !$sql_arr) {
@@ -400,15 +397,22 @@
*/
static function query($user, $host)
{
- $dbh = rcmail::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,15 +435,15 @@
{
$user_name = '';
$user_email = '';
- $rcmail = rcmail::get_instance();
+ $rcube = rcube::get_instance();
// 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 = $rcmail->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('user'=>$user, 'user_name'=>$user_name, 'user_email'=>$user_email, 'host'=>$host));
// plugin aborted this operation
if ($data['abort'])
@@ -448,23 +452,22 @@
$user_name = $data['user_name'];
$user_email = $data['user_email'];
- $dbh = $rcmail->get_dbh();
+ $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().", ?, ?, ?, ?)",
+ " (created, last_login, username, mail_host, 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']));
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;
+ $rcube->user = $user_instance;
- $mail_domain = $rcmail->config->mail_domain($host);
+ $mail_domain = $rcube->config->mail_domain($host);
if ($user_email == '') {
$user_email = strpos($user, '@') ? $user : sprintf('%s@%s', $user, $mail_domain);
@@ -476,32 +479,32 @@
if (empty($email_list))
$email_list[] = strip_newlines($user_email);
// identities_level check
- else if (count($email_list) > 1 && $rcmail->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]);
// create new identities records
$standard = 1;
foreach ($email_list as $row) {
- $record = array();
+ $record = array();
if (is_array($row)) {
- $record = $row;
+ $record = $row;
}
else {
$record['email'] = $row;
}
- if (empty($record['name']))
- $record['name'] = $user_name;
+ if (empty($record['name']))
+ $record['name'] = $user_name;
$record['name'] = strip_newlines($record['name']);
$record['user_id'] = $user_id;
$record['standard'] = $standard;
- $plugin = $rcmail->plugins->exec_hook('identity_create',
- array('login' => true, 'record' => $record));
+ $plugin = $rcube->plugins->exec_hook('identity_create',
+ array('login' => true, 'record' => $record));
if (!$plugin['abort'] && $plugin['record']['email']) {
- $rcmail->user->insert_identity($plugin['record']);
+ $rcube->user->insert_identity($plugin['record']);
}
$standard = 0;
}
@@ -527,8 +530,8 @@
*/
static function email2user($email)
{
- $rcmail = rcmail::get_instance();
- $plugin = $rcmail->plugins->exec_hook('email2user',
+ $rcube = rcube::get_instance();
+ $plugin = $rcube->plugins->exec_hook('email2user',
array('email' => $email, 'user' => NULL));
return $plugin['user'];
@@ -545,8 +548,8 @@
*/
static function user2email($user, $first=true, $extended=false)
{
- $rcmail = rcmail::get_instance();
- $plugin = $rcmail->plugins->exec_hook('user2email',
+ $rcube = rcube::get_instance();
+ $plugin = $rcube->plugins->exec_hook('user2email',
array('email' => NULL, 'user' => $user,
'first' => $first, 'extended' => $extended));
--
Gitblit v1.9.1