bug 1219: fixed calculation for GPG expired, added some comments
authorINOPIAE <inopiae@cacert.org>
Sun, 3 Nov 2013 07:14:41 +0000 (08:14 +0100)
committerINOPIAE <inopiae@cacert.org>
Sun, 3 Nov 2013 07:14:41 +0000 (08:14 +0100)
pages/account/43.php

index a942f18..a06dac5 100644 (file)
@@ -504,7 +504,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
                <td class="DataTD"><?=_("Revoked")?></td>
                <td class="DataTD"><?=_("Latest Expire")?></td>
        </tr>
-
+// server certificates
        <tr>
                <td class="DataTD"><?=_("Server")?>:</td>
        <?
@@ -564,7 +564,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
                <?
        } ?>
        </tr>
-
+// client certificates
        <tr>
                <td class="DataTD"><?=_("Client")?>:</td>
        <?
@@ -619,7 +619,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
                <?
        } ?>
        </tr>
-
+// gpg certificates
        <tr>
                <td class="DataTD"><?=_("GPG")?>:</td>
        <?
@@ -645,9 +645,9 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
                $valid = $drow['valid'];
 
                $query = "select COUNT(*) as `expired`
-                         from `emailcerts`
-                         where `memid` = '".intval($row['id'])."'
-                               and `expire` <= NOW()";
+                       from `gpg`
+                       where `memid` = '".intval($row['id'])."'
+                       and `expire` < NOW()";
                $dres = mysql_query($query);
                $drow = mysql_fetch_assoc($dres);
                $expired = $drow['expired'];
@@ -666,7 +666,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
                <?
        } ?>
        </tr>
-
+// org server certificates
        <tr>
                <td class="DataTD"><a href="account.php?id=58&amp;userid=<?=intval($row['id'])?>"><?=_("Org Server")?></a>:</td>
        <?
@@ -726,7 +726,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
                <?
        } ?>
        </tr>
-
+// org client certificates
        <tr>
                <td class="DataTD"><?=_("Org Client")?>:</td>
        <?