summaryrefslogtreecommitdiff
path: root/pages/account
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2013-11-06 16:22:50 +0100
committerMichael Tänzer <neo@nhng.de>2013-11-06 16:22:50 +0100
commitbe7573a378a88bdc8574a613a068097503f40d6d (patch)
tree42ccd8b665f142f0d601dc7d7c073265382e1074 /pages/account
parentb65dcec9da0414797ecd43af71a755df99c324c5 (diff)
parent0e36f8f6a5d4a97fc66e9033ebd8e186663f3d55 (diff)
downloadcacert-devel-be7573a378a88bdc8574a613a068097503f40d6d.tar.gz
cacert-devel-be7573a378a88bdc8574a613a068097503f40d6d.tar.xz
cacert-devel-be7573a378a88bdc8574a613a068097503f40d6d.zip
Merge remote-tracking branch 'origin/bug-1219' into release
Diffstat (limited to 'pages/account')
-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..53b24d3 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>
<?