From 3ecae0b73b5a750e7853838b3bded110011536e5 Mon Sep 17 00:00:00 2001
From: INOPIAE <inopiae@cacert.org>
Date: Sun, 11 Nov 2012 20:14:15 +0100
Subject: bug 782: Added a comment field to all certificate pages

---
 pages/account/18.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'pages/account/18.php')

diff --git a/pages/account/18.php b/pages/account/18.php
index 13dcc30..45e3be9 100644
--- a/pages/account/18.php
+++ b/pages/account/18.php
@@ -25,7 +25,8 @@
     <td class="DataTD"><?=_("Renew/Revoke/Delete")?></td>
     <td class="DataTD"><?=_("Status")?></td>
     <td class="DataTD"><?=_("CommonName")?></td>
-	<td class="DataTD"><?=_("SerialNumber")?></td>
+	  <td class="DataTD"><?=_("SerialNumber")?></td>
+		<td class="DataTD"><?=_("Comment")?></td>
     <td class="DataTD"><?=_("Revoked")?></td>
     <td class="DataTD"><?=_("Expires")?></td>
 
@@ -35,7 +36,8 @@
 			UNIX_TIMESTAMP(`oemail`.`expire`) as `expired`,
 			`oemail`.`expire` as `expires`, `oemail`.`revoked` as `revoke`,
 			UNIX_TIMESTAMP(`oemail`.`revoked`) as `revoked`,
-			`oemail`.`CN`, `oemail`.`serial`, `oemail`.`id`
+			`oemail`.`CN`, `oemail`.`serial`, `oemail`.`id`,
+			`oemail`.`description`
 			from `orgemailcerts` as `oemail`, `org`
 			where `org`.`memid`='".intval($_SESSION['profile']['id'])."' and
 				`org`.`orgid`=`oemail`.`orgid` ";
@@ -80,7 +82,8 @@
     <td class="DataTD"><?=$verified?></td>
     <td class="DataTD"><a href="account.php?id=19&cert=<?=$row['id']?>"><?=$row['CN']?></a></td>
 <? } ?>
-	<td class="DataTD"><?=$row['serial']?></td>
+	  <td class="DataTD"><?=$row['serial']?></td>
+		<td class="DataTD"><?=$row['description']?></td>
     <td class="DataTD"><?=$row['revoke']?></td>
     <td class="DataTD"><?=$row['expires']?></td>
   </tr>
-- 
cgit v1.2.1


From 71d6d063bc6633d67133ccb53f67d5d27f9f5b99 Mon Sep 17 00:00:00 2001
From: INOPIAE <inopiae@cacert.org>
Date: Tue, 14 May 2013 22:59:46 +0200
Subject: bug 782: Added comment update for all certificate view pages

---
 pages/account/18.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'pages/account/18.php')

diff --git a/pages/account/18.php b/pages/account/18.php
index 45e3be9..e736977 100644
--- a/pages/account/18.php
+++ b/pages/account/18.php
@@ -19,7 +19,7 @@
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="6" class="title"><?=_("Client Certificates")?> - <a href="account.php?id=18&amp;viewall=<?=!$viewall?>"><?=_("View all certificates")?></a></td>
+    <td colspan="8" class="title"><?=_("Client Certificates")?> - <a href="account.php?id=18&amp;viewall=<?=!$viewall?>"><?=_("View all certificates")?></a></td>
   </tr>
   <tr>
     <td class="DataTD"><?=_("Renew/Revoke/Delete")?></td>
@@ -52,7 +52,7 @@
 	{
 ?>
   <tr>
-    <td colspan="6" class="DataTD"><?=_("No client certificates are currently listed.")?></td>
+    <td colspan="8" class="DataTD"><?=_("No client certificates are currently listed.")?></td>
   </tr>
 <? } else {
 	while($row = mysql_fetch_assoc($res))
@@ -83,14 +83,21 @@
     <td class="DataTD"><a href="account.php?id=19&cert=<?=$row['id']?>"><?=$row['CN']?></a></td>
 <? } ?>
 	  <td class="DataTD"><?=$row['serial']?></td>
-		<td class="DataTD"><?=$row['description']?></td>
     <td class="DataTD"><?=$row['revoke']?></td>
     <td class="DataTD"><?=$row['expires']?></td>
+    <td class="DataTD"><input name="comment_<?=$row['id']?>" type="text" value="<?=htmlspecialchars($row['description'])?>" /></td>
+    <td class="DataTD"><input type="checkbox" name="check_comment_<?=$row['id']?>" /></td>
   </tr>
 <? } ?>
+  <tr>
+    <td class="DataTD" colspan="8">
+      <?=_("* Comment is NOT included in the certificate as it is inteded for your personal reference only. To change the comment go to the certificate view with hitting email address.")?>
+    </td>
+  </tr>
   <tr>
     <td class="DataTD" colspan="6"><input type="submit" name="renew" value="<?=_("Renew")?>">&#160;&#160;&#160;&#160;
     			<input type="submit" name="revoke" value="<?=_("Revoke/Delete")?>"></td>
+    <td class="DataTD" colspan="2"><input type="submit" name="change" value="<?=_("Change settings")?>"> </td>
   </tr>
 <? } ?>
 </table>
-- 
cgit v1.2.1


From 882428da0227c7f537e54ef85632e77a7824499c Mon Sep 17 00:00:00 2001
From: INOPIAE <inopiae@cacert.org>
Date: Wed, 15 May 2013 00:20:08 +0200
Subject: bug 782: added format for XHTML, typo fixing

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

(limited to 'pages/account/18.php')

diff --git a/pages/account/18.php b/pages/account/18.php
index e736977..2267689 100644
--- a/pages/account/18.php
+++ b/pages/account/18.php
@@ -91,7 +91,7 @@
 <? } ?>
   <tr>
     <td class="DataTD" colspan="8">
-      <?=_("* Comment is NOT included in the certificate as it is inteded for your personal reference only. To change the comment go to the certificate view with hitting email address.")?>
+      <?=_("* Comment is NOT included in the certificate as it is intended for your personal reference only. To change the comment go to the certificate view with hitting email address.")?>
     </td>
   </tr>
   <tr>
-- 
cgit v1.2.1


From 5314b0511c74cb4b4af86c124078625f7a85850f Mon Sep 17 00:00:00 2001
From: INOPIAE <inopiae@cacert.org>
Date: Wed, 22 May 2013 00:36:23 +0200
Subject: bug 782: changed wording

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

(limited to 'pages/account/18.php')

diff --git a/pages/account/18.php b/pages/account/18.php
index 2267689..2fbb8b4 100644
--- a/pages/account/18.php
+++ b/pages/account/18.php
@@ -91,7 +91,7 @@
 <? } ?>
   <tr>
     <td class="DataTD" colspan="8">
-      <?=_("* Comment is NOT included in the certificate as it is intended for your personal reference only. To change the comment go to the certificate view with hitting email address.")?>
+      <?=_('* Comment is NOT included in the certificate as it is intended for your personal reference only. To change the comment tick the checkbox and hit "Change Settings".')?>
     </td>
   </tr>
   <tr>
-- 
cgit v1.2.1