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

improved error output for file upload

This commit is contained in:
Roland Gruber 2004-10-03 18:06:57 +00:00
parent 30766c172a
commit 81f7e5e847
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lam/lib/modules/posixGroup.inc
View File

@ -82,7 +82,9 @@ class posixGroup extends baseModule {
$partialAccounts[$i]['memberUid'] = explode(",", $rawAccounts[$i][$ids['posixGroup_members']]); $partialAccounts[$i]['memberUid'] = explode(",", $rawAccounts[$i][$ids['posixGroup_members']]);
} }
else { else {
$errors[] = $this->messages['memberUID'][0]; $errMsg = $this->messages['memberUID'][0];
array_push($errMsg, $i);
$errors[] =$errMsg;
} }
} }
// password // password
@ -409,7 +411,7 @@ class posixGroup extends baseModule {
$this->messages['cn'][0] = array('WARN', _('Groupname'), _('You are using a capital letters. This can cause problems because windows isn\'t case-sensitive.')); $this->messages['cn'][0] = array('WARN', _('Groupname'), _('You are using a capital letters. This can cause problems because windows isn\'t case-sensitive.'));
$this->messages['cn'][1] = array('WARN', _('Groupname'), _('Groupname in use. Selected next free groupname.')); $this->messages['cn'][1] = array('WARN', _('Groupname'), _('Groupname in use. Selected next free groupname.'));
$this->messages['cn'][2] = array('ERROR', _('Groupname'), _('Groupname contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !')); $this->messages['cn'][2] = array('ERROR', _('Groupname'), _('Groupname contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !'));
$this->messages['memberUID'][0] = array('ERROR', 'PosixGroup_members', _("This value must be a list of user names separated by semicolons.")); $this->messages['memberUID'][0] = array('ERROR', 'Account %s: posixGroup_members', _("This value must be a list of user names separated by semicolons."));
} }

7
lam/lib/modules/sambaGroupMapping.inc
View File

@ -79,7 +79,10 @@ class sambaGroupMapping extends baseModule {
// SID // SID
$domSID = $nameToSID[$rawAccounts[$i][$ids['sambaGroupMapping_domain']]]; $domSID = $nameToSID[$rawAccounts[$i][$ids['sambaGroupMapping_domain']]];
if (!isset($domSID)) { if (!isset($domSID)) {
$errors[] =array("ERROR", "", ""); // TODO $errMsg = $this->messages['sambaSID'][1];
array_push($errMsg, $rawAccounts[$i][$ids['sambaGroupMapping_domain']]);
array_push($errMsg, $i);
$errors[] = $errMsg;
} }
else { else {
// RID // RID
@ -102,6 +105,7 @@ class sambaGroupMapping extends baseModule {
$partialAccounts[$i]['displayName'] = $rawAccounts[$i][$ids['sambaGroupMapping_name']]; $partialAccounts[$i]['displayName'] = $rawAccounts[$i][$ids['sambaGroupMapping_name']];
} }
} }
return $errors;
} }
function delete_attributes($post) { function delete_attributes($post) {
@ -284,6 +288,7 @@ class sambaGroupMapping extends baseModule {
**/ **/
function load_Messages() { function load_Messages() {
$this->messages['sambaSID'][0] = array('ERROR', _('Special Group'),sprintf( _('There can be only one group %s.'), $rids[$i]), 'sambaSID'); $this->messages['sambaSID'][0] = array('ERROR', _('Special Group'),sprintf( _('There can be only one group %s.'), $rids[$i]), 'sambaSID');
$this->messages['sambaSID'][1] = array('ERROR', _("Account %s (sambaGroupMapping_domain): LAM was unable to find a Samba 3 domain with this name!")); // third parameter must be set dynamically
} }