From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 17 Oct 2012 15:35:44 +0000 (+0200)
Subject: Removed PAGE_URL option
X-Git-Tag: 2.0.0_Beta_1~859
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=96a01a11f130e18706907274ae70fb574acba1aa;p=GitHub%2FWoltLab%2FWCF.git

Removed PAGE_URL option
---

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index e9579f2f03..ad3391db82 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -149,10 +149,6 @@
 				<supporti18n>1</supporti18n>
 				<requirei18n>0</requirei18n>
 			</option>
-			<option name="page_url">
-				<categoryname>general.page</categoryname>
-				<optiontype>text</optiontype>
-			</option>
 			<option name="page_urls">
 				<categoryname>general.page</categoryname>
 				<optiontype>textarea</optiontype>
diff --git a/wcfsetup/install/files/lib/acp/action/InstallPackageAction.class.php b/wcfsetup/install/files/lib/acp/action/InstallPackageAction.class.php
index efd00b7ad2..314251b25b 100755
--- a/wcfsetup/install/files/lib/acp/action/InstallPackageAction.class.php
+++ b/wcfsetup/install/files/lib/acp/action/InstallPackageAction.class.php
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\acp\action;
 use wcf\action\AbstractDialogAction;
+use wcf\data\application\Application;
 use wcf\data\package\installation\queue\PackageInstallationQueue;
 use wcf\system\cache\CacheHandler;
 use wcf\system\exception\IllegalLinkException;
@@ -111,15 +112,15 @@ class InstallPackageAction extends AbstractDialogAction {
 				}
 					
 				// get domain path
-				$sql = "SELECT	domainName, domainPath
+				$sql = "SELECT	*
 					FROM	wcf".WCF_N."_application
 					WHERE	packageID = ?";
 				$statement = WCF::getDB()->prepareStatement($sql);
 				$statement->execute(array($packageID));
-				$row = $statement->fetchArray();
+				$application = new Application(null, $statement->fetchArray());
 				
 				// build redirect location
-				$location = $row['domainName'] . $row['domainPath'] . 'acp/index.php/PackageList/' . SID_ARG_1ST;
+				$location = $application->getPageURL() . 'acp/index.php/PackageList/' . SID_ARG_1ST;
 				
 				// show success
 				$this->data = array(
diff --git a/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php b/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php
index bf96e4b380..266482f96f 100644
--- a/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php
+++ b/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\acp\action;
 use wcf\action\AbstractDialogAction;
+use wcf\data\application\Application;
 use wcf\data\package\installation\queue\PackageInstallationQueue;
 use wcf\data\package\installation\queue\PackageInstallationQueueEditor;
 use wcf\data\package\Package;
@@ -129,15 +130,15 @@ class UninstallPackageAction extends InstallPackageAction {
 			}
 				
 			// get domain path
-			$sql = "SELECT	domainName, domainPath
+			$sql = "SELECT	*
 				FROM	wcf".WCF_N."_application
 				WHERE	packageID = ?";
 			$statement = WCF::getDB()->prepareStatement($sql);
 			$statement->execute(array($packageID));
-			$row = $statement->fetchArray();
+			$application = new Application(null, $statement->fetchArray());
 			
 			// build redirect location
-			$location = $row['domainName'] . $row['domainPath'] . 'acp/index.php/PackageList/' . SID_ARG_1ST;
+			$location = $application->getPageURL() . 'acp/index.php/PackageList/' . SID_ARG_1ST;
 			
 			// show success
 			$this->data = array(
diff --git a/wcfsetup/install/files/lib/data/application/Application.class.php b/wcfsetup/install/files/lib/data/application/Application.class.php
index f31e465e93..23916d4861 100644
--- a/wcfsetup/install/files/lib/data/application/Application.class.php
+++ b/wcfsetup/install/files/lib/data/application/Application.class.php
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\data\application;
 use wcf\data\DatabaseObject;
+use wcf\system\request\RouteHandler;
 
 /**
  * Represents an application.
@@ -27,4 +28,23 @@ class Application extends DatabaseObject {
 	 * @see	wcf\data\DatabaseObject::$databaseTableIndexIsIdentity
 	 */
 	protected static $databaseTableIndexIsIdentity = false;
+	
+	/**
+	 * absolute page URL
+	 * @var	string
+	 */
+	protected $pageURL = '';
+	
+	/**
+	 * Returns absolute page URL.
+	 * 
+	 * @return	string
+	 */
+	public function getPageURL() {
+		if (empty($this->pageURL)) {
+			$this->pageURL = RouteHandler::getProtocol() . $this->domainName . $this->domainPath;
+		}
+		
+		return $this->pageURL;
+	}
 }
diff --git a/wcfsetup/install/files/lib/system/cache/builder/ApplicationCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/ApplicationCacheBuilder.class.php
index 9041840629..f4739f4bfa 100644
--- a/wcfsetup/install/files/lib/system/cache/builder/ApplicationCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/ApplicationCacheBuilder.class.php
@@ -1,9 +1,10 @@
 <?php
 namespace wcf\system\cache\builder;
 use wcf\data\application\group\ApplicationGroup;
+use wcf\data\application\Application;
+use wcf\data\application\ApplicationList;
 use wcf\data\package\Package;
 use wcf\data\package\PackageList;
-use wcf\data\application;
 use wcf\system\WCF;
 
 /**
@@ -40,11 +41,11 @@ class ApplicationCacheBuilder implements ICacheBuilder {
 		
 		// current application is not part of an application group
 		if (!$row || ($row['groupID'] == 0) || $row['groupID'] === null) {
-			$data['application'] = array($packageID => new application\Application($packageID));
+			$data['application'] = array($packageID => new Application($packageID));
 		}
 		else {
 			// fetch applications
-			$applicationList = new application\ApplicationList();
+			$applicationList = new ApplicationList();
 			$applicationList->getConditionBuilder()->add("application.groupID = ?", array($row['groupID']));
 			$applicationList->sqlLimit = 0;
 			$applicationList->readObjects();
@@ -72,7 +73,7 @@ class ApplicationCacheBuilder implements ICacheBuilder {
 		}
 		
 		// fetch wcf pseudo-application
-		$data['wcf'] = new application\Application(1);
+		$data['wcf'] = new Application(1);
 		
 		return $data;
 	}
diff --git a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
index e5b9d141a8..dc49a2a67c 100644
--- a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
@@ -279,7 +279,7 @@ class PackageInstallationDispatcher {
 			$this->package = null;
 			
 			if ($package->isApplication) {
-				$host = RouteHandler::getHost();
+				$host = StringUtil::replace(RouteHandler::getProtocol(), '', RouteHandler::getHost());
 				$path = RouteHandler::getPath(array('acp'));
 				
 				// insert as application
diff --git a/wcfsetup/install/files/lib/system/request/LinkHandler.class.php b/wcfsetup/install/files/lib/system/request/LinkHandler.class.php
index 2e6ea02a68..81c5a40767 100644
--- a/wcfsetup/install/files/lib/system/request/LinkHandler.class.php
+++ b/wcfsetup/install/files/lib/system/request/LinkHandler.class.php
@@ -88,7 +88,7 @@ class LinkHandler extends SingletonFactory {
 				$application = ApplicationHandler::getInstance()->getPrimaryApplication();
 			}
 			
-			$url = $application->domainName.$application->domainPath.(RequestHandler::getInstance()->isACPRequest() ? 'acp/' : '').$url;
+			$url = $application->getPageURL() . (RequestHandler::getInstance()->isACPRequest() ? 'acp/' : '') . $url;
 		}
 		
 		// append previously removed anchor
diff --git a/wcfsetup/install/files/lib/system/request/RouteHandler.class.php b/wcfsetup/install/files/lib/system/request/RouteHandler.class.php
index a3e12a1dc8..e67879477e 100644
--- a/wcfsetup/install/files/lib/system/request/RouteHandler.class.php
+++ b/wcfsetup/install/files/lib/system/request/RouteHandler.class.php
@@ -31,6 +31,18 @@ class RouteHandler extends SingletonFactory {
 	 */
 	protected static $path = '';
 	
+	/**
+	 * HTTP protocol, either 'http://' or 'https://'
+	 * @var	string
+	 */
+	protected static $protocol = '';
+	
+	/**
+	 * HTTP encryption
+	 * @var	boolean
+	 */
+	protected static $secure = null;
+	
 	/**
 	 * list of available routes
 	 * @var	array<wcf\system\request\Route>
@@ -153,6 +165,36 @@ class RouteHandler extends SingletonFactory {
 		throw new SystemException("Unable to build route, no available route is satisfied.");
 	}
 	
+	/**
+	 * Returns true, if this is a secure connection.
+	 * 
+	 * @return	true
+	 */
+	public static function secureConnection() {
+		if (self::$secure === null) {
+			self::$secure = false;
+			
+			if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off' || $_SERVER['SERVER_PORT'] == 443) {
+				self::$secure = true;
+			}
+		}
+		
+		return self::$secure;
+	}
+	
+	/**
+	 * Returns HTTP protocol, either 'http://' or 'https://'.
+	 * 
+	 * @return	string
+	 */
+	public static function getProtocol() {
+		if (empty(self::$protocol)) {
+			self::$protocol = 'http' . (self::secureConnection() ? 's' : '') . '://';
+		}
+		
+		return self::$protocol;
+	}
+	
 	/**
 	 * Returns protocol and domain name.
 	 * 
@@ -160,13 +202,7 @@ class RouteHandler extends SingletonFactory {
 	 */
 	public static function getHost() {
 		if (empty(self::$host)) {
-			// get protocol and domain name
-			$protocol = 'http://';
-			if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off' || $_SERVER['SERVER_PORT'] == 443) {
-				$protocol = 'https://';
-			}
-			
-			self::$host = $protocol . $_SERVER['HTTP_HOST'];
+			self::$host = self::getProtocol() . $_SERVER['HTTP_HOST'];
 		}
 		
 		return self::$host;
diff --git a/wcfsetup/install/files/lib/util/HeaderUtil.class.php b/wcfsetup/install/files/lib/util/HeaderUtil.class.php
index 1348d1b4f4..4444f07f2b 100644
--- a/wcfsetup/install/files/lib/util/HeaderUtil.class.php
+++ b/wcfsetup/install/files/lib/util/HeaderUtil.class.php
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\util;
+use wcf\system\request\RouteHandler;
 use wcf\system\WCF;
 
 /**
@@ -17,7 +18,8 @@ final class HeaderUtil {
 	 * Alias to php setcookie() function.
 	 */
 	public static function setCookie($name, $value = '', $expire = 0) {
-		@header('Set-Cookie: '.rawurlencode(COOKIE_PREFIX.$name).'='.rawurlencode($value).($expire ? '; expires='.gmdate('D, d-M-Y H:i:s', $expire).' GMT' : '').(COOKIE_PATH ? '; path='.COOKIE_PATH : '').(COOKIE_DOMAIN ? '; domain='.COOKIE_DOMAIN : '').((isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == '443') ? '; secure' : '').'; HttpOnly', false);
+		// TODO: COOKIE_PATH is static and does not always reflect the application's domain and path
+		@header('Set-Cookie: '.rawurlencode(COOKIE_PREFIX.$name).'='.rawurlencode($value).($expire ? '; expires='.gmdate('D, d-M-Y H:i:s', $expire).' GMT' : '').(COOKIE_PATH ? '; path='.COOKIE_PATH : '').(COOKIE_DOMAIN ? '; domain='.COOKIE_DOMAIN : '').(RouteHandler::secureConnection() ? '; secure' : '').'; HttpOnly', false);
 	}
 	
 	/**
@@ -67,12 +69,6 @@ final class HeaderUtil {
 	 * Outputs the compressed page content.
 	 */
 	public static function getCompressedOutput($output) {
-		if (defined('LESS_FILES') && LESS_FILES) {
-			// remove .css files
-			$output = preg_replace('~\\@import url\("((?!burningBoard).)*.css"\) screen;~U', '', $output);
-			$output = str_replace(array('<!-- LESS_FILES', 'LESS_FILES -->'), array('', ''), $output);
-		}
-		
 		$size = strlen($output);
 		$crc = crc32($output);
 		
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 4de4840a4b..2b353a6f2e 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -269,8 +269,6 @@
 		<item name="wcf.acp.option.page_description"><![CDATA[Seitenbeschreibung]]></item>
 		<item name="wcf.acp.option.page_title"><![CDATA[Titel der Seite]]></item>
 		<item name="wcf.acp.option.page_title.description"><![CDATA[Dieser Titel wird im Seitenkopf dargestellt, wenn Sie die Anzeige dieses Textes im Stileditor aktiviert haben.]]></item>
-		<item name="wcf.acp.option.page_url"><![CDATA[Adresse (URL) der Seite]]></item>
-		<item name="wcf.acp.option.page_url.description"><![CDATA[Adresse (URL) unter der die Seite aufzurufen ist (ohne abschließenden Slash).]]></item>
 		<item name="wcf.acp.option.page_urls"><![CDATA[Weitere Adressen (URLs)]]></item>
 		<item name="wcf.acp.option.page_urls.description"><![CDATA[Weitere Adressen (URLs) unter denen Ihre Seite erreichbar ist.]]></item>
 		<item name="wcf.acp.option.proxy_server_http"><![CDATA[Proxy-Server (HTTP)]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index c9d3605598..f84321c77e 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -269,8 +269,6 @@
 		<item name="wcf.acp.option.page_description"><![CDATA[Page description]]></item>
 		<item name="wcf.acp.option.page_title"><![CDATA[Page title]]></item>
 		<item name="wcf.acp.option.page_title.description"><![CDATA[That title will show up inside the page header, if you have enabled it with the style editor.]]></item>
-		<item name="wcf.acp.option.page_url"><![CDATA[Page adress (URL)]]></item>
-		<item name="wcf.acp.option.page_url.description"><![CDATA[Please enter the adress (URL) of the page (without trailing slash).]]></item>
 		<item name="wcf.acp.option.page_urls"><![CDATA[Further adresses (URLs)]]></item>
 		<item name="wcf.acp.option.page_urls.description"><![CDATA[Enter further adresses (URLs) which also link to your site.]]></item>
 		<item name="wcf.acp.option.proxy_server_http"><![CDATA[Proxy-Server (HTTP)]]></item>