From 2abf2a5a9f9e6121228fcb8192033fe2f4463533 Mon Sep 17 00:00:00 2001
From: actions <action@github.com>
Date: Fri, 3 May 2024 13:30:04 +0800
Subject: [PATCH] luci-app-passwall: sync upstream

last commit: https://github.com/xiaorouji/openwrt-passwall/commit/760d23b3823d8afeb88f04f3fb47d699f965fee3
---
 luci-app-passwall/luasrc/controller/passwall.lua          | 8 +++++---
 luci-app-passwall/root/etc/uci-defaults/luci-passwall     | 7 ++++++-
 .../root/usr/share/passwall/0_default_config              | 1 +
 patch-luci-app-passwall.patch                             | 8 ++++----
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/luci-app-passwall/luasrc/controller/passwall.lua b/luci-app-passwall/luasrc/controller/passwall.lua
index 31a616497..622e95294 100644
--- a/luci-app-passwall/luasrc/controller/passwall.lua
+++ b/luci-app-passwall/luasrc/controller/passwall.lua
@@ -16,7 +16,7 @@ function index()
 	entry({"admin", "services", appname, "show"}, call("show_menu")).leaf = true
 	entry({"admin", "services", appname, "hide"}, call("hide_menu")).leaf = true
 	if not nixio.fs.access("/etc/config/passwall") then return end
-	if nixio.fs.access("/etc/config/passwall_show") then
+	if ucic:get(appname, "@global[0]", "show_menu") == "1" then
 		e = entry({"admin", "services", appname}, alias("admin", "services", appname, "settings"), _("Pass Wall"), -1)
 		e.dependent = true
 		e.acl_depends = { "luci-app-passwall" }
@@ -91,14 +91,16 @@ function reset_config()
 end
 
 function show_menu()
-	luci.sys.call("touch /etc/config/passwall_show")
+	ucic:set(appname, "@global[0]", "show_menu","1")
+	ucic:commit(appname)
 	luci.sys.call("rm -rf /tmp/luci-*")
 	luci.sys.call("/etc/init.d/rpcd restart >/dev/null")
 	luci.http.redirect(api.url())
 end
 
 function hide_menu()
-	luci.sys.call("rm -rf /etc/config/passwall_show")
+	ucic:set(appname, "@global[0]", "show_menu","0")
+	ucic:commit(appname)
 	luci.sys.call("rm -rf /tmp/luci-*")
 	luci.sys.call("/etc/init.d/rpcd restart >/dev/null")
 	luci.http.redirect(luci.dispatcher.build_url("admin", "status", "overview"))
diff --git a/luci-app-passwall/root/etc/uci-defaults/luci-passwall b/luci-app-passwall/root/etc/uci-defaults/luci-passwall
index 2a5a32404..a59fae811 100755
--- a/luci-app-passwall/root/etc/uci-defaults/luci-passwall
+++ b/luci-app-passwall/root/etc/uci-defaults/luci-passwall
@@ -31,11 +31,16 @@ uci -q batch <<-EOF >/dev/null
 	commit uhttpd
 EOF
 
-touch /etc/config/passwall_show >/dev/null 2>&1
 [ ! -s "/etc/config/passwall" ] && cp -f /usr/share/passwall/0_default_config /etc/config/passwall
 
 chmod +x /usr/share/passwall/*.sh
 
+[ -e "/etc/config/passwall_show" ] && {
+	rm -rf /etc/config/passwall_show
+	uci -q set passwall.@global[0].show_menu=1
+	uci -q commit passwall
+}
+
 rm -f /tmp/luci-indexcache
 rm -rf /tmp/luci-modulecache/
 killall -HUP rpcd 2>/dev/null
diff --git a/luci-app-passwall/root/usr/share/passwall/0_default_config b/luci-app-passwall/root/usr/share/passwall/0_default_config
index 1601d03f0..331951d30 100644
--- a/luci-app-passwall/root/usr/share/passwall/0_default_config
+++ b/luci-app-passwall/root/usr/share/passwall/0_default_config
@@ -1,5 +1,6 @@
 
 config global
+	option show_menu '1'
 	option enabled '0'
 	option socks_enabled '0'
 	option tcp_node 'nil'
diff --git a/patch-luci-app-passwall.patch b/patch-luci-app-passwall.patch
index 4b5b64c00..58bdaa37d 100644
--- a/patch-luci-app-passwall.patch
+++ b/patch-luci-app-passwall.patch
@@ -11,10 +11,10 @@ index 1fb70f5..e1a5538 100644
  
  include $(TOPDIR)/feeds/luci/luci.mk
 diff --git a/luci-app-passwall/luasrc/controller/passwall.lua b/luci-app-passwall/luasrc/controller/passwall.lua
-index bfb8f79..31a6164 100644
+index 626a7bd..622e952 100644
 --- a/luci-app-passwall/luasrc/controller/passwall.lua
 +++ b/luci-app-passwall/luasrc/controller/passwall.lua
-@@ -242,7 +242,7 @@ function connect_status()
+@@ -244,7 +244,7 @@ function connect_status()
  	local e = {}
  	e.use_time = ""
  	local url = luci.http.formvalue("url")
@@ -403,10 +403,10 @@ index 24662de..77b6a0b 100644
  	</div>
  </div>
 diff --git a/luci-app-passwall/root/usr/share/passwall/0_default_config b/luci-app-passwall/root/usr/share/passwall/0_default_config
-index cfe606d..1601d03 100644
+index 0d2bf8f..331951d 100644
 --- a/luci-app-passwall/root/usr/share/passwall/0_default_config
 +++ b/luci-app-passwall/root/usr/share/passwall/0_default_config
-@@ -32,7 +32,7 @@ config global_haproxy
+@@ -33,7 +33,7 @@ config global_haproxy
  config global_delay
  	option auto_on '0'
  	option start_daemon '1'