set pwdExpiration to 'keep' instead of ''

set '' as value for never
This commit is contained in:
Uwe Steinmann 2016-08-08 20:21:30 +02:00
parent dac9c7b37f
commit 229b7e874f
2 changed files with 2 additions and 2 deletions

View File

@ -243,7 +243,7 @@ else if ($action == "edituser") {
}
if ($editedUser->getLogin() != $login)
$editedUser->setLogin($login);
if($pwdexpiration)
if($pwdexpiration != 'keep')
$editedUser->setPwdExpiration($pwdexpiration);
if($role->isGuest() && $clearpwd) {
$editedUser->setPwd('');

View File

@ -223,7 +223,7 @@ $(document).ready( function() {
?>
<tr>
<td><?php printMLText("password_expiration");?>:</td>
<td><select name="pwdexpiration"><?php if($currUser) { ?><option value=""><?php printMLText("keep");?></option><?php } ?><option value="<?php echo date('Y-m-d H:i:s'); ?>"><?php printMLText("now");?></option><option value="<?php echo date('Y-m-d H:i:s', time()+$passwordexpiration*86400); ?>"><?php printMLText("according_settings");?></option><option value="0000-00-00"><?php printMLText("never");?></option></select> <?php echo $currUser ? $currUser->getPwdExpiration() : ""; ?></td>
<td><select name="pwdexpiration"><?php if($currUser) { ?><option value="keep"><?php printMLText("keep");?></option><?php } ?><option value="<?php echo date('Y-m-d H:i:s'); ?>"><?php printMLText("now");?></option><option value="<?php echo date('Y-m-d H:i:s', time()+$passwordexpiration*86400); ?>"><?php printMLText("according_settings");?></option><option value=""><?php printMLText("never");?></option></select> <?php echo $currUser ? $currUser->getPwdExpiration() : ""; ?></td>
</tr>
<?php
}