bug 413: Backport changes from 7aced740 by Michael Tänzer to avoid conflicts when...
authorBenny Baumann <BenBE@geshi.org>
Tue, 27 May 2014 20:56:58 +0000 (22:56 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 27 May 2014 20:56:58 +0000 (22:56 +0200)
pages/account/5.php

index 2815261..f5869c2 100644 (file)
@@ -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" />