Skip to content

Commit

Permalink
V5.13 (#57)
Browse files Browse the repository at this point in the history
* Using the correct dimensions

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Add content type header

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Add codespell.yml

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

* Fix some suggestions / ignore others

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

* Allow delete multiple items - Group pages

- add checkboxes, buttons and functions to groups page;
- add checkboxes, buttons and functions to clients page;
- add checkboxes, buttons and functions to domains page;
- add checkboxes, buttons and functions to adlists page;
- move function to `utils.js`;
- fix CSS after insert a new table column;

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Pass config file path when reloading pihole-FTL.conf

Signed-off-by: Christian König <ckoenig@posteo.de>

* Use DEFAULT_FTLCONFFILE

Signed-off-by: Christian König <ckoenig@posteo.de>

* Add QUERY_SPECIAL_DOMAIN as new query status

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Review comments

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Fix dropdown background color (dark theme)

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Show "other" destination as the last graphic item

- Show the item only if it's different than zero

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fix prettier

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fix `xo`

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Added information about group assignment of whitelisted/blacklisted d… (pi-hole#2186)

* Added information about group assignment of whitelisted/blacklisted domains

Signed-off-by: martinbrose <13284268+martinbrose@users.noreply.github.com>

Co-authored-by: yubiuser <ckoenig@posteo.de>
Co-authored-by: Adam Warner <github@adamwarner.co.uk>

* Applying the reviewer's suggestions

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fix `data.columns` ID replaced by mistake

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Quote SQL reserved word and fix javascript output.

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Remove unused variable

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Only remove last data point for line charts as it is not representative there (pi-hole#2195)

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Scale axes to integer

Signed-off-by: Christian König <ckoenig@posteo.de>

* Only remove last data point for line charts as it is not representative there

Signed-off-by: Christian König <ckoenig@posteo.de>

* Reduce border size of line charts

Signed-off-by: Christian König <ckoenig@posteo.de>

* Fixing weird bug

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fixing minor inconsistencies

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Remove duplicate function declarations

and move functions to `func.php`.

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* /var/log/ -> /var/log/pihole/

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

* Add missing columns `reply_type`, `reply_time`, `dnssec`

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fix multiplier (`reply_time` field unit is second)

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fix prettier

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Using global `utils.showAlert` function

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fix prettier

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Removing old function call

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Clean text fields after success.

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Keep field values when deleting + Fix typo

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Bump xo from 0.48.0 to 0.49.0

Bumps [xo](https://github.com/xojs/xo) from 0.48.0 to 0.49.0.
- [Release notes](https://github.com/xojs/xo/releases)
- [Commits](xojs/xo@v0.48.0...v0.49.0)

---
updated-dependencies:
- dependency-name: xo
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Remove unused case

* Remove empty line before PHP opening tag

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Bump postcss from 8.4.12 to 8.4.14

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.12 to 8.4.14.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](postcss/postcss@8.4.12...8.4.14)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump autoprefixer from 10.4.4 to 10.4.7

Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 10.4.4 to 10.4.7.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/main/CHANGELOG.md)
- [Commits](postcss/autoprefixer@10.4.4...10.4.7)

---
updated-dependencies:
- dependency-name: autoprefixer
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Drop IE 11

Signed-off-by: Christian König <ckoenig@posteo.de>

* Remove unused eslint compat rule

Signed-off-by: Christian König <ckoenig@posteo.de>

* Remove repo specific PR template

Signed-off-by: Christian König <ckoenig@posteo.de>

* Also check wildcard domains for validity before adding

Signed-off-by: Christian König <ckoenig@posteo.de>

* Replace `queries` with `query_storage`

- use client names, when available;
- use column names instead of indexes;

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Change lighttpd log file names

Signed-off-by: Christian König <ckoenig@posteo.de>

* Use IP if there is no client name

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fix DNSSEC info

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fixing prettier line break

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Use the same types, as returned by FTL

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Make it clearer where to find the debug token

Signed-off-by: Christian König <ckoenig@posteo.de>

* Use consistent output for both query lists

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Use the correct endpoint for MAXLOGAGE

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Show suggested domains in group domains page

Signed-off-by: Anthony de Jong <11158888+anthony-de-jong@users.noreply.github.com>

* Fix possible XSS in `queryads.php`

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Base DHCP settings on default gateway address and not on IPV4_ADDRESS from setupVars.conf

Signed-off-by: Christian König <ckoenig@posteo.de>

* Do not use IPvX from setupVars in

Signed-off-by: Christian König <ckoenig@posteo.de>

* Fix indention

Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>

* Remove unnecessary else case

Signed-off-by: Christian König <ckoenig@posteo.de>

* Omit DHCPdomain

Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>

* Add a default option for PORTFILE

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Use API gateway endpoint

Signed-off-by: Christian König <ckoenig@posteo.de>

* Remove unnecessary requirement

* Bump xo from 0.49.0 to 0.50.0

Bumps [xo](https://github.com/xojs/xo) from 0.49.0 to 0.50.0.
- [Release notes](https://github.com/xojs/xo/releases)
- [Commits](xojs/xo@v0.49.0...v0.50.0)

---
updated-dependencies:
- dependency-name: xo
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Use simpler logic

Co-authored-by: Adam Warner <me@adamwarner.co.uk>

Signed-off-by: yubiuser <ckoenig@posteo.de>

* Update dependabot.yml

Add requested reviewers 

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

* Fix part of issue pi-hole/FTL#1319

Signed-off-by: Pingger Shikkoken <Pingger@users.noreply.github.com>

* Bump prettier from 2.6.2 to 2.7.1

Bumps [prettier](https://github.com/prettier/prettier) from 2.6.2 to 2.7.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@2.6.2...2.7.1)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Upgrade stale action to v5

Signed-off-by: Christian König <ckoenig@posteo.de>

* Add stale-issue-reason

Signed-off-by: Christian König <ckoenig@posteo.de>

* Add github-action to dependabot

Signed-off-by: Christian König <ckoenig@posteo.de>

* Adjust debug log scroll position

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Add .editorconfig

Signed-off-by: Christian König <ckoenig@posteo.de>

* Add yml editorconfig style

Signed-off-by: Christian König <ckoenig@posteo.de>

* Add editorconfig-checker action workflow

Signed-off-by: Christian König <ckoenig@posteo.de>

* Remove unused parameter

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Adjust .editorconfig to avoid warning messages

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Remove old debug output

and fix indentation.

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Add stickler-CI to test yaml and mkdowm files

Signed-off-by: Christian König <ckoenig@posteo.de>

* Exclude vendor files from stickler check

Signed-off-by: Christian König <ckoenig@posteo.de>

* Bump postcss-cli from 9.1.0 to 10.0.0

Bumps [postcss-cli](https://github.com/postcss/postcss-cli) from 9.1.0 to 10.0.0.
- [Release notes](https://github.com/postcss/postcss-cli/releases)
- [Changelog](https://github.com/postcss/postcss-cli/blob/master/CHANGELOG.md)
- [Commits](postcss/postcss-cli@9.1.0...10.0.0)

---
updated-dependencies:
- dependency-name: postcss-cli
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Switch to node 16.x

Signed-off-by: Christian König <ckoenig@posteo.de>

* Run stale workflow at 8:00 once per day

Signed-off-by: Christian König <ckoenig@posteo.de>

* Change FTL's default log file path from /var/log/pihole/pihole-FTL.log to /var/log/pihole/FTL.log

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Use a random name when creating intermediat archive for teleporter

Signed-off-by: Christian König <ckoenig@posteo.de>

* Show names in top clients list from long-term data

Signed-off-by: Christian König <ckoenig@posteo.de>

* Address reviewer's comment

Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>

Signed-off-by: yubiuser <ckoenig@posteo.de>

* Fix close-issue-reason

Signed-off-by: Christian König <ckoenig@posteo.de>

* Add yamllint config, fix some indentation

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Co-authored-by: Adam Warner <me@adamwarner.co.uk>
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Co-authored-by: yubiuser <ckoenig@posteo.de>
Co-authored-by: DL6ER <dl6er@dl6er.de>
Co-authored-by: martinbrose <13284268+martinbrose@users.noreply.github.com>
Co-authored-by: Adam Warner <github@adamwarner.co.uk>
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
Co-authored-by: Anthony de Jong <11158888+anthony-de-jong@users.noreply.github.com>
Co-authored-by: Pingger Shikkoken <Pingger@users.noreply.github.com>
  • Loading branch information
12 people authored Jul 9, 2022
1 parent 495df8b commit 3b87dfd
Show file tree
Hide file tree
Showing 51 changed files with 2,202 additions and 1,562 deletions.
2 changes: 2 additions & 0 deletions .codespellignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ede
EDE
28 changes: 28 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# EditorConfig is awesome: https://editorconfig.org/

# top-most EditorConfig file
root = true

# A newline ending every file
[*]
insert_final_newline = true
indent_style = space
indent_size = 4
charset = utf-8
trim_trailing_whitespace = true

[*.css]
indent_style = space
indent_size = 2

[scripts/**.js]
indent_style = space
indent_size = 2

[package.json]
indent_style = space
indent_size = 2

[*.yml]
indent_style = space
indent_size = 2
32 changes: 0 additions & 32 deletions .github/PULL_REQUEST_TEMPLATE.md

This file was deleted.

12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,15 @@ updates:
versions:
- 10.2.3
- 10.2.4
reviewers:
- "pi-hole/web-maintainers"
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: weekly
day: saturday
time: "10:00"
open-pull-requests-limit: 10
target-branch: devel
reviewers:
- "pi-hole/web-maintainers"
20 changes: 20 additions & 0 deletions .github/workflows/codespell.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Codespell

on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review]

jobs:
spell-check:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
steps:
-
name: Checkout repository
uses: actions/checkout@v3
-
name: Spell-Checking
uses: codespell-project/actions-codespell@master
with:
ignore_words_file: .codespellignore
skip: ./scripts/vendor,./style/vendor
14 changes: 14 additions & 0 deletions .github/workflows/editorconfig-checker
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: editorconfig-checker

on:
pull_request:
push:

jobs:
build:
name: editorconfig-checker
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: editorconfig-checker/action-editorconfig-checker@main
- run: editorconfig-checker
5 changes: 3 additions & 2 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Mark stale issues

on:
schedule:
- cron: '0 * * * *'
- cron: '0 8 * * *'
workflow_dispatch:

jobs:
Expand All @@ -13,7 +13,7 @@ jobs:
issues: write

steps:
- uses: actions/stale@v4
- uses: actions/stale@v5
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
days-before-stale: 30
Expand All @@ -23,3 +23,4 @@ jobs:
exempt-issue-labels: 'internal, Fixed In Next Release, Bug'
exempt-all-issue-assignees: true
operations-per-run: 300
close-issue-reason: 'not_planned'
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: "14.x"
node-version: "16.x"
cache: npm

- name: Install npm dependencies
Expand Down
9 changes: 9 additions & 0 deletions .stickler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
linters:
yamllint:
config: ./.yamllint.conf
remarklint:
files:
ignore:
- 'scripts/vendor/*'
- 'style/vendor/*'
3 changes: 3 additions & 0 deletions .yamllint.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
rules:
line-length: disable
document-start: disable
5 changes: 4 additions & 1 deletion api_FTL.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
}

if (isset($_GET["getMaxlogage"]) && $auth) {
$return = callFTLAPI("stats");
$return = callFTLAPI("maxlogage");
if (array_key_exists("FTLnotrunning", $return)) {
$data = array("FTLnotrunning" => true);
} else {
Expand Down Expand Up @@ -306,6 +306,9 @@
if (array_key_exists("FTLnotrunning", $return)) {
$data = array("FTLnotrunning" => true);
} else {
// Set the header
header('Content-type: application/json');

// Start the JSON string
echo '{"data":[';
$first = true;
Expand Down
43 changes: 33 additions & 10 deletions api_db.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,20 @@
{
$from = intval($_GET["from"]);
$until = intval($_GET["until"]);
$dbquery = "SELECT timestamp, type, domain, client, status, forward FROM queries WHERE timestamp >= :from AND timestamp <= :until ";

// Use table "query_storage"
// - replace domain ID with domain
// - replace client ID with client name
// - replace forward ID with forward destination
$dbquery = "SELECT timestamp, type,";
$dbquery .= " CASE typeof(domain) WHEN 'integer' THEN (SELECT domain FROM domain_by_id d WHERE d.id = q.domain) ELSE domain END domain,";
$dbquery .= " CASE typeof(client) WHEN 'integer' THEN (";
$dbquery .= " SELECT CASE TRIM(name) WHEN '' THEN c.ip ELSE c.name END name FROM client_by_id c WHERE c.id = q.client";
$dbquery .= " ) ELSE client END client,";
$dbquery .= " CASE typeof(forward) WHEN 'integer' THEN (SELECT forward FROM forward_by_id f WHERE f.id = q.forward) ELSE forward END forward,";
$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"];
Expand Down Expand Up @@ -93,22 +106,28 @@

if (!is_bool($results)) {
$first = true;
while ($row = $results->fetchArray()) {
while ($row = $results->fetchArray(SQLITE3_ASSOC)) {
// Insert a comma before the next record (except on the first one)
if (!$first) {
echo ",";
} else {
$first = false;
}

// Convert query type ID to name, encode domain, encode destination
$query_type = getQueryTypeStr($row[1]);
$domain = utf8_encode(str_replace("~"," ",$row[2]));
$destination = utf8_encode($row[5]);
// Format, encode, transform each field (if necessary).
$time = $row["timestamp"];
$query_type = getQueryTypeStr($row["type"]); // Convert query type ID to name
$domain = utf8_encode(str_replace("~"," ",$row["domain"]));
$client = $row["client"];
$status = $row["status"];
$destination = utf8_encode($row["forward"]);
$reply_type = $row["reply_type"];
$reply_time = $row["reply_time"];
$dnssec = $row["dnssec"];
$client_id = $row["client_id"];

// Insert into array and output it in JSON format
// array: time type domain client status upstream destination
echo json_encode([$row[0], $query_type, $domain, $row[3], $row[4], $destination]);
echo json_encode([$time, $query_type, $domain, $client, $status, $destination, $reply_type, $reply_time, $dnssec]);
}
}

Expand Down Expand Up @@ -139,7 +158,11 @@
{
$limit = "WHERE timestamp <= :until";
}
$stmt = $db->prepare('SELECT client,count(client) FROM queries '.$limit.' GROUP by client order by count(client) desc limit 20');
$dbquery = "SELECT CASE typeof(client) WHEN 'integer' THEN (";
$dbquery .= " SELECT CASE TRIM(name) WHEN '' THEN c.ip ELSE c.name END name FROM client_by_id c WHERE c.id = q.client)";
$dbquery .= " ELSE client END client, count(client) FROM query_storage q ".$limit." GROUP BY client ORDER BY count(client) DESC LIMIT 20";

$stmt = $db->prepare($dbquery);
$stmt->bindValue(":from", intval($_GET['from']), SQLITE3_INTEGER);
$stmt->bindValue(":until", intval($_GET['until']), SQLITE3_INTEGER);
$results = $stmt->execute();
Expand Down Expand Up @@ -384,7 +407,7 @@ function parseDBData($results, $interval, $from, $until) {
$data = array_merge($data, $result);
}

if (isset($_GET['status']))
if (isset($_GET['status']) && $auth)
{
$extra = ";";
if(isset($_GET["ignore"]) && $_GET["ignore"] === 'DNSMASQ_WARN')
Expand Down
22 changes: 3 additions & 19 deletions cname_records.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<?php /*
<?php
/*
* Pi-hole: A black hole for Internet advertisements
* (c) 2017 Pi-hole, LLC (https://pi-hole.net)
* Network-wide ad blocking via your own hardware.
*
* This file is copyright under the latest version of the EUPL.
* Please see LICENSE file for your rights under this license. */
require "scripts/pi-hole/php/header.php";

require "scripts/pi-hole/php/header.php";
?>

<!-- Title -->
Expand Down Expand Up @@ -50,23 +51,6 @@
</div>
</div>

<!-- Alerts -->
<div id="alInfo" class="alert alert-info alert-dismissible fade in" role="alert" hidden>
<button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
Updating CNAME records...
</div>
<div id="alSuccess" class="alert alert-success alert-dismissible fade in" role="alert" hidden>
<button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
Success! The list will refresh.
</div>
<div id="alFailure" class="alert alert-danger alert-dismissible fade in" role="alert" hidden>
<button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
Failure! Something went wrong, see output below:<br/><br/><pre><span id="err"></span></pre>
</div>
<div id="alWarning" class="alert alert-warning alert-dismissible fade in" role="alert" hidden>
<button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
At least one domain was already present, see output below:<br/><br/><pre><span id="warn"></span></pre>
</div>
<div class="row">
<div class="col-md-12">
<div class="box" id="recent-queries">
Expand Down
3 changes: 3 additions & 0 deletions db_queries.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
<div class="col-md-3">
<div><input type="checkbox" id="type_blacklist" checked><label for="type_blacklist">Blocked: exact blacklist</label><br></div>
<div><input type="checkbox" id="type_regex" checked><label for="type_regex">Blocked: regex blacklist</label></div>
<div><input type="checkbox" id="type_special_domain" checked><label for="type_special_domain">Blocked: special domain</label></div>
</div>
<div class="col-md-3">
<div><input type="checkbox" id="type_gravity_CNAME" checked><label for="type_gravity_CNAME">Blocked: gravity (CNAME)</label><br></div>
Expand Down Expand Up @@ -179,6 +180,7 @@
<th>Domain</th>
<th>Client</th>
<th>Status</th>
<th>Reply</th>
<th>Action</th>
</tr>
</thead>
Expand All @@ -189,6 +191,7 @@
<th>Domain</th>
<th>Client</th>
<th>Status</th>
<th>Reply</th>
<th>Action</th>
</tr>
</tfoot>
Expand Down
2 changes: 1 addition & 1 deletion debug.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</div>
<div>
<input type="checkbox" id="upload">
<label for="upload">Upload debug log and provide token once finished</label>
<label for="upload">Upload debug log and provide token (shown at the end of the report) once finished</label>
</div>
<p>Once you click this button a debug log will be generated and can automatically be uploaded if we detect a working internet connection.</p>
<button type="button" id="debugBtn" class="btn btn-lg btn-primary btn-block">Generate debug log</button>
Expand Down
22 changes: 3 additions & 19 deletions dns_records.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<?php /*
<?php
/*
* Pi-hole: A black hole for Internet advertisements
* (c) 2017 Pi-hole, LLC (https://pi-hole.net)
* Network-wide ad blocking via your own hardware.
*
* This file is copyright under the latest version of the EUPL.
* Please see LICENSE file for your rights under this license. */
require "scripts/pi-hole/php/header.php";

require "scripts/pi-hole/php/header.php";
?>

<!-- Title -->
Expand Down Expand Up @@ -54,23 +55,6 @@
</div>
</div>

<!-- Alerts -->
<div id="alInfo" class="alert alert-info alert-dismissible fade in" role="alert" hidden>
<button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
Updating the custom DNS entries...
</div>
<div id="alSuccess" class="alert alert-success alert-dismissible fade in" role="alert" hidden>
<button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
Success! The list will refresh.
</div>
<div id="alFailure" class="alert alert-danger alert-dismissible fade in" role="alert" hidden>
<button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
Failure! Something went wrong, see output below:<br/><br/><pre><span id="err"></span></pre>
</div>
<div id="alWarning" class="alert alert-warning alert-dismissible fade in" role="alert" hidden>
<button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
At least one domain was already present, see output below:<br/><br/><pre><span id="warn"></span></pre>
</div>
<div class="row">
<div class="col-md-12">
<div class="box" id="recent-queries">
Expand Down
1 change: 1 addition & 0 deletions groups-adlists.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
<tr>
<th>ID</th>
<th></th>
<th class="no-padding"></th>
<th>Address</th>
<th>Status</th>
<th>Comment</th>
Expand Down
1 change: 1 addition & 0 deletions groups-clients.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
<thead>
<tr>
<th>ID</th>
<th></th>
<th title="Acceptable values are: IP address, subnet (CIDR notation), MAC address (AA:BB:CC:DD:EE:FF format) or host names.">Client</th>
<th>Comment</th>
<th>Group assignment</th>
Expand Down
Loading

0 comments on commit 3b87dfd

Please sign in to comment.