From 3da2d267bdca86e799d1d0703cc13acad79d9578 Mon Sep 17 00:00:00 2001 From: actions Date: Sat, 30 Mar 2024 03:30:05 +0800 Subject: [PATCH] luci-app-passwall2: sync upstream --- luci-app-passwall2/Makefile | 2 +- .../passwall2/node_list/link_share_man.htm | 19 ++++++++++++------- .../root/usr/share/passwall2/subscribe.lua | 11 ++++++++--- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/luci-app-passwall2/Makefile b/luci-app-passwall2/Makefile index f95b63a85..346f60212 100644 --- a/luci-app-passwall2/Makefile +++ b/luci-app-passwall2/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall2 -PKG_VERSION:=1.28-4 +PKG_VERSION:=1.28-5 PKG_RELEASE:= PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall2/luasrc/view/passwall2/node_list/link_share_man.htm b/luci-app-passwall2/luasrc/view/passwall2/node_list/link_share_man.htm index 06bb68498..626cf5ceb 100644 --- a/luci-app-passwall2/luasrc/view/passwall2/node_list/link_share_man.htm +++ b/luci-app-passwall2/luasrc/view/passwall2/node_list/link_share_man.htm @@ -114,20 +114,25 @@ local api = require "luci.passwall2.api" } return ret; }, - query: function (param, src, default_value, tval = "1", fval = "0") { - var ret = "&" + param + "="; + query: function (param, src, default_value) { var obj = this.get(src); if (obj) { + var ret = "&" + param + "="; if (obj.type === "checkbox") { - return ret + (obj.checked === true ? tval : fval); + return ret + (obj.checked === true ? "1" : "0"); } else { var result = encodeURIComponent(obj.value); - if ((result == null || result.trim() == "") && default_value) - result = default_value; - return ret + result; + if (result == null || result.trim() == "") { + if (default_value) { + return ret + default_value; + } + return ""; + } else { + return ret + result; + } } } - return "" + return ""; } } opt.base = "cbid." + urlname + "." + sid; diff --git a/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua b/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua index 475d1f3a5..bce5a2c7a 100755 --- a/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua +++ b/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua @@ -594,7 +594,9 @@ local function processData(szType, content, add_mode, add_from) local params = {} for _, v in pairs(split(query[2], '&')) do local t = split(v, '=') - params[string.lower(t[1])] = UrlDecode(t[2]) + if #t > 1 then + params[string.lower(t[1])] = UrlDecode(t[2]) + end end -- [2001:4860:4860::8888]:443 -- 8.8.8.8:443 @@ -838,7 +840,9 @@ local function processData(szType, content, add_mode, add_from) local params = {} for _, v in pairs(split(query[2], '&')) do local t = split(v, '=') - params[string.lower(t[1])] = UrlDecode(t[2]) + if #t > 1 then + params[string.lower(t[1])] = UrlDecode(t[2]) + end end -- [2001:4860:4860::8888]:443 -- 8.8.8.8:443 @@ -1186,7 +1190,8 @@ local function parse_link(raw, add_mode, add_from) tinsert(node_list, result) end end - end, function () + end, function (err) + --log(err) log(v, "解析错误，跳过此节点。") end )