Commit graph

62 commits

Author SHA1 Message Date
Thomas Hochstein bcd2d0aba3 Fix typo, remove German umlaut.
Fix from Peter Heirich.

Signed-off-by: Thomas Hochstein <thh@thh.name>
2023-07-06 23:03:56 +02:00
Thomas Hochstein a7ea02d592 Non-greedy matching for votestrings.
A single choice on a ballot has this format:

 #1   [            ]  This or that

The regexp in uvvote.pl's process_vote() will
match and extract what's beetwen "[" and "]".
But if "This or that" contains a "]", the
match will be too greedy:

 #1   [            ]  This [or that]
       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ <- match

Fix that by using a non-greedy operator.

Signed-off-by: Thomas Hochstein <thh@thh.name>
2022-03-29 22:56:47 +02:00
Thomas Hochstein f90cfdb57f Update documentation.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2021-12-19 15:21:15 +01:00
Thomas Hochstein 1765b2e8d6 Change quorum (50 -> 15 votes)
Change in config and templates:
- result-single
- result-multi

Signed-off-by: Thomas Hochstein <thh@inter.net>
2021-12-19 15:12:52 +01:00
Thomas Hochstein 1696d12d62 Global config: change diff command to "diff -u".
Signed-off-by: Thomas Hochstein <thh@inter.net>
2021-12-19 14:20:30 +01:00
Thomas Hochstein fe022f745d Global config: add " --" to mail command.
Otherwise mail addresses beginning with a
dash ("-mymail-@provider.example") will
lead to Exim erroring out.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2021-12-19 14:19:48 +01:00
Thomas Hochstein b7f97daa67 Adapt bdsgtext.cfg to DSGVO.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2021-09-20 21:11:33 +02:00
Thomas Hochstein b4bfb23488 Update documentation from upstream.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2014-03-19 22:17:36 +01:00
Thomas Hochstein 7233d81f30 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.
2014-03-19 22:15:36 +01:00
Thomas Hochstein f406c344d9 Merge branch 'thh-setdefaults' into next
* thh-setdefaults:
  Update UVconf.pm
  Add "bdsg_confirm" to UVconf.pm
2014-03-19 22:15:30 +01:00
Thomas Hochstein ef9dd9e761 Fix whitespace and typo.
Remove umlaut in README and fix a whitespace
issue in UVmenu.pm

Signed-off-by: Thomas Hochstein <thh@inter.net>
2014-02-16 13:54:36 +01:00
Thomas Hochstein 1135267f44 Update documentation to 4.12.
Picked from upstream.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2014-02-16 13:54:33 +01:00
Thomas Hochstein 3cb13d5a31 Add correct timestamp to mbox when processing.
Picked from upstream.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2014-02-16 13:54:28 +01:00
Thomas Hochstein 52a699fdc7 Don't remove empty mailbox files/maildirs.
Picked from upstream.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2014-02-16 13:54:18 +01:00
Thomas Hochstein 98343f2272 Fix UVreadmail.pm
Use filename from function call.

Picked from upstream.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2014-02-16 13:54:13 +01:00
Thomas Hochstein 7a0133efe6 Add option to compare ballot to sample ballot.
It may be desriable to compare a ballot to
a sample ballot when checking votes.

* Add options "diff" and "sampleballotfile" to
  usevote.cfg an UVconfig.pm
* Add menu option to UVmenu.pm

Picked from upstream.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2014-02-16 13:54:06 +01:00
Thomas Hochstein dc651b4283 Documentation: Add votename to UVmenu.
Those new options to check the votename had not
been added to the README file.

Also fix a typo.

Picked from upstream.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2014-02-16 13:53:55 +01:00
Thomas Hochstein e54a12d618 Update UVconf.pm
Change default for "condition2" to a minimum of
50 votes and add "ballotintro".

Signed-off-by: Thomas Hochstein <thh@inter.net>
2014-02-16 13:26:55 +01:00
Thomas Hochstein 10e21c1f97 Add "bdsg_confirm" to UVconf.pm
Set default for "bdsg_confirm".

Picked from upstream.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2014-02-16 13:25:39 +01:00
Thomas Hochstein 8f4c5219c4 Add script to create votings.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2014-02-15 19:00:57 +01:00
Thomas Hochstein 0d6bf22b47 Add .gitattributes 2014-02-15 18:53:19 +01:00
Thomas Hochstein 0470756d59 Merge branch 'thh-pickfromupstream' into next
* thh-pickfromupstream:
  Adapt some templates to upstream version.
  Fix handling of template files like upstream.
  Fix problem with recognition of ANNULLIERUNG.
  Add option to read from Maildir.
  Update version number and copyright.
  Drop commonly used accounts from mailpatterns.
  Update documentation from upstream.
2014-02-15 18:45:53 +01:00
Thomas Hochstein 075e6efe35 Adapt some templates to upstream version.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2014-02-15 17:47:44 +01:00
Thomas Hochstein 7a54626ef8 Fix handling of template files like upstream.
In ccfa122651
we replaced TMP by DIR to harmonize its usage.

Upstream went the other way round and changed
DIR to TMP. We switch now to be compatible to
upstream.

Picked from upstream.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2014-02-15 17:47:01 +01:00
Thomas Hochstein e670e40bb0 Fix problem with recognition of ANNULLIERUNG.
Vote nullification is now recognized for
every topic.

Change template accordingly.

Picked from upstream.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2014-02-15 17:44:29 +01:00
Thomas Hochstein 34809a2a81 Add option to read from Maildir.
Parse a mailbox by virtue of Mail::Box and
add "mailboxtype" to usevote.cfg.

Picked from upstream.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2014-02-15 17:41:54 +01:00
Thomas Hochstein 0618b624e9 Update version number and copyright.
Picked from upstream.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2014-02-15 17:38:54 +01:00
Thomas Hochstein 638b24050f Drop commonly used accounts from mailpatterns.
"news" as well as "usenet" are not only used
as role accounts, but also for normal use.

Picked from upstream.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2014-02-15 17:37:08 +01:00
Thomas Hochstein 305f8f61e9 Update documentation from upstream.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2014-02-15 17:35:43 +01:00
Thomas Hochstein 6422cdc893 Merge branch 'thh-strictbdsg' into next
* thh-strictbdsg:
  Enforce strict response for data protection clause.
2014-02-15 17:30:08 +01:00
Thomas Hochstein d0fda3342c Merge branch 'thh-checkvotename' into next
* thh-checkvotename:
  Display current voting identifier in menu.
  Correctly find $votename.
  Add forgotten template.
  Fix regular expression.
  Check correct voting in ballot.
2014-02-15 17:30:05 +01:00
Thomas Hochstein e651da8b3f Enforce strict response for data protection clause.
The - legally binding - data protection clause demands
an answer of "JA" to show voter agreement for vote
processing. Hence UseVote should only accept "JA"
(in upper or lower case), but not "DAFUER" or some
other synonyms.

* Add bdsg_confirm (regexp) to usevote.cfg
* Change check in uvvote.pl accordingly

Signed-off-by: Thomas Hochstein <thh@inter.net>
2014-02-15 17:24:44 +01:00
Thomas Hochstein 95135a1102 Display current voting identifier in menu.
Add a header line with the identifier (name)
of the currently processed voting to the menu
display by UVmenu so one can check whether
the ballot really belongs to the current voting
even when checking more than one voting in a
batch.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2014-02-15 17:07:48 +01:00
Thomas Hochstein f9b53c6356 Merge branch 'thh-result-template' into next
* thh-result-template:
  Change quorum (60 -> 50 votes) in templates.
  Adapt other result templates to result-multi.
  Change quorum: 50 "JA" votes are now enough.
2014-02-15 16:24:07 +01:00
Thomas Hochstein 5b8997543c Change quorum (60 -> 50 votes) in templates.
Templates result-multi and result-single have
to be updated, too.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2012-09-19 22:10:10 +02:00
Thomas Hochstein c6943e68ec Adapt other result templates to result-multi.
Change display of valid votes to whole sentence.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2012-09-19 22:09:49 +02:00
Thomas Hochstein a374bef4c7 Correctly find $votename.
If the ballot is not quoted, the current
regular expression will match $nametext
(minus its first word) as second line
of $votename.

Change regular expression to match only
certain common quote characters at beginning
of second line. (Perhaps it would be even
better to stop matching on empty lines ...)

Check for erroneus match on $nametext as a
safety measure.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2012-01-22 13:46:33 +01:00
Thomas Hochstein 1ca99f7368 Add forgotten template.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2012-01-21 15:52:14 +01:00
Thomas Hochstein f908d8a11a Fix regular expression.
Support votenames longer than one line
(in fact, support votenames up to two lines long).

Signed-off-by: Thomas Hochstein <thh@inter.net>
2012-01-21 15:51:54 +01:00
Thomas Hochstein b9f5201405 Check correct voting in ballot.
It's possible that ballots get mixed up when
a voter is participating in more than one
voting and sending the ballots manually (by
copying and pasting them into his mail client).

UseVote could - and should! - check that the
ballot belongs to the current voting by comparing
the ballot introduction ("WAHLSCHEIN fuer ...")
with the votename and throw an error if they
don't match.

* Add ballotintro (default: WAHLSCHEIN fuer) and
  tpl_wrong_voting (default: wrong-voting) to
  usevote.cfg
* Add messages to messages.cfg
* Modify ballot and ballot-personal templates
  accordingly
* Add check to uvvote.pl
* Add error handling to UVmenu.pm
* Change UVmenu::menu call in uvcfv.pl due
  to new parameter ($voting)

Signed-off-by: Thomas Hochstein <thh@inter.net>
2012-01-21 15:51:34 +01:00
Thomas Hochstein 8ab6f4b0df Change quorum: 50 "JA" votes are now enough.
See <Umsetzung-regeln-mindeststimmen-07.01.2012@dana.de>.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2012-01-21 09:41:30 +01:00
Thomas Hochstein fb9d3eb071 Complete move to thh.votetaker.de
Fix mailcc in usevote.tpl.cfg

Signed-off-by: Thomas Hochstein <thh@inter.net>
2012-01-21 09:21:33 +01:00
Thomas Hochstein 2e9b881e81 Merge branch 'pu/fixdupnovote'
* pu/fixdupnovote:
  Fix duplicate use of VOTE_NO_VOTES.
2012-01-09 02:57:30 +01:00
Thomas Hochstein 691f834832 Fix duplicate use of VOTE_NO_VOTES.
VOTE_NO_VOTES is defined (and used) twice in
messages.cfg and uvvote.pl - once for "no mails
to process" ("Keine Stimmen zu verarbeiten") and
once for "you didn't vote in your ballot"
("Keine Stimmen abgegeben").

Change the first use to VOTE_NO_VOTEMAILS.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2012-01-09 02:52:50 +01:00
Thomas Hochstein b4bfab9c0d Add whitespace to result templates.
Paragraphs should be separated by an
empty line.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2011-11-14 00:18:37 +01:00
Thomas Hochstein 101511c255 Move from gvv.th-h.de to thh.votetaker.de
Signed-off-by: Thomas Hochstein <thh@inter.net>
2011-11-12 16:51:13 +01:00
Thomas Hochstein 69291ddcaa Add executive bits to scripts.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2011-11-12 16:49:11 +01:00
Thomas Hochstein a0c008eed7 Fix envelope adresses in config template.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2011-11-12 16:48:26 +01:00
Thomas Hochstein a908bf98dc Add missing options to usevote.tpl.cfg
Signed-off-by: Thomas Hochstein <thh@inter.net>
2011-09-16 22:34:06 +02:00
Thomas Hochstein b1f71b6a18 Change placeholders in usevote.tpl.cfg
Signed-off-by: Thomas Hochstein <thh@inter.net>
2011-09-16 22:31:31 +02:00