Commit Graph

46 Commits

Author SHA1 Message Date
Mcat12
52a5fb62ff Merge pull request #466 from pi-hole/fix/csrf-security
Add CSRF token
2017-04-06 16:22:18 -04:00
Mcat12
acc83345fd Merge pull request #252 from pi-hole/customizeadlists
Manage adlists
2017-04-06 16:16:05 -04:00
Mcat12
fe7f3d3873 Require CSRF token when changing settings 2017-04-02 20:04:39 -04:00
Mcat12
7a5c8e899e Use button to remove lists 2017-03-31 20:16:58 -04:00
Mcat12
86d8869867 Handle deletion of list in savesettings.php 2017-03-31 18:42:00 -04:00
Adam Warner
c11172d7c4 modify to work with changes in pihole#1365 2017-03-31 21:05:53 +01:00
Flo
146184824f Update savesettings.php 2017-03-26 14:56:21 +02:00
Mcat12
c182834e55 Fix undefined variable when setting DNS servers 2017-03-21 18:35:32 -04:00
Skittels
7627f35ba5 Update savesettings.php 2017-03-14 20:21:57 +01:00
DL6ER
41cadc5b48 Merge pull request #423 from pi-hole/new/IPv6upstreamDNSservers
Add IPv6 upstream server settings
2017-03-03 14:43:48 +01:00
DL6ER
4182a83bd4 Codacy and styling 2017-03-03 14:39:51 +01:00
DL6ER
40fd8b8b1d Add IPv6 upstream servers 2017-03-02 22:38:38 +01:00
DL6ER
57d62879bc Merge branch 'devel' into new/FTL-integration 2017-03-01 12:44:51 +01:00
DL6ER
6cef1b3085 Setup interface listening behavior of dnsmasq 2017-03-01 11:25:28 +01:00
DL6ER
f88092175e Conflicts:
api.php
	scripts/pi-hole/php/FTL.php
	scripts/pi-hole/php/auth.php
	scripts/pi-hole/php/password.php
2017-02-19 14:17:52 +01:00
Promofaux
86880668fa Add DNS.WATCH servers from https://github.com/pi-hole/pi-hole/pull/1253 2017-02-18 17:51:15 +00:00
DL6ER
4f70973cbc EUPL license (#402)
* Move whole project to EUPL, copy MIT license to scripts/vendor/ and style/vendor/

* Added header to main PHP files

* Modified scripts in scripts/pi-hole/php

* Added header to scripts/pi-hole/js files

* Added license header to our custom style script

* Slight reformulation
2017-02-18 14:20:51 +01:00
DL6ER
aabff35bef Squashed commit of the following:
- Dynamically fall back to PHP API functions to ensure API does always repond even if FTL is not runnung for some reason
- Update PHP API from current devel branch
- Increase flexibility in getQueryTypes API call
- Hide top ads list if nothing to display
- Proper display of activated privacy mode
- Remove spinner (would otherwise not be removed for zero results)
- Update tables every 10 seconds
- Update query types and forward destinations plots every 10 seconds
- More verbose output in top lists (total number next to percentage in tooltip)
- Implemented "recentBlocked" keyword for API
- Ensure compatibility with PHP5 version < 5.4
- Adjust output format of overTimeData10mins to comply with PHP API
- Further speedup of Query Log page by showing only the recent 10 minutes by default
- Hide temperature if FTL is not running and show FTL status
- Add information to Settings page
- Adjust error message when loading of query log failed
- Move processing of domainname, clientIP, clientname and time interval filters for the Query Log page to FTL for speed enhancement
- Generate link if pi.hole comes up in the Top Domains list
- Remove resolve DNS names option - this is now enabled by default (daemon will only do it once per day instead of PHP-API which did it on every reloading of the web interface)
- Add socket timeout of 10 seconds + modification to Settings page since FTL backend supports API_EXCLUDE_CLIENTS filtering with both IP addresses and host names (also mixed)
- Improved Query Log page
2017-02-16 08:52:30 +01:00
DL6ER
1c73016f6a Modified scripts in scripts/pi-hole/php 2017-02-14 15:00:11 +01:00
Mcat12
ee41dbdc70 Merge pull request #391 from pi-hole/fix/xss-settings
Clean any inputs being added to $success or $error
2017-02-09 16:21:00 -05:00
Mcat12
3a3883aa39 Clean any inputs being added to $success or $error
Changes htmlentities to htmlspecialchars as well, because
htmlentities is not adequate to protect against XSS attacks:
http://php.net/manual/en/function.htmlentities.php#99896

Fixes #365
2017-02-02 19:39:51 -05:00
DL6ER
11bee7f45d Do not accept :: or 0:0:0:0:0:0:0:0 as valid IPv6 address 2017-02-02 10:49:55 +01:00
DL6ER
c81e2591bd Remove debug mode 2017-01-30 23:44:14 +01:00
DL6ER
68a48aef2f added -> removed 2017-01-30 23:19:28 +01:00
DL6ER
6af5fe73ae Added comments 2017-01-25 13:10:57 +01:00
DL6ER
3ba37d7793 Also allow (manually set dhcp-host=hostname,ip.add.re.ss) in table. As this has been added manually, don't allow deleting it 2017-01-25 13:08:36 +01:00
DL6ER
8646507f37 Make sure variables are empty before call of sscanf() 2017-01-25 11:47:20 +01:00
DL6ER
915bbb3e5d Add and remove static DHCPv4 releases using Settings page, prevent adding more than one entry with the same MAC address 2017-01-25 11:44:17 +01:00
DL6ER
1eb8f32755 Allow omitting host name 2017-01-25 10:13:51 +01:00
DL6ER
3d8246e4c3 Add static leases table to DHCP settings 2017-01-25 10:11:23 +01:00
DL6ER
6760ba80a7 Allow multiple upstream DNS server selection 2017-01-13 17:49:16 +01:00
DL6ER
0924f20214 Required backend changes in savesettings.php 2017-01-13 13:47:06 +01:00
DL6ER
225c2791fe Remove debug statement 2017-01-12 16:30:18 +01:00
DL6ER
99fb6ad8ce Add DNSSEC to web UI 2017-01-12 16:02:09 +01:00
DL6ER
c6d98a88e4 Tell if IPv6 has been enabled or not in success message 2017-01-03 14:29:20 +01:00
DL6ER
a04c89f12f Pass true/false to backend 2017-01-03 14:25:38 +01:00
DL6ER
645aab6571 Add option to disable IPv6 part of the DHCP server 2017-01-03 14:07:16 +01:00
DL6ER
4b3173b434 Merge branch 'devel' into customizeadlists 2017-01-02 14:43:38 +01:00
DL6ER
5735a5b9a2 Merge branch 'devel' into customizeadlists 2016-12-30 20:43:07 +00:00
DL6ER
d9c695dc4a Merge branch 'devel' into new/dhcpv6settings 2016-12-30 20:33:21 +00:00
Promofaux
8240e2d23b merge devel 2016-12-29 19:59:09 +00:00
Mcat12
2f65430a4d Move PHP scripts to scripts folder 2016-12-21 21:09:58 +01:00
DL6ER
e188cb6fbc Revert "Merge pull request #267 from pi-hole/folderStructure"
This reverts commit fba3d10fa4, reversing
changes made to 4ee75f4167.
2016-12-21 17:16:52 +01:00
DL6ER
42c9439d1e Merge branch 'devel' into folderStructure 2016-12-20 23:09:39 +01:00
DL6ER
34a0a57447 Merge branch 'devel' into folderStructure 2016-12-20 12:52:37 +01:00
Mcat12
d1da1de597 Move PHP scripts to scripts folder 2016-12-19 19:44:51 -05:00