mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cache instances of \OC\User\User

This commit is contained in:
Robin Appelman 2013-05-31 17:31:27 +02:00
parent 542bcf9156
commit a8fb803319
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/user/manager.php
View File

@ -30,6 +30,8 @@ class Manager extends PublicEmitter {
*/ */
private $backends = array(); private $backends = array();
private $cachedUsers = array();
/** /**
* @param \OC_User_Backend $backend * @param \OC_User_Backend $backend
*/ */
@ -55,9 +57,13 @@ class Manager extends PublicEmitter {
* @return \OC\User\User * @return \OC\User\User
*/ */
public function get($uid) { public function get($uid) {
if (isset($this->cachedUsers[$uid])) {
return $this->cachedUsers[$uid];
}
foreach ($this->backends as $backend) { foreach ($this->backends as $backend) {
if ($backend->userExists($uid)) { if ($backend->userExists($uid)) {
return new User($uid, $backend, $this); $this->cachedUsers[$uid] = new User($uid, $backend, $this);
return $this->cachedUsers[$uid];
} }
} }
return null; return null;
@ -90,7 +96,7 @@ class Manager extends PublicEmitter {
$backendUsers = $backend->getUsers($pattern, $limit, $offset); $backendUsers = $backend->getUsers($pattern, $limit, $offset);
if (is_array($backendUsers)) { if (is_array($backendUsers)) {
foreach ($backendUsers as $uid) { foreach ($backendUsers as $uid) {
$users[] = new User($uid, $backend, $this); $users[] = $this->get($uid);
if (!is_null($limit)) { if (!is_null($limit)) {
$limit--; $limit--;
} }
@ -126,7 +132,7 @@ class Manager extends PublicEmitter {
$backendUsers = $backend->getDisplayNames($pattern, $limit, $offset); $backendUsers = $backend->getDisplayNames($pattern, $limit, $offset);
if (is_array($backendUsers)) { if (is_array($backendUsers)) {
foreach ($backendUsers as $uid => $displayName) { foreach ($backendUsers as $uid => $displayName) {
$users[] = new User($uid, $backend, $this); $users[] = $this->get($uid);
if (!is_null($limit)) { if (!is_null($limit)) {
$limit--; $limit--;
} }
@ -159,7 +165,7 @@ class Manager extends PublicEmitter {
// Allowed are: "a-z", "A-Z", "0-9" and "_.@-" // Allowed are: "a-z", "A-Z", "0-9" and "_.@-"
if (preg_match('/[^a-zA-Z0-9 _\.@\-]/', $uid)) { if (preg_match('/[^a-zA-Z0-9 _\.@\-]/', $uid)) {
throw new \Exception('Only the following characters are allowed in a username:' throw new \Exception('Only the following characters are allowed in a username:'
. ' "a-z", "A-Z", "0-9", and "_.@-"'); . ' "a-z", "A-Z", "0-9", and "_.@-"');
} }
// No empty username // No empty username
if (trim($uid) == '') { if (trim($uid) == '') {
@ -179,7 +185,7 @@ class Manager extends PublicEmitter {
foreach ($this->backends as $backend) { foreach ($this->backends as $backend) {
if ($backend->implementsActions(\OC_USER_BACKEND_CREATE_USER)) { if ($backend->implementsActions(\OC_USER_BACKEND_CREATE_USER)) {
$backend->createUser($uid, $password); $backend->createUser($uid, $password);
$user = new User($uid, $backend, $this); $user = $this->get($uid);
$this->emit('\OC\User', 'postCreateUser', array($user, $password)); $this->emit('\OC\User', 'postCreateUser', array($user, $password));
return $user; return $user;
} }