From fb96e6ff21e0d55bfe0606ba56d14bb302669f79 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sun, 16 Jun 2019 14:08:26 +0200 Subject: [PATCH] Reposition parseDBData() to simplify diff output Signed-off-by: DL6ER --- api_db.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/api_db.php b/api_db.php index a5d91b62..5195114e 100644 --- a/api_db.php +++ b/api_db.php @@ -382,6 +382,13 @@ if (isset($_GET['getGraphData']) && $auth) $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 interval sections with zero function parseDBData($results, $interval, $from, $until) { $data = array(); @@ -404,13 +411,6 @@ 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);