X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fpassword.php;h=3481ad33bb482bb3805a50d426e3496e4218c75a;hb=4aedce6864eb27a0c37b3dcae22fee0aa16ae537;hp=ee61c3e9782ee7ed667a6ef9d752007845e31b38;hpb=d0f8fd20fb9e50aad9568a458934b52a9439228c;p=quix0rs-gnu-social.git

diff --git a/actions/password.php b/actions/password.php
index ee61c3e978..3481ad33bb 100644
--- a/actions/password.php
+++ b/actions/password.php
@@ -23,21 +23,30 @@ require_once(INSTALLDIR.'/lib/settingsaction.php');
 
 class PasswordAction extends SettingsAction {
 
-	function show_form($msg=NULL, $success=false) {
-		common_show_header(_t('Change password'), NULL, NULL, array($this, 'settings_menu'));
+	function show_top($arr) {
+		$msg = $arr[0];
+		$success = $arr[1];
 		if ($msg) {
 			$this->message($msg, $success);
 		} else {
 			common_element('div', 'instructions', 
 						   _t('You can change your password here. Choose a good one!'));
 		}
+		$this->settings_menu();
+	}
+	
+	function show_form($msg=NULL, $success=false) {
+		common_show_header(_t('Change password'), NULL,
+						   array($msg, $success), array($this, 'show_top'));
 		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_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();