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

removed managing description in file upload (done by inetOrgPerson or account)

This commit is contained in:
Roland Gruber 2010-02-15 17:09:43 +00:00
parent a5ed2d495d
commit b86ea7b33f
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,7 +132,7 @@ class posixAccount extends baseModule implements passwordService {
$return['LDAPaliases'] = array('commonName' => 'cn', 'userid' => 'uid'); $return['LDAPaliases'] = array('commonName' => 'cn', 'userid' => 'uid');
// managed attributes // managed attributes
$return['attributes'] = array('cn', 'uid', 'uidNumber', 'gidNumber', 'homeDirectory', $return['attributes'] = array('cn', 'uid', 'uidNumber', 'gidNumber', 'homeDirectory',
'userPassword', 'loginShell', 'gecos', 'description'); 'userPassword', 'loginShell', 'gecos');
if ($this->get_scope() == "user") { if ($this->get_scope() == "user") {
// self service search attributes // self service search attributes
$return['selfServiceSearchAttributes'] = array('uid'); $return['selfServiceSearchAttributes'] = array('uid');
@ -305,17 +305,6 @@ class posixAccount extends baseModule implements passwordService {
) )
); );
} }
if (isset($_SESSION['loggedIn']) && ($_SESSION['loggedIn'] === true)) {
$modules = $_SESSION['config']->get_AccountModules($this->get_scope());
if (!in_array('inetOrgPerson', $modules)) {
$return['upload_columns'][] =
array(
'name' => 'posixAccount_description',
'description' => _('Description'),
'help' => 'description'
);
}
}
// available PDF fields // available PDF fields
$return['PDF_fields'] = array( $return['PDF_fields'] = array(
'uid', 'uid',
@ -1434,13 +1423,6 @@ class posixAccount extends baseModule implements passwordService {
array_push($errMsg, array($i)); array_push($errMsg, array($i));
$errors[] = $errMsg; $errors[] = $errMsg;
} }
// description
$modules = $_SESSION['config']->get_AccountModules($this->get_scope());
if (!in_array('inetOrgPerson', $modules)) {
if ($rawAccounts[$i][$ids['posixAccount_description']] && ($rawAccounts[$i][$ids['posixAccount_description']] != '')) {
$partialAccounts[$i]['description'] = $rawAccounts[$i][$ids['posixAccount_description']];
}
}
// cn // cn
if ($rawAccounts[$i][$ids['posixAccount_cn']] != "") { if ($rawAccounts[$i][$ids['posixAccount_cn']] != "") {
if (get_preg($rawAccounts[$i][$ids['posixAccount_cn']], 'cn')) { if (get_preg($rawAccounts[$i][$ids['posixAccount_cn']], 'cn')) {