----------------------------------------------------------------------

www/index.php

@@ -382,6 +382,8 @@
 		$_SESSION['signup']['country'] = intval(array_key_exists('country',$_REQUEST)?$_REQUEST['country']:0);
 		$_SESSION['signup']['regional'] = intval(array_key_exists('regional',$_REQUEST)?$_REQUEST['regional']:0);
 		$_SESSION['signup']['radius'] = intval(array_key_exists('radius',$_REQUEST)?$_REQUEST['radius']:0);
+		$_SESSION['signup']['cca_agree'] = intval(array_key_exists('cca_agree',$_REQUEST)?$_REQUEST['cca_agree']:0);
+
 
 		if($_SESSION['signup']['Q1'] == $_SESSION['signup']['Q2'] ||
 			$_SESSION['signup']['Q1'] == $_SESSION['signup']['Q3'] ||
@@ -437,6 +439,11 @@
 			$id = 1;
 			$_SESSION['_config']['errmsg'] .= _("Invalid date of birth")."<br>\n";
 		}
+		if($_SESSION['signup']['cca_agree'] == "0")
+		{
+		        $id = 1;
+		        $_SESSION['_config']['errmsg'] .= _("You have to agree to the CAcert Community agreement.")."<br>\n";
+		}
 		if($_SESSION['signup']['email'] == "")
 		{
 			$id = 1;
@@ -566,7 +573,8 @@
 
 			$message = "From: $who\nEmail: $email\nSubject: $subject\n\nMessage:\n".$message;
 			sendmail("support@cacert.org", "[CAcert.org] Possible SPAM", $message, $email, "", "", "CAcert Support");
-			echo "Alert! Alert! Alert! SPAM SPAM SPAM!!!<br><br><br>";
+			//echo "Alert! Alert! Alert! SPAM SPAM SPAM!!!<br><br><br>";
+			//if($_SESSION['_config']['secrethash'] != $secrethash) echo "Hash does not match: $secrethash vs. ".$_SESSION['_config']['secrethash']."\n";
 			echo "This seems like potential spam, or you have cookies or Javascript disabled, cannot continue.";
 			die;
 		}