Index: trunk/kernel/units/general/helpers/mod_rewrite_helper.php
===================================================================
diff -u -N -r5340 -r5558
--- trunk/kernel/units/general/helpers/mod_rewrite_helper.php	(.../mod_rewrite_helper.php)	(revision 5340)
+++ trunk/kernel/units/general/helpers/mod_rewrite_helper.php	(.../mod_rewrite_helper.php)	(revision 5558)
@@ -8,180 +8,278 @@
 			$this->HTTPQuery =& $this->Application->recallObject('HTTPQuery');
 		}
 
-		function processRewriteURL()
+		function SetDefaultValues()
 		{
-			// directory_1_2_3/sc1/inlink/detail/3/l1_ka_asd.html
-
-			$url = $this->HTTPQuery->Get('_mod_rw_url_');
-			if( substr($url, -5) == '.html' ) $url = substr($url, 0, strlen($url) - 5 );
-
-			$url_parts = $url ? explode('/', $url) : Array();
-
-			$process_module = true;
-			if($this->HTTPQuery->Get('rewrite') == 'on' || !$url_parts)
+			$defaults = Array('m_cat_id' => 0, 'm_cat_page' => 1, 'm_opener' => 's');
+			foreach ($defaults as $default_key => $default_value)
 			{
-				// set default values
-				$defaults = Array('m_cat_id' => 0, 'm_cat_page' => 1, 'm_opener' => 's');
-				foreach ($defaults as $default_key => $default_value)
-				{
-					if ($this->HTTPQuery->Get($default_key) == null) {
-						$this->HTTPQuery->Set($default_key, $default_value);
-					}
+				if ($this->HTTPQuery->Get($default_key) == null) {
+					$this->HTTPQuery->Set($default_key, $default_value);
 				}
 			}
+		}
 
-			if(!$url_parts)
-			{
-				$this->Application->Phrases = new PhrasesCache();
-				$this->Application->VerifyLanguageId();
-				$this->Application->Phrases->Init('phrases');
-				$this->Application->VerifyThemeId();
-
-				$this->HTTPQuery->Set('t', $this->HTTPQuery->getDefaultTemplate('') );
-				$this->HTTPQuery->finalizeParsing(Array('m'));
-				return false;
-			}
-			else
-			{
-				$this->HTTPQuery->Set('t', '');
-			}
-
+		function ProcessLanguage(&$url_parts)
+		{
+			if (!isset($url_parts[0])) return false;
+			$res = false;
 			$url_part = array_shift($url_parts);
 
-			// match language
 			$sql = 'SELECT LanguageId FROM '.TABLE_PREFIX.'Language WHERE LOWER(PackName) = '.$this->Conn->qstr($url_part).' AND Enabled = 1';
 			$language_id = $this->Conn->GetOne($sql);
 			$this->Application->Phrases = new PhrasesCache();
 			if($language_id)
 			{
 				$this->HTTPQuery->Set('m_lang', $language_id);
-				$url_part = $url_parts ? array_shift($url_parts) : ''; // prepare next url part for parsing
+				$res = true;
 			}
 
 			$this->Application->VerifyLanguageId();
+			if (!$res) {
+				array_unshift($url_parts, $url_part);
+			}
+			return $res;
+		}
 
-			// $this->HTTPQuery->Get('m_lang') );
+		function ProcessTheme(&$url_parts)
+		{
+			if (!isset($url_parts[0])) return false;
+			$res = false;
+			$url_part = array_shift($url_parts);
 
-			// match theme
-			if($url_part)
+			$sql = 'SELECT ThemeId FROM '.TABLE_PREFIX.'Theme WHERE LOWER(Name) = '.$this->Conn->qstr($url_part).' AND Enabled = 1';
+			$theme_id = $this->Conn->GetOne($sql);
+			if($theme_id)
 			{
-				$sql = 'SELECT ThemeId FROM '.TABLE_PREFIX.'Theme WHERE LOWER(Name) = '.$this->Conn->qstr($url_part).' AND Enabled = 1';
-				$theme_id = $this->Conn->GetOne($sql);
-				if($theme_id)
-				{
-					$this->HTTPQuery->Set('m_theme', $theme_id);
-					$url_part = $url_parts ? array_shift($url_parts) : ''; // prepare next url part for parsing
-				}
+				$this->HTTPQuery->Set('m_theme', $theme_id);
+				$res = true;
 			}
 			$this->Application->VerifyThemeId(); // verify anyway - will set default if not found!!!
+			if (!$res) {
+				array_unshift($url_parts, $url_part);
+			}
+			return $res;
+		}
 
-			// match category
+		function ProcessCategory(&$url_parts)
+		{
+			if (!isset($url_parts[0])) return false;
+			$res = false;
+			$url_part = array_shift($url_parts);
+
 			$category_id = 0;
-			if($url_part)
+			$last_category_id = 0;
+			$category_path = '';
+			do
 			{
-				$category_stack = Array();
-				$category_found = false;
-				$category_path = '';
-				$rets = Array(); // just in case someone has used this variable before
-				do
+				$category_path = trim($category_path.'/'.$url_part, '/');
+
+				if( preg_match('/(.*)_([\d]+)$/', $category_path, $rets) )
 				{
-					$category_path = trim($category_path.'/'.$url_part, '/');
+					$category_path = $rets[1];
+					$this->HTTPQuery->Set('m_cat_page', $rets[2]);
+				}
 
-					if( preg_match('/(.*)_([\d]+)$/', $category_path, $rets) )
-					{
-						$category_path = $rets[1];
-						$this->HTTPQuery->Set('m_cat_page', $rets[2]);
-					}
+				$category_id = $this->Conn->GetOne(
+						'SELECT CategoryId
+						FROM '.TABLE_PREFIX.'Category
+						WHERE NamedParentPath = '.$this->Conn->qstr($category_path));
+				if ($category_id !== false) {
+					$last_category_id = $category_id;
+					$url_part = array_shift($url_parts);
+					$res = true;
+				}
+			} while ($category_id !== false && $url_part);
+			$this->HTTPQuery->Set('m_cat_id', $last_category_id);
 
-					if ($category_path == '') {
-						// this is "Home" virtual category
-						array_push($category_stack, 0);
-					}
-					else {
-						$sql = 'SELECT CategoryId
-								FROM '.TABLE_PREFIX.'Category
-								WHERE NamedParentPath = '.$this->Conn->qstr($category_path);
-						array_push($category_stack, $this->Conn->GetOne($sql) );
-					}
+			if ($url_part) {
+				array_unshift($url_parts, $url_part);
+			}
+			return $res;
+		}
 
-					$category_found = end($category_stack);
-				if ($category_found !== false) $url_part = array_shift($url_parts);
+		function ProcessModuleIndex(&$url_parts)
+		{
+			if ( count($url_parts) != 0 ) return false;
 
-				}while ($category_found && $url_part);
+			$sql = 'SELECT CachedCategoryTemplate
+					FROM '.TABLE_PREFIX.'Category
+					WHERE CategoryId = '.$this->Application->GetVar('m_cat_id');
+			$this->HTTPQuery->Set('t', $this->HTTPQuery->getDefaultTemplate( $this->Conn->GetOne($sql) ) );
+			return true;
+		}
 
-				if (count($category_stack)) {
-					$category_id = array_pop($category_stack); // remove last not found category
-					if($category_id === false)
-					{
-						$category_id = array_pop($category_stack);
-					}
-					if($category_id !== false)
-					{
-						$this->HTTPQuery->Set('m_cat_id', $category_id);
-					}
-				}
-				elseif (!$category_found && getArrayValue($rets, 2)) {
+		function ProcessModuleItem(&$url_parts)
+		{
+			if (!isset($url_parts[0])) return false;
+			if ( count($url_parts) != 1 ) return false;
+			$url_part = array_shift($url_parts);
+
+			// match module reviews page
+			$page = 1;
+			if( preg_match('/(.*)_([\d]+)$/', $url_part, $rets) )
+			{
+				$url_part = $rets[1];
+				$page = $rets[2];
+			}
+
+			$cat_item = $this->Conn->GetRow('
+					SELECT ci.ItemPrefix, c.ParentPath, ci.CategoryId FORM '.TABLE_PREFIX.'CategoryItems AS ci
+					LEFT JOIN '.TABLE_PREFIX.'Category AS c
+					ON c.CategoryId = ci.CategoryId
+					WHERE
+						CategoryId = '.$this->Application->GetVar('m_cat_id').'
+						AND
+						Filename = '.$this->Conn->qstr($url_part));
+			if ($cat_item !== false) {
+				$module_prefix = $cat_item['ItemPrefix'];
+				$item_template = $category_data['CachedItemTemplate'];
+				if ($item_template) {
+					$url_parts = explode('/', $item_template);
+					array_push($url_parts, $url_part); // save item's filename as not processed
 					$url_part = array_shift($url_parts);
 				}
+				$this->Application->SetVar($cat_item['ItemPrefix'].'_id', $item_id);
 			}
 
 
-			if (!$url_part) {
-				// no more parts left in url
-				$process_module = false;
-				$sql = 'SELECT CachedCategoryTemplate
-						FROM '.TABLE_PREFIX.'Category
-						WHERE CategoryId = '.$category_id;
-				$category_template = $this->Conn->GetOne($sql);
-				if ($category_template) {
-					$category_template = explode('/', $category_template);
-					$url_part = array_shift($category_template);
-					$url_parts = $category_template;
+
+			$this->Application->SetVar( $event->getPrefixSpecial().'_Reviews_Page', $page);
+
+			// only filename left, no other parts
+			$process_module = false;
+			$sql = 'SELECT ParentPath, CachedItemTemplate, CachedCategoryTemplate
+					FROM '.TABLE_PREFIX.'Category
+					WHERE CategoryId = '.$this->Application->GetVar('m_cat_id');
+			$category_data = $this->Conn->GetRow($sql);
+
+
+
+			$root_category_id = array_shift( explode('|', substr($category_data['ParentPath'], 1, -1)) );
+			$module_info = $this->Application->findModule('RootCat', $root_category_id);
+			if ($module_info) {
+				$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->HTTPQuery->Get($module_prefix.'_id')) {
+					$item_template = $category_data['CachedItemTemplate'];
+					if ($item_template) {
+						$this->HTTPQuery->Set('t', $item_template );
+						return true;
+					}
 				}
-				else {
-					$url_part = 'index';
-				}
 			}
-			elseif ($url_part && count($url_parts) <= 1 && $category_id) {
-				// only filename left, no other parts
-				$process_module = false;
-				$sql = 'SELECT ParentPath, CachedItemTemplate, CachedCategoryTemplate
-						FROM '.TABLE_PREFIX.'Category
-						WHERE CategoryId = '.$category_id;
-				$category_data = $this->Conn->GetRow($sql);
+			array_unshift($url_parts, $url_part);
+			return false;
+		}
 
-				$root_category_id = array_shift( explode('|', substr($category_data['ParentPath'], 1, -1)) );
-				$module_info = $this->Application->findModule('RootCat', $root_category_id);
-				if ($module_info) {
-					$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);
+		function ProcessPhisycalTemplate(&$url_parts)
+		{
+			if (!isset($url_parts[0])) return false;
 
-					if ($module_event->status == erSUCCESS && $this->HTTPQuery->Get($module_prefix.'_id')) {
-						$item_template = $category_data['CachedItemTemplate'];
-						if ($item_template) {
-							$url_parts = explode('/', $item_template);
-							array_push($url_parts, $url_part); // save item's filename as not processed
-							$url_part = array_shift($url_parts);
-						}
-					}
-					elseif (!$module_event->getEventParam('url_parts')) {
-						// parseEnv has processed that param
-						$url_part = '';
-						$category_template = $category_data['CachedCategoryTemplate'];
-						if ($category_template) {
-							$category_template = explode('/', $category_template);
-							$url_part = array_shift($category_template);
-							$url_parts = $category_template;
-						}
-						else {
-							$url_part = 'index';
-						}
-					}
+			$remaining = array();
+			do
+			{
+				$template_path = implode('/', $url_parts);
+
+				$t_parts['path'] = dirname($template_path) == '.' ? '' : '/'.dirname($template_path);
+				$t_parts['file'] = basename($template_path);
+
+				$sql = 'SELECT FileId
+						FROM '.TABLE_PREFIX.'ThemeFiles
+						WHERE (FilePath = '.$this->Conn->qstr($t_parts['path']).') AND (FileName = '.$this->Conn->qstr($t_parts['file'].'.tpl').')';
+
+//				$sql = 'SELECT FileId FROM '.TABLE_PREFIX.'ThemeFiles WHERE CONCAT(FilePath, "/", FileName) = '.$this->Conn->qstr('/'.$template_path.'.tpl');
+				$template_found = $this->Conn->GetOne($sql);
+				if(!$template_found)
+				{
+					array_unshift($remaining, array_pop($url_parts));
 				}
+			} while (!$template_found && $url_parts);
+
+			$url_parts = $remaining;
+
+			if ($template_found) {
+				$this->HTTPQuery->Set('t', $template_path );
+				return true;
 			}
+			return false;
+		}
 
-			// match module
+		/**
+		 * Checks if whole url_parts matches a whole In-CMS page
+		 *
+		 * @param array $url_parts
+		 * @return boolean
+		 */
+		function ProcessVirtualTemplate(&$url_parts)
+		{
+			if (!isset($url_parts[0]) || !$this->Application->isModuleEnabled('In-CMS')) return false;
+
+			$template_path = implode('/', $url_parts);
+			$sql = 'SELECT p.PageId, ci.CategoryId FROM '.TABLE_PREFIX.'Pages AS p
+							LEFT JOIN '.TABLE_PREFIX.'CategoryItems AS ci
+							ON ci.ItemResourceId = p.ResourceId
+							WHERE
+								Path = '.$this->Conn->qstr($template_path).'
+								AND
+								ci.PrimaryCat = 1';
+			$template_found = $this->Conn->GetRow($sql);
+
+			if ($template_found) {
+				$this->Application->SetVar('m_cat_id', $template_found['CategoryId']);
+				$this->HTTPQuery->Set('t', $template_path );
+				return true;
+			}
+
+			return false;
+		}
+
+		function processRewriteURL()
+		{
+			$url = $this->HTTPQuery->Get('_mod_rw_url_');
+			if( substr($url, -5) == '.html' ) $url = substr($url, 0, strlen($url) - 5 );
+			$url_parts = $url ? explode('/', $url) : Array();
+
+			$process_module = true;
+			if($this->HTTPQuery->Get('rewrite') == 'on' || !$url_parts)
+			{
+				$this->SetDefaultValues();
+			}
+
+			if(!$url_parts)
+			{
+				$this->Application->Phrases = new PhrasesCache();
+				$this->Application->VerifyLanguageId();
+				$this->Application->Phrases->Init('phrases');
+				$this->Application->VerifyThemeId();
+
+				$this->HTTPQuery->Set('t', $this->HTTPQuery->getDefaultTemplate('') );
+				$this->HTTPQuery->finalizeParsing(Array('m'));
+				return false;
+			}
+			else
+			{
+				$this->HTTPQuery->Set('t', '');
+			}
+
+			$this->ProcessLanguage($url_parts);
+			$this->ProcessTheme($url_parts);
+
+			if ( $this->ProcessVirtualTemplate($url_parts) ) {
+				return true;
+			}
+
+			$this->ProcessCategory($url_parts);
+			if ( $this->ProcessModuleIndex($url_parts) ) {
+				return ;
+			}
+			if ( $this->ProcessModuleItem($url_parts) ) {
+				return ;
+			}
+
+			/*// match module
 			$next_template = $this->HTTPQuery->Get('next_template');
 			if($url_part || $next_template)
 			{
@@ -203,81 +301,14 @@
 						break;
 					}
 				}
-			}
+			}*/
 
-			// match template
-			$template_path = '';
-			$template_found = false;
-			if($url_part)
-			{
-				// search for template in real template records
-				array_unshift($url_parts, $url_part);
-				$template_parts = $url_parts;
-				$url_parts = Array();
-				do
-				{
-					$template_path = implode('/', $template_parts);
-
-					$t_parts['path'] = dirname($template_path) == '.' ? '' : '/'.dirname($template_path);
-					$t_parts['file'] = basename($template_path);
-
-					$sql = 'SELECT FileId
-							FROM '.TABLE_PREFIX.'ThemeFiles
-							WHERE (FilePath = '.$this->Conn->qstr($t_parts['path']).') AND (FileName = '.$this->Conn->qstr($t_parts['file'].'.tpl').')';
-
-	//				$sql = 'SELECT FileId FROM '.TABLE_PREFIX.'ThemeFiles WHERE CONCAT(FilePath, "/", FileName) = '.$this->Conn->qstr('/'.$template_path.'.tpl');
-					$template_found = $this->Conn->GetOne($sql);
-					if(!$template_found)
-					{
-						array_unshift( $url_parts, array_pop($template_parts) );
-					}
-
-				}while (!$template_found && $template_parts);
-
-				// try to find template in virtual templates in case if such ability exists
-				if ($this->Application->isModuleEnabled('In-CMS') && !$template_found) {
-
-					$template_parts = $url_parts;
-					$url_parts = Array();
-					do
-					{
-						$template_path = implode('/', $template_parts);
-
-						$sql = 'SELECT PageId FROM '.TABLE_PREFIX.'Pages WHERE Path = '.$this->Conn->qstr($template_path);
-						$template_found = $this->Conn->GetOne($sql);
-						if(!$template_found)
-						{
-							array_unshift( $url_parts, array_pop($template_parts) );
-						}
-
-					}while (!$template_found && $template_parts);
+			if ( $this->ProcessPhisycalTemplate($url_parts) ) {
+				if (!$url_parts) {
+					return true;
 				}
 			}
 
-			// guess template if no existing template found
-			if(!$template_found && isset($module_folder) && $module_folder)
-			{
-				// 1. try index template of module
-				$sql = 'SELECT FileId FROM '.TABLE_PREFIX.'ThemeFiles WHERE CONCAT(FilePath, "/", FileName) = '.$this->Conn->qstr('/'.$module_folder.'/index.tpl');
-				$template_found = $this->Conn->GetOne($sql);
-				if($template_found)
-				{
-					$template_path = $module_folder.'/index';
-					array_shift($url_parts);
-				}
-				else
-				{
-					// 2. return error template then
-					$template_found = true;
-					$template_path = $this->Application->ConfigValue('ErrorTemplate');
-					if(!$template_path) $template_path = 'error_notfound';
-
-					header('HTTP/1.0 404 Not Found');
-				}
-			}
-
-			$this->HTTPQuery->Set('t', $this->HTTPQuery->getDefaultTemplate($template_found ? $template_path : '') );
-
 			// pass params left to module
 
 			$this->Application->Phrases->Init('phrases');