From aac2c6c96fe4be58b4ad7de8840542471903e806 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Sat, 31 Jan 2015 10:38:01 -0500 Subject: Modify several functions to move logic into the model and use cfes more properly for non-forms --- openssl-controller.lua | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'openssl-controller.lua') diff --git a/openssl-controller.lua b/openssl-controller.lua index e7af93e..994c00b 100644 --- a/openssl-controller.lua +++ b/openssl-controller.lua @@ -7,8 +7,7 @@ local sslstatus mymodule.mvc={} mymodule.mvc.pre_exec = function(self) - self.model.set_umask() - sslstatus = self.model.getstatus() + sslstatus = self.model.getstatus(self, self.clientdata) if not self.redirect then return end @@ -28,21 +27,12 @@ end -- View all pending and approved requests and revoked certificates mymodule.readall = function(self) - local pending = self.model.listrequests() - local approved = self.model.listcerts() - local revoked = self.model.listrevoked() - local result = cfe({ type="list", value={pending=pending, approved=approved, revoked=revoked} }) - return result + return self.model.readall(self, self.clientdata) end -- Return all certificates (pending, approved, and revoked) for this user mymodule.read = function(self) - local user = cfe({ value=self.sessiondata.userinfo.userid, label="User Name" }) - local pending = self.model.listrequests(self.sessiondata.userinfo.userid) - local approved = self.model.listcerts(self.sessiondata.userinfo.userid) - local revoked = self.model.listrevoked() - local result = cfe({ type="list", value={user=user, pending=pending, approved=approved, revoked=revoked} }) - return result + return self.model.readuser(self, self.clientdata, self.sessiondata.userinfo.userid) end -- Form to request a new cert @@ -57,7 +47,7 @@ end -- View request details mymodule.viewrequest = function(self) - return self.model.viewrequest(self.clientdata.request) + return self.model.viewrequest(self, self.clientdata) end -- Approve the specified request @@ -77,7 +67,7 @@ end -- View certificate details mymodule.viewcert = function(self) - return self.model.viewcert(self.clientdata.cert) + return self.model.viewcert(self, self.clientdata) end -- Get the specified cert -- cgit v1.2.3