From a9e9033bd853cbfd781a25ce5f7df6d58cec4e06 Mon Sep 17 00:00:00 2001
From: Tcharp38 <tcharp38@laposte.net>
Date: Wed, 19 Jun 2024 11:51:15 +0200
Subject: [PATCH] update

---
 core/class/AbeilleCmdPrepare.class.php | 2 +-
 core/class/AbeilleCmdProcess.class.php | 8 ++++++--
 docs/fr_FR/Changelog.md                | 4 ++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/core/class/AbeilleCmdPrepare.class.php b/core/class/AbeilleCmdPrepare.class.php
index 5c02997c60..9e1b2b1a67 100755
--- a/core/class/AbeilleCmdPrepare.class.php
+++ b/core/class/AbeilleCmdPrepare.class.php
@@ -1238,7 +1238,7 @@ function prepareCmd($priority, $topic, $payload, $phpunit=0) {
                 break;
 
             default:
-                cmdLog("debug", '  No prepare function. Forwarding cmd to AbeilleCmdProcess.');
+                // cmdLog("debug", '  No prepare function. Forwarding cmd to AbeilleCmdProcess.');
                 // cmdLog("debug", '  msg='.json_encode($msg));
 
                 /* Tcharp38 notes:
diff --git a/core/class/AbeilleCmdProcess.class.php b/core/class/AbeilleCmdProcess.class.php
index 5fde7192f1..3a1ce105f0 100755
--- a/core/class/AbeilleCmdProcess.class.php
+++ b/core/class/AbeilleCmdProcess.class.php
@@ -4198,6 +4198,10 @@ function processCmd($Command) {
                     $imgOffset = $Command['imgOffset'];
                     $maxData = $Command['maxData'];
 
+                    if (!isset($GLOBALS['ota_fw']) || !isset($GLOBALS['ota_fw'][$manufCode]) || !isset($GLOBALS['ota_fw'][$manufCode][$imgType])) {
+                        cmdLog('debug', "  otaImageBlockResponse WARNING: ManufCode=${manufCode}, ImgType=${imgType} => NO FW. Request ignored");
+                        return;
+                    }
                     $fw = $GLOBALS['ota_fw'][$manufCode][$imgType];
                     $imgVers = $fw['fileVersion'];
                     $imgSize = $fw['fileSize'];
@@ -4241,8 +4245,8 @@ function processCmd($Command) {
 
                     if ($imgOffset == "00000000") {
                         $eqLogic = Abeille::byLogicalId($dest.'/'.$addr, 'Abeille');
-                        $eqPath = $eqLogic->getHumanName();
-                        message::add("Abeille", $eqPath.": Mise-à-jour du firmware démarrée", "");
+                        $eqHName = $eqLogic->getHumanName();
+                        message::add("Abeille", $eqHName.": Mise-à-jour du firmware démarrée", "");
                     }
                     return;
                 }
diff --git a/docs/fr_FR/Changelog.md b/docs/fr_FR/Changelog.md
index a5fa7af9c3..e408b0cd9f 100644
--- a/docs/fr_FR/Changelog.md
+++ b/docs/fr_FR/Changelog.md
@@ -1,5 +1,9 @@
 # ChangeLog
 
+-   Analyse réseau: Corrections.
+-   Interne: Correction sauvegarde config dev.
+-   Mises-à-jour OTA: Amélioration interne.
+
 ## 240618-BETA-5
 
 -   Modèles d'équipement: Réajout info 'Time-TimeStamp' si manquante.