From: vincent@cubedesigners.com Date: Wed, 9 Mar 2022 11:02:45 +0000 (+0000) Subject: wip #5126 @1.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=2d743afad2e59334a1387633bc2f0d8463e164d5;p=cubeextranet.git wip #5126 @1.5 --- diff --git a/.htaccess b/.htaccess index ecfb4187f..b0d961552 100644 --- a/.htaccess +++ b/.htaccess @@ -38,6 +38,10 @@ AddCharset UTF-8 log RewriteCond %{HTTP_HOST} ws.fluidbook.com RewriteRule ^(.*)$ https://workshop.fluidbook.com/$1 [R=301,L] + RewriteCond %{HTTP_HOST} ^workshop.fluidbook.com + RewriteCond %{HTTP_USER_AGENT} Chrome/87 + RewriteRule ^(.*)$ https://exe.workshop.fluidbook.com/$1 [R=301,L] + RewriteCond %{HTTPS} off RewriteCond %{HTTP_HOST} workshop.fluidbook.com RewriteCond %{REQUEST_URI} !^/s/ diff --git a/inc/commons/class.common.page.php b/inc/commons/class.common.page.php index a2f7f795e..74681a844 100644 --- a/inc/commons/class.common.page.php +++ b/inc/commons/class.common.page.php @@ -39,6 +39,7 @@ class commonPage $res .= '
' . __('Bienvenue') . ' ' . $core->user->prenom . ' ' . $core->user->nom . ' '; $res .= '| ' . __('Mes paramètres') . ' '; $res .= '| ' . __('Se déconnecter') . ''; + //$res .= '| i'; if ($search) { $res .= ' | '; } diff --git a/index.php b/index.php index d69440710..320e4e0e2 100644 --- 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 246cd9f09..dddb1ab87 100644 --- a/info.php +++ b/info.php @@ -1,5 +1,6 @@ \ No newline at end of file