bug fixes

includes/general.php

@@ -567,10 +567,8 @@
 			foreach($mxhosts as $key => $domain)
 			{
 				$fp = @fsockopen($domain,25,$errno,$errstr,5);
-				if(!$fp)
+				if($fp)
 				{
-					return false;
-				} else {
 				
 					$line = fgets($fp, 4096);
 					if(substr($line, 0, 3) != "220")

pages/account/12.php

@@ -23,7 +23,7 @@
     <td class="DataTD"><?=_("CommonName")?></td>
     <td class="DataTD"><?=_("Revoked")?></td>
     <td class="DataTD"><?=_("Expires")?></td>
-
+  </tr>
 <?
 	$query = "select UNIX_TIMESTAMP(`domaincerts`.`created`) as `created`,
 			UNIX_TIMESTAMP(`domaincerts`.`expire`) - UNIX_TIMESTAMP() as `timeleft`,
@@ -33,7 +33,10 @@
 			from `domaincerts`,`domains`
 			where `memid`='".$_SESSION[profile][id]."' and `deleted`=0 and `domaincerts`.`domid`=`domains`.`id` ";
 	if($_GET['viewall'] != 1)
-		$query .= "HAVING `timeleft` > 0 AND `revoked`=0 ";
+	{
+		$query .= "AND `revoked`=0 AND `renewed`=0 ";
+		$query .= "HAVING `timeleft` > 0 ";
+	}
 	$query .= "ORDER BY `domaincerts`.`modified` desc";
 //echo $query."<br>\n";
 	$res = mysql_query($query);

pages/account/5.php

@@ -34,10 +34,12 @@
 			from `emailcerts`, `emaillink`, `email`
 			where `emailcerts`.`memid`='".$_SESSION['profile']['id']."'
 			and `emailcerts`.`id`=`emaillink`.`emailcertsid`
-			and `emaillink`.`emailid` = `email`.`id`
-			GROUP BY `emailcerts`.`id` ";
+			and `emaillink`.`emailid` = `email`.`id` ";
 	if($_GET['viewall'] != 1)
-                $query .= "HAVING `timeleft` > 0 AND `revoked`=0 ";
+		$query .= "AND `revoked`=0 AND `renewed`=0 ";
+	$query .= "GROUP BY `emailcerts`.`id` ";
+	if($_GET['viewall'] != 1)
+                $query .= "HAVING `timeleft` > 0 ";
 	$query .= "ORDER BY `emailcerts`.`modified` desc";
 // echo $query."<br>\n";
 	$res = mysql_query($query);

pages/index/7.php

@@ -15,3 +15,11 @@
 <h3><?=_("Credits")?></h3>
 
 <p><?=_("Many people to thank, if you've had a large input with the CAcert project with code, documentation, translations, or assurances and would like recognition let me know.")?></p>
+<p><?=_("The list of names are in no sense of order")?></p>
+<ul>
+<li>* Christian Barmala - <?=_("Put a lot of effort convincing people in Germany to signup and be assured, he started work on a new RFC complient CPS, spent countless hours helping with tech support, and so much more")?></li>
+<li>* Guillaume Romagny - <?=_("He's constantly helping out on the support list, building up documentation and all round nice guy, he was even offered a free book and turned down the offer until there is a book on CAcert available!")?></li>
+<li>* Adam Butler - <?=_("For much of the art work that exists on the website, as well as a few published articles and written documents.")?></li>
+<li>* Philipp Gühring - <?=_("He's put so much effort into CAcert I don't know where to begin, he managed to bring the CPS Chrisitian had started up to draft status, he has given countless hours to assuring people and attending conferences to help spread the word")?></li>
+<li>* Evaldo Gardenali - <?=_("Has put a lot of time and effort into promoting and assuring people in Brazil and South America, and for doing most of the Portuguese translations")?></li>
+</ul>