done #685 @1

diff --git a/.htaccess b/.htaccess
index d5a4959ab8bc04dbfc800a6df3faba5e32ebd268..56cbc7810f77709772aab12ae518fbc7d03bbe87 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -24,12 +24,16 @@
        RewriteEngine on
        RewriteBase /
 
+       RewriteRule ^google[a-f0-9]*.html$ index.php [L,END]
+       RewriteRule ^BingSiteAuth.xml$ index.php [L,END]
+
        RewriteCond %{HTTPS} off
     RewriteRule .* https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
 
        # Redirection to www. subdomain
-       RewriteCond %{HTTP_HOST} ^example.com$
-       RewriteRule ^(.*)$ http://www.example.com/$1 [R=301,L]
+       RewriteCond %{HTTP_HOST} ^fluidbook.com$
+       RewriteRule ^(.*)$ https://www.fluidbook.com/$1 [R=301,L]
+
        # Protect framework
        RewriteRule ^framework/.*$ - [F]
        RewriteRule ^.*\.ini$ - [F]

diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php
index 2dd37b8fe13f1decbd1e32f36cd1ebb1315cbf7d..0fe33d2ef9cc3c77cc9c64e9acd648870a3a6f8a 100644 (file)
--- a/framework/application/Bootstrap.php
+++ b/framework/application/Bootstrap.php
@@ -42,7 +42,6 @@ class Bootstrap extends CubeIT_Bootstrap {
 
                $path = implode('/', $path);
 
-
                // Si un des cas ci-dessus
                if (isset($name)) {
                        $nav = $this->getNavigation()->getLocaleContainer($locale);
@@ -57,7 +56,7 @@ class Bootstrap extends CubeIT_Bootstrap {
 
                $map = array();
                $map['fr'] = array(
-                       'Questions-reponses' => 'faq',
+                       'Questions-reponses' => 'fonctionnalites',
                        'Presentation-fonctionnalites-services' => 'fonctionnalites',
                        'Demande-de-devis' => 'contact',
                        'Revendeurs' => 'agences',
@@ -69,7 +68,7 @@ class Bootstrap extends CubeIT_Bootstrap {
                );
 
                $map['en'] = array(
-                       'Faq' => 'faq',
+                       'Faq' => 'fonctionnalites',
                        'Overview' => 'fonctionnalites',
                        'Quote-request' => 'contact',
                        'Resellers' => 'agences',