summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorINOPIAE <inopiae@cacert.org>2014-01-26 10:08:14 +0100
committerINOPIAE <inopiae@cacert.org>2014-01-26 10:08:14 +0100
commit89702110de33ccc80f956a3fae684e2816525076 (patch)
treea1df846bf2e3dc491314c9084d6c24e40097be39
parentcff05bf168fda96ba3809c6102c225743ccd306e (diff)
downloadcacert-devel-89702110de33ccc80f956a3fae684e2816525076.tar.gz
cacert-devel-89702110de33ccc80f956a3fae684e2816525076.tar.xz
cacert-devel-89702110de33ccc80f956a3fae684e2816525076.zip
bug 550: moved the output of the organisation client certificates to notary.inc.php
-rw-r--r--includes/notary.inc.php79
-rw-r--r--pages/account/18.php176
2 files changed, 178 insertions, 77 deletions
diff --git a/includes/notary.inc.php b/includes/notary.inc.php
index 20e01db..d71cb2d 100644
--- a/includes/notary.inc.php
+++ b/includes/notary.inc.php
@@ -1318,3 +1318,82 @@ function output_orgclientcerts_data($orgadminid = 0, $orgfilterid = 0, $sorting,
}
return mysql_query($query);
}
+
+function output_orgclientcert_table_header($orgname){
+ ?>
+ <tr>
+ <td colspan="11" class="title"></td>
+ </tr>
+ <tr>
+ <td colspan="11" class="title"><? printf(_("Certificates for %s"), $orgname)?> </td>
+ </tr>
+ <tr>
+ <td class="DataTD"><?=_("OU/Department")?></td>
+ <td class="DataTD"><?=_("Renew/Revoke/Delete")?></td>
+ <td class="DataTD"><?=_("Status")?></td>
+ <td class="DataTD"><?=_("CommonName")?></td>
+ <td class="DataTD"><?=_("SerialNumber")?></td>
+ <td class="DataTD"><?=_("SerialNumber")?></td>
+ <td class="DataTD"><?=_("Revoked")?></td>
+ <td class="DataTD"><?=_("SerialNumber")?></td>
+ <td class="DataTD"><?=_("Expires")?></td>
+ <td colspan="2" class="DataTD"><?=_("Comment *")?></td>
+ </tr>
+ <?
+}
+
+function output_orgclient_table_row($verified, $row, $support = 0){
+ ?>
+ <tr>
+ <td class="DataTD"><?=$row['ou']?></td>
+ <? if($verified == _("Valid") || $verified == _("Expired")) { ?>
+ <td class="DataTD"><input type="checkbox" name="revokeid[]" value="<?=$row['id']?>"></td>
+ <td class="DataTD"><?=$verified?></td>
+ <td class="DataTD"><a href="account.php?id=19&cert=<?=$row['id']?>"><?=$row['CN']?></a></td>
+ <? } elseif($support == 1) { ?>
+ <td class="DataTD">&nbsp;</td>
+ <td class="DataTD"><?=$verified?></td>
+ <td class="DataTD"><?=$row['CN']?></td>
+ <? } else if($verified == _("Pending")) { ?>
+ <td class="DataTD"><input type="checkbox" name="delid[]" value="<?=$row['id']?>"></td>
+ <td class="DataTD"><?=$verified?></td>
+ <td class="DataTD"><?=$row['CN']?></td>
+ <? } else { ?>
+ <td class="DataTD">&nbsp;</td>
+ <td class="DataTD"><?=$verified?></td>
+ <td class="DataTD"><a href="account.php?id=19&cert=<?=$row['id']?>"><?=$row['CN']?></a></td>
+ <? } ?>
+ <td class="DataTD"><?=$row['serial']?></td>
+ <td class="DataTD"><?=$row['cfname'] . ' ' . $row['clname']?></td>
+ <td class="DataTD"><?=$row['revoke']?></td>
+ <td class="DataTD"><?=$row['cfname'] . ' ' . $row['clname']?></td>
+ <td class="DataTD"><?=$row['expires']?></td>
+ <? if($support == 1) { ?>
+ <td class="DataTD"><?=htmlspecialchars($row['description'])?></td>
+ <td class="DataTD">&nbsp;</td>
+ <? } else { ?>
+ <td class="DataTD"><input name="comment_<?=$row['id']?>" type="text" value="<?=htmlspecialchars($row['description'])?>" /></td>
+ <td class="DataTD"><input type="checkbox" name="check_comment_<?=$row['id']?>" /></td>
+ <? } ?>
+ </tr>
+ <?
+}
+
+function output_orgclient_table_footer($support = 0){
+ ?>
+ <tr>
+ <td class="DataTD" colspan="11">
+ <?=_('* Comment is NOT included in the certificate as it is intended for your personal reference only. To change the comment tick the checkbox and hit "Change Settings".')?>
+ </td>
+ </tr>
+ <? if ($support == 0) { ?>
+ <tr>
+ <td class="DataTD" colspan="8"><input type="submit" name="renew" value="<?=_("Renew")?>">&#160;&#160;&#160;&#160;
+ <input type="submit" name="revoke" value="<?=_("Revoke/Delete")?>"></td>
+ <td class="DataTD" colspan="3"><input type="submit" name="change" value="<?=_("Change settings")?>"> </td>
+ </tr>
+ <tr>
+ <td class="DataTD" colspan="11"><?=_("From here you can delete pending requests, or revoke valid certificates.")?></td>
+ </tr>
+ <? }
+}
diff --git a/pages/account/18.php b/pages/account/18.php
index 42b4a65..3641cd4 100644
--- a/pages/account/18.php
+++ b/pages/account/18.php
@@ -23,14 +23,14 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c
<form method="post" action="account.php">
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="9" class="title"><?=_("Organisation Client Certificates")?> </td>
+ <td colspan="11" class="title"><?=_("Organisation Client Certificates")?> </td>
</tr>
<tr>
- <td colspan="9" class="title"><?=_("Filter/Sorting")?></td>
+ <td colspan="11" class="title"><?=_("Filter/Sorting")?></td>
</tr>
<tr>
<td class="DataTD"><?=_("Organisation")?></td>
- <td colspan="8" class="DataTD" >
+ <td colspan="10" class="DataTD" >
<select name="orgfilterid">
<?=sprintf('<option value="%d"%s>%s</option>',0, 0 == $orgfilterid ? " selected" : "" ,_("All")) ?>
<? $query = "select `orginfo`.`O`, `orginfo`.`id`
@@ -48,7 +48,7 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c
</tr>
<tr>
<td class="DataTD"><?=_("Sorting")?></td>
- <td colspan="8" class="DataTD" >
+ <td colspan="10" class="DataTD" >
<select name="sorting">
<?=sprintf('<option value="%d"%s>%s</option>',0, 0 == $sorting ? " selected" : "" ,_("expire date (desc)")) ?>
<?=sprintf('<option value="%d"%s>%s</option>',1, 1 == $sorting ? " selected" : "" ,_("OU, expire date (desc)")) ?>
@@ -58,7 +58,7 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c
</tr>
<tr>
<td class="DataTD"><?=_("Certificate status")?></td>
- <td colspan="8" class="DataTD" >
+ <td colspan="10" class="DataTD" >
<select name="status">
<?=sprintf('<option value="%d"%s>%s</option>',0, 0 == $status ? " selected" : "" ,_("Current/Active")) ?>
<?=sprintf('<option value="%d"%s>%s</option>',1, 1 == $status ? " selected" : "" ,_("All")) ?>
@@ -66,89 +66,104 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c
</td>
</tr>
<tr>
- <td class="DataTD" colspan="9"><input type="submit" name="reset" value="<?=_("Reset")?>" />&nbsp;&nbsp;&nbsp;&nbsp;
+ <td class="DataTD" colspan="11"><input type="submit" name="reset" value="<?=_("Reset")?>" />&nbsp;&nbsp;&nbsp;&nbsp;
<input type="submit" name="filter" value="<?=_("Apply filter/sort")?>" /></td>
</tr>
<tr>
- <td colspan="9" class="DataTD"> </td>
+ <td colspan="11" class="DataTD">&nbsp;</td>
</tr>
<?
-// $query = "select UNIX_TIMESTAMP(`oemail`.`created`) as `created`,
-// UNIX_TIMESTAMP(`oemail`.`expire`) - UNIX_TIMESTAMP() as `timeleft`,
-// UNIX_TIMESTAMP(`oemail`.`expire`) as `expired`,
-// `oemail`.`expire` as `expires`, `oemail`.`revoked` as `revoke`,
-// UNIX_TIMESTAMP(`oemail`.`revoked`) as `revoked`,
-// `oemail`.`CN`, `oemail`.`serial`, `oemail`.`id`,
-// `oemail`.`description`, `oemail`.`ou`, `orginfo`.`O`
-// from `orgemailcerts` as `oemail`, `org`, `orginfo`
-// where `org`.`memid`='".intval($_SESSION['profile']['id'])."' and
-// `org`.`orgid`=`oemail`.`orgid` and `orginfo`.`id` = `org`.`orgid`";
-// if($orgfilterid>0)
-// {
-// $query .= "AND `org`.`orgid`=$orgfilterid ";
-// }
-//
-// if(0==$status)
-// {
-// $query .= "AND `oemail`.`revoked`=0 AND `oemail`.`renewed`=0 ";
-// $query .= "HAVING `timeleft` > 0 AND `revoked`=0 ";
-// }
-// switch ($sorting){
-// case 0:
-// $query .= "ORDER BY `orginfo`.`O`, `oemail`.`expire` desc";
-// break;
-// case 1:
-// $query .= "ORDER BY `orginfo`.`O`, `oemail`.`ou`, `oemail`.`expire` desc";
-// break;
-// case 2:
-// $query .= "ORDER BY `orginfo`.`O`, `oemail`.`CN`, `oemail`.`expire` desc";
-// break;
-// }
-// $res = mysql_query($query);
+/*
+ $query
+ = "select UNIX_TIMESTAMP(`oemail`.`created`) as `created`,
+ UNIX_TIMESTAMP(`oemail`.`expire`) - UNIX_TIMESTAMP() as `timeleft`,
+ UNIX_TIMESTAMP(`oemail`.`expire`) as `expired`,
+ `oemail`.`expire` as `expires`, `oemail`.`revoked` as `revoke`,
+ UNIX_TIMESTAMP(`oemail`.`revoked`) as `revoked`,
+ `oemail`.`CN`, `oemail`.`serial`, `oemail`.`id`,
+ `oemail`.`description`, `oemail`.`ou`, `orginfo`.`O`
+ from `orgemailcerts` as `oemail`, `org`, `orginfo`
+ where `org`.`memid`='".intval($_SESSION['profile']['id'])."' and
+ `org`.`orgid`=`oemail`.`orgid` and `orginfo`.`id` = `org`.`orgid`";
+ if($orgfilterid>0)
+ {
+ $query .= "AND `org`.`orgid`=$orgfilterid ";
+ }
+
+ if(0==$status)
+ {
+ $query .= "AND `oemail`.`revoked`=0 AND `oemail`.`renewed`=0 ";
+ $query .= "HAVING `timeleft` > 0 AND `revoked`=0 ";
+ }
+ switch ($sorting){
+ case 0:
+ $query .= "ORDER BY `orginfo`.`O`, `oemail`.`expire` desc";
+ break;
+ case 1:
+ $query .= "ORDER BY `orginfo`.`O`, `oemail`.`ou`, `oemail`.`expire` desc";
+ break;
+ case 2:
+ $query .= "ORDER BY `orginfo`.`O`, `oemail`.`CN`, `oemail`.`expire` desc";
+ break;
+ }
+ $res = mysql_query($query);
+*/
+
$res = output_orgclientcerts_data(intval($_SESSION['profile']['id']), $orgfilterid, $sorting, $status);
if(mysql_num_rows($res) <= 0)
{
?>
<tr>
- <td colspan="9" class="DataTD"><?=_("No client certificates are currently listed.")?></td>
+ <td colspan="11" class="DataTD"><?=_("No client certificates are currently listed.")?></td>
</tr>
<? } else {
- $orgname='';
- while($row = mysql_fetch_assoc($res))
- {
- if ($row['O']<>$orgname) {
- $orgname=$row['O'];?>
- <tr>
- <td colspan="9" class="title"></td>
- </tr>
- <tr>
- <td colspan="9" class="title"><? printf(_("Certificates for %s"), $orgname)?> </td>
- </tr>
- <tr>
- <td class="DataTD"><?=_("OU/Department")?></td>
- <td class="DataTD"><?=_("Renew/Revoke/Delete")?></td>
- <td class="DataTD"><?=_("Status")?></td>
- <td class="DataTD"><?=_("CommonName")?></td>
- <td class="DataTD"><?=_("SerialNumber")?></td>
- <td class="DataTD"><?=_("Revoked")?></td>
- <td class="DataTD"><?=_("Expires")?></td>
- <td colspan="2" class="DataTD"><?=_("Comment *")?></td>
- </tr>
- <?
- }
- if($row['timeleft'] > 0)
- $verified = _("Valid");
- if($row['timeleft'] < 0)
- $verified = _("Expired");
- if($row['expired'] == 0)
- $verified = _("Pending");
- if($row['revoked'] > 0)
- $verified = _("Revoked");
- if($row['revoked'] == 0)
- $row['revoke'] = _("Not Revoked");
-?>
+ $orgname='';
+ while($row = mysql_fetch_assoc($res))
+ {
+ if ($row['O']<>$orgname) {
+ $orgname=$row['O'];
+/*
+ <tr>
+ <td colspan="9" class="title"></td>
+ </tr>
+ <tr>
+ <td colspan="9" class="title"><? printf(_("Certificates for %s"), $orgname)?> </td>
+ // </tr>
+ // <tr>
+ // <td class="DataTD"><?=_("OU/Department")?></td>
+ // <td class="DataTD"><?=_("Renew/Revoke/Delete")?></td>
+ // <td class="DataTD"><?=_("Status")?></td>
+ // <td class="DataTD"><?=_("CommonName")?></td>
+ // <td class="DataTD"><?=_("SerialNumber")?></td>
+ // <td class="DataTD"><?=_("Revoked")?></td>
+ // <td class="DataTD"><?=_("Expires")?></td>
+ // <td colspan="2" class="DataTD"><?=_("Comment *")?></td>
+ // </tr>
+ // <?
+ */
+ output_orgclientcert_table_header($orgname);
+ }
+
+ if($row['timeleft'] > 0)
+ $verified = _("Valid");
+ if($row['timeleft'] < 0)
+ $verified = _("Expired");
+ if($row['expired'] == 0)
+ $verified = _("Pending");
+ if($row['revoked'] > 0)
+ $verified = _("Revoked");
+ if($row['revoked'] == 0)
+ $row['revoke'] = _("Not Revoked");
+ if(!$row['cfname'] && !!$row['clname'] ){
+ $row['cfname'] = _("Not recorded");
+ $row['clname'] = _("");
+ $row['rfname'] = _("Not recorded");
+ $row['rlname'] = _("");
+ }
+
+/*?>
<tr>
<td class="DataTD"><?=$row['ou']?></td>
<? if($verified == _("Valid") || $verified == _("Expired")) { ?>
@@ -170,7 +185,10 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c
<td class="DataTD"><input name="comment_<?=$row['id']?>" type="text" value="<?=htmlspecialchars($row['description'])?>" /></td>
<td class="DataTD"><input type="checkbox" name="check_comment_<?=$row['id']?>" /></td>
</tr>
-<? } ?>
+<? } ?> */
+ output_orgclient_table_row($verified, $row, 0);
+ }
+/*?>
<tr>
<td class="DataTD" colspan="9">
<?=_('* Comment is NOT included in the certificate as it is intended for your personal reference only. To change the comment tick the checkbox and hit "Change Settings".')?>
@@ -184,8 +202,12 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c
<tr>
<td class="DataTD" colspan="9"><?=_("From here you can delete pending requests, or revoke valid certificates.")?></td>
</tr>
-<? } ?>
+<? } ?>*/
+ output_orgclient_table_footer(0);
+ }
+
+?>
</table>
<input type="hidden" name="oldid" value="<?=$id?>">
<input type="hidden" name="csrf" value="<?=make_csrf('clicerchange')?>" />
-</form> \ No newline at end of file
+</form>