Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-27 13:59:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,318 Commits 20 Branches 112 Tags
b43eea7050a94de9d1ba6914bc59f06b9068299b
Commit Graph

874 Commits

Author SHA1 Message Date
rdwebdesign
75251c173c Added new theme LCARS. 
Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>
 2021-10-24 01:46:44 -03:00
Adam Warner
01191c7a1b Merge pull request from GHSA-mhr8-7rvg-8r43 
* Prevent possible XSS attack vector on add_client
Update JS code to prevent possible XSS vector

Co-authored-by: Harold Kim <root@stypr.com>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>

* Fix both addClient and deleteClient to prevent XSS

Signed-off-by: Harold Kim <root@stypr.com>

Co-authored-by: Harold Kim <root@stypr.com>
 2021-10-23 19:26:07 +01:00
Adam Warner
bce2476d78 Display Docker Tag in footer if the PIHOLE_DOCKER_TAG environment variable is detected (#1933) 
* If `PIHOLE_DOCKER_TAG` is set in the environment  then display it as Docker Tag in the versions footer. Else, don't.

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

* Update scripts/pi-hole/php/footer.php

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

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

Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2021-10-23 17:55:07 +02:00
DL6ER
5d981c165b Merge pull request #1924 from yubiuser/delete_network 
Add delete button to the network table to allow deleting individual entries
 2021-10-23 16:41:22 +02:00
DL6ER
9ab9850c9c Merge pull request #1925 from pi-hole/tweak/local_dns_cname 
Do not restart for every item during Teleporter import of Local DNS record or CNAME
 2021-10-23 16:39:12 +02:00
yubiuser
f2322157c8 Remove obsolet list_verify function 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2021-10-19 00:12:26 +02:00
yubiuser
e00d706b49 Fix tabs->spaces 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2021-10-15 07:42:00 +02:00
yubiuser
ab9454a582 Also use variable to disable reload in delteALL functions 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2021-10-13 20:47:02 +02:00
yubiuser
b80c97f6d3 Do only reload pihole once after Local DNS Records or CNAME have been modified 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2021-10-12 21:37:06 +02:00
yubiuser
9f0e5fa67e Use getCustomDNSEntries in deleteAllCustomDNSEntries 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2021-10-12 20:50:37 +02:00
yubiuser
98ee67efed Add delete function 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2021-10-11 14:46:10 +02:00
yubiuser
49c84e58dd Suppress empty lines output during teleporter import (#1921) 
Signed-off-by: Yubiuser <ckoenig@posteo.de>
 2021-10-11 09:05:08 +01:00
yubiuser
85121b69b1 Count right during teleporter import (#1922) 
Signed-off-by: Yubiuser <ckoenig@posteo.de>
 2021-10-10 22:31:59 +01:00
Th3M3
0d24f25f3c Modal Dialog for Teleporter-import 
fixes page reload every time the DHCP tab gets active

Signed-off-by: Th3M3 <the_me@outlook.de>
 2021-10-07 00:12:33 +01:00
Chris Miceli
1ed98f6f38 1777 Remember me for 7 days doesn't work if you log in from Recent Queries (#1870) 
set cookie if requested

Signed-off-by: Chris Miceli <chrismiceli@outlook.com>
 2021-10-06 23:39:21 +01:00
David Beitey
effcd907cd Make entire Forgot Password box header clickable (#1917) 
This adjusts the markup for the Forgot Password box such that the entire
box header (the text, whitespace and plus/minus icon) is interactive.
Previous behaviour of clicking the icon remains the same.

This also improves the markup/spacing inside the box's content.

Signed-off-by: David Beitey <david@davidjb.com>
 2021-10-06 22:43:56 +01:00
Adam Warner
d64818c7a5 Merge pull request #1892 from a1346054/fixes 
Simple maintenance improvements
 2021-09-29 21:17:25 +01:00
Adam Warner
5f52259c7e Merge pull request #1897 from yubiuser/lift_subnet_limitation 
Lift prefix limitaion for --rev-server
 2021-09-29 21:11:44 +01:00
yubiuser
7f13dda4a8 Fix regex 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2021-09-21 19:59:24 +02:00
yubiuser
2d41191ac3 Lift prefix limitaion for --rev-server 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2021-09-21 09:25:31 +02:00
a1346054
26f0203137 Trim excess whitespace 
Signed-off-by: a1346054 <36859588+a1346054@users.noreply.github.com>
 2021-09-15 21:23:01 +00:00
a1346054
48c63c0a0b Fix spelling 
Signed-off-by: a1346054 <36859588+a1346054@users.noreply.github.com>
 2021-09-15 21:22:59 +00:00
a1346054
7517028c64 Add final newline 
Signed-off-by: a1346054 <36859588+a1346054@users.noreply.github.com>
 2021-09-15 21:22:56 +00:00
yubiuser
e0ba6ded2a Address review comments 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2021-09-12 19:42:34 +02:00
yubiuser
9aaa45a034 Add delete button to message table 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2021-09-12 19:41:15 +02:00
yubiuser
3889c0733f Add forgotton target _blank 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2021-09-12 12:30:45 +02:00
Adam Warner
2e9bb78472 Merge pull request #1882 from pi-hole/master 
Sync Master back to Dev
 2021-09-11 22:39:57 +01:00
DL6ER
438c5be2f3 Merge pull request #1854 from pi-hole/XhmikosR-patch-1 
footer.php: move FTL before Web Interface
 2021-09-11 22:01:02 +02:00
Adam Warner
25df783378 Apply htmlentities in a couple of places to prevent xss 
Co-authored-by: wtwver <wtwver@users.noreply.github.com>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-09-11 20:03:05 +01:00
Adam Warner
cf8602eedd set httponly to true when calling setcookie. the ini_set option above doesn't actually seem to do anything... (but not removing it just in case 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-09-11 19:36:18 +01:00
Adam Warner
a7ec9510b5 re-implement fix introduced in 1664090a01 
Release v5.5.1 (based on `master`) has fixed this in `savesettings.php`, but the functionality has since been moved to `func.php` in `devel`, and so the fix needs applying here, too.

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-08-04 20:44:20 +01:00
Adam Warner
647eba40d3 Merge branch 'release/v5.6' into devel 2021-08-04 20:32:59 +01:00
Adam Warner
dacdb3d72c Merge pull request #1857 from pi-hole/master 
Sync Master -> Dev
 2021-08-04 20:21:44 +01:00
Adam Warner
7aa8057df7 Merge pull request from GHSA-5cm9-6p3m-v259 
Fix (Authenticated) Remote Code Execution Possible in Web Interface 5.5
 2021-08-04 18:13:35 +01:00
Adam Warner
8066069a1f Prevent arbritary js code from beign returned from the database 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-08-04 17:29:57 +01:00
XhmikosR
26ec74a75a footer.php: move FTL before Web Interface 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2021-07-31 21:13:01 +03:00
DL6ER
559150bb1f Fix inverse logic when adding domains on the group management pages. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-07-25 19:03:34 +02:00
DL6ER
03920e3595 Move validation functions into func.php and use the same validation in all cases. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-07-25 16:59:16 +02:00
Adam Warner
68034029b7 Merge pull request #1822 from adyanth/devel 
Adding CORS support via environment variable
 2021-07-04 11:49:01 +01:00
Adam Warner
f229e4fcc9 Merge pull request #1832 from kthchew/safari-15 
Improve `theme-color` and `background-color` for different themes
 2021-07-04 01:51:32 +01:00
Adam Warner
1664090a01 Escape . in regex for validDomainWildcard to ensure malicious commands cannot be passed to the function 
bonus, removed some trailing whitespace on line 30

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-06-23 17:34:43 +01:00
DL6ER
a2c64d6d19 Merge pull request #1836 from AlexLamond/auto-darkmode 
Added the option for an automatic dark mode based on the device status
 2021-06-22 16:15:51 +02:00
Alex L
57a5518c23 Update scripts/pi-hole/php/theme.php 
Corrected naming conventions for files and theme name

Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
Signed-off-by: Alex Lamond <9060360+AlexLamond@users.noreply.github.com>
 2021-06-22 12:52:24 +02:00
AlexLamond
5538af20b8 Added the option for an automatic dark mode based on the device status 
Signed-off-by: = <9060360+AlexLamond@users.noreply.github.com>
Signed-off-by: Alex Lamond <9060360+AlexLamond@users.noreply.github.com>
 2021-06-22 12:52:24 +02:00
Kenneth Chew
2f3f4e6056 Adapt theme-color and background-color for different themes 
Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com>
 2021-06-19 01:02:53 -04:00
Adyanth H
5331620b71 Change tabs to spaces 
Signed-off-by: Adyanth H <33192449+adyanth@users.noreply.github.com>
 2021-06-16 10:42:13 +05:30
Adyanth H
23364cfc55 Adding CORS support via environment variable 
Signed-off-by: Adyanth H <33192449+adyanth@users.noreply.github.com>
 2021-06-07 16:19:04 +05:30
Sean F Quinn
774f95f3fa Fixes pi-hole/AdminLTE#1796 
Signed-off-by: Sean F Quinn <sean@esqew.com>
 2021-05-06 14:02:09 -04:00
DL6ER
ca71bc8df8 Check if we can get a host name from the database when looking up the MAC address of this client instead 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-04-29 09:28:12 +02:00
Dylan Sealy
4fc8f283f6 Password autocompletion 
Signed-off-by: Dylan Sealy <66305635+DylanSealy@users.noreply.github.com>
 2021-04-21 22:38:51 +02:00