diff options
| author | Benny Baumann <BenBE@geshi.org> | 2014-05-27 22:56:58 +0200 |
|---|---|---|
| committer | Benny Baumann <BenBE@geshi.org> | 2014-05-27 22:56:58 +0200 |
| commit | 04c0f773367889d1aad4e4995c9ded545124d5f4 (patch) | |
| tree | 113c0c140503f1c815bd243f51857ad8d84b6410 | |
| parent | 71489928fd0a21ddfe5135795af0f6de8b7397fc (diff) | |
| download | cacert-devel-04c0f773367889d1aad4e4995c9ded545124d5f4.tar.gz cacert-devel-04c0f773367889d1aad4e4995c9ded545124d5f4.tar.xz cacert-devel-04c0f773367889d1aad4e4995c9ded545124d5f4.zip | |
bug 413: Backport changes from 7aced740 by Michael Tänzer to avoid conflicts when integrating both together
| -rw-r--r-- | pages/account/5.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pages/account/5.php b/pages/account/5.php index 2815261..f5869c2 100644 --- a/pages/account/5.php +++ b/pages/account/5.php @@ -34,7 +34,7 @@ $query = "select UNIX_TIMESTAMP(`emailcerts`.`created`) as `created`, UNIX_TIMESTAMP(`emailcerts`.`expire`) - UNIX_TIMESTAMP() as `timeleft`, UNIX_TIMESTAMP(`emailcerts`.`expire`) as `expired`, - `emailcerts`.`expire` as `expires`, + `emailcerts`.`expire`, `emailcerts`.`revoked` as `revoke`, UNIX_TIMESTAMP(`emailcerts`.`revoked`) as `revoked`, if (`emailcerts`.`expire`=0,CURRENT_TIMESTAMP(),`emailcerts`.`modified`) as `modified` , @@ -50,7 +50,7 @@ $query .= " AND `revoked`=0 AND `renewed`=0 "; $query .= " GROUP BY `emailcerts`.`id` "; if($viewall != 1) - $query .= " HAVING `timeleft` > 0 or `expires` = 0 "; + $query .= " HAVING `timeleft` > 0 or `expire` = 0 "; $query .= " ORDER BY `modified` desc"; // echo $query."<br>\n"; $res = mysql_query($query); @@ -90,7 +90,7 @@ <? } ?> <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 type="checkbox" name="disablelogin_<?=$row['id']?>" value="1" <?=$row['disablelogin']?"":'checked="checked"'?>/> <input type="hidden" name="cert_<?=$row['id']?>" value="1" /> |