From e6291ef4d851002ed644a61f005e6f97ce3cfc11 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@project-openwrt.eu.org>
Date: Sun, 20 Sep 2020 00:12:26 +0800
Subject: [PATCH] luci-app-passwall: bump to 3.9-61

---
 package/lienol/luci-app-passwall/Makefile     |  4 +--
 .../luasrc/model/cbi/passwall/client/acl.lua  |  2 +-
 .../model/cbi/passwall/client/global.lua      | 20 +++++++------
 .../model/cbi/passwall/client/node_list.lua   | 13 ++++++---
 .../model/cbi/passwall/server/index.lua       |  6 ++--
 .../view/passwall/global/socks_status.htm     |  3 --
 .../view/passwall/node_list/auto_ping.htm     |  3 --
 .../view/passwall/node_list/node_list.htm     | 29 ++++++++++---------
 .../luasrc/view/passwall/node_list/ping.htm   | 11 -------
 .../view/passwall/server/users_status.htm     |  3 --
 .../root/usr/share/passwall/app.sh            | 16 +++++-----
 11 files changed, 51 insertions(+), 59 deletions(-)
 delete mode 100644 package/lienol/luci-app-passwall/luasrc/view/passwall/global/socks_status.htm
 delete mode 100644 package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/auto_ping.htm
 delete mode 100644 package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/ping.htm
 delete mode 100644 package/lienol/luci-app-passwall/luasrc/view/passwall/server/users_status.htm

diff --git a/package/lienol/luci-app-passwall/Makefile b/package/lienol/luci-app-passwall/Makefile
index 0e1481df3f..e38560b7a4 100644
--- a/package/lienol/luci-app-passwall/Makefile
+++ b/package/lienol/luci-app-passwall/Makefile
@@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall
 PKG_VERSION:=3.9
-PKG_RELEASE:=60
-PKG_DATE:=20200917
+PKG_RELEASE:=61
+PKG_DATE:=20200919
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/acl.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/acl.lua
index d68b2143f2..78fc29f06c 100644
--- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/acl.lua
+++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/acl.lua
@@ -73,7 +73,7 @@ o:value("default", translate("Default"))
 o:value("disable", translate("No Proxy"))
 o:value("global", translate("Global Proxy"))
 o:value("gfwlist", translate("GFW List"))
-o:value("chnroute", translate("Game Mode") .. "（" .. translate("Not China List") .. "）")
+o:value("chnroute", translate("Game Mode"))
 o:value("returnhome", translate("China List"))
 
 ---- TCP No Redir Ports
diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
index d116e3e93b..436c072888 100644
--- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
+++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
@@ -249,26 +249,28 @@ o.rmempty = false
 o:value("disable", translate("No Proxy"))
 o:value("global", translate("Global Proxy"))
 o:value("gfwlist", translate("GFW List"))
-o:value("chnroute", translate("Game Mode") .. "（" .. translate("Not China List") .. "）")
+o:value("chnroute", translate("Game Mode"))
 o:value("returnhome", translate("China List"))
 
 ---- Localhost TCP Proxy Mode
 o = s:taboption("Proxy", ListValue, "localhost_tcp_proxy_mode", translate("Router Localhost") .. "TCP" .. translate("Proxy Mode"))
 -- o.description = translate("The server client can also use this rule to scientifically surf the Internet.")
 o:value("default", translate("Default"))
+o:value("global", translate("Global Proxy"))
 o:value("gfwlist", translate("GFW List"))
 o:value("chnroute", translate("Not China List"))
-o:value("global", translate("Global Proxy"))
+o:value("returnhome", translate("China List"))
 o.default = "default"
 o.rmempty = false
 
 ---- Localhost UDP Proxy Mode
 o = s:taboption("Proxy", ListValue, "localhost_udp_proxy_mode", translate("Router Localhost") .. "UDP" .. translate("Proxy Mode"))
-o:value("disable", translate("No Proxy"))
 o:value("default", translate("Default"))
-o:value("gfwlist", translate("GFW List"))
-o:value("chnroute", translate("Game Mode") .. "（" .. translate("Not China List") .. "）")
 o:value("global", translate("Global Proxy"))
+o:value("gfwlist", translate("GFW List"))
+o:value("chnroute", translate("Game Mode"))
+o:value("returnhome", translate("China List"))
+o:value("disable", translate("No Proxy"))
 o.default = "default"
 o.rmempty = false
 
@@ -287,7 +289,10 @@ function s.create(e, t)
 end
 
 o = s:option(DummyValue, "status", translate("Status"))
-o.template = appname .. "/global/socks_status"
+o.rawhtml = true
+o.cfgvalue = function(t, n)
+    return string.format('<font class="_status" socks_id="%s"></font>', n)
+end
 
 ---- Enable
 o = s:option(Flag, "enabled", translate("Enable"))
@@ -306,9 +311,6 @@ o.default = 9050
 o.datatype = "port"
 o.rmempty = false
 
----- Tips
---m:append(Template(appname .. "/global/tips"))
-
 m:append(Template(appname .. "/global/footer"))
 
 --[[
diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/node_list.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/node_list.lua
index 1348658d48..4a2a73aee4 100644
--- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/node_list.lua
+++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/node_list.lua
@@ -133,10 +133,15 @@ end
 ---- Ping
 o = s:option(DummyValue, "ping", translate("Latency"))
 o.width = "8%"
-if not nodes_ping:find("auto_ping") then
-    o.template = appname .. "/node_list/ping"
-else
-    o.template = appname .. "/node_list/auto_ping"
+o.rawhtml = true
+o.cfgvalue = function(t, n)
+    local result = "---"
+    if not nodes_ping:find("auto_ping") then
+        result = string.format('<span class="ping"><a href="javascript:void(0)" onclick="javascript:ping_node(\'%s\',this)">Ping</a></span>', n)
+    else
+        result = string.format('<span class="ping_value" cbiid="%s">---</span>', n)
+    end
+    return result
 end
 
 m:append(Template(appname .. "/node_list/node_list"))
diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/index.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/index.lua
index f77beaeaf2..905588edda 100644
--- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/index.lua
+++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/index.lua
@@ -34,8 +34,10 @@ e.width = "5%"
 e.rmempty = false
 
 e = t:option(DummyValue, "status", translate("Status"))
-e.template = "passwall/server/users_status"
-e.value = translate("Collecting data...")
+e.rawhtml = true
+e.cfgvalue = function(t, n)
+    return string.format('<font class="_users_status">%s</font>', translate("Collecting data..."))
+end
 
 e = t:option(DummyValue, "remarks", translate("Remarks"))
 e.width = "15%"
diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/global/socks_status.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/global/socks_status.htm
deleted file mode 100644
index c2e131818d..0000000000
--- a/package/lienol/luci-app-passwall/luasrc/view/passwall/global/socks_status.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<%+cbi/valueheader%>
-<font class="_status" socks_id="<%=section%>"></font>
-<%+cbi/valuefooter%>
\ No newline at end of file
diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/auto_ping.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/auto_ping.htm
deleted file mode 100644
index c54774e34c..0000000000
--- a/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/auto_ping.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<%+cbi/valueheader%>
-<span class="auto_ping_value" cbiid="<%=section%>">---</span>
-<%+cbi/valuefooter%>
\ No newline at end of file
diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm
index 8eae27d1ab..8e431f7967 100644
--- a/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm
+++ b/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm
@@ -34,6 +34,9 @@ table td, .table .td {
 ._select {
 	background: #dad8d8;
 }
+.ping a:hover{
+	text-decoration : underline;
+}
 </style>
 
 <script type="text/javascript">
@@ -239,9 +242,9 @@ table td, .table .td {
 	
 	/* 自动Ping */
 	var nodes = [];
-	const auto_ping_value = document.getElementsByClassName('auto_ping_value');
-	for (var i = 0; i < auto_ping_value.length; i++) {
-		var cbi_id = auto_ping_value[i].getAttribute("cbiid");
+	const ping_value = document.getElementsByClassName('ping_value');
+	for (var i = 0; i < ping_value.length; i++) {
+		var cbi_id = ping_value[i].getAttribute("cbiid");
 		var full = get_address_full(cbi_id);
 		if (full != null) {
 			var flag = false;
@@ -277,15 +280,15 @@ table td, .table .td {
 						var strs = dom.indexs.split(",");
 						for (var i = 0; i < strs.length; i++) {
 							if (result.ping == null || result.ping.trim() == "") {
-								auto_ping_value[strs[i]].innerHTML = "<font style='color:red'><%:Timeout%></font>";
+								ping_value[strs[i]].innerHTML = "<font style='color:red'><%:Timeout%></font>";
 							} else {
 								var ping = parseInt(result.ping);
 								if (ping < 100)
-									auto_ping_value[strs[i]].innerHTML = "<font style='color:green'>" + result.ping + " ms" + "</font>";
+									ping_value[strs[i]].innerHTML = "<font style='color:green'>" + result.ping + " ms" + "</font>";
 								else if (ping < 200)
-									auto_ping_value[strs[i]].innerHTML = "<font style='color:#fb9a05'>" + result.ping + " ms" + "</font>";
+									ping_value[strs[i]].innerHTML = "<font style='color:#fb9a05'>" + result.ping + " ms" + "</font>";
 								else if (ping >= 200)
-									auto_ping_value[strs[i]].innerHTML = "<font style='color:red'>" + result.ping + " ms" + "</font>";
+									ping_value[strs[i]].innerHTML = "<font style='color:red'>" + result.ping + " ms" + "</font>";
 							}
 						}
 					}
@@ -295,7 +298,7 @@ table td, .table .td {
 				function(x) {
 					var strs = dom.indexs.split(",");
 					for (var i = 0; i < strs.length; i++) {
-						auto_ping_value[strs[i]].innerHTML = "<font style='color:red'><%:Timeout%></font>";
+						ping_value[strs[i]].innerHTML = "<font style='color:red'><%:Timeout%></font>";
 					}
 					res();
 				}
@@ -333,15 +336,15 @@ table td, .table .td {
 					var strs = indexs.split(",");
 					for (var i = 0; i < strs.length; i++) {
 						if (result.ping == null || result.ping.trim() == "") {
-							auto_ping_value[strs[i]].innerHTML = "<font style='color:red'><%:Timeout%></font>";
+							ping_value[strs[i]].innerHTML = "<font style='color:red'><%:Timeout%></font>";
 						} else {
 							var ping = parseInt(result.ping);
 							if (ping < 100)
-								auto_ping_value[strs[i]].innerHTML = "<font style='color:green'>" + result.ping + " ms" + "</font>";
+								ping_value[strs[i]].innerHTML = "<font style='color:green'>" + result.ping + " ms" + "</font>";
 							else if (ping < 200)
-								auto_ping_value[strs[i]].innerHTML = "<font style='color:#fb9a05'>" + result.ping + " ms" + "</font>";
+								ping_value[strs[i]].innerHTML = "<font style='color:#fb9a05'>" + result.ping + " ms" + "</font>";
 							else if (ping >= 200)
-								auto_ping_value[strs[i]].innerHTML = "<font style='color:red'>" + result.ping + " ms" + "</font>";
+								ping_value[strs[i]].innerHTML = "<font style='color:red'>" + result.ping + " ms" + "</font>";
 						}
 					}
 				}
@@ -351,7 +354,7 @@ table td, .table .td {
 			function(x) {
 				var strs = indexs.split(",");
 				for (var i = 0; i < strs.length; i++) {
-					auto_ping_value[strs[i]].innerHTML = "<font style='color:red'><%:Timeout%></font>";
+					ping_value[strs[i]].innerHTML = "<font style='color:red'><%:Timeout%></font>";
 				}
 				index++;
 				return auto_ping();
diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/ping.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/ping.htm
deleted file mode 100644
index bb8dc0ae3e..0000000000
--- a/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/ping.htm
+++ /dev/null
@@ -1,11 +0,0 @@
-<style>
-.ping a:hover{
-	text-decoration : underline;
-}
-</style>
-
-<%+cbi/valueheader%>
-<span class="ping">
-	<a href="javascript:void(0)" onclick="javascript:ping_node('<%=section%>',this)">Ping</a>
-</span>
-<%+cbi/valuefooter%>
diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/server/users_status.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/server/users_status.htm
deleted file mode 100644
index 90f42b6ecd..0000000000
--- a/package/lienol/luci-app-passwall/luasrc/view/passwall/server/users_status.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<%+cbi/valueheader%>
-<font class="_users_status" hint="<%=self:cfgvalue(section)%>">--</font>
-<%+cbi/valuefooter%>
\ No newline at end of file
diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh b/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh
index 49fa473747..d903323b44 100755
--- a/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh
+++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh
@@ -844,9 +844,9 @@ add_dnsmasq() {
 		hosts_foreach "servers" host_from_url | grep -v "google.c" | grep '[a-zA-Z]$' | sort -u | gen_dnsmasq_items "vpsiplist" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/01-vpsiplist_host.conf"
 		echolog "  - [$?]节点列表中的域名(vpsiplist)：${fwd_dns:-默认}"
 
-		#始终用国内DNS解析直连（白名单）列表		
+		#始终用国内DNS解析直连（白名单）列表
 		fwd_dns="${LOCAL_DNS}"
-		#如果使用Chinadns-NG直接交给Chinadns-NG处理
+		#如果使用ChinaDNS-NG则直接交给它处理
 		[ "$CHINADNS_NG" = "1" ] && unset fwd_dns
 		#如果没使用chnlist直接使用默认DNS
 		[ "${USE_CHNLIST}" = "0" ] && unset fwd_dns
@@ -858,9 +858,9 @@ add_dnsmasq() {
 			fwd_dns="${LOCAL_DNS}"
 			[ -n "${returnhome}" ] || [ -n "${chnlist}" ] && {
 				[ -n "${global}" ] && unset fwd_dns
-				#如果使用Chinadns-NG直接交给Chinadns-NG处理
+				#如果使用Chinadns-NG直接交给它处理
 				[ "$CHINADNS_NG" = "1" ] && unset fwd_dns
-				#如果使用回国模式，设置dns为远程DNS。
+				#如果使用回国模式，设置DNS为远程DNS。
 				[ -n "${returnhome}" ] && fwd_dns="${TUN_DNS}"
 				sort -u "${RULES_PATH}/chnlist" | gen_dnsmasq_items "chnroute" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/chinalist_host.conf"
 				echolog "  - [$?]中国域名表(chnroute)：${fwd_dns:-默认}"
@@ -869,7 +869,7 @@ add_dnsmasq() {
 
 		#始终使用远程DNS解析代理（黑名单）列表
 		fwd_dns="${TUN_DNS}"
-		#如果使用Chinadns-NG直接交给Chinadns-NG处理
+		#如果使用Chinadns-NG直接交给它处理
 		[ "$CHINADNS_NG" = "1" ] && unset fwd_dns
 		#如果使用chnlist直接使用默认DNS
 		[ "${USE_CHNLIST}" = "1" ] && unset fwd_dns
@@ -881,7 +881,7 @@ add_dnsmasq() {
 		#如果没有使用回国模式
 		[ -z "${returnhome}" ] && {
 			fwd_dns="${TUN_DNS}"
-			#如果使用Chinadns-NG直接交给Chinadns-NG处理
+			#如果使用Chinadns-NG直接交给它处理
 			[ "$CHINADNS_NG" = "1" ] && unset fwd_dns
 			#如果使用chnlist直接使用默认DNS
 			[ "${USE_CHNLIST}" = "1" ] && unset fwd_dns
@@ -893,7 +893,7 @@ add_dnsmasq() {
 		#如果开启了通过代理订阅
 		[ "$(config_t_get global_subscribe subscribe_proxy 0)" = "1" ] && {
 			fwd_dns="${TUN_DNS}"
-			#如果使用Chinadns-NG直接交给Chinadns-NG处理
+			#如果使用Chinadns-NG直接交给它处理
 			[ "$CHINADNS_NG" = "1" ] && unset fwd_dns
 			#如果使用chnlist直接使用默认DNS
 			[ "${USE_CHNLIST}" = "1" ] && unset fwd_dns
@@ -912,7 +912,7 @@ add_dnsmasq() {
 		#兼容旧版dnsmasq
 		echo "conf-dir=${TMP_DNSMASQ_PATH}" > "${DNSMASQ_PATH}/dnsmasq-${CONFIG}.conf"
 
-		[ "${USE_CHNLIST}" = "1" ] && servers="${TUN_DNS}"
+		[ "${USE_CHNLIST}" = "1" ] && [ -z "${returnhome}" ] && [ -n "${chnlist}" ] && servers="${TUN_DNS}"
 		[ -n "${chnlist}" ] && msg="中国列表以外"
 		[ -n "${returnhome}" ] && msg="中国列表"
 		[ -n "${global}" ] && msg="全局"