0001433: Possibility of having 2 urls to a single page

Index: install/english.lang =================================================================== --- install/english.lang (revision 15648) +++ install/english.lang (working copy) @@ -171,6 +171,7 @@ <PHRASE Label="la_config_ExcludeTemplateSectionsFromSearch" Module="Core" Type="1">RXhjbHVkZSB0ZW1wbGF0ZSBiYXNlZCBTZWN0aW9ucyBmcm9tIFNlYXJjaCBSZXN1bHRzIChpZS4gVXNlciBSZWdpc3RyYXRpb24p</PHRASE> <PHRASE Label="la_config_FilenameSpecialCharReplacement" Module="Core" Type="1">RmlsZW5hbWUgU3BlY2lhbCBDaGFyIFJlcGxhY2VtZW50</PHRASE> <PHRASE Label="la_config_first_day_of_week" Module="Core" Type="1">Rmlyc3QgRGF5IE9mIFdlZWs=</PHRASE> + <PHRASE Label="la_config_ForceCanonicalUrls" Module="Core" Type="1">Rm9yY2UgQ2Fub25pY2FsIFVSTHM=</PHRASE> <PHRASE Label="la_config_ForceImageMagickResize" Module="Core" Type="1">QWx3YXlzIHVzZSBJbWFnZU1hZ2ljayB0byByZXNpemUgaW1hZ2Vz</PHRASE> <PHRASE Label="la_config_ForceModRewriteUrlEnding" Module="Core" Type="1" Hint="VXNlciB3aWxsIGJlIGF1dG9tYXRpY2FsbHkgcmVkaXJlY3RlZCB0byB0aGUgc2VsZWN0ZWQgVXJsIEVuZGluZyBpbiBjYXNlIHdoZW4gY3VycmVudCBwYWdlIHVybCBoYXMgYSBkaWZmZXJlbnQgZW5kaW5n">Rm9yY2UgUmVkaXJlY3QgdG8gU2VsZWN0ZWQgVVJMIEVuZGluZw==</PHRASE> <PHRASE Label="la_config_force_http" Module="Core" Type="1">UmVkaXJlY3QgdG8gSFRUUCB3aGVuIFNTTCBpcyBub3QgcmVxdWlyZWQ=</PHRASE> Index: install/install_data.sql =================================================================== --- install/install_data.sql (revision 15648) +++ install/install_data.sql (working copy) @@ -32,6 +32,7 @@ INSERT INTO SystemSettings VALUES(DEFAULT, 'PageHitCounter', '0', 'In-Portal', 'in-portal:configure_advanced', '', '', '', NULL, NULL, 0, 0, 0, NULL); INSERT INTO SystemSettings VALUES(DEFAULT, 'UseModRewrite', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_use_modrewrite', 'checkbox', '', '', 10.01, 0, 1, NULL); INSERT INTO SystemSettings VALUES(DEFAULT, 'ModRewriteUrlEnding', '.html', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ModRewriteUrlEnding', 'select', '', '=+||/=+/||.html=+.html', 10.011, 0, 0, NULL); +INSERT INTO SystemSettings VALUES(DEFAULT, 'ForceCanonicalUrls', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ForceCanonicalUrls', 'checkbox', '', '', 10.0125, 0, 0, NULL); INSERT INTO SystemSettings VALUES(DEFAULT, 'ForceModRewriteUrlEnding', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ForceModRewriteUrlEnding', 'checkbox', '', NULL, 10.012, 0, 0, 'hint:la_config_ForceModRewriteUrlEnding'); INSERT INTO SystemSettings VALUES(DEFAULT, 'UseContentLanguageNegotiation', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_UseContentLanguageNegotiation', 'checkbox', '', '', 10.013, 0, 0, NULL); INSERT INTO SystemSettings VALUES(DEFAULT, 'cms_DefaultDesign', '#default_design#', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_DefaultDesignTemplate', 'text', NULL, NULL, 10.02, 0, 0, NULL); Index: kernel/application.php =================================================================== --- kernel/application.php (revision 15648) +++ kernel/application.php (working copy) @@ -1701,6 +1701,18 @@ } /** + * Returns seo template by physical template + * + * @param string $parsed_template + * @return string + * @access public + */ + public function getSeoTemplate($parsed_template) + { + return $this->UrlManager->getSeoTemplate($parsed_template); + } + + /** * Returns template name, that corresponds with given virtual (not physical) page id * * @param int $page_id Index: kernel/managers/url_manager.php =================================================================== --- kernel/managers/url_manager.php (revision 15648) +++ kernel/managers/url_manager.php (working copy) @@ -379,6 +379,20 @@ } /** + * Returns seo template by physical template + * + * @param string $parsed_template + * @return string + * @access public + */ + public function getSeoTemplate($parsed_template) + { + $mapping_key = $parsed_template . ':' . $this->Application->GetVar('m_theme'); + + return isset($this->structureTemplateMapping[$mapping_key]) ? $this->structureTemplateMapping[$mapping_key] : ''; + } + + /** * Returns template name, that corresponds with given virtual (not physical) page id * * @param int $page_id Index: kernel/utility/http_query.php =================================================================== --- kernel/utility/http_query.php (revision 15648) +++ kernel/utility/http_query.php (working copy) @@ -369,6 +369,20 @@ $this->Application->VerifyThemeId(); $this->Application->VerifyLanguageId(); } + + $parsed_template = $this->Application->GetVar('t'); + + if ( !$this->Application->ConfigValue('ForceCanonicalUrls') || preg_match('|' . BASE_PATH . '/' . $parsed_template . '(.*)|i', $_SERVER['REQUEST_URI'])) { + + return; + } + + $seo_template = $this->Application->getSeoTemplate($parsed_template); + + if ( $seo_template && $seo_template != $parsed_template ) { + trigger_error('Request url "' . $_SERVER['REQUEST_URI'] . '" points directly to physical template', E_USER_NOTICE); + $this->Application->Redirect($parsed_template, Array ('response_code' => 301, 'use_section' => 1)); + } } /**

Index: install/english.lang =================================================================== --- install/english.lang (revision 15648) +++ install/english.lang (working copy) @@ -171,6 +171,7 @@ <PHRASE Label="la_config_ExcludeTemplateSectionsFromSearch" Module="Core" Type="1">RXhjbHVkZSB0ZW1wbGF0ZSBiYXNlZCBTZWN0aW9ucyBmcm9tIFNlYXJjaCBSZXN1bHRzIChpZS4gVXNlciBSZWdpc3RyYXRpb24p</PHRASE> <PHRASE Label="la_config_FilenameSpecialCharReplacement" Module="Core" Type="1">RmlsZW5hbWUgU3BlY2lhbCBDaGFyIFJlcGxhY2VtZW50</PHRASE> <PHRASE Label="la_config_first_day_of_week" Module="Core" Type="1">Rmlyc3QgRGF5IE9mIFdlZWs=</PHRASE> + <PHRASE Label="la_config_ForceCanonicalUrls" Module="Core" Type="1">Rm9yY2UgQ2Fub25pY2FsIFVSTHM=</PHRASE> <PHRASE Label="la_config_ForceImageMagickResize" Module="Core" Type="1">QWx3YXlzIHVzZSBJbWFnZU1hZ2ljayB0byByZXNpemUgaW1hZ2Vz</PHRASE> <PHRASE Label="la_config_ForceModRewriteUrlEnding" Module="Core" Type="1" Hint="VXNlciB3aWxsIGJlIGF1dG9tYXRpY2FsbHkgcmVkaXJlY3RlZCB0byB0aGUgc2VsZWN0ZWQgVXJsIEVuZGluZyBpbiBjYXNlIHdoZW4gY3VycmVudCBwYWdlIHVybCBoYXMgYSBkaWZmZXJlbnQgZW5kaW5n">Rm9yY2UgUmVkaXJlY3QgdG8gU2VsZWN0ZWQgVVJMIEVuZGluZw==</PHRASE> <PHRASE Label="la_config_force_http" Module="Core" Type="1">UmVkaXJlY3QgdG8gSFRUUCB3aGVuIFNTTCBpcyBub3QgcmVxdWlyZWQ=</PHRASE> Index: install/install_data.sql =================================================================== --- install/install_data.sql (revision 15648) +++ install/install_data.sql (working copy) @@ -32,6 +32,7 @@ INSERT INTO SystemSettings VALUES(DEFAULT, 'PageHitCounter', '0', 'In-Portal', 'in-portal:configure_advanced', '', '', '', NULL, NULL, 0, 0, 0, NULL); INSERT INTO SystemSettings VALUES(DEFAULT, 'UseModRewrite', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_use_modrewrite', 'checkbox', '', '', 10.01, 0, 1, NULL); INSERT INTO SystemSettings VALUES(DEFAULT, 'ModRewriteUrlEnding', '.html', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ModRewriteUrlEnding', 'select', '', '=+||/=+/||.html=+.html', 10.011, 0, 0, NULL); +INSERT INTO SystemSettings VALUES(DEFAULT, 'ForceCanonicalUrls', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ForceCanonicalUrls', 'checkbox', '', '', 10.0125, 0, 0, NULL); INSERT INTO SystemSettings VALUES(DEFAULT, 'ForceModRewriteUrlEnding', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ForceModRewriteUrlEnding', 'checkbox', '', NULL, 10.012, 0, 0, 'hint:la_config_ForceModRewriteUrlEnding'); INSERT INTO SystemSettings VALUES(DEFAULT, 'UseContentLanguageNegotiation', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_UseContentLanguageNegotiation', 'checkbox', '', '', 10.013, 0, 0, NULL); INSERT INTO SystemSettings VALUES(DEFAULT, 'cms_DefaultDesign', '#default_design#', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_DefaultDesignTemplate', 'text', NULL, NULL, 10.02, 0, 0, NULL); Index: kernel/application.php =================================================================== --- kernel/application.php (revision 15648) +++ kernel/application.php (working copy) @@ -1701,6 +1701,18 @@ } /** + * Returns seo template by physical template + * + * @param string $physical_template + * @return string + * @access public + */ + public function getSeoTemplate($physical_template) + { + return $this->UrlManager->getSeoTemplate($physical_template); + } + + /** * Returns template name, that corresponds with given virtual (not physical) page id * * @param int $page_id Index: kernel/managers/url_manager.php =================================================================== --- kernel/managers/url_manager.php (revision 15648) +++ kernel/managers/url_manager.php (working copy) @@ -379,6 +379,20 @@ } /** + * Returns seo template by physical template + * + * @param string $physical_template + * @return string + * @access public + */ + public function getSeoTemplate($physical_template) + { + $mapping_key = $physical_template . ':' . $this->Application->GetVar('m_theme'); + + return isset($this->structureTemplateMapping[$mapping_key]) ? $this->structureTemplateMapping[$mapping_key] : ''; + } + + /** * Returns template name, that corresponds with given virtual (not physical) page id * * @param int $page_id Index: kernel/utility/http_query.php =================================================================== --- kernel/utility/http_query.php (revision 15648) +++ kernel/utility/http_query.php (working copy) @@ -369,6 +369,22 @@ $this->Application->VerifyThemeId(); $this->Application->VerifyLanguageId(); } + + $physical_template = $this->Application->GetVar('t'); + + if ( !$this->Application->ConfigValue('ForceCanonicalUrls') ) { + + return; + } + + $seo_template = $this->Application->getSeoTemplate($physical_template); + + if ( $seo_template && $seo_template != $physical_template ) { + trigger_error('Request url "' . $_SERVER['REQUEST_URI'] . '" points directly to physical template', E_USER_NOTICE); + $url_params = $this->getRedirectParams(); + $url_params['response_code'] = 301; + $this->Application->Redirect($seo_template, $url_params); + } } /**

Index: install/english.lang =================================================================== --- install/english.lang (revision 15648) +++ install/english.lang (working copy) @@ -171,6 +171,7 @@ <PHRASE Label="la_config_ExcludeTemplateSectionsFromSearch" Module="Core" Type="1">RXhjbHVkZSB0ZW1wbGF0ZSBiYXNlZCBTZWN0aW9ucyBmcm9tIFNlYXJjaCBSZXN1bHRzIChpZS4gVXNlciBSZWdpc3RyYXRpb24p</PHRASE> <PHRASE Label="la_config_FilenameSpecialCharReplacement" Module="Core" Type="1">RmlsZW5hbWUgU3BlY2lhbCBDaGFyIFJlcGxhY2VtZW50</PHRASE> <PHRASE Label="la_config_first_day_of_week" Module="Core" Type="1">Rmlyc3QgRGF5IE9mIFdlZWs=</PHRASE> + <PHRASE Label="la_config_ForceCanonicalUrls" Module="Core" Type="1">Rm9yY2UgQ2Fub25pY2FsIFVSTHM=</PHRASE> <PHRASE Label="la_config_ForceImageMagickResize" Module="Core" Type="1">QWx3YXlzIHVzZSBJbWFnZU1hZ2ljayB0byByZXNpemUgaW1hZ2Vz</PHRASE> <PHRASE Label="la_config_ForceModRewriteUrlEnding" Module="Core" Type="1" Hint="VXNlciB3aWxsIGJlIGF1dG9tYXRpY2FsbHkgcmVkaXJlY3RlZCB0byB0aGUgc2VsZWN0ZWQgVXJsIEVuZGluZyBpbiBjYXNlIHdoZW4gY3VycmVudCBwYWdlIHVybCBoYXMgYSBkaWZmZXJlbnQgZW5kaW5n">Rm9yY2UgUmVkaXJlY3QgdG8gU2VsZWN0ZWQgVVJMIEVuZGluZw==</PHRASE> <PHRASE Label="la_config_force_http" Module="Core" Type="1">UmVkaXJlY3QgdG8gSFRUUCB3aGVuIFNTTCBpcyBub3QgcmVxdWlyZWQ=</PHRASE> Index: install/install_data.sql =================================================================== --- install/install_data.sql (revision 15648) +++ install/install_data.sql (working copy) @@ -32,6 +32,7 @@ INSERT INTO SystemSettings VALUES(DEFAULT, 'PageHitCounter', '0', 'In-Portal', 'in-portal:configure_advanced', '', '', '', NULL, NULL, 0, 0, 0, NULL); INSERT INTO SystemSettings VALUES(DEFAULT, 'UseModRewrite', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_use_modrewrite', 'checkbox', '', '', 10.01, 0, 1, NULL); INSERT INTO SystemSettings VALUES(DEFAULT, 'ModRewriteUrlEnding', '.html', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ModRewriteUrlEnding', 'select', '', '=+||/=+/||.html=+.html', 10.011, 0, 0, NULL); +INSERT INTO SystemSettings VALUES(DEFAULT, 'ForceCanonicalUrls', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ForceCanonicalUrls', 'checkbox', '', '', 10.0125, 0, 0, NULL); INSERT INTO SystemSettings VALUES(DEFAULT, 'ForceModRewriteUrlEnding', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ForceModRewriteUrlEnding', 'checkbox', '', NULL, 10.012, 0, 0, 'hint:la_config_ForceModRewriteUrlEnding'); INSERT INTO SystemSettings VALUES(DEFAULT, 'UseContentLanguageNegotiation', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_UseContentLanguageNegotiation', 'checkbox', '', '', 10.013, 0, 0, NULL); INSERT INTO SystemSettings VALUES(DEFAULT, 'cms_DefaultDesign', '#default_design#', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_DefaultDesignTemplate', 'text', NULL, NULL, 10.02, 0, 0, NULL); Index: install/upgrades.sql =================================================================== --- install/upgrades.sql (revision 15648) +++ install/upgrades.sql (working copy) @@ -2883,3 +2883,5 @@ UPDATE SystemSettings SET DisplayOrder = ROUND(DisplayOrder - 0.01, 2) WHERE (DisplayOrder BETWEEN 60.04 AND 60.10) AND (ModuleOwner = 'In-Portal') AND (Section = 'in-portal:configure_advanced'); + +INSERT INTO SystemSettings VALUES(DEFAULT, 'ForceCanonicalUrls', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ForceCanonicalUrls', 'checkbox', '', '', 10.0125, 0, 0, NULL); Index: kernel/application.php =================================================================== --- kernel/application.php (revision 15648) +++ kernel/application.php (working copy) @@ -1701,6 +1701,18 @@ } /** + * Returns seo template by physical template + * + * @param string $physical_template + * @return string + * @access public + */ + public function getSeoTemplate($physical_template) + { + return $this->UrlManager->getSeoTemplate($physical_template); + } + + /** * Returns template name, that corresponds with given virtual (not physical) page id * * @param int $page_id Index: kernel/managers/url_manager.php =================================================================== --- kernel/managers/url_manager.php (revision 15648) +++ kernel/managers/url_manager.php (working copy) @@ -379,6 +379,20 @@ } /** + * Returns seo template by physical template + * + * @param string $physical_template + * @return string + * @access public + */ + public function getSeoTemplate($physical_template) + { + $mapping_key = $physical_template . ':' . $this->Application->GetVar('m_theme'); + + return isset($this->structureTemplateMapping[$mapping_key]) ? $this->structureTemplateMapping[$mapping_key] : ''; + } + + /** * Returns template name, that corresponds with given virtual (not physical) page id * * @param int $page_id Index: kernel/utility/http_query.php =================================================================== --- kernel/utility/http_query.php (revision 15648) +++ kernel/utility/http_query.php (working copy) @@ -369,6 +369,22 @@ $this->Application->VerifyThemeId(); $this->Application->VerifyLanguageId(); } + + $physical_template = $this->Application->GetVar('t'); + + if ( !$this->Application->ConfigValue('ForceCanonicalUrls') ) { + + return; + } + + $seo_template = $this->Application->getSeoTemplate($physical_template); + + if ( $seo_template && $seo_template != $physical_template ) { + trigger_error('Request url "' . $_SERVER['REQUEST_URI'] . '" points directly to physical template', E_USER_NOTICE); + $url_params = $this->getRedirectParams(); + $url_params['response_code'] = 301; + $this->Application->Redirect($seo_template, $url_params); + } } /**

Index: core/kernel/managers/url_manager.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/kernel/managers/url_manager.php (revision 15601) +++ core/kernel/managers/url_manager.php (revision ) @@ -379,6 +379,20 @@ } /** + * Returns seo template by physical template + * + * @param string $physical_template + * @return string + * @access public + */ + public function getSeoTemplate($physical_template) + { + $mapping_key = $physical_template . ':' . $this->Application->GetVar('m_theme'); + + return isset($this->structureTemplateMapping[$mapping_key]) ? $this->structureTemplateMapping[$mapping_key] : ''; + } + + /** * Returns template name, that corresponds with given virtual (not physical) page id * * @param int $page_id @@ -454,4 +468,4 @@ return $vars; } -} \ No newline at end of file +} Index: core/install/upgrades.sql IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/install/upgrades.sql (revision 15650) +++ core/install/upgrades.sql (revision ) @@ -2887,3 +2887,5 @@ INSERT INTO SystemSettings VALUES(DEFAULT, 'RandomString', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSystem', 'la_config_RandomString', 'text', '', '', 60.09, 0, 1, NULL); INSERT INTO SystemSettings VALUES(DEFAULT, 'PlainTextCookies', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSystem', 'la_config_PlainTextCookies', 'text', '', '', 60.10, 0, 1, NULL); + +INSERT INTO SystemSettings VALUES(DEFAULT, 'ForceCanonicalUrls', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ForceCanonicalUrls', 'checkbox', '', '', 10.0125, 0, 0, NULL); Index: core/kernel/utility/http_query.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/kernel/utility/http_query.php (revision 15650) +++ core/kernel/utility/http_query.php (revision ) @@ -378,6 +378,19 @@ $this->Application->VerifyThemeId(); $this->Application->VerifyLanguageId(); } + + if ( !$this->Application->isAdmin && $this->Application->ConfigValue('ForceCanonicalUrls') ) { + $template = $this->Application->GetVar('t'); + $seo_template = $this->Application->getSeoTemplate($template); + + if ( $seo_template && $seo_template != $template ) { + $url_params = $this->getRedirectParams(); + $url_params['response_code'] = 301; + + trigger_error('Request url "' . $_SERVER['REQUEST_URI'] . '" points directly to physical template', E_USER_NOTICE); + $this->Application->Redirect($seo_template, $url_params); + } + } } /** Index: core/install/install_data.sql IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/install/install_data.sql (revision 15650) +++ core/install/install_data.sql (revision ) @@ -32,6 +32,7 @@ INSERT INTO SystemSettings VALUES(DEFAULT, 'PageHitCounter', '0', 'In-Portal', 'in-portal:configure_advanced', '', '', '', NULL, NULL, 0, 0, 0, NULL); INSERT INTO SystemSettings VALUES(DEFAULT, 'UseModRewrite', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_use_modrewrite', 'checkbox', '', '', 10.01, 0, 1, NULL); INSERT INTO SystemSettings VALUES(DEFAULT, 'ModRewriteUrlEnding', '.html', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ModRewriteUrlEnding', 'select', '', '=+||/=+/||.html=+.html', 10.011, 0, 0, NULL); +INSERT INTO SystemSettings VALUES(DEFAULT, 'ForceCanonicalUrls', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ForceCanonicalUrls', 'checkbox', '', '', 10.0125, 0, 0, NULL); INSERT INTO SystemSettings VALUES(DEFAULT, 'ForceModRewriteUrlEnding', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ForceModRewriteUrlEnding', 'checkbox', '', NULL, 10.012, 0, 0, 'hint:la_config_ForceModRewriteUrlEnding'); INSERT INTO SystemSettings VALUES(DEFAULT, 'UseContentLanguageNegotiation', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_UseContentLanguageNegotiation', 'checkbox', '', '', 10.013, 0, 0, NULL); INSERT INTO SystemSettings VALUES(DEFAULT, 'cms_DefaultDesign', '#default_design#', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_DefaultDesignTemplate', 'text', NULL, NULL, 10.02, 0, 0, NULL); @@ -1030,4 +1031,4 @@ INSERT INTO PromoBlockGroups VALUES (DEFAULT, 'Default Group', UNIX_TIMESTAMP(), '1', '7.00', '0.60', '1', 'fade', ''); INSERT INTO Modules VALUES ('Core', 'core/', 'adm', DEFAULT, 1, 1, '', 0, NULL, NULL); ~~-INSERT INTO Modules VALUES ('In-Portal', 'core/', 'm', DEFAULT, 1, 0, '', 0, NULL, NULL);~~ \ No newline at end of file +INSERT INTO Modules VALUES ('In-Portal', 'core/', 'm', DEFAULT, 1, 0, '', 0, NULL, NULL); Index: core/install/english.lang IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/install/english.lang (revision 15650) +++ core/install/english.lang (revision ) @@ -171,6 +171,7 @@ <PHRASE Label="la_config_ExcludeTemplateSectionsFromSearch" Module="Core" Type="1">RXhjbHVkZSB0ZW1wbGF0ZSBiYXNlZCBTZWN0aW9ucyBmcm9tIFNlYXJjaCBSZXN1bHRzIChpZS4gVXNlciBSZWdpc3RyYXRpb24p</PHRASE> <PHRASE Label="la_config_FilenameSpecialCharReplacement" Module="Core" Type="1">RmlsZW5hbWUgU3BlY2lhbCBDaGFyIFJlcGxhY2VtZW50</PHRASE> <PHRASE Label="la_config_first_day_of_week" Module="Core" Type="1">Rmlyc3QgRGF5IE9mIFdlZWs=</PHRASE> + <PHRASE Label="la_config_ForceCanonicalUrls" Module="Core" Type="1">Rm9yY2UgQ2Fub25pY2FsIFVSTHM=</PHRASE> <PHRASE Label="la_config_ForceImageMagickResize" Module="Core" Type="1">QWx3YXlzIHVzZSBJbWFnZU1hZ2ljayB0byByZXNpemUgaW1hZ2Vz</PHRASE> <PHRASE Label="la_config_ForceModRewriteUrlEnding" Module="Core" Type="1" Hint="VXNlciB3aWxsIGJlIGF1dG9tYXRpY2FsbHkgcmVkaXJlY3RlZCB0byB0aGUgc2VsZWN0ZWQgVXJsIEVuZGluZyBpbiBjYXNlIHdoZW4gY3VycmVudCBwYWdlIHVybCBoYXMgYSBkaWZmZXJlbnQgZW5kaW5n">Rm9yY2UgUmVkaXJlY3QgdG8gU2VsZWN0ZWQgVVJMIEVuZGluZw==</PHRASE> <PHRASE Label="la_config_force_http" Module="Core" Type="1">UmVkaXJlY3QgdG8gSFRUUCB3aGVuIFNTTCBpcyBub3QgcmVxdWlyZWQ=</PHRASE> @@ -2212,4 +2213,4 @@ <COUNTRY Iso="ZWE" Translation="WmltYmFid2U="/> </COUNTRIES> </LANGUAGE> ~~-</LANGUAGES>~~ \ No newline at end of file +</LANGUAGES> Index: core/kernel/application.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/kernel/application.php (revision 15650) +++ core/kernel/application.php (revision ) @@ -1702,6 +1702,18 @@ } /** + * Returns seo template by physical template + * + * @param string $physical_template + * @return string + * @access public + */ + public function getSeoTemplate($physical_template) + { + return $this->UrlManager->getSeoTemplate($physical_template); + } + + /** * Returns template name, that corresponds with given virtual (not physical) page id * * @param int $page_id

Notes
(0005313) alex (manager) 2012-12-05 03:11	Plan: 1. add new system setting "ForceCanonicalUrls" ("Force Canonical Urls") into "Configuration -> Website -> Advanced" section after "Force Redirect to Selected URL Ending" setting 1a. try using new "Add" button to ease system setting adding and then dump INSERT statement into install_data.sql/upgrades.sql file 2. create getSeoTemplate method in kUrlManager class (+ create facade method in kApplication class, like it's one with getPhysicalTemplate method), that will use "structureTemplateMapping" array (see getPhysicalTemplate method for example) to figure out given template's underlying TPL file (be careful, because that array has info about multiple themes in them; only match current theme). 3. add new check to the end of kHTTPQuery::AfterInit method code where parsed template will be given to kApplication::getSeoTemplate method and it turns out that real TPL path is present in url + setting enabled + has seo url do redirect to that seo url. 4. test with both mod-rewrite enabled and disabled 5. try putting TPL path into url, that is listed in ".smsignore" file - no redirect loop should happen 6. use trigger_error method to create notice about redirects performed this way; System Log will catch them automatically, when it's present.

(0005317) erik (manager) 2012-12-05 10:44	Patch attached. Needs testing

(0005319) alex (manager) 2012-12-06 04:10	1. method getSeoTemplate accepts physical templates as input and that's why it's parameter should be called $physical_template and not a $parsed_template 2. this is no need for preg_match('\|' . BASE_PATH check in kHTTPQuery::AfterInit method, because method getSeoTemplate will return empty string in case when we're on right seo template and not on physical one (should be done as I written in plan if this won't break anything) 3. no point in giving both "use_section" redirect parameter & seo_template to kApplication::Redirect method call, because: - with seo template given url will be to seo template - with empty string given + use_section parameter url will also be to seo template - with seo template given + use_section parameter the use_section parameter will have no effect Choose any of 3 proposed solutions in item 3. 4. getRedirectParams method not used (as in code before added code) and it will result in any extra url parameters passed to wrong url (from where we're doing a redirect) will be lost (e.g. "next_template" and so on) resulting in non working page displayed to user

(0005325) erik (manager) 2012-12-06 12:44	Patch version 2 attached. Needs testing

(0005332) alex (manager) 2012-12-11 03:06	1. no upgrade script

(0005333) erik (manager) 2012-12-11 04:07	Added insert-sql for new SystemSettings in upgrades.sql New patch attached. Needs testing.

(0005341) alex (manager) 2012-12-13 02:56	Works in general, but some minor issues fixed: 1. code was working in Admin Console but wasn't actually doing anything useful because admin template isn't listed

(0005342) alex (manager) 2012-12-13 02:57	Fix committed to 5.3.x branch. Commit Message: Fixes 0001433: Possibility of having 2 urls to a single page 1. Commit on behalf of Erik

Related Changesets
In-Portal CMS: 5.3.x r15652 Timestamp: 2012-12-13 02:57:24 Author: alex [ Details ] [ Diff ]	Fixes 0001433: Possibility of having 2 urls to a single page 1. Commit on behalf of Erik
	mod - /in-portal/branches/5.3.x/core/install/english.lang	[ Diff ] [ File ]
	mod - /in-portal/branches/5.3.x/core/install/install_data.sql	[ Diff ] [ File ]
	mod - /in-portal/branches/5.3.x/core/install/upgrades.sql	[ Diff ] [ File ]
	mod - /in-portal/branches/5.3.x/core/kernel/application.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.3.x/core/kernel/managers/url_manager.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.3.x/core/kernel/utility/http_query.php	[ Diff ] [ File ]

Issue History
Date Modified	Username	Field	Change
2012-12-13 02:57	alex	Note Added: 0005342
2012-12-13 02:57	alex	Status	reviewed and tested => resolved
2012-12-13 02:57	alex	Fixed in Version	=> 5.3.0-B1
2012-12-13 02:57	alex	Resolution	open => fixed
2012-12-13 02:57	alex	Changeset attached	5.3.x r15652
2012-12-13 02:56	alex	Note Added: 0005341
2012-12-13 02:56	alex	Status	needs testing => reviewed and tested
2012-12-13 02:54	alex	File Added: 2_urls_to_single_page_1433_v4.patch
2012-12-11 04:07	erik	Note Added: 0005333
2012-12-11 04:07	erik	Assigned To	erik => alex
2012-12-11 04:07	erik	Status	needs work => needs testing
2012-12-11 04:06	erik	File Added: 2_urls_to_single_page_1433_v3.patch
2012-12-11 03:06	alex	Note Added: 0005332
2012-12-11 03:06	alex	Assigned To	alex => erik
2012-12-11 03:06	alex	Status	needs testing => needs work
2012-12-06 12:44	erik	Note Added: 0005325
2012-12-06 12:44	erik	Assigned To	erik => alex
2012-12-06 12:44	erik	Status	needs work => needs testing
2012-12-06 12:43	erik	File Added: 2_urls_to_single_page_1433_v2.patch
2012-12-06 04:10	alex	Note Added: 0005319
2012-12-06 04:10	alex	Assigned To	alex => erik
2012-12-06 04:10	alex	Status	needs testing => needs work
2012-12-05 10:44	erik	Note Added: 0005317
2012-12-05 10:44	erik	Assigned To	=> alex
2012-12-05 10:44	erik	Developer	=> erik
2012-12-05 10:44	erik	Status	active => needs testing
2012-12-05 10:44	erik	File Added: 2_urls_to_single_page_1433.patch
2012-12-05 03:11	alex	Note Added: 0005313
2012-12-05 02:43	alex	Description Updated	View Revisions
2012-11-05 11:09	alex	New Issue
2012-11-05 11:09	alex	Reference	=> https://groups.google.com/d/topic/in-portal-bugs/_PqTRECoiHk/discussion
2012-11-05 11:09	alex	Change Log Message	=> Fixes multiple urls pointing to a single page problem
2012-11-05 11:09	alex	Estimate Points	=> 1

Relationships [ Relation Graph ] [ Dependency Graph ]

In-Portal Issue Tracker