From 97c98cf59ace088e487e130182ff4dc99d2d408b Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 17 Jan 2009 22:30:44 +0000 Subject: Break up settings into two tabset Made two tabsets: account and connect. Removed "Invite" from the global nav to make room. --- actions/passwordsettings.php | 161 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) create mode 100644 actions/passwordsettings.php (limited to 'actions/passwordsettings.php') diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php new file mode 100644 index 000000000..f96da13bd --- /dev/null +++ b/actions/passwordsettings.php @@ -0,0 +1,161 @@ +. + * + * @category Settings + * @package Laconica + * @author Evan Prodromou + * @author Zach Copley + * @copyright 2008-2009 Control Yourself, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://laconi.ca/ + */ + +if (!defined('LACONICA')) { + exit(1); +} + +require_once INSTALLDIR.'/lib/accountsettingsaction.php'; + +/** + * Change password + * + * @category Settings + * @package Laconica + * @author Evan Prodromou + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://laconi.ca/ + */ + +class PasswordsettingsAction extends AccountSettingsAction +{ + /** + * Title of the page + * + * @return string Title of the page + */ + + function title() + { + return _('Change password'); + } + + /** + * Instructions for use + * + * @return instructions for use + */ + + function getInstructions() + { + return _('Change your password.'); + } + + /** + * 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' => 'password', + 'action' => + common_local_url('profilesettings'))); + + $this->hidden('token', common_session_token()); + + // Users who logged in with OpenID won't have a pwd + if ($user->password) { + $this->password('oldpassword', _('Old password')); + } + $this->password('newpassword', _('New password'), + _('6 or more characters')); + $this->password('confirm', _('Confirm'), + _('same as password above')); + $this->submit('changepass', _('Change')); + $this->elementEnd('form'); + } + + /** + * Handle a post + * + * Validate input and save changes. Reload the form with a success + * or error message. + * + * @return void + */ + + function handlePost() + { + // 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'); + + if (0 != strcmp($newpassword, $confirm)) { + $this->showForm(_('Passwords don\'t match.')); + return; + } + + if ($user->password) { + $oldpassword = $this->arg('oldpassword'); + + if (!common_check_user($user->nickname, $oldpassword)) { + $this->showForm(_('Incorrect old password')); + return; + } + } + + $original = clone($user); + + $user->password = common_munge_password($newpassword, $user->id); + + $val = $user->validate(); + if ($val !== true) { + $this->showForm(_('Error saving user; invalid.')); + return; + } + + if (!$user->update($original)) { + $this->serverError(_('Can\'t save new password.')); + return; + } + + $this->showForm(_('Password saved.'), true); + } +} \ No newline at end of file -- cgit v1.2.3-54-g00ecf From ac1cc954ae080dbbb906cae009148eb3796de43d Mon Sep 17 00:00:00 2001 From: sarven Date: Wed, 21 Jan 2009 19:56:18 +0000 Subject: form_password markup and style --- actions/passwordsettings.php | 20 +++++++++++++++++--- theme/base/css/display.css | 3 ++- 2 files changed, 19 insertions(+), 4 deletions(-) (limited to 'actions/passwordsettings.php') diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php index f96da13bd..17b2de4e8 100644 --- a/actions/passwordsettings.php +++ b/actions/passwordsettings.php @@ -81,21 +81,35 @@ class PasswordsettingsAction extends AccountSettingsAction { $user = common_current_user(); $this->elementStart('form', array('method' => 'POST', - 'id' => 'password', + 'id' => 'form_password', + 'class' => 'form_settings', 'action' => common_local_url('profilesettings'))); - + $this->elementStart('fieldset'); + $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) { + $this->elementStart('li'); $this->password('oldpassword', _('Old password')); + $this->elementEnd('li'); } + $this->elementStart('li'); $this->password('newpassword', _('New password'), _('6 or more characters')); + $this->elementEnd('li'); + $this->elementStart('li'); $this->password('confirm', _('Confirm'), _('same as password above')); + $this->elementEnd('li'); + $this->elementEnd('ul'); + $this->submit('changepass', _('Change')); + + $this->elementEnd('fieldset'); $this->elementEnd('form'); } @@ -158,4 +172,4 @@ class PasswordsettingsAction extends AccountSettingsAction $this->showForm(_('Password saved.'), true); } -} \ No newline at end of file +} diff --git a/theme/base/css/display.css b/theme/base/css/display.css index c16fa4ab0..18205fceb 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -147,7 +147,8 @@ font-weight:bold; #form_settings_profile legend, #form_login legend, -#form_register legend { +#form_register legend, +#form_password legend { display:none; } -- cgit v1.2.3-54-g00ecf