fix the config option to remove the ability for users to set their displayname
This commit is contained in:
parent
f57c38df77
commit
a6c1b3ece3
|
@ -69,10 +69,18 @@ class Server extends SimpleContainer implements IServerContainer {
|
||||||
return new Root($manager, $view, $user);
|
return new Root($manager, $view, $user);
|
||||||
});
|
});
|
||||||
$this->registerService('UserManager', function($c) {
|
$this->registerService('UserManager', function($c) {
|
||||||
return new \OC\User\Manager();
|
/**
|
||||||
|
* @var SimpleContainer $c
|
||||||
|
* @var \OC\AllConfig $config
|
||||||
|
*/
|
||||||
|
$config = $c->query('AllConfig');
|
||||||
|
return new \OC\User\Manager($config);
|
||||||
});
|
});
|
||||||
$this->registerService('UserSession', function($c) {
|
$this->registerService('UserSession', function($c) {
|
||||||
/** @var $c SimpleContainer */
|
/**
|
||||||
|
* @var SimpleContainer $c
|
||||||
|
* @var \OC\User\Manager $manager
|
||||||
|
*/
|
||||||
$manager = $c->query('UserManager');
|
$manager = $c->query('UserManager');
|
||||||
$userSession = new \OC\User\Session($manager, \OC::$session);
|
$userSession = new \OC\User\Session($manager, \OC::$session);
|
||||||
$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
|
$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
|
||||||
|
|
|
@ -35,7 +35,16 @@ class Manager extends PublicEmitter {
|
||||||
*/
|
*/
|
||||||
private $cachedUsers = array();
|
private $cachedUsers = array();
|
||||||
|
|
||||||
public function __construct() {
|
/**
|
||||||
|
* @var \OC\AllConfig $config
|
||||||
|
*/
|
||||||
|
private $config;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param \OC\AllConfig $config
|
||||||
|
*/
|
||||||
|
public function __construct($config = null) {
|
||||||
|
$this->config = $config;
|
||||||
$cachedUsers = $this->cachedUsers;
|
$cachedUsers = $this->cachedUsers;
|
||||||
$this->listen('\OC\User', 'postDelete', function ($user) use (&$cachedUsers) {
|
$this->listen('\OC\User', 'postDelete', function ($user) use (&$cachedUsers) {
|
||||||
$i = array_search($user, $cachedUsers);
|
$i = array_search($user, $cachedUsers);
|
||||||
|
@ -103,7 +112,7 @@ class Manager extends PublicEmitter {
|
||||||
if (isset($this->cachedUsers[$uid])) {
|
if (isset($this->cachedUsers[$uid])) {
|
||||||
return $this->cachedUsers[$uid];
|
return $this->cachedUsers[$uid];
|
||||||
}
|
}
|
||||||
$this->cachedUsers[$uid] = new User($uid, $backend, $this);
|
$this->cachedUsers[$uid] = new User($uid, $backend, $this, $this->config);
|
||||||
return $this->cachedUsers[$uid];
|
return $this->cachedUsers[$uid];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -141,7 +150,7 @@ class Manager extends PublicEmitter {
|
||||||
*/
|
*/
|
||||||
public function checkPassword($loginname, $password) {
|
public function checkPassword($loginname, $password) {
|
||||||
foreach ($this->backends as $backend) {
|
foreach ($this->backends as $backend) {
|
||||||
if($backend->implementsActions(\OC_USER_BACKEND_CHECK_PASSWORD)) {
|
if ($backend->implementsActions(\OC_USER_BACKEND_CHECK_PASSWORD)) {
|
||||||
$uid = $backend->checkPassword($loginname, $password);
|
$uid = $backend->checkPassword($loginname, $password);
|
||||||
if ($uid !== false) {
|
if ($uid !== false) {
|
||||||
return $this->getUserObject($uid, $backend);
|
return $this->getUserObject($uid, $backend);
|
||||||
|
@ -234,7 +243,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) == '') {
|
||||||
|
|
|
@ -42,12 +42,18 @@ class User {
|
||||||
*/
|
*/
|
||||||
private $home;
|
private $home;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \OC\AllConfig $config
|
||||||
|
*/
|
||||||
|
private $config;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param string $uid
|
* @param string $uid
|
||||||
* @param \OC_User_Backend $backend
|
* @param \OC_User_Backend $backend
|
||||||
* @param Emitter $emitter
|
* @param \OC\Hooks\Emitter $emitter
|
||||||
|
* @param \OC\AllConfig $config
|
||||||
*/
|
*/
|
||||||
public function __construct($uid, $backend, $emitter = null) {
|
public function __construct($uid, $backend, $emitter = null, $config = null) {
|
||||||
$this->uid = $uid;
|
$this->uid = $uid;
|
||||||
if ($backend and $backend->implementsActions(OC_USER_BACKEND_GET_DISPLAYNAME)) {
|
if ($backend and $backend->implementsActions(OC_USER_BACKEND_GET_DISPLAYNAME)) {
|
||||||
$this->displayName = $backend->getDisplayName($uid);
|
$this->displayName = $backend->getDisplayName($uid);
|
||||||
|
@ -58,6 +64,7 @@ class User {
|
||||||
$this->emitter = $emitter;
|
$this->emitter = $emitter;
|
||||||
$enabled = \OC_Preferences::getValue($uid, 'core', 'enabled', 'true'); //TODO: DI for OC_Preferences
|
$enabled = \OC_Preferences::getValue($uid, 'core', 'enabled', 'true'); //TODO: DI for OC_Preferences
|
||||||
$this->enabled = ($enabled === 'true');
|
$this->enabled = ($enabled === 'true');
|
||||||
|
$this->config = $config;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -175,7 +182,11 @@ class User {
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function canChangeDisplayName() {
|
public function canChangeDisplayName() {
|
||||||
return $this->backend->implementsActions(\OC_USER_BACKEND_SET_DISPLAYNAME);
|
if ($this->config and $this->config->getSystemValue('allow_user_to_change_display_name') === false) {
|
||||||
|
return false;
|
||||||
|
} else {
|
||||||
|
return $this->backend->implementsActions(\OC_USER_BACKEND_SET_DISPLAYNAME);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue