summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2014-05-27 23:12:43 +0200
committerBenny Baumann <BenBE@geshi.org>2014-05-27 23:12:43 +0200
commit382f771389538a309193518a85357a02d9e323a9 (patch)
tree394c2535cb47c95a44719f6f16ea27bdf163947c
parent04c0f773367889d1aad4e4995c9ded545124d5f4 (diff)
downloadcacert-devel-bug-413.tar.gz
cacert-devel-bug-413.tar.xz
cacert-devel-bug-413.zip
bug 413: Port same change as for 5.php over to 12.phpbug-413
-rw-r--r--pages/account/12.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/pages/account/12.php b/pages/account/12.php
index 13bef91..4b4539a 100644
--- a/pages/account/12.php
+++ b/pages/account/12.php
@@ -34,7 +34,8 @@
$query = "select UNIX_TIMESTAMP(`domaincerts`.`created`) as `created`,
UNIX_TIMESTAMP(`domaincerts`.`expire`) - UNIX_TIMESTAMP() as `timeleft`,
UNIX_TIMESTAMP(`domaincerts`.`expire`) as `expired`,
- `domaincerts`.`expire` as `expires`, `revoked` as `revoke`,
+ `domaincerts`.`expire`,
+ `revoked` as `revoke`,
UNIX_TIMESTAMP(`revoked`) as `revoked`,
if (`domaincerts`.`expire`=0,CURRENT_TIMESTAMP(),`domaincerts`.`modified`) as `modified`,
`CN`, `domaincerts`.`serial`, `domaincerts`.`id` as `id`,
@@ -44,7 +45,7 @@
if($viewall != 1)
{
$query .= "AND `revoked`=0 AND `renewed`=0 ";
- $query .= "HAVING `timeleft` > 0 or `expires` = 0 ";
+ $query .= "HAVING `timeleft` > 0 or `expire` = 0 ";
}
$query .= "ORDER BY `modified` desc";
//echo $query."<br>\n";
@@ -81,7 +82,7 @@
<td class="DataTD"><a href="account.php?id=15&amp;cert=<?=$row['id']?>"><?=$row['CN']?></a></td>
<td class="DataTD"><?=$row['serial']?></td>
<td class="DataTD"><?=$row['revoke']?></td>
- <td class="DataTD"><?=$row['expires']?></td>
+ <td class="DataTD"><?=$row['expire']?></td>
<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>