diff --git a/lam/lib/modules/posixAccount.inc b/lam/lib/modules/posixAccount.inc index e12993e5..7dba38e3 100644 --- a/lam/lib/modules/posixAccount.inc +++ b/lam/lib/modules/posixAccount.inc @@ -132,7 +132,7 @@ class posixAccount extends baseModule implements passwordService { $return['LDAPaliases'] = array('commonName' => 'cn', 'userid' => 'uid'); // managed attributes $return['attributes'] = array('cn', 'uid', 'uidNumber', 'gidNumber', 'homeDirectory', - 'userPassword', 'loginShell', 'gecos', 'description'); + 'userPassword', 'loginShell', 'gecos'); if ($this->get_scope() == "user") { // self service search attributes $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 $return['PDF_fields'] = array( 'uid', @@ -1434,13 +1423,6 @@ class posixAccount extends baseModule implements passwordService { array_push($errMsg, array($i)); $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 if ($rawAccounts[$i][$ids['posixAccount_cn']] != "") { if (get_preg($rawAccounts[$i][$ids['posixAccount_cn']], 'cn')) {