Merge pull request #104 from Phpvarious/notifications

Notifications

Author: Sekiro-kost

core/api/mobile.api.php

@@ -343,7 +343,7 @@ function saveMenuFromAppV2($menu, $mobile)
 	$retentionTime = config::byKey('retentionTime', 'mobile', null);
 	if(isset($retentionTime) && $retentionTime != null) {
 		log::add('mobile', 'debug', '| [INFO] Nettoyage des notifs et images > ');
-		mobile::getNotificationsWithRetentioNTime($params['Iq'], $retentionTime);
+		mobile::cleaningNotifications($params['Iq'], $retentionTime);
 	}
 
 	$jsonrpc->makeSuccess($return);
@@ -676,85 +676,16 @@ function saveMenuFromAppV2($menu, $mobile)
 if ($jsonrpc->getMethod() == 'getNotificationsFromFile') {
 	log::add('mobile', 'debug', '┌──────────▶︎ :fg-warning: Recuperation des Notifications :/fg: ──────────');
 	$Iq = $params['Iq'];
-	
-	if(isset($params['notifsTime'])){
-		$retentionTime = $params['notifsTime'];
-		config::save('retentionTime', $retentionTime, 'mobile');
-		log::add('mobile', 'debug', '| Durée de retention actuelle : '. $retentionTime . ' jours');
-		$retentionSeconds = intVal($retentionTime) * 24 * 60 * 60; 
-		$currentTime = time();
-
-		$pathImages = dirname(__FILE__) . '/../data/images/';
-		if(is_dir($pathImages)){
-			$images = glob($pathImages . '*.jpg');
-
-			foreach ($images as $image) {
-				$fileCreationTime = filemtime($image);
-				if ($fileCreationTime < ($currentTime - $retentionSeconds)) {
-					unlink($file); 
-				}
-			}
-		}
-	}
-
-
-	
 	$filePath = dirname(__FILE__) . '/../data/notifications/' . $Iq . '.json';
 	$notifications = 'noNotifications';
 	if (file_exists($filePath)) {
 		$notifications = file_get_contents($filePath);
-		if ($notifications) {
-			$notifications = json_decode($notifications, true);
-			$notificationsModified = false;
-
-			foreach ($notifications as $id => $value) {
-				$notificationDate = strtotime($value['data']['date']); 
-				if(isset($retentionSeconds)){
-					if (($currentTime - $notificationDate) > $retentionSeconds) {
-						unset($notifications[$id]); 
-						$notificationsModified = true;
-					} else {
-						$dateNew = substr($value['data']['date'], 0, 10);
-						$horaire = substr($value['data']['date'], -8);
-						$horaireFormat = substr($horaire, 0, 5);
-						$notifications[$id]['data']['newDate'] = $dateNew;
-						$notifications[$id]['data']['horaireFormat'] = $horaireFormat;
-					}
-				}else{
-					$dateNew = substr($value['data']['date'], 0, 10);
-					$horaire = substr($value['data']['date'], -8);
-					$horaireFormat = substr($horaire, 0, 5);
-					$notifications[$id]['data']['newDate'] = $dateNew;
-					$notifications[$id]['data']['horaireFormat'] = $horaireFormat;
-				}
-				// if (($currentTime - $notificationDate) > $retentionSeconds) {
-				// 	unset($notifications[$id]); 
-				// 	$notificationsModified = true;
-				// } else {
-				// 	$dateNew = substr($value['data']['date'], 0, 10);
-				// 	$horaire = substr($value['data']['date'], -8);
-				// 	$horaireFormat = substr($horaire, 0, 5);
-				// 	$notifications[$id]['data']['newDate'] = $dateNew;
-				// 	$notifications[$id]['data']['horaireFormat'] = $horaireFormat;
-				// }
-			}
-			if ($notificationsModified) {
-				file_put_contents($filePath, $notifications);
-			}
-
-			$notifications = json_encode($notifications);
-			$jsonrpc->makeSuccess($notifications);
-			log::add('mobile', 'debug', '| [INFO] Notifications > ' . $notifications);
-			log::add('mobile', 'debug', '└───────────────────────────────────────────');
-		}
-
 	}
-
-	//$jsonrpc->makeSuccess($notifications);
-	
+	log::add('mobile', 'debug', '| [INFO] Notifications > ' . $notifications);
+	log::add('mobile', 'debug', '└───────────────────────────────────────────');
+	$jsonrpc->makeSuccess($notifications);	
 }
 
-
 if ($jsonrpc->getMethod() == 'deleteNotificationInJsonFile') {
 	log::add('mobile', 'debug', '┌────▶︎ deleteNotificationInJsonFile ──────');
 	$Iq = $params['Iq'];
@@ -772,8 +703,8 @@ function saveMenuFromAppV2($menu, $mobile)
 			$notifications = json_encode($notificationsArray);
 			file_put_contents($filePath, $notifications);
 		}
-		log::add('mobile', 'debug', '└───────────────────────────────────────────');
 	}
+	log::add('mobile', 'debug', '└───────────────────────────────────────────');
 	$jsonrpc->makeSuccess('ok');
 }
 

core/class/mobile.class.php

@@ -306,14 +306,14 @@ public static function discovery_multi($cmds)
 	}
 
 
-	public static function getNotificationsWithRetentioNTime($Iq, $retentionTime){
+	public static function cleaningNotifications($Iq, $retentionTime){
 		log::add('mobile', 'debug', '┌──────────▶︎ :fg-warning: Nettoyage des Notifications et Images :/fg: ──────────');
-
 		log::add('mobile', 'debug', '| Durée de retention actuelle : '. $retentionTime . ' jours');
+
 		$retentionSeconds = intVal($retentionTime) * 24 * 60 * 60; 
 		$currentTime = time();
 
-		$pathImages = dirname(__FILE__) . '/../data/images/';
+		$pathImages = dirname(__FILE__) . '/../../data/images/';
 		if(is_dir($pathImages)){
 			$images = glob($pathImages . '*.jpg');
 			foreach ($images as $image) {
@@ -322,8 +322,8 @@ public static function getNotificationsWithRetentioNTime($Iq, $retentionTime){
 					unlink($image); 
 				}
 			}
-		}	
-		
+		}
+
 		$filePath = dirname(__FILE__) . '/../data/notifications/' . $Iq . '.json';
 		$notifications = 'noNotifications';
 		if (file_exists($filePath)) {
@@ -339,9 +339,11 @@ public static function getNotificationsWithRetentioNTime($Iq, $retentionTime){
 						$notificationsModified = true;
 					} 
 				}
-			
+				$notifications = json_encode($notifications);
+				if ($notificationsModified) { 
+					file_put_contents($filePath, $notifications);
+				}
 			}
-	
 		}
 		log::add('mobile', 'debug', '| Fin du nettoyage des Notifications et Images');
 		log::add('mobile', 'debug', '└───────────────────────────────────────────');
@@ -636,6 +638,8 @@ public static function jsonPublish($os, $titre, $message, $type, $idNotif, $answ
 		if(isset($Iq)) log::add('mobile', 'debug', '||| IQ for jsonPublish > ' . $Iq);
 
 		$dateNotif = date("Y-m-d H:i:s");
+		$newDate = date("Y-m-d");
+		$horaireFormat = date("H:i");
 		$badge = 0;
 		if ($timeout != 'nok') {
 			$timeout = date('Y-m-d H:i:s', strtotime("$dateNotif + $timeout SECONDS"));
@@ -736,7 +740,9 @@ public static function jsonPublish($os, $titre, $message, $type, $idNotif, $answ
 					'boxName' => config::byKey('name'),
 					'boxApiKey' => jeedom::getHardwareKey(),
 					"askParams" => $askParams,
-					'textToDisplay' => 'none'
+					'textToDisplay' => 'none',
+					'newDate' => $newDate,
+					'horaireFormat' => $horaireFormat
 				];
 
 				$notification = [