From 9329ebc98ecf1c3f903d236f43a642d6bdef026d Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 12 Nov 2010 15:53:29 +0000
Subject: [PATCH]

---
 .htaccess          |  6 ++++++
 inc/config.inc.php | 29 +++++++++++++++++++----------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/.htaccess b/.htaccess
index ae583977a..094a14aa9 100644
--- a/.htaccess
+++ b/.htaccess
@@ -3,6 +3,12 @@ Options +FollowSymlinks
 RewriteEngine on
 RewriteBase /
 
+# Static
+ExpiresActive On
+ExpiresDefault "modification plus 1 month"
+#RequestHeader  edit "If-None-Match" "^(.*)-gzip$" "$1"
+#Header  edit "ETag" "^(.*[^g][^z][^i][^p])$" "$1-gzip"
+
 # Favicon
 RewriteCond %{HTTP_HOST} cubedesigners
 RewriteRule ^favicon.ico$ images/extranet/favicon.ico [L]
diff --git a/inc/config.inc.php b/inc/config.inc.php
index 9f9487af8..3e2eb4858 100644
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -1,4 +1,5 @@
 <?php
+
 define('DB_DRIVER', 'mysql');
 define('ROOT', dirname(__FILE__) . '/..');
 $localrel = array('localhost', 'paris.fluidbook.com');
@@ -14,7 +15,7 @@ if (in_array($_SERVER['HTTP_HOST'], array_merge($localrel, $localabs))) {
 	define('DEV', true);
 	define('WINDOWS', true);
 	define('FONT_PATH', 'C:/Windows/Fonts');
-	define('AS3_SOURCES','C:\Users\Vincent\Documents\Works\as3;C:\Users\Vincent\Documents\Works\cubeExtranet\swf\_src');
+	define('AS3_SOURCES', 'C:\Users\Vincent\Documents\Works\as3;C:\Users\Vincent\Documents\Works\cubeExtranet\swf\_src');
 
 	if (in_array($_SERVER['HTTP_HOST'], $localrel)) {
 		define('WEBROOT', '/cubeExtranet');
@@ -24,8 +25,8 @@ if (in_array($_SERVER['HTTP_HOST'], array_merge($localrel, $localabs))) {
 		define('SITE_PATH', WEBROOT . '/');
 	}
 	define('CONVERTER_PATH', ROOT . '/tools/');
-	define('MXMLC_PATH','C:\Program Files\Adobe\Flex SDK\bin\mxmlc.exe');
-	define('FTPROOT','/');
+	define('MXMLC_PATH', 'C:\Program Files\Adobe\Flex SDK\bin\mxmlc.exe');
+	define('FTPROOT', '/');
 } else {
 	// Définition des variables dans l'environnement de production
 	define('DB_HOST', 'localhost');
@@ -39,23 +40,26 @@ if (in_array($_SERVER['HTTP_HOST'], array_merge($localrel, $localabs))) {
 	define('DEV', false);
 	define('WINDOWS', false);
 	define('CONVERTER_PATH', '/bin:/usr/bin:/usr/local/bin');
-	define('MXMLC_PATH','/usr/local/bin/mxmlc');
-	define('AS3_SOURCES','/home/ws/sources');
+	define('MXMLC_PATH', '/usr/local/bin/mxmlc');
+	define('AS3_SOURCES', '/home/ws/sources');
 }
 
 if (in_array($_SERVER['HTTP_HOST'], $ws)) {
 	define('MODE', 'ws');
 	define('GA', 'UA-4339912-5');
 	define('TITLE', 'Fuidbook Workshop');
+	if(DEV){
+		define('STATIC_SERVER', 'http://devstatic.ws.fluidbook.com' . WEBROOT);
+	}
 } else {
 	define('MODE', 'extranet');
 	define('GA', 'UA-4339912-4');
 	define('TITLE', 'Extranet Cubedesigners');
 }
 
-define('WS_STATS','http://stats.fluidbook.com/');
 
-define('MINIMIZE_JS', false);
+define('WS_STATS', 'http://stats.fluidbook.com/');
+// define('MINIMIZE_JS', false);
 define('WORKER_PREFIX', 'worker.');
 
 define('CACHE', ROOT . '/cache');
@@ -64,12 +68,16 @@ define('SESSION_LIFETIME', 3600 * 10);
 define('L10N', dirname(__FILE__) . '/../l10n');
 
 define('JS_PATH', WEBROOT . '/js');
-define('CSS_PATH', WEBROOT . '/style' . '/' . MODE);
+define('JS', JS_PATH);
+define('CSS_PATH', WEBROOT . '/style/' . MODE);
+define('STYLE', CSS_PATH);
+define('SYSSTYLE', ROOT . '/style/' . MODE);
 
 define('SYSIMG', ROOT . '/images/' . MODE);
-define('IMG', WEBROOT . '/images' . '/' . MODE);
+define('IMG', WEBROOT . '/images/' . MODE);
 
 define('TYPOGRAPHP_PATH', ROOT . '/typo/' . MODE);
+define('TYPOGRAPHP_WEBROOT', IMG . '/typographp');
 
 define('JOURNEE', 8);
 define('TAUX_JOURNALIER', 500);
@@ -85,5 +93,6 @@ define('TIMEZONE', 'UTC');
 define('THEMES', WEBROOT . '/themes/');
 define('ICONS', WEBROOT . '/icones/');
 
-define('CUBE_SEARCH_LIMIT_CHARS',3);
+define('CUBE_SEARCH_LIMIT_CHARS', 3);
+
 ?>
\ No newline at end of file
-- 
2.39.5