From 28933322a2bfa084f82ebb56cc7f5f7d17351696 Mon Sep 17 00:00:00 2001 From: Roger Szabo Date: Fri, 30 Jun 2017 18:36:33 +0800 Subject: [PATCH 1/5] suppress superflous php error on rejected password change Signed-off-by: Roger Szabo --- apps/user_ldap/lib/Access.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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()); } From 3e7a49e0096a7bc89b5dd9f65738f059248af022 Mon Sep 17 00:00:00 2001 From: Roger Szabo Date: Thu, 22 Jun 2017 15:58:30 +0800 Subject: [PATCH 2/5] set needsPasswordReset flag correctly Signed-off-by: Roger Szabo --- apps/user_ldap/lib/Controller/RenewPasswordController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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', [ From b7257388707e3820a60b30763ab4573b92273536 Mon Sep 17 00:00:00 2001 From: Roger Szabo Date: Thu, 22 Jun 2017 15:53:11 +0800 Subject: [PATCH 3/5] css for button adjustment for nc12 Signed-off-by: Roger Szabo --- apps/user_ldap/css/renewPassword.css | 5 +++++ 1 file changed, 5 insertions(+) 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; +} From 500d2a0e2e8069c982f4a8b4b3550b9afe32302e Mon Sep 17 00:00:00 2001 From: Roger Szabo Date: Wed, 21 Jun 2017 14:40:44 +0800 Subject: [PATCH 4/5] pass missing function parameter Signed-off-by: Roger Szabo --- apps/user_ldap/lib/AppInfo/Application.php | 1 + 1 file changed, 1 insertion(+) 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() ); }); From ff286cd13191ff5ee22e152fc94e007e81f5e7ea Mon Sep 17 00:00:00 2001 From: Roger Szabo Date: Mon, 10 Jul 2017 18:38:30 +0800 Subject: [PATCH 5/5] Rectify variable $uid->$user Signed-off-by: Roger Szabo --- apps/user_ldap/lib/Controller/RenewPasswordController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/user_ldap/lib/Controller/RenewPasswordController.php b/apps/user_ldap/lib/Controller/RenewPasswordController.php index 7766a5a78de..9cdcdddb141 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->config->setUserValue($uid, 'user_ldap', 'needsPasswordReset', 'false'); + $this->config->setUserValue($user, 'user_ldap', 'needsPasswordReset', 'false'); return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args)); } else { $this->session->set('renewPasswordMessages', [