Fixed the upgrade process

WillyXJ · Apr 19, 2017 · 907423f · 907423f
1 parent 0150914
commit 907423f
Show file tree

Hide file tree

Showing 10 changed files with 128 additions and 107 deletions.
diff --git a/server/fm-modules/facileManager/change.log b/server/fm-modules/facileManager/change.log
@@ -1,3 +1,7 @@
+3.0-?? (2017-??-??)
+======================
+* Server - [bug] Fixed the upgrade process.
+
 3.0-beta2 (2017-04-14)
 ======================
 * Server - [improvement] Reworked the search bar for easier usage of it.

diff --git a/server/fm-modules/facileManager/classes/class_tools.php b/server/fm-modules/facileManager/classes/class_tools.php
@@ -62,7 +62,7 @@ function installModule($module_name = null) {
 	 * @since 1.0
 	 * @package facileManager
 	 */
-	function upgradeModule($module_name = null, $process = 'noisy') {
+	function upgradeModule($module_name = null, $process = 'noisy', $running_version = null) {
 		global $fmdb;
 
 		if (!$module_name) {
@@ -78,7 +78,7 @@ function upgradeModule($module_name = null, $process = 'noisy') {
 
 			$function = 'upgrade' . $module_name . 'Schema';
 			if (function_exists($function)) {
-				$output = $function($module_name);
+				$output = $function($running_version);
 			}
 			if ($output !== true) {
 				if ($process == 'quiet') return false;

diff --git a/server/fm-modules/facileManager/functions.php b/server/fm-modules/facileManager/functions.php
@@ -1342,7 +1342,7 @@ function getOption($option = null, $account_id = 0, $module_name = null) {
 	$query = "SELECT * FROM fm_options WHERE option_name='$option' AND account_id=$account_id $module_sql LIMIT 1";
 	$fmdb->get_results($query);
 
-	if ($fmdb->num_rows) {
+	if ($fmdb->num_rows && !$fmdb->sql_errors) {
 		$results = $fmdb->last_result;
 
 		if (isSerialized($results[0]->option_value)) {
@@ -1387,11 +1387,10 @@ function setOption($option = null, $value = null, $insert_update = 'auto', $auto
 		}
 		$query = "INSERT INTO fm_options (" . implode(',', $keys) . ") VALUES ('" . implode("','", $values) . "')";
 	} else {
-		$query = "UPDATE fm_options SET option_name='$option', option_value='$value' WHERE option_name='$option' AND account_id=$account_id $module_sql";
+		$query = "UPDATE fm_options SET option_value='$value' WHERE option_name='$option' AND account_id=$account_id $module_sql";
 	}
-	$result = $fmdb->query($query);
 
-	return $result;
+	return $fmdb->query($query);
 }
 
 /**

diff --git a/server/fm-modules/facileManager/upgrade.php b/server/fm-modules/facileManager/upgrade.php
@@ -67,7 +67,7 @@ function fmUpgrade($database) {
 	$module_list = $fmdb->last_result;
 	for ($x=0; $x<$num_rows; $x++) {
 		$module_name = $module_list[$x]->module_name;
-		$success = $fm_tools->upgradeModule($module_name, 'quiet');
+		$success = $fm_tools->upgradeModule($module_name, 'quiet', $module_list[$x]->option_value);
 		if (!$success || $fmdb->last_error) {
 			$errors = true;
 			$success = false;

diff --git a/server/fm-modules/fmDNS/change.log b/server/fm-modules/fmDNS/change.log
@@ -1,3 +1,7 @@
+3.0-?? (2017-??-??)
+======================
+* Server - [bug] Fixed the upgrade process.
+
 3.0-beta2 (2017-04-14)
 ======================
 * Server - [feature] Added support to automatically generate a DS RR. (Issue #285)