X-Git-Url: https://code.th-h.de/?p=usenet%2Fusevote.git;a=blobdiff_plain;f=uvvote.pl;h=4b3b2b1cea1d753cd57f265800b3e899417e34b7;hp=4affb4cb1db0e055ce0064c46a643e035012809f;hb=refs%2Ftags%2F4.0.11;hpb=bb61da374349f7d48c2f5e1976afd94fd489f122 diff --git a/uvvote.pl b/uvvote.pl index 4affb4c..4b3b2b1 100644 --- a/uvvote.pl +++ b/uvvote.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -w ############################################################################### -# UseVoteGer 4.10 Wahldurchfuehrung +# UseVoteGer 4.11 Wahldurchfuehrung # (c) 2001-2012 Marc Langer # # This script package is free software; you can redistribute it and/or @@ -135,16 +135,6 @@ if ($clean) { my $thisresult = "ergebnis-" . $ext; my $thisvotes = "stimmen-" . $ext; - # POP3 not activated: rename votes file - unless ($config{pop3}) { - print UVmessage::get("VOTE_RENAMING_MAILBOX"), "\n"; - rename ($config{votefile}, "$config{tmpdir}/$thisvotes") - or die UVmessage::get("ERR_RENAME_MAILFILE") . "$!\n\n"; - - # wait, so that current mail deliveries can finalize - sleep 2; - } - # open results file open (RESULT, ">>$config{tmpdir}/$thisresult") or die UVmessage::get("VOTE_WRITE_RESULTS", (FILE=>$thisresult)) . "\n\n"; @@ -241,7 +231,7 @@ sub process_vote { } # correct voting? - if ($$body =~ /\Q$config{ballotintro}\E\s+(.+?)\s*\n(.*?[\t ]+(\S+.+)\s*$)?/m) { + if ($$body =~ /\Q$config{ballotintro}\E\s+(.+?)[^\S\n]*\n([>:|]*?[\t ]+(\S+.+)\s*$)?/m) { $voting = $1; $voting .= " $3" if defined($3); push (@errors, 'WrongVoting') if ($config{votename} !~ /^\s*\Q$voting\E\s*$/);