From 597ae363670e996f90b34f6153d95a975b14c110 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Tue, 16 May 2006 15:43:00 +0000
Subject: [PATCH] fixed error handling

---
 lam/lib/modules/kolabUser.inc     | 8 ++++----
 lam/lib/modules/ldapPublicKey.inc | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lam/lib/modules/kolabUser.inc b/lam/lib/modules/kolabUser.inc
index 0f8be226..82e77a9c 100644
--- a/lam/lib/modules/kolabUser.inc
+++ b/lam/lib/modules/kolabUser.inc
@@ -613,7 +613,7 @@ class kolabUser extends baseModule {
 				else {
 					$errMsg = $this->messages['country'][1];
 					array_push($errMsg, array($i));
-					$triggered_messages[] = $errMsg;
+					$messages[] = $errMsg;
 				}
 			}
 			// mailbox server
@@ -624,7 +624,7 @@ class kolabUser extends baseModule {
 				else {
 					$errMsg = $this->messages['homeServer'][1];
 					array_push($errMsg, array($i));
-					$triggered_messages[] = $errMsg;
+					$messages[] = $errMsg;
 				}
 			}
 			// add invitation policies
@@ -715,7 +715,7 @@ class kolabUser extends baseModule {
 				else {
 					$errMsg = $this->messages['freeBusy'][1];
 					array_push($errMsg, array($i));
-					$triggered_messages[] = $errMsg;
+					$messages[] = $errMsg;
 				}
 			}
 			// Cyrus mail quota
@@ -726,7 +726,7 @@ class kolabUser extends baseModule {
 				else {
 					$errMsg = $this->messages['quota'][1];
 					array_push($errMsg, array($i));
-					$triggered_messages[] = $errMsg;
+					$messages[] = $errMsg;
 				}
 			}
 		}
diff --git a/lam/lib/modules/ldapPublicKey.inc b/lam/lib/modules/ldapPublicKey.inc
index 8028a9d7..009db638 100644
--- a/lam/lib/modules/ldapPublicKey.inc
+++ b/lam/lib/modules/ldapPublicKey.inc
@@ -112,7 +112,6 @@ class ldapPublicKey extends baseModule {
 	* @return array list of info/error messages
 	*/
 	function process_attributes(&$post) {
-		$this->triggered_messages = array();
 		$this->attributes['sshPublicKey'] = array();
 		// check old keys
 		if (isset($post['key_number'])) {
@@ -128,6 +127,7 @@ class ldapPublicKey extends baseModule {
 			$this->attributes['sshPublicKey'][] = $post['sshPublicKey'];
 		}
 		$this->attributes['sshPublicKey'] = array_unique($this->attributes['sshPublicKey']);
+		return array();
 	}
 
 	/**