From 98b7d99b4ca24da4b0588a6b5cfb60a743b0a243 Mon Sep 17 00:00:00 2001
From: Ycarus <ycarus@zugaina.org>
Date: Fri, 2 Nov 2018 20:20:53 +0100
Subject: [PATCH] Use uci for version check

---
 .../luasrc/controller/openmptcprouter.lua                 | 8 +++++++-
 .../luasrc/view/openmptcprouter/wanstatus.htm             | 5 +++--
 .../luasrc/view/openmptcprouter/wizard.htm                | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index b859f7c1c..5d502de8a 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -337,6 +337,7 @@ function wizard_add()
 		ucic:commit("mlvpn")
 	end
 
+	-- Set OpenVPN settings
 	local openvpn_key = luci.http.formvalue("openvpn_key")
 	if openvpn_key ~= "" then
 		local openvpn_key_path = "/etc/luci-uploads/openvpn.key"
@@ -367,6 +368,7 @@ function wizard_add()
 		ucic:commit("openvpn")
 	end
 
+	-- Restart all
 	luci.sys.call("(env -i /bin/ubus call network reload) >/dev/null 2>/dev/null")
 	luci.sys.call("/etc/init.d/shadowsocks restart >/dev/null 2>/dev/null")
 	luci.sys.call("/etc/init.d/glorytun restart >/dev/null 2>/dev/null")
@@ -396,6 +398,7 @@ function settings_add()
 	local disable_ipv6 = luci.http.formvalue("disable_ipv6") or 0
 	set_ipv6_state(disable_ipv6)
 
+	-- Enable/disable obfs
 	local obfs = luci.http.formvalue("obfs") or 0
 	ucic:foreach("shadowsocks-libev", "ss_redir", function (section)
 		ucic:set("shadowsocks-libev",section[".name"],"obfs",obfs)
@@ -430,6 +433,7 @@ function settings_add()
 	ucic:save("openmptcprouter")
 	ucic:commit("openmptcprouter")
 
+	-- Apply all settings
 	luci.sys.call("/etc/init.d/openmptcprouter restart >/dev/null 2>/dev/null")
 
 	-- Done, redirect
@@ -497,6 +501,7 @@ end
 -- Copyright 2015 OVH <OverTheBox@ovh.net>
 -- Simon Lelievre (simon.lelievre@corp.ovh.com)
 -- Sebastien Duponcheel <sebastien.duponcheel@ovh.net>
+-- Modified by Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
 -- Under GPL3+
 function interfaces_status()
 	local ut      = require "luci.util"
@@ -507,7 +512,8 @@ function interfaces_status()
 
 	-- OpenMPTCProuter info
 	mArray.openmptcprouter = {}
-	mArray.openmptcprouter["version"] = ut.trim(sys.exec("cat /etc/os-release | grep VERSION= | sed -e 's:VERSION=::'"))
+	--mArray.openmptcprouter["version"] = ut.trim(sys.exec("cat /etc/os-release | grep VERSION= | sed -e 's:VERSION=::'"))
+	mArray.openmptcprouter["version"] = uci:get("openmptcprouter", "settings", "version") or ut.trim(sys.exec("cat /etc/os-release | grep VERSION= | sed -e 's:VERSION=::' -e 's/^.//' -e 's/.$//'"))
 
 	mArray.openmptcprouter["latest_version_omr"] = uci:get("openmptcprouter", "latest_versions", "omr") or ""
 	mArray.openmptcprouter["latest_version_vps"] = uci:get("openmptcprouter", "latest_versions", "vps") or ""
diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
index 7c4118e31..198a5b5f4 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
@@ -73,8 +73,9 @@
 
 				if (mArray.openmptcprouter.version)
 				{
-					content += "Version " + mArray.openmptcprouter.version.replace(/\"/g,'');
-					if (mArray.openmptcprouter.latest_version_omr)
+					//content += "Version " + mArray.openmptcprouter.version.replace(/\"/g,'');
+					content += "Version " + mArray.openmptcprouter.version;
+					if (mArray.openmptcprouter.latest_version_omr != mArray.openmptcprouter.version)
 					{
 						content += "<br><i>(Latest available version " + mArray.openmptcprouter.latest_version_omr + ")</i>";
 					}
diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
index c0f113692..dfa977e38 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
@@ -72,7 +72,7 @@ end
 		    <input type="text" name="shadowsocks_key" placeholder="ShadowSocks key" class="cbi-input-text" value="<%=uci:get("shadowsocks-libev","sss0","key")%>" data-type="base64">
 		    <br />
 		    <div class="cbi-value-description">
-		        <%:ShadowSocks is used for TCP%>
+		        <%:ShadowSocks is used for TCP. Empty to disable.%>
 		    </div>
 		</div>
 	    </div>