Merge pull request #2814 from jeedom/beta

Stable 4.4.10

Author: zoic21

.github/workflows/docker-image-latest.yml

@@ -4,7 +4,7 @@ on:
   push:
     # only trigger CI when push on following branches
     branches:
-      - 'V4-stable'
+      - 'master'
       - 'beta'
   # this is to manually trigger the worklow
   workflow_dispatch:

.github/workflows/work.yml

@@ -8,7 +8,7 @@ on:
     branches:
       - alpha
       - beta
-      - V4-stable
+      - master
 
 name : 'Test Core Jeedom'
 

Dockerfile

@@ -5,7 +5,7 @@ ARG DEBIAN
 # ARG to build Docker images ... ENV to run Docker container
 ARG WEBSERVER_HOME=/var/www/html
 ENV WEBSERVER_HOME=${WEBSERVER_HOME}
-ARG VERSION=V4-stable
+ARG VERSION=master
 ENV VERSION=${VERSION}
 ARG DATABASE=1
 ENV DATABASE=${DATABASE}

core/ajax/cache.ajax.php

@@ -37,6 +37,11 @@
 		ajax::success(utils::o2a(cache::byKey(init('key'))));
 	}
 
+	if (init('action') == 'remove') {
+		unautorizedInDemo();
+		ajax::success(cache::delete(init('key')));
+	}
+
 	if (init('action') == 'flush') {
 		unautorizedInDemo();
 		cache::flush();
@@ -49,10 +54,6 @@
 		ajax::success();
 	}
 
-	if (init('action') == 'stats') {
-		ajax::success(cache::stats());
-	}
-
 	throw new Exception(__('Aucune méthode correspondante à :', __FILE__) . ' ' . init('action'));
 	/*     * *********Catch exeption*************** */
 } catch (Exception $e) {

core/ajax/object.ajax.php

@@ -137,7 +137,7 @@
 		ajax::success($return);
 	}
 
-	function jeeAjax_objectToHtml($_id = -1, $_version = 'dashboard', $_category = 'all', $_tag = 'all', $_summary = '') {
+	function jeeAjax_objectToHtml($_id = -1, $_version = 'dashboard', $_category = 'all', $_tag = 'all', $_summary = '',$_hideOnMain = 0) {
 		$html = array();
 		if ($_summary == '') {
 			$eqLogics = eqLogic::byObjectId($_id, true, true);
@@ -153,6 +153,9 @@ function jeeAjax_objectToHtml($_id = -1, $_version = 'dashboard', $_category = '
 				if ($_tag != 'all' && strpos($eqLogic->getTags(), init('tag')) === false) {
 					continue;
 				}
+				if ($_hideOnMain == 1 && $eqLogic->getConfiguration('hideOnMain',0) == 1) {
+					continue;
+				}
 				$order = $eqLogic->getOrder();
 				while (isset($html[$order])) {
 					$order++;
@@ -197,13 +200,13 @@ function jeeAjax_objectToHtml($_id = -1, $_version = 'dashboard', $_category = '
 			$return = array();
 			$i = 0;
 			foreach ($objects as $id) {
-				$html = jeeAjax_objectToHtml($id, init('version'), init('category', 'all'), init('tag', 'all'), init('summary'));
+				$html = jeeAjax_objectToHtml($id, init('version'), init('category', 'all'), init('tag', 'all'), init('summary'),init('hideOnMain',0));
 				$return[$i . '::' . $id] = $html;
 				$i++;
 			}
 			ajax::success($return);
 		} else {
-			$html = jeeAjax_objectToHtml(init('id'), init('version'), init('category', 'all'), init('tag', 'all'), init('summary'));
+			$html = jeeAjax_objectToHtml(init('id'), init('version'), init('category', 'all'), init('tag', 'all'), init('summary'),init('hideOnMain',0));
 			ajax::success($html);
 		}
 	}

core/ajax/user.ajax.php

@@ -83,7 +83,7 @@
 
 	if (init('action') == 'getApikey') {
 		if (!login(init('username'), init('password'), init('twoFactorCode'))) {
-			throw new Exception(__('Mot de passe ou nom d\'utilisateur incorrect'), __FILE__);
+			throw new Exception(__('Mot de passe ou nom d\'utilisateur incorrect', __FILE__));
 		}
 		ajax::success($_SESSION['user']->getHash());
 	}
@@ -229,7 +229,6 @@
 		$_SESSION['user']->setLogin($login);
 		$_SESSION['user']->save();
 		@session_write_close();
-		eqLogic::clearCacheWidget();
 		ajax::success();
 	}
 

core/class/DB.class.php

@@ -656,14 +656,18 @@ public static function compareTable($_table) {
 				$return[$_table['name']]['sql']	.= static::buildDefinitionField($field);
 				$return[$_table['name']]['sql'] .= ',';
 			}
-			$return[$_table['name']]['sql'] .= "\n" . 'primary key(';
+			$primary_key = '';
 			foreach ($_table['fields'] as $field) {
 				if (isset($field['key']) && $field['key'] == 'PRI') {
-					$return[$_table['name']]['sql'] .= '`' . $field['name'] . '`,';
+					$primary_key .= '`' . $field['name'] . '`,';
 				}
 			}
-			$return[$_table['name']]['sql'] = trim($return[$_table['name']]['sql'], ',');
-			$return[$_table['name']]['sql'] .= ')';
+			if($primary_key != ''){
+				$return[$_table['name']]['sql'] .= "\n" . 'primary key(';
+				$return[$_table['name']]['sql'] .= trim($primary_key, ',');
+				$return[$_table['name']]['sql'] .= ')';
+			}
+			$return[$_table['name']]['sql'] = trim($return[$_table['name']]['sql'],',');
 			$return[$_table['name']]['sql'] .= ')' . "\n";
 			if (!isset($_table['engine'])) {
 				$_table['engine'] = 'InnoDB';
@@ -676,6 +680,17 @@ public static function compareTable($_table) {
 			return $return;
 		}
 		$forceRebuildIndex = false;
+		try {
+			$status = DB::Prepare('show table status where name="' . $_table['name'] . '"', array(), DB::FETCH_TYPE_ROW);
+		} catch (\Exception $e) {
+			$status = array();
+		}
+	    if(!isset($_table['engine'])){
+       		$_table['engine'] = 'InnoDB';
+      	}
+		if(isset($status['Engine']) && $status['Engine'] != $_table['engine']){ 
+			$return[$_table['name']]['sql'] = 'ALTER TABLE `' . $_table['name'] . '` ENGINE = '.$_table['engine'];
+		}
 		foreach ($_table['fields'] as $field) {
 			$found = false;
 			foreach ($describes as $describe) {