Send an "X-Ajax-Location" header to redirect upon Ajax requests (see #…

…5647)
contao · Sep 26, 2013 · 6f8d8ac · 6f8d8ac
1 parent 3503e2e
commit 6f8d8ac
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 29 deletions.
diff --git a/assets/contao/js/core-uncompressed.js b/assets/contao/js/core-uncompressed.js
@@ -512,10 +512,10 @@ var AjaxRequest =
 		// Send request
 		if (publish) {
 			image.src = image.src.replace('invisible.gif', 'visible.gif');
-			new Request({'url':window.location.href}).get({'tid':id, 'state':1});
+			new Request.Contao({'url':window.location.href}).get({'tid':id, 'state':1});
 		} else {
 			image.src = image.src.replace('visible.gif', 'invisible.gif');
-			new Request({'url':window.location.href}).get({'tid':id, 'state':0});
+			new Request.Contao({'url':window.location.href}).get({'tid':id, 'state':0});
 		}
 
 		return false;
@@ -1184,13 +1184,13 @@ var Backend =
     				pid = el.getPrevious('li').get('id').replace(/li_/, ''),
     				req = window.location.search.replace(/id=[0-9]*/, 'id=' + id) + '&act=cut&mode=1&pid=' + pid,
     				href = window.location.href.replace(/\?.*$/, '');
-    			new Request({'url':href+req}).get();
+    			new Request.Contao({'url':href+req}).get();
     		} else if (el.getParent('ul')) {
     			var id = el.get('id').replace(/li_/, ''),
     				pid = el.getParent('ul').get('id').replace(/ul_/, ''),
     				req = window.location.search.replace(/id=[0-9]*/, 'id=' + id) + '&act=cut&mode=2&pid=' + pid,
     				href = window.location.href.replace(/\?.*$/, '');
-    			new Request({'url':href+req}).get();
+    			new Request.Contao({'url':href+req}).get();
     		}
     	});
 	},

diff --git a/assets/contao/js/core.js b/assets/contao/js/core.js
diff --git a/assets/mootools/mootao/Mootao-uncompressed.js b/assets/mootools/mootao/Mootao-uncompressed.js
@@ -44,7 +44,13 @@ Request.Contao = new Class(
 	},
 
 	success: function(text) {
-		var json;
+		var url = this.getHeader('X-Ajax-Location'),
+			json;
+
+		if (url) {
+			location.replace(url);
+			return;
+		}
 
 		// Support both plain text and JSON responses
 		try	{

diff --git a/assets/mootools/mootao/Mootao.js b/assets/mootools/mootao/Mootao.js
diff --git a/system/docs/CHANGELOG.md b/system/docs/CHANGELOG.md
@@ -4,6 +4,9 @@ Contao Open Source CMS Changelog
 Version 3.2.beta1 (2013-XX-XX)
 ------------------------------
 
+### Changed
+Send an "X-Ajax-Location" header to redirect upon Ajax requests (see #5647).
+
 ### New
 Added new DCA table config flags (see #5254):
 

diff --git a/system/initialize.php b/system/initialize.php
@@ -256,7 +256,8 @@ class_alias('Contao\\ModuleLoader', 'ModuleLoader');
 	// Force a JavaScript redirect upon Ajax requests (IE requires absolute link)
 	if (Environment::get('isAjaxRequest'))
 	{
-		echo '<script>location.replace("' . Environment::get('base') . 'contao/")</script>';
+		header('X-Ajax-Location: ' . Environment::get('base') . 'contao/');
+		exit;
 	}
 	else
 	{

diff --git a/system/modules/core/classes/BackendUser.php b/system/modules/core/classes/BackendUser.php
@@ -190,13 +190,6 @@ public function authenticate()
 			$strRedirect .= '?referer=' . base64_encode(\Environment::get('request'));
 		}
 
-		// Force JavaScript redirect on Ajax requests (IE requires an absolute link)
-		if (\Environment::get('isAjaxRequest'))
-		{
-			echo '<script>location.replace("' . \Environment::get('base') . $strRedirect . '")</script>';
-			exit;
-		}
-
 		\Controller::redirect($strRedirect);
 	}
 

diff --git a/system/modules/core/library/Contao/Controller.php b/system/modules/core/library/Contao/Controller.php
@@ -2078,15 +2078,16 @@ public static function addToUrl($strRequest)
 	 */
 	public static function reload()
 	{
-		$strLocation = \Environment::get('url') . \Environment::get('requestUri');
+		$strLocation = \Environment::get('uri');
 
 		// Ajax request
 		if (\Environment::get('isAjaxRequest'))
 		{
-			echo $strLocation;
+			header('X-Ajax-Location: ' . $strLocation);
 			exit;
 		}
 
+		// Headers have been sent before
 		if (headers_sent())
 		{
 			exit;
@@ -2107,19 +2108,26 @@ public static function redirect($strLocation, $intStatus=303)
 	{
 		$strLocation = str_replace('&amp;', '&', $strLocation);
 
+		// Make the location an absolute URL
+		if (!preg_match('@^https?://@i', $strLocation))
+		{
+			$strLocation = \Environment::get('base') . $strLocation;
+		}
+
 		// Ajax request
 		if (\Environment::get('isAjaxRequest'))
 		{
-			echo $strLocation;
+			header('X-Ajax-Location: ' . $strLocation);
 			exit;
 		}
 
+		// Headers have been sent before
 		if (headers_sent())
 		{
 			exit;
 		}
 
-		// Header
+		// Add the HTTP header
 		switch ($intStatus)
 		{
 			case 301:
@@ -2139,16 +2147,7 @@ public static function redirect($strLocation, $intStatus=303)
 				break;
 		}
 
-		// Check the target address
-		if (preg_match('@^https?://@i', $strLocation))
-		{
-			header('Location: ' . $strLocation);
-		}
-		else
-		{
-			header('Location: ' . \Environment::get('base') . $strLocation);
-		}
-
+		header('Location: ' . $strLocation);
 		exit;
 	}
 

diff --git a/system/modules/core/library/Contao/Environment.php b/system/modules/core/library/Contao/Environment.php
@@ -320,6 +320,17 @@ protected static function url()
 	}
 
 
+	/**
+	 * Return the current URL with path or query string
+	 *
+	 * @return string The URL
+	 */
+	protected static function uri()
+	{
+		return static::get('url') . static::get('requestUri');
+	}
+
+
 	/**
 	 * Return the real REMOTE_ADDR even if a proxy server is used
 	 *