wip #5430 @1.5

diff --git a/inc/commons/DAO/class.common.dao.utilisateur.php b/inc/commons/DAO/class.common.dao.utilisateur.php
index 6f84f78a97c619c5ea87a1e63976cc245533e2f4..756bdddb8da841693d30e9a1640bf686addeae7d 100644 (file)
--- 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') {\r
                 $c->id = $this->getNextId();\r
                 $c->insert();\r
-                $core->refreshWSUsersTree();\r
-                return $this->selectById($c->id);\r
+                $id = $c->id;\r
             } else {\r
                 // Mise à jour d'un client\r
                 $c->update('WHERE id=\'' . $this->con->escape($data['utilisateur_id']) . '\'');\r
-                $core->refreshWSUsersTree();\r
-                return $this->selectById($data['utilisateur_id']);\r
+                $id = $data['utilisateur_id'];\r
             }\r
+            $core->refreshWSUsersTree();\r
+            $api = new ws3API();\r
+            $api->clearCache('model_App_Models_User,model__App_Models_User,model_Cubedesigners_UserDatabase_Models_User,model_Cubedesigners_UserDatabase_Models_Company');\r
+            return $this->selectById($id);\r
         } catch (Exception $e) {\r
             echo $e->getMessage();\r
             exit;\r

diff --git a/inc/ws/Controlleur/class.ws.users.tree.php b/inc/ws/Controlleur/class.ws.users.tree.php
index 47816de8760a3c3aed39b6a7187d6529d232ce40..81f30f129592f9a83f2078a035810cb0fdaa0a00 100644 (file)
--- a/inc/ws/Controlleur/class.ws.users.tree.php
+++ b/inc/ws/Controlleur/class.ws.users.tree.php
@@ -141,11 +141,6 @@ class wsUsersTree
 \r
         $c = $this->con->openCursor('extranet_users.user');\r
         foreach ($this->admins as $admin => $list) {\r
-            $wscount = 0;\r
-            foreach ($list as $item) {\r
-                $wscount += $owners[$item];\r
-            }\r
-            $c->e1_ws_count = $wscount;\r
             $c->e1_ws_rights = implode(',', $list);\r
             $c->e1_ws_domains = implode(',', $adom[$admin]);\r
             $c->update('WHERE id=\'' . $this->con->escape($admin) . '\'');\r

diff --git a/inc/ws/Util/class.ws.ws3api.php b/inc/ws/Util/class.ws.ws3api.php
index ee22fbf5798eae3b01f460075ab46acb7d43430a..6b333c06563e8bde47840f4dbe43c6049e58c931 100644 (file)
--- 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
         }\r
         parent::__construct($uri);\r
         self::getHttpClient()->setConfig([\r
-            'timeout' => 300]);\r
+            'timeout' => 1800]);\r
 \r
     }\r
 \r
+    public function clearCache($tag = null)\r
+    {\r
+        global $core;\r
+        set_time_limit(300);\r
+        return $this->restPost('/api/cache/clear' . (null === $tag ? '' : '/' . $tag), ['api_token' => $core->user->api_token]);\r
+    }\r
+\r
     public function renameTheme($theme_id, $newname)\r
     {\r
         global $core;\r

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 54ca92c7948b885174e811222c0ade7197fb5128..5b3b9abd3cca9b63a7e85fdda3a5920ed1a1657a 100644 (file)
--- 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';