X-Git-Url: https://code.th-h.de/?p=usenet%2Fusevote.git;a=blobdiff_plain;f=uvvote.pl;fp=uvvote.pl;h=c101f1f7f0ec8d13da40346be6a0f17024e9dd10;hp=0e7e2bdce2b52069989e73fc3f589457724d49d2;hb=adf1f9a735713a5d33644d1fc3ff3f79d227e435;hpb=c1cc3954b44990c22aef40789195c4c4952cfca4

diff --git a/uvvote.pl b/uvvote.pl
index 0e7e2bd..c101f1f 100644
--- a/uvvote.pl
+++ b/uvvote.pl
@@ -231,9 +231,9 @@ sub process_vote {
   }
 
   # correct voting?
-  if ($$body =~ /\Q$config{ballotintro}\E\s+(.+?)[^\S\n]*\n([>:|]*?[\t ]+(\S+.+)\s*$)?/m) {
+  if ($$body =~ /\Q$config{ballotintro}\E\s+(.+?)\s*\n([>:|]*?[\t ]+(\S+.+)\s*$)?/m) {
     $voting = $1;
-    $voting .= " $3" if defined($3);
+    $voting .= " $3" if (defined($3) and $3 !~ /\Q$config{nametext}\E/);
     push (@errors, 'WrongVoting') if ($config{votename} !~ /^\s*\Q$voting\E\s*$/);
   } else {
     push (@errors, 'NoVoting');
@@ -319,7 +319,7 @@ sub process_vote {
     # Should read like this: #a [ STIMME ] Text
     # (Text is configurable in usevote.cfg)
     unless ($$body =~ /$bdsg_regexp/s &&
-            $$body =~ /#a\W*?\[\W*?$config{ja_stimme}\W*?\]\W*?$bdsg2_regexp/is) {
+            $$body =~ /#a\W*?\[\W*?$config{bdsg_confirm}\W*?\]\W*?$bdsg2_regexp/is) {
 
       push (@errors, 'InvalidBDSG');
     }