diff --git a/luci-app-alist/Makefile b/luci-app-alist/Makefile index a0fa2f776..70fc451ba 100644 --- a/luci-app-alist/Makefile +++ b/luci-app-alist/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-alist -PKG_VERSION:=1.0.10 +PKG_VERSION:=1.0.11 PKG_RELEASE:=1 LUCI_TITLE:=LuCI support for alist diff --git a/luci-app-alist/luasrc/controller/alist.lua b/luci-app-alist/luasrc/controller/alist.lua index 063aa37ea..d611d5cf3 100644 --- a/luci-app-alist/luasrc/controller/alist.lua +++ b/luci-app-alist/luasrc/controller/alist.lua @@ -41,8 +41,9 @@ function clear_log() end function admin_info() - local username = luci.sys.exec("/usr/bin/alist --data $(uci -q get alist.@alist[0].data_dir) password 2>&1 | tail -2 | awk 'NR==1 {print $2}'") - local password = luci.sys.exec("/usr/bin/alist --data $(uci -q get alist.@alist[0].data_dir) password 2>&1 | tail -2 | awk 'NR==2 {print $2}'") + local random = luci.sys.exec("/usr/bin/alist --data $(uci -q get alist.@alist[0].data_dir) admin random 2>&1") + local username = string.match(random, "username: (%S+)") + local password = string.match(random, "password: (%S+)") luci.http.prepare_content("application/json") luci.http.write_json({username = username, password = password}) diff --git a/luci-app-alist/luasrc/model/cbi/alist/basic.lua b/luci-app-alist/luasrc/model/cbi/alist/basic.lua index 5b7723b3e..d390f215f 100644 --- a/luci-app-alist/luasrc/model/cbi/alist/basic.lua +++ b/luci-app-alist/luasrc/model/cbi/alist/basic.lua @@ -86,7 +86,7 @@ o.datatype = "string" o.default = "/tmp/alist" o.rmempty = false -o = s:option(Button, "admin_info", translate("View Password")) +o = s:option(Button, "admin_info", translate("Reset Password")) o.rawhtml = true o.template = "alist/admin_info" diff --git a/luci-app-alist/luasrc/view/alist/admin_info.htm b/luci-app-alist/luasrc/view/alist/admin_info.htm index c593f2806..ba34e91bc 100644 --- a/luci-app-alist/luasrc/view/alist/admin_info.htm +++ b/luci-app-alist/luasrc/view/alist/admin_info.htm @@ -3,7 +3,7 @@ function admin_info(btn) { btn.disabled = true; - btn.value = '<%:Reading...%>'; + btn.value = '<%:Collecting data...%>'; XHR.get('<%=luci.dispatcher.build_url("admin", "nas", "alist", "admin_info")%>', null, function(x,rv) @@ -15,12 +15,12 @@ tb.innerHTML += "<%:Password:%>" + "" + rv.password + ""; } btn.disabled = false; - btn.value = '<%:Read%>'; + btn.value = '<%:Reset%>'; } ); return false; } //]]> - + <%=self.value%> <%+cbi/valuefooter%> \ No newline at end of file diff --git a/luci-app-alist/po/zh-cn/alist.po b/luci-app-alist/po/zh-cn/alist.po index 1f996d933..bd79412b4 100644 --- a/luci-app-alist/po/zh-cn/alist.po +++ b/luci-app-alist/po/zh-cn/alist.po @@ -64,8 +64,11 @@ msgstr "启用日志" msgid "Clear logs" msgstr "清空日志" -msgid "View Password" -msgstr "查看密码" +msgid "Reset Password" +msgstr "重置密码" + +msgid "Reset" +msgstr "重置" msgid "Username:" msgstr "用户名:" @@ -73,12 +76,6 @@ msgstr "用户名:" msgid "Password:" msgstr "密码:" -msgid "Reading..." -msgstr "读取中..." - -msgid "Read" -msgstr "读取" - msgid "Login Validity Period (hours)" msgstr "登录有效期(小时)" diff --git a/luci-app-linkease/Makefile b/luci-app-linkease/Makefile index 935992442..c641f1c53 100644 --- a/luci-app-linkease/Makefile +++ b/luci-app-linkease/Makefile @@ -8,8 +8,9 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for linkease LUCI_DEPENDS:=+linkease LUCI_PKGARCH:=all -PKG_VERSION:=2.1.11 -PKG_RELEASE:=1 +PKG_VERSION:=2.1.12-1 +# PKG_RELEASE MUST be empty for luci.mk +PKG_RELEASE:= LUCI_MINIFY_CSS:=0 LUCI_MINIFY_JS:=0 diff --git a/luci-app-linkease/luasrc/controller/linkease_backend.lua b/luci-app-linkease/luasrc/controller/linkease_backend.lua index aa264e86e..a6e6b3021 100644 --- a/luci-app-linkease/luasrc/controller/linkease_backend.lua +++ b/luci-app-linkease/luasrc/controller/linkease_backend.lua @@ -158,7 +158,7 @@ function linkease_backend() if key == "Transfer-Encoding" and val == "chunked" then chunked = 1 end - if key ~= "Connection" and key ~= "Transfer-Encoding" then + if key ~= "Connection" and key ~= "Transfer-Encoding" and key ~= "Content-Length" then http.header(key, val) end end