Index: branches/5.2.x/core/kernel/utility/logger.php
===================================================================
diff -u
--- branches/5.2.x/core/kernel/utility/logger.php	(revision 0)
+++ branches/5.2.x/core/kernel/utility/logger.php	(revision 15552)
@@ -0,0 +1,1364 @@
+<?php
+/**
+* @version	$Id: logger.php 15552 2012-10-02 17:13:27Z alex $
+* @package	In-Portal
+* @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
+* @license      GNU/GPL
+* In-Portal is Open Source software.
+* This means that this software may have been modified pursuant
+* the GNU General Public License, and as distributed it includes
+* or is derivative of works licensed under the GNU General Public License
+* or other free or open source software licenses.
+* See http://www.in-portal.org/license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+/**
+ * Class for logging system activity
+ */
+class kLogger extends kBase {
+
+	/**
+	 * Prefix of all database related errors
+	 */
+	const DB_ERROR_PREFIX = 'SQL Error:';
+
+
+	/**
+	 * Logger state: logging of errors and user-defined messages
+	 */
+	const STATE_ENABLED = 1;
+
+	/**
+	 * Logger state: logging of user-defined messages only
+	 */
+	const STATE_USER_ONLY = 2;
+
+	/**
+	 * Logger state: don't log anything
+	 */
+	const STATE_DISABLED = 0;
+
+
+	/**
+	 * Log store: automatically determine where log should be written
+	 */
+	const LS_AUTOMATIC = 1;
+
+	/**
+	 * Log store: always write log to database
+	 */
+	const LS_DATABASE = 2;
+
+	/**
+	 * Log store: always write log to disk
+	 */
+	const LS_DISK = 3;
+
+
+	/**
+	 * Log level: system is unusable
+	 */
+	const LL_EMERGENCY = 0;
+
+	/**
+	 * Log level: action must be taken immediately
+	 */
+	const LL_ALERT = 1;
+
+	/**
+	 * Log level: the system is in a critical condition
+	 */
+	const LL_CRITICAL = 2;
+
+	/**
+	 * Log level: there is an error condition
+	 */
+	const LL_ERROR = 3;
+
+	/**
+	 * Log level: there is a warning condition
+	 */
+	const LL_WARNING = 4;
+
+	/**
+	 * Log level: a normal but significant condition
+	 */
+	const LL_NOTICE = 5;
+
+	/**
+	 * Log level: a purely informational message
+	 */
+	const LL_INFO = 6;
+
+	/**
+	 * Log level: messages generated to debug the application
+	 */
+	const LL_DEBUG = 7;
+
+
+	/**
+	 * Log type: PHP related activity
+	 */
+	const LT_PHP = 1;
+
+	/**
+	 * Log type: database related activity
+	 */
+	const LT_DATABASE = 2;
+
+	/**
+	 * Log type: custom activity
+	 */
+	const LT_OTHER = 3;
+
+
+	/**
+	 * Log interface: Front
+	 */
+	const LI_FRONT = 1;
+
+	/**
+	 * Log interface: Admin
+	 */
+	const LI_ADMIN = 2;
+
+	/**
+	 * Log interface: Cron (Front)
+	 */
+	const LI_CRON_FRONT = 3;
+
+	/**
+	 * Log interface: Cron (Admin)
+	 */
+	const LI_CRON_ADMIN = 4;
+
+	/**
+	 * Log interface: API
+	 */
+	const LI_API = 5;
+
+
+	/**
+	 * Log notification status: disabled
+	 */
+	const LNS_DISABLED = 0;
+
+	/**
+	 * Log notification status: pending
+	 */
+	const LNS_PENDING = 1;
+
+	/**
+	 * Log notification status: sent
+	 */
+	const LNS_SENT = 2;
+
+	/**
+	 * List of error/exception handlers
+	 *
+	 * @var Array
+	 * @access protected
+	 */
+	protected $_handlers = Array ();
+
+	/**
+	 * Long messages are saved here, because "trigger_error" doesn't support error messages over 1KB in size
+	 *
+	 * @var Array
+	 * @access protected
+	 */
+	protected static $_longMessages = Array ();
+
+	/**
+	 * Log record being worked on
+	 *
+	 * @var Array
+	 * @access protected
+	 */
+	protected $_logRecord = Array ();
+
+	/**
+	 * Maximal level of a message, that can be logged
+	 *
+	 * @var int
+	 * @access protected
+	 */
+	protected $_maxLogLevel = self::LL_NOTICE;
+
+	/**
+	 * State of the logger
+	 *
+	 * @var int
+	 * @access protected
+	 */
+	protected $_state = self::STATE_DISABLED;
+
+	/**
+	 * Caches state of debug mode
+	 *
+	 * @var bool
+	 * @access protected
+	 */
+	protected $_debugMode = false;
+
+	/**
+	 * Ignores backtrace record where following files are mentioned
+	 *
+	 * @var Array
+	 * @access protected
+	 */
+	protected $_ignoreInTrace = Array ('logger.php', 'db_connection.php', 'db_load_balancer.php');
+
+	/**
+	 * Create event log
+	 *
+	 * @param Array $methods_to_call List of invokable kLogger class method with their parameters (if any)
+	 * @access public
+	 */
+	public function __construct($methods_to_call = Array ())
+	{
+		parent::__construct();
+
+		$vars = kUtil::getConfigVars();
+
+		$this->_debugMode = $this->Application->isDebugMode();
+		$this->setState(isset($vars['EnableSystemLog']) ? $vars['EnableSystemLog'] : self::STATE_DISABLED);
+		$this->_maxLogLevel = isset($vars['SystemLogMaxLevel']) ? (int)$vars['SystemLogMaxLevel'] : self::LL_NOTICE;
+
+		foreach ($methods_to_call as $method_to_call) {
+			call_user_func_array(Array ($this, $method_to_call[0]), $method_to_call[1]);
+		}
+
+		if ( !kUtil::constOn('DBG_ZEND_PRESENT') && !$this->Application->isDebugMode() ) {
+			// don't report error on screen if debug mode is turned off
+			error_reporting(0);
+			ini_set('display_errors', 0);
+		}
+
+		register_shutdown_function(Array ($this, 'catchLastError'));
+	}
+
+	/**
+	 * Sets state of the logged (enabled/user-only/disabled)
+	 *
+	 * @param $new_state
+	 * @return void
+	 * @access public
+	 */
+	public function setState($new_state = null)
+	{
+		if ( isset($new_state) ) {
+			$this->_state = (int)$new_state;
+		}
+
+		if ( $this->_state === self::STATE_ENABLED ) {
+			$this->_enableErrorHandling();
+		}
+		elseif ( $this->_state === self::STATE_DISABLED ) {
+			$this->_disableErrorHandling();
+		}
+	}
+
+	/**
+	 * Enable error/exception handling capabilities
+	 *
+	 * @return void
+	 * @access protected
+	 */
+	protected function _enableErrorHandling()
+	{
+		$this->_disableErrorHandling();
+
+		$this->_handlers[self::LL_ERROR] = new kErrorHandlerStack($this);
+		$this->_handlers[self::LL_CRITICAL] = new kExceptionHandlerStack($this);
+	}
+
+	/**
+	 * Disables error/exception handling capabilities
+	 *
+	 * @return void
+	 * @access protected
+	 */
+	protected function _disableErrorHandling()
+	{
+		foreach ($this->_handlers as $index => $handler) {
+			$this->_handlers[$index]->__destruct();
+			unset($this->_handlers[$index]);
+		}
+	}
+
+	/**
+	 * Initializes new log record. Use "kLogger::write" to save to db/disk
+	 *
+	 * @param string $message
+	 * @param int $code
+	 * @return kLogger
+	 * @access public
+	 */
+	public function prepare($message = '', $code = null)
+	{
+		$this->_logRecord = Array (
+			'LogUniqueId' => kUtil::generateId(),
+			'LogMessage' => $message,
+			'LogLevel' => self::LL_INFO,
+			'LogCode' => $code,
+			'LogType' => self::LT_OTHER,
+			'LogHostname' => $_SERVER['HTTP_HOST'],
+			'LogRequestSource' => php_sapi_name() == 'cli' ? 2 : 1,
+			'LogRequestURI' => php_sapi_name() == 'cli' ? implode(' ', $GLOBALS['argv']) : $_SERVER['REQUEST_URI'],
+			'LogUserId' => USER_GUEST,
+			'IpAddress' => isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '',
+			'LogSessionKey' => 0,
+			'LogProcessId' => getmypid(),
+			'LogUserData' => '',
+			'LogNotificationStatus' => self::LNS_DISABLED,
+		);
+
+		if ( $this->Application->isAdmin ) {
+			$this->_logRecord['LogInterface'] = defined('CRON') && CRON ? self::LI_CRON_ADMIN : self::LI_ADMIN;
+		}
+		else {
+			$this->_logRecord['LogInterface'] = defined('CRON') && CRON ? self::LI_CRON_FRONT : self::LI_FRONT;
+		}
+
+		if ( $this->Application->InitDone ) {
+			$this->_logRecord['LogUserId'] = $this->Application->RecallVar('user_id');
+			$this->_logRecord['LogSessionKey'] = $this->Application->GetSID();
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Sets one or more fields of log record
+	 *
+	 * @param string|Array $field_name
+	 * @param string|null $field_value
+	 * @return kLogger
+	 * @access public
+	 * @throws UnexpectedValueException
+	 */
+	public function setLogField($field_name, $field_value = null)
+	{
+		if ( isset($field_value) ) {
+			$this->_logRecord[$field_name] = $field_value;
+		}
+		elseif ( is_array($field_name) ) {
+			$this->_logRecord = array_merge($this->_logRecord, $field_name);
+		}
+		else {
+			throw new UnexpectedValueException('Invalid arguments');
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Sets user data
+	 *
+	 * @param string $data
+	 * @param bool $as_array
+	 * @return kLogger
+	 * @access public
+	 */
+	public function setUserData($data, $as_array = false)
+	{
+		if ( $as_array ) {
+			$data = serialize((array)$data);
+		}
+
+		return $this->setLogField('LogUserData', $data);
+	}
+
+	/**
+	 * Add user data
+	 *
+	 * @param string $data
+	 * @param bool $as_array
+	 * @return kLogger
+	 * @access public
+	 */
+	public function addUserData($data, $as_array = false)
+	{
+		$new_data = $this->_logRecord['LogUserData'];
+
+		if ( $as_array ) {
+			$new_data = $new_data ? unserialize($new_data) : Array ();
+			$new_data[] = $data;
+			$new_data = serialize($new_data);
+		}
+		else {
+			$new_data .= ($new_data ? PHP_EOL : '') . $data;
+		}
+
+		return $this->setLogField('LogUserData', $new_data);
+	}
+
+	/**
+	 * Adds event to log record
+	 *
+	 * @param kEvent $event
+	 * @return kLogger
+	 * @access public
+	 */
+	public function addEvent(kEvent $event)
+	{
+		$this->_logRecord['LogEventName'] = (string)$event;
+
+		return $this;
+	}
+
+	/**
+	 * Adds log source file & file to log record
+	 *
+	 * @param string|Array $file_or_trace file path
+	 * @param int $line file line
+	 * @return kLogger
+	 * @access public
+	 */
+	public function addSource($file_or_trace = '', $line = 0)
+	{
+		if ( is_array($file_or_trace) ) {
+			$trace_info = $file_or_trace[0];
+			$this->_logRecord['LogSourceFilename'] = $trace_info['file'];
+			$this->_logRecord['LogSourceFileLine'] = $trace_info['line'];
+		}
+		else {
+			$this->_logRecord['LogSourceFilename'] = $file_or_trace;
+			$this->_logRecord['LogSourceFileLine'] = $line;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Adds session contents to log record
+	 *
+	 * @param bool $include_optional Include optional session variables
+	 * @return kLogger
+	 * @access public
+	 */
+	public function addSessionData($include_optional = false)
+	{
+		if ( $this->Application->InitDone ) {
+			$this->_logRecord['LogSessionData'] = serialize($this->Application->Session->getSessionData($include_optional));
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Adds user request information to log record
+	 *
+	 * @return kLogger
+	 * @access public
+	 */
+	public function addRequestData()
+	{
+		$request_data = Array ();
+		$request_variables = Array ('_GET' => $_GET, '_POST' => $_POST, '_COOKIE' => $_COOKIE);
+
+		foreach ($request_variables as $title => $data) {
+			if ( !$data ) {
+				continue;
+			}
+
+			$request_data[$title] = $data;
+		}
+
+		$this->_logRecord['LogRequestData'] = serialize($request_data);
+
+		return $this;
+	}
+
+	/**
+	 * Adds trace to log record
+	 *
+	 * @param Array $trace
+	 * @param int $skip_levels
+	 * @param Array $skip_files
+	 * @return kLogger
+	 * @access public
+	 */
+	public function addTrace($trace = null, $skip_levels = 1, $skip_files = null)
+	{
+		$trace = $this->createTrace($trace, $skip_levels, $skip_files);
+
+		foreach ($trace as $trace_index => $trace_info) {
+			if ( isset($trace_info['args']) ) {
+				$trace[$trace_index]['args'] = $this->_implodeObjects($trace_info['args']);
+			}
+		}
+
+		$this->_logRecord['LogBacktrace'] = serialize($this->_removeObjectsFromTrace($trace));
+
+		return $this;
+	}
+
+	/**
+	 * Remove objects from trace, since before PHP 5.2.5 there wasn't possible to remove them initially
+	 *
+	 * @param Array $trace
+	 * @return Array
+	 * @access protected
+	 */
+	protected function _removeObjectsFromTrace($trace)
+	{
+		if ( version_compare(PHP_VERSION, '5.3', '>=') ) {
+			return $trace;
+		}
+
+		$trace_indexes = array_keys($trace);
+
+		foreach ($trace_indexes as $trace_index) {
+			unset($trace[$trace_index]['object']);
+		}
+
+		return $trace;
+	}
+
+	/**
+	 * Implodes object to prevent memory leaks
+	 *
+	 * @param Array $array
+	 * @return Array
+	 * @access protected
+	 */
+	protected function _implodeObjects($array)
+	{
+		$ret = Array ();
+
+		foreach ($array as $key => $value) {
+			if ( is_array($value) ) {
+				$ret[$key] = $this->_implodeObjects($value);
+			}
+			elseif ( is_object($value) ) {
+				if ( $value instanceof kEvent ) {
+					$ret[$key] = 'Event: ' . (string)$value;
+				}
+				elseif ( $value instanceof kBase ) {
+					$ret[$key] = (string)$value;
+				}
+				else {
+					$ret[$key] = 'Class: ' . get_class($value);
+				}
+			}
+			else {
+				$ret[$key] = $value;
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Removes first N levels from trace
+	 *
+	 * @param Array $trace
+	 * @param int $levels
+	 * @param Array $files
+	 * @return Array
+	 * @access public
+	 */
+	public function createTrace($trace = null, $levels = null, $files = null)
+	{
+		if ( !isset($trace) ) {
+			$trace = debug_backtrace(false);
+		}
+
+		if ( !$trace ) {
+			// no trace information
+			return $trace;
+		}
+
+		if ( isset($levels) && is_numeric($levels) ) {
+			for ($i = 0; $i < $levels; $i++) {
+				array_shift($trace);
+			}
+		}
+
+		if ( isset($files) && is_array($files) ) {
+			while (true) {
+				$trace_info = $trace[0];
+				$file = isset($trace_info['file']) ? basename($trace_info['file']) : '';
+
+				if ( !in_array($file, $files) ) {
+					break;
+				}
+
+				array_shift($trace);
+			}
+		}
+
+		return $trace;
+	}
+
+	/**
+	 * Adds PHP error to log record
+	 *
+	 * @param int $errno
+	 * @param string $errstr
+	 * @param string $errfile
+	 * @param int $errline
+	 * @return kLogger
+	 * @access public
+	 */
+	public function addError($errno, $errstr, $errfile = null, $errline = null)
+	{
+		$errstr = self::expandMessage($errstr, !$this->_debugMode);
+		$this->_logRecord['LogLevel'] = $this->_getLogLevelByErrorNo($errno);
+
+		if ( $this->isLogType(self::LT_DATABASE, $errstr) ) {
+			list ($errno, $errstr, $sql) = self::parseDatabaseError($errstr);
+
+			$this->_logRecord['LogType'] = self::LT_DATABASE;
+			$this->_logRecord['LogUserData'] = $sql;
+
+			$trace = $this->createTrace(null, 4, $this->_ignoreInTrace);
+			$this->addSource($trace);
+			$this->addTrace($trace, 0);
+		}
+		else {
+			$this->_logRecord['LogType'] = self::LT_PHP;
+
+			$this->addSource((string)$errfile, $errline);
+			$this->addTrace(null, 4);
+		}
+
+		$this->_logRecord['LogCode'] = $errno;
+		$this->_logRecord['LogMessage'] = $errstr;
+
+		return $this;
+	}
+
+	/**
+	 * Adds PHP exception to log record
+	 *
+	 * @param Exception $exception
+	 * @return kLogger
+	 * @access public
+	 */
+	public function addException($exception)
+	{
+		$errstr = self::expandMessage($exception->getMessage(), !$this->_debugMode);
+		$this->_logRecord['LogLevel'] = self::LL_CRITICAL;
+
+		if ( $this->isLogType(self::LT_DATABASE, $errstr) ) {
+			list ($errno, $errstr, $sql) = self::parseDatabaseError($errstr);
+
+			$this->_logRecord['LogType'] = self::LT_DATABASE;
+			$this->_logRecord['LogUserData'] = $sql;
+
+			$trace = $this->createTrace($exception->getTrace(), null, $this->_ignoreInTrace);
+			$this->addSource($trace);
+			$this->addTrace($trace, 0);
+		}
+		else {
+			$this->_logRecord['LogType'] = self::LT_PHP;
+			$errno = $exception->getCode();
+
+			$this->addSource((string)$exception->getFile(), $exception->getLine());
+			$this->addTrace($exception->getTrace(), 0);
+		}
+
+		$this->_logRecord['LogCode'] = $errno;
+		$this->_logRecord['LogMessage'] = $errstr;
+
+		return $this;
+	}
+
+	/**
+	 * Allows to map PHP error numbers to syslog log level
+	 *
+	 * @param int $errno
+	 * @return int
+	 * @access protected
+	 */
+	protected function _getLogLevelByErrorNo($errno)
+	{
+		$error_number_mapping = Array (
+			self::LL_ERROR 		=>	Array (E_RECOVERABLE_ERROR, E_USER_ERROR, E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE),
+			self::LL_WARNING	=>	Array (E_WARNING, E_USER_WARNING, E_CORE_WARNING, E_COMPILE_WARNING),
+			self::LL_NOTICE		=>	Array (E_NOTICE, E_USER_NOTICE, E_STRICT),
+		);
+
+		if ( version_compare(PHP_VERSION, '5.3.0', '>=') ) {
+			$error_number_mapping[self::LL_NOTICE][] = E_DEPRECATED;
+			$error_number_mapping[self::LL_NOTICE][] = E_USER_DEPRECATED;
+		}
+
+		foreach ($error_number_mapping as $log_level => $error_numbers) {
+			if ( in_array($errno, $error_numbers) ) {
+				return $log_level;
+			}
+		}
+
+		return self::LL_ERROR;
+	}
+
+	/**
+	 * Changes log level of a log record
+	 *
+	 * @param int $log_level
+	 * @return kLogger
+	 * @access public
+	 */
+	public function setLogLevel($log_level)
+	{
+		$this->_logRecord['LogLevel'] = $log_level;
+
+		return $this;
+	}
+
+	/**
+	 * Writes prepared log to database or disk, when database isn't available
+	 *
+	 * @param int $storage_medium
+	 * @return bool|int
+	 * @access public
+	 * @throws InvalidArgumentException
+	 */
+	public function write($storage_medium = self::LS_AUTOMATIC)
+	{
+		if ( !$this->_logRecord || $this->_logRecord['LogLevel'] > $this->_maxLogLevel || $this->_state == self::STATE_DISABLED ) {
+			// nothing to save OR less detailed logging requested OR disabled
+			return true;
+		}
+
+		$this->_logRecord['LogMemoryUsed'] = memory_get_usage();
+		$this->_logRecord['LogTimestamp'] = adodb_mktime();
+		$this->_logRecord['LogDate'] = adodb_date('Y-m-d H:i:s');
+
+		if ( $storage_medium == self::LS_AUTOMATIC ) {
+			$storage_medium = $this->Conn->connectionOpened() ? self::LS_DATABASE : self::LS_DISK;
+		}
+
+		if ( $storage_medium == self::LS_DATABASE ) {
+			$result = $this->Conn->doInsert($this->_logRecord, TABLE_PREFIX . 'SystemLog');
+		}
+		elseif ( $storage_medium == self::LS_DISK ) {
+			$result = $this->_saveToFile(RESTRICTED . '/system.log');
+		}
+		else {
+			throw new InvalidArgumentException('Unknown storage medium "' . $storage_medium . '"');
+		}
+
+		$unique_id = $this->_logRecord['LogUniqueId'];
+
+		if ( $this->_logRecord['LogNotificationStatus'] == self::LNS_SENT ) {
+			$this->_sendNotification($unique_id);
+		}
+
+		$this->_logRecord = Array ();
+
+		return $result ? $unique_id : false;
+	}
+
+	/**
+	 * Catches last error happened before script ended
+	 *
+	 * @return void
+	 * @access public
+	 */
+	public function catchLastError()
+	{
+		$this->write();
+		$last_error = error_get_last();
+
+		if ( !is_null($last_error) ) {
+			$handler = $this->_handlers[self::LL_ERROR];
+			/* @var $handler kErrorHandlerStack */
+
+			$handler->handle($last_error['type'], $last_error['message'], $last_error['file'], $last_error['line']);
+		}
+	}
+
+	/**
+	 * Deletes log with given id from database or disk, when database isn't available
+	 *
+	 * @param int $unique_id
+	 * @param int $storage_medium
+	 * @return void
+	 * @access public
+	 * @throws InvalidArgumentException
+	 */
+	public function delete($unique_id, $storage_medium = self::LS_AUTOMATIC)
+	{
+		if ( $storage_medium == self::LS_AUTOMATIC ) {
+			$storage_medium = $this->Conn->connectionOpened ? self::LS_DATABASE : self::LS_DISK;
+		}
+
+		if ( $storage_medium == self::LS_DATABASE ) {
+			$sql = 'DELETE FROM ' . TABLE_PREFIX . 'SystemLog
+					WHERE LogUniqueId = ' . $unique_id;
+			$this->Conn->Query($sql);
+		}
+		elseif ( $storage_medium == self::LS_DISK ) {
+			// TODO: no way to delete a line from a file
+		}
+		else {
+			throw new InvalidArgumentException('Unknown storage medium "' . $storage_medium . '"');
+		}
+	}
+
+	/**
+	 * Send notification (delayed or instant) about log record to e-mail from configuration
+	 *
+	 * @param bool $instant
+	 * @return kLogger
+	 * @access public
+	 */
+	public function notify($instant = false)
+	{
+		$this->_logRecord['LogNotificationStatus'] = $instant ? self::LNS_SENT : self::LNS_PENDING;
+
+		return $this;
+	}
+
+	/**
+	 * Sends notification e-mail about message with given $unique_id
+	 *
+	 * @param int $unique_id
+	 * @return void
+	 * @access protected
+	 */
+	protected function _sendNotification($unique_id)
+	{
+		$notification_email = $this->Application->ConfigValue('SystemLogNotificationEmail');
+
+		if ( !$notification_email ) {
+			trigger_error('System Log notification E-mail not specified', E_USER_NOTICE);
+
+			return;
+		}
+
+		$send_params = Array (
+			'to_name' => $notification_email,
+			'to_email' => $notification_email,
+		);
+
+		// initialize list outside of e-mail event with right settings
+		$this->Application->recallObject('system-log.email', 'system-log_List', Array ('unique_id' => $unique_id));
+
+		$this->Application->EmailEventAdmin('SYSTEM.LOG.NOTIFY', null, $send_params);
+		$this->Application->removeObject('system-log.email');
+	}
+
+	/**
+	 * Adds error/exception handler
+	 *
+	 * @param string|Array $handler
+	 * @param bool $is_exception
+	 * @return void
+	 * @access public
+	 */
+	public function addErrorHandler($handler, $is_exception = false)
+	{
+		$this->_handlers[$is_exception ? self::LL_CRITICAL : self::LL_ERROR]->add($handler);
+	}
+
+	/**
+	 * SQL Error Handler
+	 *
+	 * When not debug mode, then fatal database query won't break anything.
+	 *
+	 * @param int $code
+	 * @param string $msg
+	 * @param string $sql
+	 * @return bool
+	 * @access public
+	 * @throws RuntimeException
+	 */
+	public function handleSQLError($code, $msg, $sql)
+	{
+		$error_msg = self::shortenMessage(self::DB_ERROR_PREFIX . ' #' . $code . ' - ' . $msg . '. SQL: ' . trim($sql));
+
+		if ( isset($this->Application->Debugger) ) {
+			if ( kUtil::constOn('DBG_SQL_FAILURE') && !defined('IS_INSTALL') ) {
+				throw new RuntimeException($error_msg);
+			}
+			else {
+				$this->Application->Debugger->appendTrace();
+			}
+		}
+
+		// next line also trigger attached error handlers
+		trigger_error($error_msg, E_USER_WARNING);
+
+		return true;
+	}
+
+	/**
+	 * Packs information about error into a single line
+	 *
+	 * @param string $errno
+	 * @param bool $strip_tags
+	 * @return string
+	 * @access public
+	 */
+	public function toString($errno = null, $strip_tags = false)
+	{
+		if ( !isset($errno) ) {
+			$errno = $this->_logRecord['LogCode'];
+		}
+
+		$errstr = $this->_logRecord['LogMessage'];
+		$errfile = $this->_logRecord['LogSourceFilename'];
+		$errline = $this->_logRecord['LogSourceFileLine'];
+
+		$result = '<strong>' . $errno . ': </strong>' . "{$errstr} in {$errfile} on line {$errline}";
+
+		return $strip_tags ? strip_tags($result) : $result;
+	}
+
+	/**
+	 * Saves log to file (e.g. when not possible to save into database)
+	 *
+	 * @param $filename
+	 * @return bool
+	 * @access protected
+	 */
+	protected function _saveToFile($filename)
+	{
+		$time = adodb_date('Y-m-d H:i:s');
+		$log_file = new SplFileObject($filename, 'a');
+
+		return $log_file->fwrite('[' . $time . '] #' . $this->toString(null, true) . PHP_EOL) > 0;
+	}
+
+	/**
+	 * Checks if log type of current log record matches given one
+	 *
+	 * @param int $log_type
+	 * @param string $log_message
+	 * @return bool
+	 * @access public
+	 */
+	public function isLogType($log_type, $log_message = null)
+	{
+		if ( $this->_logRecord['LogType'] == $log_type ) {
+			return true;
+		}
+
+		if ( $log_type == self::LT_DATABASE ) {
+			if ( !isset($log_message) ) {
+				$log_message = $this->_logRecord['LogMessage'];
+			}
+
+			return strpos($log_message, self::DB_ERROR_PREFIX) !== false;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Shortens message
+	 *
+	 * @param string $message
+	 * @return string
+	 * @access public
+	 */
+	public static function shortenMessage($message)
+	{
+		$max_len = ini_get('log_errors_max_len');
+
+		if ( strlen($message) > $max_len ) {
+			$long_key = kUtil::generateId();
+			self::$_longMessages[$long_key] = $message;
+
+			return mb_substr($message, 0, $max_len - strlen($long_key) - 2) . ' #' . $long_key;
+		}
+
+		return $message;
+	}
+
+	/**
+	 * Expands shortened message
+	 *
+	 * @param string $message
+	 * @param bool $clear_cache Allow debugger to expand message after it's been expanded by kLogger
+	 * @return string
+	 * @access public
+	 */
+	public static function expandMessage($message, $clear_cache = true)
+	{
+		if ( preg_match('/(.*)#([\d]+)$/', $message, $regs) ) {
+			$long_key = $regs[2];
+
+			if ( isset(self::$_longMessages[$long_key]) ) {
+				$message = self::$_longMessages[$long_key];
+
+				if ( $clear_cache ) {
+					unset(self::$_longMessages[$long_key]);
+				}
+			}
+		}
+
+		return $message;
+	}
+
+	/**
+	 * Parses database error message into error number, error message and sql that caused that error
+	 *
+	 * @static
+	 * @param string $message
+	 * @return Array
+	 * @access public
+	 */
+	public static function parseDatabaseError($message)
+	{
+		$regexp = '/' . preg_quote(self::DB_ERROR_PREFIX) . ' #(.*?) - (.*?)\. SQL: (.*?)$/s';
+
+		if ( preg_match($regexp, $message, $regs) ) {
+			// errno, errstr, sql
+			return Array ($regs[1], $regs[2], $regs[3]);
+		}
+
+		return Array (0, $message, '');
+	}
+}
+
+
+/**
+ * Base class for error or exception handling
+ */
+abstract class kHandlerStack extends kBase {
+
+	/**
+	 * List of added handlers
+	 *
+	 * @var Array
+	 * @access protected
+	 */
+	protected $_handlers = Array ();
+
+	/**
+	 * Reference to event log, which created this object
+	 *
+	 * @var kLogger
+	 * @access protected
+	 */
+	protected $_logger;
+
+	/**
+	 * Remembers if handler is activated
+	 *
+	 * @var bool
+	 * @access protected
+	 */
+	protected $_enabled = false;
+
+	public function __construct(kLogger $logger)
+	{
+		parent::__construct();
+
+		$this->_logger = $logger;
+
+		if ( !kUtil::constOn('DBG_ZEND_PRESENT') ) {
+			$this->attach();
+			$this->_enabled = true;
+		}
+	}
+
+	/**
+	 * Detaches from error handling routines on class destruction
+	 *
+	 * @return void
+	 * @access public
+	 */
+	public function __destruct()
+	{
+		if ( !$this->_enabled ) {
+			return;
+		}
+
+		$this->detach();
+		$this->_enabled = false;
+	}
+
+	/**
+	 * Attach to error handling routines
+	 *
+	 * @abstract
+	 * @return void
+	 * @access protected
+	 */
+	abstract protected function attach();
+
+	/**
+	 * Detach from error handling routines
+	 *
+	 * @abstract
+	 * @return void
+	 * @access protected
+	 */
+	abstract protected function detach();
+
+	/**
+	 * Adds new handler to the stack
+	 *
+	 * @param callable $handler
+	 * @return void
+	 * @access public
+	 */
+	public function add($handler)
+	{
+		$this->_handlers[] = $handler;
+	}
+
+	protected function _handleFatalError($errno)
+	{
+		$debug_mode = defined('DEBUG_MODE') && DEBUG_MODE;
+		$skip_reporting = defined('DBG_SKIP_REPORTING') && DBG_SKIP_REPORTING;
+
+		if ( !$this->_handlers || ($debug_mode && $skip_reporting) ) {
+			// when debugger absent OR it's present, but we actually can't see it's error report (e.g. during ajax request)
+
+			if ( $this->_isFatalError($errno) ) {
+				$this->_displayFatalError($errno);
+			}
+
+			if ( !$this->_handlers ) {
+				return true;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Determines if given error is a fatal
+	 *
+	 * @abstract
+	 * @param Exception|int $errno
+	 * @return bool
+	 */
+	abstract protected function _isFatalError($errno);
+
+	/**
+	 * Displays div with given error message
+	 *
+	 * @param string $errno
+	 * @return void
+	 * @access protected
+	 */
+	protected function _displayFatalError($errno)
+	{
+		$errno = $this->_getFatalErrorTitle($errno);
+
+		$margin = $this->Application->isAdmin ? '8px' : 'auto';
+		echo '<div style="background-color: #FEFFBF; margin: ' . $margin . '; padding: 10px; border: 2px solid red; text-align: center">' . $this->_logger->toString($errno) . '</div>';
+		exit;
+	}
+
+	/**
+	 * Returns title to show for a fatal
+	 *
+	 * @abstract
+	 * @param Exception|int $errno
+	 * @return string
+	 */
+	abstract protected function _getFatalErrorTitle($errno);
+}
+
+
+/**
+ * Class, that handles errors
+ */
+class kErrorHandlerStack extends kHandlerStack {
+
+	/**
+	 * Attach to error handling routines
+	 *
+	 * @return void
+	 * @access protected
+	 */
+	protected function attach()
+	{
+		// set as error handler
+		$error_handler = set_error_handler(Array ($this, 'handle'));
+
+		if ( $error_handler ) {
+			// wrap around previous error handler, if any was set
+			$this->_handlers[] = $error_handler;
+		}
+	}
+
+	/**
+	 * Detach from error handling routines
+	 *
+	 * @return void
+	 * @access protected
+	 */
+	protected function detach()
+	{
+		restore_error_handler();
+	}
+
+	/**
+	 * Determines if given error is a fatal
+	 *
+	 * @param int $errno
+	 * @return bool
+	 * @access protected
+	 */
+	protected function _isFatalError($errno)
+	{
+		$fatal_errors = Array (E_USER_ERROR, E_RECOVERABLE_ERROR, E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE);
+
+		return in_array($errno, $fatal_errors);
+	}
+
+	/**
+	 * Returns title to show for a fatal
+	 *
+	 * @param int $errno
+	 * @return string
+	 * @access protected
+	 */
+	protected function _getFatalErrorTitle($errno)
+	{
+		return 'Fatal Error';
+	}
+
+	/**
+	 * Default error handler
+	 *
+	 * @param int $errno
+	 * @param string $errstr
+	 * @param string $errfile
+	 * @param int $errline
+	 * @param Array $errcontext
+	 * @return bool
+	 * @access public
+	 */
+	public function handle($errno, $errstr, $errfile = null, $errline = null, $errcontext = Array ())
+	{
+		$log = $this->_logger->prepare()->addError($errno, $errstr, $errfile, $errline);
+
+		if ( $this->_handleFatalError($errno) ) {
+			$log->write();
+
+			return true;
+		}
+
+		$log->write();
+
+		$res = false;
+		/* @var $handler Closure */
+
+		foreach ($this->_handlers as $handler) {
+			if ( is_array($handler) ) {
+				$object =& $handler[0];
+				$method = $handler[1];
+				$res = $object->$method($errno, $errstr, $errfile, $errline, $errcontext);
+			}
+			else {
+				$res = $handler($errno, $errstr, $errfile, $errline, $errcontext);
+			}
+		}
+
+		return $res;
+	}
+}
+
+
+/**
+ * Class, that handles exceptions
+ */
+class kExceptionHandlerStack extends kHandlerStack {
+
+	/**
+	 * Attach to error handling routines
+	 *
+	 * @return void
+	 * @access protected
+	 */
+	protected function attach()
+	{
+		// set as exception handler
+		$exception_handler = set_exception_handler(Array ($this, 'handle'));
+
+		if ( $exception_handler ) {
+			// wrap around previous exception handler, if any was set
+			$this->_handlers[] = $exception_handler;
+		}
+	}
+
+	/**
+	 * Detach from error handling routines
+	 *
+	 * @return void
+	 * @access protected
+	 */
+	protected function detach()
+	{
+		restore_exception_handler();
+	}
+
+	/**
+	 * Determines if given error is a fatal
+	 *
+	 * @param Exception $errno
+	 * @return bool
+	 */
+	protected function _isFatalError($errno)
+	{
+		return true;
+	}
+
+	/**
+	 * Returns title to show for a fatal
+	 *
+	 * @param Exception $errno
+	 * @return string
+	 */
+	protected function _getFatalErrorTitle($errno)
+	{
+		return get_class($errno);
+	}
+
+	/**
+	 * Handles exception
+	 *
+	 * @param Exception $exception
+	 * @return bool
+	 * @access public
+	 */
+	public function handle($exception)
+	{
+		$log = $this->_logger->prepare()->addException($exception);
+
+		if ( $exception instanceof kRedirectException ) {
+			/* @var $exception kRedirectException */
+
+			$exception->run();
+		}
+
+		if ( $this->_handleFatalError($exception) ) {
+			$log->write();
+
+			return true;
+		}
+
+		$log->write();
+
+		$res = false;
+		/* @var $handler Closure */
+
+		foreach ($this->_handlers as $handler) {
+			if ( is_array($handler) ) {
+				$object =& $handler[0];
+				$method = $handler[1];
+				$res = $object->$method($exception);
+			}
+			else {
+				$res = $handler($exception);
+			}
+		}
+
+		return $res;
+	}
+}
\ No newline at end of file
Index: branches/5.2.x/core/kernel/utility/email.php
===================================================================
diff -u -r15542 -r15552
--- branches/5.2.x/core/kernel/utility/email.php	(.../email.php)	(revision 15542)
+++ branches/5.2.x/core/kernel/utility/email.php	(.../email.php)	(revision 15552)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version	$Id: email.php 15542 2012-09-14 16:13:22Z alex $
+ * @version	$Id: email.php 15552 2012-10-02 17:13:27Z alex $
  * @package	In-Portal
  * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
  * @license	  GNU/GPL
@@ -294,7 +294,7 @@
 	 */
 	protected function _storeEmailLog()
 	{
-		return $this->Application->ConfigValue('EmailLogRotationInterval') != '';
+		return $this->Application->ConfigValue('EnableEmailLog');
 	}
 
 	/**
Index: branches/5.2.x/core/install/steps_db.xml
===================================================================
diff -u -r15445 -r15552
--- branches/5.2.x/core/install/steps_db.xml	(.../steps_db.xml)	(revision 15445)
+++ branches/5.2.x/core/install/steps_db.xml	(.../steps_db.xml)	(revision 15552)
@@ -148,6 +148,10 @@
 		but can  set to other encoding also (see <a href="http://en.wikipedia.org/wiki/Character_encoding">wikipedia.org</a> options).
 		It's highly recommended to have Website Encoding match the Database Encoding (specified on DB step).</p>
 
+		<p><b><i>Enable "System Log"</i></b> - "System Log" has capability to record PHP Exceptions, Errors, Warnings, Notices, Database/SQL
+		Errors and Warnings, and User defined messages that happened on your website. It has 3 modes - Enabled (logs everything, including user
+		defined messages), User-only (user defined messages only), and Disabled (don't log anything at all - default setting).</p>
+
 		<br/>
 		]]>
 	</step>
Index: branches/5.2.x/core/kernel/kbase.php
===================================================================
diff -u -r15252 -r15552
--- branches/5.2.x/core/kernel/kbase.php	(.../kbase.php)	(revision 15252)
+++ branches/5.2.x/core/kernel/kbase.php	(.../kbase.php)	(revision 15552)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: kbase.php 15252 2012-03-30 17:49:37Z alex $
+* @version	$Id: kbase.php 15552 2012-10-02 17:13:27Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -101,6 +101,17 @@
 	{
 		return $this->prefixSpecial;
 	}
+
+	/**
+	 * Creates string representation of a class (for logging)
+	 *
+	 * @return string
+	 * @access public
+	 */
+	public function __toString()
+	{
+		return 'ClassName: ' . get_class($this) . '; PrefixSpecial: ' . $this->getPrefixSpecial();
+	}
 }
 
 
Index: branches/5.2.x/core/kernel/startup.php
===================================================================
diff -u -r15445 -r15552
--- branches/5.2.x/core/kernel/startup.php	(.../startup.php)	(revision 15445)
+++ branches/5.2.x/core/kernel/startup.php	(.../startup.php)	(revision 15552)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: startup.php 15445 2012-07-13 16:44:00Z alex $
+* @version	$Id: startup.php 15552 2012-10-02 17:13:27Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -178,6 +178,7 @@
 			KERNEL_PATH . '/db/db_connection.php',
 			KERNEL_PATH . '/db/db_load_balancer.php',
 			KERNEL_PATH . '/utility/event.php',
+			KERNEL_PATH . '/utility/logger.php',
 			KERNEL_PATH . "/utility/factory.php",
 			KERNEL_PATH . "/languages/phrases_cache.php",
 			KERNEL_PATH . "/db/dblist.php",
Index: branches/5.2.x/core/kernel/session/session.php
===================================================================
diff -u -r15517 -r15552
--- branches/5.2.x/core/kernel/session/session.php	(.../session.php)	(revision 15517)
+++ branches/5.2.x/core/kernel/session/session.php	(.../session.php)	(revision 15552)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: session.php 15517 2012-08-17 15:09:54Z alex $
+* @version	$Id: session.php 15552 2012-10-02 17:13:27Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -732,45 +732,91 @@
 		$this->Data->AddParams( $this->Storage->LoadData() );
 	}
 
-	function PrintSession($comment = '')
+	/**
+	 * Returns information about session contents
+	 *
+	 * @param bool $include_optional
+	 * @return array
+	 * @access public
+	 */
+	public function getSessionData($include_optional = true)
 	{
-		if (defined('DEBUG_MODE') && $this->Application->isDebugMode() && kUtil::constOn('DBG_SHOW_SESSIONDATA')) {
-			// dump session data
-			$this->Application->Debugger->appendHTML('SessionStorage [' . ($this->RecallVar('admin') == 1 ? 'Admin' : 'Front-End') . '] ('.$comment.'):');
-			$session_data = $this->Data->GetParams();
-			ksort($session_data);
+		$session_data = $this->Data->GetParams();
+		ksort($session_data);
+
+		foreach ($session_data as $session_key => $session_value) {
+			if ( kUtil::IsSerialized($session_value) ) {
+				$session_data[$session_key] = unserialize($session_value);
+			}
+		}
+
+		if ( !$include_optional ) {
+			$optional_keys = array_keys($this->OptionalData);
+
 			foreach ($session_data as $session_key => $session_value) {
-				if (kUtil::IsSerialized($session_value)) {
-					$session_data[$session_key] = unserialize($session_value);
+				if ( in_array($session_key, $optional_keys) ) {
+					unset($session_data[$session_key]);
 				}
 			}
+		}
+
+		return $session_data;
+	}
+
+	/**
+	 * Returns real session data, that was saved
+	 *
+	 * @param Array $session_data
+	 * @return Array
+	 * @access protected
+	 */
+	protected function _getRealSessionData($session_data)
+	{
+		$data_keys = array_keys($session_data);
+		$optional_keys = array_keys($this->OptionalData);
+		$real_keys = array_diff($data_keys, $optional_keys);
+
+		if ( !$real_keys ) {
+			return Array ();
+		}
+
+		$ret = Array ();
+
+		foreach ($real_keys as $real_key) {
+			$ret[$real_key] = $session_data[$real_key];
+		}
+
+		return $ret;
+	}
+
+	function PrintSession($comment = '')
+	{
+		if ( defined('DEBUG_MODE') && $this->Application->isDebugMode() && kUtil::constOn('DBG_SHOW_SESSIONDATA') ) {
+			// dump session data
+			$this->Application->Debugger->appendHTML('SessionStorage [' . ($this->RecallVar('admin') == 1 ? 'Admin' : 'Front-End') . '] (' . $comment . '):');
+
+			$session_data = $this->getSessionData();
 			$this->Application->Debugger->dumpVars($session_data);
 
-			if (!$this->RecallVar('admin')) {
+			if ( !$this->RecallVar('admin') ) {
 				// dump real keys (only for front-end)
-				$data_keys = array_keys($session_data);
-				$optional_keys = array_keys($this->OptionalData);
-				$real_keys = array_diff($data_keys, $optional_keys);
+				$real_session_data = $this->_getRealSessionData($session_data);
 
-				if ($real_keys) {
-					$ret = '';
-					foreach ($real_keys as $real_key) {
-						$ret .= '[' . $real_key . '] = [' . $session_data[$real_key] . ']<br/>';
-					}
-
-					$this->Application->Debugger->appendHTML('Real Keys:<br/> ' . $ret);
+				if ( $real_session_data ) {
+					$this->Application->Debugger->appendHTML('Real Keys:');
+					$this->Application->Debugger->dumpVars($real_session_data);
 				}
 			}
 		}
 
-		if (defined('DEBUG_MODE') && $this->Application->isDebugMode() && kUtil::constOn('DBG_SHOW_PERSISTENTDATA')) {
+		if ( defined('DEBUG_MODE') && $this->Application->isDebugMode() && kUtil::constOn('DBG_SHOW_PERSISTENTDATA') ) {
 			// dump persistent session data
-			if ($this->Storage->PersistentVars) {
+			if ( $this->Storage->PersistentVars ) {
 				$this->Application->Debugger->appendHTML('Persistant Session:');
 				$session_data = $this->Storage->PersistentVars;
 				ksort($session_data);
 				foreach ($session_data as $session_key => $session_value) {
-					if (kUtil::IsSerialized($session_value)) {
+					if ( kUtil::IsSerialized($session_value) ) {
 						$session_data[$session_key] = unserialize($session_value);
 					}
 				}
Index: branches/5.2.x/core/kernel/db/db_load_balancer.php
===================================================================
diff -u -r15242 -r15552
--- branches/5.2.x/core/kernel/db/db_load_balancer.php	(.../db_load_balancer.php)	(revision 15242)
+++ branches/5.2.x/core/kernel/db/db_load_balancer.php	(.../db_load_balancer.php)	(revision 15552)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_load_balancer.php 15242 2012-03-27 10:09:34Z alex $
+* @version	$Id: db_load_balancer.php 15552 2012-10-02 17:13:27Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -450,6 +450,20 @@
 	}
 
 	/**
+	 * Checks if connection to the server given by the specified index is opened
+	 *
+	 * @param integer $i Server index
+	 * @return bool
+	 * @access public
+	 */
+	public function connectionOpened($i = null)
+	{
+		$conn =& $this->openConnection(isset($i) ? $i : $this->getMasterIndex());
+
+		return $conn ? $conn->connectionOpened : false;
+	}
+
+	/**
 	 * Really opens a connection.
 	 * Returns a database object whether or not the connection was successful.
 	 *
Index: branches/5.2.x/core/install/install_schema.sql
===================================================================
diff -u -r15461 -r15552
--- branches/5.2.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 15461)
+++ branches/5.2.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 15552)
@@ -421,6 +421,38 @@
   KEY `timestamp` (SentOn)
 );
 
+CREATE TABLE SystemLog (
+  LogId int(11) NOT NULL AUTO_INCREMENT,
+  LogUniqueId int(11) DEFAULT NULL,
+  LogLevel tinyint(4) NOT NULL DEFAULT '7',
+  LogType tinyint(4) NOT NULL DEFAULT '3',
+  LogCode int(11) DEFAULT NULL,
+  LogMessage longtext,
+  LogTimestamp int(11) DEFAULT NULL,
+  LogDate datetime DEFAULT NULL,
+  LogEventName varchar(100) NOT NULL DEFAULT '',
+  LogHostname varchar(255) NOT NULL DEFAULT '',
+  LogRequestSource tinyint(4) DEFAULT NULL,
+  LogRequestURI varchar(255) NOT NULL DEFAULT '',
+  LogRequestData longtext,
+  LogUserId int(11) DEFAULT NULL,
+  LogInterface tinyint(4) DEFAULT NULL,
+  IpAddress varchar(15) NOT NULL DEFAULT '',
+  LogSessionKey int(11) DEFAULT NULL,
+  LogSessionData longtext,
+  LogBacktrace longtext,
+  LogSourceFilename varchar(255) NOT NULL DEFAULT '',
+  LogSourceFileLine int(11) DEFAULT NULL,
+  LogProcessId bigint(20) unsigned DEFAULT NULL,
+  LogMemoryUsed bigint(20) unsigned NOT NULL,
+  LogUserData longtext NOT NULL,
+  LogNotificationStatus tinyint(4) NOT NULL DEFAULT '0',
+  PRIMARY KEY (LogId),
+  KEY LogLevel (LogLevel),
+  KEY LogType (LogType),
+  KEY LogNotificationStatus (LogNotificationStatus)
+);
+
 CREATE TABLE SystemCache (
   VarName varchar(255) NOT NULL default '',
   Data longtext,
Index: branches/5.2.x/core/units/helpers/mailing_list_helper.php
===================================================================
diff -u -r15230 -r15552
--- branches/5.2.x/core/units/helpers/mailing_list_helper.php	(.../mailing_list_helper.php)	(revision 15230)
+++ branches/5.2.x/core/units/helpers/mailing_list_helper.php	(.../mailing_list_helper.php)	(revision 15552)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: mailing_list_helper.php 15230 2012-03-26 10:13:31Z alex $
+* @version	$Id: mailing_list_helper.php 15552 2012-10-02 17:13:27Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -60,7 +60,7 @@
 			// 3. set recipient specific fields
 			$esender->SetTo($email, $email);
 
-			if ( $this->Application->ConfigValue('EmailLogRotationInterval') != '' ) {
+			if ( $this->Application->ConfigValue('EnableEmailLog') ) {
 				// 4. write to log
 				$log_fields_hash = Array (
 					'From' => $mailing_data['FromName'] . '(' . $mailing_data['FromEmail'] . ')',
Index: branches/5.2.x/core/units/logs/system_logs/system_logs_config.php
===================================================================
diff -u
--- branches/5.2.x/core/units/logs/system_logs/system_logs_config.php	(revision 0)
+++ branches/5.2.x/core/units/logs/system_logs/system_logs_config.php	(revision 15552)
@@ -0,0 +1,205 @@
+<?php
+/**
+* @version	$Id: system_logs_config.php 15552 2012-10-02 17:13:27Z alex $
+* @package	In-Portal
+* @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
+* @license      GNU/GPL
+* In-Portal is Open Source software.
+* This means that this software may have been modified pursuant
+* the GNU General Public License, and as distributed it includes
+* or is derivative of works licensed under the GNU General Public License
+* or other free or open source software licenses.
+* See http://www.in-portal.org/license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'system-log',
+	'ItemClass' => Array('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'SystemLogEventHandler', 'file' => 'system_log_eh.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'SystemLogTagProcessor', 'file' => 'system_log_tp.php', 'build_event' => 'OnBuild'),
+
+	'AutoLoad' => true,
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+		5 => 'mode',
+	),
+
+	'ScheduledTasks' => Array (
+		'system_log_notifications' => Array('EventName' => 'OnSendNotifications', 'RunSchedule' => '0 * * * *'),
+		'rotate_system_logs' => Array('EventName' => 'OnRotate', 'RunSchedule' => '0 0 * * *'),
+	),
+
+	'IDField' => 'LogId',
+	//'StatusField' => Array ('Status'),
+	'TableName' => TABLE_PREFIX . 'SystemLog',
+
+	'TitlePresets' => Array (
+		'default' => Array (
+			'edit_status_labels' => Array ('system-log' => '!la_title_ViewingSystemLog!'),
+		),
+
+		'system_log_list' => Array (
+			'prefixes' => Array('system-log_List'), 'format' => '!la_tab_SystemLog!',
+			'toolbar_buttons' => Array ('edit', 'delete', 'reset', 'view', 'dbl-click'),
+		),
+
+		'system_log_edit' => Array (
+			'prefixes' => Array('system-log'), 'format' => '#system-log_status# "#system-log_titlefield#"',
+			'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
+		),
+	),
+
+	'PermSection' => Array ('main' => 'in-portal:system_logs'),
+
+	'Sections' => Array (
+		'in-portal:system_logs' => Array (
+			'parent'		=>	'in-portal:reports',
+			'icon'			=>	'system_log',
+			'label'			=>	'la_tab_SystemLog',
+			'url'			=>	Array('t' => 'logs/system_logs/system_log_list', 'pass' => 'm'),
+			'permissions'	=>	Array('view', 'edit', 'delete'),
+			'priority'		=>	6.1,
+			'type'			=>	stTREE,
+		),
+	),
+
+	'TitleField' => 'LogMessage',
+
+	'ListSQLs' => Array (
+		'' => '	SELECT %1$s.* %2$s
+				FROM %1$s
+				LEFT JOIN '.TABLE_PREFIX.'Users AS u ON u.PortalUserId = %1$s.LogUserId',
+	),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'Sorting' => Array ('LogId' => 'desc'),
+		)
+	),
+
+	'CalculatedFields' => Array (
+		'' => Array (
+			'Username' => 'CASE %1$s.LogUserId WHEN ' . USER_ROOT . ' THEN "root" WHEN ' . USER_GUEST . ' THEN "Guest" ELSE IF(CONCAT(u.FirstName, u.LastName) <> "", CONCAT(u.FirstName, " ", u.LastName), u.Username) END',
+		),
+	),
+
+	'ForceDontLogChanges' => true,
+
+	'Fields' => Array (
+		'LogId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'LogUniqueId' => Array ('type' => 'int', 'default' => NULL),
+		'LogLevel' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter', 'options' => Array (
+				kLogger::LL_EMERGENCY => 'emergency',
+				kLogger::LL_ALERT => 'alert',
+				kLogger::LL_CRITICAL => 'critical',
+				kLogger::LL_ERROR => 'error',
+				kLogger::LL_WARNING => 'warning',
+				kLogger::LL_NOTICE => 'notice',
+				kLogger::LL_INFO => 'info',
+				kLogger::LL_DEBUG => 'debug'
+			),
+			'not_null' => 1, 'default' => kLogger::LL_INFO
+		),
+		'LogType' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter', 'options' => Array (
+				kLogger::LT_PHP => 'la_opt_LogTypePhp',
+				kLogger::LT_DATABASE => 'la_opt_LogTypeDatabase',
+				kLogger::LT_OTHER => 'la_opt_LogTypeOther',
+			), 'use_phrases' => 1,
+			'not_null', 'default' => kLogger::LT_OTHER
+		),
+		'LogCode' => Array ('type' => 'int', 'default' => NULL),
+		'LogMessage' => Array ('type' => 'string', 'default' => NULL),
+		'LogTimestamp' => Array (
+			'type' => 'int',
+			'formatter' => 'kDateFormatter',
+			'default' => NULL
+		),
+		'LogDate' => Array ('type' => 'string', 'default' => NULL),
+		'LogEventName' => Array ('type' => 'string', 'max_len' => 100, 'not_null' => 1, 'default' => ''),
+		'LogHostname' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
+		'LogRequestSource' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Web', 2 => 'CLI'),
+			'default' => NULL
+		),
+		'LogRequestURI' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
+		'LogRequestData' => Array ('type' => 'string', 'default' => NULL),
+		'LogUserId' => Array (
+			'type' => 'int',
+			'default' => NULL
+		),
+		'LogInterface' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter', 'options' => Array (
+				kLogger::LI_FRONT => 'Front',
+				kLogger::LI_ADMIN => 'Admin',
+				kLogger::LI_CRON_FRONT => 'Cron (Front)',
+				kLogger::LI_CRON_ADMIN => 'Cron (Admin)',
+				kLogger::LI_API => 'API',
+			),
+			'not_null' => 1, 'default' => 0
+		),
+		'IpAddress' => Array ('type' => 'string', 'max_len' => 15, 'not_null' => 1, 'default' => ''),
+		'LogSessionKey' => Array ('type' => 'int', 'default' => NULL),
+		'LogSessionData' => Array ('type' => 'string', 'default' => NULL),
+		'LogBacktrace' => Array ('type' => 'string', 'default' => NULL),
+		'LogSourceFilename' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
+		'LogSourceFileLine' => Array ('type' => 'int', 'default' => NULL),
+		'LogProcessId' => Array ('type' => 'int', 'default' => NULL),
+		'LogMemoryUsed' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'LogUserData' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'LogNotificationStatus' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter', 'options' => Array (
+				kLogger::LNS_DISABLED => 'la_opt_LogNotificationDisabled',
+				kLogger::LNS_PENDING => 'la_opt_LogNotificationPending',
+				kLogger::LNS_SENT => 'la_opt_LogNotificationSent'
+			), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => kLogger::LNS_DISABLED
+		)
+	),
+
+	'VirtualFields' => Array (
+		'Username' => Array ('type' => 'string', 'default' => ''),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+//			'Icons' => Array ('default' => 'icon16_item.png'),
+			'Fields' => Array (
+				'LogId' => Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 80),
+				'LogLevel' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
+				'LogType' => Array ('filter_block' => 'grid_options_filter', 'width' => 80),
+				'LogCode' => Array ('filter_block' => 'grid_range_filter', 'width' => 80),
+				'LogMessage' => Array ('filter_block' => 'grid_like_filter', 'width' => 250),
+				'LogTimestamp' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 170),
+				'LogEventName' => Array ('filter_block' => 'grid_like_filter'),
+				'LogHostname' => Array ('filter_block' => 'grid_like_filter'),
+				'LogRequestSource' => Array ('filter_block' => 'grid_options_filter'),
+				'LogRequestURI' => Array ('data_block' => 'grid_uri_td', 'filter_block' => 'grid_like_filter'),
+				'Username' => Array ('filter_block' => 'grid_range_filter', 'width' => 80),
+				'LogInterface' => Array ('filter_block' => 'grid_options_filter'),
+				'IpAddress' => Array ('filter_block' => 'grid_like_filter'),
+				'LogSessionKey' => Array ('filter_block' => 'grid_range_filter', 'width' => 80),
+				'LogSourceFilename' => Array ('data_block' => 'grid_filename_td', 'filter_block' => 'grid_like_filter', 'width' => 200),
+				'LogSourceFileLine' => Array ('filter_block' => 'grid_range_filter', 'width' => 80),
+				'LogProcessId' => Array ('filter_block' => 'grid_range_filter', 'width' => 80),
+				'LogMemoryUsed' => Array ('data_block' => 'grid_memory_td', 'filter_block' => 'grid_range_filter'),
+				'LogUserData' => Array ('filter_block' => 'grid_like_filter', 'nl2br' => 1),
+				'LogNotificationStatus' => Array ('filter_block' => 'grid_options_filter'),
+				'LogBacktrace' => Array ('data_block' => 'grid_backtrace_td', 'filter_block' => 'grid_empty_filter', 'width' => 500, 'hidden' => 1),
+			),
+		),
+	),
+);
Index: branches/5.2.x/core/install/english.lang
===================================================================
diff -u -r15471 -r15552
--- branches/5.2.x/core/install/english.lang	(.../english.lang)	(revision 15471)
+++ branches/5.2.x/core/install/english.lang	(.../english.lang)	(revision 15552)
@@ -164,7 +164,8 @@
 			<PHRASE Label="la_config_DefaultGridPerPage" Module="Core" Type="1">RGVmYXVsdCAiUGVyIFBhZ2UiIHNldHRpbmcgaW4gR3JpZHM=</PHRASE>
 			<PHRASE Label="la_config_DefaultRegistrationCountry" Module="Core" Type="1">RGVmYXVsdCBSZWdpc3RyYXRpb24gQ291bnRyeQ==</PHRASE>
 			<PHRASE Label="la_config_DefaultTrackingCode" Module="Core" Type="1">RGVmYXVsdCBBbmFseXRpY3MgVHJhY2tpbmcgQ29kZQ==</PHRASE>
-			<PHRASE Label="la_config_EmailLogRotationInterval" Module="Core" Type="1" Hint="RW1haWwgTG9nIHN0b3JlcyB0aGUgZXhhY3QgY29weSBvZiBhbGwgZW1haWxzIHRoYXQgYmVlbiBzZW50IG91dCBieSB5b3VyIHdlYnNpdGUuIFRoZSBmb2xsb3dpbmcgaW5mb3JtYXRpb24gaXMgc3RvcmVkOiBUaW1lLCBTZW5kZXIsIFJlY2lwaWVudCwgU3ViamVjdCBhbmQgRW1haWwgQm9keS4gVGhpcyBzZXR0aW5nIGFsbG93cyB5b3UgdG8gY29udHJvbCBmb3IgaG93IGxvbmcgdGhlc2UgZW1haWxzIHdpbGwgYmUgc3RvcmVkIGluIHRoZSBsb2cgYW5kIHRoZW4gYXV0b21hdGljYWxseSBkZWxldGVkLiBVc2Ugb3B0aW9uIE5ldmVyIHRvIGNvbXBsZXRlbHkgdHVybiBlbWFpbCBsb2dnaW5nIG9mZiwgYW5kIG9wdGlvbiBGb3JldmVyIHRvIGRpc2FibGUgYXV0b21hdGljIGxvZyBjbGVhbnVwLg==">S2VlcCBFbWFpbCBMb2cgZm9y</PHRASE>
+			<PHRASE Label="la_config_EmailLogRotationInterval" Module="Core" Type="1" Hint="VGhpcyBzZXR0aW5nIGFsbG93cyB5b3UgdG8gY29udHJvbCBmb3IgaG93IGxvbmcgIkUtbWFpbCBMb2ciIG1lc3NhZ2VzIHdpbGwgYmUgc3RvcmVkIGluIHRoZSBsb2cgYW5kIHRoZW4gYXV0b21hdGljYWxseSBkZWxldGVkLiBVc2Ugb3B0aW9uICJGb3JldmVyIiB3aXRoIGNhdXRpb24gc2luY2UgaXQgd2lsbCBjb21wbGV0ZWx5IGRpc2FibGUgYXV0b21hdGljIGxvZyBjbGVhbnVwIGFuZCBjYW4gbGVhZCB0byBsYXJnZSBzaXplIG9mIGRhdGFiYXNlIHRhYmxlIHRoYXQgc3RvcmVzIGUtbWFpbCBtZXNzYWdlcy4=">S2VlcCAiRS1tYWlsIExvZyIgZm9y</PHRASE>
+			<PHRASE Label="la_config_EnableEmailLog" Module="Core" Type="1" Hint="IkUtbWFpbCBMb2ciIHN0b3JlcyB0aGUgZXhhY3QgY29weSBvZiBhbGwgZW1haWxzIHRoYXQgYmVlbiBzZW50IG91dCBieSB5b3VyIHdlYnNpdGUuIFRoZSBmb2xsb3dpbmcgaW5mb3JtYXRpb24gaXMgc3RvcmVkOiBUaW1lLCBTZW5kZXIsIFJlY2lwaWVudHMsIFN1YmplY3QsIEUtbWFpbCBFdmVudCBuYW1lLCBhbmQgRW1haWwgQm9keS4=">RW5hYmxlICJFLW1haWwgTG9nIg==</PHRASE>
 			<PHRASE Label="la_config_EnablePageContentRevisionControl" Module="Core" Type="1">RW5hYmxlIFJldmlzaW9uIENvbnRyb2wgZm9yIFNlY3Rpb24gQ29udGVudA==</PHRASE>
 			<PHRASE Label="la_config_error_template" Module="Core" Type="1">VGVtcGxhdGUgZm9yICJGaWxlIG5vdCBmb3VuZCAoNDA0KSIgRXJyb3I=</PHRASE>
 			<PHRASE Label="la_config_ExcludeTemplateSectionsFromSearch" Module="Core" Type="1">RXhjbHVkZSB0ZW1wbGF0ZSBiYXNlZCBTZWN0aW9ucyBmcm9tIFNlYXJjaCBSZXN1bHRzIChpZS4gVXNlciBSZWdpc3RyYXRpb24p</PHRASE>
@@ -207,6 +208,8 @@
 			<PHRASE Label="la_config_SoftMaintenanceTemplate" Module="Core" Type="1" Hint="VGhpcyB0ZW1wbGF0ZSB3aWxsIGJlIHNob3duIHRvIHRoZSBGcm9udCBFbmQgdXNlcnMgd2hlbiBTb2Z0IE1haW50ZW5hbmNlIG1vZGUgaXMgYWN0aXZlLg==">VGVtcGxhdGUgZm9yIFNvZnQgTWFpbnRlbmFuY2U=</PHRASE>
 			<PHRASE Label="la_config_ssl_url" Module="Core" Type="1">U1NMIEZ1bGwgVVJMIChodHRwczovL3d3dy5kb21haW4uY29tL3BhdGgp</PHRASE>
 			<PHRASE Label="la_config_StickyGridSelection" Module="Core" Type="1">VXNlIFN0aWNreSBHcmlkIFNlbGVjdGlvbg==</PHRASE>
+			<PHRASE Label="la_config_SystemLogNotificationEmail" Module="Core" Type="1" Hint="RW1haWwgYWRkcmVzcyB3aGVyZSBVc2VyLWRlZmluZWQgbWVzc2FnZXMgKG1hbnVhbGx5IHNldHVwIGluIHRoZSBjb2RlKSB3aWxsIGJlIGVtYWlsZWQgdG8uIE5vdGUgdGhhdCBhbGwgZGVmYXVsdCAiU3lzdGVtIExvZyIgbWVzc2FnZXMgKG5vbmUgdXNlci1kZWZpbmVkKSBhcmUgTk9UIGVtYWlsZWQgYnkgZGVmYXVsdC4=">U2VuZCBVc2VyLWRlZmluZWQgIlN5c3RlbSBMb2ciIG1lc3NhZ2VzIHRv</PHRASE>
+			<PHRASE Label="la_config_SystemLogRotationInterval" Module="Core" Type="1" Hint="VGhpcyBzZXR0aW5nIGFsbG93cyB5b3UgdG8gY29udHJvbCBmb3IgaG93IGxvbmcgIlN5c3RlbSBMb2ciIG1lc3NhZ2VzIHdpbGwgYmUgc3RvcmVkIGluIHRoZSBsb2cgYW5kIHRoZW4gYXV0b21hdGljYWxseSBkZWxldGVkLiBVc2Ugb3B0aW9uICJGb3JldmVyIiB3aXRoIGNhdXRpb24gc2luY2UgaXQgd2lsbCBjb21wbGV0ZWx5IGRpc2FibGUgYXV0b21hdGljIGxvZyBjbGVhbnVwIGFuZCBjYW4gbGVhZCB0byBsYXJnZSBzaXplIG9mIGRhdGFiYXNlIHRhYmxlIHRoYXQgc3RvcmVzIGxvZyBtZXNzYWdlcy4=">S2VlcCAiU3lzdGVtIExvZyIgZm9y</PHRASE>
 			<PHRASE Label="la_config_ThumbnailImageHeight" Module="Core" Type="1">VGh1bWJuYWlsIEhlaWdodA==</PHRASE>
 			<PHRASE Label="la_config_ThumbnailImageWidth" Module="Core" Type="1">VGh1bWJuYWlsIFdpZHRo</PHRASE>
 			<PHRASE Label="la_config_TrimRequiredFields" Module="Core" Type="1">VHJpbSBSZXF1aXJlZCBGaWVsZHM=</PHRASE>
@@ -512,10 +515,30 @@
 			<PHRASE Label="la_fld_Locale" Module="Core" Type="1">TG9jYWxl</PHRASE>
 			<PHRASE Label="la_fld_LocalName" Module="Core" Type="1" Column="TmFtZQ==">TG9jYWwgTmFtZQ==</PHRASE>
 			<PHRASE Label="la_fld_Location" Module="Core" Type="1" Column="TG9jYXRpb24=">TG9jYXRpb24=</PHRASE>
+			<PHRASE Label="la_fld_LogBacktrace" Module="Core" Type="1" Column="QmFja3RyYWNl">QmFja3RyYWNl</PHRASE>
+			<PHRASE Label="la_fld_LogCode" Module="Core" Type="1" Column="Q29kZQ==">Q29kZQ==</PHRASE>
+			<PHRASE Label="la_fld_LogEventName" Module="Core" Type="1" Column="RXZlbnQgTmFtZQ==">RXZlbnQgTmFtZQ==</PHRASE>
+			<PHRASE Label="la_fld_LogHostname" Module="Core" Type="1" Column="SG9zdG5hbWU=">SG9zdG5hbWU=</PHRASE>
 			<PHRASE Label="la_fld_Login" Module="Core" Type="1" Column="TG9naW4=">TG9naW4=</PHRASE>
+			<PHRASE Label="la_fld_LogInterface" Module="Core" Type="1" Column="SW50ZXJmYWNl">SW50ZXJmYWNl</PHRASE>
+			<PHRASE Label="la_fld_LogLevel" Module="Core" Type="1" Column="TG9nIExldmVs">TG9nIExldmVs</PHRASE>
+			<PHRASE Label="la_fld_LogMemoryUsed" Module="Core" Type="1" Column="TWVtb3J5IFVzZWQ=">TWVtb3J5IFVzZWQ=</PHRASE>
+			<PHRASE Label="la_fld_LogMessage" Module="Core" Type="1" Column="TWVzc2FnZQ==">TWVzc2FnZQ==</PHRASE>
+			<PHRASE Label="la_fld_LogNotificationStatus" Module="Core" Type="1" Column="Tm90aWZpY2F0aW9uIFN0YXR1cw==">Tm90aWZpY2F0aW9uIFN0YXR1cw==</PHRASE>
 			<PHRASE Label="la_fld_Logo" Module="Core" Type="1">TG9nbyBpbWFnZQ==</PHRASE>
 			<PHRASE Label="la_fld_LogoBottom" Module="Core" Type="1">Qm90dG9tIExvZ28gSW1hZ2U=</PHRASE>
 			<PHRASE Label="la_fld_LogoLogin" Module="Core" Type="1">TG9nbyBMb2dpbg==</PHRASE>
+			<PHRASE Label="la_fld_LogProcessId" Module="Core" Type="1" Column="UHJvY2VzcyBJRA==">UHJvY2VzcyBJRA==</PHRASE>
+			<PHRASE Label="la_fld_LogRequestData" Module="Core" Type="1" Column="UmVxdWVzdCBEYXRh">UmVxdWVzdCBEYXRh</PHRASE>
+			<PHRASE Label="la_fld_LogRequestSource" Module="Core" Type="1" Column="UmVxdWVzdCBTb3VyY2U=">UmVxdWVzdCBTb3VyY2U=</PHRASE>
+			<PHRASE Label="la_fld_LogRequestURI" Module="Core" Type="1" Column="UmVxdWVzdCBVUkk=">UmVxdWVzdCBVUkk=</PHRASE>
+			<PHRASE Label="la_fld_LogSessionData" Module="Core" Type="1" Column="U2Vzc2lvbiBEYXRh">U2Vzc2lvbiBEYXRh</PHRASE>
+			<PHRASE Label="la_fld_LogSessionKey" Module="Core" Type="1" Column="U2Vzc2lvbiBLZXk=">U2Vzc2lvbiBLZXk=</PHRASE>
+			<PHRASE Label="la_fld_LogSourceFileLine" Module="Core" Type="1" Column="U291cmNlIEZpbGUgTGluZQ==">U291cmNlIEZpbGUgTGluZQ==</PHRASE>
+			<PHRASE Label="la_fld_LogSourceFilename" Module="Core" Type="1" Column="U291cmNlIEZpbGVuYW1l">U291cmNlIEZpbGVuYW1l</PHRASE>
+			<PHRASE Label="la_fld_LogTimestamp" Module="Core" Type="1" Column="VGltZXN0YW1w">VGltZXN0YW1w</PHRASE>
+			<PHRASE Label="la_fld_LogType" Module="Core" Type="1" Column="VHlwZQ==">VHlwZQ==</PHRASE>
+			<PHRASE Label="la_fld_LogUserData" Module="Core" Type="1" Column="VXNlciBEYXRh">VXNlciBEYXRh</PHRASE>
 			<PHRASE Label="la_fld_MarginBottom" Module="Core" Type="1">TWFyZ2luIEJvdHRvbQ==</PHRASE>
 			<PHRASE Label="la_fld_MarginLeft" Module="Core" Type="1">TWFyZ2luIExlZnQ=</PHRASE>
 			<PHRASE Label="la_fld_MarginRight" Module="Core" Type="1">TWFyZ2luIFJpZ2h0</PHRASE>
@@ -737,6 +760,7 @@
 			<PHRASE Label="la_Linux" Module="Core" Type="1">TGludXg=</PHRASE>
 			<PHRASE Label="la_Local" Module="Core" Type="1">TG9jYWw=</PHRASE>
 			<PHRASE Label="la_LocalImage" Module="Core" Type="1">TG9jYWwgSW1hZ2U=</PHRASE>
+			<PHRASE Label="la_LogBacktraceFunction" Module="Core" Type="1" Hint="U2hvdy9IaWRlIEZ1bmN0aW9uIEFyZ3VtZW50cw==">RnVuY3Rpb24=</PHRASE>
 			<PHRASE Label="la_Logged_in_as" Module="Core" Type="1">TG9nZ2VkIGluIGFz</PHRASE>
 			<PHRASE Label="la_login" Module="Core" Type="1">TG9naW4=</PHRASE>
 			<PHRASE Label="la_Logout" Module="Core" Type="1">TG9nb3V0</PHRASE>
@@ -779,6 +803,7 @@
 			<PHRASE Label="la_Off" Module="Core" Type="1">T2Zm</PHRASE>
 			<PHRASE Label="la_On" Module="Core" Type="1">T24=</PHRASE>
 			<PHRASE Label="la_OneWay" Module="Core" Type="1">T25lIFdheQ==</PHRASE>
+			<PHRASE Label="la_OnLine" Module="Core" Type="1">b24gbGluZQ==</PHRASE>
 			<PHRASE Label="la_opt_ActionCreate" Module="Core" Type="1">Y3JlYXRlZA==</PHRASE>
 			<PHRASE Label="la_opt_ActionDelete" Module="Core" Type="1">ZGVsZXRlZA==</PHRASE>
 			<PHRASE Label="la_opt_ActionUpdate" Module="Core" Type="1">dXBkYXRlZA==</PHRASE>
@@ -857,7 +882,6 @@
 			<PHRASE Label="la_opt_EmailBody" Module="Core" Type="1">RS1tYWlsIEJvZHk=</PHRASE>
 			<PHRASE Label="la_opt_EmailEvents" Module="Core" Type="1">RS1tYWlsIEV2ZW50cw==</PHRASE>
 			<PHRASE Label="la_opt_EmailLogKeepForever" Module="Core" Type="1">Rm9yZXZlciAobmV2ZXIgZGVsZXRlZCBhdXRvbWF0aWNhbGx5KQ==</PHRASE>
-			<PHRASE Label="la_opt_EmailLogKeepNever" Module="Core" Type="1">TmV2ZXIgKHR1cm5lZCBvZmYp</PHRASE>
 			<PHRASE Label="la_opt_EmailSubject" Module="Core" Type="1">RS1tYWlsIFN1YmplY3Q=</PHRASE>
 			<PHRASE Label="la_opt_Everyone" Module="Core" Type="1">RXZlcnlvbmU=</PHRASE>
 			<PHRASE Label="la_opt_Exact" Module="Core" Type="1">RXhhY3Q=</PHRASE>
@@ -881,6 +905,12 @@
 			<PHRASE Label="la_opt_June" Module="Core" Type="1">SnVuZQ==</PHRASE>
 			<PHRASE Label="la_opt_LastName" Module="Core" Type="1">TGFzdCBOYW1l</PHRASE>
 			<PHRASE Label="la_opt_LoggedOut" Module="Core" Type="1">TG9nZ2VkIE91dA==</PHRASE>
+			<PHRASE Label="la_opt_LogNotificationDisabled" Module="Core" Type="1">RGlzYWJsZWQ=</PHRASE>
+			<PHRASE Label="la_opt_LogNotificationPending" Module="Core" Type="1">UGVuZGluZw==</PHRASE>
+			<PHRASE Label="la_opt_LogNotificationSent" Module="Core" Type="1">U2VudA==</PHRASE>
+			<PHRASE Label="la_opt_LogTypeDatabase" Module="Core" Type="1">RGF0YWJhc2U=</PHRASE>
+			<PHRASE Label="la_opt_LogTypeOther" Module="Core" Type="1">T3RoZXI=</PHRASE>
+			<PHRASE Label="la_opt_LogTypePhp" Module="Core" Type="1">UEhQ</PHRASE>
 			<PHRASE Label="la_opt_Manual" Module="Core" Type="1">TWFudWFs</PHRASE>
 			<PHRASE Label="la_opt_March" Module="Core" Type="1">TWFyY2g=</PHRASE>
 			<PHRASE Label="la_opt_May" Module="Core" Type="1">TWF5</PHRASE>
@@ -926,6 +956,7 @@
 			<PHRASE Label="la_opt_SynchronizeFromOthers" Module="Core" Type="1">RnJvbSBvdGhlcnM=</PHRASE>
 			<PHRASE Label="la_opt_SynchronizeToOthers" Module="Core" Type="1">VG8gb3RoZXJz</PHRASE>
 			<PHRASE Label="la_opt_System" Module="Core" Type="1">U3lzdGVt</PHRASE>
+			<PHRASE Label="la_opt_SystemLogKeepForever" Module="Core" Type="1">Rm9yZXZlciAobmV2ZXIgZGVsZXRlZCBhdXRvbWF0aWNhbGx5KQ==</PHRASE>
 			<PHRASE Label="la_opt_Tab" Module="Core" Type="1">VGFi</PHRASE>
 			<PHRASE Label="la_opt_Template" Module="Core" Type="1">VGVtcGxhdGU=</PHRASE>
 			<PHRASE Label="la_opt_ThreeMonths" Module="Core" Type="1">MyBtb250aHM=</PHRASE>
@@ -1159,6 +1190,7 @@
 			<PHRASE Label="la_section_Settings3rdPartyAPI" Module="Core" Type="1">M3JkIFBhcnR5IEFQSSBTZXR0aW5ncw==</PHRASE>
 			<PHRASE Label="la_section_SettingsAdmin" Module="Core" Type="1">QWRtaW4gQ29uc29sZSBTZXR0aW5ncw==</PHRASE>
 			<PHRASE Label="la_section_SettingsCSVExport" Module="Core" Type="1">Q1NWIEV4cG9ydCBTZXR0aW5ncw==</PHRASE>
+			<PHRASE Label="la_section_SettingsLogs" Module="Core" Type="1">TG9ncyBTZXR0aW5ncw==</PHRASE>
 			<PHRASE Label="la_section_SettingsMailling" Module="Core" Type="1">TWFpbGluZyBTZXR0aW5ncw==</PHRASE>
 			<PHRASE Label="la_section_SettingsMaintenance" Module="Core" Type="1">TWFpbnRlbmFuY2UgU2V0dGluZ3M=</PHRASE>
 			<PHRASE Label="la_section_SettingsSession" Module="Core" Type="1">U2Vzc2lvbiBTZXR0aW5ncw==</PHRASE>
@@ -1259,6 +1291,7 @@
 			<PHRASE Label="la_tab_Site_Structure" Module="Core" Type="1">V2Vic2l0ZSAmIENvbnRlbnQ=</PHRASE>
 			<PHRASE Label="la_tab_Skins" Module="Core" Type="1">QWRtaW4gU2tpbnM=</PHRASE>
 			<PHRASE Label="la_tab_Summary" Module="Core" Type="1">U3VtbWFyeQ==</PHRASE>
+			<PHRASE Label="la_tab_SystemLog" Module="Core" Type="1">U3lzdGVtIExvZw==</PHRASE>
 			<PHRASE Label="la_tab_Sys_Config" Module="Core" Type="1">Q29uZmlndXJhdGlvbg==</PHRASE>
 			<PHRASE Label="la_tab_taglibrary" Module="Core" Type="1">VGFnIGxpYnJhcnk=</PHRASE>
 			<PHRASE Label="la_tab_Themes" Module="Core" Type="1">VGhlbWVz</PHRASE>
@@ -1446,6 +1479,10 @@
 			<PHRASE Label="la_title_LanguagePacks" Module="Core" Type="1">TGFuZ3VhZ2UgUGFja3M=</PHRASE>
 			<PHRASE Label="la_title_LanguagesManagement" Module="Core" Type="1">TGFuZ3VhZ2VzIE1hbmFnZW1lbnQ=</PHRASE>
 			<PHRASE Label="la_title_Loading" Module="Core" Type="1">TG9hZGluZyAuLi4=</PHRASE>
+			<PHRASE Label="la_title_LogOther" Module="Core" Type="1">T3RoZXI=</PHRASE>
+			<PHRASE Label="la_title_LogRequest" Module="Core" Type="1">UmVxdWVzdA==</PHRASE>
+			<PHRASE Label="la_title_LogSession" Module="Core" Type="1">U2Vzc2lvbg==</PHRASE>
+			<PHRASE Label="la_title_LogSource" Module="Core" Type="1">U291cmNl</PHRASE>
 			<PHRASE Label="la_title_MailingLists" Module="Core" Type="1">TWFpbGluZ3M=</PHRASE>
 			<PHRASE Label="la_title_Messages" Module="Core" Type="1">TWVzc2FnZXM=</PHRASE>
 			<PHRASE Label="la_title_Module_Status" Module="Core" Type="1">TW9kdWxlcw==</PHRASE>
@@ -1514,6 +1551,7 @@
 			<PHRASE Label="la_title_ViewingMailingList" Module="Core" Type="1">Vmlld2luZyBNYWlsaW5nIExpc3Q=</PHRASE>
 			<PHRASE Label="la_title_ViewingReply" Module="Core" Type="1">Vmlld2luZyBSZXBseQ==</PHRASE>
 			<PHRASE Label="la_title_ViewingRevision" Module="Core" Type="1">Vmlld2luZyBSZXZpc2lvbiAjJXMgKCVzKQ==</PHRASE>
+			<PHRASE Label="la_title_ViewingSystemLog" Module="Core" Type="1">Vmlld2luZyBTeXN0ZW0gTG9n</PHRASE>
 			<PHRASE Label="la_title_Visits" Module="Core" Type="1">VmlzaXRz</PHRASE>
 			<PHRASE Label="la_title_Website" Module="Core" Type="1">V2Vic2l0ZQ==</PHRASE>
 			<PHRASE Label="la_To" Module="Core" Type="1">dG8=</PHRASE>
@@ -1747,6 +1785,11 @@
 				<SUBJECT>Um9vdCBSZXNldCBQYXNzd29yZA==</SUBJECT>
 				<HTMLBODY>WW91ciBuZXcgcGFzc3dvcmQgaXM6IDxpbnAyOm1fUGFyYW0gbmFtZT0icGFzc3dvcmQiLz4=</HTMLBODY>
 			</EVENT>
+			<EVENT Event="SYSTEM.LOG.NOTIFY" Type="1">
+				<SUBJECT>U3lzdGVtIExvZyBOb3RpZmljYXRpb25zICg8aW5wMjpzeXN0ZW0tbG9nLmVtYWlsX1RvdGFsUmVjb3Jkcy8+KQ==</SUBJECT>
+				<HTMLBODY>PGlucDI6bV9EZWZpbmVFbGVtZW50IG5hbWU9ImJhY2t0cmFjZV9lbGVtZW50Ij4NCgk8bGk+PGlucDI6bV9QaHJhc2UgbmFtZT0ibGFfTG9nQmFja3RyYWNlRnVuY3Rpb24iLz46IDxpbnAyOm1fUGFyYW0gbmFtZT0iZmlsZV9pbmZvIi8+PC9saT4NCjwvaW5wMjptX0RlZmluZUVsZW1lbnQ+DQoNCjxpbnAyOm1fRGVmaW5lRWxlbWVudCBuYW1lPSJzeXN0ZW1fbG9nX2VsZW1lbnQiPg0KCTxoND48aW5wMjpGaWVsZCBuYW1lPSJMb2dUaW1lc3RhbXAiIGZvcm1hdD0iTSBkIEg6aTpzIi8+IDxpbnAyOkZpZWxkIG5hbWU9IkxvZ0hvc3RuYW1lIi8+IDxpbnAyOlJlcXVlc3RVUkkgaHRtbF9lc2NhcGU9IjEiLz5bUElEPTxpbnAyOkZpZWxkIG5hbWU9IkxvZ1Byb2Nlc3NJZCIvPixVSUQ9PGlucDI6RmllbGQgbmFtZT0iTG9nVW5pcXVlSWQiLz5dPC9oND4NCglbPGlucDI6RmllbGQgbmFtZT0iTG9nTGV2ZWwiLz5dICM8aW5wMjpGaWVsZCBuYW1lPSJMb2dDb2RlIi8+OiA8aW5wMjpGaWVsZCBuYW1lPSJMb2dNZXNzYWdlIiBub19zcGVjaWFsPSIxIi8+IGluIDxpbnAyOkZpbGVuYW1lLz4gb24gbGluZSA8aW5wMjpGaWVsZCBuYW1lPSJMb2dTb3VyY2VGaWxlTGluZSIvPjxici8+DQoNCgk8aW5wMjptX2lmIGNoZWNrPSJGaWVsZCIgbmFtZT0iTG9nQmFja3RyYWNlIiBkYj0iZGIiPg0KCQk8YnIvPkJhY2t0cmFjZToNCg0KCQk8b2wgc3R5bGU9Im1hcmdpbjogMDsgcGFkZGluZy1sZWZ0OiAyNXB4OyBmb250LXNpemU6IDEycHg7Ij4NCgkJCTxpbnAyOlByaW50QmFja3RyYWNlIHJlbmRlcl9hcz0iYmFja3RyYWNlX2VsZW1lbnQiLz4NCgkJPC9vbD4NCgk8L2lucDI6bV9pZj4NCg0KCTxpbnAyOm1faWZub3QgY2hlY2s9Im1fUGFyYW0iIG5hbWU9ImlzX2xhc3QiPjxoci8+PC9pbnAyOm1faWZub3Q+DQo8L2lucDI6bV9EZWZpbmVFbGVtZW50Pg0KDQo8aW5wMjpzeXN0ZW0tbG9nLmVtYWlsX1ByaW50TGlzdCByZW5kZXJfYXM9InN5c3RlbV9sb2dfZWxlbWVudCIvPg==</HTMLBODY>
+				<PLAINTEXTBODY>PGlucDI6bV9EZWZpbmVFbGVtZW50IG5hbWU9ImJhY2t0cmFjZV9wbGFpbl9lbGVtZW50Ij4NCjxpbnAyOkJhY2t0cmFjZUluZGV4Lz4uIDxpbnAyOm1fUGhyYXNlIG5hbWU9ImxhX0xvZ0JhY2t0cmFjZUZ1bmN0aW9uIi8+OiA8aW5wMjptX1BhcmFtIG5hbWU9ImZpbGVfaW5mbyIvPg0KPGlucDI6bV9pZm5vdCBjaGVjaz0ibV9QYXJhbSIgbmFtZT0iaXNfbGFzdCI+DQoNCjwvaW5wMjptX2lmbm90Pg0KPC9pbnAyOm1fRGVmaW5lRWxlbWVudD4NCjxpbnAyOm1fRGVmaW5lRWxlbWVudCBuYW1lPSJzeXN0ZW1fbG9nX3BsYWluX2VsZW1lbnQiPg0KPGlucDI6RmllbGQgbmFtZT0iTG9nVGltZXN0YW1wIiBmb3JtYXQ9Ik0gZCBIOmk6cyIvPiA8aW5wMjpGaWVsZCBuYW1lPSJMb2dIb3N0bmFtZSIvPiA8aW5wMjpSZXF1ZXN0VVJJLz5bUElEPTxpbnAyOkZpZWxkIG5hbWU9IkxvZ1Byb2Nlc3NJZCIvPixVSUQ9PGlucDI6RmllbGQgbmFtZT0iTG9nVW5pcXVlSWQiLz5dDQpbPGlucDI6RmllbGQgbmFtZT0iTG9nTGV2ZWwiLz5dICM8aW5wMjpGaWVsZCBuYW1lPSJMb2dDb2RlIi8+OiA8aW5wMjpGaWVsZCBuYW1lPSJMb2dNZXNzYWdlIiBub19zcGVjaWFsPSIxIi8+IGluIDxpbnAyOkZpbGVuYW1lLz4gb24gbGluZSA8aW5wMjpGaWVsZCBuYW1lPSJMb2dTb3VyY2VGaWxlTGluZSIvPg0KPGlucDI6bV9pZiBjaGVjaz0iRmllbGQiIG5hbWU9IkxvZ0JhY2t0cmFjZSIgZGI9ImRiIj4NCg0KQmFja3RyYWNlOg0KPGlucDI6UHJpbnRCYWNrdHJhY2UgcmVuZGVyX2FzPSJiYWNrdHJhY2VfcGxhaW5fZWxlbWVudCIgc3RyaXBfdGFncz0iMSIvPjwvaW5wMjptX2lmPg0KPGlucDI6bV9pZm5vdCBjaGVjaz0ibV9QYXJhbSIgbmFtZT0iaXNfbGFzdCI+DQotLS0tLS0tLS0tLS0tDQoNCjwvaW5wMjptX2lmbm90Pg0KPC9pbnAyOm1fRGVmaW5lRWxlbWVudD4NCjxpbnAyOnN5c3RlbS1sb2cuZW1haWxfUHJpbnRMaXN0IHJlbmRlcl9hcz0ic3lzdGVtX2xvZ19wbGFpbl9lbGVtZW50Ii8+</PLAINTEXTBODY>
+			</EVENT>
 			<EVENT Event="USER.ADD" Type="0">
 				<SUBJECT>SW4tcG9ydGFsIHJlZ2lzdHJhdGlvbg==</SUBJECT>
 				<HTMLBODY>RGVhciA8aW5wMjp1LnJlZ2lzdGVyX0ZpZWxkIG5hbWU9IkZpcnN0TmFtZSIgLz4gPGlucDI6dS5yZWdpc3Rlcl9GaWVsZCBuYW1lPSJMYXN0TmFtZSIgLz4sDQoNClRoYW5rIHlvdSBmb3IgcmVnaXN0ZXJpbmcgb24gPGlucDI6bV9MaW5rIHRlbXBsYXRlPSJpbmRleCIvPi4gWW91ciByZWdpc3RyYXRpb24gaXMgbm93IGFjdGl2ZS4NCjxpbnAyOm1faWYgY2hlY2s9InUucmVnaXN0ZXJfRmllbGQiIG5hbWU9IkVtYWlsIj4NCjxici8+PGJyLz4NClBsZWFzZSBjbGljayBoZXJlIHRvIHZlcmlmeSB5b3VyIEUtbWFpbCBhZGRyZXNzOg0KPGEgaHJlZj0iPGlucDI6dS5yZWdpc3Rlcl9Db25maXJtUGFzc3dvcmRMaW5rIHQ9InBsYXRmb3JtL215X2FjY291bnQvdmVyaWZ5X2VtYWlsIiBub19hbXA9IjEiLz4iPjxpbnAyOnUucmVnaXN0ZXJfQ29uZmlybVBhc3N3b3JkTGluayB0PSJwbGF0Zm9ybS9teV9hY2NvdW50L3ZlcmlmeV9lbWFpbCIgbm9fYW1wPSIxIi8+PC9hPjxici8+PGJyLz4NCjwvaW5wMjptX2lmPg==</HTMLBODY>
Index: branches/5.2.x/core/units/logs/system_logs/system_log_tp.php
===================================================================
diff -u
--- branches/5.2.x/core/units/logs/system_logs/system_log_tp.php	(revision 0)
+++ branches/5.2.x/core/units/logs/system_logs/system_log_tp.php	(revision 15552)
@@ -0,0 +1,175 @@
+<?php
+/**
+* @version	$Id: system_log_tp.php 15552 2012-10-02 17:13:27Z alex $
+* @package	In-Portal
+* @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
+* @license      GNU/GPL
+* In-Portal is Open Source software.
+* This means that this software may have been modified pursuant
+* the GNU General Public License, and as distributed it includes
+* or is derivative of works licensed under the GNU General Public License
+* or other free or open source software licenses.
+* See http://www.in-portal.org/license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class SystemLogTagProcessor extends kDBTagProcessor {
+
+	/**
+	 * Displays filename
+	 *
+	 * @param Array $params
+	 * @return string
+	 * @access protected
+	 */
+	protected function Filename($params)
+	{
+		$object = $this->getObject($params);
+		/* @var $object kDBItem */
+
+		$filename = $object->GetDBField('LogSourceFilename');
+
+		if ( !$filename ) {
+			return '';
+		}
+
+		return preg_replace('/^' . preg_quote(FULL_PATH, '/') . '/', '...', $filename, 1);
+	}
+
+	/**
+	 * Displays filename
+	 *
+	 * @param Array $params
+	 * @return string
+	 * @access protected
+	 */
+	protected function RequestURI($params)
+	{
+		$object = $this->getObject($params);
+		/* @var $object kDBItem */
+
+		$request_uri = $object->GetDBField('LogRequestURI');
+
+		if ( !$request_uri ) {
+			return '';
+		}
+
+		return preg_replace('/^' . preg_quote(BASE_PATH, '/') . '/', '...', $request_uri, 1);
+	}
+
+	/**
+	 * Displays used memory
+	 *
+	 * @param Array $params
+	 * @return string
+	 * @access protected
+	 */
+	protected function MemoryUsage($params)
+	{
+		$object = $this->getObject($params);
+		/* @var $object kDBItem */
+
+		return kUtil::formatSize($object->GetDBField('LogMemoryUsed'));
+	}
+
+	/**
+	 * Prints serialized array
+	 *
+	 * @param Array $params
+	 * @return string
+	 * @access protected
+	 */
+	protected function PrintArray($params)
+	{
+		$object = $this->getObject($params);
+		/* @var $object kDBItem */
+
+		$field = $params['field'];
+		$value = $object->GetDBField($field);
+
+		if ( !$value ) {
+			return '';
+		}
+
+		$value = print_r(unserialize($value), true);
+
+		return $this->highlightString($value);
+	}
+
+	/**
+	 * Prints backtrace result
+	 *
+	 * @param Array $params
+	 * @return string
+	 * @access protected
+	 */
+	protected function PrintBacktrace($params)
+	{
+		$object = $this->getObject($params);
+		/* @var $object kDBItem */
+
+		$value = $object->GetDBField('LogBacktrace');
+
+		if ( !$value ) {
+			return '';
+		}
+
+		$ret = '';
+		$trace = unserialize($value);
+		$include_args = isset($params['include_args']) ? $params['include_args'] : false;
+		$strip_tags = isset($params['strip_tags']) ? $params['strip_tags'] : false;
+
+		$block_params = $this->prepareTagParams($params);
+		$block_params['name'] = $params['render_as'];
+
+		foreach ($trace as $index => $trace_info) {
+			$block_params['index'] = $index;
+
+			if ( isset($trace_info['file']) ) {
+				$function_name = isset($trace_info['class']) ? $trace_info['class'] . $trace_info['type'] . $trace_info['function'] : $trace_info['function'];
+				$block_params['file_info'] = $function_name . ' in <b>' . basename($trace_info['file']) . '</b> on line <b>' . $trace_info['line'] . '</b>';
+
+				if ( $strip_tags ) {
+					$block_params['file_info'] = strip_tags($block_params['file_info']);
+				}
+			}
+			else {
+				$block_params['file_info'] = 'no file information available';
+			}
+
+			$block_params['has_args'] = isset($trace_info['args']);
+
+			if ( $include_args ) {
+				$block_params['args'] = $block_params['has_args'] ? $this->highlightString(print_r($trace_info['args'], true)) : '';
+			}
+
+			$ret .= $this->Application->ParseBlock($block_params);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Prints backtrace record index
+	 *
+	 * @param Array $params
+	 * @return string
+	 * @access protected
+	 */
+	protected function BacktraceIndex($params)
+	{
+		$index = $this->Application->Parser->GetParam('index') + 1;
+
+		return str_pad($index, 3, ' ', STR_PAD_LEFT);
+	}
+
+	public function highlightString($string)
+	{
+		$string = str_replace(Array ('\\', '/'), Array ('_nms1_', '_nms2_'), $string);
+		$string = highlight_string('<?php ' . $string . ' ?>', true);
+		$string = str_replace(Array ('_nms1_', '_nms2_'), Array ('\\', '/'), $string);
+
+		return str_replace(Array ('&lt;?php&nbsp;', '?&gt;'), '', $string);
+	}
+}
Index: branches/5.2.x/core/admin_templates/logs/system_logs/system_log_list.tpl
===================================================================
diff -u
--- branches/5.2.x/core/admin_templates/logs/system_logs/system_log_list.tpl	(revision 0)
+++ branches/5.2.x/core/admin_templates/logs/system_logs/system_log_list.tpl	(revision 15552)
@@ -0,0 +1,111 @@
+<inp2:m_include t="incs/header" />
+<inp2:m_RenderElement name="combined_header" section="in-portal:system_logs" prefix="system-log" title_preset="system_log_list" pagination="1"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+	<tbody>
+		<tr>
+	  		<td>
+		  		<table width="100%" cellpadding="0" cellspacing="0">
+		  			<tr>
+		  				<td>
+		  					<script type="text/javascript">
+								a_toolbar = new ToolBar();
+
+								function edit() {
+								  	std_edit_temp_item('system-log', 'logs/system_logs/system_log_edit');
+								}
+
+								a_toolbar.AddButton(
+									new ToolBarButton(
+										'edit',
+										'<inp2:m_phrase label="la_ToolTip_ViewDetails" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Details" escape="1"/>',
+										edit
+									)
+								);
+
+								a_toolbar.AddButton(
+									new ToolBarButton(
+										'delete',
+										'<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+										function() {
+											std_delete_items('system-log')
+										}
+									)
+								);
+
+								a_toolbar.AddButton(
+									new ToolBarButton(
+										'reset',
+										'<inp2:m_phrase label="la_ToolTip_DeleteAll" escape="1"/>',
+										function() {
+											if (inpConfirm('<inp2:m_Phrase name="la_Delete_Confirm" escape="1"/>')) {
+												submit_event('system-log', 'OnDeleteAll');
+											}
+										}
+									)
+								);
+
+					  			a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+								a_toolbar.AddButton(
+									new ToolBarButton(
+										'view',
+										'<inp2:m_phrase label="la_ToolTip_View" escape="1"/>',
+										function(id) {
+											show_viewmenu(a_toolbar,'view');
+										}
+									)
+								);
+
+								a_toolbar.Render();
+							</script>
+		  				</td>
+
+		  				<inp2:m_RenderElement name="search_main_toolbar" prefix="system-log" grid="Default"/>
+		  			</tr>
+		  		</table>
+			</td>
+		</tr>
+	</tbody>
+</table>
+
+<style type="text/css">
+	.log_backtrace {
+		margin: 0;
+		padding-left: 25px;
+		font-size: 11px;
+	}
+</style>
+
+<inp2:m_DefineElement name="grid_filename_td">
+	<inp2:Filename/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_uri_td">
+	<inp2:RequestURI/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_memory_td">
+	<span title="<inp2:Field name='$field'/> bytes"><inp2:MemoryUsage/></span>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="backtrace_element">
+	<li>
+		<inp2:m_Phrase name="la_LogBacktraceFunction"/>: <inp2:m_Param name="file_info"/>
+	</li>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_backtrace_td">
+	<ol class="log_backtrace">
+		<inp2:PrintBacktrace render_as="backtrace_element"/>
+	</ol>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="system-log" IdField="LogId" grid="Default"/>
+
+<script type="text/javascript">
+	Grids['system-log'].SetDependantToolbarButtons( new Array('edit', 'delete') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
Index: branches/5.2.x/core/kernel/utility/debugger.php
===================================================================
diff -u -r15530 -r15552
--- branches/5.2.x/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 15530)
+++ branches/5.2.x/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 15552)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: debugger.php 15530 2012-09-04 11:05:42Z alex $
+* @version	$Id: debugger.php 15552 2012-10-02 17:13:27Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -178,6 +178,14 @@
 			private $IsFatalError = false;
 
 			/**
+			 * Tells if last error (if any) caught by shutdown function  was processed
+			 *
+			 * @var bool
+			 * @access private
+			 */
+			private $_lastErrorProcessed = false;
+
+			/**
 			 * Counts warnings on the page
 			 *
 			 * @var int
@@ -250,14 +258,6 @@
 			private $scrollbarWidth = 0;
 
 			/**
-			 * Long errors are saved here, because trigger_error doesn't support error messages over 1KB in size
-			 *
-			 * @var Array
-			 * @access private
-			 */
-			private $longErrors = Array ();
-
-			/**
 			 * Remembers how much memory & time was spent on including files
 			 *
 			 * @var Array
@@ -366,7 +366,7 @@
 				$this->profileStart('script_runtime', 'Script runtime', $start);
 				$this->LastMoment = $start;
 
-				error_reporting(E_ALL);
+				error_reporting(E_ALL & ~E_STRICT);
 
 				// show errors on screen in case if not in Zend Studio debugging
 				ini_set('display_errors', DebuggerUtil::constOn('DBG_ZEND_PRESENT') ? 0 : 1);
@@ -403,7 +403,6 @@
 					'DBG_WINDOW_WIDTH'			=>	700,						// set width of debugger window (in pixels) for better viewing large amount of debug data
 					'DBG_USE_SHUTDOWN_FUNC'		=>	DBG_ZEND_PRESENT ? 0 : 1,	// use shutdown function to include debugger code into output
 					'DBG_HANDLE_ERRORS'			=>	DBG_ZEND_PRESENT ? 0 : 1,	// handle all allowed by php (see php manual) errors instead of default handler
-					'DBG_IGNORE_STRICT_ERRORS'	=>	0,							// ignore PHP5 errors about private/public view modified missing in class declarations
 					'DBG_DOMVIEWER'				=>	'/temp/domviewer.html',		// path to DOMViewer on website
 					'DOC_ROOT'					=>	str_replace('\\', '/', realpath($_SERVER['DOCUMENT_ROOT']) ), // windows hack
 					'DBG_LOCAL_BASE_PATH'		=>	'w:',						// replace DOC_ROOT in filenames (in errors) using this path
@@ -481,21 +480,6 @@
 			}
 
 			/**
-			 * Allows to overcome short error message problem in tigger_error function
-			 *
-			 * @param string $msg
-			 * @return int
-			 * @access public
-			 */
-			public function mapLongError($msg)
-			{
-				$key = $this->generateID();
-				$this->longErrors[$key] = $msg;
-
-				return $key;
-			}
-
-			/**
 			 * Appends all passed variable values (without variable names) to debug output
 			 *
 			 * @return void
@@ -1337,24 +1321,15 @@
 			private function getErrorNameByCode($error_code)
 			{
 				$error_map = Array (
-					'Fatal Error' 	=>	Array (E_USER_ERROR),
-					'Warning'		=>	Array (E_WARNING, E_USER_WARNING),
-					'Notice'		=>	Array (E_NOTICE, E_USER_NOTICE),
+					'Fatal Error' 	=>	Array (E_RECOVERABLE_ERROR, E_USER_ERROR, E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE),
+					'Warning'		=>	Array (E_WARNING, E_USER_WARNING, E_CORE_WARNING, E_COMPILE_WARNING),
+					'Notice'		=>	Array (E_NOTICE, E_USER_NOTICE, E_STRICT),
 				);
 
-				if ( defined('E_STRICT') ) {
-					// since PHP 5
-					$error_map['PHP5 Strict'] = Array (E_STRICT);
-				}
-
-				if ( defined('E_RECOVERABLE_ERROR') ) {
-					// since PHP 5.2
-					$error_map['Fatal Error (recoverable)'] = Array (E_RECOVERABLE_ERROR);
-				}
-
 				if ( defined('E_DEPRECATED') ) {
 					// since PHP 5.3
-					$error_map['PHP5 Depricated'] = Array (E_DEPRECATED, E_USER_DEPRECATED);
+					$error_map['Notice'][] = E_DEPRECATED;
+					$error_map['Notice'][] = E_USER_DEPRECATED;
 				}
 
 				foreach ($error_map as $error_name => $error_codes) {
@@ -1429,6 +1404,13 @@
 					return '';
 				}
 
+				$last_error = error_get_last();
+
+				if ( !is_null($last_error) && !$this->_lastErrorProcessed ) {
+					$this->_lastErrorProcessed = true;
+					$this->saveError($last_error['type'], $last_error['message'], $last_error['file'], $last_error['line']);
+				}
+
 				$this->profileFinish('script_runtime');
 				$this->breakOutofBuffering(!$returnResult);
 
@@ -1713,10 +1695,6 @@
 					$this->appendTrace(4);
 				}
 
-				if ( DebuggerUtil::constOn('DBG_IGNORE_STRICT_ERRORS') && defined('E_STRICT') && ($errno == E_STRICT) ) {
-					return false;
-				}
-
 				$this->expandError($errstr, $errfile, $errline);
 
 				$this->Data[] = Array (
@@ -1795,11 +1773,11 @@
 			 */
 			private function expandError(&$errstr, &$errfile, &$errline)
 			{
-				if ( preg_match('/(.*)#([\d]+)$/', $errstr, $rets) ) {
-					// replace short message with long one (due triger_error limitations on message size)
-					$long_id = $rets[2];
-					$errstr = $this->longErrors[$long_id];
-					unset($this->longErrors[$long_id]);
+				$errstr = kLogger::expandMessage($errstr);
+				list ($errno, $errstr, $sql) = kLogger::parseDatabaseError($errstr);
+
+				if ( $errno != 0 ) {
+					$errstr = '<span class="debug_error">' . $errstr . ' (' . $errno . ')</span><br/><strong>SQL</strong>: ' . $this->formatSQL($sql);
 				}
 
 				if ( strpos($errfile, 'eval()\'d code') !== false ) {
@@ -1886,20 +1864,14 @@
 				}
 
 				if ( class_exists('kApplication') ) {
-					// replace application error/exception handler with own
-					restore_error_handler();
-					restore_exception_handler();
-
 					$this->Application =& kApplication::Instance();
-					$this->Application->Debugger =& $this;
-
-					$this->Application->errorHandlers[] = Array (&$this, 'saveError');
-					$this->Application->exceptionHandlers[] = Array (&$this, 'saveException');
+					$this->Application->Debugger = $this;
 				}
-				else {
-					set_error_handler( Array (&$this, 'saveError') );
-					set_exception_handler( Array (&$this, 'saveException') );
-				}
+
+				// kLogger will auto-detect these automatically
+				// error/exception handlers registered before debugger will be removed!
+				set_error_handler( Array ($this, 'saveError') );
+				set_exception_handler( Array ($this, 'saveException') );
 			}
 
 			/**
Index: branches/5.2.x/core/install/install_data.sql
===================================================================
diff -u -r15524 -r15552
--- branches/5.2.x/core/install/install_data.sql	(.../install_data.sql)	(revision 15524)
+++ branches/5.2.x/core/install/install_data.sql	(.../install_data.sql)	(revision 15552)
@@ -89,7 +89,6 @@
 INSERT INTO SystemSettings VALUES(DEFAULT, 'MailingListQueuePerStep', '10', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsMailling', 'la_config_MailingListQueuePerStep', 'text', NULL, NULL, 50.08, 0, 0, NULL);
 INSERT INTO SystemSettings VALUES(DEFAULT, 'MailingListSendPerStep', '10', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsMailling', 'la_config_MailingListSendPerStep', 'text', NULL, NULL, 50.09, 0, 0, NULL);
 INSERT INTO SystemSettings VALUES(DEFAULT, 'DefaultEmailRecipients', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsMailling', 'la_config_DefaultEmailRecipients', 'text', NULL, NULL, 50.10, 0, 0, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'EmailLogRotationInterval', '2419200', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsMailling', 'la_config_EmailLogRotationInterval', 'select', NULL, '=la_opt_EmailLogKeepNever||86400=la_opt_OneDay||604800=la_opt_OneWeek||1209600=la_opt_TwoWeeks||2419200=la_opt_OneMonth||7257600=la_opt_ThreeMonths||29030400=la_opt_OneYear||-1=la_opt_EmailLogKeepForever', 50.11, 0, 0, 'hint:la_config_EmailLogRotationInterval');
 INSERT INTO SystemSettings VALUES(DEFAULT, 'UseOutputCompression', '1', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSystem', 'la_config_UseOutputCompression', 'checkbox', '', '', 60.01, 0, 1, NULL);
 INSERT INTO SystemSettings VALUES(DEFAULT, 'OutputCompressionLevel', '7', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSystem', 'la_config_OutputCompressionLevel', 'text', '', '', 60.02, 0, 1, NULL);
 INSERT INTO SystemSettings VALUES(DEFAULT, 'UseTemplateCompression', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSystem', 'la_config_UseTemplateCompression', 'checkbox', '', '', 60.03, 0, 1, NULL);
@@ -99,6 +98,10 @@
 INSERT INTO SystemSettings VALUES(DEFAULT, 'Backup_Path', '/home/alex/web/in-portal.rc/system/backupdata', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSystem', 'la_config_backup_path', 'text', '', '', 60.07, 0, 1, NULL);
 INSERT INTO SystemSettings VALUES(DEFAULT, 'SystemTagCache', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSystem', 'la_prompt_syscache_enable', 'checkbox', NULL, NULL, 60.08, 0, 0, NULL);
 INSERT INTO SystemSettings VALUES(DEFAULT, 'SocketBlockingMode', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSystem', 'la_prompt_socket_blocking_mode', 'checkbox', NULL, NULL, 60.09, 0, 0, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'EnableEmailLog', '1', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsLogs', 'la_config_EnableEmailLog', 'radio', NULL, '1=la_Yes||0=la_No', 65.01, 0, 1, 'hint:la_config_EnableEmailLog');
+INSERT INTO SystemSettings VALUES(DEFAULT, 'EmailLogRotationInterval', '2419200', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsLogs', 'la_config_EmailLogRotationInterval', 'select', NULL, '86400=la_opt_OneDay||604800=la_opt_OneWeek||1209600=la_opt_TwoWeeks||2419200=la_opt_OneMonth||7257600=la_opt_ThreeMonths||29030400=la_opt_OneYear||-1=la_opt_EmailLogKeepForever', 65.02, 0, 0, 'hint:la_config_EmailLogRotationInterval');
+INSERT INTO SystemSettings VALUES(DEFAULT, 'SystemLogRotationInterval', '2419200', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsLogs', 'la_config_SystemLogRotationInterval', 'select', NULL, '86400=la_opt_OneDay||604800=la_opt_OneWeek||1209600=la_opt_TwoWeeks||2419200=la_opt_OneMonth||7257600=la_opt_ThreeMonths||29030400=la_opt_OneYear||-1=la_opt_SystemLogKeepForever', 65.03, 0, 1, 'hint:la_config_SystemLogRotationInterval');
+INSERT INTO SystemSettings VALUES(DEFAULT, 'SystemLogNotificationEmail', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsLogs', 'la_config_SystemLogNotificationEmail', 'text', 'a:5:{s:4:"type";s:6:"string";s:9:"formatter";s:10:"kFormatter";s:6:"regexp";s:85:"/^([-a-zA-Z0-9!\\#$%&*+\\/=?^_`{|}~.]+@[a-zA-Z0-9]{1}[-.a-zA-Z0-9_]*\\.[a-zA-Z]{2,6})$/i";s:10:"error_msgs";a:1:{s:14:"invalid_format";s:18:"!la_invalid_email!";}s:7:"default";s:0:"";}', NULL, 65.04, 0, 1, 'hint:la_config_SystemLogNotificationEmail');
 INSERT INTO SystemSettings VALUES(DEFAULT, 'CSVExportDelimiter', '1', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsCSVExport', 'la_config_CSVExportDelimiter', 'select', NULL, '0=la_opt_Tab||1=la_opt_Comma||2=la_opt_Semicolon||3=la_opt_Space||4=la_opt_Colon', 70.01, 0, 1, NULL);
 INSERT INTO SystemSettings VALUES(DEFAULT, 'CSVExportEnclosure', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsCSVExport', 'la_config_CSVExportEnclosure', 'radio', NULL, '0=la_Doublequotes||1=la_Quotes', 70.02, 0, 1, NULL);
 INSERT INTO SystemSettings VALUES(DEFAULT, 'CSVExportSeparator', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsCSVExport', 'la_config_CSVExportSeparator', 'radio', NULL, '0=la_Linux||1=la_Windows', 70.03, 0, 1, NULL);
@@ -183,6 +186,7 @@
 INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'ROOT.RESET.PASSWORD', NULL, 1, 0, 'Core', 'Root Reset Password', 1, 1, 0);
 INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.EMAIL.CHANGE.VERIFY', NULL, 1, 0, 'Core', 'Changed E-mail Verification', 0, 1, 1);
 INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.EMAIL.CHANGE.UNDO', NULL, 1, 0, 'Core', 'Changed E-mail Rollback', 0, 1, 1);
+INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'SYSTEM.LOG.NOTIFY', NULL, 1, 0, 'Core', 'Notification about message added to System Log', 1, 1, 1);
 
 INSERT INTO IdGenerator VALUES ('100');
 
Index: branches/5.2.x/tools/debug_sample.php
===================================================================
diff -u -r15435 -r15552
--- branches/5.2.x/tools/debug_sample.php	(.../debug_sample.php)	(revision 15435)
+++ branches/5.2.x/tools/debug_sample.php	(.../debug_sample.php)	(revision 15552)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: debug_sample.php 15435 2012-07-12 15:50:20Z alex $
+* @version	$Id: debug_sample.php 15552 2012-10-02 17:13:27Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -15,7 +15,6 @@
 //	define('MAINTENANCE_MODE_FRONT', MaintenanceMode::NONE); // Set to MaintenanceMode::SOFT for SOFT Maintenance mode, set to MaintenanceMode::HARD for HARD Maintenance mode (no DB load)
 //	define('MAINTENANCE_MODE_ADMIN', MaintenanceMode::NONE); // Set to MaintenanceMode::SOFT for SOFT Maintenance mode, set to MaintenanceMode::HARD for HARD Maintenance mode (no DB load)
 //	define('MAINTENANCE_MODE_IPS', '');			// Define IP addresses/hosts, which will be able to continue accessing website
-//	define('SILENT_LOG', 1);					// Log all php errors on site to separate file (/silent_log.txt)
 //	define('DBG_REQUREST_LOG', '/path/to/file');// Log all user requests to site into filename specified
 //	define('DBG_ZEND_PRESENT', 0);				// Set to 0 to debug debugger (because debugger automatically got disabled during zend debug sessions)
 //	define('SA_IP', '173.9.192.210'); 			// Define IP addresses, from which super admin are allowed to login
Index: branches/5.2.x/core/install.php
===================================================================
diff -u -r15274 -r15552
--- branches/5.2.x/core/install.php	(.../install.php)	(revision 15274)
+++ branches/5.2.x/core/install.php	(.../install.php)	(revision 15552)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: install.php 15274 2012-04-05 13:15:10Z alex $
+* @version	$Id: install.php 15552 2012-10-02 17:13:27Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,7 +12,7 @@
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 	ini_set('display_errors', 1);
-	error_reporting(E_ALL);
+	error_reporting(E_ALL & ~E_STRICT);
 
 	define('IS_INSTALL', 1);
 	define('ADMIN', 1);
Index: branches/5.2.x/core/units/logs/system_logs/system_log_eh.php
===================================================================
diff -u
--- branches/5.2.x/core/units/logs/system_logs/system_log_eh.php	(revision 0)
+++ branches/5.2.x/core/units/logs/system_logs/system_log_eh.php	(revision 15552)
@@ -0,0 +1,120 @@
+<?php
+/**
+* @version	$Id: system_log_eh.php 15552 2012-10-02 17:13:27Z alex $
+* @package	In-Portal
+* @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
+* @license      GNU/GPL
+* In-Portal is Open Source software.
+* This means that this software may have been modified pursuant
+* the GNU General Public License, and as distributed it includes
+* or is derivative of works licensed under the GNU General Public License
+* or other free or open source software licenses.
+* See http://www.in-portal.org/license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class SystemLogEventHandler extends kDBEventHandler {
+
+	/**
+	 * Filters messages, that require e-mail notification to be sent
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function SetCustomQuery(kEvent $event)
+	{
+		parent::SetCustomQuery($event);
+
+		$object = $event->getObject();
+		/* @var $object kDBList */
+
+		if ( $event->Special == 'email' ) {
+			$unique_id = $event->getEventParam('unique_id');
+
+			if ( $unique_id !== false ) {
+				$object->addFilter('notification_filter', '%1$s.LogNotificationStatus = ' . kLogger::LNS_SENT);
+				$object->addFilter('unique_filter', '%1$s.LogUniqueId = ' . $unique_id);
+			}
+			else {
+				$object->addFilter('notification_filter', '%1$s.LogNotificationStatus = ' . kLogger::LNS_PENDING);
+			}
+		}
+	}
+
+	/**
+	 * [SCHEDULED TASK] Sends delayed notification of system log messages
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnSendNotifications(kEvent $event)
+	{
+		// initialize list outside of e-mail event with right settings
+		$list = $this->Application->recallObject($event->Prefix . '.email', $event->Prefix . '_List', Array ('per_page' => 20));
+		/* @var $list kDBList */
+
+		if ( !$list->GetRecordsCount() ) {
+			// no messages, that needs to be sent
+			return;
+		}
+
+		$notification_email = $this->Application->ConfigValue('SystemLogNotificationEmail');
+
+		if ( !$notification_email ) {
+			$this->Application->removeObject($event->Prefix . '.email');
+			trigger_error('System Log notification E-mail not specified', E_USER_NOTICE);
+
+			return;
+		}
+
+		$send_params = Array (
+			'to_name' => $notification_email,
+			'to_email' => $notification_email,
+		);
+
+		$this->Application->EmailEventAdmin('SYSTEM.LOG.NOTIFY', null, $send_params);
+		$this->Application->removeObject($event->Prefix . '.email');
+
+		$object = $event->getObject(Array ('skip_autoload' => true));
+		/* @var $object kDBItem */
+
+		foreach ($list as $fields_hash) {
+			$object->LoadFromHash($fields_hash);
+			$object->SetDBField('LogNotificationStatus', kLogger::LNS_SENT);
+			$object->Update();
+		}
+	}
+
+	/**
+	 * [SCHEDULED TASK] Will remove old system logs
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnRotate(kEvent $event)
+	{
+		$rotation_interval = (int)$this->Application->ConfigValue('SystemLogRotationInterval');
+
+		if ( $rotation_interval === -1 ) {
+			// forever
+			return;
+		}
+
+		$sql = 'SELECT ' . $this->Application->getUnitOption($event->Prefix, 'IDField') . '
+				FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . '
+				WHERE ' . TIMENOW . ' - LogTimestamp > ' . $rotation_interval . '
+				LIMIT 0,50';
+		$ids = $this->Conn->GetCol($sql);
+
+		if ( $ids ) {
+			$temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
+			/* @var $temp_handler kTempTablesHandler */
+
+			$temp_handler->DeleteItems($event->Prefix, $event->Special, $ids);
+		}
+	}
+}
Index: branches/5.2.x/core/kernel/application.php
===================================================================
diff -u -r15543 -r15552
--- branches/5.2.x/core/kernel/application.php	(.../application.php)	(revision 15543)
+++ branches/5.2.x/core/kernel/application.php	(.../application.php)	(revision 15552)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: application.php 15543 2012-09-21 15:37:52Z alex $
+* @version	$Id: application.php 15552 2012-10-02 17:13:27Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -115,21 +115,13 @@
 	public $Conn = null;
 
 	/**
-	 * Maintains list of user-defined error handlers
+	 * Reference to event log
 	 *
-	 * @var Array
+	 * @var Array|kLogger
 	 * @access public
 	 */
-	public $errorHandlers = Array ();
+	protected $_logger = Array ();
 
-	/**
-	 * Maintains list of user-defined exception handlers
-	 *
-	 * @var Array
-	 * @access public
-	 */
-	public $exceptionHandlers = Array ();
-
 	// performance needs:
 	/**
 	 * Holds a reference to httpquery
@@ -301,31 +293,13 @@
 			$this->Debugger->appendMemoryUsage('Application before Init:');
 		}
 
-		if ( !$this->isDebugMode() && !kUtil::constOn('DBG_ZEND_PRESENT') ) {
-			error_reporting(0);
-			ini_set('display_errors', 0);
-		}
-
-		if ( !kUtil::constOn('DBG_ZEND_PRESENT') ) {
-			$error_handler = set_error_handler(Array (&$this, 'handleError'));
-			if ( $error_handler ) {
-				// wrap around previous error handler, if any was set
-				$this->errorHandlers[] = $error_handler;
-			}
-
-			$exception_handler = set_exception_handler(Array (&$this, 'handleException'));
-			if ( $exception_handler ) {
-				// wrap around previous exception handler, if any was set
-				$this->exceptionHandlers[] = $exception_handler;
-			}
-		}
-
+		$this->_logger = new kLogger($this->_logger);
 		$this->Factory = new $factory_class();
 		$this->registerDefaultClasses();
 
 		$vars = kUtil::parseConfig(true);
 		$db_class = isset($vars['Databases']) ? 'kDBLoadBalancer' : ($this->isDebugMode() ? 'kDBConnectionDebug' : 'kDBConnection');
-		$this->Conn = $this->Factory->makeClass($db_class, Array (SQL_TYPE, Array (&$this, 'handleSQLError')));
+		$this->Conn = $this->Factory->makeClass($db_class, Array (SQL_TYPE, Array ($this->_logger, 'handleSQLError')));
 		$this->Conn->setup($vars);
 
 		$this->cacheManager = $this->makeClass('kCacheManager');
@@ -752,6 +726,7 @@
 		$this->registerClass('kTempTablesHandler', KERNEL_PATH . '/utility/temp_handler.php');
 		$this->registerClass('kValidator', KERNEL_PATH . '/utility/validator.php');
 		$this->registerClass('kOpenerStack', KERNEL_PATH . '/utility/opener_stack.php');
+		$this->registerClass('kLogger', KERNEL_PATH . '/utility/logger.php');
 
 		$this->registerClass('kUnitConfigReader', KERNEL_PATH . '/utility/unit_config_reader.php');
 
@@ -2404,224 +2379,15 @@
 	 * @param string $sql
 	 * @return bool
 	 * @access public
+	 * @throws Exception
+	 * @deprecated
 	 */
 	public function handleSQLError($code, $msg, $sql)
 	{
-		if ( isset($this->Debugger) ) {
-			$long_error_msg = '<span class="debug_error">' . $msg . ' (' . $code . ')</span><br/><a href="javascript:$Debugger.SetClipboard(\'' . htmlspecialchars($sql) . '\');"><strong>SQL</strong></a>: ' . $this->Debugger->formatSQL($sql);
-			$long_id = $this->Debugger->mapLongError($long_error_msg);
-			$error_msg = mb_substr($msg . ' (' . $code . ') [' . $sql . ']', 0, 1000) . ' #' . $long_id;
-
-			if ( kUtil::constOn('DBG_SQL_FAILURE') && !defined('IS_INSTALL') ) {
-				throw new Exception($error_msg);
-			}
-			else {
-				$this->Debugger->appendTrace();
-			}
-		}
-		else {
-			// when not debug mode, then fatal database query won't break anything
-			$error_msg = '<strong>SQL Error</strong> in sql: ' . $sql . ', code <strong>' . $code . '</strong> (' . $msg . ')';
-		}
-
-		trigger_error($error_msg, E_USER_WARNING);
-
-		return true;
+		return $this->_logger->handleSQLError($code, $msg, $sql);
 	}
 
 	/**
-	 * Default error handler
-	 *
-	 * @param int $errno
-	 * @param string $errstr
-	 * @param string $errfile
-	 * @param int $errline
-	 * @param Array $errcontext
-	 * @return bool
-	 * @access public
-	 */
-	public function handleError($errno, $errstr, $errfile = null, $errline = null, $errcontext = Array ())
-	{
-		$this->errorLogSilent($errno, $errstr, $errfile, $errline);
-
-		$debug_mode = defined('DEBUG_MODE') && DEBUG_MODE;
-		$skip_reporting = defined('DBG_SKIP_REPORTING') && DBG_SKIP_REPORTING;
-
-		if ( !$this->errorHandlers || ($debug_mode && $skip_reporting) ) {
-			// when debugger absent OR it's present, but we actually can't see it's error report (e.g. during ajax request)
-			if ( $errno == E_USER_ERROR ) {
-				$this->errorDisplayFatal('<strong>Fatal Error: </strong>' . "{$errstr} in {$errfile} on line {$errline}");
-			}
-
-			if ( !$this->errorHandlers ) {
-				return true;
-			}
-		}
-
-		$res = false;
-		/* @var $handler Closure */
-
-		foreach ($this->errorHandlers as $handler) {
-			if ( is_array($handler) ) {
-				$object =& $handler[0];
-				$method = $handler[1];
-				$res = $object->$method($errno, $errstr, $errfile, $errline, $errcontext);
-			}
-			else {
-				$res = $handler($errno, $errstr, $errfile, $errline, $errcontext);
-			}
-		}
-
-		return $res;
-	}
-
-	/**
-	 * Handles exception
-	 *
-	 * @param Exception $exception
-	 * @return bool
-	 * @access public
-	 */
-	public function handleException($exception)
-	{
-		// transform exception to regular error (no need to rewrite existing error handlers)
-		$errno = $exception->getCode();
-		$errstr = $exception->getMessage();
-		$errfile = $exception->getFile();
-		$errline = $exception->getLine();
-
-		$this->errorLogSilent($errno, $errstr, $errfile, $errline);
-
-		$debug_mode = defined('DEBUG_MODE') && DEBUG_MODE;
-		$skip_reporting = defined('DBG_SKIP_REPORTING') && DBG_SKIP_REPORTING;
-
-		if ( $exception instanceof kRedirectException ) {
-			/* @var $exception kRedirectException */
-
-			$exception->run();
-		}
-
-		if ( !$this->exceptionHandlers || ($debug_mode && $skip_reporting) ) {
-			// when debugger absent OR it's present, but we actually can't see it's error report (e.g. during ajax request)
-			$this->errorDisplayFatal('<strong>' . get_class($exception) . ': </strong>' . "{$errstr} in {$errfile} on line {$errline}");
-
-			if ( !$this->exceptionHandlers ) {
-				return true;
-			}
-		}
-
-		$res = false;
-		/* @var $handler Closure */
-
-		foreach ($this->exceptionHandlers as $handler) {
-			if ( is_array($handler) ) {
-				$object =& $handler[0];
-				$method = $handler[1];
-				$res = $object->$method($exception);
-			}
-			else {
-				$res = $handler($exception);
-			}
-		}
-
-		return $res;
-	}
-
-	/**
-	 * Silently saves each given error message to "silent_log.txt" file, when silent log mode is enabled
-	 * @param int $errno
-	 * @param string $errstr
-	 * @param string $errfile
-	 * @param int $errline
-	 * @return void
-	 * @access protected
-	 */
-	protected function errorLogSilent($errno, $errstr = '', $errfile = '', $errline = null)
-	{
-		if ( !defined('SILENT_LOG') || !SILENT_LOG ) {
-			return;
-		}
-
-		if ( !(defined('DBG_IGNORE_STRICT_ERRORS') && DBG_IGNORE_STRICT_ERRORS && defined('E_STRICT') && ($errno == E_STRICT)) ) {
-			$time = adodb_date('d/m/Y H:i:s');
-
-			$fp = fopen((defined('RESTRICTED') ? RESTRICTED : FULL_PATH) . '/silent_log.txt', 'a');
-			fwrite($fp, '[' . $time . '] #' . $errno . ': ' . strip_tags($errstr) . ' in [' . $errfile . '] on line ' . $errline . "\n");
-			fclose($fp);
-		}
-	}
-
-	/**
-	 * Displays div with given error message
-	 *
-	 * @param string $msg
-	 * @return void
-	 * @access protected
-	 */
-	protected function errorDisplayFatal($msg)
-	{
-		$margin = $this->isAdmin ? '8px' : 'auto';
-		echo '<div style="background-color: #FEFFBF; margin: ' . $margin . '; padding: 10px; border: 2px solid red; text-align: center">' . $msg . '</div>';
-		exit;
-	}
-
-	/**
-	 * Prints trace, when debug mode is not available
-	 *
-	 * @param bool $return_result
-	 * @param int $skip_levels
-	 * @return string
-	 * @access public
-	 */
-	public function printTrace($return_result = false, $skip_levels = 1)
-	{
-		$ret = Array ();
-		$trace = debug_backtrace(false);
-
-		for ($i = 0; $i < $skip_levels; $i++) {
-			array_shift($trace);
-		}
-
-		foreach ($trace as $level => $trace_info) {
-			if ( isset($trace_info['class']) ) {
-				$object = $trace_info['class'];
-			}
-			elseif ( isset($trace_info['object']) ) {
-				$object = get_class($trace_info['object']);
-			}
-			else {
-				$object = '';
-			}
-
-			$args = '';
-			$type = isset($trace_info['type']) ? $trace_info['type'] : '';
-
-			if ( isset($trace_info['args']) ) {
-				foreach ($trace_info['args'] as $argument) {
-					if ( is_object($argument) ) {
-						$args .= get_class($argument) . ' instance, ';
-					}
-					else {
-						$args .= is_array($argument) ? 'Array' : substr($argument, 0, 10) . ' ..., ';
-					}
-				}
-
-				$args = substr($args, 0, -2);
-			}
-
-			$ret[] = '#' . $level . '  ' . $object . $type . $trace_info['function'] . '(' . $args . ') called at [' . $trace_info['file'] . ':' . $trace_info['line'] . ']';
-		}
-
-		if ( $return_result ) {
-			return implode("\n", $ret);
-		}
-
-		echo implode("\n", $ret);
-
-		return '';
-	}
-
-	/**
 	 * Returns & blocks next ResourceId available in system
 	 *
 	 * @return int
@@ -3238,4 +3004,38 @@
 		$already_set = true;
 		header($header);
 	}
+
+	/**
+	 * Posts message to event log
+	 *
+	 * @param string $message
+	 * @param int $code
+	 * @param bool $write_now Allows further customization of log record by returning kLog object
+	 * @return bool|int|kLogger
+	 * @access public
+	 */
+	public function log($message, $code = null, $write_now = false)
+	{
+		$log = $this->_logger->prepare($message, $code)->addSource($this->_logger->createTrace(null, 1));
+
+		if ( $write_now ) {
+			return $log->write();
+		}
+
+		return $log;
+	}
+
+	/**
+	 * Deletes log with given id from database or disk, when database isn't available
+	 *
+	 * @param int $unique_id
+	 * @param int $storage_medium
+	 * @return void
+	 * @access public
+	 * @throws InvalidArgumentException
+	 */
+	public function deleteLog($unique_id, $storage_medium = kLogger::LS_AUTOMATIC)
+	{
+		$this->_logger->delete($unique_id, $storage_medium);
+	}
 }
\ No newline at end of file
Index: branches/5.2.x/core/units/logs/email_logs/email_log_eh.php
===================================================================
diff -u -r15230 -r15552
--- branches/5.2.x/core/units/logs/email_logs/email_log_eh.php	(.../email_log_eh.php)	(revision 15230)
+++ branches/5.2.x/core/units/logs/email_logs/email_log_eh.php	(.../email_log_eh.php)	(revision 15552)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version	$Id: email_log_eh.php 15230 2012-03-26 10:13:31Z alex $
+ * @version	$Id: email_log_eh.php 15552 2012-10-02 17:13:27Z alex $
  * @package	In-Portal
  * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
  * @license	  GNU/GPL
@@ -66,10 +66,10 @@
 	 */
 	protected function OnRotate(kEvent $event)
 	{
-		$rotation_interval = $this->Application->ConfigValue('EmailLogRotationInterval');
+		$rotation_interval = (int)$this->Application->ConfigValue('EmailLogRotationInterval');
 
-		if ( $rotation_interval == '' || $rotation_interval == -1 ) {
-			// never OR forever
+		if ( $rotation_interval === -1 ) {
+			// forever
 			return;
 		}
 
Index: branches/5.2.x/core/install/remove_schema.sql
===================================================================
diff -u -r15268 -r15552
--- branches/5.2.x/core/install/remove_schema.sql	(.../remove_schema.sql)	(revision 15268)
+++ branches/5.2.x/core/install/remove_schema.sql	(.../remove_schema.sql)	(revision 15552)
@@ -20,6 +20,7 @@
 DROP TABLE UserGroupRelations;
 DROP TABLE UserSessions;
 DROP TABLE EmailLog;
+DROP TABLE SystemLog;
 DROP TABLE SystemCache;
 DROP TABLE CountryStates;
 DROP TABLE Categories;
Index: branches/5.2.x/core/install/upgrades.sql
===================================================================
diff -u -r15550 -r15552
--- branches/5.2.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 15550)
+++ branches/5.2.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 15552)
@@ -2806,3 +2806,53 @@
 
 INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.NEW.PASSWORD', NULL, 1, 0, 'Core', 'Sends new password to an existing user', 0, 1, 0);
 INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.ADD.BYADMIN', NULL, 1, 0, 'Core', 'Sends password to a new user', 0, 1, 0);
+
+CREATE TABLE SystemLog (
+  LogId int(11) NOT NULL AUTO_INCREMENT,
+  LogUniqueId int(11) DEFAULT NULL,
+  LogLevel tinyint(4) NOT NULL DEFAULT '7',
+  LogType tinyint(4) NOT NULL DEFAULT '3',
+  LogCode int(11) DEFAULT NULL,
+  LogMessage longtext,
+  LogTimestamp int(11) DEFAULT NULL,
+  LogDate datetime DEFAULT NULL,
+  LogEventName varchar(100) NOT NULL DEFAULT '',
+  LogHostname varchar(255) NOT NULL DEFAULT '',
+  LogRequestSource tinyint(4) DEFAULT NULL,
+  LogRequestURI varchar(255) NOT NULL DEFAULT '',
+  LogRequestData longtext,
+  LogUserId int(11) DEFAULT NULL,
+  LogInterface tinyint(4) DEFAULT NULL,
+  IpAddress varchar(15) NOT NULL DEFAULT '',
+  LogSessionKey int(11) DEFAULT NULL,
+  LogSessionData longtext,
+  LogBacktrace longtext,
+  LogSourceFilename varchar(255) NOT NULL DEFAULT '',
+  LogSourceFileLine int(11) DEFAULT NULL,
+  LogProcessId bigint(20) unsigned DEFAULT NULL,
+  LogMemoryUsed bigint(20) unsigned NOT NULL,
+  LogUserData longtext NOT NULL,
+  LogNotificationStatus tinyint(4) NOT NULL DEFAULT '0',
+  PRIMARY KEY (LogId),
+  KEY LogLevel (LogLevel),
+  KEY LogType (LogType),
+  KEY LogNotificationStatus (LogNotificationStatus)
+);
+
+INSERT INTO SystemSettings VALUES(DEFAULT, 'EnableEmailLog', '1', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsLogs', 'la_config_EnableEmailLog', 'radio', NULL, '1=la_Yes||0=la_No', 65.01, 0, 1, 'hint:la_config_EnableEmailLog');
+
+UPDATE SystemSettings
+SET DisplayOrder = 65.02, Heading = 'la_section_SettingsLogs', ValueList = '86400=la_opt_OneDay||604800=la_opt_OneWeek||1209600=la_opt_TwoWeeks||2419200=la_opt_OneMonth||7257600=la_opt_ThreeMonths||29030400=la_opt_OneYear||-1=la_opt_EmailLogKeepForever'
+WHERE VariableName = 'EmailLogRotationInterval';
+
+UPDATE LanguageLabels
+SET
+	l<%PRIMARY_LANGUAGE%>_Translation = 'Keep "E-mail Log" for',
+	l<%PRIMARY_LANGUAGE%>_HintTranslation = 'This setting allows you to control for how long "E-mail Log" messages will be stored in the log and then automatically deleted. Use option "Forever" with caution since it will completely disable automatic log cleanup and can lead to large size of database table that stores e-mail messages.'
+WHERE PhraseKey = 'LA_CONFIG_EMAILLOGROTATIONINTERVAL' AND l<%PRIMARY_LANGUAGE%>_Translation = 'Keep Email Log for';
+
+DELETE FROM LanguageLabels WHERE PhraseKey = 'LA_OPT_EMAILLOGKEEPNEVER';
+
+INSERT INTO SystemSettings VALUES(DEFAULT, 'SystemLogRotationInterval', '2419200', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsLogs', 'la_config_SystemLogRotationInterval', 'select', NULL, '86400=la_opt_OneDay||604800=la_opt_OneWeek||1209600=la_opt_TwoWeeks||2419200=la_opt_OneMonth||7257600=la_opt_ThreeMonths||29030400=la_opt_OneYear||-1=la_opt_SystemLogKeepForever', 65.03, 0, 1, 'hint:la_config_SystemLogRotationInterval');
+INSERT INTO SystemSettings VALUES(DEFAULT, 'SystemLogNotificationEmail', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsLogs', 'la_config_SystemLogNotificationEmail', 'text', 'a:5:{s:4:"type";s:6:"string";s:9:"formatter";s:10:"kFormatter";s:6:"regexp";s:85:"/^([-a-zA-Z0-9!\\#$%&*+\\/=?^_`{|}~.]+@[a-zA-Z0-9]{1}[-.a-zA-Z0-9_]*\\.[a-zA-Z]{2,6})$/i";s:10:"error_msgs";a:1:{s:14:"invalid_format";s:18:"!la_invalid_email!";}s:7:"default";s:0:"";}', NULL, 65.04, 0, 1, 'hint:la_config_SystemLogNotificationEmail');
+INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'SYSTEM.LOG.NOTIFY', NULL, 1, 0, 'Core', 'Notification about message added to System Log', 1, 1, 1);
Index: branches/5.2.x/core/kernel/db/db_connection.php
===================================================================
diff -u -r15518 -r15552
--- branches/5.2.x/core/kernel/db/db_connection.php	(.../db_connection.php)	(revision 15518)
+++ branches/5.2.x/core/kernel/db/db_connection.php	(.../db_connection.php)	(revision 15552)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_connection.php 15518 2012-08-17 15:19:15Z alex $
+* @version	$Id: db_connection.php 15552 2012-10-02 17:13:27Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -314,6 +314,17 @@
 		}
 
 		/**
+		 * Checks if connection to database is opened
+		 *
+		 * @return bool
+		 * @access public
+		 */
+		public function connectionOpened()
+		{
+			return $this->connectionOpened;
+		}
+
+		/**
 		 * Setups the connection according given configuration
 		 *
 		 * @param Array $config
Index: branches/5.2.x/core/admin_templates/logs/system_logs/system_log_edit.tpl
===================================================================
diff -u
--- branches/5.2.x/core/admin_templates/logs/system_logs/system_log_edit.tpl	(revision 0)
+++ branches/5.2.x/core/admin_templates/logs/system_logs/system_log_edit.tpl	(revision 15552)
@@ -0,0 +1,193 @@
+<inp2:adm_SetPopupSize width="1000" height="650"/>
+<inp2:m_include t="incs/header"/>
+
+<inp2:m_RenderElement name="combined_header" section="in-portal:system_logs" prefix="system-log" title_preset="system_log_edit"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Close" escape="1"/>', function() {
+						submit_event('system-log', 'OnCancel');
+					}
+				));
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('system-log', '<inp2:system-log_PrevId/>');
+						}
+				));
+
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('system-log', '<inp2:system-log_NextId/>');
+						}
+				));
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="system-log_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="system-log_IsLast">
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="system-log_IsFirst">
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:system-log_SaveWarning name="grid_save_warning"/>
+<inp2:system-log_ErrorWarning name="form_error_warning"/>
+
+<style type="text/css">
+	.control-cell {
+		font-size: 12px;
+	}
+
+	.highlight-area {
+		border: 1px solid black;
+		padding: 8px;
+		font-family: serif;
+		background-color: #F6F6F6;
+		overflow: auto;
+	}
+
+	.log_backtrace {
+		margin: 0;
+		padding-left: 25px;
+	}
+
+	.log_backtrace div {
+		margin: 4px 0;
+	}
+</style>
+
+<inp2:m_DefineElement name="inp_serialized_label">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<td class="control-cell" valign="top">
+			<div class="highlight-area" style="width: 760px; height: 234px;">
+				<inp2:{$prefix}_PrintArray field="$field"/>
+			</div>
+		</td>
+	</inp2:m_RenderElement>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="backtrace_element">
+	<li>
+		<inp2:m_if check="m_Param" name="has_args">
+			<a href="#" title="<inp2:m_Phrase name='hint:la_LogBacktraceFunction' html_escape='1'/>" trace_index="<inp2:m_Param name='index'/>"><inp2:m_Phrase name="la_LogBacktraceFunction"/>:</a> <inp2:m_Param name="file_info"/>
+
+			<div class="highlight-area" style="display: none;" id="trace_args_<inp2:m_Param name='index'/>">
+				<inp2:m_Param name="args"/>
+			</div>
+		<inp2:m_else/>
+			<inp2:m_Phrase name="la_LogBacktraceFunction"/>: <inp2:m_Param name="file_info"/>
+		</inp2:m_if>
+	</li>
+</inp2:m_DefineElement>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_title_General"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="system-log" field="LogId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_label" prefix="system-log" field="LogLevel"/>
+			<inp2:m_RenderElement name="inp_label" prefix="system-log" field="LogType"/>
+
+			<inp2:m_if check="system-log_Field" name="LogCode" db="db">
+				<inp2:m_RenderElement name="inp_label" prefix="system-log" field="LogCode"/>
+			</inp2:m_if>
+
+			<inp2:m_RenderElement name="inp_label" prefix="system-log" field="LogMessage" no_special="no_special"/>
+			<inp2:m_RenderElement name="inp_label" prefix="system-log" field="LogTimestamp"/>
+
+		<inp2:m_RenderElement name="subsection" title="la_title_LogRequest"/>
+			<inp2:m_if check="system-log_Field" name="IpAddress" db="db">
+				<inp2:m_RenderElement name="inp_label" prefix="system-log" field="IpAddress"/>
+			</inp2:m_if>
+
+			<inp2:m_RenderElement name="inp_label" prefix="system-log" field="LogHostname"/>
+			<inp2:m_RenderElement name="inp_label" prefix="system-log" field="LogInterface"/>
+			<inp2:m_RenderElement name="inp_label" prefix="system-log" field="LogRequestSource"/>
+
+			<inp2:m_RenderElement design="form_row" prefix="system-log" field="LogRequestURI">
+				<td class="control-cell" valign="top">
+					<inp2:$prefix_RequestURI/>
+				</td>
+			</inp2:m_RenderElement>
+
+			<inp2:m_if check="system-log_Field" name="LogRequestData" db="db">
+				<inp2:m_RenderElement name="inp_serialized_label" prefix="system-log" field="LogRequestData"/>
+			</inp2:m_if>
+
+		<inp2:m_RenderElement name="subsection" title="la_title_LogSession"/>
+			<inp2:m_RenderElement name="inp_label" prefix="system-log" field="Username"/>
+			<inp2:m_RenderElement name="inp_label" prefix="system-log" field="LogSessionKey"/>
+
+			<inp2:m_if check="system-log_Field" name="LogSessionData" db="db">
+				<inp2:m_RenderElement name="inp_serialized_label" prefix="system-log" field="LogSessionData"/>
+			</inp2:m_if>
+
+		<inp2:m_RenderElement name="subsection" title="la_title_LogSource"/>
+			<inp2:m_RenderElement design="form_row" prefix="system-log" field="LogSourceFilename">
+				<td class="control-cell" valign="top">
+					<strong><inp2:$prefix_Filename/></strong> <inp2:m_Phrase name="la_OnLine"/> <strong><inp2:$prefix_Field field="LogSourceFileLine"/></strong>
+				</td>
+			</inp2:m_RenderElement>
+
+			<inp2:m_if check="system-log_Field" name="LogEventName" db="db">
+				<inp2:m_RenderElement name="inp_label" prefix="system-log" field="LogEventName"/>
+			</inp2:m_if>
+
+			<inp2:m_if check="system-log_Field" name="LogBacktrace" db="db">
+				<inp2:m_RenderElement design="form_row" prefix="system-log" field="LogBacktrace">
+					<td class="control-cell" valign="top">
+						<ol class="log_backtrace">
+							<inp2:$prefix_PrintBacktrace render_as="backtrace_element" include_args="1"/>
+						</ol>
+					</td>
+				</inp2:m_RenderElement>
+			</inp2:m_if>
+
+		<inp2:m_RenderElement name="subsection" title="la_title_LogOther"/>
+			<inp2:m_RenderElement name="inp_label" prefix="system-log" field="LogProcessId"/>
+
+			<inp2:m_RenderElement design="form_row" prefix="system-log" field="LogMemoryUsed">
+				<td class="control-cell" valign="top">
+					<strong><inp2:$prefix_MemoryUsage/></strong> (<inp2:{$prefix}_Field field="$field"/> bytes)
+				</td>
+			</inp2:m_RenderElement>
+
+			<inp2:m_if check="system-log_Field" name="LogUserData" db="db">
+				<inp2:m_RenderElement name="inp_label" prefix="system-log" field="LogUserData" nl2br="1"/>
+			</inp2:m_if>
+
+			<inp2:m_if check="system-log_Field" name="LogNotificationStatus" db="db">
+				<inp2:m_RenderElement name="inp_edit_radio" prefix="system-log" field="LogNotificationStatus"/>
+			</inp2:m_if>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<script type="text/javascript">
+	$(document).ready(function () {
+		$('a', '.log_backtrace').click(function () {
+			$('#trace_args_' + $(this).attr('trace_index')).toggle();
+
+			return false;
+		});
+	});
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.2.x/core/install/step_templates/sys_config.tpl
===================================================================
diff -u -r15445 -r15552
--- branches/5.2.x/core/install/step_templates/sys_config.tpl	(.../sys_config.tpl)	(revision 15445)
+++ branches/5.2.x/core/install/step_templates/sys_config.tpl	(.../sys_config.tpl)	(revision 15552)
@@ -11,10 +11,17 @@
 		'MemcacheServers' => Array ('type' => 'text', 'title' => 'Location of Memcache Servers', 'section' => 'Misc', 'default' => 'localhost:11211'),
 		'CompressionEngine' => Array ('type' => 'select', 'title' => 'CSS/JS Compression Engine', 'section' => 'Misc', 'default' => ''),
 		'WebsiteCharset' => Array ('type' => 'text', 'title' => 'Website Charset', 'section' => 'Misc', 'required' => 1, 'default' => 'utf-8'),
+		'EnableSystemLog' => Array ('type' => 'radio', 'title' => 'Enable "System Log"', 'section' => 'Misc', 'required' => 1, 'default' => '0'),
+		'SystemLogMaxLevel' => Array ('type' => 'select', 'title' => 'Highest "Log Level", that will be saved in "System Log"', 'section' => 'Misc', 'required' => 1, 'default' => '5'),
 	);
 
 	$settings['CacheHandler']['options'] = $this->toolkit->getWorkingCacheHandlers();
 	$settings['CompressionEngine']['options'] = $this->toolkit->getWorkingCompressionEngines();
+	$settings['EnableSystemLog']['options'] = Array (1 => 'Enabled', 2 => 'User-only', 0 => 'Disabled');
+	$settings['SystemLogMaxLevel']['options'] = Array (
+		0 => 'emergency', 1 => 'alert', 2 => 'critical', 3 => 'error',
+		4 => 'warning', 5 => 'notice', 6 => 'info', 7 => 'debug'
+	);
 
 	$row_class = 'table-color2';
 
@@ -29,26 +36,36 @@
 				<?php
 					$config_value =  $this->toolkit->getSystemConfig($output_params['section'], $config_var, $output_params['default']);
 
-					if ( $output_params['type'] == 'text' ) {
-						echo '<input type="text" name="system_config[' . $output_params['section'] . '][' . $config_var . ']" value="' . $config_value . '" class="text" style="width: 200px;"/>';
-					}
-					else {
-						echo '<select name="system_config[' . $output_params['section'] . '][' . $config_var . ']">';
+					switch ( $output_params['type'] ) {
+						case 'text':
+							echo '<input type="text" name="system_config[' . $output_params['section'] . '][' . $config_var . ']" value="' . $config_value . '" class="text" style="width: 200px;"/>';
+							break;
 
-						if ( $output_params['options'][$config_value] == 'None' ) {
-							$tmp_values = array_keys($output_params['options']);
+						case 'select':
+							echo '<select name="system_config[' . $output_params['section'] . '][' . $config_var . ']">';
 
-							if ( count($tmp_values) > 1 ) {
-								$config_value = $tmp_values[1];
+							if ( $output_params['options'][$config_value] == 'None' ) {
+								$tmp_values = array_keys($output_params['options']);
+
+								if ( count($tmp_values) > 1 ) {
+									$config_value = $tmp_values[1];
+								}
 							}
-						}
 
-						foreach($output_params['options'] as $option_key => $option_value) {
-							$selected = $option_key == $config_value ? ' selected' : '';
-							echo '<option value="' . $option_key . '"' . $selected . '>' . $option_value . '</option>';
-						}
+							foreach($output_params['options'] as $option_key => $option_value) {
+								$selected = $option_key == $config_value ? ' selected' : '';
+								echo '<option value="' . $option_key . '"' . $selected . '>' . $option_value . '</option>';
+							}
 
-						echo '</select>';
+							echo '</select>';
+							break;
+
+						case 'radio':
+							foreach($output_params['options'] as $option_key => $option_value) {
+								$selected = $option_key == $config_value ? ' checked' : '';
+								echo '<input type="radio" name="system_config[' . $output_params['section'] . '][' . $config_var . ']" value="' . $option_key . '"' . $selected . '/>' . $option_value;
+							}
+							break;
 					}
 				?>
 			</td>