String concatenation is removed and expdatetime is passed via session

data.

plugins/password/localization/en_GB.inc

@@ -33,6 +33,6 @@ $messages['firstloginchange'] = 'This is your first login. Please change your pa
 $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['samepasswd'] = 'New password have to be different from the old one';
-$messages['passwdexpirewarning'] = 'Warning! Your password will expire soon, change it before';
+$messages['passwdexpirewarning'] = 'Warning! Your password will expire soon, change it before $expirationdatetime';
 $messages['passwdexpired'] = 'Your password has expired, you have to change it now !';
 

plugins/password/localization/en_US.inc

@@ -37,6 +37,6 @@ $messages['firstloginchange'] = 'This is your first login. Please change your pa
 $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['samepasswd'] = 'New password have to be different from the old one';
-$messages['passwdexpirewarning'] = 'Warning! Your password will expire soon, change it before';
+$messages['passwdexpirewarning'] = 'Warning! Your password will expire soon, change it before $expirationdatetime';
 $messages['passwdexpired'] = 'Your password has expired, you have to change it now !';
 

plugins/password/localization/pl_PL.inc

@@ -33,5 +33,5 @@ $messages['firstloginchange'] = 'To jest twoje pierwsze logowanie. Proszę zmie
 $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['samepasswd'] = 'Nowe hasło musi być inne niż obecne.';
-$messages['passwdexpirewarning'] = 'UWAGA! Twoje hasło niebawem wygaśnie, zmień je przed';
+$messages['passwdexpirewarning'] = 'UWAGA! Twoje hasło niebawem wygaśnie, zmień je przed $expirationdatetime';
 $messages['passwdexpired'] = 'Twoje hasło wygasło, musisz je natychmiast zmienić !';

plugins/password/password.php

@@ -96,8 +96,9 @@ class password extends rcube_plugin
             $rcmail->output->command('display_message', $this->gettext('firstloginchange'), 'notice');
         }
         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');
+        	$expdatetime = (isset ($_SESSION[passwdexpdatetime])) ? $_SESSION[passwdexpdatetime] : '';
+        	$rcmail->output->command('display_message', $this->gettext(
+        			array('name' => 'passwdexpirewarning', 'vars' => array('expirationdatetime' => $expdatetime))), 'warning');
         } elseif (rcube_utils::get_input_value('_passwdexpired', rcube_utils::INPUT_GET)) {
         	$rcmail->output->command('display_message', $this->gettext('passwdexpired'), 'error');
         }