Correction dans la lecture des périphériques eedomus

2bprog · Feb 16, 2020 · 25bab59 · 25bab59
1 parent 5e85c3f
commit 25bab59
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v0.0.6-beta (16/02/2020)
+
+* Correction dans la lecture des périphériques eedomus
+
 ## v0.0.5-beta (16/02/2020)
 
 * Correction lors de la création du script

diff --git a/eedomus_plugin.json b/eedomus_plugin.json
@@ -2,7 +2,7 @@
 	"plugin_id": "bbdomzevents",
 	"name_fr": "Domoticz - Events",
 	"icon": "domzevents.png",
-	"version": "0.0.5",
+	"version": "0.0.6",
 	"creation_date": "2020-01-16",
 	"modification_date": "2020-02-16",
 	"author": "Benjamin B.<br><a target='_blank' href='https://github.com/2bprog/eedomus-domoticzevent-plugin'>Sources sur github <img src='/img/external.png'></a>",

diff --git a/php/2B_domzevents.php b/php/2B_domzevents.php
@@ -538,7 +538,7 @@ functions = {
 </form>
 <? } else { ?>
    <div class="alert alert-danger" role="alert">
-   <center>Une erreur est survenue lors du chargement des données !<br> (Vérifier les informations de connexion au serveur Domoticz)</center>
+   <center>Une erreur est survenue lors du chargement des données !<br> (Vérifiez les informations de connexion au serveur Domoticz)</center>
     </div>
 <? } ?>
 
@@ -707,8 +707,10 @@ function sdk_eedomusHttp($url, $method, $params,  &$result, $doXML)
     $fn = 'sdk_eedomusHttp';
     if ($doXML) echo "<$fn>\r\n";
     if ($doXML) sdk_echoxml('url',  "$method : $url" , $doXML);
-    $result = httpQuery($url, $method , $params); 
     if ($doXML) sdk_echoxml('params',$params, $doXML);
+    $result = httpQuery($url, $method , $params); 
+    $result = str_replace ( '\"' , ' ' , $result);
+
     $result = sdk_json_decode($result, false);
     if ($doXML) echo "</$fn>\r\n";
     return $result['success'] == 1;
@@ -719,8 +721,9 @@ function sdk_domzHttp($url, $method, $params, $domheader ,&$result, $doXML)
     $fn = 'sdk_domzHttp';
     if ($doXML) echo "<$fn>\r\n";
     if ($doXML) sdk_echoxml('url',  "$method : $url" , $doXML);
-    $result = httpQuery($url, $method , $params, null, $domheader);  
     if ($doXML) sdk_echoxml('params',$params, $doXML);
+    $result = httpQuery($url, $method , $params, null, $domheader);  
+
     $result = sdk_json_decode($result, false);
     if ($doXML) echo "</$fn>\r\n";
     return $result['status'] == 'OK';