Merge pull request #9 from JEALG/DeleteCodeV1

Ordre des commandes
jeedom · Dec 8, 2024 · 3e45d0f · 3e45d0f
2 parents 083a101 + 546f948
commit 3e45d0f
Showing 1 changed file with 33 additions and 27 deletions.
diff --git a/core/class/mobile.class.php b/core/class/mobile.class.php
@@ -934,6 +934,7 @@ public function postSave()
 			// Commande notification
 			$cmd = $this->getCmd(null, 'notif');
 			if (!is_object($cmd)) {
+				$order = count($this->getCmd());
 				$cmd = new mobileCmd();
 				$cmd->setIsVisible(1);
 				$cmd->setName(__('Notification', __FILE__));
@@ -943,7 +944,7 @@ public function postSave()
 				$cmd->setDisplay('forceReturnLineAfter', 1);
 				$cmd->setDisplay('showIconAndNamedashboard', 1);
 				$cmd->setDisplay('showIconAndNamemobile', 1);
-				$cmd->setOrder(0);
+				$cmd->setOrder($order);
 			}
 			$cmd->setEqLogic_id($this->getId());
 			$cmd->setType('action');
@@ -953,6 +954,7 @@ public function postSave()
 			// Commande notification Critique
 			$cmd = $this->getCmd(null, 'notifCritical');
 			if (!is_object($cmd)) {
+				$order = count($this->getCmd());
 				$cmd = new mobileCmd();
 				$cmd->setIsVisible(1);
 				$cmd->setName(__('Notification Critique', __FILE__));
@@ -962,7 +964,7 @@ public function postSave()
 				$cmd->setDisplay('forceReturnLineAfter', 1);
 				$cmd->setDisplay('showIconAndNamedashboard', 1);
 				$cmd->setDisplay('showIconAndNamemobile', 1);
-				$cmd->setOrder(1);
+				$cmd->setOrder($order);
 			}
 			$cmd->setEqLogic_id($this->getId());
 			$cmd->setType('action');
@@ -972,6 +974,7 @@ public function postSave()
 			// Commande récupération infos du téléphone
 			$cmd = $this->getCmd(null, 'notifSpecific');
 			if (!is_object($cmd)) {
+				$order = count($this->getCmd());
 				$cmd = new mobileCmd();
 				$cmd->setIsVisible(0);
 				$cmd->setName(__('Récupérer les informations du téléphone', __FILE__));
@@ -981,7 +984,7 @@ public function postSave()
 				$cmd->setDisplay('forceReturnLineAfter', 1);
 				$cmd->setDisplay('showIconAndNamedashboard', 1);
 				$cmd->setDisplay('showIconAndNamemobile', 1);
-				$cmd->setOrder(2);
+				$cmd->setOrder($order);
 			}
 			$cmd->setEqLogic_id($this->getId());
 			$cmd->setType('action');
@@ -991,6 +994,7 @@ public function postSave()
 			// Commande suppression des nodifications
 			$cmd = $this->getCmd(null, 'removeNotifs');
 			if (!is_object($cmd)) {
+				$order = count($this->getCmd());
 				$cmd = new mobileCmd();
 				$cmd->setIsVisible(1);
 				$cmd->setName(__('Supprimer les Notifications', __FILE__));
@@ -1000,7 +1004,7 @@ public function postSave()
 				$cmd->setDisplay('forceReturnLineAfter', 1);
 				$cmd->setDisplay('showIconAndNamedashboard', 1);
 				$cmd->setDisplay('showIconAndNamemobile', 1);
-				$cmd->setOrder(3);
+				$cmd->setOrder($order);
 			}
 			$cmd->setEqLogic_id($this->getId());
 			$cmd->setType('action');
@@ -1120,29 +1124,31 @@ public function execute($_options = array())
 			$filePath = dirname(__FILE__) . '/../data/notifications/' . $Iq . '.json';
 			if (!file_exists($filePath)) log::add('mobile', 'info', '| Fichier de notifications non trouvé : ' . $filePath);
 			$valueUser = $_options['select'];
-			switch($valueUser){
-				case 1:  file_put_contents($filePath, '');
-					     log::add('mobile', 'info', '| Suppression des notifications effectuée');
-						 break;
-				case 2:  
-				$notifs = json_decode(file_get_contents($filePath), true);
-				$notifs = array_filter($notifs, function($notif) {
-					$askParams = json_decode($notif['data']['askParams'], true);
-					$notifTime = strtotime($notif['data']['date']);
-					$currentTime = time();
-					$timeout = $askParams['timeout'] / 1000;
-					return $notif['data']['askVariable'] == 'rien' || ($currentTime - $notifTime) < $timeout;
-				});
-				file_put_contents($filePath, json_encode($notifs));
-				log::add('mobile', 'info', '| Suppression des asks expirés effectuée');
-				break;
-				case 3: $notifs = json_decode(file_get_contents($filePath), true);
-						$notifs = array_filter($notifs, function($notif) {
-							return $notif['data']['choiceAsk'] == '';
-						});
-						file_put_contents($filePath, json_encode($notifs));
-						log::add('mobile', 'info', '| Suppression des asks répondus effectuée');
-						break;
+			switch ($valueUser) {
+				case 1:
+					file_put_contents($filePath, '');
+					log::add('mobile', 'info', '| Suppression des notifications effectuée');
+					break;
+				case 2:
+					$notifs = json_decode(file_get_contents($filePath), true);
+					$notifs = array_filter($notifs, function ($notif) {
+						$askParams = json_decode($notif['data']['askParams'], true);
+						$notifTime = strtotime($notif['data']['date']);
+						$currentTime = time();
+						$timeout = $askParams['timeout'] / 1000;
+						return $notif['data']['askVariable'] == 'rien' || ($currentTime - $notifTime) < $timeout;
+					});
+					file_put_contents($filePath, json_encode($notifs));
+					log::add('mobile', 'info', '| Suppression des asks expirés effectuée');
+					break;
+				case 3:
+					$notifs = json_decode(file_get_contents($filePath), true);
+					$notifs = array_filter($notifs, function ($notif) {
+						return $notif['data']['choiceAsk'] == '';
+					});
+					file_put_contents($filePath, json_encode($notifs));
+					log::add('mobile', 'info', '| Suppression des asks répondus effectuée');
+					break;
 			}
 
 			log::add('mobile', 'debug', '└────────────────────');