From 0debf6e603123a3fd1a18ba251cd9420835466e7 Mon Sep 17 00:00:00 2001 From: JEALG Date: Sun, 17 May 2026 19:01:41 +0200 Subject: [PATCH 1/3] =?UTF-8?q?modification=20cr=C3=A9ation=20commande=20G?= =?UTF-8?q?eolo=20V1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/api/mobile.api.php | 16 ++++++++++------ core/class/mobile.class.php | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/core/api/mobile.api.php b/core/api/mobile.api.php index 287045b7..79925f86 100755 --- a/core/api/mobile.api.php +++ b/core/api/mobile.api.php @@ -206,7 +206,7 @@ function saveMenuFromAppV2($menu, $mobile) } else { log::add('mobile', 'debug', '| [WARNING] A required parameter Iq does not exist !'); } - } + } log::add('mobile', 'debug', '└───────────────────────────────────────────'); $jsonrpc->makeSuccess('ok'); } @@ -693,8 +693,7 @@ function saveMenuFromAppV2($menu, $mobile) log::add('mobile', 'debug', '| [WARNING] Suppression de la commande "' . $cmd->getName() . '"'); $cmd->remove(); } - } - else if (isset($params['Iq'])) log::add('mobile', 'debug', '| [ERROR] EqLogic unknown ─▶︎ ' . $params['Iq']); + } else if (isset($params['Iq'])) log::add('mobile', 'debug', '| [ERROR] EqLogic unknown ─▶︎ ' . $params['Iq']); else log::add('mobile', 'debug', '[WARNING] Parameter Iq does not exist !'); log::add('mobile', 'debug', '└───────────────────────────────────────────────'); $jsonrpc->makeSuccess('ok'); @@ -922,6 +921,11 @@ function saveMenuFromAppV2($menu, $mobile) if (isset($params['id']) && $params['id'] != '' && isset($params['name']) && $params['name'] != '') { $cmdgeoloc = cmd::byEqLogicIdAndLogicalId($mobile->getId(), 'geoId_' . $params['id']); if (!is_object($cmdgeoloc)) { + if ($params['name'] == "") { + $name = $params['id']; + } else { + $name = $params['name']; + } $cmdgeoloc = new mobileCmd(); $cmdgeoloc->setLogicalId('geoId_' . $params['id']); $cmdgeoloc->setEqLogic_id($mobile->getId()); @@ -929,7 +933,7 @@ function saveMenuFromAppV2($menu, $mobile) $cmdgeoloc->setSubType('binary'); $cmdgeoloc->setGeneric_type('PRESENCE'); $cmdgeoloc->setIsVisible(1); - $cmdgeoloc->setName(__($params['id'] . '-' . $params['name'], __FILE__)); + $cmdgeoloc->setName($name); } $cmdgeoloc->setConfiguration('latitude', $params['latitude']); $cmdgeoloc->setConfiguration('longitude', $params['longitude']); @@ -944,7 +948,7 @@ function saveMenuFromAppV2($menu, $mobile) } else log::add('mobile', 'debug', '| [ERROR] EqLogic unknown ─▶︎ ' . $params['Iq']); } log::add('mobile', 'debug', '└───────────────────────────────────────────'); - $jsonrpc->makeSuccess(); + $jsonrpc->makeSuccess(); // mobile::SaveGeoloc($params); //throw new Exception(__('pas d\'id : ', __FILE__) . $params['name']); } @@ -955,7 +959,7 @@ function saveMenuFromAppV2($menu, $mobile) $mobile = eqLogic::byLogicalId($params['Iq'], 'mobile'); if (is_object($mobile)) { if (isset($params['id']) && $params['id'] != '') { - $cmdgeoloc = cmd::byEqLogicIdAndLogicalId($mobile->getId(), 'geoId_' . $params['id']); + $cmdgeoloc = cmd::byEqLogicIdAndLogicalId($mobile->getId(), 'geoId_' . $params['id']); if (is_object($cmdgeoloc)) { $cmdgeoloc->remove(); log::add('mobile', 'debug', '| geoId_' . $params['id'] . ' (' . $params['name'] . ') is deleted with success.'); diff --git a/core/class/mobile.class.php b/core/class/mobile.class.php index b3f932fd..c4c1742a 100755 --- a/core/class/mobile.class.php +++ b/core/class/mobile.class.php @@ -41,12 +41,12 @@ public static function backupExclude() { return ['data/images']; } - - /** - * cron callback - * clean notification V2 - * makeTemplate V1 - */ + + /** + * cron callback + * clean notification V2 + * makeTemplate V1 + */ public static function cronDaily() { // APP V2 @@ -59,11 +59,11 @@ public static function cronDaily() mobile::makeTemplateJson(); } - /** - * wizard AppV2 - * Call by wizard.php + /** + * wizard AppV2 + * Call by wizard.php * @return array - */ + */ public static function getWizardSteps(): array { $wizard['doc1'] = __('Accueil', __FILE__); From bdeab9d69f82bdb86973a39b3ef916ad2c45ace8 Mon Sep 17 00:00:00 2001 From: JEALG Date: Sun, 17 May 2026 19:05:32 +0200 Subject: [PATCH 2/3] correction log --- 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 79925f86..c4a1b4fd 100755 --- a/core/api/mobile.api.php +++ b/core/api/mobile.api.php @@ -940,7 +940,7 @@ function saveMenuFromAppV2($menu, $mobile) $cmdgeoloc->setConfiguration('subtitle', $params['subtitle']); $cmdgeoloc->setConfiguration('radius', $params['radius']); $cmdgeoloc->save(); - log::add('mobile', 'debug', '| geoId_' . $params['id'] . ' ─▶︎ ' . $params['name'] . ' ─▶︎ ' . $params['value']); + log::add('mobile', 'debug', '| geoId_' . $params['id'] . ' ─▶︎ ' . $name . ' ─▶︎ ' . $params['value']); if ($mobile->checkAndUpdateCmd('geoId_' . $params['id'], $params['value'])) { log::add('mobile', 'debug', '| ↳ Update geofence point ─▶︎ ' . $params['value']); } From b3f73aaee3e3210b09dc4b919801a39b60f88167 Mon Sep 17 00:00:00 2001 From: JEALG Date: Sun, 17 May 2026 20:14:58 +0200 Subject: [PATCH 3/3] correction --- core/api/mobile.api.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/api/mobile.api.php b/core/api/mobile.api.php index c4a1b4fd..55d67eaf 100755 --- a/core/api/mobile.api.php +++ b/core/api/mobile.api.php @@ -918,14 +918,14 @@ function saveMenuFromAppV2($menu, $mobile) if (isset($params['Iq'])) { $mobile = eqLogic::byLogicalId($params['Iq'], 'mobile'); if (is_object($mobile)) { - if (isset($params['id']) && $params['id'] != '' && isset($params['name']) && $params['name'] != '') { + if (isset($params['id']) && $params['id'] != '') { $cmdgeoloc = cmd::byEqLogicIdAndLogicalId($mobile->getId(), 'geoId_' . $params['id']); + if ($params['name'] == "") { + $name = $params['id']; + } else { + $name = $params['name']; + } if (!is_object($cmdgeoloc)) { - if ($params['name'] == "") { - $name = $params['id']; - } else { - $name = $params['name']; - } $cmdgeoloc = new mobileCmd(); $cmdgeoloc->setLogicalId('geoId_' . $params['id']); $cmdgeoloc->setEqLogic_id($mobile->getId());