diff options
Diffstat (limited to 'openssl-read-html.lsp')
| -rw-r--r-- | openssl-read-html.lsp | 114 |
1 files changed, 70 insertions, 44 deletions
diff --git a/openssl-read-html.lsp b/openssl-read-html.lsp index a3dd4b3..3f4693a 100644 --- a/openssl-read-html.lsp +++ b/openssl-read-html.lsp @@ -24,7 +24,13 @@ <% htmlviewfunctions.displaycommandresults({"approve", "deleterequest", "deletemyrequest", "renewcert", "requestrenewcert", "revoke", "deletecert"}, session) %> -<h1>Pending certificate requests<% if view.value.user then%> for <%= html.html_escape(view.value.user.value) %><% end %></h1> +<% +local label = "" +if view.value.user then + label = label.." for "..html.html_escape(view.value.user.value) +end +local header_level = htmlviewfunctions.displaysectionstart(cfe({label="Pending certificate requests"..label}), page_info) +%> <% if not view.value.pending or #view.value.pending.value == 0 then %> <p>No certificates pending</p> <% else %> @@ -38,20 +44,24 @@ </tr> </thead> <tbody> + <% local req = cfe({ type="hidden", value="" }) %> <% for i,request in ipairs(view.value.pending.value) do %> <tr> <td> - <% if viewlibrary.check_permission("viewrequest") then - io.write(html.link{value="viewrequest?request="..request.name, label="View "}) - end %> - <% if viewlibrary.check_permission("approve") then - io.write(html.link{value="approve?submit=true&request="..request.name, label="Approve "}) - end %> - <% if viewlibrary.check_permission("deleterequest") then - io.write(html.link{value="deleterequest?submit=true&request="..request.name, label="Delete "}) + <% + req.value = request.name + if viewlibrary.check_permission("viewrequest") then + htmlviewfunctions.displayitem(cfe({type="link", value={request=req}, label="", option="View", action="viewrequest"}), page_info, -1) + end + if viewlibrary.check_permission("approve") then + htmlviewfunctions.displayitem(cfe({type="form", value={request=req}, label="", option="Approve", action="approve"}), page_info, -1) + end + if viewlibrary.check_permission("deleterequest") then + htmlviewfunctions.displayitem(cfe({type="form", value={request=req}, label="", option="Delete", action="deleterequest"}), page_info, -1) elseif viewlibrary.check_permission("deletemyrequest") then - io.write(html.link{value="deletemyrequest?submit=true&request="..request.name, label="Delete "}) - end %> + htmlviewfunctions.displayitem(cfe({type="form", value={request=req}, label="", option="Delete", action="deletemyrequest"}), page_info, -1) + end + %> </td> <td><%= html.html_escape(request.user) %></td> <td><%= html.html_escape(request.certtype) %></td> @@ -61,6 +71,9 @@ </tbody> </table> <% end %> +<% htmlviewfunctions.displaysectionend(header_level) %> + +<% viewtype = cfe({type="hidden", value="stream"}) %> <% local reverserevoked = {} local approved = {} @@ -80,7 +93,7 @@ else approved = view.value.approved.value end %> -<h1>Approved certificate requests<% if view.value.user then%> for <%= html.html_escape(view.value.user.value) %><% end %></h1> +<% htmlviewfunctions.displaysectionstart(cfe({label="Approved certificate requests"..label}), page_info, header_level) %> <% if #approved == 0 then %> <p>No certificates approved</p> <% else %> @@ -96,26 +109,30 @@ end %> </tr> </thead> <tbody> + <% local crt = cfe({ type="hidden", value="" }) %> <% for i,cert in ipairs(approved) do %> <tr <% if cert.daysremaining < 14 then %>class='error'<% end %>> <td> - <% if viewlibrary.check_permission("viewcert") then %> - <%= html.link{value="viewcert?cert="..cert.name, label="View "} %> - <% end %> - <% if viewlibrary.check_permission("getcert") then %> - <%= 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 "} %> - <% elseif viewlibrary.check_permission("requestrenewcert") then %> - <%= html.link{value="requestrenewcert?submit=true&cert="..cert.name, label="Renew "} %> - <% end %> - <% if viewlibrary.check_permission("revoke") then %> - <%= html.link{value="revoke?submit=true&cert="..cert.name, label="Revoke "} %> - <% end %> - <% if viewlibrary.check_permission("deletecert") then %> - <%= html.link{value="deletecert?submit=true&cert="..cert.name, label="Delete "} %> - <% end %> + <% + crt.value = cert.name + if viewlibrary.check_permission("viewcert") then + htmlviewfunctions.displayitem(cfe({type="link", value={cert=crt}, label="", option="View", action="viewcert"}), page_info, -1) + end + if viewlibrary.check_permission("getcert") then + htmlviewfunctions.displayitem(cfe({type="link", value={cert=crt, viewtype=viewtype}, label="", option="Download", action="getcert"}), page_info, -1) + end + if viewlibrary.check_permission("renewcert") then + htmlviewfunctions.displayitem(cfe({type="form", value={cert=crt}, label="", option="Renew", action="renewcert"}), page_info, -1) + elseif viewlibrary.check_permission("requestrenewcert") then + htmlviewfunctions.displayitem(cfe({type="form", value={cert=crt}, label="", option="Renew", action="requestrenewcert"}), page_info, -1) + end + if viewlibrary.check_permission("revoke") then + htmlviewfunctions.displayitem(cfe({type="form", value={cert=crt}, label="", option="Revoke", action="revoke"}), page_info, -1) + end + if viewlibrary.check_permission("deletecert") then + htmlviewfunctions.displayitem(cfe({type="form", value={cert=crt}, label="", option="Delete", action="deletecert"}), page_info, -1) + end + %> </td> <td><%= html.html_escape(cert.user) %></td> <td><%= html.html_escape(cert.certtype) %></td> @@ -127,8 +144,9 @@ end %> <tbody> </table> <% end %> +<% htmlviewfunctions.displaysectionend(header_level) %> -<h1>Revoked certificates<% if view.value.user then%> for <%= html.html_escape(view.value.user.value) %><% end %></h1> +<% htmlviewfunctions.displaysectionstart(cfe({label="Revoked certificates"..label}), page_info, header_level) %> <% if #revoked == 0 then %> <p>No certificates revoked</p> <% else %> @@ -143,18 +161,22 @@ end %> </tr> </thead> <tbody> + <% local crt = cfe({ type="hidden", value="" }) %> <% for i,cert in ipairs(revoked) do %> <tr> <td> - <% if viewlibrary.check_permission("viewcert") then %> - <%= html.link{value="viewcert?cert="..cert.name, label="View "} %> - <% end %> - <% --[[ if viewlibrary.check_permission("getcert") then %> - <%= 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 "} %> - <% end %> + <% + crt.value = cert.name + if viewlibrary.check_permission("viewcert") then + htmlviewfunctions.displayitem(cfe({type="link", value={cert=crt}, label="", option="View", action="viewcert"}), page_info, -1) + end + --[[ if viewlibrary.check_permission("getcert") then + htmlviewfunctions.displayitem(cfe({type="link", value={cert=crt, viewtype=viewtype}, label="", option="Download", action="getcert"}), page_info, -1) + end --]] + if viewlibrary.check_permission("deletecert") then + htmlviewfunctions.displayitem(cfe({type="form", value={cert=crt}, label="", option="Delete", action="deletecert"}), page_info, -1) + end + %> </td> <td><%= html.html_escape(cert.user) %></td> <td><%= html.html_escape(cert.certtype) %></td> @@ -165,9 +187,13 @@ end %> </tbody> </table> <% end %> +<% htmlviewfunctions.displaysectionend(header_level) %> -<% if viewlibrary.check_permission("getrevoked") then %> -<h1>Get revoked list (crl)</h1> -<%= html.link{value="getrevoked?viewtype=stream&crltype=PEM", label="Download PEM "} %><BR> -<%= html.link{value="getrevoked?viewtype=stream&crltype=DER", label="Download DER "} %><BR> -<% end %> +<% +if viewlibrary.check_permission("getrevoked") then + htmlviewfunctions.displaysectionstart(cfe({label="Get revoked list (crl)"}), page_info, header_level) + htmlviewfunctions.displayitem(cfe({type="link", value={crltype=cfe({type="hidden", value="PEM"}), viewtype=viewtype}, label="", option="Download PEM", action="getrevoked"}), page_info, -1) + htmlviewfunctions.displayitem(cfe({type="link", value={crltype=cfe({type="hidden", value="DER"}), viewtype=viewtype}, label="", option="Download DER", action="getrevoked"}), page_info, -1) + htmlviewfunctions.displaysectionend(header_level) +end +%> |