From 57a92dbdcd1ecd27bde621e9a51dbbd11ed82845 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Sat, 6 Dec 2014 18:10:27 +0100 Subject: add opt-in bool for shiftinfo mails and remove icq from users --- includes/pages/user_settings.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'includes/pages/user_settings.php') diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php index 1e593652..d39793ee 100644 --- a/includes/pages/user_settings.php +++ b/includes/pages/user_settings.php @@ -16,7 +16,6 @@ function user_settings() { $dect = $user['DECT']; $mobile = $user['Handy']; $mail = $user['email']; - $icq = $user['ICQ']; $jabber = $user['jabber']; $hometown = $user['Hometown']; $tshirt_size = $user['Size']; @@ -59,8 +58,6 @@ function user_settings() { $msg .= error(_("Please enter your e-mail."), true); } - if (isset($_REQUEST['icq'])) - $icq = strip_request_item('icq'); if (isset($_REQUEST['jabber']) && strlen(strip_request_item('jabber')) > 0) { $jabber = strip_request_item('jabber'); if (! check_email($jabber)) { @@ -97,7 +94,7 @@ function user_settings() { $hometown = strip_request_item('hometown'); if ($ok) { - sql_query("UPDATE `User` SET `Nick`='" . sql_escape($nick) . "', `Vorname`='" . sql_escape($prename) . "', `Name`='" . sql_escape($lastname) . "', `Alter`='" . sql_escape($age) . "', `Telefon`='" . sql_escape($tel) . "', `DECT`='" . sql_escape($dect) . "', `Handy`='" . sql_escape($mobile) . "', `email`='" . sql_escape($mail) . "', `ICQ`='" . sql_escape($icq) . "', `jabber`='" . sql_escape($jabber) . "', `Size`='" . sql_escape($tshirt_size) . "', `Hometown`='" . sql_escape($hometown) . "' WHERE `UID`=" . sql_escape($user['UID'])); + sql_query("UPDATE `User` SET `Nick`='" . sql_escape($nick) . "', `Vorname`='" . sql_escape($prename) . "', `Name`='" . sql_escape($lastname) . "', `Alter`='" . sql_escape($age) . "', `Telefon`='" . sql_escape($tel) . "', `DECT`='" . sql_escape($dect) . "', `Handy`='" . sql_escape($mobile) . "', `email`='" . sql_escape($mail) . "', `jabber`='" . sql_escape($jabber) . "', `Size`='" . sql_escape($tshirt_size) . "', `Hometown`='" . sql_escape($hometown) . "' WHERE `UID`=" . sql_escape($user['UID'])); // Assign angel-types $user_angel_type_info = array(); @@ -178,7 +175,6 @@ function user_settings() { form_text('dect', _("DECT"), $dect), form_text('mobile', _("Mobile"), $mobile), form_text('mail', _("E-Mail") . "*", $mail), - form_text('icq', _("ICQ"), $icq), form_text('jabber', _("Jabber"), $jabber), form_text('hometown', _("Hometown"), $hometown), $enable_tshirt_size ? form_select('tshirt_size', _("Shirt size"), $tshirt_sizes, $tshirt_size) : '', -- cgit v1.2.3-70-g09d2 From 481e52cf77121e3230b16f6acf4ef675e8081671 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Sat, 6 Dec 2014 18:37:34 +0100 Subject: add email shiftinfo checkbox/flag --- includes/pages/admin_user.php | 2 ++ includes/pages/guest_login.php | 49 +++++++++++++++++++++++++++++----------- includes/pages/user_settings.php | 21 ++++++++++++++++- 3 files changed, 58 insertions(+), 14 deletions(-) (limited to 'includes/pages/user_settings.php') diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php index 09398f6f..b2275b52 100644 --- a/includes/pages/admin_user.php +++ b/includes/pages/admin_user.php @@ -33,6 +33,7 @@ function admin_user() { $html .= " Handy" . "\n"; $html .= " DECT" . "\n"; $html .= " email" . "\n"; + $html .= "".form_checkbox('email_shiftinfo', _("Please send me an email if my shifts change"), $user_source['email_shiftinfo']) . "\n"; $html .= " jabber" . "\n"; $html .= " Size" . html_select_key('size', 'eSize', $tshirt_sizes, $user_source['Size']) . "\n"; @@ -235,6 +236,7 @@ function admin_user() { `Alter` = '" . sql_escape($_POST["eAlter"]) . "', `DECT` = '" . sql_escape($_POST["eDECT"]) . "', `email` = '" . sql_escape($_POST["eemail"]) . "', + `email_shiftinfo` = " . sql_escape(isset($_REQUEST['email_shiftinfo']) ? 'TRUE' : 'FALSE') . ", `jabber` = '" . sql_escape($_POST["ejabber"]) . "', `Size` = '" . sql_escape($_POST["eSize"]) . "', `Gekommen`= '" . sql_escape($_POST["eGekommen"]) . "', diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php index b23f82e6..3d8b5381 100644 --- a/includes/pages/guest_login.php +++ b/includes/pages/guest_login.php @@ -25,6 +25,7 @@ function guest_register() { $dect = ""; $mobile = ""; $mail = ""; + $email_shiftinfo = false; $jabber = ""; $hometown = ""; $comment = ""; @@ -65,6 +66,9 @@ function guest_register() { $msg .= error(_("Please enter your e-mail."), true); } + if (isset($_REQUEST['email_shiftinfo'])) + $email_shiftinfo = true; + if (isset($_REQUEST['jabber']) && strlen(strip_request_item('jabber')) > 0) { $jabber = strip_request_item('jabber'); if (! check_email($jabber)) { @@ -116,7 +120,25 @@ function guest_register() { $comment = strip_request_item_nl('comment'); if ($ok) { - sql_query("INSERT INTO `User` SET `color`=" . sql_escape($default_theme) . ", `Nick`='" . sql_escape($nick) . "', `Vorname`='" . sql_escape($prename) . "', `Name`='" . sql_escape($lastname) . "', `Alter`='" . sql_escape($age) . "', `Telefon`='" . sql_escape($tel) . "', `DECT`='" . sql_escape($dect) . "', `Handy`='" . sql_escape($mobile) . "', `email`='" . sql_escape($mail) . "', `jabber`='" . sql_escape($jabber) . "', `Size`='" . sql_escape($tshirt_size) . "', `Passwort`='" . sql_escape($password_hash) . "', `kommentar`='" . sql_escape($comment) . "', `Hometown`='" . sql_escape($hometown) . "', `CreateDate`=NOW(), `Sprache`='" . sql_escape($_SESSION["locale"]) . "'"); + sql_query(" + INSERT INTO `User` SET + `color`=" . sql_escape($default_theme) . ", + `Nick`='" . sql_escape($nick) . "', + `Vorname`='" . sql_escape($prename) . "', + `Name`='" . sql_escape($lastname) . "', + `Alter`='" . sql_escape($age) . "', + `Telefon`='" . sql_escape($tel) . "', + `DECT`='" . sql_escape($dect) . "', + `Handy`='" . sql_escape($mobile) . "', + `email`='" . sql_escape($mail) . "', + `email_shiftinfo`=" . sql_escape($email_shiftinfo ? 'TRUE' : 'FALSE') . ", + `jabber`='" . sql_escape($jabber) . "', + `Size`='" . sql_escape($tshirt_size) . "', + `Passwort`='" . sql_escape($password_hash) . "', + `kommentar`='" . sql_escape($comment) . "', + `Hometown`='" . sql_escape($hometown) . "', + `CreateDate`=NOW(), + `Sprache`='" . sql_escape($_SESSION["locale"]) . "'"); // Assign user-group and set password $user_id = sql_id(); @@ -144,19 +166,20 @@ function guest_register() { div('row', array( div('col-md-6', array( div('row', array( - div('col-md-4', array( + div('col-sm-4', array( form_text('nick', _("Nick") . ' ' . entry_required(), $nick) )), - div('col-md-8', array( - form_text('mail', _("E-Mail") . ' ' . entry_required(), $mail) + div('col-sm-8', array( + form_text('mail', _("E-Mail") . ' ' . entry_required(), $mail), + form_checkbox('email_shiftinfo', _("Please send me an email if my shifts change"), $email_shiftinfo) )) )), $enable_tshirt_size ? form_select('tshirt_size', _("Shirt size") . ' ' . entry_required(), $tshirt_sizes, $tshirt_size) : '', div('row', array( - div('col-md-6', array( + div('col-sm-6', array( form_password('password', _("Password") . ' ' . entry_required()) )), - div('col-md-6', array( + div('col-sm-6', array( form_password('password2', _("Confirm password") . ' ' . entry_required()) )) )), @@ -165,30 +188,30 @@ function guest_register() { )), div('col-md-6', array( div('row', array( - div('col-md-4', array( + div('col-sm-4', array( form_text('dect', _("DECT"), $dect) )), - div('col-md-4', array( + div('col-sm-4', array( form_text('mobile', _("Mobile"), $mobile) )), - div('col-md-4', array( + div('col-sm-4', array( form_text('tel', _("Phone"), $tel) )) )), form_text('jabber', _("Jabber"), $jabber), div('row', array( - div('col-md-6', array( + div('col-sm-6', array( form_text('prename', _("First name"), $prename) )), - div('col-md-6', array( + div('col-sm-6', array( form_text('lastname', _("Last name"), $lastname) )) )), div('row', array( - div('col-md-3', array( + div('col-sm-3', array( form_text('age', _("Age"), $age) )), - div('col-md-9', array( + div('col-sm-9', array( form_text('hometown', _("Hometown"), $hometown) )) )), diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php index d39793ee..af352a93 100644 --- a/includes/pages/user_settings.php +++ b/includes/pages/user_settings.php @@ -1,4 +1,5 @@ 0) { $jabber = strip_request_item('jabber'); if (! check_email($jabber)) { @@ -94,7 +98,21 @@ function user_settings() { $hometown = strip_request_item('hometown'); if ($ok) { - sql_query("UPDATE `User` SET `Nick`='" . sql_escape($nick) . "', `Vorname`='" . sql_escape($prename) . "', `Name`='" . sql_escape($lastname) . "', `Alter`='" . sql_escape($age) . "', `Telefon`='" . sql_escape($tel) . "', `DECT`='" . sql_escape($dect) . "', `Handy`='" . sql_escape($mobile) . "', `email`='" . sql_escape($mail) . "', `jabber`='" . sql_escape($jabber) . "', `Size`='" . sql_escape($tshirt_size) . "', `Hometown`='" . sql_escape($hometown) . "' WHERE `UID`=" . sql_escape($user['UID'])); + sql_query(" + UPDATE `User` SET + `Nick`='" . sql_escape($nick) . "', + `Vorname`='" . sql_escape($prename) . "', + `Name`='" . sql_escape($lastname) . "', + `Alter`='" . sql_escape($age) . "', + `Telefon`='" . sql_escape($tel) . "', + `DECT`='" . sql_escape($dect) . "', + `Handy`='" . sql_escape($mobile) . "', + `email`='" . sql_escape($mail) . "', + `email_shiftinfo`=" . sql_escape($email_shiftinfo ? 'TRUE' : 'FALSE') . ", + `jabber`='" . sql_escape($jabber) . "', + `Size`='" . sql_escape($tshirt_size) . "', + `Hometown`='" . sql_escape($hometown) . "' + WHERE `UID`=" . sql_escape($user['UID'])); // Assign angel-types $user_angel_type_info = array(); @@ -175,6 +193,7 @@ function user_settings() { form_text('dect', _("DECT"), $dect), form_text('mobile', _("Mobile"), $mobile), form_text('mail', _("E-Mail") . "*", $mail), + form_checkbox('email_shiftinfo', _("Please send me an email if my shifts change"), $email_shiftinfo), form_text('jabber', _("Jabber"), $jabber), form_text('hometown', _("Hometown"), $hometown), $enable_tshirt_size ? form_select('tshirt_size', _("Shirt size"), $tshirt_sizes, $tshirt_size) : '', -- cgit v1.2.3-70-g09d2