# HG changeset patch
# User Matthias Förste <foerste@schlittermann.de>
# Date 1349440718 -7200
# Node ID 6d58197d77190d22febb7a34411893399396fd12
# Parent  f501f512f8d350ca816c0f1d5732ddca3436401b
fixed redirect rule generation; added simple redirect address validation

diff -r f501f512f8d3 -r 6d58197d7719 qf.cgi
--- a/qf.cgi	Fri Oct 05 12:58:38 2012 +0200
+++ b/qf.cgi	Fri Oct 05 14:38:38 2012 +0200
@@ -50,7 +50,7 @@
     my ($address, $keep) = @_;
     error "need address" unless $address;
     $address =~ s/"/\\"/g;
-    return "redirect \"$address\";" . $keep ? "\nkeep;" : '';
+    return "redirect \"$address\";" . ( $keep ? "\nkeep;" : '' );
 
 }
 
@@ -134,8 +134,8 @@
 
 if (defined $p->{add} and $p->{add} ne '') {
 
-    error({ status => 'Bitte geben Sie eine Umleitungsaddresse an.' })
-      unless defined $p->{address} and $p->{address} ne '';
+    error({ status => 'Bitte geben Sie eine gültige Umleitungsaddresse an.' })
+      unless defined $p->{address} and $p->{address} =~ /[^@]+@[^@]+/;
     error "Can't putscript: $@"
       unless $s->putscript($script_name, redirect($p->{address}, $p->{keep}));
     error "Can't setactive: $@" unless $s->setactive($script_name);