From bcb60e5dea809ab557ee6a0fcf0db6056460df2d Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Tue, 27 Jan 2004 18:05:35 +0000 Subject: [PATCH] made host management optional --- lam/lib/config.inc | 12 +++++++---- lam/templates/config/confmain.php | 24 +++++++++++----------- lam/templates/main_header.php | 33 +++++++++++++++++++------------ 3 files changed, 41 insertions(+), 28 deletions(-) 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") . " : ". "\n\n"); if ($conf->get_cacheTimeout() != 0) echo("\n"); if ($conf->get_cacheTimeout() != 1) echo("\n"); @@ -180,8 +180,9 @@ echo (""); // Samba version echo (""); + _("Manage Samba 3 accounts") . ": "); else echo (""); echo ("\n"); @@ -212,10 +213,10 @@ echo ("\n"); // minMach echo ("\n"); // maxMach -echo ("\n"); // Machine text echo ("\n"); @@ -239,7 +240,7 @@ echo ("\n"); // host list attributes echo ("". + _("Attributes in Host List") . " **:". ""); echo ("\n"); @@ -247,7 +248,7 @@ echo ("\n"); // maximum list entries echo ("". + _("Maximum list entries") . " : ". "
". - _("Samba 3.x schema") . ": " . _("Help") . "
" . _("Maximum GID number")." *: ". echo ("" . _("Help") . "
". - _("Minimum Machine number") . " *: ". + _("Minimum Machine number") . " **: ". "get_minMachine() . "\">" . _("Maximum Machine number") . " *: ". +echo ("" . _("Maximum Machine number") . " **: ". "get_maxMachine() . "\">" . _("Help") . "
". echo ("" . _("Help") . "
". - _("Attributes in Host List") . " *:get_hostlistAttributes() . "\">" . _("Help") . "
 
". - _("Maximum list entries") . " *:
\n"); echo ("

"); echo ("

* = ". _("required") . "

"); -echo ("

** = ". _("required for Samba 3 schema") . "

"); +echo ("

** = ". _("required for Samba accounts") . "

"); +echo ("

*** = ". _("required for Samba 3 accounts") . "

"); // password for configuration echo ("

\n"); diff --git a/lam/templates/main_header.php b/lam/templates/main_header.php index 607b0ac6..8516fdf0 100644 --- a/lam/templates/main_header.php +++ b/lam/templates/main_header.php @@ -31,6 +31,12 @@ session_save_path("../sess"); setlanguage(); echo $_SESSION['header']; + +// number of list views (users, groups, ...) +$lists = 2; +if ($_SESSION['config']->is_samba3()) $lists++; +if ($_SESSION['config']->get_Hostsuffix() != "") $lists++; + ?> @@ -42,9 +48,7 @@ echo $_SESSION['header']; is_samba3()) echo "\n"; - else echo "\n"; + echo "\n"; ?> LDAP Account Manager @@ -59,9 +63,8 @@ echo $_SESSION['header']; is_samba3()) echo " \n"; - else echo " \n"; + $temp = $lists + 2; + echo " \n"; ?> @@ -69,15 +72,19 @@ echo $_SESSION['header']; is_samba3()) { - echo '' . _("Domains") . '' . "\n"; - echo '' . _("Users") . '' . "\n"; - echo '' . _("Groups") . '' . "\n"; - echo '' . _("Hosts") . '' . "\n"; + echo '' . _("Domains") . '' . "\n"; + echo '' . _("Users") . '' . "\n"; + echo '' . _("Groups") . '' . "\n"; + if ($_SESSION['config']->get_Hostsuffix() != "") { + echo '' . _("Hosts") . '' . "\n"; + } } else { - echo '' . _("Users") . '' . "\n"; - echo '' . _("Groups") . '' . "\n"; - echo '' . _("Hosts") . '' . "\n"; + echo '' . _("Users") . '' . "\n"; + echo '' . _("Groups") . '' . "\n"; + if ($_SESSION['config']->get_Hostsuffix() != "") { + echo '' . _("Hosts") . '' . "\n"; + } } ?>