From 2c208b5e29b2b36d662f394398eaa147c0280f3e Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Tue, 22 Jan 2019 08:57:48 +0100
Subject: [PATCH] fixed errors php7 mysqli and warning include

Former-commit-id: 68bdf4c26530de45efe2dd8fab360fb88c8976bc
---
 pandora_console/include/db/mysql.php      | 31 +++++++++++++----------
 pandora_console/include/functions_api.php |  2 +-
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/pandora_console/include/db/mysql.php b/pandora_console/include/db/mysql.php
index 9982ec24fb..71fed08dd9 100644
--- a/pandora_console/include/db/mysql.php
+++ b/pandora_console/include/db/mysql.php
@@ -1215,30 +1215,29 @@ function mysql_get_fields($table) {
 /**
  * Process a file with an oracle schema sentences.
  * Based on the function which installs the pandoradb.sql schema.
- * 
+ *
  * @param string $path File path.
  * @param bool $handle_error Whether to handle the mysqli_query/mysql_query errors or throw an exception.
- * 
+ *
  * @return bool Return the final status of the operation.
  */
 function mysql_db_process_file ($path, $handle_error = true) {
 	global $config;
-	
+
 	if (file_exists($path)) {
 		$file_content = file($path);
 		$query = "";
-		
+
 		// Begin the transaction
 		mysql_db_process_sql_begin();
-		
+
 		foreach ($file_content as $sql_line) {
 			if (trim($sql_line) != "" && strpos($sql_line, "--") === false) {
-				
 				$query .= $sql_line;
-				
+
 				if (preg_match("/;[\040]*\$/", $sql_line)) {
 					if ($config["mysqli"]) {
-						$query_result = mysqli_query($config['dbconnection'], $query); 
+						$query_result = mysqli_query($config['dbconnection'], $query);
 					}
 					else {
 						$query_result = mysql_query($query);
@@ -1246,9 +1245,14 @@ function mysql_db_process_file ($path, $handle_error = true) {
 					if (!$result = $query_result) {
 						// Error. Rollback the transaction
 						mysql_db_process_sql_rollback();
-						
-						$error_message = mysql_error();
-						
+
+						if($config["mysqli"]){
+							$error_message = mysqli_error($config['dbconnection']);
+						}
+						else{
+							$error_message = mysql_error();
+						}
+
 						// Handle the error
 						if ($handle_error) {
 							$backtrace = debug_backtrace();
@@ -1258,7 +1262,7 @@ function mysql_db_process_file ($path, $handle_error = true) {
 							set_error_handler('db_sql_error_handler');
 							trigger_error($error);
 							restore_error_handler();
-							
+
 							return false;
 						}
 						// Throw an exception with the error message
@@ -1270,10 +1274,9 @@ function mysql_db_process_file ($path, $handle_error = true) {
 				}
 			}
 		}
-		
+
 		// No errors. Commit the transaction
 		mysql_db_process_sql_commit();
-		
 		return true;
 	}
 	else {
diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index c1db0fadfb..27d8b5c985 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -32,7 +32,7 @@ include_once($config['homedir'] . "/include/functions_servers.php");
 include_once($config['homedir'] . "/include/functions_planned_downtimes.php");
 include_once($config['homedir'] . "/include/functions_db.php");
 include_once($config['homedir'] . "/include/functions_event_responses.php");
-include_once($config['homedir'] . "/include/functions_policies.php");
+enterprise_include_once ('include/functions_policies.php');
 enterprise_include_once ('include/functions_local_components.php');
 enterprise_include_once ('include/functions_events.php');
 enterprise_include_once ('include/functions_agents.php');