CAcert Code Development list.

[Wytze van der Raay <wytze AT cacert.org>]

Hi Michael,

Michael Tänzer schreef op 20-11-2013 15:20:
> We have a fix for https://bugs.cacert.org/view.php?id=1010
> "Reorder the view on organisation certificates"
> 
> The fix was reviewed by Benny Baumann (BenBE) and me (NEOatNHNG) and
> tested by Eva Stöwe (Eva) and Marcus Mängel (INOPIAE).
> 
> Diff is attached. Please also run the locale makefile so that our
> translators see the new strings (if present) on
> https://translations.cacert.org and new translations get imported into
> the system.
> 
> Changed files:
> includes/account.php
> pages/account/18.php
> pages/account/22.php

The patch has been installed on the production server on November 20,
2013. See also the attached log sent to the cacert-systemlog mailing
list. The translation update will be performed after completing this
row of patches.

Regards,
-- wytze

--- Begin Message ---

• From: Wytze van der Raay <wytze AT cacert.org>
• To: cacert-systemlog AT lists.cacert.org
• Subject: Fwd: cvs.cacert.org checkin notification
• Date: Wed, 20 Nov 2013 17:29:56 +0100
• Organization: CAcert

Fix for https://bugs.cacert.org/view.php?id=1010
"Reorder the view on organisation certificates"

In conjunction with the attached CVS changes a new tarball has been
made available incorporating all updates. The new tarball is available
through http://www.cacert.org/src-lic.php

-- end

--- Begin Message ---

• From: "root" <root AT cvs.cacert.org>
• To: critical-admin AT cacert.org
• Subject: cvs.cacert.org checkin notification
• Date: Wed, 20 Nov 2013 17:28:32 +0100 (CET)

uid=0(root) gid=0(root) groups=0(root)
account.php 1.167 1.168
Wed Nov 20 17:28:32 CET 2013
Update of /var/lib/cvs/cacert/includes
In directory webdb:/home/cacert/www/includes

Modified Files:
account.php
Log Message:
Fix for https://bugs.cacert.org/view.php?id=1010
"Reorder the view on organisation certificates"

===================================================================
RCS file: /var/lib/cvs/cacert/includes/account.php,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- account.php 2013/10/21 09:17:17 1.167
+++ account.php 2013/11/20 16:28:32 1.168
@@ -1540,6 +1540,7 @@

$query = "insert into `orgemailcerts` set
`CN`='$defaultemail',
+
`ou`='".$_SESSION['_config']['OU']."',
`keytype`='NS',
`orgid`='".$org['orgid']."',

`created`=FROM_UNIXTIME(UNIX_TIMESTAMP()),
@@ -1630,6 +1631,7 @@

$query = "insert into `orgemailcerts` set
`CN`='$defaultemail',
+
`ou`='".$_SESSION['_config']['OU']."',
`keytype`='" .
sanitizeHTML($_REQUEST['keytype']) . "',
`orgid`='".$org['orgid']."',

`created`=FROM_UNIXTIME(UNIX_TIMESTAMP()),
@@ -1705,6 +1707,7 @@
$query = "insert into `orgemailcerts` set
`orgid`='".$row['orgid']."',
`CN`='".$row['CN']."',
+ `ou`='".$row['ou']."',

`subject`='".$row['subject']."',

`keytype`='".$row['keytype']."',

`csr_name`='".$row['csr_name']."',
@@ -1821,6 +1824,21 @@
exit;
}

+ if($oldid == 18 && array_key_exists('filter',$_REQUEST) &&
$_REQUEST['filter']!= "")
+ {
+ $id=18;
+ $_SESSION['_config']['orgfilterid']=$_REQUEST['orgfilterid'];
+ $_SESSION['_config']['sorting']=$_REQUEST['sorting'];
+ $_SESSION['_config']['status']=$_REQUEST['status'];
+ }
+
+ if($oldid == 18 && array_key_exists('reset',$_REQUEST) &&
$_REQUEST['reset']!= "")
+ {
+ $id=18;
+ $_SESSION['_config']['orgfilterid']=0;
+ $_SESSION['_config']['sorting']=0;
+ $_SESSION['_config']['status']=0;
+ }

if($process != "" && $oldid == 20)
{
@@ -2177,6 +2195,22 @@
exit;
}

+ if($oldid == 22 && array_key_exists('filter',$_REQUEST) &&
$_REQUEST['filter']!= "")
+ {
+ $id=22;
+
$_SESSION['_config']['dorgfilterid']=$_REQUEST['dorgfilterid'];
+ $_SESSION['_config']['dsorting']=$_REQUEST['dsorting'];
+ $_SESSION['_config']['dstatus']=$_REQUEST['dstatus'];
+ }
+
+ if($oldid == 22 && array_key_exists('reset',$_REQUEST) &&
$_REQUEST['reset']!= "")
+ {
+ $id=22;
+ $_SESSION['_config']['dorgfilterid']=0;
+ $_SESSION['_config']['dsorting']=0;
+ $_SESSION['_config']['dstatus']=0;
+ }
+

if(($id == 24 || $oldid == 24 || $id == 25 || $oldid == 25 || $id ==
26 || $oldid == 26 ||
$id == 27 || $oldid == 27 || $id == 28 || $oldid == 28 || $id
== 29 || $oldid == 29 ||

--- End Message ---

--- Begin Message ---

• From: "root" <root AT cvs.cacert.org>
• To: critical-admin AT cacert.org
• Subject: cvs.cacert.org checkin notification
• Date: Wed, 20 Nov 2013 17:28:34 +0100 (CET)

uid=0(root) gid=0(root) groups=0(root)
18.php 1.17 1.18 22.php 1.14 1.15
Wed Nov 20 17:28:34 CET 2013
Update of /var/lib/cvs/cacert/pages/account
In directory webdb:/home/cacert/www/pages/account

Modified Files:
18.php 22.php
Log Message:
Fix for https://bugs.cacert.org/view.php?id=1010
"Reorder the view on organisation certificates"

===================================================================
RCS file: /var/lib/cvs/cacert/pages/account/22.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- 22.php 2013/07/17 08:19:01 1.14
+++ 22.php 2013/11/20 16:28:34 1.15
@@ -14,12 +14,117 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA
-*/ ?>
-<? $viewall=0; if(array_key_exists('viewall',$_REQUEST))
$viewall=intval($_REQUEST['viewall']); ?>
+*/
+
+$orgfilterid = array_key_exists('dorgfilterid',$_SESSION['_config']) ?
intval($_SESSION['_config']['dorgfilterid']) : 0;
+$sorting = array_key_exists('dsorting',$_SESSION['_config']) ?
intval($_SESSION['_config']['dsorting']) : 0;
+$status = array_key_exists('dstatus',$_SESSION['_config']) ?
intval($_SESSION['_config']['dstatus']) : 0;
+?>
<form method="post" action="account.php">
<table align="center" valign="middle" border="0" cellspacing="0"
cellpadding="0" class="wrapper">
<tr>
- <td colspan="8" class="title"><?=_("Domain Certificates")?> - <a
href="account.php?id=22&amp;viewall=<?=!$viewall?>"><?=_("View all
certificates")?></a></td>
+ <td colspan="8" class="title"><?=_("Organisation Server Certificates")?>
</td>
+ </tr>
+ <tr>
+ <td colspan="8" class="title"><?=_("Filter/Sorting")?></td>
+ </tr>
+ <tr>
+ <td class="DataTD"><?=_("Organisation")?></td>
+ <td colspan="7" class="DataTD" >
+ <select name="dorgfilterid">
+ <?=sprintf('<option value="%d"%s>%s</option>',0, 0 == $orgfilterid
? " selected" : "" ,_("All")) ?>
+<? $query = "select `orginfo`.`O`, `orginfo`.`id`
+ from `org`, `orginfo`
+ where `org`.`memid`='".intval($_SESSION['profile']['id'])."' and
`orginfo`.`id` = `org`.`orgid`
+ ORDER BY `orginfo`.`O` ";
+ $reso = mysql_query($query);
+ if(mysql_num_rows($reso) >= 1){
+ while($row = mysql_fetch_assoc($reso)){
+ printf('<option value="%d"%s>%s</option>',$row['id'], $row['id'] ==
$orgfilterid ? " selected" : "" , $row['O']);
+ }
+ }?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="DataTD"><?=_("Sorting")?></td>
+ <td colspan="7" class="DataTD" >
+ <select name="dsorting">
+ <?=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" : "" ,_("Common name, expire date (desc)")) ?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="DataTD"><?=_("Certificate status")?></td>
+ <td colspan="7" class="DataTD" >
+ <select name="dstatus">
+ <?=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")) ?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="DataTD" colspan="8"><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>
+ </tr>
+
+
+<?
+ $query = "select UNIX_TIMESTAMP(`orgdomaincerts`.`created`) as `created`,
+ UNIX_TIMESTAMP(`orgdomaincerts`.`expire`) - UNIX_TIMESTAMP() as
`timeleft`,
+ UNIX_TIMESTAMP(`orgdomaincerts`.`expire`) as `expired`,
+ `orgdomaincerts`.`expire` as `expires`, `revoked` as `revoke`,
+ UNIX_TIMESTAMP(`revoked`) as `revoked`, `CN`,
+ `orgdomaincerts`.`serial`,
+ `orgdomaincerts`.`id` as `id`,
+ `orgdomaincerts`.`description`, `orginfo`.`O`
+ from `orgdomaincerts`,`org`, `orginfo`
+ where `org`.`memid`='".intval($_SESSION['profile']['id'])."'
+ and `orgdomaincerts`.`orgid`=`org`.`orgid` and `orginfo`.`id` =
`org`.`orgid`";
+
+ if($orgfilterid>0)
+ {
+ $query .= "AND `org`.`orgid`=$orgfilterid ";
+ }
+
+ if(0==$status)
+ {
+ $query .= "AND `revoked`=0 AND `renewed`=0 ";
+ $query .= "HAVING `timeleft` > 0 ";
+ }
+ switch ($sorting){
+ case 0:
+ $query .= "ORDER BY `orginfo`.`O`, `orgdomaincerts`.`expire` desc";
+ break;
+ case 1:
+ $query .= "ORDER BY `orginfo`.`O`, `orgdomaincerts`.`CN`,
`orgdomaincerts`.`expire` desc";
+ break;
+ }
+
+
+//echo $query."<br>\n";
+ $res = mysql_query($query);
+ if(mysql_num_rows($res) <= 0)
+ {
+?>
+ <tr>
+ <td colspan="8" class="DataTD"><?=_("No domains 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"><?=_("Renew/Revoke/Delete")?></td>
@@ -29,42 +134,17 @@
<td class="DataTD"><?=_("Revoked")?></td>
<td class="DataTD"><?=_("Expires")?></td>
<td colspan="2" class="DataTD"><?=_("Comment *")?></td>
-<?
- $query = "select UNIX_TIMESTAMP(`orgdomaincerts`.`created`) as
`created`,
- UNIX_TIMESTAMP(`orgdomaincerts`.`expire`) -
UNIX_TIMESTAMP() as `timeleft`,
- UNIX_TIMESTAMP(`orgdomaincerts`.`expire`) as
`expired`,
- `orgdomaincerts`.`expire` as `expires`, `revoked` as
`revoke`,
- UNIX_TIMESTAMP(`revoked`) as `revoked`, `CN`,
- `orgdomaincerts`.`serial`,
- `orgdomaincerts`.`id` as `id`,
- `orgdomaincerts`.`description`
- from `orgdomaincerts`,`org`
- where
`org`.`memid`='".intval($_SESSION['profile']['id'])."' and
`orgdomaincerts`.`orgid`=`org`.`orgid` ";
- if($viewall != 1)
- {
- $query .= "AND `revoked`=0 AND `renewed`=0 ";
- $query .= "HAVING `timeleft` > 0 ";
- }
- $query .= "ORDER BY `orgdomaincerts`.`modified` desc";
-//echo $query."<br>\n";
- $res = mysql_query($query);
- if(mysql_num_rows($res) <= 0)
- {
-?>
- <tr>
- <td colspan="8" class="DataTD"><?=_("No domains are currently
listed.")?></td>
</tr>
-<? } else {
- while($row = mysql_fetch_assoc($res))
- {
- 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['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");
?>
@@ -92,12 +172,15 @@
</tr>
<tr>
<td class="DataTD" colspan="6"><input type="submit" name="renew"
value="<?=_("Renew")?>" />&#160;&#160;&#160;&#160;
- <input type="submit" name="revoke"
value="<?=_("Revoke/Delete")?>" /></td>
+ <input type="submit" name="revoke" value="<?=_("Revoke/Delete")?>"
/></td>
<td class="DataTD" colspan="2"><input type="submit" name="change"
value="<?=_("Change settings")?>" /> </td>
</tr>
+ <tr>
+ <td class="DataTD" colspan="9"><?=_("From here you can delete pending
requests, or revoke valid certificates.")?></td>
+ </tr>
<? } ?>
</table>
<input type="hidden" name="oldid" value="<?=$id?>" />
<input type="hidden" name="csrf" value="<?=make_csrf('orgsrvcerchange')?>" />
</form>
-<p><?=_("From here you can delete pending requests, or revoke valid
certificates.")?></p>
+
===================================================================
RCS file: /var/lib/cvs/cacert/pages/account/18.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- 18.php 2013/07/17 08:19:01 1.17
+++ 18.php 2013/11/20 16:28:34 1.18
@@ -14,62 +14,143 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA
-*/ ?>
-<? $viewall=0; if(array_key_exists('viewall',$_REQUEST))
$viewall=intval($_REQUEST['viewall']); ?>
+*/
+
+$orgfilterid = array_key_exists('orgfilterid',$_SESSION['_config']) ?
intval($_SESSION['_config']['orgfilterid']) : 0;
+$sorting = array_key_exists('sorting',$_SESSION['_config']) ?
intval($_SESSION['_config']['sorting']) : 0;
+$status = array_key_exists('status',$_SESSION['_config']) ?
intval($_SESSION['_config']['status']) : 0;
+?>
<form method="post" action="account.php">
<table align="center" valign="middle" border="0" cellspacing="0"
cellpadding="0" class="wrapper">
<tr>
- <td colspan="8" class="title"><?=_("Client Certificates")?> - <a
href="account.php?id=18&amp;viewall=<?=!$viewall?>"><?=_("View all
certificates")?></a></td>
+ <td colspan="9" class="title"><?=_("Organisation Client Certificates")?>
</td>
</tr>
<tr>
- <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"><?=_("Comment")?></td>
- <td class="DataTD"><?=_("Revoked")?></td>
- <td class="DataTD"><?=_("Expires")?></td>
+ <td colspan="9" class="title"><?=_("Filter/Sorting")?></td>
+ </tr>
+ <tr>
+ <td class="DataTD"><?=_("Organisation")?></td>
+ <td colspan="8" class="DataTD" >
+ <select name="orgfilterid">
+ <?=sprintf('<option value="%d"%s>%s</option>',0, 0 ==
$orgfilterid ? " selected" : "" ,_("All")) ?>
+<? $query = "select `orginfo`.`O`, `orginfo`.`id`
+ from `org`, `orginfo`
+ where `org`.`memid`='".intval($_SESSION['profile']['id'])."' and
`orginfo`.`id` = `org`.`orgid`
+ ORDER BY `orginfo`.`O` ";
+ $reso = mysql_query($query);
+ if(mysql_num_rows($reso) >= 1){
+ while($row = mysql_fetch_assoc($reso)){
+ printf('<option value="%d"%s>%s</option>',$row['id'], $row['id'] ==
$orgfilterid ? " selected" : "" , $row['O']);
+ }
+ }?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="DataTD"><?=_("Sorting")?></td>
+ <td colspan="8" 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)")) ?>
+ <?=sprintf('<option value="%d"%s>%s</option>',2, 2 == $sorting ? "
selected" : "" ,_("Common name, expire date (desc)")) ?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="DataTD"><?=_("Certificate status")?></td>
+ <td colspan="8" 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")) ?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="DataTD" colspan="9"><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>
+ </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`
- from `orgemailcerts` as `oemail`, `org`
- where
`org`.`memid`='".intval($_SESSION['profile']['id'])."' and
- `org`.`orgid`=`oemail`.`orgid` ";
- if($viewall != 1)
- {
- $query .= "AND `oemail`.`revoked`=0 AND `oemail`.`renewed`=0
";
- $query .= "HAVING `timeleft` > 0 AND `revoked`=0 ";
- }
- $query .= "ORDER BY `oemail`.`modified` desc";
- $res = mysql_query($query);
- if(mysql_num_rows($res) <= 0)
- {
+ $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);
+ if(mysql_num_rows($res) <= 0)
+ {
?>
+
<tr>
- <td colspan="8" class="DataTD"><?=_("No client certificates are
currently listed.")?></td>
+ <td colspan="9" class="DataTD"><?=_("No client certificates are
currently listed.")?></td>
</tr>
<? } else {
- while($row = mysql_fetch_assoc($res))
- {
- 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>
+ <?
+ }
+ 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");
?>
<tr>
-<? if($verified == _("Valid") || $verified == _("Expired")) { ?>
+ <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>
@@ -82,7 +163,7 @@
<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['serial']?></td>
<td class="DataTD"><?=$row['revoke']?></td>
<td class="DataTD"><?=$row['expires']?></td>
<td class="DataTD"><input name="comment_<?=$row['id']?>" type="text"
value="<?=htmlspecialchars($row['description'])?>" /></td>
@@ -90,18 +171,20 @@
</tr>
<? } ?>
<tr>
- <td class="DataTD" colspan="8">
+ <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".')?>
</td>
</tr>
<tr>
<td class="DataTD" colspan="6"><input type="submit" name="renew"
value="<?=_("Renew")?>">&#160;&#160;&#160;&#160;
- <input type="submit" name="revoke"
value="<?=_("Revoke/Delete")?>"></td>
+ <input type="submit" name="revoke"
value="<?=_("Revoke/Delete")?>"></td>
<td class="DataTD" colspan="2"><input type="submit" name="change"
value="<?=_("Change settings")?>"> </td>
</tr>
+ <tr>
+ <td class="DataTD" colspan="9"><?=_("From here you can delete pending
requests, or revoke valid certificates.")?></td>
+ </tr>
<? } ?>
</table>
<input type="hidden" name="oldid" value="<?=$id?>">
<input type="hidden" name="csrf" value="<?=make_csrf('clicerchange')?>" />
-</form>
-<p><?=_("From here you can delete pending requests, or revoke valid
certificates.")?></p>
+</form>
\ No newline at end of file

--- End Message ---

Attachment: smime.p7s
Description: S/MIME-cryptografische ondertekening

--- End Message ---

Attachment: smime.p7s
Description: S/MIME-cryptografische ondertekening