Commit Graph

19 Commits

Author SHA1 Message Date
Adam Warner
e3cd70dcb3 While I'm in here.. prevent another error being constantly output to the error log
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-05-18 18:09:23 +01:00
Samu Voutilainen
ab04607087 FTL.php: parse port path from pihole-FTL.conf
Signed-off-by: Samu Voutilainen <smar@smar.fi>
2020-01-19 16:07:33 +02:00
Philipp Kolmann
87ba9740f1 remove debug output
Signed-off-by: Philipp Kolmann <philipp@kolmann.at>
2019-12-10 21:14:09 +01:00
Philipp Kolmann
e3fd40dbf4 I have a different service running on FTL default port and so FTL service was not properly started. I searched quite a long time to discover why the Dashboard never loaded and finally found the reason.
This patch counts empty lines and dies properly with a JSON error. This fixed my issue.

Also I have pi-hole running with apache2 and so no /var/log/lighttpd/error.log exists.
Fix: Try apache2 logging location and if not found then write log to a /tmp file.

Signed-off-by: Philipp Kolmann <philipp@kolmann.at>
2019-12-07 10:44:12 +01:00
Mark Drobnak
32c55577f1 Remove max line length in getResponseFTL
Fixes issue found on Discourse: https://discourse.pi-hole.net/t/9544

Signed-off-by: Mark Drobnak <newtoncat12@yahoo.com>
2018-05-16 11:27:54 -04:00
DL6ER
ef948cfef3 Have to provide all optional arguments in PHP...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-15 11:23:55 +02:00
DL6ER
a1824a45d4 Improve way PHP connects to FTL
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-15 10:56:52 +02:00
DL6ER
71a7c84cba Make second argument of resolveHostname() optional
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-04 12:32:55 +02:00
DL6ER
c1ffcdd997 Fix resolveHostname() subroutine
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-05 16:43:28 +01:00
DL6ER
1ec38e3a79 Don't want IPs in Query Log output
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-05 16:35:42 +01:00
DL6ER
9e5eba4036 Return both client IP and hostname in clientname string
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-04 21:06:28 +01:00
DL6ER
ee4e106d83 :codacy:
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-25 09:52:40 +01:00
DL6ER
02f14ceb05 Add name resolution capabilites (with caching) for web interface
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-25 09:44:01 +01:00
DL6ER
2f3dc0befe Oh :codacy: ...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-02 12:27:42 +02:00
DL6ER
fcf2eb663f Specify one common place for defining the IP of a non-local FTL instance. Fixes #589
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-02 12:19:24 +02:00
DL6ER
4d7eef2d55 Improve behavior if socket connection does not work because, e.g. pihole-FTL is not listening: don't wait until socket timeout, but define our own timeout of 3 seconds 2017-04-20 13:40:23 +02:00
DL6ER
b3cbd29ed7 Don't rely on PID file, but try to detect FTL PID ourselves (has shown to be very effective in the update service file) 2017-04-20 13:20:36 +02: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