nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-26 00:18:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1647 from laf/issue-12-new

Browse Source 
Added mysqli support
This commit is contained in:
Daniel Preussker
2015-08-12 22:06:09 +02:00
parent 3921a6fc8b a8c03ca786
commit 409b2efd17
17 changed files with 1185 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/common/syslog.inc.php
-1
View File
@@ -1,7 +1,6 @@
<?php
$sql = "SELECT *, DATE_FORMAT(timestamp, '".$config['dateformat']['mysql']['compact']."') AS date from syslog ORDER BY timestamp DESC LIMIT 20";
$query = mysql_query($sql);
$syslog_output = '
<div class="container-fluid">
html/install.php
+1
View File
@@ -352,6 +352,7 @@ $config_file = <<<"EOD"
\$config\['db_user'\] = "$dbuser";
\$config\['db_pass'\] = "$dbpass";
\$config\['db_name'\] = "$dbname";
\$config\['db'\]\['extension'\] = "mysqli";// mysql or mysqli
### Memcached config - We use this to store realtime usage
\$config\['memcached'\]\['enable'\] = FALSE;
html/pages/front/default.php
-4
View File
@@ -174,7 +174,6 @@ echo '
if ($config['enable_syslog']) {
$sql = "SELECT *, DATE_FORMAT(timestamp, '".$config['dateformat']['mysql']['compact']."') AS date from syslog ORDER BY timestamp DESC LIMIT 20";
$query = mysql_query($sql);
echo '<div class="container-fluid">
<div class="row">
@@ -214,9 +213,6 @@ else {
$alertquery = 'SELECT devices.device_id,name,state,time_logged FROM alert_log LEFT JOIN devices ON alert_log.device_id=devices.device_id LEFT JOIN alert_rules ON alert_log.rule_id=alert_rules.id RIGHT JOIN devices_perms ON alert_log.device_id = devices_perms.device_id AND devices_perms.user_id = '.$_SESSION['user_id'].' ORDER BY `time_logged` DESC LIMIT 0,15';
}
$data = mysql_query($query);
$alertdata = mysql_query($alertquery);
echo '<div class="container-fluid">
<div class="row">
<div class="col-md-6">
html/pages/front/globe.php
-3
View File
@@ -68,7 +68,6 @@ echo ' </div>
//From default.php - This code is not part of above license.
if ($config['enable_syslog']) {
$sql = "SELECT *, DATE_FORMAT(timestamp, '".$config['dateformat']['mysql']['compact']."') AS date from syslog ORDER BY seq DESC LIMIT 20";
$query = mysql_query($sql);
echo('<div class="container-fluid">
<div class="row">
<div class="col-md-12">
@@ -106,8 +105,6 @@ else {
P.device_id AND P.user_id = " . $_SESSION['user_id'] . " ORDER BY `datetime` DESC LIMIT 0,15";
}
$data = mysql_query($query);
echo('<div class="container-fluid">
<div class="row">
<div class="col-md-12">