tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 08:45:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed errors php7 mysqli and warning include

Browse Source 
Former-commit-id: 68bdf4c26530de45efe2dd8fab360fb88c8976bc
This commit is contained in:
daniel 2019-01-22 08:57:48 +01:00
parent dc2b738776
commit 2c208b5e29
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/include/db/mysql.php
View File

@ -1233,7 +1233,6 @@ function mysql_db_process_file ($path, $handle_error = true) {
foreach ($file_content as $sql_line) { foreach ($file_content as $sql_line) {
if (trim($sql_line) != "" && strpos($sql_line, "--") === false) { if (trim($sql_line) != "" && strpos($sql_line, "--") === false) {
$query .= $sql_line; $query .= $sql_line;
if (preg_match("/;[\040]*\$/", $sql_line)) { if (preg_match("/;[\040]*\$/", $sql_line)) {
@ -1247,7 +1246,12 @@ function mysql_db_process_file ($path, $handle_error = true) {
// Error. Rollback the transaction // Error. Rollback the transaction
mysql_db_process_sql_rollback(); mysql_db_process_sql_rollback();
if($config["mysqli"]){
$error_message = mysqli_error($config['dbconnection']);
}
else{
$error_message = mysql_error(); $error_message = mysql_error();
}
// Handle the error // Handle the error
if ($handle_error) { if ($handle_error) {
@ -1273,7 +1277,6 @@ function mysql_db_process_file ($path, $handle_error = true) {
// No errors. Commit the transaction // No errors. Commit the transaction
mysql_db_process_sql_commit(); mysql_db_process_sql_commit();
return true; return true;
} }
else { else {

2
pandora_console/include/functions_api.php
View File

@ -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_planned_downtimes.php");
include_once($config['homedir'] . "/include/functions_db.php"); include_once($config['homedir'] . "/include/functions_db.php");
include_once($config['homedir'] . "/include/functions_event_responses.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_local_components.php');
enterprise_include_once ('include/functions_events.php'); enterprise_include_once ('include/functions_events.php');
enterprise_include_once ('include/functions_agents.php'); enterprise_include_once ('include/functions_agents.php');