From 48e68b1264008fd9a17160f5ad4a536925bd8686 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 13 Oct 2017 14:08:50 +0200
Subject: [PATCH] fixed error in function check mr

---
 pandora_console/include/db/mysql.php | 128 ++++++++++++++-------------
 1 file changed, 66 insertions(+), 62 deletions(-)

diff --git a/pandora_console/include/db/mysql.php b/pandora_console/include/db/mysql.php
index 3132f4239c..7da9316c65 100644
--- a/pandora_console/include/db/mysql.php
+++ b/pandora_console/include/db/mysql.php
@@ -1319,70 +1319,74 @@ function mysql_db_process_file ($path, $handle_error = true) {
 // --------------------------------------------------------------- 
 
 function db_run_sql_file ($location) {
-	global $config;
-	
-	// Load file
-	$commands = file_get_contents($location);
-	// Delete comments
-	$lines = explode("\n", $commands);
-	$commands = '';
-	foreach ($lines as $line) {
-		$line = trim($line);
-		if ($line && !preg_match('/^--/', $line) && !preg_match('/^\/\*/', $line)) {
-			$commands .= $line;
-		}
-	}
-	
-	// Convert to array
-	$commands = explode(";", $commands);
-	
-	if ($config['mysqli']) {
-		$mysqli = new mysqli($config["dbhost"], $config["dbuser"], $config["dbpass"], $config["dbname"], $config["dbport"]);
+    global $config;
 
-		// Run commands
-		$mysqli->query($config['dbconnection'], 'SET AUTOCOMMIT = 0');
-		$mysqli->query($config['dbconnection'], 'START TRANSACTION');
-	}
-	else {
-		// Run commands
-		mysql_db_process_sql_begin(); // Begin transaction
-	}
-	
-	foreach ($commands as $command) {
-		if (trim($command)) {
-			if ($config['mysqli']) {
-				$result = $mysqli->query($command);
-			}
-			else {
-				$result = mysql_query($command);
-			}
-			
-			if (!$result) {
-				break; // Error
-			}
-		}
-	}
+    // Load file
+    $commands = file_get_contents($location);
+    // Delete comments
+    $lines = explode("\n", $commands);
+    $commands = '';
+    foreach ($lines as $line) {
+        $line = trim($line);
+        if ($line && !preg_match('/^--/', $line) && !preg_match('/^\/\*/', $line)) {
 
-	if ($result) {
-		if ($config['mysqli']) {
-			$mysqli->query($config['dbconnection'], 'COMMIT');
-			$mysqli->query($config['dbconnection'], 'SET AUTOCOMMIT = 1');
-		}
-		else {
-			mysql_db_process_sql_commit(); // Save results
-		}
-		return true;
-	}
-	else {
-		if ($config['mysqli']) {
-			$mysqli->query($config['dbconnection'], 'ROLLBACK ');
-			$mysqli->query($config['dbconnection'], 'SET AUTOCOMMIT = 1');
-		}
-		else {
-			mysql_db_process_sql_rollback(); // Undo results
-		}
-		return false;
-	}
+            $line = preg_replace('/;$/',"__;__", $line);
+            $commands .= $line;
+        }
+    }
+
+    // Convert to array
+    $commands = explode("__;__", $commands);
+
+    if ($config['mysqli']) {
+        $mysqli = new mysqli($config["dbhost"], $config["dbuser"], $config["dbpass"], $config["dbname"], $config["dbport"]);
+
+        // Run commands
+        $mysqli->query($config['dbconnection'], 'SET AUTOCOMMIT = 0');
+        $mysqli->query($config['dbconnection'], 'START TRANSACTION');
+    }
+    else {
+        // Run commands
+        mysql_db_process_sql_begin(); // Begin transaction
+    }
+
+    foreach ($commands as $command) {
+        if (trim($command)) {
+            $command .= ";";
+
+            if ($config['mysqli']) {
+                $result = $mysqli->query($command);
+            }
+            else {
+                $result = mysql_query($command);
+            }
+
+            if (!$result) {
+                break; // Error
+            }
+        }
+    }
+
+    if ($result) {
+        if ($config['mysqli']) {
+            $mysqli->query($config['dbconnection'], 'COMMIT');
+            $mysqli->query($config['dbconnection'], 'SET AUTOCOMMIT = 1');
+        }
+        else {
+            mysql_db_process_sql_commit(); // Save results
+        }
+        return true;
+    }
+    else {
+        if ($config['mysqli']) {
+            $mysqli->query($config['dbconnection'], 'ROLLBACK ');
+            $mysqli->query($config['dbconnection'], 'SET AUTOCOMMIT = 1');
+        }
+        else {
+            mysql_db_process_sql_rollback(); // Undo results
+        }
+        return false;
+    }
 }
 
 ?>