diff options
| author | Michael Tänzer <neo@nhng.de> | 2011-11-24 16:11:49 +0100 |
|---|---|---|
| committer | Michael Tänzer <neo@nhng.de> | 2011-11-24 16:11:49 +0100 |
| commit | 00cfe81ecd1d3c86fcecf2f02e28236384794fbd (patch) | |
| tree | 88e0fbc31d479f4a6e9c1ca52b30c57a213b7e0c /pages/account/18.php | |
| parent | aee572b3fe878450371ae5696d40b98390ebe493 (diff) | |
| download | cacert-00cfe81ecd1d3c86fcecf2f02e28236384794fbd.tar.gz cacert-00cfe81ecd1d3c86fcecf2f02e28236384794fbd.tar.xz cacert-00cfe81ecd1d3c86fcecf2f02e28236384794fbd.zip | |
Source code taken from cacert-20111120.tar.bz2
Diffstat (limited to 'pages/account/18.php')
| -rw-r--r-- | pages/account/18.php | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/pages/account/18.php b/pages/account/18.php index 47fac9e..13dcc30 100644 --- a/pages/account/18.php +++ b/pages/account/18.php @@ -30,20 +30,21 @@ <td class="DataTD"><?=_("Expires")?></td> <? - $query = "select UNIX_TIMESTAMP(`created`) as `created`, - UNIX_TIMESTAMP(`expire`) - UNIX_TIMESTAMP() as `timeleft`, - UNIX_TIMESTAMP(`expire`) as `expired`, - `expire` as `expires`, `revoked` as `revoke`, - UNIX_TIMESTAMP(`revoked`) as `revoked`, `CN`, `serial`, `id` - from `orgemailcerts`, `org` - where `memid`='".intval($_SESSION['profile']['id'])."' and - `org`.`orgid`=`orgemailcerts`.`orgid` "; + $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` + from `orgemailcerts` as `oemail`, `org` + where `org`.`memid`='".intval($_SESSION['profile']['id'])."' and + `org`.`orgid`=`oemail`.`orgid` "; if($viewall != 1) { - $query .= "AND `revoked`=0 AND `renewed`=0 "; + $query .= "AND `oemail`.`revoked`=0 AND `oemail`.`renewed`=0 "; $query .= "HAVING `timeleft` > 0 AND `revoked`=0 "; } - $query .= "ORDER BY `modified` desc"; + $query .= "ORDER BY `oemail`.`modified` desc"; $res = mysql_query($query); if(mysql_num_rows($res) <= 0) { |