debugging for addopenid problem

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

diff --git a/actions/password.php b/actions/password.php
index 63b99c6239aaf08705b3794972adaa0f76575bf1..603ae58eaf0405c9884b775c0c2b0b50cdc879c0 100644 (file)
--- a/actions/password.php
+++ b/actions/password.php
@@ -24,25 +24,25 @@ require_once(INSTALLDIR.'/lib/settingsaction.php');
 class PasswordAction extends SettingsAction {
 
        function show_form($msg=NULL, $success=false) {
-               common_show_header(_t('Change password'));
-               $this->settings_menu();
-               $this->message($msg, $success);
+               common_show_header(_t('Change password'), NULL, NULL, array($this, 'settings_menu'));
+               if ($msg) {
+                       $this->message($msg, $success);
+               } else {
+                       common_element('div', 'instructions', 
+                                                  _t('You can change your password here. Choose a good one!'));
+               }
                common_element_start('form', array('method' => 'POST',
                                                                                   'id' => 'password',
                                                                                   'action' =>
                                                                                   common_local_url('password')));
                common_password('oldpassword', _t('Old password'));
-               common_password('newpassword', _t('New password'));
-               common_password('confirm', _t('Confirm'));
-               common_element('input', array('name' => 'submit',
-                                                                         'type' => 'submit',
-                                                                         'id' => 'submit'),
-                                          _t('Login'));
-               common_element('input', array('name' => 'cancel',
-                                                                         'type' => 'button',
-                                                                         'id' => 'cancel'),
-                                          _t('Cancel'));
+               common_password('newpassword', _t('New password'),
+                                               _t('6 or more characters'));
+               common_password('confirm', _t('Confirm'),
+                                               _t('same as password above'));
+               common_submit('submit', _t('Change'));
                common_element_end('form');
+               common_show_footer();
        }
 
        function handle_post() {
@@ -70,6 +70,12 @@ class PasswordAction extends SettingsAction {
 
                $user->password = common_munge_password($newpassword, $user->id);
 
+               $val = $user->validate();
+               if ($val !== TRUE) {
+                       $this->show_form(_t('Error saving user; invalid.'));
+                       return;
+               }
+
                if (!$user->update($original)) {
                        common_server_error(_t('Can\'t save new password.'));
                        return;