Index: branches/5.2.x/core/kernel/session/session_storage.php
===================================================================
diff -u -N -r14699 -r14714
--- branches/5.2.x/core/kernel/session/session_storage.php	(.../session_storage.php)	(revision 14699)
+++ branches/5.2.x/core/kernel/session/session_storage.php	(.../session_storage.php)	(revision 14714)
@@ -1,7 +1,7 @@
 <?php
 
 /**
-* @version	$Id: session_storage.php 14699 2011-10-26 11:39:38Z alex $
+* @version	$Id: session_storage.php 14714 2011-11-01 10:05:18Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -133,6 +133,9 @@
 		foreach ($fields_hash as $field_name => $field_value) {
 			$this->SetField($field_name, $field_value);
 		}
+
+		// ensure user groups are stored in a way, that kPermissionsHelper::CheckUserPermission can understand
+		$this->Session->StoreVar('UserGroups', $this->GetField('GroupList'), true); // true for optional
 	}
 
 	function DeleteSession()
Index: branches/5.2.x/core/units/helpers/mod_rewrite_helper.php
===================================================================
diff -u -N -r14699 -r14714
--- branches/5.2.x/core/units/helpers/mod_rewrite_helper.php	(.../mod_rewrite_helper.php)	(revision 14699)
+++ branches/5.2.x/core/units/helpers/mod_rewrite_helper.php	(.../mod_rewrite_helper.php)	(revision 14714)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: mod_rewrite_helper.php 14699 2011-10-26 11:39:38Z alex $
+* @version	$Id: mod_rewrite_helper.php 14714 2011-11-01 10:05:18Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -14,759 +14,9 @@
 
 	defined('FULL_PATH') or die('restricted access!');
 
-	class kModRewriteHelper extends kHelper {
+	class CategoryItemRewrite extends kHelper {
 
 		/**
-		 * Holds a refererence to httpquery
-		 *
-		 * @var kHttpQuery
-		 */
-		var $HTTPQuery = null;
-
-		/**
-		 * Urls parts, that needs to be matched by rewrite listeners
-		 *
-		 * @var Array
-		 */
-		var $_partsToParse = Array ();
-
-		/**
-		 * Category item prefix, that was found
-		 *
-		 * @var string
-		 */
-		var $_modulePrefix = false;
-
-		/**
-		 * Template aliases for current theme
-		 *
-		 * @var Array
-		 */
-		var $_templateAliases = null;
-
- 		/**
-		 * Domain-based primary language id
-		 *
-		 * @var int
-		 */
-		var $primaryLanguageId = false;
-
-		/**
-		 * Domain-based primary theme id
-		 *
-		 * @var int
-		 */
-		var $primaryThemeId = false;
-
-		/**
-		 * Possible url endings from ModRewriteUrlEnding configuration variable
-		 *
-		 * @var Array
-		 */
-		var $_urlEndings = Array ('.html', '/', '');
-
-		/**
-		 * Constructor of kModRewriteHelper class
-		 *
-		 * @return kModRewriteHelper
-		 */
-		public function __construct()
-		{
-			parent::__construct();
-
-			$this->HTTPQuery =& $this->Application->recallObject('HTTPQuery');
-
-			// domain based primary language
-			$this->primaryLanguageId = $this->Application->siteDomainField('PrimaryLanguageId');
-
-			// domain based primary theme
-			$this->primaryThemeId = $this->Application->siteDomainField('PrimaryThemeId');
-		}
-
-		function processRewriteURL()
-		{
-			$passed = Array ();
-			$url = $this->HTTPQuery->Get('_mod_rw_url_');
-
-			if ($url) {
-				foreach ($this->_urlEndings as $url_ending) {
-					if (substr($url, strlen($url) - strlen($url_ending)) == $url_ending) {
-						$url = substr($url, 0, strlen($url) - strlen($url_ending));
-						$default_ending = $this->Application->ConfigValue('ModRewriteUrlEnding');
-
-						// user manually typed url with different url ending -> redirect to same url with default url ending
-						if (($url_ending != $default_ending) && $this->Application->ConfigValue('ForceModRewriteUrlEnding')) {
-							$target_url = $this->Application->BaseURL() . $url . $default_ending;
-							$this->Application->Redirect('external:' . $target_url, Array ('response_code' => 301));
-						}
-
-						break;
-					}
-				}
-			}
-
-			$restored = false;
-
-			$cached = $this->_getCachedUrl($url);
-
-			if ($cached !== false) {
-				$vars = $cached['vars'];
-				$passed = $cached['passed'];
-				$restored = true;
-			}
-			else {
-				$vars = $this->parseRewriteURL($url);
-				$passed = $vars['pass']; // also used in bottom of this method
-				unset($vars['pass']);
-
-				$this->_setCachedUrl($url, Array ('vars' => $vars, 'passed' => $passed));
-
-				if (array_key_exists('t', $this->HTTPQuery->Post) && $this->HTTPQuery->Post['t']) {
-					// template from POST overrides template from URL.
-					$vars['t'] = $this->HTTPQuery->Post['t'];
-					if (isset($vars['is_virtual']) && $vars['is_virtual']) {
-						$vars['m_cat_id'] = 0; // this is virtual template category (for Proj-CMS)
-					}
-				}
-
-				unset($vars['is_virtual']);
-			}
-
-			foreach ($vars as $name => $value) {
-				$this->HTTPQuery->Set($name, $value);
-			}
-
-			$this->InitAll(); // also will use parsed language to load phrases from it
-
-			$this->HTTPQuery->finalizeParsing($passed);
-		}
-
-		function _getCachedUrl($url)
-		{
-			if (!$url) {
-				return false;
-			}
-
-			$sql = 'SELECT *
-					FROM ' . TABLE_PREFIX . 'CachedUrls
-					WHERE Hash = ' . crc32($url) . ' AND DomainId = ' . (int)$this->Application->siteDomainField('DomainId');
-			$data = $this->Conn->GetRow($sql);
-
-			if ($data) {
-				$lifetime = (int)$data['LifeTime']; // in seconds
-				if (($lifetime > 0) && ($data['Cached'] + $lifetime < adodb_mktime())) {
-					// delete expired
-					$sql = 'DELETE FROM ' . TABLE_PREFIX . 'CachedUrls
-							WHERE UrlId = ' . $data['UrlId'];
-					$this->Conn->Query($sql);
-
-					return false;
-				}
-
-				return unserialize($data['ParsedVars']);
-			}
-
-			return false;
-		}
-
-		function _setCachedUrl($url, $data)
-		{
-			if (!$url) {
-				return ;
-			}
-
-			$vars = $data['vars'];
-			$passed = $data['passed'];
-			sort($passed);
-
-			// get expiration
-			if ($vars['m_cat_id'] > 0) {
-				$sql = 'SELECT PageExpiration
-						FROM ' . TABLE_PREFIX . 'Category
-						WHERE CategoryId = ' . $vars['m_cat_id'];
-				$expiration = $this->Conn->GetOne($sql);
-			}
-
-			// get prefixes
-			$prefixes = Array ();
-			$m_index = array_search('m', $passed);
-
-			if ($m_index !== false) {
-				unset($passed[$m_index]);
-
-				if ($vars['m_cat_id'] > 0) {
-					$prefixes[] = 'c:' . $vars['m_cat_id'];
-				}
-
-				$prefixes[] = 'lang:' . $vars['m_lang'];
-				$prefixes[] = 'theme:' . $vars['m_theme'];
-			}
-
-			foreach ($passed as $prefix) {
-				if (array_key_exists($prefix . '_id', $vars) && is_numeric($vars[$prefix . '_id'])) {
-					$prefixes[] = $prefix . ':' . $vars[$prefix . '_id'];
-				}
-				else {
-					$prefixes[] = $prefix;
-				}
-			}
-
-			$fields_hash = Array (
-				'Url' => $url,
-				'Hash' => crc32($url),
-				'DomainId' => (int)$this->Application->siteDomainField('DomainId'),
-				'Prefixes' => $prefixes ? '|' . implode('|', $prefixes) . '|' : '',
-				'ParsedVars' => serialize($data),
-				'Cached' => adodb_mktime(),
-				'LifeTime' => isset($expiration) && is_numeric($expiration) ? $expiration : -1
-			);
-
-			$this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'CachedUrls');
-		}
-
-		function parseRewriteURL($url)
-		{
-			$vars = Array ('pass' => Array ('m'));
-			$url_parts = $url ? explode('/', trim(mb_strtolower($url, 'UTF-8'), '/')) : Array ();
-
-			$this->_partsToParse = $url_parts;
-
-			if ( ($this->HTTPQuery->Get('rewrite') == 'on') || !$url_parts ) {
-				$this->_setDefaultValues($vars);
-			}
-
-			if ( !$url_parts ) {
-				$this->InitAll();
-				$vars['t'] = $this->HTTPQuery->getDefaultTemplate('');
-
-				return $vars;
-			}
-			else {
-				$vars['t'] = '';
-			}
-
-			$this->_parseLanguage($url_parts, $vars);
-			$this->_parseTheme($url_parts, $vars);
-
-			// 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>
-			// http://site-url/<language>/<theme>/<category>[_<category_page>]/<module_item> (category-based detail template)
-			// http://site-url/<language>/<theme>/<rl_injections>/<category>[_<category_page>]/<rl_part> (customized url)
-
-			if ( $this->processRewriteListeners($url_parts, $vars) ) {
-				return $vars;
-			}
-
-			$this->_parsePhisycalTemplate($url_parts, $vars);
-
-			if ( ($this->_modulePrefix === false) && $vars['m_cat_id'] && !$this->_partsToParse ) {
-				// no category item found, but category found and all url matched -> module index page
-
-				return $vars;
-			}
-
-			if ( $this->_partsToParse ) {
-				$not_found = $this->Application->ConfigValue('ErrorTemplate');
-				$vars['t'] = $not_found ? $not_found : 'error_notfound';
-
-				$themes_helper =& $this->Application->recallObject('ThemesHelper');
-				/* @var $themes_helper kThemesHelper */
-
-				$vars['m_cat_id'] = $themes_helper->getPageByTemplate($vars['t'], $vars['m_theme']);
-
-				header('HTTP/1.0 404 Not Found');
-			}
-
-			return $vars;
-		}
-
-		function InitAll()
-		{
-			$this->Application->VerifyThemeId();
-			$this->Application->VerifyLanguageId();
-
-			// no need, since we don't have any cached phrase IDs + nobody will use PhrasesCache::LanguageId soon
-			// $this->Application->Phrases->Init('phrases');
-		}
-
-		/**
-		 * Processes url using rewrite listeners
-		 *
-		 * Pattern: Chain of Command
-		 *
-		 * @param Array $url_parts
-		 * @param Array $vars
-		 * @return bool
-		 */
-		function processRewriteListeners(&$url_parts, &$vars)
-		{
-			$this->initRewriteListeners();
-			$page_number = $this->_parsePage($url_parts, $vars);
-
-			foreach ($this->Application->RewriteListeners as $prefix => $listeners) {
-				// 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;
-				}
-
-				// $listeners[1] - listener, used for parsing
-				$listener_result = $listeners[1][0]->$listeners[1][1](REWRITE_MODE_PARSE, $prefix, $vars, $url_parts);
-				if ($listener_result === false) {
-					// will not proceed to other methods
-					return true;
-				}
-			}
-
-			// will proceed to other methods
-			return false;
-		}
-
-		/**
-		 * Parses real template name from url
-		 *
-		 * @param Array $url_parts
-		 * @param Array $vars
-		 * @return bool
-		 */
-		function _parsePhisycalTemplate($url_parts, &$vars)
-		{
-			if (!$url_parts) {
-				return false;
-			}
-
-			do {
-				$template_path = implode('/', $url_parts);
-
-				$physical_template = $this->Application->getPhysicalTemplate($template_path);
-
-				if (($physical_template !== false) && (substr($physical_template, 0, 3) != 'id:')) {
-					// 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 (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) {
-					array_shift($url_parts);
-				}
-			} while (!$template_found && $url_parts);
-
-			if ($template_found) {
-				$vars['t'] = $template_path;
-
-				$template_parts = explode('/', $template_path);
-
-				while ( $template_parts ) {
-					$this->partParsed( array_pop($template_parts), 'rtl' );
-				}
-
-				// 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;
-			}
-
-			return false;
-		}
-
-		/**
-		 * Parses category part of url, build main part of url
-		 *
-		 * @param int $rewrite_mode Mode in what rewrite listener was called. Possbile two modes: REWRITE_MODE_BUILD, REWRITE_MODE_PARSE.
-		 * @param string $prefix Prefix, that listener uses for system integration
-		 * @param Array $params Params, that are used for url building or created during url parsing.
-		 * @param Array $url_parts Url parts to parse (only for parsing).
-		 * @param bool $keep_events Keep event names in resulting url (only for building).
-		 * @return bool|string|Array Return true to continue to next listener; return false (when building) not to rewrite given prefix; return false (when parsing) to stop processing at this listener.
-		 */
-		function MainRewriteListener($rewrite_mode = REWRITE_MODE_BUILD, $prefix, &$params, &$url_parts, $keep_events = false)
-		{
-			if ($rewrite_mode == REWRITE_MODE_BUILD) {
-				return $this->_buildMainUrl($prefix, $params, $keep_events);
-			}
-
-			if ( $this->_parseFriendlyUrl($url_parts, $params) ) {
-				// friendly urls work like exact match only!
-				return false;
-			}
-
-			$this->_parseCategory($url_parts, $params);
-
-			return true;
-		}
-
-		/**
-		 * Build main part of every url
-		 *
-		 * @param string $prefix_special
-		 * @param Array $params
-		 * @param bool $keep_events
-		 * @return string
-		 */
-		function _buildMainUrl($prefix_special, &$params, $keep_events)
-		{
-			$ret = '';
-			list ($prefix) = explode('.', $prefix_special);
-
-			$processed_params = $this->getProcessedParams($prefix_special, $params, $keep_events);
-			if ($processed_params === false) {
-				return '';
-			}
-
-			// add language
-			if (!$this->primaryLanguageId) {
-				// when domain-based language not found -> use site-wide language
-				$this->primaryLanguageId = $this->Application->GetDefaultLanguageId();
-			}
-
-			if ($processed_params['m_lang'] && ($processed_params['m_lang'] != $this->primaryLanguageId)) {
-				$language_name = $this->Application->getCache('language_names[%LangIDSerial:' . $processed_params['m_lang'] . '%]');
-				if ($language_name === false) {
-					$sql = 'SELECT PackName
-							FROM ' . TABLE_PREFIX . 'Language
-							WHERE LanguageId = ' . $processed_params['m_lang'];
-					$language_name = $this->Conn->GetOne($sql);
-
-					$this->Application->setCache('language_names[%LangIDSerial:' . $processed_params['m_lang'] . '%]', $language_name);
-				}
-
-				$ret .= $language_name . '/';
-			}
-
-			// add theme
-			if (!$this->primaryThemeId) {
-				// when domain-based theme not found -> use site-wide theme
-				$this->primaryThemeId = $this->Application->GetDefaultThemeId(true);
-			}
-
-			if ($processed_params['m_theme'] && ($processed_params['m_theme'] != $this->primaryThemeId)) {
-				$theme_name = $this->Application->getCache('theme_names[%ThemeIDSerial:' . $processed_params['m_theme'] . '%]');
-				if ($theme_name === false) {
-					$sql = 'SELECT Name
-							FROM ' . TABLE_PREFIX . 'Theme
-							WHERE ThemeId = ' . $processed_params['m_theme'];
-					$theme_name = $this->Conn->GetOne($sql);
-
-					$this->Application->setCache('theme_names[%ThemeIDSerial:' . $processed_params['m_theme'] . '%]', $theme_name);
-
-				}
-
-				$ret .= $theme_name . '/';
-			}
-
-			// inject custom url parts made by other rewrite listeners just after language/theme url parts
-			if ($params['inject_parts']) {
-				$ret .= implode('/', $params['inject_parts']) . '/';
-			}
-
-			// add category
-			if ($processed_params['m_cat_id'] > 0 && $params['pass_category']) {
-				$category_filename = $this->Application->getCategoryCache($processed_params['m_cat_id'], 'filenames');
-
-				preg_match('/^Content\/(.*)/i', $category_filename, $regs);
-
-				if ($regs) {
-					$template = array_key_exists('t', $params) ? $params['t'] : false;
-
-					if (strtolower($regs[1]) == strtolower($template)) {
-						// we could have category path like "Content/<template_path>" in this case remove template
-						$params['pass_template'] = false;
-					}
-
-					$ret .= $regs[1] . '/';
-				}
-
-				$params['category_processed'] = true;
-			}
-
-			// reset category page
-			$force_page_adding = false;
-			if (array_key_exists('reset', $params) && $params['reset']) {
-				unset($params['reset']);
-
-				if ($processed_params['m_cat_id']) {
-					$processed_params['m_cat_page'] = 1;
-					$force_page_adding = true;
-				}
-			}
-
-			if ((array_key_exists('category_processed', $params) && $params['category_processed'] && ($processed_params['m_cat_page'] > 1)) || $force_page_adding) {
-				// category name was added before AND category page number found
-				$ret = rtrim($ret, '/') . '_' . $processed_params['m_cat_page'] . '/';
-			}
-
-			$template = array_key_exists('t', $params) ? $params['t'] : false;
-			$category_template = ($processed_params['m_cat_id'] > 0) && $params['pass_category'] ? $this->Application->getCategoryCache($processed_params['m_cat_id'], 'category_designs') : '';
-
-			if ((strtolower($template) == '__default__') && ($processed_params['m_cat_id'] == 0)) {
-				// for "Home" category set template to index when not set
-				$template = 'index';
-			}
-
-			// remove template from url if it is category index cached template OR site homepage
-			if (($template == $category_template) || (mb_strtolower($template) == '__default__') || ($template == 'index')) {
-				// given template is also default template for this category OR '__default__' given OR site homepage
-				$params['pass_template'] = false;
-			}
-
-			if ($template && $params['pass_template']) {
-				$ret .= $template . '/';
-			}
-
-			return mb_strtolower( rtrim($ret, '/') );
-		}
-
-		/**
-		 * Gets language part from url
-		 *
-		 * @param Array $url_parts
-		 * @param Array $vars
-		 * @return bool
-		 */
-		function _parseLanguage(&$url_parts, &$vars)
-		{
-			if (!$url_parts) {
-				return false;
-			}
-
-			$url_part = reset($url_parts);
-
-			$sql = 'SELECT LanguageId, IF(LOWER(PackName) = ' . $this->Conn->qstr($url_part) . ', 2, PrimaryLang) AS SortKey
-					FROM ' . TABLE_PREFIX . 'Language
-					WHERE Enabled = 1
-					ORDER BY SortKey DESC';
-			$language_info = $this->Conn->GetRow($sql);
-
-			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);
-					$this->partParsed($url_part);
-				}
-				elseif ($this->primaryLanguageId) {
-					// use domain-based primary language instead of site-wide primary language
-					$vars['m_lang'] = $this->primaryLanguageId;
-				}
-
-				return true;
-			}
-
-			return false;
-		}
-
-		/**
-		 * Gets theme part from url
-		 *
-		 * @param Array $url_parts
-		 * @param Array $vars
-		 * @return bool
-		 */
-		function _parseTheme(&$url_parts, &$vars)
-		{
-			if (!$url_parts) {
-				return false;
-			}
-
-			$url_part = reset($url_parts);
-
-			$sql = 'SELECT ThemeId, IF(LOWER(Name) = ' . $this->Conn->qstr($url_part) . ', 2, PrimaryTheme) AS SortKey, TemplateAliases
-					FROM ' . TABLE_PREFIX . 'Theme
-					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);
-					$this->partParsed($url_part);
-				}
-				elseif ($this->primaryThemeId) {
-					// use domain-based primary theme instead of site-wide primary theme
-					$vars['m_theme'] = $this->primaryThemeId;
-				}
-
-				return true;
-			}
-
-			$vars['m_theme'] = 0; // required, because used later for category/template detection
-
-			return false;
-		}
-
-		/**
-		 * Checks if whole url_parts matches a whole In-CMS page
-		 *
-		 * @param Array $url_parts
-		 * @param Array $vars
-		 * @return bool
-		 */
-		function _parseFriendlyUrl($url_parts, &$vars)
-		{
-			if (!$url_parts) {
-				return false;
-			}
-
-			$sql = 'SELECT CategoryId, NamedParentPath
-					FROM ' . TABLE_PREFIX . 'Category
-					WHERE FriendlyURL = ' . $this->Conn->qstr(implode('/', $url_parts));
-			$friendly = $this->Conn->GetRow($sql);
-
-			if ($friendly) {
-				$vars['m_cat_id'] = $friendly['CategoryId'];
-				$vars['t'] = preg_replace('/^Content\//i', '', $friendly['NamedParentPath']);
-
-				while ($url_parts) {
-					$this->partParsed( array_shift($url_parts) );
-				}
-
-				return true;
-			}
-
-			return false;
-		}
-
-		/**
-		 * Set's page (when found) to all modules
-		 *
-		 * @param Array $url_parts
-		 * @param Array $vars
-		 * @return string
-		 *
-		 * @todo Should find a way, how to determine what rewrite listerner page is it
-		 */
-		function _parsePage(&$url_parts, &$vars)
-		{
-			if (!$url_parts) {
-				return false;
-			}
-
-			$page_number = end($url_parts);
-			if (!is_numeric($page_number)) {
-				return false;
-			}
-
-			array_pop($url_parts);
-			$this->partParsed($page_number, 'rtl');
-
-			return $page_number;
-		}
-
-		/**
-		 * Remove page numbers for all rewrite listeners
-		 *
-		 * @todo Should find a way, how to determine what rewrite listerner page is it
-		 */
-		function removePages()
-		{
-			/*foreach ($this->Application->RewriteListeners as $prefix => $listener) {
-				$this->Application->DeleteVar($prefix . '_Page');
-			}*/
-		}
-
-		/**
-		 * Extracts category part from url
-		 *
-		 * @param Array $url_parts
-		 * @param Array $vars
-		 * @return bool
-		 */
-		function _parseCategory($url_parts, &$vars)
-		{
-			if (!$url_parts) {
-				return false;
-			}
-
-			$res = false;
-			$url_part = array_shift($url_parts);
-
-			$category_id = 0;
-			$last_category_info = false;
-			$category_path = $url_part == 'content' ? '' : 'content';
-
-			do {
-				$category_path = trim($category_path . '/' . $url_part, '/');
-				// bb_<topic_id> -> forums/bb_2
-				if ( !preg_match('/^bb_[\d]+$/', $url_part) && preg_match('/(.*)_([\d]+)$/', $category_path, $rets) ) {
-					$category_path = $rets[1];
-					$vars['m_cat_page'] = $rets[2];
-				}
-
-				$sql = 'SELECT CategoryId, SymLinkCategoryId, NamedParentPath
-						FROM ' . TABLE_PREFIX . 'Category
-						WHERE (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) {
-					$last_category_info = $category_info;
-					$this->partParsed($url_part);
-
-					$url_part = array_shift($url_parts);
-					$res = true;
-				}
-			} while ($category_info !== false && $url_part);
-
-			if ($last_category_info) {
-				// 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 (CategoryId = ' . $last_category_info['SymLinkCategoryId'] . ')';
-					$category_info = $this->Conn->GetRow($sql);
-
-					if ($category_info) {
-						// 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'] = 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!
-			}
-			else {
-				$vars['m_cat_id'] = 0;
-			}
-
-			return $res;
-		}
-
-		/**
 		 * Builds/parses category item part of url
 		 *
 		 * @param int $rewrite_mode Mode in what rewrite listener was called. Possbile two modes: REWRITE_MODE_BUILD, REWRITE_MODE_PARSE.
@@ -775,8 +25,9 @@
 		 * @param Array $url_parts Url parts to parse (only for parsing).
 		 * @param bool $keep_events Keep event names in resulting url (only for building).
 		 * @return bool Return true to continue to next listener; return false (when building) not to rewrite given prefix; return false (when parsing) to stop processing at this listener.
+		 * @access public
 		 */
-		function CategoryItemRewriteListener($rewrite_mode = REWRITE_MODE_BUILD, $prefix, &$params, &$url_parts, $keep_events = false)
+		public function RewriteListener($rewrite_mode = REWRITE_MODE_BUILD, $prefix, &$params, &$url_parts, $keep_events = false)
 		{
 			static $parsed = false;
 
@@ -785,10 +36,14 @@
 			}
 
 			if (!$parsed) {
-				$this->_modulePrefix = $this->_parseCategoryItemUrl($url_parts, $params);
+				$rewrite_processor =& $this->Application->recallObject('kRewriteUrlProcessor');
+				/* @var $rewrite_processor kRewriteUrlProcessor */
 
-				if ($this->_modulePrefix !== false) {
-					$params['pass'][] = $this->_modulePrefix;
+				$module_prefix = $this->_parseCategoryItemUrl($url_parts, $params);
+
+				if ($module_prefix !== false) {
+					$params['pass'][] = $module_prefix;
+					$rewrite_processor->modulePrefix = $module_prefix;
 				}
 
 				$parsed = true;
@@ -804,14 +59,18 @@
 		 * @param Array $params
 		 * @param bool $keep_events
 		 * @return string
+		 * @access protected
 		 */
-		function _buildCategoryItemUrl($prefix_special, &$params, $keep_events)
+		protected function _buildCategoryItemUrl($prefix_special, &$params, $keep_events)
 		{
 			static $default_per_page = Array ();
 
+			$rewrite_processor =& $this->Application->recallObject('kRewriteUrlProcessor');
+			/* @var $rewrite_processor kRewriteUrlProcessor */
+
 			$ret = '';
 			list ($prefix) = explode('.', $prefix_special);
-			$processed_params = $this->getProcessedParams($prefix_special, $params, $keep_events);
+			$processed_params = $rewrite_processor->getProcessedParams($prefix_special, $params, $keep_events);
 
 			if ($processed_params === false) {
 				return '';
@@ -829,7 +88,7 @@
 
 				// if template is also item template of category, then remove template
 				$template = array_key_exists('t', $params) ? $params['t'] : false;
-				$item_template = $this->GetItemTemplate($category_id, $prefix);
+				$item_template = $rewrite_processor->GetItemTemplate($category_id, $prefix);
 
 				if ($template == $item_template || strtolower($template) == '__default__') {
 					// given template is also default template for this category item or '__default__' given
@@ -874,8 +133,9 @@
 		 * @param int $id
 		 * @param int $category_id
 		 * @return string
+		 * @access protected
 		 */
-		function getFilename($prefix, $id, $category_id = null)
+		protected function getFilename($prefix, $id, $category_id = null)
 		{
 			if ($prefix == 'c') {
 				throw new Exception('Method "<strong>' . __FUNCTION__ . '</strong>" no longer work with "<strong>c</strong>" prefix. Please use "<strong>getCategoryCache</strong>" method instead');
@@ -915,8 +175,9 @@
 		 * @param Array $url_parts
 		 * @param Array $vars
 		 * @return bool|string
+		 * @access protected
 		 */
-		function _parseCategoryItemUrl(&$url_parts, &$vars)
+		protected function _parseCategoryItemUrl(&$url_parts, &$vars)
 		{
 			if (!$url_parts) {
 				return false;
@@ -928,10 +189,13 @@
 				return false;
 			}
 
+			$rewrite_processor =& $this->Application->recallObject('kRewriteUrlProcessor');
+			/* @var $rewrite_processor kRewriteUrlProcessor */
+
 			if (preg_match('/^bb_([\d]+)/', $item_filename, $regs)) {
-				// process topics separatly, because they don't use item filenames
+				// process topics separately, because they don't use item filenames
 				array_pop($url_parts);
-				$this->partParsed($item_filename, 'rtl');
+				$rewrite_processor->partParsed($item_filename, 'rtl');
 
 				return $this->_parseTopicUrl($regs[1], $vars);
 			}
@@ -946,7 +210,7 @@
 			if ($cat_item !== false) {
 				// item found
 				$module_prefix = $cat_item['ItemPrefix'];
-				$item_template = $this->GetItemTemplate($cat_item, $module_prefix);
+				$item_template = $rewrite_processor->GetItemTemplate($cat_item, $module_prefix);
 
 				// converting ResourceId to correpsonding Item id
 				$module_config = $this->Application->getUnitOptions($module_prefix);
@@ -959,7 +223,7 @@
 				array_pop($url_parts);
 
 				if ($item_id) {
-					$this->partParsed($item_filename, 'rtl');
+					$rewrite_processor->partParsed($item_filename, 'rtl');
 
 					if ($item_template) {
 						// when template is found in category -> set it
@@ -982,15 +246,19 @@
 		 * @param int $topic_id
 		 * @param Array $vars
 		 * @return string
+		 * @access protected
 		 */
-		function _parseTopicUrl($topic_id, &$vars)
+		protected function _parseTopicUrl($topic_id, &$vars)
 		{
+			$rewrite_processor =& $this->Application->recallObject('kRewriteUrlProcessor');
+			/* @var $rewrite_processor kRewriteUrlProcessor */
+
 			$sql = 'SELECT c.ParentPath, c.CategoryId
 					FROM ' . TABLE_PREFIX . 'Category AS c
 					WHERE c.CategoryId = ' . (int)$vars['m_cat_id'];
 			$cat_item = $this->Conn->GetRow($sql);
 
-			$item_template = $this->GetItemTemplate($cat_item, 'bb');
+			$item_template = $rewrite_processor->GetItemTemplate($cat_item, 'bb');
 
 			if ($item_template) {
 				$vars['t'] = $item_template;
@@ -1000,236 +268,4 @@
 
 			return 'bb';
 		}
-
-		/**
-		 * Returns enviroment variable values for given prefix (uses directly given params, when available)
-		 *
-		 * @param string $prefix_special
-		 * @param Array $params
-		 * @param bool $keep_events
-		 * @return Array
-		 */
-		function getProcessedParams($prefix_special, &$params, $keep_events)
-		{
-			list ($prefix) = explode('.', $prefix_special);
-
-			$query_vars = $this->Application->getUnitOption($prefix, 'QueryString', Array ());
-			/* @var $query_vars Array */
-
-			if ( !$query_vars ) {
-				// given prefix doesn't use "env" variable to pass it's data
-				return false;
-			}
-
-			$event_key = array_search('event', $query_vars);
-			if ( $event_key ) {
-				// pass through event of this prefix
-				unset($query_vars[$event_key]);
-			}
-
-			if ( array_key_exists($prefix_special . '_event', $params) && !$params[$prefix_special . '_event'] ) {
-				// if empty event, then remove it from url
-				unset($params[$prefix_special . '_event']);
-			}
-
-			// if pass events is off and event is not implicity passed
-			if ( !$keep_events && !array_key_exists($prefix_special . '_event', $params) ) {
-				unset($params[$prefix_special . '_event']); // remove event from url if requested
-				//otherwise it will use value from get_var
-			}
-
-			$processed_params = Array ();
-			foreach ($query_vars as $var_name) {
-				// if value passed in params use it, otherwise use current from application
-				$var_name = $prefix_special . '_' . $var_name;
-				$processed_params[$var_name] = array_key_exists($var_name, $params) ? $params[$var_name] : $this->Application->GetVar($var_name);
-
-				if ( array_key_exists($var_name, $params) ) {
-					unset($params[$var_name]);
-				}
-			}
-
-			return $processed_params;
-		}
-
-		/**
-		 * Returns module item details template specified in given category custom field for given module prefix
-		 *
-		 * @param int|Array $category
-		 * @param string $module_prefix
-		 * @return string
-		 */
-		function GetItemTemplate($category, $module_prefix)
-		{
-			$category_id = is_array($category) ? $category['CategoryId'] : $category;
-			$cache_key = __CLASS__ . '::' . __FUNCTION__ . '[%CIDSerial:' . $category_id . '%]:' . $module_prefix;
-
-			$cached_value = $this->Application->getCache($cache_key);
-			if ($cached_value !== false) {
-				return $cached_value;
-			}
-
-			if (!is_array($category)) {
-				if ($category == 0) {
-					$category = $this->Application->findModule('Var', $module_prefix, 'RootCat');
-				}
-				$sql = 'SELECT c.ParentPath, c.CategoryId
-						FROM ' . TABLE_PREFIX . 'Category AS c
-						WHERE c.CategoryId = ' . $category;
-				$category = $this->Conn->GetRow($sql);
-			}
-			$parent_path = implode(',',explode('|', substr($category['ParentPath'], 1, -1)));
-
-			// item template is stored in module' system custom field - need to get that field Id
-			$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.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.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.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($cache_key, $item_template);
-
-			return $item_template;
-		}
-
-		/**
-		 * Loads all registered rewrite listeners, so they could be quickly accessed later
-		 *
-		 */
-		function initRewriteListeners()
-		{
-			static $init_done = false;
-
-			if ($init_done || count($this->Application->RewriteListeners) == 0) {
-				// not inited OR mod-rewrite url with missing config cache
-				return ;
-			}
-
-			foreach ($this->Application->RewriteListeners as $prefix => $listener_data) {
-				foreach ($listener_data['listener'] as $index => $rewrite_listener) {
-					list ($listener_prefix, $listener_method) = explode(':', $rewrite_listener);
-					$listener =& $this->Application->recallObject($listener_prefix);
-
-					$this->Application->RewriteListeners[$prefix][$index] = Array (&$listener, $listener_method);
-				}
-			}
-
-			define('MOD_REWRITE_URL_ENDING', $this->Application->ConfigValue('ModRewriteUrlEnding'));
-
-			$init_done = true;
-		}
-
-		/**
-		 * Returns category custom field id, where given module prefix item template name is stored
-		 *
-		 * @param string $module_prefix
-		 * @return int
-		 */
-		function getItemTemplateCustomField($module_prefix)
-		{
-			$cache_key = __CLASS__ . '::' . __FUNCTION__ . '[%CfSerial%]:' . $module_prefix;
-			$cached_value = $this->Application->getCache($cache_key);
-
-			if ($cached_value !== false) {
-				return $cached_value;
-			}
-
-			$sql = 'SELECT CustomFieldId
-				 	FROM ' . TABLE_PREFIX . 'CustomField
-				 	WHERE FieldName = ' . $this->Conn->qstr($module_prefix . '_ItemTemplate');
-			$item_template_field_id = $this->Conn->GetOne($sql);
-
-			$this->Application->setCache($cache_key, $item_template_field_id);
-
-			return $item_template_field_id;
-		}
-
-		/**
-		 * Sets default parsed values before actual url parsing (only, for empty url)
-		 *
-		 * @param Array $vars
-		 */
-		function _setDefaultValues(&$vars)
-		{
-			$defaults = Array (
-				'm_cat_id' => 0, // no category
-				'm_cat_page' => 1, // first category page
-				'm_opener' => 's', // stay on same page
-				't' => 'index' // main site page
-			);
-
-			if ($this->primaryLanguageId) {
-				// domain-based primary language
-				$defaults['m_lang'] = $this->primaryLanguageId;
-			}
-
-			if ($this->primaryThemeId) {
-				// domain-based primary theme
-				$defaults['m_theme'] = $this->primaryThemeId;
-			}
-
-			foreach ($defaults as $default_key => $default_value) {
-				if ($this->HTTPQuery->Get($default_key) === false) {
-					$vars[$default_key] = $default_value;
-				}
-			}
-		}
-
-		/**
-		 * Marks url part as parsed
-		 *
-		 * @param string $url_part
-		 * @param string $parse_direction
-		 */
-		function partParsed($url_part, $parse_direction = 'ltr')
-		{
-			if ( !$this->_partsToParse ) {
-				return ;
-			}
-
-			if ( $parse_direction == 'ltr' ) {
-				$expected_url_part = reset($this->_partsToParse);
-
-				if ( $url_part == $expected_url_part ) {
-					array_shift($this->_partsToParse);
-				}
-			}
-			else {
-				$expected_url_part = end($this->_partsToParse);
-
-				if ( $url_part == $expected_url_part ) {
-					array_pop($this->_partsToParse);
-				}
-			}
-
-			if ( $url_part != $expected_url_part ) {
-				trigger_error('partParsed: expected URL part "<strong>' . $expected_url_part . '</strong>", received URL part "<strong>' . $url_part . '</strong>"', E_USER_NOTICE);
-			}
-		}
 	}
Index: branches/5.2.x/core/kernel/utility/http_query.php
===================================================================
diff -u -N -r14699 -r14714
--- branches/5.2.x/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 14699)
+++ branches/5.2.x/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 14714)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: http_query.php 14699 2011-10-26 11:39:38Z alex $
+* @version	$Id: http_query.php 14714 2011-11-01 10:05:18Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -109,15 +109,27 @@
 			// so any logic based in it (like redirects) will not break down
 			$_GET['ajax'] = 'yes';
 		}
+	}
 
+	/**
+	 * Set's prefix and special
+	 *
+	 * @param string $prefix
+	 * @param string $special
+	 * @access public
+	 */
+	public function Init($prefix, $special)
+	{
+		parent::Init($prefix, $special);
+
 		$this->AddAllVars();
 		$this->specialsToRemove = $this->Get('remove_specials');
 
-		if ($this->specialsToRemove) {
+		if ( $this->specialsToRemove ) {
 			foreach ($this->specialsToRemove as $prefix_special => $flag) {
-				if ($flag && strpos($prefix_special, '.') === false) {
+				if ( $flag && strpos($prefix_special, '.') === false ) {
 					unset($this->specialsToRemove[$prefix_special]);
-					trigger_error('Incorrect usage of "<strong>remove_specials['.$prefix_special.']</strong>" field (no special found)', E_USER_NOTICE);
+					trigger_error('Incorrect usage of "<strong>remove_specials[' . $prefix_special . ']</strong>" field (no special found)', E_USER_NOTICE);
 				}
 			}
 
@@ -133,9 +145,9 @@
 	 * @param string $prefix_special
 	 *
 	 * @return Array|bool
-	 * @access protected
+	 * @access public
 	 */
-	protected function discoverUnit($prefix_special)
+	public function discoverUnit($prefix_special)
 	{
 		list($prefix) = explode('.', $prefix_special);
 
@@ -200,20 +212,30 @@
 		return substr($prefix, 0, 1) == '#' ? $this->_getQueryString( substr($prefix, 1) ) : Array ();
 	}
 
-	function removeSpecials($array)
+	/**
+	 * Removes specials from request
+	 *
+	 * @param Array $array
+	 * @return Array
+	 * @access protected
+	 */
+	protected function removeSpecials($array)
 	{
-		$ret = Array();
+		$ret = Array ();
 		$removed = false;
+
 		foreach ($this->specialsToRemove as $prefix_special => $flag) {
-			if ($flag) {
+			if ( $flag ) {
 				$removed = true;
-				list ($prefix,$special) = explode('.', $prefix_special, 2);
+				list ($prefix, $special) = explode('.', $prefix_special, 2);
+
 				foreach ($array as $key => $val) {
-					$new_key = preg_match("/^".$prefix."[._]{1}".$special."(.*)/", $key, $regs) ? $prefix.$regs[1] : $key;
+					$new_key = preg_match("/^" . $prefix . "[._]{1}" . $special . "(.*)/", $key, $regs) ? $prefix . $regs[1] : $key;
 					$ret[$new_key] = is_array($val) ? $this->removeSpecials($val) : $val;
 				}
 			}
 		}
+
 		return $removed ? $ret : $array;
 	}
 
@@ -225,17 +247,15 @@
 	 */
 	function AddAllVars()
 	{
-		for ($i=0; $i < strlen($this->Order); $i++)
-		{
-			$current = $this->Order[$i];
-			switch ($current) {
+		for ($i = 0; $i < strlen($this->Order); $i++) {
+			switch ( $this->Order[$i] ) {
 				case 'G':
 					$this->Get = $this->AddVars($_GET);
 					if (array_key_exists('sid', $_GET)) {
 						$this->_sidInQueryString = true;
 					}
 
-					$vars = $this->processQueryString( $this->Get(ENV_VAR_NAME) );
+					$vars = $this->Application->processQueryString( $this->Get(ENV_VAR_NAME) );
 
 					if (array_key_exists('sid', $vars)) {
 						// used by Session::GetPassedSIDValue
@@ -255,22 +275,20 @@
 					$this->Cookie = $this->AddVars($_COOKIE);
 					break;
 
-				case 'E';
-					$this->Env = $this->AddVars($_ENV);
+				/*case 'E';
+					$this->Env = $this->AddVars($_ENV, false); //do not strip slashes!
 					break;
 
 				case 'S';
-					$this->Server = $this->AddVars($_SERVER);
-					break;
+					$this->Server = $this->AddVars($_SERVER, false); //do not strip slashes!
+					break;*/
 
 				case 'F';
 					$this->convertFiles();
 					$this->Files = $this->MergeVars($_FILES, false); //do not strip slashes!
 					break;
 			}
 		}
-
-//		$this->AfterInit();
 	}
 
 	/**
@@ -281,22 +299,22 @@
 	function _processPostEnvVariables()
 	{
 		$passed = $this->Get('passed');
-		if (!$passed) {
-			return ;
+		if ( !$passed ) {
+			return;
 		}
 
 		$passed = explode(',', $passed);
 		foreach ($passed as $prefix_special) {
-			if (strpos($prefix_special, '.') === false) {
+			if ( strpos($prefix_special, '.') === false ) {
 				continue;
 			}
 
 			list ($prefix, $special) = explode('.', $prefix_special);
 			$query_map = $this->getQueryString($prefix);
 			$post_prefix_special = $prefix . '_' . $special;
 
-			foreach ($query_map as $index => $var_name) {
-				if (array_key_exists($post_prefix_special . '_' . $var_name, $this->Post)) {
+			foreach ($query_map as $var_name) {
+				if ( array_key_exists($post_prefix_special . '_' . $var_name, $this->Post) ) {
 					$this->Set($prefix_special . '_' . $var_name, $this->Post[$post_prefix_special . '_' . $var_name]);
 				}
 			}
@@ -310,14 +328,16 @@
 		if ($this->Application->RewriteURLs() || $rewrite_url) {
 			// maybe call onafterconfigread here
 
+			$this->Application->UrlManager->initRewrite();
+
 			if (defined('DEBUG_MODE') && $this->Application->isDebugMode()) {
 				$this->Application->Debugger->profileStart('url_parsing', 'Parsing <b>MOD_REWRITE</b> url');
-				$this->processRewriteURL();
+				$this->Application->UrlManager->rewrite->parseRewriteURL();
 				$description = 'Parsing <b>MOD_REWRITE</b> url (template: <b>' . $this->Get('t') . '</b>)';
 				$this->Application->Debugger->profileFinish('url_parsing', $description);
 			}
 			else {
-				$this->processRewriteURL();
+				$this->Application->UrlManager->rewrite->parseRewriteURL();
 			}
 
 			if ( !$rewrite_url && $this->rewriteRedirectRequired() ) {
@@ -345,7 +365,7 @@
 	function rewriteRedirectRequired()
 	{
 		$redirect_conditions = Array (
-			!$this->Application->Session->IsHTTPSRedirect(), // not https <-> http redirect
+			!$this->IsHTTPSRedirect(), // not https <-> http redirect
 			!$this->refererIsOurSite(), // referer doesn't match ssl path or non-ssl domain (same for site domains)
 			!defined('GW_NOTIFY'), // not in payment gateway notification script
 			preg_match('/[\/]{0,1}index.php[\/]{0,1}/', $_SERVER['PHP_SELF']), // "index.php" was visited
@@ -366,6 +386,22 @@
 	}
 
 	/**
+	 * This is redirect from https to http or via versa
+	 *
+	 * @return bool
+	 */
+	function IsHTTPSRedirect()
+	{
+		$http_referer = array_key_exists('HTTP_REFERER', $_SERVER) ? $_SERVER['HTTP_REFERER'] : false;
+
+		return (
+			( PROTOCOL == 'https://' && preg_match('#http:\/\/#', $http_referer) )
+			||
+			( PROTOCOL == 'http://' && preg_match('#https:\/\/#', $http_referer) )
+		);
+	}
+
+	/**
 	 * Checks, that referer is out site
 	 *
 	 * @return bool
@@ -505,208 +541,48 @@
 		}
 	}
 
-	function finalizeParsing($passed = Array(), $module_params = Array() )
+	function finalizeParsing($passed = Array())
 	{
-		if ($passed) {
-			foreach ($passed as $passed_prefix) {
-				$this->discoverUnit($passed_prefix); // from mod-rewrite url parsing
-			}
-
-			$this->Set('passed', implode(',', $this->getDiscoveredUnits()));
+		if (!$passed) {
+			return;
 		}
 
-		// get joined version (env var + mod rewrite parsed)
-		$passed = $this->Application->GetVar('passed');
-
-		if (!array_key_exists('editing_mode', $module_params)) {
-			$module_params['editing_mode'] = '';
+		foreach ($passed as $passed_prefix) {
+			$this->discoverUnit($passed_prefix); // from mod-rewrite url parsing
 		}
 
-		$module_params['__URLENCODE__'] = 1;
-
-		$env = $this->Application->BuildEnv( $this->Get('t'), $module_params, $passed, false, false);
-		$this->Set(ENV_VAR_NAME, $env);
-		$_REQUEST['env'] = $_GET['env'] = $env; // for capability with old in-portal code
+		$this->Set('passed', implode(',', $this->getDiscoveredUnits()));
 	}
 
-	function processRewriteURL()
-	{
-		$mod_rw_helper =& $this->Application->recallObject('ModRewriteHelper');
-		/* @var $mod_rw_helper kModRewriteHelper */
-
-		$mod_rw_helper->processRewriteURL();
-	}
-
-	function getDefaultTemplate($t)
-	{
-		$t = $this->getTemplateName(trim($t, '/'));
-
-		if ( !$t ) {
-			$t = 'index';
-		}
-
-		return trim($t, '/');
-	}
-
-	function extractSIDAndTemplate(&$parts)
-	{
-		$template = '';
-		$vars = Array ();
-
-		if ( preg_match('/^([\d]+|)-(.*)$/', $parts[0], $regs) ) {
-			// first "env" component matches "sid-template" format
-			// (will be false, when mod-rewrite url to home page is built)
-			$sid = $regs[1];
-			$template = $regs[2];
-			array_shift($parts);
-
-			if ( $sid ) {
-				// Save Session ID
-				$this->Set('sid', $sid);
-				$vars['sid'] = $sid;
-			}
-		}
-
-		// Save Template Name
-		$vars['t'] = $this->getDefaultTemplate($template);
-
-		return $vars;
-	}
-
 	/**
-	 * Process QueryString only, create
-	 * events, ids, based on config
-	 * set template name and sid in
-	 * desired application variables.
-	 *
-	 * @param string $env_var environment string value
-	 * @param string $pass_name
-	 * @return Array
-	 * @access public
-	 */
-	function processQueryString($env_var, $pass_name = 'passed')
-	{
-		// env=SID-TEMPLATE:m-1-1-1-1:l0-0-0:n-0-0-0:bb-0-0-1-1-1-0
-		$vars = Array ();
-		if ($env_var) {
-			$more_vars = strpos($env_var, '&');
-			if ($more_vars !== false) {
-				parse_str(substr($env_var, $more_vars + 1), $vars);
-				$env_var = substr($env_var, 0, $more_vars);
-			}
-
-			// replace escaped ":" symbol not to explode by it
-			$env_var = str_replace('\:','_&+$$+&_', $env_var);	// replace escaped "=" with spec-chars :)
-			$parts = explode(':', $env_var);
-
-			if (!$this->Application->RewriteURLs() || ($this->Application->RewriteURLs() && $this->Get('rewrite') != 'on')) {
-				$vars = array_merge($vars, $this->extractSIDAndTemplate($parts));
-			}
-
-			if ($parts) {
-				$passed = Array ();
-				foreach ($parts as $mixed_part) {
-					list ($passed[], $processed_vars) = $this->_parseEnvPart($mixed_part);
-					$vars = array_merge($vars, $processed_vars);
-				}
-
-				$vars[$pass_name] = implode(',', array_unique($passed));
-			}
-		}
-		else {
-			$t = $this->getTemplateName('index');
-			$vars['t'] = $t;
-		}
-
-		return $vars;
-	}
-
-	/**
-	 * Converts environment part into variable array (based on query map for given prefix)
-	 *
-	 * @param string $mixed_part
-	 * @return Array
-	 */
-	function _parseEnvPart($mixed_part)
-	{
-		// In-portal old style env conversion - adds '-' between prefix and first var
-		$mixed_part = str_replace('_&+$$+&_', ':', $mixed_part);
-		$mixed_part = preg_replace("/^([a-zA-Z]+)([0-9]+)-(.*)/", "$1-$2-$3", $mixed_part);
-
-		// replace escaped "-" symbol not to explode by it
-		$escaped_part = str_replace('\-', '_&+$$+&_', $mixed_part);
-		$escaped_part = explode('-', $escaped_part);
-
-		$mixed_part = Array();
-		foreach ($escaped_part as $escaped_val) {
-			$mixed_part[] = str_replace('_&+$$+&_', '-', $escaped_val);
-		}
-
-		$prefix_special = array_shift($mixed_part); // l.pick, l
-		$query_map = $this->discoverUnit($prefix_special); // from $_GET['env']
-
-		$vars = Array ();
-
-		// if config is not defined for prefix in QueryString, then don't process it
-		if ($query_map) {
-			foreach ($query_map as $index => $var_name) {
-				// l_id, l_page, l_bla-bla-bla
-				$val = $mixed_part[$index - 1];
-				if ($val == '') $val = false;
-				$vars[$prefix_special.'_'.$var_name] = $val;
-			}
-		}
-
-		return Array ($prefix_special, $vars);
-	}
-
-	/**
-	 * Removes tpl part from template name + resolved template ID to name
-	 *
-	 * @param string $t
-	 * @return string
-	 * @access private
-	 */
-	function getTemplateName($t)
-	{
-		if ( array_key_exists('t', $this->Get) && $this->Get['t'] ) {
-			// template name is passed directly in url (GET method)
-			$t = $this->Get['t'];
-		}
-
-		// if t was set through env, even in mod_rewrite mode!
-		if ( $this->Get('env') && $this->Application->RewriteURLs() && $this->Get('t') ) {
-			$t = $this->Get('t');
-		}
-
-		return preg_replace('/\.tpl$/', '', $t);
-	}
-
-	/**
 	 * Saves variables from array specified
 	 * into common variable storage place
 	 *
 	 * @param Array $array
+	 * @param bool $strip_slashes
 	 * @return Array
 	 * @access private
 	 */
-	function AddVars($array)
+	function AddVars($array, $strip_slashes = true)
 	{
-		$array = $this->StripSlashes($array);
-		foreach($array as $key => $value)
-		{
-			$this->Set($key,$value);
+		if ( $strip_slashes ) {
+			$array = $this->StripSlashes($array);
 		}
+
+		foreach ($array as $key => $value) {
+			$this->Set($key, $value);
+		}
+
 		return $array;
 	}
 
 	function MergeVars($array, $strip_slashes = true)
 	{
-		if ($strip_slashes) {
+		if ( $strip_slashes ) {
 			$array = $this->StripSlashes($array);
 		}
 
-		foreach($array as $key => $value_array) {
+		foreach ($array as $key => $value_array) {
 			// $value_array is an array too
 			$this->_Params = kUtil::array_merge_recursive($this->_Params, Array ($key => $value_array));
 		}
@@ -853,4 +729,19 @@
 		}
 	}
 
+	/**
+	 * Checks, that url is empty
+	 *
+	 * @return bool
+	 * @access public
+	 */
+	public function isEmptyUrl()
+	{
+		if ( $this->Application->RewriteURLs() ) {
+			return !$this->Get('_mod_rw_url_');
+		}
+
+		return !count($this->Get);
+	}
+
 }
\ No newline at end of file
Index: branches/5.2.x/core/kernel/processors/main_processor.php
===================================================================
diff -u -N -r14699 -r14714
--- branches/5.2.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 14699)
+++ branches/5.2.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 14714)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: main_processor.php 14699 2011-10-26 11:39:38Z alex $
+* @version	$Id: main_processor.php 14714 2011-11-01 10:05:18Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -162,12 +162,12 @@
 		return '';
 	}
 
-	function Env($params)
+	/*function Env($params)
 	{
 		$t = $params['template'];
 		unset($params['template']);
 		return $this->Application->BuildEnv($t, $params, 'm', false, false);
-	}
+	}*/
 
 	function FormAction($params)
 	{
@@ -476,9 +476,9 @@
 	 *
 	 * @param Array $params
 	 * @return string
-	 * @author Alex
+	 * @access protected
 	 */
-	function GetFormHiddens($params)
+	protected function GetFormHiddens($params)
 	{
 		$t = $this->SelectParam($params, 'template,t');
 		unset($params['template']);
Index: branches/5.2.x/core/kernel/managers/url_manager.php
===================================================================
diff -u -N -r14699 -r14714
--- branches/5.2.x/core/kernel/managers/url_manager.php	(.../url_manager.php)	(revision 14699)
+++ branches/5.2.x/core/kernel/managers/url_manager.php	(.../url_manager.php)	(revision 14714)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: url_manager.php 14699 2011-10-26 11:39:38Z alex $
+* @version	$Id: url_manager.php 14714 2011-11-01 10:05:18Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -17,13 +17,64 @@
 class kUrlManager extends kBase {
 
 	/**
+	 * Processor of plain urls (initialized always)
+	 *
+	 * @var kPlainUrlProcessor
+	 * @access public
+	 */
+	public $plain = null;
+
+	/**
+	 * Processor of rewritten urls (initialized on demand only)
+	 *
+	 * @var kRewriteUrlProcessor
+	 * @access public
+	 */
+	public $rewrite = null;
+
+	/**
+	 * Tells, that rewrite system is ready
+	 *
+	 * @var bool
+	 * @access protected
+	 */
+	protected $rewriteReady = false;
+
+	/**
 	 * Physical template name mapping to their template names based on structure
 	 *
 	 * @var Array
 	 */
 	protected $structureTemplateMapping = Array ();
 
 	/**
+	 * Creates instead of kUrlManager class
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		// don't use kApplication::recallObject, since it will call kApplication::EventManager, which isn't ready yet
+		$this->plain =& $this->Application->makeClass('kPlainUrlProcessor', Array (&$this));
+	}
+
+	/**
+	 * Delay initialization of rewrite processor, since it uses site domains & http query
+	 *
+	 * @return void
+	 * @access public
+	 */
+	public function initRewrite()
+	{
+		if ( $this->rewriteReady ) {
+			return;
+		}
+
+		$this->rewrite =& $this->Application->recallObject('kRewriteUrlProcessor', null, Array (), Array (&$this));
+		$this->rewriteReady = true;
+	}
+
+	/**
 	 * Return href for template
 	 *
 	 * @param string $t Template path
@@ -36,102 +87,75 @@
 	{
 		static $theme_id = null;
 
-		if (!isset($theme_id)) {
+		if ( !isset($theme_id) ) {
 			$theme_id = $this->Application->GetVar('m_theme');
 		}
 
-		if (!$t) {
+		if ( !$t ) {
 			// when template not specified, use current
 			$t = $this->Application->GetVar('t');
 		}
 
 		$t = preg_replace('/^Content\//i', '', $t);
 
-		if (substr($t, -4) == '.tpl') {
+		if ( substr($t, -4) == '.tpl' ) {
 			// cut template extension (deprecated link format)
 			$t = substr($t, 0, strlen($t) - 4);
 		}
 
-		if (substr($t, 0, 3) == 'id:') {
+		if ( substr($t, 0, 3) == 'id:' ) {
 			// link to structure page using it's id
 			$params['m_cat_id'] = substr($t, 3);
 			$t = $this->structureTemplateMapping[$t];
 		}
 
-		if (array_key_exists('use_section', $params)) {
+		if ( array_key_exists('use_section', $params) ) {
 			$use_section = $params['use_section'];
 			unset($params['use_section']);
 		}
 
-		if (isset($use_section) && $use_section && array_key_exists($t . ':' . $theme_id, $this->structureTemplateMapping)) {
+		if ( isset($use_section) && $use_section && array_key_exists($t . ':' . $theme_id, $this->structureTemplateMapping) ) {
 			// structure template corresponding to given physical template
 			$t = $this->structureTemplateMapping[$t . ':' . $theme_id];
 			unset($params['use_section']);
 		}
 
-		if (preg_match('/external:(.*)/', $t, $rets)) {
+		if ( preg_match('/external:(.*)/', $t, $regs) ) {
 			// external url
-			return $rets[1];
+			return $regs[1];
 		}
 
-		if ($this->Application->isAdmin && $prefix == '') $prefix = ADMIN_DIRECTORY;
-		if ($this->Application->isAdmin && $prefix == '_FRONT_END_') $prefix = '';
+		if ( $this->Application->isAdmin && $prefix == '' ) {
+			$prefix = ADMIN_DIRECTORY;
+		}
 
-		$index_file = $this->getIndexFile($prefix, $index_file, $params);
+		if ( $this->Application->isAdmin && $prefix == '_FRONT_END_' ) {
+			$prefix = '';
+		}
 
-		if (isset($params['_auto_prefix_'])) {
+		if ( isset($params['_auto_prefix_']) ) {
 			unset($params['_auto_prefix_']); // this is parser-related param, do not need to pass it here
 		}
 
 		$ssl = isset($params['__SSL__']) ? $params['__SSL__'] : null;
-		if ($ssl !== null) {
+		if ( $ssl !== null ) {
 			$session =& $this->Application->recallObject('Session');
 			/* @var $session Session */
 
 			$target_url = rtrim($this->Application->BaseURL('', $ssl, false), '/');
 			$cookie_url = trim($session->CookieDomain . $session->CookiePath, '/.');
 
 			// set session to GET_ONLY, to pass sid only if sid is REAL AND session is set
-			if (!preg_match('#' . preg_quote($cookie_url) . '#', $target_url) && $session->SessionSet) {
+			if ( !preg_match('#' . preg_quote($cookie_url) . '#', $target_url) && $session->SessionSet ) {
 				// when SSL<->NON-SSL redirect to different domain pass SID in url
- 				$session->SetMode(Session::smGET_ONLY);
- 			}
+				$session->SetMode(Session::smGET_ONLY);
+			}
 		}
 
-		if (isset($params['opener']) && $params['opener'] == 'u') {
-			$wid = $this->Application->GetVar('m_wid');
-			$stack_name = rtrim('opener_stack_'.$wid, '_');
-			$opener_stack = $this->Application->RecallVar($stack_name);
+		if ( isset($params['opener']) && $params['opener'] == 'u' ) {
+			$ret = $this->processPopupClose($prefix, $params);
 
-			if ($opener_stack && $opener_stack != serialize(Array())) {
-				$opener_stack = unserialize($opener_stack);
-				list($index_file, $env) = explode('|', $opener_stack[count($opener_stack) - 1]);
-				$ret = $this->Application->BaseURL($prefix, $ssl).$index_file.'?'.ENV_VAR_NAME.'='.$env;
-				if ( getArrayValue($params,'escape') ) $ret = addslashes($ret);
-
-				if (isset($params['m_opener']) && $params['m_opener'] == 'u') {
-					array_pop($opener_stack);
-					if (!$opener_stack) {
-						$this->Application->RemoveVar($stack_name);
-						// remove popups last templates, because popup is closing now
-						$this->Application->RemoveVar('last_template_'.$wid);
-						$this->Application->RemoveVar('last_template_popup_'.$wid);
-
-						// don't save popups last templates again :)
-						$this->Application->SetVar('skip_last_template', 1);
-					}
-					else {
-						$this->Application->StoreVar($stack_name, serialize($opener_stack));
-					}
-
-					/*// store window relations
-					$window_relations = $this->Application->RecallVar('window_relations');
-					$window_relations = $window_relations ? unserialize($window_relations) : Array ();
-					if (array_key_exists($wid, $window_relations)) {
-						unset($window_relations[$wid]);
-						$this->Application->StoreVar('window_relations', serialize($window_relations));
-					}*/
-				}
+			if ( $ret !== false ) {
 				return $ret;
 			}
 			else {
@@ -142,488 +166,195 @@
 
 		$pass = isset($params['pass']) ? $params['pass'] : '';
 
+
 		// pass events with url
 		$pass_events = false;
-		if( isset($params['pass_events']) )
-		{
+		if ( isset($params['pass_events']) ) {
 			$pass_events = $params['pass_events'];
 			unset($params['pass_events']);
 		}
 
 		$map_link = '';
-		if( isset($params['anchor']) )
-		{
-			$map_link = '#'.$params['anchor'];
+		if ( isset($params['anchor']) ) {
+			$map_link = '#' . $params['anchor'];
 			unset($params['anchor']);
 		}
 
-		if ( isset($params['no_amp']) )
-		{
+		if ( isset($params['no_amp']) ) {
 			$params['__URLENCODE__'] = $params['no_amp'];
 			unset($params['no_amp']);
 		}
 
-		$no_rewrite = false;
-		if( isset($params['__NO_REWRITE__']) )
-		{
-			$no_rewrite = true;
+		$rewrite = true;
+		if ( isset($params['__NO_REWRITE__']) ) {
+			$rewrite = false;
 			unset($params['__NO_REWRITE__']);
 		}
 
 		$force_rewrite = false;
-		if( isset($params['__MOD_REWRITE__']) )
-		{
+		if ( isset($params['__MOD_REWRITE__']) ) {
 			$force_rewrite = true;
 			unset($params['__MOD_REWRITE__']);
 		}
 
 		$force_no_sid = false;
-		if( isset($params['__NO_SID__']) )
-		{
+		if ( isset($params['__NO_SID__']) ) {
 			$force_no_sid = true;
 			unset($params['__NO_SID__']);
 		}
 
+
 		// append pass through variables to each link to be build
 		$params = array_merge($this->getPassThroughVariables($params), $params);
 
-		if ($force_rewrite || ($this->Application->RewriteURLs($ssl) && !$no_rewrite)) {
-			static $rewrite_listeners_done = false;
-
-			if (!$rewrite_listeners_done) {
-				$mod_rewrite_helper =& $this->Application->recallObject('ModRewriteHelper');
-				/* @var $mod_rewrite_helper kModRewriteHelper */
-
-				$mod_rewrite_helper->initRewriteListeners();
-
-				$rewrite_listeners_done = true;
+		if ( $force_rewrite || ($this->Application->RewriteURLs($ssl) && $rewrite) ) {
+			if ( !$this->rewriteReady ) {
+				$this->initRewrite();
 			}
 
 			$session =& $this->Application->recallObject('Session');
 
-			if ($session->NeedQueryString() && !$force_no_sid) {
+			if ( $session->NeedQueryString() && !$force_no_sid ) {
 				$params['sid'] = $this->Application->GetSID();
 			}
 
-			$url = $this->BuildEnv_NEW($t, $params, $pass, $pass_events);
-			$ret = $this->Application->BaseURL($prefix, $ssl).$url.$map_link;
+			$url = $this->rewrite->build($t, $params, $pass, $pass_events);
 		}
 		else {
 			unset($params['pass_category']); // we don't need to pass it when mod_rewrite is off
-			$env = $this->BuildEnv($t, $params, $pass, $pass_events);
-			$ret = $this->Application->BaseURL($prefix, $ssl).$index_file.'?'.$env.$map_link;
+
+			$index_file = $this->getIndexFile($prefix, $index_file, $params);
+			$url = $index_file . '?' . $this->plain->build($t, $params, $pass, $pass_events);
 		}
 
-		return $ret;
+		return $this->Application->BaseURL($prefix, $ssl) . $url . $map_link;
 	}
 
 	/**
-	 * Returns variables with values that should be passed throught with this link + variable list
+	 * Returns popup's parent window url and optionally removes it from opener stack
 	 *
+	 * @param string $prefix
 	 * @param Array $params
-	 * @return Array
+	 * @return bool|string
+	 * @access protected
 	 */
-	function getPassThroughVariables(&$params)
+	protected function processPopupClose($prefix = '', $params = Array ())
 	{
-		static $cached_pass_through = null;
+		$opener_stack =& $this->Application->makeClass('kOpenerStack');
+		/* @var $opener_stack kOpenerStack */
 
-		if (isset($params['no_pass_through']) && $params['no_pass_through']) {
-			unset($params['no_pass_through']);
-			return Array();
+		if ( $opener_stack->isEmpty() ) {
+			return false;
 		}
 
-		// because pass through is not changed during script run, then we can cache it
-		if (is_null($cached_pass_through)) {
+		$ssl = isset($params['__SSL__']) ? $params['__SSL__'] : null;
+		list($index_file, $env) = explode('|', $opener_stack->get(kOpenerStack::LAST_ELEMENT, true));
+		$ret = $this->Application->BaseURL($prefix, $ssl) . $index_file . '?' . ENV_VAR_NAME . '=' . $env;
 
-			$cached_pass_through = Array();
-			$pass_through = $this->Application->GetVar('pass_through');
-
-			if ($pass_through) {
-				// names of variables to pass to each link
-				$cached_pass_through['pass_through'] = $pass_through;
-				$pass_through = explode(',', $pass_through);
-				foreach ($pass_through as $pass_through_var) {
-					$cached_pass_through[$pass_through_var] = $this->Application->GetVar($pass_through_var);
-				}
-			}
-
-		}
-
-		return $cached_pass_through;
-	}
-
-	function BuildEnv($t, $params, $pass='all', $pass_events = false, $env_var = true)
-	{
-		if ($this->Application->GetVar('admin') || (array_key_exists('admin', $params) && $params['admin'])) {
-			$params['admin'] = 1;
-
-			if (!array_key_exists('editing_mode', $params)) {
-				$params['editing_mode'] = EDITING_MODE;
-			}
-		}
-
-		$session =& $this->Application->recallObject('Session');
-		/* @var $session Session */
-
-		$ssl = isset($params['__SSL__']) ? $params['__SSL__'] : 0;
-		$sid = $session->NeedQueryString() && !$this->Application->RewriteURLs($ssl) ? $this->Application->GetSID() : '';
-//		if (getArrayValue($params,'admin') == 1) $sid = $this->Application->GetSID();
-
-		$ret = '';
-		if ($env_var) {
-			$ret = ENV_VAR_NAME.'=';
-		}
-
-		$ret .=	$sid . '-'; // SID-TEMPLATE
-
-		$encode = false;
-		if (isset($params['__URLENCODE__'])) {
-			$encode = $params['__URLENCODE__'];
-			unset($params['__URLENCODE__']);
-		}
-
-		if (isset($params['__SSL__'])) {
-			unset($params['__SSL__']);
-		}
-
-		$env_string = '';
-		$category_id = isset($params['m_cat_id']) ? $params['m_cat_id'] : $this->Application->GetVar('m_cat_id');
-
-		$item_id = false;
-		$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->Application->findModule('Var', $prefix);
-				if ($require_rewrite) {
-					$item_id = isset($params[$pass_element.'_id']) ? $params[$pass_element.'_id'] : $this->Application->GetVar($pass_element.'_id');
-				}
-				$env_string .= ':'.$this->BuildModuleEnv($pass_element, $params, $pass_events);
-			}
-		}
-
-		if (strtolower($t) == '__default__') {
-			if (is_numeric($item_id)) {
-				$mod_rw_helper =& $this->Application->recallObject('ModRewriteHelper');
-				/* @var $mod_rw_helper kModRewriteHelper */
-
-				$t = $mod_rw_helper->GetItemTemplate($category_id, $pass_element); // $pass_element should be the last processed element
-				// $t = $this->Application->getCategoryCache($category_id, 'item_templates');
-			}
-			elseif ($category_id) {
-				$t = strtolower(preg_replace('/^Content\//i', '', $this->Application->getCategoryCache($category_id, 'filenames') ));
-			}
-			else {
-				$t = 'index';
-			}
-		}
-
-		$ret .= $t.':'.$this->BuildModuleEnv('m', $params, $pass_events).$env_string;
-
-		unset($params['pass'], $params['opener'], $params['m_event']);
-
-		if (array_key_exists('escape', $params) && $params['escape']) {
+		if ( isset($params['escape']) && $params['escape'] ) {
 			$ret = addslashes($ret);
-			unset($params['escape']);
 		}
 
-		if ($params) {
-			$params_str = '';
-			$join_string = $encode ? '&' : '&amp;';
+		if ( isset($params['m_opener']) && $params['m_opener'] == 'u' ) {
+			$opener_stack->pop();
+			$opener_stack->save(true);
 
-			foreach ($params as $param => $value) {
-				$params_str .= $join_string . $param . '=' . $value;
-			}
+			if ( $opener_stack->isEmpty() ) {
+				// remove popups last templates, because popup is closing now
+				$this->Application->RemoveVar('last_template_' . $opener_stack->getWindowID());
+				$this->Application->RemoveVar('last_template_popup_' . $opener_stack->getWindowID());
 
-			$ret .= $params_str;
-		}
-
-		if ($encode) {
-			$ret = str_replace('\\', '%5C', $ret);
-		}
-
-		return $ret;
-	}
-
-	function BuildEnv_NEW($t, $params, $pass='all', $pass_events = false)
-	{
-		if ($this->Application->GetVar('admin') || (array_key_exists('admin', $params) && $params['admin'])) {
-			$params['admin'] = 1;
-
-			if (!array_key_exists('editing_mode', $params)) {
-				$params['editing_mode'] = EDITING_MODE;
+				// don't save popups last templates again :)
+				$this->Application->SetVar('skip_last_template', 1);
 			}
-		}
 
-		$ret = '';
-		$env = '';
-
-		$encode = false;
-
-		if (isset($params['__URLENCODE__'])) {
-			$encode = $params['__URLENCODE__'];
-			unset($params['__URLENCODE__']);
+			// store window relations
+			/*$window_relations = $this->Application->RecallVar('window_relations');
+			$window_relations = $window_relations ? unserialize($window_relations) : Array ();
+			if (array_key_exists($wid, $window_relations)) {
+				unset($window_relations[$wid]);
+				$this->Application->StoreVar('window_relations', serialize($window_relations));
+			}*/
 		}
 
-		if (isset($params['__SSL__'])) {
-			unset($params['__SSL__']);
-		}
-
-		$catalog_item_found = false;
-		$pass_info = $this->getPassInfo($pass);
-
-		if ($pass_info) {
-			if ($pass_info[0] == 'm') {
-				array_shift($pass_info);
-			}
-
-			$inject_parts = Array (); // url parts for beginning of url
-			$params['t'] = $t; // make template available for rewrite listeners
-			$params['pass_template'] = true; // by default we keep given template in resulting url
-
-			if (!array_key_exists('pass_category', $params)) {
-				$params['pass_category'] = false; // by default we don't keep categories in url
-			}
-
-			foreach ($pass_info as $pass_index => $pass_element) {
-				list ($prefix) = explode('.', $pass_element);
-				$catalog_item = $this->Application->findModule('Var', $prefix) && $this->Application->getUnitOption($prefix, 'CatalogItem');
-
-				if (array_key_exists($prefix, $this->Application->RewriteListeners)) {
-					// if next prefix is same as current, but with special => exclude current prefix from url
-					$next_prefix = array_key_exists($pass_index + 1, $pass_info) ? $pass_info[$pass_index + 1] : false;
-					if ($next_prefix) {
-						$next_prefix = substr($next_prefix, 0, strlen($prefix) + 1);
-						if ($prefix . '.' == $next_prefix) {
-							continue;
-						}
-					}
-
-					// rewrited url part
-					$url_part = $this->BuildModuleEnv_NEW($pass_element, $params, $pass_events);
-
-					if (is_string($url_part) && $url_part) {
-						$ret .= $url_part . '/';
-
-						if ($catalog_item) {
-							// pass category later only for catalog items
-							$catalog_item_found = true;
-						}
-					}
-					elseif (is_array($url_part)) {
-						// rewrite listener want to insert something at the beginning of url too
-						if ($url_part[0]) {
-							$inject_parts[] = $url_part[0];
-						}
-
-						if ($url_part[1]) {
-							$ret .= $url_part[1] . '/';
-						}
-
-						if ($catalog_item) {
-							// pass category later only for catalog items
-							$catalog_item_found = true;
-						}
-					} elseif ($url_part === false) {
-						// rewrite listener decided not to rewrite given $pass_element
-						$env .= ':' . $this->BuildModuleEnv($pass_element, $params, $pass_events);
-					}
-				}
-				else {
-					$env .= ':' . $this->BuildModuleEnv($pass_element, $params, $pass_events);
-				}
-			}
-
-			if ($catalog_item_found || preg_match('/c\.[-\d]*/', implode(',', $pass_info))) {
-				// "c" prefix is present -> keep category
-				$params['pass_category'] = true;
-			}
-
-			$params['inject_parts'] = $inject_parts;
-
-			$ret = $this->BuildModuleEnv_NEW('m', $params, $pass_events) . '/' . $ret;
-			$cat_processed = array_key_exists('category_processed', $params) && $params['category_processed'];
-
-			// remove tempporary parameters used by listeners
-			unset($params['t'], $params['inject_parts'], $params['pass_template'], $params['pass_category'], $params['category_processed']);
-
-			$ret = trim($ret, '/');
-
-			if ( isset($params['url_ending']) ) {
-				if ($ret) {
-					$ret .= $params['url_ending'];
-				}
-
-				unset($params['url_ending']);
-			}
-			elseif ($ret) {
-				$ret .= MOD_REWRITE_URL_ENDING;
-			}
-
-			if ($env) {
-				$params[ENV_VAR_NAME] = ltrim($env, ':');
-			}
-		}
-
-		unset($params['pass'], $params['opener'], $params['m_event']);
-
-		if (array_key_exists('escape', $params) && $params['escape']) {
-			$ret = addslashes($ret);
-			unset($params['escape']);
-		}
-
-		$ret = str_replace('%2F', '/', urlencode($ret));
-
-		if ($params) {
-			$params_str = '';
-			$join_string = $encode ? '&' : '&amp;';
-
-			foreach ($params as $param => $value) {
-				$params_str .= $join_string . $param . '=' . $value;
-			}
-
-			$ret .= '?' . substr($params_str, strlen($join_string));
-		}
-
-		if ($encode) {
-			$ret = str_replace('\\', '%5C', $ret);
-		}
-
 		return $ret;
 	}
 
 	/**
-	 * Builds env part that corresponds prefix passed
+	 * Returns variables with values that should be passed through with this link + variable list
 	 *
-	 * @param string $prefix_special item's prefix & [special]
-	 * @param Array $params url params
-	 * @param bool $pass_events
-	 * @return string
-	 * @access protected
+	 * @param Array $params
+	 * @return Array
+	 * @access public
 	 */
-	protected function BuildModuleEnv($prefix_special, &$params, $pass_events = false)
+	public function getPassThroughVariables(&$params)
 	{
-		list($prefix) = explode('.', $prefix_special);
-		$query_vars = $this->Application->getUnitOption($prefix, 'QueryString', Array ());
-		/* @var $query_vars Array */
+		static $cached_pass_through = null;
 
-		//if pass events is off and event is not implicitly passed
-		if ( !$pass_events && !isset($params[$prefix_special . '_event']) ) {
-			$params[$prefix_special . '_event'] = ''; // remove event from url if requested
-			//otherwise it will use value from get_var
-		}
+		if ( isset($params['no_pass_through']) && $params['no_pass_through'] ) {
+			unset($params['no_pass_through']);
 
-		if ( !$query_vars ) {
-			return '';
+			return Array ();
 		}
 
-		$tmp_string = Array (0 => $prefix_special);
-		foreach ($query_vars as $index => $var_name) {
-			//if value passed in params use it, otherwise use current from application
-			$var_name = $prefix_special . '_' . $var_name;
-			$tmp_string[$index] = isset($params[$var_name]) ? $params[$var_name] : $this->Application->GetVar($var_name);
+		// because pass through is not changed during script run, then we can cache it
+		if ( is_null($cached_pass_through) ) {
+			$cached_pass_through = Array ();
+			$pass_through = $this->Application->GetVar('pass_through');
 
-			if ( isset($params[$var_name]) ) {
-				unset($params[$var_name]);
+			if ( $pass_through ) {
+				// names of variables to pass to each link
+				$cached_pass_through['pass_through'] = $pass_through;
+				$pass_through = explode(',', $pass_through);
+
+				foreach ($pass_through as $pass_through_var) {
+					$cached_pass_through[$pass_through_var] = $this->Application->GetVar($pass_through_var);
+				}
 			}
 		}
 
-		$escaped = array ();
-		foreach ($tmp_string as $tmp_val) {
-			$escaped[] = str_replace(Array ('-', ':'), Array ('\-', '\:'), $tmp_val);
-		}
-
-		$ret = implode('-', $escaped);
-		if ( $this->Application->getUnitOption($prefix, 'PortalStyleEnv') == true ) {
-			$ret = preg_replace('/^([a-zA-Z]+)-([0-9]+)-(.*)/', '\\1\\2-\\3', $ret);
-		}
-
-		return $ret;
+		return $cached_pass_through;
 	}
 
-	function BuildModuleEnv_NEW($prefix_special, &$params, $keep_events = false)
-	{
-		list ($prefix) = explode('.', $prefix_special);
-
-		$url_parts = Array ();
-		$listener = $this->Application->RewriteListeners[$prefix][0];
-
-		$ret = $listener[0]->$listener[1](REWRITE_MODE_BUILD, $prefix_special, $params, $url_parts, $keep_events);
-
-		return $ret;
-	}
-
 	/**
-	 * Returns sorted array of passed prefixes (to build url from)
-	 *
-	 * @param string $pass
-	 * @return Array
-	 */
-	function getPassInfo($pass = 'all')
-	{
-		if (!$pass) $pass = 'all';
-		$pass = trim(
-				preg_replace(
-					'/(?<=,|\\A)all(?=,|\\z)/',
-					trim($this->Application->GetVar('passed'), ','),
-					trim($pass, ',')
-				),
-		 ',');
-
-		if (!$pass) {
-			return Array();
-		}
-
-		$pass_info = array_unique( explode(',', $pass) ); // array( prefix[.special], prefix[.special] ...
-
-		// we need to keep that sorting despite the sorting below, because this sorts prefixes with same priority by name
-		sort($pass_info, SORT_STRING); // to be prefix1,prefix1.special1,prefix1.special2,prefix3.specialX
-
-		foreach ($pass_info as $prefix) {
-			list ($prefix_only, ) = explode('.', $prefix, 2);
-			$sorted[$prefix] = $this->Application->getUnitOption($prefix_only, 'RewritePriority', 0);
-		}
-
-		asort($sorted, SORT_NUMERIC);
-		$pass_info = array_keys($sorted);
-
-		// 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;
-	}
-
-	/**
 	 * Returns index file, that could be passed as parameter to method, as parameter to tag and as constant or not passed at all
 	 *
 	 * @param string $prefix
 	 * @param string $index_file
 	 * @param Array $params
 	 * @return string
+	 * @access protected
 	 */
-	function getIndexFile($prefix, $index_file, &$params)
+	protected function getIndexFile($prefix, $index_file = null, &$params)
 	{
-		if (isset($params['index_file'])) {
+		static $cache = Array ();
+
+		if ( isset($params['index_file']) ) {
 			$index_file = $params['index_file'];
 			unset($params['index_file']);
+
 			return $index_file;
 		}
 
-		if (isset($index_file)) {
+		if ( isset($index_file) ) {
 			return $index_file;
 		}
 
-		if (defined('INDEX_FILE')) {
+		if ( defined('INDEX_FILE') ) {
 			return INDEX_FILE;
 		}
 
-		$cut_prefix = trim(BASE_PATH, '/').'/'.trim($prefix, '/');
-		return trim(preg_replace('/'.preg_quote($cut_prefix, '/').'(.*)/', '\\1', $_SERVER['PHP_SELF']), '/');
+		// detect index file only once for given script and $cut_prefix
+		$php_self = $_SERVER['PHP_SELF'];
+		$cut_prefix = BASE_PATH . '/' . trim($prefix, '/');
+
+		if ( isset($cache[$php_self . ':' . $cut_prefix]) ) {
+			return $cache[$php_self . ':' . $cut_prefix];
+		}
+
+		$cache[$php_self . ':' . $cut_prefix] = trim(preg_replace('/' . preg_quote($cut_prefix, '/') . '(.*)/', '\\1', $php_self), '/');
+
+		return $cache[$php_self . ':' . $cut_prefix];
 	}
 
 	/**
@@ -653,8 +384,10 @@
 	/**
 	 * Loads template mapping for Front-End
 	 *
+	 * @return void
+	 * @access public
 	 */
-	function LoadStructureTemplateMapping()
+	public function LoadStructureTemplateMapping()
 	{
 		if (!$this->Application->isAdmin) {
 			$category_helper =& $this->Application->recallObject('CategoryHelper');
@@ -663,4 +396,44 @@
 			$this->structureTemplateMapping = $category_helper->getTemplateMapping();
 		}
 	}
+
+	/**
+	 * Removes tpl part from template name + resolved template ID to name
+	 *
+	 * @param string $t
+	 * @return string
+	 * @access public
+	 */
+	public function getTemplateName($t)
+	{
+		if ( $this->Application->GetVarDirect('t', 'Get') !== false ) {
+			// template name is passed directly in url (GET method)
+			$t = $this->Application->GetVarDirect('t', 'Get');
+		}
+
+		// if t was set through env, even in mod_rewrite mode!
+		if ( $this->Application->GetVar('env') && $this->Application->RewriteURLs() && $this->Application->GetVar('t') ) {
+			$t = $this->Application->GetVar('t');
+		}
+
+		return preg_replace('/\.tpl$/', '', $t);
+	}
+
+	/**
+	 * Returns current template, replacing it with default when it's missing
+	 *
+	 * @param string $t
+	 * @return string
+	 * @access public
+	 */
+	public function getDefaultTemplate($t)
+	{
+		$t = $this->getTemplateName(trim($t, '/'));
+
+		if ( !$t ) {
+			$t = 'index';
+		}
+
+		return trim($t, '/');
+	}
 }
\ No newline at end of file
Index: branches/5.2.x/core/install/upgrades.php
===================================================================
diff -u -N -r14697 -r14714
--- branches/5.2.x/core/install/upgrades.php	(.../upgrades.php)	(revision 14697)
+++ branches/5.2.x/core/install/upgrades.php	(.../upgrades.php)	(revision 14714)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upgrades.php 14697 2011-10-26 09:17:53Z alex $
+* @version	$Id: upgrades.php 14714 2011-11-01 10:05:18Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1293,11 +1293,11 @@
 				}
 
 				// replace data in category custom fields used for category item template storage
-				$mod_rewrite_helper =& $this->Application->recallObject('ModRewriteHelper');
-				/* @var $mod_rewrite_helper kModRewriteHelper */
+				$rewrite_processor =& $this->Application->recallObject('kRewriteUrlProcessor');
+				/* @var $rewrite_processor kRewriteUrlProcessor */
 
 				foreach ($this->Application->ModuleInfo as $module_name => $module_info) {
-					$custom_field_id = $mod_rewrite_helper->getItemTemplateCustomField($module_info['Var']);
+					$custom_field_id = $rewrite_processor->getItemTemplateCustomField($module_info['Var']);
 
 					if (!$custom_field_id) {
 						continue;
Index: branches/5.2.x/core/kernel/session/session.php
===================================================================
diff -u -N -r14699 -r14714
--- branches/5.2.x/core/kernel/session/session.php	(.../session.php)	(revision 14699)
+++ branches/5.2.x/core/kernel/session/session.php	(.../session.php)	(revision 14714)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: session.php 14699 2011-10-26 11:39:38Z alex $
+* @version	$Id: session.php 14714 2011-11-01 10:05:18Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -308,22 +308,6 @@
 	}
 
 	/**
-	 * This is redirect from https to http or via versa
-	 *
-	 * @return bool
-	 */
-	function IsHTTPSRedirect()
-	{
-		$http_referer = array_key_exists('HTTP_REFERER', $_SERVER) ? $_SERVER['HTTP_REFERER'] : false;
-
-		return (
-					( PROTOCOL == 'https://' && preg_match('#http:\/\/#', $http_referer) )
-					||
-					( PROTOCOL == 'http://' && preg_match('#https:\/\/#', $http_referer) )
-				);
-	}
-
-	/**
 	 * Helper method for detecting cookie availability
 	 *
 	 * @return bool
@@ -352,15 +336,15 @@
 
 		$get_sid = getArrayValue($http_query->Get, $this->GETName);
 
-		if ( ($this->IsHTTPSRedirect() && $get_sid) || $this->getFlashSID() ) { // Redirect from http to https on different domain OR flash uploader
+		if ( ($this->Application->HttpQuery->IsHTTPSRedirect() && $get_sid) || $this->getFlashSID() ) { // Redirect from http to https on different domain OR flash uploader
 			$this->OriginalMode = $this->Mode;
 			$this->SetMode(self::smGET_ONLY);
 		}
 
-		if ( !$cookies_on || $this->IsHTTPSRedirect() || $this->getFlashSID() ) {
+		if ( !$cookies_on || $this->Application->HttpQuery->IsHTTPSRedirect() || $this->getFlashSID() ) {
 			//If referer is our server, but we don't have our cookies_on, it's definetly off
 			$is_install = defined('IS_INSTALL') && IS_INSTALL;
-			if ( !$is_install && $this->_checkCookieReferer() && !$this->Application->GetVar('admin') && !$this->IsHTTPSRedirect() ) {
+			if ( !$is_install && $this->_checkCookieReferer() && !$this->Application->GetVar('admin') && !$this->Application->HttpQuery->IsHTTPSRedirect() ) {
 				$this->CookiesEnabled = false;
 			}
 			else {
@@ -590,18 +574,19 @@
 
 	function SetSession($force = false)
 	{
-		if ($this->SessionSet && !$force) {
+		if ( $this->SessionSet && !$force ) {
 			return true;
 		}
 
 		$this->Expiration = adodb_mktime() + $this->SessionTimeout;
 
-		if (!$force && /*!$this->Application->isAdmin &&*/ !$this->Application->GetVar('admin') && !$this->NeedSession()) {
+		if ( !$force && /*!$this->Application->isAdmin &&*/ !$this->Application->GetVar('admin') && !$this->NeedSession() ) {
 			// don't create session (in db) on Front-End, when sid is present (GPC), but data in db isn't
-			if ($this->_fromGet) {
+			if ( $this->_fromGet ) {
 				// set sid, that was given in GET
-				$this->setSID( $this->GetPassedSIDValue() );
-			} else {
+				$this->setSID($this->GetPassedSIDValue());
+			}
+			else {
 				// re-generate sid only, when cookies are used
 				$this->GenerateSID();
 			}
@@ -611,13 +596,13 @@
 			return false;
 		}
 
-		if (!$this->SID || $force) {
+		if ( !$this->SID || $force ) {
 			$this->GenerateSID();
 		}
 
-		switch ($this->Mode) {
+		switch ( $this->Mode ) {
 			case self::smAUTO:
-				if ($this->CookiesEnabled) {
+				if ( $this->CookiesEnabled ) {
 					$this->SetSessionCookie();
 				}
 				break;
@@ -633,12 +618,12 @@
 
 		$this->Storage->StoreSession();
 
-		if ($this->Application->isAdmin || $this->Special == 'admin') {
+		if ( $this->Application->isAdmin || $this->Special == 'admin' ) {
 			$this->StoreVar('admin', 1);
 		}
 
 		$this->SessionSet = true; // should be called before SaveData, because SaveData will try to SetSession again
-		if ($this->Special != '') {
+		if ( $this->Special != '' ) {
 			// front-session called from admin or otherwise, then save it's data
 			$this->SaveData();
 		}
@@ -828,15 +813,15 @@
 	{
 		$wid = $this->Application->GetVar('m_wid');
 
-		$last_env = $this->getLastTemplateENV($t, Array('m_opener' => 'u'));
-		$last_template = basename($_SERVER['PHP_SELF']).'|'.mb_substr($last_env, mb_strlen(ENV_VAR_NAME) + 1);
-		$this->StoreVar(rtrim('last_template_'.$wid, '_'), $last_template);
+		$last_env = $this->getLastTemplateENV($t, Array ('m_opener' => 'u'));
+		$last_template = basename($_SERVER['PHP_SELF']) . '|' . $last_env;
+		$this->StoreVar(rtrim('last_template_' . $wid, '_'), $last_template);
 
 		// prepare last_template for opener stack, module & session could be added later
 		$last_env = $this->getLastTemplateENV($t, null, false);
-		$last_template = basename($_SERVER['PHP_SELF']).'|'.mb_substr($last_env, mb_strlen(ENV_VAR_NAME) + 1);
+		$last_template = basename($_SERVER['PHP_SELF']) . '|' . $last_env;
 
-		// save last_template in persistant session
+		// save last_template in persistent session
 		if (!$wid) {
 			if ($this->Application->isAdmin) {
 				// only for main window, not popups, not login template, not temp mode (used in adm:MainFrameLink tag)
@@ -850,8 +835,8 @@
 				}
 
 				if (!$temp_mode) {
-					if (isset($this->Application->HttpQuery->Get['section'])) {
-						// check directly in GET, bacause LinkVar (session -> request) used on these vars
+					if ( $this->Application->GetVarDirect('section', 'Get') !== false ) {
+						// check directly in GET, because LinkVar (session -> request) used on these vars
 						$last_template .= '&section='.$this->Application->GetVar('section').'&module='.$this->Application->GetVar('module');
 					}
 
@@ -885,14 +870,14 @@
 			}
 		}
 
-		// save other last... variables for mistical purposes (customizations may be)
+		// save other last... variables for mystical purposes (customizations may be)
 		$this->StoreVar('last_url', $_SERVER['REQUEST_URI']); // needed by ord:StoreContinueShoppingLink
-		$this->StoreVar('last_env', mb_substr($last_env, mb_strlen(ENV_VAR_NAME)+1));
+		$this->StoreVar('last_env', $last_env);
 
 		$save_last_template = array_key_exists('save_last_template', $params) ? $params['save_last_template'] : true;
 
 		if ($save_last_template) {
-			// save last template here, becase section & module could be added before
+			// save last template here, because section & module could be added before
 			$this->StoreVar(rtrim('last_template_popup_'.$wid, '_'), $last_template);
 		}
 	}
@@ -911,7 +896,7 @@
 		}
 
 		$params = array_merge($this->Application->getPassThroughVariables($params), $params);
-		$ret = $this->Application->BuildEnv($t, $params, 'all');
+		$ret = $this->Application->BuildEnv($t, $params, 'all', false, false);
 
 		if (!$encode) {
 			// cancels 2nd part of replacements, that URLENCODE does
Index: branches/5.2.x/core/units/languages/languages_item.php
===================================================================
diff -u -N -r14572 -r14714
--- branches/5.2.x/core/units/languages/languages_item.php	(.../languages_item.php)	(revision 14572)
+++ branches/5.2.x/core/units/languages/languages_item.php	(.../languages_item.php)	(revision 14714)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: languages_item.php 14572 2011-09-20 15:25:49Z alex $
+* @version	$Id: languages_item.php 14714 2011-11-01 10:05:18Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -182,20 +182,6 @@
 			return false;
 		}
 
-		/**
-		 * Checks, that url is empty
-		 *
-		 * @return bool
-		 */
-		function isEmptyUrl()
-		{
-			if ($this->Application->RewriteURLs()) {
-				return !$this->Application->GetVar('_mod_rw_url_');
-			}
-
-			return !count($this->Application->HttpQuery->Get);
-		}
-
 		public function Load($id, $id_field_name = null, $cachable = true)
 		{
 			$default = false;
@@ -213,7 +199,7 @@
 
 				if (
 					!$this->Application->isAdmin && !defined('GW_NOTIFY') && preg_match('/[\/]{0,1}index.php[\/]{0,1}/', $_SERVER['PHP_SELF']) &&
-					$this->isEmptyUrl() && $this->Application->ConfigValue('UseContentLanguageNegotiation')
+					$this->Application->HttpQuery->isEmptyUrl() && $this->Application->ConfigValue('UseContentLanguageNegotiation')
 				) {
 					$language_id = $this->processAcceptLanguage();
 
Index: branches/5.2.x/core/kernel/managers/url_processor.php
===================================================================
diff -u -N
--- branches/5.2.x/core/kernel/managers/url_processor.php	(revision 0)
+++ branches/5.2.x/core/kernel/managers/url_processor.php	(revision 14714)
@@ -0,0 +1,127 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Portal
+* @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
+* @license      GNU/GPL
+* In-Portal is Open Source software.
+* This means that this software may have been modified pursuant
+* 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.org/license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+abstract class kUrlProcessor extends kBase {
+
+	/**
+	 * Reference to kUrlProcessor class instance
+	 *
+	 * @var kUrlManager
+	 */
+	protected $manager = null;
+
+	public function __construct(&$manager)
+	{
+		parent::__construct();
+
+		$this->setManager($manager);
+	}
+
+	/**
+	 * Sets reference to url manager
+	 *
+	 * @param kUrlManager $manager
+	 * @return void
+	 * @access public
+	 */
+	public function setManager(&$manager)
+	{
+		$this->manager =& $manager;
+	}
+
+	/**
+	 * Returns sorted array of passed prefixes (to build url from)
+	 *
+	 * @param string $pass
+	 * @return Array
+	 * @access protected
+	 */
+	protected function getPassInfo($pass = 'all')
+	{
+		if ( !$pass ) {
+			$pass = 'all';
+		}
+
+		$pass = trim(
+				preg_replace(
+					'/(?<=,|\\A)all(?=,|\\z)/',
+					trim($this->Application->GetVar('passed'), ','),
+					trim($pass, ',')
+				),
+		 ',');
+
+		if ( !$pass ) {
+			return Array ();
+		}
+
+		$pass_info = array_unique(explode(',', $pass)); // array( prefix[.special], prefix[.special] ...
+
+		// we need to keep that sorting despite the sorting below, because this sorts prefixes with same priority by name
+		sort($pass_info, SORT_STRING); // to be prefix1,prefix1.special1,prefix1.special2,prefix3.specialX
+
+		foreach ($pass_info as $prefix) {
+			list ($prefix_only,) = explode('.', $prefix, 2);
+			$sorted[$prefix] = $this->Application->getUnitOption($prefix_only, 'RewritePriority', 0);
+		}
+
+		asort($sorted, SORT_NUMERIC);
+		$pass_info = array_keys($sorted);
+
+		// 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;
+	}
+
+	/**
+	 * Builds url
+	 *
+	 * @param string $t
+	 * @param Array $params
+	 * @param string $pass
+	 * @param bool $pass_events
+	 * @param bool $env_var
+	 * @return string
+	 * @access public
+	 */
+	abstract public function build($t, $params, $pass='all', $pass_events = false, $env_var = true);
+
+	/**
+	 * Parses given string into a set of variables
+	 *
+	 * @abstract
+	 * @param string $string
+	 * @param string $pass_name
+	 * @return Array
+	 * @access public
+	 */
+	abstract public function parse($string, $pass_name = 'passed');
+
+	/**
+	 * Builds env part that corresponds prefix passed
+	 *
+	 * @param string $prefix_special item's prefix & [special]
+	 * @param Array $params url params
+	 * @param bool $pass_events
+	 * @return string
+	 * @access protected
+	 */
+	abstract protected function BuildModuleEnv($prefix_special, &$params, $pass_events = false);
+}
\ No newline at end of file
Index: branches/5.2.x/core/units/languages/languages_event_handler.php
===================================================================
diff -u -N -r14675 -r14714
--- branches/5.2.x/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 14675)
+++ branches/5.2.x/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 14714)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: languages_event_handler.php 14675 2011-10-19 08:29:34Z alex $
+* @version	$Id: languages_event_handler.php 14714 2011-11-01 10:05:18Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -422,13 +422,6 @@
 			else {
 				// changing language on Front-End
 				$this->Application->SetVar('m_lang', $language_id);
-
-				if (MOD_REWRITE) {
-					$mod_rewrite_helper =& $this->Application->recallObject('ModRewriteHelper');
-					/* @var $mod_rewrite_helper kModRewriteHelper */
-
-					$mod_rewrite_helper->removePages();
-				}
 			}
 		}
 
Index: branches/5.2.x/core/kernel/session/inp_session_storage.php
===================================================================
diff -u -N -r14585 -r14714
--- branches/5.2.x/core/kernel/session/inp_session_storage.php	(.../inp_session_storage.php)	(revision 14585)
+++ branches/5.2.x/core/kernel/session/inp_session_storage.php	(.../inp_session_storage.php)	(revision 14714)
@@ -1,7 +1,7 @@
 <?php
 
 /**
-* @version	$Id: inp_session_storage.php 14585 2011-09-24 12:04:17Z alex $
+* @version	$Id: inp_session_storage.php 14714 2011-11-01 10:05:18Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -57,6 +57,11 @@
 			'GroupList'		=>	$this->Application->ConfigValue('User_GuestGroup'),
 		);
 
+		if ( !$this->Application->isAdmin ) {
+			// Guest users on Front-End belongs to Everyone group too
+			$fields_hash['GroupList'] .= ',' . $this->Application->ConfigValue('User_LoggedInGroup');
+		}
+
 		if( isset($_SERVER['REMOTE_ADDR']) ) {
 			$fields_hash['IpAddress'] = $_SERVER['REMOTE_ADDR']; // getenv('REMOTE_ADDR') won't work on IIS, so use $_SERVER instead
 		}
Index: branches/5.2.x/core/units/themes/themes_eh.php
===================================================================
diff -u -N -r14675 -r14714
--- branches/5.2.x/core/units/themes/themes_eh.php	(.../themes_eh.php)	(revision 14675)
+++ branches/5.2.x/core/units/themes/themes_eh.php	(.../themes_eh.php)	(revision 14714)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: themes_eh.php 14675 2011-10-19 08:29:34Z alex $
+* @version	$Id: themes_eh.php 14714 2011-11-01 10:05:18Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -153,13 +153,6 @@
 			$this->Application->SetVar('t', 'index');
 			$this->Application->SetVar('m_cat_id', 0);
 
-			if (MOD_REWRITE) {
-				$mod_rewrite_helper =& $this->Application->recallObject('ModRewriteHelper');
-				/* @var $mod_rewrite_helper kModRewriteHelper */
-
-				$mod_rewrite_helper->removePages();
-			}
-
 			$this->Application->SetVar('m_theme', $this->Application->GetVar('theme'));
 		}
 
Index: branches/5.2.x/core/kernel/session/inp_session.php
===================================================================
diff -u -N -r14628 -r14714
--- branches/5.2.x/core/kernel/session/inp_session.php	(.../inp_session.php)	(revision 14628)
+++ branches/5.2.x/core/kernel/session/inp_session.php	(.../inp_session.php)	(revision 14714)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: inp_session.php 14628 2011-10-04 09:36:30Z alex $
+* @version	$Id: inp_session.php 14714 2011-11-01 10:05:18Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -72,12 +72,6 @@
 		$this->SetMode($mode);
 
 		parent::Init($prefix, $special);
-
-		if ( !$this->Application->isAdmin && $this->GetField('PortalUserId') <= 0 ) {
-			$group_list = $this->Application->ConfigValue('User_GuestGroup') . ',' . $this->Application->ConfigValue('User_LoggedInGroup');
-			$this->SetField('GroupId', $this->Application->ConfigValue('User_GuestGroup'));
-			$this->SetField('GroupList', $group_list);
-		}
 	}
 
 	function Destroy()
Index: branches/5.2.x/core/kernel/utility/opener_stack.php
===================================================================
diff -u -N -r14664 -r14714
--- branches/5.2.x/core/kernel/utility/opener_stack.php	(.../opener_stack.php)	(revision 14664)
+++ branches/5.2.x/core/kernel/utility/opener_stack.php	(.../opener_stack.php)	(revision 14714)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: opener_stack.php 14664 2011-10-15 17:31:37Z alex $
+* @version	$Id: opener_stack.php 14714 2011-11-01 10:05:18Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -130,7 +130,7 @@
 		}
 
 		list ($index_file, $env) = explode('|', $this->data[$index], 2);
-		$params = $this->Application->HttpQuery->processQueryString($env, 'pass');
+		$params = $this->Application->processQueryString($env, 'pass');
 
 		$template = kUtil::popParam('t', $params, '');
 
@@ -191,4 +191,15 @@
 	{
 		$this->data = Array ();
 	}
+
+	/**
+	 * Checks, that opener stack has no records
+	 *
+	 * @return bool
+	 * @access public
+	 */
+	public function isEmpty()
+	{
+		return count($this->data) == 0;
+	}
 }
\ No newline at end of file
Index: branches/5.2.x/core/units/categories/categories_event_handler.php
===================================================================
diff -u -N -r14664 -r14714
--- branches/5.2.x/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 14664)
+++ branches/5.2.x/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 14714)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_event_handler.php 14664 2011-10-15 17:31:37Z alex $
+* @version	$Id: categories_event_handler.php 14714 2011-11-01 10:05:18Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -2535,4 +2535,254 @@
 
 			$event->setEventParam('constrain_info', Array ($constrain, ''));
 		}
+
+		/**
+		 * Parses category part of url, build main part of url
+		 *
+		 * @param int $rewrite_mode Mode in what rewrite listener was called. Possbile two modes: REWRITE_MODE_BUILD, REWRITE_MODE_PARSE.
+		 * @param string $prefix Prefix, that listener uses for system integration
+		 * @param Array $params Params, that are used for url building or created during url parsing.
+		 * @param Array $url_parts Url parts to parse (only for parsing).
+		 * @param bool $keep_events Keep event names in resulting url (only for building).
+		 * @return bool|string|Array Return true to continue to next listener; return false (when building) not to rewrite given prefix; return false (when parsing) to stop processing at this listener.
+		 */
+		public function CategoryRewriteListener($rewrite_mode = REWRITE_MODE_BUILD, $prefix, &$params, &$url_parts, $keep_events = false)
+		{
+			if ($rewrite_mode == REWRITE_MODE_BUILD) {
+				return $this->_buildMainUrl($prefix, $params, $keep_events);
+			}
+
+			if ( $this->_parseFriendlyUrl($url_parts, $params) ) {
+				// friendly urls work like exact match only!
+				return false;
+			}
+
+			$this->_parseCategory($url_parts, $params);
+
+			return true;
+		}
+
+		/**
+		 * Build main part of every url
+		 *
+		 * @param string $prefix_special
+		 * @param Array $params
+		 * @param bool $keep_events
+		 * @return string
+		 */
+		protected function _buildMainUrl($prefix_special, &$params, $keep_events)
+		{
+			$ret = '';
+			list ($prefix) = explode('.', $prefix_special);
+
+			$rewrite_processor =& $this->Application->recallObject('kRewriteUrlProcessor');
+			/* @var $rewrite_processor kRewriteUrlProcessor */
+
+			$processed_params = $rewrite_processor->getProcessedParams($prefix_special, $params, $keep_events);
+			if ($processed_params === false) {
+				return '';
+			}
+
+			// add language
+			if ($processed_params['m_lang'] && ($processed_params['m_lang'] != $rewrite_processor->primaryLanguageId)) {
+				$language_name = $this->Application->getCache('language_names[%LangIDSerial:' . $processed_params['m_lang'] . '%]');
+				if ($language_name === false) {
+					$sql = 'SELECT PackName
+							FROM ' . TABLE_PREFIX . 'Language
+							WHERE LanguageId = ' . $processed_params['m_lang'];
+					$language_name = $this->Conn->GetOne($sql);
+
+					$this->Application->setCache('language_names[%LangIDSerial:' . $processed_params['m_lang'] . '%]', $language_name);
+				}
+
+				$ret .= $language_name . '/';
+			}
+
+			// add theme
+			if ($processed_params['m_theme'] && ($processed_params['m_theme'] != $rewrite_processor->primaryThemeId)) {
+				$theme_name = $this->Application->getCache('theme_names[%ThemeIDSerial:' . $processed_params['m_theme'] . '%]');
+				if ($theme_name === false) {
+					$sql = 'SELECT Name
+							FROM ' . TABLE_PREFIX . 'Theme
+							WHERE ThemeId = ' . $processed_params['m_theme'];
+					$theme_name = $this->Conn->GetOne($sql);
+
+					$this->Application->setCache('theme_names[%ThemeIDSerial:' . $processed_params['m_theme'] . '%]', $theme_name);
+
+				}
+
+				$ret .= $theme_name . '/';
+			}
+
+			// inject custom url parts made by other rewrite listeners just after language/theme url parts
+			if ($params['inject_parts']) {
+				$ret .= implode('/', $params['inject_parts']) . '/';
+			}
+
+			// add category
+			if ($processed_params['m_cat_id'] > 0 && $params['pass_category']) {
+				$category_filename = $this->Application->getCategoryCache($processed_params['m_cat_id'], 'filenames');
+
+				preg_match('/^Content\/(.*)/i', $category_filename, $regs);
+
+				if ($regs) {
+					$template = array_key_exists('t', $params) ? $params['t'] : false;
+
+					if (strtolower($regs[1]) == strtolower($template)) {
+						// we could have category path like "Content/<template_path>" in this case remove template
+						$params['pass_template'] = false;
+					}
+
+					$ret .= $regs[1] . '/';
+				}
+
+				$params['category_processed'] = true;
+			}
+
+			// reset category page
+			$force_page_adding = false;
+			if (array_key_exists('reset', $params) && $params['reset']) {
+				unset($params['reset']);
+
+				if ($processed_params['m_cat_id']) {
+					$processed_params['m_cat_page'] = 1;
+					$force_page_adding = true;
+				}
+			}
+
+			if ((array_key_exists('category_processed', $params) && $params['category_processed'] && ($processed_params['m_cat_page'] > 1)) || $force_page_adding) {
+				// category name was added before AND category page number found
+				$ret = rtrim($ret, '/') . '_' . $processed_params['m_cat_page'] . '/';
+			}
+
+			$template = array_key_exists('t', $params) ? $params['t'] : false;
+			$category_template = ($processed_params['m_cat_id'] > 0) && $params['pass_category'] ? $this->Application->getCategoryCache($processed_params['m_cat_id'], 'category_designs') : '';
+
+			if ((strtolower($template) == '__default__') && ($processed_params['m_cat_id'] == 0)) {
+				// for "Home" category set template to index when not set
+				$template = 'index';
+			}
+
+			// remove template from url if it is category index cached template OR site homepage
+			if (($template == $category_template) || (mb_strtolower($template) == '__default__') || ($template == 'index')) {
+				// given template is also default template for this category OR '__default__' given OR site homepage
+				$params['pass_template'] = false;
+			}
+
+			if ($template && $params['pass_template']) {
+				$ret .= $template . '/';
+			}
+
+			return mb_strtolower( rtrim($ret, '/') );
+		}
+
+		/**
+		 * Checks if whole url_parts matches a whole In-CMS page
+		 *
+		 * @param Array $url_parts
+		 * @param Array $vars
+		 * @return bool
+		 */
+		protected function _parseFriendlyUrl($url_parts, &$vars)
+		{
+			if (!$url_parts) {
+				return false;
+			}
+
+			$sql = 'SELECT CategoryId, NamedParentPath
+					FROM ' . TABLE_PREFIX . 'Category
+					WHERE FriendlyURL = ' . $this->Conn->qstr(implode('/', $url_parts));
+			$friendly = $this->Conn->GetRow($sql);
+
+			$rewrite_processor =& $this->Application->recallObject('kRewriteUrlProcessor');
+			/* @var $rewrite_processor kRewriteUrlProcessor */
+
+			if ($friendly) {
+				$vars['m_cat_id'] = $friendly['CategoryId'];
+				$vars['t'] = preg_replace('/^Content\//i', '', $friendly['NamedParentPath']);
+
+				while ($url_parts) {
+					$rewrite_processor->partParsed( array_shift($url_parts) );
+				}
+
+				return true;
+			}
+
+			return false;
+		}
+
+		/**
+		 * Extracts category part from url
+		 *
+		 * @param Array $url_parts
+		 * @param Array $vars
+		 * @return bool
+		 */
+		protected function _parseCategory($url_parts, &$vars)
+		{
+			if (!$url_parts) {
+				return false;
+			}
+
+			$res = false;
+			$url_part = array_shift($url_parts);
+
+			$category_id = 0;
+			$last_category_info = false;
+			$category_path = $url_part == 'content' ? '' : 'content';
+
+			$rewrite_processor =& $this->Application->recallObject('kRewriteUrlProcessor');
+			/* @var $rewrite_processor kRewriteUrlProcessor */
+
+			do {
+				$category_path = trim($category_path . '/' . $url_part, '/');
+				// bb_<topic_id> -> forums/bb_2
+				if ( !preg_match('/^bb_[\d]+$/', $url_part) && preg_match('/(.*)_([\d]+)$/', $category_path, $rets) ) {
+					$category_path = $rets[1];
+					$vars['m_cat_page'] = $rets[2];
+				}
+
+				$sql = 'SELECT CategoryId, SymLinkCategoryId, NamedParentPath
+						FROM ' . TABLE_PREFIX . 'Category
+						WHERE (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) {
+					$last_category_info = $category_info;
+					$rewrite_processor->partParsed($url_part);
+
+					$url_part = array_shift($url_parts);
+					$res = true;
+				}
+			} while ($category_info !== false && $url_part);
+
+			if ($last_category_info) {
+				// 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 (CategoryId = ' . $last_category_info['SymLinkCategoryId'] . ')';
+					$category_info = $this->Conn->GetRow($sql);
+
+					if ($category_info) {
+						// 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'] = 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!
+			}
+			else {
+				$vars['m_cat_id'] = 0;
+			}
+
+			return $res;
+		}
 	}
\ No newline at end of file
Index: branches/5.2.x/core/kernel/managers/plain_url_processor.php
===================================================================
diff -u -N
--- branches/5.2.x/core/kernel/managers/plain_url_processor.php	(revision 0)
+++ branches/5.2.x/core/kernel/managers/plain_url_processor.php	(revision 14714)
@@ -0,0 +1,295 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Portal
+* @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
+* @license      GNU/GPL
+* In-Portal is Open Source software.
+* This means that this software may have been modified pursuant
+* 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.org/license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class kPlainUrlProcessor extends kUrlProcessor {
+
+	/**
+	 * Process QueryString only, create events, ids, based on config
+	 * set template name and sid in desired application variables.
+	 *
+	 * @param string $env_var environment string value
+	 * @param string $pass_name
+	 * @return Array
+	 */
+	public function parse($env_var, $pass_name = 'passed')
+	{
+		// env=SID-TEMPLATE:m-1-1-1-1:l0-0-0:n-0-0-0:bb-0-0-1-1-1-0
+		if ( !$env_var ) {
+			return Array ('t' => $this->manager->getTemplateName('index'));
+		}
+
+		$vars = Array ();
+		$more_vars = strpos($env_var, '&');
+
+		if ( $more_vars !== false ) {
+			parse_str(substr($env_var, $more_vars + 1), $vars);
+			$env_var = substr($env_var, 0, $more_vars);
+		}
+
+		// replace escaped ":" symbol not to explode by it
+		$env_var = str_replace('\:', '_&+$$+&_', $env_var); // replace escaped "=" with spec-chars :)
+		$parts = explode(':', $env_var);
+
+		if ( !$this->Application->RewriteURLs() || ($this->Application->RewriteURLs() && $this->Application->GetVar('rewrite') != 'on') ) {
+			$vars = array_merge($vars, $this->extractSIDAndTemplate($parts));
+		}
+
+		if ( $parts ) {
+			$passed = Array ();
+
+			foreach ($parts as $mixed_part) {
+				list ($passed[], $processed_vars) = $this->_parseEnvPart($mixed_part);
+				$vars = array_merge($vars, $processed_vars);
+			}
+
+			$vars[$pass_name] = implode(',', array_unique($passed));
+		}
+
+		return $vars;
+	}
+
+	/**
+	 * Retrieves SessionID and current template from given ENV parts
+	 *
+	 * @param Array $parts
+	 * @return array
+	 * @access protected
+	 */
+	protected function extractSIDAndTemplate(&$parts)
+	{
+		$template = '';
+		$vars = Array ();
+
+		if ( preg_match('/^([\d]+|)-(.*)$/', $parts[0], $regs) ) {
+			// first "env" component matches "sid-template" format
+			// (will be false, when mod-rewrite url to home page is built)
+			$sid = $regs[1];
+			$template = $regs[2];
+			array_shift($parts);
+
+			if ( $sid ) {
+				// Save Session ID
+				$this->Application->SetVar('sid', $sid);
+				$vars['sid'] = $sid;
+			}
+		}
+
+		// Save Template Name
+		$vars['t'] = $this->manager->getDefaultTemplate($template);
+
+		return $vars;
+	}
+
+	/**
+	 * Converts environment part into variable array (based on query map for given prefix)
+	 *
+	 * @param string $mixed_part
+	 * @return Array
+	 * @access protected
+	 */
+	protected function _parseEnvPart($mixed_part)
+	{
+		// In-portal old style env conversion - adds '-' between prefix and first var
+		$mixed_part = str_replace('_&+$$+&_', ':', $mixed_part);
+		$mixed_part = preg_replace("/^([a-zA-Z]+)([0-9]+)-(.*)/", "$1-$2-$3", $mixed_part);
+
+		// replace escaped "-" symbol not to explode by it
+		$escaped_part = str_replace('\-', '_&+$$+&_', $mixed_part);
+		$escaped_part = explode('-', $escaped_part);
+
+		$mixed_part = Array();
+		foreach ($escaped_part as $escaped_val) {
+			$mixed_part[] = str_replace('_&+$$+&_', '-', $escaped_val);
+		}
+
+		$vars = Array ();
+		$prefix_special = array_shift($mixed_part); // l.pick, l
+
+		$http_query =& $this->Application->recallObject('HTTPQuery');
+		/* @var $http_query kHTTPQuery */
+
+		$query_map = $http_query->discoverUnit($prefix_special); // from $_GET['env']
+
+		// if config is not defined for prefix in QueryString, then don't process it
+		if ($query_map) {
+			foreach ($query_map as $index => $var_name) {
+				// l_id, l_page, l_bla-bla-bla
+				$val = $mixed_part[$index - 1];
+				if ($val == '') $val = false;
+				$vars[$prefix_special.'_'.$var_name] = $val;
+			}
+		}
+
+		return Array ($prefix_special, $vars);
+	}
+
+	/**
+	 * Builds url
+	 *
+	 * @param string $t
+	 * @param Array $params
+	 * @param string $pass
+	 * @param bool $pass_events
+	 * @param bool $env_var
+	 * @return string
+	 * @access public
+	 */
+	public function build($t, $params, $pass='all', $pass_events = false, $env_var = true)
+	{
+		if ( $this->Application->GetVar('admin') || (array_key_exists('admin', $params) && $params['admin']) ) {
+			$params['admin'] = 1;
+
+			if ( !array_key_exists('editing_mode', $params) ) {
+				$params['editing_mode'] = EDITING_MODE;
+			}
+		}
+
+		$session =& $this->Application->recallObject('Session');
+		/* @var $session Session */
+
+		$ssl = isset($params['__SSL__']) ? $params['__SSL__'] : 0;
+		$sid = $session->NeedQueryString() && !$this->Application->RewriteURLs($ssl) ? $this->Application->GetSID() : '';
+
+		$ret = '';
+		if ( $env_var ) {
+			$ret = ENV_VAR_NAME . '=';
+		}
+
+		$ret .= $sid . '-'; // SID-TEMPLATE
+
+		$encode = false;
+		if ( isset($params['__URLENCODE__']) ) {
+			$encode = $params['__URLENCODE__'];
+			unset($params['__URLENCODE__']);
+		}
+
+		if ( isset($params['__SSL__']) ) {
+			unset($params['__SSL__']);
+		}
+
+		$env_string = '';
+		$category_id = isset($params['m_cat_id']) ? $params['m_cat_id'] : $this->Application->GetVar('m_cat_id');
+
+		$item_id = false;
+		$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->Application->findModule('Var', $prefix);
+
+				if ( $require_rewrite ) {
+					$item_id = isset($params[$pass_element . '_id']) ? $params[$pass_element . '_id'] : $this->Application->GetVar($pass_element . '_id');
+				}
+
+				$env_string .= ':' . $this->BuildModuleEnv($pass_element, $params, $pass_events);
+			}
+		}
+
+		if ( strtolower($t) == '__default__' ) {
+			if ( is_numeric($item_id) ) {
+				$this->manager->initRewrite();
+				$t = $this->manager->rewrite->GetItemTemplate($category_id, $pass_element); // $pass_element should be the last processed element
+				// $t = $this->Application->getCategoryCache($category_id, 'item_templates');
+			}
+			elseif ( $category_id ) {
+				$t = strtolower(preg_replace('/^Content\//i', '', $this->Application->getCategoryCache($category_id, 'filenames')));
+			}
+			else {
+				$t = 'index';
+			}
+		}
+
+		$ret .= $t . ':' . $this->BuildModuleEnv('m', $params, $pass_events) . $env_string;
+
+		unset($params['pass'], $params['opener'], $params['m_event']);
+
+		if ( array_key_exists('escape', $params) && $params['escape'] ) {
+			$ret = addslashes($ret);
+			unset($params['escape']);
+		}
+
+		if ( $params ) {
+			$params_str = '';
+			$join_string = $encode ? '&' : '&amp;';
+
+			foreach ($params as $param => $value) {
+				$params_str .= $join_string . $param . '=' . $value;
+			}
+
+			$ret .= $params_str;
+		}
+
+		if ( $encode ) {
+			$ret = str_replace('\\', '%5C', $ret);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Builds env part that corresponds prefix passed
+	 *
+	 * @param string $prefix_special item's prefix & [special]
+	 * @param Array $params url params
+	 * @param bool $pass_events
+	 * @return string
+	 * @access public
+	 */
+	public function BuildModuleEnv($prefix_special, &$params, $pass_events = false)
+	{
+		list($prefix) = explode('.', $prefix_special);
+		$query_vars = $this->Application->getUnitOption($prefix, 'QueryString', Array ());
+		/* @var $query_vars Array */
+
+		//if pass events is off and event is not implicitly passed
+		if ( !$pass_events && !isset($params[$prefix_special . '_event']) ) {
+			$params[$prefix_special . '_event'] = ''; // remove event from url if requested
+			//otherwise it will use value from get_var
+		}
+
+		if ( !$query_vars ) {
+			return '';
+		}
+
+		$tmp_string = Array (0 => $prefix_special);
+		foreach ($query_vars as $index => $var_name) {
+			//if value passed in params use it, otherwise use current from application
+			$var_name = $prefix_special . '_' . $var_name;
+			$tmp_string[$index] = isset($params[$var_name]) ? $params[$var_name] : $this->Application->GetVar($var_name);
+
+			if ( isset($params[$var_name]) ) {
+				unset($params[$var_name]);
+			}
+		}
+
+		$escaped = array ();
+		foreach ($tmp_string as $tmp_val) {
+			$escaped[] = str_replace(Array ('-', ':'), Array ('\-', '\:'), $tmp_val);
+		}
+
+		$ret = implode('-', $escaped);
+		if ( $this->Application->getUnitOption($prefix, 'PortalStyleEnv') == true ) {
+			$ret = preg_replace('/^([a-zA-Z]+)-([0-9]+)-(.*)/', '\\1\\2-\\3', $ret);
+		}
+
+		return $ret;
+	}
+}
\ No newline at end of file
Index: branches/5.2.x/core/kernel/managers/rewrite_url_processor.php
===================================================================
diff -u -N
--- branches/5.2.x/core/kernel/managers/rewrite_url_processor.php	(revision 0)
+++ branches/5.2.x/core/kernel/managers/rewrite_url_processor.php	(revision 14714)
@@ -0,0 +1,980 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Portal
+* @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
+* @license      GNU/GPL
+* In-Portal is Open Source software.
+* This means that this software may have been modified pursuant
+* 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.org/license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class kRewriteUrlProcessor extends kUrlProcessor {
+
+	/**
+	 * Holds a reference to httpquery
+	 *
+	 * @var kHttpQuery
+	 * @access protected
+	 */
+	protected $HTTPQuery = null;
+
+	/**
+	 * Urls parts, that needs to be matched by rewrite listeners
+	 *
+	 * @var Array
+	 * @access protected
+	 */
+	protected $_partsToParse = Array ();
+
+	/**
+	 * Category item prefix, that was found
+	 *
+	 * @var string|bool
+	 * @access public
+	 */
+	public $modulePrefix = false;
+
+	/**
+	 * Template aliases for current theme
+	 *
+	 * @var Array
+	 * @access protected
+	 */
+	protected $_templateAliases = null;
+
+	/**
+	 * Domain-based primary language id
+	 *
+	 * @var int
+	 * @access public
+	 */
+	public $primaryLanguageId = false;
+
+	/**
+	 * Domain-based primary theme id
+	 *
+	 * @var int
+	 * @access public
+	 */
+	public $primaryThemeId = false;
+
+	/**
+	 * Possible url endings from ModRewriteUrlEnding configuration variable
+	 *
+	 * @var Array
+	 */
+	protected $_urlEndings = Array ('.html', '/', '');
+
+	/**
+	 * Constructor of kRewriteUrlProcessor class
+	 *
+	 * @param $manager
+	 * @return kRewriteUrlProcessor
+	 */
+	public function __construct(&$manager)
+	{
+		parent::__construct($manager);
+
+		$this->HTTPQuery =& $this->Application->recallObject('HTTPQuery');
+
+		// domain based primary language
+		$this->primaryLanguageId = $this->Application->siteDomainField('PrimaryLanguageId');
+
+		if (!$this->primaryLanguageId) {
+			// when domain-based language not found -> use site-wide language
+			$this->primaryLanguageId = $this->Application->GetDefaultLanguageId();
+		}
+
+		// domain based primary theme
+		$this->primaryThemeId = $this->Application->siteDomainField('PrimaryThemeId');
+
+		if (!$this->primaryThemeId) {
+			// when domain-based theme not found -> use site-wide theme
+			$this->primaryThemeId = $this->Application->GetDefaultThemeId(true);
+		}
+
+		$this->_initRewriteListeners();
+	}
+
+	/**
+	 * Parses url
+	 *
+	 * @return void
+	 */
+	public function parseRewriteURL()
+	{
+		$url = $this->Application->GetVar('_mod_rw_url_');
+
+		if ($url) {
+			foreach ($this->_urlEndings as $url_ending) {
+				if (substr($url, strlen($url) - strlen($url_ending)) == $url_ending) {
+					$url = substr($url, 0, strlen($url) - strlen($url_ending));
+					$default_ending = $this->Application->ConfigValue('ModRewriteUrlEnding');
+
+					// user manually typed url with different url ending -> redirect to same url with default url ending
+					if (($url_ending != $default_ending) && $this->Application->ConfigValue('ForceModRewriteUrlEnding')) {
+						$target_url = $this->Application->BaseURL() . $url . $default_ending;
+						$this->Application->Redirect('external:' . $target_url, Array ('response_code' => 301));
+					}
+
+					break;
+				}
+			}
+		}
+
+		$cached = $this->_getCachedUrl($url);
+
+		if ( $cached !== false ) {
+			$vars = $cached['vars'];
+			$passed = $cached['passed'];
+		}
+		else {
+			$vars = $this->parse($url);
+			$passed = $vars['pass']; // also used in bottom of this method
+			unset($vars['pass']);
+
+			$this->_setCachedUrl($url, Array ('vars' => $vars, 'passed' => $passed));
+
+			if ( $this->Application->GetVarDirect('t', 'Post') ) {
+				// template from POST overrides template from URL.
+				$vars['t'] = $this->Application->GetVarDirect('t', 'Post');
+
+				if ( isset($vars['is_virtual']) && $vars['is_virtual'] ) {
+					$vars['m_cat_id'] = 0; // this is virtual template category (for Proj-CMS)
+				}
+			}
+
+			unset($vars['is_virtual']);
+		}
+
+		foreach ($vars as $name => $value) {
+			$this->HTTPQuery->Set($name, $value);
+		}
+
+		$this->_initAll(); // also will use parsed language to load phrases from it
+
+		$this->HTTPQuery->finalizeParsing($passed);
+	}
+
+	/**
+	 * Returns url parsing result from cache or false, when not yet parsed
+	 *
+	 * @param $url
+	 * @return Array|bool
+	 * @access protected
+	 */
+	protected function _getCachedUrl($url)
+	{
+		if (!$url) {
+			return false;
+		}
+
+		$sql = 'SELECT *
+				FROM ' . TABLE_PREFIX . 'CachedUrls
+				WHERE Hash = ' . crc32($url) . ' AND DomainId = ' . (int)$this->Application->siteDomainField('DomainId');
+		$data = $this->Conn->GetRow($sql);
+
+		if ($data) {
+			$lifetime = (int)$data['LifeTime']; // in seconds
+			if (($lifetime > 0) && ($data['Cached'] + $lifetime < adodb_mktime())) {
+				// delete expired
+				$sql = 'DELETE FROM ' . TABLE_PREFIX . 'CachedUrls
+						WHERE UrlId = ' . $data['UrlId'];
+				$this->Conn->Query($sql);
+
+				return false;
+			}
+
+			return unserialize($data['ParsedVars']);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Caches url
+	 *
+	 * @param string $url
+	 * @param Array $data
+	 * @return void
+	 * @access protected
+	 */
+	protected function _setCachedUrl($url, $data)
+	{
+		if (!$url) {
+			return ;
+		}
+
+		$vars = $data['vars'];
+		$passed = $data['passed'];
+		sort($passed);
+
+		// get expiration
+		if ($vars['m_cat_id'] > 0) {
+			$sql = 'SELECT PageExpiration
+					FROM ' . TABLE_PREFIX . 'Category
+					WHERE CategoryId = ' . $vars['m_cat_id'];
+			$expiration = $this->Conn->GetOne($sql);
+		}
+
+		// get prefixes
+		$prefixes = Array ();
+		$m_index = array_search('m', $passed);
+
+		if ($m_index !== false) {
+			unset($passed[$m_index]);
+
+			if ($vars['m_cat_id'] > 0) {
+				$prefixes[] = 'c:' . $vars['m_cat_id'];
+			}
+
+			$prefixes[] = 'lang:' . $vars['m_lang'];
+			$prefixes[] = 'theme:' . $vars['m_theme'];
+		}
+
+		foreach ($passed as $prefix) {
+			if (array_key_exists($prefix . '_id', $vars) && is_numeric($vars[$prefix . '_id'])) {
+				$prefixes[] = $prefix . ':' . $vars[$prefix . '_id'];
+			}
+			else {
+				$prefixes[] = $prefix;
+			}
+		}
+
+		$fields_hash = Array (
+			'Url' => $url,
+			'Hash' => crc32($url),
+			'DomainId' => (int)$this->Application->siteDomainField('DomainId'),
+			'Prefixes' => $prefixes ? '|' . implode('|', $prefixes) . '|' : '',
+			'ParsedVars' => serialize($data),
+			'Cached' => adodb_mktime(),
+			'LifeTime' => isset($expiration) && is_numeric($expiration) ? $expiration : -1
+		);
+
+		$this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'CachedUrls');
+	}
+
+	/**
+	 * Loads all registered rewrite listeners, so they could be quickly accessed later
+	 *
+	 * @access protected
+	 */
+	protected function _initRewriteListeners()
+	{
+		static $init_done = false;
+
+		if ($init_done || count($this->Application->RewriteListeners) == 0) {
+			// not initialized OR mod-rewrite url with missing config cache
+			return ;
+		}
+
+		foreach ($this->Application->RewriteListeners as $prefix => $listener_data) {
+			foreach ($listener_data['listener'] as $index => $rewrite_listener) {
+				list ($listener_prefix, $listener_method) = explode(':', $rewrite_listener);
+				$listener =& $this->Application->recallObject($listener_prefix);
+
+				$this->Application->RewriteListeners[$prefix][$index] = Array (&$listener, $listener_method);
+			}
+		}
+
+		define('MOD_REWRITE_URL_ENDING', $this->Application->ConfigValue('ModRewriteUrlEnding'));
+
+		$init_done = true;
+	}
+
+	/**
+	 * Parses given string into a set of variables (url in this case)
+	 *
+	 * @param string $string
+	 * @param string $pass_name
+	 * @return Array
+	 * @access public
+	 */
+	public function parse($string, $pass_name = 'pass')
+	{
+		$vars = Array ($pass_name => Array ('m'));
+		$url_parts = $string ? explode('/', trim(mb_strtolower($string, 'UTF-8'), '/')) : Array ();
+
+		$this->_partsToParse = $url_parts;
+
+		if ( ($this->HTTPQuery->Get('rewrite') == 'on') || !$url_parts ) {
+			$this->_setDefaultValues($vars);
+		}
+
+		if ( !$url_parts ) {
+			$this->_initAll();
+			$vars['t'] = $this->Application->UrlManager->getDefaultTemplate('');
+
+			return $vars;
+		}
+		else {
+			$vars['t'] = '';
+		}
+
+		$this->_parseLanguage($url_parts, $vars);
+		$this->_parseTheme($url_parts, $vars);
+
+		// 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>
+		// http://site-url/<language>/<theme>/<category>[_<category_page>]/<module_item> (category-based detail template)
+		// http://site-url/<language>/<theme>/<rl_injections>/<category>[_<category_page>]/<rl_part> (customized url)
+
+		if ( $this->_processRewriteListeners($url_parts, $vars) ) {
+			return $vars;
+		}
+
+		$this->_parsePhysicalTemplate($url_parts, $vars);
+
+		if ( ($this->modulePrefix === false) && $vars['m_cat_id'] && !$this->_partsToParse ) {
+			// no category item found, but category found and all url matched -> module index page
+
+			return $vars;
+		}
+
+		if ( $this->_partsToParse ) {
+			$not_found = $this->Application->ConfigValue('ErrorTemplate');
+			$vars['t'] = $not_found ? $not_found : 'error_notfound';
+
+			$themes_helper =& $this->Application->recallObject('ThemesHelper');
+			/* @var $themes_helper kThemesHelper */
+
+			$vars['m_cat_id'] = $themes_helper->getPageByTemplate($vars['t'], $vars['m_theme']);
+
+			header('HTTP/1.0 404 Not Found');
+		}
+
+		return $vars;
+	}
+
+	/**
+	 * Initializes theme & language based on parse results
+	 *
+	 * @return void
+	 * @access protected
+	 */
+	protected function _initAll()
+	{
+		$this->Application->VerifyThemeId();
+		$this->Application->VerifyLanguageId();
+
+		// no need, since we don't have any cached phrase IDs + nobody will use PhrasesCache::LanguageId soon
+		// $this->Application->Phrases->Init('phrases');
+	}
+
+	/**
+	 * Sets default parsed values before actual url parsing (only, for empty url)
+	 *
+	 * @param Array $vars
+	 * @access protected
+	 */
+	protected function _setDefaultValues(&$vars)
+	{
+		$defaults = Array (
+			'm_cat_id' => 0, // no category
+			'm_cat_page' => 1, // first category page
+			'm_opener' => 's', // stay on same page
+			't' => 'index' // main site page
+		);
+
+		if ($this->primaryLanguageId) {
+			// domain-based primary language
+			$defaults['m_lang'] = $this->primaryLanguageId;
+		}
+
+		if ($this->primaryThemeId) {
+			// domain-based primary theme
+			$defaults['m_theme'] = $this->primaryThemeId;
+		}
+
+		foreach ($defaults as $default_key => $default_value) {
+			if ($this->HTTPQuery->Get($default_key) === false) {
+				$vars[$default_key] = $default_value;
+			}
+		}
+	}
+
+	/**
+	 * Processes url using rewrite listeners
+	 *
+	 * Pattern: Chain of Command
+	 *
+	 * @param Array $url_parts
+	 * @param Array $vars
+	 * @return bool
+	 * @access protected
+	 */
+	protected function _processRewriteListeners(&$url_parts, &$vars)
+	{
+		$this->_initRewriteListeners();
+		$page_number = $this->_parsePage($url_parts, $vars);
+
+		foreach ($this->Application->RewriteListeners as $prefix => $listeners) {
+			// 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;
+			}
+
+			// $listeners[1] - listener, used for parsing
+			$listener_result = $listeners[1][0]->$listeners[1][1](REWRITE_MODE_PARSE, $prefix, $vars, $url_parts);
+			if ($listener_result === false) {
+				// will not proceed to other methods
+				return true;
+			}
+		}
+
+		// will proceed to other methods
+		return false;
+	}
+
+	/**
+	 * Set's page (when found) to all modules
+	 *
+	 * @param Array $url_parts
+	 * @param Array $vars
+	 * @return string
+	 * @access protected
+	 *
+	 * @todo Should find a way, how to determine what rewrite listerner page is it
+	 */
+	protected function _parsePage(&$url_parts, &$vars)
+	{
+		if (!$url_parts) {
+			return false;
+		}
+
+		$page_number = end($url_parts);
+		if (!is_numeric($page_number)) {
+			return false;
+		}
+
+		array_pop($url_parts);
+		$this->partParsed($page_number, 'rtl');
+
+		return $page_number;
+	}
+
+	/**
+	 * Gets language part from url
+	 *
+	 * @param Array $url_parts
+	 * @param Array $vars
+	 * @return bool
+	 * @access protected
+	 */
+	protected function _parseLanguage(&$url_parts, &$vars)
+	{
+		if (!$url_parts) {
+			return false;
+		}
+
+		$url_part = reset($url_parts);
+
+		$sql = 'SELECT LanguageId, IF(LOWER(PackName) = ' . $this->Conn->qstr($url_part) . ', 2, PrimaryLang) AS SortKey
+				FROM ' . TABLE_PREFIX . 'Language
+				WHERE Enabled = 1
+				ORDER BY SortKey DESC';
+		$language_info = $this->Conn->GetRow($sql);
+
+		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);
+				$this->partParsed($url_part);
+			}
+			elseif ($this->primaryLanguageId) {
+				// use domain-based primary language instead of site-wide primary language
+				$vars['m_lang'] = $this->primaryLanguageId;
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Gets theme part from url
+	 *
+	 * @param Array $url_parts
+	 * @param Array $vars
+	 * @return bool
+	 */
+	protected function _parseTheme(&$url_parts, &$vars)
+	{
+		if (!$url_parts) {
+			return false;
+		}
+
+		$url_part = reset($url_parts);
+
+		$sql = 'SELECT ThemeId, IF(LOWER(Name) = ' . $this->Conn->qstr($url_part) . ', 2, PrimaryTheme) AS SortKey, TemplateAliases
+				FROM ' . TABLE_PREFIX . 'Theme
+				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);
+				$this->partParsed($url_part);
+			}
+			elseif ($this->primaryThemeId) {
+				// use domain-based primary theme instead of site-wide primary theme
+				$vars['m_theme'] = $this->primaryThemeId;
+			}
+
+			return true;
+		}
+
+		$vars['m_theme'] = 0; // required, because used later for category/template detection
+
+		return false;
+	}
+
+	/**
+	 * Parses real template name from url
+	 *
+	 * @param Array $url_parts
+	 * @param Array $vars
+	 * @return bool
+	 */
+	protected function _parsePhysicalTemplate($url_parts, &$vars)
+	{
+		if (!$url_parts) {
+			return false;
+		}
+
+		do {
+			$template_path = implode('/', $url_parts);
+
+			$physical_template = $this->Application->getPhysicalTemplate($template_path);
+
+			if (($physical_template !== false) && (substr($physical_template, 0, 3) != 'id:')) {
+				// 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 (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) {
+				array_shift($url_parts);
+			}
+		} while (!$template_found && $url_parts);
+
+		if ($template_found) {
+			$vars['t'] = $template_path;
+
+			$template_parts = explode('/', $template_path);
+
+			while ( $template_parts ) {
+				$this->partParsed( array_pop($template_parts), 'rtl' );
+			}
+
+			// 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;
+		}
+
+		return false;
+	}
+
+
+
+	/**
+	 * Returns environment variable values for given prefix (uses directly given params, when available)
+	 *
+	 * @param string $prefix_special
+	 * @param Array $params
+	 * @param bool $keep_events
+	 * @return Array
+	 * @access public
+	 */
+	public function getProcessedParams($prefix_special, &$params, $keep_events)
+	{
+		list ($prefix) = explode('.', $prefix_special);
+
+		$query_vars = $this->Application->getUnitOption($prefix, 'QueryString', Array ());
+		/* @var $query_vars Array */
+
+		if ( !$query_vars ) {
+			// given prefix doesn't use "env" variable to pass it's data
+			return false;
+		}
+
+		$event_key = array_search('event', $query_vars);
+		if ( $event_key ) {
+			// pass through event of this prefix
+			unset($query_vars[$event_key]);
+		}
+
+		if ( array_key_exists($prefix_special . '_event', $params) && !$params[$prefix_special . '_event'] ) {
+			// if empty event, then remove it from url
+			unset($params[$prefix_special . '_event']);
+		}
+
+		// if pass events is off and event is not implicity passed
+		if ( !$keep_events && !array_key_exists($prefix_special . '_event', $params) ) {
+			unset($params[$prefix_special . '_event']); // remove event from url if requested
+			//otherwise it will use value from get_var
+		}
+
+		$processed_params = Array ();
+		foreach ($query_vars as $var_name) {
+			// if value passed in params use it, otherwise use current from application
+			$var_name = $prefix_special . '_' . $var_name;
+			$processed_params[$var_name] = array_key_exists($var_name, $params) ? $params[$var_name] : $this->Application->GetVar($var_name);
+
+			if ( array_key_exists($var_name, $params) ) {
+				unset($params[$var_name]);
+			}
+		}
+
+		return $processed_params;
+	}
+
+	/**
+	 * Returns module item details template specified in given category custom field for given module prefix
+	 *
+	 * @param int|Array $category
+	 * @param string $module_prefix
+	 * @return string
+	 * @access public
+	 * @todo Move to kPlainUrlProcessor
+	 */
+	public function GetItemTemplate($category, $module_prefix)
+	{
+		$category_id = is_array($category) ? $category['CategoryId'] : $category;
+		$cache_key = __CLASS__ . '::' . __FUNCTION__ . '[%CIDSerial:' . $category_id . '%]:' . $module_prefix;
+
+		$cached_value = $this->Application->getCache($cache_key);
+		if ($cached_value !== false) {
+			return $cached_value;
+		}
+
+		if (!is_array($category)) {
+			if ($category == 0) {
+				$category = $this->Application->findModule('Var', $module_prefix, 'RootCat');
+			}
+			$sql = 'SELECT c.ParentPath, c.CategoryId
+					FROM ' . TABLE_PREFIX . 'Category AS c
+					WHERE c.CategoryId = ' . $category;
+			$category = $this->Conn->GetRow($sql);
+		}
+		$parent_path = implode(',',explode('|', substr($category['ParentPath'], 1, -1)));
+
+		// item template is stored in module' system custom field - need to get that field Id
+		$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.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.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.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($cache_key, $item_template);
+
+		return $item_template;
+	}
+
+	/**
+	 * Returns category custom field id, where given module prefix item template name is stored
+	 *
+	 * @param string $module_prefix
+	 * @return int
+	 * @access public
+	 * @todo Move to kPlainUrlProcessor; decrease visibility, since used only during upgrade
+	 */
+	public function getItemTemplateCustomField($module_prefix)
+	{
+		$cache_key = __CLASS__ . '::' . __FUNCTION__ . '[%CfSerial%]:' . $module_prefix;
+		$cached_value = $this->Application->getCache($cache_key);
+
+		if ($cached_value !== false) {
+			return $cached_value;
+		}
+
+		$sql = 'SELECT CustomFieldId
+				FROM ' . TABLE_PREFIX . 'CustomField
+				WHERE FieldName = ' . $this->Conn->qstr($module_prefix . '_ItemTemplate');
+		$item_template_field_id = $this->Conn->GetOne($sql);
+
+		$this->Application->setCache($cache_key, $item_template_field_id);
+
+		return $item_template_field_id;
+	}
+
+	/**
+	 * Marks url part as parsed
+	 *
+	 * @param string $url_part
+	 * @param string $parse_direction
+	 * @access public
+	 */
+	public function partParsed($url_part, $parse_direction = 'ltr')
+	{
+		if ( !$this->_partsToParse ) {
+			return ;
+		}
+
+		if ( $parse_direction == 'ltr' ) {
+			$expected_url_part = reset($this->_partsToParse);
+
+			if ( $url_part == $expected_url_part ) {
+				array_shift($this->_partsToParse);
+			}
+		}
+		else {
+			$expected_url_part = end($this->_partsToParse);
+
+			if ( $url_part == $expected_url_part ) {
+				array_pop($this->_partsToParse);
+			}
+		}
+
+		if ( $url_part != $expected_url_part ) {
+			trigger_error('partParsed: expected URL part "<strong>' . $expected_url_part . '</strong>", received URL part "<strong>' . $url_part . '</strong>"', E_USER_NOTICE);
+		}
+	}
+
+	/**
+	 * Builds url
+	 *
+	 * @param string $t
+	 * @param Array $params
+	 * @param string $pass
+	 * @param bool $pass_events
+	 * @param bool $env_var
+	 * @return string
+	 * @access public
+	 */
+	public function build($t, $params, $pass = 'all', $pass_events = false, $env_var = false)
+	{
+		if ( $this->Application->GetVar('admin') || (array_key_exists('admin', $params) && $params['admin']) ) {
+			$params['admin'] = 1;
+
+			if ( !array_key_exists('editing_mode', $params) ) {
+				$params['editing_mode'] = EDITING_MODE;
+			}
+		}
+
+		$ret = '';
+		$env = '';
+
+		$encode = false;
+
+		if ( isset($params['__URLENCODE__']) ) {
+			$encode = $params['__URLENCODE__'];
+			unset($params['__URLENCODE__']);
+		}
+
+		if ( isset($params['__SSL__']) ) {
+			unset($params['__SSL__']);
+		}
+
+		$catalog_item_found = false;
+		$pass_info = $this->getPassInfo($pass);
+
+		if ( $pass_info ) {
+			if ( $pass_info[0] == 'm' ) {
+				array_shift($pass_info);
+			}
+
+			$inject_parts = Array (); // url parts for beginning of url
+			$params['t'] = $t; // make template available for rewrite listeners
+			$params['pass_template'] = true; // by default we keep given template in resulting url
+
+			if ( !array_key_exists('pass_category', $params) ) {
+				$params['pass_category'] = false; // by default we don't keep categories in url
+			}
+
+			foreach ($pass_info as $pass_index => $pass_element) {
+				list ($prefix) = explode('.', $pass_element);
+				$catalog_item = $this->Application->findModule('Var', $prefix) && $this->Application->getUnitOption($prefix, 'CatalogItem');
+
+				if ( array_key_exists($prefix, $this->Application->RewriteListeners) ) {
+					// if next prefix is same as current, but with special => exclude current prefix from url
+					$next_prefix = array_key_exists($pass_index + 1, $pass_info) ? $pass_info[$pass_index + 1] : false;
+					if ( $next_prefix ) {
+						$next_prefix = substr($next_prefix, 0, strlen($prefix) + 1);
+						if ( $prefix . '.' == $next_prefix ) {
+							continue;
+						}
+					}
+
+					// rewritten url part
+					$url_part = $this->BuildModuleEnv($pass_element, $params, $pass_events);
+
+					if ( is_string($url_part) && $url_part ) {
+						$ret .= $url_part . '/';
+
+						if ( $catalog_item ) {
+							// pass category later only for catalog items
+							$catalog_item_found = true;
+						}
+					}
+					elseif ( is_array($url_part) ) {
+						// rewrite listener want to insert something at the beginning of url too
+						if ( $url_part[0] ) {
+							$inject_parts[] = $url_part[0];
+						}
+
+						if ( $url_part[1] ) {
+							$ret .= $url_part[1] . '/';
+						}
+
+						if ( $catalog_item ) {
+							// pass category later only for catalog items
+							$catalog_item_found = true;
+						}
+					}
+					elseif ( $url_part === false ) {
+						// rewrite listener decided not to rewrite given $pass_element
+						$env .= ':' . $this->manager->plain->BuildModuleEnv($pass_element, $params, $pass_events);
+					}
+				}
+				else {
+					$env .= ':' . $this->manager->plain->BuildModuleEnv($pass_element, $params, $pass_events);
+				}
+			}
+
+			if ( $catalog_item_found || preg_match('/c\.[-\d]*/', implode(',', $pass_info)) ) {
+				// "c" prefix is present -> keep category
+				$params['pass_category'] = true;
+			}
+
+			$params['inject_parts'] = $inject_parts;
+
+			$ret = $this->BuildModuleEnv('m', $params, $pass_events) . '/' . $ret;
+			$cat_processed = array_key_exists('category_processed', $params) && $params['category_processed'];
+
+			// remove temporary parameters used by listeners
+			unset($params['t'], $params['inject_parts'], $params['pass_template'], $params['pass_category'], $params['category_processed']);
+
+			$ret = trim($ret, '/');
+
+			if ( isset($params['url_ending']) ) {
+				if ( $ret ) {
+					$ret .= $params['url_ending'];
+				}
+
+				unset($params['url_ending']);
+			}
+			elseif ( $ret ) {
+				$ret .= MOD_REWRITE_URL_ENDING;
+			}
+
+			if ( $env ) {
+				$params[ENV_VAR_NAME] = ltrim($env, ':');
+			}
+		}
+
+		unset($params['pass'], $params['opener'], $params['m_event']);
+
+		if ( array_key_exists('escape', $params) && $params['escape'] ) {
+			$ret = addslashes($ret);
+			unset($params['escape']);
+		}
+
+		$ret = str_replace('%2F', '/', urlencode($ret));
+
+		if ( $params ) {
+			$params_str = '';
+			$join_string = $encode ? '&' : '&amp;';
+
+			foreach ($params as $param => $value) {
+				$params_str .= $join_string . $param . '=' . $value;
+			}
+
+			$ret .= '?' . substr($params_str, strlen($join_string));
+		}
+
+		if ( $encode ) {
+			$ret = str_replace('\\', '%5C', $ret);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Builds env part that corresponds prefix passed
+	 *
+	 * @param string $prefix_special item's prefix & [special]
+	 * @param Array $params url params
+	 * @param bool $pass_events
+	 * @return string
+	 * @access protected
+	 */
+	protected function BuildModuleEnv($prefix_special, &$params, $pass_events = false)
+	{
+		list ($prefix) = explode('.', $prefix_special);
+
+		$url_parts = Array ();
+		$listener = $this->Application->RewriteListeners[$prefix][0];
+
+		$ret = $listener[0]->$listener[1](REWRITE_MODE_BUILD, $prefix_special, $params, $url_parts, $pass_events);
+
+		return $ret;
+	}
+}
\ No newline at end of file
Index: branches/5.2.x/core/kernel/application.php
===================================================================
diff -u -N -r14699 -r14714
--- branches/5.2.x/core/kernel/application.php	(.../application.php)	(revision 14699)
+++ branches/5.2.x/core/kernel/application.php	(.../application.php)	(revision 14714)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: application.php 14699 2011-10-26 11:39:38Z alex $
+* @version	$Id: application.php 14714 2011-11-01 10:05:18Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -122,7 +122,7 @@
 
 	// performance needs:
 	/**
-	 * Holds a refererence to httpquery
+	 * Holds a reference to httpquery
 	 *
 	 * @var kHttpQuery
 	 */
@@ -153,12 +153,12 @@
 	 * Holds a ref to kUrlManager
 	 *
 	 * @var kUrlManager
-	 * @access protected
+	 * @access public
 	 */
-	protected $UrlManager = null;
+	public $UrlManager = null;
 
 	/**
-	 * Ref for TemplatesChache
+	 * Ref for TemplatesCache
 	 *
 	 * @var TemplatesCache
 	 */
@@ -311,6 +311,7 @@
 			$this->Debugger->appendTimestamp('Before UnitConfigReader');
 		}
 
+		// init config reader and all managers
 		$this->UnitConfigReader =& $this->makeClass('kUnitConfigReader');
 		$this->UnitConfigReader->scanModules(MODULES_PATH);
 
@@ -322,7 +323,9 @@
 
 		define('MOD_REWRITE', $this->ConfigValue('UseModRewrite') && !$this->isAdmin ? 1 : 0);
 
+		// start processing request
 		$this->HttpQuery =& $this->recallObject('HTTPQuery');
+		$this->HttpQuery->AfterInit();
 
 		if ( defined('DEBUG_MODE') && $this->isDebugMode() ) {
 			$this->Debugger->appendTimestamp('Processed HTTPQuery initial');
@@ -334,18 +337,7 @@
 			$this->Debugger->appendTimestamp('Processed Session');
 		}
 
-		if ( !$this->RecallVar('UserGroups') ) {
-			$user_groups = trim($this->Session->GetField('GroupList'), ',');
-			if ( !$user_groups ) {
-				$user_groups = $this->ConfigValue('User_GuestGroup');
-			}
-
-			$this->Session->SetField('GroupList', $user_groups);
-			$this->StoreVar('UserGroups', $user_groups, true); // true for optional
-		}
-
 		$this->UrlManager->LoadStructureTemplateMapping();
-		$this->HttpQuery->AfterInit();
 
 		$this->Session->ValidateExpired();
 
@@ -690,13 +682,18 @@
 	{
 		$this->registerClass('kHelper', KERNEL_PATH . '/kbase.php');
 		$this->registerClass('kMultipleFilter', KERNEL_PATH . '/utility/filters.php');
-		$this->registerClass('kiCacheable', KERNEL_PATH . '/interfaces/cacheable.php', 'kiCacheable');
+		$this->registerClass('kiCacheable', KERNEL_PATH . '/interfaces/cacheable.php');
 
 		$this->registerClass('kEventManager', KERNEL_PATH . '/event_manager.php', 'EventManager', 'kiCacheable');
 		$this->registerClass('kHookManager', KERNEL_PATH . '/managers/hook_manager.php', null, 'kiCacheable');
 		$this->registerClass('kAgentManager', KERNEL_PATH . '/managers/agent_manager.php', null, 'kiCacheable');
 		$this->registerClass('kRequestManager', KERNEL_PATH . '/managers/request_manager.php');
+
 		$this->registerClass('kUrlManager', KERNEL_PATH . '/managers/url_manager.php');
+		$this->registerClass('kUrlProcessor', KERNEL_PATH . '/managers/url_processor.php');
+		$this->registerClass('kPlainUrlProcessor', KERNEL_PATH . '/managers/plain_url_processor.php', null, 'kUrlProcessor');
+		$this->registerClass('kRewriteUrlProcessor', KERNEL_PATH . '/managers/rewrite_url_processor.php', null, 'kUrlProcessor');
+
 		$this->registerClass('kCacheManager', KERNEL_PATH . '/managers/cache_manager.php', null, 'kiCacheable');
 		$this->registerClass('PhrasesCache', KERNEL_PATH . '/languages/phrases_cache.php', 'kPhraseCache');
 		$this->registerClass('kTempTablesHandler', KERNEL_PATH . '/utility/temp_handler.php');
@@ -1216,6 +1213,23 @@
 	}
 
 	/**
+	 * Returns variable passed to the script as $type
+	 *
+	 * @param string $name Name of variable to retrieve
+	 * @param string $type Get/Post/Cookie
+	 * @param mixed $default default value returned in case if variable not present
+	 *
+	 * @return mixed
+	 * @access public
+	 */
+	public function GetVarDirect($name, $type, $default = false)
+	{
+//		$type = ucfirst($type);
+
+		return isset($this->HttpQuery->$type[$name]) ? $this->HttpQuery->$type[$name] : $default;
+	}
+
+	/**
 	* Returns ALL variables passed to the script as GET/POST/COOKIE
 	*
 	* @access public
@@ -1482,11 +1496,27 @@
 		return $this->UrlManager->getPassThroughVariables($params);
 	}
 
-	function BuildEnv($t, $params, $pass = 'all', $pass_events = false, $env_var = true)
+	public function BuildEnv($t, $params, $pass = 'all', $pass_events = false, $env_var = true)
 	{
-		return $this->UrlManager->BuildEnv($t, $params, $pass, $pass_events, $env_var);
+		return $this->UrlManager->plain->build($t, $params, $pass, $pass_events, $env_var);
 	}
 
+	/**
+	 * Process QueryString only, create
+	 * events, ids, based on config
+	 * set template name and sid in
+	 * desired application variables.
+	 *
+	 * @param string $env_var environment string value
+	 * @param string $pass_name
+	 * @return Array
+	 * @access public
+	 */
+	public function processQueryString($env_var, $pass_name = 'passed')
+	{
+		return $this->UrlManager->plain->parse($env_var, $pass_name);
+	}
+
 	function BaseURL($prefix = '', $ssl = null, $add_port = true)
 	{
 		if ($ssl === null) {
@@ -1931,6 +1961,7 @@
 			(!$ssl && (PROTOCOL == 'https://' || PROTOCOL == 'http://')) // always allow mod_rewrite for http
 			|| // or allow rewriting for redirect TO httpS or when already in httpS
 			(($ssl || PROTOCOL == 'https://') && $this->ConfigValue('UseModRewriteWithSSL')); // but only if it's allowed in config!
+
 		return kUtil::constOn('MOD_REWRITE') && $allow_rewriting;
 	}
 
Index: branches/5.2.x/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -N -r14699 -r14714
--- branches/5.2.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 14699)
+++ branches/5.2.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 14714)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_tag_processor.php 14699 2011-10-26 11:39:38Z alex $
+* @version	$Id: categories_tag_processor.php 14714 2011-11-01 10:05:18Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -344,15 +344,15 @@
 			if ($module_info && $module_info['Var'] != 'adm' && $module_info['Var'] != 'st') {
 
 				// 2. get item template by current category & module prefix
-				$mod_rewrite_helper = $this->Application->recallObject('ModRewriteHelper');
-				/* @var $mod_rewrite_helper kModRewriteHelper */
+				$rewrite_processor = $this->Application->recallObject('kRewriteUrlProcessor');
+				/* @var $rewrite_processor kRewriteUrlProcessor */
 
 				$category_params = Array (
-				'CategoryId' => $object->GetID(),
-				'ParentPath' => $object->GetDBField('ParentPath'),
+					'CategoryId' => $object->GetID(),
+					'ParentPath' => $object->GetDBField('ParentPath'),
 				);
 
-				$item_template = $mod_rewrite_helper->GetItemTemplate($category_params, $module_info['Var']);
+				$item_template = $rewrite_processor->GetItemTemplate($category_params, $module_info['Var']);
 
 				if ($this->Application->GetVar('t') == $item_template) {
 					// we are located on item's details page
@@ -452,7 +452,7 @@
 		list($index_file, $env) = explode('|', $this->Application->RecallVar(rtrim('last_template_'.$wid, '_')), 2);
 
 		$vars_backup = Array ();
-		$vars = $this->Application->HttpQuery->processQueryString( str_replace('%5C', '\\', $env) );
+		$vars = $this->Application->processQueryString( str_replace('%5C', '\\', $env) );
 
 		foreach ($vars as $var_name => $var_value) {
 			$vars_backup[$var_name] = $this->Application->GetVar($var_name);
Index: branches/5.2.x/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -N -r14707 -r14714
--- branches/5.2.x/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 14707)
+++ branches/5.2.x/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 14714)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: admin_tag_processor.php 14707 2011-10-31 12:16:55Z alex $
+* @version	$Id: admin_tag_processor.php 14714 2011-11-01 10:05:18Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -774,7 +774,7 @@
 			}
 
 			list($index_file, $env) = explode('|', $last_template);
-			$vars = $this->Application->HttpQuery->processQueryString($env, 'pass');
+			$vars = $this->Application->processQueryString($env, 'pass');
 			$recursion_templates = Array ('login', 'index', 'no_permission');
 
 			if (isset($vars['admin']) && $vars['admin'] == 1) {
Index: branches/5.2.x/core/units/general/general_config.php
===================================================================
diff -u -N -r14244 -r14714
--- branches/5.2.x/core/units/general/general_config.php	(.../general_config.php)	(revision 14244)
+++ branches/5.2.x/core/units/general/general_config.php	(.../general_config.php)	(revision 14714)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: general_config.php 14244 2011-03-16 20:53:41Z alex $
+* @version	$Id: general_config.php 14714 2011-11-01 10:05:18Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -39,7 +39,7 @@
 		'PortalStyleEnv' => true,
 
 		'RewritePriority' => 100,
-		'RewriteListener' => 'ModRewriteHelper:MainRewriteListener',
+		'RewriteListener' => 'c_EventHandler:CategoryRewriteListener',
 
 		'PermTabText' => 'In-Portal',
 		'PermSection' => Array ('search' => 'in-portal:configuration_search', 'custom' => 'in-portal:configuration_custom'),
Index: branches/5.2.x/core/kernel/db/db_event_handler.php
===================================================================
diff -u -N -r14697 -r14714
--- branches/5.2.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 14697)
+++ branches/5.2.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 14714)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_event_handler.php 14697 2011-10-26 09:17:53Z alex $
+* @version	$Id: db_event_handler.php 14714 2011-11-01 10:05:18Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -536,7 +536,7 @@
 
 			if ($auto_load && !$skip_autload) {
 				$perm_status = true;
-				$user_id = $this->Application->RecallVar('user_id');
+				$user_id = $this->Application->InitDone ? $this->Application->RecallVar('user_id') : USER_ROOT;
 				$event->setEventParam('top_prefix', $this->Application->GetTopmostPrefix($event->Prefix, true));
 				$status_checked = false;
 				if ($user_id == USER_ROOT || $this->CheckPermission($event)) {
Index: branches/5.2.x/core/units/helpers/helpers_config.php
===================================================================
diff -u -N -r14707 -r14714
--- branches/5.2.x/core/units/helpers/helpers_config.php	(.../helpers_config.php)	(revision 14707)
+++ branches/5.2.x/core/units/helpers/helpers_config.php	(.../helpers_config.php)	(revision 14714)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: helpers_config.php 14707 2011-10-31 12:16:55Z alex $
+* @version	$Id: helpers_config.php 14714 2011-11-01 10:05:18Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -25,7 +25,7 @@
 			Array ('pseudo' => 'SectionsHelper', 'class' => 'kSectionsHelper', 'file' => 'sections_helper.php', 'build_event' => '', 'require_classes' => 'kHelper'),
 			Array ('pseudo' => 'PermissionsHelper', 'class' => 'kPermissionsHelper', 'file' => 'permissions_helper.php', 'build_event' => '', 'require_classes' => 'kHelper'),
 			Array ('pseudo' => 'ModulesHelper', 'class' => 'kModulesHelper', 'file' => 'modules_helper.php', 'build_event' => '', 'require_classes' => 'kHelper'),
-			Array ('pseudo' => 'ModRewriteHelper', 'class' => 'kModRewriteHelper', 'file' => 'mod_rewrite_helper.php', 'build_event' => '', 'require_classes' => 'kHelper'),
+			Array ('pseudo' => 'CategoryItemRewrite', 'class' => 'CategoryItemRewrite', 'file' => 'mod_rewrite_helper.php', 'build_event' => '', 'require_classes' => 'kHelper'),
 			Array ('pseudo' => 'RecursiveHelper', 'class' => 'kRecursiveHelper', 'file' => 'recursive_helper.php', 'build_event' => '', 'require_classes' => 'kHelper'),
 			Array ('pseudo' => 'FilenamesHelper', 'class' => 'kFilenamesHelper', 'file' => 'filenames_helper.php', 'build_event' => '', 'require_classes' => 'kHelper'),
 			Array ('pseudo' => 'ClipboardHelper', 'class' => 'kClipboardHelper', 'file' => 'clipboard_helper.php', 'build_event' => '', 'require_classes' => 'kHelper'),