Commit Graph

102 Commits

Author SHA1 Message Date
DL6ER
dc61eb82d4 Show summary if no arguments are passed to API 2017-02-19 19:10:49 +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
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
DL6ER
b8d6550096 Detect mime type of uploaded file on the server instead of relying on what the uploading OS tells us. Fixes #395 2017-02-09 16:21:21 +01:00
DL6ER
279ea1b18b Give some more details on teleporter failure 2017-02-09 15:25:25 +01:00
DL6ER
f5c4065b89 Check if time zone is set the mute some PHP warnings 2017-02-06 15:59:20 +01: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
Promofaux
bc4e5bb22a get Hostnames for query log page 2017-01-31 21:25:50 +00:00
DL6ER
4c952da6b2 Merge pull request #376 from pi-hole/new/DHCPstaticleases
Add static DHCPv4 leases settings
2017-01-31 21:36:50 +01:00
DL6ER
9bb7f86b0f Apply fix also for overTime graph 2017-01-31 11:51:24 +01:00
DL6ER
5e728255fa Exclude whitelisted domains from showing up in the Top Ads List 2017-01-31 11:48:02 +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
940324551f Strip https:// and http:// in CORS test 2017-01-29 11:45:38 +01:00
Mcat12
11c28bc1be Merge pull request #369 from pi-hole/new/takeout
Pi-hole Teleporter
2017-01-28 19:03:47 -05:00
DL6ER
771c548a7f Renamed zip file 2017-01-27 22:11:02 +01:00
DL6ER
cd5f5bb936 Expanable box + renamed 2017-01-27 22:08:55 +01:00
DL6ER
2f80018f51 Echo OK if everything was successful 2017-01-27 22:02:26 +01:00
DL6ER
837f98e6ed Removed debug output 2017-01-27 22:01:11 +01:00
DL6ER
fc7cf611b4 log_and_die() is not defined 2017-01-27 21:59:22 +01:00
Mcat12
96826da1f2 Return numbers as numbers in summaryRaw 2017-01-26 21:33:18 -05: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
fd0764d92c Codacy 2017-01-20 17:40:20 +01:00
DL6ER
9d09d61b7f Make selectable what should be imported from the uploaded archive 2017-01-20 16:43:33 +01:00
DL6ER
4633f800ab Import of whitelist / blacklist / wildcard list added 2017-01-20 16:43:31 +01:00
DL6ER
21a5b2af69 Add only files that exist (no empty files if the source is not there, e.g. no blacklist.txt) and don't backup adlists.default 2017-01-20 16:43:29 +01:00
DL6ER
cd12288625 Backup also setupVars.conf 2017-01-20 16:43:27 +01:00
DL6ER
db9f224ad9 Export wildcard blocked domains 2017-01-20 16:43:25 +01:00
DL6ER
4d6fa7db44 Removed debug statements 2017-01-20 16:43:23 +01:00
DL6ER
0826ae911b Added box to Settings page + added reading routines to takeout.php
Conflicts:
	scripts/pi-hole/php/takeout.php
2017-01-20 16:43:03 +01:00
DL6ER
ed8790736b Create zip file which contains whitelist, blacklist and setupVars.conf 2017-01-20 16:41:36 +01:00
DL6ER
57c99cb04d Extend CORS check to IPv6. Fixes #1109 2017-01-18 13:28:25 +01:00
DL6ER
09f5bfdea8 Added cookie test of login page 2017-01-16 15:45:44 +01:00
DL6ER
a6b3bc1cb4 Add IE mode to PHP scripts 2017-01-14 15:29:23 +01:00
Mcat12
b96fc9ca73 Merge pull request #356 from pi-hole/tweak/Pi-hole-style
Add pi-hole.css file
2017-01-13 17:26:10 -05: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
a7261bd157 Merge pull request #355 from pi-hole/DNSSEC
Add DNSSEC to web UI
2017-01-12 21:40:23 +01:00
DL6ER
8ff6c77ad4 Make statistics not selectable 2017-01-12 17:15:13 +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
e24c35a528 Merge branch 'devel' into wildcard_blacklisting 2017-01-11 18:26:10 +01:00