diff options
author | Felix Favre <gnomus@gnomus.de> | 2014-12-06 19:02:26 +0100 |
---|---|---|
committer | Felix Favre <gnomus@gnomus.de> | 2014-12-06 19:02:26 +0100 |
commit | 2f445eb90c6267a9f1055d1536838d9b3fe12f3b (patch) | |
tree | e954579afcbd6399fc8e17a4b5354f19e046e00f /includes/pages/user_settings.php | |
parent | 3973236f6e4cb76a20fca3b908afd526f293a850 (diff) | |
parent | 10d7fce163ff28da68b036bd4fae95040fd170a9 (diff) |
Merge branch 'master' of github.com:engelsystem/engelsystem
Diffstat (limited to 'includes/pages/user_settings.php')
-rw-r--r-- | includes/pages/user_settings.php | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php index 1e593652..af352a93 100644 --- a/includes/pages/user_settings.php +++ b/includes/pages/user_settings.php @@ -1,4 +1,5 @@ <?php + function settings_title() { return _("Settings"); } @@ -16,7 +17,7 @@ function user_settings() { $dect = $user['DECT']; $mobile = $user['Handy']; $mail = $user['email']; - $icq = $user['ICQ']; + $email_shiftinfo = $user['email_shiftinfo']; $jabber = $user['jabber']; $hometown = $user['Hometown']; $tshirt_size = $user['Size']; @@ -59,8 +60,8 @@ function user_settings() { $msg .= error(_("Please enter your e-mail."), true); } - if (isset($_REQUEST['icq'])) - $icq = strip_request_item('icq'); + $email_shiftinfo = isset($_REQUEST['email_shiftinfo']); + if (isset($_REQUEST['jabber']) && strlen(strip_request_item('jabber')) > 0) { $jabber = strip_request_item('jabber'); if (! check_email($jabber)) { @@ -97,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) . "', `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) . "', + `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(); @@ -178,7 +193,7 @@ 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_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) : '', |