Globally replace luci.dispatcher.build_url(...) with url(...) invocations

Also concat multiple string arguments into one while we're at it.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

2 files changed, 3 insertions, 3 deletions

diff --git a/applications/luci-app-privoxy/luasrc/view/privoxy/detail_logview.htm b/applications/luci-app-privoxy/luasrc/view/privoxy/detail_logview.htm
index 3e190709fb..ab0019bdd4 100644
--- a/applications/luci-app-privoxy/luasrc/view/privoxy/detail_logview.htm
+++ b/applications/luci-app-privoxy/luasrc/view/privoxy/detail_logview.htm
@@ -6,7 +6,7 @@
 		var txt = document.getElementById("cbid.privoxy.privoxy._logview.txt");	// TextArea
 		if ( !txt ) { return; }	// security check
 		var lvXHR = new XHR();
-		lvXHR.get('<%=luci.dispatcher.build_url("admin", "services", "privoxy", "logview")%>', null,
+		lvXHR.get('<%=url('admin/services/privoxy/logview')%>', null,
 			function(x) {
 				if (x.responseText == "_nodata_")
 					txt.value = "<%:File not found or empty%>";
diff --git a/applications/luci-app-privoxy/luasrc/view/privoxy/detail_startstop.htm b/applications/luci-app-privoxy/luasrc/view/privoxy/detail_startstop.htm
index b9de8864e4..8c97daeee2 100644
--- a/applications/luci-app-privoxy/luasrc/view/privoxy/detail_startstop.htm
+++ b/applications/luci-app-privoxy/luasrc/view/privoxy/detail_startstop.htm
@@ -21,12 +21,12 @@
 	function onclick_startstop(id) {
 		// do start/stop
 		var btnXHR = new XHR();
-		btnXHR.get('<%=luci.dispatcher.build_url("admin", "services", "privoxy", "startstop")%>', null,
+		btnXHR.get('<%=url('admin/services/privoxy/startstop')%>', null,
 			function(x) { _data2elements(x); }
 		);
 	}
 
-	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "privoxy", "status")%>', null,
+	XHR.poll(5, '<%=url('admin/services/privoxy/status')%>', null,
 		function(x, data) { _data2elements(x); }
 	);