Source code taken from cacert-20131120.tar.bz2

10 files changed, 277 insertions, 106 deletions

diff --git a/pages/account/10.php b/pages/account/10.php
index 6371f76..8908400 100644
--- a/pages/account/10.php
+++ b/pages/account/10.php
@@ -17,7 +17,7 @@
 */
 	include_once("../includes/shutdown.php");
 ?>
-<h3><?=_("CAcert Certficate Acceptable Use Policy")?></h3>
+<h3><?=_("CAcert Certificate Acceptable Use Policy")?></h3>
 <p><?=_("Once you decide to subscribe for an SSL Server Certificate you will need to complete this agreement. Please read it carefully. Your Certificate Request can only be processed with your acceptance and understanding of this agreement.")?></p>
 
 <p><?=_("I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors.")?></p>
@@ -35,7 +35,7 @@
 <input type="radio" name="rootcert" value="2" checked/> <?=_("Sign by class 3 root certificate")?><br />
 <p><?=_("Please note: The class 3 root certificate needs to be setup in your webserver as a chained certificate, while slightly more complicated to setup, this root certificate is more likely to be trusted by more people.")?></p>
 <? } ?>
-<p><?=_("Optional comment, only used in the certifictate overview")?><br>
+<p><?=_("Optional comment, only used in the certificate overview")?><br>
        <input type="text" name="description" maxlength="80" size=80/></p>
 <p><?=_("Paste your CSR(Certificate Signing Request) below...")?></p>
 <textarea name="CSR" cols="80" rows="15"></textarea><br />
diff --git a/pages/account/12.php b/pages/account/12.php
index 6d85cdc..9058a07 100644
--- a/pages/account/12.php
+++ b/pages/account/12.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="8" class="title"><?=_("Domain Certificates")?> - <a href="account.php?id=12&amp;viewall=<?=!$viewall?>"><?=_("View all certificates")?></a></td>
+    <td colspan="8" class="title"><?=_("Domain Certificates")?> - <a href="account.php?id=12&amp;viewall=<?=!$viewall?>"><?=$viewall?_("Hide old certificates"):_("View all certificates")?></a></td>
   </tr>
   <tr>
     <td class="DataTD"><?=_("Renew/Revoke/Delete")?></td>
@@ -86,6 +86,11 @@
 <? } ?>
   <tr>
     <td class="DataTD" colspan="8">
+      <a href="account.php?id=12&amp;viewall=<?=!$viewall?>"><b><?=$viewall?_("Hide old certificates"):_("View all certificates")?></b></a>
+    </td>
+  </tr>
+  <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 tick the checkbox and hit "Change Settings".')?>
     </td>
   </tr>
diff --git a/pages/account/16.php b/pages/account/16.php
index 6f055d7..564463e 100644
--- a/pages/account/16.php
+++ b/pages/account/16.php
@@ -58,7 +58,7 @@
 <? } ?>
    <tr>
    <td class="DataTD" colspan="2" align="left">
-      <?=_("Optional comment, only used in the certifictate overview")?><br />
+      <?=_("Optional comment, only used in the certificate overview")?><br />
        <input type="text" name="description" maxlength="80" size=80 />
    </td>
   </tr>
diff --git a/pages/account/18.php b/pages/account/18.php
index 2fbb8b4..9ab13b2 100644
--- a/pages/account/18.php
+++ b/pages/account/18.php
@@ -14,62 +14,143 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/ ?>
-<? $viewall=0; if(array_key_exists('viewall',$_REQUEST)) $viewall=intval($_REQUEST['viewall']); ?>
+*/
+
+$orgfilterid = array_key_exists('orgfilterid',$_SESSION['_config']) ? intval($_SESSION['_config']['orgfilterid']) : 0;
+$sorting = array_key_exists('sorting',$_SESSION['_config']) ? intval($_SESSION['_config']['sorting']) : 0;
+$status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_config']['status']) : 0;
+?>
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="8" class="title"><?=_("Client Certificates")?> - <a href="account.php?id=18&amp;viewall=<?=!$viewall?>"><?=_("View all certificates")?></a></td>
+    <td colspan="9" class="title"><?=_("Organisation Client Certificates")?> </td>
   </tr>
   <tr>
-    <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"><?=_("Comment")?></td>
-    <td class="DataTD"><?=_("Revoked")?></td>
-    <td class="DataTD"><?=_("Expires")?></td>
+    <td colspan="9" class="title"><?=_("Filter/Sorting")?></td>
+  </tr>
+    <tr>
+      <td class="DataTD"><?=_("Organisation")?></td>
+      <td colspan="8" class="DataTD" >
+        <select name="orgfilterid">
+           <?=sprintf('<option value="%d"%s>%s</option>',0, 0 == $orgfilterid ? " selected" : "" ,_("All")) ?>
+<?  $query = "select `orginfo`.`O`, `orginfo`.`id`
+      from `org`, `orginfo`
+      where `org`.`memid`='".intval($_SESSION['profile']['id'])."' and `orginfo`.`id` = `org`.`orgid`
+      ORDER BY `orginfo`.`O` ";
+    $reso = mysql_query($query);
+    if(mysql_num_rows($reso) >= 1){
+      while($row = mysql_fetch_assoc($reso)){
+        printf('<option value="%d"%s>%s</option>',$row['id'], $row['id'] == $orgfilterid ? " selected" : "" , $row['O']);
+      }
+    }?>
+        </select>
+    </td>
+  </tr>
+  <tr>
+    <td class="DataTD"><?=_("Sorting")?></td>
+    <td colspan="8" class="DataTD" >
+      <select name="sorting">
+        <?=sprintf('<option value="%d"%s>%s</option>',0, 0 == $sorting ? " selected" : "" ,_("expire date (desc)")) ?>
+        <?=sprintf('<option value="%d"%s>%s</option>',1, 1 == $sorting ? " selected" : "" ,_("OU, expire date (desc)")) ?>
+        <?=sprintf('<option value="%d"%s>%s</option>',2, 2 == $sorting ? " selected" : "" ,_("Common name, expire date (desc)")) ?>
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td class="DataTD"><?=_("Certificate status")?></td>
+    <td colspan="8" class="DataTD" >
+      <select name="status">
+        <?=sprintf('<option value="%d"%s>%s</option>',0, 0 == $status ? " selected" : "" ,_("Current/Active")) ?>
+        <?=sprintf('<option value="%d"%s>%s</option>',1, 1 == $status ? " selected" : "" ,_("All")) ?>
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td class="DataTD" colspan="9"><input type="submit" name="reset" value="<?=_("Reset")?>" />&nbsp;&nbsp;&nbsp;&nbsp;
+      <input type="submit" name="filter" value="<?=_("Apply filter/sort")?>" /></td>
+  </tr>
+  <tr>
+    <td colspan="9" class="DataTD"> </td>
+  </tr>
 
 <?
-	$query = "select UNIX_TIMESTAMP(`oemail`.`created`) as `created`,
-			UNIX_TIMESTAMP(`oemail`.`expire`) - UNIX_TIMESTAMP() as `timeleft`,
-			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`.`description`
-			from `orgemailcerts` as `oemail`, `org`
-			where `org`.`memid`='".intval($_SESSION['profile']['id'])."' and
-				`org`.`orgid`=`oemail`.`orgid` ";
-	if($viewall != 1)
-	{
-		$query .= "AND `oemail`.`revoked`=0 AND `oemail`.`renewed`=0 ";
-		$query .= "HAVING `timeleft` > 0 AND `revoked`=0 ";
-	}
-	$query .= "ORDER BY `oemail`.`modified` desc";
-	$res = mysql_query($query);
-	if(mysql_num_rows($res) <= 0)
-	{
+  $query = "select UNIX_TIMESTAMP(`oemail`.`created`) as `created`,
+      UNIX_TIMESTAMP(`oemail`.`expire`) - UNIX_TIMESTAMP() as `timeleft`,
+      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`.`description`, `oemail`.`ou`, `orginfo`.`O`
+      from `orgemailcerts` as `oemail`, `org`, `orginfo`
+      where `org`.`memid`='".intval($_SESSION['profile']['id'])."' and
+        `org`.`orgid`=`oemail`.`orgid` and `orginfo`.`id` = `org`.`orgid`";
+  if($orgfilterid>0)
+  {
+    $query .= "AND `org`.`orgid`=$orgfilterid ";
+  }
+
+  if(0==$status)
+  {
+    $query .= "AND `oemail`.`revoked`=0 AND `oemail`.`renewed`=0 ";
+    $query .= "HAVING `timeleft` > 0 AND `revoked`=0 ";
+  }
+  switch ($sorting){
+    case 0:
+      $query .= "ORDER BY `orginfo`.`O`, `oemail`.`expire` desc";
+      break;
+    case 1:
+      $query .= "ORDER BY `orginfo`.`O`, `oemail`.`ou`, `oemail`.`expire` desc";
+      break;
+    case 2:
+      $query .= "ORDER BY `orginfo`.`O`, `oemail`.`CN`, `oemail`.`expire` desc";
+      break;
+  }
+  $res = mysql_query($query);
+  if(mysql_num_rows($res) <= 0)
+  {
 ?>
+
   <tr>
-    <td colspan="8" class="DataTD"><?=_("No client certificates are currently listed.")?></td>
+    <td colspan="9" class="DataTD"><?=_("No client certificates are currently listed.")?></td>
   </tr>
 <? } else {
-	while($row = mysql_fetch_assoc($res))
-	{
-		if($row['timeleft'] > 0)
-			$verified = _("Valid");
-		if($row['timeleft'] < 0)
-			$verified = _("Expired");
-		if($row['expired'] == 0)
-			$verified = _("Pending");
-		if($row['revoked'] > 0)
-			$verified = _("Revoked");
-                if($row['revoked'] == 0)
-                        $row['revoke'] = _("Not Revoked");
+  $orgname='';
+  while($row = mysql_fetch_assoc($res))
+  {
+    if ($row['O']<>$orgname) {
+      $orgname=$row['O'];?>
+  <tr>
+    <td colspan="9" class="title"></td>
+  </tr>
+  <tr>
+    <td colspan="9" class="title"><? printf(_("Certificates for %s"), $orgname)?> </td>
+  </tr>
+  <tr>
+    <td class="DataTD"><?=_("OU/Department")?></td>
+    <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"><?=_("Revoked")?></td>
+    <td class="DataTD"><?=_("Expires")?></td>
+    <td colspan="2" class="DataTD"><?=_("Comment *")?></td>
+  </tr>
+      <?
+    }
+    if($row['timeleft'] > 0)
+      $verified = _("Valid");
+    if($row['timeleft'] < 0)
+      $verified = _("Expired");
+    if($row['expired'] == 0)
+      $verified = _("Pending");
+    if($row['revoked'] > 0)
+      $verified = _("Revoked");
+    if($row['revoked'] == 0)
+      $row['revoke'] = _("Not Revoked");
 ?>
   <tr>
-<? if($verified == _("Valid") || $verified == _("Expired")) { ?>
+    <td class="DataTD"><?=$row['ou']?></td>
+    <? if($verified == _("Valid") || $verified == _("Expired")) { ?>
     <td class="DataTD"><input type="checkbox" name="revokeid[]" value="<?=$row['id']?>"></td>
     <td class="DataTD"><?=$verified?></td>
     <td class="DataTD"><a href="account.php?id=19&cert=<?=$row['id']?>"><?=$row['CN']?></a></td>
@@ -82,7 +163,7 @@
     <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['revoke']?></td>
     <td class="DataTD"><?=$row['expires']?></td>
     <td class="DataTD"><input name="comment_<?=$row['id']?>" type="text" value="<?=htmlspecialchars($row['description'])?>" /></td>
@@ -90,18 +171,20 @@
   </tr>
 <? } ?>
   <tr>
-    <td class="DataTD" colspan="8">
+    <td class="DataTD" colspan="9">
       <?=_('* 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>
     <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>
+          <input type="submit" name="revoke" value="<?=_("Revoke/Delete")?>"></td>
     <td class="DataTD" colspan="2"><input type="submit" name="change" value="<?=_("Change settings")?>"> </td>
   </tr>
+  <tr>
+    <td class="DataTD" colspan="9"><?=_("From here you can delete pending requests, or revoke valid certificates.")?></td>
+  </tr>
 <? } ?>
 </table>
 <input type="hidden" name="oldid" value="<?=$id?>">
 <input type="hidden" name="csrf" value="<?=make_csrf('clicerchange')?>" />
-</form>
-<p><?=_("From here you can delete pending requests, or revoke valid certificates.")?></p>
+</form>
\ No newline at end of file
diff --git a/pages/account/20.php b/pages/account/20.php
index 0187013..ee16dd4 100644
--- a/pages/account/20.php
+++ b/pages/account/20.php
@@ -17,7 +17,7 @@
 */
 	include_once("../includes/shutdown.php");
 ?>
-<h3><?=_("CAcert Certficate Acceptable Use Policy")?></h3>
+<h3><?=_("CAcert Certificate Acceptable Use Policy")?></h3>
 <p><?=_("Once you decide to subscribe for an SSL Server Certificate you will need to complete this agreement. Please read it carefully. Your Certificate Request can only be processed with your acceptance and understanding of this agreement.")?></p>
 
 <p><?=_("I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors.")?></p>
@@ -29,7 +29,7 @@
 <form method="post" action="account.php">
 <input type="radio" name="rootcert" value="1" /> <?=_("Sign by class 1 root certificate")?><br />
 <input type="radio" name="rootcert" value="2" checked /> <?=_("Sign by class 3 root certificate")?><br />
-<p> <?=_("Optional comment, only used in the certifictate overview")?><br />
+<p> <?=_("Optional comment, only used in the certificate overview")?><br />
        <input type="text" name="description" maxlength="80" size=80 /></p>
 <p><?=_("Please note: The class 3 root certificate needs to be setup in your webserver as a chained certificate, while slightly more complicated to setup, this root certificate is more likely to be trusted by more people.")?></p>
 <p><?=_("Paste your CSR below...")?></p>
diff --git a/pages/account/22.php b/pages/account/22.php
index cb40cf2..0413da0 100644
--- a/pages/account/22.php
+++ b/pages/account/22.php
@@ -14,12 +14,117 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/ ?>
-<? $viewall=0; if(array_key_exists('viewall',$_REQUEST)) $viewall=intval($_REQUEST['viewall']); ?>
+*/
+
+$orgfilterid = array_key_exists('dorgfilterid',$_SESSION['_config']) ? intval($_SESSION['_config']['dorgfilterid']) : 0;
+$sorting = array_key_exists('dsorting',$_SESSION['_config']) ? intval($_SESSION['_config']['dsorting']) : 0;
+$status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_config']['dstatus']) : 0;
+?>
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="8" class="title"><?=_("Domain Certificates")?> - <a href="account.php?id=22&amp;viewall=<?=!$viewall?>"><?=_("View all certificates")?></a></td>
+    <td colspan="8" class="title"><?=_("Organisation Server Certificates")?> </td>
+  </tr>
+  <tr>
+    <td colspan="8" class="title"><?=_("Filter/Sorting")?></td>
+  </tr>
+    <tr>
+      <td class="DataTD"><?=_("Organisation")?></td>
+      <td colspan="7" class="DataTD" >
+        <select name="dorgfilterid">
+          <?=sprintf('<option value="%d"%s>%s</option>',0, 0 == $orgfilterid ? " selected" : "" ,_("All")) ?>
+<?  $query = "select `orginfo`.`O`, `orginfo`.`id`
+      from `org`, `orginfo`
+      where `org`.`memid`='".intval($_SESSION['profile']['id'])."' and `orginfo`.`id` = `org`.`orgid`
+      ORDER BY `orginfo`.`O` ";
+    $reso = mysql_query($query);
+    if(mysql_num_rows($reso) >= 1){
+      while($row = mysql_fetch_assoc($reso)){
+        printf('<option value="%d"%s>%s</option>',$row['id'], $row['id'] == $orgfilterid ? " selected" : "" , $row['O']);
+      }
+    }?>
+        </select>
+    </td>
+  </tr>
+  <tr>
+    <td class="DataTD"><?=_("Sorting")?></td>
+    <td colspan="7" class="DataTD" >
+      <select name="dsorting">
+        <?=sprintf('<option value="%d"%s>%s</option>',0, 0 == $sorting ? " selected" : "" ,_("expire date (desc)")) ?>
+        <?=sprintf('<option value="%d"%s>%s</option>',1, 1 == $sorting ? " selected" : "" ,_("Common name, expire date (desc)")) ?>
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td class="DataTD"><?=_("Certificate status")?></td>
+    <td colspan="7" class="DataTD" >
+      <select name="dstatus">
+        <?=sprintf('<option value="%d"%s>%s</option>',0, 0 == $status ? " selected" : "" ,_("Current/Active")) ?>
+        <?=sprintf('<option value="%d"%s>%s</option>',1, 1 == $status ? " selected" : "" ,_("All")) ?>
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td class="DataTD" colspan="8"><input type="submit" name="reset" value="<?=_("Reset")?>" />&nbsp;&nbsp;&nbsp;&nbsp;
+      <input type="submit" name="filter" value="<?=_("Apply filter/sort")?>" /></td>
+  </tr>
+  <tr>
+    <td colspan="9" class="DataTD"> </td>
+  </tr>
+
+
+<?
+  $query = "select UNIX_TIMESTAMP(`orgdomaincerts`.`created`) as `created`,
+      UNIX_TIMESTAMP(`orgdomaincerts`.`expire`) - UNIX_TIMESTAMP() as `timeleft`,
+      UNIX_TIMESTAMP(`orgdomaincerts`.`expire`) as `expired`,
+      `orgdomaincerts`.`expire` as `expires`, `revoked` as `revoke`,
+      UNIX_TIMESTAMP(`revoked`) as `revoked`, `CN`,
+      `orgdomaincerts`.`serial`,
+      `orgdomaincerts`.`id` as `id`,
+      `orgdomaincerts`.`description`, `orginfo`.`O`
+      from `orgdomaincerts`,`org`, `orginfo`
+      where `org`.`memid`='".intval($_SESSION['profile']['id'])."'
+      and `orgdomaincerts`.`orgid`=`org`.`orgid` and `orginfo`.`id` = `org`.`orgid`";
+
+    if($orgfilterid>0)
+    {
+      $query .= "AND `org`.`orgid`=$orgfilterid ";
+    }
+
+    if(0==$status)
+    {
+      $query .= "AND `revoked`=0 AND `renewed`=0 ";
+      $query .= "HAVING `timeleft` > 0 ";
+    }
+    switch ($sorting){
+      case 0:
+        $query .= "ORDER BY `orginfo`.`O`, `orgdomaincerts`.`expire` desc";
+        break;
+      case 1:
+        $query .= "ORDER BY `orginfo`.`O`, `orgdomaincerts`.`CN`, `orgdomaincerts`.`expire` desc";
+        break;
+    }
+
+
+//echo $query."<br>\n";
+  $res = mysql_query($query);
+  if(mysql_num_rows($res) <= 0)
+  {
+?>
+  <tr>
+    <td colspan="8" class="DataTD"><?=_("No domains are currently listed.")?></td>
+  </tr>
+<? } else {
+  $orgname='';
+  while($row = mysql_fetch_assoc($res))
+  {
+    if ($row['O']<>$orgname) {
+      $orgname=$row['O'];?>
+  <tr>
+    <td colspan="9" class="title"></td>
+  </tr>
+  <tr>
+    <td colspan="9" class="title"><? printf(_("Certificates for %s"), $orgname)?> </td>
   </tr>
   <tr>
     <td class="DataTD"><?=_("Renew/Revoke/Delete")?></td>
@@ -29,42 +134,17 @@
     <td class="DataTD"><?=_("Revoked")?></td>
     <td class="DataTD"><?=_("Expires")?></td>
     <td colspan="2" class="DataTD"><?=_("Comment *")?></td>
-<?
-	$query = "select UNIX_TIMESTAMP(`orgdomaincerts`.`created`) as `created`,
-			UNIX_TIMESTAMP(`orgdomaincerts`.`expire`) - UNIX_TIMESTAMP() as `timeleft`,
-			UNIX_TIMESTAMP(`orgdomaincerts`.`expire`) as `expired`,
-			`orgdomaincerts`.`expire` as `expires`, `revoked` as `revoke`,
-			UNIX_TIMESTAMP(`revoked`) as `revoked`, `CN`,
-			`orgdomaincerts`.`serial`,
-			`orgdomaincerts`.`id` as `id`,
-			`orgdomaincerts`.`description`
-			from `orgdomaincerts`,`org`
-			where `org`.`memid`='".intval($_SESSION['profile']['id'])."' and `orgdomaincerts`.`orgid`=`org`.`orgid` ";
-	if($viewall != 1)
-	{
-		$query .= "AND `revoked`=0 AND `renewed`=0 ";
-		$query .= "HAVING `timeleft` > 0 ";
-	}
-	$query .= "ORDER BY `orgdomaincerts`.`modified` desc";
-//echo $query."<br>\n";
-	$res = mysql_query($query);
-	if(mysql_num_rows($res) <= 0)
-	{
-?>
-  <tr>
-    <td colspan="8" class="DataTD"><?=_("No domains are currently listed.")?></td>
   </tr>
-<? } else {
-	while($row = mysql_fetch_assoc($res))
-	{
-		if($row['timeleft'] > 0)
-			$verified = _("Valid");
-		if($row['timeleft'] < 0)
-			$verified = _("Expired");
-		if($row['expired'] == 0)
-			$verified = _("Pending");
-		if($row['revoked'] > 0)
-			$verified = _("Revoked");
+      <?
+    }
+    if($row['timeleft'] > 0)
+      $verified = _("Valid");
+    if($row['timeleft'] < 0)
+      $verified = _("Expired");
+    if($row['expired'] == 0)
+      $verified = _("Pending");
+    if($row['revoked'] > 0)
+      $verified = _("Revoked");
                 if($row['revoked'] == 0)
                         $row['revoke'] = _("Not Revoked");
 ?>
@@ -92,12 +172,15 @@
   </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>
+      <input type="submit" name="revoke" value="<?=_("Revoke/Delete")?>" /></td>
     <td class="DataTD" colspan="2"><input type="submit" name="change" value="<?=_("Change settings")?>" /> </td>
   </tr>
+  <tr>
+    <td class="DataTD" colspan="9"><?=_("From here you can delete pending requests, or revoke valid certificates.")?></td>
+  </tr>
 <? } ?>
 </table>
 <input type="hidden" name="oldid" value="<?=$id?>" />
 <input type="hidden" name="csrf" value="<?=make_csrf('orgsrvcerchange')?>" />
 </form>
-<p><?=_("From here you can delete pending requests, or revoke valid certificates.")?></p>
+
diff --git a/pages/account/3.php b/pages/account/3.php
index b760c11..7e34300 100644
--- a/pages/account/3.php
+++ b/pages/account/3.php
@@ -24,7 +24,7 @@
 
 <p><?=_("CAcert Inc.'s public certification services are governed by a CPS as amended from time to time which is incorporated into this Agreement by reference. The Subscriber will use the SSL Server Certificate in accordance with CAcert Inc.'s CPS and supporting documentation published at")?> <a href="http://www.cacert.org/cps.php">http://www.cacert.org/cps.php</a></p>
 
-<p><?=_("If the Subscriber's name and/or domain name registration change the subscriber will immediately inform CAcert Inc. who shall revoke the digital certificate. When the Digital Certificate expires or is revoked the company will permanently remove the certificate from the server on which it is installed andwill not use it for any purpose thereafter. The person responsible for key management and security is fully authorized to install and utilize the certificate to represent this organization's electronic presence.")?></p>
+<p><?=_("If the Subscriber's name and/or domain name registration change the subscriber will immediately inform CAcert Inc. who shall revoke the digital certificate. When the Digital Certificate expires or is revoked the company will permanently remove the certificate from the server on which it is installed and will not use it for any purpose thereafter. The person responsible for key management and security is fully authorized to install and utilize the certificate to represent this organization's electronic presence.")?></p>
 
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
@@ -90,7 +90,7 @@ if($_SESSION['profile']['points'] >= 50)
   </tr>
   <tr>
    <td class="DataTD" colspan="2" align="left">
-      <?=_("Optional comment, only used in the certifictate overview max. 100 characters")?><br />
+      <?=_("Optional comment, only used in the certificate overview")?><br />
        <input type="text" name="description" maxlength="100" size="100" />
    </td>
   </tr>
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>
 	<?
diff --git a/pages/account/5.php b/pages/account/5.php
index 9607850..44763e2 100644
--- a/pages/account/5.php
+++ b/pages/account/5.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="10" class="title"><?=_("Client Certificates")?> - <a href="account.php?id=5&amp;viewall=<?=!$viewall?>"><?=_("View all certificates")?></a></td>
+    <td colspan="10" class="title"><?=_("Client Certificates")?> - <a href="account.php?id=5&amp;viewall=<?=!$viewall?>"><?=$viewall?_("Hide old certificates"):_("View all certificates")?></a></td>
   </tr>
   <tr>
     <td class="DataTD"><?=_("Renew/Revoke/Delete")?></td>
diff --git a/pages/gpg/0.php b/pages/gpg/0.php
index f490511..a11c4bf 100644
--- a/pages/gpg/0.php
+++ b/pages/gpg/0.php
@@ -19,7 +19,7 @@
 ?>
 <p><?=_("Paste your own public OpenPGP key below. It should not contain a picture. CAcert will sign your key after submission.")?></p>
 <form method="post" action="gpg.php">
-<p><?=_("Optional comment, only used in the certifictate overview")?><br />
+<p><?=_("Optional comment, only used in the certificate overview")?><br />
        <input type="text" name="description" maxlength="80" size=80 /></p>
 <textarea name="CSR" cols="80" rows="15"><?=array_key_exists('CSR',$_POST)?strip_tags($_POST['CSR']):""?></textarea><br />
 <p><input type="checkbox" name="CCA" /> <strong><?=sprintf(_("I accept the CAcert Community Agreement (%s)."),"<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>")?></strong><br />