In-Portal Issue Tracker

Index: core/kernel/application.php
===================================================================
--- core/kernel/application.php	(revision 13134)
+++ core/kernel/application.php	(working copy)
@@ -1927,6 +1927,15 @@
 		if (array_key_exists('js_redirect', $params)) {
 			unset($params['js_redirect']);
 		}
+		
+		// allows to send custom responce code along with redirect header
+		if (array_key_exists('response_code', $params)) {
+			$response_code = (int)$params['response_code'];
+			unset($params['response_code']);
+		}
+		else {
+			$responce_code = 302; // Found
+		}
 
 		if (!array_key_exists('pass', $params)) {
 			$params['pass'] = 'all';
@@ -1967,7 +1976,7 @@
 					// no output before -> redirect using HTTP header
 
 //					header('HTTP/1.1 302 Found');
-					header("$location");
+					header("$location", true, $response_code);
 				}
 			}
 		}
Index: core/kernel/utility/http_query.php
===================================================================
--- core/kernel/utility/http_query.php	(revision 13134)
+++ core/kernel/utility/http_query.php	(working copy)
@@ -253,6 +253,13 @@
 			$this->Application->VerifyLanguageId();
 			$this->Application->VerifyThemeId();
 		}
+		
+		// redirect user to the same mod-rewrite page with 301 header
+		if ($this->Application->RewriteURLs() && !$this->Get('_mod_rw_url_')) {			
+			$url_params = $this->getRedirectParams();	
+			$url_params['response_code'] = 301; // Moved Permanently
+			$this->Application->Redirect('', $url_params);
+		}
 	}
 
 	function convertFiles()

Index: kernel/utility/http_query.php
===================================================================
--- kernel/utility/http_query.php	(revision 13128)
+++ kernel/utility/http_query.php	(working copy)
@@ -234,20 +234,31 @@
 
 	function AfterInit()
 	{
-//		$vars = $this->processQueryString($this->Get(ENV_VAR_NAME));
-//		$this->AddParams($vars);
-//		$this->convertPostEvents();
-		//		if ($this->Application->RewriteURLs()) {
-		if ($this->Application->RewriteURLs() || $this->Get('_mod_rw_url_')) {
+		$rewrite_url = $this->Get('_mod_rw_url_');
+
+		if ($this->Application->RewriteURLs() || $rewrite_url) {
 			if (defined('DEBUG_MODE') && $this->Application->isDebugMode()) {
 				$this->Application->Debugger->profileStart('url_parsing');
 				$this->processRewriteURL();
-				$description = 'Parsing <b>MOD_REWRITE</b> url (template: <b>'.$this->Get('t').'</b>)';
+				$description = 'Parsing <b>MOD_REWRITE</b> url (template: <b>' . $this->Get('t') . '</b>)';
 				$this->Application->Debugger->profileFinish('url_parsing', $description);
 			}
 			else {
 				$this->processRewriteURL();
 			}
+
+			if (!defined('GW_NOTIFY') && !$rewrite_url && preg_match('/[\/]{0,1}index.php[\/]{0,1}/', $_SERVER['PHP_SELF'])) {
+				// not in payment gateway notification script AND
+				// rewrite url is missing AND not a script from tools folder AND
+				// "index.php" was visited
+				$url_params = $this->getRedirectParams();
+
+				// no idea about how to check, that given template require category to be passed with it, so pass anyway
+				$url_params['pass_category'] = 1;
+				$url_params['response_code'] = 301; // Moved Permanently
+
+				$this->Application->Redirect('', $url_params);
+			}
 		}
 		else {
 			$this->Application->VerifyLanguageId();

Index: kernel/utility/http_query.php
===================================================================
--- kernel/utility/http_query.php	(revision 13400)
+++ kernel/utility/http_query.php	(working copy)
@@ -234,20 +234,31 @@
 
 	function AfterInit()
 	{
-//		$vars = $this->processQueryString($this->Get(ENV_VAR_NAME));
-//		$this->AddParams($vars);
-//		$this->convertPostEvents();
-		//		if ($this->Application->RewriteURLs()) {
-		if ($this->Application->RewriteURLs() || $this->Get('_mod_rw_url_')) {
+		$rewrite_url = $this->Get('_mod_rw_url_');
+
+		if ($this->Application->RewriteURLs() || $rewrite_url) {
 			if (defined('DEBUG_MODE') && $this->Application->isDebugMode()) {
 				$this->Application->Debugger->profileStart('url_parsing');
 				$this->processRewriteURL();
-				$description = 'Parsing <b>MOD_REWRITE</b> url (template: <b>'.$this->Get('t').'</b>)';
+				$description = 'Parsing <b>MOD_REWRITE</b> url (template: <b>' . $this->Get('t') . '</b>)';
 				$this->Application->Debugger->profileFinish('url_parsing', $description);
 			}
 			else {
 				$this->processRewriteURL();
 			}
+
+			if (!defined('GW_NOTIFY') && !$rewrite_url && preg_match('/[\/]{0,1}index.php[\/]{0,1}/', $_SERVER['PHP_SELF'])) {
+				// not in payment gateway notification script AND
+				// rewrite url is missing AND not a script from tools folder AND
+				// "index.php" was visited
+				$url_params = $this->getRedirectParams();
+
+				// no idea about how to check, that given template require category to be passed with it, so pass anyway
+				$url_params['pass_category'] = 1;
+				$url_params['response_code'] = 301; // Moved Permanently
+
+				$this->Application->Redirect('', $url_params);
+			}
 		}
 		else {
 			$this->Application->VerifyLanguageId();

Index: kernel/utility/http_query.php
===================================================================
--- kernel/utility/http_query.php	(revision 13470)
+++ kernel/utility/http_query.php	(working copy)
@@ -249,10 +249,11 @@
 				$this->processRewriteURL();
 			}
 
-			if (!defined('GW_NOTIFY') && !$rewrite_url && preg_match('/[\/]{0,1}index.php[\/]{0,1}/', $_SERVER['PHP_SELF'])) {
+			if (!defined('GW_NOTIFY') && !$rewrite_url && preg_match('/[\/]{0,1}index.php[\/]{0,1}/', $_SERVER['PHP_SELF']) && ($this->Get('t') != 'index')) {
 				// not in payment gateway notification script AND
 				// rewrite url is missing AND not a script from tools folder AND
 				// "index.php" was visited
+				// not on index page
 				$url_params = $this->getRedirectParams();
 
 				// no idea about how to check, that given template require category to be passed with it, so pass anyway