tyler.durden/loganalyzer
1
0
Fork 0
mirror of https://github.com/rsyslog/loganalyzer.git synced 2025-09-26 11:19:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Install Script: Replace mysql functions with mysqli functions.

Browse Source 
Also enahnced database error reporting function.
closes: https://github.com/rsyslog/loganalyzer/issues/17
This commit is contained in:
Andre Lorbach 2016-10-20 11:52:34 +02:00
parent 29174ec95f
commit 5ae2ddd0c2
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/include/functions_db.php
View File

@ -207,12 +207,14 @@ function DB_GetMysqlStats()
return $status;
}
function DB_ReturnSimpleErrorMsg()
function DB_ReturnSimpleErrorMsg($dbConn = NULL)
{
global $userdbconn;
if ( $dbConn == NULL )
$dbConn = $userdbconn;
// Return Mysql Error
return "Mysql Error " . mysqli_errno($userdbconn) . " - Description: " . mysqli_error($userdbconn);
return "Mysql Error " . mysqli_errno($dbConn) . " - Description: " . mysqli_error($dbConn);
}
function DB_PrintError($MyErrorMsg, $DieOrNot)

8
src/install.php
View File

@ -374,14 +374,14 @@ else if ( $content['INSTALL_STEP'] == 4 )
}
// Now Check database connect
$link_id = mysql_connect( $_SESSION['UserDBServer'], $_SESSION['UserDBUser'], $_SESSION['UserDBPass']);
$link_id = mysqli_connect( $_SESSION["UserDBServer"], $_SESSION["UserDBUser"], $_SESSION["UserDBPass"], $_SESSION["UserDBName"], $_SESSION["UserDBPort"]);
if (!$link_id)
RevertOneStep( $content['INSTALL_STEP']-1, GetAndReplaceLangStr( $content['LN_INSTALL_ERRORCONNECTFAILED'], $_SESSION['UserDBServer']) . "<br>" . DB_ReturnSimpleErrorMsg() );
RevertOneStep( $content['INSTALL_STEP']-1, GetAndReplaceLangStr( $content['LN_INSTALL_ERRORCONNECTFAILED'], $_SESSION['UserDBServer']) . "<br>" . DB_ReturnSimpleErrorMsg($link_id) );
// Try to select the DB!
$db_selected = mysql_select_db($_SESSION['UserDBName'], $link_id);
$db_selected = mysqli_select_db($link_id, $_SESSION['UserDBName']);
if(!$db_selected)
RevertOneStep( $content['INSTALL_STEP']-1, GetAndReplaceLangStr( $content['LN_INSTALL_ERRORACCESSDENIED'], $_SESSION['UserDBName']) . "<br>" . DB_ReturnSimpleErrorMsg());
RevertOneStep( $content['INSTALL_STEP']-1, GetAndReplaceLangStr( $content['LN_INSTALL_ERRORACCESSDENIED'], $_SESSION['UserDBName']) . "<br>" . DB_ReturnSimpleErrorMsg($link_id));
}
}
// ---