Use symfony session

4 files changed, 38 insertions, 20 deletions

diff --git a/includes/pages/admin_shifts.php b/includes/pages/admin_shifts.php
index 04d88a4f..c77bd46d 100644
--- a/includes/pages/admin_shifts.php
+++ b/includes/pages/admin_shifts.php
@@ -19,6 +19,7 @@ function admin_shifts()
 {
     $valid = true;
     $request = request();
+    $session = session();
     $start = parse_date('Y-m-d H:i', date('Y-m-d') . ' 00:00');
     $end = $start;
     $mode = 'single';
@@ -270,8 +271,8 @@ function admin_shifts()
             }
 
             // Fürs Anlegen zwischenspeichern:
-            $_SESSION['admin_shifts_shifts'] = $shifts;
-            $_SESSION['admin_shifts_types'] = $needed_angel_types;
+            $session->set('admin_shifts_shifts', $shifts);
+            $session->set('admin_shifts_types', $needed_angel_types);
 
             $hidden_types = '';
             foreach ($needed_angel_types as $type_id => $count) {
@@ -301,16 +302,14 @@ function admin_shifts()
         }
     } elseif ($request->has('submit')) {
         if (
-            !isset($_SESSION['admin_shifts_shifts'])
-            || !isset($_SESSION['admin_shifts_types'])
-            || !is_array($_SESSION['admin_shifts_shifts'])
-            || !is_array($_SESSION['admin_shifts_types'])
+            !is_array($session->get('admin_shifts_shifts'))
+            || !is_array($session->get('admin_shifts_types'))
         ) {
             redirect(page_link_to('admin_shifts'));
         }
 
         $needed_angel_types_info = [];
-        foreach ($_SESSION['admin_shifts_shifts'] as $shift) {
+        foreach ($session->get('admin_shifts_shifts', []) as $shift) {
             $shift['URL'] = null;
             $shift['PSID'] = null;
             $shift_id = Shift_create($shift);
@@ -322,7 +321,7 @@ function admin_shifts()
                 . ' to ' . date('Y-m-d H:i', $shift['end'])
             );
 
-            foreach ($_SESSION['admin_shifts_types'] as $type_id => $count) {
+            foreach ($session->get('admin_shifts_types', []) as $type_id => $count) {
                 $angel_type_source = DB::selectOne('
                       SELECT *
                       FROM `AngelTypes`
@@ -348,8 +347,8 @@ function admin_shifts()
         success('Schichten angelegt.');
         redirect(page_link_to('admin_shifts'));
     } else {
-        unset($_SESSION['admin_shifts_shifts']);
-        unset($_SESSION['admin_shifts_types']);
+        $session->remove('admin_shifts_shifts');
+        $session->remove('admin_shifts_types');
     }
 
     $rid = null;
diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php
index 4a77b40c..9179c6c4 100644
--- a/includes/pages/guest_login.php
+++ b/includes/pages/guest_login.php
@@ -39,6 +39,7 @@ function guest_register()
     $min_password_length = config('min_password_length');
     $event_config = EventConfig();
     $request = request();
+    $session = session();
 
     $msg = '';
     $nick = '';
@@ -226,7 +227,7 @@ function guest_register()
                     $password_hash,
                     $comment,
                     $hometown,
-                    $_SESSION['locale'],
+                    $session->get('locale'),
                     $planned_arrival_date,
                 ]
             );
@@ -377,25 +378,36 @@ function guest_register()
     ]);
 }
 
+/**
+ * @return string
+ */
 function entry_required()
 {
     return '<span class="text-info glyphicon glyphicon-warning-sign"></span>';
 }
 
+/**
+ * @return bool
+ */
 function guest_logout()
 {
-    session_destroy();
+    session()->invalidate();
     redirect(page_link_to('start'));
     return true;
 }
 
+/**
+ * @return string
+ */
 function guest_login()
 {
     $nick = '';
     $request = request();
-    unset($_SESSION['uid']);
+    $session = session();
     $valid = true;
 
+    $session->remove('uid');
+
     if ($request->has('submit')) {
         if ($request->has('nick') && strlen(User_validate_Nick($request->input('nick'))) > 0) {
             $nick = User_validate_Nick($request->input('nick'));
@@ -420,8 +432,8 @@ function guest_login()
         }
 
         if ($valid && !empty($login_user)) {
-            $_SESSION['uid'] = $login_user['UID'];
-            $_SESSION['locale'] = $login_user['Sprache'];
+            $session->set('uid', $login_user['UID']);
+            $session->set('locale', $login_user['Sprache']);
 
             redirect(page_link_to('news'));
         }
@@ -477,6 +489,9 @@ function guest_login()
     ]);
 }
 
+/**
+ * @return string
+ */
 function get_register_hint()
 {
     global $privileges;
diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php
index 03621a45..0ba8bbcb 100644
--- a/includes/pages/user_settings.php
+++ b/includes/pages/user_settings.php
@@ -164,6 +164,7 @@ function user_settings_locale($user_source, $locales)
 {
     $valid = true;
     $request = request();
+    $session = session();
 
     if ($request->has('language') && isset($locales[$request->input('language')])) {
         $user_source['Sprache'] = $request->input('language');
@@ -182,7 +183,7 @@ function user_settings_locale($user_source, $locales)
                 $user_source['UID'],
             ]
         );
-        $_SESSION['locale'] = $user_source['Sprache'];
+        $session->set('locale', $user_source['Sprache']);
 
         success('Language changed.');
         redirect(page_link_to('user_settings'));
diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index db0bb193..30abbde6 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -167,20 +167,23 @@ function view_user_shifts()
 {
     global $user, $privileges, $ical_shifts;
 
+    $session = session();
     $ical_shifts = [];
     $days = load_days();
     $rooms = load_rooms();
     $types = load_types();
 
-    if (!isset($_SESSION['ShiftsFilter'])) {
+    if (!$session->has('ShiftsFilter')) {
         $room_ids = [
             $rooms[0]['id']
         ];
         $type_ids = array_map('get_ids_from_array', $types);
-        $_SESSION['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);
     }
-    update_ShiftsFilter($_SESSION['ShiftsFilter'], in_array('user_shifts_admin', $privileges), $days);
-    $shiftsFilter = $_SESSION['ShiftsFilter'];
+
+    $shiftsFilter = $session->get('ShiftsFilter');
+    update_ShiftsFilter($shiftsFilter, in_array('user_shifts_admin', $privileges), $days);
 
     $shiftCalendarRenderer = shiftCalendarRendererByShiftFilter($shiftsFilter);