summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2008-04-24 20:31:58 +0000
committerTed Trask <ttrask01@yahoo.com>2008-04-24 20:31:58 +0000
commitcaf15ef4b5d4feb77ee699f56fa02dd2364e07b0 (patch)
tree605da44a6d09953cb8307748e82ddf7946833619
parente8b5a82495c75dbf51b8f2657a07844ac538b9b4 (diff)
downloadacf-openvpn-caf15ef4b5d4feb77ee699f56fa02dd2364e07b0.tar.bz2
acf-openvpn-caf15ef4b5d4feb77ee699f56fa02dd2364e07b0.tar.xz
Replaced all list_redir functions with redirect in mvc.lua, implemented a default_action string in each controller, removing the on_load functions
git-svn-id: svn://svn.alpinelinux.org/acf/openvpn/trunk@1037 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r--openvpn-controller.lua23
1 files changed, 3 insertions, 20 deletions
diff --git a/openvpn-controller.lua b/openvpn-controller.lua
index 7f0d571..5876189 100644
--- a/openvpn-controller.lua
+++ b/openvpn-controller.lua
@@ -2,24 +2,7 @@
module (..., package.seeall)
--- Cause an http redirect to our "read" action
--- We use the self.conf table because it already has prefix,controller,etc
--- The redir code is defined in the application error handler (acf-controller)
-local list_redir = function (self)
- self.conf.action = "status"
- self.conf.type = "redir"
- error (self.conf)
-end
-
-mvc={}
-mvc.on_load = function(self, parent)
- if (self.worker[self.conf.action] == nil ) or ( self.conf.action == "init" ) then
- self.worker[self.conf.action] = list_redir(self)
- end
-
--- logit ("hostname.mvc.on_load activated")
-
-end
+default_action = "status"
status = function (self)
-- FIXME: If return 1 rows go direct to that config-page
@@ -53,7 +36,7 @@ unknownconfig = function (self)
if ( filecontent ~= "") then
local me = ( {configfilecontent = self.model:update_filecontent(filename,filecontent), url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller } )
if ( me.configfilecontent == nil ) then
- list_redir(self)
+ redirect(self)
else
return me
end
@@ -61,7 +44,7 @@ unknownconfig = function (self)
---[=[
local me = ( {configfilecontent = self.model:get_filecontent(filename), url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller } )
if ( me.configfilecontent == nil ) then
- list_redir(self)
+ redirect(self)
else
return me
end