Merge pull request #23906 from nextcloud/techdebt/noid/simplify-can-change-user-pasword
Simplify the check if admin can change password based on encryption status
This commit is contained in:
commit
f657f0c455
|
@ -318,10 +318,8 @@ class UsersController extends Controller {
|
||||||
$noUserSpecificEncryptionKeys = true;
|
$noUserSpecificEncryptionKeys = true;
|
||||||
$isEncryptionModuleLoaded = false;
|
$isEncryptionModuleLoaded = false;
|
||||||
}
|
}
|
||||||
|
$canChangePassword = ($isEncryptionModuleLoaded && $noUserSpecificEncryptionKeys)
|
||||||
$canChangePassword = ($isEncryptionEnabled && $isEncryptionModuleLoaded && $noUserSpecificEncryptionKeys)
|
|| (!$isEncryptionModuleLoaded && !$isEncryptionEnabled);
|
||||||
|| (!$isEncryptionEnabled && !$isEncryptionModuleLoaded)
|
|
||||||
|| (!$isEncryptionEnabled && $isEncryptionModuleLoaded && $noUserSpecificEncryptionKeys);
|
|
||||||
|
|
||||||
return $canChangePassword;
|
return $canChangePassword;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue