pi-hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2024-12-06 19:36:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Always show the full requested range. Fill data with zero at the end when the daterange is extending into the future. Similarly, fill data wil zero at the beginning if the requested range extends into a region without recorded queries.

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2019-01-20 11:54:15 +01:00
parent be1a765773
commit ab31284f26
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api_db.php
+11 -8
View File
@@ -378,15 +378,18 @@ if (isset($_GET['getGraphData']) && $auth)
$interval = $q;
}
$from = intval($_GET['from']);
$until = intval($_GET['until']);
// Count permitted queries in intervals
$stmt = $db->prepare('SELECT (timestamp/:interval)*:interval interval, COUNT(*) FROM queries WHERE (status != 0 )'.$limit.' GROUP by interval ORDER by interval');
$stmt->bindValue(":from", intval($_GET['from']), SQLITE3_INTEGER);
$stmt->bindValue(":until", intval($_GET['until']), SQLITE3_INTEGER);
$stmt->bindValue(":from", $from, SQLITE3_INTEGER);
$stmt->bindValue(":until", $until, SQLITE3_INTEGER);
$stmt->bindValue(":interval", $interval, SQLITE3_INTEGER);
$results = $stmt->execute();
// Parse the DB result into graph data, filling in missing sections with zero
function parseDBData($results, $interval) {
function parseDBData($results, $interval, $from, $until) {
$data = array();
$min = null;
$max = null;
@@ -406,7 +409,7 @@ if (isset($_GET['getGraphData']) && $auth)
}
// Fill the missing intervals with zero
for($i = $min; $i < $max; $i += $interval) {
for($i = min($min,$from); $i < max($max,$until); $i += $interval) {
if(!array_key_exists($i, $data))
$data[$i] = 0;
}
@@ -415,19 +418,19 @@ if (isset($_GET['getGraphData']) && $auth)
return $data;
}
$domains = parseDBData($results, $interval);
$domains = parseDBData($results, $interval, $from, $until);
$result = array('domains_over_time' => $domains);
$data = array_merge($data, $result);
// Count blocked queries in intervals
$stmt = $db->prepare('SELECT (timestamp/:interval)*:interval interval, COUNT(*) FROM queries WHERE (status == 1 OR status == 4 OR status == 5)'.$limit.' GROUP by interval ORDER by interval');
$stmt->bindValue(":from", intval($_GET['from']), SQLITE3_INTEGER);
$stmt->bindValue(":until", intval($_GET['until']), SQLITE3_INTEGER);
$stmt->bindValue(":from", $from, SQLITE3_INTEGER);
$stmt->bindValue(":until", $until, SQLITE3_INTEGER);
$stmt->bindValue(":interval", $interval, SQLITE3_INTEGER);
$results = $stmt->execute();
$addomains = parseDBData($results, $interval);
$addomains = parseDBData($results, $interval, $from, $until);
$result = array('ads_over_time' => $addomains);
$data = array_merge($data, $result);