diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-07-05 11:49:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-05 11:49:13 +0200 |
| commit | e836efe68b2a7c97fc6f6427546ef62c3a56cf3a (patch) | |
| tree | b585a34c366b55199d41fcdcf692203bb9785f51 /apps | |
| parent | 1cbb7a18d8d4e1153a6b54e55a8e0f4ed71f167f (diff) | |
| parent | 51ecc7ce114f7155942bdbf1ff336ca5a2f80ee7 (diff) | |
| download | nextcloud-server-e836efe68b2a7c97fc6f6427546ef62c3a56cf3a.tar.gz nextcloud-server-e836efe68b2a7c97fc6f6427546ef62c3a56cf3a.zip | |
Merge pull request #5569 from GitHubUser4234/ldap_password_renew_nc12fix
Ldap password renewal fixes for NC12
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/user_ldap/css/renewPassword.css | 5 | ||||
| -rw-r--r-- | apps/user_ldap/lib/Access.php | 2 | ||||
| -rw-r--r-- | apps/user_ldap/lib/AppInfo/Application.php | 1 | ||||
| -rw-r--r-- | apps/user_ldap/lib/Controller/RenewPasswordController.php | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/apps/user_ldap/css/renewPassword.css b/apps/user_ldap/css/renewPassword.css index a06a101efe5..03fe2bccd88 100644 --- a/apps/user_ldap/css/renewPassword.css +++ b/apps/user_ldap/css/renewPassword.css @@ -18,3 +18,8 @@ #renewpassword .title { background-color: transparent; } + +input.primary, +button.primary { + background-color: #00a2e9 !important; +} diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php index f342785ee03..69e1f3c52f4 100644 --- a/apps/user_ldap/lib/Access.php +++ b/apps/user_ldap/lib/Access.php @@ -346,7 +346,7 @@ class Access extends LDAPUtility implements IUserTools { return false; } try { - return $this->invokeLDAPMethod('modReplace', $cr, $userDN, $password); + return @$this->invokeLDAPMethod('modReplace', $cr, $userDN, $password); } catch(ConstraintViolationException $e) { throw new HintException('Password change rejected.', \OC::$server->getL10N('user_ldap')->t('Password change rejected. Hint: ').$e->getMessage(), $e->getCode()); } diff --git a/apps/user_ldap/lib/AppInfo/Application.php b/apps/user_ldap/lib/AppInfo/Application.php index c3fa1ce9f94..2188605b5e8 100644 --- a/apps/user_ldap/lib/AppInfo/Application.php +++ b/apps/user_ldap/lib/AppInfo/Application.php @@ -45,6 +45,7 @@ class Application extends App { $c->query('UserManager'), $server->getConfig(), $c->query('OCP\IL10N'), + $c->query('Session'), $server->getURLGenerator() ); }); diff --git a/apps/user_ldap/lib/Controller/RenewPasswordController.php b/apps/user_ldap/lib/Controller/RenewPasswordController.php index 4714c0646cd..7766a5a78de 100644 --- a/apps/user_ldap/lib/Controller/RenewPasswordController.php +++ b/apps/user_ldap/lib/Controller/RenewPasswordController.php @@ -146,7 +146,7 @@ class RenewPasswordController extends Controller { $this->session->set('loginMessages', [ [], [$this->l10n->t("Please login with the new password")] ]); - $this->session->remove('needPasswordRenewal'); + $this->config->setUserValue($uid, 'user_ldap', 'needsPasswordReset', 'false'); return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args)); } else { $this->session->set('renewPasswordMessages', [ |