diff options
| -rw-r--r-- | openssl-html.lsp | 122 |
1 files changed, 74 insertions, 48 deletions
diff --git a/openssl-html.lsp b/openssl-html.lsp index c3d0c3b..97b4a97 100644 --- a/openssl-html.lsp +++ b/openssl-html.lsp @@ -4,6 +4,17 @@ 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> +<script type="text/javascript"> + $(document).ready(function() { + $("#pending").tablesorter({headers: {0:{sorter: false}}}); + $("#approved").tablesorter({headers: {0:{sorter: false}, 5:{sorter:'usLongDate'}}}); + $("#revoked").tablesorter({headers: {0:{sorter: false}, 5:{sorter:'usLongDate'}}}); + }); +</script> + <? if view.value.cmdresult then ?> <H1>Command Result</H1> <DL> @@ -15,15 +26,19 @@ io.write(html.cfe_unpack(view)) <? if not view.value.pending or #view.value.pending.value == 0 then ?> No certificates pending <? else ?> -<TABLE> - <TR style="background:#eee;font-weight:bold;"> - <TD style="padding-right:20px;white-space:nowrap;" class="header">Action</TD> - <TD style="padding-right:20px;white-space:nowrap;" class="header">User</TD> - <TD style="padding-right:20px;white-space:nowrap;" class="header">Cert Type</TD> - <TD style="white-space:nowrap;" class="header">Common Name</TD> +<table id="pending" class="tablesorter"> +<thead> + <tr> + <th>Action</th> + <th>User</th> + <th>Cert Type</th> + <th>Common Name</th> + </tr> +</thead> +<tbody> <? for i,request in ipairs(view.value.pending.value) do ?> - <TR> - <TD> + <tr> + <td> <? if session.permissions.openssl.viewrequest then io.write(html.link{value="viewrequest?request="..request.name, label="View "}) end ?> @@ -35,13 +50,14 @@ io.write(html.cfe_unpack(view)) elseif session.permissions.openssl.deletemyrequest then io.write(html.link{value="deletemyrequest?request="..request.name, label="Delete "}) end ?> - </TD> - <TD><?= request.user ?></TD> - <TD><?= request.certtype ?></TD> - <TD><?= request.commonName ?></TD> - </TR> + </td> + <td><?= request.user ?></td> + <td><?= request.certtype ?></td> + <td><?= request.commonName ?></td> + </tr> <? end ?> -</TABLE> +</tbody> +</table> <? end ?> <? local reverserevoked = {} @@ -66,17 +82,21 @@ end ?> <? if #approved == 0 then ?> No certificates approved <? else ?> -<TABLE> - <TR style="background:#eee;font-weight:bold;"> - <TD style="padding-right:20px;white-space:nowrap;" class="header">Action</TD> - <TD style="padding-right:20px;white-space:nowrap;" class="header">User</TD> - <TD style="padding-right:20px;white-space:nowrap;" class="header">Cert Type</TD> - <TD style="padding-right:20px;white-space:nowrap;" class="header">Common Name</TD> - <TD style="padding-right:20px;white-space:nowrap;" class="header">Serial Num</TD> - <TD style="white-space:nowrap;" class="header">End Date</TD> +<table id="approved" class="tablesorter"> +<thead> + <tr> + <th>Action</th> + <th>User</th> + <th>Cert Type</th> + <th>Common Name</th> + <th>Serial Num</th> + <th>End Date</th> + </tr> +</thead> +<tbody> <? for i,cert in ipairs(approved) do ?> - <TR <? if cert.daysremaining < 14 then ?>class='error'<? end ?>> - <TD> + <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 ?> @@ -94,31 +114,36 @@ 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><?= cert.serial ?></TD> - <TD><?= cert.enddate ?></TD> - </TR> + </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 ?> -</TABLE> +<tbody> +</table> <? end ?> <H1>Revoked certificates<? if view.value.user then?> for <?= view.value.user.value ?><? end ?></H1> <? if #revoked == 0 then ?> No certificates revoked <? else ?> -<TABLE> - <TR style="background:#eee;font-weight:bold;"> - <TD style="padding-right:20px;white-space:nowrap;" class="header">Action</TD> - <TD style="padding-right:20px;white-space:nowrap;" class="header">User</TD> - <TD style="padding-right:20px;white-space:nowrap;" class="header">Cert Type</TD> - <TD style="padding-right:20px;white-space:nowrap;" class="header">Common Name</TD> - <TD style="white-space:nowrap;" class="header">Serial Num</TD> +<table id="revoked" class="tablesorter"> +<thead> + <tr> + <th>Action</th> + <th>User</th> + <th>Cert Type</th> + <th>Common Name</th> + <th>Serial Num</th> + </tr> +</thead> +<tbody> <? for i,cert in ipairs(revoked) do ?> - <TR> - <TD> + <tr> + <td> <? if session.permissions.openssl.viewcert then ?> <?= html.link{value="viewcert?cert="..cert.name, label="View "} ?> <? end ?> @@ -128,14 +153,15 @@ 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><?= cert.serial ?></TD> - </TR> + </td> + <td><?= cert.user ?></td> + <td><?= cert.certtype ?></td> + <td><?= cert.commonName ?></td> + <td><?= tostring(tonumber('0x'..cert.serial)) ?></td> + </tr> <? end ?> -</TABLE> +</tbody> +</table> <? end ?> <? if session.permissions.openssl.getrevoked then ?> |