(no commit message)

diff --git a/.htaccess b/.htaccess
index 608ec71a74bc868ae19c90d7bb677225ce0f14b1..d861e72a28e96f1e7abef11820a62403585f8764 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -21,7 +21,6 @@ RewriteRule ^phpMyAdmin - [L]
 #RewriteRule ^books - [L]\r
 #RewriteRule ^docs - [L]\r
 \r
-\r
 RewriteRule ^ajax/supprimeFichier/([0-9]+)/(.*)$ index.php/ajax/supprimeFichier/$1/$2 [L]\r
 RewriteRule ^telecharger/([0-9]+)/(.*)$ index.php/telecharger/$1/$2 [L]\r
 RewriteRule ^([-_a-zA-Z0-9/]+)$ index.php/$1 [L]\r

diff --git a/inc/config.inc.php b/inc/config.inc.php
index 11f8c09396d5a5037ba4da9a208906a25263badf..99ca60267e1fd27bf299ba02e541366b00dd5840 100644 (file)
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -4,8 +4,8 @@ define('DB_DRIVER', 'mysql');
 define('ROOT', dirname(__FILE__) . '/..');\r
 \r
 $dev = stristr($_SERVER['HTTP_HOST'], 'dev.');\r
-$extranet = stristr($_SERVER['HTTP_HOST'], 'extranet.cubedesigners.com');\r
-$ws = stristr($_SERVER['HTTP_HOST'], 'ws.fluidbook.com');\r
+$extranet = stristr($_SERVER['HTTP_HOST'], 'cubedesigners.com');\r
+$ws = stristr($_SERVER['HTTP_HOST'], 'fluidbook.com');\r
 \r
 define('WEBROOT', '');\r
 define('SITE_PATH', WEBROOT . '/');\r
@@ -36,7 +36,7 @@ if ($dev) {
        define('DB_PASSWORD', '*arica*2');\r
 \r
        define('EXTRANET_URL', 'http://extranet.cubedesigners.com');\r
-       define('WS_URL', 'http://ws.fluidbook.com');\r
+       define('WS_URL', 'http://workshop.fluidbook.com');\r
 }\r
 \r
 if ($ws) {\r