From 56b76098158cb99ad9291d332dce24c107340fbd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 10:56:35 +0000 Subject: [PATCH 01/18] Bump prettier from 2.8.3 to 2.8.4 Bumps [prettier](https://github.com/prettier/prettier) from 2.8.3 to 2.8.4. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.8.3...2.8.4) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1e2a4b184..65ab488ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "eslint-plugin-compat": "^4.0.2", "postcss": "^8.4.21", "postcss-cli": "^10.1.0", - "prettier": "2.8.3", + "prettier": "2.8.4", "xo": "^0.53.1" } }, @@ -4431,9 +4431,9 @@ } }, "node_modules/prettier": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz", - "integrity": "sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==", + "version": "2.8.4", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz", + "integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==", "dev": true, "bin": { "prettier": "bin-prettier.js" diff --git a/package.json b/package.json index b276f5eae..7c3ed270d 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "eslint-plugin-compat": "^4.0.2", "postcss": "^8.4.21", "postcss-cli": "^10.1.0", - "prettier": "2.8.3", + "prettier": "2.8.4", "xo": "^0.53.1" }, "browserslist": [ From 69297d4cdc57fe95d7263980f4ef6cbf51bc30d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 10:56:47 +0000 Subject: [PATCH 02/18] Bump eslint-plugin-compat from 4.0.2 to 4.1.1 Bumps [eslint-plugin-compat](https://github.com/amilajack/eslint-plugin-compat) from 4.0.2 to 4.1.1. - [Release notes](https://github.com/amilajack/eslint-plugin-compat/releases) - [Changelog](https://github.com/amilajack/eslint-plugin-compat/blob/main/CHANGELOG.md) - [Commits](https://github.com/amilajack/eslint-plugin-compat/compare/v4.0.2...v4.1.1) --- updated-dependencies: - dependency-name: eslint-plugin-compat dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 86 +++++++++++++++-------------------------------- package.json | 2 +- 2 files changed, 29 insertions(+), 59 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1e2a4b184..1e1d6fbb5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "EUPL-1.2", "devDependencies": { "autoprefixer": "^10.4.13", - "eslint-plugin-compat": "^4.0.2", + "eslint-plugin-compat": "^4.1.1", "postcss": "^8.4.21", "postcss-cli": "^10.1.0", "prettier": "2.8.3", @@ -244,9 +244,9 @@ } }, "node_modules/@mdn/browser-compat-data": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-4.2.1.tgz", - "integrity": "sha512-EWUguj2kd7ldmrF9F+vI5hUOralPd+sdsUnYbRy33vZTuZkduC1shE9TtEMEjAQwyfyMb4ole5KtjF8MsnQOlA==", + "version": "5.2.35", + "resolved": "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-5.2.35.tgz", + "integrity": "sha512-WMGl70X/upKye9Ix0xQtaKzNsFJE6I4ZEexypk1gyiB5REQZv9BI3Stw8Tby25YSGJ7OuYG0+5oCnkv1A+3kRA==", "dev": true }, "node_modules/@nodelib/fs.scandir": { @@ -803,9 +803,9 @@ } }, "node_modules/browserslist": { - "version": "4.21.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", - "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", + "version": "4.21.5", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz", + "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==", "dev": true, "funding": [ { @@ -818,10 +818,10 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001400", - "electron-to-chromium": "^1.4.251", - "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.9" + "caniuse-lite": "^1.0.30001449", + "electron-to-chromium": "^1.4.284", + "node-releases": "^2.0.8", + "update-browserslist-db": "^1.0.10" }, "bin": { "browserslist": "cli.js" @@ -923,9 +923,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001442", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz", - "integrity": "sha512-239m03Pqy0hwxYPYR5JwOIxRJfLTWtle9FV8zosfV5pHg+/51uD4nxcUlM8+mWWGfwKtt8lJNHnD3cWw9VZ6ow==", + "version": "1.0.30001451", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001451.tgz", + "integrity": "sha512-XY7UbUpGRatZzoRft//5xOa69/1iGJRBlrieH6QYrkKLIFn3m7OVEJ81dSrKoy2BnKsdbX5cLrOispZNYo9v2w==", "dev": true, "funding": [ { @@ -1097,9 +1097,9 @@ "dev": true }, "node_modules/core-js": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.27.1.tgz", - "integrity": "sha512-GutwJLBChfGCpwwhbYoqfv03LAfmiz7e7D/BNxzeMxwQf10GRSzqiOjx7AmtEk+heiD/JWmBuyBPgFtx0Sg1ww==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.27.2.tgz", + "integrity": "sha512-9ashVQskuh5AZEZ1JdQWp1GqSoC1e1G87MzRqg2gIfVAQ7Qn9K+uFj8EcniUFA4P2NLZfV+TOlX1SzoKfo+s7w==", "dev": true, "hasInstallScript": true, "funding": { @@ -1678,19 +1678,19 @@ } }, "node_modules/eslint-plugin-compat": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-4.0.2.tgz", - "integrity": "sha512-xqvoO54CLTVaEYGMzhu35Wzwk/As7rCvz/2dqwnFiWi0OJccEtGIn+5qq3zqIu9nboXlpdBN579fZcItC73Ycg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-4.1.1.tgz", + "integrity": "sha512-vUAaqKcDwXpVASyCAfKzkfaw3NxZ6FqeCNSGp7yqHpUMzkAiWRO0B6pR5zqh8RUhvybwXhPXvwVKDLr9GqGFUQ==", "dev": true, "dependencies": { - "@mdn/browser-compat-data": "^4.1.5", + "@mdn/browser-compat-data": "^5.2.34", "ast-metadata-inferer": "^0.7.0", - "browserslist": "^4.16.8", - "caniuse-lite": "^1.0.30001304", - "core-js": "^3.16.2", + "browserslist": "^4.21.5", + "caniuse-lite": "^1.0.30001450", + "core-js": "^3.27.2", "find-up": "^5.0.0", "lodash.memoize": "4.1.2", - "semver": "7.3.5" + "semver": "7.3.8" }, "engines": { "node": ">=9.x" @@ -1849,21 +1849,6 @@ "eslint": ">=7.0.0" } }, - "node_modules/eslint-plugin-n/node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/eslint-plugin-no-use-extend-native": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/eslint-plugin-no-use-extend-native/-/eslint-plugin-no-use-extend-native-0.5.0.tgz", @@ -1931,21 +1916,6 @@ "eslint": ">=8.23.1" } }, - "node_modules/eslint-plugin-unicorn/node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/eslint-rule-docs": { "version": "1.1.235", "resolved": "https://registry.npmjs.org/eslint-rule-docs/-/eslint-rule-docs-1.1.235.tgz", @@ -4904,9 +4874,9 @@ } }, "node_modules/semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" diff --git a/package.json b/package.json index b276f5eae..3ebeb62ad 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ }, "devDependencies": { "autoprefixer": "^10.4.13", - "eslint-plugin-compat": "^4.0.2", + "eslint-plugin-compat": "^4.1.1", "postcss": "^8.4.21", "postcss-cli": "^10.1.0", "prettier": "2.8.3", From d84210fcb4d67b0891c1a67c136141e516e7dc6d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 10:57:15 +0000 Subject: [PATCH 03/18] Bump phpstan/phpstan from 1.9.14 to 1.9.17 Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.9.14 to 1.9.17. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/1.10.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.9.14...1.9.17) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 60b5305ce..5b3eff66a 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "phpstan/phpstan", - "version": "1.9.14", + "version": "1.9.17", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "e5fcc96289cf737304286a9b505fbed091f02e58" + "reference": "204e459e7822f2c586463029f5ecec31bb45a1f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e5fcc96289cf737304286a9b505fbed091f02e58", - "reference": "e5fcc96289cf737304286a9b505fbed091f02e58", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/204e459e7822f2c586463029f5ecec31bb45a1f2", + "reference": "204e459e7822f2c586463029f5ecec31bb45a1f2", "shasum": "" }, "require": { @@ -47,7 +47,7 @@ ], "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.9.14" + "source": "https://github.com/phpstan/phpstan/tree/1.9.17" }, "funding": [ { @@ -63,7 +63,7 @@ "type": "tidelift" } ], - "time": "2023-01-19T10:47:09+00:00" + "time": "2023-02-08T12:25:00+00:00" } ], "packages-dev": [], From aa5068bbe9fe68d64540d43674efa1e3108e8bed Mon Sep 17 00:00:00 2001 From: RD WebDesign Date: Wed, 25 Jan 2023 21:21:23 -0300 Subject: [PATCH 04/18] Using a new function to retrieve CSS values from classes - create a new function to access CSS values, even if not directly used on the page; - remove the empty harcoded HTML `` placeholders used only to source the colors from CSS classes Signed-off-by: RD WebDesign --- db_graph.php | 5 ----- db_lists.php | 4 ---- index.php | 5 ----- scripts/pi-hole/js/db_graph.js | 8 ++++---- scripts/pi-hole/js/index.js | 8 ++++---- scripts/pi-hole/js/utils.js | 8 ++++++++ 6 files changed, 16 insertions(+), 22 deletions(-) diff --git a/db_graph.php b/db_graph.php index 613e28914..2b0583450 100644 --- a/db_graph.php +++ b/db_graph.php @@ -10,11 +10,6 @@ require 'scripts/pi-hole/php/header_authenticated.php'; ?> - - - - -

Compute graphical statistics from the Pi-hole query database

diff --git a/db_lists.php b/db_lists.php index b8e17b76e..e89801aec 100644 --- a/db_lists.php +++ b/db_lists.php @@ -11,10 +11,6 @@ require 'scripts/pi-hole/php/header_authenticated.php'; ?> - - - -

Compute Top Lists from the Pi-hole query database

diff --git a/index.php b/index.php index 45482daa8..ac58c1a8a 100644 --- a/index.php +++ b/index.php @@ -11,11 +11,6 @@ require 'scripts/pi-hole/php/header_authenticated.php'; require_once 'scripts/pi-hole/php/gravity.php'; ?> - - - - -
diff --git a/scripts/pi-hole/js/db_graph.js b/scripts/pi-hole/js/db_graph.js index 8fdeb122a..1c02748aa 100644 --- a/scripts/pi-hole/js/db_graph.js +++ b/scripts/pi-hole/js/db_graph.js @@ -208,10 +208,10 @@ function updateQueriesOverTime() { $(function () { var ctx = document.getElementById("queryOverTimeChart").getContext("2d"); - var blockedColor = $(".queries-blocked").css("background-color"); - var permittedColor = $(".queries-permitted").css("background-color"); - var gridColor = $(".graphs-grid").css("background-color"); - var ticksColor = $(".graphs-ticks").css("color"); + var blockedColor = utils.getCSSval("queries-blocked", "background-color"); + var permittedColor = utils.getCSSval("queries-permitted", "background-color"); + var gridColor = utils.getCSSval("graphs-grid", "background-color"); + var ticksColor = utils.getCSSval("graphs-ticks", "color"); timeLineChart = new Chart(ctx, { type: utils.getGraphType(), diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js index 9c02b9068..a1b84e605 100644 --- a/scripts/pi-hole/js/index.js +++ b/scripts/pi-hole/js/index.js @@ -232,8 +232,8 @@ function updateQueriesOverTime() { timeLineChart.data.datasets = []; var labels = ["Blocked DNS Queries", "Permitted DNS Queries"]; - var blockedColor = $(".queries-blocked").css("background-color"); - var permittedColor = $(".queries-permitted").css("background-color"); + var blockedColor = utils.getCSSval("queries-blocked", "background-color"); + var permittedColor = utils.getCSSval("queries-permitted", "background-color"); var colors = [blockedColor, permittedColor]; // Collect values and colors, and labels @@ -862,8 +862,8 @@ $(function () { getMaxlogage(); updateSummaryData(); - var gridColor = $(".graphs-grid").css("background-color"); - var ticksColor = $(".graphs-ticks").css("color"); + var gridColor = utils.getCSSval("graphs-grid", "background-color"); + var ticksColor = utils.getCSSval("graphs-ticks", "color"); var ctx = document.getElementById("queryOverTimeChart").getContext("2d"); timeLineChart = new Chart(ctx, { type: utils.getGraphType(), diff --git a/scripts/pi-hole/js/utils.js b/scripts/pi-hole/js/utils.js index f81bb5a4b..9d84116a1 100644 --- a/scripts/pi-hole/js/utils.js +++ b/scripts/pi-hole/js/utils.js @@ -408,6 +408,13 @@ function changeBulkDeleteStates(table) { } } +function getCSSval(cssclass, cssproperty) { + var elem = $("
"), + val = elem.appendTo("body").css(cssproperty); + elem.remove(); + return val; +} + window.utils = (function () { return { escapeHtml: escapeHtml, @@ -432,5 +439,6 @@ window.utils = (function () { colorBar: colorBar, checkMessages: checkMessages, changeBulkDeleteStates: changeBulkDeleteStates, + getCSSval: getCSSval, }; })(); From f59f587895d61a0e680908629dba84a4415e247a Mon Sep 17 00:00:00 2001 From: RD WebDesign Date: Sat, 11 Feb 2023 19:37:20 -0300 Subject: [PATCH 05/18] Adding the new themes to the web interface settings Signed-off-by: RD WebDesign --- scripts/pi-hole/php/theme.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/scripts/pi-hole/php/theme.php b/scripts/pi-hole/php/theme.php index 5c44a6cf0..361c584e0 100644 --- a/scripts/pi-hole/php/theme.php +++ b/scripts/pi-hole/php/theme.php @@ -13,13 +13,16 @@ * Array[0] = Description * Array[1] = Is this a dark mode theme? (Sets background to black during page reloading to avoid white "flashing") * Array[2] = Style sheet name +* Array[3] = Theme color */ -$available_themes['default-light'] = array('Pi-hole default theme (light, default)', false, 'default-light'); -$available_themes['default-dark'] = array('Pi-hole midnight theme (dark)', true, 'default-dark'); -$available_themes['default-darker'] = array('Pi-hole deep-midnight theme (dark)', true, 'default-darker'); +$available_themes['default-light'] = array('Pi-hole default theme (light, default)', false, 'default-light', '#367fa9'); +$available_themes['default-dark'] = array('Pi-hole midnight theme (dark)', true, 'default-dark', '#272c30'); +$available_themes['default-darker'] = array('Pi-hole deep-midnight theme (dark)', true, 'default-darker', '#2e6786'); +$available_themes['high-contrast'] = array('High contrast light', false, 'high-contrast', '#0078a0'); +$available_themes['high-contrast-dark'] = array('High contrast dark', false, 'high-contrast-dark', '#0077c7'); // Option to have the theme go with the device dark mode setting, always set the background to black to avoid flashing -$available_themes['default-auto'] = array('Pi-hole auto theme (light/dark)', true, 'default-auto'); -$available_themes['lcars'] = array('Star Trek LCARS theme (dark)', true, 'lcars'); +$available_themes['default-auto'] = array('Pi-hole auto theme (light/dark)', true, 'default-auto', '#367fa9'); +$available_themes['lcars'] = array('Star Trek LCARS theme (dark)', true, 'lcars', '#4488FF'); $webtheme = ''; // Try to load theme settings from setupVars.conf @@ -42,6 +45,7 @@ $darkmode = $available_themes[$webtheme][1]; $theme = $available_themes[$webtheme][2]; +$theme_color = $available_themes[$webtheme][3]; function theme_selection() { From c74162ee476f1b76bf15f2eb96fcdc9f6d3344d5 Mon Sep 17 00:00:00 2001 From: RD WebDesign Date: Sat, 11 Feb 2023 19:36:25 -0300 Subject: [PATCH 06/18] Preparing PHP and javascript files for the new themes - change HTML header code - add new class to Pi-hole logo - add new classes to auditlog buttons - add new classes to query log and long-term query log buttons Signed-off-by: RD WebDesign --- scripts/pi-hole/js/auditlog.js | 10 +++++----- scripts/pi-hole/js/db_queries.js | 20 ++++++++++---------- scripts/pi-hole/js/queries.js | 20 ++++++++++---------- scripts/pi-hole/php/header.php | 14 +++----------- scripts/pi-hole/php/header_authenticated.php | 2 +- scripts/pi-hole/php/sidebar.php | 2 +- 6 files changed, 30 insertions(+), 38 deletions(-) diff --git a/scripts/pi-hole/js/auditlog.js b/scripts/pi-hole/js/auditlog.js index 0374d6de0..7afd14371 100644 --- a/scripts/pi-hole/js/auditlog.js +++ b/scripts/pi-hole/js/auditlog.js @@ -33,8 +33,8 @@ function updateTopLists() { " " + data.top_queries[domain] + " " + - '' + - '' + + '' + + '' + " " ); } @@ -58,7 +58,7 @@ function updateTopLists() { " " + data.top_ads[domain] + " " + - '' + + '' + " " ); } else { @@ -69,8 +69,8 @@ function updateTopLists() { " " + data.top_ads[domain] + " " + - '' + - '' + + '' + + '' + " " ); } diff --git a/scripts/pi-hole/js/db_queries.js b/scripts/pi-hole/js/db_queries.js index efa85074f..535d38ac6 100644 --- a/scripts/pi-hole/js/db_queries.js +++ b/scripts/pi-hole/js/db_queries.js @@ -265,7 +265,7 @@ $(function () { case 1: fieldtext = "Blocked (gravity)"; buttontext = - ''; + ''; blocked = true; break; case 2: @@ -275,24 +275,24 @@ $(function () { : "OK (answered by "; fieldtext += (data.length > 5 && data[5] !== "N/A" ? data[5] : "") + ")" + dnssecStatus; buttontext = - ''; + ''; break; case 3: fieldtext = "OK (cache)" + dnssecStatus; buttontext = - ''; + ''; break; case 4: fieldtext = "Blocked (regex blacklist)"; buttontext = - ''; + ''; blocked = true; break; case 5: fieldtext = "Blocked (exact blacklist)"; buttontext = - ''; + ''; blocked = true; break; case 6: @@ -313,21 +313,21 @@ $(function () { fieldtext = "Blocked (gravity, CNAME)"; buttontext = - ''; + ''; blocked = true; break; case 10: fieldtext = "Blocked (regex blacklist, CNAME)"; buttontext = - ''; + ''; blocked = true; break; case 11: fieldtext = "Blocked (exact blacklist, CNAME)"; buttontext = - ''; + ''; blocked = true; break; case 12: @@ -341,7 +341,7 @@ $(function () { "OK (already forwarded)" + dnssecStatus; buttontext = - ''; + ''; break; case 15: fieldtext = @@ -358,7 +358,7 @@ $(function () { "OK (stale cache)" + dnssecStatus; buttontext = - ''; + ''; break; default: fieldtext = "Unknown (" + parseInt(data[4], 10) + ")"; diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js index 163d282b8..708db6e82 100644 --- a/scripts/pi-hole/js/queries.js +++ b/scripts/pi-hole/js/queries.js @@ -124,7 +124,7 @@ $(function () { case "1": fieldtext = "Blocked (gravity)"; buttontext = - ''; + ''; blocked = true; break; case "2": @@ -135,25 +135,25 @@ $(function () { fieldtext += (data.length > 10 && data[10] !== "N/A" ? data[10] : "") + ")" + dnssecStatus; buttontext = - ''; + ''; break; case "3": fieldtext = "OK (cache)" + dnssecStatus; buttontext = - ''; + ''; break; case "4": fieldtext = "Blocked (regex blacklist)"; blocked = true; buttontext = - ''; + ''; break; case "5": fieldtext = "Blocked (exact blacklist)"; blocked = true; buttontext = - ''; + ''; break; case "6": fieldtext = "Blocked (external, IP)"; @@ -177,7 +177,7 @@ $(function () { "Blocked (gravity, CNAME)"; blocked = true; buttontext = - ''; + ''; isCNAME = true; break; case "10": @@ -185,7 +185,7 @@ $(function () { "Blocked (regex blacklist, CNAME)"; blocked = true; buttontext = - ''; + ''; isCNAME = true; break; case "11": @@ -193,7 +193,7 @@ $(function () { "Blocked (exact blacklist, CNAME)"; blocked = true; buttontext = - ''; + ''; isCNAME = true; break; case "12": @@ -207,7 +207,7 @@ $(function () { "OK (already forwarded)" + dnssecStatus; buttontext = - ''; + ''; break; case "15": fieldtext = @@ -224,7 +224,7 @@ $(function () { "OK (stale cache)" + dnssecStatus; buttontext = - ''; + ''; break; default: fieldtext = "Unknown (" + parseInt(data[4], 10) + ")"; diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php index e0619177e..563101e5f 100644 --- a/scripts/pi-hole/php/header.php +++ b/scripts/pi-hole/php/header.php @@ -26,21 +26,13 @@ - + - + - - - - - - - - - +