summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-adblock/luasrc
AgeCommit message (Collapse)Author
2019-07-17English grammar fixPaul Dee
Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
2019-02-12treewide: avoid double-escaping CBI section labelsJo-Philipp Wich
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-02luci-app-adblock: small controller changesDirk Brenken
- 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-01-14luci-app-adblock: sync with release 3.6.3Dirk Brenken
* 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>
2018-12-27luci-app-adblock: sync with release 3.6.1Dirk Brenken
* support new reporting options * small fixes Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-12-22luci-app-adblock: minor fixesDirk Brenken
* use new XHR default on report page * fix wrong string.find syntax Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-12-20luci-app-*: use default poll intervalFlorian Eckert
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-20luci-app-adblock: sync with release 3.6.0Dirk Brenken
* 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-11-16luci-app-adblock: adapt latest css changesDirk Brenken
Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-11-14luci-app-adblock: consolidate cssDirk Brenken
* fix IE Edge rendering issues * merge external styles in central css Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-09-07luci-app-adblock: use placeholder in query toolAndrei Troie
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-01luci-app-adblock: sync with adblock 3.5.5Dirk Brenken
* fix cornercase issues in runtime information/json parsing Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-07-31luci-app-adblock: "final" fixesDirk Brenken
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-28luci-app-adblock: small fixesDirk Brenken
* fix possible controller error during json parsing * remaining code cleanup Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-07-25luci-app-adblock: small visual fixesDirk Brenken
* made readonly textarea (logview) scrollable again (bootstrap theme) * align "Query" input button Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-07-22luci-app-adblock: fix translationsDirk Brenken
* fix runtime & button translations Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-07-22luci-app-adblock: sync with adblock 3.5.4Dirk Brenken
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-09luci-app-adblock: align blocklist markup with recent changesJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-07-09treewide: always include cbi.jsJo-Philipp Wich
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-06-08luci-app-adblock: partly revert last commitDirk Brenken
* use now CSS for non breaking spaces in div table header Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-06-07luci-app-adblock: sync with adblock 3.5.3Dirk Brenken
* small fixes & cosmetics Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-05-28treewide: convert HTML tables to divJo-Philipp Wich
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-18luci-app-adblock: respect SimpleForm size limitDirk Brenken
* respect SimpleForm size limit of 100KB for advanced online editing Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-05-15luci-app-adblock: sync with adblock 3.5.2Dirk Brenken
* 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-09luci-app-adblock: support new workflowDirk Brenken
* adapt Adblock to support the new cbi apply workflow * tested successfully with old & new workflow Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-04-05luci-app-adblock: fix SimpleForm page delegationJo-Philipp Wich
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-05treewide: filter shell arguments through shellquote() where applicableJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-03-16luci-app-adblock: remaining fixesDirk Brenken
* missed in the last (untested) commit - sorry. Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-03-15luci-app-adblock: fix function callsDirk Brenken
* fix function calls that have an implicit extra parameter self, pre-requisite for PR #1681 Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-02-27luci-app-adblock: fix frontend typoDirk Brenken
fix trivial 'msmtp' typo & changed .po files as well Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-02-03luci-app-adblock: fix XHMTL MarkupDirk Brenken
Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-01-31luci-app-adblock: sync with adblock 3.5.0Dirk Brenken
* 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-10luci-app-adblock: sync with adblock 3.4.3Dirk Brenken
* add 'Download Utility' select box * add new "running" status * small visual fixes Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-01-05luci-app-adblock: sync with adblock 3.4.1Dirk Brenken
* 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>
2017-12-27luci-app-adblock: sync with adblock 3.4.0Dirk Brenken
* 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-04luci-app-adblock: fix minor visual issueDirk Brenken
* fix visual issue in runtime section (originally provided by @ansuel) Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-11-04luci-app-adblock: sync with adblock 3.1.0Dirk Brenken
* add support for new 'whitelist mode' * fix a small css issue in advanced edit tabs Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-09-11luci-app-adblock: Fix LuCI i18n-tools detection issuesINAGAKI Hiroshi
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-09luci-app-adblock: sync with adblock 3.0.0Dirk Brenken
Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-08-04luci-app-adblock: sync with adblock 2.8.5Dirk Brenken
* add preliminary kresd support * small fixes Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-07-05luci-app-adblock: bugfixDirk Brenken
* fix nil error on overview page Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-06-29luci-app-adblock: sync with adblock 2.8.1Dirk Brenken
* add bind support Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-06-09luci-app-adblock: sync with adblock 2.7.1Dirk Brenken
* "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-07luci-app-adblock: sync with adblock 2.7.0Dirk Brenken
* add new 'Manual mode' option Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-05-09luci-app-adblock: Fix duplicated textINAGAKI Hiroshi
Added text "Input file not found. Please check your configuration." by commit 9b4b1df is duplicated. so I replaced the text with previously existed. Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-05-08luci-app-adblock: sync with adblock 2.6.3Dirk Brenken
* Limit Blacklist/Whitelist Online editing to max. 512 KB, approx. 20.000 domains per list * Automatically refresh the overview page after button onclick event, e.g. 'Suspend/Resume' or 'Save & Apply' * cosmetics Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-04-26luci-app-adblock: fix markupDirk Brenken
Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-04-25luci-app-adblock: sync with 2.6.1Dirk Brenken
* add two new extra options * cosmetics Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-04-17luci-app-adblock: sync with 2.6.0-2Dirk Brenken
* made default trigger delay more conservative to fix possible start up issues * add luci-lib-jsonc dependency Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-04-12luci-app-adblock: sync with adblock 2.6.0Dirk Brenken
* add new trigger timeout input field * the download utility plus SSL Library will be listed in runtime information and the blocklist source table contains an additional "SSL req." column * various small fixes * changed copyright notice Signed-off-by: Dirk Brenken <dev@brenken.org>