From 191354ca7a5e6ea26354b6aa60974445bd6fa340 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 18 Jun 2009 08:01:19 -0400
Subject: [PATCH] - fix use_only_cookies typo (#1485929)
---
program/include/rcube_user.php | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
index fd25660..fb44cb0 100644
--- a/program/include/rcube_user.php
+++ b/program/include/rcube_user.php
@@ -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];
}
@@ -160,7 +160,12 @@
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;
}
@@ -366,8 +371,8 @@
// 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];
+ if ($email_list = self::user2email($user, false, true))
+ $user_email = is_array($email_list[0]) ? $email_list[0][0] : $email_list[0];
}
$dbh->query(
@@ -399,22 +404,31 @@
// create new identities records
$standard = 1;
- foreach ($email_list as $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('record' => array(
'login' => true,
'user_id' => $user_id,
- 'name' => strip_newlines($user_name),
+ 'name' => strip_newlines($name),
'email' => $email,
'standard' => $standard)));
- if (!$plugin['abort'] && $plugin['record']['name'] && $plugin['record']['email']) {
+ if (!$plugin['abort'] && $plugin['record']['email']) {
$dbh->query(
"INSERT INTO ".get_table_name('identities')."
(user_id, del, standard, name, email)
VALUES (?, 0, ?, ?, ?)",
$user_id,
$plugin['record']['standard'],
- $plugin['record']['name'],
+ $plugin['record']['name'] != NULL ? $plugin['record']['name'] : '',
$plugin['record']['email']);
}
$standard = 0;
@@ -461,9 +475,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();
@@ -474,7 +489,7 @@
$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];
}
--
Gitblit v1.9.1