From a2b9edc6a301745a299c8c29cdbbbc795961c9f0 Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Mon, 17 Jul 2017 22:17:58 +0200 Subject: Reapplied "Merge pull request #314 from Scriptkiddi/master" --- includes/helper/email_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'includes') diff --git a/includes/helper/email_helper.php b/includes/helper/email_helper.php index a2e25269..dad27b39 100644 --- a/includes/helper/email_helper.php +++ b/includes/helper/email_helper.php @@ -39,7 +39,7 @@ function engelsystem_email($address, $title, $message) $address, $title, $message, - "Content-Type: text/plain; charset=UTF-8\r\nFrom: Engelsystem " + sprintf("Content-Type: text/plain; charset=UTF-8\r\nFrom: Engelsystem <%s>", config('no_reply_email')) ); if ($result === false) { -- cgit v1.2.3-54-g00ecf From 317c91a22f736342c52ed643c94d510a100f7fdb Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Mon, 17 Jul 2017 23:08:15 +0200 Subject: Reapplied "Merge pull request #319 from jwacalex/gh_317_unable_to_edit_hidden_room_in_admin" --- includes/controller/rooms_controller.php | 11 ++++++++--- includes/model/Room_model.php | 6 +++--- includes/sys_menu.php | 14 ++++++++++++-- 3 files changed, 23 insertions(+), 8 deletions(-) (limited to 'includes') diff --git a/includes/controller/rooms_controller.php b/includes/controller/rooms_controller.php index 3f5ff387..3082a28d 100644 --- a/includes/controller/rooms_controller.php +++ b/includes/controller/rooms_controller.php @@ -19,7 +19,11 @@ function room_controller() redirect(page_link_to()); } - $room = load_room(); + $room = load_room(false); + if ($room['show'] != 'Y' && !in_array('admin_rooms', $privileges)) { + redirect(page_link_to()); + } + $all_shifts = Shifts_by_room($room); $days = []; foreach ($all_shifts as $shift) { @@ -99,15 +103,16 @@ function room_edit_link($room) /** * Loads room by request param room_id * + * @param bool $onlyVisible * @return array */ -function load_room() +function load_room($onlyVisible = true) { if (!test_request_int('room_id')) { redirect(page_link_to()); } - $room = Room($_REQUEST['room_id']); + $room = Room($_REQUEST['room_id'], $onlyVisible); if ($room == null) { redirect(page_link_to()); } diff --git a/includes/model/Room_model.php b/includes/model/Room_model.php index c8399bc4..17617b39 100644 --- a/includes/model/Room_model.php +++ b/includes/model/Room_model.php @@ -57,16 +57,16 @@ function Room_create($name, $from_frab, $public, $number = null) * Returns room by id. * * @param int $room_id RID - * @param bool $show_only + * @param bool $onlyVisible * @return array|false */ -function Room($room_id, $show_only = true) +function Room($room_id, $onlyVisible = true) { $room_source = DB::select(' SELECT * FROM `Room` WHERE `RID` = ? - ' . ($show_only ? 'AND `show` = \'Y\'' : ''), + ' . ($onlyVisible ? 'AND `show` = \'Y\'' : ''), [$room_id] ); diff --git a/includes/sys_menu.php b/includes/sys_menu.php index 0b7d6b37..f160441c 100644 --- a/includes/sys_menu.php +++ b/includes/sys_menu.php @@ -197,7 +197,8 @@ function make_room_navigation($menu) return $menu; } - $rooms = Rooms(); + // Get a list of all rooms + $rooms = Rooms(true); $room_menu = []; if (in_array('admin_rooms', $privileges)) { $room_menu[] = toolbar_item_link(page_link_to('admin_rooms'), 'list', _('Manage rooms')); @@ -206,7 +207,16 @@ function make_room_navigation($menu) $room_menu[] = toolbar_item_divider(); } foreach ($rooms as $room) { - $room_menu[] = toolbar_item_link(room_link($room), 'map-marker', $room['Name']); + if ( + $room['show'] == 'Y' // room is public + || ( + // room is not public, but user can admin_rooms + $room['show'] != 'Y' + && in_array('admin_rooms', $privileges) + ) + ) { + $room_menu[] = toolbar_item_link(room_link($room), 'map-marker', $room['Name']); + } } if (count($room_menu) > 0) { $menu[] = toolbar_dropdown('map-marker', _('Rooms'), $room_menu); -- cgit v1.2.3-54-g00ecf From cdf14f9d3f83b43bda6cb636c22546d315f3acdb Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Mon, 17 Jul 2017 23:43:47 +0200 Subject: Reapplied "Merge pull request #321 from raboof/wantsToDrive" --- includes/model/UserDriverLicenses_model.php | 4 ++-- includes/view/AngelTypes_view.php | 2 +- includes/view/UserDriverLicenses_view.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'includes') diff --git a/includes/model/UserDriverLicenses_model.php b/includes/model/UserDriverLicenses_model.php index 5ff4df35..525d2016 100644 --- a/includes/model/UserDriverLicenses_model.php +++ b/includes/model/UserDriverLicenses_model.php @@ -29,8 +29,8 @@ function UserDriverLicense_new() */ function UserDriverLicense_valid($user_driver_license) { - return $user_driver_license['has_car'] - || $user_driver_license['has_license_car'] + return + $user_driver_license['has_license_car'] || $user_driver_license['has_license_3_5t_transporter'] || $user_driver_license['has_license_7_5t_truck'] || $user_driver_license['has_license_12_5t_truck'] diff --git a/includes/view/AngelTypes_view.php b/includes/view/AngelTypes_view.php index bd258d3a..f74b0eb1 100644 --- a/includes/view/AngelTypes_view.php +++ b/includes/view/AngelTypes_view.php @@ -182,7 +182,7 @@ function AngelType_view_members($angeltype, $members, $admin_user_angeltypes, $a $member['Nick'] = User_Nick_render($member); if ($angeltype['requires_driver_license']) { - $member['wants_to_drive'] = glyph_bool($member['user_id']); + $member['wants_to_drive'] = glyph_bool($member['wants_to_drive']); $member['has_car'] = glyph_bool($member['has_car']); $member['has_license_car'] = glyph_bool($member['has_license_car']); $member['has_license_3_5t_transporter'] = glyph_bool($member['has_license_3_5t_transporter']); diff --git a/includes/view/UserDriverLicenses_view.php b/includes/view/UserDriverLicenses_view.php index dce08c29..5eacf456 100644 --- a/includes/view/UserDriverLicenses_view.php +++ b/includes/view/UserDriverLicenses_view.php @@ -17,12 +17,12 @@ function UserDriverLicense_edit_view($user_source, $wants_to_drive, $user_driver msg(), form([ form_info(_('Privacy'), _('Your driving license information is only visible for supporters and admins.')), - form_checkbox('wants_to_drive', _('I am willing to operate cars for the PL'), $wants_to_drive), + form_checkbox('wants_to_drive', _('I am willing to drive a car for the event'), $wants_to_drive), div('panel panel-default', [ div('panel-body', [ form_checkbox( 'has_car', - _('I have my own car with me and am willing to use it for the PL (You\'ll get reimbursed for fuel)'), + _('I have my own car with me and am willing to use it for the event (You\'ll get reimbursed for fuel)'), $user_driver_license['has_car'] ), heading(_('Driver license'), 3), -- cgit v1.2.3-54-g00ecf