mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Put VPS error as warning because it is working even if this use a direct output

Browse source
This commit is contained in:
Ycarus 2018-11-28 15:27:16 +01:00
parent efe96abea7
commit 0cf598324b
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
View file

@ -147,9 +147,6 @@
if (mArray.openmptcprouter.socks_service_enabled == false) if (mArray.openmptcprouter.socks_service_enabled == false)
{ {
statusMessage += 'ShadowSocks is DISABLED<br/>'; statusMessage += 'ShadowSocks is DISABLED<br/>';
} else if (mArray.openmptcprouter.ss_addr == "")
{
statusMessage += 'Can\'t get public IP address from ShadowSocks<br/>';
} }
if (mArray.openmptcprouter.tun_state == "DOWN") if (mArray.openmptcprouter.tun_state == "DOWN")
{ {
@ -190,24 +187,29 @@
} }
content = ""; content = "";
statusMessage = ""; statusMessage = "";
if (mArray.openmptcprouter.vps_status == "DOWN")
{
statusMessage += 'Can\'t ping server<br/>';
}
if (mArray.openmptcprouter.wan_addr == "" && mArray.openmptcprouter.ss_addr == "") if (mArray.openmptcprouter.wan_addr == "" && mArray.openmptcprouter.ss_addr == "")
{ {
statusMessage += 'No VPS IP address, No WAN IP address<br/>'; statusMessage += 'No VPS IP address, No WAN IP address<br/>';
} }
if (mArray.openmptcprouter.socks_service_enabled == true && mArray.openmptcprouter.ss_addr == "")
{
statusMessage += 'Can\'t get public IP address from ShadowSocks<br/>';
}
if (statusMessage !== "") if (statusMessage !== "")
{ {
statusMessageClass = "error"; statusMessageClass = "error";
statusIcon = "<%=resource%>/openmptcprouter/images/statusError.png"; statusIcon = "<%=resource%>/openmptcprouter/images/statusError.png";
} else {
if (mArray.openmptcprouter.vps_status == "DOWN")
{
statusMessage += 'Can\'t ping server<br/>';
} else if (mArray.openmptcprouter.socks_service_enabled == true && mArray.openmptcprouter.ss_addr == "")
{
statusMessage += 'Can\'t get public IP address from ShadowSocks<br/>';
} }
if (mArray.openmptcprouter.vps_omr_version) if (statusMessage !== "")
{
statusMessageClass = "warning";
statusIcon = "<%=resource%>/openmptcprouter/images/statusWarning.png";
}
}
if (mArray.openmptcprouter.vps_omr_version && mArray.openmptcprouter.wan_addr !== mArray.openmptcprouter.service_addr)
{ {
content += "Version " + mArray.openmptcprouter.vps_omr_version; content += "Version " + mArray.openmptcprouter.vps_omr_version;
if (mArray.openmptcprouter.latest_version_vps !== mArray.openmptcprouter.vps_omr_version && mArray.openmptcprouter.latest_version_vps !== "") if (mArray.openmptcprouter.latest_version_vps !== mArray.openmptcprouter.vps_omr_version && mArray.openmptcprouter.latest_version_vps !== "")