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

fixed error handling

This commit is contained in:
Roland Gruber 2006-05-17 18:32:10 +00:00
parent 6e06b09250
commit 09ce3a98c2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,7 +111,7 @@ class sambaGroupMapping extends baseModule {
for ($i = 0; $i < sizeof($domains); $i++) { for ($i = 0; $i < sizeof($domains); $i++) {
$nameToRIDBase[$domains[$i]->name] = $domains[$i]->RIDbase; $nameToRIDBase[$domains[$i]->name] = $domains[$i]->RIDbase;
} }
$triggered_messages = array(); $errors = array();
for ($i = 0; $i < sizeof($rawAccounts); $i++) { for ($i = 0; $i < sizeof($rawAccounts); $i++) {
// group type // group type
if ($rawAccounts[$i][$ids['sambaGroupMapping_groupType']] != "") { if ($rawAccounts[$i][$ids['sambaGroupMapping_groupType']] != "") {
@ -124,7 +124,7 @@ class sambaGroupMapping extends baseModule {
else { // invalid type else { // invalid type
$errMsg = $this->messages['groupType'][0]; $errMsg = $this->messages['groupType'][0];
array_push($errMsg, array($i, implode(", ", array_keys($this->sambaGroupTypes) + $this->sambaGroupTypes))); array_push($errMsg, array($i, implode(", ", array_keys($this->sambaGroupTypes) + $this->sambaGroupTypes)));
$triggered_messages[] = $errMsg; $errors[] = $errMsg;
} }
} }
else { else {
@ -137,7 +137,7 @@ class sambaGroupMapping extends baseModule {
$errMsg = $this->messages['sambaSID'][1]; $errMsg = $this->messages['sambaSID'][1];
array_push($errMsg, $rawAccounts[$i][$ids['sambaGroupMapping_domain']]); array_push($errMsg, $rawAccounts[$i][$ids['sambaGroupMapping_domain']]);
array_push($errMsg, $i); array_push($errMsg, $i);
$triggered_messages[] = $errMsg; $errors[] = $errMsg;
} }
else { else {
// RID // RID
@ -160,7 +160,7 @@ class sambaGroupMapping extends baseModule {
$partialAccounts[$i]['displayName'] = $rawAccounts[$i][$ids['sambaGroupMapping_name']]; $partialAccounts[$i]['displayName'] = $rawAccounts[$i][$ids['sambaGroupMapping_name']];
} }
} }
return $triggered_messages; return $errors;
} }
/* This function will create the html-page /* This function will create the html-page
@ -403,7 +403,7 @@ class sambaGroupMapping extends baseModule {
* @return array list of info/error messages * @return array list of info/error messages
*/ */
function process_attributes(&$post) { function process_attributes(&$post) {
$triggered_messages = array(); $errors = array();
$sambaDomains = search_domains(); $sambaDomains = search_domains();
if (sizeof($sambaDomains) == 0) { if (sizeof($sambaDomains) == 0) {
return array(array(array("ERROR", _('No Samba 3 domains found in LDAP! Please create one first.')))); return array(array(array("ERROR", _('No Samba 3 domains found in LDAP! Please create one first.'))));
@ -434,14 +434,14 @@ class sambaGroupMapping extends baseModule {
if ($_SESSION['cache']->in_cache($SID."-".$this->rids[$rids[$i]], 'sambaSID', 'group')) { if ($_SESSION['cache']->in_cache($SID."-".$this->rids[$rids[$i]], 'sambaSID', 'group')) {
$message = $this->messages['sambaSID'][0]; $message = $this->messages['sambaSID'][0];
$message[] = $rids[$i]; $message[] = $rids[$i];
$triggered_messages['sambaSID'][] = $message; $errors['sambaSID'][] = $message;
} }
} }
} }
} }
if (!$wrid) $this->attributes['sambaSID'][0] = $SID . "-" . ($_SESSION[$this->base]->module['posixGroup']->attributes['gidNumber'][0]*2+$RIDbase+1); if (!$wrid) $this->attributes['sambaSID'][0] = $SID . "-" . ($_SESSION[$this->base]->module['posixGroup']->attributes['gidNumber'][0]*2+$RIDbase+1);
// Return error-messages // Return error-messages
return $triggered_messages; return $errors;
} }