Merge branch 'bug-413' into bug-1138bug-1138

Conflicts:
	pages/account/12.php
	pages/account/5.php

4 files changed, 19 insertions, 13 deletions

diff --git a/pages/account/12.php b/pages/account/12.php
index a59a5a1..f4428aa 100644
--- a/pages/account/12.php
+++ b/pages/account/12.php
@@ -36,16 +36,18 @@
 			UNIX_TIMESTAMP(`domaincerts`.`expire`) as `expired`,
 			`domaincerts`.`expire`,
 			`domaincerts`.`revoked` as `revoke`,
-			UNIX_TIMESTAMP(`revoked`) as `revoked`, `CN`, `domaincerts`.`serial`, `domaincerts`.`id` as `id`,
+			UNIX_TIMESTAMP(`revoked`) as `revoked`,
+			if (`domaincerts`.`expire`=0,CURRENT_TIMESTAMP(),`domaincerts`.`modified`) as `modified`,
+			`CN`, `domaincerts`.`serial`, `domaincerts`.`id` as `id`,
 			`domaincerts`.`description`
 			from `domaincerts`,`domains`
 			where `memid`='".intval($_SESSION['profile']['id'])."' and `domaincerts`.`domid`=`domains`.`id` ";
 	if($viewall != 1)
 	{
 		$query .= "AND `revoked`=0 AND `renewed`=0 ";
-		$query .= "HAVING `timeleft` > 0 ";
+		$query .= "HAVING `timeleft` > 0 or `expire` = 0 ";
 	}
-	$query .= "ORDER BY `domaincerts`.`modified` desc";
+	$query .= "ORDER BY `modified` desc";
 //echo $query."<br>\n";
 	$res = mysql_query($query);
 	if(mysql_num_rows($res) <= 0)
diff --git a/pages/account/18.php b/pages/account/18.php
index 9ab13b2..ca0a3c8 100644
--- a/pages/account/18.php
+++ b/pages/account/18.php
@@ -79,6 +79,7 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c
       UNIX_TIMESTAMP(`oemail`.`expire`) as `expired`,
       `oemail`.`expire` as `expires`, `oemail`.`revoked` as `revoke`,
       UNIX_TIMESTAMP(`oemail`.`revoked`) as `revoked`,
+      if (`oemail`.`expire`=0,CURRENT_TIMESTAMP(),`oemail`.`modified`) as `modified`,
       `oemail`.`CN`, `oemail`.`serial`, `oemail`.`id`,
       `oemail`.`description`, `oemail`.`ou`, `orginfo`.`O`
       from `orgemailcerts` as `oemail`, `org`, `orginfo`
@@ -92,17 +93,17 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c
   if(0==$status)
   {
     $query .= "AND `oemail`.`revoked`=0 AND `oemail`.`renewed`=0 ";
-    $query .= "HAVING `timeleft` > 0 AND `revoked`=0 ";
+    $query .= "HAVING `timeleft` > 0 AND `revoked`=0 or `expires` = 0 ";
   }
   switch ($sorting){
     case 0:
-      $query .= "ORDER BY `orginfo`.`O`, `oemail`.`expire` desc";
+      $query .= "ORDER BY `orginfo`.`O`, `modified` desc";
       break;
     case 1:
-      $query .= "ORDER BY `orginfo`.`O`, `oemail`.`ou`, `oemail`.`expire` desc";
+      $query .= "ORDER BY `orginfo`.`O`, `oemail`.`ou`, `modified` desc";
       break;
     case 2:
-      $query .= "ORDER BY `orginfo`.`O`, `oemail`.`CN`, `oemail`.`expire` desc";
+      $query .= "ORDER BY `orginfo`.`O`, `oemail`.`CN`, `modified` desc";
       break;
   }
   $res = mysql_query($query);
diff --git a/pages/account/22.php b/pages/account/22.php
index 0413da0..7b7db2d 100644
--- a/pages/account/22.php
+++ b/pages/account/22.php
@@ -78,7 +78,9 @@ $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_
       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`,
+      UNIX_TIMESTAMP(`orgdomaincerts`.`revoked`) as `revoked`,
+      if (`orgdomaincerts`.`expire`=0,CURRENT_TIMESTAMP(),`orgdomaincerts`.`modified`) as `modified`,
+       `CN`,
       `orgdomaincerts`.`serial`,
       `orgdomaincerts`.`id` as `id`,
       `orgdomaincerts`.`description`, `orginfo`.`O`
@@ -94,14 +96,14 @@ $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_
     if(0==$status)
     {
       $query .= "AND `revoked`=0 AND `renewed`=0 ";
-      $query .= "HAVING `timeleft` > 0 ";
+      $query .= "HAVING `timeleft` > 0 or `expires` = 0 ";
     }
     switch ($sorting){
       case 0:
-        $query .= "ORDER BY `orginfo`.`O`, `orgdomaincerts`.`expire` desc";
+        $query .= "ORDER BY `orginfo`.`O`, `modified` desc";
         break;
       case 1:
-        $query .= "ORDER BY `orginfo`.`O`, `orgdomaincerts`.`CN`, `orgdomaincerts`.`expire` desc";
+        $query .= "ORDER BY `orginfo`.`O`, `orgdomaincerts`.`CN`, `modified` desc";
         break;
     }
 
diff --git a/pages/account/5.php b/pages/account/5.php
index f458114..efed0ab 100644
--- a/pages/account/5.php
+++ b/pages/account/5.php
@@ -37,6 +37,7 @@
 			`emailcerts`.`expire`,
 			`emailcerts`.`revoked` as `revoke`,
 			UNIX_TIMESTAMP(`emailcerts`.`revoked`) as `revoked`,
+			if (`emailcerts`.`expire`=0,CURRENT_TIMESTAMP(),`emailcerts`.`modified`) as `modified` ,
 			`emailcerts`.`id`,
 			`emailcerts`.`CN`,
 			`emailcerts`.`serial`,
@@ -49,8 +50,8 @@
 		$query .= " AND `revoked`=0 AND `renewed`=0 ";
 	$query .= " GROUP BY `emailcerts`.`id` ";
 	if($viewall != 1)
-                $query .= " HAVING `timeleft` > 0 ";
-	$query .= " ORDER BY `emailcerts`.`modified` desc";
+		$query .= " HAVING `timeleft` > 0 or `expire` = 0 ";
+	$query .= " ORDER BY `modified` desc";
 // echo $query."<br>\n";
 	$res = mysql_query($query);
 	if(mysql_num_rows($res) <= 0)