diff options
Diffstat (limited to 'weblog-controller.lua')
| -rw-r--r-- | weblog-controller.lua | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/weblog-controller.lua b/weblog-controller.lua index 76f4db9..b865f80 100644 --- a/weblog-controller.lua +++ b/weblog-controller.lua @@ -1,12 +1,9 @@ module(..., package.seeall) --- Load libraries -require("controllerfunctions") - default_action = "viewauditstats" function config(self) - return controllerfunctions.handle_form(self, self.model.getconfig, self.model.updateconfig, self.clientdata, "Save", "Edit Configuration", "Configuration Saved") + return self.handle_form(self, self.model.getconfig, self.model.updateconfig, self.clientdata, "Save", "Edit Configuration", "Configuration Saved") end function listsources(self) @@ -14,7 +11,7 @@ function listsources(self) end function createsource(self) - return controllerfunctions.handle_form(self, self.model.getnewsource, self.model.createsource, self.clientdata, "Create", "Create new source", "New source created") + return self.handle_form(self, self.model.getnewsource, self.model.createsource, self.clientdata, "Create", "Create new source", "New source created") end function deletesource(self) @@ -22,7 +19,7 @@ function deletesource(self) end function editsource(self) - return controllerfunctions.handle_form(self, function() return self.model.getsource(self.clientdata.sourcename) end, self.model.updatesource, self.clientdata, "Save", "Edit Source", "Source Saved") + return self.handle_form(self, function() return self.model.getsource(self.clientdata.sourcename) end, self.model.updatesource, self.clientdata, "Save", "Edit Source", "Source Saved") end function testsource(self) @@ -38,10 +35,10 @@ function viewactivitylog(self) end function viewweblog(self) - local retval = controllerfunctions.handle_form(self, self.model.getweblogparameters, self.model.getweblog, self.clientdata, "Update", "Display Weblog") + local retval = self.handle_form(self, self.model.getweblogparameters, self.model.getweblog, self.clientdata, "Update", "Display Weblog") -- We want to get the weblog even if form wasn't submitted if not self.clientdata.Update then - controllerfunctions.handle_clientdata(retval, self.clientdata) + self.handle_clientdata(retval, self.clientdata) retval = self.model.getweblog(retval) end return retval @@ -61,7 +58,7 @@ function downloadweblog(self) end function updateselected(self) - return controllerfunctions.handle_form(self, self.model.geteditselected, self.model.editselected, self.clientdata, "Submit", "Submit select update", "Select fields updated") + return self.handle_form(self, self.model.geteditselected, self.model.editselected, self.clientdata, "Submit", "Submit select update", "Select fields updated") end function clearselected(self) @@ -81,13 +78,13 @@ function completeaudit(self) end function adhocquery(self) - return controllerfunctions.handle_form(self, self.model.getnewadhocquery, self.model.adhocquery, self.clientdata, "Submit", "Submit ad-hoc query") + return self.handle_form(self, self.model.getnewadhocquery, self.model.adhocquery, self.clientdata, "Submit", "Submit ad-hoc query") end function downloadadhocquery(self) self.conf.viewtype = "stream" local retval = self.model.getnewadhocquery() - controllerfunctions.handle_clientdata(retval, self.clientdata) + self.handle_clientdata(retval, self.clientdata) retval = self.model.adhocquery(retval) local file = cfe({ type="longtext", value="", label="weblogadhocquery.tab" }) @@ -115,7 +112,7 @@ function status(self) end function createdatabase(self) - return controllerfunctions.handle_form(self, self.model.getnewdatabase, self.model.create_database, self.clientdata, "Create", "Create New Database", "Database Created") + return self.handle_form(self, self.model.getnewdatabase, self.model.create_database, self.clientdata, "Create", "Create New Database", "Database Created") end function listfiles(self) @@ -123,5 +120,5 @@ function listfiles(self) end function editfile(self) - return controllerfunctions.handle_form(self, function() return self.model.readfile(self.clientdata.filename) end, self.model.updatefile, self.clientdata, "Save", "Edit Weblog File", "Weblog File Saved" ) + return self.handle_form(self, function() return self.model.readfile(self.clientdata.filename) end, self.model.updatefile, self.clientdata, "Save", "Edit Weblog File", "Weblog File Saved" ) end |