X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fpassword.php;h=603ae58eaf0405c9884b775c0c2b0b50cdc879c0;hb=d0559fdf4dafcaf8446b437f4af089c944a23d09;hp=c5ab28ee973e8708b656542808f87045bb06ccd2;hpb=07eb05157a86f83a853e5591862f413d44e0babb;p=quix0rs-gnu-social.git

diff --git a/actions/password.php b/actions/password.php
index c5ab28ee97..603ae58eaf 100644
--- a/actions/password.php
+++ b/actions/password.php
@@ -1,18 +1,18 @@
 <?php
-/* 
+/*
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -22,40 +22,40 @@ if (!defined('LACONICA')) { exit(1); }
 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' => 
+										   '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() {
 
 		$user = common_current_user();
 		assert(!is_null($user)); # should already be checked
-		
+
 		# FIXME: scrub input
 
 		$oldpassword = $this->arg('oldpassword');
 		$newpassword = $this->arg('newpassword');
 		$confirm = $this->arg('confirm');
-		
+
 		if (0 != strcmp($newpassword, $confirm)) {
 			$this->show_form(_t('Passwords don\'t match'));
 			return;
@@ -65,14 +65,22 @@ class PasswordAction extends SettingsAction {
 			$this->show_form(_t('Incorrect old password'));
 			return;
 		}
-		
+
+		$original = clone($user);
+
 		$user->password = common_munge_password($newpassword, $user->id);
-		
-		if (!$user->update()) {
+
+		$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;
 		}
-		
+
 		$this->show_form(_t('Password saved'), true);
 	}
 }
\ No newline at end of file