73265605c2
Acknowledge possible custom time interval set by MAXLOGAGE in pihole-FTL.conf
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-08-08 10:35:31 +02:00
c847144152
Merge pull request #802 from pi-hole/devel
...
Bring missing v4.0 changes into release branch
2018-08-03 23:28:58 -04:00
1e7e0dc0f9
Merge pull request #798 from pi-hole/fix/list-comments
...
Ignore commented lines in list files
2018-08-02 12:20:55 +02:00
57698ba45a
Fix permissive regex
...
The `\.?` is too permissive, letting in anything that ends in the domain
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-31 22:17:25 -04:00
b7ad22c51e
Use simpler regex format for wildcards
...
Use `\.?domain\.com$` instead of `((^)|(\.))domain\.com$`
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-31 21:35:27 -04:00
97023278b3
Ignore commented lines in list files
...
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com >
2018-07-31 21:12:41 -04:00
2188103b5c
Update blocklist wording and help page
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-22 11:57:16 -04:00
97967f6180
Merge pull request #788 from pi-hole/fix/query-log-memory
...
Always start with empty search field on Query Log page
2018-07-17 20:04:18 -04:00
cca2f6fc69
Always start with empty search field on Query Log page
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-07-16 18:35:30 +02:00
dd77a6af58
Add missing semicolon
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-15 16:43:14 -04:00
846e3e4184
Fix lag by limiting rendering to every 50ms
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-15 15:04:38 -04:00
4542a68f2f
Fix y value of tooltip scaling incorrectly
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-15 15:04:07 -04:00
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
3e4613caf0
Move function add_regex($regex) to func.php
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-07-15 12:48:46 +02:00
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
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
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
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
6dc8bf300c
Export regex.list
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-07-14 15:27:54 +02:00
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
2759ec0da5
Add missing break statements
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-06-30 15:18:13 -04:00
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
4566db2a7c
Use passed argument in new function add_regex()
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-06-30 14:30:45 +02:00
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
60ca5e06fa
Merge remote-tracking branch 'origin/devel' into new/regex-support
2018-06-29 23:49:28 -04:00
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
aef5f7c7ce
Keep trailing newline in regex file after removal
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-06-28 23:16:11 -04:00
9bc09564ba
Improve readability of long term summary stats
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-06-25 19:44:22 -04:00
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
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
3f7246968e
Review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-06-17 20:01:46 +02:00
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
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
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
881d80b7f7
Don't append DNSSEC status if wildcard blocked
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-06-14 17:25:22 +02:00
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
2aef235040
Use client address if name is empty
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-06-07 19:05:27 +02:00
357da1d15a
Expose both name and IP of client
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-06-06 18:27:55 -04:00
36930e3834
Add regex support on the web interface
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-06-05 10:35:41 +02:00
c93fe7a93f
Fix syntax
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-06-03 12:29:28 +02:00
65cb428f35
Codacy forces { } even for single lines
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-06-03 12:24:15 +02:00
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
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
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
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
96039f52a5
fix typo in cookie check
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-06-01 09:52:07 +10:00
842b503f98
Merge pull request #687 from Toakan/LogScroll
...
Log scroll
2018-05-29 18:18:31 -04:00
523b4c390d
Merge pull request #522 from Th3M3/clean_up_style-rules
...
Clean up style rules
2018-05-29 18:16:31 -04:00
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
5171158b12
Merge pull request #756 from rrobgill/fixquerysorting
...
Fix query sorting by Reply, DNSSEC and Action
2018-05-28 16:53:38 -04:00
DL6ER
Mark Drobnak
DL6ER
Mcat12
Rob Gill