4791 Commits

Author SHA1 Message Date
Florian Eckert
5e1356fe51 luci-app-acl: unset read and write before acl set
If the setting in the view is set to `denied`, only the read list option
is deleted. This is not correct. The write list option must also be
deleted. To ensure that the correct configuration is saved, the write
and read list options are always deleted beforehand and then rewritten.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit f4e8fcb6b53780bd2d126b22a89c379cd7c071d7)
2021-07-07 17:18:03 +02:00
Jo-Philipp Wich
2b87ea0fc2 luci-app-acl: ensure to set read/write ACL presets as uci lists
The rpcd daemon expects uci list notation for the login.read and login.write
options, so ensure to set them accordingly when chosing the `full access` or
`readonly` presets while configuring an account.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9922c838cd1abcda60f4e93b89b0c52a101fc667)
2021-07-07 17:17:13 +02:00
Dirk Brenken
d9430378f9 luci-app-openvpn: create base directory if not available
* trivial fix for never ending ticket #3454

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit b6f36ca91b74e708cb8866a0299923dab3f5343b)
2021-07-07 17:17:02 +02:00
Paul Spooren
a56934fb0f luci-app-attendedsysupgrade: fix typo
Suggested-by: Jo-Philipp Wich <jo@mein.io>
Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit cef330a1c8b59b0b84bb862b8d04b56892be3803)
2021-07-06 17:46:42 -10:00
Dirk Brenken
7d5318b9ae
luci-app-adblock: sync with latest version
* expose new reporting option to LuCI
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 83778c145281eb128a4acf23defda07003dfdc98)
2021-07-01 06:41:37 +02:00
SiYao Mo
ad08c8e912 luci-app-frpc/frps:add service status display
reference from luci-app-smartdns
Special thanks to Nick Peng <pymumu@gmail.com>

Signed-off-by: SiYao Mo <msylgj@vip.qq.com>
2021-06-24 18:01:54 +08:00
Siyao Mo
1878aab778 luci-app-frpc: allow hostname in server address
Sometimes, our frp server cannot use a static ip address.
So perhaps we should allow people to use hostname in server address.

Signed-off-by: SiYao Mo <msylgj@vip.qq.com>
2021-06-24 00:18:59 +08:00
Florian Eckert
891eff7f1c luci-app-nlbwmon: i18n sync translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-06-21 13:53:18 +02:00
Florian Eckert
71def4a101 luci-app-watchcat: i18n sync translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-06-21 13:52:50 +02:00
Florian Eckert
abc50bd1ae luci-app-banip: i18n sync translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-06-21 13:52:28 +02:00
Florian Eckert
d35a1a7866 luci-app-adblock: i18n sync translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-06-21 13:52:12 +02:00
Florian Eckert
b1567baf0c luci-app-nlbwmon: show force reload button even if data are available
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit a7be13ff05cc35352a02ad7c36acd704a037e37f)
2021-06-21 12:03:31 +02:00
Florian Eckert
dbb2cb9523 luci-app-nlbwmon: adjused the display export page
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 04c4499be74152c476ca1edfd6b8048252a55251)
2021-06-21 12:03:06 +02:00
Florian Eckert
5cdce5d96a luci-app-nlbwmon: change force reload html element to button
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit d6443a629362f7ed79d1212cd964e5d6a127a9c0)
2021-06-21 12:03:06 +02:00
Florian Eckert
4ab591a24d luci-app-nlbwmon: add missing cbi-button class for database backup
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 6f6ec9f56cc24be9f432b0a88a29f46277dad7d5)
2021-06-21 12:03:06 +02:00
Florian Eckert
ec2712335a luci-app-nlbwmon: fix url
When moving this application to the service section, the links were
forgotten to be changed.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 7a365183296f385bb8cb14b8eb6fcfc29941c7e4)
2021-06-21 12:03:06 +02:00
Florian Eckert
eee3d4bef4 luci-app-nlbwmon: move into menu entry into service section
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 9e91737566cc6101b4bf37107c6d945842f06bb8)
2021-06-21 12:03:06 +02:00
Jo-Philipp Wich
d365470f66 luco-app-ksmbd, luci-app-omcproxy: use relative luci.mk include path
Fixes: #5134
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 2f0ffd9d82b1e41d64e4d63088086f4956010840)
2021-06-18 14:29:20 +02:00
Jo-Philipp Wich
199533a08e treewide: resync and merge master translations
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2021-06-15 10:06:26 +02:00
Dirk Brenken
467b8535ae
luci-app-banip: sync with banip 0.7.9
* support the new 'ban_fetchinsecure' option
* improve the chain help text to make clear that you can assign
  multiple FW chains

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 770548eadf21ea4c18c57b5e4ee68bf7dfa184fd)
2021-06-14 06:42:32 +02:00
Dirk Brenken
4c8ab04dcc
luci-app-adblock: sync with adblock 4.1.3
* support the new 'adb_fetchinsecure' option

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit be578c64e97d138e7104dfa7025eb9ab998b3b07)
2021-06-14 06:40:40 +02:00
Jo-Philipp Wich
c7ee2c1141 treewide: resync and merge master translations
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2021-06-12 20:01:58 +02:00
Jo-Philipp Wich
9660eedfda luci-app-firewall: further luci-rpc/getHostHints compatibility fixes
Rework some further code instances to fall back to the legacy ipv4/ipv6
properties if needed.

Fixes: c7b7b42cd3 ("treewide: Update JS using luci-rpc getHostHints")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit dc0cfc642e42eefcac91bb965f9aa612089fad5d)
2021-06-12 19:23:46 +02:00
Niels Widger
7d7df070c3 treewide: Update JS using luci-rpc getHostHints
Update frontend JS code which uses luci-rpc getHostHints to support the new
response format which removes the `ipv4` and `ipv6` host hint string fields
and replaces them with `ipaddrs` and `ip6addrs` weighted string list fields.

Signed-off-by: Niels Widger <niels@qacafe.com>
[rework code to be forwards/backwards compatible, fix some Network.Hosts
 methods, fix IP choice ordering, change commit subject, rewrap commit
 message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit c7b7b42cd3840cfd67f412191578a8659eb63c87)
2021-06-12 19:23:28 +02:00
Anderson McKinley
54b2195dcf luci-app-statistics: fix read of hostname
Existing javascript did not read a non-default statistics hostname due to
incorrect config ids.

Signed-off-by: Anderson McKinley <coyoso@tuta.io>
(cherry picked from commit 97424d57af1d0e02ea914012c47987541d7ee6a6)
2021-06-12 19:22:46 +02:00
Jo-Philipp Wich
66808a9d4c luci-app-firewall: simplify some form actions
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit bbf1a5343f1d930096cd5ff6b98f3e1f2f0d3c9a)
2021-06-12 19:20:04 +02:00
Huang-Huang Bao
39280c3703 luci-app-frpc: correct prop name 'subdomain'
Signed-off-by: Huang-Huang Bao <eh5@sokka.cn>
(cherry picked from commit de9f21cb8c8c056566d3390c93bd72aef9efde7a)
2021-06-12 19:19:03 +02:00
Stan Grishin
d29a460260 luci-app-vpn-policy-routing: support for 21.02.0-rc2
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-06-10 05:47:50 +00:00
Hannu Nyman
aaac84602d treewide: i18n - Backport translations
Backport translations from master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2021-06-08 20:07:21 +03:00
Hannu Nyman
74e04dde74 treewide: i18n - backport translations from master
Backport translations from master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2021-06-01 08:22:44 +03:00
Jo-Philipp Wich
81f41819a5 luci-app-samba4: prevent calling split() on array or null values
Since `uci.get()` may return null or array values, we cannot blindly call
split() on the result. Use the safe `L.toArray()` helper which is intended
to deal with such situations.

Also clean up whitespace while we're at.

Fixes: #5080
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit c4cdfcbe5121d5959dac1e18ed11b8611a86fb9e)
2021-05-31 11:27:48 +02:00
Hannu Nyman
d851570070 treewide: backport i18n translations from master
Backport translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2021-05-26 19:11:37 +03:00
Liangbin Lian
19de3acdde luci-app-samba4: support listen on multiple interfaces
/etc/init.d/samba4 already support that

Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
(cherry picked from commit 169ab9979eee780758256c2859f7c2ee86a0b0ae)
2021-05-25 20:04:30 +03:00
Hannu Nyman
53c572ac9b treewide: i18n - Backport translations
Backport translations from master and sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2021-05-16 20:52:12 +03:00
Hannu Nyman
766e8f8cbf treewide: backport translations i18n
Backport translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2021-05-08 17:05:54 +03:00
Paul Spooren
56c323505b luci-app-attendedsysupgrade: fix branch detection
The running branch determines which upgrades are suggested. A jump to a
newer branch (e.g. 19.07.8 to 21.02.1) is only suggested if the advanced
mode is enable, since it may break the router.

OpenWrt versions end in either `-SNAPSHOT`, `.X-rcY` or `.x`. All these
suffixes are removed, resulting in the branch name.

Previously the `-SNAPSHOT` suffix wasn't removed resulting in wrong
branch names.

Also clean up some log spam.

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit 85e9ee31239c4e912613005f4c222f13c34e9a36)
2021-05-07 03:45:32 -10:00
Paul Spooren
29d3ed290c luci-app-attendedsysupgrade: hide branch update
Branch updates (e.g. 19.07 to 21.02) are risky and shouldn't be
suggested by default. Hide those unless the advanced mode is enabled.

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit 9184721fab65934fe016c132a8f11a2308742f92)
2021-05-07 03:45:32 -10:00
Florian Eckert
424d11381b luci-app-mwan3: i18n sync translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-05-06 12:27:00 +02:00
Florian Eckert
0ddb72dec2 luci-app-mwan3: fix css status with
This commit fixes the width of the mwan3 status page for the
openwrt-2020 theme.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 6fa40fffcaa6015633e1e7426ff1f0bae61597c9)
2021-05-06 12:23:21 +02:00
Florian Eckert
ea334e254e luci-app-mwan3: add i18n to status page
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 2b0fbcb0c88fb073745ec99974c12f363b771ac2)
2021-05-06 12:23:12 +02:00
Florian Eckert
d31345fc77 luci-app-mwan3: update status page for no tracked interfaces
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 4fee871630dec3b6bfbfb6dadc1580f0e3edf830)
2021-05-06 12:23:04 +02:00
Florian Eckert
9dc93d5d2f treewide: i18n sync translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-05-04 09:16:04 +02:00
Dirk Brenken
11cfd83648
luci-app-banip: switch IP query provider
* switch to IPWHOIS.IO for IP report queries, the IP geolocation API is
  more accurate & faster

Signed-off-by: Dirk Brenken <dev@brenken.org>
2021-05-02 22:11:25 +02:00
Dirk Brenken
0eb4e0911a
luci-app-travelmate: typo fix
* typo fix & sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
2021-05-01 11:11:32 +02:00
Paul Spooren
33aa61ff25 luci-app-attendedsysupgrade: add target in reuqest
The updated ASU api requires `target` within reuqests since the
`profile` or `board_name` is never truely unique. This is especially a
problem for x86 devices which mostly use `generic` as profile name.

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit c6b4d4ab5a2c57889bcf14fafac17e73d22205c6)
2021-04-28 01:31:04 -10:00
Hannu Nyman
a27b10dd36 treewide: i18n - backport translations from master
Backport translations from master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2021-04-27 23:31:27 +03:00
Jo-Philipp Wich
9344026efd luci-app-statistics: treat APC UPS "host" setting as single value option
Existing Lua code incorrectly stated that the "Host" option takes a space
sparated list of hostnames which is not the case since the collect plugin
does not handle multiple hosts.

This change reverts the configuration to a simple value as proposed by
the original PR and adjusts the config summary accordingly, while retaining
the translation string.

Ref: https://github.com/openwrt/luci/pull/5010#issuecomment-827285319
Fixes: dd5d96afd ("luci-app-statistics: fix APC UPS host configuration")
Fixes: e7d22dce5 ("luci-app-statistics: convert collectd configuration to client side views")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 8816c8fff7e8e30f19e85c0f1c7f70b6914be701)
2021-04-27 10:18:14 +02:00
Jo-Philipp Wich
a6efaee0dc luci-app-statistics: fix APC UPS host configuration
Ensure that list of hosts is stored as space separated list, like it was
done in the previous Lua implementation.

Fixes: #5010
Fixes: e7d22dce5 ("luci-app-statistics: convert collectd configuration to client side views")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit dd5d96afdba698e11d12880f4adf28e24a140305)
2021-04-26 17:41:19 +02:00
Dirk Brenken
bbc677096d
luci-app-banip: sync with banIP 0.7.7
* support the new 'Whitelist Only' mode
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
2021-04-22 06:04:22 +02:00
Florian Eckert
a7845594f5 luci-app-dockerman: Carelessness fixed during branch rebasing
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit c4f3ac05288ba148fcd5c0222f34f393dbec57a2)
2021-04-21 23:00:29 +02:00