luci-base: remove 'dsl' feature flag

This is now unused.

Signed-off-by: Andre Heider <a.heider@gmail.com>
(cherry picked from commit a398ccfde69f66dff0ce439bb1f68a93041e5b91)

luci-mod-status: fix determining DSL modem type

The `network.getDSLModemType()` function returns a promise, so handle it
accordingly.

Fixes: 45ab2cd6be ("luci-mod-status: use network.getDSLModemType()")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit b5f11bf6ee5ceb04c36d9f88ce82386430321741)

luci-mod-status: use network.getDSLModemType()

This matches what luci-mod-network does for the DSL modem configuration.

Since this is based on a common uci config, it may also prevent issues as
fixed with 111c551c "luci-base: fix DSL feature detection" in the future.

Signed-off-by: Andre Heider <a.heider@gmail.com>
(cherry picked from commit 45ab2cd6be0cac32ec49364280bbfa2c43c17eda)

luci-app-dhcp: 'addresses' helptext improvement with info from manpage.

Placeholder hint also reflects syntax.

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
[replace asdf.com with example.com, use … instead of ..., remove uneeded
 &nbsp; entities]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 45f02d94b2c06599fa0d0ab75b7c5cf485ffc2a8)

luci-mod-network: 'mxhosts' tab added

DHCP Help does not document mxhost, but they are available in dnsmasq.

This effectively implements MX records within DNS.

Tested on 22.03.2

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
[fix _() calls, fix commit subject, rebase onto current master]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 3240714ed38556e48c635cd4e2703a45ac6fb45d)

luci-mod-network: 'srvhosts' tab added

DHCP Help does not document srv-host, but they are available in dnsmasq.

This effectively implements SRV records within DNS.

Tested on 22.03.2

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
[fix _() calls, join translation strings on the same line, replace &hellip;
 with …, fix commit subject]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 08a089740af0c9734169f6dc206beec09fe80324)

luci: sort dependencies alphabetically with newline

Improve readability and group related packages together.

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit fc313a59dbc837f32d0c1d291bba054631c91039)

luci-app-example: improve description

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 7b073526a659842d942a3a0e4717ddba3ee6eadb)

luci-app-attendedsysupgrade: Fixed a typo, updated po/pot files

(cherry picked from commit 18bfccac9d67028345b797073297aab478989096)

luci-mod-network: improve description for filterwin2k option

Make it clear that this option also filters some not-so-useless queries.

Signed-off-by: Jan Hoffmann <jan@3e8.eu>
(cherry picked from commit ec4f219b2b26fc3181c0ea62d4364f8f15aac9c5)

luci.mk: refactor install recipe

Detect the presence of directories using Make $(wildcard ...) and emit
plain install commands depending on the outcome instead of relying on
shell conditionals which impose syntax constraints on code outside of
the scope of the LuCI repo.

Fixes: #5936
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 3393e15815f116b33e90b5f58050cfedebe00fe2)

luci-app-dawn: return 0 in case of weird frequency

Sometimes 0 is passed to the frequency. Return 0 in that case.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 88bb5f31c44926170f2ff43adef91877f4af283b)

proper cache control in firefox

Added more meta headers to ensure proper cache control in Firefox.
Before this patch, the `/` url hasn't even been requested when opened in Firefox.

Signed-off-by: Daniel Kucera <daniel.kucera@gmail.com>
(cherry picked from commit 34dd31ae9a63c573646cce9f75ca5edf4bc4e82e)

luci-app-ddns: sort list of services

It makes it much easier to find selected service provider.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 74cf149544010645dd69f3e9029d0a181138a55a)

luci-app-frpc: add plugin options

Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
(backported from commit 175487f054b904383673d85ca95bdccb386919c1)

luci-app-frpc: show remote port

Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
(cherry picked from commit a185562836408ff38dcd0a48f076831424903ba1)

luci-app-frpc: fix local_ip datatype

Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
(cherry picked from commit 1ab4ce1a5e12afbecf1ed74c49ee91c8a049ca0b)

luci-proto-openfortivpn: Correct server certificate SHA label

According to the documentation[1], the SHA256 hash is used for the
trusted-cert option, not SHA1.

[1] https://github.com/adrienverge/openfortivpn/blob/master/doc/openfortivpn.1.in

Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
(cherry picked from commit 57936a40c32937d4bedfa6344868668af687bcc5)

luci-proto-openfortivpn: add persistent reconnect option

Add ability to specify persistent reconnection interval.

Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
(cherry picked from commit c084570d063fd64db6f8a42a0b1d5270d8831d83)

luci-proto-openfortivpn: add user, key, CA PEM support

Add PEM inputs and file handling for user cert, key and CA cert. This
handling is largely based upon that used in luci-proto-openconnect.

Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
(cherry picked from commit 1f01a661c9e39da4e2fcf2a77cbd2bfeb3d0bc93)

luci-compat: fix common cbi-page-actions position

With legacy applications, the common page actions "Save and Apply" are
not displayed correctly, so that they are not aligned on the right as
with javascript applications. To fix the alignment, the control-group
css class is removed.

This was determined with the application 'luci-app-nft-qos'
with the theme 'luci-theme-bootstrap'.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit a70c5705e476cf1325edceab29c15148c289f280)

luci-app-opkg: fix bottom pager

Fixes: #6007, #6156
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit ec3aac47c43d44d170af6a09d31493c2e8efe590)

luci-app-opkg: various improvements

 - Add additional filter option to hide translation packages
 - Add pager to top and bottom of package list (fixes #5671)
 - Add option to automatically install related translations along with
   LuCI packages
 - Add option to automatically install translations for all installed
   LuCI packages when installing a new language base package

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit ac47bc9dd7bff9f415ffa13a1b02892ca3f4453f)

luci-app-apinger: Add LuCI for Apinger

LuCI Support for Apinger

Signed-off-by: Jaymin Patel <jem.patel@gmail.com>
(cherry picked from commit 6c151fcddbabc0fcdd9de8c5088153e84f5b0ccd)

luci-mod-dashboard: show IPv6 connection uptime

Show connection uptime for both IPv4 & IPv6 interfaces.
Rename display field from 'Connected since' to 'Uptime' as this makes
more sense to me.  You could say 'Connected for' or 'Connection
duration'.  After a lot of thought decided that 'Uptime' is what I'm
most comfortable saying.

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit e96c1f31db4857fe58dbc8f777a5a5ebf8f48591)

luci-proto-ncm: adds missing error messages, removes 'dialnumber' option, changes 'delay' according to real behavior
This commit:
Adds missing error messages and harmonizes message texts with comgt-ncm script. [1]
Removes option 'dialnumber' not used in comgt-ncm. [1][2]
Fixes option 'delay' according to comgt-ncm script real behavior. (No default value, if parameter is set, then there's always sleep) [1]

[1] https://github.com/openwrt/openwrt/blob/master/package/network/utils/comgt/files/ncm.sh
[2] https://github.com/openwrt/openwrt/blob/master/package/network/utils/comgt/files/ncm.json

Signed-off-by: Anari Jalakas <anari.jalakas@gmail.com>
(cherry picked from commit 049d876bc14a1282089701acfa007c63fe6f99d8)

luci-mod-network: ensure consistent bridge port and network interface order

Ref: #5899
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 801d4513b25117de20706695dda715ff34c9355b)

luci-mod-dashboard: improve label's display

Removing overflow and position, adding padding and increasing font size for the label.

Signed-off-by: Santiago Kozak <santikzk1406@gmail.com>
(cherry picked from commit df8b5f4e381961707efd50d60390a43639584992)

luci-appnft-qos: add missing translation wrapper

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit d3a6ba9d55ccfb83e30abc350735fca1e308c6e3)

luci-mod-network: fix sort operations

Ensure to return [-1, 0, 1] from the sort callback instead of [0, 1]
which fails in non-FF browsers.

Fixes: #5859
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 3a6f37f9df68c4055f9adc792e0fd4c5a1a1bf66)

luci-app-mwan3: fix i18n plural warning

Updating applications/luci-app-mwan3/po/templates/mwan3.pot ...
xgettext: warning: msgid '%d second' is used without plural and with
plural.
  standard input:175: Here is the occurrence without plural.
  standard input:170: Here is the occurrence with plural.
Workaround: If the msgid is a sentence, change the wording of the
sentence; otherwise, use contexts for disambiguation.
xgettext: warning: msgid '%d second' is used without plural and with
plural.
  standard input:191: Here is the occurrence without plural.
  standard input:170: Here is the occurrence with plural.
Workaround: If the msgid is a sentence, change the wording of the
sentence; otherwise, use contexts for disambiguation.
xgettext: warning: msgid '%d second' is used without plural and with
plural.
  standard input:213: Here is the occurrence without plural.
  standard input:170: Here is the occurrence with plural.
Workaround: If the msgid is a sentence, change the wording of the
sentence; otherwise, use contexts for disambiguation.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 675a0eae5661bd207c3e818b3c1d8fa4d2577c5b)

luci-app-bmx7: optimized images filesizes

Wifi icons optimized without any quality degradation. Bmx7logo filesize rediced from 5121 to 3318 bytes, visually looks the same, technically the image is 99.9% identical.

Signed-off-by: Alexander Semukhin <semukhin@mail.com>
(cherry picked from commit 09f7278d8872a5052437cc4c4bdc53dd9f84ace2)

luci-theme-openwrt: optimized image filesize

Optimized PNG filesize from 152 to 80 bytes without any quality loss.

Signed-off-by: Alexander Semukhin <semukhin@mail.com>
(cherry picked from commit 5a3cc88a67948b3ee278b2ca858134bf0ade791d)

luci-theme-bootstrap: optimized favicon filesize

Optimized PNG filesize from 733 to 592 bytes without any quality loss.

Signed-off-by: Alexander Semukhin <semukhin@mail.com>
(cherry picked from commit d4c4afeabc3281bbe1ded40d02c5341ae85b6847)

luci-mod-network: interfaces.js: remove references to original MAC/MTU

Do not show the original values for MAC and MTU in device list tooltips
anymore as the values we read from the netdev might already stem from
overridden config settings.

Since there's no generic way to acquire that information, remove the
potentially confusing information.

Fixes: #5820
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 34813ff2b6b898cf4adb4a20df606261413d9afa)

luci-theme-bootstrap: various style tweaks

 - Make control-group containers flex and ensure proper spacing between
   elements, fixes e.g. unwanted break for reveal/hide password button
   on narrow mobile views

 - Decrease top margin of modal popups

 - Fix displaying cell titles on mobile wrapped table rows

 - Tune mobile flex table styles

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit c19020b2a4236945c1ad4a699ebb761a5dd7dc1f)

luci-app-mosquitto: add option 'allow anonymous'

Add missed option 'allow anonymous' in mosquitto section.

Signed-off-by: Ptilopsis Leucotis <PtilopsisLeucotis@yandex.com>
(cherry picked from commit 4e3d6c15640aad5df6280a619a3fa808595b903d)

luci-app-tinyproxy: fix description of ConnectPort option

Fixes: #803
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit eadf07b5299a450c43bc4162f891d5c95b629e8a)

luci-app-https-dns-proxy: remove redundant cbi-value-field div

The redundant "cbi-value-field" div introduces uneeded margin, remove this
element to fix the view layout.

Suggested-by: Santiago Kozak <arbolitoloco1@protonmail.com>
[reword commit message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 6b3bba36d1381d0cd72e77f096b7f6892fd3314f)

luci-lib-httpprotoutils: add airplay mime types

Airplay of a statically hosted video file from one Apple device to another
fails due to unrecognized content-type. Adding Airplay supported
mime types fixes the issue.

Signed-off-by: Sasha Andonov <s.andonnov@gmail.com>
(cherry picked from commit e776759549fba3e69727a0402e39d7c8d13118fd)

luci-mod-status: nftables add counter and comment for empty match

Signed-off-by: Ingo Heinrich <ingo-github@goheinrich.de>
(cherry picked from commit 8c7c56f4e415a3b80bf91c98aa02a638111bef51)

luci-proto-wireguard: use ddns lookup_host for peer hints

The `domain` option of a DDNS service entry may contain non-hostname values,
use the `lookup_hostname` option instead.

Fixes: #6289
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 59a6f062d29ee7a400e9cb0477e0e55eb674208a)

lucihttp: update to latest Git HEAD

9b5b683 multipart-parser: properly handle parts with trailing CR

Fixes: #6282
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 0f6e1663ca0370ab3f8ca3927a9d0a37b015d0f4)

luci-app-statistics: add watt-ups for nut and skip unsupported values

Only render NUT charts for actually available data and add a chart
definition for `watt-ups` values while we're at it.

Ref: https://forum.openwrt.org/t/x/156246
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit dd1111407d8f0b1f7f761c5ebbe6ae43a268a4a4)

treewide: Backport translations and sync

Backport from master and sync translations

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-app-banip: sync with banIP 0.8.2-5

* made some missing text pieces translatable
* change banip.feeds permission

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 0c67d74fd39ca52e58432eeb1f58480fca381915)
Signed-off-by: Dirk Brenken <dev@brenken.org>

luci-theme-material: add again No password set hint

This was accidentally deleted with commit:
bec2c7e2b50e062575f3649ccd76b81af41b9820

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

luci-app-banip: sync with banIP 0.8.2-4

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit df9549e6bdf0c0d33e468765167c5e15338abcb1)
Signed-off-by: Dirk Brenken <dev@brenken.org>

treewide: Backport translations, sync

Sync and backport translations from master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

Merge pull request #6299 from dibdot/banIP

luci-app-banip: backport to 22.03

luci-app-banip: backport to 22.03

Signed-off-by: Dirk Brenken <dev@brenken.org>

Merge pull request #6294 from nemesisdesign/openwrt-22.03

[22.03] luci-app-openwisp: improved schema for usability

luci-app-openwisp: improved schema for usability

Without these changes, saving the form of luci-app-openwisp without
doing any change generates a configuration which will not work in most cases.

In this patch I took care of providing the right settings to show the default values,
avoid saving default values and show the interface names properly.
With these changes it will be possible for a user to edit just 1 field without
introducing breaking changes.

Signed-off-by: Federico Capoano <f.capoano@openwisp.io>
(cherry picked from commit 8727b1cbc8542e06b0b9db7e41366bbbe19d42f5)

luci-base: dispatcher.lua: prevent XSS through 404 error template

Make sure to escape the user controlled URL passed as part of the error
message into the error404 template in order to avoid XSS.

Reported-by: 40826d <40826d@posteo.de>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

Merge pull request #6227 from liudf0716/xfrpc

[22.03] xfrpc : add xfrpc to 22.03 branch

treewide: Backport translations

Backport translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-app-sqm: Move verbose descriptions into help text

The field labels contain verbose descriptions which looks terrible in the
UI. Replace them with short labels and move the verbose text into the help
text where it belongs.

Reported by Github user @saldry at https://github.com/openwrt/luci/issues/6161

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
(cherry picked from commit 127c9002e6e6898631928f66774575c25b05f536)

treewide: Backport translations

Backport from master.
(fix bad translation in applications/luci-app-https-dns-proxy/po/es/https-dns-proxy.po)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

treewide: Backport and sync translations - i18n

Backport translations from master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

Merge pull request #6261 from stangri/openwrt-22.03-luci-app-pbr

[22.03] luci-app-pbr: bugfixes

luci-app-pbr: bugfixes

* do not remove non-empty custom user files fields
* add provides for vpnbypass and vpn-policy-routing luci apps
  addresses https://github.com/openwrt/luci/pull/6127#pullrequestreview-1311512052

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 0d4b675e7062ddc0d1d2b9be2d0962186239c51b)

Merge pull request #6259 from BKPepe/remove-translations-vpn-policy-routing

[22.03] luci-app-vpn-routing: drop leftover translations

luci-app-vpn-routing: drop leftover translations

The package luci-app-vpn-policy-routing was replaced by luci-app-pbr,
but while doing it, it seems that Makefile of
luci-app-vpn-policy-routing is gone, but the translations are not. Let's
fix it.

Fixes 60ee510924a3818ddee7a19d651de9647fd41723 ("luci-app-pbr: initial
commit")

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>

luci-app-adblock: sync with latest adblock

* removed energized soruce selection
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit b762e772ce317153000a93b6ea4cba51256c8ca7)
Signed-off-by: Dirk Brenken <dev@brenken.org>

Merge pull request #6246 from stangri/openwrt-22.03-luci-app-https-dns-proxy

[22.03] luci-app-https-dns-proxy: update to 2022-10-15-11

luci-app-https-dns-proxy: update to 2022-10-15-11

* Makefile: change dependency from luci-mod-admin-full to luci-base
* Providers: add AdGuard and AdGuard Family
* Bugfix: update field value in CBI, fixes https://github.com/openwrt/luci/issues/6244

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 6ee377fd4b388e7878ab9bcb7e9c47e994578be2)

luci-proto-openconnect: fix server url validation

The OpenConnect configuration form incorrectly assumed that the server
setting must be hostname while it actually may be a full URL.

Fixes: #6184
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit b200e0e90fdfb294cd31870eb32b6b362ded3733)

Revert "luci-proto-openconnect: fix server url validation"

This reverts commit f1312cadc6675fb29d02425775dd8a2a533d7e7c.

The commit contained unrelated changes.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 41e9b8d1219a949a0a3105eabec3774dc97f65c2)

luci-proto-openconnect: fix server url validation

The OpenConnect configuration form incorrectly assumed that the server
setting must be hostname while it actually may be a full URL.

Fixes: #6184
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f1312cadc6675fb29d02425775dd8a2a533d7e7c)

luci-proto-openconnect: Add options proxy server and reconnect timeout support

Signed-off-by: David Bentham <db260179@gmail.com>
(cherry picked from commit 1f25483953dc20e2d8521a1b8f9528420b5b817a)

luci-theme-openwrt-2020: don't inherit background in alert message buttons

Fixes: #6177
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 1597d8e555cfe7444bcbcb44d45caf6954b61b3e)

luci-mod-status: nftables.js: remove unused fwtool require

Fixes: #6203
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit b8f91d53b4b2d5e89928ceca73203e48292ca2b0)

rpcd-mod-luci: fix reporting network device flags

Fix reporting of ceertain flag values larger than 255, such as IFF_PROMISC
by explicitly casting the bit test expression to a boolean result since
the implicit integer truncation to uint8_t will turn the `0x100` result of
a set IFF_PROMISC bit into just `0x0`.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit a570e300061fae7250999c35e4e7215940bca82d)

luci-app-xfrpc: add po template

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 91faed3d62d21af9992fc98a5fe3d5addd47edff)

luci-app-xfrpc: add subdomain to http&https config

Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>
(cherry picked from commit ca9def41a47075209d460e5c599e1cd987242dd6)

luci-app-xfrpc: add luci-app-xfrpc

Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>
(cherry picked from commit 283ac0513f5c84005c5b3b87f243a5b597b0497e)

luci-base: form.js: reuse JSONMap data provider in GridSection modals

Reuse the same data provider as the parent JSONMap instance in order
to avoid inadvertently mangling the form data when saving the modal
edit dialog.

Fixes: bb9ede238a ("luci-base: form.js: reuse JSONMap data provider in GridSection modals")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit dd47f3f6742a6d80221b75aa7b6ea27eca2bb535)

luci-base: form.js: fix GridSection modals in JSONMap instances

Since grid section edit modals construct a new Map instance internally,
we must take care of using the correct map constructor type for the
internal copy in order to end up with the correct data provider.

Ensure that the extended option modal of GridSection instances uses a
JSONMap when the grid section's owner map is a JSONMap to avoid stray
uci related errors.

Ref: https://forum.openwrt.org/t/luci-save-apply/149658/5
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 6fe34990265a02dac20f7b352e4039a90fed45ca)

treewide: Backport translations - sync

Backport translations and sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-app-wireguard: trivial fix to separate a peer's multiple IPs

Attempts to address issue #6003

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit a53fc7711cc067e7fca5f9f5df926ba929569863)

luci-app-dockerman: add minor version

The package has static versioning, based on the original upstream
versioning. Add date as a minor version to signal later changes.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit eda3c14e9fa062bd829d02aebb8b27344a68ac8e)

luci-app-dockerman:  Update to play nice with recent changes

https://github.com/openwrt/luci/commit/180d39dcd2427e3c32c0ec7ecc3c7bfb48c0d0ab broke dockerman's appearance in the menus

Make a small change to dockerman's index entry to make it play nice with the new architecture, firstchild() was obtained using DAWN's controller/dawn.lua as an example

Signed-off-by: Andrew Dodd <atd7@cornell.edu>
(cherry picked from commit 0c1fc7f64566bd5da643eadc6b817bb0f5f591e7)
Fixes #6168

luci-app-nlbwmon: validate date input

Fixes: #6188
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 7c7ac8bf0d9d554d19f5d21226110743899b8802)

luci-app-openvpn: fix potential XSS in pageswitch template

Ensure to escape URL instance parameter displayed in the heading.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 25983b9fa572a640a7ecd077378df2790266cd61)

luci-mod-system: fix potential stored XSS

Make sure to escape the key contents in the delete confirmation dialog.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 0186d7eae0e123a409e9919a83fdfecc7945c984)

Merge pull request #6182 from stangri/openwrt-22.03-luci-app-pbr

[22.03] luci-app-pbr: additional error messages

luci-app-pbr: additional error messages

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit a748f86fec61d7c390ff0f9ee4a007fadfa936f7)

luci-app-statistics: provide defaul minimal scale for some graphs

Avoid cryptic "200m" axis items for really small values by setting
a default minimal y-axis max value for some of the conntrack, cpu,
cpufreq, load and ping graphs (mainly percentages). The axis
automatically scales upward if necessary, so this just provides
a minimal "at least" scale for the y-axis.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit d9e548fe0c619c0935926a1dfe4a8f8b9ff810a2)

luci-app-statistics: Adjust also default_timespan to 2hour

Adjust also default_timespan option to be 2hour, as that change was
forgotten in 4b49b456. (That seems to have no practical relevance, as
LuCI seems to offer the first item from the period list in any case.)

Fixes: 4b49b456 luci-app-statistics: set shortest period data/graph to 2 hours
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 3aedb609cea9df548fe8a21a0b98e3f01a801200)

treewide: Backport translations from master - i18n

Backport translations.
Sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-base: ui.js: support div based table markup in UITable.update()

Constructing UITable instances from existing, div based markup is
supported but the UITable.update() implementation did not account
for that, leading to defunct data updates on tables built from div
based markup.

Fix this issue by extending UITable.update() to consider a div based
table structure as well, like we do in UITable.initFromMarkup() already.

Fixes: #5713
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit deed6827b2eb0b58ee8c1d810a584a9589108eac)

luci-app-natmap: add forward_port option and update stun_server description

Signed-off-by: Richard Yu <yurichard3839@gmail.com>
(cherry picked from commit 1a4ac922829aa8088608374a3bd7445fbf2a6f96)

Merge pull request #6160 from stangri/openwrt-22.03-luci-app-pbr

[22.03] luci-app-pbr: update to 1.0.1-1

luci-app-natmap: add new package

Signed-off-by: Richard Yu <yurichard3839@gmail.com>
(cherry picked from commit cc01c0bffa9030318c39cf493c42c48d22500ec3)

luci-proto-autoip: fix protocol name

Fixes: 2965e527f5 ("luci-proto-autoip: add protocol support for avahi-autoipd")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit ae47caf383c6da53f2345bd225c49b875cb0d514)

luci-proto-autoip: add protocol support for avahi-autoipd

Fixes: #6162
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 2965e527f578abda1dc58dd540343422455be3ac)

luci-app-pbr: update to 1.0.1-1

* add more error/warning messages
* better error/ubus error handling

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 54c3ba32f9a2327ca4fdb9c419fb842108b17894)

luci-base: fix button handling for named sections

If more than one named section is added to the page, it is currently the
case, that the first button is always switched on or off during input
validation of the uci section name. This is because the usage of the
'document.querySelector' function is to imprecise. Changing the search
start to the element to be created, fixes this.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 440a2e79a762b4152ccb7e41c90a2826d9fb3538)

Merge pull request #6143 from stangri/openwrt-22.03-luci-app-pbr

[22.03] luci-app-pbr: Detect missing iptables & error-proofing WebUI

luci-app-pbr: Detect missing iptables & error-proofing WebUI

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit f8cbfa11c6583f298f505b103c73781f6349eba8)