Index: trunk/admin/include/sections.php
===================================================================
diff -u -N -r4243 -r4446
--- trunk/admin/include/sections.php	(.../sections.php)	(revision 4243)
+++ trunk/admin/include/sections.php	(.../sections.php)	(revision 4446)
@@ -79,11 +79,11 @@
 		$url = $rootURL.$this->Get("icon_small");
 		return $url;
 	}
-	
+
 	function IsKernel4Link() {
 		$path = $this->Get('path');
 		if(!$path) return false;
-		
+
 		$file = $this->Get('file');
 
 		return ( strpos($path, 'index4.php') !== false ||  strpos($file, 'kernel4:') !== false) ? true : false;
@@ -114,7 +114,7 @@
 			else {
 				$env = BuildEnv();
 			}
-			
+
 			$url = $rootURL.$this->Get('path').$this->Get('file');
 			$url .= (strstr($url, '?') ? '&' : '?').'env='.$env;
 		}
@@ -234,16 +234,16 @@
 		// simplified method to add sections
 		global $pathtoroot;
 		$sn = explode(':', $section_name);
-		
+
 		if (substr($script, 0, 8) == 'kernel4:') {
 			$img_path = $sn[0].'/admin_templates/img/icons';
 		}
 		else {
 			$img_path = $module.'/admin/images/icons';
 		}
-		
+
 		if (!$img_path) {
-			
+
 		}
 		if( !isset($title_phrase) ) $title_phrase = $tab_phrase;
 
@@ -430,7 +430,7 @@
 					$o = "<DIV style='position:relative; z-Index: 1; background-color: #ffffff; padding-top:1px;'>
                 <div style='position:absolute; width:100%;top:0px;' align='right'>
                 <img src='".$imagesURL.'/'.$bg_image."'></div><img src='".$imagesURL."/spacer.gif' width=1 height=7>
-                <br><div style='z-Index:1; position:relative'>"; 
+                <br><div style='z-Index:1; position:relative'>";
 					$o .= "<!-- ADMIN TITLE --><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">
               <tr><td valign=\"top\" class=\"admintitle\" align=\"left\">
               <img title=\"\" width=\"46\" height=\"46\" src=\"$icon\" align=\"absmiddle\">&nbsp;$caption<br>
@@ -449,7 +449,7 @@
           						</td>
           					</tr>
           				</table>
-          				';	
+          				';
 				}
 			}
 		}
@@ -492,7 +492,7 @@
 
 				$o = "<!-- TABS --><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\"><tr>
                 <td align=\"right\" width=\"100%\"><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" height=\"23\">
-                <tr>";		
+                <tr>";
 				$showtabs=1;
 			}
 			//traverse and print tabs
Index: trunk/core/kernel/utility/http_query.php
===================================================================
diff -u -N -r4418 -r4446
--- trunk/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 4418)
+++ trunk/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 4446)
@@ -158,8 +158,7 @@
 			}
 		}
 
-		if( $this->Application->RewriteURLs() )
-		{
+		if ($this->Application->RewriteURLs()) {
 			if( $this->Application->isDebugMode() )
 			{
 				$this->Application->Debugger->profileStart('url_parsing');
@@ -173,6 +172,10 @@
 			}
 
 		}
+		else {
+			$this->Application->VerifyLanguageId();
+			$this->Application->VerifyThemeId();
+		}
 	}
 
 	function convertFiles()
@@ -435,7 +438,7 @@
 				$module_prefix = $module_info['Var'];
 				$module_event = new kEvent($module_prefix.':ParseEnv', Array('url_parts' => array_merge(Array($url_part), $url_parts)) );
 				$this->Application->HandleEvent($module_event);
-				
+
 				if ($module_event->status == erSUCCESS && $this->Get($module_prefix.'_id')) {
 					$item_template = $category_data['CachedItemTemplate'];
 					if ($item_template) {
@@ -566,7 +569,7 @@
 			$passed[] = $module_prefix;
 			$module_event = new kEvent($module_prefix.':ParseEnv', Array('url_parts' => $url_parts) );
 			if ($process_module) {
-				$this->Application->HandleEvent($module_event);
+			$this->Application->HandleEvent($module_event);
 			}
 			$item_id = $this->Get($module_prefix.'_id');
 			$module_params = Array($module_prefix.'_id' => $item_id ? $item_id : '0' );
Index: trunk/core/units/categories/categories_config.php
===================================================================
diff -u -N -r4329 -r4446
--- trunk/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 4329)
+++ trunk/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 4446)
@@ -68,7 +68,7 @@
 									            'ParentId' => Array('type' => 'int','not_null' => '1','default' => '0'),
 									            'Name' => Array('type' => 'string','not_null' => '1','default' => ''),
 									            'Filename' => Array('type' => 'string','not_null' => '1','default' => ''),
-            									'AutomaticFilename' => Array('type' => 'int','not_null' => '1','default' => '0'),
+            									'AutomaticFilename' => Array('type' => 'int','not_null' => '1','default' => '1'),
 									            'Description' => Array('type' => 'string','not_null' => '1','default' => ''),
 									            'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default'=>'#NOW#', 'not_null' => '1'),
 									            'EditorsPick' => Array('type' => 'int','default' => ''),
Index: trunk/admin/install/langpacks/english.lang
===================================================================
diff -u -N -r4427 -r4446
--- trunk/admin/install/langpacks/english.lang	(.../english.lang)	(revision 4427)
+++ trunk/admin/install/langpacks/english.lang	(.../english.lang)	(revision 4446)
@@ -881,6 +881,7 @@
 			<PHRASE Label="la_section_Message" Module="In-Portal" Type="1">TWVzc2FnZQ==</PHRASE>
 			<PHRASE Label="la_section_overview" Module="In-Portal" Type="1">U2VjdGlvbiBPdmVydmlldw==</PHRASE>
 			<PHRASE Label="la_section_Properties" Module="In-Portal" Type="1">UHJvcGVydGllcw==</PHRASE>
+			<PHRASE Label="la_section_Templates" Module="In-Portal" Type="1">VGVtcGxhdGVz</PHRASE>
 			<PHRASE Label="la_section_Translation" Module="In-Portal" Type="1">VHJhbnNsYXRpb24=</PHRASE>
 			<PHRASE Label="la_selecting_categories" Module="In-Portal" Type="1">U2VsZWN0aW5nIENhdGVnb3JpZXM=</PHRASE>
 			<PHRASE Label="la_Selection_Empty" Module="In-Portal" Type="1">RW1wdHkgc2VsZWN0aW9u</PHRASE>
Index: trunk/core/units/configuration/configuration_tag_processor.php
===================================================================
diff -u -N -r4225 -r4446
--- trunk/core/units/configuration/configuration_tag_processor.php	(.../configuration_tag_processor.php)	(revision 4225)
+++ trunk/core/units/configuration/configuration_tag_processor.php	(.../configuration_tag_processor.php)	(revision 4446)
@@ -34,7 +34,7 @@
 			$this->Application->SetVar( $this->getPrefixSpecial().'_id', $list->GetDBField($id_field) ); // for edit/delete links using GET
 			
 			// using 2 blocks for drawing o row in case if current & next record titles match
-			$next_item_prompt = $list->Records[$list->CurrentIndex + 1]['prompt'];
+			$next_item_prompt = $list->CurrentIndex + 1 < $list->RecordsCount ? $list->Records[$list->CurrentIndex + 1]['prompt'] : '';
 			$this_item_prompt = $list->GetDBField('prompt');
 	
 			if ($next_item_prompt == $this_item_prompt) {
Index: trunk/kernel/units/general/inp1_parser.php
===================================================================
diff -u -N -r3576 -r4446
--- trunk/kernel/units/general/inp1_parser.php	(.../inp1_parser.php)	(revision 3576)
+++ trunk/kernel/units/general/inp1_parser.php	(.../inp1_parser.php)	(revision 4446)
@@ -72,7 +72,7 @@
 		$lastExpire, $diffZone, $date, $nowDate, $lastExpireDate, $SearchPerformed, 
 		$TotalMessagesSent, $ado, $adminDir, $rootURL, $secureURL, $html, $timeout, 
 		$pathchar, $objTemplate, $objTopicList, $objArticleList, $objPostingList, $objCensorList,
-		$objSmileys, $objPMList, $SubscribeAddress, $SubscribeError, $SubscribeResult;
+		$objSmileys, $objPMList, $SubscribeAddress, $SubscribeError, $SubscribeResult, $application;
 		
 		$pathtoroot = $this->Application->IsAdmin() ? '../' : './';
 		$pathtoroot = realpath($pathtoroot)."/";
Index: trunk/core/kernel/application.php
===================================================================
diff -u -N -r4358 -r4446
--- trunk/core/kernel/application.php	(.../application.php)	(revision 4358)
+++ trunk/core/kernel/application.php	(.../application.php)	(revision 4446)
@@ -205,14 +205,11 @@
 		// Module items are recalled during url parsing & PhrasesCache is needed already there,
 		// because it's used in their build events. That's why phrases cache initialization is
 		// called from kHTTPQuery in case when mod_rewrite is used
-		if( !$this->RewriteURLs() )
-		{
+		if (!$this->RewriteURLs()) {
 			$this->Phrases = new PhrasesCache();
-			$this->VerifyLanguageId();
 			$this->Phrases->Init('phrases');
-			$this->VerifyThemeId();
 		}
-
+		
 		if( !$this->RecallVar('UserGroups') )
 		{
 			$session =& $this->recallObject('Session');
@@ -411,6 +408,11 @@
 			$id_field = $this->getUnitOption($prefix, 'IDField');
 			
 			if ($prefix == 'c') {
+				if(!$id) {
+					$this->setCache('filenames', $prefix.'_'.$id, '');
+					return '';
+				}
+				
 				// this allows to save 2 sql queries for each category
 				$sql = 'SELECT NamedParentPath, CachedCategoryTemplate, CachedItemTemplate
 						FROM '.$table.'
@@ -925,6 +927,29 @@
 		return $ret;
 	}
 
+	
+	/**
+	 * Returns sorted array of passed prefixes (to build url from)
+	 *
+	 * @param string $pass
+	 * @return Array
+	 */
+	function getPassInfo($pass = 'all')
+	{
+		$pass = str_replace('all', trim($this->GetVar('passed'), ','), $pass);
+		
+		$pass_info = array_unique( explode(',', $pass) ); // array( prefix[.special], prefix[.special] ...
+		sort($pass_info, SORT_STRING); // to be prefix1,prefix1.special1,prefix1.special2,prefix3.specialX
+		
+		// ensure that "m" prefix is at the beginning
+		$main_index = array_search('m', $pass_info);
+		if ($main_index !== false) {
+			unset($pass_info[$main_index]);
+			array_unshift($pass_info, 'm');
+		}
+		return $pass_info;
+	}
+	
 	function BuildEnv_NEW($t, $params, $pass = 'all', $pass_events = false)
 	{
 //		$session =& $this->recallObject('Session');
@@ -946,20 +971,9 @@
 			unset($params['__SSL__']);
 		}
 
-		$pass = str_replace('all', trim($this->GetVar('passed'), ','), $pass);
-
-		if(strlen($pass) > 0)
-		{
-			$pass_info = array_unique( explode(',',$pass) ); // array( prefix[.special], prefix[.special] ...
-			sort($pass_info, SORT_STRING); // to be prefix1,prefix1.special1,prefix1.special2,prefix3.specialX
-
-			// ensure that "m" prefix is always first
-			$main_index = array_search('m', $pass_info);
-			if($main_index !== false)
-			{
-				unset($pass_info[$main_index]);
-			}
-
+		$pass_info = $this->getPassInfo($pass);
+		if ($pass_info) {
+			if ($pass_info[0] == 'm') array_shift($pass_info);
 			$params['t'] = $t;
 			foreach($pass_info as $pass_index => $pass_element)
 			{
@@ -1066,18 +1080,19 @@
 		return $ret;
 	}
 
-	function BuildEnv($t, $params, $pass='all', $pass_events=false, $env_var=true)
+	function BuildEnv($t, $params, $pass='all', $pass_events = false, $env_var = true)
 	{
 		$session =& $this->recallObject('Session');
 		$ssl = isset($params['__SSL__']) ? $params['__SSL__'] : 0;
 		$sid = $session->NeedQueryString() && !$this->RewriteURLs($ssl) ? $this->GetSID() : '';
-		if( getArrayValue($params,'admin') == 1 ) $sid = $this->GetSID();
+		if (getArrayValue($params,'admin') == 1) $sid = $this->GetSID();
 
 		$ret = '';
 		if ($env_var) {
 			$ret = ENV_VAR_NAME.'=';
 		}
-		$ret .=	constOn('INPORTAL_ENV') ? $sid.'-'.$t : $sid.':'.$t;
+		
+		$ret .=	$sid.(constOn('INPORTAL_ENV') ? '-' : ':');
 
 		$encode = false;
 		if (isset($params['__URLENCODE__'])) {
@@ -1089,16 +1104,39 @@
 			unset($params['__SSL__']);
 		}
 
-		$pass = trim( str_replace('all', $this->GetVar('passed'), $pass), ',');
-
-		if(strlen($pass) > 0)
-		{
-			$pass_info = array_unique( explode(',',$pass) ); // array( prefix[.special], prefix[.special] ...
-			foreach($pass_info as $pass_element)
-			{
-				$ret .= ':'.$this->BuildModuleEnv($pass_element, $params, $pass_events);
+		$env_string = '';
+		$category_id = isset($params['m_cat_id']) ? $params['m_cat_id'] : $this->GetVar('m_cat_id');
+		
+		$item_id = 0;
+		$pass_info = $this->getPassInfo($pass);
+		if ($pass_info) {
+			if ($pass_info[0] == 'm') array_shift($pass_info);
+			foreach ($pass_info as $pass_element) {
+				list($prefix) = explode('.', $pass_element);
+				$require_rewrite = $this->findModule('Var', $prefix);
+				if ($require_rewrite) {
+					$item_id = isset($params[$pass_element.'_id']) ? $params[$pass_element.'_id'] : $this->GetVar($pass_element.'_id');
+				}
+				$env_string .= ':'.$this->BuildModuleEnv($pass_element, $params, $pass_events);
 			}
 		}
+		
+		if (strtolower($t) == '__default__') {
+			// to put category & item templates into cache
+			$filename = $this->getFilename('c', $category_id);
+			if ($item_id) {
+				$t =  $this->getCache('item_templates', $category_id);
+			}
+			elseif ($category_id) {
+				$t = $this->getCache('category_templates', $category_id);
+			}
+			else {
+				$t = 'index';
+			}
+		}
+		
+		$ret .= $t.':'.$this->BuildModuleEnv('m', $params, $pass_events).$env_string;
+		
 		unset($params['pass']);
 		unset($params['opener']);
 		unset($params['m_event']);
Index: trunk/core/units/categories/categories_event_handler.php
===================================================================
diff -u -N -r4029 -r4446
--- trunk/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 4029)
+++ trunk/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 4446)
@@ -8,23 +8,23 @@
 	 * @param kEvent $event
 	 */
 	function OnCategoryUp(&$event)
-	{		
+	{
 		$category_table = $this->Application->getUnitOption($event->Prefix,'TableName');
 		$current_cat = $this->Application->GetVar('m_cat_id');
-		
+
 		if($current_cat)
 		{
 			$sql = 'SELECT ParentId FROM '.$category_table.' WHERE CategoryId = '.$current_cat;
 			$cat_to_go = $this->Conn->GetOne($sql);
 		}
-		else 
+		else
 		{
 			$cat_to_go = 0;
 		}
-		
+
 		$event->redirect_params = Array('m_cat_id' => $cat_to_go);
 	}
-	
+
 	/**
 	 * Goes to home category
 	 *
@@ -35,7 +35,7 @@
 		$cat_to_go = 0;
 		$event->redirect_params = Array('m_cat_id' => $cat_to_go);
 	}
-	
+
 	/**
 	 * Apply system filter to categories list
 	 *
@@ -44,16 +44,23 @@
 	function SetCustomQuery(&$event)
 	{
 		parent::SetCustomQuery($event);
-		
+
 		$types=$event->getEventParam('types');
 		$except_types=$event->getEventParam('except');
 		$object =& $event->getObject();
 		$type_clauses = Array();
-		
+
 		$object =& $event->getObject();
-		
+
 		if ( $event->getEventParam('parent_cat_id') ) {
 			$parent_cat_id = $event->getEventParam('parent_cat_id');
+
+			if ($parent_cat_id == 'Root') {
+				$module_name = getArrayValue($params, 'module') ? $params['module'] : 'In-Commerce';
+				$module =& $this->Application->recallObject('mod.'.$module_name);
+				$parent_cat_id = $module->GetDBField('RootCat');
+			}
+
 		}
 		else {
 			$parent_cat_id = $this->Application->GetVar('c_id');
@@ -64,7 +71,7 @@
 				$parent_cat_id = 0;
 			}
 		}
-		
+
 		if ($parent_cat_id != 'any') {
 			if ($event->getEventParam('recursive')) {
 				$current_path = $this->Conn->GetOne('SELECT ParentPath FROM '.TABLE_PREFIX.'Category WHERE CategoryId='.$parent_cat_id);
@@ -75,9 +82,9 @@
 				$object->addFilter('parent_filter', 'ParentId = '.$parent_cat_id);
 			}
 		}
-		
+
 		$object->addFilter('parent_filter', 'ParentId = '.$parent_cat_id);
-		
+
 		$view_perm = 1;
 		$object->addFilter('perm_filter', 'PermId = '.$view_perm);
 		if ( !$this->Application->IsAdmin() )
@@ -98,7 +105,7 @@
 							SELECT ResourceId FROM '.$this->Application->getUnitOption($event->Prefix, 'TableName').'
 							WHERE CategoryId = '.$parent_cat_id
 						);
-			
+
 			$sql = 'SELECT DISTINCT(TargetId) FROM '.TABLE_PREFIX.'Relationship
 					WHERE SourceId = '.$resource_id.' AND SourceType = 1';
 			$related_cats = $this->Conn->GetCol($sql);
@@ -108,30 +115,30 @@
 			$related_cats2 = $this->Conn->GetCol($sql);
 			$related_cats2 = is_array($related_cats2) ? $related_cats2 : Array();
 			$related_cats = array_unique( array_merge( $related_cats2, $related_cats ) );
-			
+
 			if($related_cats)
 			{
 				$type_clauses['category_related']['include'] = '%1$s.ResourceId IN ('.implode(',', $related_cats).')';
 				$type_clauses['category_related']['except'] = '%1$s.ResourceId NOT IN ('.implode(',', $related_cats).')';
 			}
-			else 
+			else
 			{
 				$type_clauses['category_related']['include'] = '0';
 				$type_clauses['category_related']['except'] = '1';
 			}
 			$type_clauses['category_related']['having_filter'] = false;
 		}
-		
+
 		if(strpos($types, 'product_related') !== false)
 		{
 			$object->removeFilter('parent_filter');
-			
+
 			$product_id = $event->getEventParam('product_id') ? $event->getEventParam('product_id') : $this->Application->GetVar('p_id');
 			$resource_id = $this->Conn->GetOne('
 							SELECT ResourceId FROM '.$this->Application->getUnitOption('p', 'TableName').'
 							WHERE ProductId = '.$product_id
 						);
-			
+
 			$sql = 'SELECT DISTINCT(TargetId) FROM '.TABLE_PREFIX.'Relationship
 					WHERE SourceId = '.$resource_id.' AND TargetType = 1';
 			$related_cats = $this->Conn->GetCol($sql);
@@ -141,36 +148,36 @@
 			$related_cats2 = $this->Conn->GetCol($sql);
 			$related_cats2 = is_array($related_cats2) ? $related_cats2 : Array();
 			$related_cats = array_unique( array_merge( $related_cats2, $related_cats ) );
-			
+
 			if($related_cats)
 			{
 				$type_clauses['product_related']['include'] = '%1$s.ResourceId IN ('.implode(',', $related_cats).')';
 				$type_clauses['product_related']['except'] = '%1$s.ResourceId NOT IN ('.implode(',', $related_cats).')';
 			}
-			else 
+			else
 			{
 				$type_clauses['product_related']['include'] = '0';
 				$type_clauses['product_related']['except'] = '1';
 			}
 			$type_clauses['product_related']['having_filter'] = false;
 		}
-		
+
 		/********************************************/
-		
+
 		$includes_or_filter =& $this->Application->makeClass('kMultipleFilter');
 		$includes_or_filter->setType(FLT_TYPE_OR);
-		
+
 		$excepts_and_filter =& $this->Application->makeClass('kMultipleFilter');
 		$excepts_and_filter->setType(FLT_TYPE_AND);
 
 		$includes_or_filter_h =& $this->Application->makeClass('kMultipleFilter');
 		$includes_or_filter_h->setType(FLT_TYPE_OR);
-		
+
 		$excepts_and_filter_h =& $this->Application->makeClass('kMultipleFilter');
 		$excepts_and_filter_h->setType(FLT_TYPE_AND);
 
 		$except_types_array=explode(',', $types);
-		
+
 		if ($types){
 			$types_array=explode(',', $types);
 			for ($i=0; $i<sizeof($types_array); $i++){
@@ -186,7 +193,7 @@
 				}
 			}
 		}
-		
+
 		if ($except_types){
 			$except_types_array=explode(',', $except_types);
 			for ($i=0; $i<sizeof($except_types_array); $i++){
@@ -202,24 +209,24 @@
 				}
 			}
 		}
-		
+
 		$object->addFilter('includes_filter', $includes_or_filter);
 		$object->addFilter('excepts_filter', $excepts_and_filter);
-	
+
 		$object->addFilter('includes_filter_h', $includes_or_filter_h, HAVING_FILTER);
 		$object->addFilter('excepts_filter_h', $excepts_and_filter_h, HAVING_FILTER);
 	}
-	
+
 	function GetPassedId(&$event)
 	{
 		if ( $this->Application->IsAdmin() ) return parent::getPassedID($event);
-		
+
 		$ret = $this->Application->GetVar('m_cat_id');
 		if($ret) return $ret;
-		
+
 		return parent::getPassedID($event);
 	}
-	
+
 	/**
 	 * Rebuilds category cache
 	 *
@@ -230,7 +237,7 @@
 		$this->Application->StoreVar('PermCache_UpdateRequired', 1);
 		$event->SetRedirectParam('index_file', 'category/category_maint.php');
 	}
-	
+
 	/**
 	 * Adds calculates fields for item statuses
 	 *
@@ -240,14 +247,14 @@
 	function prepareObject(&$object, &$event)
 	{
 		$object =& $event->getObject( Array('skip_autoload' => true) );
-		
+
 		$object->addCalculatedField('IsNew', '	IF(%1$s.NewItem = 2,
 														IF(%1$s.CreatedOn >= (UNIX_TIMESTAMP() - '.
 															$this->Application->ConfigValue('Category_DaysNew').
 															'*3600*24), 1, 0),
 														%1$s.NewItem
 													)');
-		
+
 	}
 }
 
Index: trunk/core/units/general/cat_event_handler.php
===================================================================
diff -u -N -r4314 -r4446
--- trunk/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 4314)
+++ trunk/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 4446)
@@ -936,7 +936,7 @@
 				case 'text':
 					if( !$this->Application->GetVar('INPORTAL_ON') )
 					{
-						$keywords[$field] = unhtmlentities( $keywords[$field] );
+					$keywords[$field] = unhtmlentities( $keywords[$field] );
 					}
 
 					if(strlen($keywords[$field]) >= $this->Application->ConfigValue('Search_MinKeyword_Length'))
Index: trunk/globals.php
===================================================================
diff -u -N -r4243 -r4446
--- trunk/globals.php	(.../globals.php)	(revision 4243)
+++ trunk/globals.php	(.../globals.php)	(revision 4446)
@@ -500,7 +500,7 @@
 	       if ($r[$i] == "<") {
 	           $i++; continue;
 	       }
-	       $r[$i] = preg_replace("/($k)/i", "$OpenTag\\1$CloseTag", $r[$i]);
+	       $r[$i] = preg_replace('/('.preg_quote($k, '/').')/i', "$OpenTag\\1$CloseTag", $r[$i]);
 	    }
    	}
    	return join("", $r);
Index: trunk/admin/install/inportal_schema.sql
===================================================================
diff -u -N -r4330 -r4446
--- trunk/admin/install/inportal_schema.sql	(.../inportal_schema.sql)	(revision 4330)
+++ trunk/admin/install/inportal_schema.sql	(.../inportal_schema.sql)	(revision 4446)
@@ -19,7 +19,7 @@
   ParentId int(11) NOT NULL default '0',
   Name varchar(255) NOT NULL default '',
   Filename varchar(255) NOT NULL,
-  AutomaticFilename tinyint(3) unsigned NOT NULL default '0',
+  AutomaticFilename tinyint(3) unsigned NOT NULL default '1',
   Description text NOT NULL,
   CreatedOn int(11) NOT NULL default '0',
   EditorsPick tinyint(4) NOT NULL default '0',
Index: trunk/kernel/admin/include/navmenu.php
===================================================================
diff -u -N -r4329 -r4446
--- trunk/kernel/admin/include/navmenu.php	(.../navmenu.php)	(revision 4329)
+++ trunk/kernel/admin/include/navmenu.php	(.../navmenu.php)	(revision 4446)
@@ -35,8 +35,9 @@
                          $admin."/icons/icon46_reviews.gif",$admin."/icons/icon24_reviews.gif",                         
                          NULL,"in-portal:site",NULL,"in-portal:configure_categories",0,"",1,NULL,NULL,NULL,$admin."/icons/icon46_list_reviews.gif");
 
-$objSections->AddSection("in-portal:configure_categories", "la_tab_Settings", "la_tab_Settings", $admin."/config/",
-                         "edit_config.php?&module=In-Portal&section=in-portal:configure_categories",
+$objSections->AddSection("in-portal:configure_categories", "la_tab_Settings", "la_tab_Settings",
+						 $admin."/config/", "edit_config.php?&module=In-Portal&section=in-portal:configure_categories",
+//						 $admin.'/index4.php?section=in-portal:configure_categories&module=In-Portal','kernel4:config/config_universal', 
                          $admin."/icons/icon46_cat_settings.gif", $admin."/icons/icon24_cat_settings.gif",
                          NULL, "in-portal:site","in-portal:advanced_view", "in-portal:configuration_search",0,"",1,NULL,NULL,NULL,$admin."/icons/icon46_list_cat_settings.gif","la_updating_config");
 
@@ -197,36 +198,42 @@
 						NULL,NULL,NULL,$admin."/icons/icon46_list_banlist.gif","la_updating_rules");
 						
 /*Edit Category Section*/
-$objSections->AddSection("in-portal:editcategory_general","la_tab_General",NULL,$admin."/category/",
-                         "javascript:edit_submit('category','CatEditStatus','".$admin."/category/addcategory.php',0);",
-                         $admin."/icons/icon46_struct.gif", $admin."/icons/icon24_navigate.gif",
-                         NULL, "in-portal:browse",NULL, "in-portal:editcategory_items",-1);
+$home_category = $objSession->GetVariable('IsHomeCategory');
 
-$objSections->AddSection("in-portal:editcategory_items","la_tab_Items",NULL, $admin."/category/",
-                         "javascript:edit_submit('category','CatEditStatus','".$admin."/index4_direct.php',0, '&t=category/category_items&prefix=c');",
-                         $admin."/icons/icon46_struct.gif", $admin."/icons/icon24_navigate.gif",
-                         NULL,"in-portal:browse","in-portal:editcategory_general","in-portal:editcategory_relations",-1);
-                         
-$objSections->AddSection("in-portal:editcategory_relations","la_tab_Relations",NULL, $admin."/category/",
-                         "javascript:edit_submit('category','CatEditStatus','".$admin."/category/addcategory_relations.php',0);",
-                         $admin."/icons/icon46_struct.gif", $admin."/icons/icon24_navigate.gif",
-                         NULL,"in-portal:browse","in-portal:editcategory_general","in-portal:editcategory_images",-1);
+if(!$home_category) {
+	$objSections->AddSection("in-portal:editcategory_general","la_tab_General",NULL,$admin."/category/",
+	                         "javascript:edit_submit('category','CatEditStatus','".$admin."/category/addcategory.php',0);",
+	                         $admin."/icons/icon46_struct.gif", $admin."/icons/icon24_navigate.gif",
+	                         NULL, "in-portal:browse",NULL, "in-portal:editcategory_relations",-1);
+	
+	$objSections->AddSection("in-portal:editcategory_relations","la_tab_Relations",NULL, $admin."/category/",
+	                         "javascript:edit_submit('category','CatEditStatus','".$admin."/category/addcategory_relations.php',0);",
+	                         $admin."/icons/icon46_struct.gif", $admin."/icons/icon24_navigate.gif",
+	                         NULL,"in-portal:browse","in-portal:editcategory_general","in-portal:editcategory_images",-1);
+	
+	$objSections->AddSection("in-portal:editcategory_images","la_tab_Images", NULL,$admin."/category/",
+	                         "javascript:edit_submit('category','CatEditStatus','".$admin."/category/addcategory_images.php',0);",
+	                         $admin."/icons/icon46_struct.gif", $admin."/icons/icon24_navigate.gif",
+	                         NULL, "in-portal:browse", "in-portal:editcategory_relations", "in-portal:editcategory_permissions",-1);
 
-$objSections->AddSection("in-portal:editcategory_images","la_tab_Images", NULL,$admin."/category/",
-                         "javascript:edit_submit('category','CatEditStatus','".$admin."/category/addcategory_images.php',0);",
-                         $admin."/icons/icon46_struct.gif", $admin."/icons/icon24_navigate.gif",
-                         NULL, "in-portal:browse", "in-portal:editcategory_relations", "in-portal:editcategory_permissions",-1);
 
-$objSections->AddSection("in-portal:editcategory_permissions","la_tab_Permissions", NULL,$admin."/category/",
+	$objSections->AddSection("in-portal:editcategory_permissions","la_tab_Permissions", NULL,$admin."/category/",
+    	                     "javascript:edit_submit('category','CatEditStatus','".$admin."/category/addcategory_permissions.php',0);",
+        	                 $admin."/icons/icon46_struct.gif", $admin."/icons/icon24_navigate.gif",
+            	             NULL, "in-portal:browse", 'in-portal:editcategory_images', 'in-portal:editcategory_custom', -1);
+
+	$objSections->AddSection("in-portal:editcategory_custom", "la_tab_Custom", NULL, $admin."/category/",
+	                         "javascript:edit_submit('category','CatEditStatus','".$admin."/category/addcategory_custom.php',0);",
+	                         $admin."/icons/icon46_struct.gif", $admin."/icons/icon24_navigate.gif", NULL,
+	                         "in-portal:browse", "in-portal:editcategory_permissions", NULL,-1);
+}
+else {
+	$objSections->AddSection("in-portal:editcategory_permissions","la_tab_Permissions", NULL,$admin."/category/",
                          "javascript:edit_submit('category','CatEditStatus','".$admin."/category/addcategory_permissions.php',0);",
                          $admin."/icons/icon46_struct.gif", $admin."/icons/icon24_navigate.gif",
-                         NULL, "in-portal:browse", "in-portal:editcategory_images","in-portal:editcategory_custom",-1);
+                         NULL, "in-portal:browse", null, null, -1);
+}
 
-$objSections->AddSection("in-portal:editcategory_custom", "la_tab_Custom", NULL, $admin."/category/",
-                         "javascript:edit_submit('category','CatEditStatus','".$admin."/category/addcategory_custom.php',0);",
-                         $admin."/icons/icon46_struct.gif", $admin."/icons/icon24_navigate.gif", NULL,
-                         "in-portal:browse", "in-portal:editcategory_permissions", NULL,-1);
-
 /* category edit subitems */                         
 $objSections->AddSection("in-portal:cat_imageedit","la_tab_Images","la_title_edit_category",$admin."/category/",
                          "javascript:edit_submit('category','CatEditStatus','".$admin."/category/addimage.php',0);",
Index: trunk/core/units/configuration/configuration_config.php
===================================================================
diff -u -N -r4043 -r4446
--- trunk/core/units/configuration/configuration_config.php	(.../configuration_config.php)	(revision 4043)
+++ trunk/core/units/configuration/configuration_config.php	(.../configuration_config.php)	(revision 4446)
@@ -18,7 +18,7 @@
 
 					'TitlePresets'		=>	Array(
 												'default'	=>	Array('tag_params' => Array('conf' => Array('per_page' => -1))),
-																
+												
 												'config_list_general' => Array('prefixes' => Array('conf_List','confg_List'), 'format' => "!la_updating_config!"),
 												'config_list_output' => Array('prefixes' => Array('conf_List','confg_List'), 'format' => "!la_updating_config!"),
 												'config_list_contacts' => Array('prefixes' => Array('conf_List','confg_List'), 'format' => "!la_updating_config!"),
Index: trunk/admin/category/permcacheupdate.php
===================================================================
diff -u -N -r4124 -r4446
--- trunk/admin/category/permcacheupdate.php	(.../permcacheupdate.php)	(revision 4124)
+++ trunk/admin/category/permcacheupdate.php	(.../permcacheupdate.php)	(revision 4446)
@@ -2,17 +2,17 @@
 class clsRecursionStack
 {
 	var $Stack;
-	
+
 	function clsRecursionStack()
 	{
 		$this->Stack = Array();
 	}
-	
+
 	function Push($values)
 	{
 		array_push($this->Stack, $values);
 	}
-	
+
 	function Pop()
 	{
 		if ($this->Count() > 0) {
@@ -22,7 +22,7 @@
 			return false;
 		}
 	}
-	
+
 	function Get()
 	{
 		if ($this->Count() > 0) {
@@ -33,12 +33,12 @@
 			return false;
 		}
 	}
-	
+
 	function Update($values)
 	{
 		$this->Stack[count($this->Stack)-1] = $values;
 	}
-	
+
 	function Count()
 	{
 		return count($this->Stack);
@@ -51,25 +51,25 @@
 	var $Allow;
 	var $Deny;
 	var $CatId;
-		
+
 	function clsCachedPermissions($CatId)
 	{
 		$this->CatId = $CatId;
 	}
-	
+
 	function SetCatId($CatId)
 	{
 		$this->CatId = $CatId;
 	}
-	
+
 	function CheckPermArray($Perm)
 	{
 		if (!isset($this->Allow[$Perm])) {
 			$this->Allow[$Perm] = array();
 			$this->Deny[$Perm] = array();
 		}
 	}
-	
+
 	function AddAllow($Perm, $GroupId)
 	{
 		$this->CheckPermArray($Perm);
@@ -78,7 +78,7 @@
 			$this->RemoveDeny($Perm, $GroupId);
 		}
 	}
-	
+
 	function AddDeny($Perm, $GroupId)
 	{
 		$this->CheckPermArray($Perm);
@@ -87,34 +87,34 @@
 			$this->RemoveAllow($Perm, $GroupId);
 		}
 	}
-	
+
 	function RemoveDeny($Perm, $GroupId)
 	{
 		if (in_array($GroupId, $this->Deny[$Perm])) {
 			array_splice($this->Deny[$Perm], array_search($GroupId, $this->Deny[$Perm]), 1);
 		}
 	}
-	
+
 	function RemoveAllow($Perm, $GroupId)
 	{
 		if (in_array($GroupId, $this->Allow[$Perm])) {
 			array_splice($this->Allow[$Perm], array_search($GroupId, $this->Allow[$Perm]), 1);
 		}
 	}
-	
+
 	function GetInsertSQL()
 	{
 		$values = array();
-		
+
 		$has_deny = array();
-		
+
 		foreach ($this->Deny as $perm => $groups) {
 			if (count($groups) > 0) {
 				$values[] = '('.$this->CatId.', '.$perm.', "", "'.join(',', $groups).'")';
 				$has_deny[] = $perm;
 			}
 		}
-		
+
 		foreach ($this->Allow as $perm => $groups) {
 			if (in_array($perm, $has_deny)) continue;
 			if (count($groups) > 0) {
@@ -123,7 +123,7 @@
 		}
 		if (!$values) return '';
 		$sql = 'INSERT INTO '.GetTablePrefix().'PermCache (CategoryId, PermId, ACL, DACL) VALUES '.join(',', $values);
-		return $sql;										
+		return $sql;
 	}
 }
 
@@ -134,6 +134,8 @@
 	var $totalCats;
 	var $doneCats;
 	var $table;
+
+	var $root_prefixes = Array();
 	
 	/**
 	 * Kernel Application
@@ -147,18 +149,22 @@
 	 * @var kDBConnection
 	 */
 	var $Conn = null;
-	
+
 	function clsCacheUpdater($continuing=false)
 	{
 		$this->Application =& kApplication::Instance();
 		$this->Conn =& $this->Application->GetADODBConnection();
+
+		foreach ($this->Application->ModuleInfo as $module_name => $module_info) {
+			$this->root_prefixes[ $module_info['RootCat'] ] = $module_info['Var'];
+		}
 		
 		$this->conn =& GetADODBConnection();
 		$this->iteration = 0;
 		$this->table=$GLOBALS['objSession']->GetEditTable('permCacheUpdate');
 
 		if (!$continuing) {
-			$this->Stack =& new clsRecursionStack();	
+			$this->Stack =& new clsRecursionStack();
 			$sql = 'DELETE FROM '.GetTablePrefix().'PermCache';
 			$this->conn->Execute($sql);
 			$this->initData();
@@ -178,29 +184,29 @@
 		$sql='SELECT data FROM '.$this->table;
 		if( $rs = $this->conn->Execute($sql) )
 			$tmp = unserialize($rs->fields['data']);
-		
+
 		$this->totalCats = isset($tmp['totalCats']) ? $tmp['totalCats'] : 0;
 		$this->doneCats = isset($tmp['doneCats']) ? $tmp['doneCats'] : 0;
 		if(isset($tmp['stack']))
 			$this->Stack = $tmp['stack'];
 		else
 			$this->Stack = & new clsRecursionStack();
-		
-	}	
+
+	}
 	function setData()
 	{
 		$tmp=Array
 		(
 			'totalCats'	=>$this->totalCats,
 			'doneCats'	=>$this->doneCats,
 			'stack'		=>$this->Stack,
-			
+
 		);
 		$sql='DELETE FROM '.$this->table;
 		$this->conn->Execute($sql);
 		$sql='INSERT '.$this->table.' SET data="'.addslashes(serialize($tmp)).'"';
 		$this->conn->Execute($sql);
-	}	
+	}
 	function initData()
 	{
 		$sql='CREATE TABLE '.$this->table.'(data LONGTEXT)';
@@ -216,8 +222,8 @@
 	{
 		$sql='DROP TABLE IF EXISTS '.$this->table;
 		$this->conn->Execute($sql);
-	}	
-	
+	}
+
 	function DoTheJob()
 	{
 		$data = $this->Stack->Get();
@@ -229,27 +235,27 @@
 			$data['item_template'] = '';
 			$this->Stack->Push($data);
 		}
-		
+
 		if (!isset($data['queried'])) {
-		
+
 			$this->QueryTitle($data);
 			$this->QueryChildren($data);
 			$this->QueryPermissions($data);
 			$data['queried'] = 1;
-			
+
 			if($sql = $data['perms']->GetInsertSQL())
 			{
 				$this->conn->Execute($sql);
 				$this->doneCats++;
 			}
 			$this->iteration++;
 		}
-		
+
 		// start with first child if we haven't started yet
 		if (!isset($data['current_child'])) $data['current_child'] = 0;
-		
+
 		// if we have more children
-		if (isset($data['children'][$data['current_child']])) 
+		if (isset($data['children'][$data['current_child']]))
 		{
 			$next_data = Array();
 			$next_data['title'] = $data['title'];
@@ -268,7 +274,7 @@
 			$this->UpdateCachedPath($data);
 			$this->Stack->Pop(); //remove ourself from stack if we have finished all the childs (or there are none)
 			// we are getting here if we finished with current level, so check if it's first level - then bail out.
-			return $this->Stack->Count() > 0; 
+			return $this->Stack->Count() > 0;
 		}
 	}
 	function UpdateCachedPath(&$data)
@@ -277,48 +283,68 @@
 								'NamedParentPath'		=>	implode('/', $data['named_path'] ),
 								'CachedCategoryTemplate'=>	$data['category_template'],
 								'CachedItemTemplate'	=>	$data['item_template'],
-						);	
-		
-		$this->Conn->doUpdate($fields_hash, TABLE_PREFIX.'Category', 'CategoryId = '.$data['current_id']);				
+						);
+
+		$this->Conn->doUpdate($fields_hash, TABLE_PREFIX.'Category', 'CategoryId = '.$data['current_id']);
 	}
-	
+
 	function QueryTitle(&$data)
 	{
+		$category_id = $data['current_id'];
+		
 		$sql = 'SELECT Name, Filename, CategoryTemplate, ItemTemplate
 				FROM '.GetTablePrefix().'Category
-				WHERE CategoryId = '.$data['current_id'];
-		
+				WHERE CategoryId = '.$category_id;
+
 		$rs = $this->conn->Execute($sql);
-		
+
 		if ($rs && !$rs->EOF)
 		{
 			$data['title'][] = $rs->fields['Name'];
 			$data['named_path'][] = $rs->fields['Filename'];
+
+			// it is one of the modules root category
+			$root_prefix = isset($this->root_prefixes[$category_id]) ? $this->root_prefixes[$category_id] : false;
+			if ($root_prefix) {
+				$fields_hash = Array();
+				if (!$rs->fields['CategoryTemplate']) {
+					$rs->fields['CategoryTemplate'] = $this->Application->ConfigValue($root_prefix.'_CategoryTemplate');
+					$fields_hash['CategoryTemplate'] = $rs->fields['CategoryTemplate'];
+				}
+				
+				if (!$rs->fields['ItemTemplate']) {
+					$rs->fields['ItemTemplate'] = $this->Application->ConfigValue($root_prefix.'_ItemTemplate');
+					$fields_hash['ItemTemplate'] = $rs->fields['ItemTemplate'];
+				}
+				
+				$this->Conn->doUpdate($fields_hash, TABLE_PREFIX.'Category', 'CategoryId = '.$category_id);
+			}
 			
 			// if explicitly set, then use it; use parent template otherwise
 			if ($rs->fields['CategoryTemplate']) {
 				$data['category_template'] = $rs->fields['CategoryTemplate'];
 			}
+			
 			if ($rs->fields['ItemTemplate']) {
 				$data['item_template'] = $rs->fields['ItemTemplate'];
 			}
 		}
 	}
-	
+
 	function QueryChildren(&$data)
 	{
 		$sql = sprintf('SELECT CategoryId FROM '.GetTablePrefix().'Category WHERE ParentId = %s',
 										$data['current_id']);
 		$rs = $this->conn->Execute($sql);
-		
+
 		$data['children'] = Array();
 		while ($rs && !$rs->EOF)
 		{
 			$data['children'][] = $rs->fields['CategoryId'];
 			$rs->MoveNext();
 		}
 	}
-	
+
 	function QueryPermissions(&$data)
 	{
 		$sql = sprintf('SELECT ipc.PermissionConfigId, ip.GroupId, ip.PermissionValue FROM '.GetTablePrefix().'Permissions AS ip
@@ -327,12 +353,12 @@
 										WHERE CatId = %s AND Permission LIKE "%%.VIEW"',
 										$data['current_id']);
 		$rs = $this->conn->Execute($sql);
-		
+
 		//create permissions array only if we don't have it yet (set by parent)
 		if (!isset($data['perms'])) {
 			$data['perms'] = new clsCachedPermissions($data['current_id']);
 		}
-		
+
 		while ($rs && !$rs->EOF)
 		{
 			if ($rs->fields['PermissionValue'] == 1) {
Index: trunk/kernel/units/config_general/config_general_tag_processor.php
===================================================================
diff -u -N -r4243 -r4446
--- trunk/kernel/units/config_general/config_general_tag_processor.php	(.../config_general_tag_processor.php)	(revision 4243)
+++ trunk/kernel/units/config_general/config_general_tag_processor.php	(.../config_general_tag_processor.php)	(revision 4446)
@@ -79,9 +79,11 @@
 			$next_params['cat_id'] = $res['ParentId'];
 			return $this->CategoryPath($next_params).$this->Application->ParseBlock($block_params);
 		}
-	}	
-	function SaveWarning($params){
+	}
 		
+	function SaveWarning($params)
+	{
+		
 		$object=&$this->Application->recallObject($this->getPrefixSpecial());
 		$root_cat=$object->GetDBField("RootCat");
 		$stored_cat=$this->Application->RecallVar("StoredRootCatId", "");
Index: trunk/admin/install/upgrades/inportal_upgrade_v1.1.8.sql
===================================================================
diff -u -N -r4108 -r4446
--- trunk/admin/install/upgrades/inportal_upgrade_v1.1.8.sql	(.../inportal_upgrade_v1.1.8.sql)	(revision 4108)
+++ trunk/admin/install/upgrades/inportal_upgrade_v1.1.8.sql	(.../inportal_upgrade_v1.1.8.sql)	(revision 4446)
@@ -1,5 +1,5 @@
-UPDATE SearchConfig SET CustomFieldId = NULL WHERE CustomFieldId = 0;
 ALTER TABLE SearchConfig CHANGE CustomFieldId CustomFieldId INT(11) NULL DEFAULT NULL;
+UPDATE SearchConfig SET CustomFieldId = NULL WHERE CustomFieldId = 0;
 UPDATE SearchConfig SET SimpleSearch = -1 WHERE TableName = 'PortalUser' AND ModuleName = 'In-Portal';
 
 INSERT INTO ConfigurationAdmin VALUES ('SearchRel_Keyword_category', 'la_config_SearchRel_DefaultKeyword', 'la_text_keyword', 'text', NULL, NULL, 0, 1);
@@ -13,5 +13,6 @@
 CREATE TABLE CategoryCustomData (CustomDataId int(11) NOT NULL auto_increment, ResourceId int(10) unsigned NOT NULL default '0', UNIQUE KEY ResourceId (ResourceId), PRIMARY KEY  (CustomDataId));
 
 ALTER TABLE Category ADD CategoryTemplate VARCHAR(255) NOT NULL, ADD ItemTemplate VARCHAR(255) NOT NULL, ADD CachedCategoryTemplate VARCHAR(255) NOT NULL, ADD CachedItemTemplate VARCHAR(255) NOT NULL;
+ALTER TABLE Category CHANGE AutomaticFilename AutomaticFilename TINYINT(3) UNSIGNED NOT NULL DEFAULT '1';
 
 UPDATE Modules SET Version = '1.1.8' WHERE Name = 'In-Portal';
\ No newline at end of file
Index: trunk/kernel/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r4320 -r4446
--- trunk/kernel/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 4320)
+++ trunk/kernel/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 4446)
@@ -1,20 +1,32 @@
 <inp2:m_block name="section_header"/>
-
+	<inp2:m_if check="m_ParamEquals" name="prefix" value="" inverse="inverse">
+		<inp2:m_RenderElement name="section_header_new" pass_params="true"/>
+	<inp2:m_else />
 		<table cellpadding="0" cellspacing="0" border="0" width="100%">
 			<tr class="section_header_bg">
 				<td valign="top" class="admintitle" align="left" style="padding-top: 2px; padding-bottom: 2px;">
-		    		<img width="46" height="46" src="<inp2:m_if check="m_ParamEquals" name="prefix" value="" inverse="inverse"><inp2:ModulePath/></inp2:m_if>img/icons/<inp2:m_GetSectionIcon icon="$icon"/>.gif" align="absmiddle" title="<inp2:m_GetSectionTitle phrase="$title"/>">&nbsp;<inp2:m_GetSectionTitle phrase="$title"/>
-
+		    		<img width="46" height="46" src="img/icons/<inp2:m_GetSectionIcon icon="$icon"/>.gif" align="absmiddle" title="<inp2:m_GetSectionTitle phrase="$title"/>">&nbsp;<inp2:m_GetSectionTitle phrase="$title"/>
 		   		</td>
 			</tr>
 		</table>
+	</inp2:m_if>
 <inp2:m_blockend/>
 
+<inp2:m_DefineElement name="section_header_new">
+		<table cellpadding="0" cellspacing="0" border="0" width="100%">
+			<tr style="background: url(<inp2:ModulePath module="#session#"/>img/logo_bg.gif) no-repeat top right;">
+				<td valign="top" class="admintitle" align="left" style="padding-top: 2px; padding-bottom: 2px;">
+		    		<img width="46" height="46" src="<inp2:ModulePath/>img/icons/<inp2:m_GetSectionIcon icon="$icon"/>.gif" align="absmiddle" title="<inp2:m_GetSectionTitle phrase="$title"/>">&nbsp;<inp2:m_GetSectionTitle phrase="$title"/>
+		   		</td>
+			</tr>
+		</table>
+</inp2:m_DefineElement>
+
 <inp2:m_block name="blue_bar"/>
 	<table border="0" cellpadding="2" cellspacing="0" class="tableborder_full" width="100%" height="30">
 		<tr>
 			<td class="header_left_bg" nowrap width="80%" valign="middle">
-				<span class="tablenav_link" id="blue_bar"><inp2:$prefix_SectionTitle title_preset="$title_preset" title="Invalid OR Missing title preset" cut_first="100"/></span>
+				<span class="tablenav_link" id="blue_bar"><inp2:$prefix_SectionTitle title_preset="$title_preset" title="Invalid OR Missing title preset [#preset_name#]" cut_first="100"/></span>
 			</td>
 			<td align="right" class="tablenav" width="20%" valign="middle">
 				<script>
Index: trunk/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -N -r4314 -r4446
--- trunk/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 4314)
+++ trunk/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 4446)
@@ -146,7 +146,7 @@
 				// in case if category is deleted
 				return '';
 			}
-				
+
 			$block_params['cat_name'] = $res['Name'];
 			$block_params['cat_id'] = $res['CategoryId'];
 
Index: trunk/admin/category/addcategory.php
===================================================================
diff -u -N -r4108 -r4446
--- trunk/admin/category/addcategory.php	(.../addcategory.php)	(revision 4108)
+++ trunk/admin/category/addcategory.php	(.../addcategory.php)	(revision 4446)
@@ -7,9 +7,11 @@
 require_once FULL_PATH.'/kernel/startup.php';
 // new startup: end
 
-require_once ($pathtoroot.$admin."/include/elements.php"); 
-require_once ($pathtoroot."kernel/admin/include/navmenu.php"); 
-//require_once ($pathtolocal."admin/include/navmenu.php"); 
+$objSession->SetVariable('IsHomeCategory', 0);
+
+require_once ($pathtoroot.$admin."/include/elements.php");
+require_once ($pathtoroot."kernel/admin/include/navmenu.php");
+//require_once ($pathtolocal."admin/include/navmenu.php");
 require_once($pathtoroot.$admin."/toolbar.php");
 
 unset($objEditItems);
@@ -45,15 +47,15 @@
     $objRelList->CreateEmptyEditTable("RelationshipId");    
     $objCustomDataList->CreateEmptyEditTable('c');
     $objImages->CreateEmptyEditTable("ResourceId");
-    
+
     $TitleVerb = prompt_language("la_Text_Adding");
 }
 else
-{   
+{
     if(isset($_POST["catlist"]))
-    {   
+    {
     	$cats = $_POST["catlist"];
-        $objCatList->CopyToEditTable("CategoryId",$cats); 
+        $objCatList->CopyToEditTable("CategoryId",$cats);
     	$objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable);
         /* make a copy of the relationship records */
         $ids = $objEditItems->GetResourceIDList();
@@ -65,46 +67,46 @@
         $en = 0;
     }
     else
-    {  
+    {
     	if($_GET["item"])
     	{
     		/*shortcut to edit link */
         	$objCatList->CopyToEditTable("ResourceId",$_GET["item"]);
         	$backurl = $_GET["return"];
-    	}   
-    		
+    	}
+
 		//Multiedit init
 		$en = (int)$_GET["en"];
 		$objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable);
-		
+
 		//$ids = $objEditItems->GetResourceIDList();
         //$objRelList->CopyToEditTable("SourceId", $ids);
         //$objCustomDataList->CopyToEditTable("ResourceId",$ids);
         //$objImages->CopyToEditTable("ResourceId", $ids);
-		
+
 		$itemcount=$objEditItems->NumItems();
 		$c = $objEditItems->GetItemByIndex($en);
     }
-	
+
     if($itemcount>1)
-	{    
+	{
 		if ($en+1 == $itemcount)
 			$en_next = -1;
 	  	else
 			$en_next = $en+1;
-	
+
 	    if ($en == 0)
 			$en_prev = -1;
 		else
-			$en_prev = $en-1;	
+			$en_prev = $en-1;
 	}
-		
+
     $action = "m_edit_category";
     $TitleVerb = prompt_language("la_Text_Editing");
 }
 
 $envar = "env=" . BuildEnv() . "&en=$en";
-$section = 'in-portal:editcategory_general'; 
+$section = 'in-portal:editcategory_general';
 
 if (strlen($c->Get("Name")))
 	$editing_category_title = "'".$c->Get("Name")."' ";
@@ -126,10 +128,10 @@
 
 if ( isset($en_prev) || isset($en_next) )
 {
-  $url = $RootUrl.$admin."/category/addcategory.php"; 
+  $url = $RootUrl.$admin."/category/addcategory.php";
   $StatusField = "CatEditStatus";
   $form = "category";
-  MultiEditButtons($objCatToolBar,$en_next,$en_prev,$form,$StatusField,$url,$sec->Get("OnClick"),'','la_PrevCategory','la_NextCategory');  
+  MultiEditButtons($objCatToolBar,$en_next,$en_prev,$form,$StatusField,$url,$sec->Get("OnClick"),'','la_PrevCategory','la_NextCategory');
 }
 
 int_header($objCatToolBar,NULL,$title);
@@ -306,7 +308,7 @@
         	if (is_object($cfield)) {
 				$f->default_value = $c->GetCustomFieldValue($n, '', 0, true);
         	}
-            print "<tr ".int_table_color_ret().">\n"; 
+            print "<tr ".int_table_color_ret().">\n";
             print "  <td valign=\"top\" class=\"text\">".$f->GetPrompt()."</td>\n";
             print "  <td nowrap>".$f->ItemFormElement($tab_index++)."</TD>";       
             if(is_object($f->NextItem))
@@ -320,7 +322,7 @@
         }
     }
   }
-} 
+}
 ?>
 	<input type="hidden" name="ParentId" value="<?php echo $c->Get("ParentId"); ?>">
 	<input type="hidden" name="CategoryId" value="<?php echo $c->parsetag("cat_id"); ?>">
@@ -339,11 +341,11 @@
     	document.getElementById('filename').readOnly = $checked;
     }
     reflect_filename();
-</SCRIPT>  
+</SCRIPT>
 <FORM method="POST" NAME="save_edit" ID="save_edit">
   <input type="hidden" name="CatEditStatus" VALUE="0">
 </FORM>
-<?php 
+<?php
 	MarkFields('category');
-	int_footer(); 
+	int_footer();
 ?>
\ No newline at end of file
Index: trunk/kernel/admin_templates/incs/config_blocks.tpl
===================================================================
diff -u -N -r4043 -r4446
--- trunk/kernel/admin_templates/incs/config_blocks.tpl	(.../config_blocks.tpl)	(revision 4043)
+++ trunk/kernel/admin_templates/incs/config_blocks.tpl	(.../config_blocks.tpl)	(revision 4446)
@@ -1,9 +1,9 @@
 <inp2:m_DefineElement name="config_edit_text">
-	<input type="text" name="<inp2:InputName field="$field"/>" value="<inp2:Field field="$field" />" />
+	<input type="text" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:InputName field="$field"/>" value="<inp2:Field field="$field" />" />
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_password">
-	<input type="password" primarytype="password" name="<inp2:InputName field="$field"/>" id="<inp2:InputName field="$field"/>" value="" />
+	<input type="password" tabindex="<inp2:m_get param="tab_index"/>" primarytype="password" name="<inp2:InputName field="$field"/>" id="<inp2:InputName field="$field"/>" value="" />
 	<input type="password" name="verify_<inp2:InputName field="$field"/>" id="verify_<inp2:InputName field="$field"/>" value="" />
 	&nbsp;<span class="error" id="error_<inp2:InputName field="$field"/>"></span>
 </inp2:m_DefineElement>
@@ -13,29 +13,30 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_select">
-	<select name="<inp2:InputName field="$field"/>">
-		<inp2:PredefinedOptions field="$field" tabindex="$pass_tabindex" block="config_edit_option" selected="selected"/>
+	<select name="<inp2:InputName field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>">
+		<inp2:PredefinedOptions field="$field" block="config_edit_option" selected="selected"/>
 	</select>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="config_edit_checkbox">
+<inp2:m_DefineElement name="config_edit_checkbox" field_class="">
 	<input type="hidden" id="<inp2:InputName field="$field"/>" name="<inp2:InputName field="$field"/>" value="<inp2:Field field="$field" db="db"/>">
 	<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:m_param name="field"/>" name="_cb_<inp2:InputName field="$field"/>" <inp2:Field field="$field" checked="checked" db="db"/> class="<inp2:m_param name="field_class"/>" onclick="update_checkbox(this, document.getElementById('<inp2:InputName field="$field"/>'))">
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_textarea">
-	<textarea name="<inp2:InputName field="$field"/>" <inp2:m_param name="field_params" />><inp2:Field field="$field" /></textarea>
+	<textarea tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:InputName field="$field"/>" <inp2:m_param name="field_params" />><inp2:Field field="$field" /></textarea>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_radio_item">
 	<input type="radio" <inp2:m_param name="checked"/> name="<inp2:InputName field="$field"/>" id="<inp2:InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_param name="option"/></label>&nbsp;
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_radio">
-			<inp2:PredefinedOptions field="$field" tabindex="$pass_tabindex" block="config_radio_item" selected="checked"/>
+		<inp2:PredefinedOptions field="$field" tabindex="$pass_tabindex" block="config_radio_item" selected="checked"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_block">
+	<inp2:m_inc param="tab_index" by="1"/>
 	<inp2:m_if check="m_ParamEquals" name="show_heading" value="1">
 		<tr class="subsectiontitle">
 			<td colspan="3">
@@ -58,6 +59,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_block1">
+	<inp2:m_inc param="tab_index" by="1"/>
 	<inp2:m_if check="m_ParamEquals" name="show_heading" value="1">
 		<tr class="subsectiontitle">
 			<td colspan="3">
Index: trunk/core/kernel/db/db_connection.php
===================================================================
diff -u -N -r4329 -r4446
--- trunk/core/kernel/db/db_connection.php	(.../db_connection.php)	(revision 4329)
+++ trunk/core/kernel/db/db_connection.php	(.../db_connection.php)	(revision 4446)
@@ -567,6 +567,8 @@
 		
 		function doUpdate($fields_hash, $table, $key_clause)
 		{
+			if (!$fields_hash) return true;
+			
 			$fields_sql = '';
 			foreach ($fields_hash as $field_name => $field_value) {
 				$fields_sql .= '`'.$field_name.'` = '.$this->qstr($field_value).',';
Index: trunk/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -N -r4287 -r4446
--- trunk/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 4287)
+++ trunk/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 4446)
@@ -1133,7 +1133,7 @@
 		$preset_name = replaceModuleSection($params['title_preset']);
 		$title_presets = $this->Application->getUnitOption($this->Prefix,'TitlePresets');
 		$title_info = getArrayValue($title_presets, $preset_name);
-		if($title_info === false) return $params['title'];
+		if($title_info === false) return str_replace('#preset_name#', $preset_name, $params['title']);
 
 		if( getArrayValue($title_presets,'default') )
 		{
@@ -1458,13 +1458,17 @@
 	function ModulePath($params)
 	{
 		$force_module = getArrayValue($params, 'module');
-		if($force_module)
-		{
-			$force_module = strtolower($force_module);
+		if ($force_module) {
+			if ($force_module == '#session#') {
+				$force_module = $this->Application->RecallVar('module');
+			}
+			else {
+				$force_module = strtolower($force_module);
+			}
+			
 			$module_folder = trim( $this->Conn->GetOne('SELECT Path FROM '.TABLE_PREFIX.'Modules WHERE LOWER(Name) = '.$this->Conn->qstr($force_module) ), '/');
 		}
-		else
-		{
+		else {
 			$module_folder = $this->Application->getUnitOption($this->Prefix, 'ModuleFolder');
 		}
 		return '../../'.$module_folder.'/admin_templates/';
Index: trunk/admin/email/sendmail.php
===================================================================
diff -u -N -r4243 -r4446
--- trunk/admin/email/sendmail.php	(.../sendmail.php)	(revision 4243)
+++ trunk/admin/email/sendmail.php	(.../sendmail.php)	(revision 4446)
@@ -27,17 +27,17 @@
 require_once($pathtoroot.$admin."/browse/toolbar.php");
 
 //Set Section
-$section = 'in-portal:sendmail'; 
+$section = 'in-portal:sendmail';
 
 //Set Environment Variable
-$envar = "env=" . BuildEnv(); 
+$envar = "env=" . BuildEnv();
 
 $objListToolBar = new clsToolBar();
 
 $objListToolBar->Set("section",$section);
 $objListToolBar->Set("load_menu_func","");
 $objListToolBar->Set("CheckClass","");
-  
+
 $listImages = array();
                     //$img, $alt, $link, $onMouseOver, $onMouseOut, $onClick
 
@@ -59,62 +59,62 @@
 else
   $action = "email_single_send";
 if ($addr_list != '' || $addr_list != null) {
-	$addresses = implode(",",$addr_list);  
+	$addresses = implode(",",$addr_list);
 }
 ?>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-<form ID="sendmail" name="sendmail" action="<?php echo $adminURL."/email/do_send.php?env=".BuildEnv(); ?>&destform=popup" enctype="multipart/form-data" method=POST>   
+<form ID="sendmail" name="sendmail" action="<?php echo $adminURL."/email/do_send.php?env=".BuildEnv(); ?>&destform=popup" enctype="multipart/form-data" method=POST>
   <INPUT TYPE="HIDDEN" NAME="EmailState" VALUE="<?php echo $action; ?>">
   <?php int_subsection_title(admin_language("la_tab_General")); ?>
 
-  <tr <?php int_table_color(); ?>> 
+  <tr <?php int_table_color(); ?>>
     <td valign="top"><span class="text"><?php echo admin_language("la_prompt_To"); ?></span></td>
-    <td> 
+    <td>
 
     <SPAN CLASS="text"><?php echo implode("; ", $reciplist); ?></SPAN>
       <input type="hidden" name="sendto" class="text" value="<?php echo $recip_ids; ?>">
       <INPUT TYPE="HIDDEN" NAME="sendaddrs" VALUE="<?php echo $addresses; ?>">
     </td>
     <td><span ID="valTo" class="validation_error"><?php echo admin_language("la_val_RequiredField"); ?></span></td>
   </tr>
-  <tr <?php int_table_color(); ?>> 
+  <tr <?php int_table_color(); ?>>
     <td valign="top"><span class="text"><?php echo admin_language("la_prompt_Subject"); ?></span></td>
-    <td> 
+    <td>
       <input type="text" name="subject" class="text" size="60" value="<?php echo ""; ?>">
     </td>
     <td><span ID="valSubject" class="validation_error"><?php echo admin_language("la_val_RequiredField"); ?></span></td>
   </tr>
 
-  <tr <?php int_table_color(); ?>> 
+  <tr <?php int_table_color(); ?>>
     <td valign="top"><span class="text"><?php echo admin_language("la_prompt_Attatchment"); ?></span></td>
-    <td> 
+    <td>
       <input type="file" name="attatchment" class="text" size="60">
     </td>
     <td></td>
   </tr>
 
   <?php int_subsection_title(admin_language("la_tab_Message")); ?>
-  <tr <?php int_table_color(); ?>> 
+  <tr <?php int_table_color(); ?>>
     <td valign="top"><span class="text"><?php echo admin_language("la_prompt_html_version"); ?></span>
    		<br />
          <a href="#">
          <img src="<?php echo $rootURL; ?>admin/icons/icon24_link_editor.gif" style="cursor:hand" border="0"
    ONCLICK="document.forms[0].elements[0].checked=true; OpenEditor('&section=<?php echo $section; ?>','sendmail','messageHTML');">
-         </a>    
-    
+         </a>
+
     </td>
     <td valign="top" COLSPAN=2>
          <textarea name="messageHTML" id="messageHTML" rows="5" cols="60">Type your Message Here</textarea>
     </td>
   </tr>
-  <tr <?php int_table_color(); ?>> 
+  <tr <?php int_table_color(); ?>>
     <td valign="top"><span class="text"><?php echo admin_language("la_prompt_text_version"); ?></span></td>
     <td valign="top" COLSPAN=2>
          <textarea name="messageTEXT" id="messageTEXT" rows="5" cols="60">Type your Message Here</textarea>
     </td>
   </tr>
-  
+
 </FORM>
 </TABLE>
 <script language="JavaScript">
Index: trunk/admin/category/addcategory_permissions.php
===================================================================
diff -u -N -r3830 -r4446
--- trunk/admin/category/addcategory_permissions.php	(.../addcategory_permissions.php)	(revision 3830)
+++ trunk/admin/category/addcategory_permissions.php	(.../addcategory_permissions.php)	(revision 4446)
@@ -20,6 +20,12 @@
 require_once FULL_PATH.'/kernel/startup.php';
 // new startup: end
 
+// Permissions tab is opened first -> Home category live permissions editing
+$item_resource_id = $application->GetVar('item');
+if (($item_resource_id !== false) && ((int)$item_resource_id === 0)) {
+	$objSession->SetVariable('IsHomeCategory', 1);
+}
+
 require_once ($pathtoroot.$admin."/include/elements.php"); 
 require_once ($pathtoroot."kernel/admin/include/navmenu.php"); 
 //require_once ($pathtolocal."admin/include/navmenu.php"); 
@@ -41,10 +47,15 @@
 $objEditItems = new clsCatList();
 $objEditItems->SourceTable = $objSession->GetEditTable("Category");
 
+$live_editing = $objSession->GetVariable('IsHomeCategory');
+if ($live_editing) {
+	$objEditItems->SourceTable = TABLE_PREFIX.'Category';
+}
+
 //Multiedit init
 $en = (int)$_GET["en"];
-$objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable);
-$itemcount=$objEditItems->NumItems();
+$objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable.($objEditItems->isLiveTable() ? ' WHERE CategoryId = 0' : ''));
+$itemcount = $objEditItems->NumItems();
 if(isset($_GET["en"]))
 {
   $c = $objEditItems->GetItemByIndex($en);
Index: trunk/kernel/include/parseditem.php
===================================================================
diff -u -N -r4077 -r4446
--- trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 4077)
+++ trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 4446)
@@ -683,6 +683,12 @@
 	 */
 	var $Conn = null;
 	
+	function isLiveTable()
+	{
+		global $objSession;
+		return !preg_match('/'.GetTablePrefix().'ses_'.$objSession->GetSessionKey().'_edit_(.*)/', $this->SourceTable);
+	}
+  
     function SetTable($action, $table_name = null) // new by Alex
     {
     	// $action = {'live', 'restore','edit'}
Index: trunk/kernel/units/configuration/configuration_tag_processor.php
===================================================================
diff -u -N -r4225 -r4446
--- trunk/kernel/units/configuration/configuration_tag_processor.php	(.../configuration_tag_processor.php)	(revision 4225)
+++ trunk/kernel/units/configuration/configuration_tag_processor.php	(.../configuration_tag_processor.php)	(revision 4446)
@@ -34,7 +34,7 @@
 			$this->Application->SetVar( $this->getPrefixSpecial().'_id', $list->GetDBField($id_field) ); // for edit/delete links using GET
 			
 			// using 2 blocks for drawing o row in case if current & next record titles match
-			$next_item_prompt = $list->Records[$list->CurrentIndex + 1]['prompt'];
+			$next_item_prompt = $list->CurrentIndex + 1 < $list->RecordsCount ? $list->Records[$list->CurrentIndex + 1]['prompt'] : '';
 			$this_item_prompt = $list->GetDBField('prompt');
 	
 			if ($next_item_prompt == $this_item_prompt) {
Index: trunk/kernel/units/categories/categories_config.php
===================================================================
diff -u -N -r4329 -r4446
--- trunk/kernel/units/categories/categories_config.php	(.../categories_config.php)	(revision 4329)
+++ trunk/kernel/units/categories/categories_config.php	(.../categories_config.php)	(revision 4446)
@@ -68,7 +68,7 @@
 									            'ParentId' => Array('type' => 'int','not_null' => '1','default' => '0'),
 									            'Name' => Array('type' => 'string','not_null' => '1','default' => ''),
 									            'Filename' => Array('type' => 'string','not_null' => '1','default' => ''),
-            									'AutomaticFilename' => Array('type' => 'int','not_null' => '1','default' => '0'),
+            									'AutomaticFilename' => Array('type' => 'int','not_null' => '1','default' => '1'),
 									            'Description' => Array('type' => 'string','not_null' => '1','default' => ''),
 									            'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default'=>'#NOW#', 'not_null' => '1'),
 									            'EditorsPick' => Array('type' => 'int','default' => ''),
Index: trunk/kernel/include/portalgroup.php
===================================================================
diff -u -N -r4243 -r4446
--- trunk/kernel/include/portalgroup.php	(.../portalgroup.php)	(revision 4243)
+++ trunk/kernel/include/portalgroup.php	(.../portalgroup.php)	(revision 4446)
@@ -212,14 +212,13 @@
         global $var_list_update, $objConfig, $objSession;
         $tagname = is_object($tag) ? $tag->name : $tag;
         
-        $is_temp = strpos($this->SourceTable, $objSession->Get('SessionKey') ) !== false;
-        
         switch($tagname)
         {	
 			case 'GroupName':
 				$db =& GetADODBConnection();
-				$table = $is_temp ? $objSession->GetEditTable('PortalGroup') : GetTablePrefix().'PortalGroup';
-				$sql = 'SELECT Name FROM '.$table.' WHERE GroupId = '.$this->Get('GroupId');
+				$sql = 'SELECT Name
+						FROM '.TABLE_PREFIX.'PortalGroup
+						WHERE GroupId = '.$this->Get('GroupId');
 				return $db->GetOne($sql);
             	break;
  			
Index: trunk/kernel/admin_templates/config/config_universal.tpl
===================================================================
diff -u -N -r4222 -r4446
--- trunk/kernel/admin_templates/config/config_universal.tpl	(.../config_universal.tpl)	(revision 4222)
+++ trunk/kernel/admin_templates/config/config_universal.tpl	(.../config_universal.tpl)	(revision 4446)
@@ -5,7 +5,7 @@
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
 <inp2:m_ParseBlock prefix="conf" name="section_header" icon="icon46_settings_#section#" title="!la_tab_Config#section#!"/>
 
-<inp2:m_ParseBlock name="blue_bar" prefix="conf" title_preset="config_list_#section#" module="in-commerce" icon="icon46_settings_#section#"/>
+<inp2:m_ParseBlock name="blue_bar" prefix="conf" title_preset="config_list_#section#" icon="icon46_settings_#section#"/>
 
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
Index: trunk/kernel/action.php
===================================================================
diff -u -N -r4358 -r4446
--- trunk/kernel/action.php	(.../action.php)	(revision 4358)
+++ trunk/kernel/action.php	(.../action.php)	(revision 4446)
@@ -2326,7 +2326,10 @@
 	{
 	    $adodbConnection = &GetADODBConnection();
 	//    $sql = "SELECT * FROM ".$objSession->GetEditTable("Category")." WHERE CategoryId=0";
-	    $sql = "SELECT ParentId FROM ".$objSession->GetEditTable("Category")." WHERE CategoryId=-1";
+		$category_table = $objSession->GetVariable('IsHomeCategory') ? TABLE_PREFIX.'Category' : $objSession->GetEditTable('Category');
+	    $sql = 'SELECT ParentId
+	    		FROM '.$category_table.'
+	    		WHERE CategoryId = -1';
 
 	    $rs = $adodbConnection->Execute($sql);
 	    while ($rs && !$rs->EOF)
@@ -2335,17 +2338,20 @@
 	        $rs->MoveNext();
 	    }
 
-	    $cat_ids = $objCatList->CopyFromEditTable("CategoryId");
-	    if ($cat_ids) {
-			$objCustomDataList->CopyFromEditTable('c');
-		}
-	    $objCatList->Clear();
-
 	    if($_REQUEST['CategoryId'] > 0) // not root category is updated
 	    {
+		    $cat_ids = $objCatList->CopyFromEditTable("CategoryId");
+		    if ($cat_ids) {
+				$objCustomDataList->CopyFromEditTable('c');
+			}
+		    $objCatList->Clear();
+	    
 	    	$objImages = new clsImageList();
 	    	$objImages->CopyFromEditTable("ImageId");
 		}
+		else {
+			$objCatList->Clear();
+		}
 	}
 
 	if( GetVar('CatEditStatus') == 2 )
Index: trunk/admin/category/addpermission.php
===================================================================
diff -u -N -r3830 -r4446
--- trunk/admin/category/addpermission.php	(.../addpermission.php)	(revision 3830)
+++ trunk/admin/category/addpermission.php	(.../addpermission.php)	(revision 4446)
@@ -39,11 +39,16 @@
 unset($objEditItems);
 
 $objEditItems = new clsCatList();
-$objEditItems->SourceTable = $objSession->GetEditTable("Category");
+$objEditItems->SourceTable = $objSession->GetEditTable('Category');
 
+$live_editing = $objSession->GetVariable('IsHomeCategory');
+if ($live_editing) {
+	$objEditItems->SourceTable = TABLE_PREFIX.'Category';
+}
+
 //Multiedit init
 $en = (int)$_GET["en"];
-$objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable);
+$objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable.($objEditItems->isLiveTable() ? ' WHERE CategoryId = 0' : ''));
 $itemcount=$objEditItems->NumItems();
 
 $c = $objEditItems->GetItemByIndex($en);
Index: trunk/core/units/general/inp1_parser.php
===================================================================
diff -u -N -r3576 -r4446
--- trunk/core/units/general/inp1_parser.php	(.../inp1_parser.php)	(revision 3576)
+++ trunk/core/units/general/inp1_parser.php	(.../inp1_parser.php)	(revision 4446)
@@ -72,7 +72,7 @@
 		$lastExpire, $diffZone, $date, $nowDate, $lastExpireDate, $SearchPerformed, 
 		$TotalMessagesSent, $ado, $adminDir, $rootURL, $secureURL, $html, $timeout, 
 		$pathchar, $objTemplate, $objTopicList, $objArticleList, $objPostingList, $objCensorList,
-		$objSmileys, $objPMList, $SubscribeAddress, $SubscribeError, $SubscribeResult;
+		$objSmileys, $objPMList, $SubscribeAddress, $SubscribeError, $SubscribeResult, $application;
 		
 		$pathtoroot = $this->Application->IsAdmin() ? '../' : './';
 		$pathtoroot = realpath($pathtoroot)."/";
Index: trunk/kernel/units/general/cat_event_handler.php
===================================================================
diff -u -N -r4314 -r4446
--- trunk/kernel/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 4314)
+++ trunk/kernel/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 4446)
@@ -936,7 +936,7 @@
 				case 'text':
 					if( !$this->Application->GetVar('INPORTAL_ON') )
 					{
-						$keywords[$field] = unhtmlentities( $keywords[$field] );
+					$keywords[$field] = unhtmlentities( $keywords[$field] );
 					}
 
 					if(strlen($keywords[$field]) >= $this->Application->ConfigValue('Search_MinKeyword_Length'))
Index: trunk/kernel/units/categories/categories_event_handler.php
===================================================================
diff -u -N -r4029 -r4446
--- trunk/kernel/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 4029)
+++ trunk/kernel/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 4446)
@@ -8,23 +8,23 @@
 	 * @param kEvent $event
 	 */
 	function OnCategoryUp(&$event)
-	{		
+	{
 		$category_table = $this->Application->getUnitOption($event->Prefix,'TableName');
 		$current_cat = $this->Application->GetVar('m_cat_id');
-		
+
 		if($current_cat)
 		{
 			$sql = 'SELECT ParentId FROM '.$category_table.' WHERE CategoryId = '.$current_cat;
 			$cat_to_go = $this->Conn->GetOne($sql);
 		}
-		else 
+		else
 		{
 			$cat_to_go = 0;
 		}
-		
+
 		$event->redirect_params = Array('m_cat_id' => $cat_to_go);
 	}
-	
+
 	/**
 	 * Goes to home category
 	 *
@@ -35,7 +35,7 @@
 		$cat_to_go = 0;
 		$event->redirect_params = Array('m_cat_id' => $cat_to_go);
 	}
-	
+
 	/**
 	 * Apply system filter to categories list
 	 *
@@ -44,16 +44,23 @@
 	function SetCustomQuery(&$event)
 	{
 		parent::SetCustomQuery($event);
-		
+
 		$types=$event->getEventParam('types');
 		$except_types=$event->getEventParam('except');
 		$object =& $event->getObject();
 		$type_clauses = Array();
-		
+
 		$object =& $event->getObject();
-		
+
 		if ( $event->getEventParam('parent_cat_id') ) {
 			$parent_cat_id = $event->getEventParam('parent_cat_id');
+
+			if ($parent_cat_id == 'Root') {
+				$module_name = getArrayValue($params, 'module') ? $params['module'] : 'In-Commerce';
+				$module =& $this->Application->recallObject('mod.'.$module_name);
+				$parent_cat_id = $module->GetDBField('RootCat');
+			}
+
 		}
 		else {
 			$parent_cat_id = $this->Application->GetVar('c_id');
@@ -64,7 +71,7 @@
 				$parent_cat_id = 0;
 			}
 		}
-		
+
 		if ($parent_cat_id != 'any') {
 			if ($event->getEventParam('recursive')) {
 				$current_path = $this->Conn->GetOne('SELECT ParentPath FROM '.TABLE_PREFIX.'Category WHERE CategoryId='.$parent_cat_id);
@@ -75,9 +82,9 @@
 				$object->addFilter('parent_filter', 'ParentId = '.$parent_cat_id);
 			}
 		}
-		
+
 		$object->addFilter('parent_filter', 'ParentId = '.$parent_cat_id);
-		
+
 		$view_perm = 1;
 		$object->addFilter('perm_filter', 'PermId = '.$view_perm);
 		if ( !$this->Application->IsAdmin() )
@@ -98,7 +105,7 @@
 							SELECT ResourceId FROM '.$this->Application->getUnitOption($event->Prefix, 'TableName').'
 							WHERE CategoryId = '.$parent_cat_id
 						);
-			
+
 			$sql = 'SELECT DISTINCT(TargetId) FROM '.TABLE_PREFIX.'Relationship
 					WHERE SourceId = '.$resource_id.' AND SourceType = 1';
 			$related_cats = $this->Conn->GetCol($sql);
@@ -108,30 +115,30 @@
 			$related_cats2 = $this->Conn->GetCol($sql);
 			$related_cats2 = is_array($related_cats2) ? $related_cats2 : Array();
 			$related_cats = array_unique( array_merge( $related_cats2, $related_cats ) );
-			
+
 			if($related_cats)
 			{
 				$type_clauses['category_related']['include'] = '%1$s.ResourceId IN ('.implode(',', $related_cats).')';
 				$type_clauses['category_related']['except'] = '%1$s.ResourceId NOT IN ('.implode(',', $related_cats).')';
 			}
-			else 
+			else
 			{
 				$type_clauses['category_related']['include'] = '0';
 				$type_clauses['category_related']['except'] = '1';
 			}
 			$type_clauses['category_related']['having_filter'] = false;
 		}
-		
+
 		if(strpos($types, 'product_related') !== false)
 		{
 			$object->removeFilter('parent_filter');
-			
+
 			$product_id = $event->getEventParam('product_id') ? $event->getEventParam('product_id') : $this->Application->GetVar('p_id');
 			$resource_id = $this->Conn->GetOne('
 							SELECT ResourceId FROM '.$this->Application->getUnitOption('p', 'TableName').'
 							WHERE ProductId = '.$product_id
 						);
-			
+
 			$sql = 'SELECT DISTINCT(TargetId) FROM '.TABLE_PREFIX.'Relationship
 					WHERE SourceId = '.$resource_id.' AND TargetType = 1';
 			$related_cats = $this->Conn->GetCol($sql);
@@ -141,36 +148,36 @@
 			$related_cats2 = $this->Conn->GetCol($sql);
 			$related_cats2 = is_array($related_cats2) ? $related_cats2 : Array();
 			$related_cats = array_unique( array_merge( $related_cats2, $related_cats ) );
-			
+
 			if($related_cats)
 			{
 				$type_clauses['product_related']['include'] = '%1$s.ResourceId IN ('.implode(',', $related_cats).')';
 				$type_clauses['product_related']['except'] = '%1$s.ResourceId NOT IN ('.implode(',', $related_cats).')';
 			}
-			else 
+			else
 			{
 				$type_clauses['product_related']['include'] = '0';
 				$type_clauses['product_related']['except'] = '1';
 			}
 			$type_clauses['product_related']['having_filter'] = false;
 		}
-		
+
 		/********************************************/
-		
+
 		$includes_or_filter =& $this->Application->makeClass('kMultipleFilter');
 		$includes_or_filter->setType(FLT_TYPE_OR);
-		
+
 		$excepts_and_filter =& $this->Application->makeClass('kMultipleFilter');
 		$excepts_and_filter->setType(FLT_TYPE_AND);
 
 		$includes_or_filter_h =& $this->Application->makeClass('kMultipleFilter');
 		$includes_or_filter_h->setType(FLT_TYPE_OR);
-		
+
 		$excepts_and_filter_h =& $this->Application->makeClass('kMultipleFilter');
 		$excepts_and_filter_h->setType(FLT_TYPE_AND);
 
 		$except_types_array=explode(',', $types);
-		
+
 		if ($types){
 			$types_array=explode(',', $types);
 			for ($i=0; $i<sizeof($types_array); $i++){
@@ -186,7 +193,7 @@
 				}
 			}
 		}
-		
+
 		if ($except_types){
 			$except_types_array=explode(',', $except_types);
 			for ($i=0; $i<sizeof($except_types_array); $i++){
@@ -202,24 +209,24 @@
 				}
 			}
 		}
-		
+
 		$object->addFilter('includes_filter', $includes_or_filter);
 		$object->addFilter('excepts_filter', $excepts_and_filter);
-	
+
 		$object->addFilter('includes_filter_h', $includes_or_filter_h, HAVING_FILTER);
 		$object->addFilter('excepts_filter_h', $excepts_and_filter_h, HAVING_FILTER);
 	}
-	
+
 	function GetPassedId(&$event)
 	{
 		if ( $this->Application->IsAdmin() ) return parent::getPassedID($event);
-		
+
 		$ret = $this->Application->GetVar('m_cat_id');
 		if($ret) return $ret;
-		
+
 		return parent::getPassedID($event);
 	}
-	
+
 	/**
 	 * Rebuilds category cache
 	 *
@@ -230,7 +237,7 @@
 		$this->Application->StoreVar('PermCache_UpdateRequired', 1);
 		$event->SetRedirectParam('index_file', 'category/category_maint.php');
 	}
-	
+
 	/**
 	 * Adds calculates fields for item statuses
 	 *
@@ -240,14 +247,14 @@
 	function prepareObject(&$object, &$event)
 	{
 		$object =& $event->getObject( Array('skip_autoload' => true) );
-		
+
 		$object->addCalculatedField('IsNew', '	IF(%1$s.NewItem = 2,
 														IF(%1$s.CreatedOn >= (UNIX_TIMESTAMP() - '.
 															$this->Application->ConfigValue('Category_DaysNew').
 															'*3600*24), 1, 0),
 														%1$s.NewItem
 													)');
-		
+
 	}
 }
 
Index: trunk/core/kernel/globals.php
===================================================================
diff -u -N -r4418 -r4446
--- trunk/core/kernel/globals.php	(.../globals.php)	(revision 4418)
+++ trunk/core/kernel/globals.php	(.../globals.php)	(revision 4446)
@@ -479,7 +479,8 @@
 		if ($module_section) {
 			// substitute section instead of #section# parameter in title preset name
 			$module_section = explode(':', $module_section);
-			$string = str_replace('#section#', strtolower($module_section[1]), $string);
+			$section = preg_replace('/configuration_(.*)/i', '\\1', $module_section[1]);
+			$string = str_replace('#section#', strtolower($section), $string);
 		}
 		return $string;
 	}
Index: trunk/admin/install/upgrades/changelog_1_1_8.txt
===================================================================
diff -u -N -r4358 -r4446
--- trunk/admin/install/upgrades/changelog_1_1_8.txt	(.../changelog_1_1_8.txt)	(revision 4358)
+++ trunk/admin/install/upgrades/changelog_1_1_8.txt	(.../changelog_1_1_8.txt)	(revision 4446)
@@ -19,6 +19,7 @@
 File in-portal/admin/config/importlang_progress.php is removed; release_1_1_7 revision 1.10
 File in-portal/admin/editor/FCKeditor/css/fck_editorarea.php changed
 File in-portal/admin/editor/FCKeditor/filemanager/upload/php/upload.php changed
+File in-portal/admin/email/sendmail.php changed
 File in-portal/admin/import/import_funcs.php changed
 File in-portal/admin/include/elements.php changed
 File in-portal/admin/include/mainscript.php changed
@@ -27,9 +28,9 @@
 File in-portal/admin/install/inportal_schema.sql changed
 File in-portal/admin/install/install_lib.php changed
 File in-portal/admin/install/langpacks/english.lang changed
-File in-portal/admin/install/upgrades/changelog_1_1_8.txt is new; release_1_1_8 revision 1.1.2.1
+File in-portal/admin/install/upgrades/changelog_1_1_8.txt is new; release_1_1_8 revision 1.1.2.3
 File in-portal/admin/install/upgrades/inportal_upgrade_v1.1.8.php is new; release_1_1_8 revision 1.1
-File in-portal/admin/install/upgrades/inportal_upgrade_v1.1.8.sql is new; release_1_1_8 revision 1.3
+File in-portal/admin/install/upgrades/inportal_upgrade_v1.1.8.sql is new; release_1_1_8 revision 1.3.2.1
 File in-portal/admin/listview/listview.php changed
 File in-portal/admin/logs/searchlog.php changed
 File in-portal/admin/modules/mod_status.php changed
@@ -50,6 +51,7 @@
 File in-portal/kernel/admin_templates/custom_fields/custom_fields_list.tpl is new; release_1_1_8 revision 1.1
 File in-portal/kernel/admin_templates/incs/config_blocks.tpl is new; release_1_1_8 revision 1.1
 File in-portal/kernel/admin_templates/incs/custom_blocks.tpl changed
+File in-portal/kernel/admin_templates/incs/export.js changed
 File in-portal/kernel/admin_templates/incs/form_blocks.tpl changed
 File in-portal/kernel/admin_templates/incs/grid_blocks.tpl changed
 File in-portal/kernel/admin_templates/incs/header.tpl changed
@@ -69,6 +71,7 @@
 File in-portal/kernel/include/searchitems.php changed
 File in-portal/kernel/units/categories/categories_config.php changed
 File in-portal/kernel/units/categories/categories_event_handler.php changed
+File in-portal/kernel/units/categories/categories_tag_processor.php changed
 File in-portal/kernel/units/config_search/config_search_config.php changed
 File in-portal/kernel/units/config_search/config_search_event_handler.php changed
 File in-portal/kernel/units/config_search/config_search_tag_processor.php changed
@@ -86,8 +89,11 @@
 File in-portal/kernel/units/general/cat_dbitem.php changed
 File in-portal/kernel/units/general/cat_dbitem_export.php changed
 File in-portal/kernel/units/general/cat_event_handler.php changed
+File in-portal/kernel/units/general/inp1_parser.php changed
+File in-portal/kernel/units/general/inp_db_event_handler.php changed
 File in-portal/kernel/units/general/main_event_handler.php changed
 File in-portal/kernel/units/general/my_application.php changed
+File in-portal/kernel/units/general/xml_helper.php changed
 File in-portal/kernel/units/general/helpers/multilanguage.php is new; release_1_1_8 revision 1.3.2.2
 File in-portal/kernel/units/general/helpers/search_helper.php is new; release_1_1_8 revision 1.2
 File in-portal/kernel/units/help/help_tag_processor.php changed
@@ -97,8 +103,11 @@
 File in-portal/kernel/units/modules/modules_event_handler.php changed
 File in-portal/kernel/units/translator/translator_event_handler.php changed
 File in-portal/kernel/units/users/users_config.php changed
+File in-portal/kernel/units/users/users_event_handler.php changed
 File in-portal/kernel/units/users/users_item.php changed
 File in-portal/themes/default/categories/catlist_element.tpl changed
+File in-portal/themes/default/register/register_dob.tpl changed
+File in-portal/themes/default/register/register_form.tpl changed
 File kernel4_dev/kernel4/application.php changed
 File kernel4_dev/kernel4/event_handler.php changed
 File kernel4_dev/kernel4/event_manager.php changed
@@ -115,6 +124,7 @@
 File kernel4_dev/kernel4/processors/tag_processor.php changed
 File kernel4_dev/kernel4/utility/cache.php is new; release_1_1_8 revision 1.1
 File kernel4_dev/kernel4/utility/event.php changed
+File kernel4_dev/kernel4/utility/factory.php changed
 File kernel4_dev/kernel4/utility/formatters.php changed
 File kernel4_dev/kernel4/utility/http_query.php changed
 File kernel4_dev/kernel4/utility/params.php changed
Index: trunk/admin/category/addpermission_modules.php
===================================================================
diff -u -N -r3830 -r4446
--- trunk/admin/category/addpermission_modules.php	(.../addpermission_modules.php)	(revision 3830)
+++ trunk/admin/category/addpermission_modules.php	(.../addpermission_modules.php)	(revision 4446)
@@ -41,9 +41,14 @@
 $objEditItems = new clsCatList();
 $objEditItems->SourceTable = $objSession->GetEditTable("Category");
 
+$live_editing = $objSession->GetVariable('IsHomeCategory');
+if ($live_editing) {
+	$objEditItems->SourceTable = TABLE_PREFIX.'Category';
+}
+
 //Multiedit init
 $en = (int)$_GET["en"];
-$objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable);
+$objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable.($objEditItems->isLiveTable() ? ' WHERE CategoryId = 0' : ''));
 $itemcount=$objEditItems->NumItems();
 
 if(isset($_GET["en"]))
Index: trunk/kernel/units/categories/categories_tag_processor.php
===================================================================
diff -u -N -r4314 -r4446
--- trunk/kernel/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 4314)
+++ trunk/kernel/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 4446)
@@ -146,7 +146,7 @@
 				// in case if category is deleted
 				return '';
 			}
-				
+
 			$block_params['cat_name'] = $res['Name'];
 			$block_params['cat_id'] = $res['CategoryId'];
 
Index: trunk/kernel/startup.php
===================================================================
diff -u -N -r4243 -r4446
--- trunk/kernel/startup.php	(.../startup.php)	(revision 4243)
+++ trunk/kernel/startup.php	(.../startup.php)	(revision 4446)
@@ -5,17 +5,8 @@
 
 	if( !isset($FrontEnd) )	$FrontEnd = 0;
 
-	# New path detection method: begin
-//	safeDefine('REL_PATH', '/admin');
-	$k4_path_detection = false;
-	if( defined('REL_PATH') )
+	if( !class_exists('kApplication') )
 	{
-		$ps = preg_replace("/".preg_quote(rtrim(REL_PATH, '/'), '/')."$/", '', str_replace('\\', '/', dirname($_SERVER['PHP_SELF'])));
-		if (!defined('BASE_PATH')) {
-			define('BASE_PATH', $ps); // in case in-portal has defined it before
-		}
-		# New path detection method: end
-
 		// KENEL4 INIT: BEGIN
 		if ($FrontEnd != 1 && !defined('ADMIN') ) {
 			define('ADMIN', 1);
@@ -34,27 +25,22 @@
 		$application =& kApplication::Instance();
 		$application->Init();
 		$application->ProcessRequest();
-		
-		// compatibility constants
-		$g_TablePrefix = TABLE_PREFIX;
-		$pathtoroot = FULL_PATH.'/';
-
-	    $admin		=	'admin';
-		$rootURL	=	PROTOCOL.SERVER_NAME.(defined('PORT')?':'.PORT : '').rtrim(BASE_PATH, '/').'/';
-	    $localURL	=	$rootURL.'kernel/';
-		$adminURL	=	$rootURL.$admin;
-		$imagesURL	=	$adminURL.'/images';
-		$browseURL	=	$adminURL.'/browse';
-		$cssURL		=	$adminURL.'/include';
-		$pathchar	=	'/';
 		// KERNEL4 INIT: END
-		$k4_path_detection = true;
-		define('OLD_STARTUP', 0);
 	}
-	else {
-		define('OLD_STARTUP', 1);
-	}
 
+	// compatibility constants
+	$g_TablePrefix = TABLE_PREFIX;
+	$pathtoroot = FULL_PATH.'/';
+
+  $admin		=	'admin';
+	$rootURL	=	PROTOCOL.SERVER_NAME.(defined('PORT')?':'.PORT : '').rtrim(BASE_PATH, '/').'/';
+  $localURL	=	$rootURL.'kernel/';
+	$adminURL	=	$rootURL.$admin;
+	$imagesURL	=	$adminURL.'/images';
+	$browseURL	=	$adminURL.'/browse';
+	$cssURL		=	$adminURL.'/include';
+	$pathchar	=	'/';
+
 if(!get_magic_quotes_gpc())
 {
 	function addSlashesA($a)
Index: trunk/kernel/units/configuration/configuration_config.php
===================================================================
diff -u -N -r4043 -r4446
--- trunk/kernel/units/configuration/configuration_config.php	(.../configuration_config.php)	(revision 4043)
+++ trunk/kernel/units/configuration/configuration_config.php	(.../configuration_config.php)	(revision 4446)
@@ -18,7 +18,7 @@
 
 					'TitlePresets'		=>	Array(
 												'default'	=>	Array('tag_params' => Array('conf' => Array('per_page' => -1))),
-																
+												
 												'config_list_general' => Array('prefixes' => Array('conf_List','confg_List'), 'format' => "!la_updating_config!"),
 												'config_list_output' => Array('prefixes' => Array('conf_List','confg_List'), 'format' => "!la_updating_config!"),
 												'config_list_contacts' => Array('prefixes' => Array('conf_List','confg_List'), 'format' => "!la_updating_config!"),
Index: trunk/kernel/include/category.php
===================================================================
diff -u -N -r4126 -r4446
--- trunk/kernel/include/category.php	(.../category.php)	(revision 4126)
+++ trunk/kernel/include/category.php	(.../category.php)	(revision 4446)
@@ -26,42 +26,42 @@
         $this->CloseTagVar = "Category_Highlight_CloseTag";
 
         if($CategoryId!=NULL)
-        {        
+        {
             $this->LoadFromDatabase($CategoryId);
             $this->Permissions = new clsPermList($CategoryId,$objSession->Get("GroupId"));
-            
+
         }
         else
-        {        
+        {
            $this->Permissions = new clsPermList();
 
         }
      }
-     
+
      function StripDisallowed($string)
      {
      	$not_allowed = Array(	' ', '\\', '/', ':', '*', '?', '"', '<', '>', '|', '`',
      							'~', '!', '@', '#', '$', '%', '^', '&', '(', ')', '~',
      							'+', '=', '-', '{', '}', ']', '[', "'", ';', '.', ',');
-     							
+
      	$string = str_replace($not_allowed, '_', $string);
      	$string = preg_replace('/(_+)/', '_', $string);
      	$string = $this->checkAutoFilename($string);
-     	
+
      	return $string;
      }
-     
+
      function checkAutoFilename($filename)
      {
      	global $m_var_list;
-     	
+
      	if(!$filename || $this->UniqueId() == 0 ) return $filename;
 		$db =& GetADODBConnection();
-	
+
 		$sql = 'SELECT CategoryId FROM '.$this->tablename.' WHERE (Filename = '.$db->qstr($filename).') AND (ParentId = '.$m_var_list['cat'].')';
 		$found_category_ids = $db->GetCol($sql);
 		$has_page = preg_match('/(.*)_([\d]+)([a-z]*)$/', $filename, $rets);
-		
+
 		$duplicates_found = (count($found_category_ids) > 1) || ($found_category_ids && $found_category_ids[0] != $this->UniqueId());
 		if ($duplicates_found || $has_page)
 		{
@@ -71,20 +71,20 @@
 				$filename = $rets[1].'_'.$rets[2];
 				$append = $rets[3] ? $rets[3] : '_a';
 			}
-			
+
 			$sql = 'SELECT CategoryId FROM '.$this->tablename.' WHERE (Filename = %s) AND (CategoryId != '.$this->UniqueId().') AND (ParentId = '.$m_var_list['cat'].')';
 			while ( $db->GetOne( sprintf($sql, $db->qstr($filename.$append)) ) > 0 )
 			{
 				if (substr($append, -1) == 'z') $append .= 'a';
 				$append = substr($append, 0, strlen($append) - 1) . chr( ord( substr($append, -1) ) + 1 );
 			}
-			
+
 			return $filename.$append;
 		}
-		
+
 		return $filename;
      }
-     
+
      function GenerateFilename()
      {
      	if ( !$this->Get('AutomaticFilename') && $this->Get('Filename') )
@@ -96,100 +96,100 @@
 			$name = $this->Get('Name');
 		}
 		$name = $this->StripDisallowed($name);
-     	
+
      	if ( $name != $this->Get('Filename') ) $this->Set('Filename', $name);
      }
 
     function ClearCacheData()
     {
        /*$env = "':m".$this->Get("CategoryId")."%'";
        DeleteTagCache("m_list_cats","",$env); */
-       DeleteTagCache("m_itemcount","Category%");           
+       DeleteTagCache("m_itemcount","Category%");
        DeleteModuleTagCache('kernel');
     }
-    
+
   function DetectChanges($name, $value)
-  {  	
+  {
   	global $objSession;
   	//print_pre($_POST);
 	if (!isset($this->Data[$name]) ) return false;
-	
-	if ($this->Data[$name] != $value) {		
+
+	if ($this->Data[$name] != $value) {
 		//echo "$name Modified tt ".$this->Data[$name]." tt $value<br>";
 		if (!stristr($name, 'Modif') && !stristr($name, 'Created')) {
 			if ($objSession->GetVariable("HasChanges") != 1) {
-				$objSession->SetVariable("HasChanges", 2);		
+				$objSession->SetVariable("HasChanges", 2);
 			}
 		}
 	}
-  }    
+  }
 
-      
+
     function Delete()
     {
     	global $CatDeleteList;
-		
+
     	if(!is_array($CatDeleteList))
-    	  $CatDeleteList = array();    	 
+    	  $CatDeleteList = array();
     	if($this->UsingTempTable()==FALSE)
     	{
           $this->Permissions->Delete_CatPerms($this->Get("CategoryId"));
-          
+
           // TODO: find way to delete specific category cache only
           /*$sql = "DELETE FROM ".GetTablePrefix()."CountCache WHERE CategoryId=".$this->Get("CategoryId");
           $this->adodbConnection->Execute($sql);*/
-          
-		  $CatDeleteList[] = $this->Get("CategoryId");          
+
+		  $CatDeleteList[] = $this->Get("CategoryId");
       	  if($this->Get("CreatedById")>0)
          	$this->SendUserEventMail("CATEGORY.DELETE",$this->Get("CreatedById"));
-      	  $this->SendAdminEventMail("CATEGORY.DELETE");          
-		  
+      	  $this->SendAdminEventMail("CATEGORY.DELETE");
+
     	  parent::Delete();
-          $this->ClearCacheData();          
+          $this->ClearCacheData();
     	}
-    	else 
+    	else
     	{
-    		parent::Delete();    		
+    		parent::Delete();
     	}
     }
-    
 
+
     function Update($UpdatedBy=NULL)
     {
         parent::Update($UpdatedBy);
         $this->GenerateFilename();
-        
+
         parent::Update($UpdatedBy);
-        
+
         if ($this->tablename == GetTablePrefix().'Category') $this->ClearCacheData();
     }
 
     function Create()
     {
     	if( (int)$this->Get('CreatedOn') == 0 ) $this->Set('CreatedOn', adodb_date('U') );
     	parent::Create();
-    	
+
     	$this->GenerateFilename();
     	parent::Update();
-    	
+
     	if ($this->tablename == GetTablePrefix().'Category') $this->ClearCacheData();
     }
 
-    function SetParentId($value) 
+    function SetParentId($value)
     {
         //Before we set a parent verify that propsed parent is not our child.
         //Otherwise it will cause recursion.
-         
+
       $id = $this->Get("CategoryId");
       $path = $this->Get("ParentPath");
-      $sql = sprintf("SELECT CategoryId From ".GetTablePrefix()."Category WHERE ParentPath LIKE '$path%' AND CategoryId = %d ORDER BY ParentPath",$value);     
+      $sql = sprintf("SELECT CategoryId From ".GetTablePrefix()."Category WHERE ParentPath LIKE '$path%' AND CategoryId = %d ORDER BY ParentPath",$value);
       $rs = $this->adodbConnection->SelectLimit($sql,1,0);
       if(!$rs->EOF)
       {
          return;
         }
         $this->Set("ParentId",$value);
-    } 
+    }
 
 	function Approve()
 	{
@@ -215,45 +215,45 @@
     }
 
 
-    function IsEditorsPick() 
+    function IsEditorsPick()
     {
         return $this->Is("EditorsPick");
     }
-    
-    function SetEditorsPick($value) 
+
+    function SetEditorsPick($value)
     {
         $this->Set("EditorsPick", $value);
     }
-       
+
    function GetSubCats($limit=NULL, $target_template=NULL, $separator=NULL, $anchor=NULL, $ending=NULL, $class=NULL)
    {
       global $m_var_list, $m_var_list_update, $var_list, $var_list_update;
-      
+
       $sql = "SELECT CategoryId, Name from ".GetTablePrefix()."Category where ParentId=".$this->Get("CategoryId")." AND Status=1 ORDER BY Priority";
       if(isset($limit))
-      {        
+      {
       	$rs = $this->adodbConnection->SelectLimit($sql, $limit, 0);
         }
         else
         {
             $rs = $this->adodbConnection->Execute($sql);
         }
       $count=1;
-      
+
       $class_name = is_null($class)? "catsub" : $class;
-      
-      
+
+
       while($rs && !$rs->EOF)
-      {      	
+      {
          $var_list_update["t"] = !is_null($target_template)? $target_template : $var_list["t"];
          $m_var_list_update["cat"] = $rs->fields["CategoryId"];
          $m_var_list_update["p"] = "1";
          $cat_name = $rs->fields['Name'];
 		if (!is_null($anchor))
-			$ret .= "<a class=\"$class_name\" href=\"". HREF_Wrapper() . "\">$cat_name</a>";            
+			$ret .= "<a class=\"$class_name\" href=\"". HREF_Wrapper() . "\">$cat_name</a>";
 		else
-			$ret .= "<span=\"$class_name\">$cat_name</span>";       
-        
+			$ret .= "<span=\"$class_name\">$cat_name</span>";
+
             $rs->MoveNext();
             if(!$rs->EOF)
             {
@@ -262,41 +262,41 @@
       	}
         if(strlen($ret))
           $ret .= is_null($ending)? " ..." : $ending;
-          
+
       	unset($var_list_update["t"], $m_var_list_update["cat"], $m_var_list_update["p"]);
-      	
+
         return $ret;
    }
 
     function Validate()
     {
       global $objSession;
-      
-        $dataValid = true;             
+
+        $dataValid = true;
       if(!isset($this->m_Type))
         {
             $Errors->AddError("error.fieldIsRequired",'Type',"","","clsCategory","Validate");
             $dataValid = false;
         }
-        
+
         if(!isset($this->m_Name))
         {
             $Errors->AddError("error.fieldIsRequired",'Name',"","","clsCategory","Validate");
             $dataValid = false;
         }
-        
+
         if(!isset($this->m_Description))
         {
             $Errors->AddError("error.fieldIsRequired",'Description',"","","clsCategory","Validate");
             $dataValid = false;
         }
-        
+
         if(!isset($this->m_Visible))
         {
             $Errors->AddError("error.fieldIsRequired",'Visible',"","","clsCategory","Validate");
             $dataValid = false;
         }
-        
+
         if(!isset($this->m_CreatedById))
         {
             $Errors->AddError("error.fieldIsRequired",'CreatedBy',"","","clsCategory","Validate");
@@ -322,6 +322,7 @@
             $path_parts[] = $Id2;
             $nav_parts[] = $rs->fields['Name'];
             $named_parts[] = $rs->fields['Filename'];
+
             if (!$cateogry_template && $rs->fields['CachedCategoryTemplate']) {
             	$cateogry_template = $rs->fields['CachedCategoryTemplate'];
             }
@@ -373,12 +374,12 @@
       global $objSession, $Errors, $objConfig;
         if($Id==0)
             return FALSE;
-        
+
         if(!isset($Id))
         {
             $Errors->AddError("error.AppError",NULL,'Internal error: LoadFromDatabase id',"",get_class($this),"LoadFromDatabase");
             return false;
-        }        
+        }
         $sql = sprintf("SELECT * FROM ".$this->tablename." WHERE CategoryId = '%s'",$Id);
         $result = $this->adodbConnection->Execute($sql);
         if ($result === false)
@@ -407,30 +408,30 @@
         $this->IsNew = FALSE;
         if($value>$cutoff)
             $this->IsNew = TRUE;
-        return $this->IsNew;      
+        return $this->IsNew;
     }
 
-    
+
     function LoadFromResourceId($Id)
     {
         global $objSession, $Errors;
         if(!isset($Id))
         {
             $Errors->AddError("error.AppError",NULL,'Internal error: LoadFromDatabase id',"",get_class($this),"LoadFromResourceId");
             return false;
-        }        
-        $sql = sprintf("SELECT * FROM ".$this->tablename." WHERE ResourceId = '%s'",$Id); 
+        }
+        $sql = sprintf("SELECT * FROM ".$this->tablename." WHERE ResourceId = '%s'",$Id);
         $result = $this->adodbConnection->Execute($sql);
         if ($result === false)
         {
             $Errors->AddError("error.DatabaseError",NULL,$adodbConnection->ErrorMsg(),"",get_class($this),"LoadFromResourceId");
             return false;
-        }        
+        }
         $data = $result->fields;
         if(is_array($data))
             $this->SetFromArray($data);
         else
-            return false;  
+            return false;
         return true;
     }
 
@@ -459,8 +460,8 @@
         return $ret;
     }
 
-    
 
+
     function GetCustomField($fieldName)
     {
       global $objSession, $Errors;
@@ -485,26 +486,26 @@
         }
         return SetCustomFieldValue($this->m_CategoryId,"category",$fieldName,$value);
     }
-    
+
     function LoadPermissions($first=1)
-    {        
+    {
         /* load all permissions for group on this category */
         $this->Permissions->CatId=$this->Get("CategoryId");
         if($this->Permissions->NumItems()==0)
-        {      
+        {
           $cats = explode("|",substr($this->Get("ParentPath"),1,-1));
           if(is_array($cats))
-          {             
-            $cats = array_reverse($cats);    
+          {
+            $cats = array_reverse($cats);
             $cats[] = 0;
             foreach($cats as $catid)
-            { 
+            {
               $this->Permissions->LoadCategory($catid);
             }
           }
         }
         if($this->Permissions->NumItems()==0)
-        {        
+        {
           if($first==1)
           {
             $this->Permissions->GroupId=NULL;
@@ -525,7 +526,7 @@
     }
 
     function HasPermission($PermissionName,$GroupID)
-    { 
+    {
         global $objSession;
 
         $perm = $this->PermissionValue($PermissionName,$GroupID);
@@ -539,7 +540,7 @@
 
     function PermissionValue($PermissionName,$GroupID)
     {
-      //$this->LoadPermissions();            
+      //$this->LoadPermissions();
       $ret=NULL;
       //echo "Looping though ".count($this->Permissions)." permissions Looking for $PermissionName of $GroupID<br>\n";
       if($this->Permissions->GroupId != $GroupID)
@@ -555,11 +556,11 @@
          $cats = explode("|",substr($this->Get("ParentPath"),1,-1));
 
        if(is_array($cats))
-        { 
-          $cats = array_reverse($cats);          
+        {
+          $cats = array_reverse($cats);
           $cats[] = 0;
           foreach($cats as $catid)
-          {  
+          {
             $this->Permissions->LoadCategory($catid);
             $ret = $this->Permissions->GetPermissionValue($PermissionName);
             if(is_numeric($ret))
@@ -573,7 +574,7 @@
     function SetPermission($PermName,$GroupID,$Value,$Type=0)
     {
         global $objSession, $objPermissions, $objGroups;
-        
+
         if($this->Permissions->GroupId != $GroupID)
         {
             $this->Permissions->Clear();
@@ -600,7 +601,7 @@
                    $this->Permissions->Add_Permission($this->Get("CategoryId"),$GroupId,$PermName,$Value,$Type);
             }
             if($PermName == "CATEGORY.VIEW")
-            {           
+            {
               $Groups = $objGroups->GetAllGroupList();
               $ViewList = $this->Permissions->GetGroupPermList($this,"CATEGORY.VIEW",$Groups);
               $this->SetViewPerms("CATEGORY.VIEW",$ViewList,$Groups);
@@ -619,7 +620,7 @@
            global $objGroups;
            $allgroups = $objGroups->GetAllGroupList();
        }
-       
+
        for($i=0;$i<count($allgroups);$i++)
        {
            $g = $allgroups[$i];
@@ -632,7 +633,7 @@
             $dval = "";
         }
         else
-        {            
+        {
             $dval = implode(",",$dacl);
             $aval = "";
         }
@@ -643,7 +644,7 @@
         $PermId = $this->Permissions->GetPermId($PermName);
         $pc = $objPermCache->GetPerm($this->Get("CategoryId"),$PermId);
         if(is_object($pc))
-        {            
+        {
             $pc->Set("ACL",$aval);
             $pc->Set("DACL",$dval);
             $pc->Update();
@@ -662,7 +663,7 @@
         $PermId = $this->Permissions->GetPermId($PermName);
         $pc = $objPermCache->GetPerm($this->Get("CategoryId"),$PermId);
         if(is_object($pc))
-        {            
+        {
             $ret = $this->Get("ACL");
         }
         return $ret;
@@ -675,11 +676,11 @@
 
        $glist = $objGroups->GetAllGroupList();
 
-       $ViewList = $this->Permissions->GetGroupPermList($this,"CATEGORY.VIEW",$glist);       
+       $ViewList = $this->Permissions->GetGroupPermList($this,"CATEGORY.VIEW",$glist);
        $perms = $this->Permissions->GetAllViewPermGroups($this,$glist);
        //echo "<PRE>";print_r($perms); echo "</PRE>";
        foreach($perms as $PermName => $l)
-       {                
+       {
          $this->SetViewPerms($PermName,$l,$glist);
        }
     }
@@ -728,15 +729,15 @@
             $ret .= "icon16_cat_disabled.gif";
             break;
           case STATUS_PENDING:
-            $ret .= "icon16_cat_pending.gif";  
+            $ret .= "icon16_cat_pending.gif";
             break;
           case STATUS_ACTIVE:
             $img = "icon16_cat.gif";
             if($this->IsPopItem())
                 $img = "icon16_cat_pop.gif";
             if($this->IsHotItem())
                 $img = "icon16_cat_hot.gif";
-            if($this->IsNewItem())           
+            if($this->IsNewItem())
                 $img = "icon16_cat_new.gif";
             if($this->Is("EditorsPick"))
                 $img = "icon16_car_pick.gif";
@@ -756,12 +757,12 @@
             {
                 $val = $rs->fields["SubCount"];
                 if($val != $this->Get("CachedDescendantCatsQty"))
-                {               
+                {
                   $this->Set("CachedDescendantCatsQty",$val);
                   $this->Update();
                 }
-                $ret = $this->Get("CachedDescendantCatsQty");                
-            }                       
+                $ret = $this->Get("CachedDescendantCatsQty");
+            }
         return $ret;
     }
 
@@ -777,7 +778,7 @@
         }
         return $ret;
     }
-    
+
     function GetParentIds()
     {
     	$Parents = array();
@@ -789,18 +790,18 @@
     	}
     	return $Parents;
     }
-    
+
     function ItemCount($ItemType="")
     {
 		global $objItemTypes,$objCatList,$objCountCache;
-	
+
 		if(!is_numeric($ItemType))
 		{
-      		$TypeId = $objItemTypes->GetItemTypeValue($ItemType); 
+      		$TypeId = $objItemTypes->GetItemTypeValue($ItemType);
 		}
 		else
-	  		$TypeId = (int)$ItemType;      		 		
-	  	  
+	  		$TypeId = (int)$ItemType;
+
 	  	//$path = $this->Get("ParentPath");
 	  	//$path = substr($path,1,-1);
 	  	//$path = str_replace("|",",",$path);
@@ -811,32 +812,32 @@
 	  	}
 	  	else
 	  	  $path = $this->Get("CategoryId");
-	  	
-	  	$res = TableCount(GetTablePrefix()."CategoryItems","CategoryId IN ($path)",FALSE);    
-	  	
-	  	return $res;	  	
+
+	  	$res = TableCount(GetTablePrefix()."CategoryItems","CategoryId IN ($path)",FALSE);
+
+	  	return $res;
     }
 
     function ParseObject($element)
     {
         global $objConfig, $objCatList, $rootURL, $var_list, $var_list_update, $m_var_list_update, $objItemTypes,$objCountCache, $objUsers;
-        
+
         $extra_attribs = ExtraAttributes($element->attributes);
-        
+
         //print_r($element);
         if(strtolower($element->name)==$this->TagPrefix)
-        {          
+        {
             $field = strtolower( $element->GetAttributeByName('_field') );
             switch($field)
             {
             	case 'filename':
             		$ret = $this->Get('Filename');
             		break;
-            		
+
             	case 'm_language':
             		$ret = language( $element->GetAttributeByName('_Phrase') );
             		break;
-            	
+
             	case 'parentcategorylink':
 	            	$m_var_list_update['cat'] = $this->Get('ParentId');
 	                $m_var_list_update['p'] = 1;
@@ -854,10 +855,10 @@
             			array_pop($ret);
             			$ret = implode('>',$ret);
             		}
-            		
+
             		$ret = prompt_language($objConfig->Get("Root_Name")).($ret ? '>' : '').$ret;
             		break;
-            	
+
             	case "name":
             case "Name":
             	/*
@@ -870,7 +871,7 @@
             	/*
             	@field:cat.description
             	@description:Category Description
-            	*/            
+            	*/
                 $ret = ($this->Get("Description"));
                 $ret = $this->HighlightText($ret);
             break;
@@ -894,7 +895,7 @@
   				@attrib:_name::Return the image with this name
   				@attrib:_thumbnail:bool:If true, return the thumbnail version of the image
   				@attrib:_imagetag:bool:If true, returns a complete image tag. exta html attributes are passed to the image tag
-               */            
+               */
                $default = $element->GetAttributeByName('_primary');
                $name = $element->GetAttributeByName('_name');
                if(strlen($name))
@@ -937,39 +938,39 @@
 				/*
 				@field:cat.createdby
 				@description:parse a user field of the user that created the category
-  				@attrib:_usertag::User field to return (defaults to login ID)            
-  				*/            
+  				@attrib:_usertag::User field to return (defaults to login ID)
+  				*/
                 $field = $element->GetAttributeByName('_usertag');
                 if(!strlen($field))
                 {
                     $field = "user_login";
                 }
-                 
-                $userId = $this->Get("CreatedById");                
+
+                $userId = $this->Get("CreatedById");
                 if (!empty($userId) && ($userId > 0))
                 {
 	                $u =& $objUsers->GetItem($userId);
 	                if (is_object($u))
-	                {                	
-	                	$ret = $u->parsetag($field);	
+	                {
+	                	$ret = $u->parsetag($field);
 	                }
                 }
 	            else
-	            	$ret = " ";        
-	            	
+	            	$ret = " ";
+
             break;
             case "custom":
                 /*
                 @field:cat.custom
                 @description:Returns a custom field
   				@attrib:_customfield::field name to return
   				@attrib:_default::default value
-  				*/            
-                $field =  $element->GetAttributeByName('_customfield'); 
+  				*/
+                $field =  $element->GetAttributeByName('_customfield');
                 $default = $element->GetAttributeByName('_default');
                 $ret = $this->GetCustomFieldValue($field,$default);
             break;
-            
+
             case "catsubcats":
                 /*
                 @field:cat.catsubcats
@@ -979,27 +980,27 @@
   				@attrib:_anchor:bool:Make an anchor (only if template is not specified)
   				@attrib:_TargetTemplate:tpl:Target template
   				@attrib:_Ending::Add special text at the end of subcategory list
-  				@attrib:_Class::Specify stly sheet class for anchors (if used) or "span" object			
-  				*/            
-                $limit =  ((int)$element->attributes["_limit"]>0)? $element->attributes["_limit"] : NULL; 
+  				@attrib:_Class::Specify stly sheet class for anchors (if used) or "span" object
+  				*/
+                $limit =  ((int)$element->attributes["_limit"]>0)? $element->attributes["_limit"] : NULL;
                 $separator = $element->attributes["_separator"];
-                $anchor = (int)($element->attributes["_anchor"])? 1 : NULL;                
-                $templ = $element->GetAttributeByName("_TargetTemplate");               
-                $template = !empty($templ)? $templ : NULL;                       
+                $anchor = (int)($element->attributes["_anchor"])? 1 : NULL;
+                $templ = $element->GetAttributeByName("_TargetTemplate");
+                $template = !empty($templ)? $templ : NULL;
                 $ending = strlen($element->attributes["_ending"])? $element->attributes["_ending"] : NULL;
                 $class = strlen($element->attributes["_class"])? $element->attributes["_class"] : NULL;
-                
+
                 $ret = $this->GetSubCats($limit, $template, $separator, $anchor, $ending, $class);
-                
+
             break;
-            
+
             case "date":
             	/*
   				@field:cat.date
   				@description:Returns the date/time the category was created
   				@attrib:_tz:bool:Convert the date to the user's local time
   				@attrib:_part::Returns part of the date.  The following options are available: month,day,year,time_24hr,time_12hr
-            	*/            
+            	*/
                 $d = $this->Get("CreatedOn");
 
                 if( $element->GetAttributeByName('_tz') )
@@ -1013,9 +1014,9 @@
                     $ret = ExtractDatePart($part,$d);
                 }
                 else
-                {                                        
+                {
                   if(!is_numeric($d))
-                  {                  
+                  {
                     $ret = "";
                   }
                   else
@@ -1026,20 +1027,20 @@
             	/*
   				@field:cat.link
   				@description:Returns a URL setting the category to the current category
-  				@attrib:_template:tpl:Template URL should point to   
+  				@attrib:_template:tpl:Template URL should point to
   				@attrib:_mod_template:tpl:Template INSIDE a module to which the category belongs URL should point to
-  				*/        
-  				if ( strlen( $element->GetAttributeByName('_mod_template') ) ){ 
+  				*/
+  				if ( strlen( $element->GetAttributeByName('_mod_template') ) ){
   					//will prefix the template with module template root path depending on category
             			$ids = $this->GetParentIds();
             			$tpath = GetModuleArray("template");
             			$roots = GetModuleArray("rootcat");
-            			
-            			// get template path of module, by searching for moudle name 
-            			// in this categories first parent category 
+
+            			// get template path of module, by searching for moudle name
+            			// in this categories first parent category
             			// and then using found moudle name as a key for module template paths array
             			$path = $tpath[array_search ($ids[0], $roots)];
-            			
+
             			$module_templates = explode(',', $element->GetAttributeByName('_mod_template'));
             			$m_templates = Array();
             			foreach($module_templates as $module_t)
@@ -1049,7 +1050,7 @@
             				{
             					$m_templates[$module_t[0]] = $module_t[1];
             				}
-            				else 
+            				else
             				{
             					$m_templates['default'] = $module_t[0];
             				}
@@ -1061,20 +1062,20 @@
             			{
             				$target_template = $m_templates[$module];
             			}
-            			else 
+            			else
             			{
             				$target_template = $m_templates['default'];
             			}
             			$t = $path . $target_template;
             		}
-            		else 
+            		else
             		{
             			$t = $element->GetAttributeByName('_template');
-            		} 
-            		
+            		}
+
                 $url_params = Array();
                 if(strlen($t))
-                {                
+                {
                     $var_list_update["t"] = $t;
                 }
                 else
@@ -1083,7 +1084,7 @@
                 }
                 $m_var_list_update["cat"] = $this->Get("CategoryId");
                 if( $element->GetAttributeByName('reset') ) $url_params['reset'] = 1;
-                
+
                 $ret = HREF_Wrapper('', $url_params);
                 unset($m_var_list_update["cat"], $var_list_update["t"]);
             break;
@@ -1094,11 +1095,11 @@
                 unset($m_var_list_update["cat"]);
                 unset($m_var_list_update["p"]);
                 return $ret;
-                break;            
+                break;
             case "customlink":
                 $t = $this->GetCustomFieldValue("indextemplate","");
                 if(strlen($t))
-                {                
+                {
                     $var_list_update["t"] = $t;
                 }
                 else
@@ -1108,16 +1109,16 @@
                 $m_var_list_update["cat"] = $this->Get("CategoryId");
                 $ret = HREF_Wrapper();
                 unset($m_var_list_update["cat"], $var_list_update["t"]);
-			break;            
+			break;
             case "link_selector":
                 $m_var_list_update["cat"] = $this->Get("CategoryId");
                 $ret = $_SERVER["PHP_SELF"]."?env=" . BuildEnv();
 
-                
+
 				$tmp = GetVar('Selector'); if($tmp) $ret .= '&Selector='.$tmp;
                 $tmp = GetVar('new'); if($tmp) $ret .= '&new='.$tmp;
                 $tmp = GetVar('destform'); if($tmp) $ret .= '&destform='.$tmp;
-                
+
                 unset($m_var_list_update["cat"]);
                 return $ret;
                 break;
@@ -1132,14 +1133,14 @@
             case "subcats":
             	/*
             	@field:cat.subcats
-            	@description: Loads category's subcategories into a list and renders using the m_list_cats global tag           	
+            	@description: Loads category's subcategories into a list and renders using the m_list_cats global tag
             	@attrib:_subcattemplate:tpl:Template used to render subcategory list elements
   				@attrib: _columns:int: Numver of columns to display the categories in (defaults to 1)
   				@attrib: _maxlistcount:int: Maximum number of categories to list
   				@attrib: _FirstItemTemplate:tpl: Template used for the first category listed
-  				@attrib: _LastItemTemplate:tpl: Template used for the last category listed  				
+  				@attrib: _LastItemTemplate:tpl: Template used for the last category listed
   				@attrib: _NoTable:bool: If set to 1, the categories will not be listed in a table. If a table is used, all HTML attributes are passed to the TABLE tag
-				*/            	
+				*/
                 $attr = array();
                 $attr["_catid"] = $this->Get("CategoryId");
                 $attr["_itemtemplate"] = $element->GetAttributeByName('_subcattemplate');
@@ -1156,8 +1157,8 @@
             	$txt = "<inp:m_itemcount _CatId=\"".$this->Get("CategoryId")."\" _SubCats=\"1\" ";
             	$txt .="_CategoryCount=\"1\" _ItemType=\"1\" _GroupOnly=\"$GroupOnly\" />";
             	$tag = new clsHtmlTag($txt);
-            	$ret = $tag->Execute();	            	
-            break;    
+            	$ret = $tag->Execute();
+            break;
             case "itemcount":
                /*
                @field:cat.itemcount
@@ -1176,7 +1177,7 @@
             	   $txt = "<inp:m_itemcount _CatId=\"".$this->Get("CategoryId")."\" _SubCats=\"1\" ";
             	   $txt .=" _ListType=\"category\" _CountCurrent=\"1\" _ForceUpdate=\"$ForceUpdate\" _ItemType=\"$TypeId\" _GroupOnly=\"$GroupOnly\" />";
             	   $tag = new clsHtmlTag($txt);
-            	   $ret = $tag->Execute();	
+            	   $ret = $tag->Execute();
             	   //echo "Category parseobject: $ret<br>";
                  }
                  else
@@ -1190,11 +1191,11 @@
             case "totalitems":
                /*
                @field:cat.totalitems
-               @description:returns the number of items in the category and all subcategories               
-               */           
-                $ret = $this->ItemCount();               
+               @description:returns the number of items in the category and all subcategories
+               */
+                $ret = $this->ItemCount();
             break;
-            
+
             case 'modified':
             	$ret = '';
             	$date = $this->Get('Modified');
@@ -1214,14 +1215,14 @@
             		$ret = ($date <= 0) ? '' : LangDate($date);
             	}
             	break;
-            
+
             case "itemdate":
             	/*
             	@field:cat.itemdate
             	@description:Returns the date the cache count was last updated
             	@attrib:_itemtype:Item name to check
   				@attrib:_tz:bool:Convert the date to the user's local time
-  				@attrib:_part::Returns part of the date.  The following options are available: month,day,year,time_24hr,time_12hr            	
+  				@attrib:_part::Returns part of the date.  The following options are available: month,day,year,time_24hr,time_12hr
             	*/
                 $typestr = $element->GetAttributeByName('_itemtype');
                 $type = $objItemTypes->GetTypeByName($typestr);
@@ -1233,9 +1234,9 @@
                     {
                     	$date = $cc->Get("LastUpdate");
                     }
-                    else  
+                    else
                       $date = "";
-                      
+
                     //$date = $this->GetCacheCountDate($TypeId);
                     if( $element->GetAttributeByName('_tz') )
                     {
@@ -1264,8 +1265,8 @@
             	/*
  				@field:cat.new
  				@description:returns text if category's status is "new"
-  				@attrib:_label:lang: Text to return if status is new            
-  				*/            
+  				@attrib:_label:lang: Text to return if status is new
+  				*/
                 if($this->IsNewItem())
                 {
                   $ret = $element->GetAttributeByName('_label');
@@ -1280,8 +1281,8 @@
             	/*
  				@field:cat.pick
  				@description:returns text if article's status is "hot"
-  				@attrib:_label:lang: Text to return if status is "hot"            
-  				*/               
+  				@attrib:_label:lang: Text to return if status is "hot"
+  				*/
                 if($this->Get("EditorsPick")==1)
                 {
                   $ret = $element->GetAttributeByName('_label');
@@ -1292,49 +1293,49 @@
                 else
                    $ret = "";
             	break;
-                        
+
             case "parsetag":
             	/*
  				@field:cat.parsetag
  				@description:returns a tag output with this categoriy set as a current category
-  				@attrib:_tag:: tag name            
-  				*/               
-                
+  				@attrib:_tag:: tag name
+  				*/
+
   				$tag = new clsHtmlTag();
                 $tag->name = $element->GetAttributeByName('_tag');
-                $tag->attributes = $element->attributes;               
-                $tag->attributes["_catid"] = $this->Get("CategoryId"); 
-                $ret = $tag->Execute();               
+                $tag->attributes = $element->attributes;
+                $tag->attributes["_catid"] = $this->Get("CategoryId");
+                $ret = $tag->Execute();
             	break;
-            	
-           
+
+
             /*
             @field:cat.relevance
            	@description:Displays the category relevance in search results
   			@attrib:_displaymode:: How the relevance should be displayed<br>
   				<UL>
-  					<LI>"Numerical": Show the decimal value 
+  					<LI>"Numerical": Show the decimal value
   				    <LI>"Bar": Show the HTML representing the relevance. Returns two HTML cells &lg;td&lt; with specified background colors
   				    <LI>"Graphical":Show image representing the relevance
-  				</UL>  
+  				</UL>
 			@attrib:_onimage::Zero relevance image shown in graphical display mode. Also used as prefix to build other images (i.e. prefix+"_"+percentage+".file_extension"
 			@attrib:_OffBackGroundColor::Off background color of HTML cell in bar display mode
-			@attrib:_OnBackGroundColor::On background color of HTML cell in bar display mode           
-            */  
-            
+			@attrib:_OnBackGroundColor::On background color of HTML cell in bar display mode
+            */
+
             }
             if( !isset($ret) ) $ret = parent::ParseObject($element);
-            
+
         }
         return $ret;
     }
 
 
     function parsetag($tag)
-    { 
+    {
         global $objConfig,$objUsers, $m_var_list, $m_var_list_update;
         if(is_object($tag))
-        {        
+        {
             $tagname = $tag->name;
         }
         else
@@ -1344,10 +1345,10 @@
         {
           case "cat_id":
                 return $this->Get("CategoryId");
-                break;        
+                break;
           case "cat_parent":
                 return $this->Get("ParentId");
-                break;  
+                break;
           case "cat_fullpath":
                 return $this->Get("CachedNavbar");
                 break;
@@ -1359,7 +1360,7 @@
                 break;
           case "cat_priority":
                 if($this->Get("Priority")!=0)
-                {               
+                {
                   return (int)$this->Get("Priority");
                 }
                 else
@@ -1436,9 +1437,9 @@
                 $ret = "addcategory.php?env=" . BuildEnv();
                 unset($m_var_list_update["id"]);
                 return $ret;
-                break;        
+                break;
 
-            case "cat_date":               
+            case "cat_date":
                 return LangDate($this->Get("CreatedOn"), 0, true);
                 break;
             case "cat_num_cats":
@@ -1470,21 +1471,21 @@
           $nav = "";
           //echo "Rebuilding Navbar..<br>\n";
           if(strlen($this->Get("ParentPath"))==0)
-          {   
+          {
             $this->UpdateCachedPath();
           }
           $cats = explode("|",substr($this->Get("ParentPath"),1,-1));
-          
+
           foreach($cats as $catid)
-          { 
+          {
               $cat =& $objCatList->GetCategory($catid);
               if(is_object($cat))
-              { 
+              {
                   if(strlen($cat->Get("Name")))
-                      $names[] = $cat->Get("Name");   
-                
+                      $names[] = $cat->Get("Name");
+
               }
-          }       
+          }
           $nav = implode(">", $names);
           $this->Set("CachedNavbar",$nav);
           $this->Update();
@@ -1506,7 +1507,7 @@
     		UpdateCategoryCount(0,$CatId);
     	}
     }*/
-    
+
     /**
     * @return void
     * @param int $date
@@ -1516,16 +1517,16 @@
     {
     	$parents = $this->Get('ParentPath');
     	if (!$parents) return false;
-    		
+
     	$parents = substr($parents, 1, strlen($parents) - 2 );
     	$parents = explode('|', $parents);
-    	
+
     	$db =&GetADODBConnection();
     	$sql = 'UPDATE '.$this->tablename.' SET Modified = '.$date.' WHERE CategoryId IN ('.implode(',', $parents).')';
     	$db->Execute($sql);
     }
-    
-      
+
+
 }
 
 class clsCatList extends clsItemList //clsItemCollection
@@ -1556,14 +1557,14 @@
   function GetCountSQL($PermName,$CatId=NULL, $GroupId=NULL, $AdditonalWhere="")
   {
   	global $objSession, $objPermissions, $objCatList;
-  	
+
   	$ltable = $this->SourceTable;
     $acl = $objSession->GetACLClause();
     $cattable = GetTablePrefix()."CategoryItems";
     $CategoryTable = GetTablePrefix()."Category";
-    $ptable = GetTablePrefix()."PermCache";  	
+    $ptable = GetTablePrefix()."PermCache";
     $VIEW = $objPermissions->GetPermId($PermName);
-  	
+
   	$sql = "SELECT count(*) as CacheVal FROM $ltable ";
     $sql .="INNER JOIN $ptable ON ($ltable.CategoryId=$ptable.CategoryId) ";
     $sql .="WHERE ($acl AND PermId=$VIEW AND $ltable.Status=1) ";
@@ -1573,7 +1574,7 @@
       $sql .= "AND (".$AdditonalWhere.")";
     }
     return $sql;
-  }  
+  }
 
   function CountCategories($attribs)
   {
@@ -1586,56 +1587,56 @@
     }
     if((int)$cat>0)
         $c = $this->GetCategory($cat);
-        
+
   	if( getArrayValue($attribs,'_subcats') && $cat>0)
     {
        $ParentWhere = "(ParentPath LIKE '".$c->Get("ParentPath")."%' AND ".$this->SourceTable.".CategoryId != $cat)";
     }
     if( getArrayValue($attribs,'_today') )
     {
-      $today = adodb_mktime(0,0,0,adodb_date("m"),adodb_date("d"),adodb_date("Y"));             
-      $TodayWhere = "(CreatedOn>=$today)";	
+      $today = adodb_mktime(0,0,0,adodb_date("m"),adodb_date("d"),adodb_date("Y"));
+      $TodayWhere = "(CreatedOn>=$today)";
     }
     else
     {
     	$TodayWhere = '';
     }
     if( getArrayValue($attribs,'_grouponly') )
 	{
-	   $GroupList = $objSession->Get("GroupList");	    	  
+	   $GroupList = $objSession->Get("GroupList");
 	}
-	else        		
+	else
 	   $GroupList = NULL;
-	       	
+
 	$where = "";
 	if(strlen($ParentWhere))
 	{
-	  $where = $ParentWhere;    
+	  $where = $ParentWhere;
 	}
 	if(strlen($TodayWhere))
 	{
-	  if(strlen($where))	       		
+	  if(strlen($where))
 	     $where .=" AND ";
 	   $where .= $TodayWhere;
 	}
     $sql = $this->GetCountSQL("CATEGORY.VIEW",$cat,$GroupList,$where);
-    
+
 //    echo "SQL: ".$sql."<BR>";
-    
-	$rs = $this->adodbConnection->Execute($sql);  
+
+	$rs = $this->adodbConnection->Execute($sql);
 	if($rs && !$rs->EOF)
 	{
-	   $ret = $rs->fields["CacheVal"];		  
+	   $ret = $rs->fields["CacheVal"];
 	}
 	else
 	  $ret = 0;
-	  
-	return $ret;  
-  }         
-    
+
+	return $ret;
+  }
+
   function CurrentCategoryID()
   {
-      global $m_var_list;      
+      global $m_var_list;
       return (int)$m_var_list["cat"];
   }
 
@@ -1660,63 +1661,63 @@
       return $this->GetItemByField("ResourceId",$ResId);
   }
 
-  function QueryOrderByClause($EditorsPick=FALSE,$Priority=FALSE,$UseTableName=FALSE)  
+  function QueryOrderByClause($EditorsPick=FALSE,$Priority=FALSE,$UseTableName=FALSE)
   {
   	global $objSession;
-  	
+
     if($UseTableName)
     {
       $TableName = $this->SourceTable.".";
     }
     else
-      $TableName = "";	
+      $TableName = "";
 
     $Orders = array();
 
-    if($EditorsPick)  
+    if($EditorsPick)
     {
     	$Orders[] = $TableName."EditorsPick DESC";
     }
     if($Priority)
     {
-       $Orders[] = $TableName."Priority DESC";  	
+       $Orders[] = $TableName."Priority DESC";
     }
-  
+
   	$FieldVar = "Category_Sortfield";
     $OrderVar = "Category_Sortorder";
-       	 	   
+
     if(is_object($objSession))
     {
-      if(strlen($objSession->GetPersistantVariable($FieldVar))>0)  
-      {  	
-      		$Orders[] = trim($TableName.$objSession->GetPersistantVariable($FieldVar) . " ". 
-          		       $objSession->GetPersistantVariable($OrderVar));            	
+      if(strlen($objSession->GetPersistantVariable($FieldVar))>0)
+      {
+      		$Orders[] = trim($TableName.$objSession->GetPersistantVariable($FieldVar) . " ".
+          		       $objSession->GetPersistantVariable($OrderVar));
       }
     }
 
   	$FieldVar = "Category_Sortfield2";
     $OrderVar = "Category_Sortorder2";
-       	 	   
+
     if(is_object($objSession))
     {
-      if(strlen($objSession->GetPersistantVariable($FieldVar))>0)  
-      {  		
-      		$Orders[] = trim($TableName.$objSession->GetPersistantVariable($FieldVar) . " ". 
-          		       $objSession->GetPersistantVariable($OrderVar));            	
+      if(strlen($objSession->GetPersistantVariable($FieldVar))>0)
+      {
+      		$Orders[] = trim($TableName.$objSession->GetPersistantVariable($FieldVar) . " ".
+          		       $objSession->GetPersistantVariable($OrderVar));
       }
     }
-    
-    
+
+
     if(count($Orders)>0)
     {
     	$OrderBy = "ORDER BY ".implode(", ",$Orders);
     }
-    else   
+    else
       $OrderBy="";
-    return $OrderBy; 
+    return $OrderBy;
   }
-  
 
+
 	function LoadCategories($where="", $orderBy = "", $no_limit = true, $fix_method = 'set_first')
   	{
       	// load category list using $where clause
@@ -1725,7 +1726,7 @@
       	// in case if stored page is greather then page count issue page_fixing with
       	// method specified (see "FixInvalidPage" method for details)
       	$PerPage = $this->GetPerPage();
-      
+
       	$this->QueryItemCount = TableCount($this->SourceTable,$where,0);
       	if($no_limit == false)
       	{
@@ -1734,13 +1735,13 @@
       	    $limit = "LIMIT ".$Start.",".$PerPage;
       	}
       	else
-      		$limit = NULL;           
-      
+      		$limit = NULL;
+
       	return $this->Query_Category($where, $orderBy, $limit);
   	}
 
   function Query_Category($whereClause="",$orderByClause="",$limit=NULL)
-  {   
+  {
     global $m_var_list, $objSession, $Errors, $objPermissions;
     $GroupID = $objSession->Get("GroupID");
     $resultset = array();
@@ -1749,11 +1750,11 @@
    $ptable = GetTablePrefix()."PermCache";
    $CAT_VIEW = $objPermissions->GetPermId("CATEGORY.VIEW");
    if(!$objSession->HasSystemPermission("ADMIN"))
-   {   
+   {
      $sql = "SELECT * FROM $table INNER JOIN $ptable ON ($ptable.CategoryId=$table.CategoryId)";
-     $acl_where = $objSession->GetACLClause(); 
+     $acl_where = $objSession->GetACLClause();
      if(strlen($whereClause))
-     {    
+     {
         $sql .= " WHERE ($acl_where) AND PermId=$CAT_VIEW AND ".$whereClause;
      }
      else
@@ -1772,7 +1773,7 @@
     //echo "SQL: $sql<br>";
     return $this->Query_item($sql);
   }
-  
+
   function CountPending()
   {
       return TableCount($this->SourceTable,"Status=".STATUS_PENDING,0);
@@ -1786,7 +1787,7 @@
 
       $PerPage = $this->GetPerPage();
       $NumPages = ceil( $this->GetNumPages($PerPage) );
-      
+
       if($NumPages == 1 && $HideEmpty) return '';
 
       if(strlen($dest_template))
@@ -1844,11 +1845,11 @@
       unset($m_var_list_update,$var_list_update["t"] );
       return $o;
   }
-	
+
   	function GetAdminPageLinkList($url)
   	{
       	global $objConfig, $m_var_list_update, $var_list_update, $var_list;
-		
+
 		$PerPage = $this->GetPerPage();
       	$NumPages = ceil($this->GetNumPages($PerPage));
       	$o = "";
@@ -1880,29 +1881,29 @@
           	else
               $o .= "<SPAN class=\"CURRENT_PAGE\">$p</SPAN>";
       	}
-      	
+
       	if($this->Page < $NumPages)
          	$o .= "<A HREF=\"$next_url\" class=\"NAV_URL\">>></A>";
 
-      	return $o;        
+      	return $o;
   	}
 
   function Search_Category($orderByClause)
   {
-    global $objSession, $objConfig, $Errors;    
+    global $objSession, $objConfig, $Errors;
 
     $PerPage = $this->GetPerPage();
     $Start = ($this->Page-1) * $PerPage;
     $objResults = new clsSearchResults("Category","clsCategory");
     $this->Clear();
     $this->Categories = $objResults->LoadSearchResults($Start,$PerPage);
-    
+
     return $this->Categories;
   }
 
 
   function GetSubCats($ParentCat)
-  {   
+  {
       return $this->Query_Category("ParentId=".$ParentCat,"");
   }
 
@@ -1931,7 +1932,7 @@
   }
 
   function cat_navbar($admin=0, $cat, $target_template, $separator = " > ", $LinkLeaf = FALSE,
-  					  $root = 0,$RootTemplate="",$modcat=0, $ModTemplate="", $LinkRoot = FALSE)  					 
+  					  $root = 0,$RootTemplate="",$modcat=0, $ModTemplate="", $LinkRoot = FALSE)
   {
     // draw category navigation bar (at top)
     global $Errors, $var_list_update, $var_list, $m_var_list_update, $m_var_list, $objConfig;
@@ -1941,13 +1942,13 @@
 	if( GetVar('new') ) $url_params['new'] = GetVar('new');
 	if( GetVar('destform') ) $url_params['destform'] = GetVar('destform');
 	if( GetVar('destfield') ) $url_params['destfield'] = GetVar('destfield');
-	
+
     $nav = "";
-    $m_var_list_update["p"]=1;   
+    $m_var_list_update["p"]=1;
     if(strlen($target_template)==0)
       $target_template = $var_list["t"];
-   
-   
+
+
     if($cat == 0)
     {
         $cat_name = language($objConfig->Get("Root_Name"));
@@ -1962,15 +1963,15 @@
     {
       $nav = array();
       $c =& $this->GetCategory($cat);
-      $nav_unparsed = $c->Get("ParentPath");    
+      $nav_unparsed = $c->Get("ParentPath");
       if(strlen($nav_unparsed)==0)
-      {  
+      {
         $c->UpdateCachedPath();
         $nav_unparsed = $c->Get("ParentPath");
       }
       //echo " Before $nav_unparsed ";
       if($root)
-      {      
+      {
         $r =& $this->GetCategory($root);
         $rpath = $r->Get("ParentPath");
         $nav_unparsed = substr($nav_unparsed,strlen($rpath),-1);
@@ -1981,8 +1982,8 @@
           $nav[] = "<span class=\"NAV_CURRENT_ITEM\" >".$cat_name."</span>";         //href=\"browse.php?env=". BuildEnv() ."\"
         }
         else
-        {          
-          if ($admin == 1)       
+        {
+          if ($admin == 1)
           {
             $nav[] = "<a class=\"control_link\" href=\"".HREF_Wrapper('', $url_params)."\">".$cat_name."</a>";
           }
@@ -2001,7 +2002,7 @@
         }
       }
       else
-      {      
+      {
         $nav_unparsed = substr($nav_unparsed,1,-1);
         $cat_name = language($objConfig->Get("Root_Name"));
         $m_var_list_update["cat"] = 0;
@@ -2010,8 +2011,8 @@
           $nav[] = "<span class=\"NAV_CURRENT_ITEM\" >".$cat_name."</span>";         //href=\"browse.php?env=". BuildEnv() ."\"
         }
         else
-        {          
-          if ($admin == 1)       
+        {
+          if ($admin == 1)
           {
             $nav[] = "<a class=\"control_link\" href=\"".HREF_Wrapper('', $url_params)."\">".$cat_name."</a>";
           }
@@ -2026,36 +2027,36 @@
             $nav[] = "<a class=\"navbar\" href=\"".HREF_Wrapper('', $url_params)."\">".$cat_name."</a>";
           }
         }
-        
+
       }
       //echo " After $nav_unparsed <br>\n";
       if(strlen($target_template)==0)
-        $target_template = $var_list["t"];    
-        
+        $target_template = $var_list["t"];
+
       $cats = explode("|", $nav_unparsed);
       foreach($cats as $catid)
       {
           if($catid)
-          {          
+          {
             $c =& $this->GetCategory($catid);
             if(is_object($c))
-            {          
+            {
               $cat_name = $c->Get("Name");
-          
+
               $m_var_list_update["cat"] = $catid;
               if($catid==$modcat && strlen($ModTemplate)>0)
               {
               	$t = $ModTemplate;
               }
-              else 
+              else
               	$t = $target_template;
               if($cat == $catid && !$LinkLeaf)
               {
                 $nav[] = "<span class=\"NAV_CURRENT_ITEM\" >".$cat_name."</span>";
               }
               else
-              {          
-                if ($admin == 1)       
+              {
+                if ($admin == 1)
                 {
                   $nav[] = "<a class=\"control_link\" href=\"".HREF_Wrapper('', $url_params)."\">".$cat_name."</a>";
                 }
@@ -2066,17 +2067,17 @@
                   unset($var_list_update["t"]);
                 }
               }
-             unset($m_var_list_update["cat"]); 
+             unset($m_var_list_update["cat"]);
             }
-          }          
+          }
       }
       $nav = implode($separator, $nav);
     }
     return $nav;
   }
 
 
-	function &Add_NEW($fields_hash)
+	function &Add_NEW($fields_hash, $from_import = false)
 	{
   		global $objSession;
   		
@@ -2096,21 +2097,24 @@
 	  	}
 	
 	  	$d->Create();
-	  	if ($d->Get('Status') == STATUS_ACTIVE) {
-	  		$d->SendUserEventMail("CATEGORY.ADD", $objSession->Get("PortalUserId"));
-	  		$d->SendAdminEventMail("CATEGORY.ADD");
+	  	
+	  	if (!$from_import) {
+		  	if ($d->Get('Status') == STATUS_ACTIVE) {
+		  		$d->SendUserEventMail("CATEGORY.ADD", $objSession->Get("PortalUserId"));
+		  		$d->SendAdminEventMail("CATEGORY.ADD");
+		  	}
+		  	else
+		  	{
+		  		$d->SendUserEventMail("CATEGORY.ADD.PENDING", $objSession->Get("PortalUserId"));
+		  		$d->SendAdminEventMail("CATEGORY.ADD.PENDING");
+		  	}
+		  	$d->UpdateCachedPath();
 	  	}
-	  	else
-	  	{
-	  		$d->SendUserEventMail("CATEGORY.ADD.PENDING", $objSession->Get("PortalUserId"));
-	  		$d->SendAdminEventMail("CATEGORY.ADD.PENDING");
-	  	}
-	  	$d->UpdateCachedPath();
 	  	return $d;
 	}
   
 	function &Add(	$ParentId, $Name, $Description, $CreatedOn, $EditorsPick, $Status, $Hot, $New, $Pop,
-                	$Priority, $MetaKeywords,$MetaDesc, $auto_filename = 1, $filename = '')  
+                	$Priority, $MetaKeywords,$MetaDesc, $auto_filename = 1, $filename = '')
 	{
 		global $objSession;
 
@@ -2119,13 +2123,13 @@
 		$d = new clsCategory(NULL);
 		$filename = $d->StripDisallowed($filename);
 		$d->tablename = $this->SourceTable;
-		
+
 		if( $d->UsingTempTable() ) $d->Set('CategoryId', -1);
 		$d->idfield = 'CategoryId';
-		
-		$d->Set(Array(	'ParentId', 'Name', 'Description', 'CreatedOn',  'EditorsPick', 'Status', 'HotItem', 
+
+		$d->Set(Array(	'ParentId', 'Name', 'Description', 'CreatedOn',  'EditorsPick', 'Status', 'HotItem',
 		            	'NewItem','PopItem', 'Priority', 'MetaKeywords', 'MetaDescription', 'CreatedById',
-		            	'AutomaticFilename', 'Filename'), 
+		            	'AutomaticFilename', 'Filename'),
 		      	Array(	$ParentId, $Name, $Description, $CreatedOn, $EditorsPick, $Status, $Hot, $New,
 		            	$Pop, $Priority, $MetaKeywords,$MetaDesc, $UserId, $auto_filename, $filename) );
 
@@ -2163,19 +2167,19 @@
   function Move_Category($Id, $ParentTo)
   {
       global $objCatList;
-      
+
       $d =& $this->GetCategory($Id);
-      $oldparent = $d->Get("ParentId");      
+      $oldparent = $d->Get("ParentId");
       $ChildList = $d->GetSubCatIds();
-      
+
       /*
       echo "Target Parent Id: $ParentTo <br>\n";
       echo "<PRE>";print_r($ChildList); echo "</PRE>";
       echo "Old Parent: $oldparent <br>\n";
       echo "ID: $Id <br>\n";
       */
       /* sanity checks */
-      
+
       if(!in_array($ParentTo,$ChildList) && $oldparent != $ParentTo && $oldparent != $Id &&
       	 $Id != $ParentTo)
       {
@@ -2186,15 +2190,15 @@
           RunUp($oldparent, "Decrement_Count");
           RunUp($ParentTo, "Increment_Count");
           RunDown($ParentTo, "UpdateCachedPath");
-          return TRUE; 
+          return TRUE;
       }
-      else 
+      else
       {
 		   	global $Errors;
       		$Errors->AddAdminUserError("la_error_move_subcategory");
         	return FALSE;
-      }      
-      die();  
+      }
+      die();
   }
 
   function Copy_CategoryTree($Id, $ParentTo)
@@ -2210,7 +2214,7 @@
         if ($result && !$result->EOF)
         {
           while(!$result->EOF)
-          {       
+          {
               $this->Copy_CategoryTree($result->fields["CategoryId"], $new);
               $result->MoveNext();
           }
@@ -2220,19 +2224,19 @@
   }
 
   function Copy_Category($Id, $ParentTo)
-  {        
+  {
       global $objGroups;
 
-      
+
       $src = $this->GetCategory($Id);
       $Children = $src->GetSubCatIds();
       if($Id==$ParentTo || in_array($ParentTo,$Children))
       {
       	/* sanity error here */
       	global $Errors;
-      	$Errors->AddAdminUserError("la_error_copy_subcategory");      	
+      	$Errors->AddAdminUserError("la_error_copy_subcategory");
       	return 0;
-      }      
+      }
       $dest = $src;
       $dest->Set("ParentId", $ParentTo);
       if ($src->get("ParentId") == $ParentTo)
@@ -2251,20 +2255,20 @@
     		    $Name = $parts[2]." ".$parts[3];
     		  }
     		  else
-    		    $Name = $OldName; 
+    		    $Name = $OldName;
     	}
     	else
-    	  $Name = $OldName;      	
+    	  $Name = $OldName;
     	//echo "New Name: $Name<br>";
-		$dest->Set("Name", $Name);    	  
-		$Names = CategoryNameCount($ParentTo,$Name); 
+		$dest->Set("Name", $Name);
+		$Names = CategoryNameCount($ParentTo,$Name);
 		//echo "Names Count: ".count($Names)."<br>";
     	if(count($Names)>0)
-    	{    		
+    	{
     		$NameCount = count($Names);
     		$found = FALSE;
     		$NewName = "Copy of $Name";
-    		
+
     		if(!in_array($NewName,$Names))
     		{
     			//echo "Matched on $NewName in:<br>\n";
@@ -2281,55 +2285,55 @@
     					$found = TRUE;
     					break;
     				}
-    				
+
     			}
-    		}    	
+    		}
     		if(!$found)
     		{
     			$NameCount++;
     			$NewName = "Copy $NameCount of $Name";
-    		} 
+    		}
     		//echo "New Name: $NewName<br>";
-            $dest->Set("Name",$NewName);      
+            $dest->Set("Name",$NewName);
     	}
-    	
+
       }
       $dest->UnsetIdField();
       $dest->Set("CachedDescendantCatsQty",0);
       $dest->Set("ResourceId",NULL);
       $dest->Set('Filename', '');
-      $dest->Create();      
-      $dest->UpdateCachedPath();     
+      $dest->Create();
+      $dest->UpdateCachedPath();
       $p = new clsPermList();
-      $p->Copy_Permissions($src->Get("CategoryId"),$dest->Get("CategoryId"));   
+      $p->Copy_Permissions($src->Get("CategoryId"),$dest->Get("CategoryId"));
       $glist =  $objGroups->GetAllGroupList();
       $view = $p->GetGroupPermList($dest, "CATEGORY.VIEW", $glist);
       $dest->SetViewPerms("CATEGORY.VIEW",$view,$glist);
       RunUp($ParentTo, "Increment_Count");
-      return $dest->Get("CategoryId");     
+      return $dest->Get("CategoryId");
   }
 
   function Delete_Category($Id)
   {
       global $objSession;
 
       $d =& $this->GetCategory($Id);
-      
+
       if(is_object($d))
-      {      
+      {
         if($d->Get("CategoryId")==$Id)
-        {    
+        {
           $d->SendUserEventMail("CATEGORY.DELETE",$objSession->Get("PortalUserId"));
           $d->SendAdminEventMail("CATEGORY.DELETE");
-          $p =& $this->GetCategory($d->Get("ParentId"));        
+          $p =& $this->GetCategory($d->Get("ParentId"));
           RunDown($d->Get("CategoryId"), "Delete");
-          RunUp($p->Get("CategoryId"), "Decrement_Count");   
+          RunUp($p->Get("CategoryId"), "Decrement_Count");
           RunUp($d->Get("CategoryId"),"ClearCacheData");
 
         }
       }
   }
-  
+
   function PasteFromClipboard($TargetCat)
   {
         global $objSession;
@@ -2342,17 +2346,17 @@
 
             $item_ids = explode(",",$ClipBoard["ids"]);
             for($i=0;$i<count($item_ids);$i++)
-            {   
+            {
                 $ItemId = $item_ids[$i];
                 $item = $this->GetItem($item_ids[$i]);
                 if(!$IsCopy)
-                { 
-                    $this->Move_Category($ItemId, $TargetCat);                    
+                {
+                    $this->Move_Category($ItemId, $TargetCat);
                     $clip = str_replace("CUT","COPY",$clip);
                     $objSession->SetVariable("ClipBoard",$clip);
                 }
                 else
-                {              
+                {
                   $this->Copy_CategoryTree($ItemId,$TargetCat);
                 }
             }
@@ -2361,7 +2365,7 @@
 
 
   function NumChildren($ParentID)
-  {   
+  {
    $cat_filter = "m_cat_filter";
    global $$cat_filter;
 
@@ -2393,9 +2397,9 @@
           $c->SetFromArray($data);
           $c->UpdateCachedPath();
           $rs->MoveNext();
-      }      
+      }
   }
- 
+
   function CopyFromEditTable($idfield)
   {
       global $objGroups, $objSession, $objPermList;
@@ -2410,11 +2414,11 @@
       {
           $data = $rs->fields;
           $c = new $this->classname;
-          $c->SetFromArray($data);          
-          $c->Dirty();          
-          
+          $c->SetFromArray($data);
+          $c->Dirty();
+
           if($c->Get("CategoryId")>0)
-          {          
+          {
             $c->Update();
           }
           else
@@ -2424,13 +2428,13 @@
               $sql = "UPDATE ".GetTablePrefix()."Permissions SET CatId=".$c->Get("CategoryId")." WHERE CatId=-1";
               $this->adodbConnection->Execute($sql);
           }
-          $c->UpdateCachedPath();                     
+          $c->UpdateCachedPath();
           $c->UpdateACL();
           $c->SendUserEventMail("CATEGORY.MODIFY",$objSession->Get("PortalUserId"));
           $c->SendAdminEventMail("CATEGORY.MODIFY");
           $c->Related = new clsRelationshipList();
           if(is_object($c->Related))
-          {            
+          {
             $r = $c->Related;
             $r->CopyFromEditTable($c->Get("ResourceId"));
           }
@@ -2445,8 +2449,8 @@
 		unset($GLOBALS['_CopyFromEditTable']);
       return $item_ids;
       //$this->UpdateMissingCacheData();
-  }   
-  
+  }
+
   function PurgeEditTable($idfield)
   {
   	 parent::PurgeEditTable($idfield);
@@ -2472,65 +2476,65 @@
               $p = substr($path,0,strlen($rpath));
               //echo $rpath." vs. .$p [$path]<br>\n";
               if($rpath==$p)
-              {              
+              {
                   $itemtype = $Type;
                   break;
               }
-          }      
+          }
       }
       return $itemtype;
   }
 }
 
 function RunUp($Id, $function, $Param=NULL)
-{     
+{
     global $objCatList;
 
    $d =  $objCatList->GetCategory($Id);
    $ParentId = $d->Get("ParentId");
    if ($ParentId == 0)
     {
         if($Param == NULL)
-        {        
+        {
         	$d->$function();
         }
         else
-        {            
+        {
             $d->$function($Param);
         }
     }
    else
    {
       	RunUp($ParentId, $function, $Param);
         if($Param == NULL)
-        {        
+        {
         $d->$function();
         }
         else
-        {               
+        {
             $d->$function($Param);
         }
 
    }
-   
+
 }
 
 function RunDown($Id, $function, $Param=NULL)
 {
     global $objCatList;
 
-   $adodbConnection = &GetADODBConnection(); 
+   $adodbConnection = &GetADODBConnection();
    $sql = "select CategoryId from ".GetTablePrefix()."Category where ParentId='$Id'";
    $rs = $adodbConnection->Execute($sql);
-  
-   while($rs && !$rs->EOF) 
-   {  
-      RunDown($rs->fields["CategoryId"], $function, $Param);           
+
+   while($rs && !$rs->EOF)
+   {
+      RunDown($rs->fields["CategoryId"], $function, $Param);
       $rs->MoveNext();
    }
    $d = $objCatList->GetCategory($Id);
     if($Param == NULL)
-    {        
+    {
       $d->$function();
     }
     else
Index: trunk/kernel/include/customfield.php
===================================================================
diff -u -N -r4435 -r4446
--- trunk/kernel/include/customfield.php	(.../customfield.php)	(revision 4435)
+++ trunk/kernel/include/customfield.php	(.../customfield.php)	(revision 4446)
@@ -199,7 +199,7 @@
           if(is_object($Item))
           {
           	  //$Table = $Item->Get("SourceTable");
-          	  $Table = GetTablePrefix()."CustomField";
+          	  $Table = 'CustomField';
           	  $Header = "la_text_".strtolower($Item->Get("ItemName"));
           	  $Module = $Item->Get("Module");
 //          	  $Desc = $FieldLabel;
@@ -222,10 +222,10 @@
  		  	  
 			  $dtable = GetTablePrefix()."CustomMetaData";
 			  $Join = "($dtable.ResourceId={Table}.ResourceId)";
-			  $objSearchConfig->AddSearchField($Table,$FieldName,$Module,$Type == 6 ? -1 : 0, 0,
+			  $objSearchConfig->AddSearchField($Table,$FieldName,$Module,$Type == 6 ? -1 : 0,0,
 			  									$FieldLabel,$desc,$Header,$NextOrder,0,
-			  									$ElementType,$Join, NULL, NULL, NULL, NULL,
-			  									$f->Get("CustomFieldId"), "CustomMetaData.Value");
+			  									$ElementType, NULL, NULL, NULL, NULL, NULL,
+			  									$f->Get("CustomFieldId"), NULL);
           }  
           return $f;
     	//}