(no commit message)

diff --git a/.htaccess b/.htaccess
index 8f956f76311f1f9c5982362280dec655a29fc71f..13bf7501f8f3c9cf6475058ff4830fbb8751238b 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -24,8 +24,10 @@
        RewriteEngine on
        RewriteBase /
        # Redirection to www. subdomain
-       RewriteCond %{HTTP_HOST} ^example.com$
-       RewriteRule ^(.*)$ http://www.example.com/$1 [R=301,L]
+       RewriteCond %{HTTP_HOST} !^www.ccgm.fr$
+       RewriteRule ^(.*)$ http://www.ccgm.fr/$1 [R=301,L]
+       # Redirect auth header to env
+       RewriteRule ^.*$ - [E=REMOTE_USER:%{HTTP:Authorization}]
        # Skip static files
        RewriteRule ^css/ - [NC,L]
        RewriteRule ^js/ - [NC,L]
@@ -39,7 +41,7 @@
        RewriteCond %{REQUEST_FILENAME} -d
        RewriteRule ^.*$ - [NC,L]
        # Finally, redirect all other cases to the index.php
-       RewriteRule ^.*$ index.php [NC,L]
+       RewriteRule ^.*$ [NC,L]
 </IfModule>
 
 <IfModule mod_headers.c>

diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php
index ab77aa03b5c7d95acd5a1b507108b4e2bbc39407..a083b16e9a1d4f6d47e07c75c7395934b3bd0051 100644 (file)
--- a/framework/application/Bootstrap.php
+++ b/framework/application/Bootstrap.php
@@ -14,8 +14,8 @@ class Bootstrap extends CubeIT_Bootstrap {
                $this->getView()->headScript()->addWebFont(array('google' => array('families' => array('Ubuntu:500italic,300,300italic,500,400italic'))));
        }
 
-       protected function _initRouter($initCms = true) {
-               $router = parent::_initRouter($initCms);
+       protected function _initRouter($initCms = true, $standard = true) {
+               $router = parent::_initRouter($initCms, $standard);
                return $router;
        }
 

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index b58b39dffff77c8b08f2b243cb4d142716dab65f..aa337ad48679f4da6e83a0c19ac9e38abd33b99b 100644 (file)
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -25,8 +25,6 @@ includePaths.library = APPLICATION_PATH "/../library"
 bootstrap.path = APPLICATION_PATH "/Bootstrap.php"
 bootstrap.class = "Bootstrap"
 appnamespace = "CCGM"
-resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers"
-resources.frontController.params.displayExceptions = 0
 resources.view[] =
 
 resources.layout.layoutPath = APPLICATION_PATH "/layouts/scripts/"
@@ -36,21 +34,13 @@ timezone = 'Europe/Paris'
 session.lifetime = 31536000 ;1 year
 session.adapter = cache
 
-webhost = www.
+webhost = www.ccgm.fr
 
 database.adapter = pdo_mysql
-database.params.host = 
-database.params.username = 
-database.params.password = 
-database.params.dbname = 
-
-;former.database.adapter = pdo_mysql
-;former.database.params.host = 
-;former.database.params.username = 
-;former.database.params.password = 
-;former.database.params.dbname = 
-
-;former.home = 
+database.params.host = mysql51-56.pro
+database.params.username = ccgmzwgfweb
+database.params.password = 6vr7TbBC
+database.params.dbname = ccgmzwgfweb
 
 seo.universalAnalytics = UA-42799235-1
 seo.google = 
@@ -84,11 +74,4 @@ resources.frontController.params.displayExceptions = 1
 httpauth.username = ccgm
 httpauth.password = 20ccgm13
 
-seo.robots = false
-
-database.params.host = localhost
-database.params.username = ccgm
-database.params.password = k8impxgKCK
-database.params.dbname = ccgm
-
-webhost = ccgm.cubedesigners.com
\ No newline at end of file
+seo.robots = false
\ No newline at end of file

diff --git a/index.php b/index.php
index 3eaff12499032e252005a6ba89e9bc0e5023ec0f..fd19d45ae65bff1e4ade1e27e99d6056c3c4efdb 100644 (file)
--- a/index.php
+++ b/index.php
@@ -4,10 +4,6 @@ $start = microtime(true);
 ini_set('log_errors', '1');
 ini_set('error_log', dirname(__FILE__) . '/log/php_error.log');
 
-if ($_SERVER['HTTP_HOST'] == 'ccgm.cubedesigners.com') {
-       define('APPLICATION_ENV', 'testing');
-} else if ($_SERVER['HTTP_HOST'] == 'www.') {
-       define('APPLICATION_ENV', 'production');
-}
+define('APPLICATION_ENV', 'testing');
 
-include dirname(__FILE__) . '/CubeIT/common.php';
+include dirname(__FILE__) . '/CubeIT/common.php';
\ No newline at end of file