+ 
+
@@ -112,7 +112,7 @@ While we are primarily reachable on our
- 
+ 
## Detailed graphs and doughnut charts
diff --git a/api.php b/api.php
index 7176e243c4..6fcf8768b3 100644
--- a/api.php
+++ b/api.php
@@ -8,8 +8,8 @@
*/
$api = true;
-require_once 'scripts/pi-hole/php/FTL.php';
require_once 'scripts/pi-hole/php/password.php';
+require_once 'scripts/pi-hole/php/FTL.php';
require_once 'scripts/pi-hole/php/database.php';
require_once 'scripts/pi-hole/php/auth.php';
check_cors();
@@ -71,10 +71,28 @@
$branches = array('core_branch' => $core_branch,
'web_branch' => $web_branch,
'FTL_branch' => $FTL_branch, );
+ if (isset($versions['DOCKER_VERSION'])) {
+ // Docker info is available only inside containers
+ $updates['docker_update'] = $docker_update;
+ $current['docker_current'] = $docker_current;
+ $latest['docker_latest'] = $docker_latest;
+ }
+
$data = array_merge($data, $updates);
$data = array_merge($data, $current);
$data = array_merge($data, $latest);
$data = array_merge($data, $branches);
+} elseif (isset($_GET['setTempUnit'])) {
+ $unit = strtolower($_GET['setTempUnit']);
+ if ($unit == 'c' || $unit == 'f' || $unit == 'k') {
+ pihole_execute('-a -'.$unit);
+ $result = 'success';
+ } else {
+ // invalid unit
+ $result = 'error';
+ }
+
+ $data = array_merge($data, array('result' => $result));
} elseif (isset($_GET['list'])) {
if (!$auth) {
exit('Not authorized!');
@@ -86,22 +104,22 @@
switch ($_GET['list']) {
case 'black':
- $_POST['type'] = ListType::blacklist;
+ $_POST['type'] = LISTTYPE_BLACKLIST;
break;
case 'regex_black':
- $_POST['type'] = ListType::regex_blacklist;
+ $_POST['type'] = LISTTYPE_REGEX_BLACKLIST;
break;
case 'white':
- $_POST['type'] = ListType::whitelist;
+ $_POST['type'] = LISTTYPE_WHITELIST;
break;
case 'regex_white':
- $_POST['type'] = ListType::regex_whitelist;
+ $_POST['type'] = LISTTYPE_REGEX_WHITELIST;
break;
diff --git a/api_FTL.php b/api_FTL.php
index f1b7c237d9..927bbbba7b 100644
--- a/api_FTL.php
+++ b/api_FTL.php
@@ -19,7 +19,7 @@
$data['version'] = 3;
}
-if (isset($_GET['status'])) {
+if (isset($_GET['status']) && $auth) {
$return = callFTLAPI('stats');
if (array_key_exists('FTLnotrunning', $return)) {
$data = array('FTLnotrunning' => true);
@@ -32,7 +32,7 @@
}
}
-if (isset($_GET['summary']) || isset($_GET['summaryRaw']) || !count($_GET)) {
+if ((isset($_GET['summary']) || isset($_GET['summaryRaw']) || !count($_GET)) && $auth) {
require_once 'scripts/pi-hole/php/gravity.php';
$return = callFTLAPI('stats');
@@ -43,12 +43,12 @@
foreach ($return as $line) {
$tmp = explode(' ', $line);
- if ('domains_being_blocked' === $tmp[0] && !is_numeric($tmp[1]) || 'status' === $tmp[0]) {
+ if ($tmp[0] === 'domains_being_blocked' && !is_numeric($tmp[1]) || $tmp[0] === 'status') {
// Expect string response
$stats[$tmp[0]] = $tmp[1];
} elseif (isset($_GET['summary'])) {
// "summary" expects a formmated string response
- if ('ads_percentage_today' !== $tmp[0]) {
+ if ($tmp[0] !== 'ads_percentage_today') {
$stats[$tmp[0]] = number_format($tmp[1]);
} else {
$stats[$tmp[0]] = number_format($tmp[1], 1, '.', '');
@@ -64,30 +64,37 @@
}
if (isset($_GET['getMaxlogage']) && $auth) {
- $return = callFTLAPI('maxlogage');
- if (array_key_exists('FTLnotrunning', $return)) {
+ $maxlogage = getMaxlogage();
+
+ if ($maxlogage < 0) {
+ // FTL is offline
$data = array('FTLnotrunning' => true);
} else {
- // Convert seconds to hours and rounds to one decimal place.
- $ret = round(intval($return[0]) / 3600, 1);
- // Return 24h if value is 0, empty, null or non numeric.
- $ret = $ret ?: 24;
-
- $data = array_merge($data, array('maxlogage' => $ret));
+ $data = array_merge($data, array('maxlogage' => $maxlogage));
}
}
-if (isset($_GET['overTimeData10mins'])) {
+if (isset($_GET['overTimeData10mins']) && $auth) {
+ $maxlogage = getMaxlogage();
+
$return = callFTLAPI('overTime');
- if (array_key_exists('FTLnotrunning', $return)) {
+ if (array_key_exists('FTLnotrunning', $return) || $maxlogage < 0) {
$data = array('FTLnotrunning' => true);
} else {
$domains_over_time = array();
$ads_over_time = array();
+
+ // Use current time and maxlogage to limit the time range
+ $time_end = time();
+ $time_start = $time_end - ($maxlogage * 3600);
+
foreach ($return as $line) {
$tmp = explode(' ', $line);
- $domains_over_time[intval($tmp[0])] = intval($tmp[1]);
- $ads_over_time[intval($tmp[0])] = intval($tmp[2]);
+ $timeslot = intval($tmp[0]);
+ if ($timeslot >= $time_start && $timeslot <= $time_end) {
+ $domains_over_time[$timeslot] = intval($tmp[1]);
+ $ads_over_time[$timeslot] = intval($tmp[2]);
+ }
}
$result = array(
@@ -100,7 +107,7 @@
}
if (isset($_GET['topItems']) && $auth) {
- if ('audit' === $_GET['topItems']) {
+ if ($_GET['topItems'] === 'audit') {
$return = callFTLAPI('top-domains for audit');
} elseif (is_numeric($_GET['topItems'])) {
$return = callFTLAPI('top-domains ('.$_GET['topItems'].')');
@@ -114,7 +121,7 @@
$top_queries = array();
foreach ($return as $line) {
$tmp = explode(' ', $line);
- if (2 == count($tmp)) {
+ if (count($tmp) == 2) {
$tmp[2] = '';
}
$domain = utf8_encode($tmp[2]);
@@ -122,7 +129,7 @@
}
}
- if ('audit' === $_GET['topItems']) {
+ if ($_GET['topItems'] === 'audit') {
$return = callFTLAPI('top-ads for audit');
} elseif (is_numeric($_GET['topItems'])) {
$return = callFTLAPI('top-ads ('.$_GET['topItems'].')');
@@ -216,7 +223,7 @@
}
if (isset($_GET['getForwardDestinations']) && $auth) {
- if ('unsorted' === $_GET['getForwardDestinations']) {
+ if ($_GET['getForwardDestinations'] === 'unsorted') {
$return = callFTLAPI('forward-dest unsorted');
} else {
$return = callFTLAPI('forward-dest');
@@ -282,7 +289,7 @@
} elseif (isset($_GET['domain'])) {
// Get specific domain only
$return = callFTLAPI('getallqueries-domain '.$_GET['domain']);
- } elseif (isset($_GET['client']) && (isset($_GET['type']) && 'blocked' === $_GET['type'])) {
+ } elseif (isset($_GET['client']) && (isset($_GET['type']) && $_GET['type'] === 'blocked')) {
// Get specific client only
$return = callFTLAPI('getallqueries-client-blocked '.$_GET['client']);
} elseif (isset($_GET['client'])) {
@@ -401,16 +408,25 @@
}
if (isset($_GET['overTimeDataClients']) && $auth) {
- $return = callFTLAPI('ClientsoverTime');
+ $maxlogage = getMaxlogage();
- if (array_key_exists('FTLnotrunning', $return)) {
+ $return = callFTLAPI('ClientsoverTime');
+ if (array_key_exists('FTLnotrunning', $return) || $maxlogage < 0) {
$data = array('FTLnotrunning' => true);
} else {
$over_time = array();
+
+ // Use current time and maxlogage to limit the time range
+ $time_end = time();
+ $time_start = $time_end - ($maxlogage * 3600);
+
foreach ($return as $line) {
$tmp = explode(' ', $line);
for ($i = 0; $i < count($tmp) - 1; ++$i) {
- $over_time[intval($tmp[0])][$i] = floatval($tmp[$i + 1]);
+ $timeslot = intval($tmp[0]);
+ if ($timeslot >= $time_start && $timeslot <= $time_end) {
+ $over_time[$timeslot][$i] = floatval($tmp[$i + 1]);
+ }
}
}
$result = array('over_time' => $over_time);
diff --git a/api_db.php b/api_db.php
index 1ab47ff1b6..f060d47bbb 100644
--- a/api_db.php
+++ b/api_db.php
@@ -8,9 +8,10 @@
*/
$api = true;
+require 'scripts/pi-hole/php/password.php';
+
header('Content-type: application/json');
require 'scripts/pi-hole/php/database.php';
-require 'scripts/pi-hole/php/password.php';
require 'scripts/pi-hole/php/auth.php';
require_once 'scripts/pi-hole/php/func.php';
check_cors();
@@ -30,16 +31,16 @@
$network = array();
$results = $db->query('SELECT * FROM network');
- while (false !== $results && $res = $results->fetchArray(SQLITE3_ASSOC)) {
+ while ($results !== false && $res = $results->fetchArray(SQLITE3_ASSOC)) {
$id = intval($res['id']);
// Get IP addresses and host names for this device
$res['ip'] = array();
$res['name'] = array();
$network_addresses = $db->query("SELECT ip,name FROM network_addresses WHERE network_id = {$id} ORDER BY lastSeen DESC");
- while (false !== $network_addresses && $network_address = $network_addresses->fetchArray(SQLITE3_ASSOC)) {
+ while ($network_addresses !== false && $network_address = $network_addresses->fetchArray(SQLITE3_ASSOC)) {
array_push($res['ip'], $network_address['ip']);
- if (null !== $network_address['name']) {
+ if ($network_address['name'] !== null) {
array_push($res['name'], utf8_encode($network_address['name']));
} else {
array_push($res['name'], '');
@@ -58,7 +59,7 @@
if (isset($_GET['getAllQueries']) && $auth) {
$allQueries = array();
- if ('empty' !== $_GET['getAllQueries']) {
+ if ($_GET['getAllQueries'] !== 'empty') {
$from = intval($_GET['from']);
$until = intval($_GET['until']);
@@ -75,17 +76,18 @@
$dbquery .= ' status, reply_type, reply_time, dnssec';
$dbquery .= ' FROM query_storage q';
$dbquery .= ' WHERE timestamp >= :from AND timestamp <= :until ';
- if (isset($_GET['types'])) {
- $types = $_GET['types'];
- if (1 === preg_match('/^[0-9]+(?:,[0-9]+)*$/', $types)) {
+ if (isset($_GET['status'])) {
+ // if some query status should be excluded
+ $excludedStatus = $_GET['status'];
+ if (preg_match('/^[0-9]+(?:,[0-9]+)*$/', $excludedStatus) === 1) {
// Append selector to DB query. The used regex ensures
// that only numbers, separated by commas are accepted
// to avoid code injection and other malicious things
// We accept only valid lists like "1,2,3"
// We reject ",2,3", "1,2," and similar arguments
- $dbquery .= 'AND status IN ('.$types.') ';
+ $dbquery .= 'AND status NOT IN ('.$excludedStatus.') ';
} else {
- exit('Error. Selector types specified using an invalid format.');
+ exit('Error. Selector status specified using an invalid format.');
}
}
$dbquery .= 'ORDER BY timestamp ASC';
@@ -190,7 +192,7 @@
$limit = ' AND timestamp <= :until';
}
// Select top permitted domains only
- $stmt = $db->prepare('SELECT domain,count(domain) FROM queries WHERE status IN (2,3,12,13,14)'.$limit.' GROUP by domain order by count(domain) desc limit 20');
+ $stmt = $db->prepare('SELECT domain,count(domain) FROM queries WHERE status IN (2,3,12,13,14,17)'.$limit.' GROUP by domain order by count(domain) desc limit 20');
$stmt->bindValue(':from', intval($_GET['from']), SQLITE3_INTEGER);
$stmt->bindValue(':until', intval($_GET['until']), SQLITE3_INTEGER);
$results = $stmt->execute();
@@ -293,11 +295,11 @@
$limit = '';
if (isset($_GET['from'], $_GET['until'])) {
- $limit = ' AND timestamp >= :from AND timestamp <= :until';
+ $limit = 'timestamp >= :from AND timestamp <= :until';
} elseif (isset($_GET['from']) && !isset($_GET['until'])) {
- $limit = ' AND timestamp >= :from';
+ $limit = 'timestamp >= :from';
} elseif (!isset($_GET['from']) && isset($_GET['until'])) {
- $limit = ' AND timestamp <= :until';
+ $limit = 'timestamp <= :until';
}
$interval = 600;
@@ -313,8 +315,24 @@
$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');
+ // Count domains and blocked queries using the same intervals
+ $sqlcommand = "
+ SELECT
+ (timestamp / :interval) * :interval AS interval,
+ SUM(CASE
+ WHEN status !=0 THEN 1
+ ELSE 0
+ END) AS domains,
+ SUM(CASE
+ WHEN status IN (1,4,5,6,7,8,9,10,11,15,16) THEN 1
+ ELSE 0
+ END) AS blocked
+ FROM queries
+ WHERE $limit
+ GROUP BY interval
+ ORDER BY interval";
+
+ $stmt = $db->prepare($sqlcommand);
$stmt->bindValue(':from', $from, SQLITE3_INTEGER);
$stmt->bindValue(':until', $until, SQLITE3_INTEGER);
$stmt->bindValue(':interval', $interval, SQLITE3_INTEGER);
@@ -323,57 +341,45 @@
// Parse the DB result into graph data, filling in missing interval sections with zero
function parseDBData($results, $interval, $from, $until)
{
- $data = array();
+ $domains = array();
+ $blocked = array();
$first_db_timestamp = -1;
if (!is_bool($results)) {
// Read in the data
while ($row = $results->fetchArray()) {
- // $data[timestamp] = value_in_this_interval
- $data[$row[0]] = intval($row[1]);
- if (-1 === $first_db_timestamp) {
+ $domains[$row['interval']] = intval($row['domains']);
+ $blocked[$row['interval']] = intval($row['blocked']);
+ if ($first_db_timestamp === -1) {
$first_db_timestamp = intval($row[0]);
}
}
}
- // It is unpredictable what the first timestamp returned by the database
- // will be. This depends on live data. Hence, we re-align the FROM
- // timestamp to avoid unaligned holes appearing as additional
- // (incorrect) data points
+ // It is unpredictable what the first timestamp returned by the database will be.
+ // This depends on live data. The bar graph can handle "gaps", but the Area graph can't.
+ // Hence, we filling the "missing" timeslots with 0 to avoid wrong graphic render.
+ // (https://github.com/pi-hole/AdminLTE/pull/2374#issuecomment-1261865428)
$aligned_from = $from + (($first_db_timestamp - $from) % $interval);
// Fill gaps in returned data
for ($i = $aligned_from; $i < $until; $i += $interval) {
- if (!array_key_exists($i, $data)) {
- $data[$i] = 0;
+ if (!array_key_exists($i, $domains)) {
+ $domains[$i] = 0;
+ $blocked[$i] = 0;
}
}
- return $data;
+ return array('domains_over_time' => $domains, 'ads_over_time' => $blocked);
}
- $domains = parseDBData($results, $interval, $from, $until);
-
- $result = array('domains_over_time' => $domains);
- $data = array_merge($data, $result);
-
- // Count blocked queries in intervals
- $stmt = $db->prepare('SELECT (timestamp/:interval)*:interval interval, COUNT(*) FROM queries WHERE status IN (1,4,5,6,7,8,9,10,11)'.$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();
-
- $addomains = parseDBData($results, $interval, $from, $until);
-
- $result = array('ads_over_time' => $addomains);
- $data = array_merge($data, $result);
+ $over_time = parseDBData($results, $interval, $from, $until);
+ $data = array_merge($data, $over_time);
}
if (isset($_GET['status']) && $auth) {
$extra = ';';
- if (isset($_GET['ignore']) && 'DNSMASQ_WARN' === $_GET['ignore']) {
+ if (isset($_GET['ignore']) && $_GET['ignore'] === 'DNSMASQ_WARN') {
$extra = "WHERE type != 'DNSMASQ_WARN';";
}
$results = $db->query('SELECT COUNT(*) FROM message '.$extra);
@@ -389,14 +395,14 @@ function parseDBData($results, $interval, $from, $until)
if (isset($_GET['messages']) && $auth) {
$extra = ';';
- if (isset($_GET['ignore']) && 'DNSMASQ_WARN' === $_GET['ignore']) {
+ if (isset($_GET['ignore']) && $_GET['ignore'] === 'DNSMASQ_WARN') {
$extra = "WHERE type != 'DNSMASQ_WARN';";
}
$messages = array();
$results = $db->query('SELECT * FROM message '.$extra);
- while (false !== $results && $res = $results->fetchArray(SQLITE3_ASSOC)) {
+ while ($results !== false && $res = $results->fetchArray(SQLITE3_ASSOC)) {
// Convert string to to UTF-8 encoding to ensure php-json can handle it.
// Furthermore, convert special characters to HTML entities to prevent XSS attacks.
foreach ($res as $key => $value) {
diff --git a/auditlog.php b/auditlog.php
index b1e7cfb35a..3c311ac604 100644
--- a/auditlog.php
+++ b/auditlog.php
@@ -8,7 +8,7 @@
* Please see LICENSE file for your rights under this license.
*/
-require 'scripts/pi-hole/php/header.php';
+require 'scripts/pi-hole/php/header_authenticated.php';
?>
@@ -79,7 +79,7 @@
-
+
@@ -32,7 +32,7 @@
Queries Blocked
+Total Queries
Queries Blocked (Wildcards)
+Queries Blocked
Queries Total
+Queries Blocked (Wildcards)
Queries Blocked
+Percentage Blocked
+ After installing Pi-hole for the first time, a password is generated and displayed + to the user. The password cannot be retrieved later on, but it is possible to set + a new password (or explicitly disable the password by setting an empty password) + using the command +
+sudo pihole -a -p+