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

fix horrible bug returning incorrect start times for graphs in the billing pages

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1537 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-07-30 10:01:52 +00:00
parent 548dc82f8e
commit e814c4353c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
html/pages/bill.inc.php
View File

@ -11,7 +11,7 @@ $yesterday = str_replace("-", "", mysql_result(mysql_query("SELECT DATE_SUB(CURD
$tomorrow = str_replace("-", "", mysql_result(mysql_query("SELECT DATE_ADD(CURDATE(), INTERVAL 1 DAY)"), 0)); $tomorrow = str_replace("-", "", mysql_result(mysql_query("SELECT DATE_ADD(CURDATE(), INTERVAL 1 DAY)"), 0));
$last_month = str_replace("-", "", mysql_result(mysql_query("SELECT DATE_SUB(CURDATE(), INTERVAL 1 MONTH)"), 0)); $last_month = str_replace("-", "", mysql_result(mysql_query("SELECT DATE_SUB(CURDATE(), INTERVAL 1 MONTH)"), 0));
$now = $today . date(His); $rightnow = $today . date(His);
$before = $yesterday . date(His); $before = $yesterday . date(His);
$lastmonth = $last_month . date(His); $lastmonth = $last_month . date(His);
@ -143,14 +143,14 @@ $bi = $bi . "$type'>";
$lastmonth = mysql_result(mysql_query("SELECT UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL 1 MONTH))"), 0); $lastmonth = mysql_result(mysql_query("SELECT UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL 1 MONTH))"), 0);
$yesterday = mysql_result(mysql_query("SELECT UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL 1 DAY))"), 0); $yesterday = mysql_result(mysql_query("SELECT UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL 1 DAY))"), 0);
$now = date(U); $rightnow = date(U);
$di = "<img src='".$config['base_url']."/billing-graph.php?bill_id=" . $bill_id . "&bill_code=" . $_GET['bill_code']; $di = "<img src='".$config['base_url']."/billing-graph.php?bill_id=" . $bill_id . "&bill_code=" . $_GET['bill_code'];
$di = $di . "&from=" . $yesterday . "&to=" . $now . "&x=715&y=250"; $di = $di . "&from=" . $yesterday . "&to=" . $rightnow . "&x=715&y=250";
$di = $di . "$type'>"; $di = $di . "$type'>";
$mi = "<img src='".$config['base_url']."/billing-graph.php?bill_id=" . $bill_id . "&bill_code=" . $_GET['bill_code']; $mi = "<img src='".$config['base_url']."/billing-graph.php?bill_id=" . $bill_id . "&bill_code=" . $_GET['bill_code'];
$mi = $mi . "&from=" . $lastmonth . "&to=" . $now . "&x=715&y=250"; $mi = $mi . "&from=" . $lastmonth . "&to=" . $rightnow . "&x=715&y=250";
$mi = $mi . "$type'>"; $mi = $mi . "$type'>";
if($null) { if($null) {
@ -180,7 +180,7 @@ echo("
if ($_GET[all]) { if ($_GET[all]) {
$ai = "<img src=\"billing-graph.php?bill_id=" . $bill_id . "&bill_code=" . $_GET['bill_code']; $ai = "<img src=\"billing-graph.php?bill_id=" . $bill_id . "&bill_code=" . $_GET['bill_code'];
$ai = $ai . "&from=0&to=" . $now; $ai = $ai . "&from=0&to=" . $rightnow;
$ai = $ai . "&x=715&y=250"; $ai = $ai . "&x=715&y=250";
$ai = $ai . "&count=60\">"; $ai = $ai . "&count=60\">";
echo("<h3>Entire Data View</h3>$ai"); echo("<h3>Entire Data View</h3>$ai");