From d114eae53d22c2de4b66720548d441096f92bea1 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 18 Sep 2020 20:48:47 +0200
Subject: [PATCH] Use total proxy data in status page

---
 .../luasrc/view/openmptcprouter/wanstatus.htm       | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
index 715554e80..9906d34c5 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
@@ -328,14 +328,9 @@
 					content += _('IPv6:') + " " + mArray.openmptcprouter.wan_addr6;
 					content += '<br />';
 				}
-				if (mArray.openmptcprouter.ss_traffic && mArray.openmptcprouter.ss_traffic != 0)
+				if (mArray.openmptcprouter.proxy_traffic && mArray.openmptcprouter.proxy_traffic != 0)
 				{
-					content += _('Shadowsocks traffic:') + " " + formatBytes(mArray.openmptcprouter.ss_traffic);
-					content += '<br />';
-				}
-				if (mArray.openmptcprouter.v2ray_traffic && mArray.openmptcprouter.v2ray_traffic != 0)
-				{
-					content += _('V2Ray traffic:') + " " + formatBytes(mArray.openmptcprouter.v2ray_traffic);
+					content += _('Proxy traffic:') + " " + formatBytes(mArray.openmptcprouter.proxy_traffic);
 					content += '<br />';
 				}
 				if (mArray.openmptcprouter.vpn_traffic && mArray.openmptcprouter.vpn_traffic != 0)
@@ -343,9 +338,9 @@
 					content += _('VPN traffic:') + " " + formatBytes(mArray.openmptcprouter.vpn_traffic);
 					content += '<br />';
 				}
-				if (mArray.openmptcprouter.v2ray_traffic && mArray.openmptcprouter.ss_traffic && mArray.openmptcprouter.vpn_traffic && mArray.openmptcprouter.vpn_traffic != 0 && mArray.openmptcprouter.ss_traffic != 0)
+				if (mArray.openmptcprouter.total_traffic && mArray.openmptcprouter.total_traffic != 0)
 				{
-					content += _('Total traffic:') + " " + formatBytes(mArray.openmptcprouter.vpn_traffic + mArray.openmptcprouter.ss_traffic + mArray.openmptcprouter.v2ray_traffic);
+					content += _('Total traffic:') + " " + formatBytes(mArray.openmptcprouter.total_traffic);
 					content += '<br />';
 				}
 				content += '<br />';