Merge pull request #3016 from Mips2648/alpha

fix: do not exclude all folders named "log"

Author: Mips2648

install/backup.php

@@ -77,7 +77,7 @@
 		}
 	}
 
-	
+
 	if (isset($CONFIG['db']['unix_socket'])) {
 		$str_db_connexion = "--socket=" . $CONFIG['db']['unix_socket'] . " --user=" . $CONFIG['db']['username'] . " --password='" . $CONFIG['db']['password'] . "' " . $CONFIG['db']['dbname'];
 	} else {
@@ -90,14 +90,14 @@
 	$tables = DB::Prepare("SHOW TABLES", array(), DB::FETCH_TYPE_ALL);
 	foreach ($tables as $table) {
 		$table = array_values($table)[0];
-		if($table == 'event'){
+		if ($table == 'event') {
 			continue;
 		}
-		echo "Checking  table ".$table."...";
-		system("mysqlcheck " . $str_db_connexion . ' --auto-repair --silent --tables '.$table);
+		echo "Checking  table " . $table . "...";
+		system("mysqlcheck " . $str_db_connexion . ' --auto-repair --silent --tables ' . $table);
 		echo "OK" . "\n";
 	}
-	
+
 	echo 'Backing up database...';
 	if (file_exists($jeedom_dir . "/DB_backup.sql")) {
 		unlink($jeedom_dir . "/DB_backup.sql");
@@ -109,7 +109,7 @@
 		throw new Exception('can\'t delete database backup. Check rights');
 	}
 	system("mysqldump " . $str_db_connexion . "  > " . $jeedom_dir . "/DB_backup.sql", $rc);
-	
+
 	if ($rc != 0) {
 		throw new Exception('Backing up database failed. Check mysqldump installation. Code: ' . $rc);
 	}
@@ -130,7 +130,7 @@
 
 	$excludes = array(
 		'tmp',
-		'log',
+		'./log',
 		'docs',
 		'doc',
 		'tests',
@@ -195,10 +195,10 @@
 			if ($value['scope']['backup'] === false) {
 				continue;
 			}
-			if (config::byKey($key . '::enable','core',0) == 0) {
+			if (config::byKey($key . '::enable', 'core', 0) == 0) {
 				continue;
 			}
-			if (config::byKey($key . '::cloudUpload','core',0) == 0) {
+			if (config::byKey($key . '::cloudUpload', 'core', 0) == 0) {
 				continue;
 			}
 			$class = 'repo_' . $key;