WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed help entries

This commit is contained in:
Roland Gruber 2005-06-02 20:30:18 +00:00
parent 029b30f954
commit ed3ccd66fe
2 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lam/lib/modules/inetOrgPerson.inc
View File

@ -220,7 +220,7 @@ class inetOrgPerson extends baseModule {
$return['help'] = array ( $return['help'] = array (
'user' => array ( 'user' => array (
'description' => array ( 'description' => array (
"Headline" => _("Gecos"), "Headline" => _("Description"),
"Text" => _("User description. If left empty sur- and give name will be used.") "Text" => _("User description. If left empty sur- and give name will be used.")
), ),
'title' => array ( 'title' => array (
@ -270,7 +270,7 @@ class inetOrgPerson extends baseModule {
), ),
'host' => array( 'host' => array(
'description' => array ( 'description' => array (
"Headline" => _("Gecos"), "Headline" => _("Description"),
"Text" => _("Host description. If left empty host name will be used.") "Text" => _("Host description. If left empty host name will be used.")
) )
) )

50
lam/lib/modules/posixAccount.inc
View File

@ -168,7 +168,7 @@ class posixAccount extends baseModule {
array( array(
'name' => 'posixAccount_userName', 'name' => 'posixAccount_userName',
'description' => _('User name'), 'description' => _('User name'),
'help' => 'userName', // TODO 'help' => 'uid',
'example' => _('smiller'), 'example' => _('smiller'),
'required' => true, 'required' => true,
'unique' => true 'unique' => true
@ -176,33 +176,33 @@ class posixAccount extends baseModule {
array( array(
'name' => 'posixAccount_uid', 'name' => 'posixAccount_uid',
'description' => _('UID number'), 'description' => _('UID number'),
'help' => 'uid', // TODO 'help' => 'uidNumber',
'example' => '1234' 'example' => '1234'
), ),
array( array(
'name' => 'posixAccount_group', 'name' => 'posixAccount_group',
'description' => _('Primary group'), 'description' => _('Primary group'),
'help' => 'group', // TODO 'help' => 'group_upload',
'example' => _('users'), 'example' => _('users'),
'required' => true 'required' => true
), ),
array( array(
'name' => 'posixAccount_additionalGroups', 'name' => 'posixAccount_additionalGroups',
'description' => _('Additional groups'), 'description' => _('Additional groups'),
'help' => 'additionalGroups', // TODO 'help' => 'addgroup_upload',
'example' => _('group01,group02') 'example' => _('group01,group02')
), ),
array( array(
'name' => 'posixAccount_homedir', 'name' => 'posixAccount_homedir',
'description' => _('Home directory'), 'description' => _('Home directory'),
'help' => 'homedir', // TODO 'help' => 'homeDirectory_upload',
'example' => _('/home/smiller'), 'example' => _('/home/smiller'),
'default' => '/home/<i>&lt;posixAccount_userName&gt;</i>' 'default' => '/home/<i>&lt;posixAccount_userName&gt;</i>'
), ),
array( array(
'name' => 'posixAccount_shell', 'name' => 'posixAccount_shell',
'description' => _('Login shell'), 'description' => _('Login shell'),
'help' => 'shell', // TODO 'help' => 'loginShell',
'example' => '/bin/bash', 'example' => '/bin/bash',
'values' => implode(", ", getshells()), 'values' => implode(", ", getshells()),
'default' => '/bin/bash' 'default' => '/bin/bash'
@ -210,13 +210,13 @@ class posixAccount extends baseModule {
array( array(
'name' => 'posixAccount_password', 'name' => 'posixAccount_password',
'description' => _('Password'), 'description' => _('Password'),
'help' => 'password', // TODO 'help' => 'userPassword',
'example' => _('secret') 'example' => _('secret')
), ),
array( array(
'name' => 'posixAccount_passwordDisabled', 'name' => 'posixAccount_passwordDisabled',
'description' => _('Lock password'), 'description' => _('Lock password'),
'help' => 'passwordDisabled', // TODO 'help' => 'userPassword_lock',
'example' => 'false', 'example' => 'false',
'values' => 'true, false', 'values' => 'true, false',
'default' => 'false' 'default' => 'false'
@ -235,7 +235,7 @@ class posixAccount extends baseModule {
array( array(
'name' => 'posixAccount_hostName', 'name' => 'posixAccount_hostName',
'description' => _('Host name'), 'description' => _('Host name'),
'help' => 'hostName', // TODO 'help' => 'uid',
'example' => _('pc01$'), 'example' => _('pc01$'),
'required' => true, 'required' => true,
'unique' => true 'unique' => true
@ -243,13 +243,13 @@ class posixAccount extends baseModule {
array( array(
'name' => 'posixAccount_uid', 'name' => 'posixAccount_uid',
'description' => _('UID number'), 'description' => _('UID number'),
'help' => 'uid', // TODO 'help' => 'uidNumber',
'example' => '1234' 'example' => '1234'
), ),
array( array(
'name' => 'posixAccount_group', 'name' => 'posixAccount_group',
'description' => _('Primary group'), 'description' => _('Primary group'),
'help' => 'group', // TODO 'help' => 'group_upload',
'example' => _('machines'), 'example' => _('machines'),
'required' => true 'required' => true
), ),
@ -302,6 +302,18 @@ class posixAccount extends baseModule {
"Headline" => _("UID number"), "Headline" => _("UID number"),
"Text" => _("If empty UID number will be generated automaticly.") "Text" => _("If empty UID number will be generated automaticly.")
), ),
'group_upload' => array(
"Headline" => _("Primary group"),
"Text" => _("The primary group for this account. You can insert a GID number or a group name.")
),
'addgroup_upload' => array(
"Headline" => _("Additional groups"),
"Text" => _("Here you can enter a list of additional group memberships. The group names are separated by commas.")
),
'homeDirectory_upload' => array(
"Headline" => _("Home directory"),
"Text" => _("Please enter the path to the user's home directory.")
),
'user' => array( 'user' => array(
'uid' => array( 'uid' => array(
"Headline" => _("Username"), "Headline" => _("Username"),
@ -313,7 +325,7 @@ class posixAccount extends baseModule {
), ),
'gidNumber' => array( 'gidNumber' => array(
"Headline" => _("Primary group"), "Headline" => _("Primary group"),
"Text" => _("The Primary Group the user should be member of.") "Text" => _("The Primary group the user should be member of.")
), ),
'homeDirectory' => array( 'homeDirectory' => array(
"Headline" => _("Home directory"), "Headline" => _("Home directory"),
@ -327,10 +339,13 @@ class posixAccount extends baseModule {
"Headline" => _("Use no password"), "Headline" => _("Use no password"),
"Text" => _("If checked no password will be used.") "Text" => _("If checked no password will be used.")
), ),
/*'userPassword_lock' =>*/ 'userPassword_lock' => array(
"Headline" => _("Account deactivated"),
"Text" => _("If checked account will be deactivated by putting a \"!\" before the encrypted password.")
),
'loginShell' => array( 'loginShell' => array(
"Headline" => _("Login shell"), "Headline" => _("Login shell"),
"Text" => _("To disable login use /bin/false. List of shells is read from lam/config/shells") "Text" => _("To disable login use /bin/false. The list of shells is read from lam/config/shells")
), ),
'addgroup' => array( 'addgroup' => array(
"Headline" => _("Additional groups"), "Headline" => _("Additional groups"),
@ -348,7 +363,11 @@ class posixAccount extends baseModule {
), ),
'gidNumber' => array( 'gidNumber' => array(
"Headline" => _("Primary group"), "Headline" => _("Primary group"),
"Text" => _("The Primary group the host should be member of.") "Text" => _("The primary group the host should be member of.")
),
'description' => array (
"Headline" => _("Description"),
"Text" => _("Host description. If left empty host name will be used.")
) )
) )
); );
@ -1187,7 +1206,6 @@ class posixAccount extends baseModule {
$partialAccounts[$i]['gidNumber'] = $rawAccounts[$i][$ids['posixAccount_group']]; $partialAccounts[$i]['gidNumber'] = $rawAccounts[$i][$ids['posixAccount_group']];
} }
if (get_preg($rawAccounts[$i][$ids['posixAccount_group']], 'groupname')) { if (get_preg($rawAccounts[$i][$ids['posixAccount_group']], 'groupname')) {
$partialAccounts[$i]['gidNumber'] = 42;
$gid = $_SESSION['cache']->getgid($rawAccounts[$i][$ids['posixAccount_group']]); $gid = $_SESSION['cache']->getgid($rawAccounts[$i][$ids['posixAccount_group']]);
if (is_numeric($gid)) { if (is_numeric($gid)) {
$partialAccounts[$i]['gidNumber'] = $gid; $partialAccounts[$i]['gidNumber'] = $gid;