From d3f46d8c5e6d3073e56f19d0a820cd30ff4501a1 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 17 Feb 2025 13:03:46 +0100
Subject: [PATCH] wip #7264 @2

---
 .htaccess                                     | 18 +++++++-
 .idea/deployment.xml                          |  9 +++-
 framework/application/configs/application.ini | 41 ++++++++-----------
 index.php                                     |  2 +-
 info.php                                      |  3 +-
 5 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/.htaccess b/.htaccess
index 008dbbb..5d0e589 100644
--- a/.htaccess
+++ b/.htaccess
@@ -14,8 +14,23 @@
 	Options +FollowSymlinks
 	RewriteEngine on
 	RewriteBase /
-	#
 
+    RewriteCond %{HTTP_HOST} ^www.bloomsburie.com$
+    RewriteRule ^(.*)$ https://bloomsburie.com/$1 [R=308,L]
+
+    RewriteCond %{HTTPS} off
+    RewriteCond %{HTTP_HOST} ^(www\.)?bloomsburie\.com$ [NC]
+    RewriteRule ^(.*)$ https://bloomsburie.com%{REQUEST_URI} [E=UPGRADE,L,R=301]
+
+	RewriteRule about-us.html about-us [L,R=308]
+	RewriteRule services.html Services [L,R=308]
+	RewriteRule carrers.html Carrers [L,R=308]
+	RewriteRule portfolio.html Portfolio [L,R=308]
+	RewriteRule contract-vehicles.html Contract-Vehicles [L,R=308]
+	RewriteRule contact-us.html Contact [L,R=308]
+	RewriteRule hcats.html Human-Capital [L,R=308]
+	RewriteRule portfolio-fema-fima.html Human-Capital [L,R=308]
+	RewriteRule position-elearning.html Position/eLearning-Developper [L,R=308]
 
     # Block browser access to the framework folder and sensitive files
     RewriteRule ^framework/.*$ - [F]
@@ -42,6 +57,7 @@
 <IfModule mod_headers.c>
 	Header Set Cache-Control "max-age=2592000"
 	Header Set X-UA-Compatible "IE=edge"
+	Header always set Content-Security-Policy "upgrade-insecure-requests;" env=UPGRADE
 </IfModule>
 
 # Mime types
diff --git a/.idea/deployment.xml b/.idea/deployment.xml
index fbd385c..67c022d 100644
--- a/.idea/deployment.xml
+++ b/.idea/deployment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="PublishConfigData" autoUpload="Always" serverName="staging.bloomsburie.com" remoteFilesAllowedToDisappearOnAutoupload="false" confirmBeforeUploading="false" autoUploadExternalChanges="true">
+  <component name="PublishConfigData" autoUpload="Always" serverName="www.bloomsburie.com" remoteFilesAllowedToDisappearOnAutoupload="false" confirmBeforeUploading="false" autoUploadExternalChanges="true" showAutoUploadSettingsWarning="false">
     <option name="confirmBeforeUploading" value="false" />
     <serverData>
       <paths name="alpha.toolbox.fluidbook.com">
@@ -346,6 +346,13 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="www.bloomsburie.com">
+        <serverdata>
+          <mappings>
+            <mapping deploy="/" local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="www.ccgm.fr">
         <serverdata>
           <mappings>
diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index a2feedd..7e6be47 100644
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -12,27 +12,30 @@ bin.imagemagick = convert
 bin.cp = /bin/cp
 bin.rm = /bin/rm
 
+mail.from = external@cubedesigners.com
+mail.host=mail2.cubedesigners.com
+mail.port=587
+mail.username=external@cubedesigners.com
+mail.password=z6hfYZJEfFZp48pza3
+mail.encryption=tls
+
 appnamespace = "Cubedesigners"
 
 timezone = 'America/New_York'
 
-session.lifetime = 31536000 ;1 year
-session.adapter = cache
+session.lifetime = 31536000
+session.adapter = files
 
-webhost = www.bloomsburie.com
+webhost = bloomsburie.com
 
-locales.en =
+locales.en = bloomsburie.com
+locales.fr = fr.bloomsburie.com
 
 database.adapter = pdo_mysql
-database.params.host = cubedesigners-v7-mariadb
-database.params.username = root
-database.params.password = shEhdyg0ke8F48D1
-database.params.dbname = cubedesigners-v7
-
-;seo.universalAnalytics = UA-4339912-1
-;seo.google = google93c0129ef18a399d.html
-;seo.bing = 8986457D1D126C38A815027C839372DC
-;seo.pinterest = fa7873389173bc29df6ef3ea8789bca2
+database.params.host = localhost
+database.params.password = "7^ACmhtEx4P^8s&44#jN"
+database.params.dbname = bloomsburie_2025
+database.params.username = cubedesigners
 
 navigation.containers[] = 0;
 navigation.containers[] = -2;
@@ -53,17 +56,7 @@ privacy.analytics = 1
 
 dev = false
 
-mail.from = external@cubedesigners.com
-mail.host=mail2.cubedesigners.com
-mail.port=587
-mail.username=external@cubedesigners.com
-mail.password=z6hfYZJEfFZp48pza3
-mail.encryption=tls
-
-database.params.host = localhost
-database.params.password = "7^ACmhtEx4P^8s&44#jN"
 database.params.dbname = bloomsburie_2025_staging
-database.params.username = cubedesigners
 
 webhost = staging.bloomsburie.com
 
@@ -75,8 +68,6 @@ seo.robots = false
 httpauth.username = bloomsburie
 httpauth.password = training2025
 
-session.adapter = files
-
 [testing : staging]
 
 database.params.host = bloomsburie-mariadb
diff --git a/index.php b/index.php
index aa9da2e..508177e 100644
--- a/index.php
+++ b/index.php
@@ -5,7 +5,7 @@ ini_set('log_errors', '1');
 
 if ($_SERVER['HTTP_HOST'] == 'bloomsburie.dev2.cubedesigners.com') {
     define('APPLICATION_ENV', 'testing');
-} else if (stristr('staging.bloomsburie.com', $_SERVER['HTTP_HOST'])) {
+} else if (stristr($_SERVER['HTTP_HOST'],'staging.bloomsburie.com')) {
     define('APPLICATION_ENV', 'staging');
 }else{
     define('APPLICATION_ENV', 'production');
diff --git a/info.php b/info.php
index c4837a3..61ace19 100644
--- a/info.php
+++ b/info.php
@@ -1 +1,2 @@
-<?php phpinfo();
+<?php
+phpinfo();
-- 
2.39.5