From c68f6161e770fa12e5c5aa244983748d393bd26a Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 11 Oct 2016 19:53:54 +0200
Subject: [PATCH] Cleanup / resolved todos

---
 com.woltlab.wcf/option.xml                    |  3 +
 com.woltlab.wcf/templates/pageHeader.tpl      |  1 -
 .../acp/update_com.woltlab.wcf_3.0.0.php      |  2 +
 wcfsetup/install/files/js/WCF.js              |  4 --
 .../files/js/WoltLabSuite/Core/Language.js    |  3 -
 .../files/lib/form/LoginForm.class.php        |  4 +-
 .../install/files/lib/system/WCF.class.php    | 33 +----------
 .../lib/system/request/RouteHandler.class.php | 57 +++++--------------
 wcfsetup/install/lang/de.xml                  |  6 --
 9 files changed, 21 insertions(+), 92 deletions(-)

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 406c987625..a64d841ffe 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -460,11 +460,14 @@
 				<optiontype>textarea</optiontype>
 			</option>
 			
+			<!-- legacy option, no longer used -->
 			<option name="url_legacy_mode">
 				<categoryname>hidden</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 			</option>
+			<!-- /legacy option, no longer used -->
+			
 			<option name="url_omit_index_php">
 				<categoryname>general.page.seo</categoryname>
 				<optiontype>boolean</optiontype>
diff --git a/com.woltlab.wcf/templates/pageHeader.tpl b/com.woltlab.wcf/templates/pageHeader.tpl
index 1516b16d91..b87fa4880c 100644
--- a/com.woltlab.wcf/templates/pageHeader.tpl
+++ b/com.woltlab.wcf/templates/pageHeader.tpl
@@ -16,7 +16,6 @@
 			</div>
 		</div>
 		
-		{* TODO: this should be moved somewhere else and turned into an option *}
 		<script data-relocate="true">
 			require(['WoltLabSuite/Core/Ui/Page/Header/Fixed'], function(UiPageHeaderFixed) {
 				UiPageHeaderFixed.init();
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_3.0.0.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_3.0.0.php
index 16cc81df2f..e095d24219 100644
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_3.0.0.php
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_3.0.0.php
@@ -8,3 +8,5 @@
 // see: https://github.com/WoltLab/WCF/commit/e1b6d09d705d6c153612bb36c70efbdb3d42871e
 // 4. Generate signature_secret
 // see: https://github.com/WoltLab/WCF/commit/9fe8b50cc6011628e2ac72d6e80c9561312503f4
+// 5. add application configs
+// if (!file_exists($appConfig)) { Package::writeConfigFile($appPackageID); }
diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index a43170be3a..da301d810b 100755
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -788,10 +788,6 @@ $.extend(WCF, {
 	 * @return	string
 	 */
 	convertLegacyURL: function(url) {
-		if (URL_LEGACY_MODE) {
-			return url;
-		}
-		
 		return url.replace(/^index\.php\/(.*?)\/\?/, function(match, controller) {
 			var $parts = controller.split(/([A-Z][a-z0-9]+)/);
 			var $controller = '';
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Language.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Language.js
index 1030de3989..915221a33b 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Language.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Language.js
@@ -49,9 +49,6 @@ define(['Dictionary', './Template'], function(Dictionary, Template) {
 			var value = _languageItems.get(key);
 			
 			if (value === undefined) {
-				// TODO
-				//console.warn("Attempt to retrieve unknown phrase '" + key + "'.");
-				//console.warn(new Error().stack);
 				return key;
 			}
 			
diff --git a/wcfsetup/install/files/lib/form/LoginForm.class.php b/wcfsetup/install/files/lib/form/LoginForm.class.php
index 4a4224c8ae..92eafd8813 100644
--- a/wcfsetup/install/files/lib/form/LoginForm.class.php
+++ b/wcfsetup/install/files/lib/form/LoginForm.class.php
@@ -78,8 +78,6 @@ class LoginForm extends \wcf\acp\form\LoginForm {
 		}
 		
 		// drop index.php
-		if (!URL_LEGACY_MODE) {
-			$this->url = preg_replace('~index\.php~', '', $this->url);
-		}
+		$this->url = preg_replace('~index\.php~', '', $this->url);
 	}
 }
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 6a1d27cb63..42dba0e2e0 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -454,8 +454,6 @@ class WCF {
 		// register WCF as application
 		self::$applications['wcf'] = ApplicationHandler::getInstance()->getApplicationByID(1);
 		
-		// TODO: what exactly should the base href represent and how should it be calculated, also because
-		// defining it here eventually breaks the ACP due to tpl initialization occurs first
 		if (!class_exists(WCFACP::class, false)) {
 			static::getTPL()->assign('baseHref', self::$applications['wcf']->getPageURL());
 		}
@@ -529,8 +527,6 @@ class WCF {
 		if (class_exists($className) && is_subclass_of($className, IApplication::class)) {
 			// include config file
 			$configPath = $packageDir . PackageInstallationDispatcher::CONFIG_FILE;
-			
-			// TODO: this should be done during update instead, remove this before any public release
 			if (!file_exists($configPath)) {
 				Package::writeConfigFile($package->packageID);
 			}
@@ -838,34 +834,7 @@ class WCF {
 	 * @return	string
 	 */
 	public static function getRequestURI() {
-		if (URL_LEGACY_MODE) {
-			// resolve path and query components
-			$scriptName = $_SERVER['SCRIPT_NAME'];
-			$pathInfo = RouteHandler::getPathInfo();
-			if (empty($pathInfo)) {
-				// bug fix if URL omits script name and path
-				$scriptName = substr($scriptName, 0, strrpos($scriptName, '/'));
-			}
-			
-			$path = str_replace('/index.php', '', str_replace($scriptName, '', $_SERVER['REQUEST_URI']));
-			if (!StringUtil::isUTF8($path)) {
-				$path = StringUtil::convertEncoding('ISO-8859-1', 'UTF-8', $path);
-			}
-			$path = FileUtil::removeLeadingSlash($path);
-			$baseHref = self::getTPL()->get('baseHref');
-			
-			if (!empty($path) && mb_strpos($path, '?') !== 0) {
-				$baseHref .= 'index.php/';
-			}
-			
-			return $baseHref . $path;
-		}
-		else {
-			$url = preg_replace('~^(https?://[^/]+)(?:/.*)?$~', '$1', self::getTPL()->get('baseHref'));
-			$url .= $_SERVER['REQUEST_URI'];
-			
-			return $url;
-		}
+		return preg_replace('~^(https?://[^/]+)(?:/.*)?$~', '$1', self::getTPL()->get('baseHref')) . $_SERVER['REQUEST_URI'];
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/request/RouteHandler.class.php b/wcfsetup/install/files/lib/system/request/RouteHandler.class.php
index 548f3a379f..b15afff607 100644
--- a/wcfsetup/install/files/lib/system/request/RouteHandler.class.php
+++ b/wcfsetup/install/files/lib/system/request/RouteHandler.class.php
@@ -296,50 +296,21 @@ class RouteHandler extends SingletonFactory {
 		if (self::$pathInfo === null) {
 			self::$pathInfo = '';
 			
-			if (!URL_LEGACY_MODE || RequestHandler::getInstance()->isACPRequest()) {
-				// WCF 2.1: ?Foo/Bar/
-				if (!empty($_SERVER['QUERY_STRING'])) {
-					// don't use parse_str as it replaces dots with underscores
-					$components = explode('&', $_SERVER['QUERY_STRING']);
-					for ($i = 0, $length = count($components); $i < $length; $i++) {
-						$component = $components[$i];
-						
-						$pos = mb_strpos($component, '=');
-						if ($pos !== false && $pos + 1 === mb_strlen($component)) {
-							$component = mb_substr($component, 0, -1);
-							$pos = false;
-						}
-						
-						if ($pos === false) {
-							self::$pathInfo = urldecode($component);
-							break;
-						}
+			if (!empty($_SERVER['QUERY_STRING'])) {
+				// don't use parse_str as it replaces dots with underscores
+				$components = explode('&', $_SERVER['QUERY_STRING']);
+				for ($i = 0, $length = count($components); $i < $length; $i++) {
+					$component = $components[$i];
+					
+					$pos = mb_strpos($component, '=');
+					if ($pos !== false && $pos + 1 === mb_strlen($component)) {
+						$component = mb_substr($component, 0, -1);
+						$pos = false;
 					}
-				}
-			}
-			
-			// WCF 2.0: index.php/Foo/Bar/
-			if ((URL_LEGACY_MODE && !RequestHandler::getInstance()->isACPRequest()) || (RequestHandler::getInstance()->isACPRequest() && empty(self::$pathInfo))) {
-				if (isset($_SERVER['PATH_INFO'])) {
-					self::$pathInfo = $_SERVER['PATH_INFO'];
-				}
-				else if (isset($_SERVER['ORIG_PATH_INFO'])) {
-					self::$pathInfo = $_SERVER['ORIG_PATH_INFO'];
-						
-					// in some configurations ORIG_PATH_INFO contains the path to the file
-					// if the intended PATH_INFO component is empty
-					if (!empty(self::$pathInfo)) {
-						if (isset($_SERVER['SCRIPT_NAME']) && (self::$pathInfo == $_SERVER['SCRIPT_NAME'])) {
-							self::$pathInfo = '';
-						}
-						
-						if (isset($_SERVER['PHP_SELF']) && (self::$pathInfo == $_SERVER['PHP_SELF'])) {
-							self::$pathInfo = '';
-						}
-						
-						if (isset($_SERVER['SCRIPT_URL']) && (self::$pathInfo == $_SERVER['SCRIPT_URL'])) {
-							self::$pathInfo = '';
-						}
+					
+					if ($pos === false) {
+						self::$pathInfo = urldecode($component);
+						break;
 					}
 				}
 			}
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 42dfad2a1e..dcaacea235 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1144,12 +1144,6 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 		<item name="wcf.acp.option.show_update_notice_frontend"><![CDATA[Hinweis bei neuen Updates für Pakete im Frontend anzeigen]]></item>
 		<item name="wcf.acp.option.url_omit_index_php"><![CDATA[Link-Umschreibungen aktivieren]]></item>
 		<item name="wcf.acp.option.url_omit_index_php.description"><![CDATA[Wandelt Links in eine vereinfachte Form um, aus „http://example.com/index.php?thread/1-dies-ist-ein-test/“ wird „http://example.com/thread/1-dies-ist-ein-test/“ und vergleichbar. Achtung: Die Aktivierung der Link-Umschreibungen erfordert Rewrite-Unterstützung in {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} Webserver sowie eine entsprechende Konfiguration. Fehlerhafte Einstellungen können hier dazu führen, dass Links nicht mehr aufrufbar sind.<br>Eine Anleitung zur Einrichtung {if LANGUAGE_USE_INFORMAL_VARIANT}deines{else}Ihres{/if} Webservers {if LANGUAGE_USE_INFORMAL_VARIANT}findest du{else}finden Sie{/if} in diesem Artikel: <a href="{@$__wcf->getPath()}acp/dereferrer.php?url=https%3A%2F%2Fblog.woltlab.com%2Fentry%2F68-konfiguration-von-benutzerfreundlichen-urls-seo-urls%2F" class="externalURL">Konfiguration von benutzerfreundlichen URLs (SEO-URLs)</a>]]></item>
-		<item name="wcf.acp.option.url_legacy_mode"><![CDATA[Kompatibilitätsmodus für Links aktivieren]]></item>
-		<item name="wcf.acp.option.url_legacy_mode.description"><![CDATA[Die Aktivierung dieses Modus erzwingt die URL-Struktur von WoltLab Community Framework 2.0 und sollte nur aus Kompatibilitätsgründen zur Beibehaltung der Link-Gültigkeit aktiviert werden:
-<ul class="nativeList">
-	<li>WCF 2.0: „index.php/Thread/123-Title/“</li>
-	<li>WCF 2.1+: „index.php?thread/123-title/“</li>
-</ul>]]></item>
 		<item name="wcf.acp.option.module_wcf_ad"><![CDATA[Werbung]]></item>
 		<item name="wcf.acp.option.module_wcf_ad.description"><![CDATA[Aktiviert die <a href="{link controller='AdList'}{/link}">Verwaltung von Werbe-Anzeigen</a>.]]></item>
 		<item name="wcf.acp.option.captcha_type"><![CDATA[Captcha-Art]]></item>
-- 
2.20.1