From 3f5de451f4334e1400a5429e9259b1d6e899e368 Mon Sep 17 00:00:00 2001
From: "Julien C." <julien@jeedom.com>
Date: Tue, 14 Jan 2025 12:05:07 +0100
Subject: [PATCH 1/6] add confirmationMessage for disable plugins

---
 desktop/js/update.js | 68 ++++++++++++++++++++++++++++----------------
 1 file changed, 43 insertions(+), 25 deletions(-)

diff --git a/desktop/js/update.js b/desktop/js/update.js
index 8affc9af15..2da798747a 100644
--- a/desktop/js/update.js
+++ b/desktop/js/update.js
@@ -640,32 +640,50 @@ document.getElementById('div_pageContainer').addEventListener('click', function(
   }
 
   if (_target = event.target.closest('#table_update .update')) {
-    if (_target.hasClass('disabled')) return
-    var id = _target.closest('tr').getAttribute('data-id')
-    var logicalId = _target.closest('tr').getAttribute('data-logicalid')
-    jeeDialog.confirm('{{Êtes-vous sûr de vouloir mettre à jour :}}' + ' ' + logicalId + ' ?', function(result) {
-      if (result) {
-        jeeP.progress = -1
-        document.getElementById('progressbarContainer').removeClass('hidden')
-        document.querySelector('.bt_refreshOsPackageUpdate').addClass('disabled')
-        jeeP.updateProgressBar()
-        jeedomUtils.hideAlert()
-        jeedom.update.do({
-          id: id,
-          error: function(error) {
+    if (_target.hasClass('disabled')) return;
+    var id = _target.closest('tr').getAttribute('data-id');
+    var logicalId = _target.closest('tr').getAttribute('data-logicalid');
+
+    jeedom.plugin.get({
+        id: logicalId,
+        error: function(error) {
             jeedomUtils.showAlert({
-              message: error.message,
-              level: 'danger'
-            })
-          },
-          success: function() {
-            jeeP.getJeedomLog(1, 'update')
-          }
-        })
-      }
-    })
-    return
-  }
+                message: error.message,
+                level: 'danger'
+            });
+        },
+        success: function(data) {
+            var isActivated = (data.activate !== undefined && data.activate !== null) ? data.activate : 1;
+            var confirmationMessage = '{{Êtes-vous sûr de vouloir mettre à jour le plugin :}} ' + logicalId + ' ?';
+            if (isActivated != 1) {
+                confirmationMessage = '{{Attention : Le plugin ' + logicalId + ' n\'est pas activé. Êtes-vous sûr de vouloir le mettre à jour ?}}';
+            }
+
+            jeeDialog.confirm(confirmationMessage, function(result) {
+                if (result) {
+                    jeeP.progress = -1;
+                    document.getElementById('progressbarContainer').removeClass('hidden');
+                    document.querySelector('.bt_refreshOsPackageUpdate').addClass('disabled');
+                    jeeP.updateProgressBar();
+                    jeedomUtils.hideAlert();
+                    jeedom.update.do({
+                        id: id,
+                        error: function(error) {
+                            jeedomUtils.showAlert({
+                                message: error.message,
+                                level: 'danger'
+                            });
+                        },
+                        success: function() {
+                            jeeP.getJeedomLog(1, 'update');
+                        }
+                    });
+                }
+            });
+        }
+    });
+    return;
+}
 
   if (_target = event.target.closest('#table_update .remove')) {
     var id = _target.closest('tr').getAttribute('data-id')

From 9ab6cd6f7625c03b7444b6b85f7001a2d1ef19b5 Mon Sep 17 00:00:00 2001
From: "Julien C." <julien@jeedom.com>
Date: Tue, 14 Jan 2025 15:51:00 +0100
Subject: [PATCH 2/6] hide installButtons if minVersionJeedom is not compatible

---
 core/repo/market.display.repo.php | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/core/repo/market.display.repo.php b/core/repo/market.display.repo.php
index 636a40d2dd..ea8035a906 100644
--- a/core/repo/market.display.repo.php
+++ b/core/repo/market.display.repo.php
@@ -85,6 +85,7 @@
             echo ' <a class="btn btn-default bt_installFromMarket" data-version="' . $branch . '" data-market_logicalId="' . $market->getLogicalId() . '" data-market_id="' . $market->getId() . '" ><i class="fas fa-plus-circle"></i> {{Installer}} ' . $branch . '</a>';
           }
         }
+        echo '<div class="alert alert-warning" id="warningVersion" style="display:none;">{{Votre version actuelle du core ne permet pas d\'installer ce plugin}}</div>';
       } else if ($market->getPrivate() == 1) {
         echo '<div class="alert alert-info">{{Ce plugin est pour le moment privé. Vous devez attendre qu\'il devienne public ou avoir un code pour y accéder}}</div>';
       } else {
@@ -95,15 +96,15 @@
             <a class="btn btn-default" href='<?php echo config::byKey('market::address'); ?>/index.php?v=d&p=profils' target="_blank"><i class="fa fa-eur"></i> {{Code promo}}</a>
         <?php
             if ($market->getCertification() !== 'Premium') {
-              echo '<a class="btn btn-default" target="_blank" href="' . config::byKey('market::address') . '/index.php?v=d&p=market_display&id=' . $market->getId() . '"><i class="fa fa-shopping-cart"></i> {{Acheter}}</a>';
+              echo '<a class="btn btn-default buyButtons" target="_blank" href="' . config::byKey('market::address') . '/index.php?v=d&p=market_display&id=' . $market->getId() . '"><i class="fa fa-shopping-cart"></i> {{Acheter}}</a>';
             } else {
               echo '<a class="btn btn-default" target="_blank" href="mailto:supportpro@jeedom.com"><i class="fa fa-envelope"></i> {{Nous Contacter}}</a>';
             }
           } else {
-            echo '<a class="btn btn-default" target="_blank" href="' . config::byKey('market::address') . '/index.php?v=d&p=market_display&id=' . $market->getId() . '"><i class="fa fa-shopping-cart"></i> {{Acheter}}</a>';
+            echo '<a class="btn btn-default buyButtons" target="_blank" href="' . config::byKey('market::address') . '/index.php?v=d&p=market_display&id=' . $market->getId() . '"><i class="fa fa-shopping-cart"></i> {{Acheter}}</a>';
           }
         } else {
-          echo '<a class="btn btn-default" target="_blank" href="' . config::byKey('market::address') . '/index.php?v=d&p=market_display&id=' . $market->getId() . '"><i class="fa fa-shopping-cart"></i> {{Acheter}}</a>';
+          echo '<a class="btn btn-default buyButtons" target="_blank" href="' . config::byKey('market::address') . '/index.php?v=d&p=market_display&id=' . $market->getId() . '"><i class="fa fa-shopping-cart"></i> {{Acheter}}</a>';
         }
       }
       if (is_object($update)) {
@@ -277,6 +278,28 @@
 <script>
   (function() { // Self Isolation!
 
+
+    jeedom.version({
+        success: function(version) {
+            if (market_display_info.parameters.minJeedomVersion >= version) {
+                var installButtons = document.querySelectorAll('.bt_installFromMarket');
+                installButtons.forEach(function(installButton) {
+                    installButton.style.display = 'none';
+                });
+              var buyButtons = document.querySelectorAll('.buyButtons');
+                     buyButtons.forEach(function(buyButton) {
+                          buyButton.style.display = 'none';
+                      });
+     
+              var warningDiv = document.getElementById('warningVersion'); 
+              if (warningDiv) {
+                  warningDiv.style.display = 'block';
+              }
+            }
+        }
+    });
+
+
     //Slide screenshot:
     if (document.querySelector(".slide")) {
       document.getElementById("slide-arrow-next")?.addEventListener("click", (event) => {

From bef2944f1ecfe114e67bc08eb305dd30536e4793 Mon Sep 17 00:00:00 2001
From: "Julien C." <julien@jeedom.com>
Date: Thu, 13 Feb 2025 14:06:17 +0100
Subject: [PATCH 3/6] correction of undefined variables

---
 desktop/php/overview.php       | 5 ++---
 desktop/php/user.php           | 1 +
 install/restore.php            | 9 +++++++--
 install/update/reloadCache.php | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/desktop/php/overview.php b/desktop/php/overview.php
index 4020737c97..57dc975d4e 100644
--- a/desktop/php/overview.php
+++ b/desktop/php/overview.php
@@ -28,6 +28,7 @@
       }
 
       $synthAction = $_object->getConfiguration('synthToAction', -1);
+      $dataUrl = 'index.php?v=d&p=dashboard&object_id=' . $_object->getId() . '&childs=0&btover=1';
       if ($synthAction != -1 && $synthAction != 'synthToDashboard') {
         if ($synthAction == 'synthToView') {
           $dataUrl = 'index.php?v=d&p=view&view_id=' . $_object->getConfiguration('synthToView');
@@ -38,9 +39,7 @@
         if ($synthAction == 'synthToPlan3d') {
           $dataUrl = 'index.php?v=d&p=plan3d&plan3d_id=' . $_object->getConfiguration('synthToPlan3d');
         }
-      } else {
-        $dataUrl = 'index.php?v=d&p=dashboard&object_id=' . $_object->getId() . '&childs=0' . '&btover=1';
-      }
+      } 
 
       $div .= '<div class="col-lg-3 col-md-4 col-sm-6 col-xs-12">';
       $div .= '<div class="objectPreview cursor shadowed fullCorner" style="background:url(' . $backUrl . ')" data-url="' . $dataUrl . '" data-object_id="' . $_object->getId() . '">';
diff --git a/desktop/php/user.php b/desktop/php/user.php
index 1ef17106bf..2e5bff1ed3 100644
--- a/desktop/php/user.php
+++ b/desktop/php/user.php
@@ -56,6 +56,7 @@
 		</thead>
 		<tbody>
 			<?php
+			$sessions = null;
 			try {
 				$sessions = listSession();
 			} catch (Exception $e) {
diff --git a/install/restore.php b/install/restore.php
index bf3c9b5acf..68a77970a0 100644
--- a/install/restore.php
+++ b/install/restore.php
@@ -195,16 +195,21 @@
 	echo "OK\n";
 	
 	foreach (plugin::listPlugin(true) as $plugin) {
+		$plugin_id = null;
 		try {
 			$plugin_id = $plugin->getId();
 			$dependancy_info = $plugin->dependancy_info(true);
 			if (method_exists($plugin_id, 'restore')) {
-				echo 'Restoring Plugin : ' . $plugin_id . '...';
+				echo 'Restoring Plugin: ' . $plugin_id . '...';
 				$plugin_id::restore();
 				echo "OK\n";
 			}
 		} catch (\Exception $e) {
-			echo '[error] on plugin : '.$plugin_id. ' => '.$e->getMessage();
+			if ($plugin_id !== null) {
+				echo '[error] on plugin: ' . $plugin_id . ' => ' . $e->getMessage() . "\n";
+			} else {
+				echo '[error] on unknown plugin => ' . $e->getMessage() . "\n";
+			}
 		}
 	}
 	config::save('hardware_name', '');
diff --git a/install/update/reloadCache.php b/install/update/reloadCache.php
index a7a410be41..52d6a2ee18 100644
--- a/install/update/reloadCache.php
+++ b/install/update/reloadCache.php
@@ -34,7 +34,7 @@
         }
         foreach ($data['eqLogic'] as $id => $value) {
             $eqLogic = eqLogic::byId($id);
-            if(is_object($cmd)){
+            if(is_object($eqLogic)){
                 $eqLogic->setCache($value);
             }
         }

From 5297f2fa112fbfe536454bba175230e60a5de14c Mon Sep 17 00:00:00 2001
From: "Julien C." <julien@jeedom.com>
Date: Thu, 13 Feb 2025 14:35:30 +0100
Subject: [PATCH 4/6] Update reloadCache.php

---
 install/update/reloadCache.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/update/reloadCache.php b/install/update/reloadCache.php
index 52d6a2ee18..b23e4b0a24 100644
--- a/install/update/reloadCache.php
+++ b/install/update/reloadCache.php
@@ -34,7 +34,7 @@
         }
         foreach ($data['eqLogic'] as $id => $value) {
             $eqLogic = eqLogic::byId($id);
-            if(is_object($eqLogic)){
+            if(is_object($cmd)){
                 $eqLogic->setCache($value);
             }
         }
@@ -43,4 +43,4 @@
     } 
 } catch (\Throwable $th) {
     echo 'Error on reload cache : '.$th->getMessage();
-}
\ No newline at end of file
+}

From ee7b168cb6cc19abb9a177d1acc3a934004382c3 Mon Sep 17 00:00:00 2001
From: Julien C <julien@jeedom.com>
Date: Wed, 19 Feb 2025 17:03:46 +0100
Subject: [PATCH 5/6] Revert "Update reloadCache.php"

This reverts commit 5297f2fa112fbfe536454bba175230e60a5de14c.
---
 install/update/reloadCache.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/update/reloadCache.php b/install/update/reloadCache.php
index b23e4b0a24..52d6a2ee18 100644
--- a/install/update/reloadCache.php
+++ b/install/update/reloadCache.php
@@ -34,7 +34,7 @@
         }
         foreach ($data['eqLogic'] as $id => $value) {
             $eqLogic = eqLogic::byId($id);
-            if(is_object($cmd)){
+            if(is_object($eqLogic)){
                 $eqLogic->setCache($value);
             }
         }
@@ -43,4 +43,4 @@
     } 
 } catch (\Throwable $th) {
     echo 'Error on reload cache : '.$th->getMessage();
-}
+}
\ No newline at end of file

From c64573de0aeabc0c218056ae2a3e887792d6cf88 Mon Sep 17 00:00:00 2001
From: Julien C <julien@jeedom.com>
Date: Wed, 19 Feb 2025 17:05:00 +0100
Subject: [PATCH 6/6] Revert "correction of undefined variables"

This reverts commit bef2944f1ecfe114e67bc08eb305dd30536e4793.
---
 desktop/php/overview.php       | 5 +++--
 desktop/php/user.php           | 1 -
 install/restore.php            | 9 ++-------
 install/update/reloadCache.php | 2 +-
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/desktop/php/overview.php b/desktop/php/overview.php
index 57dc975d4e..4020737c97 100644
--- a/desktop/php/overview.php
+++ b/desktop/php/overview.php
@@ -28,7 +28,6 @@
       }
 
       $synthAction = $_object->getConfiguration('synthToAction', -1);
-      $dataUrl = 'index.php?v=d&p=dashboard&object_id=' . $_object->getId() . '&childs=0&btover=1';
       if ($synthAction != -1 && $synthAction != 'synthToDashboard') {
         if ($synthAction == 'synthToView') {
           $dataUrl = 'index.php?v=d&p=view&view_id=' . $_object->getConfiguration('synthToView');
@@ -39,7 +38,9 @@
         if ($synthAction == 'synthToPlan3d') {
           $dataUrl = 'index.php?v=d&p=plan3d&plan3d_id=' . $_object->getConfiguration('synthToPlan3d');
         }
-      } 
+      } else {
+        $dataUrl = 'index.php?v=d&p=dashboard&object_id=' . $_object->getId() . '&childs=0' . '&btover=1';
+      }
 
       $div .= '<div class="col-lg-3 col-md-4 col-sm-6 col-xs-12">';
       $div .= '<div class="objectPreview cursor shadowed fullCorner" style="background:url(' . $backUrl . ')" data-url="' . $dataUrl . '" data-object_id="' . $_object->getId() . '">';
diff --git a/desktop/php/user.php b/desktop/php/user.php
index 2e5bff1ed3..1ef17106bf 100644
--- a/desktop/php/user.php
+++ b/desktop/php/user.php
@@ -56,7 +56,6 @@
 		</thead>
 		<tbody>
 			<?php
-			$sessions = null;
 			try {
 				$sessions = listSession();
 			} catch (Exception $e) {
diff --git a/install/restore.php b/install/restore.php
index 68a77970a0..bf3c9b5acf 100644
--- a/install/restore.php
+++ b/install/restore.php
@@ -195,21 +195,16 @@
 	echo "OK\n";
 	
 	foreach (plugin::listPlugin(true) as $plugin) {
-		$plugin_id = null;
 		try {
 			$plugin_id = $plugin->getId();
 			$dependancy_info = $plugin->dependancy_info(true);
 			if (method_exists($plugin_id, 'restore')) {
-				echo 'Restoring Plugin: ' . $plugin_id . '...';
+				echo 'Restoring Plugin : ' . $plugin_id . '...';
 				$plugin_id::restore();
 				echo "OK\n";
 			}
 		} catch (\Exception $e) {
-			if ($plugin_id !== null) {
-				echo '[error] on plugin: ' . $plugin_id . ' => ' . $e->getMessage() . "\n";
-			} else {
-				echo '[error] on unknown plugin => ' . $e->getMessage() . "\n";
-			}
+			echo '[error] on plugin : '.$plugin_id. ' => '.$e->getMessage();
 		}
 	}
 	config::save('hardware_name', '');
diff --git a/install/update/reloadCache.php b/install/update/reloadCache.php
index 52d6a2ee18..a7a410be41 100644
--- a/install/update/reloadCache.php
+++ b/install/update/reloadCache.php
@@ -34,7 +34,7 @@
         }
         foreach ($data['eqLogic'] as $id => $value) {
             $eqLogic = eqLogic::byId($id);
-            if(is_object($eqLogic)){
+            if(is_object($cmd)){
                 $eqLogic->setCache($value);
             }
         }