From aa69cad300650edeb51f7fe64cbcc2006c3ce27f Mon Sep 17 00:00:00 2001 From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de> Date: Tue, 22 Oct 2024 12:16:23 +0000 Subject: [PATCH] use Request::int() for clipboard_id, fixes #4715 Closes #4715 Merge request studip/studip!3535 --- app/controllers/resources/messages.php | 2 +- app/controllers/resources/print.php | 2 +- app/controllers/resources/room_request.php | 2 +- app/controllers/room_management/planning.php | 6 +++--- lib/classes/sidebar/ClipboardWidget.php | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/controllers/resources/messages.php b/app/controllers/resources/messages.php index ae202e58c60..da3ca87f7aa 100644 --- a/app/controllers/resources/messages.php +++ b/app/controllers/resources/messages.php @@ -68,7 +68,7 @@ class Resources_MessagesController extends AuthenticatedController $this->room_selection = Request::get('room_selection'); $this->room_ids = Request::getArray('room_ids'); $this->selected_rooms = Room::findMany($this->room_ids); - $this->clipboard_id = Request::get('clipboard_id'); + $this->clipboard_id = Request::int('clipboard_id'); //First validation: diff --git a/app/controllers/resources/print.php b/app/controllers/resources/print.php index 8674fae63bf..811893564b4 100644 --- a/app/controllers/resources/print.php +++ b/app/controllers/resources/print.php @@ -132,7 +132,7 @@ class Resources_PrintController extends AuthenticatedController //clipboard, the selected date and the selected schedule type. //Furthermore a date and the type of schedule has been selected. // Also check for booking types to export. - $this->selected_clipboard_id = Request::get('clipboard_id'); + $this->selected_clipboard_id = Request::int('clipboard_id'); $this->schedule_type = Request::get('schedule_type'); $this->selected_date_string = Request::get('date'); $this->selected_booking_types = Request::intArray('bookingtypes') ?: diff --git a/app/controllers/resources/room_request.php b/app/controllers/resources/room_request.php index 8cc87023e4d..247de5c0f97 100644 --- a/app/controllers/resources/room_request.php +++ b/app/controllers/resources/room_request.php @@ -1302,7 +1302,7 @@ class Resources_RoomRequestController extends AuthenticatedController $this->clipboards = Clipboard::getClipboardsForUser($this->current_user->id, ['Room']); - $this->selected_clipboard_id = Request::get('selected_clipboard_id'); + $this->selected_clipboard_id = Request::int('selected_clipboard_id'); if (!$this->selected_clipboard_id) { if (count($this->clipboards) > 0) { $this->selected_clipboard_id = $this->clipboards[0]->id; diff --git a/app/controllers/room_management/planning.php b/app/controllers/room_management/planning.php index a63e4ab19f0..70fd566920d 100644 --- a/app/controllers/room_management/planning.php +++ b/app/controllers/room_management/planning.php @@ -30,7 +30,7 @@ class RoomManagement_PlanningController extends AuthenticatedController if (Navigation::hasItem('/resources/planning/index')) { Navigation::activateItem('/resources/planning/index'); } - $selected_clipboard_id = Request::get('clipboard_id', $selected_clipboard_id); + $selected_clipboard_id = Request::int('clipboard_id', $selected_clipboard_id); $this->no_clipboard = false; $this->no_rooms = false; @@ -271,7 +271,7 @@ class RoomManagement_PlanningController extends AuthenticatedController Navigation::activateItem('/resources/planning/semestergroup_plan'); } - $selected_clipboard_id = Request::get('clipboard_id', $selected_clipboard_id); + $selected_clipboard_id = Request::int('clipboard_id', $selected_clipboard_id); $this->no_clipboard = false; $this->no_rooms = false; @@ -1066,7 +1066,7 @@ class RoomManagement_PlanningController extends AuthenticatedController Navigation::activateItem('/resources/planning/booking_comments'); } - $selected_clipboard_id = Request::get('clipboard_id', $selected_clipboard_id); + $selected_clipboard_id = Request::int('clipboard_id', $selected_clipboard_id); $this->standalone = false; if ($selected_clipboard_id) { diff --git a/lib/classes/sidebar/ClipboardWidget.php b/lib/classes/sidebar/ClipboardWidget.php index abc0d6ca16a..1209c952c88 100644 --- a/lib/classes/sidebar/ClipboardWidget.php +++ b/lib/classes/sidebar/ClipboardWidget.php @@ -84,7 +84,7 @@ class ClipboardWidget extends SidebarWidget if (Request::submitted('clipboard_update_session_special_action')) { CSRFProtection::verifyUnsafeRequest(); - $_SESSION['selected_clipboard_id'] = Request::get('selected_clipboard_id'); + $_SESSION['selected_clipboard_id'] = Request::int('selected_clipboard_id'); } } -- GitLab