Updates to reflect changes in acf-core-0.15 - viewfunctions becomes htmlviewfunctions

17 files changed, 53 insertions, 76 deletions

diff --git a/cron-listjobs-html.lsp b/cron-listjobs-html.lsp
index 6cc4463..79446a6 100644
--- a/cron-listjobs-html.lsp
+++ b/cron-listjobs-html.lsp
@@ -1,8 +1,8 @@
 <% local view, viewlibrary, page_info, session = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
-<% displaycommandresults({"editjob", "deletejob", "movejob"}, session) %>
-<% displaycommandresults({"createjob"}, session, true) %>
+<% htmlviewfunctions.displaycommandresults({"editjob", "deletejob", "movejob"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"createjob"}, session, true) %>
 
 <% if viewlibrary and viewlibrary.dispatch_component then
 	viewlibrary.dispatch_component("status")
diff --git a/health-networkstats-ajax.lsp b/health-networkstats-ajax.lsp
deleted file mode 100644
index e8d176e..0000000
--- a/health-networkstats-ajax.lsp
+++ /dev/null
@@ -1,10 +0,0 @@
-<% local view, viewlibrary, page_info = ... %>
-<%
-	require("json")
-%>
-Status: 200 OK
-Content-Type: "application/json"
-<% io.write("\n") %>
-<%
-	print(json.encode(view))
-%>
diff --git a/health-networkstats-html.lsp b/health-networkstats-html.lsp
index 91084c0..0ba89bd 100644
--- a/health-networkstats-html.lsp
+++ b/health-networkstats-html.lsp
@@ -1,5 +1,4 @@
 <% local view, viewlibrary, page_info = ... %>
-<% require("viewfunctions") %>
 <% require("json") %>
 <%
 	-- Table of colors
diff --git a/hostname-html.lsp b/hostname-html.lsp
index 52238b3..4563279 100644
--- a/hostname-html.lsp
+++ b/hostname-html.lsp
@@ -1,7 +1,7 @@
 <% local view = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
 <h1><%= html.html_escape(view.label) %></h1>
 <DL>
-<% displayitem(view) %>
+<% htmlviewfunctions.displayitem(view) %>
 </DL>
diff --git a/interfaces-read-html.lsp b/interfaces-read-html.lsp
index 922e96a..7e3850c 100644
--- a/interfaces-read-html.lsp
+++ b/interfaces-read-html.lsp
@@ -1,5 +1,5 @@
 <% local view, viewlibrary, page_info, session = ... 
-require("viewfunctions")
+require("htmlviewfunctions")
 %>
 
 <% showoption = function(option)
@@ -12,7 +12,7 @@ require("viewfunctions")
 	<% end %>	
 <% end %>
 
-<% displaycommandresults({"update", "delete", "ifup", "ifdown", "restart"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"update", "delete", "ifup", "ifdown", "restart"}, session) %>
 
 <% if viewlibrary and viewlibrary.dispatch_component then
 	viewlibrary.dispatch_component("status")
diff --git a/interfaces-status-html.lsp b/interfaces-status-html.lsp
index dfca7b1..c20b798 100644
--- a/interfaces-status-html.lsp
+++ b/interfaces-status-html.lsp
@@ -1,14 +1,14 @@
 <% local view = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
 <H1>SYSTEM INFO</H1>
 <DL>
 <% 
-displayitem(view.value.filename)
-displayitem(view.value.ipaddr)
-displayitem(view.value.iproute)
+htmlviewfunctions.displayitem(view.value.filename)
+htmlviewfunctions.displayitem(view.value.ipaddr)
+htmlviewfunctions.displayitem(view.value.iproute)
 if view.value.iptunnel.value ~= "" then
-	displayitem(view.value.iptunnel)
+	htmlviewfunctions.displayitem(view.value.iptunnel)
 end
 %>
 </DL>
diff --git a/interfaces-update-html.lsp b/interfaces-update-html.lsp
index cee1321..375c505 100644
--- a/interfaces-update-html.lsp
+++ b/interfaces-update-html.lsp
@@ -1,5 +1,5 @@
 <% local form, viewlibrary, page_info = ... 
-require("viewfunctions")
+require("htmlviewfunctions")
 %>
 
 <script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script>
@@ -149,5 +149,5 @@ require("viewfunctions")
 		form.value.name.readonly = true
 	end
 	local order = {"name", "comment", "auto", "family", "method", "pre-up", "up", "down", "post-down"}
-	displayform(form, order)
+	htmlviewfunctions.displayform(form, order)
 %>
diff --git a/logfiles-status-html.lsp b/logfiles-status-html.lsp
index 1610417..804182f 100644
--- a/logfiles-status-html.lsp
+++ b/logfiles-status-html.lsp
@@ -1,7 +1,7 @@
 <% local view, viewlibrary, page_info, session  = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
-<% displaycommandresults({"delete"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"delete"}, session) %>
 
 <h1>Available Logfiles</h1>
 <DL>
diff --git a/logfiles-tail-ajax.lsp b/logfiles-tail-ajax.lsp
deleted file mode 100644
index 8697208..0000000
--- a/logfiles-tail-ajax.lsp
+++ /dev/null
@@ -1,12 +0,0 @@
-<% local view, viewlibrary, page_info = ... %>
-<%
-	require("json")
-	require("html")
-%>
-Status: 200 OK
-Content-Type: "application/json"
-<% io.write("\n") %>
-<%
-	view.value.filecontent.value = html.html_escape(view.value.filecontent.value)
-	print(json.encode(view))
-%>
diff --git a/logfiles-tail-html.lsp b/logfiles-tail-html.lsp
index 921439c..1f63e91 100644
--- a/logfiles-tail-html.lsp
+++ b/logfiles-tail-html.lsp
@@ -1,5 +1,5 @@
 <% local form, viewlibrary, page_info = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
 <script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script>
 <script type="text/javascript">
@@ -59,10 +59,10 @@
 <H1>Tail File</H1>
 <DL>
 <% 
-displayitem(form.value.filename)
-displayitem(form.value.filesize)
+htmlviewfunctions.displayitem(form.value.filename)
+htmlviewfunctions.displayitem(form.value.filesize)
 if form.value.grep.value ~= "" then
-	displayitem(form.value.grep)
+	htmlviewfunctions.displayitem(form.value.grep)
 end
 %>
 <textarea id="filecontent">
diff --git a/logfiles-view-html.lsp b/logfiles-view-html.lsp
index e3c58df..2751941 100644
--- a/logfiles-view-html.lsp
+++ b/logfiles-view-html.lsp
@@ -1,5 +1,5 @@
 <% local form, viewlibrary, page_info = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
 <% if form.type == "form" then %>
 <H1>Configuration</H1>
@@ -10,11 +10,11 @@
 <H3>File Details</H3>
 <DL>
 <% 
-displayitem(form.value.filename)
-displayitem(form.value.filesize)
-displayitem(form.value.mtime)
+htmlviewfunctions.displayitem(form.value.filename)
+htmlviewfunctions.displayitem(form.value.filesize)
+htmlviewfunctions.displayitem(form.value.mtime)
 if form.value.grep.value ~= "" then
-	displayitem(form.value.grep)
+	htmlviewfunctions.displayitem(form.value.grep)
 end
 %>
 </DL>
@@ -23,7 +23,7 @@ end
 <DL>
 <% if form.type == "form" then %>
 <% form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action %>
-<% displayformstart(form) %>
+<% htmlviewfunctions.displayformstart(form) %>
 <input type="hidden" name="filename" value="<%= html.html_escape(form.value.filename.value) %>">
 <% end %>
 <textarea name="filecontent">
@@ -33,7 +33,7 @@ end
 <% if form.value.filecontent.descr then %><P CLASS='descr'><%= string.gsub(html.html_escape(form.value.filecontent.descr), "\n", "<BR>") %></P><% end %>
 
 <% if form.type == "form" then %>
-<% displayformend(form) %>
+<% htmlviewfunctions.displayformend(form) %>
 <% end %>
 </form>
 </DL>
diff --git a/modules-edit-html.lsp b/modules-edit-html.lsp
index 5a96422..4bcc173 100644
--- a/modules-edit-html.lsp
+++ b/modules-edit-html.lsp
@@ -1,7 +1,7 @@
 <% local form, viewlibrary, page_info, session = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
-<% displaycommandresults({"reload"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"reload"}, session) %>
 
 <% if form.type == "form" then %>
 <H1>Configuration</H1>
@@ -12,16 +12,16 @@
 <H3>File Details</H3>
 <DL>
 <% 
-displayitem(form.value.filename)
-displayitem(form.value.filesize)
-displayitem(form.value.mtime)
+htmlviewfunctions.displayitem(form.value.filename)
+htmlviewfunctions.displayitem(form.value.filesize)
+htmlviewfunctions.displayitem(form.value.mtime)
 %>
 </DL>
 
 <H3>File Content</H3>
 <% if form.type == "form" then %>
 <% form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action %>
-<% displayformstart(form) %>
+<% htmlviewfunctions.displayformstart(form) %>
 <input type="hidden" name="filename" value="<%= form.value.filename.value %>">
 <% end %>
 <textarea name="filecontent">
@@ -31,7 +31,7 @@ displayitem(form.value.mtime)
 <% if form.value.filecontent.descr then %><P CLASS='descr'><%= string.gsub(html.html_escape(form.value.filecontent.descr), "\n", "<BR>") %></P><% end %>
 
 <% if form.type == "form" then %>
-<% displayformend(form) %>
+<% htmlviewfunctions.displayformend(form) %>
 <% end %>
 </form>
 
diff --git a/password-edit-html.lsp b/password-edit-html.lsp
index 257c319..b9cc9df 100644
--- a/password-edit-html.lsp
+++ b/password-edit-html.lsp
@@ -1,5 +1,5 @@
 <% local form, viewlibrary, page_info = ... 
-require("viewfunctions")
+require("htmlviewfunctions")
 %>
 
 <H1><%= html.html_escape(form.label) %></H1>
@@ -8,5 +8,5 @@ require("viewfunctions")
 	form.value.password.type = "password"
 	form.value.password_confirm.type = "password"
 	local order = {"user", "password"}
-	displayform(form, order)
+	htmlviewfunctions.displayform(form, order)
 %>
diff --git a/rc-edit-html.lsp b/rc-edit-html.lsp
index fe792d1..79d374d 100644
--- a/rc-edit-html.lsp
+++ b/rc-edit-html.lsp
@@ -1,5 +1,5 @@
 <% local form, viewlibrary, page_info = ... 
-require("viewfunctions")
+require("htmlviewfunctions")
 %>
 
 <H1><%= html.html_escape(form.label) %></H1>
@@ -7,5 +7,5 @@ require("viewfunctions")
 	form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action
 	form.value.servicename.readonly = true
 	local order = {"servicename", "runlevels"}
-	displayform(form, order)
+	htmlviewfunctions.displayform(form, order)
 %>
diff --git a/rc-status-html.lsp b/rc-status-html.lsp
index b04913a..6bb6533 100644
--- a/rc-status-html.lsp
+++ b/rc-status-html.lsp
@@ -1,7 +1,7 @@
 <% local view, viewlibrary, page_info, session = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
-<% displaycommandresults({"edit", "startstop"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"edit", "startstop"}, session) %>
 
 <H1><%= html.html_escape(view.label) %></H1>
 <DL>
diff --git a/syslog-config-html.lsp b/syslog-config-html.lsp
index 911b0d1..ef93b3f 100644
--- a/syslog-config-html.lsp
+++ b/syslog-config-html.lsp
@@ -1,5 +1,5 @@
 <% local form, viewlibrary, page_info, session = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
 <% if viewlibrary and viewlibrary.dispatch_component then
 	viewlibrary.dispatch_component("status")
@@ -8,30 +8,30 @@ end %>
 <H1>Configuration</H1>
 <H2>Advanced Configuration</H2>
 <% form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action %>
-<% displayformstart(form) %>
+<% htmlviewfunctions.displayformstart(form) %>
 </DL>
 <H3>General</H3>
 <DL>
 <% 
-	displayformitem(form.value.logfile, "logfile")
-	displayformitem(form.value.loglevel, "loglevel")
-	displayformitem(form.value.smallerlogs, "smallerlogs")
+	htmlviewfunctions.displayformitem(form.value.logfile, "logfile")
+	htmlviewfunctions.displayformitem(form.value.loglevel, "loglevel")
+	htmlviewfunctions.displayformitem(form.value.smallerlogs, "smallerlogs")
 %>
 </DL>
 <H3>Log Rotate</H3>
 <DL>
 <%
-	displayformitem(form.value.maxsize, "maxsize")
-	displayformitem(form.value.numrotate, "numrotate")
+	htmlviewfunctions.displayformitem(form.value.maxsize, "maxsize")
+	htmlviewfunctions.displayformitem(form.value.numrotate, "numrotate")
 %>
 </DL>
 <H3>Remote Logging</H3>
 <DL>
 <% 
-	displayformitem(form.value.localandnetworklog, "localandnetworklog")
-	displayformitem(form.value.remotelogging, "remotelogging")
+	htmlviewfunctions.displayformitem(form.value.localandnetworklog, "localandnetworklog")
+	htmlviewfunctions.displayformitem(form.value.remotelogging, "remotelogging")
 %>
 </DL>
 <H2>Save and Apply Above Settings</H2>
 <DL>
-<% displayformend(form) %>
+<% htmlviewfunctions.displayformend(form) %>
diff --git a/syslog-loginfo-html.lsp b/syslog-loginfo-html.lsp
index 91b24c4..2c3c4f2 100644
--- a/syslog-loginfo-html.lsp
+++ b/syslog-loginfo-html.lsp
@@ -1,5 +1,5 @@
 <% local form, viewlibrary = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
 <% ---[[ %>
 <% if viewlibrary and viewlibrary.dispatch_component then
@@ -10,7 +10,7 @@ end %>
 <H2>Program Specific Options/Information</H2>
 <DL>
 <% 
-displayitem(form.value.logfile)
-displayitem(form.value.remote)
+htmlviewfunctions.displayitem(form.value.logfile)
+htmlviewfunctions.displayitem(form.value.remote)
 %>
 </DL>