Continuing to work on openssl. Not done yet.

git-svn-id: svn://svn.alpinelinux.org/acf/openssl/trunk@1127 ab2d0c66-481e-0410-8bed-d214d4d58bed

1 files changed, 21 insertions, 9 deletions

diff --git a/openssl-controller.lua b/openssl-controller.lua
index 88bb098..c359b51 100644
--- a/openssl-controller.lua
+++ b/openssl-controller.lua
@@ -7,15 +7,20 @@ default_action = "read"
 
 -- View all pending and approved requests and revoked certificates
 readall = function(self)
+	local pending = self.model.listrequests()
+	local approved = nil
+	local revoked = nil
+	local result = cfe({ type="list", value={pending=pending, approved=approved, revoked=revoked} })
+	return result
 end
 
 -- Return all certificates (pending, approved, and revoked) for this user
 read = function(self)
-	local user = cfe({ value="Ted", label="User Name" })
-	local result = cfe({ type="list", value={user=user} })
---	result.value[1] = getopts.getoptsfromfile(configfile, nil, nil)
---	getopts.setoptsinfile(configfile, "Hey", "test", "--qasdg", true, nil)
---	result.value[2] = getopts.getoptsfromfile(configfile, nil, nil)
+	local user = cfe({ value=self.sessiondata.userinfo.userid, label="User Name" })
+	local pending = self.model.listrequests(self.sessiondata.userinfo.userid)
+	local approved = nil
+	local revoked = nil
+	local result = cfe({ type="list", value={user=user, pending=pending, approved=approved, revoked=revoked} })
 	return result
 end
 
@@ -24,9 +29,13 @@ request = function(self)
 	local request
 	if self.clientdata.Submit then
 		-- Try to submit the request
-		request = cfe({ type="group", value={} })
+		request = self.model.submitrequest(self.clientdata, self.sessiondata.userinfo.userid)
+		if not request.errtxt then
+			request.descr = "Submitted request"
+			--redirect(self)
+		end
 	else
-		request = self.model.getdefaults()
+		request = self.model.getnewrequest()
 	end
 
 	request.type = "form"
@@ -40,9 +49,12 @@ end
 editdefaults = function(self)
 	local defaults
 	if self.clientdata.Save then
-		defaults = cfe({ type="group", value={} })
+		defaults = self.model.setreqdefaults(self.clientdata)
+		if not defaults.errtxt then
+			defaults.descr = "Defaults set"
+		end
 	else
-		defaults = self.model.getdefaults()
+		defaults = self.model.getreqdefaults()
 	end
 
 	defaults.type = "form"