made Header and Footer optional

includes/general.php

@@ -378,9 +378,7 @@
 		}
 //		if(count($rows) <= 0)
 //		{
-//			showheader(_("My CAcert.org Account!"));
 //			echo _("There were no valid CommonName fields on the CSR, or I was unable to match any of these against your account. Please review your CSR, or add and verify domains contained in it to your account before trying again.");
-//			showfooter();
 //			exit;
 //		}
 
@@ -466,9 +464,7 @@
 		}
 //		if(count($rows) <= 0)
 //		{
-//			showheader(_("My CAcert.org Account!"));
 //			echo _("There were no valid CommonName fields on the CSR, or I was unable to match any of these against your account. Please review your CSR, or add and verify domains contained in it to your account before trying again.");
-//			showfooter();
 //			exit;
 //		}
 		$_SESSION['_config']['rows'] = $rows;
@@ -672,7 +668,7 @@
 		return _("Failed to make a connection to the mail server");
 	}
 
-	function waitForResult($table, $certid, $id = 0)
+	function waitForResult($table, $certid, $id = 0, $show = 1)
 	{
 		$found = $trycount = 0;
 		while($trycount++ <= 30)
@@ -692,15 +688,15 @@
 
 		if(!$found)
 		{
-			showheader(_("My CAcert.org Account!"));
+			if($show) showheader(_("My CAcert.org Account!"));
 			$query = "select * from `$table` where `id`='$certid' ";
 			$res = mysql_query($query);
 			if(mysql_num_rows($res) > 0)
 				printf(_("Your certificate request is still queued and hasn't been processed yet. Please wait, and go to Certificates -> View to see it's status."));
 			else
 				printf(_("Your certificate request has failed to be processed correctly, see %sthe WIKI page%s for reasons and solutions.")." certid:$table:$certid", "<a href='http://wiki.cacert.org/wiki/FAQ/CertificateRenewal'>", "</a>");
-			showfooter();
-			exit;
+			if($show) showfooter();
+			if($show) exit;
 		}
 	}