in-portal
No OneTemporary
Actions

Subscribers

None

File Metadata

Created: Tue, Feb 25, 1:04 PM

in-portal
View Options

	Index: branches/5.2.x/core/kernel/utility/debugger.php
	===================================================================
	--- branches/5.2.x/core/kernel/utility/debugger.php (revision 15283)
	+++ branches/5.2.x/core/kernel/utility/debugger.php (revision 15284)
	@@ -1,1963 +1,1963 @@
	<?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!');

	if( !class_exists('Debugger') ) {

	/**
	* Contains misc functions, used by debugger (mostly copied from kUtil class)
	*/
	class DebuggerUtil {

	/**
	* Checks if constant is defined and has positive value
	*
	* @param string $const_name
	* @return bool
	*/
	public static function constOn($const_name)
	{
	return defined($const_name) && constant($const_name);
	}

	/**
	* Define constant if it was not already defined before
	*
	* @param string $const_name
	* @param string $const_value
	* @access public
	*/
	public static function safeDefine($const_name, $const_value)
	{
	if ( !defined($const_name) ) {
	define($const_name, $const_value);
	}
	}

	/**
	* Formats file/memory size in nice way
	*
	* @param int $bytes
	* @return string
	* @access public
	*/
	public static function formatSize($bytes)
	{
	if ($bytes >= 1099511627776) {
	$return = round($bytes / 1024 / 1024 / 1024 / 1024, 2);
	$suffix = "TB";
	} elseif ($bytes >= 1073741824) {
	$return = round($bytes / 1024 / 1024 / 1024, 2);
	$suffix = "GB";
	} elseif ($bytes >= 1048576) {
	$return = round($bytes / 1024 / 1024, 2);
	$suffix = "MB";
	} elseif ($bytes >= 1024) {
	$return = round($bytes / 1024, 2);
	$suffix = "KB";
	} else {
	$return = $bytes;
	$suffix = "Byte";
	}

	$return .= ' '.$suffix;

	return $return;
	}

	/**
	* Checks, that user IP address is within allowed range
	*
	* @param string $ip_list semi-column (by default) separated ip address list
	* @param string $separator ip address separator (default ";")
	*
	* @return bool
	*/
	public static function ipMatch($ip_list, $separator = ';')
	{
	if ( !isset($_SERVER['REMOTE_ADDR']) ) {
	// PHP CLI used -> never match
	return false;
	}

	$ip_match = false;
	$ip_addresses = $ip_list ? explode($separator, $ip_list) : Array ();
	foreach ($ip_addresses as $ip_address) {
	if (self::netMatch($ip_address, $_SERVER['REMOTE_ADDR'])) {
	$ip_match = true;
	break;
	}
	}

	return $ip_match;
	}

	/**
	* Checks, that given ip belongs to given subnet
	*
	* @param string $network
	* @param string $ip
	* @return bool
	* @access public
	*/
	public static function netMatch($network, $ip) {

	$network = trim($network);
	$ip = trim($ip);

	if ( preg_replace('/[\d\.\/-]/', '', $network) != '' ) {
	$network = gethostbyname($network);
	}

	if ($network == $ip) {
	// comparing two ip addresses directly
	return true;
	}

	$d = strpos($network, '-');
	if ($d !== false) {
	// ip address range specified
	$from = ip2long(trim(substr($network, 0, $d)));
	$to = ip2long(trim(substr($network, $d + 1)));

	$ip = ip2long($ip);
	return ($ip >= $from && $ip <= $to);
	}
	elseif (strpos($network, '/') !== false) {
	// single subnet specified
	$ip_arr = explode('/', $network);

	if (!preg_match("@\d\.\d\.\d\.\d@", $ip_arr[0], $matches)) {
	$ip_arr[0] .= '.0'; // Alternate form 194.1.4/24
	}

	$network_long = ip2long($ip_arr[0]);
	$x = ip2long($ip_arr[1]);

	$mask = long2ip($x) == $ip_arr[1] ? $x : (0xffffffff << (32 - $ip_arr[1]));
	$ip_long = ip2long($ip);

	return ($ip_long & $mask) == ($network_long & $mask);
	}

	return false;
	}
	}

	/**
	* Main debugger class, that can be used with any In-Portal (or not) project
	*/
	class Debugger {

	/**
	* Holds reference to global KernelApplication instance
	*
	* @var kApplication
	* @access private
	*/
	private $Application = null;

	/**
	* Set to true if fatal error occurred
	*
	* @var bool
	* @access private
	*/
	private $IsFatalError = false;

	/**
	* Counts warnings on the page
	*
	* @var int
	* @access public
	*/
	public $WarningCount = 0;

	/**
	* Allows to track compile errors, like "stack-overflow"
	*
	* @var bool
	* @access private
	*/
	private $_compileError = false;

	/**
	* Debugger data for building report
	*
	* @var Array
	* @access private
	*/
	private $Data = Array ();

	/**
	* Holds information about each profiler record (start/end/description)
	*
	* @var Array
	* @access private
	*/
	private $ProfilerData = Array ();

	/**
	* Holds information about total execution time per profiler key (e.g. total sql time)
	*
	* @var Array
	* @access private
	*/
	private $ProfilerTotals = Array ();

	/**
	* Counts how much each of total types were called (e.g. total error count)
	*
	* @var Array
	* @access private
	*/
	private $ProfilerTotalCount = Array ();

	/**
	* Holds information about all profile points registered
	*
	* @var Array
	* @access private
	*/
	private $ProfilePoints = Array ();

	/**
	* Prevent recursion when processing debug_backtrace() function results
	*
	* @var Array
	* @access private
	*/
	private $RecursionStack = Array ();

	/**
	* Cross browser debugger report scrollbar width detection
	*
	* @var int
	* @access private
	*/
	private $scrollbarWidth = 0;

	/**
	* Long errors are saved here, because trigger_error doesn't support error messages over 1KB in size
	*
	* @var Array
	* @access private
	*/
	private $longErrors = Array ();

	/**
	* Remembers how much memory & time was spent on including files
	*
	* @var Array
	* @access public
	* @see kUtil::includeOnce
	*/
	public $IncludesData = Array ();

	/**
	* Remembers maximal include deep level
	*
	* @var int
	* @access public
	* @see kUtil::includeOnce
	*/
	public $IncludeLevel = 0;

	/**
	* Prevents report generation more then once
	*
	* @var bool
	* @access private
	*/
	private $reportDone = false;

	/**
	* Transparent spacer image used in case of none spacer image defined via SPACER_URL constant.
	* Used while drawing progress bars (memory usage, time usage, etc.)
	*
	* @var string
	* @access private
	*/
	private $dummyImage = '';

	/**
	* Temporary files created by debugger will be stored here
	*
	* @var string
	* @access private
	*/
	private $tempFolder = '';

	/**
	* Debug rows will be separated using this string before writing to debug file
	*
	* @var string
	* @access private
	*/
	private $rowSeparator = '@@';

	/**
	* Base URL for debugger includes
	*
	* @var string
	* @access private
	*/
	private $baseURL = '';

	/**
	* Sub-folder, where In-Portal is installed
	*
	* @var string
	* @access private
	*/
	private $basePath = '';

	/**
	* Holds last recorded timestamp (for appendTimestamp)
	*
	* @var int
	* @access private
	*/
	private $LastMoment;

	/**
	* Determines, that current request is AJAX request
	*
	* @var bool
	* @access private
	*/
	private $_isAjax = false;

	/**
	* Creates instance of debugger
	*/
	public function __construct()
	{
	global $start, $dbg_options;

	// check if user haven't defined DEBUG_MODE contant directly
	if ( defined('DEBUG_MODE') && DEBUG_MODE ) {
	die('error: constant DEBUG_MODE defined directly, please use <strong>$dbg_options</strong> array instead');
	}

	// check IP before enabling debug mode
	$ip_match = DebuggerUtil::ipMatch(isset($dbg_options['DBG_IP']) ? $dbg_options['DBG_IP'] : '');

	if ( !$ip_match \|\| (isset($_COOKIE['debug_off']) && $_COOKIE['debug_off']) ) {
	define('DEBUG_MODE', 0);
	return;
	}

	// debug is allowed for user, continue initialization
	$this->InitDebugger();
	$this->profileStart('kernel4_startup', 'Startup and Initialization of kernel4', $start);
	$this->profileStart('script_runtime', 'Script runtime', $start);
	$this->LastMoment = $start;

	error_reporting(E_ALL);

	// show errors on screen in case if not in Zend Studio debugging
	ini_set('display_errors', DebuggerUtil::constOn('DBG_ZEND_PRESENT') ? 0 : 1);

	// vertical scrollbar width differs in Firefox and other browsers
	$this->scrollbarWidth = $this->isGecko() ? 22 : 25;

	$this->appendRequest();
	}

	/**
	* Set's default values to constants debugger uses
	*
	*/
	function InitDebugger()
	{
	global $dbg_options;

	unset($dbg_options['DBG_IP']);

	// Detect fact, that this session being debugged by Zend Studio
	foreach ($_COOKIE as $cookie_name => $cookie_value) {
	if (substr($cookie_name, 0, 6) == 'debug_') {
	DebuggerUtil::safeDefine('DBG_ZEND_PRESENT', 1);
	break;
	}
	}

	DebuggerUtil::safeDefine('DBG_ZEND_PRESENT', 0); // set this constant value to 0 (zero) to debug debugger using Zend Studio

	// set default values for debugger constants
	$dbg_constMap = Array (
	'DBG_USE_HIGHLIGHT' => 1, // highlight output same as php code using "highlight_string" function
	'DBG_WINDOW_WIDTH' => 700, // set width of debugger window (in pixels) for better viewing large amount of debug data
	'DBG_USE_SHUTDOWN_FUNC' => DBG_ZEND_PRESENT ? 0 : 1, // use shutdown function to include debugger code into output
	'DBG_HANDLE_ERRORS' => DBG_ZEND_PRESENT ? 0 : 1, // handle all allowed by php (see php manual) errors instead of default handler
	'DBG_IGNORE_STRICT_ERRORS' => 0, // ignore PHP5 errors about private/public view modified missing in class declarations
	'DBG_DOMVIEWER' => '/temp/domviewer.html', // path to DOMViewer on website
	'DOC_ROOT' => str_replace('\\', '/', realpath($_SERVER['DOCUMENT_ROOT']) ), // windows hack
	'DBG_LOCAL_BASE_PATH' => 'w:', // replace DOC_ROOT in filenames (in errors) using this path
	);

	// only for IE, in case if no windows php script editor defined
	if (!defined('DBG_EDITOR')) {
	// $dbg_constMap['DBG_EDITOR'] = 'c:\Program Files\UltraEdit\uedit32.exe %F/%L';
	$dbg_constMap['DBG_EDITOR'] = 'c:\Program Files\Zend\ZendStudio-5.2.0\bin\ZDE.exe %F';
	}

	// debugger is initialized before kHTTPQuery, so do jQuery headers check here too
	if (array_key_exists('HTTP_X_REQUESTED_WITH', $_SERVER) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest') {
	$this->_isAjax = true;
	}
	elseif (array_key_exists('ajax', $_GET) && $_GET['ajax'] == 'yes') {
	$this->_isAjax = true;
	}

	// user defined options override debugger defaults
	$dbg_constMap = array_merge($dbg_constMap, $dbg_options);

	if ($this->_isAjax && array_key_exists('DBG_SKIP_AJAX', $dbg_constMap) && $dbg_constMap['DBG_SKIP_AJAX']) {
	$dbg_constMap['DBG_SKIP_REPORTING'] = 1;
	}

	// allows to validate unit configs via request variable
	if ( !array_key_exists('DBG_VALIDATE_CONFIGS', $dbg_constMap) ) {
	$dbg_constMap['DBG_VALIDATE_CONFIGS'] = array_key_exists('validate_configs', $_GET) ? (int)$_GET['validate_configs'] : 0;
	}

	// when validation configs, don't show sqls for better validation error displaying
	if ($dbg_constMap['DBG_VALIDATE_CONFIGS']) {
	$dbg_constMap['DBG_SQL_PROFILE'] = 0;
	}

	// when showing explain make shure, that debugger window is large enough
	if (array_key_exists('DBG_SQL_EXPLAIN', $dbg_constMap) && $dbg_constMap['DBG_SQL_EXPLAIN']) {
	$dbg_constMap['DBG_WINDOW_WIDTH'] = 1000;
	}

	foreach ($dbg_constMap as $dbg_constName => $dbg_constValue) {
	DebuggerUtil::safeDefine($dbg_constName, $dbg_constValue);
	}
	}

	/**
	* Performs debugger initialization
	*
	* @return void
	*/
	private function InitReport()
	{
	if ( !class_exists('kApplication') ) {
	return;
	}

	$application =& kApplication::Instance();

	// string used to separate debugger records while in file (used in debugger dump filename too)
	$this->rowSeparator = '@' . (/is_object($application->Factory) &&/ $application->InitDone ? $application->GetSID() : 0) . '@';
	// $this->rowSeparator = '@' . rand(0, 100000) . '@';

	// include debugger files from this url
	$reg_exp = '/^' . preg_quote(FULL_PATH, '/') . '/';
	$kernel_path = preg_replace($reg_exp, '', KERNEL_PATH, 1);
	$this->baseURL = PROTOCOL . SERVER_NAME . (defined('PORT') ? ':' . PORT : '') . rtrim(BASE_PATH, '/') . $kernel_path . '/utility/debugger';

	// store debugger cookies at this path
	$this->basePath = rtrim(BASE_PATH, '/');

	// save debug output in this folder
	$this->tempFolder = defined('RESTRICTED') ? RESTRICTED : WRITEABLE . '/cache';
	}

	/**
	* Allows to overcome short error message problem in tigger_error function
	*
	* @param string $msg
	* @return int
	* @access public
	*/
	public function mapLongError($msg)
	{
	$key = $this->generateID();
	$this->longErrors[$key] = $msg;

	return $key;
	}

	/**
	* Appends all passed variable values (without variable names) to debug output
	*
	* @return void
	* @access public
	*/
	public function dumpVars()
	{
	$dump_mode = 'var_dump';
	$dumpVars = func_get_args();

	if ( $dumpVars[count($dumpVars) - 1] === 'STRICT' ) {
	$dump_mode = 'strict_var_dump';
	array_pop($dumpVars);
	}

	foreach ($dumpVars as $varValue) {
	$this->Data[] = Array ('value' => $varValue, 'debug_type' => $dump_mode);
	}
	}

	/**
	* Transforms collected data at given index into human-readable HTML to place in debugger report
	*
	* @param int $dataIndex
	* @return string
	* @access private
	*/
	private function prepareHTML($dataIndex)
	{
	static $errors_displayed = 0;

	$Data =& $this->Data[$dataIndex];
	if ( $Data['debug_type'] == 'html' ) {
	return $Data['html'];
	}

	switch ($Data['debug_type']) {
	case 'error':
	$errors_displayed++;
	$fileLink = $this->getFileLink($Data['file'], $Data['line']);
	$ret = '<b class="debug_error">' . $this->getErrorNameByCode($Data['no']) . ' (#' . $errors_displayed . ')</b>: ' . $Data['str'];
	$ret .= ' in <b>' . $fileLink . '</b> on line <b>' . $Data['line'] . '</b>';
	return $ret;
	break;

	case 'exception':
	$fileLink = $this->getFileLink($Data['file'], $Data['line']);
	$ret = '<b class="debug_error">' . $Data['exception_class'] . '</b>: ' . $Data['str'];
	$ret .= ' in <b>' . $fileLink . '</b> on line <b>' . $Data['line'] . '</b>';
	return $ret;
	break;

	case 'var_dump':
	return $this->highlightString($this->print_r($Data['value'], true));
	break;

	case 'strict_var_dump':
	return $this->highlightString(var_export($Data['value'], true));
	break;

	case 'trace':
	ini_set('memory_limit', '500M');
	$trace =& $Data['trace'];

	$i = 0;
	$traceCount = count($trace);
	$ret = '';

	while ( $i < $traceCount ) {
	$traceRec =& $trace[$i];
	$argsID = 'trace_args_' . $dataIndex . '_' . $i;

	$has_args = isset($traceRec['args']);

	if ( isset($traceRec['file']) ) {
	$func_name = isset($traceRec['class']) ? $traceRec['class'] . $traceRec['type'] . $traceRec['function'] : $traceRec['function'];
	$args_link = $has_args ? '<a href="javascript:$Debugger.ToggleTraceArgs(\'' . $argsID . '\');" title="Show/Hide Function Arguments"><b>Function</b></a>' : '<strong>Function</strong>';

	$ret .= $args_link . ': ' . $this->getFileLink($traceRec['file'], $traceRec['line'], $func_name);
	$ret .= ' in <b>' . basename($traceRec['file']) . '</b> on line <b>' . $traceRec['line'] . '</b><br>';
	}
	else {
	$ret .= 'no file information available';
	}

	if ( $has_args ) {
	// if parameter value is longer then 200 symbols, then leave only first 50
	$args = $this->highlightString($this->print_r($traceRec['args'], true));
	$ret .= '<div id="' . $argsID . '" style="display: none;">' . $args . '</div>';
	}
	$i++;
	}
	return $ret;
	break;

	case 'profiler':
	$profileKey = $Data['profile_key'];
	$Data =& $this->ProfilerData[$profileKey];
	$runtime = ($Data['ends'] - $Data['begins']); // in seconds

	$totals_key = getArrayValue($Data, 'totalsKey');
	if ( $totals_key ) {
	$total_before = $Data['totalsBefore'];
	$total = $this->ProfilerTotals[$totals_key];

	$div_width = Array ();
	$total_width = ($this->getWindowWidth() - 10);
	$div_width['before'] = round(($total_before / $total) * $total_width);
	$div_width['current'] = round(($runtime / $total) * $total_width);
	$div_width['left'] = round((($total - $total_before - $runtime) / $total) * $total_width);

	$subtitle = array_key_exists('subtitle', $Data) ? ' (' . $Data['subtitle'] . ')' : '';
	$ret = '<b>Name' . $subtitle . '</b>: ' . $Data['description'] . '<br />';

	$additional = isset($Data['additional']) ? $Data['additional'] : Array ();
	if ( isset($Data['file']) ) {
	array_unshift($additional, Array ('name' => 'File', 'value' => $this->getFileLink($Data['file'], $Data['line'], basename($Data['file']) . ':' . $Data['line'])));
	}
	array_unshift($additional, Array ('name' => 'Runtime', 'value' => $runtime . 's'));

	$ret .= '<div>'; //FF 3.5 needs this!
	foreach ($additional as $mixed_param) {
	$ret .= '[<strong>' . $mixed_param['name'] . '</strong>: ' . $mixed_param['value'] . '] ';
	}

	/*if ( isset($Data['file']) ) {
	$ret .= '[<b>Runtime</b>: ' . $runtime . 's] [<b>File</b>: ' . $this->getFileLink($Data['file'], $Data['line'], basename($Data['file']) . ':' . $Data['line']) . ']<br />';
	}
	else {
	$ret .= '<b>Runtime</b>: ' . $runtime . 's<br />';
	}*/

	$ret .= '</div>';

	$ret .= '<div class="dbg_profiler" style="width: ' . $div_width['before'] . 'px; border-right: 0px; background-color: #298DDF;"><img src="' . $this->dummyImage . '" width="1" height="1"/></div>';
	$ret .= '<div class="dbg_profiler" style="width: ' . $div_width['current'] . 'px; border-left: 0px; border-right: 0px; background-color: #EF4A4A;"><img src="' . $this->dummyImage . '" width="1" height="1"/></div>';
	$ret .= '<div class="dbg_profiler" style="width: ' . $div_width['left'] . 'px; border-left: 0px; background-color: #DFDFDF;"><img src="' . $this->dummyImage . '" width="1" height="1"/></div>';

	return $ret;
	}
	else {
	return '<b>Name</b>: ' . $Data['description'] . '<br><b>Runtime</b>: ' . $runtime . 's';
	}
	break;

	default:
	return 'incorrect debug data';
	break;
	}
	}

	/**
	* Returns debugger report window width excluding scrollbar
	*
	* @return int
	* @access private
	*/
	private function getWindowWidth()
	{
	return DBG_WINDOW_WIDTH - $this->scrollbarWidth - 8;
	}

	/**
	* Tells debugger to skip objects that are heavy in plan of memory usage while printing debug_backtrace results
	*
	* @param Object $object
	* @return bool
	* @access private
	*/
	private function IsBigObject(&$object)
	{
	$skip_classes = Array(
	defined('APPLICATION_CLASS') ? APPLICATION_CLASS : 'kApplication',
	'kFactory',
	'kUnitConfigReader',
	'NParser',
	);

	foreach ($skip_classes as $class_name) {
	if ( strtolower(get_class($object)) == strtolower($class_name) ) {
	return true;
	}
	}

	return false;
	}

	/**
	* Advanced version of print_r (for debugger only). Don't print objects recursively
	*
	* @param Array $array
	* @param bool $return_output return output or print it out
	* @param int $tab_count offset in tabs
	* @return string
	* @access private
	*/
	private function print_r(&$array, $return_output = false, $tab_count = -1)
	{
	static $first_line = true;

	// not an array at all
	if ( !is_array($array) ) {
	switch ( gettype($array) ) {
	case 'NULL':
	return 'NULL' . "\n";
	break;

	case 'object':
	return $this->processObject($array, $tab_count);
	break;

	default:
	// number or string
	if ( strlen($array) > 200 ) {
	$array = substr($array, 0, 50) . ' ...';
	}
	return $array . "\n";
	break;
	}
	}

	$output = '';

	$tab_count++;
	$output .= "Array\n" . str_repeat(' ', $tab_count) . "(\n";

	$tab_count++;
	$tabsign = $tab_count ? str_repeat(' ', $tab_count) : '';

	$array_keys = array_keys($array);

	foreach ($array_keys as $key) {
	switch ( gettype($array[$key]) ) {
	case 'array':
	$output .= $tabsign . '[' . $key . '] = ' . $this->print_r($array[$key], true, $tab_count);
	break;

	case 'boolean':
	$output .= $tabsign . '[' . $key . '] = ' . ($array[$key] ? 'true' : 'false') . "\n";
	break;

	case 'integer':
	case 'double':
	case 'string':
	if ( strlen($array[$key]) > 200 ) {
	$array[$key] = substr($array[$key], 0, 50) . ' ...';
	}
	$output .= $tabsign . '[' . $key . '] = ' . $array[$key] . "\n";
	break;

	case 'NULL':
	$output .= $tabsign . '[' . $key . "] = NULL\n";
	break;

	case 'object':
	$output .= $tabsign . '[' . $key . "] = ";
	$output .= "Object (" . get_class($array[$key]) . ") = \n" . str_repeat(' ', $tab_count + 1) . "(\n";
	$output .= $this->processObject($array[$key], $tab_count + 2);
	$output .= str_repeat(' ', $tab_count + 1) . ")\n";
	break;

	default:
	$output .= $tabsign . '[' . $key . '] unknown = ' . gettype($array[$key]) . "\n";
	break;
	}
	}

	$tab_count--;
	$output .= str_repeat(' ', $tab_count) . ")\n";

	if ( $first_line ) {
	$first_line = false;
	$output .= "\n";
	}

	$tab_count--;

	if ( $return_output ) {
	return $output;
	}
	else {
	echo $output;
	}

	return true;
	}

	/**
	* Returns string representation of given object (more like print_r, but with recursion prevention check)
	*
	* @param Object $object
	* @param int $tab_count
	* @return string
	* @access private
	*/
	private function processObject(&$object, $tab_count)
	{
	$object_class = get_class($object);
	if ( !in_array($object_class, $this->RecursionStack) ) {
	if ( $this->IsBigObject($object) ) {
	return 'SKIPPED (class: ' . $object_class . ")\n";
	}

	$attribute_names = get_class_vars($object_class);
	if ( !$attribute_names ) {
	return "NO_ATTRIBUTES\n";
	}
	else {
	$output = '';
	array_push($this->RecursionStack, $object_class);

	$tabsign = $tab_count ? str_repeat(' ', $tab_count) : '';
	foreach ($attribute_names as $attribute_name => $attribute_value) {
	if ( is_object($object->$attribute_name) ) {
	// it is object
	$output .= $tabsign . '[' . $attribute_name . '] = ' . $this->processObject($object->$attribute_name, $tab_count + 1);
	}
	else {
	$output .= $tabsign . '[' . $attribute_name . '] = ' . $this->print_r($object->$attribute_name, true, $tab_count);
	}
	}
	array_pop($this->RecursionStack);
	return $output;
	}
	}
	else {
	// object [in recursion stack]
	return '* RECURSION * (class: ' . $object_class . ")\n";
	}
	}

	/**
	* Format SQL Query using predefined formatting
	* and highlighting techniques
	*
	* @param string $sql
	* @return string
	* @access public
	*/
	public function formatSQL($sql)
	{
	$sql = trim(preg_replace('/(\n\|\t\| )+/is', ' ', $sql));

	// whitespace in the beginning of the regex is to avoid splitting inside words, for example "FROM int_ConfigurationValues" into "FROM intConfiguration\n\tValues"
	$formatted_sql = preg_replace('/\s(CREATE TABLE\|DROP TABLE\|SELECT\|UPDATE\|SET\|REPLACE\|INSERT\|DELETE\|VALUES\|FROM\|LEFT JOIN\|INNER JOIN\|LIMIT\|WHERE\|HAVING\|GROUP BY\|ORDER BY)\s/is', "\n\t$1 ", ' ' . $sql);
	$formatted_sql = $this->highlightString($formatted_sql);

	if ( defined('DBG_SQL_EXPLAIN') && DBG_SQL_EXPLAIN ) {
	if ( substr($sql, 0, 6) == 'SELECT' ) {
	$formatted_sql .= '<br/>' . '<strong>Explain</strong>:<br /><br />';
	$explain_result = $this->Application->Conn->Query('EXPLAIN ' . $sql, null, true);

	$explain_table = '';
	foreach ($explain_result as $explain_row) {
	if ( !$explain_table ) {
	// first row -> draw header
	$explain_table .= '<tr class="explain_header"><td>' . implode('</td><td>', array_keys($explain_row)) . '</td></tr>';
	}
	$explain_table .= '<tr><td>' . implode('</td><td>', $explain_row) . '</td></tr>';
	}

	$formatted_sql .= '<table class="dbg_explain_table">' . $explain_table . '</table>';
	}
	}

	return $formatted_sql;
	}

	/**
	* Highlights given string using "highlight_string" method
	*
	* @param string $string
	* @return string
	* @access public
	*/
	public function highlightString($string)
	{
	if ( !(defined('DBG_USE_HIGHLIGHT') && DBG_USE_HIGHLIGHT) \|\| $this->_compileError ) {
	return nl2br($string);
	}

	$string = str_replace(Array ('\\', '/'), Array ('_no_match_string_', '_n_m_s_'), $string);
	$this->_compileError = true; // next line is possible cause of compile error
	$string = highlight_string('<?php ' . $string . ' ?>', true);
	$this->_compileError = false;

	$string = str_replace(Array ('_no_match_string_', '_n_m_s_'), Array ('\\', '/'), $string);

	if ( strlen($string) >= 65536 ) {
	// preg_replace will fail, when string is longer, then 65KB
	return str_replace(Array ('<?php ', '?>'), '', $string);
	}

	return preg_replace('/<\?(.)php (.)\?>/Us', '\\2', $string);
	}

	/**
	* Determine by php type of browser used to show debugger
	*
	* @return bool
	* @access private
	*/
	private function isGecko()
	{
	// we need isset because we may run scripts from shell with no user_agent at all
	return isset($_SERVER['HTTP_USER_AGENT']) && strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'firefox') !== false;
	}

	/**
	* Returns link for editing php file (from error) in external editor
	*
	* @param string $file filename with path from root folder
	* @param int $lineno line number in file where error is found
	* @param string $title text to show on file edit link
	* @return string
	* @access public
	*/
	public function getFileLink($file, $lineno = 1, $title = '')
	{
	if ( !$title ) {
	$title = str_replace('/', '\\', $this->getLocalFile($file));
	}

	if ( $this->isGecko() ) {
	return '<a href="file://' . $this->getLocalFile($file) . '">' . $title . '</a>';
	}
	else {
	return '<a href="javascript:$Debugger.editFile(\'' . $this->getLocalFile($file) . '\', ' . $lineno . ');" title="' . $file . '">' . $title . '</a>';
	}
	}

	/**
	* Converts filepath on server to filepath in mapped DocumentRoot on developer pc
	*
	* @param string $remoteFile
	* @return string
	* @access private
	*/
	private function getLocalFile($remoteFile)
	{
	return preg_replace('/^' . preg_quote(DOC_ROOT, '/') . '/', DBG_LOCAL_BASE_PATH, $remoteFile, 1);
	}

	/**
	* Appends call trace till this method call
	*
	* @param int $levels_to_shift
	* @return void
	* @access public
	*/
	public function appendTrace($levels_to_shift = 1)
	{
	$levels_shifted = 0;
	$trace = debug_backtrace();

	while ( $levels_shifted < $levels_to_shift ) {
	array_shift($trace);
	$levels_shifted++;
	}

	$this->Data[] = Array ('trace' => $trace, 'debug_type' => 'trace');
	}

	/**
	* Appends call trace till this method call
	*
	* @param Exception $exception
	* @return void
	* @access private
	*/
	private function appendExceptionTrace(&$exception)
	{
	$trace = $exception->getTrace();
	$this->Data[] = Array('trace' => $trace, 'debug_type' => 'trace');
	}

	/**
	* Adds memory usage statistics
	*
	* @param string $msg
	* @param int $used
	* @return void
	* @access public
	*/
	public function appendMemoryUsage($msg, $used = null)
	{
	if ( !isset($used) ) {
	$used = round(memory_get_usage() / 1024);
	}

	$this->appendHTML('<b>Memory usage</b> ' . $msg . ' ' . $used . 'Kb');
	}

	/**
	* Appends HTML code without transformations
	*
	* @param string $html
	* @return void
	* @access public
	*/
	public function appendHTML($html)
	{
	$this->Data[] = Array ('html' => $html, 'debug_type' => 'html');
	}

	/**
	* Change debugger info that was already generated before.
	* Returns true if html was set.
	*
	* @param int $index
	* @param string $html
	* @param string $type = {'append','prepend','replace'}
	* @return bool
	* @access public
	*/
	public function setHTMLByIndex($index, $html, $type = 'append')
	{
	if ( !isset($this->Data[$index]) \|\| $this->Data[$index]['debug_type'] != 'html' ) {
	return false;
	}

	switch ( $type ) {
	case 'append':
	$this->Data[$index]['html'] .= '<br>' . $html;
	break;

	case 'prepend':
	$this->Data[$index]['html'] = $this->Data[$index]['html'] . '<br>' . $html;
	break;

	case 'replace':
	$this->Data[$index]['html'] = $html;
	break;
	}

	return true;
	}

	/**
	* Move $debugLineCount lines of input from debug output
	* end to beginning.
	*
	* @param int $debugLineCount
	* @return void
	* @access private
	*/
	private function moveToBegin($debugLineCount)
	{
	$lines = array_splice($this->Data, count($this->Data) - $debugLineCount, $debugLineCount);
	$this->Data = array_merge($lines, $this->Data);
	}

	/**
	* Moves all debugger report lines after $debugLineCount into $new_row position
	*
	* @param int $new_row
	* @param int $debugLineCount
	* @return void
	* @access private
	*/
	private function moveAfterRow($new_row, $debugLineCount)
	{
	$lines = array_splice($this->Data, count($this->Data) - $debugLineCount, $debugLineCount);
	$rows_before = array_splice($this->Data, 0, $new_row, $lines);
	$this->Data = array_merge($rows_before, $this->Data);
	}

	/**
	* Appends HTTP REQUEST information to debugger report
	*
	* @return void
	* @access private
	*/
	private function appendRequest()
	{
	if ( isset($_SERVER['SCRIPT_FILENAME']) ) {
	$script = $_SERVER['SCRIPT_FILENAME'];
	}
	else {
	$script = $_SERVER['DOCUMENT_ROOT'] . $_SERVER['PHP_SELF'];
	}

	$this->appendHTML('ScriptName: <b>' . $this->getFileLink($script, 1, basename($script)) . '</b> (<b>' . dirname($script) . '</b>)');
	if ( $this->_isAjax ) {
	$this->appendHTML('RequestURI: ' . $_SERVER['REQUEST_URI'] . ' (QS Length:' . strlen($_SERVER['QUERY_STRING']) . ')');
	}

	$tools_html = ' <table style="width: ' . $this->getWindowWidth() . 'px;">
	<tr>
	<td>' . $this->_getDomViewerHTML() . '</td>
	<td>' . $this->_getToolsHTML() . '</td>
	</tr>
	</table>';
	$this->appendHTML($tools_html);

	ob_start();
	?>
	<table border="0" cellspacing="0" cellpadding="0" class="dbg_flat_table" style="width: <?php echo $this->getWindowWidth(); ?>px;">
	<thead style="font-weight: bold;">
	<td width="20">Src</td><td>Name</td><td>Value</td>
	</thead>
	<?php
	foreach ($_REQUEST as $key => $value) {
	if ( !is_array($value) && trim($value) == '' ) {
	$value = '<b class="debug_error">no value</b>';
	}
	else {
	$value = htmlspecialchars($this->print_r($value, true));
	}

	$in_cookie = isset($_COOKIE[$key]);
	$src = isset($_GET[$key]) && !$in_cookie ? 'GE' : (isset($_POST[$key]) && !$in_cookie ? 'PO' : ($in_cookie ? 'CO' : '?'));
	echo '<tr><td>' . $src . '</td><td>' . $key . '</td><td>' . $value . '</td></tr>';
	}
	?>
	</table>
	<?php
	$this->appendHTML(ob_get_contents());
	ob_end_clean();
	}

	/**
	* Appends php session content to debugger output
	*
	* @return void
	* @access private
	*/
	private function appendSession()
	{
	if ( isset($_SESSION) && $_SESSION ) {
	$this->appendHTML('PHP Session: [<b>' . ini_get('session.name') . '</b>]');
	$this->dumpVars($_SESSION);
	$this->moveToBegin(2);
	}
	}

	/**
	* Starts profiling of a given $key
	*
	* @param string $key
	* @param string $description
	* @param int $timeStamp
	* @return void
	* @access public
	*/
	public function profileStart($key, $description = null, $timeStamp = null)
	{
	if ( !isset($timeStamp) ) {
	$timeStamp = microtime(true);
	}
	$this->ProfilerData[$key] = Array ('begins' => $timeStamp, 'ends' => 5000, 'debuggerRowID' => count($this->Data));
	if ( isset($description) ) {
	$this->ProfilerData[$key]['description'] = $description;
	}

	if ( substr($key, 0, 4) == 'sql_' ) {
	// append place from what was called
	$trace_results = debug_backtrace();
	$trace_count = count($trace_results);
	$i = 0;
	while ( $i < $trace_count ) {
	if ( !isset($trace_results[$i]['file']) ) {
	$i++;
	continue;
	}

	$trace_file = basename($trace_results[$i]['file']);
	if ( $trace_file != 'db_connection.php' && $trace_file != 'db_load_balancer.php' && $trace_file != 'adodb.inc.php' ) {
	break;
	}
	$i++;
	}

	$this->ProfilerData[$key]['file'] = $trace_results[$i]['file'];
	$this->ProfilerData[$key]['line'] = $trace_results[$i]['line'];

	if ( array_key_exists('object', $trace_results[$i + 1]) && isset($trace_results[$i + 1]['object']->Prefix) ) {
	$object =& $trace_results[$i + 1]['object'];
	/* @var $object kBase */

	$prefix_special = rtrim($object->Prefix . '.' . $object->Special, '.');
	$this->ProfilerData[$key]['prefix_special'] = $prefix_special;
	}

	unset($trace_results);
	}

	$this->Data[] = Array ('profile_key' => $key, 'debug_type' => 'profiler');
	}

	/**
	* Ends profiling for a given $key
	*
	* @param string $key
	* @param string $description
	* @param int $timeStamp
	* @return void
	* @access public
	*/
	public function profileFinish($key, $description = null, $timeStamp = null)
	{
	if ( !isset($timeStamp) ) {
	$timeStamp = microtime(true);
	}
	$this->ProfilerData[$key]['ends'] = $timeStamp;

	if ( isset($description) ) {
	$this->ProfilerData[$key]['description'] = $description;
	}

	if ( substr($key, 0, 4) == 'sql_' ) {
	$func_arguments = func_get_args();
	$rows_affected = $func_arguments[3];

	$additional = Array ();

	if ( $rows_affected > 0 ) {
	$additional[] = Array ('name' => 'Affected Rows', 'value' => $rows_affected);

	if ( isset($func_arguments[4]) ) {
	if ( strlen($func_arguments[4]) > 200 ) {
	$func_arguments[4] = substr($func_arguments[4], 0, 50) . ' ...';
	}

	$additional[] = Array ('name' => 'Result', 'value' => $func_arguments[4]);
	}
	}

	$additional[] = Array ('name' => 'Query Number', 'value' => $func_arguments[5]);

	if ( $func_arguments[6] ) {
	$this->profilerAddTotal('cachable_queries', $key);
	$this->ProfilerData[$key]['subtitle'] = 'cachable';
	}

	if ( $func_arguments[7] ) {
	$additional[] = Array ('name' => 'Server #', 'value' => $func_arguments[7]);
	}

	if ( array_key_exists('prefix_special', $this->ProfilerData[$key]) ) {
	$additional[] = Array ('name' => 'PrefixSpecial', 'value' => $this->ProfilerData[$key]['prefix_special']);
	}

	$this->ProfilerData[$key]['additional'] =& $additional;
	}
	}

	/**
	* Collects total execution time from profiler record
	*
	* @param string $total_key
	* @param string $key
	* @param int $value
	* @return void
	* @access public
	*/
	public function profilerAddTotal($total_key, $key = null, $value = null)
	{
	if ( !isset($this->ProfilerTotals[$total_key]) ) {
	$this->ProfilerTotals[$total_key] = 0;
	$this->ProfilerTotalCount[$total_key] = 0;
	}

	if ( !isset($value) ) {
	$value = $this->ProfilerData[$key]['ends'] - $this->ProfilerData[$key]['begins'];
	}

	if ( isset($key) ) {
	$this->ProfilerData[$key]['totalsKey'] = $total_key;
	$this->ProfilerData[$key]['totalsBefore'] = $this->ProfilerTotals[$total_key];
	}

	$this->ProfilerTotals[$total_key] += $value;
	$this->ProfilerTotalCount[$total_key]++;
	}

	/**
	* Traces relative code execution speed between this method calls
	*
	* @param string $message
	* @return void
	* @access public
	*/
	public function appendTimestamp($message)
	{
	global $start;

	$time = microtime(true);
	$from_last = $time - $this->LastMoment;
	$from_start = $time - $start;
	$this->appendHTML(sprintf("<strong>%s</strong> %.5f from last %.5f from start", $message, $from_last, $from_start));
	$this->LastMoment = $time;
	}

	/**
	* Returns unique ID for each method call
	*
	* @return int
	* @access public
	*/
	public function generateID()
	{
	list($usec, $sec) = explode(' ', microtime());

	$id_part_1 = substr($usec, 4, 4);
	$id_part_2 = mt_rand(1, 9);
	$id_part_3 = substr($sec, 6, 4);
	$digit_one = substr($id_part_1, 0, 1);

	if ( $digit_one == 0 ) {
	$digit_one = mt_rand(1, 9);
	$id_part_1 = preg_replace('/^0/', '', $id_part_1);
	$id_part_1 = $digit_one . $id_part_1;
	}

	return $id_part_1 . $id_part_2 . $id_part_3;
	}

	/**
	* Returns error name based on it's code
	*
	* @param int $error_code
	* @return string
	* @access private
	*/
	private function getErrorNameByCode($error_code)
	{
	$error_map = Array (
	'Fatal Error' => Array (E_USER_ERROR),
	'Warning' => Array (E_WARNING, E_USER_WARNING),
	'Notice' => Array (E_NOTICE, E_USER_NOTICE),
	);

	if ( defined('E_STRICT') ) {
	// since PHP 5
	$error_map['PHP5 Strict'] = Array (E_STRICT);
	}

	if ( defined('E_RECOVERABLE_ERROR') ) {
	// since PHP 5.2
	$error_map['Fatal Error (recoverable)'] = Array (E_RECOVERABLE_ERROR);
	}

	if ( defined('E_DEPRECATED') ) {
	// since PHP 5.3
	$error_map['PHP5 Depricated'] = Array (E_DEPRECATED, E_USER_DEPRECATED);
	}

	foreach ($error_map as $error_name => $error_codes) {
	if ( in_array($error_code, $error_codes) ) {
	return $error_name;
	}
	}

	return '';
	}

	/**
	* Returns profile total key (check against missing key too)
	*
	* @param string $key
	* @return int
	* @access private
	*/
	private function getProfilerTotal($key)
	{
	if ( isset($this->ProfilerTotalCount[$key]) ) {
	return (int)$this->ProfilerTotalCount[$key];
	}

	return 0;
	}

	/**
	* Counts how much calls were made to a place, where this method is called (basic version of profiler)
	*
	* @param string $title
	* @param int $level
	* @return void
	* @access public
	*/
	public function ProfilePoint($title, $level = 1)
	{
	$trace_results = debug_backtrace();
	$level = min($level, count($trace_results) - 1);

	do {
	$point = $trace_results[$level];
	$location = $point['file'] . ':' . $point['line'];
	$level++;
	$has_more = isset($trace_results[$level]);
	} while ( $has_more && $point['function'] == $trace_results[$level]['function'] );

	if ( !isset($this->ProfilePoints[$title]) ) {
	$this->ProfilePoints[$title] = Array ();
	}

	if ( !isset($this->ProfilePoints[$title][$location]) ) {
	$this->ProfilePoints[$title][$location] = 0;
	}

	$this->ProfilePoints[$title][$location]++;
	}

	/**
	* Generates report
	*
	* @param bool $returnResult
	* @param bool $clean_output_buffer
	*
	* @return string
	* @access public
	*/
	public function printReport($returnResult = false, $clean_output_buffer = true)
	{
	if ( $this->reportDone ) {
	// don't print same report twice (in case if shutdown function used + compression + fatal error)
	return '';
	}

	$this->profileFinish('script_runtime');
	$this->breakOutofBuffering(!$returnResult);

	$debugger_start = memory_get_usage();

	if ( defined('SPACER_URL') ) {
	$this->dummyImage = SPACER_URL;
	}

	$this->InitReport(); // set parameters required by AJAX

	// defined here, because user can define this constant while script is running, not event before debugger is started
	DebuggerUtil::safeDefine('DBG_RAISE_ON_WARNINGS', 0);
	DebuggerUtil::safeDefine('DBG_TOOLBAR_BUTTONS', 1);

	$this->appendSession(); // show php session if any

	// ensure, that 1st line of debug output always is this one:
	$top_line = '<table cellspacing="0" cellpadding="0" style="width: ' . $this->getWindowWidth() . 'px; margin: 0px;"><tr><td align="left" width="50%">[<a href="javascript:window.location.reload();">Reload Frame</a>] [<a href="javascript:$Debugger.Toggle(27);">Hide Debugger</a>] [<a href="javascript:$Debugger.Clear();">Clear Debugger</a>]</td><td align="right" width="50%">[Current Time: <b>' . date('H:i:s') . '</b>] [File Size: <b>#DBG_FILESIZE#</b>]</td></tr></table>';

	$this->appendHTML($top_line);
	$this->moveToBegin(1);

	if ( count($this->ProfilePoints) > 0 ) {
	foreach ($this->ProfilePoints as $point => $locations) {
	arsort($this->ProfilePoints[$point]);
	}

	$this->appendHTML($this->highlightString($this->print_r($this->ProfilePoints, true)));
	}

	if ( DebuggerUtil::constOn('DBG_SQL_PROFILE') && isset($this->ProfilerTotals['sql']) ) {
	// sql query profiling was enabled -> show totals
	if ( array_key_exists('cachable_queries', $this->ProfilerTotalCount) ) {
	$append = ' <strong>Cachable queries</strong>: ' . $this->ProfilerTotalCount['cachable_queries'];
	}
	else {
	$append = '';
	}

	$this->appendHTML('<b>SQL Total time:</b> ' . $this->ProfilerTotals['sql'] . ' <b>Number of queries</b>: ' . $this->ProfilerTotalCount['sql'] . $append);
	}

	if ( DebuggerUtil::constOn('DBG_PROFILE_INCLUDES') && isset($this->ProfilerTotals['includes']) ) {
	// included file profiling was enabled -> show totals
	$this->appendHTML('<b>Included Files Total time:</b> ' . $this->ProfilerTotals['includes'] . ' Number of includes: ' . $this->ProfilerTotalCount['includes']);
	}

	if ( DebuggerUtil::constOn('DBG_PROFILE_MEMORY') ) {
	// detailed memory usage reporting by objects was enabled -> show totals
	$this->appendHTML('<b>Memory used by Objects:</b> ' . round($this->ProfilerTotals['objects'] / 1024, 2) . 'Kb');
	}

	if ( DebuggerUtil::constOn('DBG_INCLUDED_FILES') ) {
	$files = get_included_files();
	$this->appendHTML('<strong>Included files:</strong>');
	foreach ($files as $file) {
	$this->appendHTML($this->getFileLink($this->getLocalFile($file)) . ' (' . round(filesize($file) / 1024, 2) . 'Kb)');
	}
	}

	if ( DebuggerUtil::constOn('DBG_PROFILE_INCLUDES') ) {
	$totals = $totals_configs = Array ('mem' => 0, 'time' => 0);
	$this->appendHTML('<b>Included files statistics:</b>' . (DebuggerUtil::constOn('DBG_SORT_INCLUDES_MEM') ? ' (sorted by memory usage)' : ''));

	if ( is_array($this->IncludesData['mem']) ) {
	if ( DebuggerUtil::constOn('DBG_SORT_INCLUDES_MEM') ) {
	array_multisort($this->IncludesData['mem'], SORT_DESC, $this->IncludesData['file'], $this->IncludesData['time'], $this->IncludesData['level']);
	}

	foreach ($this->IncludesData['file'] as $key => $file_name) {
	$this->appendHTML(str_repeat(' -> ', ($this->IncludesData['level'][$key] >= 0 ? $this->IncludesData['level'][$key] : 0)) . $file_name . ' Mem: ' . sprintf("%.4f Kb", $this->IncludesData['mem'][$key] / 1024) . ' Time: ' . sprintf("%.4f", $this->IncludesData['time'][$key]));

	if ( $this->IncludesData['level'][$key] == 0 ) {
	$totals['mem'] += $this->IncludesData['mem'][$key];
	$totals['time'] += $this->IncludesData['time'][$key];
	}
	elseif ( $this->IncludesData['level'][$key] == -1 ) {
	$totals_configs['mem'] += $this->IncludesData['mem'][$key];
	$totals_configs['time'] += $this->IncludesData['time'][$key];
	}
	}

	$this->appendHTML('<b>Sub-Total classes:</b> ' . ' Mem: ' . sprintf("%.4f Kb", $totals['mem'] / 1024) . ' Time: ' . sprintf("%.4f", $totals['time']));
	$this->appendHTML('<b>Sub-Total configs:</b> ' . ' Mem: ' . sprintf("%.4f Kb", $totals_configs['mem'] / 1024) . ' Time: ' . sprintf("%.4f", $totals_configs['time']));
	$this->appendHTML('<span class="error"><b>Grand Total:</b></span> ' . ' Mem: ' . sprintf("%.4f Kb", ($totals['mem'] + $totals_configs['mem']) / 1024) . ' Time: ' . sprintf("%.4f", $totals['time'] + $totals_configs['time']));
	}
	}

	$skip_reporting = DebuggerUtil::constOn('DBG_SKIP_REPORTING') \|\| DebuggerUtil::constOn('DBG_ZEND_PRESENT');

	if ( ($this->_isAjax && !DebuggerUtil::constOn('DBG_SKIP_AJAX')) \|\| !$skip_reporting ) {
	$debug_file = $this->tempFolder . '/debug_' . $this->rowSeparator . '.txt';
	if ( file_exists($debug_file) ) {
	unlink($debug_file);
	}

	$i = 0;
	$fp = fopen($debug_file, 'a');
	$lineCount = count($this->Data);

	while ( $i < $lineCount ) {
	fwrite($fp, $this->prepareHTML($i) . $this->rowSeparator);
	$i++;
	}

	fclose($fp);
	}

	if ( $skip_reporting ) {
	// let debugger write report and then don't output anything
	$this->reportDone = true;
	return '';
	}

	$application =& kApplication::Instance();
	$dbg_path = str_replace(FULL_PATH, '', $this->tempFolder);

	$debugger_params = Array (
	'RowSeparator' => $this->rowSeparator,
	'ErrorsCount' => (int)$this->getProfilerTotal('error_handling'),
	'IsFatalError' => $this->IsFatalError ? 'true' : 'false',
	'SQLCount' => (int)$this->getProfilerTotal('sql'),
	'SQLTime' => isset($this->ProfilerTotals['sql']) ? sprintf('%.5f', $this->ProfilerTotals['sql']) : 0,
	'ScriptTime' => sprintf('%.5f', $this->ProfilerData['script_runtime']['ends'] - $this->ProfilerData['script_runtime']['begins']),
	'ScriptMemory' => DebuggerUtil::formatSize($this->getMemoryUsed($debugger_start)),
	);

	ob_start();
	// the <script .. /script> and hidden div helps browser to break out of script tag or attribute esacped
	// with " or ' in case fatal error (or user-error) occurs inside it in compiled template,
	// otherwise it has no effect
	?>
	<div style="display: none" x='nothing'><script></script></div><html><body></body></html>
	- <script type="text/javascript" src="<?php echo $this->baseURL; ?>/debugger.js?v3"></script>
	<link rel="stylesheet" rev="stylesheet" href="<?php echo $this->baseURL; ?>/debugger.css" type="text/css" media="screen" />
	+ <script type="text/javascript" src="<?php echo $this->baseURL; ?>/debugger.js?v3"></script>

	<script type="text/javascript">
	var $Debugger = new Debugger(<?php echo json_encode($debugger_params); ?>);
	$Debugger.createEnvironment(<?php echo DBG_WINDOW_WIDTH; ?>, <?php echo $this->getWindowWidth(); ?>);

	$Debugger.DOMViewerURL = '<?php echo constant('DBG_DOMVIEWER'); ?>';
	$Debugger.EditorPath = '<?php echo defined('DBG_EDITOR') ? addslashes(DBG_EDITOR) : '' ?>';
	$Debugger.DebugURL = '<?php echo $this->baseURL.'/debugger_responce.php?sid='.$this->rowSeparator.'&path='.urlencode($dbg_path); ?>';
	$Debugger.EventURL = '<?php echo /is_object($application->Factory) &&/ $application->InitDone ? $application->HREF('dummy', '', Array ('pass' => 'm', '__NO_REWRITE__' => 1)) : ''; ?>';
	$Debugger.BasePath = '<?php echo $this->basePath; ?>';
	<?php
	$is_install = defined('IS_INSTALL') && IS_INSTALL;

	if ( $this->IsFatalError \|\| (!$is_install && DBG_RAISE_ON_WARNINGS && $this->WarningCount) ) {
	echo '$Debugger.Toggle();';
	}
	if ( DBG_TOOLBAR_BUTTONS ) {
	echo '$Debugger.AddToolbar("$Debugger");';
	}
	?>
	window.focus();
	</script>
	<?php
	if ( $returnResult ) {
	$ret = ob_get_contents();
	if ( $clean_output_buffer ) {
	ob_end_clean();
	}
	$ret .= $this->getShortReport($this->getMemoryUsed($debugger_start));

	$this->reportDone = true;
	return $ret;
	}
	else {
	if ( !DebuggerUtil::constOn('DBG_HIDE_FULL_REPORT') ) {
	$this->breakOutofBuffering();
	}
	elseif ( $clean_output_buffer ) {
	ob_clean();
	}
	echo $this->getShortReport($this->getMemoryUsed($debugger_start));

	$this->reportDone = true;
	}

	return '';
	}

	function getMemoryUsed($debugger_start)
	{
	if ( !isset($this->ProfilerTotals['error_handling']) ) {
	$memory_used = $debugger_start;
	$this->ProfilerTotalCount['error_handling'] = 0;
	}
	else {
	$memory_used = $debugger_start - $this->ProfilerTotals['error_handling'];
	}

	return $memory_used;
	}

	/**
	* Format's memory usage report by debugger
	*
	* @param int $memory_used
	* @return string
	* @access private
	*/
	private function getShortReport($memory_used)
	{
	if ( DebuggerUtil::constOn('DBG_TOOLBAR_BUTTONS') ) {
	// evenrything is in toolbar - don't duplicate
	return '';
	}
	else {
	// toolbar not visible, then show sql & error count too
	$info = Array (
	'Script Runtime' => 'PROFILE:script_runtime',
	'SQL\'s Runtime' => 'PROFILE_T:sql',
	'-' => 'SEP:-',
	'Notice / Warning' => 'PROFILE_TC:error_handling',
	'SQLs Count' => 'PROFILE_TC:sql',
	);
	}

	$ret = ''; // '<tr><td>Application:</td><td><b>' . DebuggerUtil::formatSize($memory_used) . '</b> (' . $memory_used . ')</td></tr>';

	foreach ($info as $title => $value_key) {
	list ($record_type, $record_data) = explode(':', $value_key, 2);
	switch ( $record_type ) {
	case 'PROFILE': // profiler totals value
	$Data =& $this->ProfilerData[$record_data];
	$profile_time = ($Data['ends'] - $Data['begins']); // in seconds
	$ret .= '<tr><td>' . $title . ':</td><td><b>' . sprintf('%.5f', $profile_time) . ' s</b></td></tr>';
	break;

	case 'PROFILE_TC': // profile totals record count
	$record_cell = '<td>';
	if ( $record_data == 'error_handling' && $this->ProfilerTotalCount[$record_data] > 0 ) {
	$record_cell = '<td class="debug_error">';
	}
	$ret .= '<tr>' . $record_cell . $title . ':</td>' . $record_cell . '<b>' . $this->ProfilerTotalCount[$record_data] . '</b></td></tr>';
	break;

	case 'PROFILE_T': // profile total
	$record_cell = '<td>';
	$total = array_key_exists($record_data, $this->ProfilerTotals) ? $this->ProfilerTotals[$record_data] : 0;
	$ret .= '<tr>' . $record_cell . $title . ':</td>' . $record_cell . '<b>' . sprintf('%.5f', $total) . ' s</b></td></tr>';
	break;

	case 'SEP':
	$ret .= '<tr><td colspan="2" style="height: 1px; background-color: #000000; padding: 0px;"><img src="' . $this->dummyImage . '" height="1" alt=""/></td></tr>';
	break;
	}
	}

	return '<br /><table class="dbg_stats_table"><tr><td style="border-color: #FFFFFF;"><table class="dbg_stats_table" align="left">' . $ret . '</table></td></tr></table>';
	}

	/**
	* User-defined error handler
	*
	* @throws Exception
	* @param int $errno
	* @param string $errstr
	* @param string $errfile
	* @param int $errline
	* @param array $errcontext
	* @return bool
	* @access public
	*/
	public function saveError($errno, $errstr, $errfile = null, $errline = null, $errcontext = Array ())
	{
	$this->ProfilerData['error_handling']['begins'] = memory_get_usage();

	$errorType = $this->getErrorNameByCode($errno);

	if (!$errorType) {
	throw new Exception('Unknown error type [' . $errno . ']');

	return false;
	}
	elseif ( substr($errorType, 0, 5) == 'Fatal' ) {
	$this->IsFatalError = true;
	$this->appendTrace(4);
	}

	if ( DebuggerUtil::constOn('DBG_IGNORE_STRICT_ERRORS') && defined('E_STRICT') && ($errno == E_STRICT) ) {
	return false;
	}

	$this->expandError($errstr, $errfile, $errline);

	$this->Data[] = Array (
	'no' => $errno, 'str' => $errstr, 'file' => $errfile, 'line' => $errline,
	'context' => $errcontext, 'debug_type' => 'error'
	);

	$this->ProfilerData['error_handling']['ends'] = memory_get_usage();
	$this->profilerAddTotal('error_handling', 'error_handling');

	if ($errorType == 'Warning') {
	$this->WarningCount++;
	}

	if ( $this->IsFatalError ) {
	// append debugger report to data in buffer & clean buffer afterwards
	die( $this->breakOutofBuffering(false) . $this->printReport(true) );
	}

	return true;
	}

	/**
	* Adds exception details into debugger but don't cause fatal error
	*
	* @param Exception $exception
	* @return void
	* @access public
	*/
	public function appendException($exception)
	{
	$this->ProfilerData['error_handling']['begins'] = memory_get_usage();

	$this->appendExceptionTrace($exception);

	$errno = $exception->getCode();
	$errstr = $exception->getMessage();
	$errfile = $exception->getFile();
	$errline = $exception->getLine();

	$this->expandError($errstr, $errfile, $errline);

	$this->Data[] = Array (
	'no' => $errno, 'str' => $errstr, 'file' => $errfile, 'line' => $errline,
	'exception_class' => get_class($exception), 'debug_type' => 'exception'
	);

	$this->ProfilerData['error_handling']['ends'] = memory_get_usage();
	$this->profilerAddTotal('error_handling', 'error_handling');
	}

	/**
	* User-defined exception handler
	*
	* @param Exception $exception
	* @return void
	* @access public
	*/
	public function saveException($exception)
	{
	$this->appendException($exception);
	$this->IsFatalError = true;

	// append debugger report to data in buffer & clean buffer afterwards
	die( $this->breakOutofBuffering(false) . $this->printReport(true) );
	}

	/**
	* Transforms short error messages into long ones
	*
	* @param string $errstr
	* @param string $errfile
	* @param int $errline
	* @return void
	* @access private
	*/
	private function expandError(&$errstr, &$errfile, &$errline)
	{
	if ( preg_match('/(.*)#([\d]+)$/', $errstr, $rets) ) {
	// replace short message with long one (due triger_error limitations on message size)
	$long_id = $rets[2];
	$errstr = $this->longErrors[$long_id];
	unset($this->longErrors[$long_id]);
	}

	if ( strpos($errfile, 'eval()\'d code') !== false ) {
	$errstr = '[<b>EVAL</b>, line <b>' . $errline . '</b>]: ' . $errstr;
	$tmpStr = $errfile;
	$pos = strpos($tmpStr, '(');
	$errfile = substr($tmpStr, 0, $pos);
	$pos++;
	$errline = substr($tmpStr, $pos, strpos($tmpStr, ')', $pos) - $pos);
	}
	}

	/**
	* Break buffering in case if fatal error is happened in the middle
	*
	* @param bool $flush
	* @return string
	* @access private
	*/
	private function breakOutofBuffering($flush = true)
	{
	$buffer_content = Array ();
	while ( ob_get_level() ) {
	$buffer_content[] = ob_get_clean();
	}

	$ret = implode('', array_reverse($buffer_content));
	if ( $flush ) {
	echo $ret;
	flush();
	}

	return $ret;
	}

	/**
	* Saves given message to "vb_debug.txt" file in DocumentRoot
	*
	* @param string $msg
	* @return void
	* @access public
	*/
	public function saveToFile($msg)
	{
	$fp = fopen($_SERVER['DOCUMENT_ROOT'] . '/vb_debug.txt', 'a');
	fwrite($fp, $msg . "\n");
	fclose($fp);
	}

	/**
	* Prints given constant values in a table
	*
	* @param mixed $constants
	* @return void
	* @access public
	*/
	public function printConstants($constants)
	{
	if ( !is_array($constants) ) {
	$constants = explode(',', $constants);
	}

	$constant_tpl = '<tr><td>%s</td><td><b>%s</b></td></tr>';
	$ret = '<table class="dbg_flat_table" style="width: ' . $this->getWindowWidth() . 'px;">';

	foreach ($constants as $constant_name) {
	$ret .= sprintf($constant_tpl, $constant_name, constant($constant_name));
	}

	$ret .= '</table>';
	$this->appendHTML($ret);
	}

	/**
	* Attaches debugger to Application
	*
	* @return void
	* @access public
	*/
	public function AttachToApplication()
	{
	if ( !DebuggerUtil::constOn('DBG_HANDLE_ERRORS') ) {
	return;
	}

	if ( class_exists('kApplication') ) {
	// replace application error/exception handler with own
	restore_error_handler();
	restore_exception_handler();

	$this->Application =& kApplication::Instance();
	$this->Application->Debugger =& $this;

	$this->Application->errorHandlers[] = Array (&$this, 'saveError');
	$this->Application->exceptionHandlers[] = Array (&$this, 'saveException');
	}
	else {
	set_error_handler( Array (&$this, 'saveError') );
	set_exception_handler( Array (&$this, 'saveException') );
	}
	}

	/**
	* Returns HTML for tools section
	*
	* @return string
	* @access private
	*/
	private function _getToolsHTML()
	{
	$html = '<table>
	<tr>
	<td>System Tools:</td>
	<td>
	<select id="reset_cache" style="border: 1px solid #000000;">
	<option value=""></option>
	<option value="events[adm][OnResetModRwCache]">Reset mod_rewrite Cache</option>
	<option value="events[adm][OnResetCMSMenuCache]">Reset SMS Menu Cache</option>
	<option value="events[adm][OnResetSections]">Reset Sections Cache</option>
	<option value="events[adm][OnResetConfigsCache]">Reset Configs Cache</option>
	<option value="events[adm][OnRebuildThemes]">Re-build Themes Files</option>
	<option value="events[lang][OnReflectMultiLingualFields]">Re-build Multilanguage Fields</option>
	<option value="events[adm][OnDeleteCompiledTemplates]">Delete Compiled Templates</option>
	</select>
	</td>
	<td>
	<input type="button" class="button" onclick="$Debugger.resetCache(\'reset_cache\');" value="Go"/>
	</td>
	</tr>
	</table>';

	return $html;
	}

	/**
	* Returns HTML for dom viewer section
	*
	* @return string
	* @access private
	*/
	private function _getDomViewerHTML()
	{
	$html = '<table>
	<tr>
	<td>
	<a href="http://www.brainjar.com/dhtml/domviewer/" target="_blank">DomViewer</a>:
	</td>
	<td>
	<input id="dbg_domviewer" type="text" value="window" style="border: 1px solid #000000;"/>
	</td>
	<td>
	<button class="button" onclick="return $Debugger.OpenDOMViewer();">Show</button>
	</td>
	</tr>
	</table>';

	return $html;
	}
	}

	if ( !function_exists('memory_get_usage') ) {
	// PHP 4.x and compiled without --enable-memory-limit option
	function memory_get_usage()
	{
	return -1;
	}
	}

	if ( !DebuggerUtil::constOn('DBG_ZEND_PRESENT') ) {
	$debugger = new Debugger();
	}

	if ( DebuggerUtil::constOn('DBG_USE_SHUTDOWN_FUNC') ) {
	register_shutdown_function(Array (&$debugger, 'printReport'));
	}
	}
	\ No newline at end of file
	Index: branches/5.2.x/core/units/helpers/minifiers/minify_helper.php
	===================================================================
	--- branches/5.2.x/core/units/helpers/minifiers/minify_helper.php (revision 15283)
	+++ branches/5.2.x/core/units/helpers/minifiers/minify_helper.php (revision 15284)
	@@ -1,281 +1,315 @@
	<?php
	/**
	* @version $Id$
	* @package In-Portal
	* @copyright Copyright (C) 1997 - 2010 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 MinifyHelper extends kHelper {

	/**
	* Debug mode mark
	*
	* @var bool
	*/
	var $debugMode = false;

	/**
	* Folder, that contains produced CSS/JS files
	*
	* @var string
	* @access protected
	*/
	protected $resourceFolder = '';

	public function __construct()
	{
	parent::__construct();

	$this->debugMode = $this->Application->isDebugMode(false);
	$this->resourceFolder = WRITEABLE . '/cache';
	}

	/**
	* When used as non-block tag, then compress given files and return url to result
	*
	* @param Array $params
	* @return string
	* @access public
	*/
	public function CompressScriptTag($params)
	{
	// put to queue
	if ( array_key_exists('to', $params) ) {
	$files = $this->Application->GetVar($params['to'], '');
	$this->Application->SetVar($params['to'], $files . '\|' . $params['files']);

	return '';
	}

	if ( array_key_exists('from', $params) ) {
	// get from queue
	$files = $this->Application->GetVar($params['from']);
	}
	else {
	// get from tag
	$files = $params['files'];
	}

	$files = $this->_getTemplatePaths( array_map('trim', explode('\|', $files)) );

	if ( !$files ) {
	trigger_error('No files specified for compression.', E_USER_NOTICE);

	return '';
	}

	$extension = pathinfo($files[0], PATHINFO_EXTENSION);
	$save_as = isset($params['save_as']) ? $params['save_as'] : false;
	$dst_file = $this->resourceFolder . DIRECTORY_SEPARATOR . ($this->debugMode ? 'd' : 'c') . '_';

	if ( $save_as ) {
	$dst_file .= $save_as . ( strpos($save_as, '.') === false ? '.' . $extension : '' );
	}
	else {
	$dst_file .= $this->_getHash($files) . '.' . $extension;
	}

	$was_compressed = file_exists($dst_file);

	if ( !$was_compressed \|\| ($this->debugMode && filemtime($dst_file) < $this->_getMaxFileDate($files)) ) {
	$string = '';
	$path_length = strlen(FULL_PATH) + 1;

	foreach ($files as $file) {
	+ if ( !file_exists($file) ) {
	+ continue;
	+ }
	+
	// add filename before for easier debugging
	if ( $this->debugMode ) {
	$string .= '/* === File: ' . substr($file, $path_length) . ' === */' . "\n";
	$string .= '/* ' . str_repeat('=', strlen(substr($file, $path_length)) + 14) . ' */' . "\n\n";
	}

	// add file content
	$string .= file_get_contents($file) . "\n\n";
	}

	// replace templates base
	if ( isset($params['templates_base']) ) {
	$templates_base = $params['templates_base'];
	}
	else {
	$templates_base = $this->Application->ProcessParsedTag('m', 'TemplatesBase', Array ());
	}

	$templates_base = preg_replace('/^' . preg_quote($this->Application->BaseURL(), '/') . '/', BASE_PATH . '/', $templates_base);
	$string = str_replace('@templates_base@', rtrim($templates_base, '/'), $string);

	if ( !$this->debugMode ) {
	// don't compress merged js/css file in debug mode to allow js/css debugging
	$this->compressString($string, $extension);
	}

	// save compressed file
	file_put_contents($dst_file, $string);
	}

	$file_helper = $this->Application->recallObject('FileHelper');
	/* @var $file_helper FileHelper */

	return $file_helper->pathToUrl($dst_file) . '?ts=' . adodb_date('Y-m-d_H:i:s', filemtime($dst_file));
	}

	/**
	* Returns maximal modification date across given files
	*
	* @param Array $files
	* @return int
	* @access protected
	*/
	protected function _getMaxFileDate($files)
	{
	$ret = 0;

	foreach ($files as $file) {
	- $ret = max($ret, filemtime($file));
	+ if ( file_exists($file) ) {
	+ $ret = max($ret, filemtime($file));
	+ }
	}

	return $ret;
	}

	/**
	* Returns hash string based on given files
	*
	* @param Array $files
	* @return int
	* @access protected
	*/
	protected function _getHash($files)
	{
	$hash = $files;

	if ($this->Application->isAdmin) {
	array_unshift($hash, 'A:1');
	}
	else {
	array_unshift($hash, 'A:0;T:' . $this->Application->GetVar('m_theme'));
	}

	return crc32( implode('\|', $hash) );
	}

	/**
	* Deletes compression info file
	*
	* @todo also delete all listed there files
	* @access public
	*/
	public function delete()
	{
	$iterator = new DirectoryIterator($this->resourceFolder);
	/* @var $file_info DirectoryIterator */

	foreach ($iterator as $file_info) {
	if ( !$file_info->isDir() && preg_match('/^(c\|d)_.*.(css\|js)$/', $file_info->getFilename()) ) {
	unlink( $file_info->getPathname() );
	}
	}
	}

	/**
	* Compress $string based on $extension
	*
	* @param string $string
	* @param string $extension
	* @return void
	* @access protected
	*/
	public function compressString(&$string, $extension)
	{
	$vars = kUtil::getConfigVars();

	if ( !array_key_exists('CompressionEngine', $vars) ) {
	// compression method not specified - use none
	return;
	}

	switch ( $vars['CompressionEngine'] ) {
	case 'yui':
	$this->compressViaJava($string, $extension);
	break;

	case 'php':
	$this->compressViaPHP($string, $extension);
	break;
	}
	}

	/**
	* Compresses string using YUI compressor (uses Java)
	*
	* @param string $string
	* @param string $extension
	* @return void
	* @access protected
	*/
	protected function compressViaJava(&$string, $extension)
	{
	$tmp_file = tempnam('/tmp', 'to_compress_');
	file_put_contents($tmp_file, $string);

	$command = 'java -jar ' . dirname(__FILE__) . DIRECTORY_SEPARATOR . 'yuicompressor-2.4.2.jar --type ' . $extension . ' --charset utf-8 ' . $tmp_file;
	$string = shell_exec($command);

	unlink($tmp_file);
	}

	/**
	* Compresses string using PHP compressor
	*
	* @param string $string
	* @param string $extension
	* @return void
	* @access protected
	*/
	protected function compressViaPHP(&$string, $extension)
	{
	$minifier = $this->Application->makeClass($extension == 'js' ? 'JsMinifyHelper' : 'CssMinifyHelper');
	/* @var $minifier JsMinifyHelper */

	$string = $minifier->minify($string);
	}

	/**
	* Get full paths on disk for each of given templates
	*
	* @param Array $templates
	* @return Array
	* @access protected
	*/
	protected function _getTemplatePaths($templates)
	{
	$ret = Array ();
	$reg_exp = '/^' . preg_quote($this->Application->BaseURL(), '/') . '(.*)/';

	foreach ($templates as $template) {
	if ( !$template ) {
	continue;
	}

	if ( preg_match($reg_exp, $template, $regs) ) {
	// full url (from current domain) to a file
	- $path = FULL_PATH . '/' . $regs[1];
	+ $ret[] = FULL_PATH . '/' . $regs[1];
	+ }
	+ elseif ( strpos($template, '{module_path}') !== false ) {
	+ $ret = array_merge($ret, $this->_moduleInclude($template));
	}
	else {
	- list ($path, $module_filename) = $this->Application->TemplatesCache->GetTemplatePaths($template);
	- $path .= DIRECTORY_SEPARATOR . $module_filename;
	+ $ret[] = $this->Application->TemplatesCache->GetRealFilename($template);
	+ }
	+ }
	+
	+ return $ret;
	+ }
	+
	+ /**
	+ *
	+ * @param string $template
	+ * @return Array
	+ * @access protected
	+ */
	+ protected function _moduleInclude($template)
	+ {
	+ $ret = $included = Array ();
	+
	+ foreach ($this->Application->ModuleInfo as $module_name => $module_data) {
	+ if ( $module_name == 'In-Portal' ) {
	+ continue;
	+ }
	+
	+ $module_prefix = $this->Application->isAdmin ? mb_strtolower($module_name) . '/' : $module_data['TemplatePath'];
	+
	+ if ( in_array($module_prefix, $included) ) {
	+ continue;
	}

	- $ret[] = $path;
	+ $ret[] = $this->Application->TemplatesCache->GetRealFilename(str_replace('{module_path}', $module_prefix, $template));
	+ $included[] = $module_prefix;
	}

	return $ret;
	}
	}
	\ No newline at end of file
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_resend.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_resend.gif
	___________________________________________________________________
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_paste_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_paste_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1.2.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_clone_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_clone_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_decline_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_decline_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_decline_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_decline_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_refresh_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_refresh_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_refresh_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_refresh_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_reset_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_reset_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_to_user_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_to_user_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_preview_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_preview_f3.gif
	___________________________________________________________________
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_preview_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_preview_f2.gif
	___________________________________________________________________
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_reset.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_reset.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_edit_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_edit_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_edit_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_edit_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_upcat_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_upcat_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_frontend_mail_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_frontend_mail_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_rebuild_cache.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_rebuild_cache.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1.2.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_homecat_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_homecat_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_homecat_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_homecat_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_export.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_export.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1.4.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_cut.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_cut.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1.2.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_usertogroup_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_usertogroup_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_usertogroup_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_usertogroup_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_edit.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_edit.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_reset_alt_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_reset_alt_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_delete_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_delete_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_cancel_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_cancel_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_cancel_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_cancel_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_delete_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_delete_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_decline.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_decline.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_frontend_mail_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_frontend_mail_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_move_up.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_move_up.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_editcat.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_editcat.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1.2.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_edit.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_edit.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_next_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_next_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_edit_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_edit_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_select_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_select_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_select_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_select_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_archive.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_archive.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_refresh.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_refresh.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_deny_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_deny_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_view_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_view_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_print_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_print_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_history.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_history.gif
	___________________________________________________________________
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_prev_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_prev_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_deny.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_deny.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_copy_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_copy_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1.2.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_select_user_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_select_user_f2.gif
	___________________________________________________________________
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_select_user_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_select_user_f3.gif
	___________________________________________________________________
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_new_item_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_new_item_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_a_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_a_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_export_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_export_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1.4.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_export_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_export_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1.4.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_usertogroup2_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_usertogroup2_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_select_user.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_select_user.gif
	___________________________________________________________________
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_to_base.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_to_base.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_print_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_print_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_e-mail.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_e-mail.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reply.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_reply.gif
	___________________________________________________________________
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_move_up_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_move_up_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_move_up_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_move_up_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_editcat_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_editcat_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1.2.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_editcat_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_editcat_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1.2.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_copy.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_copy.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1.2.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_setprimary.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_setprimary.gif
	___________________________________________________________________
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_paste.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_paste.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1.2.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_clone.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_clone.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_clear_selected.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_clear_selected.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1.2.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_usertogroup2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_usertogroup2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_delete.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_delete.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_cancel.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_cancel.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_process_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_process_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_process_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_process_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_select.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_select.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_reset_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_reset_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_rebuild_cache_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_rebuild_cache_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1.2.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_history_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_history_f2.gif
	___________________________________________________________________
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_history_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_history_f3.gif
	___________________________________________________________________
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_a.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_a.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_approve_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_approve_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_approve_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_approve_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reply_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_reply_f2.gif
	___________________________________________________________________
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_e-mail_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_e-mail_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_e-mail_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_e-mail_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_to_user.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_to_user.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_next.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_next.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_move_down_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_move_down_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_upcat.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_upcat.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_frontend_mail.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_frontend_mail.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_new_cat.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_new_cat.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_tools.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_tools.gif
	___________________________________________________________________
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_archive_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_archive_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_archive_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_archive_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_print.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_print.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_search.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_search.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_homecat.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_homecat.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_reset_alt_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_reset_alt_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_b.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_b.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_to_base_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_to_base_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_reset_alt.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_reset_alt.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_resend_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_resend_f3.gif
	___________________________________________________________________
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_resend_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_resend_f2.gif
	___________________________________________________________________
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_process.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_process.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reply_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_reply_f3.gif
	___________________________________________________________________
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_next_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_next_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_edit_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_edit_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_tools_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_tools_f2.gif
	___________________________________________________________________
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_deny_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_deny_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_move_down_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_move_down_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_view_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_view_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_preview.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_preview.gif
	___________________________________________________________________
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_prev_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_prev_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_view.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_view.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_copy_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_copy_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1.2.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_approve.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_approve.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_prev.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_prev.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_cut_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_cut_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1.2.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_cut_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_cut_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1.2.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_import_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_import_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1.4.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_import_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_import_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1.4.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_move_down.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_move_down.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_new_item_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_new_item_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_b_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_b_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_to_base_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_to_base_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_import.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_import.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1.4.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_usertogroup2_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_usertogroup2_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_paste_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_paste_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1.2.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_clone_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_clone_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_tools_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_tools_f3.gif
	___________________________________________________________________
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_setprimary_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_setprimary_f2.gif
	___________________________________________________________________
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_setprimary_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_setprimary_f3.gif
	___________________________________________________________________
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_query_database_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_query_database_f3.gif
	___________________________________________________________________
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_query_database_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_query_database_f2.gif
	___________________________________________________________________
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_new_cat_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_new_cat_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_new_cat_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_new_cat_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_clear_selected_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_clear_selected_f3.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1.2.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_clear_selected_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_clear_selected_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1.2.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_usertogroup.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_usertogroup.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_new_item.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_new_item.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.1
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_upcat_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_upcat_f2.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_query_database.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/tool_query_database.gif
	___________________________________________________________________
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/toolbar-sprite.png
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/toolbar-sprite.png
	___________________________________________________________________
	Added: svn:mime-type
	## -0,0 +1 ##
	+application/octet-stream
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/img/toolbar/toolbar-sprite.css
	===================================================================
	--- branches/5.2.x/core/admin_templates/img/toolbar/toolbar-sprite.css (nonexistent)
	+++ branches/5.2.x/core/admin_templates/img/toolbar/toolbar-sprite.css (revision 15284)
	@@ -0,0 +1,136 @@
	+.core-toolbar-sprite {
	+ background: url("@templates_base@/img/toolbar/toolbar-sprite.png") repeat-x scroll 0 0 transparent;
	+ border: 0 none;
	+ cursor: pointer;
	+ padding: 0;
	+}
	+#core-tb-approve { background-position: -0px -0px; }
	+#core-tb-approve.hover { background-position: -32px -0px; }
	+#core-tb-approve.disabled { background-position: -64px -0px; }
	+#core-tb-archive { background-position: -0px -32px; }
	+#core-tb-archive.hover { background-position: -32px -32px; }
	+#core-tb-archive.disabled { background-position: -64px -32px; }
	+#core-tb-cancel { background-position: -0px -64px; }
	+#core-tb-cancel.hover { background-position: -32px -64px; }
	+#core-tb-cancel.disabled { background-position: -64px -64px; }
	+#core-tb-clear_selected { background-position: -0px -96px; }
	+#core-tb-clear_selected.hover { background-position: -32px -96px; }
	+#core-tb-clear_selected.disabled { background-position: -64px -96px; }
	+#core-tb-clone, #core-tb-copy { background-position: -0px -128px; }
	+#core-tb-clone.hover, #core-tb-copy.hover { background-position: -32px -128px; }
	+#core-tb-clone.disabled, #core-tb-copy.disabled { background-position: -64px -128px; }
	+#core-tb-cut { background-position: -0px -160px; }
	+#core-tb-cut.hover { background-position: -32px -160px; }
	+#core-tb-cut.disabled { background-position: -64px -160px; }
	+#core-tb-decline, #core-tb-deny { background-position: -0px -192px; }
	+#core-tb-decline.hover, #core-tb-deny.hover { background-position: -32px -192px; }
	+#core-tb-decline.disabled, #core-tb-deny.disabled { background-position: -64px -192px; }
	+#core-tb-delete { background-position: -0px -224px; }
	+#core-tb-delete.hover { background-position: -32px -224px; }
	+#core-tb-delete.disabled { background-position: -64px -224px; }
	+#core-tb-e-mail { background-position: -0px -256px; }
	+#core-tb-e-mail.hover { background-position: -32px -256px; }
	+#core-tb-e-mail.disabled { background-position: -64px -256px; }
	+#core-tb-edit { background-position: -0px -288px; }
	+#core-tb-edit.hover { background-position: -32px -288px; }
	+#core-tb-edit.disabled { background-position: -64px -288px; }
	+#core-tb-editcat { background-position: -0px -320px; }
	+#core-tb-editcat.hover { background-position: -32px -320px; }
	+#core-tb-editcat.disabled { background-position: -64px -320px; }
	+#core-tb-export { background-position: -0px -352px; }
	+#core-tb-export.hover { background-position: -32px -352px; }
	+#core-tb-export.disabled { background-position: -64px -352px; }
	+#core-tb-frontend_mail { background-position: -0px -384px; }
	+#core-tb-frontend_mail.hover { background-position: -32px -384px; }
	+#core-tb-frontend_mail.disabled { background-position: -64px -384px; }
	+#core-tb-history { background-position: -0px -416px; }
	+#core-tb-history.hover { background-position: -32px -416px; }
	+#core-tb-history.disabled { background-position: -64px -416px; }
	+#core-tb-homecat { background-position: -0px -448px; }
	+#core-tb-homecat.hover { background-position: -32px -448px; }
	+#core-tb-homecat.disabled { background-position: -64px -448px; }
	+#core-tb-import { background-position: -0px -480px; }
	+#core-tb-import.hover { background-position: -32px -480px; }
	+#core-tb-import.disabled { background-position: -64px -480px; }
	+#core-tb-move_down { background-position: -0px -512px; }
	+#core-tb-move_down.hover { background-position: -32px -512px; }
	+#core-tb-move_down.disabled { background-position: -64px -512px; }
	+#core-tb-move_up { background-position: -0px -544px; }
	+#core-tb-move_up.hover { background-position: -32px -544px; }
	+#core-tb-move_up.disabled { background-position: -64px -544px; }
	+#core-tb-new_cat { background-position: -0px -576px; }
	+#core-tb-new_cat.hover { background-position: -32px -576px; }
	+#core-tb-new_cat.disabled { background-position: -64px -576px; }
	+#core-tb-new_item { background-position: -0px -608px; }
	+#core-tb-new_item.hover { background-position: -32px -608px; }
	+#core-tb-new_item.disabled { background-position: -64px -608px; }
	+#core-tb-next { background-position: -0px -640px; }
	+#core-tb-next.hover { background-position: -32px -640px; }
	+#core-tb-next.disabled { background-position: -64px -640px; }
	+#core-tb-paste { background-position: -0px -672px; }
	+#core-tb-paste.hover { background-position: -32px -672px; }
	+#core-tb-paste.disabled { background-position: -64px -672px; }
	+#core-tb-prev { background-position: -0px -704px; }
	+#core-tb-prev.hover { background-position: -32px -704px; }
	+#core-tb-prev.disabled { background-position: -64px -704px; }
	+#core-tb-preview { background-position: -0px -736px; }
	+#core-tb-preview.hover { background-position: -32px -736px; }
	+#core-tb-preview.disabled { background-position: -64px -736px; }
	+#core-tb-print { background-position: -0px -768px; }
	+#core-tb-print.hover { background-position: -32px -768px; }
	+#core-tb-print.disabled { background-position: -64px -768px; }
	+#core-tb-process, #core-tb-reply { background-position: -0px -800px; }
	+#core-tb-process.hover, #core-tb-reply.hover { background-position: -32px -800px; }
	+#core-tb-process.disabled, #core-tb-reply.disabled { background-position: -64px -800px; }
	+#core-tb-query_database { background-position: -0px -832px; }
	+#core-tb-query_database.hover { background-position: -32px -832px; }
	+#core-tb-query_database.disabled { background-position: -64px -832px; }
	+#core-tb-rebuild_cache { background-position: -0px -864px; }
	+#core-tb-rebuild_cache.hover { background-position: -32px -864px; }
	+#core-tb-refresh { background-position: -0px -896px; }
	+#core-tb-refresh.hover { background-position: -32px -896px; }
	+#core-tb-refresh.disabled { background-position: -64px -896px; }
	+#core-tb-resend, #core-tb-usertogroup { background-position: -0px -928px; }
	+#core-tb-resend.hover, #core-tb-usertogroup.hover { background-position: -32px -928px; }
	+#core-tb-resend.disabled, #core-tb-usertogroup.disabled { background-position: -64px -928px; }
	+#core-tb-reset_edit { background-position: -0px -960px; }
	+#core-tb-reset_edit.hover { background-position: -32px -960px; }
	+#core-tb-reset_edit.disabled { background-position: -64px -960px; }
	+#core-tb-reset { background-position: -0px -992px; }
	+#core-tb-reset.hover { background-position: -32px -992px; }
	+#core-tb-reset.disabled { background-position: -64px -992px; }
	+#core-tb-reset_to_base { background-position: -0px -1024px; }
	+#core-tb-reset_to_base.hover { background-position: -32px -1024px; }
	+#core-tb-reset_to_base.disabled { background-position: -64px -1024px; }
	+#core-tb-reset_to_user { background-position: -0px -1056px; }
	+#core-tb-reset_to_user.hover { background-position: -32px -1056px; }
	+#core-tb-search { background-position: -0px -1088px; }
	+#core-tb-search.hover { background-position: -32px -1088px; }
	+#core-tb-search.disabled { background-position: -64px -1088px; }
	+#core-tb-search_reset_alt { background-position: -0px -1120px; }
	+#core-tb-search_reset_alt.hover { background-position: -32px -1120px; }
	+#core-tb-search_reset_alt.disabled { background-position: -64px -1120px; }
	+#core-tb-search_reset { background-position: -0px -1152px; }
	+#core-tb-search_reset.hover { background-position: -32px -1152px; }
	+#core-tb-search_reset.disabled { background-position: -64px -1152px; }
	+#core-tb-select { background-position: -0px -1184px; }
	+#core-tb-select.hover { background-position: -32px -1184px; }
	+#core-tb-select.disabled { background-position: -64px -1184px; }
	+#core-tb-select_user { background-position: -0px -1216px; }
	+#core-tb-select_user.hover { background-position: -32px -1216px; }
	+#core-tb-select_user.disabled { background-position: -64px -1216px; }
	+#core-tb-setprimary { background-position: -0px -1248px; }
	+#core-tb-setprimary.hover { background-position: -32px -1248px; }
	+#core-tb-setprimary.disabled { background-position: -64px -1248px; }
	+#core-tb-tools { background-position: -0px -1280px; }
	+#core-tb-tools.hover { background-position: -32px -1280px; }
	+#core-tb-tools.disabled { background-position: -64px -1280px; }
	+#core-tb-upcat { background-position: -0px -1312px; }
	+#core-tb-upcat.hover { background-position: -32px -1312px; }
	+#core-tb-upcat.disabled { background-position: -64px -1312px; }
	+#core-tb-usertogroup2 { background-position: -0px -1344px; }
	+#core-tb-usertogroup2.hover { background-position: -32px -1344px; }
	+#core-tb-usertogroup2.disabled { background-position: -64px -1344px; }
	+#core-tb-view { background-position: -0px -1376px; }
	+#core-tb-view.hover { background-position: -32px -1376px; }
	+#core-tb-view.disabled { background-position: -64px -1376px; }
	\ No newline at end of file

	Property changes on: branches/5.2.x/core/admin_templates/img/toolbar/toolbar-sprite.css
	___________________________________________________________________
	Added: svn:eol-style
	## -0,0 +1 ##
	+LF
	\ No newline at end of property
	Index: branches/5.2.x/core/admin_templates/js/toolbar.js
	===================================================================
	--- branches/5.2.x/core/admin_templates/js/toolbar.js (revision 15283)
	+++ branches/5.2.x/core/admin_templates/js/toolbar.js (revision 15284)
	@@ -1,400 +1,404 @@
	function ToolBarButton(title, alt, onclick, $hidden, prefix)
	{
	this.Title = title \|\| '';
	this.TranslateLink = false;
	this.CheckTitleModule();
	this.Alt = RemoveTranslationLink(alt \|\| '');
	if (this.Alt != alt) {
	this.TranslateLink = alt \|\| '';
	this.TranslateLink = this.TranslateLink.replace(/<a href="(.?)".>(.*?)<\/a>/g, '$1');
	}

	if (this.Alt.match(/(.)::(.)/)) {
	this.Alt = RegExp.$1;
	this.Label = RegExp.$2
	}
	else {
	this.Label = this.Alt;
	}


	if ( $.isFunction(onclick) ) {
	this.onClick = onclick;
	}
	else {
	this.onClick = function() {
	this.runFunction(this.Title);
	}
	}

	this.imgObject = null;
	this.Enabled = true;
	this.Hidden = $hidden ? true : false;
	this.ToolBar = null;
	this.Prefix = prefix ? prefix : '';
	this.Separator = false;

	// all buttons are read-only until page is fully loaded!
	this.ReadOnly = true;
	}

	ToolBarButton.prototype.CheckTitleModule = function()
	{
	if (this.Title.match(/([^:]+):(.*)$/)) {
	// has module set directly
	this.Title = RegExp.$2;
	this.Module = RegExp.$1.toLowerCase();

	if (this.Module == 'in-portal') {
	this.Module = 'core';
	}
	}
	else {
	// use default module
	this.Module = 'core';
	}
	}

	-ToolBarButton.prototype.IconsPath = function()
	+ToolBarButton.prototype.IconsPath = function($module_path)
	{
	- var $module_path = this.Module;
	+ if ( $module_path === undefined ) {
	+ $module_path = this.Module;
	+ }

	- if (this.Module != 'core') {
	+ if ( $module_path != 'core' ) {
	$module_path = 'modules/' + $module_path;
	}

	return this.ToolBar.IconPath.replace('#MODULE#', $module_path) + 'toolbar/';
	}

	ToolBarButton.prototype.GetHTML = function() {
	- var add_style = this.ToolBar.ButtonStyle ? 'style="'+this.ToolBar.ButtonStyle+'"' : '';
	- var o = '<div class="toolbar-button" id="'+this.GetToolID('div')+'" '+add_style+'>'
	- o += '<img id="' + this.GetToolID() + '" width="'+this.ToolBar.IconSize.w+'" height="'+this.ToolBar.IconSize.h+'" src="' + this.IconsPath() + this.ToolBar.IconPrefix + this.Title + '.gif" title="' + this.Alt + ' ">';
	- if (this.ToolBar.UseLabels) o += '<br/>'+this.Label;
	+ var add_style = this.ToolBar.ButtonStyle ? 'style="' + this.ToolBar.ButtonStyle + '"' : '',
	+ o = '<div class="toolbar-button" id="' + this.GetToolID('div') + '" ' + add_style + '>';
	+
	+ o += '<img class="' + this.Module + '-toolbar-sprite" id="' + this.GetToolID() + '" width="' + this.ToolBar.IconSize.w + '" height="' + this.ToolBar.IconSize.h + '" src="' + this.IconsPath('core') + '../spacer.gif" title="' + this.Alt + ' ">';
	+
	+ if ( this.ToolBar.UseLabels ) {
	+ o += '<br/>' + this.Label;
	+ }
	+
	o += '</div>'
	+
	return o;
	}

	ToolBarButton.prototype.GetToolID = function(item) {
	- if (!item) item = 'tool'
	- return this.Prefix == '' ? item+'_' + this.Title : item+'_['+this.Prefix+'][' + this.Title+']'
	+ if ( item === undefined ) {
	+ item = 'tool';
	+ }
	+
	+ if ( this.Prefix == '' ) {
	+ return item == 'tool' ? this.Module + '-tb-' + this.Title : item + '_' + this.Title;
	+ }
	+
	+ return item + '_[' + this.Prefix + '][' + this.Title + ']'
	}

	ToolBarButton.prototype.Init = function() {

	img = document.getElementById(this.GetToolID());
	this.imgObject = img;
	this.Container = document.getElementById(this.GetToolID('div')) ? document.getElementById(this.GetToolID('div')) : false;
	this.Container.btn = this;
	img.btn = this;

	- this.MouseOverImg = new Image();
	- this.MouseOverImg.src = this.IconsPath() + this.ToolBar.IconPrefix + this.Title + '_f2.gif';
	- this.MouseOutImg = new Image();
	- this.MouseOutImg.src = this.IconsPath() + this.ToolBar.IconPrefix + this.Title + '.gif';
	-
	this.SetOnMouseOver();
	this.SetOnMouseOut();
	this.SetOnClick();
	this.SetOnRightClick()
	if (this.Hidden) this.Hide();
	}

	ToolBarButton.prototype.EditTitle = function() {
	if (this.TranslateLink !== false && !this.ReadOnly) {
	var $links = this.TranslateLink;

	$links = $links.split('::');
	var $i = 0;
	while ($i < $links.length) {
	var $link = $links[$i];
	if ($link.match(/(javascript:\|http:\/\/)(.*)/)) {
	var $link_type = RegExp.$1;
	$link = RegExp.$2.replace(/&#[0]{0,1}39;/g, '"');
	if ($link_type == 'javascript:') {
	eval($link);
	}
	else {
	window.location.href = 'http://' + $link;
	}

	// edit one phrase at a time
	break;
	}
	$i++;
	}

	return false;
	}

	return true;
	}

	ToolBarButton.prototype.SetOnMouseOver = function() {
	this.Container.onmouseover = function() {
	- this.btn.imgObject.src = this.btn.MouseOverImg.src;
	+ $(this.btn.imgObject).addClass('hover');
	this.className = 'toolbar-button-over';
	};
	}

	ToolBarButton.prototype.SetOnMouseOut = function() {
	this.Container.onmouseout = function() {
	- this.btn.imgObject.src = this.btn.MouseOutImg.src;
	+ $(this.btn.imgObject).removeClass('hover');
	this.className = 'toolbar-button';
	};
	}

	ToolBarButton.prototype.runFunction = function($name) {
	if ( window[$name] !== undefined && $.isFunction( window[$name] ) ) {
	window[$name]();
	}
	}

	ToolBarButton.prototype.SetOnClick = function() {
	// we have SetOnMouseOut for this ???
	/*this.Container.onmouseout = function() {
	this.btn.imgObject.src = this.btn.IconsPath() + this.btn.ToolBar.IconPrefix + this.btn.Title + '.gif';
	};*/

	this.Container.inClick = false;
	if (typeof(this.onClick) != 'function') {
	this.Container.onclick = function() {
	if (this.inClick \|\| this.btn.ReadOnly) return;
	this.inClick = true;

	this.runFunction(this.btn.Title);

	this.inClick = false;
	}
	}
	else {
	this.Container.onclick = function() {
	if (this.inClick \|\| this.btn.ReadOnly) return;
	this.inClick = true;
	this.btn.onClick();
	this.inClick = false;
	}
	}

	// the following lines are correct, as long as mozilla understands 'pointer', but IE 'hand',
	// do not change the order of these lines!
	if (is.ie6up \|\| is.gecko) {
	this.Container.style.cursor = 'pointer';
	}
	else {
	// somehow set cursor hand for IE 5/ 5.5
	// this.imgObject.style = 'cursor: hand';
	}
	}

	ToolBarButton.prototype.SetOnRightClick = function() {
	this.Container.oncontextmenu = function() {
	return this.btn.EditTitle();
	}
	}


	ToolBarButton.prototype.Disable = function() {
	if ( !this.Enabled ) return;

	- if (typeof(this.DisabledImg) == 'undefined') {
	- this.DisabledImg = new Image();
	- this.DisabledImg.src = this.IconsPath() + this.ToolBar.IconPrefix + this.Title + '_f3.gif';
	- }
	- this.imgObject.src = this.DisabledImg.src;
	+ $(this.imgObject).addClass('disabled');
	this.Container.onmouseover = null;
	this.Container.onmouseout = null;
	this.Container.onclick = null;
	this.Container.style.cursor = 'default';
	this.Enabled = false;
	this.Container.className = 'toolbar-button-disabled'
	}

	ToolBarButton.prototype.Enable = function() {
	if (this.Enabled) return;
	- this.imgObject.src = this.MouseOutImg.src;
	+ $(this.imgObject).removeClass('hover disabled');
	this.SetOnMouseOver();
	this.SetOnMouseOut();
	this.SetOnClick();
	this.Enabled = true;
	this.Container.className = 'toolbar-button'
	}

	ToolBarButton.prototype.Hide = function() {
	this.Container.style.display = 'none';
	this.Hidden = true;
	}

	ToolBarButton.prototype.Show = function() {
	this.Container.style.display = '';
	this.Hidden = false;
	}

	/* ----------- */

	function ToolBarSeparator(title, $hidden) //extends ToolBarButton
	{
	this.Title = title;
	this.Hidden = $hidden ? true : false;
	this.Separator = true;
	}
	ToolBarSeparator.prototype = new ToolBarButton;

	ToolBarSeparator.prototype.GetHTML = function() {
	- var add_style = this.ToolBar.ButtonStyle ? 'style="'+this.ToolBar.ButtonStyle+'"' : '';
	+ var add_style = this.ToolBar.ButtonStyle ? 'style="' + this.ToolBar.ButtonStyle + '"' : '';
	var padding = this.ToolBar.UseLabels ? '12px' : '2px'
	- return '<div id="'+this.GetToolID('div')+'" class="toolbar-button" style="padding-top: '+padding+'; height: 32px;" '+add_style+'><img id="' + this.GetToolID() + '" src="' + this.IconsPath() + 'tool_divider.gif"></div>';

	- var add_style = this.ToolBar.ButtonStyle ? 'style="'+this.ToolBar.ButtonStyle+'"' : '';
	- return '<div id="'+this.GetToolID('div')+'" class="toolbar-button" style="border: 1px solid black; height: 100%;" '+add_style+'><img id="' + this.GetToolID() + '" src="' + this.IconsPath() + 'tool_divider.gif"></div>';
	+ return '<div id="' + this.GetToolID('div') + '" class="toolbar-button" style="padding-top: ' + padding + '; height: 32px;" ' + add_style + '><img id="' + this.GetToolID() + '" src="' + this.IconsPath() + 'tool_divider.gif"></div>';
	}

	ToolBarSeparator.prototype.Init = function() {
	- img = document.getElementById(this.ToolBar.IconPrefix + this.Title);
	+ img = document.getElementById(this.Module + '-tb-' + this.Title);
	this.Container = document.getElementById(this.GetToolID('div')) ? document.getElementById(this.GetToolID('div')) : false;
	this.imgObject = img;
	img.btn = this;

	if (this.Hidden) {
	this.Hide();
	}
	}

	ToolBarSeparator.prototype.Enable = function() { }
	ToolBarSeparator.prototype.Disable = function() { }

	/* ----------- */

	function ToolBarMarkup(title, html) //extends ToolBarButton
	{
	this.Title = title;
	this.HTML = html;
	}

	ToolBarMarkup.prototype = new ToolBarButton;

	ToolBarMarkup.prototype.GetHTML = function() {
	return this.HTML;
	}

	ToolBarMarkup.prototype.Init = function() { }
	ToolBarMarkup.prototype.Enable = function() { }
	ToolBarMarkup.prototype.Disable = function() { }

	/* ----------- */

	function ToolBar(icon_prefix, $module, $image_path)
	{
	this.Module = $module ? $module : 'core';
	this.IconPrefix = icon_prefix ? icon_prefix : 'tool_';
	this.IconSize = {w:32,h:32};
	this.Buttons = {};
	this.UseLabels = typeof($use_toolbarlabels) != 'undefined' ? $use_toolbarlabels : false;

	if ( $image_path !== undefined ) {
	this.IconPath = $image_path;
	}
	else if ( typeof(img_path) != 'undefined' ) {
	this.IconPath = img_path;
	}
	else {
	this.IconPath = '';
	// alert('error: toolbar image path not set');
	}
	}

	ToolBar.prototype.AddButton = function(a_button)
	{
	if ($visible_toolbar_buttons === true \|\| in_array(a_button.Title, $visible_toolbar_buttons) \|\| a_button.Separator) {
	a_button.ToolBar = this;
	this.Buttons[a_button.Title] = a_button;
	}
	}

	ToolBar.prototype._removeSeparators = function()
	{
	// TODO: find a way to cut first and last separators from non-indexed array, like $new_buttons.
	var $separator = false;
	var $new_buttons = {};

	for (var $button_title in this.Buttons) {
	if ($separator && this.Buttons[$button_title].Separator) {
	continue;
	}

	$separator = this.Buttons[$button_title].Separator;
	$new_buttons[$button_title] = this.Buttons[$button_title];
	}

	this.Buttons = $new_buttons;
	}

	ToolBar.prototype.Render = function($container)
	{
	// remove duplicate separators or separators at the end of button list
	this._removeSeparators();

	if ($container) {
	var tmp = '';
	for (var i in this.Buttons) {
	btn = this.Buttons[i];
	tmp += btn.GetHTML();
	}
	$container.innerHTML = tmp; // container will contain only buttons

	// init all buttons after because objects are not yet created directly after assigning to innerHTML
	for (var i in this.Buttons) {
	btn = this.Buttons[i];
	btn.Init();
	}
	}
	else {
	for (var i in this.Buttons) {
	btn = this.Buttons[i];
	document.write( btn.GetHTML() );
	btn.Init();
	}
	}

	var $me = this;

	$(document).ready(
	function () {
	for (var $button_name in $me.Buttons) {
	$me.Buttons[$button_name].ReadOnly = false;
	}
	}
	);
	}

	ToolBar.prototype.EnableButton = function(button_id) {
	if(this.ButtonExists(button_id)) this.Buttons[button_id].Enable();
	}

	ToolBar.prototype.DisableButton = function(button_id) {
	if(this.ButtonExists(button_id)) this.Buttons[button_id].Disable();
	}

	ToolBar.prototype.HideButton = function(button_id) {
	if(this.ButtonExists(button_id)) this.Buttons[button_id].Hide();
	}

	ToolBar.prototype.ShowButton = function(button_id) {
	if(this.ButtonExists(button_id)) this.Buttons[button_id].Show();
	}

	ToolBar.prototype.SetEnabled = function(button_id, $enabled) {
	var $ret = $enabled ? this.EnableButton(button_id) : this.DisableButton(button_id);
	}

	ToolBar.prototype.SetVisible = function(button_id, $visible) {
	var $ret = $visible ? this.ShowButton(button_id) : this.HideButton(button_id);
	}

	ToolBar.prototype.GetButtonImage = function(button_id) {
	if( this.ButtonExists(button_id) ) return this.Buttons[button_id].imgObject;
	}

	ToolBar.prototype.ButtonExists = function(button_id) {
	return typeof(this.Buttons[button_id]) == 'object';
	}
	Index: branches/5.2.x/core/admin_templates/incs/header.tpl
	===================================================================
	--- branches/5.2.x/core/admin_templates/incs/header.tpl (revision 15283)
	+++ branches/5.2.x/core/admin_templates/incs/header.tpl (revision 15284)
	@@ -1,121 +1,122 @@
	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
	<inp2:m_CheckSSL mode="required" condition="Require_AdminSSL" />
	<inp2:m_CheckSSL/>
	<inp2:m_DefaultParam body_properties=""/>
	<html>
	<head>
	<title><inp2:m_GetConfig var="Site_Name"/> - <inp2:m_Phrase label="la_AdministrativeConsole"/></title>

	<meta http-equiv="content-type" content="text/html; charset=<inp2:lang_GetCharset/>"/>
	<meta name="keywords" content="..."/>
	<meta name="description" content="..."/>
	<meta name="robots" content="all"/>
	<meta name="copyright" content="In-Portal CMS, Copyright ® 2011"/>
	<meta name="author" content="Intechnic Inc."/>

	<inp2:m_base_ref/>

	<link rel="icon" href="<inp2:m_BaseURL/>favicon.ico" type="image/x-icon" />
	<link rel="shortcut icon" href="<inp2:m_BaseURL/>favicon.ico" type="image/x-icon" />

	<inp2:adm_AdminSkin file_only="1" result_to_var="skin_css"/>
	<link rel="stylesheet" href="<inp2:m_Compress files='
	js/jquery/thickbox/thickbox.css\|
	js/calendar/calendar-blue.css\|
	- $skin_css
	+ $skin_css\|
	+ {module_path}/img/toolbar/toolbar-sprite.css
	'/>" type="text/css" media="screen" />

	<script type="text/javascript" src="js/jquery/jquery.pack.js"></script>
	<script type="text/javascript" src="js/jquery/jquery-ui.custom.min.js"></script>

	<script type="text/javascript" src="<inp2:m_Compress files='
	js/is.js\|
	js/ajax.js\|
	js/application.js\|
	js/script.js\|
	js/in-portal.js\|
	js/toolbar.js\|
	js/grid.js\|
	js/grid_filters.js\|
	js/simple_grid.js\|
	js/grid_scroller.js\|
	js/forms.js\|
	js/drag.js\|
	js/ajax_dropdown.js\|
	js/form_controls.js\|
	js/jquery/thickbox/thickbox.js\|
	js/tab_scroller.js\|
	js/calendar/calendar.js\|
	js/calendar/calendar-setup.js\|
	js/calendar/calendar-en.js
	'/>"></script>

	<script type="text/javascript">
	TB.pathToImage = 'js/jquery/thickbox/loadingAnimation.gif';
	var t = '<inp2:m_get param="t"/>';
	var popups = '1';
	var $use_popups = <inp2:m_if check="adm_UsePopups">true<inp2:m_else/>false</inp2:m_if>;
	var $modal_windows = <inp2:m_if check="adm_UsePopups" mode="modal">true<inp2:m_else/>false</inp2:m_if>;
	var multiple_windows = '1';
	var main_title = '<inp2:m_GetConfig var="Site_Name" escape="1"/>';
	var tpl_changed = 0;
	var base_url = '<inp2:m_BaseURL/>';
	var $base_path = '<inp2:m_GetConst name="BASE_PATH"/>';
	var img_path = '<inp2:m_TemplatesBase module="#MODULE#"/>/img/';

	var phrases = {
	'la_Delete_Confirm' : '<inp2:m_Phrase label="la_Delete_Confirm" js_escape="1"/>'
	}

	NumberFormatter.ThousandsSep = '<inp2:lang.current_Field name="ThousandSep" js_escape="1"/>';
	NumberFormatter.DecimalSep = '<inp2:lang.current_Field name="DecimalPoint" js_escape="1"/>';

	<inp2:m_if check="m_GetEquals" name="m_wid" value="" inverse="inverse">
	if (!window.name.match(/_<inp2:m_get name="m_wid"/>$/)) {
	window.name += '_<inp2:m_get name="m_wid"/>'; // change window name only once per window

	if ($modal_windows) {
	getFrame('main').TB.setWindowMetaData('window_name', window.name); // used to simulate window.opener functionality
	}
	}
	</inp2:m_if>

	var $use_toolbarlabels = <inp2:m_if check="adm_UseToolbarLabels">true<inp2:m_else/>false</inp2:m_if>;
	</script>

	<inp2:m_if check="m_get" var="m_wid">
	<style type="text/css">
	.tableborder {
	border: none;
	}
	.toolbar {
	border-right: none;
	border-left: none;
	}
	.tableborder_full {
	border-right: none;
	border-left: none;
	}
	</style>
	</inp2:m_if>

	<inp2:m_ifnot check="adm_UsePopups">
	<style type="text/css">
	table.edit-form {
	border: 1px solid black;
	}
	</style>
	</inp2:m_ifnot>

	</head>

	<inp2:m_include t="incs/blocks"/>
	<inp2:m_include t="incs/in-portal"/>

	<inp2:m_if check="m_ParamEquals" name="nobody" value="yes" inverse="inverse">
	<body class="<inp2:m_if check="m_get" var="m_wid">edit-popup<inp2:m_else/>regular-body</inp2:m_if>" <inp2:m_param name="body_properties"/>>
	</inp2:m_if>

	<inp2:m_if check="m_ParamEquals" name="noform" value="yes" inverse="inverse">
	<inp2:m_RenderElement name="kernel_form"/>
	</inp2:m_if>
	\ No newline at end of file

in-portalNo OneTemporaryActions

File Metadata

in-portalView Options

Event Timeline

in-portal
No OneTemporary
Actions

in-portal
View Options