(no commit message)

diff --git a/.htaccess b/.htaccess
index 4570e6395f00d9e72c0d199f58dde0f382bcfdc7..8fff7ed39e71ea7cc01f6781d245652195c749b8 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -15,9 +15,11 @@
        RewriteEngine on
        RewriteBase /
        # Redirection to www. subdomain
-       RewriteCond %{HTTP_HOST} !=www.cubedesigners.fr
-       #RewriteCond %{HTTP_HOST} !=www.cubedesigners.com
+       RewriteCond %{HTTP_HOST} =cubedesigners.fr
        RewriteRule ^(.*)$ http://www.cubedesigners.fr/$1 [R=301,L]
+       # Redirection to www. subdomain
+       RewriteCond %{HTTP_HOST} =cubedesigners.com
+       RewriteRule ^(.*)$ http://www.cubedesigners.com/$1 [R=301,L]
        # Redirect auth header to env
        RewriteRule ^.*$ - [E=REMOTE_USER:%{HTTP:Authorization}]
        # Skip static files

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index 6f1f976b9a6ac8ee0272110c9d7f8ae8c294fccd..935f5ad2b9e3e1b6db90cf9ffaffbfabbf4d15a8 100644 (file)
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -1,5 +1,5 @@
 [production]
-dev = true
+dev = false
 
 minify.js = true
 minify.css = true
@@ -23,17 +23,10 @@ webhost = www.cubedesigners.fr
 
 database.adapter = pdo_mysql
 database.params.host = localhost
-database.params.username = cubev6
-database.params.password = Y0k3C5c51N
+database.params.username = cubedesigners
+database.params.password = *arica*5
 database.params.dbname = cubev6
 
-former.database.adapter = pdo_mysql
-former.database.params.host = localhost
-former.database.params.username = cubedesigners
-former.database.params.password = *arica*5
-former.database.params.dbname = cubedesigners
-former.home = /home/cubedesigners/www
-
 seo.universalAnalytics = UA-4339912-1
 seo.google = google93c0129ef18a399d.html
 seo.bing = 8986457D1D126C38A815027C839372DC
@@ -58,12 +51,12 @@ mail.test = APPLICATION_PATH "/../data/email/test"
 [testing : production]
 dev = true
 
-firephp = true
+database.params.dbname = cubev6dev
 
 locales.fr = dev.cubedesigners.fr
-locales.en = cubev6.dev.cubedesigners.com
+locales.en = dev.cubedesigners.com
 
 httpauth.username = cubedesigners
 httpauth.password = cubedesigners
 
-webhost = cubev6.dev.cubedesigners.com
\ No newline at end of file
+webhost = dev.cubedesigners.fr
\ No newline at end of file

diff --git a/index.php b/index.php
index 21eeb09a7a14037484fabd12ac6e47abb0db5481..f6607811b04c78c886a43f6c735abd6307bc39a2 100644 (file)
--- a/index.php
+++ b/index.php
@@ -3,11 +3,10 @@
 $start = microtime(true);
 ini_set('log_errors', '1');
 ini_set('error_log', dirname(__FILE__) . '/log/php_error.log');
-
-if ($_SERVER['HTTP_HOST'] == 'cubev6.dev.cubedesigners.com' || $_SERVER['HTTP_HOST'] == 'dev.cubedesigners.fr') {
-       define('APPLICATION_ENV', 'testing');
-} else if ($_SERVER['HTTP_HOST'] == 'www.cubedesigners.com' || $_SERVER['HTTP_HOST'] == 'www.cubedesigners.fr') {
+if ($_SERVER['HTTP_HOST'] == 'www.cubedesigners.com' || $_SERVER['HTTP_HOST'] == 'www.cubedesigners.fr') {
        define('APPLICATION_ENV', 'production');
+} else {
+       define('APPLICATION_ENV', 'testing');
 }
 
 include dirname(__FILE__) . '/CubeIT/common.php';