#337: Added routing

7 files changed, 42 insertions, 29 deletions

diff --git a/includes/controller/angeltypes_controller.php b/includes/controller/angeltypes_controller.php
index 346a4d73..d60b6fc7 100644
--- a/includes/controller/angeltypes_controller.php
+++ b/includes/controller/angeltypes_controller.php
@@ -42,7 +42,7 @@ function angeltypes_controller()
  */
 function angeltype_link($angeltype_id)
 {
-    return page_link_to('angeltypes') . '&action=view&angeltype_id=' . $angeltype_id;
+    return page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype_id]);
 }
 
 /**
@@ -211,17 +211,21 @@ function angeltypes_list_controller()
 
     foreach ($angeltypes as &$angeltype) {
         $actions = [
-            button(page_link_to('angeltypes') . '&action=view&angeltype_id=' . $angeltype['id'], _('view'), 'btn-xs')
+            button(
+                page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']]),
+                _('view'),
+                'btn-xs'
+            )
         ];
 
         if (in_array('admin_angel_types', $privileges)) {
             $actions[] = button(
-                page_link_to('angeltypes') . '&action=edit&angeltype_id=' . $angeltype['id'],
+                page_link_to('angeltypes', ['action' => 'edit', 'angeltype_id' => $angeltype['id']]),
                 _('edit'),
                 'btn-xs'
             );
             $actions[] = button(
-                page_link_to('angeltypes') . '&action=delete&angeltype_id=' . $angeltype['id'],
+                page_link_to('angeltypes', ['action' => 'delete', 'angeltype_id' => $angeltype['id']]),
                 _('delete'),
                 'btn-xs'
             );
@@ -230,13 +234,15 @@ function angeltypes_list_controller()
         $angeltype['membership'] = AngelType_render_membership($angeltype);
         if ($angeltype['user_angeltype_id'] != null) {
             $actions[] = button(
-                page_link_to('user_angeltypes') . '&action=delete&user_angeltype_id=' . $angeltype['user_angeltype_id'],
+                page_link_to('user_angeltypes',
+                    ['action' => 'delete', 'user_angeltype_id' => $angeltype['user_angeltype_id']]
+                ),
                 _('leave'),
                 'btn-xs'
             );
         } else {
             $actions[] = button(
-                page_link_to('user_angeltypes') . '&action=add&angeltype_id=' . $angeltype['id'],
+                page_link_to('user_angeltypes', ['action' => 'add', 'angeltype_id' => $angeltype['id']]),
                 _('join'),
                 'btn-xs'
             );
@@ -245,7 +251,11 @@ function angeltypes_list_controller()
         $angeltype['restricted'] = $angeltype['restricted'] ? glyph('lock') : '';
         $angeltype['no_self_signup'] = $angeltype['no_self_signup'] ? '' : glyph('share');
 
-        $angeltype['name'] = '<a href="' . page_link_to('angeltypes') . '&action=view&angeltype_id=' . $angeltype['id'] . '">' . $angeltype['name'] . '</a>';
+        $angeltype['name'] = '<a href="'
+            . page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']])
+            . '">'
+            . $angeltype['name']
+            . '</a>';
 
         $angeltype['actions'] = table_buttons($actions);
     }
diff --git a/includes/controller/rooms_controller.php b/includes/controller/rooms_controller.php
index 2d6f1a77..81b0113e 100644
--- a/includes/controller/rooms_controller.php
+++ b/includes/controller/rooms_controller.php
@@ -1,4 +1,5 @@
 <?php
+
 use Engelsystem\ShiftsFilter;
 use Engelsystem\ShiftsFilterRenderer;
 
@@ -91,7 +92,7 @@ function rooms_controller()
  */
 function room_link($room)
 {
-    return page_link_to('rooms') . '&action=view&room_id=' . $room['RID'];
+    return page_link_to('rooms', ['action' => 'view', 'room_id' => $room['RID']]);
 }
 
 /**
@@ -100,7 +101,7 @@ function room_link($room)
  */
 function room_edit_link($room)
 {
-    return page_link_to('admin_rooms') . '&show=edit&id=' . $room['RID'];
+    return page_link_to('admin_rooms', ['show' => 'edit', 'id' => $room['RID']]);
 }
 
 /**
diff --git a/includes/controller/shifts_controller.php b/includes/controller/shifts_controller.php
index 21c6e160..f4f3f119 100644
--- a/includes/controller/shifts_controller.php
+++ b/includes/controller/shifts_controller.php
@@ -1,4 +1,5 @@
 <?php
+
 use Engelsystem\ShiftSignupState;
 
 /**
@@ -7,7 +8,7 @@ use Engelsystem\ShiftSignupState;
  */
 function shift_link($shift)
 {
-    $link = page_link_to('shifts') . '&action=view';
+    $link = page_link_to('shifts', ['action' => 'view']);
     if (isset($shift['SID'])) {
         $link .= '&shift_id=' . $shift['SID'];
     }
@@ -20,7 +21,7 @@ function shift_link($shift)
  */
 function shift_delete_link($shift)
 {
-    return page_link_to('user_shifts') . '&delete_shift=' . $shift['SID'];
+    return page_link_to('user_shifts', ['delete_shift' => $shift['SID']]);
 }
 
 /**
@@ -29,7 +30,7 @@ function shift_delete_link($shift)
  */
 function shift_edit_link($shift)
 {
-    return page_link_to('user_shifts') . '&edit_shift=' . $shift['SID'];
+    return page_link_to('user_shifts', ['edit_shift' => $shift['SID']]);
 }
 
 /**
@@ -228,7 +229,9 @@ function shift_delete_controller()
             date('Y-m-d H:i', $shift['start']),
             date('H:i', $shift['end'])
         ), true),
-        '<a class="button" href="?p=user_shifts&delete_shift=' . $shift_id . '&delete">' . _('delete') . '</a>'
+        '<a class="button" href="'
+        . page_link_to('user_shifts', ['delete_shift' => $shift_id, 'delete' => 1]) .
+        '">' . _('delete') . '</a>'
     ]);
 }
 
diff --git a/includes/controller/shifttypes_controller.php b/includes/controller/shifttypes_controller.php
index acdeb982..3ef2675f 100644
--- a/includes/controller/shifttypes_controller.php
+++ b/includes/controller/shifttypes_controller.php
@@ -6,7 +6,7 @@
  */
 function shifttype_link($shifttype)
 {
-    return page_link_to('shifttypes') . '&action=view&shifttype_id=' . $shifttype['id'];
+    return page_link_to('shifttypes', ['action' => 'view', 'shifttype_id' => $shifttype['id']]);
 }
 
 /**
@@ -107,7 +107,7 @@ function shifttype_edit_controller()
                 engelsystem_log('Created shifttype ' . $name);
                 success(_('Created shifttype.'));
             }
-            redirect(page_link_to('shifttypes') . '&action=view&shifttype_id=' . $shifttype_id);
+            redirect(page_link_to('shifttypes', ['action' => 'view', 'shifttype_id' => $shifttype_id]));
         }
     }
 
diff --git a/includes/controller/user_angeltypes_controller.php b/includes/controller/user_angeltypes_controller.php
index 41185552..b427e868 100644
--- a/includes/controller/user_angeltypes_controller.php
+++ b/includes/controller/user_angeltypes_controller.php
@@ -17,8 +17,7 @@ function user_angeltypes_unconfirmed_hint()
     $unconfirmed_links = [];
     foreach ($unconfirmed_user_angeltypes as $user_angeltype) {
         $unconfirmed_links[] = '<a href="'
-            . page_link_to('angeltypes')
-            . '&action=view&angeltype_id=' . $user_angeltype['angeltype_id']
+            . page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $user_angeltype['angeltype_id']])
             . '">' . $user_angeltype['name']
             . ' (+' . $user_angeltype['count'] . ')'
             . '</a>';
@@ -61,7 +60,7 @@ function user_angeltypes_delete_all_controller()
 
         engelsystem_log(sprintf('Denied all users for angeltype %s', AngelType_name_render($angeltype)));
         success(sprintf(_('Denied all users for angeltype %s.'), AngelType_name_render($angeltype)));
-        redirect(page_link_to('angeltypes') . '&action=view&angeltype_id=' . $angeltype['id']);
+        redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']]));
     }
 
     return [
@@ -107,7 +106,7 @@ function user_angeltypes_confirm_all_controller()
 
         engelsystem_log(sprintf('Confirmed all users for angeltype %s', AngelType_name_render($angeltype)));
         success(sprintf(_('Confirmed all users for angeltype %s.'), AngelType_name_render($angeltype)));
-        redirect(page_link_to('angeltypes') . '&action=view&angeltype_id=' . $angeltype['id']);
+        redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']]));
     }
 
     return [
@@ -167,7 +166,7 @@ function user_angeltype_confirm_controller()
             User_Nick_render($user_source),
             AngelType_name_render($angeltype)
         ));
-        redirect(page_link_to('angeltypes') . '&action=view&angeltype_id=' . $angeltype['id']);
+        redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']]));
     }
 
     return [
@@ -224,7 +223,7 @@ function user_angeltype_delete_controller()
         engelsystem_log($success_message);
         success($success_message);
 
-        redirect(page_link_to('angeltypes') . '&action=view&angeltype_id=' . $angeltype['id']);
+        redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']]));
     }
 
     return [
@@ -290,7 +289,7 @@ function user_angeltype_update_controller()
         engelsystem_log($success_message);
         success($success_message);
 
-        redirect(page_link_to('angeltypes') . '&action=view&angeltype_id=' . $angeltype['id']);
+        redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']]));
     }
 
     return [
@@ -344,7 +343,7 @@ function user_angeltype_add_controller()
                 AngelType_name_render($angeltype)
             ));
 
-            redirect(page_link_to('angeltypes') . '&action=view&angeltype_id=' . $angeltype['id']);
+            redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']]));
         }
     }
 
@@ -386,7 +385,7 @@ function user_angeltype_join_controller($angeltype)
             ));
         }
 
-        redirect(page_link_to('angeltypes') . '&action=view&angeltype_id=' . $angeltype['id']);
+        redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']]));
     }
 
     return [
diff --git a/includes/controller/user_driver_licenses_controller.php b/includes/controller/user_driver_licenses_controller.php
index fef278dd..3db31eff 100644
--- a/includes/controller/user_driver_licenses_controller.php
+++ b/includes/controller/user_driver_licenses_controller.php
@@ -63,7 +63,7 @@ function user_driver_license_edit_link($user = null)
     if ($user == null) {
         return page_link_to('user_driver_licenses');
     }
-    return page_link_to('user_driver_licenses') . '&user_id=' . $user['UID'];
+    return page_link_to('user_driver_licenses', ['user_id' => $user['UID']]);
 }
 
 /**
diff --git a/includes/controller/users_controller.php b/includes/controller/users_controller.php
index b747cc83..6dc74d68 100644
--- a/includes/controller/users_controller.php
+++ b/includes/controller/users_controller.php
@@ -109,7 +109,7 @@ function users_link()
  */
 function user_edit_link($user)
 {
-    return page_link_to('admin_user') . '&user_id=' . $user['UID'];
+    return page_link_to('admin_user', ['user_id' => $user['UID']]);
 }
 
 /**
@@ -118,7 +118,7 @@ function user_edit_link($user)
  */
 function user_delete_link($user)
 {
-    return page_link_to('users') . '&action=delete&user_id=' . $user['UID'];
+    return page_link_to('users', ['action' => 'delete', 'user_id' => $user['UID']]);
 }
 
 /**
@@ -127,7 +127,7 @@ function user_delete_link($user)
  */
 function user_link($user)
 {
-    return page_link_to('users') . '&action=view&user_id=' . $user['UID'];
+    return page_link_to('users', ['action' => 'view', 'user_id' => $user['UID']]);
 }
 
 /**
@@ -363,7 +363,7 @@ function user_password_recovery_start_controller()
                 _('Password recovery'),
                 sprintf(
                     _('Please visit %s to recover your password.'),
-                    page_link_to_absolute('user_password_recovery') . '&token=' . $token
+                    page_link_to_absolute('user_password_recovery', ['token' => $token])
                 )
             );
             success(_('We sent an email containing your password recovery link.'));