Skip to content

Commit

Permalink
V5.14.2 (#61)
Browse files Browse the repository at this point in the history
* 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>

* Bump actions/cache from 2 to 3

Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](actions/cache@v2...v3)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

* Bump actions/checkout from 2 to 3

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

* Bump github/codeql-action from 1 to 2

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 1 to 2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@v1...v2)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

* Bump actions/setup-node from 2 to 3

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2 to 3.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@v2...v3)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

* Allow to delete IDN via API

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

* Add the new "integrity check" option to debug log page

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

* Better format for log options

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

* Fix editing domains from blacklist/whitelist pages

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

* Add highlighting to tailLog.php

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

* Omit idn_domain as it is not necessary

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

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

* Create separat convertDomainToIDNA function in func.php

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

* Create separat converIDNAToUnicode function in func.php

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

* Removing the text `dnsmasq[nnnn]` from the log.

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

* Tidy the ends of some php file

Signed-off-by: Gontier Julien <gontierjulien68@gmail.com>

* Remove Blacklist and Whitelist from main nav

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

* Restructure nav menu

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

* Remove black/whitelist from group pages

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

* Remove unused client_id

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

* Fix login redirect and collapsed sidemenu

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

* Address reviewer's comment

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

* Further simplification of the code, removing empty code blocks and some always-true if-clauses

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

* Remove <configured> from list heading

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

* Fix LCARS menu (add grouping headers)

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

* Move `require "footer.php"` to loginpage.php

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

* Simplify `header.php`

- move some functions to `func.php`
- move sidebar to its own file `sidebar.php`
- fix indentation
- LCARS CSS: hide menu headers when logged off
- LCARS CSS: invert hover and active menu colors

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

* README: Adding logo for github dark theme

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

* Using the correct dimensions

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

* Bump xo from 0.50.0 to 0.51.0

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

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

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

* Bump autoprefixer from 10.4.7 to 10.4.8

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

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

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

* Add A and AAAA to heading

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

* Fix editorconfig-checker

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

* Extend editorconfig rules

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

* Use 4 spaces to indent PHP files.

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

* Replacing tabs with 4 spaces

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

* Fixing/ignoring CSS comments

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

* Fixing lines without multiple of 4 spaces

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

* Don't check vendor files

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

* Enable check for default-darker after logo

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

* Remove unnecessary indent_style options in .editorconfig

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

* Explicit set minor and patch version on used actions

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

* Set all actions to latest

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

* Bump actions/stale from 5.1.0 to 5.1.1

Bumps [actions/stale](https://github.com/actions/stale) from 5.1.0 to 5.1.1.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/v5.1.1/CHANGELOG.md)
- [Commits](actions/stale@v5.1.0...v5.1.1)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Bump actions-ecosystem/action-add-labels from 1.1.0 to 1.1.3

Bumps [actions-ecosystem/action-add-labels](https://github.com/actions-ecosystem/action-add-labels) from 1.1.0 to 1.1.3.
- [Release notes](https://github.com/actions-ecosystem/action-add-labels/releases)
- [Commits](actions-ecosystem/action-add-labels@v1.1.0...v1.1.3)

---
updated-dependencies:
- dependency-name: actions-ecosystem/action-add-labels
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Bump actions/cache from 3.0.5 to 3.0.6

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.5 to 3.0.6.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](actions/cache@v3.0.5...v3.0.6)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Remove Content-Security-Policy meta tag. We're setting this now as HTTP header which is the preferred way.

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

* Add PHP-CS-Fixer Workflow

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

* Run PHP-CS-Fixer on all files

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

* Fix remaining styling change

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

* Update .php-cs-fixer.dist.php

Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: DL6ER <DL6ER@users.noreply.github.com>

* Update .github/workflows/php-cs-fixer.yml

Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: DL6ER <DL6ER@users.noreply.github.com>

* Explicitly set blank_line_before_statement to exclude include* and require*

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

* Switch to style Symfony

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

* Fix unecessary string concat added during the conversion from PhpCsFixer to Symfony

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

* Add setLineEnding(PHP_EOL)

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

* Disable Yoda style

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

* Move login form to a new page

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

* Testing a shorter main menu + top menu

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

* Different order

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

* Fix logout link

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

* Change left hamburger menu icon to arrows

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

* Remove session timer leftovers

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

* Add link to releases on discourse

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

* Bump postcss from 8.4.14 to 8.4.16

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

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

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

* Bump actions/cache from 3.0.6 to 3.0.7

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.6 to 3.0.7.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](actions/cache@v3.0.6...v3.0.7)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Fix donate button on mobile

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

* Remove unused $auth

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

* Extend list of files to be ignored by codespell

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

* fix codespell complains

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

* Remove email functionality

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

* Tweak topbar and sidebar

- fix broken visual after initial changes;
- remove donate button from topmenu;
- re-add donate button to the sidebar and add hover color;
- remove "Ph" when collapsed;
- add icon and background to topmenu button;
- hide main menu headers (using lines as separators);
- reorder the main menu;
- adjust each theme to the new visual (CSS and HTML tweaks).
- new menu colors for LCARS theme

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

* Change docker upgrade link in footer

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

* Improve pi-hole SVG icon

- keep using inline SVG to allow color change via CSS;
- Reuse the SVG icon in all instances, using SVG symbol;
- Simplify/reduce inline SVG code;

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

* Improve pi-hole logo

- use the exact brand colors;
- slightly smaller file.

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

* Move inline svg symbol to external file

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

* Optimized `safari-pinned-tab.svg` icon

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

* Reuse paths to improve SVG improve_svg_files

- positioning and rotating the same path to create the Vortex

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

* Restore save functionality

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

* Add missing parenthesis

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

* Refocus the domain element after submitting new domain in list form

Signed-off-by: Joshua Wu <Joshua.wu.0910@gmail.com>

* Add auto focus to groups and groups-adlist pages

Signed-off-by: Joshua Wu <Joshua.wu.0910@gmail.com>

* Add auto focus to custom dns and custom cname after submition

Signed-off-by: Joshua Wu <Joshua.wu.0910@gmail.com>

* Adjusting menu colors, active and hover effects

- new menu button colors;
- change sidebar background color;
- small adjustments.

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

* Fix top background during animation (desktop and mobile)

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

* Check versions using the new file

- change the arrays
- use a function to compare versions

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

* Move all "version check" code to `update_checker.php`

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

* New check warnings logic

Changes:
- Show warning message on docker, if a new image is available;
- Never show the warning for Nightly or Dev images;
- In docker, never show individual component update warnings;
- simplified footer (logic moved to upgrade_checker file).

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

* Bump xo from 0.51.0 to 0.52.2

Bumps [xo](https://github.com/xojs/xo) from 0.51.0 to 0.52.2.
- [Release notes](https://github.com/xojs/xo/releases)
- [Commits](xojs/xo@v0.51.0...v0.52.2)

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

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

* Bump actions/cache from 3.0.7 to 3.0.8

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.7 to 3.0.8.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](actions/cache@v3.0.7...v3.0.8)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Revert empty domain dot replacement

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

* Keep conversion for long-term data

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

* Add test to avoid "Undefined Variable" warnings

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

* Add special handling for the root zone on domain validation and IDNA conversion

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

* Show "Logout" link only when a password is required

Re-introducing the test, removed when the menu was updated

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

* Complementing PR 2316

- other undefined vars are still spamming the log

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

* Never check for individual component updates on docker

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

* Remove unnecssary <br> from adlist details

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

* git pu

* Bump xo from 0.52.2 to 0.52.3

Bumps [xo](https://github.com/xojs/xo) from 0.52.2 to 0.52.3.
- [Release notes](https://github.com/xojs/xo/releases)
- [Commits](xojs/xo@v0.52.2...v0.52.3)

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

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

* Declaring all strings to avoid warnings

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

* Check if the API call was made using authentication

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

* added back missing codes

* cs-fixer

* added trim

* remove unsed else

* removed unwated codes

* remove whitespace

* remove python cli option

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Christian König <ckoenig@posteo.de>
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Anthony de Jong <11158888+anthony-de-jong@users.noreply.github.com>
Signed-off-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Signed-off-by: Pingger Shikkoken <Pingger@users.noreply.github.com>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: Gontier Julien <gontierjulien68@gmail.com>
Signed-off-by: DL6ER <DL6ER@users.noreply.github.com>
Signed-off-by: Joshua Wu <Joshua.wu.0910@gmail.com>
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Christian König <ckoenig@posteo.de>
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Co-authored-by: Anthony de Jong <11158888+anthony-de-jong@users.noreply.github.com>
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
Co-authored-by: Pingger Shikkoken <Pingger@users.noreply.github.com>
Co-authored-by: DL6ER <dl6er@dl6er.de>
Co-authored-by: Adam Warner <github@adamwarner.co.uk>
Co-authored-by: Gontier Julien <gontierjulien68@gmail.com>
Co-authored-by: Joshua Wu <Joshua.wu.0910@gmail.com>
  • Loading branch information
13 people authored Sep 5, 2022
1 parent 9fa1562 commit ce145d2
Show file tree
Hide file tree
Showing 7 changed files with 70 additions and 69 deletions.
34 changes: 17 additions & 17 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,11 @@
</div>

<?php
if ($boxedlayout) {
$tablelayout = 'col-md-6';
} else {
$tablelayout = 'col-md-6 col-lg-6';
} ?>
if ($boxedlayout) {
$tablelayout = 'col-md-6';
} else {
$tablelayout = 'col-md-6 col-lg-6';
} ?>
<div class="row">
<div class="<?php echo $tablelayout; ?>">
<div class="box" id="domain-frequency">
Expand All @@ -200,9 +200,9 @@
<table class="table table-bordered">
<thead>
<tr>
<th>Domain</th>
<th>Hits</th>
<th>Frequency</th>
<th>Domain</th>
<th>Hits</th>
<th>Frequency</th>
</tr>
</thead>
<tbody>
Expand All @@ -229,9 +229,9 @@
<table class="table table-bordered">
<thead>
<tr>
<th>Domain</th>
<th>Hits</th>
<th>Frequency</th>
<th>Domain</th>
<th>Hits</th>
<th>Frequency</th>
</tr>
</thead>
<tbody>
Expand Down Expand Up @@ -260,9 +260,9 @@
<table class="table table-bordered">
<thead>
<tr>
<th>Client</th>
<th>Requests</th>
<th>Frequency</th>
<th>Client</th>
<th>Requests</th>
<th>Frequency</th>
</tr>
</thead>
<tbody>
Expand All @@ -289,9 +289,9 @@
<table class="table table-bordered">
<thead>
<tr>
<th>Client</th>
<th>Requests</th>
<th>Frequency</th>
<th>Client</th>
<th>Requests</th>
<th>Frequency</th>
</tr>
</thead>
<tbody>
Expand Down
65 changes: 33 additions & 32 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"postcss": "^8.4.16",
"postcss-cli": "^10.0.0",
"prettier": "2.7.1",
"xo": "^0.52.2"
"xo": "^0.52.3"
},
"browserslist": [
"defaults",
Expand Down
6 changes: 3 additions & 3 deletions scripts/pi-hole/php/password.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
$pwhash = '';
}

function verifyPassword($pwhash)
function verifyPassword($pwhash, $use_api = false)
{
$validpassword = true;

Expand Down Expand Up @@ -86,7 +86,7 @@ function verifyPassword($pwhash)
if (hash_equals($pwhash, $_SESSION['hash'])) {
$_SESSION['auth'] = true;
}
} elseif (isset($api) && isset($_GET['auth'])) {
} elseif ($use_api && isset($_GET['auth'])) {
// API can use the hash to get data without logging in via plain-text password
if (hash_equals($pwhash, $_GET['auth'])) {
$_SESSION['auth'] = true;
Expand All @@ -103,5 +103,5 @@ function verifyPassword($pwhash)
return $validpassword;
}

$wrongpassword = !verifyPassword($pwhash);
$wrongpassword = !verifyPassword($pwhash, isset($api));
$auth = $_SESSION['auth'];
10 changes: 5 additions & 5 deletions scripts/pi-hole/php/savesettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -580,25 +580,25 @@ function addStaticDHCPLease($mac, $ip, $hostname)

case 'speedtest':
if (isset($_POST['speedtestmode'])) {
exec('sudo pihole -a -sm '.trim($_POST['speedtestmode']));
pihole_execute('-a -sm '.trim($_POST['speedtestmode']));
}

if (isset($_POST['speedtestschedule'])) {
exec('sudo pihole -a -s '.trim($_POST['speedtestschedule']));
pihole_execute('-a -s '.trim($_POST['speedtestschedule']));
}

if (isset($_POST['clearspeedtests'])) {
if (trim($_POST['clearspeedtests']) == 'yes') {
exec('sudo pihole -a -sc');
pihole_execute('-a -sc');
}
}

if (isset($_POST['speedtestserver']) && is_numeric($_POST['speedtestserver'])) {
exec('sudo pihole -a -ss '.trim($_POST['speedtestserver']));
pihole_execute('-a -ss '.trim($_POST['speedtestserver']));
}

if (isset($_POST['speedtestdays'])) {
exec('sudo pihole -a -sd '.trim($_POST['speedtestdays']));
pihole_execute('-a -sd '.trim($_POST['speedtestdays']));
}

$success .= 'The Speedtest settings have been updated';
Expand Down
21 changes: 11 additions & 10 deletions scripts/pi-hole/php/update_checker.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,6 @@ function checkUpdate($currentVersion, $latestVersion)
$docker_update = false;
} else {
$docker_update = checkUpdate($docker_current, $docker_latest);

$dockerUrl = 'https://github.com/pi-hole/docker-pi-hole/releases';
$dockerVersionStr = '<a href="'.$dockerUrl.'/'.$docker_current.'" rel="noopener" target="_blank">'.$docker_current.'</a>';
}
} else {
// Components comparison
Expand All @@ -100,28 +97,32 @@ function checkUpdate($currentVersion, $latestVersion)

// URLs for the links
$coreUrl = 'https://github.com/pi-hole/pi-hole/releases';
$webUrl = 'https://github.com/pi-hole/AdminLTE/releases';
$webUrl = 'https://github.com/arevindh/AdminLTE/releases';
$ftlUrl = 'https://github.com/pi-hole/FTL/releases';
$dockerUrl = 'https://github.com/arevindh/docker-pi-hole/releases';

// Version strings
// If "vDev" show branch/commit, else show link
$coreVersionStr = $core_current;
if (isset($core_commit)) {
$coreVersionStr .= ' ('.$core_branch.', '.$core_commit.')';
$coreVersionStr = $core_current.' ('.$core_branch.', '.$core_commit.')';
} else {
$coreVersionStr = '<a href="'.$coreUrl.'/'.$core_current.'" rel="noopener" target="_blank">'.$core_current.'</a>';
}

$webVersionStr = $web_current;
if (isset($web_commit)) {
$webVersionStr .= ' ('.$web_branch.', '.$web_commit.')';
$webVersionStr = $web_current.' ('.$web_branch.', '.$web_commit.')';
} else {
$webVersionStr = '<a href="'.$webUrl.'/'.$web_current.'" rel="noopener" target="_blank">'.$web_current.'</a>';
}

$ftlVersionStr = $FTL_current;
if (isset($FTL_commit)) {
$ftlVersionStr .= ' ('.$FTL_branch.', '.$FTL_commit.')';
$ftlVersionStr = $FTL_current.' ('.$FTL_branch.', '.$FTL_commit.')';
} else {
$ftlVersionStr = '<a href="'.$ftlUrl.'/'.$FTL_current.'" rel="noopener" target="_blank">'.$FTL_current.'</a>';
}

if ($docker_current) {
$dockerVersionStr = '<a href="'.$dockerUrl.'/'.$docker_current.'" rel="noopener" target="_blank">'.$docker_current.'</a>';
} else {
$dockerVersionStr = '';
}
1 change: 0 additions & 1 deletion settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -1558,7 +1558,6 @@
<label>Speedtest Mode</label>
<select name="speedtestmode" class="form-control" >
<option value="official" <?php if ($speedtestmode == 'official') {?> selected <?php } ?>>Official CLI</option>
<option value="python" disabled <?php if ($speedtestmode == 'python') {?> selected <?php } ?>>Python</option>
</select>
</div>

Expand Down

0 comments on commit ce145d2

Please sign in to comment.