From 57a92dbdcd1ecd27bde621e9a51dbbd11ed82845 Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
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-54-g00ecf