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

Show hint if password policy disallows password change

This commit is contained in:
Morris Jobke 2016-08-19 13:31:43 +02:00
parent dfb66e1101
commit 429eb21780
No known key found for this signature in database
GPG Key ID: 9CE5ED29E7FCD38A
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
settings/Controller/ChangePasswordController.php
View File

@ -21,6 +21,7 @@
*/
namespace OC\Settings\Controller;
use OC\HintException;
use OCP\App\IAppManager;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\JSONResponse;
@ -233,11 +234,21 @@ class ChangePasswordController extends Controller {
}
}
} else {
if ($targetUser->setPassword($password) === false) {
try {
if ($targetUser->setPassword($password) === false) {
return new JSONResponse([
'status' => 'error',
'data' => [
'message' => $this->l->t('Unable to change password'),
],
]);
}
// password policy app throws exception
} catch(HintException $e) {
return new JSONResponse([
'status' => 'error',
'data' => [
'message' => $this->l->t('Unable to change password'),
'message' => $e->getHint(),
],
]);
}