diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index b0d851977..a5deedd78 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -21,7 +21,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.3.0 + uses: actions/checkout@v3.4.0 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v2 diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 03a72d2f8..56b57b523 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.3.0 + uses: actions/checkout@v3.4.0 - name: Spell-Checking uses: codespell-project/actions-codespell@master diff --git a/.github/workflows/editorconfig-checker.yml b/.github/workflows/editorconfig-checker.yml index fb47c4a27..3d7a6d842 100644 --- a/.github/workflows/editorconfig-checker.yml +++ b/.github/workflows/editorconfig-checker.yml @@ -9,6 +9,6 @@ jobs: name: editorconfig-checker runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.3.0 + - uses: actions/checkout@v3.4.0 - uses: editorconfig-checker/action-editorconfig-checker@main - run: editorconfig-checker diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml index 9af3f9149..e389afb32 100644 --- a/.github/workflows/php-cs-fixer.yml +++ b/.github/workflows/php-cs-fixer.yml @@ -6,7 +6,7 @@ jobs: name: PHP-CS-Fixer runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.3.0 + - uses: actions/checkout@v3.4.0 - name: PHP-CS-Fixer uses: docker://oskarstark/php-cs-fixer-ga with: diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index adc090081..97bc3e1c0 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -8,7 +8,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.3.0 + - uses: actions/checkout@v3.4.0 - name: Install composer uses: php-actions/composer@v6 diff --git a/.github/workflows/sync-back-to-dev.yml b/.github/workflows/sync-back-to-dev.yml index 5a8bde29b..b67bb33c9 100644 --- a/.github/workflows/sync-back-to-dev.yml +++ b/.github/workflows/sync-back-to-dev.yml @@ -11,7 +11,7 @@ jobs: name: Syncing branches steps: - name: Checkout - uses: actions/checkout@v3.3.0 + uses: actions/checkout@v3.4.0 - name: Opening pull request run: gh pr create -B devel -H master --title 'Sync master back into development' --body 'Created by Github action' --label 'internal' env: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5cfc6fa96..4e9628e9e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Clone repository - uses: actions/checkout@v3.3.0 + uses: actions/checkout@v3.4.0 - name: Set up Node.js uses: actions/setup-node@v3.6.0 diff --git a/composer.lock b/composer.lock index 60b5305ce..fdac0197e 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "phpstan/phpstan", - "version": "1.9.14", + "version": "1.10.7", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "e5fcc96289cf737304286a9b505fbed091f02e58" + "reference": "b10ceb526d9607903c5b2673f1fc8775dbe48975" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e5fcc96289cf737304286a9b505fbed091f02e58", - "reference": "e5fcc96289cf737304286a9b505fbed091f02e58", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b10ceb526d9607903c5b2673f1fc8775dbe48975", + "reference": "b10ceb526d9607903c5b2673f1fc8775dbe48975", "shasum": "" }, "require": { @@ -46,8 +46,11 @@ "static analysis" ], "support": { + "docs": "https://phpstan.org/user-guide/getting-started", + "forum": "https://github.com/phpstan/phpstan/discussions", "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.9.14" + "security": "https://github.com/phpstan/phpstan/security/policy", + "source": "https://github.com/phpstan/phpstan-src" }, "funding": [ { @@ -63,7 +66,7 @@ "type": "tidelift" } ], - "time": "2023-01-19T10:47:09+00:00" + "time": "2023-03-16T15:24:20+00:00" } ], "packages-dev": [], 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/package-lock.json b/package-lock.json index 1e2a4b184..16e030e7a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,11 +9,11 @@ "version": "1.0.0", "license": "EUPL-1.2", "devDependencies": { - "autoprefixer": "^10.4.13", - "eslint-plugin-compat": "^4.0.2", + "autoprefixer": "^10.4.14", + "eslint-plugin-compat": "^4.1.2", "postcss": "^8.4.21", "postcss-cli": "^10.1.0", - "prettier": "2.8.3", + "prettier": "2.8.4", "xo": "^0.53.1" } }, @@ -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": { @@ -721,9 +721,9 @@ "dev": true }, "node_modules/autoprefixer": { - "version": "10.4.13", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz", - "integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==", + "version": "10.4.14", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz", + "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==", "dev": true, "funding": [ { @@ -736,8 +736,8 @@ } ], "dependencies": { - "browserslist": "^4.21.4", - "caniuse-lite": "^1.0.30001426", + "browserslist": "^4.21.5", + "caniuse-lite": "^1.0.30001464", "fraction.js": "^4.2.0", "normalize-range": "^0.1.2", "picocolors": "^1.0.0", @@ -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.30001464", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001464.tgz", + "integrity": "sha512-oww27MtUmusatpRpCGSOneQk2/l5czXANDSFvsc7VuOQ86s3ANhZetpwXNf1zY/zdfP63Xvjz325DAdAoES13g==", "dev": true, "funding": [ { @@ -1096,17 +1096,6 @@ "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==", "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==", - "dev": true, - "hasInstallScript": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/core-js" - } - }, "node_modules/cosmiconfig": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", @@ -1678,22 +1667,21 @@ } }, "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.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-4.1.2.tgz", + "integrity": "sha512-DNrQgDi5L4mAL4FdFboKBlSRg6MWfd75eA7K91lMjtP5ryN+O11qT2FDn7Z6zqy6sZ4sJawUR5V75qzB6l0CBg==", "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.30001451", "find-up": "^5.0.0", "lodash.memoize": "4.1.2", - "semver": "7.3.5" + "semver": "7.3.8" }, "engines": { - "node": ">=9.x" + "node": ">=16.x" }, "peerDependencies": { "eslint": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0" @@ -1849,21 +1837,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 +1904,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", @@ -4431,9 +4389,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" @@ -4904,9 +4862,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..fe660164c 100644 --- a/package.json +++ b/package.json @@ -24,11 +24,11 @@ "testpr": "npm run prettier:fix && git diff --ws-error-highlight=all --color=always --exit-code && npm run xo" }, "devDependencies": { - "autoprefixer": "^10.4.13", - "eslint-plugin-compat": "^4.0.2", + "autoprefixer": "^10.4.14", + "eslint-plugin-compat": "^4.1.2", "postcss": "^8.4.21", "postcss-cli": "^10.1.0", - "prettier": "2.8.3", + "prettier": "2.8.4", "xo": "^0.53.1" }, "browserslist": [ 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_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/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/footer.js b/scripts/pi-hole/js/footer.js index e982c0d69..bf3ff7dc9 100644 --- a/scripts/pi-hole/js/footer.js +++ b/scripts/pi-hole/js/footer.js @@ -6,6 +6,7 @@ * Please see LICENSE file for your rights under this license. */ /* global utils:false */ + //The following functions allow us to display time until pi-hole is enabled after disabling. //Works between all pages @@ -185,8 +186,9 @@ function initCPUtemp() { var token = encodeURIComponent($("#token").text()); $.getJSON("api.php?setTempUnit=" + unit + "&token=" + token, function (data) { if (showmsg === true) { + utils.showAlert("info", "", "Setting temperature unit..."); if ("result" in data && data.result === "success") { - utils.showAlert("success", "", "Temperature unit set to " + unit, ""); + utils.showAlert("success", "far fa-check-circle", "Temperature unit set to " + unit, ""); } else { utils.showAlert("error", "", "", "Temperature unit not set"); } diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js index 9c02b9068..f27b17496 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 @@ -678,7 +678,6 @@ function updateSummaryData(runOnce) { updateTopLists(); } - var formatter = new Intl.NumberFormat(); //Element name might have a different name to the property of the API so we split it at | [ "ads_blocked_today|queries_blocked_today", @@ -691,9 +690,17 @@ function updateSummaryData(runOnce) { var apiName = apiElName[0]; var elName = apiElName[1]; var $todayElement = elName ? $("span#" + elName) : $("span#" + apiName); - // Round to one decimal place and format locale-aware - var text = formatter.format(Math.round(data[apiName] * 10) / 10); - var textData = idx === 2 && data[apiName] !== "to" ? text + "%" : text; + + var textData = data[apiName]; + if (!FTLoffline) { + // Only format as number if FTL is online + var formatter = new Intl.NumberFormat(); + + // Round to one decimal place and format locale-aware + var text = formatter.format(Math.round(data[apiName] * 10) / 10); + textData = idx === 2 && data[apiName] !== "to" ? text + "%" : text; + } + if ($todayElement.text() !== textData && $todayElement.text() !== textData + "%") { $todayElement.addClass("glow"); $todayElement.text(textData); @@ -862,8 +869,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/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/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, }; })(); 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 @@ - + - + - - - - - - - - - +