From 06bc6ac46b92ccb24fdd45941bab4e8121ab9f9d Mon Sep 17 00:00:00 2001
From: Ycarus <ycarus@zugaina.org>
Date: Thu, 14 Jun 2018 06:22:24 +0200
Subject: [PATCH] Only a warning if ShadowSocks is disabled and fix

---
 .../luasrc/controller/openmptcprouter.lua     |  8 ++++-
 .../luasrc/view/openmptcprouter/wanstatus.htm | 33 ++++++++++++-------
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index 9b6b80276..a64924173 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -263,7 +263,7 @@ function get_ip(interface)
 end
 
 function get_gateway(interface)
-	local gateway = nil
+	local gateway = ""
 	local dump = nil
 
 	dump = require("luci.util").ubus("network.interface.%s" % interface, "status", {})
@@ -350,6 +350,12 @@ function interfaces_status()
 		mArray.openmptcprouter["socks_service"] = true
 	end
 
+	mArray.openmptcprouter["socks_service_enabled"] = true
+	local ss_server = uci:get("shadowsocks-libev","sss0","disabled") or "0"
+	if ss_server == "1" then
+		mArray.openmptcprouter["socks_service_enabled"] = false
+	end
+
 	-- Add DHCP infos by parsing dnsmasq config file
 	mArray.openmptcprouter.dhcpd = {}
 	dnsmasq = ut.trim(sys.exec("cat /var/etc/dnsmasq.conf*"))
diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
index 7d6f64ddc..c1a491544 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
@@ -102,12 +102,14 @@
 					temp += String.format('lan (%s)', mArray.openmptcprouter.local_addr);
 				}
 
-				if (mArray.openmptcprouter.socks_service == false)
-				{
-					statusMessage += 'ShadowSocks is not running<br/>';
-				} else if (mArray.openmptcprouter.ss_addr == "")
-				{
-					statusMessage += 'ShadowSocks not working<br/>';
+				if (mArray.openmptcprouter.socks_service_enabled == true) {
+					if (mArray.openmptcprouter.socks_service == false)
+					{
+						statusMessage += 'ShadowSocks is not running<br/>';
+					} else if (mArray.openmptcprouter.ss_addr == "")
+					{
+						statusMessage += 'ShadowSocks not working<br/>';
+					}
 				}
 				if (mArray.openmptcprouter.tun_service == false)
 				{
@@ -126,11 +128,20 @@
 				{
 					statusMessageClass = "error";
 					statusIcon = "<%=resource%>/openmptcprouter/images/statusError.png";
-				} else if (mArray.openmptcprouter.tun_state == "DOWN")
-				{
-					statusMessageClass = "warning";
-					statusIcon = "<%=resource%>/openmptcprouter/images/statusWarning.png";
-					statusMessage += 'Glorytun VPN tunnel DOWN';
+				} else {
+					if (mArray.openmptcprouter.socks_service_enabled == false)
+					{
+						statusMessage += 'ShadowSocks is DISABLED<br/>';
+					}
+					if (mArray.openmptcprouter.tun_state == "DOWN")
+					{
+						statusMessage += 'VPN tunnel DOWN<br/>';
+					}
+					if (statusMessage !== "")
+					{
+						statusMessageClass = "warning";
+						statusIcon = "<%=resource%>/openmptcprouter/images/statusWarning.png";
+					}
 				}
 				temp += getNetworkNodeTemplate(equipmentIcon, statusIcon, title, statusMessageClass,statusMessage,content);
 				temp += '</a></td>'