X-Git-Url: https://code.th-h.de/?p=usenet%2Fusevote.git;a=blobdiff_plain;f=uvvote.pl;h=2af270eff95b324e5292e63ddebc0f36c407b851;hp=836903ab9e66940413b8e0a99fb09646935ff52b;hb=6422cdc89300a908d613765a85d075d9d5bb68be;hpb=b9f5201405ce5145f258c7e909397f4cf1f3bd23

diff --git a/uvvote.pl b/uvvote.pl
index 836903a..2af270e 100755
--- a/uvvote.pl
+++ b/uvvote.pl
@@ -241,8 +241,9 @@ sub process_vote {
   }
 
   # correct voting?
-  if ($$body =~ /\Q$config{ballotintro}\E\s+(.+?)\s*$/m) {
+  if ($$body =~ /\Q$config{ballotintro}\E\s+(.+?)\s*\n([>:|]*?[\t ]+(\S+.+)\s*$)?/m) {
     $voting = $1;
+    $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');
@@ -328,7 +329,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');
     }