Merge pull request #2830 from jeedom/master

Last merge info v4 stable 4.4.12

Author: zoic21

core/class/cache.class.php

@@ -299,7 +299,7 @@ public static function clean() {
 	/*     * *********************Methode d'instance************************* */
 
 	public function save() {
-		$this->setDatetime(strtotime('now'));
+		$this->setTimestamp(strtotime('now'));
 		$engine = config::byKey('cache::engine');
 		if(in_array($engine,array('MariadbCache','FileCache','RedisCache'))){
 			return $engine::save($this);
@@ -355,11 +355,20 @@ public function setLifetime($lifetime): self {
 	}
 
 	public function getDatetime() {
-		return $this->datetime;
+		return date('Y-m-d H:i:s',$this->datetime);
 	}
 
 	public function setDatetime($datetime): self {
-		$this->datetime = $datetime;
+		$this->datetime = strtotime($datetime);
+		return $this;
+	}
+
+	public function getTimestamp(){
+		return $this->datetime;
+	}
+
+	public function setTimestamp($_timestamp){
+		$this->datetime = $_timestamp;
 		return $this;
 	}
 }
@@ -392,7 +401,7 @@ public static function fetch($_key){
 		if($cache === false){
 			return null;
 		}
-		if($cache->getLifetime() > 0 && ($cache->getDatetime() + $cache->getLifetime()) < strtotime('now')){
+		if($cache->getLifetime() > 0 && ($cache->getTimestamp() + $cache->getLifetime()) < strtotime('now')){
 			return null;
 		}
 		$cache->setValue(unserialize($cache->getValue()));
@@ -415,7 +424,7 @@ public static function save($_cache){
 			'key' => $_cache->getKey(),
 			'value' => serialize($_cache->getValue()),
 			'lifetime' =>$_cache->getLifetime(),
-			'datetime' => $_cache->getDatetime()
+			'datetime' => $_cache->getTimestamp()
 		);
 		$sql = 'REPLACE INTO cache SET `key`=:key, `value`=:value,`datetime`=:datetime,`lifetime`=:lifetime';
 		return  DB::Prepare($sql,$value, DB::FETCH_TYPE_ROW);
@@ -485,7 +494,7 @@ public static function all(){
 	public static function clean(){
 		foreach (ls(jeedom::getTmpFolder('cache'), '*',false,array('files')) as $file) {
 			$cache = unserialize(file_get_contents(jeedom::getTmpFolder('cache').'/'.$file));
-			if($cache->getLifetime() > 0 && ($cache->getDatetime() + $cache->getLifetime()) < strtotime('now')){
+			if($cache->getLifetime() > 0 && ($cache->getTimestamp() + $cache->getLifetime()) < strtotime('now')){
 				unlink(jeedom::getTmpFolder('cache').'/'.$file);
 			}
 		}
@@ -500,7 +509,7 @@ public static function fetch($_key){
 		if(!is_object($cache)){
 			return null;
 		}
-		if($cache->getLifetime() > 0 && ($cache->getDatetime() + $cache->getLifetime()) < strtotime('now')){
+		if($cache->getLifetime() > 0 && ($cache->getTimestamp() + $cache->getLifetime()) < strtotime('now')){
 			self::delete($_key);
 			return null;
 		}

core/class/event.class.php

@@ -126,7 +126,7 @@ private static function filterEvent($_events = array(), $_filter = null) {
 		}
 		$filters = ($_filter !== null) ? cache::byKey($_filter . '::event')->getValue(array()) : array();
 		$return = array();
-		foreach (_events as $event) {
+		foreach ($_events as $event) {
 			if ($_filter !== null && isset($_filter::$_listenEvents) && !in_array($event->getName(), $_filter::$_listenEvents)) {
 				continue;
 			}
@@ -181,6 +181,9 @@ public function setName($_name) {
 	}
 
 	public function getOption($_key = '', $_default = '') {
+		if(!is_json($this->option)){
+			return $this->option;
+		}
 		return utils::getJsonAttr($this->option, $_key, $_default);
 	}
 

core/config/version

@@ -1 +1 @@
-4.4.10
+4.4.12

desktop/php/administration.php

@@ -260,7 +260,7 @@
 								$cache = cache::byKey('hour');
 								$lastKnowDate = $cache->getDatetime();
 								?>
-								<span class="label label-info"><?php echo date('Y-m-d H:i:s',(int) $lastKnowDate) ?></span>
+								<span class="label label-info"><?php echo $lastKnowDate ?></span>
 								<a class="btn btn-sm btn-default pull-right" id="bt_resetHour" tooltip="{{Remise à zéro}}"><i class=" fas fa-undo-alt"></i></a>
 							</div>
 						</div>

docs/fr_FR/changelog.md

@@ -1,5 +1,14 @@
 # Changelog Jeedom V4.4
 
+# 4.4.12
+
+- Correction d'un bug sur la fonction de filtre des évenements (impact les plugins type homebridge) [LIEN](https://github.com/jeedom/core/commit/a7b6447bbd000b6508aebee211fb4b68be03ebe2)
+
+# 4.4.11
+
+- Correction d'un bug avec l'action gotodesign [LIEN](https://github.com/jeedom/core/issues/2825)
+- Correction de l'erreur sur certain plugin `Call to a member function getTimestamp()` [LIEN](https://github.com/jeedom/core/issues/2828)
+
 # 4.4.10
 
 - Déplacement de la gestion des evenements (event) qui sert à la mise à jour de l'interface en base de données en mémoire [LIEN](https://github.com/jeedom/core/pull/2757)

install/database.json

@@ -1083,10 +1083,6 @@
             "3": {
               "column": "event",
               "Sub_part": null
-            },
-            "4": {
-              "column": "option",
-              "Sub_part": null
             }
           }
         }