Index: trunk/kernel/admin_templates/incs/tree.js
===================================================================
diff -u -N
--- trunk/kernel/admin_templates/incs/tree.js	(revision 0)
+++ trunk/kernel/admin_templates/incs/tree.js	(revision 4357)
@@ -0,0 +1,349 @@
+function TreeItem(title, url, icon)
+{
+	this.Title = title;
+	this.Url = url;
+	this.Rendered = false;
+	this.Displayed = false;
+	this.Level = 0;
+	this.Icon = icon;
+}
+
+TreeItem.prototype.Render = function(before)
+{
+	if (!this.Rendered) {
+		if (!isset(before)) {before = null}
+
+		tr = document.createElement('tr');
+		this.ParentElement.insertBefore(tr, before);
+		if (!this.Displayed) { tr.style.display = 'none' }
+		td = document.createElement('td');
+		td.TreeElement = this;
+		tr.appendChild(td);
+
+		this.appendLevel(td);
+		if (this.ParentFolder != null) this.appendNodeImage(td);
+		this.appendIcon(td);
+		this.appendLink(td);
+
+		this.Tr = tr;
+		this.Rendered = true;
+	}
+}
+
+TreeItem.prototype.appendLevel = function(td)
+{
+	for (var i=0; i < this.Level; i++)
+	{
+		img = document.createElement('img');
+		img.src = TREE_ICONS_PATH+'ftv2blank.gif';
+		img.style.verticalAlign = 'middle';
+		td.appendChild(img);
+	}
+}
+
+TreeItem.prototype.getNodeImage = function(is_last)
+{
+	return is_last ? TREE_ICONS_PATH+'/ftv2lastnode.gif' : TREE_ICONS_PATH+'/ftv2node.gif';
+}
+
+TreeItem.prototype.appendNodeImage = function(td)
+{
+	img = document.createElement('img');
+	img.src = this.getNodeImage();
+	img.style.verticalAlign = 'middle';
+	td.appendChild(img);
+}
+
+TreeItem.prototype.appendIcon = function (td)
+{
+	img = document.createElement('img');
+	if (this.Icon.indexOf('http://') != -1) {
+		img.src = this.Icon;
+	}
+	else {
+		img.src = 'icons/'+this.Icon;
+	}
+	img.style.verticalAlign = 'middle';
+	td.appendChild(img);
+}
+
+TreeItem.prototype.appendLink = function (td)
+{
+	link = document.createElement('a');
+	link.nodeValue = this.Title;
+	link.href = this.Url;
+	link.target = 'main';
+	link.appendChild( document.createTextNode(this.Title) )
+	td.appendChild( link );
+//	td.appendChild( document.createTextNode(this.Title) );
+}
+
+TreeItem.prototype.display = function()
+{
+	this.Tr.style.display = 'block';
+	this.Displayed = true;
+}
+
+TreeItem.prototype.hide = function()
+{
+	this.Tr.style.display = 'none';
+	this.Displayed = false;
+}
+
+TreeItem.prototype.expand = function() { this.display() }
+
+TreeItem.prototype.collapse = function() { this.hide() }
+
+TreeItem.prototype.updateLastNodes = function(is_last, lines_pattern)
+{
+	if (!isset(is_last)) is_last = true;
+	if (!isset(this.Tr)) return;
+	if (!isset(lines_pattern)) { var lines_pattern = new Array() }
+
+	imgs = this.Tr.getElementsByTagName('img');
+	found = false;
+	for (var i=0; i<imgs.length; i++)
+	{
+		the_img = imgs.item(i);
+		if (in_array(i, lines_pattern) && the_img.src.indexOf('ftv2blank.gif') != -1) {
+			the_img.src = TREE_ICONS_PATH+'/ftv2vertline.gif';
+		}
+		if (this.isNodeImage(the_img))
+		{
+			found = true;
+			break;
+		}
+	}
+	if (found) {
+		the_img.src = this.getNodeImage(is_last);
+	}
+	this.isLast = is_last;
+	return lines_pattern;
+}
+
+TreeItem.prototype.isNodeImage = function(img)
+{
+	return (
+					img.src.indexOf('ftv2node.gif') != -1 ||
+					img.src.indexOf('ftv2lastnode.gif') != -1
+				 )
+
+}
+
+TreeItem.prototype.locateLastItem = function()
+{
+	return this;
+}
+/* FOLDER */
+
+function TreeFolder(parent_id, title, url, icon, late_load_url)
+{
+	var render = false;
+	if (isset(parent_id)) {
+		this.ParentElement = document.getElementById(parent_id);
+		render = true;
+	}
+
+	this.Title = title;
+	this.Url = url;
+	this.Rendered = false;
+	this.Displayed = false;
+	this.Expanded = false;
+	this.Level = 0;
+	this.Tr = null;
+	this.Icon = icon;
+	this.LateLoadURL = isset(late_load_url) ? late_load_url : false;
+	this.Loaded = false;
+
+	this.Children = new Array();
+	this.ChildIndex = 0;
+	if (render) {
+		this.Expanded = true;
+		this.Displayed = true;
+		this.Render();
+		this.expand();
+	}
+}
+
+TreeFolder.prototype = new TreeItem;
+
+TreeFolder.prototype.locateLastItem = function()
+{
+	if (this.Children.length == 0) return this;
+
+	for (var i=0; i<this.Children.length; i++)
+	{
+		last_item = this.Children[i].locateLastItem()
+	}
+	return last_item;
+}
+
+TreeFolder.prototype.locateTopItem = function()
+{
+	if (this.ParentFolder == null) return this;
+	return this.ParentFolder.locateTopItem();
+}
+
+TreeFolder.prototype.AddItem = function(an_item, render, display) {
+	an_item.ParentElement = this.ParentElement;
+	an_item.Level = this.ParentFolder != null ? this.Level + 1 : 0;
+	an_item.ParentFolder = this;
+
+	last_item = this.locateLastItem();
+	this.Children.push(an_item);
+	an_item.Render(last_item.Tr.nextSibling);
+	this.locateTopItem().updateLastNodes();
+	if (this.Expanded)
+	{
+		an_item.display();
+	}
+	return an_item;
+}
+
+TreeFolder.prototype.AddFromXML = function(xml, render)
+{
+	if (!isset(render)) render = true;
+	doc = getDocumentFromXML(xml);
+	this.LastFolder = this;
+	this.ProcessXMLNode(doc, render);
+}
+
+TreeFolder.prototype.ProcessXMLNode = function(node, render)
+{
+	if (!isset(render)) render = true;
+	if (!isset(this.LastFolder)) this.LastFolder = this;
+	for (var i=0; i<node.childNodes.length; i++)
+	{
+		child = node.childNodes.item(i);
+		if (child.tagName == 'folder') {
+			this.LastFolder = this.LastFolder.AddItem(new TreeFolder(null, child.getAttribute('name'), child.getAttribute('href'), child.getAttribute('icon'), child.getAttribute('load_url')), render);
+			if (child.hasChildNodes) {
+				this.ProcessXMLNode(child);
+			}
+			this.LastFolder = this;
+		}
+		else if (child.tagName == 'item') {
+			this.LastFolder.AddItem(new TreeItem(child.firstChild.nodeValue, child.getAttribute('href'), child.getAttribute('icon')), render)
+		}
+		else if (child.tagName == 'tree') {
+			this.ProcessXMLNode(child);
+		}
+	}
+}
+
+TreeFolder.prototype.getNodeImage = function(is_last)
+{
+	if (is_last) {
+		return this.Expanded ? TREE_ICONS_PATH+'/ftv2mlastnode.gif' : TREE_ICONS_PATH+'/ftv2plastnode.gif';
+	}
+	else {
+		return this.Expanded ? TREE_ICONS_PATH+'/ftv2mnode.gif' : TREE_ICONS_PATH+'/ftv2pnode.gif';
+	}
+}
+
+TreeFolder.prototype.appendNodeImage = function(td, is_last)
+{
+	img = document.createElement('img');
+	img.src = this.getNodeImage(is_last);
+	img.style.cursor = 'hand';
+	img.style.cursor = 'pointer';
+	img.style.verticalAlign = 'middle';
+	img.onclick = function() { this.parentNode.TreeElement.folderClick(this)	}
+	this.Img = img;
+	td.appendChild(img);
+}
+
+TreeFolder.prototype.updateLastNodes = function(is_last, lines_pattern)
+{
+	if (!isset(is_last)) is_last = true;
+	if (!isset(lines_pattern)) { var lines_pattern = new Array() }
+	if (!is_last && !in_array(this.Level, lines_pattern)) {	lines_pattern.push(this.Level) }
+
+	lines_pattern = TreeItem.prototype.updateLastNodes.apply(this, new Array(is_last, lines_pattern))
+
+	for (var i=0; i<this.Children.length; i++)
+	{
+		lines_pattern = this.Children[i].updateLastNodes((i+1) == this.Children.length, lines_pattern)
+	}
+	lines_pattern[array_search(this.Level, lines_pattern)] = -1;
+	return lines_pattern;
+}
+
+TreeFolder.prototype.isNodeImage = function(img)
+{
+	return (
+					img.src.indexOf('ftv2mlastnode.gif') != -1 ||
+					img.src.indexOf('ftv2plastnode.gif') != -1 ||
+					img.src.indexOf('ftv2mnode.gif') != -1 ||
+					img.src.indexOf('ftv2pnode.gif') != -1
+				 )
+
+}
+
+TreeFolder.prototype.folderClick = function(img)
+{
+	if (this.LateLoadURL && !this.Loaded) {
+
+		request = getXMLHTTPObject('text/xml');
+
+		if (request && request.readyState != 0) {
+			request.abort();
+		}
+		request.open('POST', this.LateLoadURL, true);
+		request.setRequestHeader("referer", this.LateLoadURL);
+		obj = this;
+		function processLateLoad() {
+			if (request.readyState == 4) {
+				if (request.status == 200) {
+					obj.ProcessXMLNode(request.responseXML);
+					obj.Loaded = true;
+					obj.Render();
+					obj.expand();
+				}
+			}
+		}
+		request.onreadystatechange = processLateLoad;
+		request.send('is_xml=1');
+	}
+
+	if (this.Expanded) {
+		this.collapse();
+	}
+	else {
+		this.expand();
+	}
+}
+
+TreeFolder.prototype.expand = function(mode)
+{
+	if (!isset(mode)) mode = 0;
+	this.display();
+	if (mode == 0 || this.Expanded ) {
+		for (var i=0; i<this.Children.length; i++)
+		{
+			this.Children[i].expand(mode+1);
+		}
+	}
+	if (mode == 0) {
+		this.Expanded = true;
+		if (isset(this.Img)) {
+			this.Img.src = this.getNodeImage(this.isLast);
+		}
+	}
+}
+
+TreeFolder.prototype.collapse = function(mode)
+{
+	if (!isset(mode)) mode = 0;
+	for (var i=0; i<this.Children.length; i++)
+	{
+		this.Children[i].collapse(mode+1);
+		this.Children[i].hide();
+	}
+	if (mode == 0) {
+		this.Expanded = false;
+		if (isset(this.Img)) {
+			this.Img.src = this.getNodeImage(this.isLast);
+		}
+	}
+}
\ No newline at end of file
Index: trunk/kernel/admin_templates/incs/script.js
===================================================================
diff -u -N -r4330 -r4357
--- trunk/kernel/admin_templates/incs/script.js	(.../script.js)	(revision 4330)
+++ trunk/kernel/admin_templates/incs/script.js	(.../script.js)	(revision 4357)
@@ -11,7 +11,7 @@
 	var submitted = false;
 	var $edit_mode = false;
 	var $init_made = true; // in case of double inclusion of script.js :)
-	
+
 	// hook processing
 	var hBEFORE	= 1; // this is const, but including this twice causes errors
 	var hAFTER	= 2; // this is const, but including this twice causes errors
@@ -57,7 +57,7 @@
 {
 	var $i = 0;
 	var $local_hooks = getArrayValue($hooks, $function_name, $hook_type);
-	
+
 	while($i < $local_hooks.length) {
 		$local_hooks[$i]($function_name, $prefix_special);
 		$i++;
@@ -162,11 +162,26 @@
 	return (typeof(variable)=='undefined')?false:true;
 }
 
-function print_pre(variable)
+function in_array(needle, haystack)
 {
-	var s = "";
+	return array_search(needle, haystack) != -1;
+}
+
+function array_search(needle, haystack)
+{
+	for (var i=0; i<haystack.length; i++)
+	{
+		if (haystack[i] == needle) return i;
+	}
+	return -1;
+}
+
+function print_pre(variable, msg)
+{
+	if (!isset(msg)) msg = '';
+	var s = msg;
 	for (prop in variable)   {
-      s += prop+" => "+variable[prop] + "";
+      s += prop+" => "+variable[prop] + "\n";
   }
   alert(s);
 }
@@ -803,30 +818,31 @@
 		var $dst_html = $aSelect.options[$dst_num].innerHTML;
 		var $src_value = $aSelect.options[$src_num].value;
 		var $dst_value = $aSelect.options[$dst_num].value;
-		
+
 		var $src_option = document.createElement('OPTION');
 		var $dst_option = document.createElement('OPTION');
-		
+
 		$aSelect.remove($src_num);
 		$aSelect.options.add($dst_option, $src_num);
 		$dst_option.innerText = $dst_html;
 		$dst_option.value = $dst_value;
 		$dst_option.innerHTML = $dst_html;
-		
+
 		$aSelect.remove($dst_num);
 		$aSelect.options.add($src_option, $dst_num);
 		$src_option.innerText = $src_html;
 		$src_option.value = $src_value;
 		$src_option.innerHTML = $src_html;
 	}
-	
-	function getXMLHTTPObject()
+
+	function getXMLHTTPObject(content_type)
     {
+    	if (!isset(content_type)) content_type = 'text/plain';
     	var http_request = false;
         if (window.XMLHttpRequest) { // Mozilla, Safari,...
             http_request = new XMLHttpRequest();
             if (http_request.overrideMimeType) {
-                http_request.overrideMimeType('text/plain');
+                http_request.overrideMimeType(content_type);
                 // See note below about this line
             }
         } else if (window.ActiveXObject) { // IE
@@ -840,8 +856,8 @@
         }
         return http_request;
     }
-    
-    function str_repeat($symbol, $count)
+
+  function str_repeat($symbol, $count)
 	{
 		var $i = 0;
 		var $ret = '';
@@ -850,4 +866,18 @@
 			$i++;
 		}
 		return $ret;
+	}
+
+	function getDocumentFromXML(xml)
+	{
+		if (window.ActiveXObject) {
+			var doc = new ActiveXObject("Microsoft.XMLDOM");
+			doc.async=false;
+			doc.loadXML(xml);
+		}
+		else {
+			var parser = new DOMParser();
+			var doc = parser.parseFromString(xml,"text/xml");
+		}
+		return doc;
 	}
\ No newline at end of file
Index: trunk/core/kernel/processors/main_processor.php
===================================================================
diff -u -N -r4329 -r4357
--- trunk/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 4329)
+++ trunk/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 4357)
@@ -187,13 +187,13 @@
 	{
 		// <inp2:m_SetParam param="custom_name" src="cf:FieldName"/>
 		list($prefix_special, $field_name) = explode(':', $params['src']);
-		
+
 		$object =& $this->Application->recallObject($prefix_special);
 		$name = $this->SelectParam($params, 'param,name,var');
-		
+
 		$this->Application->Parser->SetParam($name, $object->GetField($field_name) );
 	}*/
-	
+
 	/**
 	 * Compares block parameter with value specified
 	 *
@@ -498,7 +498,7 @@
 
 		$t = $this->SelectParam($params, 't,template,block,name');
 		$t = eregi_replace("\.tpl$", '', $t);
-		
+
 		$templates_cache =& $this->Application->recallObject('TemplatesCache');
 		
 		$res = $BlockParser->Parse(	$templates_cache->GetTemplateBody($t, getArrayValue($params, 'is_silent')), $t );
@@ -699,6 +699,11 @@
 	 */
 	function RequireLogin($params)
 	{
+		$t = $this->Application->GetVar('t');
+		if ($next_t = getArrayValue($params, 'next_template')) {
+			$t = $next_t;
+		}
+
 		if($permission_groups = getArrayValue($params, 'permissions'))
 		{
 			$permission_groups = explode('|', $permission_groups);
@@ -721,8 +726,7 @@
 
 			if( !$this->Application->LoggedIn() )
 			{
-				$t = $this->Application->GetVar('t');
-					$this->Application->Redirect( $params['login_template'], Array('next_template'=>$t) );
+				$this->Application->Redirect( $params['login_template'], Array('next_template'=>$t) );
 			}
 			else
 			{
@@ -760,7 +764,9 @@
 
 		if( (!$this->Application->LoggedIn() || !$group_access) && $condition )
 		{
-			$t = $this->Application->GetVar('t');
+			if ( $this->Application->LoggedIn() && !$group_access) {
+				$this->Application->Redirect( $params['no_group_perm_template'], Array('next_template'=>$t) );
+			}
 			$this->Application->Redirect( $params['login_template'], Array('next_template'=>$t) );
 		}
 	}
@@ -834,21 +840,21 @@
 		$module =& $this->Application->recallObject('mod.'.$module_name);
 		$this->Application->SetVar('m_cat_id', $module->GetDBField('RootCat') );
 	}
-	
+
 	function ImportRedirect($params)
 	{
 		$import_id = $this->Application->GetVar('import_id');
 		if ($import_id) {
 			// redirect forward to step3 (import parameters coosing)
 			$this->Application->StoreVar('ImportScriptID', $import_id);
-		
+
 			$sql = 'SELECT *
 					FROM '.TABLE_PREFIX.'ImportScripts
 					WHERE is_id = '.$import_id;
-			
+
 			$db =& $this->Application->GetADODBConnection();
 			$is_params = $db->GetRow($sql);
-			
+
 			if ($is_params['is_type'] == 'db') {
 				$this->Application->Redirect('', null, '', 'import/step3.php');
 			}
@@ -879,7 +885,7 @@
 	{
 		return replaceModuleSection($params['icon']);
 	}
-	
+
 	function StoreSystemVars($params)
 	{
 		// save theese variables to session, because they are useful for most configuration templates
@@ -892,6 +898,12 @@
 		$this->Application->LinkVar('main_prefix');	// window prefix, that opener selector
 		$this->Application->LinkVar('dst_field'); // field to set value choosed in selector
 		$this->Application->LinkVar('return_template'); // template to go, when something was coosen from popup (from finalizePopup)
+	}  
+
+	function XMLTemplate($params)
+	{
+		define('DBG_SKIP_REPORTING', 1);
+		header('Content-type: text/xml');
 	}
 }