Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-24 20:55:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some fixes to some warnings and errors

Browse Source
This commit is contained in:
DL6ER
2017-01-02 11:23:57 +01:00
parent 5cbfe6a5be
commit 2d72ae75b2
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/pi-hole/php/data.php
View File

@@ -60,17 +60,15 @@
list($domains_over_time, $ads_over_time) = overTime($dns_queries, $gravity_domains);
// Align arrays
$domains_over_time = overTime($dns_queries);
$ads_over_time = overTime($ads_blocked);
alignTimeArrays($ads_over_time, $domains_over_time);
// 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)
if(count($ads_over_time) == 0)
{
$ads_over_time = [1 => 0];
}
alignTimeArrays($ads_over_time, $domains_over_time);
return Array(
'domains_over_time' => $domains_over_time,
'ads_over_time' => $ads_over_time,
@@ -90,18 +88,15 @@
list($domains_over_time, $ads_over_time) = overTime10mins($dns_queries, $gravity_domains);
// Align arrays (in case there have been hours without ad queries)
$domains_over_time = overTime10mins($dns_queries);
$ads_over_time = overTime10mins($ads_blocked);
alignTimeArrays($ads_over_time, $domains_over_time);
// 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)
if(count($ads_over_time) == 0)
{
$ads_over_time = [1 => 0];
}
alignTimeArrays($ads_over_time, $domains_over_time);
return Array(
'domains_over_time' => $domains_over_time,
'ads_over_time' => $ads_over_time,
@@ -613,7 +608,7 @@
return [$byTimeDomains,$byTimeAds];
}
function overTime10mins($entries, $gravity_domains) {
function overTime10mins($entries, $gravity_domains=[]) {
$byTimeDomains = [];
$byTimeAds = [];
foreach ($entries as $entry) {