From 2188103b5c9f7f84d006bfea5f4a890cbf3e77e8 Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Sun, 22 Jul 2018 11:57:16 -0400 Subject: [PATCH 1/2] Update blocklist wording and help page Signed-off-by: Mcat12 --- gravity.php | 4 ++-- help.php | 40 +++++++++++++++------------------- queryads.php | 2 +- scripts/pi-hole/php/header.php | 6 ++--- settings.php | 6 ++--- 5 files changed, 26 insertions(+), 32 deletions(-) diff --git a/gravity.php b/gravity.php index f11e6ab7..1b1bd3bb 100644 --- a/gravity.php +++ b/gravity.php @@ -9,7 +9,7 @@ ?>
-

Update list of ad-serving domains / blacklist / whitelist

+

Update Gravity (list of blocked domains)

@@ -22,7 +22,7 @@ Success! - +
-

Tools → Update Lists

-

Will download any updates from the third-party ad-serving domain lists that we source. By default, this command runs once a week via cron (Sunday at 01:59).

+

Tools → Update Gravity

+

Will download any updates from the third-party blocklists that we source. By default, this command runs once a week via cron (Sunday).

-

Tools → Query adlists

- This function is useful to find out what list a domain appears on. Since we don't control what the third-parties put on the block lists, you may find that a domain you normally visit stops working. If this is the case, you could run this command to scan for strings in the list of blocked domains and it will return the list the domain is found on. This proved useful a while back when the Mahakala list was adding apple.com and microsoft.com to their block list.

+

Tools → Query Lists

+ This function is useful to find out what list a domain appears on. Since we don't control what the third-parties put on the blocklists, you may find that a domain you normally visit stops working. If this is the case, you could run this command to scan for strings in the list of blocked domains and it will return the list the domain is found on. This proved useful a while back when the Mahakala list was adding apple.com and microsoft.com to their block list.

@@ -102,26 +102,20 @@

Settings

Change settings for the Pi-hole -

Networking

- Displays information about the interfaces of the Pi-hole. No changes possible. -

Pi-hole DHCP Server

- Using this setting you can enable/disable the DHCP server of the Pi-hole. Note that you should disable any other DHCP server on your network to avoid IP addresses being used more than once. You have to give the range of IPs that DHCP will serve and the IP of the local router (gateway). If the DHCP server is active, the current leases are shown on the settings page. IPv4 DHCP will always be activated, IPv6 (stateless + statefull) can be enabled. -

Upstream DNS Servers

+

System

+ Displays network and other system information of Pi-hole. At the bottom there is a "Danger Zone" with actions such as disable query logging and reboot. +

Blocklists

+ View and edit the blocklists sourced for blocked domains. +

DNS

Customize used upstream DNS servers + advanced settings for DNS servers. Note that any number of DNS servers may be enabled at a time. -

Query Logging

- Enabled/disable query logging on your Pi-hole + provide option to flush the log -

API

- Change settings which apply to the API as well as the web UI -
    -
  • Show permitted domain entries: Toogle permitted queries in Query Log + Top Domains on Main Page
    • -
  • Show blockes domain entries: Toogle blocked queries in Query Log + Top Ads on Main Page
    • -
  • Privacy mode: Replace IPs in query log with "hidden"
    • -
-

Web User Interface

- Other settings which affect the webUI but not the API of Pi-hole -

System Administration

- Apply system-wide actions like restarting of the server -
+

DHCP

+ Using this setting you can enable/disable the DHCP server of the Pi-hole. Note that you should disable any other DHCP server on your network to avoid IP addresses being used more than once. You have to give the range of IPs that DHCP will serve and the IP of the local router (gateway). If the DHCP server is active, the current leases are shown on the settings page. IPv4 DHCP will always be activated, IPv6 (stateless + statefull) can be enabled. +

API / Web Interface

+ Change settings which apply to the API as well as the web interface +

Privacy

+ Set the privacy level for queries. Note that decreasing the privacy level will not disclose previously hidden query data. +

Teleporter

+ Import and export Pi-hole settings.
diff --git a/queryads.php b/queryads.php index 14bec1dd..0fe5850c 100644 --- a/queryads.php +++ b/queryads.php @@ -9,7 +9,7 @@ ?>
-

Find Ad Domain In Lists

+

Find Blocked Domain In Lists

diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php index de3c687b..49727926 100644 --- a/scripts/pi-hole/php/header.php +++ b/scripts/pi-hole/php/header.php @@ -504,13 +504,13 @@ if($auth) { class="active"> - Update Lists + Update Gravity - + class="active"> - Query adlists + Query Lists diff --git a/settings.php b/settings.php index f824dcf2..73783d44 100644 --- a/settings.php +++ b/settings.php @@ -236,7 +236,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
    class="active">System - class="active">Block Lists + class="active">Blocklists class="active">DNS class="active">DHCP class="active">API / Web interface @@ -251,7 +251,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
    -

    Lists used to generate Pi-hole's Gravity:

    +

    Blocklists used to generate Pi-hole's Gravity:

    @@ -284,7 +284,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
    - +
    From 34f89a83e726edce6d8e8bd92315c9c91e49955a Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Sun, 22 Jul 2018 12:26:45 -0400 Subject: [PATCH 2/2] Fill in empty db graph data intervals with zero Signed-off-by: Mcat12 --- api_db.php | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/api_db.php b/api_db.php index aee13616..567e2c32 100644 --- a/api_db.php +++ b/api_db.php @@ -325,13 +325,38 @@ if (isset($_GET['getGraphData']) && $auth) $stmt->bindValue(":interval", $interval, SQLITE3_INTEGER); $results = $stmt->execute(); - $domains = array(); + // Parse the DB result into graph data, filling in missing sections with zero + function parseDBData($results, $interval) { + $data = array(); + $min = null; + $max = null; - if(!is_bool($results)) - while ($row = $results->fetchArray()) - { - $domains[$row[0]] = intval($row[1]); + if(!is_bool($results)) { + // Read in the data + while($row = $results->fetchArray()) { + // Get min and max timestamps + if($min === null || $min > $row[0]) + $min = $row[0]; + + if($max === null || $max < $row[0]) + $max = $row[0]; + + // Get the non-zero graph data + $data[$row[0]] = intval($row[1]); + } + + // Fill the missing intervals with zero + for($i = $min; $i < $max; $i += $interval) { + if(!array_key_exists($i, $data)) + $data[$i] = 0; + } } + + return $data; + } + + $domains = parseDBData($results, $interval); + $result = array('domains_over_time' => $domains); $data = array_merge($data, $result); @@ -342,13 +367,8 @@ if (isset($_GET['getGraphData']) && $auth) $stmt->bindValue(":interval", $interval, SQLITE3_INTEGER); $results = $stmt->execute(); - $addomains = array(); + $addomains = parseDBData($results, $interval); - if(!is_bool($results)) - while ($row = $results->fetchArray()) - { - $addomains[$row[0]] = intval($row[1]); - } $result = array('ads_over_time' => $addomains); $data = array_merge($data, $result); }