mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

changed connection around

Browse Source
This commit is contained in:
laf
2015-08-15 17:37:20 +00:00
parent a8f0d91aae
commit 446add9dd6
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
build-base.php
View File

@@ -14,24 +14,24 @@ if ($sql_fh === false) {
exit(1);
}
$connection = mysqli_connect($config['db_host'], $config['db_user'], $config['db_pass']);
if ($connection === false) {
echo 'ERROR: Cannot connect to database: '.mysqli_error($connection)."\n";
$database_link = mysqli_connect($config['db_host'], $config['db_user'], $config['db_pass']);
if ($database_link === false) {
echo 'ERROR: Cannot connect to database: '.mysqli_error($database_link)."\n";
exit(1);
}
$select = mysqli_select_db($connection, $config['db_name']);
$select = mysqli_select_db($database_link, $config['db_name']);
if ($select === false) {
echo 'ERROR: Cannot select database: '.mysqli_error($connection)."\n";
echo 'ERROR: Cannot select database: '.mysqli_error($database_link)."\n";
exit(1);
}
while (!feof($sql_fh)) {
$line = fgetss($sql_fh);
if (!empty($line)) {
$creation = mysqli_query($connection, $line);
$creation = mysqli_query($database_link, $line);
if (!$creation) {
echo 'WARNING: Cannot execute query ('.$line.'): '.mysqli_error($connection)."\n";
echo 'WARNING: Cannot execute query ('.$line.'): '.mysqli_error($database_link)."\n";
}
}
}

4
includes/sql-schema/update.php
View File

@@ -109,7 +109,7 @@ foreach ($filelist as $file) {
if ($line[0] != '#') {
if ($config['db']['extension'] == 'mysqli') {
$update = mysqli_query($connection, $line);
$update = mysqli_query($database_link, $line);
}
else {
$update = mysql_query($line);
@@ -118,7 +118,7 @@ foreach ($filelist as $file) {
$err++;
if ($debug) {
if ($config['db']['extension'] == 'mysqli') {
echo mysqli_error($connection)."\n";
echo mysqli_error($database_link)."\n";
}
else {
echo mysql_error()."\n";