diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua index 37954d367..ac9f8995b 100644 --- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua +++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua @@ -785,6 +785,7 @@ function interfaces_status() mArray.openmptcprouter["vps_admin"] = false mArray.openmptcprouter["vps_admin_error"] = false mArray.openmptcprouter["vps_admin_error_msg"] = "Not found" + mArray.openmptcprouter["vps_hostname"] = "OpenMPTCProuter Server" -- Get VPS info ucic:foreach("openmptcprouter", "server", function(s) local serverip = uci:get("openmptcprouter",s[".name"],"ip") or "" @@ -807,6 +808,7 @@ function interfaces_status() mArray.openmptcprouter["vps_loadavg"] = vpsinfo.vps.loadavg or "" mArray.openmptcprouter["vps_uptime"] = vpsinfo.vps.uptime or "" mArray.openmptcprouter["vps_mptcp"] = vpsinfo.vps.mptcp or "" + mArray.openmptcprouter["vps_hostname"] = vpsinfo.vps.hostname or "OpenMPTCProuter Server" mArray.openmptcprouter["vps_admin"] = true mArray.openmptcprouter["vps_status"] = "UP" mArray.openmptcprouter["vps_admin_error_msg"] = "" diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm index 740f3cd5c..c6bc6438a 100644 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm +++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm @@ -192,18 +192,18 @@ var equipmentIcon = ''; if (mArray.openmptcprouter.wan_addr == mArray.openmptcprouter.service_addr) { - var title = String.format("OpenMPTCProuter Server (%s)", mArray.openmptcprouter.wan_addr); + var title = String.format("%s (%s)", mArray.openmptcprouter.vps_hostname, mArray.openmptcprouter.wan_addr); } else if (mArray.openmptcprouter.wan_addr != "" && mArray.openmptcprouter.service_addr == "127.0.0.1") { - var title = String.format("OpenMPTCProuter Server (%s)", mArray.openmptcprouter.wan_addr); + var title = String.format("%s (%s)", mArray.openmptcprouter.vps_hostname, mArray.openmptcprouter.wan_addr); } else if (mArray.openmptcprouter.wan_addr != "") { var title = String.format("Direct output (%s)", mArray.openmptcprouter.wan_addr); } else if (mArray.openmptcprouter.ss_addr != "" && mArray.openmptcprouter.vps_status != "DOWN") { - var title = String.format("OpenMPTCProuter Server (%s)", mArray.openmptcprouter.ss_addr); + var title = String.format("%s (%s)", mArray.openmptcprouter.vps_hostname, mArray.openmptcprouter.ss_addr); } else if (mArray.openmptcprouter.external_check == false) { - var title = String.format("OpenMPTCProuter Server ?"); + var title = String.format("%s ?", mArray.openmptcprouter.vps_hostname); } else { var title = "No output"; } @@ -215,7 +215,7 @@ } if (mArray.openmptcprouter.wan_addr !== "" && mArray.openmptcprouter.vps_status == "DOWN") { - statusMessage += 'Can\'t access and use OpenMPTCProuter server
'; + statusMessage += 'Can\'t access and use server part
'; } if (statusMessage !== "") {