From 9c8491fb79a70a47cbb61cd577ae293f87044461 Mon Sep 17 00:00:00 2001 From: Ycarus Date: Tue, 8 Jan 2019 16:57:06 +0100 Subject: [PATCH] Display when key is empty and method not none --- .../luasrc/controller/openmptcprouter.lua | 7 +++++++ .../luasrc/view/openmptcprouter/wanstatus.htm | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua index 270a97b75..fa0292aab 100644 --- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua +++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua @@ -792,6 +792,13 @@ function interfaces_status() if ss_server == "1" then mArray.openmptcprouter["socks_service_enabled"] = false end + local ss_key = uci:get("shadowsocks-libev","sss0","key") or "" + mArray.openmptcprouter["socks_service_method"] = uci:get("shadowsocks-libev","sss0","method") + if ss_key == "" then + mArray.openmptcprouter["socks_service_key"] = false + else + mArray.openmptcprouter["socks_service_key"] = true + end -- Add DHCP infos by parsing dnsmasq config file mArray.openmptcprouter.dhcpd = {} diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm index d3330cc1e..158282c54 100644 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm +++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm @@ -132,7 +132,12 @@ { if (mArray.openmptcprouter.socks_service == false) { - statusMessage += 'ShadowSocks is not running
'; + statusMessage += 'ShadowSocks is not running'; + if (mArray.openmptcprouter.socks_service_key == false && mArray.openmptcprouter.socks_service_method !== "none") + { + statusMessage += ' (empty key)'; + } + statusMessage += '
'; } } if (mArray.openmptcprouter.tun_service == false)