summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorINOPIAE <inopiae@cacert.org>2013-11-03 08:14:41 +0100
committerINOPIAE <inopiae@cacert.org>2013-11-03 08:14:41 +0100
commitc29a0e00c86f514995260cb70ba544677982aa29 (patch)
tree7a180d92fa3bb3e2af39982a2207bb20c68e52c2
parent55d2a7b1fdd6aba528adf5afaec880ebf067edcf (diff)
downloadcacert-devel-c29a0e00c86f514995260cb70ba544677982aa29.tar.gz
cacert-devel-c29a0e00c86f514995260cb70ba544677982aa29.tar.xz
cacert-devel-c29a0e00c86f514995260cb70ba544677982aa29.zip
bug 1219: fixed calculation for GPG expired, added some comments
-rw-r--r--pages/account/43.php16
1 files changed, 8 insertions, 8 deletions
diff --git a/pages/account/43.php b/pages/account/43.php
index a942f18..a06dac5 100644
--- a/pages/account/43.php
+++ b/pages/account/43.php
@@ -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>
<?