Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-25 13:06:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,647 Commits 19 Branches 112 Tags
921791da17841f78cb74c475cf583728438159c2
Commit Graph

657 Commits

Author SHA1 Message Date
Mcat12
dd77a6af58 Add missing semicolon 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-15 16:43:14 -04:00
Mcat12
846e3e4184 Fix lag by limiting rendering to every 50ms 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-15 15:04:38 -04:00
Mcat12
4542a68f2f Fix y value of tooltip scaling incorrectly 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-15 15:04:07 -04:00
DL6ER
7c9f09db0e Directly write imported regex file to disk instead of useing bash callbacks 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-07-15 12:56:40 +02:00
DL6ER
3e4613caf0 Move function add_regex($regex) to func.php 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-07-15 12:48:46 +02:00
DL6ER
65d0c7a1d9 Also try to import legacy wildcard list if found in imported teleporter archive 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-07-14 22:25:17 +02:00
DL6ER
e67695d51a Add files backed up from /etc/dnsmasq.d into a separate directory to tidy up the generated archive 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-07-14 15:46:22 +02:00
DL6ER
ed8dbfd10e Show number of processed items when importing whitelist, blacklist, and regex filters 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-07-14 15:34:42 +02:00
DL6ER
50885d092a Import regex.list if requested. Don't check validity of regex filters as they are not necessarily in valid domain format 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-07-14 15:33:52 +02:00
DL6ER
6dc8bf300c Export regex.list 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-07-14 15:27:54 +02:00
Mcat12
fbe9516cbe Fix incorrect regex removal code 
If you had these in the regex list:
- example\.com
- example
- ^example.*

And you removed "example", then the list would look like this:
- \.com
- ^.*

This behavior is fixed.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-08 16:27:38 -04:00
Mcat12
2759ec0da5 Add missing break statements 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-30 15:18:13 -04:00
DL6ER
e8b2cbe698 Tag regex filters as "regex" to avoid the domain validation (otherwise regex lines could not get removed). Also ensure that deleting the first wildcard/regex does not hide the first exact blocking domain (this bug has been in since the very beginning of wildcard blocking) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-30 14:42:52 +02:00
DL6ER
4566db2a7c Use passed argument in new function add_regex() 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-30 14:30:45 +02:00
DL6ER
ec0afceeed Add new button to allow both regex filters and legacy wildcards (get automatically converted to regex format) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-30 14:19:03 +02:00
Mcat12
60ca5e06fa Merge remote-tracking branch 'origin/devel' into new/regex-support 2018-06-29 23:49:28 -04:00
Mcat12
4259aada78 Don't leave a newline at the end of the regex file 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-29 23:03:01 -04:00
Mcat12
aef5f7c7ce Keep trailing newline in regex file after removal 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-28 23:16:11 -04:00
Mcat12
9bc09564ba Improve readability of long term summary stats 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-25 19:44:22 -04:00
DL6ER
c0da231fa6 Force reload of the regex filters in FTLDNS after having added/removed one from the dashboard 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-24 12:42:05 +02:00
DL6ER
1935544183 Directly manipulate regex.list from PHP to avoid detour over bash. This needs read/write permissions of the PHP user on "/etc/pihole/regex.list" ! 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-23 15:50:19 +02:00
DL6ER
3f7246968e Review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-17 20:01:46 +02:00
DL6ER
a0f9a1bdb8 JavaScript allows the omission of curly braces when a block contains only one statement. However, codacy wants us to never omit curly braces around blocks, even when they are optional. This code has not been introduced in this PR, so it's not entirely clear why it has been detected in this PR... 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-17 15:11:53 +02:00
DL6ER
a98df3d190 Merge branch 'devel' into new/regex-support 
Signed-off-by: DL6ER <dl6er@dl6er.de>

Conflicts:
	scripts/pi-hole/js/queries.js
 2018-06-17 15:04:01 +02:00
Mark Drobnak
6fd0709f72 Merge pull request #763 from pi-hole/query-log/remove_DNSSEC_extra_column 
Query Log: Remove DNSSEC column
 2018-06-14 20:37:37 -04:00
DL6ER
881d80b7f7 Don't append DNSSEC status if wildcard blocked 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-14 17:25:22 +02:00
Mark Drobnak
81b97eaf8b Merge pull request #762 from pi-hole/feature/PHP_error_display 
Settings page: Display PHP errors
 2018-06-07 21:43:38 -04:00
DL6ER
2aef235040 Use client address if name is empty 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-07 19:05:27 +02:00
Mcat12
357da1d15a Expose both name and IP of client 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-06 18:27:55 -04:00
DL6ER
36930e3834 Add regex support on the web interface 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-05 10:35:41 +02:00
DL6ER
c93fe7a93f Fix syntax 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-03 12:29:28 +02:00
DL6ER
65cb428f35 Codacy forces { } even for single lines 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-03 12:24:15 +02:00
DL6ER
965a8f31c7 Remember last selected "Show X entries" in Query Log 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-03 12:11:55 +02:00
DL6ER
adfa0b6a03 Remember last selected "Show X entries" in Query Log 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-03 12:09:52 +02:00
DL6ER
2df0c21753 Remove extra DNSSEC column. Instead, we integrate the DNSSEC result into the STATUS column if available. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-03 11:32:33 +02:00
DL6ER
80017e9b41 Remove auto-dismissal for error messages on the settings page 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-03 11:19:16 +02:00
Rob Gill
96039f52a5 fix typo in cookie check 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-01 09:52:07 +10:00
Mark Drobnak
842b503f98 Merge pull request #687 from Toakan/LogScroll 
Log scroll
 2018-05-29 18:18:31 -04:00
Mark Drobnak
523b4c390d Merge pull request #522 from Th3M3/clean_up_style-rules 
Clean up style rules
 2018-05-29 18:16:31 -04:00
DL6ER
2eb4f78e0d Merge pull request #744 from pi-hole/fix/show_blocked_permitted_only 
Correctly apply API_QUERY_LOG_SHOW filters on dashboard
 2018-05-29 15:24:36 +02:00
Mark Drobnak
5171158b12 Merge pull request #756 from rrobgill/fixquerysorting 
Fix query sorting by Reply, DNSSEC and Action
 2018-05-28 16:53:38 -04:00
Mark Drobnak
75559ef86e Merge pull request #759 from pi-hole/fix/getClientNames 
Fix a minor bug in api.php?getClientNames
 2018-05-28 14:36:53 -04:00
DL6ER
b2743ed245 Fix a minor bug with api.php?getClientNames when hostnames are present more than once on the local network (maybe once IPv6, once IPv4) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-05-28 17:42:11 +02:00
Kevin Kirsche
49d6feb4c3 Fix 579 | Add interface option for administrator email address (Redo of #757) 
Signed-off-by: Kevin Kirsche <Kev.Kirsche@gmail.com>
 2018-05-26 23:17:17 -04:00
Rob Gill
0fd0061e73 Fix query sorting by Reply, DNSSEC and Action 
orderData added to column specifications, allowing sorting to work when storage and display columns do not match.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-05-26 20:25:34 +10:00
DL6ER
c6f5c2ee35 Display new dns_queries_all_types value (if available) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-05-25 09:53:30 +02:00
DL6ER
c8f0db326b Remove ancient and completely outdated PHP-only API. Pi-hole v4.0 will only use the FTL-PHP API. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-05-24 14:06:46 +02: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
Mark Drobnak
fc795e3b10 Merge pull request #743 from rrobgill/cookielogin 
Persistent login cookie
 2018-05-14 21:03:16 -04:00
Rob Gill
967763b6da indenting 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-05-15 10:56:49 +10:00