From 51de0ea690a7b5d213479b6d0e7b69b38846ad1d Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Wed, 18 Apr 2012 01:11:53 +0000
Subject: Started work on updating for acf-core-0.15

Removed controllerfunctions library (still needs more work and corresponding work in model)
Updated startstop functionality and deleted view
Updated for viewfunctions to htmlviewfunctions and modified require statements for acf libraries
---
 dovecot-controller.lua     |  7 ++-----
 dovecot-details-html.lsp   |  4 ++--
 dovecot-logfile-html.lsp   |  1 -
 dovecot-model.lua          | 12 ++++++++----
 dovecot-startstop-html.lsp |  1 -
 5 files changed, 12 insertions(+), 13 deletions(-)
 delete mode 120000 dovecot-startstop-html.lsp

diff --git a/dovecot-controller.lua b/dovecot-controller.lua
index d53cc75..2c2208a 100644
--- a/dovecot-controller.lua
+++ b/dovecot-controller.lua
@@ -1,8 +1,5 @@
 module(..., package.seeall)
 
--- Load libraries
-require("controllerfunctions")
-
 default_action = "status"
 
 function status(self)
@@ -10,7 +7,7 @@ function status(self)
 end
 
 function startstop(self)
-	return controllerfunctions.handle_startstop(self, self.model.startstop_service, self.clientdata)
+	return self.handle_form(self, self.model.get_startstop, self.model.startstop_service, self.clientdata)
 end
 
 function details(self)
@@ -18,5 +15,5 @@ function details(self)
 end
 
 function expert(self)
-	return controllerfunctions.handle_form(self, self.model.get_filedetails, self.model.update_filedetails, self.clientdata, "Save", "Edit Dovecot Config", "Configuration Set")
+	return self.handle_form(self, self.model.get_filedetails, self.model.update_filedetails, self.clientdata, "Save", "Edit Dovecot Config", "Configuration Set")
 end
diff --git a/dovecot-details-html.lsp b/dovecot-details-html.lsp
index 8f1363e..ae142cd 100644
--- a/dovecot-details-html.lsp
+++ b/dovecot-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/dovecot-logfile-html.lsp b/dovecot-logfile-html.lsp
index 8924317..c8f048c 100644
--- a/dovecot-logfile-html.lsp
+++ b/dovecot-logfile-html.lsp
@@ -1,5 +1,4 @@
 <% local data, viewlibrary = ... 
-require("viewfunctions")
 %>
 
 <% if viewlibrary and viewlibrary.dispatch_component then
diff --git a/dovecot-model.lua b/dovecot-model.lua
index 06dc180..f85b795 100644
--- a/dovecot-model.lua
+++ b/dovecot-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 configfile = "/etc/dovecot/dovecot.conf"
@@ -18,8 +18,12 @@ local path = "PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin
 -- ################################################################################
 -- PUBLIC FUNCTIONS
 
-function startstop_service(action)
-	return modelfunctions.startstop_service(processname, action)
+function get_startstop(clientdata)
+        return modelfunctions.get_startstop(processname)
+end
+	
+function startstop_service(startstop, action)
+        return modelfunctions.startstop_service(startstop, action)
 end
 
 function getstatus()
diff --git a/dovecot-startstop-html.lsp b/dovecot-startstop-html.lsp
deleted file mode 120000
index 0ea2627..0000000
--- a/dovecot-startstop-html.lsp
+++ /dev/null
@@ -1 +0,0 @@
-../startstop-html.lsp
\ No newline at end of file
-- 
cgit v1.2.3