From ab31284f263d095527b36c56ff2c2a565dc71730 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 20 Jan 2019 11:54:15 +0100
Subject: [PATCH] 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.

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 api_db.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/api_db.php b/api_db.php
index 7687fb6e..1fe77449 100644
--- a/api_db.php
+++ b/api_db.php
@@ -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);