diff options
| author | robocoder <anthon.pang@gmail.com> | 2010-12-25 07:13:36 +0300 |
|---|---|---|
| committer | robocoder <anthon.pang@gmail.com> | 2010-12-25 07:13:36 +0300 |
| commit | 78d5ec1430b55eb08b576a7a3d89df4a6e8b4fdb (patch) | |
| tree | 3f99da749123a2a8dbb8a3832e05ca9d1c30df33 /plugins/Login | |
| parent | 47f0620c01472196c4b20543c211cc90d68486e3 (diff) | |
fixes #1914 - add webtests for login, forgot password, and password reset for valid and invalid input
git-svn-id: http://dev.piwik.org/svn/trunk@3529 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'plugins/Login')
| -rw-r--r-- | plugins/Login/Controller.php | 5 | ||||
| -rw-r--r-- | plugins/Login/FormResetPassword.php | 2 | ||||
| -rw-r--r-- | plugins/Login/Login.php | 2 | ||||
| -rw-r--r-- | plugins/Login/templates/resetPassword.tpl | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php index c3684e4cac..e2c8ec95e5 100644 --- a/plugins/Login/Controller.php +++ b/plugins/Login/Controller.php @@ -358,7 +358,7 @@ class Piwik_Login_Controller extends Piwik_Controller for($i = 0; $i <= 24; $i++) { $generatedToken = self::generatePasswordResetToken($user, $now + $i*60*60); - if($generatedToken == $token) + if($generatedToken === $token) { return true; } @@ -380,7 +380,8 @@ class Piwik_Login_Controller extends Piwik_Controller $cookie = new Piwik_Cookie($authCookieName); $cookie->delete(); - Zend_Session::expireSessionCookie(); + Piwik_Session::expireSessionCookie(); + Piwik_Session::regenerateId(); } /** diff --git a/plugins/Login/FormResetPassword.php b/plugins/Login/FormResetPassword.php index ed697e6ba6..e435ebd1b7 100644 --- a/plugins/Login/FormResetPassword.php +++ b/plugins/Login/FormResetPassword.php @@ -45,7 +45,7 @@ class Piwik_Login_FormResetPassword extends Piwik_QuickForm2 'form_token' => $resetToken, ))); - $this->attributes['action'] = Piwik_Url::getCurrentQueryStringWithParametersModified( array('token' => null) ); + $this->attributes['action'] = 'index.php' . Piwik_Url::getCurrentQueryStringWithParametersModified( array('token' => null) ); } } } diff --git a/plugins/Login/Login.php b/plugins/Login/Login.php index 8ad3b966ef..44eef80b40 100644 --- a/plugins/Login/Login.php +++ b/plugins/Login/Login.php @@ -132,6 +132,6 @@ class Piwik_Login extends Piwik_Plugin $cookie->setSecure(Piwik::isHttps()); $cookie->save(); - Zend_Session::regenerateId(); + Piwik_Session::regenerateId(); } } diff --git a/plugins/Login/templates/resetPassword.tpl b/plugins/Login/templates/resetPassword.tpl index 49644b21b4..481cab4cc3 100644 --- a/plugins/Login/templates/resetPassword.tpl +++ b/plugins/Login/templates/resetPassword.tpl @@ -27,7 +27,7 @@ <p> <label>{'Login_PasswordRepeat'|translate}:<br /> - <input type="password" name="form_password_bis" id="form_password" class="input" value="" size="20" tabindex="30" /></label> + <input type="password" name="form_password_bis" id="form_password_bis" class="input" value="" size="20" tabindex="30" /></label> </p> <p> |