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

Simplify getGraphData and round and to match the requested .

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2019-06-16 14:06:52 +02:00
committed by Mcat12
parent 429aa066e7
commit 1fa2e07642
1 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api_db.php
+13 -27
View File
@@ -378,45 +378,24 @@ if (isset($_GET['getGraphData']) && $auth)
$interval = $q;
}
$from = intval($_GET['from']);
$until = intval($_GET['until']);
// Round $from and $until to match the requested $interval
$from = intval((intval($_GET['from'])/$interval)*$interval);
$until = intval((intval($_GET['until'])/$interval)*$interval);
// 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", $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
// Parse the DB result into graph data, filling in missing interval sections with zero
function parseDBData($results, $interval, $from, $until) {
$data = array();
$min = null;
$max = null;
if(!is_bool($results)) {
// Read in the data
while($row = $results->fetchArray()) {
// Get min and max timestamps
if($min === null || $min > $row[0])
$min = $row[0];
if($max === null || $max < $row[0])
$max = $row[0];
// $data[timestamp] = value_in_this_interval
$data[$row[0]] = intval($row[1]);
}
// Fall back to $from and $until if we read
// no data in the fetchArray while loop above
if($min === null)
$min = $from;
if($max === null)
$max = $until;
// Fill the missing intervals with zero
for($i = min($min,$from); $i < max($max,$until); $i += $interval) {
// Advance in steps of interval
for($i = $from; $i < $until; $i += $interval) {
if(!array_key_exists($i, $data))
$data[$i] = 0;
}
@@ -425,6 +404,13 @@ if (isset($_GET['getGraphData']) && $auth)
return $data;
}
// 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", $from, SQLITE3_INTEGER);
$stmt->bindValue(":until", $until, SQLITE3_INTEGER);
$stmt->bindValue(":interval", $interval, SQLITE3_INTEGER);
$results = $stmt->execute();
$domains = parseDBData($results, $interval, $from, $until);
$result = array('domains_over_time' => $domains);