--- a/index.cgi	Wed Jul 06 00:41:47 2011 +0200
+++ b/index.cgi	Wed Jul 06 09:33:50 2011 +0200
@@ -35,7 +35,7 @@
 my $SENDMAIL = "/usr/sbin/sendmail -f $SENDER -t";
 
 my %FIELDS = (
-    MAN => [qw[givenname surname mail]],
+    MAN => [qw[givenname surname email]],
     OPT => [qw[tel]]
 );
 
@@ -86,9 +86,14 @@
 	my $confirmed = param("confirm") eq "yes";
 	my %data = confirm($uuid => $confirmed);
 
+	if ($data{error}) {
+	    $tt->process("html.denied.tpl");
+	    exit 0;
+	}
+
 	open(my $sendmail, "|$SENDMAIL") or die "Can't open $SENDMAIL: $!\n";
 	$tt->process("mail.confirmed.tpl", {
-	    to => $data{mail},
+	    to => $data{email},
 	    confirmed => $confirmed,
 	}, $sendmail)
 	or die $tt->error();
@@ -146,8 +151,8 @@
 	    }
 
 	    # Mail needs extra check
-	    if ($value{mail} and not valid($value{mail})) {
-		push @{$warn{mail}}, "Keine gültig erscheinende Mail-Adresse.";
+	    if ($value{email} and not valid($value{email})) {
+		push @{$warn{email}}, "Keine gültig erscheinende Mail-Adresse.";
 	    }
 
 	    foreach (keys %warn) {
@@ -161,7 +166,7 @@
 		    or die "Can't open $SENDMAIL: $!\n";
 
 		$tt->process("mail.form-ack.tpl", {
-		    to => $value{mail},
+		    to => $value{email},
 		    url => {
 			yes => "$SELF/user.$r{uuid}?confirm=yes",
 			no  => "$SELF/user.$r{uuid}?confirm=no",
@@ -185,7 +190,7 @@
 	    value => {
 		givenname => scalar param("givenname"),
 		surname => scalar param("surname"),
-		mail => scalar param("mail"),
+		email => scalar param("email"),
 	    },
 	} ) or die $tt->error();
 	exit 0;
@@ -267,9 +272,9 @@
 	my %warn;
 	my $sent;
 
-	if (param("mail")) {
-	    if (not valid param("mail")) {
-		$warn{mail} = "INVALID";
+	if (param("email")) {
+	    if (not valid param("email")) {
+		$warn{email} = "INVALID";
 	    }
 	    else {
 		my $xxx = encrypt(time);
@@ -281,21 +286,21 @@
 		    or die "Can't open sendmail: $!\n";
 
 		$tt->process("mail.invitation.tpl", {
-		    to   => scalar(param("mail")),
+		    to   => scalar(param("email")),
 		    url  => "$SELF/tmp.$xxx"}, $sendmail)
 		or die $tt->error();
 		close($sendmail)
 			or die "problem sending mail to "
-				. param("mail");
+				. param("email");
 
-		$sent = param("mail");
+		$sent = param("email");
 	    }
 	}
 	$tt->process("html.invitation.tpl", {
 	    sent => $sent,
 	    warn => %warn ? \%warn : undef,
 	    expires => $EXPIRATION,
-	    value => { mail => scalar param("mail") },
+	    value => { email => scalar param("email") },
 	});
 }