summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2012-04-28 12:17:43 +0000
committerTed Trask <ttrask01@yahoo.com>2012-04-28 12:17:43 +0000
commitdf68cedfd39d7ea4691d13c4f4cba9a3b9c7362f (patch)
tree3624627239e42014097a561b7bd9b999304fa279
parent2709d2ce6ab6f6d299bf44f2f209552438cf6a41 (diff)
downloadacf-openssl-df68cedfd39d7ea4691d13c4f4cba9a3b9c7362f.tar.bz2
acf-openssl-df68cedfd39d7ea4691d13c4f4cba9a3b9c7362f.tar.xz
Updated for handle_form now passing self to get and set functions
-rwxr-xr-xopenssl-controller.lua2
-rwxr-xr-xopenssl-model.lua10
2 files changed, 6 insertions, 6 deletions
diff --git a/openssl-controller.lua b/openssl-controller.lua
index a9ac987..e5f4c0a 100755
--- a/openssl-controller.lua
+++ b/openssl-controller.lua
@@ -44,7 +44,7 @@ end
-- Form to request a new cert
request = function(self)
- return self.handle_form(self, self.model.getnewrequest, function(value) return self.model.submitrequest(value, self.sessiondata.userinfo.userid) end, self.clientdata, "Submit", "Request Certificate", "Request Submitted")
+ return self.handle_form(self, self.model.getnewrequest, function(self, value) return self.model.submitrequest(value, self.sessiondata.userinfo.userid) end, self.clientdata, "Submit", "Request Certificate", "Request Submitted")
end
-- Form to edit request defaults
diff --git a/openssl-model.lua b/openssl-model.lua
index 371b29b..44926af 100755
--- a/openssl-model.lua
+++ b/openssl-model.lua
@@ -331,7 +331,7 @@ getreqdefaults = function()
return defaults
end
-setreqdefaults = function(defaults)
+setreqdefaults = function(self, defaults)
local success, defaults = validate_request(defaults, true)
-- If success, write the values to the config file
@@ -721,7 +721,7 @@ getnewputca = function()
return cfe({ type="group", value={ca=ca, password=password} })
end
-putca = function(newca)
+putca = function(self, newca)
local success = true
-- Trying to upload a cert/key
-- The way haserl works, ca contains the temporary file name
@@ -794,7 +794,7 @@ getnewcarequest = function()
return request
end
-generateca = function(defaults)
+generateca = function(self, defaults)
local success, defaults = validate_request(defaults)
if not validator.is_integer(defaults.value.days.value) then
@@ -840,9 +840,9 @@ getconfigfile = function()
return modelfunctions.getfiledetails(configfile)
end
-setconfigfile = function(filedetails)
+setconfigfile = function(self, filedetails)
-- validate
- return modelfunctions.setfiledetails(filedetails, {configfile})
+ return modelfunctions.setfiledetails(self, filedetails, {configfile})
end
checkenvironment = function(set)