From 4143680297808dd23fe03b121f28ad5183601b8b Mon Sep 17 00:00:00 2001 From: msquare Date: Sun, 10 Dec 2017 15:02:37 +0100 Subject: remove room number and visible flag, rename pentabarf to frab and introduce map/c3nav integration as well as markdown description for rooms --- includes/sys_menu.php | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'includes/sys_menu.php') diff --git a/includes/sys_menu.php b/includes/sys_menu.php index 385a6948..863808d2 100644 --- a/includes/sys_menu.php +++ b/includes/sys_menu.php @@ -186,7 +186,7 @@ function make_room_navigation($menu) } // Get a list of all rooms - $rooms = Rooms(true); + $rooms = Rooms(); $room_menu = []; if (in_array('admin_rooms', $privileges)) { $room_menu[] = toolbar_item_link(page_link_to('admin_rooms'), 'list', _('Manage rooms')); @@ -195,16 +195,7 @@ function make_room_navigation($menu) $room_menu[] = toolbar_item_divider(); } foreach ($rooms as $room) { - 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']); - } + $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.3.1