From c29a0e00c86f514995260cb70ba544677982aa29 Mon Sep 17 00:00:00 2001
From: INOPIAE <inopiae@cacert.org>
Date: Sun, 3 Nov 2013 08:14:41 +0100
Subject: bug 1219: fixed calculation for GPG expired, added some comments

---
 pages/account/43.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'pages')

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>
 	<?
-- 
cgit v1.2.1


From 1e721b60cb4d690ed612f443b1d162e0b9f6216e Mon Sep 17 00:00:00 2001
From: INOPIAE <inopiae@cacert.org>
Date: Sun, 3 Nov 2013 20:32:19 +0100
Subject: bug 1219: changed comment sytax to html

---
 pages/account/43.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'pages')

diff --git a/pages/account/43.php b/pages/account/43.php
index a06dac5..81c3dc5 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
+<!-- server certificates -->
 	<tr>
 		<td class="DataTD"><?=_("Server")?>:</td>
 	<?
@@ -564,7 +564,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
 		<?
 	} ?>
 	</tr>
-// client certificates
+<!-- client certificates -->
 	<tr>
 		<td class="DataTD"><?=_("Client")?>:</td>
 	<?
@@ -619,7 +619,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
 		<?
 	} ?>
 	</tr>
-// gpg certificates
+<!-- gpg certificates -->
 	<tr>
 		<td class="DataTD"><?=_("GPG")?>:</td>
 	<?
@@ -666,7 +666,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
 		<?
 	} ?>
 	</tr>
-// org server certificates
+<!-- 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
+<!-- org client certificates -->
 	<tr>
 		<td class="DataTD"><?=_("Org Client")?>:</td>
 	<?
-- 
cgit v1.2.1


From 0e36f8f6a5d4a97fc66e9033ebd8e186663f3d55 Mon Sep 17 00:00:00 2001
From: INOPIAE <inopiae@cacert.org>
Date: Sun, 3 Nov 2013 20:38:52 +0100
Subject: bug 1219: added equal

---
 pages/account/43.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pages')

diff --git a/pages/account/43.php b/pages/account/43.php
index 81c3dc5..53b24d3 100644
--- a/pages/account/43.php
+++ b/pages/account/43.php
@@ -647,7 +647,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
 		$query = "select COUNT(*) as `expired`
 			from `gpg`
 			where `memid` = '".intval($row['id'])."'
-			and `expire` < NOW()";
+			and `expire` <= NOW()";
 		$dres = mysql_query($query);
 		$drow = mysql_fetch_assoc($dres);
 		$expired = $drow['expired'];
-- 
cgit v1.2.1