]> source.dussan.org Git - nextcloud-server.git/commitdiff
Simplify the check if admin can change password based on encryption status 23906/head
authorMorris Jobke <hey@morrisjobke.de>
Thu, 5 Nov 2020 12:21:19 +0000 (13:21 +0100)
committerMorris Jobke <hey@morrisjobke.de>
Thu, 5 Nov 2020 21:20:34 +0000 (22:20 +0100)
Found by Psalm:
```
/home/runner/work/server/server/apps/settings/lib/Controller/UsersController.php:324:8:error - RedundantCondition: Type true for $isEncryptionModuleLoaded is never falsy
```

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
apps/settings/lib/Controller/UsersController.php

index b9d20f5c0dea727bd74c89e563bd25f558a6bb5d..cad21c5f3b34f1256206f5f276688e1347ba7250 100644 (file)
@@ -318,10 +318,8 @@ class UsersController extends Controller {
                        $noUserSpecificEncryptionKeys = true;
                        $isEncryptionModuleLoaded = false;
                }
-
-               $canChangePassword = ($isEncryptionEnabled && $isEncryptionModuleLoaded && $noUserSpecificEncryptionKeys)
-                       || (!$isEncryptionEnabled && !$isEncryptionModuleLoaded)
-                       || (!$isEncryptionEnabled && $isEncryptionModuleLoaded && $noUserSpecificEncryptionKeys);
+               $canChangePassword = ($isEncryptionModuleLoaded && $noUserSpecificEncryptionKeys)
+                       || (!$isEncryptionModuleLoaded && !$isEncryptionEnabled);
 
                return $canChangePassword;
        }