summaryrefslogtreecommitdiff
path: root/includes/pages/user_settings.php
diff options
context:
space:
mode:
authormsquare <msquare@notrademark.de>2016-11-11 15:24:51 +0100
committermsquare <msquare@notrademark.de>2016-11-11 15:24:51 +0100
commitf5a5f234e41a23f56c1515eebc0824ce8cd115d1 (patch)
treeecb7f74ca64f4d50deebec9daf1cd7c71fbb4422 /includes/pages/user_settings.php
parent82b9436c508fd9739555240991abda1b2fd63bd4 (diff)
fixes #266: add checkbox allowing the users email to be used by humans like event-team
Diffstat (limited to 'includes/pages/user_settings.php')
-rw-r--r--includes/pages/user_settings.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php
index 22ead68b..b92f7bd3 100644
--- a/includes/pages/user_settings.php
+++ b/includes/pages/user_settings.php
@@ -18,6 +18,7 @@ function user_settings() {
$mobile = $user['Handy'];
$mail = $user['email'];
$email_shiftinfo = $user['email_shiftinfo'];
+ $email_by_human_allowed = $user['email_by_human_allowed'];
$jabber = $user['jabber'];
$hometown = $user['Hometown'];
$tshirt_size = $user['Size'];
@@ -39,8 +40,9 @@ function user_settings() {
$valid = false;
$msg .= error(_("Please enter your e-mail."), true);
}
-
+
$email_shiftinfo = isset($_REQUEST['email_shiftinfo']);
+ $email_by_human_allowed = isset($_REQUEST['email_by_human_allowed']);
if (isset($_REQUEST['jabber']) && strlen(strip_request_item('jabber')) > 0) {
$jabber = strip_request_item('jabber');
@@ -109,6 +111,7 @@ function user_settings() {
`Handy`='" . sql_escape($mobile) . "',
`email`='" . sql_escape($mail) . "',
`email_shiftinfo`=" . sql_bool($email_shiftinfo) . ",
+ `email_by_human_allowed`=" . sql_bool($email_by_human_allowed) . ",
`jabber`='" . sql_escape($jabber) . "',
`Size`='" . sql_escape($tshirt_size) . "',
`Hometown`='" . sql_escape($hometown) . "',
@@ -185,7 +188,8 @@ function user_settings() {
form_text('dect', _("DECT"), $dect),
form_text('mobile', _("Mobile"), $mobile),
form_text('mail', _("E-Mail") . ' ' . entry_required(), $mail),
- form_checkbox('email_shiftinfo', _("Please send me an email if my shifts change"), $email_shiftinfo),
+ form_checkbox('email_shiftinfo', _("The engelsystem is allowed to send me an email (e.g. when my shifts change)"), $email_shiftinfo),
+ form_checkbox('email_by_human_allowed', _("Humans are allowed to send me an email (e.g. for ticket vouchers)"), $email_by_human_allowed),
form_text('jabber', _("Jabber"), $jabber),
form_text('hometown', _("Hometown"), $hometown),
$enable_tshirt_size ? form_select('tshirt_size', _("Shirt size"), $tshirt_sizes, $tshirt_size) : '',