mirror of
https://github.com/Ysurac/openmptcprouter-feeds.git
synced 2025-03-09 15:40:03 +00:00
V2ray support to status page and wizard
This commit is contained in:
parent
8cd9e76fee
commit
1218fea5b1
2 changed files with 47 additions and 15 deletions
|
@ -146,18 +146,26 @@
|
|||
}
|
||||
}
|
||||
|
||||
if (mArray.openmptcprouter.socks_service_enabled == true && mArray.openmptcprouter.service_addr != "")
|
||||
if (mArray.openmptcprouter.shadowsocks_enabled == true && mArray.openmptcprouter.service_addr != "")
|
||||
{
|
||||
if (mArray.openmptcprouter.socks_service == false)
|
||||
if (mArray.openmptcprouter.shadowsocks_service == false)
|
||||
{
|
||||
statusMessage += _('ShadowSocks is not running');
|
||||
if (mArray.openmptcprouter.socks_service_key == false && mArray.openmptcprouter.socks_service_method !== "none")
|
||||
if (mArray.openmptcprouter.shadowsocks_service_key == false && mArray.openmptcprouter.shadowsocks_service_method !== "none")
|
||||
{
|
||||
statusMessage += ' <i>(' + _('empty key') + ')</i>';
|
||||
}
|
||||
statusMessage += '<br/>';
|
||||
}
|
||||
}
|
||||
if (mArray.openmptcprouter.v2ray_enabled == true && mArray.openmptcprouter.service_addr != "")
|
||||
{
|
||||
if (mArray.openmptcprouter.v2ray_service == false)
|
||||
{
|
||||
statusMessage += _('V2Ray is not running');
|
||||
statusMessage += '<br/>';
|
||||
}
|
||||
}
|
||||
if (mArray.openmptcprouter.fsro == true)
|
||||
{
|
||||
statusMessage += _('Filesystem is readonly') + '<br/>';
|
||||
|
@ -181,9 +189,9 @@
|
|||
statusIcon = "<%=resource%>/openmptcprouter/images/statusError.png";
|
||||
} else if (mArray.openmptcprouter.service_addr != "")
|
||||
{
|
||||
if (mArray.openmptcprouter.socks_service_enabled == false)
|
||||
if (mArray.openmptcprouter.v2ray_enabled == false && mArray.openmptcprouter.shadowsocks_enabled == false)
|
||||
{
|
||||
statusMessage += _('ShadowSocks is DISABLED') + '<br/>';
|
||||
statusMessage += _('Proxy is DISABLED') + '<br/>';
|
||||
}
|
||||
if (mArray.openmptcprouter.tun_state == "DOWN")
|
||||
{
|
||||
|
@ -255,7 +263,7 @@
|
|||
if (mArray.openmptcprouter.vps_status == "DOWN")
|
||||
{
|
||||
statusMessage += _('Can\'t ping server') + '<br/>';
|
||||
} else if (mArray.openmptcprouter.socks_service_enabled == true && mArray.openmptcprouter.ss_addr == "" && mArray.openmptcprouter.external_check == true)
|
||||
} else if (mArray.openmptcprouter.shadowsocks_enabled == true && mArray.openmptcprouter.ss_addr == "" && mArray.openmptcprouter.external_check == true)
|
||||
{
|
||||
statusMessage += _('Can\'t get public IP address from ShadowSocks') + '<br/>';
|
||||
} else if (mArray.openmptcprouter.wan_addr == "" && mArray.openmptcprouter.external_check == true)
|
||||
|
@ -320,19 +328,24 @@
|
|||
content += _('IPv6:') + " " + mArray.openmptcprouter.wan_addr6;
|
||||
content += '<br />';
|
||||
}
|
||||
if (mArray.openmptcprouter.socks_service_enabled == true && mArray.openmptcprouter.ss_traffic && mArray.openmptcprouter.ss_traffic != 0)
|
||||
if (mArray.openmptcprouter.ss_traffic && mArray.openmptcprouter.ss_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 += '<br />';
|
||||
}
|
||||
if (mArray.openmptcprouter.vpn_traffic && mArray.openmptcprouter.vpn_traffic != 0)
|
||||
{
|
||||
content += _('VPN traffic:') + " " + formatBytes(mArray.openmptcprouter.vpn_traffic);
|
||||
content += '<br />';
|
||||
}
|
||||
if (mArray.openmptcprouter.ss_traffic && mArray.openmptcprouter.vpn_traffic && mArray.openmptcprouter.vpn_traffic != 0 && mArray.openmptcprouter.ss_traffic != 0)
|
||||
if (mArray.openmptcprouter.v2ray_traffic && mArray.openmptcprouter.ss_traffic && mArray.openmptcprouter.vpn_traffic && mArray.openmptcprouter.vpn_traffic != 0 && mArray.openmptcprouter.ss_traffic != 0)
|
||||
{
|
||||
content += _('Total traffic:') + " " + formatBytes(mArray.openmptcprouter.vpn_traffic + mArray.openmptcprouter.ss_traffic);
|
||||
content += _('Total traffic:') + " " + formatBytes(mArray.openmptcprouter.vpn_traffic + mArray.openmptcprouter.ss_traffic + mArray.openmptcprouter.v2ray_traffic);
|
||||
content += '<br />';
|
||||
}
|
||||
content += '<br />';
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue