Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/index.tpl
===================================================================
diff -u -r6928 -r7021
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/index.tpl	(.../index.tpl)	(revision 6928)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/index.tpl	(.../index.tpl)	(revision 7021)
@@ -27,7 +27,7 @@
 		</script>
 	</head>
 
-	<frame src="<inp2:m_t t="head" pass="m" m_cat_id="0" m_opener="s" no_pass_through="1"/>" name="head" scrolling="no" noresize>
+	<frame src="<inp2:m_t t="head" pass="m" m_cat_id="0" m_opener="s" no_pass_through="1"/>" name="head" scrolling="no" noresize="noresize">
 	<frameset cols="200,*" border="0">
 			<frame src="<inp2:m_t t="tree" pass="m" m_cat_id="0" m_opener="s" no_pass_through="1"/>" name="menu" target="main" noresize scrolling="auto" marginwidth="0" marginheight="0">
 			<inp2:m_DefineElement name="root_node">
Index: branches/unlabeled/unlabeled-1.63.4/core/kernel/utility/debugger.php
===================================================================
diff -u -r7008 -r7021
--- branches/unlabeled/unlabeled-1.63.4/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 7008)
+++ branches/unlabeled/unlabeled-1.63.4/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 7021)
@@ -70,15 +70,15 @@
 			 * @var string
 			 */
 			var $baseURL = '';
-			
+
 			function Debugger()
 			{
 				global $start, $dbg_options;
 				// check if user haven't defined DEBUG_MODE contant directly
 				if (defined('DEBUG_MODE') && DEBUG_MODE) {
 					die('error: contant DEBUG_MODE defined directly, please use <strong>$dbg_options</strong> array instead');
 				}
-				
+
 				// check IP before enabling debug mode
 				$ip_match = false;
 				$ip_addresses = isset($dbg_options['DBG_IP']) ? explode(';', $dbg_options['DBG_IP']) : Array ();
@@ -88,12 +88,12 @@
 						break;
 					}
 				}
-				
+
 				if (!$ip_match) {
 					define('DEBUG_MODE', 0);
 					return ;
 				}
-				
+
 				// debug is allowed for user, continue initialization
 				$this->InitDebugger();
 				$this->profileStart('kernel4_startup', 'Startup and Initialization of kernel4', $start);
@@ -105,15 +105,15 @@
 				$this->scrollbarWidth = $this->isGecko() ? 22 : 25;					// vertical scrollbar width differs in Firefox and other browsers
 				$this->appendRequest();
 			}
-			
+
 			/**
 			 * Set's default values to constants debugger uses
 			 *
 			 */
 			function InitDebugger()
 			{
 				global $dbg_options;
-				
+
 				unset($_REQUEST['debug_host'], $_REQUEST['debug_fastfile'], $dbg_options['DBG_IP']);	// this var messed up whole detection stuff :(
 
 				// Detect fact, that this session beeing debugged by Zend Studio
@@ -123,7 +123,7 @@
 						break;
 					}
 				}
-				
+
 				$this->safeDefine('DBG_ZEND_PRESENT', 0); // set this constant value to 0 (zero) to debug debugger using Zend Studio
 
 				// set default values for debugger constants
@@ -146,7 +146,7 @@
 
 				// user defined options override debugger defaults
 				$dbg_constMap = $this->array_merge_recursive2($dbg_constMap, $dbg_options);
-				
+
 				foreach ($dbg_constMap as $dbg_constName => $dbg_constValue) {
 					$this->safeDefine($dbg_constName, $dbg_constValue);
 				}
@@ -165,17 +165,17 @@
 
 			function array_merge_recursive2($paArray1, $paArray2)
 			{
-				if (!is_array($paArray1) or !is_array($paArray2)) { 
+				if (!is_array($paArray1) or !is_array($paArray2)) {
 					return $paArray2;
 				}
-				
+
 				foreach ($paArray2 AS $sKey2 => $sValue2) {
 					$paArray1[$sKey2] = isset($paArray1[$sKey2]) ? array_merge_recursive2($paArray1[$sKey2], $sValue2) : $sValue2;
 				}
-				
+
 				return $paArray1;
 			}
-		
+
 			function netMatch($network, $ip) {
 
 				$network = trim($network);
@@ -212,7 +212,7 @@
 					return ($ip >= $from && $ip <= $to);
 				}
 			}
-			
+
 			function InitReport()
 			{
 				if (!class_exists('kApplication')) return false;
@@ -388,7 +388,8 @@
 
 				if (is_null($array)) {
 					return 'NULL';
-				}elseif (!is_array($array)) {
+				}
+				elseif (!is_array($array)) {
 					if ($cut_min_length != -1 && strlen($array) > $cut_min_length) {
 						$array = substr($array, 0, $cut_first).' ...';
 					}
Index: branches/unlabeled/unlabeled-1.65.4/core/kernel/processors/main_processor.php
===================================================================
diff -u -r6881 -r7021
--- branches/unlabeled/unlabeled-1.65.4/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 6881)
+++ branches/unlabeled/unlabeled-1.65.4/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 7021)
@@ -69,6 +69,12 @@
 		return $this->Application->BaseURL();
 	}
 
+	//for compatability with K3 tags
+	function Base()
+	{
+		return $this->TemplatesBase().'/';
+	}
+
 	function ProjectBase($params)
 	{
 		return $this->Application->BaseURL();
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/head.tpl
===================================================================
diff -u -r6899 -r7021
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/head.tpl	(.../head.tpl)	(revision 6899)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/head.tpl	(.../head.tpl)	(revision 7021)
@@ -6,7 +6,7 @@
 	$popup_manager = new AjaxPopupManager('<inp2:m_t t="ajax/popup_manager" pass="m" js_escape="1"/>');
 </script>
 
-<body topmargin="0" leftmargin="0" marginheight="0" marginwidth="0" bgcolor="#FFFFFF">
+<body topmargin="0" leftmargin="0" marginheight="0" marginwidth="0" bgcolor="#FFFFFF" onload="document.body.scroll='no'">
 
 	<table cellpadding="0" cellspacing="0" width="100%" border="0">
 		<tr>
Index: branches/unlabeled/unlabeled-1.9.18/core/kernel/utility/debugger/debugger.js
===================================================================
diff -u -r6912 -r7021
--- branches/unlabeled/unlabeled-1.9.18/core/kernel/utility/debugger/debugger.js	(.../debugger.js)	(revision 6912)
+++ branches/unlabeled/unlabeled-1.9.18/core/kernel/utility/debugger/debugger.js	(.../debugger.js)	(revision 7021)
@@ -64,18 +64,37 @@
 	this.DebuggerTable = document.getElementById('debug_table');
 	this.RowCount = 0;
 	this.busyRequest = false;
-	
+
 //	window.$Debugger = this; // this should be uncommented in case if debugger variable is not $Debugger
 	this.AddEvent(window, 'scroll', function (ev) { window.$Debugger.Resize(ev); });
 	this.AddEvent(window, 'resize', function (ev) { window.$Debugger.Resize(ev); });
 //	this.AddEvent(window, 'keydown', function (ev) { window.$Debugger.KeyDown(ev); }); // don't work in IE
 	document.onkeydown = function(ev) { window.$Debugger.KeyDown(ev); }
 }
 
+Debugger.prototype.SetOpacity = function(opacity)
+{
+	this.DebuggerToolbar.style.opacity = (opacity / 100);
+  this.DebuggerToolbar.style.MozOpacity = (opacity / 100);
+  this.DebuggerToolbar.style.KhtmlOpacity = (opacity / 100);
+  this.DebuggerToolbar.style.filter = "alpha(opacity=" + opacity + ")";
+}
+
 Debugger.prototype.AddToolbar = function($var_name) {
 	var $span = document.createElement('SPAN');
+	$span.style.position = 'absolute';
+
 	$span.innerHTML = '<table cellspacing="3" cellpadding="0" width="100%" class="dbg-toolbar"><tr><td><input type="button" class="dbg-button" value="Reload Frame" onclick="self.location.reload();" /><input type="button" class="dbg-button" value="Show Debugger" onclick="' + $var_name + '.Toggle();" /><br /></td></tr></table>';
-	
+
+	this.DebuggerToolbar = $span;
+	this.SetOpacity(20);
+	$span.onmouseover = function() {
+		$Debugger.SetOpacity(100);
+	}
+	$span.onmouseout = function() {
+		$Debugger.SetOpacity(20);
+	}
+
 	var $body = document.getElementsByTagName('BODY')[0];
 	$body.insertBefore($span, $body.firstChild);
 }
@@ -99,7 +118,7 @@
 
 Debugger.prototype.Clear = function() {
 	if (!this.IsQueried) return false;
-	
+
 	this.IsQueried = false;
 	while (this.DebuggerTable.rows.length) {
 		this.RemoveRow(0);
@@ -155,7 +174,7 @@
 
 Debugger.prototype.successCallback = function(p_req, p_pass, p_object) {
 	var contents = p_req.responseText;
-	
+
 	contents = contents.split(p_object.RowSeparator);
 	if (contents.length == 1) {
 		alert('error: '+p_req.responseText);
@@ -166,7 +185,7 @@
 	for (var $i = 0; $i < contents.length - 1; $i++) {
 		p_object.AppendRow(contents[$i]);
 	}
-	
+
 	p_object.Refresh();
 }
 
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/grid_scroller.js
===================================================================
diff -u -r6938 -r7021
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/grid_scroller.js	(.../grid_scroller.js)	(revision 6938)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/grid_scroller.js	(.../grid_scroller.js)	(revision 7021)
@@ -43,6 +43,8 @@
 	var result = new Object();
 	result.innerHeight = obj.clientHeight - padding[0] - padding[2];
 	result.innerWidth = obj.clientWidth - padding[1] - padding[3];
+	result.padding = padding;
+	result.borders = border;
 
 	return result;
 }
@@ -56,7 +58,7 @@
 	this.LeftCells = 0;
 	this.LeftWidth = 0;
 
-	this.BottomOffset = 5;
+	this.BottomOffset = 0;
 
 	this.Width = w;
 	this.Height = h;
@@ -93,6 +95,13 @@
 
 	this.TheGrid.style.visibility = 'visible'
 	this.MainScroller.style.visibility = 'visible'
+
+	var the_grid = this;
+	if (document.all) {
+		$status = window.attachEvent('onresize', function(ev) { the_grid.AutoResize() });
+	} else {
+		$status = window.addEventListener('resize', function(ev) { the_grid.AutoResize() }, true);
+	}
 }
 
 GridScroller.prototype.SetReferences = function() {
@@ -170,7 +179,7 @@
 	{
 //		target = Math.max( Math.max(header_widths[i], data_widths[i]), footer_widths[i]);
 		var sum = header_widths[i]*header_cf*count + data_widths[i]*data_cf*count;
-//		alert('sum = '+header_widths[i]+' * '+header_cf+' * '+count+' + '+data_widths[i]+' * '+data_cf+' * '+count+' = '+sum)
+//		alert('sum ('+i+') = '+header_widths[i]+' * '+header_cf+' * '+count+' + '+data_widths[i]+' * '+data_cf+' * '+count+' = '+sum)
 		if (this.HasFooter()) {
 			sum += footer_widths[i]*footer_cf*count;
 //			alert('sum + '+footer_widths[i]+' * '+footer_cf+' * '+count+' = '+sum)
@@ -181,7 +190,7 @@
 		total += target;
 	}
 	this.MinDataWidth = total;
-	this.SetRowWidths('header_'+this.GridId, widths, total);
+	this.SetWidths('header_'+this.GridId, widths, total);
 	this.SetWidths('data_'+this.GridId, widths, total);
 
 	if (this.LeftCells != 0) {
@@ -248,6 +257,7 @@
 	for (var col=0; col<table.rows[row].cells.length-1; col++)
 	{
 		table.rows[row].cells[col].innerHTML = '<div style="width: '+(widths[col]) +'px; overflow: hidden; background-color: inherit;">' + table.rows[row].cells[col].innerHTML + '</div>'
+//		alert('setting '+widths[col]+' for col '+col)
 		table.rows[row].cells[col].style.width =  widths[col]+'px';
 //		alert('set ('+col+')'+table.rows[0].cells[col].innerHTML+' to '+widths[col])
 	}
@@ -302,7 +312,7 @@
 	for (var col=0; col<table.rows[0].cells.length; col++)
 	{
 		widths.push( table.rows[0].cells[col].clientWidth )
-//		alert('get ('+col+')'+table.rows[0].cells[col].innerHTML+' to '+table.rows[0].cells[col].offsetWidth)
+//		alert('get ('+col+')'+table.rows[0].cells[col].innerHTML+' width '+table.rows[0].cells[col].offsetWidth)
 	}
 	return widths;
 }
@@ -314,8 +324,11 @@
 	var h = document.body.clientHeight;
 
 	var pos = findPos(this.MainOuter);
-	h -= pos[1] + this.BottomOffset;
 
+	var dim = getDimensions(this.MainOuter);
+
+	h -= pos[1] + dim.padding[0] + dim.padding[2] + dim.borders[0] + dim.borders[2] + this.BottomOffset;
+
 	return [w,h]
 }
 
@@ -413,9 +426,9 @@
 	w = this.Width;
 	h = this.Height;
 	var o = '';
-	o += this.CreateScroller( '<div id="main_scroller_'+this.GridId+'" style="background-color: green; position: relative; width: auto;"><img src="'+this.Spacer+'" id="dot_'+this.GridId+'" width="200" height="200"><br/><br/></div>', 100, 100, 'main_'+this.GridId, false, 1 );
+	o += this.CreateScroller( '<div id="main_scroller_'+this.GridId+'" style="background-color: inherit; position: relative; width: auto;"><img src="'+this.Spacer+'" id="dot_'+this.GridId+'" width="200" height="200"><br/><br/></div>', 100, 100, 'main_'+this.GridId, false, 1 );
 
-	o += '<div id="'+this.GridId+'" class="grid-container" style="top: 0px; visibility: hidden; z-index: 10; width: auto; height: '+300+'px; position: absolute; overflow: hidden;">';
+	o += '<div id="'+this.GridId+'" class="grid-container" style="background-color: inherit; top: 0px; visibility: hidden; z-index: 10; width: auto; height: '+300+'px; position: absolute; overflow: hidden;">';
 	var header = this.CreateScroller( this.CreateTable( this.GetHeaderCells(), 'header_'+this.GridId), 100, 10, 'header_'+this.GridId, true, 5 )
 	var data = this.CreateScroller( this.CreateTable( this.GetDataCells(), 'data_'+this.GridId ), 100, 10, 'data_'+this.GridId, true, 5  )
 	var footer = this.HasFooter() ? this.CreateScroller( this.CreateTable( this.GetFooterCells(), 'footer_'+this.GridId ), 100, 10, 'footer_'+this.GridId, true, 5 ) : '';
@@ -424,7 +437,7 @@
 		var left_header = this.CreateScroller( this.CreateTable( this.GetLeftHeader(), 'left_header_'+this.GridId), 20, 10, 'left_header_'+this.GridId, true, 5 )
 		var left_data = this.CreateScroller( this.CreateTable( this.GetLeftData(), 'left_data_'+this.GridId), 20, 10, 'left_data_'+this.GridId, true, 5 )
 		var left_footer = this.CreateScroller( this.CreateTable( this.GetLeftFooter(), 'left_footer_'+this.GridId), 20, 10, 'left_footer_'+this.GridId, true, 5 )
-		o += '<table style="width: 100%; border-collapse: collapse">'
+		o += '<table style="width: 100%; border-collapse: collapse;">'
 		o += '<tr><td style="vertical-align: top; margin: 0px; padding: 0px">' + left_header + '</td>'
 		o += '<td style="vertical-align: top; margin: 0px; padding: 0px">' + header + '</td></tr>'
 		o += '<tr><td style="vertical-align: top; margin: 0px; padding: 0px">' + left_data + '</td>'
@@ -485,7 +498,18 @@
 GridScroller.prototype.GetLeftHeader = function()
 {
 	var o = '';
+	for (var row in this.Header) {
+		o +='<tr class="grid-header-row grid-header-row-'+row+'">'
+		for (var col=0; col<this.LeftCells; col++) {
+			o += '<td class="grid-header-'+col+'">'+this.Header[row][col]+'</td>'
+		}
+		o += '<td class="grid-header-last-cell" style="width: auto"><img src="'+this.Spacer+'" width="1" height="1" alt=""/></td>'
+		o += '</tr>'
+	}
+	return o
 
+	var o = '';
+
 	o += '<tr class="grid-header-row">'
 	for (var col=0; col<this.LeftCells; col++) {
 		o += '<td class="grid-header-col-'+col+'">'+this.Header[col]+'</td>'
@@ -526,13 +550,24 @@
 
 GridScroller.prototype.GetHeaderCells = function()
 {
-	var o = '<tr class="grid-header-row">'
+	var o = '';
+	for (var row in this.Header) {
+		o +='<tr class="grid-header-row grid-header-row-'+row+'">'
+		for (var col=this.LeftCells; col<this.Header[row].length; col++) {
+			o += '<td class="grid-header-'+col+'">'+this.Header[row][col]+'</td>'
+		}
+		o += '<td class="grid-header-last-cell" style="width: auto"><img src="'+this.Spacer+'" width="1" height="1" alt=""/></td>'
+		o += '</tr>'
+	}
+	return o
+
+	/*var o = '<tr class="grid-header-row">'
 	for (var col=this.LeftCells; col<this.Header.length; col++) {
 		o += '<td class="grid-header-col-'+col+'">'+this.Header[col]+'</td>'
 	}
 	o += '<td class="grid-header-last-cell" style="width: auto"><img src="'+this.Spacer+'" width="1" height="1" alt=""/></td>'
 	o += '</tr>'
-	return o
+	return o*/
 }
 
 
Index: branches/unlabeled/unlabeled-1.13.4/core/kernel/processors/tag_processor.php
===================================================================
diff -u -r6584 -r7021
--- branches/unlabeled/unlabeled-1.13.4/core/kernel/processors/tag_processor.php	(.../tag_processor.php)	(revision 6584)
+++ branches/unlabeled/unlabeled-1.13.4/core/kernel/processors/tag_processor.php	(.../tag_processor.php)	(revision 7021)
@@ -79,6 +79,7 @@
 					$ret = str_replace('\'', '&#39;', $ret);
 					$ret = addslashes($ret);
 					$ret = str_replace(Array("\r", "\n"), Array('\r', '\n'), $ret);
+					$ret = str_replace('</script>', "</'+'script>", $ret);
 				}
 				if ($flag_values['result_to_var']) {
 					$this->Application->Parser->SetParam($flag_values['result_to_var'], $ret);
Index: branches/unlabeled/unlabeled-1.25.2/core/units/categories/categories_event_handler.php
===================================================================
diff -u -r7018 -r7021
--- branches/unlabeled/unlabeled-1.25.2/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 7018)
+++ branches/unlabeled/unlabeled-1.25.2/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 7021)
@@ -263,6 +263,11 @@
 		return $this->Application->GetVar('m_cat_id');
 	}
 
+	function ParentGetPassedId(&$event)
+	{
+		return parent::GetPassedId($event);
+	}
+
 	/**
 	 * Adds calculates fields for item statuses
 	 *
@@ -346,7 +351,7 @@
 	{
 		parent::OnSave($event);
 	}
-	
+
 	/**
 	 * Checks cache update mark and redirect to cache if needed
 	 *
@@ -364,7 +369,7 @@
 			// "catalog" should be in opener stack by now
 			$wid = $this->Application->GetVar('m_wid');
 			$stack_name = rtrim('opener_stack_'.$wid, '_');
-			
+
 			$opener_stack = unserialize($this->Application->RecallVar($stack_name));
 			$opener_stack[0] = str_replace('catalog', 'categories/cache_updater', $opener_stack[0]);
 			$this->Application->StoreVar($stack_name, serialize($opener_stack));
@@ -391,7 +396,7 @@
 		if ($ids) {
 			$recursive_helper =& $this->Application->recallObject('RecursiveHelper');
 			/* @var $recursive_helper kRecursiveHelper */
-			
+
 			foreach ($ids as $id) {
 				$recursive_helper->DeleteCategory($id);
 			}
@@ -460,7 +465,7 @@
 
 		$recursive_helper =& $this->Application->recallObject('RecursiveHelper');
 		/* @var $recursive_helper kRecursiveHelper */
-		
+
 		if ($clipboard_data['cut']) {
 			$recursive_helper->MoveCategories($clipboard_data['cut'], $this->Application->GetVar('m_cat_id'));
 		}