Merge pull request #344 from MyIgel/master

Prepared routing, added symfony http Closes #336 and closes #337

1 files changed, 6 insertions, 6 deletions

diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php
index 81f8f505..836bd566 100644
--- a/includes/pages/user_myshifts.php
+++ b/includes/pages/user_myshifts.php
@@ -37,16 +37,16 @@ function user_myshifts()
         if ($request->input('reset') == 'ack') {
             User_reset_api_key($user);
             success(_('Key changed.'));
-            redirect(page_link_to('users') . '&action=view&user_id=' . $shifts_user['UID']);
+            redirect(page_link_to('users', ['action' => 'view', 'user_id' => $shifts_user['UID']]));
         }
         return page_with_title(_('Reset API key'), [
             error(
                 _('If you reset the key, the url to your iCal- and JSON-export and your atom feed changes! You have to update it in every application using one of these exports.'),
                 true
             ),
-            button(page_link_to('user_myshifts') . '&reset=ack', _('Continue'), 'btn-danger')
+            button(page_link_to('user_myshifts', ['reset' => 'ack']), _('Continue'), 'btn-danger')
         ]);
-    } elseif ($request->has('edit') && preg_match('/^\d*$/', $request->input('edit'))) {
+    } elseif ($request->has('edit') && preg_match('/^\d+$/', $request->input('edit'))) {
         $user_id = $request->input('edit');
         $shift = DB::selectOne('
                 SELECT
@@ -106,7 +106,7 @@ function user_myshifts()
                         . '. Freeloaded: ' . ($freeloaded ? 'YES Comment: ' . $freeload_comment : 'NO')
                     );
                     success(_('Shift saved.'));
-                    redirect(page_link_to('users') . '&action=view&user_id=' . $shifts_user['UID']);
+                    redirect(page_link_to('users', ['action' => 'view', 'user_id' => $shifts_user['UID']]));
                 }
             }
 
@@ -124,7 +124,7 @@ function user_myshifts()
         } else {
             redirect(page_link_to('user_myshifts'));
         }
-    } elseif ($request->has('cancel') && preg_match('/^\d*$/', $request->input('cancel'))) {
+    } elseif ($request->has('cancel') && preg_match('/^\d+$/', $request->input('cancel'))) {
         $user_id = $request->input('cancel');
         $shift = DB::selectOne('
                 SELECT *
@@ -164,6 +164,6 @@ function user_myshifts()
         }
     }
 
-    redirect(page_link_to('users') . '&action=view&user_id=' . $shifts_user['UID']);
+    redirect(page_link_to('users', ['action' => 'view', 'user_id' => $shifts_user['UID']]));
     return '';
 }