WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow -1 for pwdMaxAge

This commit is contained in:
Roland Gruber 2013-08-22 16:44:40 +00:00
parent 27136315c1
commit 99d73b4dcd
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lam/lib/modules/sambaDomain.inc
View File

@ -323,7 +323,7 @@ class sambaDomain extends baseModule {
$sambaMaxPwdAge = $this->attributes['sambaMaxPwdAge'][0]; $sambaMaxPwdAge = $this->attributes['sambaMaxPwdAge'][0];
} }
$sambaMaxPwdAgeInput = new htmlTableExtendedInputField(_('Maximum password age'), 'maxPwdAge', $sambaMaxPwdAge, 'maxPwdAge'); $sambaMaxPwdAgeInput = new htmlTableExtendedInputField(_('Maximum password age'), 'maxPwdAge', $sambaMaxPwdAge, 'maxPwdAge');
$sambaMaxPwdAgeInput->setValidationRule(htmlElement::VALIDATE_NUMERIC); $sambaMaxPwdAgeInput->setValidationRule(htmlElement::VALIDATE_NUMERIC_WITH_NEGATIVE);
$return->addElement($sambaMaxPwdAgeInput, true); $return->addElement($sambaMaxPwdAgeInput, true);
// Lockout duration // Lockout duration
$sambaLockoutDuration = ''; $sambaLockoutDuration = '';
@ -488,7 +488,9 @@ class sambaDomain extends baseModule {
} }
// Minimum password age // Minimum password age
if (! isset($_POST['minPwdAge']) || ($_POST['minPwdAge'] == '')) { if (! isset($_POST['minPwdAge']) || ($_POST['minPwdAge'] == '')) {
if (isset($this->attributes['sambaMinPwdAge'])) unset($this->attributes['sambaMinPwdAge'][0]); if (isset($this->attributes['sambaMinPwdAge'])) {
unset($this->attributes['sambaMinPwdAge'][0]);
}
} }
else { else {
if (is_numeric($_POST['minPwdAge']) && ($_POST['minPwdAge'] > -2)) { if (is_numeric($_POST['minPwdAge']) && ($_POST['minPwdAge'] > -2)) {
@ -500,13 +502,15 @@ class sambaDomain extends baseModule {
} }
// Maximum password age // Maximum password age
if (! isset($_POST['maxPwdAge']) || ($_POST['maxPwdAge'] == '')) { if (! isset($_POST['maxPwdAge']) || ($_POST['maxPwdAge'] == '')) {
if (isset($this->attributes['sambaMaxPwdAge'])) unset($this->attributes['sambaMaxPwdAge'][0]); if (isset($this->attributes['sambaMaxPwdAge'])) {
unset($this->attributes['sambaMaxPwdAge'][0]);
}
} }
else { else {
if (!is_numeric($_POST['maxPwdAge']) || ($_POST['maxPwdAge'] < -1)) { if (!is_numeric($_POST['maxPwdAge']) || ($_POST['maxPwdAge'] < -1)) {
$errors[] = $this->messages['pwdAgeMax'][0]; $errors[] = $this->messages['pwdAgeMax'][0];
} }
elseif ($_POST['maxPwdAge'] < $_POST['minPwdAge']) { elseif (($_POST['maxPwdAge'] > 1) && ($_POST['maxPwdAge'] < $_POST['minPwdAge'])) {
$errors[] = $this->messages['pwdAge_cmp'][0]; $errors[] = $this->messages['pwdAge_cmp'][0];
} }
else { else {