summaryrefslogtreecommitdiff
path: root/includes/controller
diff options
context:
space:
mode:
authormsquare <msquare@notrademark.de>2017-12-10 15:02:37 +0100
committermsquare <msquare@notrademark.de>2017-12-10 15:02:37 +0100
commit4143680297808dd23fe03b121f28ad5183601b8b (patch)
tree75d8c819afd4590d0d792200a6d906c7957b63dc /includes/controller
parentef0dbe8a1bd80fb9bec0400e84550df02f138dbd (diff)
remove room number and visible flag, rename pentabarf to frab and introduce map/c3nav integration as well as markdown description for rooms
Diffstat (limited to 'includes/controller')
-rw-r--r--includes/controller/rooms_controller.php10
1 files changed, 3 insertions, 7 deletions
diff --git a/includes/controller/rooms_controller.php b/includes/controller/rooms_controller.php
index d6da9709..596cb6d7 100644
--- a/includes/controller/rooms_controller.php
+++ b/includes/controller/rooms_controller.php
@@ -21,10 +21,7 @@ function room_controller()
}
$request = request();
- $room = load_room(false);
- if ($room['show'] != 'Y' && !in_array('admin_rooms', $privileges)) {
- redirect(page_link_to());
- }
+ $room = load_room();
$all_shifts = Shifts_by_room($room);
$days = [];
@@ -104,16 +101,15 @@ function room_edit_link($room)
/**
* Loads room by request param room_id
*
- * @param bool $onlyVisible
* @return array
*/
-function load_room($onlyVisible = true)
+function load_room()
{
if (!test_request_int('room_id')) {
redirect(page_link_to());
}
- $room = Room(request()->input('room_id'), $onlyVisible);
+ $room = Room(request()->input('room_id'));
if ($room == null) {
redirect(page_link_to());
}