Commit graph

76 commits

Author SHA1 Message Date
Jo-Philipp Wich
74da73b012 applications: add ACL dependency annotations to legacy controllers
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-04-19 17:17:26 +02:00
Dirk Brenken
0f18b873d8
luci-app-adblock: release 4.0.0
* complete rewrite, migrated to client side JS
* tested with mainline 19.07 and current master
* tested with latest Firefox & Chrome and all
  standard themes (not OpenWrt2020!)
  Pre-tested by many forum users, see here:
  https://forum.openwrt.org/t/adblock-4-pre-releases/57101
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
2020-03-28 14:35:10 +01:00
Stefan Sundin
8726937611 luci-app-adblock: Fix enter key submitting form but not showing any results.
Signed-off-by: Stefan Sundin <git@stefansundin.com>
2020-02-26 19:08:21 -08:00
Jo-Philipp Wich
7b4efa9ba3 luci-app-adblock: fix spelling: UDP, TCP, e-mail, DNS, cache
Ref: https://github.com/openwrt/luci/pull/3249
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-12-25 18:20:14 +01:00
Dirk Brenken
62c6f21de3
luci-app-adblock: sync with adblock 3.8.5
* support the new extra options 'TLD Compression Threshold',
 'Local FW/DNS Ports' and 'DNS Inotify', see packages PR for details.

Signed-off-by: Dirk Brenken <dev@brenken.org>
2019-09-06 13:36:52 +02:00
Dirk Brenken
bd405bfed0
luci-app-adblock: sync with adblock 3.8.3
* fix a suspend/resume issue
* format overall domains with a thousands separator

Signed-off-by: Dirk Brenken <dev@brenken.org>
2019-08-26 14:09:39 +02:00
Dirk Brenken
9400fc7536
luci-app-adblock: sync with adblock 3.8.0
* add support for the 'null' blocking variant in dnsmasq
  (via addn-hosts), see new select box 'DNS Variant'
* add support for 'DNS File Reset', where the final DNS blockfile
  will be purged after DNS backend loading (save storage space)
* Provide additional Runtime information:
  'DNS Variant' and 'Backup Directory'
* add E-Mail notification options to LuCI

Signed-off-by: Dirk Brenken <dev@brenken.org>
2019-08-15 11:36:48 +02:00
Paul Dee
59718ab14d English grammar fix
Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
2019-07-17 21:39:00 +02:00
Jo-Philipp Wich
eda8f02dac treewide: avoid double-escaping CBI section labels
Since the section labels are already HTML-escaped implicitely by the
striptags() function, we must not escape them again in attr() or
ifattr().

Fixes: #2524
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-02-12 08:32:02 +01:00
Dirk Brenken
09ea2573ff luci-app-adblock: small controller changes
- show 'DNS Query Report' tab only when tcpdump was found
- remove needless Turris Omnia logread workaround, due to changes in
latest syslog-ng package

Signed-off-by: Dirk Brenken <dev@brenken.org>
2019-02-02 08:47:40 +01:00
Dirk Brenken
f6ff32c40d luci-app-adblock: sync with release 3.6.3
* the DNS Report now displays the hostname, MAC-Address or
  client IP (CLI & LuCI)
* Filter the DNS Query result set for a particular domain, client or
  time frame (CLI & LuCI)
* remove needless XHR.Poll-Events from Reporting page in LuCI
* remove needless 'force sort' option in LuCI

Signed-off-by: Dirk Brenken <dev@brenken.org>
2019-01-14 16:02:46 +01:00
Dirk Brenken
c0a2421afb luci-app-adblock: sync with release 3.6.1
* support new reporting options
* small fixes

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-12-27 06:51:21 +01:00
Dirk Brenken
0299b13292 luci-app-adblock: minor fixes
* use new XHR default on report page
* fix wrong string.find syntax

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-12-22 18:37:45 +01:00
Florian Eckert
121e7fea66 luci-app-*: use default poll interval
Replace all XHR poll time number with -1 so they will use the default
poll interval time value from "/etc/config/luci". If this is not set then
5 seconds as default is used.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-12-20 10:20:23 +01:00
Dirk Brenken
87ec92d1ed luci-app-adblock: sync with release 3.6.0
* add adblock dns query reporting via tcpdump (see readme for details)
* fix tld compression on low memory systems (< 64 MB)
* fix various small issues

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-12-20 08:45:35 +01:00
Dirk Brenken
5dd93edefa luci-app-adblock: adapt latest css changes
Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-11-16 08:56:32 +01:00
Dirk Brenken
253f912f17 luci-app-adblock: consolidate css
* fix IE Edge rendering issues
* merge external styles in central css

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-11-14 10:45:18 +01:00
Andrei Troie
ddaac101a5 luci-app-adblock: use placeholder in query tool
Use the placeholder property on the textbox in the query tool so it's more convenient.

Signed-off-by: Andrei Troie <andreitroie90@gmail.com>
2018-09-07 23:59:20 +01:00
Dirk Brenken
4e56083833 luci-app-adblock: sync with adblock 3.5.5
* fix cornercase issues in runtime information/json parsing

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-09-01 08:42:00 +02:00
Dirk Brenken
b8f8394681 luci-app-adblock: "final" fixes
during intense testing with different browsers (Chrome/Firefox/partly IE
in a VM) I found & fixed some more minor things:

* remove needless hook & include from overview page
* fix possible JS error in Runtime Information
* Align CSS color with "LuCI standard"

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-07-31 09:21:44 +02:00
Dirk Brenken
b7ed444cbb luci-app-adblock: small fixes
* fix possible controller error during json parsing
* remaining code cleanup

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-07-28 17:30:18 +02:00
Dirk Brenken
771672ff7a luci-app-adblock: small visual fixes
* made readonly textarea (logview) scrollable again (bootstrap theme)
* align "Query" input button

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-07-25 21:39:22 +02:00
Dirk Brenken
8d7ebf0572 luci-app-adblock: fix translations
* fix runtime & button translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-07-22 22:28:26 +02:00
Dirk Brenken
5db2b76497 luci-app-adblock: sync with adblock 3.5.4
backend:
* add low priority mode (nice level 10), disabled by default
* enhance 'Force DNS' to redirect ports 53, 853 and 5353

frontend:
* switch to dynamic XHR polling for runtime information and logfile
viewing
* add new 'Refresh' button to reload blocklists
* various cleanups & small fixes

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-07-22 08:58:33 +02:00
Jo-Philipp Wich
994531ea26 luci-app-adblock: align blocklist markup with recent changes
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-07-09 11:51:43 +02:00
Jo-Philipp Wich
c0de036b31 treewide: always include cbi.js
Include cbi.js in the main header template like it is done for xhr.js and
remove the page specific includes.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-07-09 11:51:43 +02:00
Dirk Brenken
45c2059c15 luci-app-adblock: partly revert last commit
* use now CSS for non breaking spaces in div table header

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-06-08 09:34:47 +02:00
Dirk Brenken
a561d3045c luci-app-adblock: sync with adblock 3.5.3
* small fixes & cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-06-07 21:14:06 +02:00
Jo-Philipp Wich
067d7dc9f7 treewide: convert HTML tables to div
Mostly convert HTML tables to div based markup to allow for easier styling
in the future. Also change JS accessor code accordingly.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-05-28 15:18:45 +02:00
Dirk Brenken
840f45ecc5 luci-app-adblock: respect SimpleForm size limit
* respect SimpleForm size limit of 100KB for advanced online editing

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-05-18 18:19:41 +02:00
Dirk Brenken
55f251b01f luci-app-adblock: sync with adblock 3.5.2
* archive sub-categories (shalla & ut_capitole) are now configurable
  via LuCI CBI template
* small bugfixes & enhancements

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-05-15 08:00:02 +02:00
Dirk Brenken
3aae6ce82e luci-app-adblock: support new workflow
* adapt Adblock to support the new cbi apply workflow
* tested successfully with old & new workflow

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-05-09 13:35:49 +02:00
Jo-Philipp Wich
72b973b258 luci-app-adblock: fix SimpleForm page delegation
Invoke the SimpleForm models using the form() action, not the cbi() ones.
This avoids the extraneous rendering of the cbi header template, avoiding
rejected save operations due to duplicated token value.

Fixes #1722.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-04-05 19:21:50 +02:00
Jo-Philipp Wich
c0d9c4f3ce treewide: filter shell arguments through shellquote() where applicable
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-04-05 09:37:43 +02:00
Dirk Brenken
ab30c8365f luci-app-adblock: remaining fixes
* missed in the last (untested) commit - sorry.

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-03-16 12:59:53 +01:00
Dirk Brenken
b2cc7bf276 luci-app-adblock: fix function calls
* fix function calls that have an implicit extra parameter self,
  pre-requisite for PR #1681

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-03-15 20:25:30 +01:00
Dirk Brenken
b1c5a4c075 luci-app-adblock: fix frontend typo
fix trivial 'msmtp' typo & changed .po files as well

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-02-27 10:20:56 +01:00
Dirk Brenken
71230d2b70 luci-app-adblock: fix XHMTL Markup
Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-02-03 11:25:34 +01:00
Dirk Brenken
47e0990eac luci-app-adblock: sync with adblock 3.5.0
* Support new 'Download Queue'
* Support new 'Jail' Blocklist Creation
  (replace former 'Whitelist Mode')
* Fix field width in "Runtime Information" section

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-01-31 13:09:55 +01:00
Dirk Brenken
054935ab7c luci-app-adblock: sync with adblock 3.4.3
* add 'Download Utility' select box
* add new "running" status
* small visual fixes

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-01-10 19:35:39 +01:00
Dirk Brenken
931531310e luci-app-adblock: sync with adblock 3.4.1
* refine logfile search term
* textarea 'autoscroll down' in logfile view
* left-align blocklist source table plus a more compact design

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-01-05 18:56:39 +01:00
Dirk Brenken
033e903097 luci-app-adblock: sync with adblock 3.4.0
* add new extra options (disabled by default):
  - Flush DNS Cache
  - Email Notification
  - Email Notification Count

Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-12-27 17:41:28 +01:00
Dirk Brenken
dce8ae85ff luci-app-adblock: fix minor visual issue
* fix visual issue in runtime section (originally provided by @ansuel)

Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-12-04 22:26:18 +01:00
Dirk Brenken
b02a13ea77 luci-app-adblock: sync with adblock 3.1.0
* add support for new 'whitelist mode'
* fix a small css issue in advanced edit tabs

Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-11-04 14:13:22 +01:00
INAGAKI Hiroshi
e1e5509c92 luci-app-adblock: Fix LuCI i18n-tools detection issues
LuCI i18n-tools cannot interpret variables, so translations on that are
not applied in po/pot by i18n-tools.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-09-11 22:08:37 +09:00
Dirk Brenken
f46f3e5124 luci-app-adblock: sync with adblock 3.0.0
Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-09-09 21:09:28 +02:00
Dirk Brenken
0f13f7eb81 luci-app-adblock: sync with adblock 2.8.5
* add preliminary kresd support
* small fixes

Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-08-04 11:12:03 +02:00
Dirk Brenken
985f0f5118 luci-app-adblock: bugfix
* fix nil error on overview page

Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-07-05 21:31:56 +02:00
Dirk Brenken
3c5e41d369 luci-app-adblock: sync with adblock 2.8.1
* add bind support

Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-06-29 12:58:33 +02:00
Dirk Brenken
bd482566f4 luci-app-adblock: sync with adblock 2.7.1
* "Save & Reply" now distinguish between normal and manual/backup mode
  and triggers an appropriate reload or a start action

Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-06-09 20:18:23 +02:00