diff options
| -rw-r--r-- | ppp-controller.lua | 11 | ||||
| -rw-r--r-- | ppp-expert-html.lsp | 2 | ||||
| -rw-r--r-- | ppp-listpeers-html.lsp | 6 | ||||
| -rw-r--r-- | ppp-model.lua | 6 |
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" |