iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prevent object serialization in session

This commit is contained in:
Igor Scheller 2018-08-07 02:38:41 +02:00
parent 79e9714c74
commit 864a086900
2 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
includes/model/ShiftsFilter.php
View File

@ -48,7 +48,7 @@ class ShiftsFilter
* @param int[] $rooms * @param int[] $rooms
* @param int[] $types * @param int[] $types
*/ */
public function __construct($user_shifts_admin, $rooms, $types) public function __construct($user_shifts_admin = false, $rooms = [], $types = [])
{ {
$this->rooms = $rooms; $this->rooms = $rooms;
$this->types = $types; $this->types = $types;
@ -62,6 +62,34 @@ class ShiftsFilter
} }
} }
/**
* @return array
*/
public function sessionExport()
{
return [
'userShiftsAdmin' => $this->userShiftsAdmin,
'filled' => $this->filled,
'rooms' => $this->rooms,
'types' => $this->types,
'startTime' => $this->startTime,
'endTime' => $this->endTime,
];
}
/**
* @param array $data
*/
public function sessionImport($data)
{
$this->userShiftsAdmin = $data['userShiftsAdmin'];
$this->filled = $data['filled'];
$this->rooms = $data['rooms'];
$this->types = $data['types'];
$this->startTime = $data['startTime'];
$this->endTime = $data['endTime'];
}
/** /**
* @return int unix timestamp * @return int unix timestamp
*/ */

9
includes/pages/user_shifts.php
View File

@ -177,18 +177,19 @@ function view_user_shifts()
$rooms = load_rooms(); $rooms = load_rooms();
$types = load_types(); $types = load_types();
if (!$session->has('ShiftsFilter')) { if (!$session->has('shifts-filter')) {
$room_ids = [ $room_ids = [
$rooms[0]['id'] $rooms[0]['id']
]; ];
$type_ids = array_map('get_ids_from_array', $types); $type_ids = array_map('get_ids_from_array', $types);
$shiftsFilter = new ShiftsFilter(in_array('user_shifts_admin', $privileges), $room_ids, $type_ids); $shiftsFilter = new ShiftsFilter(in_array('user_shifts_admin', $privileges), $room_ids, $type_ids);
$session->set('ShiftsFilter', $shiftsFilter); $session->set('shifts-filter', $shiftsFilter->sessionExport());
} }
/** @var ShiftsFilter $shiftsFilter */ $shiftsFilter = new ShiftsFilter();
$shiftsFilter = $session->get('ShiftsFilter'); $shiftsFilter->sessionImport($session->get('shifts-filter'));
update_ShiftsFilter($shiftsFilter, in_array('user_shifts_admin', $privileges), $days); update_ShiftsFilter($shiftsFilter, in_array('user_shifts_admin', $privileges), $days);
$session->set('shifts-filter', $shiftsFilter->sessionExport());
$shiftCalendarRenderer = shiftCalendarRendererByShiftFilter($shiftsFilter); $shiftCalendarRenderer = shiftCalendarRendererByShiftFilter($shiftsFilter);