# HG changeset patch
# User heiko
# Date 1309789622 -7200
# Node ID 641140d445cafa5543616a82a8e3cf794973aee5
# Parent  56b8dfae50aab9d22c6fd71726be2cce6aa9245f
fixed more umlauts

diff -r 56b8dfae50aa -r 641140d445ca conf.example/secret
--- a/conf.example/secret	Mon Jul 04 16:14:52 2011 +0200
+++ b/conf.example/secret	Mon Jul 04 16:27:02 2011 +0200
@@ -1,1 +1,2 @@
-jahcaesh
+# secret for hashing several values
+xxx
diff -r 56b8dfae50aa -r 641140d445ca conf.example/self
--- a/conf.example/self	Mon Jul 04 16:14:52 2011 +0200
+++ b/conf.example/self	Mon Jul 04 16:27:02 2011 +0200
@@ -1,1 +1,2 @@
+# my own url for creating self references (in mail)
 https://ssl.schlittermann.de/retter/index.cgi
diff -r 56b8dfae50aa -r 641140d445ca conf.example/subject
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf.example/subject	Mon Jul 04 16:27:02 2011 +0200
@@ -0,0 +1,2 @@
+# subject line prefix. ASCII ONLY
+[Retter packen]
diff -r 56b8dfae50aa -r 641140d445ca index.cgi
--- a/index.cgi	Mon Jul 04 16:14:52 2011 +0200
+++ b/index.cgi	Mon Jul 04 16:27:02 2011 +0200
@@ -25,10 +25,10 @@
 $ENV{PATH} = "/usr/bin:/usr/sbin:/bin:/sbin";
 
 my $DSN = "DBI:SQLite:var/db.sqlite3";
-my $SECRET = slurp "conf/secret"; chomp($SECRET);
-my $SELF = slurp "conf/self";     chomp($SELF);
+my $SECRET = slurp "conf/secret";   chomp($SECRET);
+my $SELF = slurp "conf/self";       chomp($SELF);
+my $SUBJECT = slurp "conf/subject"; chomp($SUBJECT);
 my $EXPIRATION = 60;		    # the link is valid for XX minutes only
-my $SUBJECT = "Retter packen";	    # ASCII only! *used for mail subject*
 my %FIELDS = (
     MAN => [qw[givenname surname mail]],
     OPT => [qw[tel]]
@@ -78,7 +78,7 @@
 		sendmail(To => scalar(param("mail")),
 		         From => "hs+retter\@schlittermann.de",
 			 Sender => "hs\@schlittermann.de",
-			 Subject => "[$SUBJECT] Link zur Online-Anmeldung",
+			 Subject => "$SUBJECT Link zur Online-Anmeldung",
 			 Message => "Bitte benutze den folgenden Link, um zum Anmeldeformular zu gelangen:\n"
 			    . "$SELF/$xxx.tmp\n"
 			    . "\n-- \nHeiko Schlittermann\n");
@@ -174,7 +174,7 @@
 	    sendmail(To => $value{mail},
 		     From => "hs\@schlittermann.de",
 		     "Content-Type" => "text/plain; charset=\"UTF-8\"",
-		     Subject => "[$SUBJECT] Bitte die Anmeldung bestaetigen.",
+		     Subject => "$SUBJECT Bitte die Anmeldung bestaetigen.",
 		     Message => <<_EOF);
 
 Bitte bestaetige Deine Anmeldung. Dazu mußt Du folgenden Link in Deinem
@@ -269,9 +269,9 @@
 	sendmail(
 	    To => $data{mail},
 	    From => "hs+retter\@schlittermann.de",
-	    Subject => "[$SUBJECT] Bestaetigung der Anmeldung",
+	    Subject => "$SUBJECT Bestaetigung der Anmeldung",
 	    Message => <<_EOF);
-Du bist erfolgreich angemeldet. Für weitere Fragen kontaktiere bitte
+Du bist erfolgreich angemeldet. Fuer weitere Fragen kontaktiere bitte
 hs+retter\@schlittermann.de.
 _EOF
     }
@@ -279,7 +279,7 @@
 	sendmail(
 	    To => $data{mail},
 	    From => "hs+retter\@schlittermann.de",
-	    Subject => "[$SUBJECT] Bestaetigung der NICHT-Anmeldung",
+	    Subject => "$SUBJECT Bestaetigung der NICHT-Anmeldung",
 	    Message => <<_EOF);
 Wir vergessen Deine Anmeldung. Fuer weitere Fragen kontaktiere bitte
 hs+retter\@schlittermann.de.
@@ -292,5 +292,6 @@
 sub slurp($) {
     open(my $_, $_[0]) or die "Can't open $_[0]: $!\n";
     local $/ = undef;
+    s/^#.*//mg;
     return <$_>;
 }