luci-base: ui.js: improve ui.Dropdown event handling

Improve overall event and focus handling, avoid registering a global
mouseover event listener, stop propagating escape keypress on closing
dropdown and avoid `Element.blur()` to prevent de-focusing open modals.

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

luci-mod-network: interfaces.js: avoid stray empty device uci sections

Ensure that just created uci device sections are removed if the edit
option modal is cancelled without saving. This prevents empty, but
harmless `config device` sections from being created on a subsequent
Save & Apply operation.

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

luci-app-firewall: Add clarification to masquerading option

Signed-off-by: Martijn Staal <27222398+mastaal@users.noreply.github.com>
(cherry picked from commit c54efde71718f6a05b7832f5092e7a7da83d22eb)

luci-mod-status: add missing cbi-section class to routing view

With the material theme, there is a gap between the tab view and the
content. The css class 'cbi-section' is missing here in the data-tab div.

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

luci-app-advanced-reboot: add support for Linksys WHW03 v2

Signed-off-by: Vincent Tremblay <vincent@vtremblay.dev>
(cherry picked from commit 10e438fabf755d24a0ed6eade897da52eef8c568)

luci-base: help-text spell fix

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

luci-mod-network: remove uciname validation from wireless interface

Remove the 'uciname' validation rule, as it prevents using '-' that
is a valid character.

Fixes: 0c1be9ae5 luci-mod-network: Add length restriction to wireless
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 8673aef8db90b2ae276b9323f23d078cc68f4189)

luci-mod-network: Add length restriction to wireless interface name

Based on issue #6101, add a maxlength of 15 chars to the wireless
interface's optional name field. Also validate it as uciname.

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

luci-app-xinetd: update redirect help

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

luci-app-xinetd: add processing of redirect option

Signed-off-by: Helge Mader <ma@dev.tdt.de>
(cherry picked from commit 2947b4507302524128569df604e08c03c81c8749)

luci-app-statistics: Generate graphs for humidity sensors

This fixes graph generation for sensors that provide humidity data.

Suggested-by: Jo-Philipp Wich <jo@mein.io>
Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org>
(cherry picked from commit 9f321b831f41b73554819ac54e308dfa3677ab45)

luci-theme-: add postrm script

Remove uci theme config section on uninstall.

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

luci-app-https-dns-proxy: Change files names and replace bootstrap_dns

Signed-off-by: Zuev Aleksandr <A.Zuev@stdev.su>
(cherry picked from commit 1bf53a1b9a0e5178db2be7fc86877b0713f35577)

luci-app-https-dns-proxy: Add new and update adguard dns server

Add adguard unsecured dns provider and update ips on existents based on https://adguard-dns.io/en/public-dns.html info. Also added ipv6 bootstrap_dns ips.

Signed-off-by: Zuev Aleksandr <A.Zuev@stdev.su>
(cherry picked from commit a2fef4a3269e27c695b5e99c3fea776e05fe2da3)

luci-mod-network: disambiguate DHCP IP set help text

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(backported from commit 8414f916bab61b661062bf20c5e1a789893100b4)

luci-mod-network: place wlan roaming related options to a tab

Collectd all WLAN roaming related options to a new dedicated tab.

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

luci-mid-status: nftables.js: minor cleanups and enhancements

 - Recognize `log` expression as action
 - Recognize `meta time` expression
 - Remove debug tooltip from `reject` targets

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

luci-mod-network: (wireless) Expose WPA Enterprise RADIUS VLAN settings.

Tested on: 21.02.1

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

luci-mod-network: improve description for filterwin2k option again

Stop using the word useless both in the name and the description and call
the feature what it actually is (Filter SRV/SOA service discovery).

Signed-off-by: Lukas Tribus <lukas@ltri.eu>
[slightly reword commit message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 8607aa7a6712d6a78e4c8cc1be391fe60b85908c)

luci-app-udpxy: rewritten in JS

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 3aca045ec6173da675184d24d57d971065ce2eaf)

luci-mod-network: fix address validation

Fixes --server validation for:
- /domain[/domain]
- //
- /#/

Fixes hostname validation for:
- *.domain
- *domain

Changes ..domain to be an invalid hostname

Signed-off-by: Kyle Schwarz <zeranoe@gmail.com>
(cherry picked from commit de9341648aba82ebbf4af1843854dffb9e63322e)

luci-mod-network: restrict peerdns option to protocols that implemenent it

Only some supported protocol extensions honour the `peerdns` options.

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

luci-mod-network: DNS - support filtering A or AAAA records

Support Dnsmasq 2.87-5 feature to filter DNS results:
* remove IPv6 AAAA records and return only IPv4 addresses
* remove IPv4 A records and return only IPv6 addresses

Especially the removal of IPv6 AAAA records can be useful with
ISPs that provide IPv6 address resolving but do not actually
offer IPv6 routing/connectivity.

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

luci-mod-network: fix output style of diagnostics commands

Ensure that the output textarea uses a monospace font and preformatted text.

Fixes: 5f2d305476 ("luci-mod-network: convert diagnostic page to LuCI look and feel")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 7c91e62575e31a1e39aa7a99012a76039358657c)

luci-mod-network: convert diagnostic page to LuCI look and feel

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

luci-app-openvpn: add possibility to set param "compress" without algorithm

In some situations you need to set the compress param without an
algorithm. Compression will be turned off, but the packet framing for
compression will still be enabled, allowing a different setting to be
pushed later.

As it is not possible to have options with optional values at the
moment, I've introduced a pseudo value "frames_only" which will be
removed in the init script.

Signed-off-by: Martin Schiller <ms@dev.tdt.de>
(cherry picked from commit f8efd2c347f23f515da996754b05efbabf10b00a)

luci-app-https-dns-proxy: add cn.edu.tsinghua.tuna.dns.lua provider

Signed-off-by: Zhang Rui <rui.crater@gmail.com>
(cherry picked from commit 37a836c0c03d2fb68bebbb9a06ae6a691879e392)

luci-mod-network: fix invalid markup in the relay tab

Fixes: #6107
Fixes: a627744bb5 ("luci-mod-network: 'relay' tab added")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 7c3705bb0f351e1d107c38e21bf7d0480824baa0)

luci-mod-network: 'relay' tab added

Adds LuCI GUI for dnsmasq DHCP 'relays'.

The helper functions in dnsmasq/files/dnsmasq.init limit behaviour
whereby it is not possible to omit server_addr, where to omit
it (dnsmasq supported) would result in a broad- or multicast further on.

Tested on 22.03.2

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

luci-mod-network: remove uppercase for interface name in modal view

Unify the network name display as shown in the overview by removing the
uppercase conversion.

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

luci-mod-network: remove uppercase for interface name on overview page

In the overview page, the name of the interface is converted to
uppercase. However, this is not the name in the configuration. From my
point of view, this makes no sense. The name displayed should correspond
exactly to the name in the configuration.

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

luci.mk: fix compatibility with GNU Make 4.2

GNU Make version 4.2 chokes on `#` characters embedded in variable
substitutions, leading to the following error:

    ../../luci.mk:114: *** unterminated call to function 'if': missing ')'.  Stop.

Avoid this problem by replacing variable substitutions with Git branch
format arguments.

Ref: https://github.com/openwrt/luci/pull/5976#issuecomment-1289935106
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 639e7faa1ad25b0bc2ffd5bfec79c2b9d95a50ee)

luci.mk: adjust path of purged index cache files

The index cache files have been split into separate, dynamically named
Lua and JSON files a while ago, so adjust the remove command in the
postinstall script accordingly.

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

luci.mk: typo and indentation fixes

 - Fix misspelled comment
 - Fix wrong variable in Lua SrcDiet condition
 - Fix wrong indentation

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

luci.mk: rework logic to determine current branch

In case `git branch --remote` yields no result, fall back to `git branch`
without `--remote` since it is possible that the local branch has not
been pushed yet.

Also simplify extraction of the branch name by not passing `--verbose`
and utilizing variable substitutions instead of sed expressions.

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

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