From a3644638aaf0418598196a870204e0b632a4c8ad Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 17 Apr 2015 06:28:40 -0400
Subject: [PATCH] Allow preference sections to define CSS class names
---
program/lib/Roundcube/rcube_user.php | 87 ++++++++++++++++++++++++++++++-------------
1 files changed, 61 insertions(+), 26 deletions(-)
diff --git a/program/lib/Roundcube/rcube_user.php b/program/lib/Roundcube/rcube_user.php
index b2110df..8ed34fc 100644
--- a/program/lib/Roundcube/rcube_user.php
+++ b/program/lib/Roundcube/rcube_user.php
@@ -29,6 +29,7 @@
public $ID;
public $data;
public $language;
+ public $prefs;
/**
* Holds database connection.
@@ -50,6 +51,14 @@
* @var array
*/
private $identities = array();
+
+ /**
+ * Internal emails cache
+ *
+ * @var array
+ */
+ private $emails;
+
const SEARCH_ADDRESSBOOK = 1;
const SEARCH_MAIL = 2;
@@ -78,7 +87,6 @@
$this->language = $sql_arr['language'];
}
}
-
/**
* Build a user name string (as e-mail address)
@@ -118,7 +126,6 @@
return false;
}
-
/**
* Get the preferences saved for this user
*
@@ -126,10 +133,14 @@
*/
function get_prefs()
{
- $prefs = array();
+ if (isset($this->prefs)) {
+ return $this->prefs;
+ }
+
+ $this->prefs = array();
if (!empty($this->language))
- $prefs['language'] = $this->language;
+ $this->prefs['language'] = $this->language;
if ($this->ID) {
// Preferences from session (write-master is unavailable)
@@ -147,13 +158,12 @@
}
if ($this->data['preferences']) {
- $prefs += (array)unserialize($this->data['preferences']);
+ $this->prefs += (array)unserialize($this->data['preferences']);
}
}
- return $prefs;
+ return $this->prefs;
}
-
/**
* Write the given user prefs to the user's record
@@ -178,7 +188,7 @@
$config = $this->rc->config;
// merge (partial) prefs array with existing settings
- $save_prefs = $a_user_prefs + $old_prefs;
+ $this->prefs = $save_prefs = $a_user_prefs + $old_prefs;
unset($save_prefs['language']);
// don't save prefs with default values if they haven't been changed yet
@@ -224,12 +234,46 @@
}
/**
- * Generate a unique hash to identify this user which
+ * Generate a unique hash to identify this user whith
*/
function get_hash()
{
- $key = substr($this->rc->config->get('des_key'), 1, 4);
- return md5($this->data['user_id'] . $key . $this->data['username'] . '@' . $this->data['mail_host']);
+ $prefs = $this->get_prefs();
+
+ // generate a random hash and store it in user prefs
+ if (empty($prefs['client_hash'])) {
+ $prefs['client_hash'] = md5($this->data['username'] . mt_rand() . $this->data['mail_host']);
+ $this->save_prefs(array('client_hash' => $prefs['client_hash']));
+ }
+
+ return $prefs['client_hash'];
+ }
+
+ /**
+ * Return a list of all user emails (from identities)
+ *
+ * @param bool Return only default identity
+ *
+ * @return array List of emails (identity_id, name, email)
+ */
+ function list_emails($default = false)
+ {
+ if ($this->emails === null) {
+ $this->emails = array();
+
+ $sql_result = $this->db->query(
+ "SELECT `identity_id`, `name`, `email`"
+ ." FROM " . $this->db->table_name('identities', true)
+ ." WHERE `user_id` = ? AND `del` <> 1"
+ ." ORDER BY `standard` DESC, `name` ASC, `email` ASC, `identity_id` ASC",
+ $this->ID);
+
+ while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
+ $this->emails[] = $sql_arr;
+ }
+ }
+
+ return $default ? $this->emails[0] : $this->emails;
}
/**
@@ -249,7 +293,6 @@
return $this->identities[$id];
}
-
/**
* Return a list of all identities linked with this user
@@ -286,7 +329,6 @@
return $result;
}
-
/**
* Update a specific identity record
*
@@ -317,11 +359,12 @@
call_user_func_array(array($this->db, 'query'),
array_merge(array($sql), $query_params));
+ // clear the cache
$this->identities = array();
+ $this->emails = null;
return $this->db->affected_rows();
}
-
/**
* Create a new identity record linked with this user
@@ -351,11 +394,12 @@
call_user_func_array(array($this->db, 'query'),
array_merge(array($sql), $insert_values));
+ // clear the cache
$this->identities = array();
+ $this->emails = null;
return $this->db->insert_id('identities');
}
-
/**
* Mark the given identity as deleted
@@ -387,11 +431,12 @@
$this->ID,
$iid);
+ // clear the cache
$this->identities = array();
+ $this->emails = null;
return $this->db->affected_rows();
}
-
/**
* Make this identity the default one for this user
@@ -412,7 +457,6 @@
}
}
-
/**
* Update user's last_login timestamp
*/
@@ -427,7 +471,6 @@
}
}
-
/**
* Clear the saved object state
*/
@@ -436,7 +479,6 @@
$this->ID = null;
$this->data = null;
}
-
/**
* Find a user record matching the given name and host
@@ -472,7 +514,6 @@
else
return false;
}
-
/**
* Create a new user record and return a rcube_user instance
@@ -587,7 +628,6 @@
return $user_id ? $user_instance : false;
}
-
/**
* Resolve username using a virtuser plugins
*
@@ -602,7 +642,6 @@
return $plugin['user'];
}
-
/**
* Resolve e-mail address from virtuser plugins
@@ -621,7 +660,6 @@
return empty($plugin['email']) ? NULL : $plugin['email'];
}
-
/**
* Return a list of saved searches linked with this user
@@ -654,7 +692,6 @@
return $result;
}
-
/**
* Return saved search data.
@@ -690,7 +727,6 @@
return null;
}
-
/**
* Deletes given saved search record
*
@@ -711,7 +747,6 @@
return $this->db->affected_rows();
}
-
/**
* Create a new saved search record linked with this user
--
Gitblit v1.9.1