From 8186015cd8fd6ba2ad09fd9f631cbe8e973cf565 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 17 Aug 2016 00:41:15 +0200
Subject: [PATCH] Unified AJAX endpoints

---
 com.woltlab.wcf/templates/headIncludeJavaScript.tpl      | 3 ++-
 wcfsetup/install/files/acp/templates/header.tpl          | 2 +-
 wcfsetup/install/files/js/WCF.Message.js                 | 2 +-
 wcfsetup/install/files/js/WCF.Poll.js                    | 2 +-
 wcfsetup/install/files/js/WCF.js                         | 4 ++--
 wcfsetup/install/files/js/WoltLabSuite/Core/Ajax.js      | 4 ++--
 .../install/files/js/WoltLabSuite/Core/Ajax/Request.js   | 2 +-
 wcfsetup/install/files/js/WoltLabSuite/Core/Upload.js    | 9 ++++++---
 8 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
index 2971d951b2..91f9d6b09f 100644
--- a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
+++ b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
@@ -5,10 +5,11 @@
 <script>
 	var SID_ARG_2ND	= '';
 	var WCF_PATH = '{@$__wcf->getPath()}';
+	var WSC_API_URL = '{@$__wcf->getPath()}';
 	var SECURITY_TOKEN = '{@SECURITY_TOKEN}';
 	var LANGUAGE_ID = {@$__wcf->getLanguage()->languageID};
 	var TIME_NOW = {@TIME_NOW};
-	var URL_LEGACY_MODE = {if URL_LEGACY_MODE}true{else}false{/if};
+	var URL_LEGACY_MODE = false;
 </script>
 
 {js application='wcf' file='require' bundle='WoltLabSuite.Core' core='true'}
diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index fdb3a3074d..6321d46f81 100644
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -18,7 +18,7 @@
 	<script>
 		var SID_ARG_2ND = '';
 		var WCF_PATH = '{@$__wcf->getPath()}';
-		var WSC_IS_ACP = true;
+		var WSC_API_URL = '{@$__wcf->getPath()}acp/';
 		var SECURITY_TOKEN = '{@SECURITY_TOKEN}';
 		var LANGUAGE_ID = {@$__wcf->getLanguage()->languageID};
 		var TIME_NOW = {@TIME_NOW};
diff --git a/wcfsetup/install/files/js/WCF.Message.js b/wcfsetup/install/files/js/WCF.Message.js
index 20e5393144..ea4ddc05b7 100644
--- a/wcfsetup/install/files/js/WCF.Message.js
+++ b/wcfsetup/install/files/js/WCF.Message.js
@@ -1598,7 +1598,7 @@ WCF.Message.Quote.Manager = Class.extend({
 		this._proxy = new WCF.Action.Proxy({
 			showLoadingOverlay: false,
 			success: $.proxy(this._success, this),
-			url: 'index.php/MessageQuote/?t=' + SECURITY_TOKEN
+			url: 'index.php?message-quote/&t=' + SECURITY_TOKEN
 		});
 		
 		this._toggleShowQuotes();
diff --git a/wcfsetup/install/files/js/WCF.Poll.js b/wcfsetup/install/files/js/WCF.Poll.js
index 62d3568414..e1194d3277 100644
--- a/wcfsetup/install/files/js/WCF.Poll.js
+++ b/wcfsetup/install/files/js/WCF.Poll.js
@@ -364,7 +364,7 @@ WCF.Poll.Manager = Class.extend({
 		this._polls = { };
 		this._proxy = new WCF.Action.Proxy({
 			success: $.proxy(this._success, this),
-			url: 'index.php/Poll/?t=' + SECURITY_TOKEN
+			url: 'index.php?poll/&t=' + SECURITY_TOKEN
 		});
 		
 		// init polls
diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index de998f50f9..2361562861 100755
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -1489,7 +1489,7 @@ WCF.Action.Proxy = Class.extend({
 			success: null,
 			suppressErrors: false,
 			type: 'POST',
-			url: 'index.php/AJAXProxy/?t=' + SECURITY_TOKEN,
+			url: 'index.php?ajax-proxy/&t=' + SECURITY_TOKEN,
 			aborted: null,
 			autoAbortPrevious: false
 		}, options);
@@ -6009,7 +6009,7 @@ WCF.Upload = Class.extend({
 		this._options = $.extend(true, {
 			action: 'upload',
 			multiple: false,
-			url: 'index.php/AJAXUpload/?t=' + SECURITY_TOKEN
+			url: 'index.php?ajax-upload/&t=' + SECURITY_TOKEN
 		}, options || { });
 		
 		this._options.url = WCF.convertLegacyURL(this._options.url);
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ajax.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ajax.js
index 4f38e2ef7b..c5846733f9 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ajax.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ajax.js
@@ -39,7 +39,7 @@ define(['AjaxRequest', 'Core', 'ObjectMap'], function(AjaxRequest, Core, ObjectM
 				options.pinData = true;
 				options.callbackObject = callbackObject;
 				
-				if (!options.url) options.url = 'index.php/AJAXProxy/?t=' + SECURITY_TOKEN;
+				if (!options.url) options.url = 'index.php?ajax-proxy/&t=' + SECURITY_TOKEN;
 				
 				request = new AjaxRequest(options);
 				
@@ -82,7 +82,7 @@ define(['AjaxRequest', 'Core', 'ObjectMap'], function(AjaxRequest, Core, ObjectM
 			
 			options.pinData = false;
 			options.callbackObject = null;
-			if (!options.url) options.url = 'index.php/AJAXProxy/?t=' + SECURITY_TOKEN;
+			if (!options.url) options.url = 'index.php?ajax-proxy/&t=' + SECURITY_TOKEN;
 			
 			var request = new AjaxRequest(options);
 			request.sendRequest();
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ajax/Request.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ajax/Request.js
index f5d09fc8a9..8dd9593f49 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ajax/Request.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ajax/Request.js
@@ -62,7 +62,7 @@ define(['Core', 'Language', 'Dom/ChangeListener', 'Dom/Util', 'Ui/Dialog', 'Wolt
 			
 			this._options.url = Core.convertLegacyUrl(this._options.url);
 			if (this._options.url.indexOf('index.php') === 0) {
-				this._options.url = WCF_PATH + (window.WSC_IS_ACP === true ? 'acp/' : '') + this._options.url;
+				this._options.url = WSC_API_URL + this._options.url;
 			}
 			
 			if (this._options.pinData) {
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Upload.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Upload.js
index 958c83f8f3..52b1fffe48 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Upload.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Upload.js
@@ -2,7 +2,7 @@
  * Uploads file via AJAX.
  * 
  * @author	Matthias Schmidt
- * @copyright	2001-2015 WoltLab GmbH
+ * @copyright	2001-2016 WoltLab GmbH
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @module	WoltLabSuite/Core/Upload
  */
@@ -30,10 +30,13 @@ define(['AjaxRequest', 'Core', 'Dom/ChangeListener', 'Language', 'Dom/Util', 'Do
 			// is true if every file from a multi-file selection is uploaded in its own request
 			singleFileRequests: false,
 			// url for uploading file
-			url: 'index.php/AJAXUpload/?t=' + SECURITY_TOKEN
+			url: 'index.php?ajax-upload/&t=' + SECURITY_TOKEN
 		}, options);
 		
-		this._options.url = WCF.convertLegacyURL(this._options.url);
+		this._options.url = Core.convertLegacyUrl(this._options.url);
+		if (this._options.url.indexOf('index.php') === 0) {
+			this._options.url = WSC_API_URL + this._options.url;
+		}
 		
 		this._buttonContainer = elById(buttonContainerId);
 		if (this._buttonContainer === null) {
-- 
2.20.1