in-portal
No OneTemporary
Actions

Subscribers

None

File Metadata

Created: Thu, Oct 9, 7:47 AM

in-portal
View Options

	Index: branches/5.3.x/admin/system_presets/simple/email_templates_email-template.php
	===================================================================
	--- branches/5.3.x/admin/system_presets/simple/email_templates_email-template.php (revision 16388)
	+++ branches/5.3.x/admin/system_presets/simple/email_templates_email-template.php (revision 16389)
	@@ -1,68 +1,68 @@
	<?php

	defined('FULL_PATH') or die('restricted access!');

	// section removal
	$remove_sections = Array (
	// 'in-portal:configemail',
	);

	// sections shown with debug on
	$debug_only_sections = Array (
	'in-portal:configemail',
	);

	// toolbar buttons
	$remove_buttons = Array (
	// list of all email templates
	'email_template_list' => Array (/'new_item', 'edit', 'delete', 'approve', 'decline', 'frontend_mail', 'view',/ 'export', /'dbl-click'/),

	// edit email template - general tab
	'email_template_edit' => Array (/'select',/ 'setprimary', /'cancel', 'reset_edit', 'prev', 'next'/),

	// edit email template - settings tab
	// 'email_template_edit_settings' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
	);

	// fields to hide
	$hidden_fields = Array (
	/*'TemplateId', 'TemplateName', 'ReplacementTags', 'AllowChangingSender', 'CustomSender',
	'SenderName', 'SenderAddressType', 'SenderAddress', 'AllowChangingRecipient',
	'CustomRecipient', 'Recipients', 'Subject', 'HtmlBody', 'PlainTextBody', 'Headers',
	'Enabled', 'FrontEndOnly', 'Module', 'BindToSystemEvent', 'Description', 'Type'*/
	);

	// virtual fields to hide
	$virtual_hidden_fields = Array (
	/*'RecipientType', 'RecipientName', 'RecipientAddressType',
	'RecipientAddress', 'Tag', 'Replacement', 'ReplacementTagsXML',*/ 'TranslationInSync', 'TranslateFromLanguage'
	);

	// fields to make required
	$required_fields = Array (
	/'TemplateId',/ 'TemplateName', /*'ReplacementTags', 'AllowChangingSender', 'CustomSender',
	'SenderName', 'SenderAddressType', 'SenderAddress', 'AllowChangingRecipient',
	'CustomRecipient', 'Recipients',/ 'Subject', /'HtmlBody', 'PlainTextBody', 'Headers',*/
	/'Enabled', 'FrontEndOnly',/ 'Module', /'BindToSystemEvent', 'Description',/ 'Type'
	);

	// virtual fields to make required
	$virtual_required_fields = Array (
	/*'RecipientType', 'RecipientName', 'RecipientAddressType',
	'RecipientAddress', 'Tag', 'Replacement', 'ReplacementTagsXML',*/
	);

	$debug_only_virtual_fields = Array (
	'SourceSubject', 'SourceHtmlBody', 'SourcePlainTextBody',
	);

	// tabs during editing
	$hide_edit_tabs = Array (
	'Default' => Array (/'general',/ 'settings'),
	);

	// hide columns in grids
	$hide_columns = Array (
	// 'Default' => Array ('TemplateId', 'Description', 'TemplateName', 'Module', 'Type', 'Enabled', 'LastChanged'),
	- 'Emails' => Array (/'EventId', 'Event', 'Subject', 'Description', 'Type', 'Enabled', 'Module', 'FrontEndOnly', 'LastChanged',/ 'TranslationInSync', 'TranslateFromLanguage'),
	+ 'Emails' => Array (/'TemplateId', 'TemplateName', 'Subject', 'Description', 'Type', 'Enabled', 'Module', 'FrontEndOnly', 'LastChanged',/ 'TranslationInSync', 'TranslateFromLanguage'),
	);
	Index: branches/5.3.x/core/kernel/utility/logger.php
	===================================================================
	--- branches/5.3.x/core/kernel/utility/logger.php (revision 16388)
	+++ branches/5.3.x/core/kernel/utility/logger.php (revision 16389)
	@@ -1,1403 +1,1404 @@
	<?php
	/**
	* @version $Id$
	* @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();

	$system_config = kUtil::getSystemConfig();

	$this->_debugMode = $this->Application->isDebugMode();
	$this->setState($system_config->get('EnableSystemLog', self::STATE_DISABLED));
	$this->_maxLogLevel = $system_config->get('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();
	+ $this->_logRecord['IpAddress'] = $this->Application->getClientIp();
	}

	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(
	'Headers' => $this->Application->HttpQuery->getHeaders(),
	);

	$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);
	}
	}
	elseif ( strlen($value) > 200 ) {
	$ret[$key] = substr($value, 0, 50) . ' ...';
	}
	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;

	$exception_trace = $exception->getTrace();

	array_unshift($exception_trace, array(
	'function' => '',
	'file' => $exception->getFile() !== null ? $exception->getFile() : 'n/a',
	'line' => $exception->getLine() !== null ? $exception->getLine() : 'n/a',
	'args' => array(),
	));

	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_trace, 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_trace, 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 false;
	}

	$this->_logRecord['LogMemoryUsed'] = memory_get_usage();
	$this->_logRecord['LogTimestamp'] = time();
	$this->_logRecord['LogDate'] = 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) && isset($this->_handlers[self::LL_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->emailAdmin('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'];

	if ( PHP_SAPI === 'cli' ) {
	$result = sprintf(' [%s] ' . PHP_EOL . ' %s', $errno, $errstr);

	if ( $this->_logRecord['LogBacktrace'] ) {
	$result .= $this->printBacktrace(unserialize($this->_logRecord['LogBacktrace']));
	}
	}
	else {
	$result = '<strong>' . $errno . ': </strong>' . "{$errstr} in {$errfile} on line {$errline}";
	}

	return $strip_tags ? strip_tags($result) : $result;
	}

	/**
	* Prints backtrace result
	*
	* @param array $trace Trace.
	*
	* @return string
	*/
	protected function printBacktrace(array $trace)
	{
	if ( !$trace ) {
	return '';
	}

	$ret = PHP_EOL . PHP_EOL . PHP_EOL . 'Exception trace:' . PHP_EOL;

	foreach ( $trace as $trace_info ) {
	$class = isset($trace_info['class']) ? $trace_info['class'] : '';
	$type = isset($trace_info['type']) ? $trace_info['type'] : '';
	$function = $trace_info['function'];
	$args = isset($trace_info['args']) && $trace_info['args'] ? '...' : '';
	$file = isset($trace_info['file']) ? $trace_info['file'] : 'n/a';
	$line = isset($trace_info['line']) ? $trace_info['line'] : 'n/a';

	$ret .= sprintf(' %s%s%s(%s) at %s:%s' . PHP_EOL, $class, $type, $function, $args, $file, $line);
	}

	return $ret;
	}

	/**
	* Saves log to file (e.g. when not possible to save into database)
	*
	* @param $filename
	* @return bool
	* @access protected
	*/
	protected function _saveToFile($filename)
	{
	$time = 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';
	$error_msg = $this->_logger->toString($errno, PHP_SAPI === 'cli');

	if ( PHP_SAPI === 'cli' ) {
	echo $error_msg;
	}
	else {
	echo '<div style="background-color: #FEFFBF; margin: ' . $margin . '; padding: 10px; border: 2px solid red; text-align: center">' . $error_msg . '</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;

	foreach ($this->_handlers as $handler) {
	$res = call_user_func($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;

	foreach ($this->_handlers as $handler) {
	$res = call_user_func($handler, $exception);
	}

	return $res;
	}
	}
	Index: branches/5.3.x/core/units/visits/visits_config.php
	===================================================================
	--- branches/5.3.x/core/units/visits/visits_config.php (revision 16388)
	+++ branches/5.3.x/core/units/visits/visits_config.php (revision 16389)
	@@ -1,166 +1,166 @@
	<?php
	/**
	* @version $Id$
	* @package In-Portal
	* @copyright Copyright (C) 1997 - 2009 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' => 'visits',
	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
	'ListClass' => Array ('class' => 'VisitsList', 'file' => 'visits_list.php', 'build_event' => 'OnListBuild'),
	'EventHandlerClass' => Array ('class' => 'VisitsEventHandler', 'file' => 'visits_event_handler.php', 'build_event' => 'OnBuild'),
	'TagProcessorClass' => Array ('class' => 'VisitsTagProcessor', 'file' => 'visits_tag_processor.php', 'build_event' => 'OnBuild'),

	'AutoLoad' => true,

	'QueryString' => Array (
	1 => 'id',
	2 => 'Page',
	3 => 'PerPage',
	4 => 'event',
	5 => 'mode',
	),

	'Hooks' => Array (
	Array (
	'Mode' => hBEFORE,
	'Conditional' => false,
	'HookToPrefix' => 'adm',
	'HookToSpecial' => '',
	'HookToEvent' => Array ( 'OnStartup' ),
	'DoPrefix' => '',
	'DoSpecial' => '',
	'DoEvent' => 'OnRegisterVisit',
	),

	Array (
	'Mode' => hAFTER,
	'Conditional' => false,
	'HookToPrefix' => 'u',
	'HookToSpecial' => '*',
	'HookToEvent' => Array ( 'OnAfterLogin' ),
	'DoPrefix' => '',
	'DoSpecial' => '',
	'DoEvent' => 'OnUserLogin',
	),
	),

	'IDField' => 'VisitId',
	'TableName' => TABLE_PREFIX.'UserVisits',

	'PermSection' => Array ('main' => 'in-portal:visits'),

	'Sections' => Array (
	'in-portal:visits' => Array (
	'parent' => 'in-portal:reports',
	'icon' => 'visits',
	'label' => 'la_tab_VisitorLog',
	'url' => Array ('t' => 'logs/visits/visits_list', 'pass' => 'm'),
	'permissions' => Array ('view', 'delete'),
	'priority' => 6,
	'type' => stTREE,
	),
	),

	'TitlePresets' => Array (
	'visits_list' => Array (
	'prefixes' => Array ('visits_List'), 'format' => "!la_title_Visits!",
	'toolbar_buttons' => Array ('search', 'search_reset', 'refresh', 'delete', 'export', 'view'),
	),

	'visits.incommerce_list' => Array (
	'prefixes' => Array ('visits.incommerce_List'), 'format' => "!la_title_Visits!",
	'toolbar_buttons' => Array ('search', 'search_reset', 'refresh', 'delete', 'export', 'view'),
	),
	),

	'CalculatedFields' => Array (
	'' => Array (
	'UserName' => 'IF( ISNULL(u.Username), IF (%1$s.PortalUserId = ' . USER_ROOT . ', \'root\', IF (%1$s.PortalUserId = ' . USER_GUEST . ', \'Guest\', \'n/a\')), IF(u.Username = "", u.Email, u.Username))',
	),
	'incommerce' => Array (
	'UserName' => 'IF( ISNULL(u.Username), IF (%1$s.PortalUserId = ' . USER_ROOT . ', \'root\', IF (%1$s.PortalUserId = ' . USER_GUEST . ', \'Guest\', \'n/a\')), IF(u.Username = "", u.Email, u.Username))',
	'AffiliateUser' => 'IF(au.PortalUserId IS NULL, "!la_None!", IF(au.Username = "", au.Email, au.Username))',
	'AffiliatePortalUserId' => 'af.PortalUserId',
	'OrderTotalAmount' => 'IF(ord.Status = 4, ord.SubTotal+ord.ShippingCost+ord.VAT, 0)',
	'OrderAffiliateCommission' => 'IF(ord.Status = 4, ord.AffiliateCommission, 0)',
	'OrderNumber' => 'CONCAT(LPAD(Number,6,"0"),\'-\',LPAD(SubNumber,3,"0") )',
	'OrderId' => 'ord.OrderId',
	),
	),

	'ListSQLs' => Array (
	'' => ' SELECT %1$s.* %2$s
	FROM %1$s
	LEFT JOIN '.TABLE_PREFIX.'Users u ON %1$s.PortalUserId = u.PortalUserId',
	'incommerce' => '
	SELECT %1$s.* %2$s
	FROM %1$s
	LEFT JOIN '.TABLE_PREFIX.'Users u ON %1$s.PortalUserId = u.PortalUserId
	LEFT JOIN '.TABLE_PREFIX.'Affiliates af ON %1$s.AffiliateId = af.AffiliateId
	LEFT JOIN '.TABLE_PREFIX.'Users au ON af.PortalUserId = au.PortalUserId
	LEFT JOIN '.TABLE_PREFIX.'Orders ord ON %1$s.VisitId = ord.VisitId',
	),

	'ListSortings' => Array (
	'' => Array (
	'Sorting' => Array ('VisitDate' => 'desc'),
	)
	),

	'Fields' => Array (
	'VisitId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
	'VisitDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'custom_filter' => 'date_range', 'default' => NULL),
	'Referer' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
	'IPAddress' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
	- 'AffiliateId' => Array ('type' => 'int','formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (0 => 'lu_None'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'Users u ON u.PortalUserId = af.PortalUserId WHERE %s','left_key_field' => 'AffiliateId','left_title_field' => 'IF(u.Email = "", u.Username, u.Email)','not_null'=>1,'default'=>0),
	+ 'AffiliateId' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (0 => 'lu_None'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'Users u ON u.PortalUserId = af.PortalUserId WHERE %s', 'left_key_field' => 'AffiliateId', 'left_title_field' => 'IF(u.Email = "", u.Username, u.Email)', 'not_null'=>1,'default'=>0),
	'PortalUserId' => Array ('type' => 'int', 'not_null' => '1', 'default' => USER_GUEST),
	),

	'VirtualFields' => Array (
	'UserName' => Array ('type' => 'string', 'default' => ''),
	'AffiliateUser' => Array ('type' => 'string', 'default' => ''),
	'AffiliatePortalUserId' => Array ('type' => 'int', 'default' => null),
	'OrderTotalAmount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'default' => '0.00', 'totals' => 'SUM'),
	'OrderTotalAmountSum' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'default' => '0.00'),
	'OrderAffiliateCommission' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%.02f', 'default' => '0.0000', 'totals' => 'SUM'),
	'OrderAffiliateCommissionSum' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%.02f', 'default' => '0.0000'),
	'OrderNumber' => Array ('type' => 'string', 'default' => ''),
	'OrderId' => Array ('type' => 'int', 'default' => '0'),
	),

	'Grids' => Array (
	'Default' => Array (
	'Icons' => Array ('default' => 'icon16_item.png'),
	'Fields' => Array (
	'VisitDate' => Array ( 'title' => 'la_col_VisitDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
	'IPAddress' => Array ( 'title' => 'la_col_IP', 'filter_block' => 'grid_like_filter', 'width' => 130, ),
	'Referer' => Array ( 'title' => 'la_col_Referer', 'data_block' => 'grid_referer_td', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
	'UserName' => Array ('title' => 'column:la_fld_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
	),
	),

	'visitsincommerce' => Array (
	'Icons' => Array ('default' => 'icon16_item.png'),
	'Fields' => Array (
	'VisitDate' => Array ( 'title' => 'la_col_VisitDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
	'IPAddress' => Array ( 'title' => 'la_col_IP', 'filter_block' => 'grid_like_filter', 'width' => 130, ),
	'Referer' => Array ( 'title' => 'la_col_Referer', 'data_block' => 'grid_referer_td', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
	'UserName' => Array ('data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
	'AffiliateUser' => Array ('data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 105, ),
	'OrderTotalAmountSum' => Array ( 'title' => 'la_col_OrderTotal', 'filter_block' => 'grid_range_filter', 'width' => 95, ),
	'OrderAffiliateCommissionSum' => Array ( 'title' => 'la_col_Commission', 'filter_block' => 'grid_range_filter', 'width' => 160, ),
	),
	),
	),
	-);
	\ No newline at end of file
	+);
	Index: branches/5.3.x/core/units/categories/categories_config.php
	===================================================================
	--- branches/5.3.x/core/units/categories/categories_config.php (revision 16388)
	+++ branches/5.3.x/core/units/categories/categories_config.php (revision 16389)
	@@ -1,543 +1,543 @@
	<?php
	/**
	* @version $Id$
	* @package In-Portal
	* @copyright Copyright (C) 1997 - 2009 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' => 'c',
	'ItemClass' => Array ('class' => 'CategoriesItem', 'file' => 'categories_item.php', 'build_event' => 'OnItemBuild'),
	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
	'EventHandlerClass' => Array ('class' => 'CategoriesEventHandler', 'file' => 'categories_event_handler.php', 'build_event' => 'OnBuild'),
	'TagProcessorClass' => Array ('class' => 'CategoriesTagProcessor', 'file' => 'categories_tag_processor.php', 'build_event' => 'OnBuild'),

	'RegisterClasses' => Array (
	Array ('pseudo' => 'kPermCacheUpdater', 'class' => 'kPermCacheUpdater', 'file' => 'cache_updater.php', 'build_event' => ''),
	),

	'ConfigPriority' => 0,

	'Hooks' => Array (
	Array (
	'Mode' => hAFTER,
	'Conditional' => false,
	'HookToPrefix' => 'adm', //self
	'HookToSpecial' => '*',
	'HookToEvent' => Array ('OnRebuildThemes'),
	'DoPrefix' => '',
	'DoSpecial' => '',
	'DoEvent' => 'OnAfterRebuildThemes',
	),

	Array (
	'Mode' => hBEFORE,
	'Conditional' => false,
	'HookToPrefix' => '',
	'HookToSpecial' => '*',
	'HookToEvent' => Array ('OnAfterConfigRead'),
	'DoPrefix' => 'cdata',
	'DoSpecial' => '*',
	'DoEvent' => 'OnDefineCustomFields',
	),

	Array (
	'Mode' => hBEFORE,
	'Conditional' => false,
	'HookToPrefix' => 'rel',
	'HookToSpecial' => '*',
	'HookToEvent' => Array ('OnAfterConfigRead'),
	'DoPrefix' => '',
	'DoSpecial' => '*',
	'DoEvent' => 'OnCloneSubItem',
	),

	Array (
	'Mode' => hBEFORE,
	'Conditional' => false,
	'HookToPrefix' => 'img',
	'HookToSpecial' => '*',
	'HookToEvent' => Array ('OnAfterConfigRead'),
	'DoPrefix' => '',
	'DoSpecial' => '*',
	'DoEvent' => 'OnCloneSubItem',
	),
	),

	'AutoLoad' => true,
	'CatalogItem' => true,
	'AdminTemplatePath' => 'categories',
	'AdminTemplatePrefix' => 'categories_',
	'SearchConfigPostfix' => 'category',

	'QueryString' => Array (
	1 => 'id',
	2 => 'Page',
	3 => 'PerPage',
	4 => 'event',
	5 => 'mode',
	),

	'AggregateTags' => Array (
	Array (
	'AggregateTo' => 'm',
	'AggregatedTagName' => 'CategoryLink',
	'LocalTagName' => 'CategoryLink',
	),
	),

	'IDField' => 'CategoryId',
	'StatusField' => Array ('Status'), // 'Status'
	'TitleField' => 'Name',

	'TitlePhrase' => 'la_Text_Category',
	'ItemType' => 1, // used for custom fields only

	'StatisticsInfo' => Array (
	'pending' => Array (
	'icon' => 'icon16_cat_pending.gif',
	'label' => 'la_tab_Categories',
	'js_url' => '#url#',
	'url' => Array ('t' => 'catalog/advanced_view', 'SetTab' => 'c', 'pass' => 'm,c.showall', 'c.showall_event' => 'OnSetFilterPattern', 'c.showall_filters' => 'show_active=0,show_pending=1,show_disabled=0,show_new=1,show_pick=1'),
	'status' => STATUS_PENDING,
	),
	),

	'TableName' => TABLE_PREFIX.'Categories',
	'CustomDataTableName' => TABLE_PREFIX . 'CategoryCustomData',

	'ViewMenuPhrase' => 'la_text_Categories',
	'CatalogTabIcon' => 'icon16_sections.png',

	'TitlePresets' => Array (
	'default' => Array (
	'new_status_labels' => Array ('c' => '!la_title_Adding_Category!'),
	'edit_status_labels' => Array ('c' => '!la_title_Editing_Category!'),
	'new_titlefield' => Array ('c' => '!la_title_New_Category!'),
	),

	'category_list' => Array ('prefixes' => Array ('c_List'), 'format' => "!la_title_Categories! (#c_recordcount#)"),
	'catalog' => Array (
	'prefixes' => Array (), 'format' => "<span id='category_path'>!la_title_Categories!</span>",
	'toolbar_buttons' => Array ('select', 'cancel', 'upcat', 'homecat', 'new_cat', 'new_link', 'new_article', 'new_topic', 'new_product', 'edit', 'delete', 'new_listing', 'approve', 'decline', 'cut', 'copy', 'paste', 'move_up', 'move_down', 'tools', 'view', 'dbl-click')
	),

	'advanced_view' => Array (
	'prefixes' => Array (), 'format' => "!la_title_AdvancedView!",
	'toolbar_buttons' => Array ('select', 'cancel', 'new_cat', 'new_link', 'new_article', 'new_topic', 'new_product', 'edit', 'delete', 'new_listing', 'approve', 'decline', 'view', 'dbl-click'),
	),
	'reviews' => Array (
	'prefixes' => Array (), 'format' => "!la_title_Reviews!",
	'toolbar_buttons' => Array ('edit', 'delete', 'approve', 'decline', 'view', 'dbl-click',)
	),

	'review_edit' => Array ('prefixes' => Array (), 'format' => "!la_title_Editing_Review!"),

	'categories_edit' => Array (
	'prefixes' => Array ('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_General!",
	),

	'categories_properties' => Array (
	'prefixes' => Array ('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Properties!",
	'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next'),
	),

	'categories_relations' => Array (
	'prefixes' => Array ('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Relations!",
	'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'new_item', 'edit', 'delete', 'approve', 'decline', 'view', 'dbl-click'),
	),

	'categories_related_searches' => Array (
	'prefixes' => Array ('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_RelatedSearches!",
	'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'new_item', 'edit', 'delete', 'move_up', 'move_down', 'approve', 'decline', 'view', 'dbl-click'),
	),

	'categories_images' => Array (
	'prefixes' => Array ('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Images!",
	'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'new_item', 'edit', 'delete', 'move_up', 'move_down', 'primary_image', 'view', 'dbl-click'),
	),

	'categories_permissions' => Array (
	'prefixes' => Array ('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Permissions!",
	'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next'),
	),

	'categories_custom' => Array ('prefixes' => Array ('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Custom!"),
	'categories_update' => Array ('prefixes' => Array (), 'format' => "!la_title_UpdatingCategories!"),

	'images_edit' => Array (
	'prefixes' => Array ('c', 'c-img'),
	'new_status_labels' => Array ('c-img' => '!la_title_Adding_Image!'),
	'edit_status_labels' => Array ('c-img' => '!la_title_Editing_Image!'),
	'new_titlefield' => Array ('c-img' => ''),
	'format' => "#c_status# '#c_titlefield#' - #c-img_status# '#c-img_titlefield#'",
	'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next'),
	),

	'relations_edit' => Array (
	'prefixes' => Array ('c', 'c-rel'),
	'new_status_labels' => Array ('c-rel' => "!la_title_Adding_Relationship! '!la_title_New_Relationship!'"),
	'edit_status_labels' => Array ('c-rel' => '!la_title_Editing_Relationship!'),
	'format' => "#c_status# '#c_titlefield#' - #c-rel_status#",
	'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next'),
	),

	'related_searches_edit' => Array (
	'prefixes' => Array ('c', 'c-search'),
	'new_status_labels' => Array ('c-search' => "!la_title_Adding_RelatedSearch_Keyword!"),
	'edit_status_labels' => Array ('c-search' => '!la_title_Editing_RelatedSearch_Keyword!'),
	'format' => "#c_status# '#c_titlefield#' - #c-search_status#",
	'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next'),
	),

	'edit_content' => Array ('format' => '!la_EditingContent!'),
	'tree_site' => Array ('format' => '!la_selecting_categories!'),
	),

	'EditTabPresets' => Array (
	'Default' => Array (
	'general' => Array ('title' => 'la_tab_General', 't' => 'categories/categories_edit', 'priority' => 1),
	'properties' => Array ('title' => 'la_tab_Properties', 't' => 'categories/categories_edit_properties', 'priority' => 2),
	'relations' => Array ('title' => 'la_tab_Relations', 't' => 'categories/categories_edit_relations', 'priority' => 3),
	'related_searches' => Array ('title' => 'la_tab_Related_Searches', 't' => 'categories/categories_edit_related_searches', 'priority' => 4),
	'images' => Array ('title' => 'la_tab_Images', 't' => 'categories/categories_edit_images', 'priority' => 5),
	'permissions' => Array ('title' => 'la_tab_Permissions', 't' => 'categories/categories_edit_permissions', 'priority' => 6),
	'custom' => Array ('title' => 'la_tab_Custom', 't' => 'categories/categories_edit_custom', 'priority' => 7),
	),
	),

	'PermItemPrefix' => 'CATEGORY',

	'PermSection' => Array ('main' => 'CATEGORY:in-portal:categories', /'search' => 'in-portal:configuration_search',/ 'custom' => 'in-portal:configuration_custom'),

	'Sections' => Array (
	'in-portal:configure_categories' => Array (
	'parent' => 'in-portal:website_setting_folder',
	'icon' => 'conf_output',
	'label' => 'la_tab_ConfigOutput',
	'url' => Array ('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array ('view', 'add', 'edit'),
	'priority' => 11.1,
	'type' => stTREE,
	),

	'in-portal:configuration_search' => Array (
	'parent' => 'in-portal:website_setting_folder',
	'icon' => 'conf_search',
	'label' => 'la_tab_ConfigSearch',
	'url' => Array ('t' => 'config/config_search', 'module_key' => 'category', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array ('view', 'edit'),
	'priority' => 11.2,
	'type' => stTREE,
	),

	'in-portal:configuration_custom' => Array (
	'parent' => 'in-portal:website_setting_folder',
	'icon' => 'conf_customfields',
	'label' => 'la_tab_ConfigCustom',
	'url' => Array ('t' => 'custom_fields/custom_fields_list', 'cf_type' => 1, 'pass_section' => true, 'pass' => 'm,cf'),
	'permissions' => Array ('view', 'add', 'edit', 'delete'),
	'priority' => 11.3,
	'type' => stTREE,
	),
	),

	'FilterMenu' => Array (
	'Groups' => Array (
	Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => kDBList::HAVING_FILTER),
	Array ('mode' => 'AND', 'filters' => Array ('show_pick'), 'type' => kDBList::WHERE_FILTER),
	),
	'Filters' => Array (
	'show_new' => Array ('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1'),
	'show_pick' => Array ('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '`EditorsPick` != 1'),
	)
	),

	'ListSQLs' => Array (
	'' => ' SELECT %1$s.* %2$s
	FROM %1$s
	LEFT JOIN '.TABLE_PREFIX.'%3$sCatalogImages img ON img.ResourceId = %1$s.ResourceId AND img.DefaultImg = 1
	{PERM_JOIN}
	LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryCustomData cust ON %1$s.ResourceId = cust.ResourceId',
	'-virtual' => ' SELECT %1$s.* %2$s
	FROM %1$s',
	),

	'SubItems' => Array ('c-rel', 'c-search', 'c-img', 'c-cdata', 'c-perm', 'content', 'page-revision'),

	'ListSortings' => Array (
	'' => Array (
	'Sorting' => Array ('Priority' => 'desc', 'Name' => 'asc'),
	)
	),

	'CalculatedFields' => Array (
	'' => Array (
	'CurrentSort' => "REPLACE(ParentPath, CONCAT('\|', ".'%1$s'.".CategoryId, '\|'), '')",

	'AltName' => 'img.AltName',
	'SameImages' => 'img.SameImages',
	'LocalThumb' => 'img.LocalThumb',
	'ThumbPath' => 'img.ThumbPath',
	'ThumbUrl' => 'img.ThumbUrl',
	'LocalImage' => 'img.LocalImage',
	'LocalPath' => 'img.LocalPath',
	'FullUrl' => 'img.Url',
	),
	'-virtual' => Array (),
	),

	'CacheModRewrite' => true,

	'Fields' => Array (
	'CategoryId' => Array ('type' => 'int', 'not_null' => 1,'default' => 0),
	'Type' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_opt_Virtual', 2 => 'la_opt_Template'), 'use_phrases' => 1,
	'not_null' => 1,'default' => 1
	),
	'SymLinkCategoryId' => Array ('type' => 'int', 'default' => NULL),
	'ParentId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'not_null' => 1,'default' => 0, 'required' => 1),
	'Name' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'required' => 1, 'default' => ''),
	'Filename' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
	'AutomaticFilename' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter',
	'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1,
	'default' => 1, 'not_null' => 1,
	),
	'Description' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => null),
	'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'),
	'EditorsPick' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter',
	'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1,
	'default' => 0, 'not_null' => 1,
	),
	'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled' ), 'use_phrases' => 1, 'not_null' => 1,'default' => 1),
	'Priority' => Array ('type' => 'int', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => 0),
	'MetaKeywords' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null),
	'CachedDescendantCatsQty' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
	'CachedNavbar' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => null),
	- 'CreatedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Users WHERE %s', 'left_key_field' => 'PortalUserId', 'left_title_field' => USER_TITLE_FIELD, 'default' => NULL),
	+ 'CreatedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'),'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Users WHERE %s', 'left_key_field' => 'PortalUserId', 'left_title_field' => USER_TITLE_FIELD, 'default' => NULL),
	'ResourceId' => Array ('type' => 'int', 'default' => null),
	'ParentPath' => Array ('type' => 'string', 'default' => null),
	'TreeLeft' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
	'TreeRight' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
	'NamedParentPath' => Array ('type' => 'string', 'default' => null),
	'NamedParentPathHash' => Array ('type' => 'string', 'not_null' => 1, 'default' => 0),
	'MetaDescription' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null),
	'HotItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2),
	'NewItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2),
	'PopItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2),
	'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
	- 'ModifiedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Users WHERE %s', 'left_key_field' => 'PortalUserId', 'left_title_field' => USER_TITLE_FIELD, 'default' => NULL),
	+ 'ModifiedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'),'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Users WHERE %s', 'left_key_field' => 'PortalUserId', 'left_title_field' => USER_TITLE_FIELD, 'default' => NULL),
	'CachedTemplate' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
	'CachedTemplateHash' => Array ('type' => 'string', 'not_null' => 1, 'default' => 0),

	// fields from Pages
	'Template' => Array (
	'type' => 'string',
	'formatter' => 'kOptionsFormatter',
	'options_sql' => ' SELECT CONCAT(tf.Description, " :: ", FilePath, "/", TRIM(TRAILING ".tpl" FROM FileName) ) AS Title,
	IF(tf.TemplateAlias <> "", tf.TemplateAlias, CONCAT(FilePath, "/", TRIM(TRAILING ".tpl" FROM FileName))) AS Value
	FROM ' . TABLE_PREFIX . 'ThemeFiles AS tf
	LEFT JOIN ' . TABLE_PREFIX . 'Themes AS t ON t.ThemeId = tf.ThemeId
	WHERE (t.Enabled = 1) AND (tf.FileName NOT LIKE "%%.elm.tpl") AND (tf.FileName NOT LIKE "%%.des.tpl") AND (tf.FilePath = "/designs")
	ORDER BY tf.Description ASC, tf.FileName ASC',
	'option_key_field' => 'Value', 'option_title_field' => 'Title',
	'error_msgs' => Array (
	'no_inherit' => '!la_error_NoInheritancePossible!',
	),
	'required' => 1, 'not_null' => 1, 'default' => CATEGORY_TEMPLATE_INHERIT
	),

	'UseExternalUrl' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter',
	'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1,
	'not_null' => 1, 'default' => 0,
	),
	'ExternalUrl' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
	'UseMenuIconUrl' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter',
	'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1,
	'not_null' => 1, 'default' => 0,
	),
	'MenuIconUrl' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
	'Title' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => '', 'not_null'=>1),
	'MenuTitle' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'default' => ''),
	'MetaTitle' => Array ('type' => 'string', 'default' => null),
	'IndexTools' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null),
	'IsMenu' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Show', 0 => 'la_Hide'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1),
	'Protected' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
	'FormId' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter', 'options' => Array ('' => ''),
	'options_sql' => 'SELECT Title, FormId FROM '.TABLE_PREFIX.'Forms ORDER BY Title',
	'option_key_field' => 'FormId', 'option_title_field' => 'Title',
	'default' => NULL
	),
	'FormSubmittedTemplate' => Array ('type' => 'string', 'default' => null),
	'FriendlyURL' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
	'ThemeId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),

	'EnablePageCache' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
	'not_null' => 1, 'default' => 0
	),
	'OverridePageCacheKey' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
	'not_null' => 1, 'default' => 0
	),
	'PageCacheKey' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
	'PageExpiration' => Array ('type' => 'int', 'default' => NULL),
	'LiveRevisionNumber' => Array ('type' => 'int', 'not_null' => 1, 'default' => 1),
	'DirectLinkEnabled' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
	'not_null' => 1, 'default' => 1
	),
	'DirectLinkAuthKey' => Array ('type' => 'string', 'max_len' => 20, 'not_null' => 1, 'default' => ''),
	'PromoBlockGroupId' => Array (
	'type' => 'int',
	'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PromoBlockGroups ORDER BY Title', 'option_title_field' => 'Title', 'option_key_field' => 'PromoBlockGroupId',
	'not_null' => 1, 'default' => 0,
	),
	'RequireSSL' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
	'not_null' => 1, 'default' => 0
	),
	'RequireLogin' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
	'not_null' => 1, 'default' => 0
	),
	),

	'VirtualFields' => Array (
	'Relevance' => Array ('type' => 'float', 'default' => 0),
	'CurrentSort' => Array ('type' => 'string', 'default' => ''),
	'IsNew' => Array ('type' => 'int', 'default' => 0),
	'OldPriority' => Array ('type' => 'int', 'default' => 0),

	// for primary image
	'AltName' => Array ('type' => 'string', 'default' => ''),
	'SameImages' => Array ('type' => 'string', 'default' => ''),
	'LocalThumb' => Array ('type' => 'string', 'default' => ''),
	'ThumbPath' => Array ('type' => 'string', 'default' => ''),
	'ThumbUrl' => Array ('type' => 'string', 'default' => ''),
	'LocalImage' => Array ('type' => 'string', 'default' => ''),
	'LocalPath' => Array ('type' => 'string', 'default' => ''),
	'FullUrl' => Array ('type' => 'string', 'default' => ''),
	),

	'Grids' => Array (
	'Default' => Array (
	'Icons' => Array ( // 'StatusField' => Array ('Type', 'Status', 'IsMenu'), // 'Status'
	'default' => 'icon_section.png',
	'1_0_0' => 'icon16_section_system.png', // system
	'1_0_1' => 'icon16_section_system.png', // system
	'1_1_1' => 'icon16_section_system.png', // system
	'0_0_0' => 'icon16_section_disabled.png', // disabled
	'0_0_1' => 'icon16_section_disabled.png', // disabled
	'0_1_0' => 'icon16_section_menuhidden.png', // hidden from menu
	'0_2_0' => 'icon16_section_pending.png', // pending
	'0_2_1' => 'icon16_section_pending.png', // pending
	'NEW' => 'icon16_section_new.png', // section is new
	),
	'Fields' => Array (
	'CategoryId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
	'Name' => Array ('title' => 'column:la_fld_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
	'Priority' => Array ('filter_block' => 'grid_options_filter', 'width' => 65),
	'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 170),
	'Template' => Array ('title' => 'column:la_fld_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
	'IsMenu' => Array ('title' => 'la_col_InMenu', 'filter_block' => 'grid_options_filter', 'width' => 70),
	'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
	'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
	'Protected' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
	'RequireSSL' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
	'RequireLogin' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
	),
	),

	'Radio' => Array (
	'Selector' => 'radio',
	'Icons' => Array ( // 'StatusField' => Array ('Type', 'Status', 'IsMenu'), // 'Status'
	'default' => 'icon_section.png',
	'1_0_0' => 'icon16_section_system.png', // system
	'1_0_1' => 'icon16_section_system.png', // system
	'1_1_1' => 'icon16_section_system.png', // system
	'0_0_0' => 'icon16_section_disabled.png', // disabled
	'0_0_1' => 'icon16_section_disabled.png', // disabled
	'0_1_0' => 'icon16_section_menuhidden.png', // hidden from menu
	'0_2_0' => 'icon16_section_pending.png', // pending
	'0_2_1' => 'icon16_section_pending.png', // pending
	'NEW' => 'icon16_section_new.png', // section is new
	),
	'Fields' => Array (
	'CategoryId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
	'Name' => Array ('title' => 'column:la_fld_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
	'Priority' => Array ('filter_block' => 'grid_options_filter', 'width' => 65),
	'IsMenu' => Array ('title' => 'la_col_InMenu', 'filter_block' => 'grid_options_filter', 'width' => 70),
	'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 170),
	'Template' => Array ('title' => 'column:la_fld_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
	'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
	'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
	'Protected' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
	'RequireSSL' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
	'RequireLogin' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
	),
	),

	'Structure' => Array (
	'Icons' => Array ( // 'StatusField' => Array ('Type', 'Status', 'IsMenu'), // 'Status'
	'default' => 'icon_section.png',
	'1_0_0' => 'icon16_section_system.png', // system
	'1_0_1' => 'icon16_section_system.png', // system
	'1_1_1' => 'icon16_section_system.png', // system
	'0_0_0' => 'icon16_section_disabled.png', // disabled
	'0_0_1' => 'icon16_section_disabled.png', // disabled
	'0_1_0' => 'icon16_section_menuhidden.png', // hidden from menu
	'0_2_0' => 'icon16_section_pending.png', // pending
	'0_2_1' => 'icon16_section_pending.png', // pending
	'NEW' => 'icon16_section_new.png', // section is new
	),
	'Fields' => Array (
	'CategoryId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
	'Name' => Array ('title' => 'column:la_fld_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
	'Priority' => Array ('filter_block' => 'grid_options_filter', 'width' => 65),
	'IsMenu' => Array ('title' => 'la_col_InMenu', 'filter_block' => 'grid_options_filter', 'width' => 70),
	'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 170),
	'Template' => Array ('title' => 'column:la_fld_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
	'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
	'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
	'Protected' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
	'RequireSSL' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
	'RequireLogin' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
	),
	),
	),

	'ConfigMapping' => Array (
	'PerPage' => 'Perpage_Category',
	'ShortListPerPage' => 'Perpage_Category_Short',
	'DefaultSorting1Field' => 'Category_Sortfield',
	'DefaultSorting2Field' => 'Category_Sortfield2',
	'DefaultSorting1Dir' => 'Category_Sortorder',
	'DefaultSorting2Dir' => 'Category_Sortorder2',
	),
	-);
	\ No newline at end of file
	+);
	Index: branches/5.3.x/core/units/skins/skins_config.php
	===================================================================
	--- branches/5.3.x/core/units/skins/skins_config.php (revision 16388)
	+++ branches/5.3.x/core/units/skins/skins_config.php (revision 16389)
	@@ -1,181 +1,181 @@
	<?php
	/**
	* @version $Id$
	* @package In-Portal
	* @copyright Copyright (C) 1997 - 2009 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' => 'skin',
	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
	'EventHandlerClass' => Array ('class' => 'SkinEventHandler', 'file' => 'skin_eh.php', 'build_event' => 'OnBuild'),
	'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),

	'AutoLoad' => true,

	'Hooks' => Array (
	Array (
	'Mode' => hAFTER,
	'Conditional' => false,
	'HookToPrefix' => 'skin',
	'HookToSpecial' => '',
	'HookToEvent' => Array ('OnSave'),
	'DoPrefix' => '',
	'DoSpecial' => '',
	'DoEvent' => 'OnCompileStylesheet',
	),
	),

	'QueryString' => Array (
	1 => 'id',
	2 => 'Page',
	3 => 'PerPage',
	4 => 'event',
	5 => 'mode',
	),

	'IDField' => 'SkinId',
	'StatusField' => Array ('IsPrimary'),
	'TableName' => TABLE_PREFIX.'AdminSkins',

	/*
	'ForeignKey' => 'ParentId', // field title in TableName, linking record to a parent
	'ParentTableKey' => 'ParentId', // id (or other key) field title in parent's table
	'ParentPrefix' => 'parent',
	'AutoDelete' => true, // delete these items when parent is being deleted
	'AutoClone' => true, // clone these items when parent is being cloned
	*/

	'TitlePresets' => Array (
	'default' => Array (
	'new_status_labels' => Array ('skin' => '!la_title_AddingSkin!'),
	'edit_status_labels' => Array ('skin' => '!la_title_EditingSkin!'),
	'new_titlefield' => Array ('skin' => ''),
	),

	'skin_list'=>Array (
	'prefixes' => Array ('skin_List'),
	'format' => '!la_tab_Skins!',
	'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'setprimary', 'clone', 'view', 'dbl-click'),
	),

	'skin_edit'=>Array (
	'prefixes' => Array ('skin'),
	'format' => '#skin_status# #skin_titlefield#',
	'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
	),
	),

	'PermSection' => Array ('main' => 'in-portal:skins'),

	'Sections' => Array (
	'in-portal:skins' => Array (
	'parent' => 'in-portal:tools',
	'icon' => 'admin_skins',
	'label' => 'la_tab_Skins',
	'url' => Array ('t' => 'skins/skin_list', 'pass' => 'm'),
	'permissions' => Array ('view', 'add', 'edit', 'delete'),
	'priority' => 7,
	// 'show_mode' => smSUPER_ADMIN,
	'type' => stTREE,
	),
	),

	'TitleField' => 'Name', // field, used in bluebar when editing existing item

	// Use %1$s for local table name with prefix, %2$s for calculated fields
	'ListSQLs' => Array ( // key - special, value - list select sql
	'' => ' SELECT %1$s.* %2$s
	FROM %1$s',
	),

	'ListSortings' => Array (
	'' => Array (
	// 'ForcedSorting' => Array ('Priority' => 'desc'),
	'Sorting' => Array ('Name' => 'asc'),
	)
	),

	'Fields' => Array (
	'SkinId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
	'Name' => Array ('type' => 'string', 'max_len' => 255, 'required' => 1, 'default' => NULL),
	'CSS' => Array ('type' => 'string', 'default' => NULL),
	'Logo' => Array (
	'type' => 'string', 'formatter' => 'kUploadFormatter',
	'max_size'=>MAX_UPLOAD_SIZE, // in Bytes !
	- 'file_types'=>'.jpg;.jpeg;.gif;.png;*.bmp', 'files_description'=>'!la_hint_ImageFiles!',
	+ 'file_types' => '.jpg;.jpeg;.gif;.png;*.bmp', 'files_description' => '!la_hint_ImageFiles!',
	'upload_dir' => WRITEBALE_BASE . '/user_files/', // relative to project's home
	'thumb_format' => 'resize:100x100',
	'multiple'=>false, // false or max number of files - will be stored as serialized array of paths
	'direct_links'=>false, // use direct file urls or send files through wrapper (requires mod_mime_magic)
	'default' => null,
	),
	'LogoBottom' => Array (
	'type' => 'string', 'formatter' => 'kUploadFormatter',
	'max_size'=>MAX_UPLOAD_SIZE, // in Bytes !
	- 'file_types'=>'.jpg;.jpeg;.gif;.png;*.bmp', 'files_description'=>'!la_hint_ImageFiles!',
	+ 'file_types' => '.jpg;.jpeg;.gif;.png;*.bmp', 'files_description' => '!la_hint_ImageFiles!',
	'upload_dir' => WRITEBALE_BASE . '/user_files/', // relative to project's home
	'thumb_format' => 'resize:100x100',
	'multiple'=>false, // false or max number of files - will be stored as serialized array of paths
	'direct_links'=>false, // use direct file urls or send files through wrapper (requires mod_mime_magic)
	'not_null' => 1, 'default' => '',
	),
	'LogoLogin' => Array (
	'type' => 'string', 'formatter' => 'kUploadFormatter',
	'max_size'=>MAX_UPLOAD_SIZE, // in Bytes !
	- 'file_types'=>'.jpg;.jpeg;.gif;.png;*.bmp', 'files_description'=>'!la_hint_ImageFiles!',
	+ 'file_types' => '.jpg;.jpeg;.gif;.png;*.bmp', 'files_description' => '!la_hint_ImageFiles!',
	'upload_dir' => WRITEBALE_BASE . '/user_files/', // relative to project's home
	'thumb_format' => 'resize:100x100',
	'multiple'=>false, // false or max number of files - will be stored as serialized array of paths
	'direct_links'=>false, // use direct file urls or send files through wrapper (requires mod_mime_magic)
	'not_null' => 1, 'default' => '',
	),
	'Options' => Array (
	'type' => 'string', 'default' => NULL,
	'formatter' => 'kSerializedFormatter',
	'default'=>serialize(
	Array (
	'HeadBgColor' => Array ('Description' => 'Head frame background color', 'Value' => '#1961B8'),
	'HeadColor' => Array ('Description' => 'Head frame text color', 'Value' => '#000000'),
	'SectionBgColor' => Array ('Description' => 'Section bar background color', 'Value' => '#2D79D6'),
	'SectionColor' => Array ('Description' => 'Section bar text color', 'Value' => '#000000'),
	)
	),
	),
	'LastCompiled' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
	'IsPrimary' => Array (
	'type' => 'int', 'formatter' => 'kOptionsFormatter',
	'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
	'not_null' => 1, 'default' => 0
	),
	'DisplaySiteNameInHeader' => Array (
	'type' => 'int', 'formatter' => 'kOptionsFormatter',
	'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
	'not_null' => 1, 'default' => 1
	),
	),

	'Grids' => Array (
	'Default' => Array (
	'Icons' => Array (
	'default' => 'icon16_item.png',
	1 => 'icon16_primary.png',
	),
	'Fields' => Array (
	'SkinId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
	'Name' => Array ('title' => 'column:la_fld_SkinName', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
	'IsPrimary' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
	),
	),
	),
	-);
	\ No newline at end of file
	+);
	Index: branches/5.3.x/core/units/structure/structure_config.php
	===================================================================
	--- branches/5.3.x/core/units/structure/structure_config.php (revision 16388)
	+++ branches/5.3.x/core/units/structure/structure_config.php (revision 16389)
	@@ -1,277 +1,277 @@
	<?php
	/**
	* @version $Id$
	* @package In-Portal
	* @copyright Copyright (C) 1997 - 2009 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' => 'st',
	'ItemClass' => Array ('class' => 'CategoriesItem', 'file' => 'structure_item.php', 'build_event' => 'OnItemBuild'),
	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
	'EventHandlerClass' => Array ('class' => 'CategoriesEventHandler', 'file' => 'structure_eh.php', 'build_event' => 'OnBuild'),
	'TagProcessorClass' => Array ('class' => 'CategoriesTagProcessor', 'file' => 'structure_tp.php', 'build_event' => 'OnBuild'),

	'AutoLoad' => true,

	'QueryString' => Array (
	1 => 'id',
	2 => 'Page',
	3 => 'PerPage',
	4 => 'event',
	5 => 'mode',
	),

	'ConfigPriority' => 0,

	'Hooks' => Array (
	Array (
	'Mode' => hBEFORE,
	'Conditional' => false,
	'HookToPrefix' => '',
	'HookToSpecial' => '*',
	'HookToEvent' => Array ('OnAfterConfigRead'),
	'DoPrefix' => 'cdata',
	'DoSpecial' => '*',
	'DoEvent' => 'OnDefineCustomFields',
	),

	Array (
	'Mode' => hBEFORE,
	'Conditional' => false,
	'HookToPrefix' => 'rel',
	'HookToSpecial' => '*',
	'HookToEvent' => Array ('OnAfterConfigRead'),
	'DoPrefix' => '',
	'DoSpecial' => '*',
	'DoEvent' => 'OnCloneSubItem',
	),

	Array (
	'Mode' => hBEFORE,
	'Conditional' => false,
	'HookToPrefix' => 'img',
	'HookToSpecial' => '*',
	'HookToEvent' => Array ('OnAfterConfigRead'),
	'DoPrefix' => '',
	'DoSpecial' => '*',
	'DoEvent' => 'OnCloneSubItem',
	),
	),

	'IDField' => 'CategoryId',

	'StatusField' => Array ('Status'),

	'TitleField' => 'Name', // field, used in bluebar when editing existing item

	'TableName' => TABLE_PREFIX.'Categories',
	'CustomDataTableName' => TABLE_PREFIX . 'CategoryCustomData',

	'TitlePresets' => Array (
	'default' => Array (
	'new_status_labels' => Array ('st' => '!la_title_Adding_Category!'),
	'edit_status_labels' => Array ('st' => '!la_title_Editing_Category!'),
	'new_titlefield' => Array ('st' => '!la_title_New_Category!'),
	),
	'structure_list' => Array (
	'prefixes' => Array ('st_List', 'st.current'), 'format' => "!la_title_Structure! - '#st.current_Name#'"
	),
	'structure_edit' => Array (
	'prefixes' => Array ('st'), 'format' => "#st_status# '#st_titlefield#'",
	),

	'edit_content' => Array ('format' => '!la_EditingContent!'),

	// 'categories_edit' => Array ('prefixes' => Array ('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_General!"),
	),

	'PermItemPrefix' => 'CATEGORY',
	'PermSection' => Array ('main' => 'CATEGORY:in-portal:structure', 'email' => 'in-portal:configemail'),

	'ListSQLs' => Array (
	'' => ' SELECT %1$s.* %2$s
	FROM %1$s
	{PERM_JOIN}',
	'-virtual' => ' SELECT %1$s.* %2$s
	FROM %1$s',
	),

	'SubItems' => Array ('content', 'page-revision'),

	'ListSortings' => Array (
	'' => Array (
	'ForcedSorting' => Array ('Priority' => 'desc'),
	'Sorting' => Array ('Name' => 'asc'),
	)
	),

	'CalculatedFields' => Array (
	'' => Array (
	'CurrentSort' => "REPLACE(ParentPath, CONCAT('\|', ".'%1$s'.".CategoryId, '\|'), '')",
	),
	'-virtual' => Array (),
	),

	'Fields' => Array (
	'CategoryId' => Array ('type' => 'int', 'not_null' => 1,'default' => 0),
	'Type' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_opt_Virtual', 2 => 'la_opt_Template'), 'use_phrases' => 1,
	'not_null' => 1,'default' => 1
	),
	'SymLinkCategoryId' => Array ('type' => 'int', 'default' => NULL),
	'ParentId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'not_null' => 1,'default' => 0, 'required'=>1),
	'Name' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'required' => 1, 'default' => ''),
	'Filename' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1),
	'AutomaticFilename' => Array ('type' => 'int', 'not_null' => 1, 'default' => 1),
	'Description' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => null),
	'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'),
	'EditorsPick' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
	'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled' ), 'use_phrases' => 1, 'not_null' => 1,'default' => 1),
	'Priority' => Array ('type' => 'int', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'options' => array(), 'required' => 1, 'default' => 0),
	'MetaKeywords' => Array ('type' => 'string', 'default' => null),
	'CachedDescendantCatsQty' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
	'CachedNavbar' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => null),
	- 'CreatedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'options' => Array(USER_ROOT => 'root', USER_GUEST => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Users WHERE %s', 'left_key_field' => 'PortalUserId', 'left_title_field' => USER_TITLE_FIELD, 'default' => NULL),
	+ 'CreatedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'),'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Users WHERE %s', 'left_key_field' => 'PortalUserId', 'left_title_field' => USER_TITLE_FIELD, 'default' => NULL),
	'ResourceId' => Array ('type' => 'int', 'default' => null),
	'ParentPath' => Array ('type' => 'string', 'default' => null),
	'TreeLeft' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
	'TreeRight' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
	'NamedParentPath' => Array ('type' => 'string', 'default' => null),
	'NamedParentPathHash' => Array ('type' => 'string', 'not_null' => 1, 'default' => 0),
	'MetaDescription' => Array ('type' => 'string', 'default' => null),
	'HotItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2),
	'NewItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2),
	'PopItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2),
	'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
	- 'ModifiedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'options' => Array(USER_ROOT => 'root', USER_GUEST => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Users WHERE %s', 'left_key_field' => 'PortalUserId', 'left_title_field' => USER_TITLE_FIELD, 'default' => NULL),
	+ 'ModifiedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'),'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Users WHERE %s', 'left_key_field' => 'PortalUserId', 'left_title_field' => USER_TITLE_FIELD, 'default' => NULL),
	'CachedTemplate' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
	'CachedTemplateHash' => Array ('type' => 'string', 'not_null' => 1, 'default' => 0),


	// fields from Pages
	'Template' => Array (
	'type' => 'string',
	'formatter' => 'kOptionsFormatter', 'options_sql' => ' SELECT CONCAT(tf.Description, " (", TRIM(TRAILING ".des" FROM TRIM(TRAILING ".tpl" FROM FileName) ), ")") AS Title,
	CONCAT(FilePath, "/", TRIM(TRAILING ".tpl" FROM FileName)) AS Value
	FROM ' . TABLE_PREFIX . 'ThemeFiles AS tf
	LEFT JOIN ' . TABLE_PREFIX . 'Themes AS t ON t.ThemeId = tf.ThemeId
	WHERE (t.Enabled = 1) AND (tf.FileName NOT LIKE "%%.elm.tpl") AND (tf.FileName NOT LIKE "%%.des.tpl") AND (tf.FilePath = "/designs")',
	'option_key_field' => 'Value', 'option_title_field' => 'Title',
	'not_null' => 1, 'default' => CATEGORY_TEMPLATE_INHERIT
	),

	'UseExternalUrl' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1,
	'not_null' => 1, 'default' => 0
	),
	'ExternalUrl' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
	'UseMenuIconUrl' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1,
	'not_null' => 1, 'default' => 0
	),
	'MenuIconUrl' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
	'Title' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => '', 'not_null'=>1),
	'MenuTitle' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'default' => ''),
	'MetaTitle' => Array ('type' => 'string', 'default' => null),
	'IndexTools' => Array ('type' => 'string', 'default' => null),
	'IsMenu' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Show', 0 => 'la_Hide'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1),
	'Protected' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
	'FormId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter',
	'options' => array('' => ''),
	'options_sql' => 'SELECT Title, FormId FROM '.TABLE_PREFIX.'Forms ORDER BY Title',
	'option_key_field' => 'FormId', 'option_title_field' => 'Title', 'default' => NULL),
	'FormSubmittedTemplate' => Array ('type' => 'string', 'default' => null),
	'FriendlyURL' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
	'ThemeId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),

	'EnablePageCache' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
	'not_null' => 1, 'default' => 0
	),
	'OverridePageCacheKey' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
	'not_null' => 1, 'default' => 0
	),
	'PageCacheKey' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
	'PageExpiration' => Array ('type' => 'int', 'default' => NULL),
	'LiveRevisionNumber' => Array ('type' => 'int', 'not_null' => 1, 'default' => 1),
	'DirectLinkEnabled' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
	'not_null' => 1, 'default' => 1
	),
	'DirectLinkAuthKey' => Array ('type' => 'string', 'max_len' => 20, 'not_null' => 1, 'default' => '')
	),

	'VirtualFields' => Array (
	'CurrentSort' => Array ('type' => 'string', 'default' => ''),
	'IsNew' => Array ('type' => 'int', 'default' => 0),
	'OldPriority' => Array ('type' => 'int', 'default' => 0),
	),

	'Grids' => Array (
	'Default' => Array (
	'Icons' => Array (1 => 'icon16_folder.gif', 0 => 'icon16_folder-red.gif'),
	'Fields' => Array (
	'CategoryId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
	'Name' => Array ('title' => 'column:la_fld_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
	'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 170),
	'Template' => Array ('title' => 'column:la_fld_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
	'IsMenu' => Array ('title' => 'la_col_Visible', 'filter_block' => 'grid_options_filter', 'width' => 70),
	'Path' => Array ('title' => 'la_col_Path', 'data_block' => 'page_entercat_td', 'filter_block' => 'grid_like_filter' ),
	'Protected' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
	),
	),

	'Radio' => Array (
	'Icons' => Array (1 => 'icon16_folder.gif', 0 => 'icon16_folder-red.gif'),
	'Selector' => 'radio',
	'Fields' => Array (
	'CategoryId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
	'Name' => Array ('title' => 'column:la_fld_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
	'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 170),
	'Template' => Array ('title' => 'column:la_fld_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
	'IsMenu' => Array ('title' => 'la_col_Visible', 'filter_block' => 'grid_options_filter', 'width' => 70),
	'Path' => Array ('title' => 'la_col_Path', 'data_block' => 'page_entercat_td', 'filter_block' => 'grid_like_filter' ),
	'Protected' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
	),
	),

	'AllPages' => Array (
	'Icons' => Array (1 => 'icon16_folder.gif', 0 => 'icon16_folder-red.gif'),
	'Fields' => Array (
	'CategoryId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
	'Name' => Array ('title' => 'column:la_fld_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
	'Path' => Array ('title' => 'la_col_Path', 'data_block' => 'page_path_td', 'sort_field' => 'CachedNavbar', 'filter_block' => 'grid_like_filter' ),
	'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 170),
	'Template' => Array ('title' => 'column:la_fld_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
	'IsMenu' => Array ('title' => 'la_col_Visible', 'filter_block' => 'grid_options_filter', 'width' => 70),
	'Protected' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
	),
	),
	),

	'ConfigMapping' => Array (
	'PerPage' => 'Perpage_Category',
	'ShortListPerPage' => 'Perpage_Category_Short',
	'DefaultSorting1Field' => 'Category_Sortfield',
	'DefaultSorting2Field' => 'Category_Sortfield2',
	'DefaultSorting1Dir' => 'Category_Sortorder',
	'DefaultSorting2Dir' => 'Category_Sortorder2',
	),
	-);
	\ No newline at end of file
	+);
	Index: branches/5.3.x/core/units/logs/system_logs/system_logs_config.php
	===================================================================
	--- branches/5.3.x/core/units/logs/system_logs/system_logs_config.php (revision 16388)
	+++ branches/5.3.x/core/units/logs/system_logs/system_logs_config.php (revision 16389)
	@@ -1,205 +1,205 @@
	<?php
	/**
	* @version $Id$
	* @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',
	+ '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), IF(u.Username = "", u.Email, 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),
	),
	),
	),
	-);
	\ No newline at end of file
	+);
	Index: branches/5.3.x/core/units/email_templates/email_templates_config.php
	===================================================================
	--- branches/5.3.x/core/units/email_templates/email_templates_config.php (revision 16388)
	+++ branches/5.3.x/core/units/email_templates/email_templates_config.php (revision 16389)
	@@ -1,309 +1,309 @@
	<?php
	/**
	* @version $Id$
	* @package In-Portal
	* @copyright Copyright (C) 1997 - 2009 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' => 'email-template',
	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
	'EventHandlerClass' => Array ('class' => 'EmailTemplateEventHandler', 'file' => 'email_template_eh.php', 'build_event' => 'OnBuild'),
	'TagProcessorClass' => Array ('class' => 'EmailTemplateTagProcessor', 'file' => 'email_template_tp.php', 'build_event' => 'OnBuild'),

	'AutoLoad' => true,

	'QueryString' => Array (
	1 => 'id',
	2 => 'Page',
	3 => 'PerPage',
	4 => 'event',
	5 => 'mode',
	),

	'IDField' => 'TemplateId',
	'StatusField' => Array ('Enabled'),
	'TitleField' => 'TemplateName',

	'TitlePresets' => Array (
	'default' => Array (
	'new_status_labels' => Array ('email-template' => '!la_title_AddingEmailTemplate!'),
	'edit_status_labels' => Array ('email-template' => '!la_title_EditingEmailTemplate!'),
	'new_titlefield' => Array ('email-template' => '!la_title_NewEmailTemplate!'),
	),

	// for separate grid with email editing
	'email_template_list' => Array (
	'prefixes' => Array ('email-template_List'), 'format' => "!la_title_EmailTemplates!",
	'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'approve', 'decline', 'frontend_mail', 'export', 'process', 'view', 'dbl-click'),
	),

	'email_template_edit' => Array (
	'prefixes' => Array ('email-template'),
	'format' => '#email-template_status# - #email-template_titlefield# - !la_section_General!',
	'toolbar_buttons' => Array ('select', 'setprimary', 'cancel', 'reset_edit', 'prev', 'next'),
	),

	'email_template_edit_settings' => Array (
	'prefixes' => Array ('email-template'),
	'format' => '#email-template_status# - #email-template_titlefield# - !la_section_Settings!',
	'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
	),

	// for mass mailing
	'email_send_form' => Array ('prefixes' => Array (), 'format' => '!la_title_SendEmail!'),
	),

	'EditTabPresets' => Array (
	'Default' => Array (
	'general' => Array ('title' => 'la_tab_General', 't' => 'languages/email_template_edit', 'priority' => 1),
	'settings' => Array ('title' => 'la_tab_Settings', 't' => 'languages/email_template_settings', 'priority' => 2),
	),
	),

	'CheckSimulatniousEdit' => true,

	'PermSection' => Array ('main' => 'in-portal:configemail'),

	'Sections' => Array (
	- 'in-portal:configemail' => Array (
	- 'parent' => 'in-portal:site',
	- 'icon' => 'email_templates',
	- 'label' => 'la_title_EmailTemplates',
	- 'url' => Array ('t' => 'languages/email_template_list', 'pass' => 'm'),
	- 'permissions' => Array ('view', 'add', 'edit', 'delete'),
	- 'priority' => 5,
	- 'type' => stTREE,
	+ 'in-portal:configemail' => Array (
	+ 'parent' => 'in-portal:site',
	+ 'icon' => 'email_templates',
	+ 'label' => 'la_title_EmailTemplates',
	+ 'url' => Array ('t' => 'languages/email_template_list', 'pass' => 'm'),
	+ 'permissions' => Array ('view', 'add', 'edit', 'delete'),
	+ 'priority' => 5,
	+ 'type' => stTREE,
	),
	),

	'TableName' => TABLE_PREFIX . 'EmailTemplates',

	'CalculatedFields' => Array (
	'' => Array (
	'SourceSubject' => 'l%4$s_Subject',
	'SourceHtmlBody' => 'l%4$s_HtmlBody',
	'SourcePlainTextBody' => 'l%4$s_PlainTextBody',

	'CurrentSubject' => 'l%5$s_Subject',
	'CurrentHtmlBody' => 'l%5$s_HtmlBody',
	'CurrentPlainTextBody' => 'l%5$s_PlainTextBody',

	'TranslationInSync' => 'IF(l%5$s_TranslateFrom = 0, 1, 0)',
	'TranslateFromLanguage' => 'l%5$s_TranslateFrom',
	),
	),

	'ListSQLs' => Array (
	'' => ' SELECT %1$s.* %2$s
	FROM %1$s',
	),

	'ListSortings' => Array (
	'' => Array (
	'ForcedSorting' => Array ('Enabled' => 'desc'),
	'Sorting' => Array ('TemplateName' => 'asc'),
	),
	'module' => Array (
	'ForcedSorting' => Array ('Enabled' => 'desc'),
	'Sorting' => Array ('Description' => 'asc')
	),
	),

	'Fields' => Array (
	'TemplateId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
	- 'TemplateName' => Array ('type' => 'string', 'not_null' => 1, 'unique' => Array ('Type'), 'required' => 1, 'default' => ''),
	+ 'TemplateName' => Array ('type' => 'string', 'not_null' => 1, 'unique' => Array ('Type'), 'required' => 1, 'default' => ''),
	'Headers' => Array ('type' => 'string', 'default' => NULL),
	- 'ReplacementTags' => Array ('type' => 'string', 'default' => NULL),
	+ 'ReplacementTags' => Array ('type' => 'string', 'default' => NULL),

	'AllowChangingSender' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter',
	'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
	'not_null' => 1, 'default' => 0
	),
	'CustomSender' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_opt_DefaultAddress', 1 => 'la_opt_CustomSender'), 'use_phrases' => 1,
	'not_null' => 1, 'default' => 0
	),
	'SenderName' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
	'SenderAddressType' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_opt_Email', 2 => 'la_opt_User'), 'use_phrases' => 1,
	'not_null' => 1, 'error_field' => 'SenderAddress', 'default' => 0
	),
	'SenderAddress' => Array (
	'type' => 'string', 'max_len' => 255,
	'error_msgs' => Array (
	'invalid_email' => '!la_err_invalid_format!',
	'invalid_user' => '!la_error_UserNotFound!',
	),
	'not_null' => 1, 'default' => ''
	),
	'AllowChangingRecipient' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
	'not_null' => 1, 'default' => 0
	),
	'CustomRecipient' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_opt_DefaultAddress', 1 => 'la_opt_CustomRecipients'), 'use_phrases' => 1,
	'not_null' => 1, 'default' => 0
	),
	'Recipients' => Array ('type' => 'string', 'default' => NULL),

	- 'Subject' => Array (
	+ 'Subject' => Array (
	'type' => 'string',
	'formatter' => 'kMultiLanguage', 'db_type' => 'text',
	'error_msgs' => Array ('parsing_error' => '!la_error_ParsingError!'),
	'required' => 1, 'default' => null
	),

	'HtmlBody' => Array (
	'type' => 'string',
	'formatter' => 'kMultiLanguage', 'db_type' => 'longtext',
	'error_msgs' => Array ('parsing_error' => '!la_error_ParsingError!'),
	'default' => null
	),

	'PlainTextBody' => Array (
	'type' => 'string',
	'formatter' => 'kMultiLanguage', 'db_type' => 'longtext',
	'error_msgs' => Array ('parsing_error' => '!la_error_ParsingError!'),
	'default' => null
	),

	'TranslateFrom' => Array (
	'type' => 'int',
	'formatter' => 'kMultiLanguage', 'db_type' => 'int', 'index_type' => 'int',
	'not_null' => 1, 'default' => 0
	),

	- 'Enabled' => Array (
	- 'type' => 'int',
	- 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
	- 'not_null' => 1, 'default' => 1
	- ),
	-
	- 'FrontEndOnly' => Array (
	- 'type' => 'int',
	- 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
	- 'not_null' => 1, 'default' => 0
	- ),
	-
	- 'Module' => Array (
	- 'type' => 'string',
	- 'formatter' => 'kOptionsFormatter', 'options' => Array (),
	- 'not_null' => 1, 'required' => 1, 'default' => 'Core'
	- ),
	-
	- 'Description' => Array ('type' => 'string', 'default' => NULL),
	-
	- 'Type' => Array (
	- 'type' => 'int',
	- 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Text_Admin', 0 => 'la_Text_User'), 'use_phrases' => 1,
	- 'not_null' => 1, 'unique' => Array ('TemplateName'), 'required' => 1, 'default' => 0
	- ),
	+ 'Enabled' => Array (
	+ 'type' => 'int',
	+ 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
	+ 'not_null' => 1, 'default' => 1
	+ ),
	+
	+ 'FrontEndOnly' => Array (
	+ 'type' => 'int',
	+ 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
	+ 'not_null' => 1, 'default' => 0
	+ ),
	+
	+ 'Module' => Array (
	+ 'type' => 'string',
	+ 'formatter' => 'kOptionsFormatter', 'options' => Array (),
	+ 'not_null' => 1, 'required' => 1, 'default' => 'Core'
	+ ),
	+
	+ 'Description' => Array ('type' => 'string', 'default' => NULL),
	+
	+ 'Type' => Array (
	+ 'type' => 'int',
	+ 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Text_Admin', 0 => 'la_Text_User'), 'use_phrases' => 1,
	+ 'not_null' => 1, 'unique' => Array ('TemplateName'), 'required' => 1, 'default' => 0
	+ ),
	'LastChanged' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL),
	'BindToSystemEvent' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
	- ),
	+ ),

	'VirtualFields' => Array (
	'RecipientType' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'To', 2 => 'Cc', 3 => 'Bcc'),
	'default' => 1
	),
	'RecipientName' => Array ('type' => 'string', 'max_len' => 255, 'default' => ''),
	'RecipientAddressType' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_opt_Email', 2 => 'la_opt_User', 3 => 'la_opt_Group'), 'use_phrases' => 1,
	'error_field' => 'RecipientAddress', 'default' => 0
	),
	'RecipientAddress' => Array (
	'type' => 'string', 'max_len' => 255,
	'error_msgs' => Array (
	'invalid_email' => '!la_err_invalid_format!',
	'invalid_user' => '!la_error_UserNotFound!',
	'invalid_group' => '!la_error_GroupNotFound!',
	),
	'default' => ''
	),

	'Tag' => Array ('type' => 'string', 'default' => ''),
	'Replacement' => Array ('type' => 'string', 'default' => ''),
	'ReplacementTagsXML' => Array ('type' => 'string', 'default' => ''),

	'SourceSubject' => Array ('type' => 'string', 'default' => ''),
	'SourceHtmlBody' => Array ('type' => 'string', 'default' => ''),
	'SourcePlainTextBody' => Array ('type' => 'string', 'default' => ''),

	'CurrentSubject' => Array ('type' => 'string', 'default' => ''),
	'CurrentHtmlBody' => Array ('type' => 'string', 'default' => ''),
	'CurrentPlainTextBody' => Array ('type' => 'string', 'default' => ''),

	'TranslationInSync' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
	'default' => 0,
	),
	'TranslateFromLanguage' => Array (
	'type' => 'int',
	'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Languages ORDER BY PackName', 'option_title_field' => 'PackName', 'option_key_field' => 'LanguageId',
	'default' => 0,
	),
	),

	- 'Grids' => Array (
	+ 'Grids' => Array (
	// used on "Email Events" tab in language editing in "Regional" section
	'Default' => Array (
	'Icons' => Array (
	'default' => 'icon16_item.png',
	0 => 'icon16_disabled.png',
	1 => 'icon16_item.png',
	),
	'Fields' => Array (
	- 'TemplateId' => Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
	- 'Description' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
	- 'TemplateName' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
	- 'Module' => Array ('filter_block' => 'grid_multioptions_filter', 'width' => 100, ),
	- 'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 120, ),
	- 'Enabled' => Array ('title' => 'column:la_fld_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
	- 'LastChanged' => Array ('title' => 'column:la_fld_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 150),
	+ 'TemplateId' => Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
	+ 'Description' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
	+ 'TemplateName' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
	+ 'Module' => Array ('filter_block' => 'grid_multioptions_filter', 'width' => 100, ),
	+ 'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 120, ),
	+ 'Enabled' => Array ('title' => 'column:la_fld_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
	+ 'LastChanged' => Array ('title' => 'column:la_fld_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 150),
	),
	),

	// used on "Email Templates" section
	'Emails' => Array (
	'Icons' => Array (
	'default' => 'icon16_item.png',
	0 => 'icon16_disabled.png',
	1 => 'icon16_item.png',
	),
	'Fields' => Array (
	'TemplateId' => Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
	'TemplateName' => Array ('filter_block' => 'grid_like_combo_filter', 'width' => 250, ),
	'CurrentSubject' => Array ('title' => 'column:la_fld_Subject', 'filter_block' => 'grid_like_filter', 'no_special' => 0, 'width' => 300, ),
	'Description' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
	'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 60, ),
	'Enabled' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
	'Module' => Array ('filter_block' => 'grid_multioptions_filter', 'width' => 100, ),
	'FrontEndOnly' => Array ('filter_block' => 'grid_options_filter', 'width' => 120, 'hidden' => 1),
	'LastChanged' => Array ('title' => 'column:la_fld_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 150),
	'TranslationInSync' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, 'hidden' => 1),
	'TranslateFromLanguage' => Array ('filter_block' => 'grid_multioptions_filter', 'width' => 100, 'hidden' => 1),
	),
	),
	),
	);
	Index: branches/5.3.x/core/admin_templates/regional/phrases_edit.tpl
	===================================================================
	--- branches/5.3.x/core/admin_templates/regional/phrases_edit.tpl (revision 16388)
	+++ branches/5.3.x/core/admin_templates/regional/phrases_edit.tpl (revision 16389)
	@@ -1,97 +1,97 @@
	<inp2:adm_SetPopupSize width="888" height="510"/>
	<inp2:m_include t="incs/header"/>
	<inp2:m_RenderElement name="combined_header" prefix="lang" section="in-portal:configure_lang" title_preset="phrase_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('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
	submit_event('phrases','<inp2:phrases_SaveEvent/>');
	}
	) );

	a_toolbar.AddButton(
	new ToolBarButton(
	'cancel',
	'<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>',
	function() {
	<inp2:m_if check="phrases_UseQuickFormCancel">
	window_close();
	<inp2:m_else/>
	cancel_edit('phrases', 'OnCancelEdit', '<inp2:phrases_SaveEvent/>', '<inp2:m_Phrase label="la_FormCancelConfirmation" js_escape="1"/>');
	</inp2:m_if>
	}
	)
	);

	a_toolbar.AddButton( new ToolBarButton('reset_edit', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
	reset_form('phrases', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
	}
	) );

	<inp2:m_if check="phrases_IsTopmostPrefix">
	<inp2:m_if check="phrases_IsSingle" inverse="inverse">
	a_toolbar.AddButton( new ToolBarSeparator('sep1') );
	</inp2:m_if>

	a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
	go_to_id('phrases', '<inp2:phrases_PrevId/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
	go_to_id('phrases', '<inp2:phrases_NextId/>');
	}
	) );
	</inp2:m_if>

	a_toolbar.Render();

	<inp2:m_RenderElement name="edit_navigation" prefix="phrases"/>
	</script>
	</td>
	</tr>
	</tbody>
	</table>

	<inp2:phrases_SaveWarning name="grid_save_warning"/>
	<inp2:phrases_ErrorWarning name="form_error_warning"/>

	<input type="hidden" name="simple_mode" value="<inp2:m_Get name='simple_mode'/>"/>
	<input type="hidden" id="phrases_label" name="phrases_label" value="<inp2:m_Get name='phrases_label'/>"/>
	<input type="hidden" name="regional" value="<inp2:m_Get name='regional'/>"/>

	<inp2:m_if check="m_Get" name="simple_mode">
	<inp2:m_RenderElement name="inp_edit_hidden" prefix="phrases" field="Phrase"/>
	</inp2:m_if>

	<div id="scroll_container">
	<table class="edit-form">
	<inp2:lang_Field name="LanguageId" result_to_var="language_id"/>

	<inp2:m_if check="m_Get" name="simple_mode">
	- <inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_Translation" title="la_fld_Translation" rows="7" cols="50"/>
	+ <inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_Translation" title="la_fld_Translation" rows="7" cols="50"/>
	<inp2:m_else/>
	<tr class="subsectiontitle">
	<td colspan="3"><inp2:phrases_Field name="Phrase"/></td>
	</tr>

	<inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" size="60"/>

	<inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation"/>
	<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_Translation" title="la_fld_Translation" style="width: 100%; height: 100px;" control_options="{max_height: 100}"/>
	<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_HintTranslation" title="la_fld_HintTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}"/>
	<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_ColumnTranslation" title="la_fld_ColumnTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}"/>

	<inp2:m_RenderElement name="inp_label" prefix="phrases" field="PhraseType"/>
	<inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module" has_empty="1"/>
	</inp2:m_if>

	<inp2:m_RenderElement name="inp_edit_filler"/>
	</table>
	</div>

	-<inp2:m_include t="incs/footer"/>
	\ No newline at end of file
	+<inp2:m_include t="incs/footer"/>

in-portalNo OneTemporaryActions

File Metadata

in-portalView Options

Event Timeline

in-portal
No OneTemporary
Actions

in-portal
View Options