wait #5126 @2

diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php
index 110f39b64c6dd80836a4e24abc070a9e5a8f89f0..2dc5812c39af119b78cb1ff7f293decb3ee7734c 100644 (file)
--- a/inc/commons/class.common.url.php
+++ b/inc/commons/class.common.url.php
@@ -10,7 +10,12 @@ class commonUrl
         // Si l'utilisateur n'est pas connecté, on affiche le formulaire\r
         // de login\r
 \r
-        $bypass = array('stats', 'telecharger', 'telechargerr', 'orpiref', 'resetPassword','relay','relayfb');\r
+        $closesession = ['relay', 'relayfb'];\r
+        $bypass = array_merge(['stats', 'telecharger', 'telechargerr', 'orpiref', 'resetPassword'], $closesession);\r
+        if (in_array($args[0], $closesession)) {\r
+            session_write_close();\r
+        }\r
+\r
 \r
         if ((!isset($args[0]) || !in_array($args[0], $bypass)) && (is_null($core->user) || !$core->user)) {\r
             $args = array('login');\r

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 2988e9a3eab5495e87b1940f935046f7f02c984b..c238fdbd093957ac5857b38681e5782949913702 100644 (file)
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -13,6 +13,7 @@ class wsMaintenance
         }
     }
 
+
     public static function cleanOriginauxPDF()
     {
         global $core;
@@ -1586,12 +1587,6 @@ class wsMaintenance
         }
     }
 
-    public static function test()
-    {
-        global $core;
-        $dao = new wsDAOTheme($core->con);
-        print_r($dao->selectById('3641'));
-    }
 
     public static function getAdditionalSettingsMap(): array
     {

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 5d8a1b38b5d3c98a21f4cd0580d327acf6c1e13e..4a86c805d3e6c64abf0fe5a8201eabffc1ad030d 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -997,6 +997,8 @@ html.tall{height:150%}' . "\n";
     {
         global $core;
 
+        session_write_close();
+
         $nointerface = isset($_GET['nointerface']);
 
         $args = cubePage::getArgs($args);
@@ -2040,6 +2042,8 @@ html,body{height:100%;cursor: wait;font-family: "Open Sans", Arial;background-co
     {
         global $core;
 
+        session_write_close();
+
         array_shift($args);
         $file = ROOT . '/' . implode('/', $args);
 
@@ -2071,7 +2075,7 @@ html,body{height:100%;cursor: wait;font-family: "Open Sans", Arial;background-co
             exit;
         }
         header('Content-Length: ' . filesize($file));
-      header('Content-Type: ' . files::getMimeType($file));
+        header('Content-Type: ' . files::getMimeType($file));
         header('X-Sendfile: ' . $file);
     }
 
@@ -2097,6 +2101,9 @@ html,body{height:100%;cursor: wait;font-family: "Open Sans", Arial;background-co
     public static function relayfb($args)
     {
         global $core;
+
+        session_write_close();
+
         array_shift($args);
         $fb = array_shift($args);
         $hash = array_shift($args);

diff --git a/inc/ws/prepend.php b/inc/ws/prepend.php
index d1fd8caa1b123edadbebf06216a07507c3b90069..f93e4a89a6a5b1d0a8ecd7543bb429ab0a5252fe 100644 (file)
--- a/inc/ws/prepend.php
+++ b/inc/ws/prepend.php
@@ -6,7 +6,6 @@ $core->url->register('s', 's', '^s/(.*)$', array('wsServices', 'in'));
 $core->url->register('maintenance', 'maintenance', '^maintenance(.*)$', array('wsMaintenance', 'in'));
 $core->url->register('editor', 'editor', '^editor/(.*)$', array('wsUrl', 'editor'));
 $core->url->register('restoreLinks', 'restoreLinks', '^restoreLinks/(.*)$', array('wsUrl', 'restoreLinks'));
-$core->url->register('viewer', 'viewer', '^viewer/(.*)$', array('wsUrl', 'viewer'));
 $core->url->register('viewerh', 'viewerh', '^viewerh/(.*)$', array('wsUrl', 'viewerh'));
 $core->url->register('viewers', 'viewers', '^viewers/(.*)$', array('wsUrl', 'viewers'));