wait #5693 @0.5

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index aba0cc8322cb39ae27c55f8aec535a001a14590a..24ccfd3d7f4324d43840cd80e1ab768d909a3bfc 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -155,6 +155,11 @@ services:
       - extranet\r
       - fluidbook-processfarm\r
     restart: unless-stopped\r
+    logging:\r
+      driver: json-file\r
+      options:\r
+        max-size: 10M\r
+        max-file: 10\r
 \r
   redis:\r
     container_name: extranet-redis\r

diff --git a/inc/commons/DAO/class.common.dao.entreprise.php b/inc/commons/DAO/class.common.dao.entreprise.php
index 19e0fdd91644bca0531f13c1cad707fa63c5396d..b44359c056ec6d06e4ff6a7750b05b6c9e75efaa 100644 (file)
--- a/inc/commons/DAO/class.common.dao.entreprise.php
+++ b/inc/commons/DAO/class.common.dao.entreprise.php
@@ -131,7 +131,13 @@ class commonDAOEntreprise extends commonDAO
 
     protected function limitToUserRights($user)
     {
+        global $core;
         if ($user) {
+            if (!$user->ws_rights) {
+                $core->refreshWSUsersTree();
+                $core->authentifie();
+                $user = $core->user;
+            }
             return ' AND entreprise_id IN (SELECT entreprise FROM e2_u WHERE utilisateur_id IN(' . $user->ws_rights . ') AND utilisateur_id!=\'' . $this->con->escape($user->utilisateur_id) . '\') ';
         }
         return '';

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index f5cc308ce62ba38d64c7cd2c6fbc351c3b10b098..c93ec2e9bddbeb887d78e2d355a702807619aa80 100644 (file)
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -68,7 +68,7 @@ class commonCore extends cubeCore
      *\r
      * @return\r
      */\r
-    protected function authentifie()\r
+    public function authentifie()\r
     {\r
         // On regarde si user_email et user_password ont été postées\r
         // Si c'est le cas, on les copie dans la session\r