made inetOrgPerson independent from posixAccount
This commit is contained in:
Roland Gruber
parent
c15f355e19
commit
697893fbc0
|
|
@ -433,6 +433,7 @@ function get_preg($argument, $regexp) {
|
|||
case 'password': // fixme where do i get an exact regexp?
|
||||
$pregexpr = '/^([[:alnum:]\\ \\|\\#\\*\\,\\.\\;\\:\\_\\+\\!\\%\\&\\/\\?\\{\\(\\)\\}-])*$/u';
|
||||
break;
|
||||
case 'cn':
|
||||
case 'groupname': // first character must be a letter. All letters, numbers, space and ._- are allowed characters
|
||||
case 'username': // first character must be a letter. All letters, numbers, space and ._- are allowed characters
|
||||
$pregexpr = '/^[[:alpha:]]([[:alnum:]\\.\\ \\_-])*$/u';
|
||||
|
|
@ -444,7 +445,6 @@ function get_preg($argument, $regexp) {
|
|||
case 'hostname': // first character must be letter, last must be $. Only normal letters, numbers and ._- are allowed
|
||||
$pregexpr = '/^[a-zA-Z]([a-zA-Z0-9\\.\\_-])*\\$$/u';
|
||||
break;
|
||||
case 'cn':
|
||||
case 'realname': // Allow all letters, space and .-_
|
||||
$pregexpr = '/^[[:alpha:]]([[:alpha:]\\.\\ \\_-])*$/u';
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -72,7 +72,11 @@ class inetOrgPerson extends baseModule {
|
|||
$this->messages['title'][1] = array('ERROR', _('Account %s:') . ' inetOrgPerson_title', _('Please enter a valid job title!'));
|
||||
$this->messages['employeeType'][0] = array('ERROR', _('Employee type'), _('Please enter a valid employee type!'));
|
||||
$this->messages['employeeType'][1] = array('ERROR', _('Account %s:') . ' inetOrgPerson_type', _('Please enter a valid employee type!'));
|
||||
$this->messages['cn'][0] = array('ERROR', _('Account %s:') . ' inetOrgPerson_cn', _('Please enter a valid common name!'));
|
||||
$this->messages['cn'][0] = array('ERROR', _('Common name'), _('Please enter a valid common name!'));
|
||||
$this->messages['cn'][1] = array('ERROR', _('Account %s:') . ' inetOrgPerson_cn', _('Please enter a valid common name!'));
|
||||
$this->messages['uid'][0] = array('ERROR', _('User name'), _('User name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !'));
|
||||
$this->messages['uid'][1] = array('ERROR', _('Account %s:') . ' posixAccount_userName', _('User name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !'));
|
||||
$this->messages['uid'][3] = array('ERROR', _('Account %s:') . ' posixAccount_userName', _('User name already exists!'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -90,8 +94,10 @@ class inetOrgPerson extends baseModule {
|
|||
$return["is_base"] = true;
|
||||
// RDN attribute
|
||||
$return["RDN"] = array("cn" => "low");
|
||||
// LDAP filter
|
||||
$return["ldap_filter"] = array('or' => "(objectClass=inetOrgPerson)");
|
||||
// module dependencies
|
||||
$return['dependencies'] = array('depends' => array('posixAccount'), 'conflicts' => array()); // TODO make inetOrgPerson independent
|
||||
$return['dependencies'] = array('depends' => array(), 'conflicts' => array());
|
||||
// profile elements
|
||||
$return['profile_options'] = array(
|
||||
array(
|
||||
|
|
@ -120,13 +126,6 @@ class inetOrgPerson extends baseModule {
|
|||
// upload fields
|
||||
$return['upload_columns'] = array(
|
||||
array(
|
||||
'name' => 'inetOrgPerson_cn',
|
||||
'description' => _('Common name'),
|
||||
'help' => 'cn',
|
||||
'example' => _('Steve Miller'),
|
||||
'default' => '<i><inetOrgPerson_firstName> <inetOrgPerson_lastName></i>'
|
||||
),
|
||||
array(
|
||||
'name' => 'inetOrgPerson_firstName',
|
||||
'description' => _('First name'),
|
||||
'help' => 'givenName',
|
||||
|
|
@ -200,6 +199,27 @@ class inetOrgPerson extends baseModule {
|
|||
'example' => _('user@company.com')
|
||||
)
|
||||
);
|
||||
// cn and uid for upload (only if posixAccount is not loaded)
|
||||
if ($_SESSION['loggedIn']) {
|
||||
$modules = $_SESSION['config']->get_AccountModules($this->get_scope());
|
||||
if (!in_array('posixAccount', $modules)) {
|
||||
$return['upload_columns'][] = array(
|
||||
'name' => 'inetOrgPerson_cn',
|
||||
'description' => _('Common name'),
|
||||
'help' => 'cn',
|
||||
'example' => _('Steve Miller'),
|
||||
'default' => '<i><inetOrgPerson_firstName> <inetOrgPerson_lastName></i>'
|
||||
);
|
||||
$return['upload_columns'][] = array(
|
||||
'name' => 'inetOrgPerson_userName',
|
||||
'description' => _('User name'),
|
||||
'help' => 'uid',
|
||||
'example' => _('smiller'),
|
||||
'unique' => true,
|
||||
'required' => true
|
||||
);
|
||||
}
|
||||
}
|
||||
// Unix workstations for upload
|
||||
if ($_SESSION['ldap']->supports_unix_hosts) {
|
||||
$return['upload_columns'][] = array(
|
||||
|
|
@ -222,9 +242,16 @@ class inetOrgPerson extends baseModule {
|
|||
'postalAddress',
|
||||
'telephoneNumber',
|
||||
'mobileTelephoneNumber',
|
||||
'facimilieTelefonNumber',
|
||||
'facimilieTelephoneNumber',
|
||||
'mail'
|
||||
);
|
||||
if ($_SESSION['loggedIn']) {
|
||||
$modules = $_SESSION['config']->get_AccountModules($this->get_scope());
|
||||
if (!in_array('posixAccount', $modules)) {
|
||||
$return['PDF_fields'][] = 'uid';
|
||||
$return['PDF_fields'][] = 'cn';
|
||||
}
|
||||
}
|
||||
// help Entries
|
||||
$return['help'] = array (
|
||||
'user' => array (
|
||||
|
|
@ -276,16 +303,18 @@ class inetOrgPerson extends baseModule {
|
|||
"Headline" => _("eMail address"),
|
||||
"Text" => _("eMail address")
|
||||
),
|
||||
'cn' => array (
|
||||
"Headline" => _("Common name"),
|
||||
"Text" => _("This is the natural name of the user. If empty, the first and last name is used.")
|
||||
),
|
||||
'uid' => array(
|
||||
"Headline" => _("User name"),
|
||||
"Text" => _("User name of the user who should be created. Valid characters are: a-z,0-9, .-_. LAM does not allow a number as first character because useradd also does not allow it. LAM does not allow capital letters A-Z because it can cause several problems. If user name is already used user name will be expanded with a number. The next free number will be used. Warning: Older systems have problems with user names longer than 8 characters. You can not log in to Windows if user name is longer than 16 characters.")
|
||||
),
|
||||
'workstations' => array (
|
||||
"Headline" => _("Unix workstations"),
|
||||
"Text" => _("Please enter a comma separated list of host names where this user is allowed to log in. Can be left empty.")
|
||||
)
|
||||
),
|
||||
'host' => array(
|
||||
'description' => array (
|
||||
"Headline" => _("Description"),
|
||||
"Text" => _("Host description. If left empty host name will be used.")
|
||||
)
|
||||
)
|
||||
);
|
||||
|
||||
|
|
@ -369,6 +398,32 @@ class inetOrgPerson extends baseModule {
|
|||
$this->attributes['postalAddress'][0] = $post['postalAddress'];
|
||||
$this->attributes['employeeType'][0] = $post['employeeType'];
|
||||
|
||||
$modules = $_SESSION['config']->get_AccountModules($this->get_scope());
|
||||
if (!in_array('posixAccount', $modules)) {
|
||||
// uid
|
||||
if (!get_preg($post['userName'], 'username')) {
|
||||
$triggered_messages['uid'][] = $this->messages['uid'][0];
|
||||
}
|
||||
else {
|
||||
$this->attributes['uid'][0] = $post['userName'];
|
||||
}
|
||||
// cn
|
||||
if ($post['cn'] == '') {
|
||||
if ($post['givenName'] != '') {
|
||||
$this->attributes['cn'][0] = $post['givenName'] . " " . $post['sn'];
|
||||
}
|
||||
else {
|
||||
$this->attributes['cn'][0] = $post['sn'];
|
||||
}
|
||||
}
|
||||
else {
|
||||
$this->attributes['cn'][0] = $post['cn'];
|
||||
}
|
||||
if (!get_preg($this->attributes['cn'][0], 'cn')) {
|
||||
$triggered_messages['cn'][] = $this->messages['cn'][0];
|
||||
}
|
||||
}
|
||||
|
||||
// handle host-attribute in on epice because it's not set by default
|
||||
if (isset($this->attributes['host'])) {
|
||||
$host = $post['host'];
|
||||
|
|
@ -401,23 +456,13 @@ class inetOrgPerson extends baseModule {
|
|||
* It will output a complete html-table
|
||||
*/
|
||||
function display_html_attributes(&$post) {
|
||||
$return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('Description') ),
|
||||
1 => array ( 'kind' => 'input', 'name' => 'description', 'type' => 'text', 'size' => '30',
|
||||
'maxlength' => '255', 'value' => $this->attributes['description'][0] ),
|
||||
2 => array ('kind' => 'help', 'value' => 'description'));
|
||||
if (isset($this->attributes['host'])) {
|
||||
if (is_array($this->attributes['host'])) {
|
||||
$hostvalue .= implode(",", $this->attributes['host']);
|
||||
}
|
||||
$return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('Unix workstations') ),
|
||||
1 => array ( 'kind' => 'input', 'name' => 'host', 'type' => 'text', 'size' => '20',
|
||||
'maxlength' => '255', 'value' => $hostvalue ),
|
||||
2 => array ('kind' => 'help', 'value' => 'workstations'));
|
||||
}
|
||||
$return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('Job title') ),
|
||||
1 => array ( 'kind' => 'input', 'name' => 'title', 'type' => 'text', 'size' => '10',
|
||||
'value' => $this->attributes['title'][0] ),
|
||||
2 => array ('kind' => 'help', 'value' => 'title'));
|
||||
$modules = $_SESSION['config']->get_AccountModules($this->get_scope());
|
||||
if (!in_array('posixAccount', $modules)) {
|
||||
$return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('User name') . '*' ),
|
||||
1 => array ( 'kind' => 'input', 'name' => 'userName', 'type' => 'text', 'size' => '30',
|
||||
'maxlength' => '255', 'value' => $this->attributes['uid'][0] ),
|
||||
2 => array ('kind' => 'help', 'value' => 'uid'));
|
||||
}
|
||||
$return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('First name') ),
|
||||
1 => array ( 'kind' => 'input', 'name' => 'givenName', 'type' => 'text', 'size' => '30',
|
||||
'maxlength' => '255', 'value' => $this->attributes['givenName'][0] ),
|
||||
|
|
@ -426,6 +471,16 @@ class inetOrgPerson extends baseModule {
|
|||
1 => array ( 'kind' => 'input', 'name' => 'sn', 'type' => 'text', 'size' => '30',
|
||||
'maxlength' => '255', 'value' => $this->attributes['sn'][0] ),
|
||||
2 => array ('kind' => 'help', 'value' => 'sn'));
|
||||
if (!in_array('posixAccount', $modules)) {
|
||||
$return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('Common name') . '*' ),
|
||||
1 => array ( 'kind' => 'input', 'name' => 'cn', 'type' => 'text', 'size' => '30',
|
||||
'maxlength' => '255', 'value' => $this->attributes['cn'][0] ),
|
||||
2 => array ('kind' => 'help', 'value' => 'cn'));
|
||||
}
|
||||
$return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('Job title') ),
|
||||
1 => array ( 'kind' => 'input', 'name' => 'title', 'type' => 'text', 'size' => '30',
|
||||
'value' => $this->attributes['title'][0] ),
|
||||
2 => array ('kind' => 'help', 'value' => 'title'));
|
||||
$return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('Employee type') ),
|
||||
1 => array ( 'kind' => 'input', 'name' => 'employeeType', 'type' => 'text', 'size' => '30',
|
||||
'maxlength' => '255', 'value' => $this->attributes['employeeType'][0] ),
|
||||
|
|
@ -458,6 +513,19 @@ class inetOrgPerson extends baseModule {
|
|||
1 => array ( 'kind' => 'input', 'name' => 'mail', 'type' => 'text', 'size' => '30',
|
||||
'maxlength' => '255', 'value' => $this->attributes['mail'][0] ),
|
||||
2 => array ('kind' => 'help', 'value' => 'mail'));
|
||||
$return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('Description') ),
|
||||
1 => array ( 'kind' => 'input', 'name' => 'description', 'type' => 'text', 'size' => '30',
|
||||
'maxlength' => '255', 'value' => $this->attributes['description'][0] ),
|
||||
2 => array ('kind' => 'help', 'value' => 'description'));
|
||||
if (isset($this->attributes['host'])) {
|
||||
if (is_array($this->attributes['host'])) {
|
||||
$hostvalue .= implode(",", $this->attributes['host']);
|
||||
}
|
||||
$return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('Unix workstations') ),
|
||||
1 => array ( 'kind' => 'input', 'name' => 'host', 'type' => 'text', 'size' => '30',
|
||||
'maxlength' => '255', 'value' => $hostvalue ),
|
||||
2 => array ('kind' => 'help', 'value' => 'workstations'));
|
||||
}
|
||||
return $return;
|
||||
}
|
||||
|
||||
|
|
@ -470,19 +538,22 @@ class inetOrgPerson extends baseModule {
|
|||
* @see baseModule#get_pdfEntries
|
||||
*/
|
||||
function get_pdfEntries($account_type = "user") {
|
||||
return array( 'inetOrgPerson_description' => array('<block><key>' . _('Description') . '</key><value>' . $this->attributes['description'][0] . '</value></block>'),
|
||||
'inetOrgPerson_host' => array('<block><key>' . _('Unix workstations') . '</key><value>' . $this->attributes['host'][0] . '</value></block>'),
|
||||
'inetOrgPerson_title' => array('<block><key>' . _('Job title') . '</key><value>' . $this->attributes['title'][0] . '</value></block>'),
|
||||
'inetOrgPerson_givenName' => array('<block><key>' . _('First name') . '</key><value>' . $this->attributes['givenName'][0] . '</value></block>'),
|
||||
'inetOrgPerson_sn' => array('<block><key>' . _('Last name') . '</key><value>' . $this->attributes['sn'][0] . '</value></block>'),
|
||||
'inetOrgPerson_employeeType' => array('<block><key>' . _('Employee type') . '</key><value>' . $this->attributes['employeeType'][0]),
|
||||
'inetOrgPerson_street' => array('<block><key>' . _('Street') . '</key><value>' . $this->attributes['street'] . '</value></block>'),
|
||||
'inetOrgPerson_postalCode' => array('<block><key>' . _('Postal code') . '</key><value>' . $this->attributes['postalCode'][0] . '</value></block>'),
|
||||
'inetOrgPerson_postalAddress' => array('<block><key>' . _('Postal address') . '</key><value>' . $this->attributes['postalAddress'][0] . '</value></block>'),
|
||||
'inetOrgPerson_telephoneNumber' => array('<block><key>' . _('Telephone number') . '</key><value>' . $this->attributes['telephoneNumber'][0] . '</value></block>'),
|
||||
'inetOrgPerson_mobileTelephoneNumber' => array('<block><key>' . _('Mobile number') . '</key><value>' . $this->attributes['mobileTelephoneNumber'][0] . '</value></block>'),
|
||||
'inetOrgPerson_facimileTelefonNumber' => array('<block><key>' . _('Fax number') . '</key><value>' . $this->attributes['facsimileTelephoneNumber'][0] . '</value></block>'),
|
||||
'inetOrgPerson_mail' => array('<block><key>' . _('eMail address') . '</key><value>' . $this->attributes['mail'][0] . '</value></block>'));
|
||||
return array(
|
||||
'inetOrgPerson_description' => array('<block><key>' . _('Description') . '</key><value>' . $this->attributes['description'][0] . '</value></block>'),
|
||||
'inetOrgPerson_host' => array('<block><key>' . _('Unix workstations') . '</key><value>' . $this->attributes['host'][0] . '</value></block>'),
|
||||
'inetOrgPerson_title' => array('<block><key>' . _('Job title') . '</key><value>' . $this->attributes['title'][0] . '</value></block>'),
|
||||
'inetOrgPerson_givenName' => array('<block><key>' . _('First name') . '</key><value>' . $this->attributes['givenName'][0] . '</value></block>'),
|
||||
'inetOrgPerson_sn' => array('<block><key>' . _('Last name') . '</key><value>' . $this->attributes['sn'][0] . '</value></block>'),
|
||||
'inetOrgPerson_employeeType' => array('<block><key>' . _('Employee type') . '</key><value>' . $this->attributes['employeeType'][0]),
|
||||
'inetOrgPerson_street' => array('<block><key>' . _('Street') . '</key><value>' . $this->attributes['street'][0] . '</value></block>'),
|
||||
'inetOrgPerson_postalCode' => array('<block><key>' . _('Postal code') . '</key><value>' . $this->attributes['postalCode'][0] . '</value></block>'),
|
||||
'inetOrgPerson_postalAddress' => array('<block><key>' . _('Postal address') . '</key><value>' . $this->attributes['postalAddress'][0] . '</value></block>'),
|
||||
'inetOrgPerson_telephoneNumber' => array('<block><key>' . _('Telephone number') . '</key><value>' . $this->attributes['telephoneNumber'][0] . '</value></block>'),
|
||||
'inetOrgPerson_mobileTelephoneNumber' => array('<block><key>' . _('Mobile number') . '</key><value>' . $this->attributes['mobileTelephoneNumber'][0] . '</value></block>'),
|
||||
'inetOrgPerson_facimileTelephoneNumber' => array('<block><key>' . _('Fax number') . '</key><value>' . $this->attributes['facsimileTelephoneNumber'][0] . '</value></block>'),
|
||||
'inetOrgPerson_mail' => array('<block><key>' . _('eMail address') . '</key><value>' . $this->attributes['mail'][0] . '</value></block>'),
|
||||
'inetOrgPerson_cn' => array('<block><key>' . _('Common name') . '</key><value>' . $this->attributes['cn'][0] . '</value></block>'),
|
||||
'inetOrgPerson_uid' => array('<block><key>' . _('User name') . '</key><value>' . $this->attributes['uid'][0] . '</value></block>'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -628,25 +699,6 @@ class inetOrgPerson extends baseModule {
|
|||
$triggered_messages[] = $errMsg;
|
||||
}
|
||||
}
|
||||
// cn
|
||||
if ($rawAccounts[$i][$ids['inetOrgPerson_cn']] != "") {
|
||||
if (get_preg($rawAccounts[$i][$ids['inetOrgPerson_cn']], 'cn')) {
|
||||
$partialAccounts[$i]['cn'] = $rawAccounts[$i][$ids['inetOrgPerson_cn']];
|
||||
}
|
||||
else {
|
||||
$errMsg = $this->messages['cn'][0];
|
||||
array_push($errMsg, array($i));
|
||||
$triggered_messages[] = $errMsg;
|
||||
}
|
||||
}
|
||||
else {
|
||||
if ($partialAccounts[$i]['givenName'] != "") {
|
||||
$partialAccounts[$i]['cn'] = $partialAccounts[$i]['givenName'] . " " . $partialAccounts[$i]['sn'];
|
||||
}
|
||||
else {
|
||||
$partialAccounts[$i]['cn'] = $partialAccounts[$i]['sn'];
|
||||
}
|
||||
}
|
||||
// Unix workstations
|
||||
if ($rawAccounts[$i][$ids['inetOrgPerson_hosts']] != "") {
|
||||
if (get_preg($rawAccounts[$i][$ids['inetOrgPerson_hosts']], 'unixhost')) {
|
||||
|
|
@ -658,6 +710,48 @@ class inetOrgPerson extends baseModule {
|
|||
$triggered_messages[] = $errMsg;
|
||||
}
|
||||
}
|
||||
$modules = $_SESSION['config']->get_AccountModules($this->get_scope());
|
||||
if (!in_array('posixAccount', $modules)) {
|
||||
// cn
|
||||
if ($rawAccounts[$i][$ids['inetOrgPerson_cn']] != "") {
|
||||
if (get_preg($rawAccounts[$i][$ids['inetOrgPerson_cn']], 'cn')) {
|
||||
$partialAccounts[$i]['cn'] = $rawAccounts[$i][$ids['inetOrgPerson_cn']];
|
||||
}
|
||||
else {
|
||||
$errMsg = $this->messages['cn'][1];
|
||||
array_push($errMsg, array($i));
|
||||
$triggered_messages[] = $errMsg;
|
||||
}
|
||||
}
|
||||
else {
|
||||
if ($partialAccounts[$i]['givenName'] != "") {
|
||||
$partialAccounts[$i]['cn'] = $partialAccounts[$i]['givenName'] . " " . $partialAccounts[$i]['sn'];
|
||||
}
|
||||
else {
|
||||
$partialAccounts[$i]['cn'] = $partialAccounts[$i]['sn'];
|
||||
}
|
||||
}
|
||||
// uid
|
||||
// get list of existing users
|
||||
$dnUsers = $_SESSION['cache']->get_cache('uid', 'inetOrgPerson', '*');
|
||||
$existingUsers = array();
|
||||
foreach ($dnUsers as $dn) {
|
||||
$existingUsers[] = $dn[0];
|
||||
}
|
||||
if (in_array($rawAccounts[$i][$ids['inetOrgPerson_userName']], $existingUsers)) {
|
||||
$errMsg = $this->messages['uid'][3];
|
||||
array_push($errMsg, array($i));
|
||||
$triggered_messages[] = $errMsg;
|
||||
}
|
||||
elseif (get_preg($rawAccounts[$i][$ids['inetOrgPerson_userName']], 'username')) {
|
||||
$partialAccounts[$i]['uid'] = $rawAccounts[$i][$ids['inetOrgPerson_userName']];
|
||||
}
|
||||
else {
|
||||
$errMsg = $this->messages['uid'][1];
|
||||
array_push($errMsg, array($i));
|
||||
$triggered_messages[] = $errMsg;
|
||||
}
|
||||
}
|
||||
}
|
||||
return $triggered_messages;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -73,12 +73,12 @@ class posixAccount extends baseModule {
|
|||
$this->messages['userPassword'][3] = array('ERROR', _('Password'), _('You cannot use this password options at the same time.'));
|
||||
$this->messages['userPassword'][4] = array('ERROR', _('Account %s:') . ' posixAccount_password', _('Password contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and #*,.;:_-+!$%&/|?{[()]}= !'));
|
||||
$this->messages['uid'][0] = array('INFO', _('UID'), _('UID has changed. Do you want to change home directory?'));
|
||||
$this->messages['uid'][1] = array('WARN', _('Username'), _('You are using a capital letters. This can cause problems because windows isn\'t case-sensitive.'));
|
||||
$this->messages['uid'][2] = array('ERROR', _('Username'), _('Username contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !'));
|
||||
$this->messages['uid'][3] = array('WARN', _('Hostname'), _('You are using a capital letters. This can cause problems because windows isn\'t case-sensitive.'));
|
||||
$this->messages['uid'][4] = array('ERROR', _('Hostname'), _('Hostname contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ ! Host name must end with $ !'));
|
||||
$this->messages['uid'][5] = array('WARN', _('Username'), _('User name in use. Selected next free user name.'));
|
||||
$this->messages['uid'][6] = array('WARN', _('Hostname'), _('Host name in use. Selected next free host name.'));
|
||||
$this->messages['uid'][1] = array('WARN', _('User name'), _('You are using a capital letters. This can cause problems because windows isn\'t case-sensitive.'));
|
||||
$this->messages['uid'][2] = array('ERROR', _('User name'), _('User name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !'));
|
||||
$this->messages['uid'][3] = array('WARN', _('Host name'), _('You are using a capital letters. This can cause problems because windows isn\'t case-sensitive.'));
|
||||
$this->messages['uid'][4] = array('ERROR', _('Host name'), _('Host name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ ! Host name must end with $ !'));
|
||||
$this->messages['uid'][5] = array('WARN', _('User name'), _('User name in use. Selected next free user name.'));
|
||||
$this->messages['uid'][6] = array('WARN', _('Host name'), _('Host name in use. Selected next free host name.'));
|
||||
$this->messages['uid'][7] = array('ERROR', _('Account %s:') . ' posixAccount_userName', _('User name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !'));
|
||||
$this->messages['uid'][8] = array('ERROR', _('Account %s:') . ' posixAccount_hostName', _('Host name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !'));
|
||||
$this->messages['uid'][9] = array('ERROR', _('Account %s:') . ' posixAccount_userName', _('User name already exists!'));
|
||||
|
|
@ -88,6 +88,8 @@ class posixAccount extends baseModule {
|
|||
$this->messages['gecos'][0] = array('ERROR', _('Account %s:') . ' posixAccount_gecos', _('This gecos value is invalid!'));
|
||||
$this->messages['shell'][0] = array('ERROR', _('Account %s:') . ' posixAccount_shell', _('This login shell is invalid!'));
|
||||
$this->messages['passwordDisabled'][0] = array('ERROR', _('Account %s:') . ' posixAccount_passwordDisabled', _('This value can only be \"true\" or \"false\".'));
|
||||
$this->messages['cn'][0] = array('ERROR', _('Common name'), _('Please enter a valid common name!'));
|
||||
$this->messages['cn'][1] = array('ERROR', _('Account %s:') . ' inetOrgPerson_cn', _('Please enter a valid common name!'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -175,6 +177,12 @@ class posixAccount extends baseModule {
|
|||
'required' => true,
|
||||
'unique' => true
|
||||
),
|
||||
array(
|
||||
'name' => 'posixAccount_cn',
|
||||
'description' => _('Common name'),
|
||||
'help' => 'cn',
|
||||
'example' => _('Steve Miller')
|
||||
),
|
||||
array(
|
||||
'name' => 'posixAccount_uid',
|
||||
'description' => _('UID number'),
|
||||
|
|
@ -284,7 +292,8 @@ class posixAccount extends baseModule {
|
|||
'additionalGroups',
|
||||
'homeDirectory',
|
||||
'userPassword',
|
||||
'loginShell'
|
||||
'loginShell',
|
||||
'cn'
|
||||
);
|
||||
// help Entries
|
||||
$return['help'] = array(
|
||||
|
|
@ -318,8 +327,8 @@ class posixAccount extends baseModule {
|
|||
),
|
||||
'user' => array(
|
||||
'uid' => array(
|
||||
"Headline" => _("Username"),
|
||||
"Text" => _("Username of the user who should be created. Valid characters are: a-z,0-9, .-_. Lam does not allow a number as first character because useradd also does not allow it. Lam does not allow capital letters A-Z because it can cause several problems. If username is already used username will be expanded with a number. The next free number will be used. Warning: Older systems have problems with usernames longer than 8 characters. You can not log in to Windows if username is longer than 16 characters.")
|
||||
"Headline" => _("User name"),
|
||||
"Text" => _("User name of the user who should be created. Valid characters are: a-z,0-9, .-_. LAM does not allow a number as first character because useradd also does not allow it. LAM does not allow capital letters A-Z because it can cause several problems. If user name is already used user name will be expanded with a number. The next free number will be used. Warning: Older systems have problems with user names longer than 8 characters. You can not log in to Windows if user name is longer than 16 characters.")
|
||||
),
|
||||
'gecos' => array(
|
||||
"Headline" => _("Gecos"),
|
||||
|
|
@ -327,7 +336,7 @@ class posixAccount extends baseModule {
|
|||
),
|
||||
'gidNumber' => array(
|
||||
"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(
|
||||
"Headline" => _("Home directory"),
|
||||
|
|
@ -352,12 +361,16 @@ class posixAccount extends baseModule {
|
|||
'addgroup' => array(
|
||||
"Headline" => _("Additional groups"),
|
||||
"Text" => _("Hold the CTRL-key to (de)select multiple groups."). ' '. _("Can be left empty.")
|
||||
),
|
||||
'cn' => array (
|
||||
"Headline" => _("Common name"),
|
||||
"Text" => _("This is the natural name of the user. If empty, the first and last name or user name is used.")
|
||||
)
|
||||
),
|
||||
'host' => array(
|
||||
'uid' => array(
|
||||
"Headline" => _("Host name"),
|
||||
"Text" => _("Host name of the host which should be created. Valid characters are: a-z,0-9, .-_$. Lam does not allow a number as first character because useradd also does not allow it. Lam does not allow capital letters A-Z because it can cause several problems. Hostnames are always ending with $. If last character is not $ it will be added. If hostname is already used hostname will be expanded with a number. The next free number will be used.")
|
||||
"Text" => _("Host name of the host which should be created. Valid characters are: a-z,0-9, .-_$. LAM does not allow a number as first character because useradd also does not allow it. LAM does not allow capital letters A-Z because it can cause several problems. Host names are always ending with $. If last character is not $ it will be added. If host name is already used host name will be expanded with a number. The next free number will be used.")
|
||||
),
|
||||
'gecos' => array(
|
||||
"Headline" => _("Gecos"),
|
||||
|
|
@ -632,7 +645,26 @@ class posixAccount extends baseModule {
|
|||
$triggered_messages['homeDirectory'][] = $this->dynamic_Message('homeDirectory',0);
|
||||
// Load attributes
|
||||
$this->attributes['uid'][0] = $post['uid'];
|
||||
$this->attributes['cn'][0] = $this->attributes['uid'][0];
|
||||
$this->attributes['cn'][0] = $post['cn'];
|
||||
if ($this->attributes['cn'][0] == '') {
|
||||
if (isset($_SESSION[$this->base]->module['inetOrgPerson'])) {
|
||||
if ($_SESSION[$this->base]->module['inetOrgPerson']->attributes['givenName'][0]) {
|
||||
$this->attributes['cn'][0] = $_SESSION[$this->base]->module['inetOrgPerson']->attributes['givenName'][0] . " " . $_SESSION[$this->base]->module['inetOrgPerson']->attributes['sn'][0];
|
||||
}
|
||||
elseif ($_SESSION[$this->base]->module['inetOrgPerson']->attributes['sn'][0]) {
|
||||
$this->attributes['cn'][0] = $_SESSION[$this->base]->module['inetOrgPerson']->attributes['sn'][0];
|
||||
}
|
||||
else {
|
||||
$this->attributes['cn'][0] = $post['uid'];
|
||||
}
|
||||
}
|
||||
else {
|
||||
$this->attributes['cn'][0] = $post['uid'];
|
||||
}
|
||||
}
|
||||
if (!get_preg($this->attributes['cn'][0], 'cn')) {
|
||||
$triggered_messages['cn'][] = $this->messages['cn'][0];
|
||||
}
|
||||
$this->attributes['uidNumber'][0] = $post['uidNumber'];
|
||||
$this->attributes['gidNumber'][0] = $_SESSION['cache']->getgid($post['gidNumber']);
|
||||
// Check if UID is valid. If none value was entered, the next useable value will be inserted
|
||||
|
|
@ -854,9 +886,13 @@ class posixAccount extends baseModule {
|
|||
$shelllist = getshells(); // list of all valid shells
|
||||
|
||||
$return[] = array (
|
||||
0 => array('kind' => 'text', 'text' => _("Username").'*'),
|
||||
1 => array('kind' => 'input', 'name' => 'uid', 'type' => 'text', 'size' => '20', 'maxlength' => '20', 'value' => $this->attributes['uid'][0]),
|
||||
0 => array('kind' => 'text', 'text' => _("User name").'*'),
|
||||
1 => array('kind' => 'input', 'name' => 'uid', 'type' => 'text', 'size' => '30', 'maxlength' => '20', 'value' => $this->attributes['uid'][0]),
|
||||
2 => array('kind' => 'help', 'value' => 'uid'));
|
||||
$return[] = array (
|
||||
0 => array('kind' => 'text', 'text' => _("Common name").'*'),
|
||||
1 => array('kind' => 'input', 'name' => 'cn', 'type' => 'text', 'size' => '30', 'value' => $this->attributes['cn'][0]),
|
||||
2 => array('kind' => 'help', 'value' => 'cn'));
|
||||
$return[] = array(
|
||||
0 => array('kind' => 'text', 'text' => _('UID number').'*'),
|
||||
1 => array('kind' => 'input', 'name' => 'uidNumber', 'type' => 'text', 'size' => '6', 'maxlength' => '6', 'value' => $this->attributes['uidNumber'][0]),
|
||||
|
|
@ -890,13 +926,13 @@ class posixAccount extends baseModule {
|
|||
if ($_SESSION[$this->base]->isNewAccount) {
|
||||
$return[] = array(
|
||||
0 => array('kind' => 'text', 'text' => _('Password') ),
|
||||
1 => array('kind' => 'input', 'name' => 'userPassword', 'type' => 'password', 'size' => '20', 'maxlength' => '255', 'value' => $this->userPassword()),
|
||||
1 => array('kind' => 'input', 'name' => 'userPassword', 'type' => 'password', 'size' => '30', 'maxlength' => '255', 'value' => $this->userPassword()),
|
||||
2 => array('kind' => 'input', 'name' => 'genpass', 'type' => 'submit', 'value' => _('Generate password')));
|
||||
if ($post['userPassword2']!='') $password2 = $post['userPassword2'];
|
||||
else $password2 = $this->userPassword();
|
||||
$return[] = array(
|
||||
0 => array('kind' => 'text', 'text' => _('Repeat password')),
|
||||
1 => array('kind' => 'input', 'name' => 'userPassword2', 'type' => 'password', 'size' => '20', 'maxlength' => '255', 'value' => $password2),
|
||||
1 => array('kind' => 'input', 'name' => 'userPassword2', 'type' => 'password', 'size' => '30', 'maxlength' => '255', 'value' => $password2),
|
||||
2 => array('kind' => 'help', 'value' => 'userPassword'));
|
||||
}
|
||||
else {
|
||||
|
|
@ -1098,15 +1134,17 @@ class posixAccount extends baseModule {
|
|||
* @see baseModule#get_pdfEntries
|
||||
*/
|
||||
function get_pdfEntries($account_type = "user") {
|
||||
return array( 'posixAccount_uid' => array('<block><key>' . _('Username') . '</key><value>' . $this->attributes['uid'][0] . '</value></block>'),
|
||||
'posixAccount_uidNumber' => array('<block><key>' . _('UID number') . '</key><value>' . $this->attributes['uidNumber'][0] . '</value></block>'),
|
||||
'posixAccount_gidNumber' => array('<block><key>' . _('GID number') . '</key><value>' . $this->attributes['gidNumber'][0] . '</value></block>'),
|
||||
'posixAccount_gecos' => array('<block><key>' . _('Gecos') . '</key><value>' . $this->attributes['gecos'][0] . '</value></block>'),
|
||||
'posixAccount_primaryGroup' => array('<block><key>' . _('Primary group') . '</key><value>' . $_SESSION['cache']->getgrnam($this->attributes['gidNumber'][0]) . '</value></block>'),
|
||||
'posixAccount_additionalGroups' => array('<block><key>' . _('Additional groups') . '</key><value>' . '</value></block>'),
|
||||
'posixAccount_homeDirectory' => array('<block><key>' . _('Home directory') . '</key><value>' . $this->attributes['homeDirectory'][0] . '</value></block>'),
|
||||
'posixAccount_userPassword' => array('<block><key>' . _('Password') . '</key><value>' . $this->attributes['userPassword'][0] . '</value></block>'),
|
||||
'posixAccount_loginShell' => array('<block><key>' . _('Login shell') . '</key><value>' . $this->attributes['loginShell'][0] . '</value></block>'),
|
||||
return array(
|
||||
'posixAccount_uid' => array('<block><key>' . _('User name') . '</key><value>' . $this->attributes['uid'][0] . '</value></block>'),
|
||||
'posixAccount_cn' => array('<block><key>' . _('Common name') . '</key><value>' . $this->attributes['cn'][0] . '</value></block>'),
|
||||
'posixAccount_uidNumber' => array('<block><key>' . _('UID number') . '</key><value>' . $this->attributes['uidNumber'][0] . '</value></block>'),
|
||||
'posixAccount_gidNumber' => array('<block><key>' . _('GID number') . '</key><value>' . $this->attributes['gidNumber'][0] . '</value></block>'),
|
||||
'posixAccount_gecos' => array('<block><key>' . _('Gecos') . '</key><value>' . $this->attributes['gecos'][0] . '</value></block>'),
|
||||
'posixAccount_primaryGroup' => array('<block><key>' . _('Primary group') . '</key><value>' . $_SESSION['cache']->getgrnam($this->attributes['gidNumber'][0]) . '</value></block>'),
|
||||
'posixAccount_additionalGroups' => array('<block><key>' . _('Additional groups') . '</key><value>' . '</value></block>'),
|
||||
'posixAccount_homeDirectory' => array('<block><key>' . _('Home directory') . '</key><value>' . $this->attributes['homeDirectory'][0] . '</value></block>'),
|
||||
'posixAccount_userPassword' => array('<block><key>' . _('Password') . '</key><value>' . $this->attributes['userPassword'][0] . '</value></block>'),
|
||||
'posixAccount_loginShell' => array('<block><key>' . _('Login shell') . '</key><value>' . $this->attributes['loginShell'][0] . '</value></block>'),
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -1338,6 +1376,28 @@ class posixAccount extends baseModule {
|
|||
$partialAccounts[$i]['description'] = $rawAccounts[$i][$ids['posixAccount_hostName']];
|
||||
}
|
||||
}
|
||||
// cn
|
||||
if ($rawAccounts[$i][$ids['posixAccount_cn']] != "") {
|
||||
if (get_preg($rawAccounts[$i][$ids['posixAccount_cn']], 'cn')) {
|
||||
$partialAccounts[$i]['cn'] = $rawAccounts[$i][$ids['posixAccount_cn']];
|
||||
}
|
||||
else {
|
||||
$errMsg = $this->messages['cn'][1];
|
||||
array_push($errMsg, array($i));
|
||||
$triggered_messages[] = $errMsg;
|
||||
}
|
||||
}
|
||||
else {
|
||||
if ($partialAccounts[$i]['givenName']) {
|
||||
$partialAccounts[$i]['cn'] = $partialAccounts[$i]['givenName'] . " " . $partialAccounts[$i]['sn'];
|
||||
}
|
||||
elseif ($partialAccounts[$i]['sn']) {
|
||||
$partialAccounts[$i]['cn'] = $partialAccounts[$i]['sn'];
|
||||
}
|
||||
else {
|
||||
$partialAccounts[$i]['cn'] = $partialAccounts[$i]['uid'];
|
||||
}
|
||||
}
|
||||
}
|
||||
// host specific attributes
|
||||
elseif ($this->scope == 'host') {
|
||||
|
|
|
|||
Loading…
Reference in New Issue