wip #5126 @1.5

diff --git a/.htaccess b/.htaccess
index ecfb4187f9a23e2c7e697c1be92cef6854763564..b0d9615523cbd1db35071d735c8a5c7be345a768 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -38,6 +38,10 @@ AddCharset UTF-8 log
        RewriteCond %{HTTP_HOST} ws.fluidbook.com\r
        RewriteRule ^(.*)$ https://workshop.fluidbook.com/$1 [R=301,L]\r
 \r
+       RewriteCond %{HTTP_HOST} ^workshop.fluidbook.com\r
+    RewriteCond %{HTTP_USER_AGENT} Chrome/87\r
+    RewriteRule ^(.*)$ https://exe.workshop.fluidbook.com/$1 [R=301,L]\r
+\r
        RewriteCond %{HTTPS} off\r
        RewriteCond %{HTTP_HOST} workshop.fluidbook.com\r
        RewriteCond %{REQUEST_URI} !^/s/\r

diff --git a/inc/commons/class.common.page.php b/inc/commons/class.common.page.php
index a2f7f795e945f1a0d04f660e6bcf8a0c5e1c6887..74681a84487c6dbd37b489cd8692536065f69ed8 100644 (file)
--- a/inc/commons/class.common.page.php
+++ b/inc/commons/class.common.page.php
@@ -39,6 +39,7 @@ class commonPage
             $res .= '<div id="welcome"' . $class . '>' . __('Bienvenue') . ' ' . $core->user->prenom . ' ' . $core->user->nom . ' ';\r
             $res .= '| <a href="#" class="popup" rel="mesParametres">' . __('Mes paramètres') . '</a> ';\r
             $res .= '| <a href="' . SITE_PATH . 'logout">' . __('Se déconnecter') . '</a>';\r
+            //$res .= '| <a href="' . SITE_PATH . 'info.php">i</a>';\r
             if ($search) {\r
                 $res .= ' | ';\r
             }\r

diff --git a/index.php b/index.php
index d69440710847b3cc4560c669bb3ab9d7e96c1253..320e4e0e29671af860a9cfaa466a7fdf095c8ea3 100644 (file)
--- a/index.php
+++ b/index.php
@@ -9,8 +9,11 @@ function exception_handle($e)
 
 function before_session_start()
 {
-    if (isset($_SERVER['PATH_INFO']) && stristr($_SERVER['PATH_INFO'], 'relay')) {
-        ini_set('redis.session.locking_enabled', 0);
+    if (isset($_SERVER['PATH_INFO'])) {
+        header('X-Pathinfo:'. $_SERVER['PATH_INFO']);
+        if (stristr($_SERVER['PATH_INFO'], 'relay') || stristr($_SERVER['PATH_INFO'], 'viewerh')) {
+            ini_set('redis.session.locking_enabled', 0);
+        }
     }
 }
 

diff --git a/info.php b/info.php
index 246cd9f097e68dc22e46377c2d97c1c01aa1a327..dddb1ab872348fded80bacffeb0143c05d5c4d27 100644 (file)
--- a/info.php
+++ b/info.php
@@ -1,5 +1,6 @@
 <?php\r
 //echo base64_encode(sodium_crypto_secretbox_keygen());\r
+var_dump(ini_set('redis.session.locking_enabled', 0));\r
 trigger_error('test');\r
 phpinfo();\r
 ?>
\ No newline at end of file