Merge branch 'thh-pickfromupstream' into next

* thh-pickfromupstream:
  Fix whitespace and typo.
  Update documentation to 4.12.
  Add correct timestamp to mbox when processing.
  Don't remove empty mailbox files/maildirs.
  Fix UVreadmail.pm
  Add option to compare ballot to sample ballot.
  Documentation: Add votename to UVmenu.
This commit is contained in:
Thomas Hochstein 2014-03-19 22:15:36 +01:00
commit 7233d81f30
12 changed files with 88 additions and 25 deletions

View file

@ -18,7 +18,7 @@ require Exporter;
$VERSION = "0.18";
# Usevote version
$usevote_version = "UseVoteGer 4.11";
$usevote_version = "UseVoteGer 4.12";
sub read_config {
@ -27,6 +27,7 @@ sub read_config {
# Default configuration options (overwritten in usevote.cfg)
%config = (votefile => "votes",
votename => "unkonfiguriertes Usevote",
sampleballotfile => "ballot.sample",
resultfile => "ergebnis.alle",
rulefile => "usevote.rul",
badaddrfile => "mailpatterns.cfg",
@ -57,6 +58,7 @@ sub read_config {
mailcc => "",
sleepcmd => "sleep 1",
clearcmd => "clear",
diff => "diff",
pager => "less",
pop3 => 0,
pop3server => "localhost",