luci: compatible

luci-app-passwall/Makefile

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall
 PKG_VERSION:=4.62
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \

luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua

@@ -261,4 +261,11 @@ o.remove = function(self, section, value)
 	fs.writefile(hosts, "")
 end
 
+if sys.call('[ -f "/www/luci-static/resources/uci.js" ]') == 0 then
+	m.apply_on_parse = true
+	function m.on_apply(self)
+		luci.sys.call("/etc/init.d/passwall reload > /dev/null 2>&1 &")
+	end
+end
+
 return m

luci-app-passwall/luasrc/passwall/util_xray.lua

@@ -636,7 +636,7 @@ function gen_config(var)
 					if not observatory then
 						observatory = {
 							subjectSelector = { "blc-" },
-							probeUrl = _node.useCustomProbeUrl == true and _node.probeUrl or nil,
+							probeUrl = _node.useCustomProbeUrl and _node.probeUrl or nil,
 							probeInterval = _node.probeInterval or "1m",
 							enableConcurrency = node.type == "Xray" and true or nil --这里只判断顶层节点(分流总节点/单独的负载均衡节点)类型为Xray，就可以启用并发
 						}