Commit graph

25 commits

Author SHA1 Message Date
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 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
Thomas Hochstein a0d69f7532 From upstream: Change tpl/result-multi.
Add newline after multi-line topic.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2010-08-21 22:54:44 +02:00
Thomas Hochstein 6d43059e4a From upstream: Change tpl/result-single.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2010-08-17 07:42:52 +02:00
Thomas Hochstein ccfa122651 Fix: Harmonize DIR/TMP in uvvote.pl.
There was a bug introduced in 4.0.9 by changing TMP to DIR
just in one place.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2010-08-17 07:37:21 +02:00
Thomas Hochstein 45110d89e2 tpl/ack-mail: Add directions for replying to vote address.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2010-08-17 00:23:12 +02:00
Thomas Hochstein c1d1eea6c2 tpl/ack-mail: Drop information about copy of CfV to be sent.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2010-08-17 00:23:07 +02:00
Thomas Hochstein f3ce003de7 tpl/ack-mail: Note that ANNULLIERUNG must be used at first vote.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2010-08-17 00:23:01 +02:00
Thomas Hochstein 0684acb79b tpl/ack-mail: Left align votetaker.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2010-08-17 00:22:56 +02:00
Thomas Hochstein 9854ee664c bdsgtext.cfg: Fix typo.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2010-08-17 00:22:48 +02:00
Thomas Hochstein b00b7d6de5 From upstream: missing fixes.
* UVrules.pm, usevote.rul: add H, h.
* messages.cfg: add COUNT_ERR_GROUPCOUNT.
* uvvote.pl: TMP/DIR, $msgid.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2010-08-16 23:40:38 +02:00
Thomas Hochstein ef29545875 From upstream: Update copyright.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2010-08-16 23:40:29 +02:00
Thomas Hochstein a384e31e54 Initial checkin of personal version.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2010-08-16 23:40:20 +02:00
Thomas Hochstein ac7e2c541a Initial checkin of upstream version 4.09.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2010-08-16 22:16:26 +02:00