diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2012-11-25 14:15:38 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2012-11-25 14:15:38 +0000 |
| commit | 0b5914ae86262efd87a9ae38a0dfa9a33296fc27 (patch) | |
| tree | be0b179b9867f8ea8a761b90f108297ae34b84fc | |
| parent | 8d1ce4085b97497170a381d4d3695d87bacb3e3e (diff) | |
| download | acf-openssl-0b5914ae86262efd87a9ae38a0dfa9a33296fc27.tar.bz2 acf-openssl-0b5914ae86262efd87a9ae38a0dfa9a33296fc27.tar.xz | |
Cleaned up use of viewtype
| -rw-r--r-- | openssl-controller.lua | 3 | ||||
| -rw-r--r-- | openssl-read-html.lsp | 9 | ||||
| -rw-r--r-- | openssl-status-html.lsp | 5 |
3 files changed, 6 insertions, 11 deletions
diff --git a/openssl-controller.lua b/openssl-controller.lua index 013d4b3..45efb71 100644 --- a/openssl-controller.lua +++ b/openssl-controller.lua @@ -82,7 +82,6 @@ end -- Get the specified cert getcert = function(self) - self.conf.viewtype="stream" return self.model.getcert(self.clientdata.cert) end @@ -108,7 +107,6 @@ end -- Get the revoked list getrevoked = function(self) - self.conf.viewtype="stream" return self.model.getcrl(self.clientdata.crltype) end @@ -118,7 +116,6 @@ putcacert = function(self) end downloadcacert = function(self) - self.conf.viewtype="stream" return self.model.getca(self.clientdata.certtype) end diff --git a/openssl-read-html.lsp b/openssl-read-html.lsp index 9ca9b5f..964dab0 100644 --- a/openssl-read-html.lsp +++ b/openssl-read-html.lsp @@ -96,7 +96,7 @@ end %> <%= html.link{value="viewcert?cert="..cert.name, label="View "} %> <% end %> <% if viewlibrary.check_permission("getcert") then %> - <%= html.link{value="getcert?cert="..cert.name, label="Download "} %> + <%= html.link{value="getcert?viewtype=stream&cert="..cert.name, label="Download "} %> <% end %> <% if viewlibrary.check_permission("renewcert") then %> <%= html.link{value="renewcert?submit=true&cert="..cert.name, label="Renew "} %> @@ -145,7 +145,7 @@ end %> <%= html.link{value="viewcert?cert="..cert.name, label="View "} %> <% end %> <% --[[ if viewlibrary.check_permission("getcert") then %> - <%= html.link{value="getcert?cert="..cert.name, label="Download "} %> + <%= html.link{value="getcert?viewtype=stream&cert="..cert.name, label="Download "} %> <% end --]] %> <% if viewlibrary.check_permission("deletecert") then %> <%= html.link{value="deletecert?submit=true&cert="..cert.name, label="Delete "} %> @@ -165,8 +165,7 @@ end %> <% if viewlibrary.check_permission("getrevoked") then %> <H1>Get revoked list (crl)</H1> <DL> -<%= html.link{value="getrevoked?crltype=PEM", label="Download PEM "} %><BR> -<%= html.link{value="getrevoked?crltype=DER", label="Download DER "} %><BR> -<%= html.link{value="getrevoked", label="Import to Firefox"} %><BR> +<%= html.link{value="getrevoked?viewtype=stream&crltype=PEM", label="Download PEM "} %><BR> +<%= html.link{value="getrevoked?viewtype=stream&crltype=DER", label="Download DER "} %><BR> </DL> <% end %> diff --git a/openssl-status-html.lsp b/openssl-status-html.lsp index 02928d4..3a5e504 100644 --- a/openssl-status-html.lsp +++ b/openssl-status-html.lsp @@ -42,8 +42,7 @@ end %> <% if viewlibrary.check_permission("downloadcacert") then %> <H1>Download CA Cert</H1> <DL> -<%= html.link{value="downloadcacert?certtype=pem", label="Download PEM"} %><BR> -<%= html.link{value="downloadcacert?certtype=der", label="Download DER"} %><BR> -<%= html.link{value="downloadcacert", label="Import to Firefox"} %><BR> +<%= html.link{value="downloadcacert?viewtype=stream&certtype=pem", label="Download PEM"} %><BR> +<%= html.link{value="downloadcacert?viewtype=stream&certtype=der", label="Download DER"} %><BR> </DL> <% end %> |