From 2e03b9a3fe06c3bd9237cf7d390a900a52cebd8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Andr=C3=A9=20Eikeland?= <zegenie@gmail.com>
Date: Fri, 5 Oct 2012 10:21:37 +0200
Subject: [PATCH] update auth cookie functionality

---
 application/configuration/caspar.yml.template |  5 ++++-
 caspar/core/Caspar.class.php                  | 20 +++++++++++++++++++
 caspar/core/Response.class.php                |  6 +++---
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/application/configuration/caspar.yml.template b/application/configuration/caspar.yml.template
index becc2e1..7f24d68 100644
--- a/application/configuration/caspar.yml.template
+++ b/application/configuration/caspar.yml.template
@@ -1,14 +1,17 @@
 # Caspar configuration
 
 core:
-  base_url: "http://caspar.l"
+  base_url: "caspar.l"
   base_path: "/"
+  cookie_domain: "caspar.l"
+  cookie_path: "/"
   modules: ['main', 'b2db']
   language: 'en_US'
   debug: true
   site_name: 'Caspar sample application'
   stylesheets: []
   javascripts: ['prototype', 'scriptaculous']
+  salt: 5DsIFX9SrMloZxvUnhdpZC
   user_classname: \caspar\core\User
   response_classname: \caspar\core\Response
 
diff --git a/caspar/core/Caspar.class.php b/caspar/core/Caspar.class.php
index d57dac8..617baef 100644
--- a/caspar/core/Caspar.class.php
+++ b/caspar/core/Caspar.class.php
@@ -265,6 +265,26 @@ public static function getBaseURL()
 		return self::$_configuration['core']['base_url'];
 	}
 
+	/**
+	 * Get the cookie domain
+	 *
+	 * @return string
+	 */
+	public static function getDefaultCookieDomain()
+	{
+		return self::$_configuration['core']['cookie_domain'];
+	}
+
+	/**
+	 * Get the cookie base path
+	 *
+	 * @return string
+	 */
+	public static function getDefaultCookiePath()
+	{
+		return self::$_configuration['core']['cookie_path'];
+	}
+
 	/**
 	 * Get the subdirectory part of the url
 	 *
diff --git a/caspar/core/Response.class.php b/caspar/core/Response.class.php
index ff821f3..bf38b4a 100644
--- a/caspar/core/Response.class.php
+++ b/caspar/core/Response.class.php
@@ -444,9 +444,9 @@ public function getFooterDecoration()
 		 */
 		public function setCookie($key, $value, $expiration = 864000, $base_path = null, $domain = null)
 		{
-			$base_path = ($base_path !== null) ? $base_path : Caspar::getBasePath();
-			$domain = ($domain !== null) ? $domain : Caspar::getBaseURL();
-			setcookie($key, $value, NOW + $expiration, Caspar::getBasePath());
+			$base_path = ($base_path !== null) ? $base_path : Caspar::getDefaultCookiePath();
+			$domain = ($domain !== null) ? $domain : Caspar::getDefaultCookieDomain();
+			setcookie($key, $value, NOW + $expiration, $base_path, $domain);
 			return true;
 		}