Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 2125)
+++ branches/2.8.x/CHANGELOG	(revision 2126)
@@ -11,6 +11,10 @@
 ! = Update/Change
 ===============================================================================
 
+18 Jun -2015 Build 2126 Manuela v.d.Decken(DarkViper)
+! /framework/msgQueue
+Methods  ::getError() and ::getSuccess() are deprecated and have
+been replaced replaced by ::getMessages(). See inline documentation for further information
 17 Jun -2015 Build 2125 Manuela v.d.Decken(DarkViper)
 ! /framework/class.Login.php
 ! /account/ ~login_form.php  ~login.php
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 2125)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 2126)
@@ -51,5 +51,5 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.4');
-if(!defined('REVISION')) define('REVISION', '2124');
+if(!defined('REVISION')) define('REVISION', '2126');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/framework/msgQueue.php
===================================================================
--- branches/2.8.x/wb/framework/msgQueue.php	(revision 2125)
+++ branches/2.8.x/wb/framework/msgQueue.php	(revision 2126)
@@ -6,21 +6,33 @@
  */
 class msgQueue {
 
-	const RETVAL_ARRAY  = 0;
-	const RETVAL_STRING = 1; // (default)
-
-	private static $_instance;
-
-	private $_error = array();
-	private $_success = array();
-
-	protected function __construct() {
-		$this->_error = array();
-		$this->_success = array();
-	}
-	private function __clone() { throw new Exception('cloning Class '.__CLASS__.' is illegal'); }
-
-    public static function handle()
+/** define type of retval */
+    const RETVAL_ARRAY  = 0;
+    const RETVAL_STRING = 1; // (default)
+/** */
+    const LOG      = 0;
+    const ERROR    = 1; // (default)
+    const SUCCESS  = 2;
+    const OK       = 2;
+    const WARN     = 4;
+    const SHOW_ALL = 0;
+    const ALL      = 0;
+/**  */
+    private static $_instance;
+/**  */
+    private $aLogs    = array();
+/**
+ * constructor
+ */
+    protected function __construct() {
+        $this->aLogs = array();
+    }
+/** disable cloning */
+    private function __clone() { }
+/**
+ * get handle for active instance
+ */
+    public static function getInstance()
     {
         if (!isset(self::$_instance)) {
             $c = __CLASS__;
@@ -27,57 +39,85 @@
             self::$_instance = new $c;
         }
         return self::$_instance;
-	}
+    }
+/**
+ * push new message in queue
+ * @param string $sMessage
+ * @param int $iStatus (default: self::FAIL)
+ */
+    public static function add($sMessage = '', $iStatus = self::ERROR)
+    {
+        $iStatus =
+            ($iStatus === true ? self::OK : ($iStatus === false ? self::ERROR : $iStatus)) ?: self::ERROR;
+        self::getInstance()->aLogs[self::LOG][] = array('status'=>self::WARN, 'msg'=>$sMessage);
+        self::getInstance()->aLogs[$iStatus][]  = $sMessage;
+    }
+/**
+ *
+ * @param int $iStatus
+ */
+    public static function clear($iStatus = self::ALL)
+    {
+        if ($iStatus == self::ALL) {
+            self::getInstance()->aLogs = array();
+        } else {
+            if (isset(self::getInstance()->aLogs[$iStatus])) {
+                self::getInstance()->aLogs[$iStatus] = array();
+            }
+        }
+    }
+/**
+ *
+ * @param int $iStatus (default: self::ALL)
+ * @return bool
+ */
+    public static function isEmpty($iStatus = self::ALL)
+    {
+        if ($iStatus == self::ALL) {
+            return (sizeof(self::getInstance()->aLogs[self::LOG]) == 0);
+        } else {
+            return (isset(self::getInstance()->aLogs[$iStatus]) == false);
+        }
+    }
+/**
+ * returns selected kind of messages
+ * @param type $iStatus  which messages
+ * @param type $iRetvalType  return as string or array(default)
+ * @return mixed  string|array
+ */
+    public static function getMessages($iStatus = self::ERROR, $iRetvalType = self::RETVAL_Array)
+    {
+        $aRetval = array();
+        if ($iStatus == self::SHOW_ALL) {
+            return self::getInstance()->aLogs[self::LOG];
+        } else {
+            if (isset(self::getInstance()->aLogs[$iStatus])) {
+                foreach (self::getInstance()->aLogs[$iStatus] as $aItem) {
+                    $aRetval[] = $aItem['msg'];
+                }
+            }
+        }
+        return ($iRetvalType == self::RETVAL_STRING ? implode("\n", $aRetval) : $aRetval);
+    }
+/**
+ *
+ * @param int $iType
+ * @return mixed
+ * @deprecated set deprecated since 2.8.4 and removed in next version
+ */
+    public static function getError($iType = self::RETVAL_STRING)
+    {
+        return self::getMessages(self::ERROR, $iType);
+    }
+/**
+ *
+ * @param int $iType
+ * @return mixed
+ * @deprecated set deprecated since 2.8.4 and removed in next version
+ */
+    public static function getSuccess($iType = self::RETVAL_STRING)
+    {
+        return self::getMessages(self::OK, $iType);
+    }
 
-	public static function add($message = '', $type = false)
-	{
-		if($type)
-		{
-			self::handle()->_success[] = $message;
-		}else
-		{
-			self::handle()->_error[] = $message;
-		}
-	}
-
-	public static function clear()
-	{
-		self::handle()->_error = array();
-		self::handle()->_success = array();
-	}
-
-	public static function isEmpty()
-	{
-		return (sizeof(self::handle()->_success) == 0 && sizeof(self::handle()->_error) == 0 );
-	}
-
-	public static function getError($retval_type = self::RETVAL_STRING)
-	{
-		if(sizeof(self::handle()->_error))
-		{
-			if($retval_type == self::RETVAL_STRING)
-			{
-				return implode('<br />', self::handle()->_error);
-			}else
-			{
-				return self::handle()->_error;
-			}
-		}
-	}
-
-	public static function getSuccess($retval_type = self::RETVAL_STRING)
-	{
-		if(sizeof(self::handle()->_success))
-		{
-			if($retval_type == self::RETVAL_STRING)
-			{
-				return implode('<br />', self::handle()->_success);
-			}else
-			{
-				return self::handle()->_success;
-			}
-		}
-	}
-
-
-}
+} // end of class msgQueue