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 #383 from pi-hole/fix/whitelisted_ads

Browse Source 
Exclude whitelisted domains from showing up in the Top Ads List
This commit is contained in:
DL6ER
2017-01-31 11:58:48 +01:00
committed by GitHub
parent 2e44c6897c 9bb7f86b0f
commit e285a101d2
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/pi-hole/php/data.php
+17 -3
View File
@@ -103,6 +103,20 @@
);
}
// Test if variable exists and is positive
function ispositive(&$arg)
{
if(isset($arg))
{
if($arg > 0)
{
return true;
}
return false;
}
return false;
}
function getTopItems($argument) {
global $log,$setupVars,$privacyMode;
@@ -136,7 +150,7 @@
// Process sorted domain names
foreach ($dns_domains as $key => $value) {
if(isset($gravity_domains[$key]) && $adcounter < $qty)
if(ispositive($gravity_domains[$key]) && $adcounter < $qty)
{
// New entry for Top Ads
$topAds[$key] = $value;
@@ -669,7 +683,7 @@
$exploded = explode(" ", $entry);
$domain = trim($exploded[count($exploded) - 3]);
if(isset($gravity_domains[$domain]))
if(ispositive($gravity_domains[$domain]))
{
if (isset($byTimeAds[$time])) {
$byTimeAds[$time]++;
@@ -709,7 +723,7 @@
$exploded = explode(" ", $entry);
$domain = trim($exploded[count($exploded) - 3]);
if(isset($gravity_domains[$domain]))
if(ispositive($gravity_domains[$domain]))
{
if (isset($byTimeAds[$time])) {
$byTimeAds[$time]++;