Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-02-23 11:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,318 Commits 23 Branches 113 Tags
b43eea7050a94de9d1ba6914bc59f06b9068299b
Commit Graph

128 Commits

Author SHA1 Message Date
Adam Warner
d64818c7a5 Merge pull request #1892 from a1346054/fixes 
Simple maintenance improvements
 2021-09-29 21:17:25 +01: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
48c63c0a0b Fix spelling 
Signed-off-by: a1346054 <36859588+a1346054@users.noreply.github.com>
 2021-09-15 21:22:59 +00: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
Will Cooke
b69e774bf3 Simple typo fix: static release -> static lease. 
Signed-off-by: Will Cooke <will@whizzy.org>
 2021-02-27 15:02:52 +00:00
Jonny Bolton
590749b7eb Typo fixed in save settings 
Signed-off-by: Jonny Bolton <jonnybolton@gmail.com>
 2021-02-16 17:39:39 +00:00
DL6ER
1b129bcad0 Merge branch 'release/v5.2' into new/mac_clients 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-07-30 21:56:21 +02:00
DL6ER
99adb3012b Fix arpflush command 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-07-19 22:13:05 +02:00
Adam Warner
c42c06be2d Merge pull request #1208 from pi-hole/new/rev-server 
Improve conditional forwarding settings
 2020-07-02 10:51:41 +01:00
DL6ER
1482b9055d Update scripts/pi-hole/php/savesettings.php 
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-30 22:55:06 +02:00
Adam Warner
f51705b675 Don't add #53 to any passed IP value by default, only add custom port if it is specified by the user 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-25 17:54:23 +01:00
Adam Warner
297c1b019f response is expected to be empty here, as far as I can tell. Reverting this logic change prevents a misleading message being displayed to the user 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-25 17:46:22 +01:00
DL6ER
a901489a96 Merge branch 'devel' into new/mac_clients 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-05 22:24:17 +02:00
DL6ER
540ebddb8c Merge branch 'devel' into new/rev-server 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-04 09:24:49 +02:00
DL6ER
a4a678b584 Revert "Add per-browser boxed layout setting" 
This reverts commit c2683fb87bc50369753b279e179e7b5d0d1e60a9.

Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:20:51 +01:00
DL6ER
51dc473278 Remove saving backend for settings moved into local storage. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:20:51 +01:00
DL6ER
ac89d268a7 Only try to implode pihole arpflush quiet output if it is an array. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-19 11:23:42 +02:00
Jack'lul
e12ebcbd08 Trim user input where applicable 
Signed-off-by: Jack'lul <jacklulcat@gmail.com>
 2020-05-14 18:01:36 +02:00
DL6ER
05d5f02a36 Add theme chooser to Setting -> Web interface. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 22:50:29 +02:00
DL6ER
73ee91a024 Merge branch 'master' into master-to-development-v5.0 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-10 22:00:07 +02:00
Adam Warner
6e5bbfb68a Check IP addresses read in from dns-server.conf are valid before adding them to the array. 
Fix for CVE-2020-12620

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-03 22:47:33 +01:00
Samu Voutilainen
39ec67829b Execute pihole through wrapper 
All different exec() calls basically just calls sudo pihole,
with various different syntaxes. Using a wrapper function
allows sanitization of arguments for better safety.

Signed-off-by: Samu Voutilainen <smar@smar.fi>
 2020-04-17 07:55:16 +03:00
DL6ER
373d59f751 Improve conditional forwarding settings so users can specify the subnet according to their needs. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-10 10:54:41 +02:00
DL6ER
0f892c9ffc Check for existance and readability of static leases file before trying to access it. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-07 12:30:51 +02:00
DL6ER
f9fd89cda7 Merge pull request #1149 from pi-hole/new/space-separated-item-injection 
Allow space separated multiple items injection
 2020-03-31 23:40:39 +02:00
Th3M3
2a38bcc074 allow to clear email address 
Signed-off-by: Th3M3 <the_me@outlook.de>
 2020-03-18 21:39:55 +01:00
DL6ER
13b7b3d1a9 Remove redundant adlist management on settings page. This is still using CLI callbacks instead of working directly on the database. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-11 20:07:43 +01:00
DL6ER
1c4e8056c2 Allow underscores in the middle of TLDs. Fixes #1036 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-01-12 13:16:55 +01:00
DL6ER
52f5be0c8f Merge pull request #992 from trimalcione/devel 
Add DHCP leases export/import from teleporter
 2019-12-16 11:22:28 +01:00
trimalcione
6c04b8cb39 add DHCP static leases import from teleporter 
Signed-off-by: trimalcione <okchtioui@gmail.com>
 2019-12-02 16:21:19 +01:00
Adam Warner
8311a0aefc Add ability for user to include comment when adding a blocklist 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-10-14 22:59:05 +01:00
trimalcione
9d32aa6489 Add DHCP leases export/import from teleporter 
Signed-off-by: trimalcione <okchtioui@gmail.com>
 2019-08-20 18:12:16 +02:00
Mcat12
c5b25f23e5 Add missing break 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-09 20:37:05 -07:00
Mcat12
bc85bcda7b Prevent static DHCP leases from having duplicate hostnames 
Fixes #979

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-09 20:35:15 -07:00
Mcat12
86ba703ef5 Use the renamed adlist table when getting adlists 
This fixes an error shown on the settings page.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-04 11:28:01 -07:00
Mark Drobnak
4e1df1664c Merge pull request #951 from pi-hole/new/arp-flush 
Add button for pihole arpflush on Pi-hole settings page
 2019-07-04 14:10:29 -04:00
Mcat12
f7905167c0 Prevent command injection via admin email 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-01 20:17:10 -07:00
DL6ER
43fa24fbea Glue needs to be the first argument of implode 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-30 22:11:13 +02:00
DL6ER
72abc5dad4 Add button for pihole arpflush on Pi-hole settings page 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-30 22:05:13 +02:00
DL6ER
ced7174c37 Modify adlists subpage of the settings page to sources the lists from the gravity database. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-28 20:42:50 +02:00
Mcat12
2ba8787261 Merge branch 'release/v4.2' into devel 
# Conflicts:
#	scripts/pi-hole/js/db_graph.js
 2019-02-03 11:24:19 -08:00
Mark Drobnak
991be959d3 Update scripts/pi-hole/php/savesettings.php 
Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-01-19 22:35:12 +01:00
Michael Epstein
84f6f3dae6 - Fix the delete of blacklist/whitelist records under NGINX + PHP-FPM 
- Fix multiple php warning/error messages when this scripts are executed from AJAX requests

Example errors/warnings:

2019/01/15 13:22:22 [error] 1408#1408: *2535 FastCGI sent in stderr: "PHP message: PHP Notice:  Undefined variable: api in /var/www/html/admin/scripts/pi-hole/php/sub.php on line 16
PHP message: PHP Warning:  Cannot modify header information - headers already sent by (output started at /var/www/html/admin/scripts/pi-hole/php/sub.php:8) in /var/www/html/admin/scripts/pi-hole/php/auth.php on line 81
PHP message: PHP Warning:  session_start(): Cannot start session when headers already sent in /var/www/html/admin/scripts/pi-hole/php/auth.php on line 93

Signed-off-by: Michael Epstein <mepstein@mediabox.cl>
 2019-01-16 01:51:54 -03:00
DL6ER
a10f23b79a Prevent multiple static DHCP entries for the same IP address to get added. Fixes #889 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-01-15 17:17:34 +01:00
Sylvia van Os
525901e552 Read DNS server list from file 
Signed-off-by: Sylvia van Os <sylvia@hackerchick.me>
 2019-01-13 19:49:49 +01:00
Dan Schaper
798486b7a3 Merge pull request #879 from pi-hole/hotfix/v4.1.1 
Merge hotfix v4.1.1 into dev
 2018-12-21 09:07:21 -08:00
Dan Schaper
a0961f9e21 Cloudflare does not support ECS 
>EDNS Client Subnet
1.1.1.1 is a privacy centric resolver so it does not send any client IP information and does not send the EDNS Client Subnet Header to authoritative servers.

https://developers.cloudflare.com/1.1.1.1/nitty-gritty-details/
 2018-12-18 18:16:58 -08:00
Mark Drobnak
9fa4cc62cb Merge pull request #872 from pi-hole/release/v4.1 
Update development with final v4.1 changes
 2018-12-09 22:14:30 -05:00
Mark Drobnak
064e652344 Merge branch 'release/v4.1' into fix/admin-email-security 2018-12-06 12:18:39 -05:00
DL6ER
18f9ed4532 Update savesettings.php 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-11-26 19:12:08 +01:00