diff options
Diffstat (limited to 'includes')
-rw-r--r-- | includes/controller/api.php | 2 | ||||
-rw-r--r-- | includes/controller/user_angeltypes_controller.php | 10 | ||||
-rw-r--r-- | includes/helper/email_helper.php | 2 | ||||
-rw-r--r-- | includes/model/UserAngelTypes_model.php | 1 | ||||
-rw-r--r-- | includes/model/User_model.php | 2 | ||||
-rw-r--r-- | includes/pages/admin_user.php | 4 | ||||
-rw-r--r-- | includes/pages/guest_login.php | 53 | ||||
-rw-r--r-- | includes/pages/user_settings.php | 25 |
8 files changed, 69 insertions, 30 deletions
diff --git a/includes/controller/api.php b/includes/controller/api.php index 4403b984..9ecd3a2f 100644 --- a/includes/controller/api.php +++ b/includes/controller/api.php @@ -63,7 +63,7 @@ getUser id (integer) - User ID Return Example: [{"UID":"1"},{"UID":"23"},{"UID":"42"}] - {"UID":"1","Nick":"admin","Name":"Gates","Vorname":"Bill","Telefon":"","DECT":"","Handy":"","email":"","ICQ":"","jabber":"","Avatar":"115"} + {"UID":"1","Nick":"admin","Name":"Gates","Vorname":"Bill","Telefon":"","DECT":"","Handy":"","email":"","jabber":"","Avatar":"115"} getShift Description: diff --git a/includes/controller/user_angeltypes_controller.php b/includes/controller/user_angeltypes_controller.php index e4c7676f..049d6211 100644 --- a/includes/controller/user_angeltypes_controller.php +++ b/includes/controller/user_angeltypes_controller.php @@ -5,14 +5,18 @@ */ function user_angeltypes_unconfirmed_hint() { global $user; + $unconfirmed_user_angeltypes = User_unconfirmed_AngelTypes($user); if ($unconfirmed_user_angeltypes === false) engelsystem_error("Unable to load user angeltypes."); if (count($unconfirmed_user_angeltypes) == 0) return ''; - if ($_REQUEST['p'] == 'angeltypes' && $_REQUEST['action'] == 'view' && $_REQUEST['angeltype_id'] == $unconfirmed_user_angeltypes[0]['angeltype_id']) - return ''; - return error(sprintf(ngettext("There is %d unconfirmed angeltype.", "There are %d unconfirmed angeltypes.", count($unconfirmed_user_angeltypes)), count($unconfirmed_user_angeltypes)) . " " . sprintf(_("The first wants to join %s."), '<a href="' . page_link_to('angeltypes') . '&action=view&angeltype_id=' . $unconfirmed_user_angeltypes[0]['angeltype_id'] . '">' . $unconfirmed_user_angeltypes[0]['name'] . '</a>')); + + $unconfirmed_links = []; + foreach ($unconfirmed_user_angeltypes as $user_angeltype) + $unconfirmed_links[] = '<a href="' . page_link_to('angeltypes') . '&action=view&angeltype_id=' . $user_angeltype['angeltype_id'] . '">' . $user_angeltype['name'] . '</a>'; + + return error(sprintf(ngettext("There is %d unconfirmed angeltype.", "There are %d unconfirmed angeltypes.", count($unconfirmed_user_angeltypes)), count($unconfirmed_user_angeltypes)) . " " . _('Angel types which need approvals:') . ' ' . join(', ', $unconfirmed_links)); } /** diff --git a/includes/helper/email_helper.php b/includes/helper/email_helper.php index 98cfd0f3..b8ccabc4 100644 --- a/includes/helper/email_helper.php +++ b/includes/helper/email_helper.php @@ -13,4 +13,4 @@ function engelsystem_email($address, $title, $message) { return mail($address, $title, $message, "Content-Type: text/plain; charset=UTF-8\r\nFrom: Engelsystem <noreply@engelsystem.de>"); } -?>
\ No newline at end of file +?> diff --git a/includes/model/UserAngelTypes_model.php b/includes/model/UserAngelTypes_model.php index 4a25d25a..7dcaef7a 100644 --- a/includes/model/UserAngelTypes_model.php +++ b/includes/model/UserAngelTypes_model.php @@ -23,6 +23,7 @@ function User_unconfirmed_AngelTypes($user) { JOIN `AngelTypes` ON `UserAngelTypes`.`angeltype_id`=`AngelTypes`.`id` JOIN `UserAngelTypes` as `UnconfirmedMembers` ON `UserAngelTypes`.`angeltype_id`=`UnconfirmedMembers`.`angeltype_id` WHERE `UserAngelTypes`.`user_id`=" . sql_escape($user['UID']) . " + AND `UserAngelTypes`.`coordinator`=TRUE AND `AngelTypes`.`restricted`=TRUE AND `UnconfirmedMembers`.`confirm_user_id` IS NULL"); } diff --git a/includes/model/User_model.php b/includes/model/User_model.php index 45ed2700..2d2b1afb 100644 --- a/includes/model/User_model.php +++ b/includes/model/User_model.php @@ -132,7 +132,7 @@ function User($id) { * @param $id UID */ function mUser_Limit($id) { - $user_source = sql_select("SELECT `UID`, `Nick`, `Name`, `Vorname`, `Telefon`, `DECT`, `Handy`, `email`, `ICQ`, `jabber`, `Avatar` FROM `User` WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); + $user_source = sql_select("SELECT `UID`, `Nick`, `Name`, `Vorname`, `Telefon`, `DECT`, `Handy`, `email`, `jabber`, `Avatar` FROM `User` WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); if ($user_source === false) return false; if (count($user_source) > 0) diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php index 26bf18b5..b2275b52 100644 --- a/includes/pages/admin_user.php +++ b/includes/pages/admin_user.php @@ -33,7 +33,7 @@ function admin_user() { $html .= " <tr><td>Handy</td><td>" . "<input type=\"text\" size=\"40\" name=\"eHandy\" value=\"" . $user_source['Handy'] . "\"></td></tr>\n"; $html .= " <tr><td>DECT</td><td>" . "<input type=\"text\" size=\"4\" name=\"eDECT\" value=\"" . $user_source['DECT'] . "\"></td></tr>\n"; $html .= " <tr><td>email</td><td>" . "<input type=\"text\" size=\"40\" name=\"eemail\" value=\"" . $user_source['email'] . "\"></td></tr>\n"; - $html .= " <tr><td>ICQ</td><td>" . "<input type=\"text\" size=\"40\" name=\"eICQ\" value=\"" . $user_source['ICQ'] . "\"></td></tr>\n"; + $html .= "<tr><td>".form_checkbox('email_shiftinfo', _("Please send me an email if my shifts change"), $user_source['email_shiftinfo']) . "</td></tr>\n"; $html .= " <tr><td>jabber</td><td>" . "<input type=\"text\" size=\"40\" name=\"ejabber\" value=\"" . $user_source['jabber'] . "\"></td></tr>\n"; $html .= " <tr><td>Size</td><td>" . html_select_key('size', 'eSize', $tshirt_sizes, $user_source['Size']) . "</td></tr>\n"; @@ -236,7 +236,7 @@ function admin_user() { `Alter` = '" . sql_escape($_POST["eAlter"]) . "', `DECT` = '" . sql_escape($_POST["eDECT"]) . "', `email` = '" . sql_escape($_POST["eemail"]) . "', - `ICQ` = '" . sql_escape($_POST["eICQ"]) . "', + `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 c2bdfe97..3d8b5381 100644 --- a/includes/pages/guest_login.php +++ b/includes/pages/guest_login.php @@ -25,7 +25,7 @@ function guest_register() { $dect = ""; $mobile = ""; $mail = ""; - $icq = ""; + $email_shiftinfo = false; $jabber = ""; $hometown = ""; $comment = ""; @@ -66,8 +66,9 @@ function guest_register() { $msg .= error(_("Please enter your e-mail."), true); } - if (isset($_REQUEST['icq'])) - $icq = strip_request_item('icq'); + 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)) { @@ -119,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) . "', `ICQ`='" . sql_escape($icq) . "', `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(); @@ -147,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()) )) )), @@ -168,37 +188,36 @@ 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) )) )), form_info(entry_required() . ' = ' . _("Entry required!")) )) )), - // form_text('icq', _("ICQ"), $icq), // form_textarea('comment', _("Did you help at former CCC events and which tasks have you performed then?"), $comment), form_submit('submit', _("Register")) )) 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) : '', |