summaryrefslogtreecommitdiff
path: root/pages/account/43.php
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2014-01-11 20:10:03 +0100
committerBenny Baumann <BenBE@geshi.org>2014-01-11 20:10:03 +0100
commit499b1281956490bb2f4d243e3b04686444a79816 (patch)
tree4b1ca507fc69f5bba36de9fdd580b2df515598f7 /pages/account/43.php
parent39f4aa38f6b1cbbf3f8593420b42c0a30badc3d4 (diff)
parentbeef667c8fc1dd6e41807732358174832d801ecf (diff)
downloadcacert-devel-499b1281956490bb2f4d243e3b04686444a79816.tar.gz
cacert-devel-499b1281956490bb2f4d243e3b04686444a79816.tar.xz
cacert-devel-499b1281956490bb2f4d243e3b04686444a79816.zip
Merge branch 'release' into bug-1138
Conflicts: www/styles/default.css
Diffstat (limited to 'pages/account/43.php')
-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 1ea6142..d3723ed 100644
--- a/pages/account/43.php
+++ b/pages/account/43.php
@@ -598,7 +598,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>
<?
@@ -658,7 +658,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
<?
} ?>
</tr>
-
+<!-- client certificates -->
<tr>
<td class="DataTD"><?=_("Client")?>:</td>
<?
@@ -713,7 +713,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
<?
} ?>
</tr>
-
+<!-- gpg certificates -->
<tr>
<td class="DataTD"><?=_("GPG")?>:</td>
<?
@@ -739,9 +739,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'];
@@ -760,7 +760,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>
<?
@@ -820,7 +820,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
<?
} ?>
</tr>
-
+<!-- org client certificates -->
<tr>
<td class="DataTD"><?=_("Org Client")?>:</td>
<?