From c6cc30b44087e6af84283dcf8d199bb95f35fdf5 Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Thu, 17 Dec 2009 10:26:02 +0000
Subject: Use viewlibrary.check_permission from acf-core-0.9.0

---
 openssl-html.lsp | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

(limited to 'openssl-html.lsp')

diff --git a/openssl-html.lsp b/openssl-html.lsp
index 110c867..2a13ff4 100644
--- a/openssl-html.lsp
+++ b/openssl-html.lsp
@@ -1,10 +1,6 @@
 <% local view, viewlibrary, pageinfo, session = ... %>
 <% require("viewfunctions") %>
 
-<% --[[ DEBUG INFORMATION
-io.write(html.cfe_unpack(view))
---]] %>
-
 <link rel="stylesheet" type="text/css" href="/js/style.css">
 <script type="text/javascript" src="/js/jquery-latest.js"></script>
 <script type="text/javascript" src="/js/jquery.tablesorter.min.js"></script>
@@ -36,15 +32,15 @@ io.write(html.cfe_unpack(view))
 	<% for i,request in ipairs(view.value.pending.value) do %>
 		<tr>
 		<td>
-		<% if session.permissions.openssl.viewrequest then
+		<% if viewlibrary.check_permission("viewrequest") then
 			io.write(html.link{value="viewrequest?request="..request.name, label="View "})
 		end %>
-		<% if session.permissions.openssl.approve then
+		<% if viewlibrary.check_permission("approve") then
 			io.write(html.link{value="approve?request="..request.name, label="Approve "})
 		end %>
-		<% if session.permissions.openssl.deleterequest then
+		<% if viewlibrary.check_permission("deleterequest") then
 			io.write(html.link{value="deleterequest?request="..request.name, label="Delete "})
-		elseif session.permissions.openssl.deletemyrequest then
+		elseif viewlibrary.check_permission("deletemyrequest") then
 			io.write(html.link{value="deletemyrequest?request="..request.name, label="Delete "})
 		end %>
 		</td>
@@ -96,21 +92,21 @@ end %>
 	<% for i,cert in ipairs(approved) do %>
 		<tr <% if cert.daysremaining < 14 then %>class='error'<% end %>>
 		<td>
-		<% if session.permissions.openssl.viewcert then %>
+		<% if viewlibrary.check_permission("viewcert") then %>
 			<%= html.link{value="viewcert?cert="..cert.name, label="View "} %>
 		<% end %>
-		<% if session.permissions.openssl.getcert then %>
+		<% if viewlibrary.check_permission("getcert") then %>
 			<%= html.link{value="getcert?cert="..cert.name, label="Download "} %>
 		<% end %>
-		<% if session.permissions.openssl.renewcert then %>
+		<% if viewlibrary.check_permission("renewcert") then %>
 			<%= html.link{value="renewcert?cert="..cert.name, label="Renew "} %>
-		<% elseif session.permissions.openssl.requestrenewcert then %>
+		<% elseif viewlibrary.check_permission("requestrenewcert") then %>
 			<%= html.link{value="requestrenewcert?cert="..cert.name, label="Renew "} %>
 		<% end %>
-		<% if session.permissions.openssl.revoke then %>
+		<% if viewlibrary.check_permission("revoke") then %>
 			<%= html.link{value="revoke?cert="..cert.name, label="Revoke "} %>
 		<% end %>
-		<% if session.permissions.openssl.deletecert then %>
+		<% if viewlibrary.check_permission("deletecert") then %>
 			<%= html.link{value="deletecert?cert="..cert.name, label="Delete "} %>
 		<% end %>
 		</td>
@@ -145,13 +141,13 @@ end %>
 	<% for i,cert in ipairs(revoked) do %>
 		<tr>
 		<td>
-		<% if session.permissions.openssl.viewcert then %>
+		<% if viewlibrary.check_permission("viewcert") then %>
 			<%= html.link{value="viewcert?cert="..cert.name, label="View "} %>
 		<% end %>
-		<% --[[ if session.permissions.openssl.getcert then %>
+		<% --[[ if viewlibrary.check_permission("getcert") then %>
 			<%= html.link{value="getcert?cert="..cert.name, label="Download "} %>
 		<% end --]] %>
-		<% if session.permissions.openssl.deletecert then %>
+		<% if viewlibrary.check_permission("deletecert") then %>
 			<%= html.link{value="deletecert?cert="..cert.name, label="Delete "} %>
 		<% end %>
 		</td>
@@ -166,7 +162,7 @@ end %>
 <% end %>
 </DL>
 
-<% if session.permissions.openssl.getrevoked then %>
+<% if viewlibrary.check_permission("getrevoked") then %>
 <H1>Get revoked list (crl)</H1>
 <DL>
 <%= html.link{value="getrevoked?crltype=PEM", label="Download PEM "} %><BR>
-- 
cgit v1.2.3