diff options
| -rw-r--r-- | openssl-checkenvironment-html.lsp | 20 | ||||
| -rw-r--r-- | openssl-editconfigfile-html.lsp | 12 | ||||
| -rw-r--r-- | openssl-editdefaults-html.lsp | 14 | ||||
| -rw-r--r-- | openssl-generatecacert-html.lsp | 14 | ||||
| -rw-r--r-- | openssl-html.lsp | 150 | ||||
| -rw-r--r-- | openssl-putcacert-html.lsp | 14 | ||||
| -rw-r--r-- | openssl-request-html.lsp | 14 | ||||
| -rw-r--r-- | openssl-status-html.lsp | 28 | ||||
| -rw-r--r-- | openssl-viewcert-html.lsp | 8 | ||||
| -rw-r--r-- | openssl-viewrequest-html.lsp | 8 |
10 files changed, 141 insertions, 141 deletions
diff --git a/openssl-checkenvironment-html.lsp b/openssl-checkenvironment-html.lsp index 9b8848c..1bd73a2 100644 --- a/openssl-checkenvironment-html.lsp +++ b/openssl-checkenvironment-html.lsp @@ -1,15 +1,15 @@ -<? local form, viewlibrary, page_info = ... ?> -<? require("viewfunctions") ?> +<% local form, viewlibrary, page_info = ... %> +<% require("viewfunctions") %> -<? --[[ DEBUG INFORMATION +<% --[[ DEBUG INFORMATION io.write(html.cfe_unpack(form)) ---]] ?> +--]] %> -<H1><?= form.label ?></H1> +<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 ?> +<% 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> diff --git a/openssl-editconfigfile-html.lsp b/openssl-editconfigfile-html.lsp index bd8e6de..50b8922 100644 --- a/openssl-editconfigfile-html.lsp +++ b/openssl-editconfigfile-html.lsp @@ -1,12 +1,12 @@ -<? local form, viewlibrary, page_info, session = ... ?> -<? require("viewfunctions") ?> +<% local form, viewlibrary, page_info, session = ... %> +<% require("viewfunctions") %> -<? +<% local pattern = string.gsub(page_info.prefix..page_info.controller, "[%(%)%.%%%+%-%*%?%[%]%^%$]", "%%%1") local func = haserl.loadfile(page_info.viewfile:gsub(pattern..".*$", "/") .. "filedetails-html.lsp") func(form, viewlibrary, page_info, session) -?> +%> -<? if viewlibrary and viewlibrary.dispatch_component and session.permissions.openssl.checkenvironment then +<% if viewlibrary and viewlibrary.dispatch_component and session.permissions.openssl.checkenvironment then viewlibrary.dispatch_component("checkenvironment") -end ?> +end %> diff --git a/openssl-editdefaults-html.lsp b/openssl-editdefaults-html.lsp index 376eb12..2962877 100644 --- a/openssl-editdefaults-html.lsp +++ b/openssl-editdefaults-html.lsp @@ -1,16 +1,16 @@ -<? local form, viewlibrary, page_info = ... ?> -<? require("viewfunctions") ?> +<% local form, viewlibrary, page_info = ... %> +<% require("viewfunctions") %> -<? --[[ DEBUG INFORMATION +<% --[[ DEBUG INFORMATION io.write(html.cfe_unpack(form)) ---]] ?> +--]] %> -<H1><?= form.label ?></H1> -<? +<H1><%= form.label %></H1> +<% form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action local order = { "countryName", "C", "stateOrProvinceName", "ST", "localityName", "L", "organizationName", "O", "organizationalUnitName", "OU", "commonName", "CN", "emailAddress" } local finishingorder = { "certtype", "extensions" } displayform(form, order, finishingorder) -?> +%> diff --git a/openssl-generatecacert-html.lsp b/openssl-generatecacert-html.lsp index 1061ab6..a4ebdd3 100644 --- a/openssl-generatecacert-html.lsp +++ b/openssl-generatecacert-html.lsp @@ -1,15 +1,15 @@ -<? local form, viewlibrary, page_info = ... ?> -<? require("viewfunctions") ?> +<% local form, viewlibrary, page_info = ... %> +<% require("viewfunctions") %> -<? --[[ DEBUG INFORMATION +<% --[[ DEBUG INFORMATION io.write(html.cfe_unpack(form)) ---]] ?> +--]] %> -<H1><?= form.label ?></H1> -<? +<H1><%= form.label %></H1> +<% form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action local order = { "countryName", "C", "stateOrProvinceName", "ST", "localityName", "L", "organizationName", "O", "organizationalUnitName", "OU", "commonName", "CN", "emailAddress" } displayform(form, order) -?> +%> diff --git a/openssl-html.lsp b/openssl-html.lsp index abf71a7..616bc40 100644 --- a/openssl-html.lsp +++ b/openssl-html.lsp @@ -1,9 +1,9 @@ -<? local view, viewlibrary, pageinfo, session = ... ?> -<? require("viewfunctions") ?> +<% local view, viewlibrary, pageinfo, session = ... %> +<% require("viewfunctions") %> -<? --[[ DEBUG INFORMATION +<% --[[ 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> @@ -16,12 +16,12 @@ io.write(html.cfe_unpack(view)) }); </script> -<? displaycommandresults({"approve", "deleterequest", "deletemyrequest", "renewcert", "requestrenewcert", "revoke", "deletecert"}, session) ?> +<% displaycommandresults({"approve", "deleterequest", "deletemyrequest", "renewcert", "requestrenewcert", "revoke", "deletecert"}, session) %> -<H1>Pending certificate requests<? if view.value.user then?> for <?= view.value.user.value ?><? end ?></H1> -<? if not view.value.pending or #view.value.pending.value == 0 then ?> +<H1>Pending certificate requests<% if view.value.user then%> for <%= view.value.user.value %><% end %></H1> +<% if not view.value.pending or #view.value.pending.value == 0 then %> No certificates pending -<? else ?> +<% else %> <table id="pending" class="tablesorter"> <thead> <tr> @@ -32,31 +32,31 @@ io.write(html.cfe_unpack(view)) </tr> </thead> <tbody> - <? for i,request in ipairs(view.value.pending.value) do ?> + <% for i,request in ipairs(view.value.pending.value) do %> <tr> <td> - <? if session.permissions.openssl.viewrequest then + <% if session.permissions.openssl.viewrequest then io.write(html.link{value="viewrequest?request="..request.name, label="View "}) - end ?> - <? if session.permissions.openssl.approve then + end %> + <% if session.permissions.openssl.approve then io.write(html.link{value="approve?request="..request.name, label="Approve "}) - end ?> - <? if session.permissions.openssl.deleterequest then + end %> + <% if session.permissions.openssl.deleterequest then io.write(html.link{value="deleterequest?request="..request.name, label="Delete "}) elseif session.permissions.openssl.deletemyrequest then io.write(html.link{value="deletemyrequest?request="..request.name, label="Delete "}) - end ?> + end %> </td> - <td><?= request.user ?></td> - <td><?= request.certtype ?></td> - <td><?= request.commonName ?></td> + <td><%= request.user %></td> + <td><%= request.certtype %></td> + <td><%= request.commonName %></td> </tr> - <? end ?> + <% end %> </tbody> </table> -<? end ?> +<% end %> -<? local reverserevoked = {} +<% local reverserevoked = {} local approved = {} local revoked = {} if view.value.revoked and #view.value.revoked.value > 0 then @@ -72,12 +72,12 @@ if view.value.revoked and #view.value.revoked.value > 0 then end else approved = view.value.approved.value -end ?> +end %> -<H1>Approved certificate requests<? if view.value.user then?> for <?= view.value.user.value ?><? end ?></H1> -<? if #approved == 0 then ?> +<H1>Approved certificate requests<% if view.value.user then%> for <%= view.value.user.value %><% end %></H1> +<% if #approved == 0 then %> No certificates approved -<? else ?> +<% else %> <table id="approved" class="tablesorter"> <thead> <tr> @@ -90,42 +90,42 @@ end ?> </tr> </thead> <tbody> - <? for i,cert in ipairs(approved) do ?> - <tr <? if cert.daysremaining < 14 then ?>class='error'<? end ?>> + <% for i,cert in ipairs(approved) do %> + <tr <% if cert.daysremaining < 14 then %>class='error'<% end %>> <td> - <? if session.permissions.openssl.viewcert then ?> - <?= html.link{value="viewcert?cert="..cert.name, label="View "} ?> - <? end ?> - <? if session.permissions.openssl.getcert then ?> - <?= html.link{value="getcert?cert="..cert.name, label="Download "} ?> - <? end ?> - <? --[[ if session.permissions.openssl.renewcert then ?> - <?= html.link{value="renewcert?cert="..cert.name, label="Renew "} ?> - <? elseif session.permissions.openssl.requestrenewcert then ?> - <?= html.link{value="requestrenewcert?cert="..cert.name, label="Renew "} ?> - <? end --]] ?> - <? if session.permissions.openssl.revoke then ?> - <?= html.link{value="revoke?cert="..cert.name, label="Revoke "} ?> - <? end ?> - <? if session.permissions.openssl.deletecert then ?> - <?= html.link{value="deletecert?cert="..cert.name, label="Delete "} ?> - <? end ?> + <% if session.permissions.openssl.viewcert then %> + <%= html.link{value="viewcert?cert="..cert.name, label="View "} %> + <% end %> + <% if session.permissions.openssl.getcert then %> + <%= html.link{value="getcert?cert="..cert.name, label="Download "} %> + <% end %> + <% --[[ if session.permissions.openssl.renewcert then %> + <%= html.link{value="renewcert?cert="..cert.name, label="Renew "} %> + <% elseif session.permissions.openssl.requestrenewcert then %> + <%= html.link{value="requestrenewcert?cert="..cert.name, label="Renew "} %> + <% end --]] %> + <% if session.permissions.openssl.revoke then %> + <%= html.link{value="revoke?cert="..cert.name, label="Revoke "} %> + <% end %> + <% if session.permissions.openssl.deletecert then %> + <%= html.link{value="deletecert?cert="..cert.name, label="Delete "} %> + <% end %> </td> - <td><?= cert.user ?></td> - <td><?= cert.certtype ?></td> - <td><?= cert.commonName ?></td> - <td><?= tostring(tonumber('0x'..cert.serial)) ?></td> - <td><?= cert.enddate ?></td> + <td><%= cert.user %></td> + <td><%= cert.certtype %></td> + <td><%= cert.commonName %></td> + <td><%= tostring(tonumber('0x'..cert.serial)) %></td> + <td><%= cert.enddate %></td> </tr> - <? end ?> + <% end %> <tbody> </table> -<? end ?> +<% end %> -<H1>Revoked certificates<? if view.value.user then?> for <?= view.value.user.value ?><? end ?></H1> -<? if #revoked == 0 then ?> +<H1>Revoked certificates<% if view.value.user then%> for <%= view.value.user.value %><% end %></H1> +<% if #revoked == 0 then %> No certificates revoked -<? else ?> +<% else %> <table id="revoked" class="tablesorter"> <thead> <tr> @@ -137,33 +137,33 @@ end ?> </tr> </thead> <tbody> - <? for i,cert in ipairs(revoked) do ?> + <% for i,cert in ipairs(revoked) do %> <tr> <td> - <? if session.permissions.openssl.viewcert then ?> - <?= html.link{value="viewcert?cert="..cert.name, label="View "} ?> - <? end ?> - <? --[[ if session.permissions.openssl.getcert then ?> - <?= html.link{value="getcert?cert="..cert.name, label="Download "} ?> - <? end --]] ?> - <? if session.permissions.openssl.deletecert then ?> - <?= html.link{value="deletecert?cert="..cert.name, label="Delete "} ?> - <? end ?> + <% if session.permissions.openssl.viewcert then %> + <%= html.link{value="viewcert?cert="..cert.name, label="View "} %> + <% end %> + <% --[[ if session.permissions.openssl.getcert then %> + <%= html.link{value="getcert?cert="..cert.name, label="Download "} %> + <% end --]] %> + <% if session.permissions.openssl.deletecert then %> + <%= html.link{value="deletecert?cert="..cert.name, label="Delete "} %> + <% end %> </td> - <td><?= cert.user ?></td> - <td><?= cert.certtype ?></td> - <td><?= cert.commonName ?></td> - <td><?= tostring(tonumber('0x'..cert.serial)) ?></td> + <td><%= cert.user %></td> + <td><%= cert.certtype %></td> + <td><%= cert.commonName %></td> + <td><%= tostring(tonumber('0x'..cert.serial)) %></td> </tr> - <? end ?> + <% end %> </tbody> </table> -<? end ?> +<% end %> -<? if session.permissions.openssl.getrevoked then ?> +<% if session.permissions.openssl.getrevoked then %> <H1>Get revoked list (crl)</H1> -<?= 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?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> -<? end ?> +<% end %> diff --git a/openssl-putcacert-html.lsp b/openssl-putcacert-html.lsp index 2a2cfb7..35bd34a 100644 --- a/openssl-putcacert-html.lsp +++ b/openssl-putcacert-html.lsp @@ -1,16 +1,16 @@ -<? local form, viewlibrary, page_info = ... ?> -<? require("viewfunctions") ?> +<% local form, viewlibrary, page_info = ... %> +<% require("viewfunctions") %> -<? --[[ DEBUG INFORMATION +<% --[[ DEBUG INFORMATION io.write(html.cfe_unpack(form)) ---]] ?> +--]] %> -<H1><?= form.label ?></H1> -<? +<H1><%= form.label %></H1> +<% -- This is a kludge to get file upload working form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action .. '" enctype="multipart/form-data' form.value.ca.type="file" form.value.password.type="password" local order = {"ca", "password"} displayform(form, order) -?> +%> diff --git a/openssl-request-html.lsp b/openssl-request-html.lsp index cc0cdb3..b2b6495 100644 --- a/openssl-request-html.lsp +++ b/openssl-request-html.lsp @@ -1,12 +1,12 @@ -<? local form, viewlibrary, page_info = ... ?> -<? require("viewfunctions") ?> +<% local form, viewlibrary, page_info = ... %> +<% require("viewfunctions") %> -<? --[[ DEBUG INFORMATION +<% --[[ DEBUG INFORMATION io.write(html.cfe_unpack(form)) ---]] ?> +--]] %> -<H1><?= form.label ?></H1> -<? +<H1><%= form.label %></H1> +<% form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action form.value.password.type = "password" form.value.password_confirm.type = "password" @@ -14,5 +14,5 @@ io.write(html.cfe_unpack(form)) "organizationalUnitName", "OU", "commonName", "CN", "emailAddress" } local finishingorder = { "certtype", "extensions", "password", "password_confirm" } displayform(form, order, finishingorder) -?> +%> diff --git a/openssl-status-html.lsp b/openssl-status-html.lsp index cf9f119..e2247d5 100644 --- a/openssl-status-html.lsp +++ b/openssl-status-html.lsp @@ -1,28 +1,28 @@ -<? local view, viewlibrary, pageinfo, session = ... ?> -<? require("viewfunctions") ?> +<% local view, viewlibrary, pageinfo, session = ... %> +<% require("viewfunctions") %> -<? --[[ DEBUG INFORMATION +<% --[[ DEBUG INFORMATION io.write(html.cfe_unpack(view)) ---]] ?> +--]] %> <H1>System Info</H1> <DL> -<? displayitem(view.value.version) ?> -<? displayitem(view.value.conffile) ?> -<? displayitem(view.value.environment) ?> -<? displayitem(view.value.cacert) ?> -<? displayitem(view.value.cakey) ?> +<% displayitem(view.value.version) %> +<% displayitem(view.value.conffile) %> +<% displayitem(view.value.environment) %> +<% displayitem(view.value.cacert) %> +<% displayitem(view.value.cakey) %> </DL> -<? if not view.value.version.errtxt and not view.value.conffile.errtxt then +<% if not view.value.version.errtxt and not view.value.conffile.errtxt then if view.value.environment.errtxt then if viewlibrary and viewlibrary.dispatch_component and session.permissions.openssl.checkenvironment then viewlibrary.dispatch_component("checkenvironment") end - elseif not view.value.cacert.errtxt and not view.value.cakey.errtxt then ?> + elseif not view.value.cacert.errtxt and not view.value.cakey.errtxt then %> <H1>CA Certificate contents</H1> -<pre><?= view.value.cacertcontents.value ?></pre> - <? elseif viewlibrary and viewlibrary.dispatch_component then +<pre><%= view.value.cacertcontents.value %></pre> + <% elseif viewlibrary and viewlibrary.dispatch_component then if session.permissions.openssl.putcacert then viewlibrary.dispatch_component("putcacert") end @@ -30,5 +30,5 @@ io.write(html.cfe_unpack(view)) viewlibrary.dispatch_component("generatecacert") end end -end ?> +end %> diff --git a/openssl-viewcert-html.lsp b/openssl-viewcert-html.lsp index 0593afd..d23cb53 100644 --- a/openssl-viewcert-html.lsp +++ b/openssl-viewcert-html.lsp @@ -1,8 +1,8 @@ -<? local view, viewlibrary = ... ?> +<% local view, viewlibrary = ... %> -<? --[[ DEBUG INFORMATION +<% --[[ DEBUG INFORMATION io.write(html.cfe_unpack(view)) ---]] ?> +--]] %> <H1>Certificate Details</H1> -<pre><?= view.value.value ?></pre> +<pre><%= view.value.value %></pre> diff --git a/openssl-viewrequest-html.lsp b/openssl-viewrequest-html.lsp index cea358e..30c5c05 100644 --- a/openssl-viewrequest-html.lsp +++ b/openssl-viewrequest-html.lsp @@ -1,8 +1,8 @@ -<? local view, viewlibrary = ... ?> +<% local view, viewlibrary = ... %> -<? --[[ DEBUG INFORMATION +<% --[[ DEBUG INFORMATION io.write(html.cfe_unpack(view)) ---]] ?> +--]] %> <H1>Request Details</H1> -<pre><?= view.value.value ?></pre> +<pre><%= view.value.value %></pre> |