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

refactor: Default to only using mysqli (#4915)

Browse Source 
* refactor: Default to only using mysqli

* Remove includes/dbFacile.mysql.php

* updated mres() function to remove $config global
This commit is contained in:
Neil Lathwood
2016-11-11 01:40:53 +00:00
committed by Tony Murray
parent 55f0d441e6
commit cc01969b06
9 changed files with 577 additions and 1185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
includes/definitions.inc.php
View File

@@ -5,11 +5,7 @@ require_once $config['install_dir'].'/includes/dbFacile.php';
require_once $config['install_dir'].'/includes/mergecnf.inc.php';
// Connect to database
if ($config['db']['extension'] == 'mysqli') {
$database_link = mysqli_connect('p:'.$config['db_host'], $config['db_user'], $config['db_pass']);
} else {
$database_link = mysql_pconnect($config['db_host'], $config['db_user'], $config['db_pass']);
}
$database_link = mysqli_connect('p:'.$config['db_host'], $config['db_user'], $config['db_pass']);
if (!$database_link) {
if (isCli()) {
@@ -17,19 +13,11 @@ if (!$database_link) {
} else {
echo '<h2>MySQL Error: could not connect</h2>';
}
if ($config['db']['extension'] == 'mysqli') {
echo mysqli_error($database_link);
} else {
echo mysql_error();
}
echo mysqli_error($database_link);
die;
}
if ($config['db']['extension'] == 'mysqli') {
$database_db = mysqli_select_db($database_link, $config['db_name']);
} else {
$database_db = mysql_select_db($config['db_name'], $database_link);
}
$database_db = mysqli_select_db($database_link, $config['db_name']);
if ($config['memcached']['enable'] === true) {
if (class_exists('Memcached')) {