Index: trunk/themes/default/common/footer.tpl
===================================================================
diff -u -r1566 -r1920
--- trunk/themes/default/common/footer.tpl	(.../footer.tpl)	(revision 1566)
+++ trunk/themes/default/common/footer.tpl	(.../footer.tpl)	(revision 1920)
@@ -9,7 +9,7 @@
 				<tr>
 					<td style="background: #009ff0 url('img/bgr_footer.jpg')" class="copyright"><img src="img/s.gif" width="740" height="1" alt="" /><br />Powered by  <a href="http://www.in-portal.net" target="_blank" style="color: #FFFFFF; text-decoration : none;">In-portal</a>&nbsp;&#174; 1997-2005, <a href="http://www.intechnic.com" target="_blank" style="color: #FFFFFF; text-decoration : none;">Intechnic Corporation</a>. All rights reserved.
 					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-					<a href="<inp:m_template_link _Template="sitemap.tpl" />" style="color: #FFFFFF; text-decoration : none;"><inp:m_language _Phrase="lu_site_map" /></a></td>
+					<a href="<inp:m_template_link _Template="sitemap" />" style="color: #FFFFFF; text-decoration : none;"><inp:m_language _Phrase="lu_site_map" /></a></td>
 					<td width="10000" bgcolor="#009ff0"><img src="img/s.gif" width="1" height="22" alt="" /><br /></td>
 				</tr>
 			</table>
Index: trunk/kernel/parser.php
===================================================================
diff -u -r1892 -r1920
--- trunk/kernel/parser.php	(.../parser.php)	(revision 1892)
+++ trunk/kernel/parser.php	(.../parser.php)	(revision 1920)
@@ -3609,47 +3609,44 @@
    	{
    		foreach ($objModules->Items as $curr_mod)
    		{
-   			if ($curr_mod->Get("Name") != "In-Portal")
+   			if( !$curr_mod->Get('Loaded') || ($curr_mod->Get('Name') == 'In-Portal') ) continue;
+   			
+   			$mod_name = (int)$curr_mod->Get('RootCat');
+   			if( !empty($mod_name) )
    			{
-	   			$mod_name = (int)$curr_mod->Get("RootCat");
-	   			if (!empty($mod_name))
-	   			{
-		   			if (!isset($modules[$mod_name]))   			  			
-		   				$modules[$mod_name] = $curr_mod->Get("TemplatePath");		
-		   			else
-		   				$modules[$mod_name] = "";		   			
-	   			}
-	   			else
-	   				$modules[$mod_name] = "";	   			
+   				$modules[$mod_name] = !isset($modules[$mod_name]) ? $curr_mod->Get('TemplatePath') : '';
    			}
+   			else
+   			{
+   				$modules[$mod_name] = '';
+   			}
    		}
    	}
    				
 	$_C_objCat = new clsCatList();
-	$_Where = GetTablePrefix()."Category.ParentId=$_RootCat AND Status=1";
+	$_Where = GetTablePrefix()."Category.ParentId = $_RootCat AND Status = 1";
 	$_OrderBy = " ORDER BY ".GetTablePrefix()."Category.Priority DESC ";
 	$_C_catList = $_C_objCat->LoadCategories($_Where, $_OrderBy, false);
 		
 	## getting TOP level categories
-	if (is_array($_C_catList) && count($_C_catList))
+	if( is_array($_C_catList) && count($_C_catList) )
 	{
 		$ret = "<TABLE $html_attribs><TR CLASS=\"m_list_cats\">";
 	    $ret.= "<TD valign=\"top\">";
 		
 		$CatCount = $_C_objCat->NumCategories();
-    	$per_row = ceil($CatCount/$cols);	
+    	$per_row = ceil($CatCount / $cols);
     	
-    	
 		foreach ($_C_catList as $cat)
 		{
 			$text = $cat->Get("Name");
 			$val = $cat->Get("CategoryId");			
 			$sub_path = $cat->Get("ParentPath");
 			 
 			$add_path = "";
-			if (is_array($modules))
+			if( is_array($modules) )
 			{
-				foreach ($modules as $curr => $v)
+				foreach($modules as $curr => $v)
 				{
 					if (strpos($sub_path, "|$curr|") !== false)
 					{
@@ -3658,6 +3655,7 @@
 					}	
 				}							
 			}
+			if(!$add_path) continue;
 			
 			$main_templ = $add_path.$MainItemTemplate;
 	        $ret.= $cat->ParseTemplate($main_templ);
@@ -3667,10 +3665,7 @@
 	         
 			$_C_objCatSubs = new clsCatList();
 			
-			if (empty($_RootCat))
-				$ParentPath = "|$val|%";
-			else			
-				$ParentPath = "|$_RootCat|$val|%";
+			$ParentPath = empty($_RootCat) ? '|'.$val.'|%' : '|'.$_RootCat.'|'.$val.'|%';
 				
 			$_Where = GetTablePrefix()."Category.ParentPath LIKE '$ParentPath' AND ".GetTablePrefix()."Category.CategoryId!=$val AND Status=1";
 			$_OrderBy = " ORDER BY ".GetTablePrefix()."Category.ParentPath ASC, ".GetTablePrefix()."Category.Name ASC";