From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 5 Nov 2012 16:23:58 +0000 (+0100)
Subject: Using application's cookie domain and path
X-Git-Tag: 2.0.0_Beta_1~812
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=638344b681231890d6ab9e0ead9dce3d2ca9af5b;p=GitHub%2FWoltLab%2FWCF.git

Using application's cookie domain and path
---

diff --git a/wcfsetup/install/files/lib/util/HeaderUtil.class.php b/wcfsetup/install/files/lib/util/HeaderUtil.class.php
index 1c2b60aad1..ce5537c05e 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\application\ApplicationHandler;
 use wcf\system\request\RouteHandler;
 use wcf\system\WCF;
 
@@ -18,8 +19,8 @@ final class HeaderUtil {
 	 * Alias to php setcookie() function.
 	 */
 	public static function setCookie($name, $value = '', $expire = 0) {
-		// 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);
+		$application = ApplicationHandler::getInstance()->getActiveApplication();
+		@header('Set-Cookie: '.rawurlencode(COOKIE_PREFIX.$name).'='.rawurlencode($value).($expire ? '; expires='.gmdate('D, d-M-Y H:i:s', $expire).' GMT' : '').'; path='.$application->cookiePath.'; domain='.$application->cookieDomain.(RouteHandler::secureConnection() ? '; secure' : '').'; HttpOnly', false);
 	}
 	
 	/**