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

set duplicate uid message to warning

This commit is contained in:
Roland Gruber 2018-08-12 10:38:56 +02:00
parent cb24a02efd
commit a35c4bc06d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,8 +108,8 @@ class posixAccount extends baseModule implements passwordService {
$this->messages['uid'][6] = array('WARN', _('Host name'), _('Host name in use (%s). Selected next free host name.')); $this->messages['uid'][6] = array('WARN', _('Host name'), _('Host name in use (%s). 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'][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'][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!') . ' ' . _('You might want to use %s instead of %s.') . ' %s'); $this->messages['uid'][9] = array('WARN', _('Account %s:') . ' posixAccount_userName', _('User name already exists!') . ' ' . _('You might want to use %s instead of %s.') . ' %s');
$this->messages['uid'][10] = array('ERROR', _('Account %s:') . ' posixAccount_hostName', _('Host name already exists!') . ' ' . _('You might want to use %s instead of %s.') . ' %s'); $this->messages['uid'][10] = array('WARN', _('Account %s:') . ' posixAccount_hostName', _('Host name already exists!') . ' ' . _('You might want to use %s instead of %s.') . ' %s');
$this->messages['gidNumber'][0] = array('ERROR', _('Account %s:') . ' posixAccount_group', _('LAM was unable to find a group with this name!')); $this->messages['gidNumber'][0] = array('ERROR', _('Account %s:') . ' posixAccount_group', _('LAM was unable to find a group with this name!'));
$this->messages['gidNumber'][1] = array('ERROR', _('Account %s:') . ' posixAccount_group', _('This GID number is invalid! Please provide either a number or a group name.')); $this->messages['gidNumber'][1] = array('ERROR', _('Account %s:') . ' posixAccount_group', _('This GID number is invalid! Please provide either a number or a group name.'));
$this->messages['gidNumber'][2] = array('INFO', _('GID number'), _('GID number has changed. To keep file ownership you have to run the following command as root: \'find / -gid %s -uid %s -exec chgrp %s {} \;\'')); $this->messages['gidNumber'][2] = array('INFO', _('GID number'), _('GID number has changed. To keep file ownership you have to run the following command as root: \'find / -gid %s -uid %s -exec chgrp %s {} \;\''));
@ -2599,7 +2599,7 @@ class posixAccount extends baseModule implements passwordService {
htmlspecialchars($existingUsers[$rawAccount[$ids['posixAccount_userName']]]))); htmlspecialchars($existingUsers[$rawAccount[$ids['posixAccount_userName']]])));
$errors[] = $errMsg; $errors[] = $errMsg;
} }
elseif (get_preg($rawAccount[$ids['posixAccount_userName']], 'username')) { if (get_preg($rawAccount[$ids['posixAccount_userName']], 'username')) {
$partialAccounts[$i]['uid'] = $rawAccount[$ids['posixAccount_userName']]; $partialAccounts[$i]['uid'] = $rawAccount[$ids['posixAccount_userName']];
} }
else { else {
@ -2709,7 +2709,7 @@ class posixAccount extends baseModule implements passwordService {
htmlspecialchars($existingUsers[$rawAccount[$ids['posixAccount_userName']]]))); htmlspecialchars($existingUsers[$rawAccount[$ids['posixAccount_userName']]])));
$errors[] = $errMsg; $errors[] = $errMsg;
} }
elseif (get_preg($rawAccount[$ids['posixAccount_hostName']], 'hostname')) { if (get_preg($rawAccount[$ids['posixAccount_hostName']], 'hostname')) {
$partialAccounts[$i]['uid'] = $rawAccount[$ids['posixAccount_hostName']]; $partialAccounts[$i]['uid'] = $rawAccount[$ids['posixAccount_hostName']];
$partialAccounts[$i]['cn'] = $rawAccount[$ids['posixAccount_hostName']]; $partialAccounts[$i]['cn'] = $rawAccount[$ids['posixAccount_hostName']];
} }