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

added auto value for GECOS in upload

This commit is contained in:
Roland Gruber 2005-06-07 18:28:28 +00:00
parent b7cbe60f61
commit 675a666497
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -321,7 +321,7 @@ class posixAccount extends baseModule {
), ),
'gecos' => array( 'gecos' => array(
"Headline" => _("Gecos"), "Headline" => _("Gecos"),
"Text" => _("User description. If left empty sur- and give name will be used.") "Text" => _("User description. If left empty first and last name will be used.")
), ),
'gidNumber' => array( 'gidNumber' => array(
"Headline" => _("Primary group"), "Headline" => _("Primary group"),
@ -1221,8 +1221,9 @@ class posixAccount extends baseModule {
array_push($errMsg, array($i)); array_push($errMsg, array($i));
$triggered_messages[] = $errMsg; $triggered_messages[] = $errMsg;
} }
// GECOS // TODO fill default values // GECOS
if (($rawAccounts[$i][$ids['posixAccount_gecos']] != "") && (get_preg($rawAccounts[$i][$ids['posixAccount_gecos']], 'gecos'))) { if ($rawAccounts[$i][$ids['posixAccount_gecos']] != "") {
if (get_preg($rawAccounts[$i][$ids['posixAccount_gecos']], 'gecos')) {
$partialAccounts[$i]['gecos'] = $rawAccounts[$i][$ids['posixAccount_gecos']]; $partialAccounts[$i]['gecos'] = $rawAccounts[$i][$ids['posixAccount_gecos']];
} }
else { else {
@ -1230,6 +1231,20 @@ class posixAccount extends baseModule {
array_push($errMsg, array($i)); array_push($errMsg, array($i));
$triggered_messages[] = $errMsg; $triggered_messages[] = $errMsg;
} }
}
else {
$gecos = "";
if (($rawAccounts[$i][$ids['inetOrgPerson_firstName']] != "") && ($rawAccounts[$i][$ids['inetOrgPerson_lastName']] != "")) {
$gecos = $rawAccounts[$i][$ids['inetOrgPerson_firstName']] . " " . $rawAccounts[$i][$ids['inetOrgPerson_lastName']];
if ($rawAccounts[$i][$ids['inetOrgPerson_telephone']] != "") {
$gecos = $gecos . ",," . $rawAccounts[$i][$ids['inetOrgPerson_telephone']]; // double "," because room is unknown
if ($rawAccounts[$i][$ids['inetOrgPerson_fax']] != "") {
$gecos = $gecos . "," . $rawAccounts[$i][$ids['inetOrgPerson_fax']];
}
}
}
if ($gecos != "") $partialAccounts[$i]['gecos'] = $gecos;
}
// user specific attributes // user specific attributes
if ($this->scope == 'user') { if ($this->scope == 'user') {
// user name // user name