Skip to content
Snippets Groups Projects
Commit 373b28b6 authored by André Noack's avatar André Noack
Browse files

Resolve #5008 "PHPLib - Öffentliche Belegungspläne gehen nicht"

Closes #5008

Merge request studip/studip!3799
parent 1b7714d2
No related branches found
No related tags found
No related merge requests found
...@@ -22,11 +22,13 @@ ...@@ -22,11 +22,13 @@
*/ */
class Resources_RoomPlanningController extends AuthenticatedController class Resources_RoomPlanningController extends AuthenticatedController
{ {
protected $allow_nobody = true;
public function before_filter(&$action, &$args) public function before_filter(&$action, &$args)
{ {
$anonymous_actions = ['booking_plan', 'anonymous_booking_plan_data']; $anonymous_actions = ['booking_plan', 'anonymous_booking_plan_data'];
if (in_array($action, $anonymous_actions)) { if (!in_array($action, $anonymous_actions) && $GLOBALS['user']->id === 'nobody') {
$this->allow_nobody = true; throw new AccessDeniedException();
} }
parent::before_filter($action, $args); parent::before_filter($action, $args);
} }
......
...@@ -26,15 +26,13 @@ ...@@ -26,15 +26,13 @@
*/ */
class RoomManagement_OverviewController extends AuthenticatedController class RoomManagement_OverviewController extends AuthenticatedController
{ {
protected $allow_nobody = true;
public function before_filter(&$action, &$args) public function before_filter(&$action, &$args)
{ {
if ($action === 'public_booking_plans') { if ($action !== 'public_booking_plans' && $GLOBALS['user']->id === 'nobody') {
if (Config::get()->RESOURCES_SHOW_PUBLIC_ROOM_PLANS) {
$this->allow_nobody = true;
} else {
throw new AccessDeniedException(); throw new AccessDeniedException();
} }
}
parent::before_filter($action, $args); parent::before_filter($action, $args);
$this->user = User::findCurrent(); $this->user = User::findCurrent();
...@@ -434,6 +432,9 @@ class RoomManagement_OverviewController extends AuthenticatedController ...@@ -434,6 +432,9 @@ class RoomManagement_OverviewController extends AuthenticatedController
*/ */
public function public_booking_plans_action() public function public_booking_plans_action()
{ {
if (!Config::get()->RESOURCES_SHOW_PUBLIC_ROOM_PLANS) {
throw new AccessDeniedException();
}
if (Navigation::hasItem('/resources/overview/public_booking_plans')) { if (Navigation::hasItem('/resources/overview/public_booking_plans')) {
Navigation::activateItem('/resources/overview/public_booking_plans'); Navigation::activateItem('/resources/overview/public_booking_plans');
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment