From 7578b1bbf8123408922df297feab517e1306be31 Mon Sep 17 00:00:00 2001 From: katagia Date: Thu, 23 Oct 2003 11:30:33 +0000 Subject: [PATCH] Removed half sentences in help. Removed some debug-code --- lam/help/help.inc | 9 ++++++--- lam/lib/account.inc | 1 - lam/templates/account/groupedit.php | 2 +- lam/templates/account/hostedit.php | 2 +- lam/templates/account/useredit.php | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lam/help/help.inc b/lam/help/help.inc index d4773e1d..52a7b985 100644 --- a/lam/help/help.inc +++ b/lam/help/help.inc @@ -143,7 +143,8 @@ $helpArray = array ( Warning: Older systems have problems with usernames longer than 8 characters. You can't log in to Windows if username is longer than 16 characters.")), "401" => array ("ext" => "FALSE", "Headline" => _("UID number"), - "Text" => _("If empty UID number will be generated automaticly. Valid values are between").' '.$_SESSION['config']->get_minUID().' '._("and").' '.$_SESSION['config']->get_maxUID()."."), + "Text" => _("If empty UID number will be generated automaticly. Valid values are between %s and %s."), + "variables" => array($_SESSION['config']->get_minUID(), $_SESSION['config']->get_maxUID())), "402" => array ("ext" => "FALSE", "Headline" => _("Additional groups"), "Text" => _("Hold the CTRL-key to (de)select multiple groups."). ' '. _("Can be left empty.")), "403" => array ("ext" => "FALSE", "Headline" => _("Home directory"), @@ -159,7 +160,8 @@ $helpArray = array ( character because groupadd also does not allow it. Lam doesn't allow capital letters A-Z because it can cause several problems. If groupname is allready used username will expanded with a number. The next free number will be used.")), "408" => array ("ext" => "FALSE", "Headline" => _("GID number"), - "Text" => _("If empty GID number will be generated automaticly. Valid values are between").' '.$_SESSION['config']->get_minGID().' '._("and").' '.$_SESSION['config']->get_maxGID()."."), + "Text" => _("If empty GID number will be generated automaticly. Valid values are between %s and %s."), + "variables" => array($_SESSION['config']->get_minGID(), $_SESSION['config']->get_maxGID())), "409" => array ("ext" => "FALSE", "Headline" => _("Gecos"), "Text" => _("Group description. If left empty group name will be used.")), "410" => array ("ext" => "FALSE", "Headline" => _("Host name"), @@ -167,7 +169,8 @@ $helpArray = array ( character because useradd also does not allow it. Lam doesn't allow capital letters A-Z because it can cause several problems. Hostnames are always ending with $. If last character isn't $ it will be added. If hostname is allready used username will expanded with a number. The next free number will be used.")), "411" => array ("ext" => "FALSE", "Headline" => _("UID number"), - "Text" => _("If empty UID number will be generated automaticly. Valid values are between").' '.$_SESSION['config']->get_minMachine().' '._("and").' '.$_SESSION['config']->get_maxMachine()."."), + "Text" => _("If empty UID number will be generated automaticly. Valid values are between %s and %s."), + "variables" => array($_SESSION['config']->get_minMachine(), $_SESSION['config']->get_maxMachine())), "412" => array ("ext" => "FALSE", "Headline" => _("Primary group"), "Text" => _("The Primary group the host should be member of.")), "413" => array ("ext" => "FALSE", "Headline" => _("Gecos"), diff --git a/lam/lib/account.inc b/lam/lib/account.inc index 32a1534e..fc3d5aa0 100644 --- a/lam/lib/account.inc +++ b/lam/lib/account.inc @@ -212,7 +212,6 @@ function getquotas($type,$user='+') { * scriptPath is Path to lamdaemon.pl on remote system */ exec("perl ".escapeshellarg($_SESSION['lampath']."lib/lamdaemon.pl")." ".escapeshellarg($_SESSION['config']->scriptServer)." ".escapeshellarg($_SESSION['config']->scriptPath)." ".$towrite, $vals, $status); - print("perl ".escapeshellarg($_SESSION['lampath']."lib/lamdaemon.pl")." ".escapeshellarg($_SESSION['config']->scriptServer)." ".escapeshellarg($_SESSION['config']->scriptPath)." ".$towrite); /* $vals is a string which contains a two dimensional array. * We have to recreate it with explode * diff --git a/lam/templates/account/groupedit.php b/lam/templates/account/groupedit.php index 942614f0..e0d0119b 100644 --- a/lam/templates/account/groupedit.php +++ b/lam/templates/account/groupedit.php @@ -857,7 +857,7 @@ switch ($select_local) { case 'finish': // Final Settings echo ''; - echo "
"._('Success')."\n"; + echo "
"._('Note')."\n"; echo ""; echo '
'; echo _('Group').' '; diff --git a/lam/templates/account/hostedit.php b/lam/templates/account/hostedit.php index a6c94e68..5921a0c7 100644 --- a/lam/templates/account/hostedit.php +++ b/lam/templates/account/hostedit.php @@ -449,7 +449,7 @@ switch ($select_local) { case 'finish': // Final Settings echo ''; - echo "
"._('Success')."\n"; + echo "
"._('Note')."\n"; echo "
"; echo '
'; echo _('Host'); diff --git a/lam/templates/account/useredit.php b/lam/templates/account/useredit.php index 073456e3..5b9a0e44 100644 --- a/lam/templates/account/useredit.php +++ b/lam/templates/account/useredit.php @@ -1551,7 +1551,7 @@ switch ($select_local) { case 'finish': // Final Settings echo ''; - echo "
"._('Success')."\n"; + echo "
"._('Note')."\n"; echo "
"; echo '
'; echo _('User ');