diff --git a/lam/help/help.inc b/lam/help/help.inc index 91c2e7a6..c465515e 100644 --- a/lam/help/help.inc +++ b/lam/help/help.inc @@ -34,6 +34,19 @@ $Id$ setlanguage(); +// generate help entry for translated list attributes +$types = getTypes(); +$entry206Example = ""; +for ($i = 0; $i < sizeof($types); $i++) { + $entry206Example .= "" . getTypeAlias($types[$i]) . ":

\n"; + $descriptions = getListAttributeDescriptions($types[$i]); + $attributes = array_keys($descriptions); + for ($a = 0; $a < sizeof($attributes); $a++) { + $entry206Example .= "#" . $attributes[$a] . ": " . $descriptions[$attributes[$a]] . "
"; + } + $entry206Example .= "

"; +} + $helpArray = array ( // 0 - 99 // any developer @@ -56,10 +69,10 @@ $helpArray = array ( _("Note") . ":

" . _("When using ldaps:// be sure to use exactly the same IP/domain name as in your certificate!")), - "202" => array ("ext" => "FALSE", "Headline" => _("Configuration wizard") . " - " . _("User/Group/Host suffix"), - "Text" => _("This is the suffix of the LDAP tree from where to search for user/group/host entries. Only entries in these subtrees will be displayed in the user/group/host list. When creating a new accont this will be the DN where it is saved.") . + "202" => array ("ext" => "FALSE", "Headline" => _("Configuration wizard") . " - " . _("LDAP suffix"), + "Text" => _("This is the suffix of the LDAP tree from where to search for LDAP entries. Only entries in this subtree will be displayed in the account list. When creating a new accont this will be the DN where it is saved.") . "

". - _("Examples"). + _("Example"). ":

". _("ou=People,dc=yourcompany,dc=com will read and store all accounts in this subtree.")), "203" => array ("ext" => "FALSE", "Headline" => _("Configuration wizard") . " - " . _("Tree suffix"), @@ -69,20 +82,10 @@ $helpArray = array ( ":

". _("dc=yourcompany,dc=com")), "206" => array ("ext" => "FALSE", "Headline" => _("Configuration wizard") . " - " . _("List attributes"), - "Text" => _("This is the list of attributes to show in the user/group/host list. The entries can either be predefined values, \"#attribute\", or individual ones, \"attribute:description\". Several entries are seperated by semicolons.") . - "

" . - _("Example") . - ": #homeDirectory;#uid;#uidNumber;#gidNumber;mail:Mail address


" . - _("Predefined values") . - ":

" . - _("Users") . - ": #uid, #uidNumber, #gidNumber, #cn, #host, #givenName, #sn, #homeDirectory, #loginShell, #mail, #gecos". - "
" . - _("Groups") . - ": #cn, #gidNumber, #memberUID, #member, #description". - "
" . - _("Hosts") . - ": #uid, #cn, #rid, #description"), + "Text" => _("This is the list of attributes to show in the account list. The entries can either be predefined values, \"#attribute\", or individual ones, \"attribute:description\". Several entries are seperated by semicolons.") . + "


" . + _("Example") . ": #homeDirectory;#uid;#uidNumber;#gidNumber;mail:Mail address

" . + "
" . _("Predefined values") . ":


" . $entry206Example), "207" => array ("ext" => "FALSE", "Headline" => _("Configuration wizard") . " - " . _("Valid users"), "Text" => _("This is a list of valid DN entries of all users that are allowed to login to LDAP Account Manager. The user names have to be separated by semicolons.") . "

" . @@ -108,8 +111,9 @@ $helpArray = array ( "Text" => _("This is the time in minutes which LAM caches its LDAP searches. Shorter times will stress LDAP more but decrease the possibility that changes are not identified.")), "216" => array ("ext" => "FALSE", "Headline" => _("Configuration wizard") . " - " . _("Text for user PDF"), "Text" => _("This text will appear on top of every user PDF file.")), - "217" => array ("ext" => "FALSE", "Headline" => _("Configuration wizard") . " - " . _("Account modules"), - "Text" => _("Here you can select which plugins you want to use for account management.")), + "217" => array ("ext" => "FALSE", "Headline" => _("Configuration wizard") . " - " . _("Account types and modules"), + "Text" => _("Here you can select which plugins you want to use for account management.") . "

" + . _("Account types define which sorts of LDAP entries (e.g. users and groups) should be managed. The account modules define which properties (e.g. Unix and Samba) can be edited.")), "230" => array ("ext" => "FALSE", "Headline" => _("Profile management") . " - " . _("Add profile"), "Text" => _("Please enter the name of the new profile and the password to change its settings. Profile names may contain letters, numbers and -/_.")), "231" => array ("ext" => "FALSE", "Headline" => _("Profile management") . " - " . _("Rename profile"), diff --git a/lam/templates/config/conftypes.php b/lam/templates/config/conftypes.php index 12989ccc..7feeec35 100644 --- a/lam/templates/config/conftypes.php +++ b/lam/templates/config/conftypes.php @@ -192,6 +192,11 @@ for ($i = 0; $i < sizeof($activeTypes); $i++) { echo "\n"; echo "" . _("LDAP suffix") . "\n"; echo "\n"; + echo ""; + echo ""; + echo "\"""; + echo "\n"; + echo "\n"; echo "\n"; // list attributes if (isset($_SESSION['conf_typeSettings']['attr_' . $activeTypes[$i]])) { @@ -203,6 +208,11 @@ for ($i = 0; $i < sizeof($activeTypes); $i++) { echo "\n"; echo "" . _("List attributes") . "\n"; echo "\n"; + echo ""; + echo ""; + echo "\"""; + echo "\n"; + echo "\n"; echo "\n"; echo " \n"; // remove button