(no commit message)

diff --git a/.htaccess b/.htaccess
index ae583977a58d7daed4de47b2130152c4814efdbc..094a14aa962f9bc8c68b3cd14d75f44f703262e2 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -3,6 +3,12 @@ Options +FollowSymlinks
 RewriteEngine on\r
 RewriteBase /\r
 \r
+# Static\r
+ExpiresActive On\r
+ExpiresDefault "modification plus 1 month"\r
+#RequestHeader  edit "If-None-Match" "^(.*)-gzip$" "$1"\r
+#Header  edit "ETag" "^(.*[^g][^z][^i][^p])$" "$1-gzip"\r
+\r
 # Favicon\r
 RewriteCond %{HTTP_HOST} cubedesigners\r
 RewriteRule ^favicon.ico$ images/extranet/favicon.ico [L]\r

diff --git a/inc/config.inc.php b/inc/config.inc.php
index 9f9487af82a5040a4121d216410600b8e18528fa..3e2eb4858d10b76ddb8f63d6266466cd536d5607 100644 (file)
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -1,4 +1,5 @@
 <?php\r
+\r
 define('DB_DRIVER', 'mysql');\r
 define('ROOT', dirname(__FILE__) . '/..');\r
 $localrel = array('localhost', 'paris.fluidbook.com');\r
@@ -14,7 +15,7 @@ if (in_array($_SERVER['HTTP_HOST'], array_merge($localrel, $localabs))) {
        define('DEV', true);\r
        define('WINDOWS', true);\r
        define('FONT_PATH', 'C:/Windows/Fonts');\r
-       define('AS3_SOURCES','C:\Users\Vincent\Documents\Works\as3;C:\Users\Vincent\Documents\Works\cubeExtranet\swf\_src');\r
+       define('AS3_SOURCES', 'C:\Users\Vincent\Documents\Works\as3;C:\Users\Vincent\Documents\Works\cubeExtranet\swf\_src');\r
 \r
        if (in_array($_SERVER['HTTP_HOST'], $localrel)) {\r
                define('WEBROOT', '/cubeExtranet');\r
@@ -24,8 +25,8 @@ if (in_array($_SERVER['HTTP_HOST'], array_merge($localrel, $localabs))) {
                define('SITE_PATH', WEBROOT . '/');\r
        }\r
        define('CONVERTER_PATH', ROOT . '/tools/');\r
-       define('MXMLC_PATH','C:\Program Files\Adobe\Flex SDK\bin\mxmlc.exe');\r
-       define('FTPROOT','/');\r
+       define('MXMLC_PATH', 'C:\Program Files\Adobe\Flex SDK\bin\mxmlc.exe');\r
+       define('FTPROOT', '/');\r
 } else {\r
        // Définition des variables dans l'environnement de production\r
        define('DB_HOST', 'localhost');\r
@@ -39,23 +40,26 @@ if (in_array($_SERVER['HTTP_HOST'], array_merge($localrel, $localabs))) {
        define('DEV', false);\r
        define('WINDOWS', false);\r
        define('CONVERTER_PATH', '/bin:/usr/bin:/usr/local/bin');\r
-       define('MXMLC_PATH','/usr/local/bin/mxmlc');\r
-       define('AS3_SOURCES','/home/ws/sources');\r
+       define('MXMLC_PATH', '/usr/local/bin/mxmlc');\r
+       define('AS3_SOURCES', '/home/ws/sources');\r
 }\r
 \r
 if (in_array($_SERVER['HTTP_HOST'], $ws)) {\r
        define('MODE', 'ws');\r
        define('GA', 'UA-4339912-5');\r
        define('TITLE', 'Fuidbook Workshop');\r
+       if(DEV){\r
+               define('STATIC_SERVER', 'http://devstatic.ws.fluidbook.com' . WEBROOT);\r
+       }\r
 } else {\r
        define('MODE', 'extranet');\r
        define('GA', 'UA-4339912-4');\r
        define('TITLE', 'Extranet Cubedesigners');\r
 }\r
 \r
-define('WS_STATS','http://stats.fluidbook.com/');\r
 \r
-define('MINIMIZE_JS', false);\r
+define('WS_STATS', 'http://stats.fluidbook.com/');\r
+// define('MINIMIZE_JS', false);\r
 define('WORKER_PREFIX', 'worker.');\r
 \r
 define('CACHE', ROOT . '/cache');\r
@@ -64,12 +68,16 @@ define('SESSION_LIFETIME', 3600 * 10);
 define('L10N', dirname(__FILE__) . '/../l10n');\r
 \r
 define('JS_PATH', WEBROOT . '/js');\r
-define('CSS_PATH', WEBROOT . '/style' . '/' . MODE);\r
+define('JS', JS_PATH);\r
+define('CSS_PATH', WEBROOT . '/style/' . MODE);\r
+define('STYLE', CSS_PATH);\r
+define('SYSSTYLE', ROOT . '/style/' . MODE);\r
 \r
 define('SYSIMG', ROOT . '/images/' . MODE);\r
-define('IMG', WEBROOT . '/images' . '/' . MODE);\r
+define('IMG', WEBROOT . '/images/' . MODE);\r
 \r
 define('TYPOGRAPHP_PATH', ROOT . '/typo/' . MODE);\r
+define('TYPOGRAPHP_WEBROOT', IMG . '/typographp');\r
 \r
 define('JOURNEE', 8);\r
 define('TAUX_JOURNALIER', 500);\r
@@ -85,5 +93,6 @@ define('TIMEZONE', 'UTC');
 define('THEMES', WEBROOT . '/themes/');\r
 define('ICONS', WEBROOT . '/icones/');\r
 \r
-define('CUBE_SEARCH_LIMIT_CHARS',3);\r
+define('CUBE_SEARCH_LIMIT_CHARS', 3);\r
+\r
 ?>
\ No newline at end of file