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

Properly return boolean on enable state 

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2018-04-06 20:19:52 +02:00
parent e970e9f710
commit eae55761de
No known key found for this signature in database
GPG Key ID: 60C25B8C072916CF
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/provisioning_api/lib/Controller/AUserData.php
View File

@ -92,7 +92,7 @@ abstract class AUserData extends OCSController {
// Should be at least Admin Or SubAdmin! // Should be at least Admin Or SubAdmin!
if( $this->groupManager->isAdmin($currentLoggedInUser->getUID()) if( $this->groupManager->isAdmin($currentLoggedInUser->getUID())
|| $this->groupManager->getSubAdmin()->isUserAccessible($currentLoggedInUser, $targetUserObject)) { || $this->groupManager->getSubAdmin()->isUserAccessible($currentLoggedInUser, $targetUserObject)) {
$data['enabled'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'enabled', 'true'); $data['enabled'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'enabled', 'true') === 'true';
} else { } else {
// Check they are looking up themselves // Check they are looking up themselves
if($currentLoggedInUser->getUID() !== $targetUserObject->getUID()) { if($currentLoggedInUser->getUID() !== $targetUserObject->getUID()) {

5
lib/private/User/User.php
View File

@ -349,13 +349,12 @@ class User implements IUser {
* *
* @param bool $enabled * @param bool $enabled
*/ */
public function setEnabled($enabled) { public function setEnabled(bool $enabled = true) {
$oldStatus = $this->isEnabled(); $oldStatus = $this->isEnabled();
$this->enabled = $enabled; $this->enabled = $enabled;
$enabled = $enabled ? 'true' : 'false';
if ($oldStatus !== $this->enabled) { if ($oldStatus !== $this->enabled) {
$this->triggerChange('enabled', $enabled); $this->triggerChange('enabled', $enabled);
$this->config->setUserValue($this->uid, 'core', 'enabled', $enabled); $this->config->setUserValue($this->uid, 'core', 'enabled', $enabled ? 'true' : 'false');
} }
} }

2
lib/public/IUser.php
View File

@ -146,7 +146,7 @@ interface IUser {
* @param bool $enabled * @param bool $enabled
* @since 8.0.0 * @since 8.0.0
*/ */
public function setEnabled($enabled); public function setEnabled(bool $enabled = true);
/** /**
* get the users email address * get the users email address