In-Portal Issue Tracker

Welcome to the In-Portal Open Source CMS Issue Tracker! This is a central management / tracking tool for all types of tasks / issues / bugs for the In-Portal Project. Before reporting any issues, please make sure to read the Guide into Issue Tracker and How to Properly Test and Report Bugs!

Viewing Issue Advanced Details [ Jump to Notes ] [ Wiki ]

[ View Simple ] [ Issue History ] [ Print ]

Tags

No tags attached.

Reference

https://groups.google.com/d/topic/in-portal-bugs/JfZfDA0uuko/discussion

Change Log Message

Fixes redirect with language negotiation

Estimate Points

Attached Files

first_visit_language_1432.patch [^] (1,532 bytes) 2012-11-07 09:29 [Show Content]

Index: languages_item.php
===================================================================
--- languages_item.php	(revision 15602)
+++ languages_item.php	(working copy)
@@ -207,19 +207,14 @@
 					$res = parent::Load(1, 'PrimaryLang', $cachable);
 				}
 
-				if (
-					!$this->Application->isAdmin && !defined('GW_NOTIFY') && preg_match('/[\/]{0,1}index.php[\/]{0,1}/', $_SERVER['PHP_SELF']) &&
-					$this->Application->HttpQuery->isEmptyUrl() && $this->Application->ConfigValue('UseContentLanguageNegotiation')
+				if ( !$this->Application->isAdmin && !defined('GW_NOTIFY') && preg_match('/[\/]{0,1}index.php[\/]{0,1}/', $_SERVER['PHP_SELF']) && $this->Application->ConfigValue('UseContentLanguageNegotiation') && !kHTTPQuery::refererIsOurSite()
 				) {
 					$language_id = $this->processAcceptLanguage();
 
-					if ($language_id != $this->GetID()) {
+					if ( $language_id != $this->GetID() ) {
 						// redirect to same page with found language
-						$url_params = Array (
-							'm_cat_id' => 0, 'm_cat_page' => 1,
-							'm_lang' => $language_id, 'm_opener' => 's',
-							'pass' => 'm'
-						);
+						$url_params = Array ('m_cat_id' => 0, 'm_cat_page' => 1, 'm_lang' => $language_id,
+							'm_opener' => 's', 'pass' => 'm');
 
 						$this->_addLoginState($url_params);
 						$exception = new kRedirectException('Redirect into language ID = <strong>' . $language_id . '</strong> according to "<strong>Accepted-Language</strong>" header "<strong>' . $_SERVER['HTTP_ACCEPT_LANGUAGE'] . '</strong>"');

first_visit_language_1432_v3.patch [^] (1,551 bytes) 2012-11-07 11:25 [Show Content]

Index: languages_item.php
===================================================================
--- languages_item.php	(revision 15602)
+++ languages_item.php	(working copy)
@@ -207,19 +207,14 @@
 					$res = parent::Load(1, 'PrimaryLang', $cachable);
 				}
 
-				if (
-					!$this->Application->isAdmin && !defined('GW_NOTIFY') && preg_match('/[\/]{0,1}index.php[\/]{0,1}/', $_SERVER['PHP_SELF']) &&
-					$this->Application->HttpQuery->isEmptyUrl() && $this->Application->ConfigValue('UseContentLanguageNegotiation')
+				if ( !$this->Application->isAdmin && !defined('GW_NOTIFY') && preg_match('/[\/]{0,1}index.php[\/]{0,1}/', $_SERVER['PHP_SELF']) && $this->Application->ConfigValue('UseContentLanguageNegotiation') && !$this->Application->HttpQuery->refererIsOurSite()
 				) {
 					$language_id = $this->processAcceptLanguage();
 
-					if ($language_id != $this->GetID()) {
+					if ( $language_id != $this->GetID() ) {
 						// redirect to same page with found language
-						$url_params = Array (
-							'm_cat_id' => 0, 'm_cat_page' => 1,
-							'm_lang' => $language_id, 'm_opener' => 's',
-							'pass' => 'm'
-						);
+						$url_params = Array ('m_cat_id' => 0, 'm_cat_page' => 1, 'm_lang' => $language_id,
+							'm_opener' => 's', 'pass' => 'm');
 
 						$this->_addLoginState($url_params);
 						$exception = new kRedirectException('Redirect into language ID = <strong>' . $language_id . '</strong> according to "<strong>Accepted-Language</strong>" header "<strong>' . $_SERVER['HTTP_ACCEPT_LANGUAGE'] . '</strong>"');

first_visit_language_1432_v4.patch [^] (913 bytes) 2012-11-08 07:51 [Show Content]

Index: units/languages/languages_item.php
===================================================================
--- units/languages/languages_item.php	(revision 15607)
+++ units/languages/languages_item.php	(working copy)
@@ -209,11 +209,11 @@
 
 				if (
 					!$this->Application->isAdmin && !defined('GW_NOTIFY') && preg_match('/[\/]{0,1}index.php[\/]{0,1}/', $_SERVER['PHP_SELF']) &&
-					$this->Application->HttpQuery->isEmptyUrl() && $this->Application->ConfigValue('UseContentLanguageNegotiation')
+					!$this->Application->HttpQuery->refererIsOurSite() && $this->Application->ConfigValue('UseContentLanguageNegotiation')
 				) {
 					$language_id = $this->processAcceptLanguage();
 
-					if ($language_id != $this->GetID()) {
+					if ( $language_id != $this->GetID() ) {
 						// redirect to same page with found language
 						$url_params = Array (
 							'm_cat_id' => 0, 'm_cat_page' => 1,

Relationships [ Relation Graph ] [ Dependency Graph ]

Notes
(0005265) erik (manager) 2012-11-07 06:21	Done. Patch attached. Needs testing

(0005268) alex (manager) 2012-11-07 07:28	1. Proposed solution in task advised to REPLACE current check for empty url with referrer check. Please re-read task and fix.

(0005275) erik (manager) 2012-11-07 09:31	1. Removed current check for empty url 2. Improved code formatting in work area (by use automatic formatting of IDE).

(0005286) alex (manager) 2012-11-07 10:59	1. Used method "kHTTPQuery::refererIsOurSite" isn't declared as static and notice is issued on each call. Please look at other code, that uses kHTTPQuery class and how it's been actually used. 2. Don't delete old patch version, but add "_vN" (e.g. "_v2", "_v3", etc.) to patch number and upload it. This way later on comments can be matched to uploaded patches.

(0005287) erik (manager) 2012-11-07 11:26	Fixed usage of non-static method. New patch attached. Needs testing.

(0005291) alex (manager) 2012-11-08 07:53	In "first_visit_language_1432_v4.patch" patch some changes that were not related to fixing were reverted and code rearranged to easily see what actually was changed.

(0005292) alex (manager) 2012-11-08 07:53	OK

(0005293) alex (manager) 2012-11-08 07:54	Fix committed to 5.2.x branch. Commit Message: Fixes 0001432: Change first visit detection with language negotiation enabled

Related Changesets
In-Portal CMS: 5.2.x r15621 Timestamp: 2012-11-08 07:54:14 Author: alex [ Details ] [ Diff ]	Fixes 0001432: Change first visit detection with language negotiation enabled
	mod - /in-portal/branches/5.2.x/core/units/languages/languages_item.php	[ Diff ] [ File ]

Issue History
Date Modified	Username	Field	Change
2012-11-08 07:54	alex	Changeset attached	5.2.x r15621
2012-11-08 07:54	alex	Note Added: 0005293
2012-11-08 07:54	alex	Status	reviewed and tested => resolved
2012-11-08 07:54	alex	Fixed in Version	=> 5.2.1-B1
2012-11-08 07:54	alex	Resolution	open => fixed
2012-11-08 07:53	alex	Note Added: 0005292
2012-11-08 07:53	alex	Status	needs testing => reviewed and tested
2012-11-08 07:53	alex	Note Added: 0005291
2012-11-08 07:51	alex	File Added: first_visit_language_1432_v4.patch
2012-11-07 11:26	erik	Note Added: 0005287
2012-11-07 11:26	erik	Assigned To	erik => alex
2012-11-07 11:26	erik	Status	needs work => needs testing
2012-11-07 11:25	erik	File Added: first_visit_language_1432_v3.patch
2012-11-07 10:59	alex	Note Added: 0005286
2012-11-07 10:59	alex	Assigned To	alex => erik
2012-11-07 10:59	alex	Status	needs testing => needs work
2012-11-07 09:31	erik	Note Added: 0005275
2012-11-07 09:31	erik	Assigned To	erik => alex
2012-11-07 09:31	erik	Status	needs work => needs testing
2012-11-07 09:29	erik	File Added: first_visit_language_1432.patch
2012-11-07 09:29	erik	File Deleted: first_visit_language_1432.patch
2012-11-07 07:28	alex	Note Added: 0005268
2012-11-07 07:28	alex	Assigned To	=> erik
2012-11-07 07:28	alex	Status	needs testing => needs work
2012-11-07 06:21	erik	Note Added: 0005265
2012-11-07 06:21	erik	Developer	=> erik
2012-11-07 06:21	erik	Status	active => needs testing
2012-11-07 06:21	erik	File Added: first_visit_language_1432.patch
2012-11-05 11:02	alex	New Issue
2012-11-05 11:02	alex	Reference	=> https://groups.google.com/d/topic/in-portal-bugs/JfZfDA0uuko/discussion
2012-11-05 11:02	alex	Change Log Message	=> Fixes redirect with language negotiation
2012-11-05 11:02	alex	Estimate Points	=> 1

Web Development by Intechnic

In-Portal Open Source CMS