From 96f1d9fd541d0c5ef78151f8c69a89c41684b67a Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Wed, 30 Aug 2017 14:59:27 +0200
Subject: Bugfixes

---
 includes/controller/shifts_controller.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'includes/controller/shifts_controller.php')

diff --git a/includes/controller/shifts_controller.php b/includes/controller/shifts_controller.php
index c359850f..70011821 100644
--- a/includes/controller/shifts_controller.php
+++ b/includes/controller/shifts_controller.php
@@ -8,10 +8,13 @@ use Engelsystem\ShiftSignupState;
  */
 function shift_link($shift)
 {
-    $link = page_link_to('shifts', ['action' => 'view']);
+    $parameters = ['action' => 'view'];
     if (isset($shift['SID'])) {
-        $link .= '&shift_id=' . $shift['SID'];
+        $parameters['shift_id'] = $shift['SID'];
     }
+
+    $link = page_link_to('shifts', $parameters);
+
     return $link;
 }
 
@@ -201,7 +204,7 @@ function shift_delete_controller()
     }
 
     // Schicht komplett löschen (nur für admins/user mit user_shifts_admin privileg)
-    if (!$request->has('delete_shift') || !preg_match('/^\d*$/', $request->input('delete_shift'))) {
+    if (!$request->has('delete_shift') || !preg_match('/^\d+$/', $request->input('delete_shift'))) {
         redirect(page_link_to('user_shifts'));
     }
     $shift_id = $request->input('delete_shift');
@@ -316,8 +319,6 @@ function shifts_controller()
 
 /**
  * Redirects the user to his next shift.
- *
- * @return false
  */
 function shift_next_controller()
 {
-- 
cgit v1.2.3-70-g09d2