summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/password.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/actions/password.php b/actions/password.php
index aef1accdc..90e7db266 100644
--- a/actions/password.php
+++ b/actions/password.php
@@ -30,10 +30,12 @@ class PasswordAction extends SettingsAction {
function show_form($msg=NULL, $success=false) {
$user = common_current_user();
$this->form_header(_('Change password'), $msg, $success);
+ $token = common_session_token();
common_element_start('form', array('method' => 'post',
'id' => 'password',
'action' =>
common_local_url('password')));
+ common_hidden('token', $token);
# Users who logged in with OpenID won't have a pwd
if ($user->password) {
common_password('oldpassword', _('Old password'));
@@ -56,8 +58,11 @@ class PasswordAction extends SettingsAction {
$newpassword = $this->arg('newpassword');
$confirm = $this->arg('confirm');
-
- if (0 != strcmp($newpassword, $confirm)) {
+ $token = $this->arg('token');
+
+ if (!$token || $token != common_session_token()) {
+ $this->show_form(_('There was a problem with your session token. Try again, please.'));
+ } else if (0 != strcmp($newpassword, $confirm)) {
$this->show_form(_('Passwords don\'t match.'));
return;
}