X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fluci-mod-admin-full%2Fluasrc%2Fview%2Fadmin_network%2Fdiagnostics.htm;h=f4adb26069468935ed345b04398ee23dd432a7f0;hp=bd60924f0408b246f15c01e55a20dfc2960a0c47;hb=1367f7b624e9ee926cdbd3235a9fec4450c904b5;hpb=7a3493b1f7d75a3945279115324cf2ff4da26b7b

diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm
index bd60924f0..f4adb2606 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm
@@ -1,5 +1,5 @@
 <%#
- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+ Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
  Licensed to the public under the Apache License 2.0.
 -%>
 
@@ -9,6 +9,10 @@
 local fs   = require "nixio.fs"
 local has_ping6 = fs.access("/bin/ping6") or fs.access("/usr/bin/ping6")
 local has_traceroute6 = fs.access("/usr/bin/traceroute6")
+
+local dns_host = luci.config.diag and luci.config.diag.dns or "dev.openwrt.org"
+local ping_host = luci.config.diag and luci.config.diag.ping or "dev.openwrt.org"
+local route_host = luci.config.diag and luci.config.diag.route or "dev.openwrt.org"
 %>
 
 <script type="text/javascript" src="<%=resource%>/cbi.js"></script>
@@ -34,7 +38,7 @@ local has_traceroute6 = fs.access("/usr/bin/traceroute6")
 			legend.parentNode.style.display = 'block';
 			legend.style.display = 'inline';
 
-			stxhr.get('<%=luci.dispatcher.build_url("admin", "network")%>/diag_' + tool + protocol + '/' + addr, null,
+			stxhr.post('<%=url('admin/network')%>/diag_' + tool + protocol + '/' + addr, { token: '<%=token%>' },
 				function(x)
 				{
 					if (x.responseText)
@@ -53,9 +57,9 @@ local has_traceroute6 = fs.access("/usr/bin/traceroute6")
 	}
 //]]></script>
 
-<form method="post" action="<%=pcdata(luci.http.getenv("REQUEST_URI"))%>">
+<form method="post" action="<%=url('admin/network/diagnostics')%>">
 	<div class="cbi-map">
-		<h2><a id="content" name="content"><%:Diagnostics%></a></h2>
+		<h2 name="content"><%:Diagnostics%></h2>
 
 		<fieldset class="cbi-section">
 			<legend><%:Network Utilities%></legend>
@@ -63,7 +67,7 @@ local has_traceroute6 = fs.access("/usr/bin/traceroute6")
 			<br />
 
 			<div style="width:30%; float:left">
-				<input style="margin: 5px 0" type="text" value="openwrt.org" name="ping" /><br />
+				<input style="margin: 5px 0" type="text" value="<%=ping_host%>" name="ping" /><br />
 				<% if has_ping6 then %>
 				<select name="ping_proto" style="width:auto">
 					<option value="" selected="selected"><%:IPv4%></option>
@@ -76,7 +80,7 @@ local has_traceroute6 = fs.access("/usr/bin/traceroute6")
 			</div>
 
 			<div style="width:33%; float:left">
-				<input style="margin: 5px 0" type="text" value="openwrt.org" name="traceroute" /><br />
+				<input style="margin: 5px 0" type="text" value="<%=route_host%>" name="traceroute" /><br />
 				<% if has_traceroute6 then %>
 				<select name="traceroute_proto" style="width:auto">
 					<option value="" selected="selected"><%:IPv4%></option>
@@ -93,7 +97,7 @@ local has_traceroute6 = fs.access("/usr/bin/traceroute6")
 			</div>
 
 			<div style="width:33%; float:left;">
-				<input style="margin: 5px 0" type="text" value="openwrt.org" name="nslookup" /><br />
+				<input style="margin: 5px 0" type="text" value="<%=dns_host%>" name="nslookup" /><br />
 				<input type="button" value="<%:Nslookup%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.nslookup)" />
 			</div>