From b4a71468b82aec04cf3a176b03ea383c53722286 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Dec 2022 21:35:07 +0000 Subject: [PATCH 01/18] Bump actions/stale from 6.0.1 to 7.0.0 Bumps [actions/stale](https://github.com/actions/stale) from 6.0.1 to 7.0.0. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v6.0.1...v7.0.0) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index ae4ce526..6c6a2eae 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -13,7 +13,7 @@ jobs: issues: write steps: - - uses: actions/stale@v6.0.1 + - uses: actions/stale@v7.0.0 with: repo-token: ${{ secrets.GITHUB_TOKEN }} days-before-stale: 30 From 2cefc5817cec9a90deccfdb6353c1fab7c60437b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Thu, 22 Dec 2022 22:31:21 +0100 Subject: [PATCH 02/18] Shorten no merge conflict message MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- .github/workflows/merge-conflict.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-conflict.yml b/.github/workflows/merge-conflict.yml index 28f1a078..438b23c6 100644 --- a/.github/workflows/merge-conflict.yml +++ b/.github/workflows/merge-conflict.yml @@ -18,4 +18,4 @@ jobs: dirtyLabel: "Merge Conflicts" repoToken: "${{ secrets.GITHUB_TOKEN }}" commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request." - commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly." + commentOnClean: "Conflicts have been resolved." From 9a56e8e723e5916cc01f4964448fbf5201a8a6c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Sun, 6 Nov 2022 08:29:41 +0100 Subject: [PATCH 03/18] Provide fake username on login form MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- login.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/login.php b/login.php index a6926000..fe2fc6a2 100644 --- a/login.php +++ b/login.php @@ -42,6 +42,8 @@ require 'scripts/pi-hole/php/header.php';
- - + + diff --git a/db_lists.php b/db_lists.php index 25e2677a..b8e17b76 100644 --- a/db_lists.php +++ b/db_lists.php @@ -145,8 +145,8 @@ if ($boxedlayout) { - - + + - - - + + + Generate debug log - + - - + + Update - + - - - + + + - - - - + + + + - - - + + + - - - + + + - + Donate if you found this useful. - + diff --git a/messages.php b/messages.php index 1c8b47c7..4fc0abf3 100644 --- a/messages.php +++ b/messages.php @@ -47,7 +47,7 @@ require 'scripts/pi-hole/php/header_authenticated.php'; - + - - + + 0) { - - + + - + diff --git a/scripts/pi-hole/php/footer.php b/scripts/pi-hole/php/footer.php index c4ca7a1d..e96cf20a 100644 --- a/scripts/pi-hole/php/footer.php +++ b/scripts/pi-hole/php/footer.php @@ -102,6 +102,6 @@ if (isset($core_commit) || isset($web_commit) || isset($FTL_commit)) { - + diff --git a/scripts/pi-hole/php/func.php b/scripts/pi-hole/php/func.php index ef1a514b..a36cdba7 100644 --- a/scripts/pi-hole/php/func.php +++ b/scripts/pi-hole/php/func.php @@ -111,6 +111,19 @@ function checkfile($filename) return '/dev/null'; } +// Avoid browser caching old versions of a file, using the last modification time +// Receive the file URL (without "/admin/"); +// Return the string containin URL + "?v=xxx", where xxx is the last modified time of the file. +function fileversion($url) +{ + $filename = $_SERVER['DOCUMENT_ROOT'].'/admin/'.$url; + if (file_exists($filename)) { + $ver = filemtime($filename); + } + + return $url.'?v='.$ver; +} + // Credit: http://php.net/manual/en/function.hash-equals.php#119576 if (!function_exists('hash_equals')) { function hash_equals($known_string, $user_string) diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php index ddfe5af7..e0619177 100644 --- a/scripts/pi-hole/php/header.php +++ b/scripts/pi-hole/php/header.php @@ -1,9 +1,6 @@ - - + + - + - + - - - + + + - - + + - - - + + + - - + + - + - - - - + + + + - - - - - - - + + + + + + + - - + + diff --git a/settings.php b/settings.php index 7ff980f6..f024b894 100644 --- a/settings.php +++ b/settings.php @@ -1462,8 +1462,8 @@ if (isset($piholeFTLConf['RATE_LIMIT'])) { - - + + Automatic scrolling on update - + Automatic scrolling on update - + Date: Sat, 14 Jan 2023 10:00:34 +0000 Subject: [PATCH 17/18] Bump prettier from 2.8.1 to 2.8.3 Bumps [prettier](https://github.com/prettier/prettier) from 2.8.1 to 2.8.3. - [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.1...2.8.3) --- 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 6535f004..1e2a4b18 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.1", + "prettier": "2.8.3", "xo": "^0.53.1" } }, @@ -4431,9 +4431,9 @@ } }, "node_modules/prettier": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.1.tgz", - "integrity": "sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==", + "version": "2.8.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz", + "integrity": "sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==", "dev": true, "bin": { "prettier": "bin-prettier.js" diff --git a/package.json b/package.json index 7c6fa114..b276f5ea 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.1", + "prettier": "2.8.3", "xo": "^0.53.1" }, "browserslist": [ From 4d636d3a8dd0ba28222a6e9c7b8481d0f35a62a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 14 Jan 2023 10:01:07 +0000 Subject: [PATCH 18/18] Bump phpstan/phpstan from 1.9.7 to 1.9.11 Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.9.7 to 1.9.11. - [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.7...1.9.11) --- 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 cb770698..15d3d830 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "phpstan/phpstan", - "version": "1.9.7", + "version": "1.9.11", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "0501435cd342eac7664bd62155b1ef907fc60b6f" + "reference": "60f3d68481eef216199eae7a2603cd5fe124d464" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0501435cd342eac7664bd62155b1ef907fc60b6f", - "reference": "0501435cd342eac7664bd62155b1ef907fc60b6f", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/60f3d68481eef216199eae7a2603cd5fe124d464", + "reference": "60f3d68481eef216199eae7a2603cd5fe124d464", "shasum": "" }, "require": { @@ -47,7 +47,7 @@ ], "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.9.7" + "source": "https://github.com/phpstan/phpstan/tree/1.9.11" }, "funding": [ { @@ -63,7 +63,7 @@ "type": "tidelift" } ], - "time": "2023-01-04T21:59:57+00:00" + "time": "2023-01-12T14:04:13+00:00" } ], "packages-dev": [],