thh/usevote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity

Merge branch 'thh-strictbdsg' into next

Browse source 
* thh-strictbdsg:
  Enforce strict response for data protection clause.
This commit is contained in:
Thomas Hochstein 2014-02-15 17:30:08 +01:00
commit 6422cdc893
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
usevote.cfg
View file

@ -271,6 +271,10 @@ enth_stimme = (E|E\s*N\s*T\s*H\s*A\s*L\s*T\s*U\s*N\s*G)
# Achtung, sollte auch in den Templates im Bestaetigungstext angepasst werden # Achtung, sollte auch in den Templates im Bestaetigungstext angepasst werden
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 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
# RegExp fuer Bestaetigung der Datenschutzklause (case-insensitive)
# Standardmaessig wird nur JA erkannt
bdsg_confirm = JA
# Template files (these files are in the template directory defined above) # Template files (these files are in the template directory defined above)
tpl_mailheader = "mailheader" # generally used mail header tpl_mailheader = "mailheader" # generally used mail header
tpl_bouncelist = "bouncelist" # used by uvbounce.pl tpl_bouncelist = "bouncelist" # used by uvbounce.pl

4
usevote.global.cfg
View file

@ -143,6 +143,10 @@ enth_stimme = (E|E\s*N\s*T\s*H\s*A\s*L\s*T\s*U\s*N\s*G)
# Achtung, sollte auch in den Templates im Bestaetigungstext angepasst werden # Achtung, sollte auch in den Templates im Bestaetigungstext angepasst werden
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 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
# RegExp fuer Bestaetigung der Datenschutzklause (case-insensitive)
# Standardmaessig wird nur JA erkannt
bdsg_confirm = JA
# Template files (these files are in the template directory defined above) # Template files (these files are in the template directory defined above)
tpl_mailheader = "mailheader" # generally used mail header tpl_mailheader = "mailheader" # generally used mail header
tpl_bouncelist = "bouncelist" # used by uvbounce.pl tpl_bouncelist = "bouncelist" # used by uvbounce.pl

2
uvvote.pl
View file

@ -329,7 +329,7 @@ sub process_vote {
# Should read like this: #a [ STIMME ] Text # Should read like this: #a [ STIMME ] Text
# (Text is configurable in usevote.cfg) # (Text is configurable in usevote.cfg)
unless ($$body =~ /$bdsg_regexp/s && unless ($$body =~ /$bdsg_regexp/s &&
$$body =~ /#a\W*?\[\W*?$config{ja_stimme}\W*?\]\W*?$bdsg2_regexp/is) { $$body =~ /#a\W*?\[\W*?$config{bdsg_confirm}\W*?\]\W*?$bdsg2_regexp/is) {
push (@errors, 'InvalidBDSG'); push (@errors, 'InvalidBDSG');
} }