diff --git a/lam/lib/config.inc b/lam/lib/config.inc
index 687d92c7..ae3615d8 100644
--- a/lam/lib/config.inc
+++ b/lam/lib/config.inc
@@ -386,7 +386,8 @@ class Config {
// $value: new host suffix
// returns true if $value has correct format
function set_HostSuffix($value) {
- if (is_string($value) && (eregi("^(([a-z0-9 \\-])*=([a-z0-9 \\-])*)(,([a-z0-9 \\-])*=([a-z0-9 \\-])*)*$", $value))) {
+ if (! $value) $this->hostsuffix = "";
+ elseif (is_string($value) && (eregi("^(([a-z0-9 \\-])*=([a-z0-9 \\-])*)(,([a-z0-9 \\-])*=([a-z0-9 \\-])*)*$", $value))) {
$this->hostsuffix = $value;
}
else return false;
@@ -475,7 +476,8 @@ class Config {
// $value: new minimum machine number
// returns true if $value has correct format
function set_minMachine($value) {
- if (is_numeric($value)) $this->MinMachine = $value;
+ if (! $value && ($this->hostsuffix == "")) $this->MinMachine = "";
+ elseif (is_numeric($value)) $this->MinMachine = $value;
else return false;
return true;
}
@@ -489,7 +491,8 @@ class Config {
// $value: new maximum machine number
// returns true if $value has correct format
function set_maxMachine($value) {
- if (is_numeric($value)) $this->MaxMachine = $value;
+ if (! $value && ($this->hostsuffix == "")) $this->MaxMachine = "";
+ elseif (is_numeric($value)) $this->MaxMachine = $value;
else return false;
return true;
}
@@ -535,7 +538,8 @@ class Config {
// $value: new attribute string
// returns true if $value has correct format
function set_hostlistAttributes($value) {
- if (is_string($value) && eregi("^((#[^:;]+)|([^:;]*:[^:;]+))(;((#[^:;]+)|([^:;]*:[^:;]+)))*$", $value)) {
+ if (! $value && ($this->hostsuffix == "")) $this->hostlistAttributes = "";
+ elseif (is_string($value) && eregi("^((#[^:;]+)|([^:;]*:[^:;]+))(;((#[^:;]+)|([^:;]*:[^:;]+)))*$", $value)) {
$this->hostlistAttributes = $value;
}
else return false;
diff --git a/lam/templates/config/confmain.php b/lam/templates/config/confmain.php
index afa94116..68cbbe4d 100644
--- a/lam/templates/config/confmain.php
+++ b/lam/templates/config/confmain.php
@@ -130,12 +130,12 @@ echo ("
".
echo (" | " . _("Help") . " |
\n");
// host suffix
echo ("".
- _("HostSuffix") . " *: | ".
+ _("HostSuffix") . " **: ".
"get_HostSuffix() . "\"> | \n");
echo ("" . _("Help") . " |
\n");
// domain suffix
echo ("".
- _("DomainSuffix") . " **: | ".
+ _("DomainSuffix") . " ***: ".
"get_DomainSuffix() . "\"> | \n");
echo ("" . _("Help") . " |
\n");
@@ -144,7 +144,7 @@ echo ("  |
");
// LDAP password hash type
echo ("".
- _("Password hash type") . " *: | ".
+ _("Password hash type") . " : ".
" |