little correction of variables names

plugins/password/localization/en_GB.inc

@@ -32,7 +32,7 @@ $messages['passwordforbidden'] = 'Password contains forbidden characters.';
 $messages['firstloginchange'] = 'This is your first login. Please change your password.';
 $messages['disablednotice'] = 'The system is currently under maintenance and password change is not possible at the moment. Everything should be back to normal soon. We apologise for any inconvenience.';
 $messages['passwdinhistory'] = 'This password has already been used previously';
-$messages['samepass'] = 'New password have to be different from the old one';
-$messages['passexpirewarning'] = 'Warning! Your password will expire soon, change it before';
-$messages['passexpired'] = 'Your password has expired, you have to change it now !';
+$messages['samepasswd'] = 'New password have to be different from the old one';
+$messages['passwdexpirewarning'] = 'Warning! Your password will expire soon, change it before';
+$messages['passwdexpired'] = 'Your password has expired, you have to change it now !';
 

plugins/password/localization/en_US.inc

@@ -36,7 +36,7 @@ $messages['passwordforbidden'] = 'Password contains forbidden characters.';
 $messages['firstloginchange'] = 'This is your first login. Please change your password.';
 $messages['disablednotice'] = 'The system is currently under maintenance and password change is not possible at the moment. Everything should be back to normal soon. We apologize for any inconvenience.';
 $messages['passwinhistory'] = 'This password has already been used previously';
-$messages['samepass'] = 'New password have to be different from the old one';
-$messages['passexpirewarning'] = 'Warning! Your password will expire soon, change it before';
-$messages['passexpired'] = 'Your password has expired, you have to change it now !';
+$messages['samepasswd'] = 'New password have to be different from the old one';
+$messages['passwdexpirewarning'] = 'Warning! Your password will expire soon, change it before';
+$messages['passwdexpired'] = 'Your password has expired, you have to change it now !';
 

plugins/password/localization/pl_PL.inc

@@ -32,6 +32,6 @@ $messages['passwordforbidden'] = 'Hasło zawiera niedozwolone znaki.';
 $messages['firstloginchange'] = 'To jest twoje pierwsze logowanie. Proszę zmień hasło.';
 $messages['disablednotice'] = 'System jest w trakcie konserwacji i zmiana hasła w tym momencie nie jest możliwa. Wszystko powinno wrócić do normy w niedługim czasie. Przepraszamy za wszelkie niedogodności';
 $messages['passwdinhistory'] = 'To hasło było już użyte poprzednio.';
-$messages['samepass'] = 'Nowe hasło musi być inne niż obecne.';
-$messages['passexpirewarning'] = 'UWAGA! Twoje hasło niebawem wygaśnie, zmień je przed';
-$messages['passexpired'] = 'Twoje hasło wygasło, musisz je natychmiast zmienić !';
+$messages['samepasswd'] = 'Nowe hasło musi być inne niż obecne.';
+$messages['passwdexpirewarning'] = 'UWAGA! Twoje hasło niebawem wygaśnie, zmień je przed';
+$messages['passwdexpired'] = 'Twoje hasło wygasło, musisz je natychmiast zmienić !';

plugins/password/password.php

@@ -95,11 +95,11 @@ class password extends rcube_plugin
         if (rcube_utils::get_input_value('_first', rcube_utils::INPUT_GET)) {
             $rcmail->output->command('display_message', $this->gettext('firstloginchange'), 'notice');
         }
-        if (rcube_utils::get_input_value('_passexpwarning', rcube_utils::INPUT_GET)) {
-        	$expdate = rcube_utils::get_input_value('_passexpdate', rcube_utils::INPUT_GET, true);
-        	$rcmail->output->command('display_message', $this->gettext('passexpirewarning'). ': '. $expdate, 'warning');
-        } elseif (rcube_utils::get_input_value('_passexpired', rcube_utils::INPUT_GET)) {
-        	$rcmail->output->command('display_message', $this->gettext('passexpired'), 'error');
+        if (rcube_utils::get_input_value('_passwdexpwarning', rcube_utils::INPUT_GET)) {
+        	$expdate = rcube_utils::get_input_value('_passwdexpdate', rcube_utils::INPUT_GET, true);
+        	$rcmail->output->command('display_message', $this->gettext('passwdexpirewarning'). ': '. $expdate, 'warning');
+        } elseif (rcube_utils::get_input_value('_passwdexpired', rcube_utils::INPUT_GET)) {
+        	$rcmail->output->command('display_message', $this->gettext('passwdexpired'), 'error');
         }
         
         $rcmail->output->send('plugin');
@@ -161,7 +161,7 @@ class password extends rcube_plugin
             }
             // password is the same as the old one, warn user, return error
             else if ($sespwd == $newpwd && !$rcmail->config->get('password_force_save')) {
-                $rcmail->output->command('display_message', $this->gettext('samepass'), 'error');
+                $rcmail->output->command('display_message', $this->gettext('samepasswd'), 'error');
             }
             // try to save the password
             else if (!($res = $this->_save($curpwd, $newpwd))) {

plugins/ppolicy_checker/ppolicy_checker.php

@@ -62,12 +62,12 @@ class ppolicy_checker extends rcube_plugin {
 			$this->load_policies ();
 			if ($this->get_user_info ( $username )) {
 				if ($this->expired) {
-					$args ['_passexpired']    = TRUE;
+					$args ['_passwdexpired']    = TRUE;
 				} else {
-					$args ['_passexpwarning'] = TRUE;
+					$args ['_passwdexpwarning'] = TRUE;
 				}
 								
-				$args ['_passexpdate'] = $this->end_date;
+				$args ['_passwdexpdate'] = $this->end_date;
 				$args ['_task']        = 'settings';
 				$args ['action']       = 'plugin.password';
 			}