diff --git a/phpgwapi/inc/class.errorlog.inc.php b/phpgwapi/inc/class.errorlog.inc.php
new file mode 100644
index 0000000000..3405621b10
--- /dev/null
+++ b/phpgwapi/inc/class.errorlog.inc.php
@@ -0,0 +1,211 @@
+<?php
+	/**************************************************************************\
+	* eGroupWare - errorlog                                                    *
+	* http://www.egroupware.org                                                *
+	* This application written by jerry westrick <jerry@westrick.com>          *
+	* --------------------------------------------                             *
+	*  This program is free software; you can redistribute it and/or modify it *
+	*  under the terms of the GNU General Public License as published by the   *
+	*  Free Software Foundation; either version 2 of the License, or (at your  *
+	*  option) any later version.                                              *
+	\**************************************************************************/
+
+	/* $Id$ */
+
+	class errorlog
+	{
+		/***************************\
+		*	Instance Variables...   *
+		\***************************/
+		var $errorstack = array();
+		var $public_functions = array(
+			'message',
+			'error',
+			'iserror',
+			'severity',
+			'commit',
+			'clearstack',
+			'astable'
+		);
+
+		function message($parms)
+		{
+			$parms['ismsg']=1;
+			CreateObject('phpgwapi.error',$parms);
+			return true;
+		}
+
+		function error($parms)
+		{
+			$parms['ismsg']=0;
+			CreateObject('phpgwapi.error',$parms);
+			return true;
+		}
+
+		function write($parms)
+		{
+			$parms['ismsg']=0;
+			$save = $this->errorstack;
+			$this->$errorstack = array();
+			CreateObject('phpgwapi.error',$parms);
+			$this->commit();
+			$this->errorstack = $save;
+			return true;
+		}
+
+		function iserror($parms)
+		{
+			$ecode = $parms['code'];
+			$errorstack = $this->errorstack;
+			reset($errorstack);
+			while(list(,$err)=each($errorstack))
+			{
+				if ($ecode == $err->code)
+				{
+					return true;
+				}
+			}
+			return false;
+		}
+
+		function severity()
+		{
+			$max = 'D';
+			$errorstack = $this->errorstack;
+			reset($errorstack);
+			while(list(,$err)=each($errorstack))
+			{
+				switch($err->severity)
+				{
+					case 'F':
+						return 'F';
+						break;
+					case 'E':
+						$max = 'E';
+						break;
+					case 'W':
+						if ($max != 'E') 
+						{
+							$max = 'W';
+						}
+						break;
+					case 'I':
+						if ($max == 'D')
+						{
+							$max = 'I';
+						}
+						break;
+					default:
+						break;
+				}
+			}
+			return $max;
+		}
+
+		function commit()
+		{
+			$db = $GLOBALS['phpgw']->db;
+//			$db->lock('phpgw_log');
+			$db->query("insert into phpgw_log (log_date, log_user, log_app, log_severity) values "
+				."('". $GLOBALS['phpgw']->db->to_timestamp(time())
+				."','".(int)$GLOBALS['phpgw']->session->account_id
+				."','".$GLOBALS['phpgw_info']['flags']['currentapp']."'"
+				.",'".$this->severity()."'"
+				.")"
+				,__LINE__,__FILE__
+			);
+
+			$log_id = $db->get_last_insert_id('phpgw_log','log_id');
+//			$db->query('select max(log_id) as lid from phpgw_log');
+//			$db->next_record();
+//			$log_id = $db->f('lid');
+//			$db->unlock();
+
+			$errorstack = $this->errorstack;
+			for ($i = 0; $i < count($errorstack); $i++)
+			{
+				$err = $errorstack[$i];
+				$db->query("insert into phpgw_log_msg "
+					."(Log_msg_log_id, log_msg_seq_no, log_msg_date, log_msg_severity, "
+					."log_msg_code, log_msg_msg, log_msg_parms, log_msg_file, log_msg_line) values "
+					."(" . $log_id
+					."," . $i
+					.", '" . $GLOBALS['phpgw']->db->to_timestamp($err->timestamp)
+					."', '". $err->severity . "'"
+					.", '". $err->code . "'"
+					.", '". $db->db_addslashes($err->msg) . "'"
+					.", '". $db->db_addslashes((count($err->parms) > 1?implode('|',$err->parms):$err->parms[1])). "'"
+					.", '". $err->fname . "'"
+					.", " . (int)$err->line
+					.")" 
+					,__LINE__,__FILE__
+				);
+			}
+			unset ($errorstack);
+			unset ($this->errorstack);
+			$this->errorstack = array();
+			return true;
+		}
+
+		function clearstack()
+		{
+			$new = array();
+			reset($this->errorstack);
+			for ($i = 0; $i < count($this->errorstack); $i++)
+			{
+				$err = $this->errorstack[$i];
+				if ($err->ismsg)
+				{
+					$new[] = $err;
+				};
+			}
+			unset ($this->errorstack);
+			$this->errorstack = $new;
+			return true;
+		}
+
+		function astable()
+		{
+			$html  = "<center>\n";
+			$html .= "<table width=\"98%\">\n";
+			$html .= "\t<tr bgcolor=\"D3DCFF\">\n";
+			$html .= "\t\t<td width=\"2%\">No</td>\n";
+			$html .= "\t\t<td width=\"16%\">Date</td>\n";
+			$html .= "\t\t<td width=\"15%\">App</td>\n";
+			$html .= "\t\t<td align=\"center\", width=\"2%\">S</td>\n";
+			$html .= "\t\t<td width=\"10%\">Error Code</td>\n";
+			$html .= "\t\t<td >Msg</td>\n";
+			$html .= "\t\t<td >File</td>\n";
+			$html .= "\t\t<td >Line</td>\n";
+			$html .= "\t</tr>\n";
+
+			$errorstack = $this->errorstack;
+			for ($i = 0; $i < count($errorstack); $i++)
+			{
+				$err = $errorstack[$i];
+				switch ($err->severity)
+				{
+					case 'D': $color = 'D3DCFF'; break;
+					case 'I': $color = 'C0FFC0'; break;
+					case 'W': $color = 'FFFFC0'; break;
+					case 'E': $color = 'FFC0C0'; break;
+					case 'F': $color = 'FF0909'; break;
+				}
+
+				$html .= "\t<tr bgcolor=".'"'.$color.'"'.">\n";
+				$html .= "\t\t<td align=center>".$i."</td>\n";
+				$html .= "\t\t<td>".$GLOBALS['phpgw']->common->show_date($err->timestamp)."</td>\n";
+				$html .= "\t\t<td>".$err->app."&nbsp </td>\n";
+				$html .= "\t\t<td align=center>".$err->severity."</td>\n";
+				$html .= "\t\t<td>".$err->code."</td>\n";
+				$html .= "\t\t<td>".$err->langmsg()."</td>\n";
+				$html .= "\t\t<td>".$err->fname."</td>\n";
+				$html .= "\t\t<td>".$err->line."</td>\n";
+				$html .= "\t</tr>\n";
+			}
+			$html .= "</table>\n";
+			$html .= "</center>\n";
+
+			return $html;
+		}
+	}