From 2f8b1036da42ec3d15a51c6b17a473f9f4df71d3 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Sat, 07 Feb 2015 12:33:24 -0500
Subject: [PATCH] Bump version and copyright year
---
program/lib/Roundcube/rcube_user.php | 61 +++++++++++++++++++++---------
1 files changed, 42 insertions(+), 19 deletions(-)
diff --git a/program/lib/Roundcube/rcube_user.php b/program/lib/Roundcube/rcube_user.php
index b63cabe..77c58dd 100644
--- a/program/lib/Roundcube/rcube_user.php
+++ b/program/lib/Roundcube/rcube_user.php
@@ -51,6 +51,14 @@
*/
private $identities = array();
+ /**
+ * Internal emails cache
+ *
+ * @var array
+ */
+ private $emails;
+
+
const SEARCH_ADDRESSBOOK = 1;
const SEARCH_MAIL = 2;
@@ -78,7 +86,6 @@
$this->language = $sql_arr['language'];
}
}
-
/**
* Build a user name string (as e-mail address)
@@ -118,7 +125,6 @@
return false;
}
-
/**
* Get the preferences saved for this user
*
@@ -153,7 +159,6 @@
return $prefs;
}
-
/**
* Write the given user prefs to the user's record
@@ -233,6 +238,33 @@
}
/**
+ * 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;
+ }
+
+ /**
* Get default identity of this user
*
* @param int $id Identity ID. If empty, the default identity is returned
@@ -249,7 +281,6 @@
return $this->identities[$id];
}
-
/**
* Return a list of all identities linked with this user
@@ -286,7 +317,6 @@
return $result;
}
-
/**
* Update a specific identity record
*
@@ -317,11 +347,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
@@ -341,7 +372,7 @@
$insert_cols[] = $this->db->quote_identifier($col);
$insert_values[] = $value;
}
- $insert_cols[] = 'user_id';
+ $insert_cols[] = $this->db->quote_identifier('user_id');
$insert_values[] = $this->ID;
$sql = "INSERT INTO ".$this->db->table_name('identities', true).
@@ -351,11 +382,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 +419,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 +445,6 @@
}
}
-
/**
* Update user's last_login timestamp
*/
@@ -427,7 +459,6 @@
}
}
-
/**
* Clear the saved object state
*/
@@ -436,7 +467,6 @@
$this->ID = null;
$this->data = null;
}
-
/**
* Find a user record matching the given name and host
@@ -472,7 +502,6 @@
else
return false;
}
-
/**
* Create a new user record and return a rcube_user instance
@@ -587,7 +616,6 @@
return $user_id ? $user_instance : false;
}
-
/**
* Resolve username using a virtuser plugins
*
@@ -602,7 +630,6 @@
return $plugin['user'];
}
-
/**
* Resolve e-mail address from virtuser plugins
@@ -621,7 +648,6 @@
return empty($plugin['email']) ? NULL : $plugin['email'];
}
-
/**
* Return a list of saved searches linked with this user
@@ -654,7 +680,6 @@
return $result;
}
-
/**
* Return saved search data.
@@ -690,7 +715,6 @@
return null;
}
-
/**
* Deletes given saved search record
*
@@ -711,7 +735,6 @@
return $this->db->affected_rows();
}
-
/**
* Create a new saved search record linked with this user
--
Gitblit v1.9.1