diff options
Diffstat (limited to 'modules/luci-base/luasrc')
| -rw-r--r-- | modules/luci-base/luasrc/model/uci.lua | 4 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/sys.lua | 2 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua | 8 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua | 3 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/view/header.htm | 2 |
5 files changed, 10 insertions, 9 deletions
diff --git a/modules/luci-base/luasrc/model/uci.lua b/modules/luci-base/luasrc/model/uci.lua index a50e28a871..816f6f2053 100644 --- a/modules/luci-base/luasrc/model/uci.lua +++ b/modules/luci-base/luasrc/model/uci.lua @@ -123,10 +123,10 @@ function apply(self, rollback) if rollback then local sys = require "luci.sys" local conf = require "luci.config" - local timeout = tonumber(conf and conf.apply and conf.apply.rollback or 30) or 0 + local timeout = tonumber(conf and conf.apply and conf.apply.rollback or 90) or 0 _, err = call("apply", { - timeout = (timeout > 30) and timeout or 30, + timeout = (timeout > 90) and timeout or 90, rollback = true }) diff --git a/modules/luci-base/luasrc/sys.lua b/modules/luci-base/luasrc/sys.lua index bf21b5f191..aa00766fb8 100644 --- a/modules/luci-base/luasrc/sys.lua +++ b/modules/luci-base/luasrc/sys.lua @@ -509,7 +509,7 @@ user.getuser = nixio.getpw function user.getpasswd(username) local pwe = nixio.getsp and nixio.getsp(username) or nixio.getpw(username) local pwh = pwe and (pwe.pwdp or pwe.passwd) - if not pwh or #pwh < 1 or pwh == "!" or pwh == "x" then + if not pwh or #pwh < 1 then return nil, pwe else return pwh, pwe diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua index 95f2ad4cfc..705a15db22 100644 --- a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua +++ b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua @@ -202,10 +202,10 @@ TZ = { { 'America/Winnipeg', 'CST6CDT,M3.2.0,M11.1.0' }, { 'America/Yakutat', 'AKST9AKDT,M3.2.0,M11.1.0' }, { 'America/Yellowknife', 'MST7MDT,M3.2.0,M11.1.0' }, - { 'Antarctica/Casey', '<+08>-8' }, + { 'Antarctica/Casey', '<+11>-11' }, { 'Antarctica/Davis', '<+07>-7' }, { 'Antarctica/DumontDUrville', '<+10>-10' }, - { 'Antarctica/Macquarie', '<+11>-11' }, + { 'Antarctica/Macquarie', 'AEST-10AEDT,M10.1.0,M4.1.0/3' }, { 'Antarctica/Mawson', '<+05>-5' }, { 'Antarctica/McMurdo', 'NZST-12NZDT,M9.5.0,M4.1.0/3' }, { 'Antarctica/Palmer', '<-03>3' }, @@ -239,8 +239,8 @@ TZ = { { 'Asia/Dubai', '<+04>-4' }, { 'Asia/Dushanbe', '<+05>-5' }, { 'Asia/Famagusta', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, - { 'Asia/Gaza', 'EET-2EEST,M3.5.5/0,M10.5.6/1' }, - { 'Asia/Hebron', 'EET-2EEST,M3.5.5/0,M10.5.6/1' }, + { 'Asia/Gaza', 'EET-2EEST,M3.4.4/48,M10.4.4/49' }, + { 'Asia/Hebron', 'EET-2EEST,M3.4.4/48,M10.4.4/49' }, { 'Asia/Ho Chi Minh', '<+07>-7' }, { 'Asia/Hong Kong', 'HKT-8' }, { 'Asia/Hovd', '<+07>-7' }, diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua index e63e2a6958..caee1d2c1c 100644 --- a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua +++ b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua @@ -24,6 +24,8 @@ OFFSET = { pdt = -25200, -- PDT nst = -12600, -- NST ndt = -9000, -- NDT + aest = 36000, -- AEST + aedt = 39600, -- AEDT nzst = 43200, -- NZST nzdt = 46800, -- NZDT hkt = 28800, -- HKT @@ -38,7 +40,6 @@ OFFSET = { wet = 0, -- WET acst = 34200, -- ACST acdt = 37800, -- ACDT - aest = 36000, -- AEST awst = 28800, -- AWST msk = 10800, -- MSK sst = -39600, -- SST diff --git a/modules/luci-base/luasrc/view/header.htm b/modules/luci-base/luasrc/view/header.htm index e7b2d4787b..cffe9482ca 100644 --- a/modules/luci-base/luasrc/view/header.htm +++ b/modules/luci-base/luasrc/view/header.htm @@ -29,7 +29,7 @@ ubuspath = luci.config.main.ubuspath or '/ubus/', sessionid = luci.dispatcher.context.authsession, nodespec = luci.dispatcher.context.dispatched, - apply_rollback = math.max(applyconf and applyconf.rollback or 30, 30), + apply_rollback = math.max(applyconf and applyconf.rollback or 90, 90), apply_holdoff = math.max(applyconf and applyconf.holdoff or 4, 1), apply_timeout = math.max(applyconf and applyconf.timeout or 5, 1), apply_display = math.max(applyconf and applyconf.display or 1.5, 1), |