project/luci.git
2 years agoluci-app-commands: use FULL_REQUEST_URI
Jo-Philipp Wich [Wed, 4 Apr 2018 21:32:23 +0000 (23:32 +0200)]
luci-app-commands: use FULL_REQUEST_URI

Switch from using the REQUEST_URI CGI variable directly to the canonicalized
FULL_REQUEST_URI property.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2 years agoluci-base: use FULL_REQUEST_URI on login form templates
Jo-Philipp Wich [Wed, 4 Apr 2018 21:30:49 +0000 (23:30 +0200)]
luci-base: use FULL_REQUEST_URI on login form templates

Switch from using the REQUEST_URI CGI variable directly to the canonicalized
FULL_REQUEST_URI property.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2 years agoluci-base: add FULL_REQUEST_URI template property
Jo-Philipp Wich [Wed, 4 Apr 2018 21:24:31 +0000 (23:24 +0200)]
luci-base: add FULL_REQUEST_URI template property

Introduce a new template property FULL_REQUEST_URI which returns the full
canonicalized request URL built from SCRIPT_NAME, PATH_INFO and QUERY_STRING.

This new property is safer to use compared to using the raw REQUEST_URI CGI
environment variable directly as this value is essentially untrusted user
input which may contain embedded escaped slashes, double forward slashes and
other oddities allowing XSS exploitation or request redirection.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2 years agoluci-mod-admin-full: use strict hostname validation for dhcp hosts
Jo-Philipp Wich [Thu, 22 Mar 2018 08:52:55 +0000 (09:52 +0100)]
luci-mod-admin-full: use strict hostname validation for dhcp hosts

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2 years agoluci-base: add a strict flag to the hostname validator
Jo-Philipp Wich [Thu, 22 Mar 2018 08:49:52 +0000 (09:49 +0100)]
luci-base: add a strict flag to the hostname validator

Some applications, e.g. dnsmasq, do not allow hostnames starting with an
underscore, therefor extend the existing hostname datatype validator with
a `strict` which disallows a leading underscore.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2 years agoluci-base: switch to ubus uci operations
Jo-Philipp Wich [Wed, 14 Mar 2018 00:23:50 +0000 (01:23 +0100)]
luci-base: switch to ubus uci operations

Switch luci.model.uci to use ubus uci calls instead of driving libuci-lua
directly.

This prepares support for more advanced features such as per-session change
isolation and configuration rollback on errors.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2 years agoMerge pull request #1715 from TDT-AG/pr/20180403-luci-app-mwan3-update
Hannu Nyman [Tue, 3 Apr 2018 14:43:57 +0000 (17:43 +0300)]
Merge pull request #1715 from TDT-AG/pr/20180403-luci-app-mwan3-update

luci-app-mwan3: fixes and improvments

2 years agoluci-app-mwan3: remove unnecessary 'tracking active' hint 1715/head
Florian Eckert [Tue, 3 Apr 2018 11:21:49 +0000 (13:21 +0200)]
luci-app-mwan3: remove unnecessary 'tracking active' hint

Remove the unnecessary 'tracking active' hint from the status interface
page.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2 years agoluci-app-mwan3: remove diag-rc-legend field id
Florian Eckert [Tue, 3 Apr 2018 11:16:44 +0000 (13:16 +0200)]
luci-app-mwan3: remove diag-rc-legend field id

On the material theme the "Collecting data" hint in the status pages
was still present on the page even though the command was sucessfull executed.

Remove the legend tag and move the info "Collecting data" to the
"diag-rc-output" tag will solve this issue.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2 years agoluci-app-mwan3: calculate max interface usage from mmx_mask value
Florian Eckert [Tue, 3 Apr 2018 09:43:52 +0000 (11:43 +0200)]
luci-app-mwan3: calculate max interface usage from mmx_mask value

Show max interface value on interface page dependent on the mmx_mask
value

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2 years agoluci-base: zh_CN: update Simplified Chinese translation
Qian Zheng [Mon, 2 Apr 2018 00:46:50 +0000 (08:46 +0800)]
luci-base: zh_CN: update Simplified Chinese translation

Signed-off-by: Qian Zheng <sotux82@gmail.com>
2 years agoMerge pull request #1706 from musashino205/l10n/tmate-upd-ja
Hannu Nyman [Thu, 29 Mar 2018 13:41:47 +0000 (16:41 +0300)]
Merge pull request #1706 from musashino205/l10n/tmate-upd-ja

luci-app-travelmate: update Japanese translation

2 years agoluci-app-travelmate: update Japanese translation 1706/head
INAGAKI Hiroshi [Thu, 29 Mar 2018 04:13:38 +0000 (13:13 +0900)]
luci-app-travelmate: update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2 years agoi18n: sync translations
INAGAKI Hiroshi [Thu, 29 Mar 2018 03:51:13 +0000 (12:51 +0900)]
i18n: sync translations

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2 years agoMerge pull request #1703 from dibdot/travelmate
Dirk Brenken [Wed, 28 Mar 2018 09:22:15 +0000 (11:22 +0200)]
Merge pull request #1703 from dibdot/travelmate

luci-app-travelmate: made "ignore bssid" flag conditional

2 years agoMerge pull request #1704 from TDT-AG/pr/20180328-luci-app-mwan3-fixes
Dirk Brenken [Wed, 28 Mar 2018 09:21:56 +0000 (11:21 +0200)]
Merge pull request #1704 from TDT-AG/pr/20180328-luci-app-mwan3-fixes

luci-app-mwan3: fix syntax error and update notify page

2 years agoluci-app-mwan3: update notify info 1704/head
Florian Eckert [Wed, 28 Mar 2018 07:17:34 +0000 (09:17 +0200)]
luci-app-mwan3: update notify info

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2 years agoluci-app-mwan3: fix strict XHTML syntax error
Florian Eckert [Wed, 28 Mar 2018 07:17:13 +0000 (09:17 +0200)]
luci-app-mwan3: fix strict XHTML syntax error

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2 years agoluci-app-travelmate: made "ignore bssid" flag conditional 1703/head
Dirk Brenken [Wed, 28 Mar 2018 07:22:19 +0000 (09:22 +0200)]
luci-app-travelmate: made "ignore bssid" flag conditional

* made the "ignore bssid" flag conditional to ease connection
  to hidden networks:
    * default for hidden networks "disabled"
    * default for all others "enabled"

Signed-off-by: Dirk Brenken <dev@brenken.org>
2 years agoMerge pull request #1697 from TDT-AG/pr/20180323-luci-base-fix-tblsection
Dirk Brenken [Tue, 27 Mar 2018 20:45:57 +0000 (22:45 +0200)]
Merge pull request #1697 from TDT-AG/pr/20180323-luci-base-fix-tblsection

luci-base: add missing colspan in tblsection if table is empty

2 years agoluci-base: fix colspans calculation in tblsection 1697/head
Florian Eckert [Wed, 14 Mar 2018 15:03:55 +0000 (16:03 +0100)]
luci-base: fix colspans calculation in tblsection

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2 years agoMerge pull request #1701 from SvenRoederer/patch-2
Hannu Nyman [Mon, 26 Mar 2018 18:03:50 +0000 (21:03 +0300)]
Merge pull request #1701 from SvenRoederer/patch-2

wireguard: add dependency to luci-proto-wireguard

2 years agowireguard: add dependency to luci-proto-wireguard 1701/head
Sven Roederer [Mon, 26 Mar 2018 17:15:25 +0000 (19:15 +0200)]
wireguard: add dependency to luci-proto-wireguard

Installing luci-app-wireguard should also install luci-proto-wireguard, to have it as an protocol for interface setup.

Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
2 years agoMerge pull request #1696 from TDT-AG/pr/20180323-luci-app-mwan3-add-boxes-again
Hannu Nyman [Fri, 23 Mar 2018 14:59:42 +0000 (16:59 +0200)]
Merge pull request #1696 from TDT-AG/pr/20180323-luci-app-mwan3-add-boxes-again

luci-app-mwan3: add boxes again and update css in luci-theme-material

2 years agoluci-theme-material: add missing css classes 1696/head
Florian Eckert [Fri, 23 Mar 2018 08:35:26 +0000 (09:35 +0100)]
luci-theme-material: add missing css classes

* Add missing css class danger
* Add missing css class success
* Update background color for css class warning

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2 years agoluci-app-mwan3: add missing graphics boxes again
Florian Eckert [Thu, 8 Mar 2018 10:03:19 +0000 (11:03 +0100)]
luci-app-mwan3: add missing graphics boxes again

Add css boxes for mwan3 status again

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2 years agoluci-app-mwan3: remove notMonitored status information
Florian Eckert [Thu, 8 Mar 2018 08:43:18 +0000 (09:43 +0100)]
luci-app-mwan3: remove notMonitored status information

This case is not supported by mwan3 anymore

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2 years agoMerge pull request #1695 from dibdot/regex-dhcphost
Jo-Philipp Wich [Thu, 22 Mar 2018 09:45:42 +0000 (10:45 +0100)]
Merge pull request #1695 from dibdot/regex-dhcphost

luci-base/util.lua: enhance checklib function

2 years agoluci-base/util.lua: enhance checklib function 1695/head
Dirk Brenken [Thu, 22 Mar 2018 08:19:51 +0000 (09:19 +0100)]
luci-base/util.lua: enhance checklib function

* enhance the checklib function in util.lua to check the 'fullpathexe'
  as well, e.g. this fixes runtime errors on the dhcp/dns template in
  environments without dnsmasq

Signed-off-by: Dirk Brenken <dev@brenken.org>
2 years agoMerge pull request #1693 from sotux/master_zh-cn-translation
Hannu Nyman [Tue, 20 Mar 2018 08:05:44 +0000 (10:05 +0200)]
Merge pull request #1693 from sotux/master_zh-cn-translation

luci-app-upnp: zh_CN: Update Simplified Chinese translation

2 years agoluci-app-upnp: zh_CN: Update Simplified Chinese translation 1693/head
Qian Zheng [Fri, 9 Feb 2018 06:43:59 +0000 (14:43 +0800)]
luci-app-upnp: zh_CN: Update Simplified Chinese translation

Signed-off-by: Qian Zheng <sotux82@gmail.com>
2 years agoMerge pull request #1692 from EricLuehrsen/unbound_pnet
Hannu Nyman [Mon, 19 Mar 2018 15:31:07 +0000 (17:31 +0200)]
Merge pull request #1692 from EricLuehrsen/unbound_pnet

unbound: add domain resolution control options

2 years agoMerge pull request #1689 from aparcar/asu-fixup
Hannu Nyman [Mon, 19 Mar 2018 15:27:50 +0000 (17:27 +0200)]
Merge pull request #1689 from aparcar/asu-fixup

luci-app-attendedsysupgrade: fixup missing package

2 years agounbound: add domain resolution control options 1692/head
Eric Luehrsen [Sat, 17 Mar 2018 17:50:58 +0000 (13:50 -0400)]
unbound: add domain resolution control options

Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
2 years agoMerge pull request #1691 from dibdot/travelmate
Dirk Brenken [Sun, 18 Mar 2018 19:24:36 +0000 (20:24 +0100)]
Merge pull request #1691 from dibdot/travelmate

luci-app-travelmate: final frontend changes for 18.x

2 years agoluci-app-travelmate: final frontend changes for 18.x 1691/head
Dirk Brenken [Sat, 17 Mar 2018 18:04:51 +0000 (19:04 +0100)]
luci-app-travelmate: final frontend changes for 18.x

* made qrencode support optional (remove hardcoded dependency)
  * add a conditional QR Code button on overview page,
    remove separate "QR Codes" tab
* move trigger timeout setting to extra section

Signed-off-by: Dirk Brenken <dev@brenken.org>
2 years agoluci-app-attendedsysupgrade: fixup missing package 1689/head
Paul Spooren [Fri, 16 Mar 2018 17:52:48 +0000 (18:52 +0100)]
luci-app-attendedsysupgrade: fixup missing package

Signed-off-by: Paul Spooren <spooren@informatik.uni-leipzig.de>
2 years agoMerge pull request #1688 from dibdot/adblock
Dirk Brenken [Fri, 16 Mar 2018 12:01:36 +0000 (13:01 +0100)]
Merge pull request #1688 from dibdot/adblock

luci-app-adblock: remaining fixes

2 years agoluci-app-adblock: remaining fixes 1688/head
Dirk Brenken [Fri, 16 Mar 2018 11:59:53 +0000 (12:59 +0100)]
luci-app-adblock: remaining fixes

* missed in the last (untested) commit - sorry.

Signed-off-by: Dirk Brenken <dev@brenken.org>
2 years agoMerge pull request #1686 from dibdot/wifischedule
Dirk Brenken [Fri, 16 Mar 2018 05:37:08 +0000 (06:37 +0100)]
Merge pull request #1686 from dibdot/wifischedule

luci-app-wifischedule: fix function calls

2 years agoMerge pull request #1685 from dibdot/travelmate
Dirk Brenken [Fri, 16 Mar 2018 05:36:51 +0000 (06:36 +0100)]
Merge pull request #1685 from dibdot/travelmate

luci-app-travelmate: fix function calls

2 years agoMerge pull request #1684 from dibdot/adblock
Dirk Brenken [Fri, 16 Mar 2018 05:36:31 +0000 (06:36 +0100)]
Merge pull request #1684 from dibdot/adblock

luci-app-adblock: fix function calls

2 years agoluci-app-wifischedule: fix function calls 1686/head
Dirk Brenken [Thu, 15 Mar 2018 19:44:13 +0000 (20:44 +0100)]
luci-app-wifischedule: 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>
2 years agoluci-app-adblock: fix function calls 1684/head
Dirk Brenken [Thu, 15 Mar 2018 14:39:30 +0000 (15:39 +0100)]
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>
2 years agoluci-app-travelmate: fix function calls 1685/head
Dirk Brenken [Thu, 15 Mar 2018 14:38:17 +0000 (15:38 +0100)]
luci-app-travelmate: 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>
2 years agoMerge pull request #1654 from TDT-AG/pr/20180301-luci-several-fixes
Jo-Philipp Wich [Thu, 15 Mar 2018 08:52:22 +0000 (09:52 +0100)]
Merge pull request #1654 from TDT-AG/pr/20180301-luci-several-fixes

luci-app-firewall/luci-base/luci-mod-admin-full: some fixes and improvements

2 years agoMerge pull request #1680 from rtau/bugfix-ocserv_compr
Hannu Nyman [Mon, 12 Mar 2018 19:19:08 +0000 (21:19 +0200)]
Merge pull request #1680 from rtau/bugfix-ocserv_compr

luci-app-ocserv: match default value of compression

2 years agoluci-app-ocserv: match default value of compression 1680/head
Raymond Tau [Mon, 12 Mar 2018 18:15:22 +0000 (02:15 +0800)]
luci-app-ocserv: match default value of compression

Modify the default setting of compression to match the default
value of the package ocserv.

Signed-off-by: Raymond Tau <raymondtau@gmail.com>
2 years agotreewide: unify mac address handling
Jo-Philipp Wich [Mon, 12 Mar 2018 15:12:18 +0000 (16:12 +0100)]
treewide: unify mac address handling

Use the new luci.ip MAC address facilities to parse and verify MAC addresses
in a common way, instead of relying on various ad-hoc solutions.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2 years agoluci-base: fix documentation spelling mistakes in luci.http.protocol
Jo-Philipp Wich [Mon, 12 Mar 2018 15:04:52 +0000 (16:04 +0100)]
luci-base: fix documentation spelling mistakes in luci.http.protocol

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2 years agoluci-base: fix documentation spelling mistakes in luci.util
Jo-Philipp Wich [Mon, 12 Mar 2018 15:03:58 +0000 (16:03 +0100)]
luci-base: fix documentation spelling mistakes in luci.util

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2 years agoluci-lib-ip: add MAC address calculation support
Jo-Philipp Wich [Mon, 12 Mar 2018 07:18:11 +0000 (08:18 +0100)]
luci-lib-ip: add MAC address calculation support

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2 years agoluci-lib-nixio: fix spelling mistakes in documentation
Jo-Philipp Wich [Mon, 12 Mar 2018 14:59:52 +0000 (15:59 +0100)]
luci-lib-nixio: fix spelling mistakes in documentation

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2 years agoluci-base: fix parsing of ethers(5)
Jo-Philipp Wich [Sun, 11 Mar 2018 17:16:24 +0000 (18:16 +0100)]
luci-base: fix parsing of ethers(5)

The /etc/ethers file may contain any number of white space characters
between the mac address and the IP/hostname field, so extend the pattern
to allow for that.

Man ethers(5) also states that the IP field may be a symbolic hostname,
so test whether the name is an IP address or hostname before adding it
to the hints structure.

Fixes #1674.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2 years agoMerge pull request #1675 from dibdot/material-fix
Hannu Nyman [Fri, 9 Mar 2018 16:54:32 +0000 (18:54 +0200)]
Merge pull request #1675 from dibdot/material-fix

luci-base/firewall_zonelist: fix visual interface/background alignment

2 years agoluci-base/firewall_zonelist: fix visual interface/background alignment 1675/head
Dirk Brenken [Fri, 9 Mar 2018 07:11:06 +0000 (08:11 +0100)]
luci-base/firewall_zonelist: fix visual interface/background alignment

* fix for #1667, tested with all standard themes

Signed-off-by: Dirk Brenken <dev@brenken.org>
2 years agoMerge pull request #1671 from dibdot/travelmate
Dirk Brenken [Thu, 8 Mar 2018 09:21:01 +0000 (10:21 +0100)]
Merge pull request #1671 from dibdot/travelmate

luci-app-travelmate: remove qrencode short options

2 years agoluci-app-travelmate: remove qrencode short options 1671/head
Dirk Brenken [Thu, 8 Mar 2018 09:13:15 +0000 (10:13 +0100)]
luci-app-travelmate: remove qrencode short options

* forthcoming qrencode version will remove the short option "-I"
  for inline, to get prepared switch to normal qrencode
  command line parameters.

Signed-off-by: Dirk Brenken <dev@brenken.org>
2 years agoluci-app-attendedsysupgrade: reload rpcd fix #1668
Paul Spooren [Wed, 7 Mar 2018 11:16:17 +0000 (12:16 +0100)]
luci-app-attendedsysupgrade: reload rpcd fix #1668

when installing the luci app and opening it for the first time the
webinterface shows an error as some freshly installed rpcd calls are not
yet available. The reload fixes the problem.

luci-app-attendedsysupgrade: downloadable image

the creted sysupgrade image can now easily be downloaded via web
interface.

also fixed some </br> to <br />

Signed-off-by: Paul Spooren <spooren@informatik.uni-leipzig.de>
2 years agoluci-app-attendedsysupgrade: show unknown package
Paul Spooren [Tue, 6 Mar 2018 18:23:28 +0000 (19:23 +0100)]
luci-app-attendedsysupgrade: show unknown package

Reads the header X-Unknown-Package offered by the sysupgrade server and
shows it in the error message.

Signed-off-by: Paul Spooren <spooren@informatik.uni-leipzig.de>
2 years agoMerge pull request #1653 from guidosarducci/master-fix-apcups-statistics
Hannu Nyman [Tue, 6 Mar 2018 14:31:57 +0000 (16:31 +0200)]
Merge pull request #1653 from guidosarducci/master-fix-apcups-statistics

[RFC] luci-app-statistics: only graph data supported by APC UPS

2 years agoMerge pull request #1662 from dibdot/travelmate
Dirk Brenken [Mon, 5 Mar 2018 11:26:19 +0000 (12:26 +0100)]
Merge pull request #1662 from dibdot/travelmate

luci-app-travelmate: fixes for new QR code template

2 years agoluci-app-travelmate: fixes for new QR code template 1662/head
Dirk Brenken [Sun, 4 Mar 2018 14:01:50 +0000 (15:01 +0100)]
luci-app-travelmate: fixes for new QR code template

* remove unofficial 'WPA2' enc. token for better compatibility with
  certain QR code reader, still 'WPA', 'WEP' and 'nopass' are supported
* add WEP key slot support (not really needed, but it's still
  supported by LuCI wireless)
* correct escape single quotes and other special chars
  in SSID & passwords
* code cleanup

Signed-off-by: Dirk Brenken <dev@brenken.org>
2 years agoMerge pull request #1660 from musashino205/l10n/tmate-upd-ja
Hannu Nyman [Sun, 4 Mar 2018 07:53:25 +0000 (09:53 +0200)]
Merge pull request #1660 from musashino205/l10n/tmate-upd-ja

luci-app-travelmate: update Japanese translation

2 years agoluci-app-travelmate: update Japanese translation 1660/head
INAGAKI Hiroshi [Sun, 4 Mar 2018 07:42:48 +0000 (16:42 +0900)]
luci-app-travelmate: update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2 years agoluci-app-travelmate: sync translations
INAGAKI Hiroshi [Sun, 4 Mar 2018 05:23:52 +0000 (14:23 +0900)]
luci-app-travelmate: sync translations

Synchronized translations with sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2 years agoluci-app-statistics: only graph data supported by APC UPS 1653/head
guidosarducci [Sat, 3 Mar 2018 21:45:23 +0000 (13:45 -0800)]
luci-app-statistics: only graph data supported by APC UPS

Some graph definitions rely on data not supported across all APC UPSes.
Due to recent upstream changes in collectd, the daemon no longer creates
a NaN-filled .rrd file corresponding to any missing UPS data. Depending
on the connected UPS, this may result in some "broken" graphs on the Luci
Statistics page since rrdtool cannot find the expected .rrd file.

Include the add_supported() function to determine the UPS data available
at runtime and update any definitions of graphs to include only supported
data. For example, the whole chart stack of AC input and output voltages
will normally be "broken" if the UPS only measures AC input voltage. With
these changes, the output voltage graph definition is stripped out,
allowing the chart to render.

Make consistent use of data types and instances in graph definitions. All
definitions now use the same format with the 'instances' key. Unnecessary
'types' and 'sources' keys are removed.

Fix the definition of 'line frequency' graph, based on upstream collectd
apcups plugin code: type is 'frequency' but instance should be 'input'.

This also includes some code and whitespace cleanup.

Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2 years agoMerge pull request #1658 from dibdot/travelmate
Dirk Brenken [Sat, 3 Mar 2018 07:44:07 +0000 (08:44 +0100)]
Merge pull request #1658 from dibdot/travelmate

luci-app-travelmate: sync with release 1.1.3

2 years agoMerge pull request #1652 from TDT-AG/pr/20180301-luci-app-mwan3-fix-status-page
Hannu Nyman [Fri, 2 Mar 2018 21:31:56 +0000 (23:31 +0200)]
Merge pull request #1652 from TDT-AG/pr/20180301-luci-app-mwan3-fix-status-page

luci-app-mwan3: fix status pages

2 years agoluci-app-travelmate: sync with release 1.1.3 1658/head
Dirk Brenken [Fri, 2 Mar 2018 17:06:38 +0000 (18:06 +0100)]
luci-app-travelmate: sync with release 1.1.3

* show WiFi QR codes from all configured Access Points

Signed-off-by: Dirk Brenken <dev@brenken.org>
2 years agoluci-base: properly handle undefined IPv6 local-address information
Jo-Philipp Wich [Fri, 2 Mar 2018 13:42:52 +0000 (14:42 +0100)]
luci-base: properly handle undefined IPv6 local-address information

If IPv6 prefix assignment is disabled, the "local-address" structure
might exist, but be empty which causes the adress formatting in the
network model class to bail out.

Verify the completeness of the "local-address" structure before using
it in order to avoid runtime errors.

Fixes #1657.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2 years agoluci-base, luci-mod-admin-full: store backup vars in luci configuration
Jo-Philipp Wich [Fri, 2 Mar 2018 11:23:55 +0000 (12:23 +0100)]
luci-base, luci-mod-admin-full: store backup vars in luci configuration

Keep the ifname and bridge state backup variables in /etc/config/luci to not
pollute /etc/config/network.

Fixes #1655.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2 years agoMerge pull request #1656 from musashino205/l10n/adblk-upd-ja
Dirk Brenken [Thu, 1 Mar 2018 19:04:22 +0000 (20:04 +0100)]
Merge pull request #1656 from musashino205/l10n/adblk-upd-ja

luci-app-adblock: fix the msgid to keep the translations

2 years agoluci-app-adblock: fix the msgid to keep the translations 1656/head
INAGAKI Hiroshi [Thu, 1 Mar 2018 17:12:14 +0000 (02:12 +0900)]
luci-app-adblock: fix the msgid to keep the translations

XHTML markup of "&" in the description about "download queue" was fixed
in 71230d2. Since UI text of it no longer matches msgid, I fixed it.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2 years agoluci-mod-admin-full: add hint on backup restore 1654/head
Florian Eckert [Wed, 24 Jan 2018 13:57:08 +0000 (14:57 +0100)]
luci-mod-admin-full: add hint on backup restore

Add a hint to backup restore that files could remain on the system.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2 years agoluci-app-firewall: only show SNAT template if there are more then one zone
Florian Eckert [Tue, 30 Jan 2018 10:52:32 +0000 (11:52 +0100)]
luci-app-firewall: only show SNAT template if there are more then one zone

Only show SNAT template if there are more then one zone.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2 years agoluci-app-firewall: on forward rule change preselection
Florian Eckert [Tue, 30 Jan 2018 08:45:18 +0000 (09:45 +0100)]
luci-app-firewall: on forward rule change preselection

Change the preselection for the src zone to wan and the dest zon to lan
because this is the normal situation.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2 years agoluci-app-firewall: only show portforward template if there are more then one zone
Florian Eckert [Thu, 8 Feb 2018 12:07:24 +0000 (13:07 +0100)]
luci-app-firewall: only show portforward template if there are more then one zone

Only show portforward template if there are more then one zone.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2 years agoluci-base: fix browser.htm template
Florian Eckert [Fri, 9 Feb 2018 14:12:21 +0000 (15:12 +0100)]
luci-base: fix browser.htm template

If cbi_init() is not called first browser gif will not be found.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2 years agoluci-app-mwan3: remove css from javascript in overview_status_interface 1652/head
Florian Eckert [Thu, 1 Mar 2018 09:36:03 +0000 (10:36 +0100)]
luci-app-mwan3: remove css from javascript in overview_status_interface

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2 years agoluci-app-mwan3: Update header name in status pages
Florian Eckert [Thu, 1 Mar 2018 07:58:36 +0000 (08:58 +0100)]
luci-app-mwan3: Update header name in status pages

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2 years agoluci-app-mwan3: remove duplicated code section
Florian Eckert [Thu, 1 Mar 2018 07:56:43 +0000 (08:56 +0100)]
luci-app-mwan3: remove duplicated code section

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2 years agoluci-app-mwan3: fix source styling
Florian Eckert [Thu, 1 Mar 2018 07:53:17 +0000 (08:53 +0100)]
luci-app-mwan3: fix source styling

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2 years agoluci-app-mwan3: remove css styling from status_interface page
Florian Eckert [Thu, 1 Mar 2018 07:52:06 +0000 (08:52 +0100)]
luci-app-mwan3: remove css styling from status_interface page

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2 years agoluci-app-mwan3: remove css styling from overview_status_interface page
Florian Eckert [Thu, 1 Mar 2018 07:51:51 +0000 (08:51 +0100)]
luci-app-mwan3: remove css styling from overview_status_interface page

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2 years agoluci-app-mwan3: fix stack trace if no tacking_ip is set on interface add
Florian Eckert [Tue, 27 Feb 2018 14:00:50 +0000 (15:00 +0100)]
luci-app-mwan3: fix stack trace if no tacking_ip is set on interface add

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2 years agoMerge pull request #1651 from hafu/ffp-profile
Hannu Nyman [Wed, 28 Feb 2018 15:33:52 +0000 (17:33 +0200)]
Merge pull request #1651 from hafu/ffp-profile

community-profiles: potsdam - changed SSID

2 years agocommunity-profiles: potsdam - changed SSID 1651/head
Hannes Fuchs [Tue, 27 Feb 2018 22:00:18 +0000 (23:00 +0100)]
community-profiles: potsdam - changed SSID

After some discussion in our meetings and on the maling list we decided to
change the SSID to a fixed one.

Signed-off-by: Hannes Fuchs <hannes.fuchs@gmx.org>
2 years agoMerge pull request #1647 from dibdot/adblock
Dirk Brenken [Wed, 28 Feb 2018 13:14:41 +0000 (14:14 +0100)]
Merge pull request #1647 from dibdot/adblock

luci-app-adblock: fix frontend typo

2 years agoMerge pull request #1648 from dibdot/travelmate
Dirk Brenken [Tue, 27 Feb 2018 18:23:45 +0000 (19:23 +0100)]
Merge pull request #1648 from dibdot/travelmate

luci-app-travelmate: sync with release 1.1.2

2 years agoluci-app-travelmate: sync with release 1.1.2 1648/head
Dirk Brenken [Tue, 27 Feb 2018 13:04:58 +0000 (14:04 +0100)]
luci-app-travelmate: sync with release 1.1.2

* refine timings & valid input ranges

Signed-off-by: Dirk Brenken <dev@brenken.org>
2 years agoluci-app-adblock: fix frontend typo 1647/head
Dirk Brenken [Tue, 27 Feb 2018 09:20:56 +0000 (10:20 +0100)]
luci-app-adblock: fix frontend typo

fix trivial 'msmtp' typo & changed .po files as well

Signed-off-by: Dirk Brenken <dev@brenken.org>
2 years agoMerge pull request #1633 from dibdot/travelmate
dibdot [Tue, 20 Feb 2018 07:55:24 +0000 (08:55 +0100)]
Merge pull request #1633 from dibdot/travelmate

luci-app-travelmate: sync with release 1.1.0

2 years agoluci-app-travelmate: sync with release 1.1.0 1633/head
Dirk Brenken [Mon, 19 Feb 2018 20:52:21 +0000 (21:52 +0100)]
luci-app-travelmate: sync with release 1.1.0

* add an option for the captive portal detection
* support the new signal quality treshold (default 30)
* small fixes

Signed-off-by: Dirk Brenken <dev@brenken.org>
2 years agoluci-base: do not assume a fixed host address in delegated prefix (#1484)
Jo-Philipp Wich [Fri, 16 Feb 2018 16:04:13 +0000 (17:04 +0100)]
luci-base: do not assume a fixed host address in delegated prefix (#1484)

OpenWrt/LEDE introduced the "local-address" field a while back to expose the
effective local host address of the delegated prefix, so use that information
instead of assuming `[prefix]:1`.

Fixes #1484.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2 years agoluci-base: rework client side IP validation types and support "hostid" type
Jo-Philipp Wich [Fri, 16 Feb 2018 15:53:48 +0000 (16:53 +0100)]
luci-base: rework client side IP validation types and support "hostid" type

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2 years agoluci-base: fix Lua-side ip6hostid() datatype validation
Jo-Philipp Wich [Tue, 13 Feb 2018 13:29:21 +0000 (14:29 +0100)]
luci-base: fix Lua-side ip6hostid() datatype validation

A valid host ID as accepted by netifd must meet the following criteria:

 - Is either one of the two special "random" or "eui64" strings
 - Or is a valid IPv6 address according to inet_pton(AF_INET6)
 - Has the first 64 bit set to zero

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2 years agoMerge pull request #1627 from user7887/luci-ru
Hannu Nyman [Thu, 8 Feb 2018 16:17:02 +0000 (18:17 +0200)]
Merge pull request #1627 from user7887/luci-ru

i18n-ru: fixed russian translation

2 years agoi18n-ru: fixed russian translation 1627/head
Vladimir [Tue, 6 Feb 2018 22:04:33 +0000 (01:04 +0300)]
i18n-ru: fixed russian translation

Signed-off-by: Vladimir <picfun@ya.ru>
2 years agoMerge pull request #1626 from TDT-AG/pr/20180105-luci-app-mwan3-add-service
Hannu Nyman [Mon, 5 Feb 2018 15:43:44 +0000 (17:43 +0200)]
Merge pull request #1626 from TDT-AG/pr/20180105-luci-app-mwan3-add-service

luci-app-mwan3: add service hint