From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 7 Sep 2016 15:19:51 +0000 (+0000)
Subject: done #685 @1
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=696dd2fb1b6194da1a23823421e1cab5cc693f4d;p=fluidbook-v3.git

done #685 @1
---

diff --git a/.htaccess b/.htaccess
index d5a4959..56cbc78 100644
--- 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 2dd37b8..0fe33d2 100644
--- 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',