From b28af7487ffee56a8066cf605a9dd7a6cdc327ab Mon Sep 17 00:00:00 2001 From: JEALG Date: Tue, 4 Jun 2024 17:50:42 +0200 Subject: [PATCH 1/3] Typo Log Co-Authored-By: Julien C. --- .DS_Store | Bin 6148 -> 8196 bytes core/api/mobile.api.php | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.DS_Store b/.DS_Store index 1ce105b6d6d81ba22d405ad1fd45d5746968c68b..dce8cd9be66f32de2eb1ec547f9644ff5be14273 100644 GIT binary patch literal 8196 zcmeHM&1(}u6n~ROyKS*n5F7BaRs^XzG$vXU#26#kixgJsK})k~VjA4+#C#ZPjLn}> z1;InlA_x`~k4n9G?X~}aC(oj9KDwD~cA>XwGXpbkGw=6i=KbEwOlAWBB-1P;0Ac`O zU}bV@0-J!s^sEk)i0qj`Nzfj^h8i?r-6BGA(6SNMQ~{m;;eB6L~`+e0H=mIUGn@NZo1%Gy{VS%wU%RNxZigpsL>A zS81in;l|GoL6{27X7disGu`A~X?^GS*IU83!hvwrwS?u(d2SDf!ku9iD6Xuy;Lue$ z7yEkO#5((j7Y6I$@~wJR;=bprPPyKgo7*Lkk?67GqlPhVjGq`^w$^CNYS@itJ!97% zvQLY4V=XVA?^Eh{&vt&PTx_jOoxV-ohFx}xHEvuk6cO_1LD?4Ph(}_D_5u;4R|7!eX|@2*_L)_49qN{_kF7I`$ztP+ z9$Q@x_McL9>UyrlK7Pq9@&xg0)%67F)%D0jWfbQvLLHvq+!U(5wAjYk?<#5GLm$=T z@VVI+lE}tAB*lkN14G|?i86rdrAs)fFGwScIGKO8fYhP*y{`8Mk6c2_i%RfVnsA)z z4_SV97IB_V^<-(&^F-12d8}Xz(u#VCU>LX*x?Z}uDVnF_;u##r)|EIgrL=+0=&gx!^ZWcCPNNY z84=#b*!}-b`1}8%;zT>E85lMONHl9@GwAjHZ%{u05$rIr=CHEDa9ts}2{sJE`uTMn rrT2#+KATdPma;1(YOox_ivaKUfqGQv^Z(%Yk&u&DpZ`3g|BvP`@%&n8 delta 155 zcmZp1XfcprU|?W$DortDU=RQ@Ie-{Mvv5r;6q~50D9Qzr2Z?#+TPgetMethod() == 'deleteGeolocCommand') { - log::add('mobile', 'debug', 'Delete geoloc command'); - log::add('mobile', 'debug', 'Params > ' . json_encode($params)); + log::add('mobile', 'debug', '| -- Commande suppression GeoLoc --'); + log::add('mobile', 'debug', '| Paramètres > ' . json_encode($params)); $geolocId = $params['geoloc_id']; $eqLogic = eqLogic::byLogicalId($params['Iq'], 'mobile'); if (is_object($eqLogic)) { From df1ced535cfbd02ee405a6b3daf10cd34f386de4 Mon Sep 17 00:00:00 2001 From: JEALG Date: Tue, 4 Jun 2024 18:25:54 +0200 Subject: [PATCH 2/3] typo log suite Co-Authored-By: Julien C. --- core/api/mobile.api.php | 4 ++-- core/class/mobile.class.php | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/api/mobile.api.php b/core/api/mobile.api.php index 60b1efaf..f1f5a9ef 100755 --- a/core/api/mobile.api.php +++ b/core/api/mobile.api.php @@ -69,7 +69,7 @@ function checkDateMenu($menu, $mobile) $dateMobile = $mobile->getConfiguration('DateMenu', 'pasdedate'); if (isset($dateMobile) && isset($menu['date'])) { if ($dateMobile < $menu['date']) { - log::add('mobile', 'debug', 'SAVE MENU DEPUIS L APP'); + log::add('mobile', 'debug', '| Sauvegarde Menu depuis L APP'); saveMenuFromAppV2($menu, $mobile); } } else { @@ -80,7 +80,7 @@ function checkDateMenu($menu, $mobile) function saveMenuFromAppV2($menu, $mobile) { - log::add('mobile', 'debug', 'MENU_SAVE_FRM_APPV2 ' . json_encode($menu)); + log::add('mobile', 'debug', '| Menu sazvegarde FRM / APPV2 ' . json_encode($menu)); if (is_object($mobile)) { $menuCustomArray = []; $count = 0; diff --git a/core/class/mobile.class.php b/core/class/mobile.class.php index a51890bf..f50eb594 100755 --- a/core/class/mobile.class.php +++ b/core/class/mobile.class.php @@ -868,7 +868,7 @@ public function SaveGeoloc($geoloc) $eqLogicMobile = eqLogic::byLogicalId($geoloc['Iq'], 'mobile'); log::add('mobile', 'debug', '| Iq = ' . $geoloc['Iq']); if (is_object($eqLogicMobile)) { - log::add('mobile', 'debug', '| Mobile bien trouvé dans cette Jeedom'); + log::add('mobile', 'debug', '| Mobile bien trouvé dans cette Box'); log::add('mobile', 'debug', '| Objet > ' . $eqLogicMobile->getId()); $cmdgeoloc = cmd::byEqLogicIdAndLogicalId($eqLogicMobile->getId(), 'geoId_' . $geoloc['id']); if (!is_object($cmdgeoloc)) { @@ -904,7 +904,7 @@ public static function createCmdGeoLocV2($Iq, $geolocs) $decodedGeolocs = json_decode($geolocs, true); foreach ($decodedGeolocs as $index => $geoloc) { if (!isset($geoloc['name'])) continue; - log::add('mobile', 'debug', '| index > ' . $index . ' / ' . $geoloc['name']); + log::add('mobile', 'debug', '| Index > ' . $index . ' / ' . $geoloc['name']); $cmdgeoloc = cmd::byEqLogicIdAndLogicalId($mobile->getId(), 'geoloc_' . $index); if (!is_object($cmdgeoloc)) { @@ -925,7 +925,7 @@ public static function createCmdGeoLocV2($Iq, $geolocs) $cmdgeoloc->save(); if ($noExistCmd == 1) { $cmdgeoloc->event($geoloc['value']); - log::add('mobile', 'debug', '| valeur enregistrée > ' . $geoloc['value']); + log::add('mobile', 'debug', '| Valeur enregistrée > ' . $geoloc['value']); } $noExistCmd = 0; } @@ -937,7 +937,7 @@ public static function createCmdGeoLocV2($Iq, $geolocs) public function delGeoloc($geoloc) { - log::add('mobile', 'debug', 'Geoloc lancement DEL du mobile > ' . $geoloc['Iq'] . ' pour ' . $geoloc['id']); + log::add('mobile', 'debug', '| Geoloc lancement DEL du mobile > ' . $geoloc['Iq'] . ' pour ' . $geoloc['id']); $eqLogicMobile = eqLogic::byLogicalId($geoloc['Iq'], 'mobile'); $cmdgeoloc = cmd::byEqLogicIdAndLogicalId($eqLogicMobile->getId(), 'geoId_' . $geoloc['id']); if (isset($cmdgeoloc)) { @@ -954,19 +954,19 @@ public function EventGeoloc($geoloc) if (is_object($cmdgeoloc)) { log::add('mobile', 'debug', '| Commande trouvé'); if ($geoloc['value'] !== $cmdgeoloc->execCmd()) { - log::add('mobile', 'debug', 'Valeur non pareille.'); + log::add('mobile', 'debug', 'Valeur non identique'); $cmdgeoloc->event($geoloc['value']); } else { - log::add('mobile', 'debug', '| Valeur pareille >' . $geoloc['value'] . ' / ' . $cmdgeoloc->execCmd()); + log::add('mobile', 'debug', '| Valeur identique >' . $geoloc['value'] . ' / ' . $cmdgeoloc->execCmd()); } } if (is_object($cmdgeolocv2)) { log::add('mobile', 'debug', '| Commande trouvé'); if ($geoloc['value'] !== $cmdgeolocv2->execCmd()) { - log::add('mobile', 'debug', 'Valeur non pareille.'); + log::add('mobile', 'debug', 'Valeur non identique'); $cmdgeolocv2->event($geoloc['value']); } else { - log::add('mobile', 'debug', '| Valeur pareille >' . $geoloc['value'] . ' / ' . $cmdgeolocv2->execCmd()); + log::add('mobile', 'debug', '| Valeur identique >' . $geoloc['value'] . ' / ' . $cmdgeolocv2->execCmd()); } } } @@ -1523,7 +1523,7 @@ public function execute($_options = array()) log::add('mobile', 'debug', '| Action : Envoi d\'une configuration ', 'config'); } else { - log::add('mobile', 'debug', 'ARN non configuré ', 'config'); + log::add('mobile', 'debug', '| ARN non configuré ', 'config'); } log::add('mobile', 'debug', '|-----------------------------------'); } From 4ff554c02d2a77058cf9aec4dc10eca7dc7f469e Mon Sep 17 00:00:00 2001 From: JEALG Date: Tue, 4 Jun 2024 18:41:34 +0200 Subject: [PATCH 3/3] typo sauvegarde Co-Authored-By: Julien C. --- core/api/mobile.api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/api/mobile.api.php b/core/api/mobile.api.php index f1f5a9ef..e48ede63 100755 --- a/core/api/mobile.api.php +++ b/core/api/mobile.api.php @@ -80,7 +80,7 @@ function checkDateMenu($menu, $mobile) function saveMenuFromAppV2($menu, $mobile) { - log::add('mobile', 'debug', '| Menu sazvegarde FRM / APPV2 ' . json_encode($menu)); + log::add('mobile', 'debug', '| Menu sauvegarde FRM / APPV2 ' . json_encode($menu)); if (is_object($mobile)) { $menuCustomArray = []; $count = 0;