From 670f4f142deb8a63e847a270a24bc3ea2b3ec430 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Thu, 30 Dec 2004 14:12:28 +0000 Subject: [PATCH] removed help variables --- lam/help/help.inc | 9 +++------ lam/lib/modules/sambaAccount.inc | 9 +++------ lam/lib/modules/sambaSamAccount.inc | 13 +++++-------- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/lam/help/help.inc b/lam/help/help.inc index cfb108f9..4d6dd161 100644 --- a/lam/help/help.inc +++ b/lam/help/help.inc @@ -198,16 +198,13 @@ $helpArray = array ( "433" => array ("ext" => "FALSE", "Headline" => _("Home drive"), "Text" => _("Driveletter assigned on windows workstations as homedirectory.")), "434" => array ("ext" => "FALSE", "Headline" => _("Script path"), - "Text" => _("Filename and -path relative to netlogon-share which should be executed on logon. $%s and $%s are replaced with user- and groupname."). ' '. _("Can be left empty."), - "variables" => array('user', 'group')), + "Text" => _('Filename and -path relative to netlogon-share which should be executed on logon. $user and $group are replaced with user- and groupname.'). ' '. _("Can be left empty.")), "435" => array ("ext" => "FALSE", "Headline" => _("Profile path"), - "Text" => _("Path of the user profile. Can be a local absolute path or a UNC-path (\\\\server\\share). $%s and $%s are replaced with user- and groupname."). ' '. _("Can be left empty."), - "variables" => array('user', 'group')), + "Text" => _('Path of the user profile. Can be a local absolute path or a UNC-path (\\\\server\\share). $user and $group are replaced with user- and groupname.'). ' '. _("Can be left empty.")), "436" => array ("ext" => "FALSE", "Headline" => _("Samba workstations"), "Text" => _("List of Samba workstations the user is allowed to login. Empty means every workstation."). ' '. _("Can be left empty.")), "437" => array ("ext" => "FALSE", "Headline" => _("Home path"), - "Text" => _("UNC-path (\\\\server\\share) of homedirectory. $%s and $%s are replaced with user- and groupname."). ' '. _("Can be left empty."), - "variables" => array('user', 'group')), + "Text" => _('UNC-path (\\\\server\\share) of homedirectory. $user and $group are replaced with user- and groupname.'). ' '. _("Can be left empty.")), "438" => array ("ext" => "FALSE", "Headline" => _("Domain"), "Text" => _("Windows-Domain of user."). ' '. _("Can be left empty.")), "457" => array ("ext" => "FALSE", "Headline" => _("Save profile"), diff --git a/lam/lib/modules/sambaAccount.inc b/lam/lib/modules/sambaAccount.inc index 8b011a59..2f6f60cd 100644 --- a/lam/lib/modules/sambaAccount.inc +++ b/lam/lib/modules/sambaAccount.inc @@ -348,16 +348,13 @@ class sambaAccount extends baseModule { "Text" => _("Drive letter assigned on windows workstations as homedirectory.")), "homePath" => array( "ext" => "FALSE", "Headline" => _("Home path"), - "Text" => _("UNC-path (\\\\server\\share) of homedirectory. $%s and $%s are replaced with user- and groupname."). ' '. _("Can be left empty."), - "variables" => array('user', 'group')), + "Text" => _('UNC-path (\\\\server\\share) of homedirectory. $user and $group are replaced with user- and groupname.'). ' '. _("Can be left empty.")), "profilePath" => array( "ext" => "FALSE", "Headline" => _("Profile path"), - "Text" => _("Path of the user profile. Can be a local absolute path or a UNC-path (\\\\server\\share). $%s and $%s are replaced with user- and groupname."). ' '. _("Can be left empty."), - "variables" => array('user', 'group')), + "Text" => _('Path of the user profile. Can be a local absolute path or a UNC-path (\\\\server\\share). $user and $group are replaced with user- and groupname.'). ' '. _("Can be left empty.")), "scriptPath" => array( "ext" => "FALSE", "Headline" => _("Logon script"), - "Text" => _("Filename and -path relative to netlogon-share which should be executed on logon. $%s and $%s are replaced with user- and groupname."). ' '. _("Can be left empty."), - "variables" => array('user', 'group')), + "Text" => _('Filename and -path relative to netlogon-share which should be executed on logon. $user and $group are replaced with user- and groupname.'). ' '. _("Can be left empty.")), "workstations" => array( "ext" => "FALSE", "Headline" => _("Samba workstations"), "Text" => _("Comma separated list of Samba workstations the user is allowed to login. Empty means every workstation."). ' '. _("Can be left empty.")), diff --git a/lam/lib/modules/sambaSamAccount.inc b/lam/lib/modules/sambaSamAccount.inc index 79e7747b..ca27dc95 100644 --- a/lam/lib/modules/sambaSamAccount.inc +++ b/lam/lib/modules/sambaSamAccount.inc @@ -163,16 +163,13 @@ class sambaSamAccount extends baseModule { "Text" => _("Drive letter assigned on windows workstations as homedirectory.")), "homePath" => array( "ext" => "FALSE", "Headline" => _("Home path"), - "Text" => _("UNC-path (\\\\server\\share) of homedirectory. $%s and $%s are replaced with user- and groupname."). ' '. _("Can be left empty."), - "variables" => array('user', 'group')), + "Text" => _('UNC-path (\\\\server\\share) of homedirectory. $user and $group are replaced with user- and groupname.'). ' '. _("Can be left empty.")), "profilePath" => array( "ext" => "FALSE", "Headline" => _("Profile path"), - "Text" => _("Path of the user profile. Can be a local absolute path or a UNC-path (\\\\server\\share). $%s and $%s are replaced with user- and groupname."). ' '. _("Can be left empty."), - "variables" => array('user', 'group')), + "Text" => _('Path of the user profile. Can be a local absolute path or a UNC-path (\\\\server\\share). $user and $group are replaced with user- and groupname.'). ' '. _("Can be left empty.")), "scriptPath" => array( "ext" => "FALSE", "Headline" => _("Logon script"), - "Text" => _("Filename and -path relative to netlogon-share which should be executed on logon. $%s and $%s are replaced with user- and groupname."). ' '. _("Can be left empty."), - "variables" => array('user', 'group')), + "Text" => _('Filename and -path relative to netlogon-share which should be executed on logon. $user and $group are replaced with user- and groupname.'). ' '. _("Can be left empty.")), "workstations" => array( "ext" => "FALSE", "Headline" => _("Samba workstations"), "Text" => _("Comma separated list of Samba workstations the user is allowed to login. Empty means every workstation."). ' '. _("Can be left empty.")), @@ -181,8 +178,8 @@ class sambaSamAccount extends baseModule { "Text" => _("This is the SID of the user's primary Windows group.")), "ridUpload" => array( "ext" => "FALSE", "Headline" => _("Samba RID"), - "Text" => _("This is the relative ID number for your Windows account. You can either enter a number or one of these special accounts: %s. If you leave this empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."), - "variables" => implode(", ", $this->rids)), + "Text" => _("This is the relative ID number for your Windows account. You can either enter a number or one of these special accounts: ") . + implode(", ", array_keys($this->rids)) . "

" . _("If you leave this empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase.")), "ridUploadHost" => array( "ext" => "FALSE", "Headline" => _("Samba RID"), "Text" => _("This is the relative ID number for your host account. If you leave this empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase.")),