summaryrefslogtreecommitdiff
path: root/pages/account/12.php
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2014-06-06 18:58:04 +0200
committerBenny Baumann <BenBE@geshi.org>2014-06-06 18:58:04 +0200
commita4a8075571ad33ac0fd4393b25e0c1e8fc31d7fa (patch)
tree9af6cb6cd21d09fd902e18236a273829fecacfbf /pages/account/12.php
parentcea6657d48bae2334bd37229df4e42a797b6c949 (diff)
parent382f771389538a309193518a85357a02d9e323a9 (diff)
downloadcacert-devel-a4a8075571ad33ac0fd4393b25e0c1e8fc31d7fa.tar.gz
cacert-devel-a4a8075571ad33ac0fd4393b25e0c1e8fc31d7fa.tar.xz
cacert-devel-a4a8075571ad33ac0fd4393b25e0c1e8fc31d7fa.zip
Merge branch 'bug-413' into bug-1138bug-1138
Conflicts: pages/account/12.php pages/account/5.php
Diffstat (limited to 'pages/account/12.php')
-rw-r--r--pages/account/12.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/pages/account/12.php b/pages/account/12.php
index a59a5a1..f4428aa 100644
--- a/pages/account/12.php
+++ b/pages/account/12.php
@@ -36,16 +36,18 @@
UNIX_TIMESTAMP(`domaincerts`.`expire`) as `expired`,
`domaincerts`.`expire`,
`domaincerts`.`revoked` as `revoke`,
- UNIX_TIMESTAMP(`revoked`) as `revoked`, `CN`, `domaincerts`.`serial`, `domaincerts`.`id` as `id`,
+ UNIX_TIMESTAMP(`revoked`) as `revoked`,
+ if (`domaincerts`.`expire`=0,CURRENT_TIMESTAMP(),`domaincerts`.`modified`) as `modified`,
+ `CN`, `domaincerts`.`serial`, `domaincerts`.`id` as `id`,
`domaincerts`.`description`
from `domaincerts`,`domains`
where `memid`='".intval($_SESSION['profile']['id'])."' and `domaincerts`.`domid`=`domains`.`id` ";
if($viewall != 1)
{
$query .= "AND `revoked`=0 AND `renewed`=0 ";
- $query .= "HAVING `timeleft` > 0 ";
+ $query .= "HAVING `timeleft` > 0 or `expire` = 0 ";
}
- $query .= "ORDER BY `domaincerts`.`modified` desc";
+ $query .= "ORDER BY `modified` desc";
//echo $query."<br>\n";
$res = mysql_query($query);
if(mysql_num_rows($res) <= 0)