Always naming it 'plugin' is not good, it can easily confuse. So better name it

[quix0rs-gnu-social.git] / actions / passwordsettings.php

diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index cd4beac3f2120a9c83a81f4ddc8a4e98c8573777..cfdb6c78176e221fcef24a1cd3e7d04feb48584b 100644 (file)
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -28,11 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR.'/lib/accountsettingsaction.php';
+if (!defined('STATUSNET')) { exit(1); }
 
 /**
  * Change password
@@ -45,7 +41,7 @@ require_once INSTALLDIR.'/lib/accountsettingsaction.php';
  * @link     http://status.net/
  */
 
-class PasswordsettingsAction extends AccountSettingsAction
+class PasswordsettingsAction extends SettingsAction
 {
     /**
      * Title of the page
@@ -55,7 +51,8 @@ class PasswordsettingsAction extends AccountSettingsAction
 
     function title()
     {
-        return _('Change password');
+        // TRANS: Title for page where to change password.
+        return _m('TITLE','Change password');
     }
 
     /**
@@ -66,6 +63,7 @@ class PasswordsettingsAction extends AccountSettingsAction
 
     function getInstructions()
     {
+        // TRANS: Instructions for page where to change password.
         return _('Change your password.');
     }
 
@@ -75,112 +73,97 @@ class PasswordsettingsAction extends AccountSettingsAction
         $this->autofocus('oldpassword');
     }
 
-    /**
-     * Content area of the page
-     *
-     * Shows a form for changing the password
-     *
-     * @return void
-     */
-
     function showContent()
     {
-        $user = common_current_user();
         $this->elementStart('form', array('method' => 'POST',
                                           'id' => 'form_password',
                                           'class' => 'form_settings',
                                           'action' =>
                                           common_local_url('passwordsettings')));
         $this->elementStart('fieldset');
+        // TRANS: Fieldset legend on page where to change password.
         $this->element('legend', null, _('Password change'));
         $this->hidden('token', common_session_token());
 
 
         $this->elementStart('ul', 'form_data');
         // Users who logged in with OpenID won't have a pwd
-        if ($user->password) {
+        if ($this->scoped->hasPassword()) {
             $this->elementStart('li');
+            // TRANS: Field label on page where to change password.
             $this->password('oldpassword', _('Old password'));
             $this->elementEnd('li');
         }
         $this->elementStart('li');
+        // TRANS: Field label on page where to change password.
         $this->password('newpassword', _('New password'),
-                        _('6 or more characters'));
+                        // TRANS: Field title on page where to change password.
+                        _('6 or more characters.'));
         $this->elementEnd('li');
         $this->elementStart('li');
-        $this->password('confirm', _('Confirm'),
-                        _('same as password above'));
+        // TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+        $this->password('confirm', _m('LABEL','Confirm'),
+                        // TRANS: Field title on page where to change password.
+                        _('Same as password above.'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
 
-        $this->submit('changepass', _('Change'));
+        // TRANS: Button text on page where to change password.
+        $this->submit('changepass', _m('BUTTON','Change'));
 
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 
-    /**
-     * Handle a post
-     *
-     * Validate input and save changes. Reload the form with a success
-     * or error message.
-     *
-     * @return void
-     */
-
-    function handlePost()
+    protected function doPost()
     {
-        // CSRF protection
-
-        $token = $this->trimmed('token');
-        if (!$token || $token != common_session_token()) {
-            $this->showForm(_('There was a problem with your session token. '.
-                               'Try again, please.'));
-            return;
-        }
-
-        $user = common_current_user();
-        assert(!is_null($user)); // should already be checked
-
         // FIXME: scrub input
 
         $newpassword = $this->arg('newpassword');
         $confirm     = $this->arg('confirm');
 
-        # Some validation
+        // Some validation
 
         if (strlen($newpassword) < 6) {
-            $this->showForm(_('Password must be 6 or more characters.'));
-            return;
+            // TRANS: Form validation error on page where to change password.
+            throw new ClientException(_('Password must be 6 or more characters.'));
         } else if (0 != strcmp($newpassword, $confirm)) {
-            $this->showForm(_('Passwords don\'t match.'));
-            return;
+            // TRANS: Form validation error on password change when password confirmation does not match.
+            throw new ClientException(_('Passwords do not match.'));
         }
 
-        if ($user->password) {
+        $oldpassword = null;
+        if ($this->scoped->hasPassword()) {
             $oldpassword = $this->arg('oldpassword');
 
-            if (!common_check_user($user->nickname, $oldpassword)) {
-                $this->showForm(_('Incorrect old password'));
-                return;
+            if (!common_check_user($this->scoped->getNickname(), $oldpassword)) {
+                // TRANS: Form validation error on page where to change password.
+                throw new ClientException(_('Incorrect old password.'));
             }
         }
 
-        $original = clone($user);
+        if (Event::handle('StartChangePassword', array($this->scoped, $oldpassword, $newpassword))) {
+            //no handler changed the password, so change the password internally
+            $user = $this->scoped->getUser();
+            $original = clone($user);
 
-        $user->password = common_munge_password($newpassword, $user->id);
+            $user->password = common_munge_password($newpassword, $this->scoped);
 
-        $val = $user->validate();
-        if ($val !== true) {
-            $this->showForm(_('Error saving user; invalid.'));
-            return;
-        }
+            $val = $user->validate();
+            if ($val !== true) {
+                // TRANS: Form validation error on page where to change password.
+                throw new ServerException(_('Error saving user; invalid.'));
+            }
 
-        if (!$user->update($original)) {
-            $this->serverError(_('Can\'t save new password.'));
-            return;
+            if (!$user->update($original)) {
+                // TRANS: Server error displayed on page where to change password when password change
+                // TRANS: could not be made because of a server error.
+                throw new ServerException(_('Cannot save new password.'));
+            }
+            Event::handle('EndChangePassword', array($this->scoped));
         }
 
-        $this->showForm(_('Password saved.'), true);
+        // TRANS: Form validation notice on page where to change password.
+        return _('Password saved.');
     }
 }