diff options
author | msquare <msquare@notrademark.de> | 2017-07-19 20:52:31 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-19 20:52:31 +0200 |
commit | 0d772ec9082ef780ec67c239eba61e979143ad05 (patch) | |
tree | ba68d1f00a0c9fb434f24f03eaaf2b7a8a9ec4e2 /includes/controller/rooms_controller.php | |
parent | 20e0765f571ed60aa21c07502ee7efcbe9995a6e (diff) | |
parent | 04217834fa4e6f94fec0836a80ea5526b8ebc9bc (diff) |
Merge pull request #326 from MyIgel/master
Reapplied missing commits
Diffstat (limited to 'includes/controller/rooms_controller.php')
-rw-r--r-- | includes/controller/rooms_controller.php | 11 |
1 files changed, 8 insertions, 3 deletions
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()); } |