Merge pull request #532 from chris5560/master

documentation/CBI.md fixed markdown formating

documentation/CBI.md fixed markdown formating

CBI.md: fixed markdown formating
ModulesHowTo.md: fixed to make link inside CBI.md work.

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>

Merge pull request #528 from nmav/no-vpn

ocserv: removed unnecessary option and add proxy arp option

Merge pull request #531 from chris5560/master

template cbi/value.htm implement documented property maxlength

template cbi/value.htm implement documented property maxlength

template cbi/value.htm implement already documented property maxlength

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>

Merge pull request #529 from chris5560/master

cbi: Implement "readonly" property for "Value"

ocserv: added proxy arp option

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

luci-app-ocserv: removed unecessary option

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

cbi.lua: Implement "readonly" property for "Value"

cbi.lua: Implement "readonly" property for "Value"

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>

template cbi/value.htm: add "readonly" property

template cbi/value.htm: add "readonly" property

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>

Merge pull request #526 from chris5560/master

cbi.lua: Implement Flag.validate function

cbi.lua: Implement Flag.validate function

cbi.lua
- Implement Flag.validate function to be overwritable
- rewritten if clause for easier reading ;-)

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>

luci-app-voice-core and -diag: mark broken

Mark luci-app-voice-core and luci-app-voice-diag @BROKEN as their only functionality
is to create menu structure to be filled by items from luci-app-diag-devinfo,
which is currently broken due to missing dependencies.

References:

Initial commit creating all three packages:
https://github.com/openwrt/luci/commit/820f11932f548182ebb32704e1df83b78e69b19e

Explanation why luci-app-diag-devinfo is currently broken:
https://github.com/openwrt/luci/commit/ec6ccf1cd3225b51b958b38c7439f1dea8c28457

If luci-app-diag-devinfo gets its dependencies fixed, these two voice packages
might be re-activated. Combining the three packages would increase clarity.

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

luci-app-firewall: limit zone name length to 11 characters

Change the maximum length of a firewall zone name from 14 to 11 characters.

Longer names break iptables rule generation (max. 29 chars are allowed).

XT_EXTENSION_MAXNAMELEN = 29
29 - sizeof("postrouting_") - sizeof("_rule") - sizeof("\0") = 11

References to:
https://github.com/openwrt/luci/issues/507
https://dev.openwrt.org/ticket/20380

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

Merge pull request #494 from ollie27/strings

fix string "UPNP" -> "UPnP"

fix string "UPNP" -> "UPnP"

Signed-off-by: Oliver Middleton <olliemail27@gmail.com>

Merge pull request #509 from neheb/master

resources/icons: Use gifsicle to save a few bytes.

luci-base: eliminiate use of uci state vars in luci.sys

Rewrite `luci.sys.wifi.getiwinfo()` to use the ubus wireless state instead of
depreacated uci state vars in order to map abstract network notation to
wireless ifnames.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

Add link to API reference

Move libubus-lua dependency to luci-base

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-app-diag-devinfo: mark broken due to dependencies

Mark luci-app-diag-devinfo @BROKEN as it has several failing dependencies:

Four dependencies from "oldpackages":
 httping, mac-to-devinfo, smap-to-devinfo, netdiscover-to-devinfo

One dependency from "abandoned":
 smap

(netdiscover is currently ok in trunk, but not in 15.05.)

Reference to Luci issue #523.

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

luci-app-statistics: Adjust ping graphs to show target hosts separately

Ping statistics plugin allows the user to define multiple ping targets.
The graphs have so far shown multiple hosts in a stacked way.
Adjust graphs to show the target hosts separately (overlay=true).

Clarify the plugin definition with some additional line spacing.

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

luci-app-statistics: improve scaling of the associated stations graph

Improve scaling of the associated stations graph on the wireless page.

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

Merge pull request #522 from LuttyYang/master

luci-theme-material: fix some style bugs

luci-theme-material: fix some style bugs

Signed-off-by: Lutty Yang <lutty@wcan.in>

Merge pull request #521 from LuttyYang/master

luci-theme-material: Synchronized to the LUCI version f9e590a

Revert "luci-theme-material: do not infer login state from url (#520)"

This reverts commit f9e590aa4741bf337029be3f374a33543cc3f37b
in order to enable a clean merge of the PR #521 from the theme author.

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

luci-theme-material: try find current position by using lua code

thanks for jow

Signed-off-by: Lutty Yang <lutty@wcan.in>

luci-theme-material: Synchronized to the LUCI version f9e590a

Signed-off-by: Lutty Yang <lutty@wcan.in>

luci-theme-material: do not infer login state from url (#520)

Checking for `;` in the url is no good indicator whether a user is logged in,
instead query the dispatcher and set a `logged-in` CSS class on the `<body>`
element if a session exists.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-mod-admin-full: fix invalid markup in packages.htm (#518)

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-mod-admin-full: restructure and fix backup, restore and sysuprade (#517)

Do not use standard post security checking for actions that require file upload
since reading the token value will trigger parsing of the http message body
before the file upload handler has been set, which causes LuCI to buffer the
entire request body in memory.

In order to simplify the code and logic flow, split action_flashops() into
separate handlers for reset, backup, restore and sysupgrade.

Let the backup restore and sysupgrade handlers use the new test_post_security()
method in luci.dispatcher to perform token checking *after* setting the upload
handler.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-base: dispatcher expose test_post_security()

Allows external code to perform POST and token checking manually.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-base: ensure that base url is emitted with trailing slash

Now that we don't have an url token anymore, '/cgi-bin/luci' becomes a valid
url while cookies are restricted to only '/cgi-bin/luci/' and below.

In order to ensure that the first request after login refers to a path
covered by the authentication cookie, change build_url() to always append
a trailing slash if we're referring to the base url.

This should fix the login problems mentioned in #516.

While we're touching the dispatcher, also remove remaining url token code.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-mod-admin-full: do not access dispatcher.context.urltoken in logout

The urltoken table is going to be removed.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-base: remove security token from urls

Now that sensitive urls require post requests and only accept them if a valid
security token is sent along the request, we can drop the global random url
token to improve LuCI usability.

The main improvement is the ability to use multiple tabs with the same login
session, but also deep linking to specific urls without the need for another
login becomes feasible, e.g. for documentation purposes.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-app-upnp: protect lease delete call with csrf token

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-app-splash: protect admin status call with csrf token

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-app-radicale: protect start/stop actions with csrf token

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-app-privoxy: protect start/stop actions with csrf token

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-app-ocserv: protect disconnect action with csrf token

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-app-ddns: protect start/stop actions with csrf token

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-mod-admin-full: protect iptables counter reset and restart with token

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-mod-admin-full: protect network post actions with csrf tokens

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-base: filter invalid opkg status lines

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-mod-admin-full: protect clock, flash and opkg ops with submit token

* Use post_on() target to require csrf token verification for modifying actions
* Ensure that package and flash operation handlers guard modifying operations
  with parameter check

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-base: generalize post security token handling

* Add a generic helper function to check need for post / csrf token validation
* Remove custom token verification in cbi targets
* Support requiring post security depending on specific submit parameters,
  usable through post_on() action

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

Merge pull request #513 from LuttyYang/master

luci-theme-material: PR from Version 0.2.11

luci-theme-material: PR from Version 0.2.11

Signed-off-by: Lutty Yang <lutty@wcan.in>

i18n: Sync translations

Sync translations to the current strings.

Changes in luci-app-ddns, luci-app-mjpg-streamer, luci-app-qos,
luci-app-shadowsocks-libev, luci-app-statistics and luci-base

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

luci-base: update i18n base template

Update i18n base template to match the current strings.

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

luci.mk: correct SK language name to Slovak

SK language code refers to Slovak, not Slovene.
Native language name is correct.

References:
https://forum.openwrt.org/viewtopic.php?id=60235
https://en.wikipedia.org/wiki/Slovak_language

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

luci-app-ddns: fix typo in previous commit

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

Timezone information: update to 2015g

Changes in 2015g:
http://mm.icann.org/pipermail/tz-announce/2015-October/000034.html

     Norfolk moves from +1130 to +1100 on 2015-10-04 at 02:00 local time.

     Fiji's 2016 fall-back transition is scheduled for January 17, not 24.

     Fort Nelson, British Columbia will not fall back on 2015-11-01. It has
     effectively been on MST (-0700) since it advanced its clocks on 2015-03-08.
     New zone America/Fort_Nelson.

Note: the Turkey-related one-time rule change is not apparently catched by
the zoneinfo2lua script, so that change is not included in this commit.
(Turkey's 2015 fall-back transition is scheduled for Nov. 8, not Oct. 25.)

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

luci-app-ddns: remove title <a> hacks

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

resources/icons: Use gifsicle to save a few bytes.
Signed-off by: Rosen Penev <rosenp@gmail.com>

Merge pull request #505 from roger-/dump1090-latlon

dump1090: lat/lon should be floats

dump1090: lat/lon should be floats

Signed-off-by: Roger D <rogerdammit@gmail.com>

luci-base: prevent UCI changes in CBI if form is not in submit state

Only process submitted data if the "cbi.submit" parameter is present as the
dispatcher will verify the integrity of the CSRF token in this case.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

Globally replace luci.dispatcher.build_url(...) with url(...) invocations

Also concat multiple string arguments into one while we're at it.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-base: expose luci.dispatcher.build_url() as url() in templates

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-base: protect simpleforms with CSRF tokens

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-mod-admin-full: switch to POST action for reboot

Also rework the reboot tmeplate a little bit.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-base: switch to POST action for service reload

Switches the service reload calls to CSRF token protected POST action.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-mod-admin-full: switch to POST actions for UCI changes

Switches UCI apply/revert/save to CSRF token protected POST actions.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-theme-bootstrap: add redir parameter to uci change menu

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-theme-material: add redir parameter to uci change menu

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-base: protect CBI forms with CSRF tokens

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-base: add support for POST-only actions with CSRF token check

Add the dispatcher infrastructure to restrict certain routes to POST
requests only in conjunction with verification of CSRF tokens.

This is the first step to get rid of the CSRF token in the url in favor
to tokens embedded in forms.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

Merge pull request #503 from LuttyYang/master

luci-theme-material: fix some style bug in LUCI newest version

luci-theme-material: fix some style bug in LUCI newest version

Signed-off-by: Lutty Yang <lutty@wcan.in>

Globally convert headline anchors into name attributes.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

Merge pull request #501 from LuttyYang/master

luci-theme-material: PR from version 0.2.6

luci-app-statistics: reorder interface, netlink and openvpn datasources

This aligns the order and grouping of RX and TX network datasources.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-app-statistics: add support for sorting RRD data sources

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-app-statistics: add initial support for collectd-mod-openvpn

This changeset covers compression and traffic stats, not every combination has
been tested yet.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-theme-material: PR from version 0.2.6

PR from version 0.2.6

Signed-off-by: Lutty Yang <lutty@wcan.in>

luci-app-statistics: add initial support for collect-mod-sensors

Due to a lack of a test environment this support only covers thermal graphs
so far. Please send the output of "rrdtool info /tmp/rrd/*/sensors-*/*.rrd"
if your system happens to support voltage, power or fanspeed sensors.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

Merge pull request #488 from hnyman/black-flash

luci-base: change index.html to be more like current themes

Merge pull request #489 from hnyman/remove-bno-theme

themes: remove freifunk-bno theme

luci-mod-admin-full: status: survive broken DSL status output

Only attempt to call "dsl_func" if the dsl_control lucistat output could be
successfully evaluated.

Works around https://dev.openwrt.org/ticket/20607

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-app-statistics: improve diagram generation, add missing title

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-app-statistics: rework graph label handling

Remove leftover unused translation code and properly escape colons in line
labels.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-app-statistics: only render index view for more than one instance

If a plugin produces only one instance, e.g. netlink with just one interface
configured, then the controller will register no detail views which would
normally show all graphs but the index pacage of a given plugin will still
display the collapsed view without any possibility to reach the full listing.

Fix the problem by only rendering a linked index view when more than one
instance is present.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

proto_map: fix ealen range

Signed-off-by: Steven Barth <steven@midlink.org>

Merge pull request #496 from neheb/master

Use ZopfliPNG to save 5.4 KB

resources/icons: Use ZopfliPNG to save 5.4 KB

Signed-off by: Rosen Penev <rosenp@gmail.com>

luci-base: change index.html to be more like current themes

Change index.html that is visible for a second when entering Luci:
* Black text on white background (instead of white on black)
* Specify font as Arial/Helvetica

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

themes: remove freifunk-bno theme

Remove the freifunk-bno theme as the bno profile itself was removed.
Discussion in https://github.com/openwrt/luci/pull/471

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

Merge pull request #497 from cshore/asterisk-update

applications/asterisk: Remove incorrect dependency

CONTRIBUTING.md: Add advice on pull requests

Add advice on pull requests and best practices in working with Github.
Minor corrections & updates.
Adjust to Github 'markdown' syntax.

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

applications/asterisk: Remove incorrect dependency

ahcpd dependency appears to have come from a cut-n-paste from
luci-app-ahcpd.

Merge pull request #495 from openwrt-es/dump1090-next

applications/luci-dump1090: update config to latest version

applications/luci-dump1090: update config to latest version

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

Merge pull request #491 from hnyman/reorganise-stats-menu

luci-app-statistics: reorganise menu items

Merge pull request #492 from ollie27/nohosts

luci-mod-admin-full: fix dnsmasq no-hosts/addn-hosts options

luci-mod-admin-full: fix dnsmasq no-hosts/addn-hosts options

no-hosts does not disable addn-hosts.

Signed-off-by: Oliver Middleton <olliemail27@gmail.com>

luci-app-statistics: reorganise menu items

Reorganise the menu items of the Luci statistics module:

* Re-label "Collectd" to "Setup" and place it after the "Graphs" items.
  - "Graphs" is used much more frequently so it should be first.
  - Change "Collectd" menu item to "Setup" to clarify things.

* Re-label "System plugins" to "General plugins" to change sorting.
  "Network / Output / System" changes to "General / Network / Output"
  that is more logical order for the items.

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

Merge pull request #487 from jorgifumi/patch-1

Update multiwan.po

Update multiwan.po

Little fix in translation msgid "WAN Uplink"

Signed-off-by: Jorge Lucena <jorgifumi@gmail.com>