projects
/
usenet
/
usevote.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'thh-pickfromupstream' into next
[usenet/usevote.git]
/
UVconfig.pm
diff --git
a/UVconfig.pm
b/UVconfig.pm
index
c93f135
..
c2a1629
100644
(file)
--- a/
UVconfig.pm
+++ b/
UVconfig.pm
@@
-18,7
+18,7
@@
require Exporter;
$VERSION = "0.18";
# Usevote version
$VERSION = "0.18";
# Usevote version
-$usevote_version = "UseVoteGer 4.
09
";
+$usevote_version = "UseVoteGer 4.
12
";
sub read_config {
sub read_config {
@@
-27,6
+27,7
@@
sub read_config {
# Default configuration options (overwritten in usevote.cfg)
%config = (votefile => "votes",
votename => "unkonfiguriertes Usevote",
# 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",
resultfile => "ergebnis.alle",
rulefile => "usevote.rul",
badaddrfile => "mailpatterns.cfg",
@@
-45,6
+46,7
@@
sub read_config {
voteaccount => "<> (unkonfiguriertes Usevote)",
mailfrom => "<> (unkonfiguriertes Usevote)",
envelopefrom => "<>",
voteaccount => "<> (unkonfiguriertes Usevote)",
mailfrom => "<> (unkonfiguriertes Usevote)",
envelopefrom => "<>",
+ mailboxtype => "mbox",
mailstart => "^From ",
archivedir => "fertig",
tmpdir => "tmp",
mailstart => "^From ",
archivedir => "fertig",
tmpdir => "tmp",
@@
-56,6
+58,7
@@
sub read_config {
mailcc => "",
sleepcmd => "sleep 1",
clearcmd => "clear",
mailcc => "",
sleepcmd => "sleep 1",
clearcmd => "clear",
+ diff => "diff",
pager => "less",
pop3 => 0,
pop3server => "localhost",
pager => "less",
pop3 => 0,
pop3server => "localhost",
@@
-89,8
+92,9
@@
sub read_config {
nein_stimme => '(N\s*E\s*I\s*N|N|(D\s*A\s*)?G\s*E\s*G\s*E\s*N)',
enth_stimme => '(E|E\s*N\s*T\s*H\s*A\s*L\s*T\s*U\s*N\s*G)',
ann_stimme => 'A\s*N\s*N\s*U\s*L\s*L\s*I\s*E\s*R\s*U\s*N\s*G',
nein_stimme => '(N\s*E\s*I\s*N|N|(D\s*A\s*)?G\s*E\s*G\s*E\s*N)',
enth_stimme => '(E|E\s*N\s*T\s*H\s*A\s*L\s*T\s*U\s*N\s*G)',
ann_stimme => 'A\s*N\s*N\s*U\s*L\s*L\s*I\s*E\s*R\s*U\s*N\s*G',
+ bdsg_confirm => 'JA',
condition1 => '$yes>=2*$no', # twice as many yes as no
condition1 => '$yes>=2*$no', # twice as many yes as no
- condition2 => '$yes>=
60', # min 6
0 yes votes
+ condition2 => '$yes>=
50', # min 5
0 yes votes
prop_formula => '$yes/$no',
tpl_ack_mail => 'ack-mail',
tpl_bouncelist => 'bouncelist',
prop_formula => '$yes/$no',
tpl_ack_mail => 'ack-mail',
tpl_bouncelist => 'bouncelist',
@@
-117,6
+121,7
@@
sub read_config {
tpl_rule_violated => 'rule-violated',
begin_divider => 'Alles vor dieser Zeile bitte loeschen',
end_divider => 'Alles nach dieser Zeile bitte loeschen',
tpl_rule_violated => 'rule-violated',
begin_divider => 'Alles vor dieser Zeile bitte loeschen',
end_divider => 'Alles nach dieser Zeile bitte loeschen',
+ ballotintro => 'WAHLSCHEIN fuer',
nametext => 'Dein Realname, falls nicht im FROM-Header:',
nametext2 => 'Waehlername:',
addresstext => 'Waehleradresse:',
nametext => 'Dein Realname, falls nicht im FROM-Header:',
nametext2 => 'Waehlername:',
addresstext => 'Waehleradresse:',
This page took
0.011443 seconds
and
4
git commands to generate.