summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2012-04-18 01:35:33 +0000
committerTed Trask <ttrask01@yahoo.com>2012-04-18 01:35:33 +0000
commitf277d0e1c513b9d0261a3405fd66977cd8ecb451 (patch)
tree9f5e964ecec06d546922f668e3c3ff8a7dbdee60
parent2b7deda1b2511d0992dea7d9664900b893a68cbe (diff)
downloadacf-ppp-f277d0e1c513b9d0261a3405fd66977cd8ecb451.tar.bz2
acf-ppp-f277d0e1c513b9d0261a3405fd66977cd8ecb451.tar.xz
Started work on updating for acf-core-0.15
Removed controllerfunctions library (still needs more work and corresponding work in model) Updated for viewfunctions to htmlviewfunctions and modified require statements for acf libraries
-rw-r--r--ppp-controller.lua11
-rw-r--r--ppp-expert-html.lsp2
-rw-r--r--ppp-listpeers-html.lsp6
-rw-r--r--ppp-model.lua6
4 files changed, 10 insertions, 15 deletions
diff --git a/ppp-controller.lua b/ppp-controller.lua
index 175e8ee..275f728 100644
--- a/ppp-controller.lua
+++ b/ppp-controller.lua
@@ -1,8 +1,5 @@
module(..., package.seeall)
--- Load libraries
-require("controllerfunctions")
-
default_action = "status"
function status(self)
@@ -10,11 +7,11 @@ function status(self)
end
function editpap(self)
- return controllerfunctions.handle_form(self, self.model.read_papfiledetails, self.model.update_papfiledetails, self.clientdata, "Save", "Edit Config", "Configuration Set")
+ return self.handle_form(self, self.model.read_papfiledetails, self.model.update_papfiledetails, self.clientdata, "Save", "Edit Config", "Configuration Set")
end
function editchap(self)
- return controllerfunctions.handle_form(self, self.model.read_chapfiledetails, self.model.update_chapfiledetails, self.clientdata, "Save", "Edit Config", "Configuration Set")
+ return self.handle_form(self, self.model.read_chapfiledetails, self.model.update_chapfiledetails, self.clientdata, "Save", "Edit Config", "Configuration Set")
end
function listpeers(self)
@@ -22,7 +19,7 @@ function listpeers(self)
end
function createpeer(self)
- return controllerfunctions.handle_form(self, self.model.get_newpeer, self.model.create_peer, self.clientdata, "Create", "Create New Peer File", "Peer File Created")
+ return self.handle_form(self, self.model.get_newpeer, self.model.create_peer, self.clientdata, "Create", "Create New Peer File", "Peer File Created")
end
function deletepeer(self)
@@ -30,5 +27,5 @@ function deletepeer(self)
end
function editpeer(self)
- return controllerfunctions.handle_form(self, function() return self.model.read_peerfile(self.clientdata.name) end, self.model.update_peerfile, self.clientdata, "Save", "Edit PPP Peer", "Peer Configuration Set")
+ return self.handle_form(self, function() return self.model.read_peerfile(self.clientdata.name) end, self.model.update_peerfile, self.clientdata, "Save", "Edit PPP Peer", "Peer Configuration Set")
end
diff --git a/ppp-expert-html.lsp b/ppp-expert-html.lsp
index af70cc6..579700b 100644
--- a/ppp-expert-html.lsp
+++ b/ppp-expert-html.lsp
@@ -1,8 +1,6 @@
<% local data, viewlibrary = ...
-require("viewfunctions")
%>
<% viewlibrary.dispatch_component("status") %>
-
<% viewlibrary.dispatch_component("editpap") %>
<% viewlibrary.dispatch_component("editchap") %>
diff --git a/ppp-listpeers-html.lsp b/ppp-listpeers-html.lsp
index 99e56ec..2db2c84 100644
--- a/ppp-listpeers-html.lsp
+++ b/ppp-listpeers-html.lsp
@@ -1,9 +1,9 @@
<% local form, viewlibrary, page_info, session = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
-<% displaycommandresults({"deletepeer", "editpeer"}, session) %>
-<% displaycommandresults({"createpeer"}, session, true) %>
+<% htmlviewfunctions.displaycommandresults({"deletepeer", "editpeer"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"createpeer"}, session, true) %>
<h1>Peer Files</h1>
<DL><TABLE>
diff --git a/ppp-model.lua b/ppp-model.lua
index 8392ea5..82acc2c 100644
--- a/ppp-model.lua
+++ b/ppp-model.lua
@@ -2,9 +2,9 @@ module(..., package.seeall)
-- Load libraries
require("modelfunctions")
-require("processinfo")
-require("fs")
-require("validator")
+processinfo = require("acf.processinfo")
+fs = require("acf.fs")
+validator = require("acf.validator")
-- Set variables
local processname = "pppd"