diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2015-01-31 21:43:34 -0500 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2015-01-31 21:43:34 -0500 |
| commit | 97c66e10c5bc12415eeb6b0f2c6470d6e5b7f9a1 (patch) | |
| tree | 5c7dad520ca8cecf12c13a4c08a7974a59247343 | |
| parent | 04feaaceb5de55bf95dfc712ab97641b194a222b (diff) | |
| download | acf-openssl-97c66e10c5bc12415eeb6b0f2c6470d6e5b7f9a1.tar.bz2 acf-openssl-97c66e10c5bc12415eeb6b0f2c6470d6e5b7f9a1.tar.xz | |
Update model.submitrequest and .deleterequest to new prototype
| -rw-r--r-- | openssl-controller.lua | 6 | ||||
| -rw-r--r-- | openssl-model.lua | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/openssl-controller.lua b/openssl-controller.lua index 450332c..25805bf 100644 --- a/openssl-controller.lua +++ b/openssl-controller.lua @@ -37,7 +37,7 @@ end -- Form to request a new cert mymodule.request = function(self) - 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") + return self.handle_form(self, self.model.getnewrequest, function(self, value, submit) return self.model.submitrequest(self, value, submit, self.sessiondata.userinfo.userid) end, self.clientdata, "Submit", "Request Certificate", "Request Submitted") end -- Form to edit request defaults @@ -57,12 +57,12 @@ end -- Delete the specified request mymodule.deleterequest = function(self) - return self.handle_form(self, self.model.getdeleterequest, function(self, value) return self.model.deleterequest(self, value, nil) end, self.clientdata, "Delete", "Delete Request", "Request Deleted") + return self.handle_form(self, self.model.getdeleterequest, function(self, value, submit) return self.model.deleterequest(self, value, submit, nil) end, self.clientdata, "Delete", "Delete Request", "Request Deleted") end -- Delete the specified request mymodule.deletemyrequest = function(self) - return self.handle_form(self, self.model.getdeleterequest, function(self, value) return self.model.deleterequest(self, value, self.sessiondata.userinfo.userid) end, self.clientdata, "Delete", "Delete Request", "Request Deleted") + return self.handle_form(self, self.model.getdeleterequest, function(self, value, submit) return self.model.deleterequest(self, value, submit, self.sessiondata.userinfo.userid) end, self.clientdata, "Delete", "Delete Request", "Request Deleted") end -- View certificate details diff --git a/openssl-model.lua b/openssl-model.lua index bb33e35..2c1a54a 100644 --- a/openssl-model.lua +++ b/openssl-model.lua @@ -431,7 +431,7 @@ mymodule.getnewrequest = function() return values end -mymodule.submitrequest = function(defaults, user) +mymodule.submitrequest = function(self, defaults, submit, user) local success, defaults = validate_request(defaults) -- Must have a common name @@ -597,7 +597,7 @@ mymodule.getdeleterequest = function(self, clientdata) return cfe({ type="group", value=retval, label="Delete Request" }) end -mymodule.deleterequest = function(self, delrequest, user) +mymodule.deleterequest = function(self, delrequest, submit, user) user = user or ".*" if (not fs.is_file(openssldir..requestdir..delrequest.value.request.value..".csr")) or (not string.find(delrequest.value.request.value, "^"..user.."%.")) then delrequest.value.request.errtxt = "Request not found" |