From 9bb5f5967b53ce365f8ad2813c0e1a0a0865b92a Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Wed, 18 Apr 2012 00:50:33 +0000
Subject: Modified require statements for acf. libraries, updated for
 viewfunctions to htmlviewfunctions, deleted startstop view

---
 clamav-details-html.lsp   | 4 ++--
 clamav-listfiles-html.lsp | 4 ++--
 clamav-logfile-html.lsp   | 1 -
 clamav-model.lua          | 4 ++--
 clamav-startstop-html.lsp | 1 -
 5 files changed, 6 insertions(+), 8 deletions(-)
 delete mode 120000 clamav-startstop-html.lsp

diff --git a/clamav-details-html.lsp b/clamav-details-html.lsp
index 8f1363e..ae142cd 100644
--- a/clamav-details-html.lsp
+++ b/clamav-details-html.lsp
@@ -1,5 +1,5 @@
 <% local data, viewlibrary = ... 
-require("viewfunctions")
+require("htmlviewfunctions")
 %>
 
 <% viewlibrary.dispatch_component("status") %>
@@ -7,6 +7,6 @@ require("viewfunctions")
 <H2><%= html.html_escape(data.label) %></H2>
 <DL>
 <%
-displayitem(data)
+htmlviewfunctions.displayitem(data)
 %>
 </DL>
diff --git a/clamav-listfiles-html.lsp b/clamav-listfiles-html.lsp
index 374146c..6420120 100644
--- a/clamav-listfiles-html.lsp
+++ b/clamav-listfiles-html.lsp
@@ -1,8 +1,8 @@
 <% local data, viewlibrary, page_info, session = ... 
-require("viewfunctions")
+require("htmlviewfunctions")
 %>
 
-<% displaycommandresults({"expert"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"expert"}, session) %>
 
 <% if viewlibrary and viewlibrary.dispatch_component then
 	viewlibrary.dispatch_component("status")
diff --git a/clamav-logfile-html.lsp b/clamav-logfile-html.lsp
index fbe7221..7cedd8b 100644
--- a/clamav-logfile-html.lsp
+++ b/clamav-logfile-html.lsp
@@ -1,5 +1,4 @@
 <% local data, viewlibrary = ... 
-require("viewfunctions")
 %>
 
 <% if viewlibrary and viewlibrary.dispatch_component then
diff --git a/clamav-model.lua b/clamav-model.lua
index 20d1885..60ebd8f 100644
--- a/clamav-model.lua
+++ b/clamav-model.lua
@@ -2,8 +2,8 @@ module(..., package.seeall)
 
 -- Load libraries
 require("modelfunctions")
-require("fs")
-require("format")
+fs = require("acf.fs")
+format = require("acf.format")
 
 -- Set variables
 local processname = "clamd"
diff --git a/clamav-startstop-html.lsp b/clamav-startstop-html.lsp
deleted file mode 120000
index 0ea2627..0000000
--- a/clamav-startstop-html.lsp
+++ /dev/null
@@ -1 +0,0 @@
-../startstop-html.lsp
\ No newline at end of file
-- 
cgit v1.2.3