From 67be5a9e2b10e9bfd4273de6ccd2a27f4ae879f4 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 6 Sep 2022 13:09:15 +0000
Subject: [PATCH] wip #5430 @1.5

---
 inc/commons/DAO/class.common.dao.utilisateur.php     | 10 ++++++----
 inc/ws/Controlleur/class.ws.users.tree.php           |  5 -----
 inc/ws/Util/class.ws.ws3api.php                      |  9 ++++++++-
 inc/ws/Util/html5/master/class.ws.html5.compiler.php |  2 --
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/inc/commons/DAO/class.common.dao.utilisateur.php b/inc/commons/DAO/class.common.dao.utilisateur.php
index 6f84f78a9..756bdddb8 100644
--- a/inc/commons/DAO/class.common.dao.utilisateur.php
+++ b/inc/commons/DAO/class.common.dao.utilisateur.php
@@ -260,14 +260,16 @@ class commonDAOUtilisateur extends commonDAO
             if ($data['utilisateur_id'] == 'new') {
                 $c->id = $this->getNextId();
                 $c->insert();
-                $core->refreshWSUsersTree();
-                return $this->selectById($c->id);
+                $id = $c->id;
             } else {
                 // Mise à jour d'un client
                 $c->update('WHERE id=\'' . $this->con->escape($data['utilisateur_id']) . '\'');
-                $core->refreshWSUsersTree();
-                return $this->selectById($data['utilisateur_id']);
+                $id = $data['utilisateur_id'];
             }
+            $core->refreshWSUsersTree();
+            $api = new ws3API();
+            $api->clearCache('model_App_Models_User,model__App_Models_User,model_Cubedesigners_UserDatabase_Models_User,model_Cubedesigners_UserDatabase_Models_Company');
+            return $this->selectById($id);
         } catch (Exception $e) {
             echo $e->getMessage();
             exit;
diff --git a/inc/ws/Controlleur/class.ws.users.tree.php b/inc/ws/Controlleur/class.ws.users.tree.php
index 47816de87..81f30f129 100644
--- a/inc/ws/Controlleur/class.ws.users.tree.php
+++ b/inc/ws/Controlleur/class.ws.users.tree.php
@@ -141,11 +141,6 @@ class wsUsersTree
 
         $c = $this->con->openCursor('extranet_users.user');
         foreach ($this->admins as $admin => $list) {
-            $wscount = 0;
-            foreach ($list as $item) {
-                $wscount += $owners[$item];
-            }
-            $c->e1_ws_count = $wscount;
             $c->e1_ws_rights = implode(',', $list);
             $c->e1_ws_domains = implode(',', $adom[$admin]);
             $c->update('WHERE id=\'' . $this->con->escape($admin) . '\'');
diff --git a/inc/ws/Util/class.ws.ws3api.php b/inc/ws/Util/class.ws.ws3api.php
index ee22fbf57..6b333c065 100644
--- a/inc/ws/Util/class.ws.ws3api.php
+++ b/inc/ws/Util/class.ws.ws3api.php
@@ -10,10 +10,17 @@ class ws3API extends Zend_Rest_Client
         }
         parent::__construct($uri);
         self::getHttpClient()->setConfig([
-            'timeout' => 300]);
+            'timeout' => 1800]);
 
     }
 
+    public function clearCache($tag = null)
+    {
+        global $core;
+        set_time_limit(300);
+        return $this->restPost('/api/cache/clear' . (null === $tag ? '' : '/' . $tag), ['api_token' => $core->user->api_token]);
+    }
+
     public function renameTheme($theme_id, $newname)
     {
         global $core;
diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index 54ca92c79..5b3b9abd3 100644
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -3416,8 +3416,6 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
     public function addFont($fontFile)
     {
         $f = $this->wdir . '/' . $fontFile;
-        $e = explode('.', $f);
-        $ext = array_pop($f);
         $hash = 'fb_' . substr(md5($fontFile), 0, 10);
         if (!isset($this->cssfont[$hash])) {
             $final = $hash . '.woff';
-- 
2.39.5