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-16 15:43:00 +00:00
parent ef43685e7d
commit 597ae36367
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -613,7 +613,7 @@ class kolabUser extends baseModule {
else { else {
$errMsg = $this->messages['country'][1]; $errMsg = $this->messages['country'][1];
array_push($errMsg, array($i)); array_push($errMsg, array($i));
$triggered_messages[] = $errMsg; $messages[] = $errMsg;
} }
} }
// mailbox server // mailbox server
@ -624,7 +624,7 @@ class kolabUser extends baseModule {
else { else {
$errMsg = $this->messages['homeServer'][1]; $errMsg = $this->messages['homeServer'][1];
array_push($errMsg, array($i)); array_push($errMsg, array($i));
$triggered_messages[] = $errMsg; $messages[] = $errMsg;
} }
} }
// add invitation policies // add invitation policies
@ -715,7 +715,7 @@ class kolabUser extends baseModule {
else { else {
$errMsg = $this->messages['freeBusy'][1]; $errMsg = $this->messages['freeBusy'][1];
array_push($errMsg, array($i)); array_push($errMsg, array($i));
$triggered_messages[] = $errMsg; $messages[] = $errMsg;
} }
} }
// Cyrus mail quota // Cyrus mail quota
@ -726,7 +726,7 @@ class kolabUser extends baseModule {
else { else {
$errMsg = $this->messages['quota'][1]; $errMsg = $this->messages['quota'][1];
array_push($errMsg, array($i)); array_push($errMsg, array($i));
$triggered_messages[] = $errMsg; $messages[] = $errMsg;
} }
} }
} }

2
lam/lib/modules/ldapPublicKey.inc
View File

@ -112,7 +112,6 @@ class ldapPublicKey extends baseModule {
* @return array list of info/error messages * @return array list of info/error messages
*/ */
function process_attributes(&$post) { function process_attributes(&$post) {
$this->triggered_messages = array();
$this->attributes['sshPublicKey'] = array(); $this->attributes['sshPublicKey'] = array();
// check old keys // check old keys
if (isset($post['key_number'])) { if (isset($post['key_number'])) {
@ -128,6 +127,7 @@ class ldapPublicKey extends baseModule {
$this->attributes['sshPublicKey'][] = $post['sshPublicKey']; $this->attributes['sshPublicKey'][] = $post['sshPublicKey'];
} }
$this->attributes['sshPublicKey'] = array_unique($this->attributes['sshPublicKey']); $this->attributes['sshPublicKey'] = array_unique($this->attributes['sshPublicKey']);
return array();
} }
/** /**