Commit Graph

684 Commits

Author SHA1 Message Date
DL6ER 6fb2dab5bc Extend query log and API to be able to handle requests limited to specific forward destinations and query types
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-15 14:36:37 +02:00
DL6ER 6f7e1b5b59 Open Query Log with filtering option on Query Type when left-clicking on an element in the pie-chart. The current behavior is moved to middle mouse click.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-15 14:33:02 +02:00
Mark Drobnak da2a6fec69 Merge pull request #817 from pi-hole/codeformatting
Changes to code formatting
2018-08-13 16:11:28 -04:00
Rob Gill 5dfe0eedef Standalone open curly brackets for if and for statements
For code consistency all opening curly brackets for if and for statements now stand alone on their own lines

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-08-11 09:26:58 +10:00
Rob Gill 32cd50b718 Changes to formatting only (no functional changes)
Issues identified by codacy

*Multiple spaces removed
*piholeChanged defined before use
*curly brackets after if conditions
*lonely if converted to else if

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-08-11 08:29:03 +10:00
Mark Drobnak 90b075f11f Merge pull request #816 from pi-hole/tweak/teleporter_auditlist
Offer possibility to import auditlog.list from teleporter archive
2018-08-10 18:06:57 -04:00
Mark Drobnak 321b2023de Merge pull request #815 from rrobgill/pietooltips
Pie-chart custom tooltips
2018-08-10 17:34:30 -04:00
DL6ER 78d262d7b0 Offer possibility to import auditlog.list from teleporter archive
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-10 18:25:12 +02:00
Rob Gill ff29a440b5 Double quotes.
i <3 codacy-bot

Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
2018-08-10 13:39:14 +10:00
Rob Gill ad2439c46d Adjust customToolTips to deal with pie charts
Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
2018-08-10 13:16:46 +10:00
Rob Gill 4cf14dfc30 Constrain tooltips for piecharts
This stops the tooltips from disappearing beyond the pie chart's canvas.

Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
2018-08-10 09:59:31 +10:00
DL6ER afc97b1004 :codacy: review comments
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-09 18:20:09 +02:00
DL6ER 5360bfae9d Add RRNAME as reply type for TXT queries
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-09 18:07:40 +02:00
DL6ER f2cf9ab8d7 Add further reply types
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-09 17:46:50 +02:00
DL6ER 423084dc3b Restructure long chain of "if" statements into a set of "switch" statements. No functional change!
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-09 17:44:26 +02:00
DL6ER 82f4d718aa Merge pull request #812 from pi-hole/fix/settings_page_adlists_show_everything
Don't require adlists to start in "http"
2018-08-08 21:32:18 +02:00
DL6ER 2df4a0d052 Improve logic
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-08 21:17:10 +02:00
DL6ER 8b1313b864 Don't require adlists to start in "http". This also displays lists that start in e.g., "ftp://" or "file://" or without a protocol.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-08 12:06:59 +02:00
DL6ER 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
Mark Drobnak 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
DL6ER 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
Mcat12 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
Mcat12 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
Mark Drobnak 97023278b3 Ignore commented lines in list files
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
2018-07-31 21:12:41 -04:00
Mcat12 2188103b5c Update blocklist wording and help page
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-07-22 11:57:16 -04:00
Mark Drobnak 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
DL6ER 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
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