Index: branches/5.1.x/core/units/helpers/mod_rewrite_helper.php
===================================================================
diff -u -r12657 -r13086
--- branches/5.1.x/core/units/helpers/mod_rewrite_helper.php	(.../mod_rewrite_helper.php)	(revision 12657)
+++ branches/5.1.x/core/units/helpers/mod_rewrite_helper.php	(.../mod_rewrite_helper.php)	(revision 13086)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: mod_rewrite_helper.php 12511 2009-09-15 19:27:06Z alex $
+* @version	$Id: mod_rewrite_helper.php 13086 2010-01-12 19:47:40Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -9,7 +9,7 @@
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
+* See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
@@ -38,6 +38,13 @@
 		var $_modulePrefix = false;
 
 		/**
+		 * Template aliases for current theme
+		 *
+		 * @var Array
+		 */
+		var $_templateAliases = null;
+
+		/**
 		 * Constructor of kModRewriteHelper class
 		 *
 		 * @return kModRewriteHelper
@@ -120,7 +127,7 @@
 			}
 
 			$vars = Array ('pass' => Array ('m'));
-			$url_parts = $url ? explode('/', trim($url, '/')) : Array ();
+			$url_parts = $url ? explode('/', trim(mb_strtolower($url, 'UTF-8'), '/')) : Array ();
 
 			if (($this->HTTPQuery->Get('rewrite') == 'on') || !$url_parts) {
 				$this->_setDefaultValues($vars);
@@ -138,12 +145,7 @@
 
 			$this->_parseLanguage($url_parts, $vars);
 			$this->_parseTheme($url_parts, $vars);
-			$this->_setDefaultPages($vars);
 
-			if ($this->_parsePage($url_parts, $vars)) {
-				$this->_partsFound[] = 'parsePage';
-			}
-
 			// http://site-url/<language>/<theme>/<category>[_<category_page>]/<template>/<module_page>
 			// http://site-url/<language>/<theme>/<category>[_<category_page>]/<module_page> (category-based section template)
 			// http://site-url/<language>/<theme>/<category>[_<category_page>]/<template>/<module_item>
@@ -175,7 +177,7 @@
 				$themes_helper =& $this->Application->recallObject('ThemesHelper');
 				/* @var $themes_helper kThemesHelper */
 
-				$vars['m_cat_id'] = $themes_helper->getPageByTemplate($vars['t']);
+				$vars['m_cat_id'] = $themes_helper->getPageByTemplate($vars['t'], $vars['m_theme']);
 
 				header('HTTP/1.0 404 Not Found');
 			}
@@ -201,7 +203,22 @@
 		{
 			$this->initRewriteListeners();
 
+			$page_number = $this->_parsePage($url_parts, $vars);
+
+			if ($page_number) {
+				$this->_partsFound[] = 'parsePage';
+			}
+
 			foreach ($this->Application->RewriteListeners as $prefix => $listener) {
+				// set default page
+				$vars[$prefix . '_Page'] = 1; // will override page in session in case, when none is given in url
+
+				if ($page_number) {
+					// page given in url - use it
+					$vars[$prefix . '_id'] = 0;
+					$vars[$prefix . '_Page'] = $page_number;
+				}
+
 				$listener_result = $listener[0]->$listener[1](REWRITE_MODE_PARSE, $prefix, $vars, $url_parts);
 				if ($listener_result === false) {
 					// will not proceed to other methods
@@ -229,12 +246,19 @@
 			do {
 				$template_path = implode('/', $url_parts);
 
+				$physical_template = array_search($template_path, $this->Application->structureTemplateMapping);
+
+				if ($physical_template !== false) {
+					// replace menu template name with it's actual template name on disk
+					list ($template_path) = explode(':', $physical_template, 2);
+				}
+
 				$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') . ')';
+						WHERE (ThemeId = ' . $vars['m_theme'] . ') AND (FilePath = ' . $this->Conn->qstr($t_parts['path']) . ') AND (FileName = ' . $this->Conn->qstr($t_parts['file'] . '.tpl') . ')';
 				$template_found = $this->Conn->GetOne($sql);
 
 				if (!$template_found) {
@@ -244,6 +268,14 @@
 
 			if ($template_found) {
 				$vars['t'] = $template_path;
+
+				// 1. will damage actual category during category item review add process
+				// 2. will use "use_section" parameter of "m_Link" tag to gain same effect
+//				$themes_helper =& $this->Application->recallObject('ThemesHelper');
+//				/* @var $themes_helper kThemesHelper */
+//
+//				$vars['m_cat_id'] = $themes_helper->getPageByTemplate($template_path, $vars['m_theme']);
+
 				return true;
 			}
 
@@ -313,7 +345,7 @@
 			}
 
 			// add theme
-			$default_theme_id = $this->Application->GetDefaultThemeId();
+			$default_theme_id = $this->Application->GetDefaultThemeId(true);
 			if ($processed_params['m_theme'] && ($processed_params['m_theme'] != $default_theme_id)) {
 				$theme_name = $this->Application->getCache('theme_names', $processed_params['m_theme']);
 				if ($theme_name === false) {
@@ -371,7 +403,7 @@
 			}
 
 			$template = array_key_exists('t', $params) ? $params['t'] : false;
-			$category_template = $processed_params['m_cat_id'] ? $this->Application->getCache('category_designs', $processed_params['m_cat_id']) : '';
+			$category_template = ($processed_params['m_cat_id'] > 0) && $params['pass_category'] ? $this->Application->getCache('category_designs', $processed_params['m_cat_id']) : '';
 
 			if ((strtolower($template) == '__default__') && ($processed_params['m_cat_id'] == 0)) {
 				// for "Home" category set template to index when not set
@@ -404,21 +436,28 @@
 				return false;
 			}
 
-			$url_part = array_shift($url_parts);
+			$url_part = reset($url_parts);
 
-			$sql = 'SELECT LanguageId
+			$sql = 'SELECT LanguageId, IF(LOWER(PackName) = ' . $this->Conn->qstr($url_part) . ', 2, PrimaryLang) AS SortKey
 					FROM ' . TABLE_PREFIX . 'Language
-					WHERE LOWER(PackName) = ' . $this->Conn->qstr($url_part) . ' AND Enabled = 1';
-			$language_id = $this->Conn->GetOne($sql);
-
+					WHERE Enabled = 1
+					ORDER BY SortKey DESC';
+			$language_info = $this->Conn->GetRow($sql);
 			$this->Application->Phrases = new PhrasesCache();
-			if ($language_id) {
-				$vars['m_lang'] = $language_id;
+
+			if ($language_info && $language_info['LanguageId'] && $language_info['SortKey']) {
+				// primary language will be selected in case, when $url_part doesn't match to other's language pack name
+				// don't use next enabled language, when primary language is disabled
+				$vars['m_lang'] = $language_info['LanguageId'];
+
+				if ($language_info['SortKey'] == 2) {
+					// language was found by pack name
+					array_shift($url_parts);
+				}
+
 				return true;
 			}
 
-			array_unshift($url_parts, $url_part);
-
 			return false;
 		}
 
@@ -435,18 +474,35 @@
 				return false;
 			}
 
-			$url_part = array_shift($url_parts);
+			$url_part = reset($url_parts);
 
-			$sql = 'SELECT ThemeId
+			$sql = 'SELECT ThemeId, IF(LOWER(Name) = ' . $this->Conn->qstr($url_part) . ', 2, PrimaryTheme) AS SortKey, TemplateAliases
 					FROM ' . TABLE_PREFIX . 'Theme
-					WHERE LOWER(Name) = ' . $this->Conn->qstr($url_part) . ' AND Enabled = 1';
-			$theme_id = $this->Conn->GetOne($sql);
-			if ($theme_id) {
-				$vars['m_theme'] = $theme_id;
+					WHERE Enabled = 1
+					ORDER BY SortKey DESC';
+			$theme_info = $this->Conn->GetRow($sql);
+
+			if ($theme_info && $theme_info['ThemeId'] && $theme_info['SortKey']) {
+				// primary theme will be selected in case, when $url_part doesn't match to other's theme name
+				// don't use next enabled theme, when primary theme is disabled
+				$vars['m_theme'] = $theme_info['ThemeId'];
+
+				if ($theme_info['TemplateAliases']) {
+					$this->_templateAliases = unserialize($theme_info['TemplateAliases']);
+				}
+				else {
+					$this->_templateAliases = Array ();
+				}
+
+				if ($theme_info['SortKey'] == 2) {
+					// theme was found by name
+					array_shift($url_parts);
+				}
+
 				return true;
 			}
 
-			array_unshift($url_parts, $url_part);
+			$vars['m_theme'] = 0; // required, because used later for category/template detection
 
 			return false;
 		}
@@ -478,19 +534,6 @@
 		}
 
 		/**
-		 * Set's 1st page for all modules (will be used when not passed in url)
-		 *
-		 * @param Array $vars
-		 */
-		function _setDefaultPages(&$vars)
-		{
-			// set 1st page for all rewrite listeners, since we don't know which of them will need it
-			foreach ($this->Application->RewriteListeners as $prefix => $listener) {
-				$vars[$prefix . '_Page'] = 1;
-			}
-		}
-
-		/**
 		 * Set's page (when found) to all modules
 		 *
 		 * @param Array $url_parts
@@ -510,15 +553,9 @@
 				return false;
 			}
 
-			// set module pages for all modules, since we don't know which module will need it
-			foreach ($this->Application->RewriteListeners as $prefix => $listener) {
-				$vars[$prefix . '_id'] = 0;
-				$vars[$prefix . '_Page'] = $page_number;
-			}
-
 			array_pop($url_parts);
 
-			return true;
+			return $page_number;
 		}
 
 		/**
@@ -561,9 +598,9 @@
 					$vars['m_cat_page'] = $rets[2];
 				}
 
-				$sql = 'SELECT CategoryId, IsIndex, NamedParentPath
+				$sql = 'SELECT CategoryId, SymLinkCategoryId, NamedParentPath
 						FROM ' . TABLE_PREFIX . 'Category
-						WHERE Status IN (1,4) AND (LOWER(NamedParentPath) = ' . $this->Conn->qstr($category_path) . ')';
+						WHERE Status IN (1,4) AND (LOWER(NamedParentPath) = ' . $this->Conn->qstr($category_path) . ') AND (ThemeId = ' . $vars['m_theme'] . ' OR ThemeId = 0)';
 				$category_info = $this->Conn->GetRow($sql);
 
 				if ($category_info !== false) {
@@ -574,22 +611,24 @@
 			} while ($category_info !== false && $url_part);
 
 			if ($last_category_info) {
-				// IsIndex = 2 is a Container-only page, meaning it should go to index-page child
-				if ($last_category_info['IsIndex'] == 2) {
+				// this category is symlink to other category, so use it's url instead
+				// (used in case if url prior to symlink adding was indexed by spider or was bookmarked)
+				if ($last_category_info['SymLinkCategoryId']) {
 					$sql = 'SELECT CategoryId, NamedParentPath
 							FROM ' . TABLE_PREFIX . 'Category
-							WHERE ParentId = ' . $last_category_info['CategoryId'] . ' AND IsIndex = 1';
+							WHERE (CategoryId = ' . $last_category_info['SymLinkCategoryId'] . ')';
 					$category_info = $this->Conn->GetRow($sql);
 
 					if ($category_info) {
-						// when index sub-page is found use it, otherwise use container page
+						// web symlinked category was found use it
+						// TODO: maybe 302 redirect should be made to symlinked category url (all other url parts should stay)
 						$last_category_info = $category_info;
 					}
 				}
 
 				// 1. Set virtual page as template, this will be replaced to physical template later in kApplication::Run.
 				// 2. Don't set CachedTemplate field as template here, because we will loose original page associated with it's cms blocks!
-				$vars['t'] = strtolower( preg_replace('/^Content\//i', '', $last_category_info['NamedParentPath']) );
+				$vars['t'] = mb_strtolower( preg_replace('/^Content\//i', '', $last_category_info['NamedParentPath']), 'UTF-8' );
 
 				$vars['m_cat_id'] = $last_category_info['CategoryId'];
 				$vars['is_virtual'] = true; // for template from POST, strange code there!
@@ -854,19 +893,38 @@
 			$parent_path = implode(',',explode('|', substr($category['ParentPath'], 1, -1)));
 
 			// item template is stored in module' system custom field - need to get that field Id
-			$item_template_field_id = $this->_getItemTemplateCustomField($module_prefix);
+			$primary_lang = $this->Application->GetDefaultLanguageId();
+			$item_template_field_id = $this->getItemTemplateCustomField($module_prefix);
 
 			// looking for item template through cats hierarchy sorted by parent path
-			$query = '	SELECT ccd.l1_cust_' . $item_template_field_id . ',
+			$query = '	SELECT ccd.l' . $primary_lang . '_cust_' . $item_template_field_id . ',
 									FIND_IN_SET(c.CategoryId, ' . $this->Conn->qstr($parent_path) . ') AS Ord1,
-									c.CategoryId, c.Name, ccd.l1_cust_' . $item_template_field_id . '
+									c.CategoryId, c.Name, ccd.l' . $primary_lang . '_cust_' . $item_template_field_id . '
 						FROM ' . TABLE_PREFIX . 'Category AS c
 						LEFT JOIN ' . TABLE_PREFIX . 'CategoryCustomData AS ccd
 						ON ccd.ResourceId = c.ResourceId
-						WHERE c.CategoryId IN (' . $parent_path . ') AND ccd.l1_cust_' . $item_template_field_id . ' != \'\'
+						WHERE c.CategoryId IN (' . $parent_path . ') AND ccd.l' . $primary_lang . '_cust_' . $item_template_field_id . ' != \'\'
 						ORDER BY FIND_IN_SET(c.CategoryId, ' . $this->Conn->qstr($parent_path) . ') DESC';
 			$item_template = $this->Conn->GetOne($query);
 
+			if (!isset($this->_templateAliases)) {
+				// when empty url OR mod-rewrite disabled
+
+				$themes_helper =& $this->Application->recallObject('ThemesHelper');
+				/* @var $themes_helper kThemesHelper */
+
+				$sql = 'SELECT TemplateAliases
+						FROM ' . TABLE_PREFIX . 'Theme
+						WHERE ThemeId = ' . (int)$themes_helper->getCurrentThemeId();
+				$template_aliases = $this->Conn->GetOne($sql);
+
+				$this->_templateAliases = $template_aliases ? unserialize($template_aliases) : Array ();
+			}
+
+			if ($item_template && array_key_exists($item_template, $this->_templateAliases)) {
+				$item_template = $this->_templateAliases[$item_template];
+			}
+
 			$this->Application->setCache(__CLASS__ . __FUNCTION__, $cache_key, $item_template);
 
 			return $item_template;
@@ -900,7 +958,7 @@
 		 * @param string $module_prefix
 		 * @return int
 		 */
-		function _getItemTemplateCustomField($module_prefix)
+		function getItemTemplateCustomField($module_prefix)
 		{
 			$cached_value = $this->Application->getCache(__CLASS__ . __FUNCTION__, $module_prefix);
 			if ($cached_value !== false) {
@@ -934,4 +992,3 @@
 			}
 		}
 	}
-?>
\ No newline at end of file