diff options
| -rw-r--r-- | openssl-checkenvironment-html.lsp | 9 | ||||
| -rw-r--r-- | openssl-controller.lua | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/openssl-checkenvironment-html.lsp b/openssl-checkenvironment-html.lsp index 1bd73a2..3fca9f0 100644 --- a/openssl-checkenvironment-html.lsp +++ b/openssl-checkenvironment-html.lsp @@ -8,8 +8,9 @@ io.write(html.cfe_unpack(form)) <H1><%= form.label %></H1> <DL> <% displayitem(form.value.status) %> -<% if form.value.status.errtxt then %> -<form action="<%= page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action %>" method="POST"> -<DT></DT><DD><input class="submit" type="submit" name="<%= form.option %>" value="<%= form.option %>"></DD> -<% end %> </DL> +<% if form.value.status.errtxt then + form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action + displayformstart(form) + displayformend(form) +end %> diff --git a/openssl-controller.lua b/openssl-controller.lua index be85ac6..824e6bd 100644 --- a/openssl-controller.lua +++ b/openssl-controller.lua @@ -45,7 +45,7 @@ end -- Form to request a new cert request = function(self) - return controllerfunctions.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", "read") + return controllerfunctions.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") end -- Form to edit request defaults @@ -112,12 +112,12 @@ end -- Put the CA cert putcacert = function(self) - return controllerfunctions.handle_form(self, self.model.getnewputca, self.model.putca, self.clientdata, "Upload", "Upload CA Certificate", "Certificate Uploaded", "status") + return controllerfunctions.handle_form(self, self.model.getnewputca, self.model.putca, self.clientdata, "Upload", "Upload CA Certificate", "Certificate Uploaded") end -- Generate a self-signed CA generatecacert = function(self) - return controllerfunctions.handle_form(self, self.model.getnewcarequest, self.model.generateca, self.clientdata, "Generate", "Generate CA Certificate", "Certificate Generated", "status") + return controllerfunctions.handle_form(self, self.model.getnewcarequest, self.model.generateca, self.clientdata, "Generate", "Generate CA Certificate", "Certificate Generated") end editconfigfile = function(self) |