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

Merge pull request #306 from pi-hole/fix/APImaingraphwithzeroAds

Browse Source 
Fix output of API for overTimeData if there are 0 blocked queries
This commit is contained in:
Mcat12
2016-12-28 13:54:49 -05:00
committed by GitHub
parent 8ae49e4914 bc57793761
commit 8d8787f343
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data.php
+16
View File
@@ -54,6 +54,14 @@
$domains_over_time = overTime($dns_queries);
$ads_over_time = overTime($ads_blocked);
// Provide a minimal valid array if there have are no blocked
// queries at all. Otherwise the output of the API is inconsistent.
if(count($ads_blocked) == 0)
{
$ads_over_time = [1 => 0];
}
alignTimeArrays($ads_over_time, $domains_over_time);
return Array(
'domains_over_time' => $domains_over_time,
@@ -68,6 +76,14 @@
$domains_over_time = overTime10mins($dns_queries);
$ads_over_time = overTime10mins($ads_blocked);
// Provide a minimal valid array if there have are no blocked
// queries at all. Otherwise the output of the API is inconsistent.
if(count($ads_blocked) == 0)
{
$ads_over_time = [1 => 0];
}
alignTimeArrays($ads_over_time, $domains_over_time);
return Array(
'domains_over_time' => $domains_over_time,