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

Replace page_link_to() with url()

This commit is contained in:
Xu 2023-11-13 16:56:52 +01:00 committed by Igor Scheller
parent 6477e5dabd
commit b6bd3eba56
40 changed files with 227 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
includes/controller/angeltypes_controller.php
View File

@ -48,7 +48,7 @@ function angeltypes_controller()
function angeltype_link($angeltype_id, $params = []) function angeltype_link($angeltype_id, $params = [])
{ {
$params = array_merge(['action' => 'view', 'angeltype_id' => $angeltype_id], $params); $params = array_merge(['action' => 'view', 'angeltype_id' => $angeltype_id], $params);
return page_link_to('angeltypes', $params); return url('/angeltypes', $params);
} }
/** /**
@ -59,7 +59,7 @@ function angeltype_link($angeltype_id, $params = [])
function angeltype_delete_controller() function angeltype_delete_controller()
{ {
if (!auth()->can('admin_angel_types')) { if (!auth()->can('admin_angel_types')) {
throw_redirect(page_link_to('angeltypes')); throw_redirect(url('/angeltypes'));
} }
$angeltype = AngelType::findOrFail(request()->input('angeltype_id')); $angeltype = AngelType::findOrFail(request()->input('angeltype_id'));
@ -68,7 +68,7 @@ function angeltype_delete_controller()
$angeltype->delete(); $angeltype->delete();
engelsystem_log('Deleted angeltype: ' . AngelType_name_render($angeltype, true)); engelsystem_log('Deleted angeltype: ' . AngelType_name_render($angeltype, true));
success(sprintf(__('Angeltype %s deleted.'), $angeltype->name)); success(sprintf(__('Angeltype %s deleted.'), $angeltype->name));
throw_redirect(page_link_to('angeltypes')); throw_redirect(url('/angeltypes'));
} }
return [ return [
@ -93,13 +93,13 @@ function angeltype_edit_controller()
$angeltype = AngelType::findOrFail($request->input('angeltype_id')); $angeltype = AngelType::findOrFail($request->input('angeltype_id'));
if (!auth()->user()?->isAngelTypeSupporter($angeltype) && !auth()->can('admin_user_angeltypes')) { if (!auth()->user()?->isAngelTypeSupporter($angeltype) && !auth()->can('admin_user_angeltypes')) {
throw_redirect(page_link_to('angeltypes')); throw_redirect(url('/angeltypes'));
} }
} else { } else {
// New angeltype // New angeltype
if ($supporter_mode) { if ($supporter_mode) {
// Supporters aren't allowed to create new angeltypes. // Supporters aren't allowed to create new angeltypes.
throw_redirect(page_link_to('angeltypes')); throw_redirect(url('/angeltypes'));
} }
$angeltype = new AngelType(); $angeltype = new AngelType();
} }
@ -169,7 +169,7 @@ function angeltype_controller()
$user = auth()->user(); $user = auth()->user();
if (!auth()->can('angeltypes')) { if (!auth()->can('angeltypes')) {
throw_redirect(page_link_to('/')); throw_redirect(url('/'));
} }
$angeltype = AngelType::findOrFail(request()->input('angeltype_id')); $angeltype = AngelType::findOrFail(request()->input('angeltype_id'));
@ -275,14 +275,14 @@ function angeltypes_list_controller()
$user = auth()->user(); $user = auth()->user();
if (!auth()->can('angeltypes')) { if (!auth()->can('angeltypes')) {
throw_redirect(page_link_to('/')); throw_redirect(url('/'));
} }
$angeltypes = AngelTypes_with_user($user->id); $angeltypes = AngelTypes_with_user($user->id);
foreach ($angeltypes as $angeltype) { foreach ($angeltypes as $angeltype) {
$actions = [ $actions = [
button( button(
page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id]), url('/angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id]),
icon('eye') . __('view'), icon('eye') . __('view'),
'btn-sm' 'btn-sm'
), ),
@ -290,12 +290,12 @@ function angeltypes_list_controller()
if (auth()->can('admin_angel_types')) { if (auth()->can('admin_angel_types')) {
$actions[] = button( $actions[] = button(
page_link_to('angeltypes', ['action' => 'edit', 'angeltype_id' => $angeltype->id]), url('/angeltypes', ['action' => 'edit', 'angeltype_id' => $angeltype->id]),
icon('pencil') . __('edit'), icon('pencil') . __('edit'),
'btn-sm' 'btn-sm'
); );
$actions[] = button( $actions[] = button(
page_link_to('angeltypes', ['action' => 'delete', 'angeltype_id' => $angeltype->id]), url('/angeltypes', ['action' => 'delete', 'angeltype_id' => $angeltype->id]),
icon('trash') . __('delete'), icon('trash') . __('delete'),
'btn-sm' 'btn-sm'
); );
@ -304,8 +304,8 @@ function angeltypes_list_controller()
$angeltype->membership = AngelType_render_membership($angeltype); $angeltype->membership = AngelType_render_membership($angeltype);
if (!empty($angeltype->user_angel_type_id)) { if (!empty($angeltype->user_angel_type_id)) {
$actions[] = button( $actions[] = button(
page_link_to( url(
'user_angeltypes', '/user-angeltypes',
['action' => 'delete', 'user_angeltype_id' => $angeltype->user_angel_type_id] ['action' => 'delete', 'user_angeltype_id' => $angeltype->user_angel_type_id]
), ),
icon('box-arrow-right') . __('leave'), icon('box-arrow-right') . __('leave'),
@ -313,7 +313,7 @@ function angeltypes_list_controller()
); );
} else { } else {
$actions[] = button( $actions[] = button(
page_link_to('user_angeltypes', ['action' => 'add', 'angeltype_id' => $angeltype->id]), url('/user_angeltypes', ['action' => 'add', 'angeltype_id' => $angeltype->id]),
icon('box-arrow-in-right') . __('join'), icon('box-arrow-in-right') . __('join'),
'btn-sm' 'btn-sm'
); );
@ -323,7 +323,7 @@ function angeltypes_list_controller()
$angeltype->shift_self_signup_allowed = $angeltype->shift_self_signup ? icon('pencil-square') : ''; $angeltype->shift_self_signup_allowed = $angeltype->shift_self_signup ? icon('pencil-square') : '';
$angeltype->name = '<a href="' $angeltype->name = '<a href="'
. page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id]) . url('/angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id])
. '">' . '">'
. $angeltype->name . $angeltype->name
. '</a>'; . '</a>';

4
includes/controller/event_config_controller.php
View File

@ -17,7 +17,7 @@ function event_config_title()
function event_config_edit_controller() function event_config_edit_controller()
{ {
if (!auth()->can('admin_event_config')) { if (!auth()->can('admin_event_config')) {
throw_redirect(page_link_to('/')); throw_redirect(url('/'));
} }
$request = request(); $request = request();
@ -118,7 +118,7 @@ function event_config_edit_controller()
) )
); );
success(__('settings.success')); success(__('settings.success'));
throw_redirect(page_link_to('admin_event_config')); throw_redirect(url('/admin_event_config'));
} }
} }

12
includes/controller/locations_controller.php
View File

@ -17,7 +17,7 @@ use Engelsystem\ShiftsFilterRenderer;
function location_controller(): array function location_controller(): array
{ {
if (!auth()->can('view_locations')) { if (!auth()->can('view_locations')) {
throw_redirect(page_link_to()); throw_redirect(url('/'));
} }
$request = request(); $request = request();
@ -73,8 +73,8 @@ function locations_controller(): array
return match ($action) { return match ($action) {
'view' => location_controller(), 'view' => location_controller(),
'list' => throw_redirect(page_link_to('admin/locations')), 'list' => throw_redirect(url('/admin/locations')),
default => throw_redirect(page_link_to('admin/locations')), default => throw_redirect(url('/admin/locations')),
}; };
} }
@ -84,7 +84,7 @@ function locations_controller(): array
*/ */
function location_link(Location $location) function location_link(Location $location)
{ {
return page_link_to('locations', ['action' => 'view', 'location_id' => $location->id]); return url('/locations', ['action' => 'view', 'location_id' => $location->id]);
} }
/** /**
@ -95,12 +95,12 @@ function location_link(Location $location)
function load_location() function load_location()
{ {
if (!test_request_int('location_id')) { if (!test_request_int('location_id')) {
throw_redirect(page_link_to()); throw_redirect(url('/'));
} }
$location = Location::find(request()->input('location_id')); $location = Location::find(request()->input('location_id'));
if (!$location) { if (!$location) {
throw_redirect(page_link_to()); throw_redirect(url('/'));
} }
return $location; return $location;

2
includes/controller/public_dashboard_controller.php
View File

@ -136,5 +136,5 @@ function public_dashboard_needed_angels($needed_angels, ShiftsFilter $filter = n
*/ */
function public_dashboard_link(array $parameters = []): string function public_dashboard_link(array $parameters = []): string
{ {
return page_link_to('public-dashboard', $parameters); return url('/public-dashboard', $parameters);
} }

12
includes/controller/shift_entries_controller.php
View File

@ -18,7 +18,7 @@ function shift_entries_controller(): array
{ {
$user = auth()->user(); $user = auth()->user();
if (!$user) { if (!$user) {
throw_redirect(page_link_to('login')); throw_redirect(url('/login'));
} }
$action = strip_request_item('action'); $action = strip_request_item('action');
@ -44,7 +44,7 @@ function shift_entry_create_controller(): array
$request = request(); $request = request();
if ($user->isFreeloader()) { if ($user->isFreeloader()) {
throw_redirect(page_link_to('user_myshifts')); throw_redirect(url('/user_myshifts'));
} }
$shift = Shift($request->input('shift_id')); $shift = Shift($request->input('shift_id'));
@ -272,7 +272,7 @@ function shift_entry_create_link(Shift $shift, AngelType $angeltype, $params = [
'shift_id' => $shift->id, 'shift_id' => $shift->id,
'angeltype_id' => $angeltype->id, 'angeltype_id' => $angeltype->id,
], $params); ], $params);
return page_link_to('shift_entries', $params); return url('/shift-entries', $params);
} }
/** /**
@ -288,7 +288,7 @@ function shift_entry_create_link_admin(Shift $shift, $params = [])
'action' => 'create', 'action' => 'create',
'shift_id' => $shift->id, 'shift_id' => $shift->id,
], $params); ], $params);
return page_link_to('shift_entries', $params); return url('/shift-entries', $params);
} }
/** /**
@ -301,7 +301,7 @@ function shift_entry_load()
$request = request(); $request = request();
if (!$request->has('shift_entry_id') || !test_request_int('shift_entry_id')) { if (!$request->has('shift_entry_id') || !test_request_int('shift_entry_id')) {
throw_redirect(page_link_to('user_shifts')); throw_redirect(url('/user-shifts'));
} }
$shiftEntry = ShiftEntry::findOrFail($request->input('shift_entry_id')); $shiftEntry = ShiftEntry::findOrFail($request->input('shift_entry_id'));
@ -362,5 +362,5 @@ function shift_entry_delete_link($shiftEntry, $params = [])
'action' => 'delete', 'action' => 'delete',
'shift_entry_id' => $shiftEntry['shift_entry_id'] ?? $shiftEntry['id'], 'shift_entry_id' => $shiftEntry['shift_entry_id'] ?? $shiftEntry['id'],
], $params); ], $params);
return page_link_to('shift_entries', $params); return url('/shift-entries', $params);
} }

36
includes/controller/shifts_controller.php
View File

@ -20,7 +20,7 @@ function shift_link($shift)
$parameters['shift_id'] = $shift['shift_id'] ?? $shift['id']; $parameters['shift_id'] = $shift['shift_id'] ?? $shift['id'];
} }
return page_link_to('shifts', $parameters); return url('/shifts', $parameters);
} }
/** /**
@ -29,7 +29,7 @@ function shift_link($shift)
*/ */
function shift_delete_link(Shift $shift) function shift_delete_link(Shift $shift)
{ {
return page_link_to('user_shifts', ['delete_shift' => $shift->id]); return url('/user-shifts', ['delete_shift' => $shift->id]);
} }
/** /**
@ -38,7 +38,7 @@ function shift_delete_link(Shift $shift)
*/ */
function shift_edit_link(Shift $shift) function shift_edit_link(Shift $shift)
{ {
return page_link_to('user_shifts', ['edit_shift' => $shift->id]); return url('/user-shifts', ['edit_shift' => $shift->id]);
} }
/** /**
@ -52,11 +52,11 @@ function shift_edit_controller()
$request = request(); $request = request();
if (!auth()->can('admin_shifts')) { if (!auth()->can('admin_shifts')) {
throw_redirect(page_link_to('user_shifts')); throw_redirect(url('/user-shifts'));
} }
if (!$request->has('edit_shift') || !test_request_int('edit_shift')) { if (!$request->has('edit_shift') || !test_request_int('edit_shift')) {
throw_redirect(page_link_to('user_shifts')); throw_redirect(url('/user-shifts'));
} }
$shift_id = $request->input('edit_shift'); $shift_id = $request->input('edit_shift');
@ -201,7 +201,7 @@ function shift_edit_controller()
); );
} }
$link = button(page_link_to('shifts', ['action' => 'view', 'shift_id' => $shift_id]), icon('chevron-left'), 'btn-sm'); $link = button(url('/shifts', ['action' => 'view', 'shift_id' => $shift_id]), icon('chevron-left'), 'btn-sm');
return page_with_title( return page_with_title(
$link . ' ' . shifts_title(), $link . ' ' . shifts_title(),
[ [
@ -233,18 +233,18 @@ function shift_delete_controller()
$request = request(); $request = request();
if (!auth()->can('user_shifts_admin')) { if (!auth()->can('user_shifts_admin')) {
throw_redirect(page_link_to('user_shifts')); throw_redirect(url('/user-shifts'));
} }
// Schicht komplett löschen (nur für admins/user mit user_shifts_admin privileg) // 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'))) {
throw_redirect(page_link_to('user_shifts')); throw_redirect(url('/user-shifts'));
} }
$shift_id = $request->input('delete_shift'); $shift_id = $request->input('delete_shift');
$shift = Shift($shift_id); $shift = Shift($shift_id);
if (empty($shift)) { if (empty($shift)) {
throw_redirect(page_link_to('user_shifts')); throw_redirect(url('/user-shifts'));
} }
// Schicht löschen bestätigt // Schicht löschen bestätigt
@ -270,10 +270,10 @@ function shift_delete_controller()
. ' to ' . $shift->end->format('Y-m-d H:i') . ' to ' . $shift->end->format('Y-m-d H:i')
); );
success(__('Shift deleted.')); success(__('Shift deleted.'));
throw_redirect(page_link_to('user_shifts')); throw_redirect(url('/user-shifts'));
} }
$link = button(page_link_to('shifts', ['action' => 'view', 'shift_id' => $shift_id]), icon('chevron-left'), 'btn-sm'); $link = button(url('/shifts', ['action' => 'view', 'shift_id' => $shift_id]), icon('chevron-left'), 'btn-sm');
return page_with_title( return page_with_title(
$link . ' ' . shifts_title(), $link . ' ' . shifts_title(),
[ [
@ -300,17 +300,17 @@ function shift_controller()
$request = request(); $request = request();
if (!auth()->can('user_shifts')) { if (!auth()->can('user_shifts')) {
throw_redirect(page_link_to('/')); throw_redirect(url('/'));
} }
if (!$request->has('shift_id')) { if (!$request->has('shift_id')) {
throw_redirect(page_link_to('user_shifts')); throw_redirect(url('/user-shifts'));
} }
$shift = Shift($request->input('shift_id')); $shift = Shift($request->input('shift_id'));
if (empty($shift)) { if (empty($shift)) {
error(__('Shift could not be found.')); error(__('Shift could not be found.'));
throw_redirect(page_link_to('user_shifts')); throw_redirect(url('/user-shifts'));
} }
$shifttype = $shift->shiftType; $shifttype = $shift->shiftType;
@ -357,13 +357,13 @@ function shifts_controller()
{ {
$request = request(); $request = request();
if (!$request->has('action')) { if (!$request->has('action')) {
throw_redirect(page_link_to('user_shifts')); throw_redirect(url('/user-shifts'));
} }
return match ($request->input('action')) { return match ($request->input('action')) {
'view' => shift_controller(), 'view' => shift_controller(),
'next' => shift_next_controller(), // throws redirect 'next' => shift_next_controller(), // throws redirect
default => throw_redirect(page_link_to('/')), default => throw_redirect(url('/')),
}; };
} }
@ -373,7 +373,7 @@ function shifts_controller()
function shift_next_controller() function shift_next_controller()
{ {
if (!auth()->can('user_shifts')) { if (!auth()->can('user_shifts')) {
throw_redirect(page_link_to('/')); throw_redirect(url('/'));
} }
$upcoming_shifts = ShiftEntries_upcoming_for_user(auth()->user()); $upcoming_shifts = ShiftEntries_upcoming_for_user(auth()->user());
@ -382,5 +382,5 @@ function shift_next_controller()
throw_redirect(shift_link($upcoming_shifts[0]->shift)); throw_redirect(shift_link($upcoming_shifts[0]->shift));
} }
throw_redirect(page_link_to('user_shifts')); throw_redirect(url('/user-shifts'));
} }

10
includes/controller/shifttypes_controller.php
View File

@ -8,7 +8,7 @@ use Engelsystem\Models\Shifts\ShiftType;
*/ */
function shifttype_link(ShiftType $shifttype) function shifttype_link(ShiftType $shifttype)
{ {
return page_link_to('shifttypes', ['action' => 'view', 'shifttype_id' => $shifttype->id]); return url('/shifttypes', ['action' => 'view', 'shifttype_id' => $shifttype->id]);
} }
/** /**
@ -20,7 +20,7 @@ function shifttype_delete_controller()
{ {
$request = request(); $request = request();
if (!$request->has('shifttype_id')) { if (!$request->has('shifttype_id')) {
throw_redirect(page_link_to('shifttypes')); throw_redirect(url('/shifttypes'));
} }
$shifttype = ShiftType::findOrFail($request->input('shifttype_id')); $shifttype = ShiftType::findOrFail($request->input('shifttype_id'));
@ -29,7 +29,7 @@ function shifttype_delete_controller()
success(sprintf(__('Shifttype %s deleted.'), $shifttype->name)); success(sprintf(__('Shifttype %s deleted.'), $shifttype->name));
$shifttype->delete(); $shifttype->delete();
throw_redirect(page_link_to('shifttypes')); throw_redirect(url('/shifttypes'));
} }
return [ return [
@ -88,7 +88,7 @@ function shifttype_edit_controller()
success(__('Created shifttype.')); success(__('Created shifttype.'));
} }
throw_redirect(page_link_to('shifttypes', ['action' => 'view', 'shifttype_id' => $shifttype_id])); throw_redirect(url('/shifttypes', ['action' => 'view', 'shifttype_id' => $shifttype_id]));
} }
} }
@ -105,7 +105,7 @@ function shifttype_controller()
{ {
$request = request(); $request = request();
if (!$request->has('shifttype_id')) { if (!$request->has('shifttype_id')) {
throw_redirect(page_link_to('shifttypes')); throw_redirect(url('/shifttypes'));
} }
$shifttype = ShiftType::findOrFail($request->input('shifttype_id')); $shifttype = ShiftType::findOrFail($request->input('shifttype_id'));

44
includes/controller/user_angeltypes_controller.php
View File

@ -36,7 +36,7 @@ function user_angeltypes_unconfirmed_hint()
$unconfirmed_links = []; $unconfirmed_links = [];
foreach ($unconfirmed_user_angeltypes as $user_angeltype) { foreach ($unconfirmed_user_angeltypes as $user_angeltype) {
$unconfirmed_links[] = '<a href="' $unconfirmed_links[] = '<a href="'
. page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $user_angeltype->angel_type_id]) . url('/angeltypes', ['action' => 'view', 'angeltype_id' => $user_angeltype->angel_type_id])
. '">' . $user_angeltype->angelType->name . '">' . $user_angeltype->angelType->name
. ' (+' . $user_angeltype->count . ')' . ' (+' . $user_angeltype->count . ')'
. '</a>'; . '</a>';
@ -65,13 +65,13 @@ function user_angeltypes_delete_all_controller(): array
if (!$request->has('angeltype_id')) { if (!$request->has('angeltype_id')) {
error(__('Angeltype doesn\'t exist.')); error(__('Angeltype doesn\'t exist.'));
throw_redirect(page_link_to('angeltypes')); throw_redirect(url('/angeltypes'));
} }
$angeltype = AngelType::findOrFail($request->input('angeltype_id')); $angeltype = AngelType::findOrFail($request->input('angeltype_id'));
if (!auth()->user()->isAngelTypeSupporter($angeltype) && !auth()->can('admin_user_angeltypes')) { if (!auth()->user()->isAngelTypeSupporter($angeltype) && !auth()->can('admin_user_angeltypes')) {
error(__('You are not allowed to delete all users for this angeltype.')); error(__('You are not allowed to delete all users for this angeltype.'));
throw_redirect(page_link_to('angeltypes')); throw_redirect(url('/angeltypes'));
} }
if ($request->hasPostData('deny_all')) { if ($request->hasPostData('deny_all')) {
@ -81,7 +81,7 @@ function user_angeltypes_delete_all_controller(): array
engelsystem_log(sprintf('Denied all users for angeltype %s', AngelType_name_render($angeltype, true))); engelsystem_log(sprintf('Denied all users for angeltype %s', AngelType_name_render($angeltype, true)));
success(sprintf(__('Denied all users for angeltype %s.'), $angeltype->name)); success(sprintf(__('Denied all users for angeltype %s.'), $angeltype->name));
throw_redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id])); throw_redirect(url('/angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id]));
} }
return [ return [
@ -102,13 +102,13 @@ function user_angeltypes_confirm_all_controller(): array
if (!$request->has('angeltype_id')) { if (!$request->has('angeltype_id')) {
error(__('Angeltype doesn\'t exist.')); error(__('Angeltype doesn\'t exist.'));
throw_redirect(page_link_to('angeltypes')); throw_redirect(url('/angeltypes'));
} }
$angeltype = AngelType::findOrFail($request->input('angeltype_id')); $angeltype = AngelType::findOrFail($request->input('angeltype_id'));
if (!auth()->can('admin_user_angeltypes') && !$user->isAngelTypeSupporter($angeltype)) { if (!auth()->can('admin_user_angeltypes') && !$user->isAngelTypeSupporter($angeltype)) {
error(__('You are not allowed to confirm all users for this angeltype.')); error(__('You are not allowed to confirm all users for this angeltype.'));
throw_redirect(page_link_to('angeltypes')); throw_redirect(url('/angeltypes'));
} }
if ($request->hasPostData('confirm_all')) { if ($request->hasPostData('confirm_all')) {
@ -125,7 +125,7 @@ function user_angeltypes_confirm_all_controller(): array
user_angeltype_confirm_email($user, $angeltype); user_angeltype_confirm_email($user, $angeltype);
} }
throw_redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id])); throw_redirect(url('/angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id]));
} }
return [ return [
@ -146,7 +146,7 @@ function user_angeltype_confirm_controller(): array
if (!$request->has('user_angeltype_id')) { if (!$request->has('user_angeltype_id')) {
error(__('User angeltype doesn\'t exist.')); error(__('User angeltype doesn\'t exist.'));
throw_redirect(page_link_to('angeltypes')); throw_redirect(url('/angeltypes'));
} }
/** @var UserAngelType $user_angeltype */ /** @var UserAngelType $user_angeltype */
@ -154,7 +154,7 @@ function user_angeltype_confirm_controller(): array
$angeltype = $user_angeltype->angelType; $angeltype = $user_angeltype->angelType;
if (!$user->isAngelTypeSupporter($angeltype) && !auth()->can('admin_user_angeltypes')) { if (!$user->isAngelTypeSupporter($angeltype) && !auth()->can('admin_user_angeltypes')) {
error(__('You are not allowed to confirm this users angeltype.')); error(__('You are not allowed to confirm this users angeltype.'));
throw_redirect(page_link_to('angeltypes')); throw_redirect(url('/angeltypes'));
} }
$user_source = $user_angeltype->user; $user_source = $user_angeltype->user;
@ -171,7 +171,7 @@ function user_angeltype_confirm_controller(): array
user_angeltype_confirm_email($user_source, $angeltype); user_angeltype_confirm_email($user_source, $angeltype);
throw_redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id])); throw_redirect(url('/angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id]));
} }
return [ return [
@ -224,7 +224,7 @@ function user_angeltype_delete_controller(): array
if (!$request->has('user_angeltype_id')) { if (!$request->has('user_angeltype_id')) {
error(__('User angeltype doesn\'t exist.')); error(__('User angeltype doesn\'t exist.'));
throw_redirect(page_link_to('angeltypes')); throw_redirect(url('/angeltypes'));
} }
/** @var UserAngelType $user_angeltype */ /** @var UserAngelType $user_angeltype */
@ -237,7 +237,7 @@ function user_angeltype_delete_controller(): array
&& !auth()->can('admin_user_angeltypes') && !auth()->can('admin_user_angeltypes')
) { ) {
error(__('You are not allowed to delete this users angeltype.')); error(__('You are not allowed to delete this users angeltype.'));
throw_redirect(page_link_to('angeltypes')); throw_redirect(url('/angeltypes'));
} }
if ($request->hasPostData('delete')) { if ($request->hasPostData('delete')) {
@ -246,7 +246,7 @@ function user_angeltype_delete_controller(): array
engelsystem_log(sprintf('User %s removed from %s.', User_Nick_render($user_source, true), $angeltype->name)); engelsystem_log(sprintf('User %s removed from %s.', User_Nick_render($user_source, true), $angeltype->name));
success(sprintf(__('User %s removed from %s.'), $user_source->displayName, $angeltype->name)); success(sprintf(__('User %s removed from %s.'), $user_source->displayName, $angeltype->name));
throw_redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id])); throw_redirect(url('/angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id]));
} }
return [ return [
@ -267,19 +267,19 @@ function user_angeltype_update_controller(): array
if (!auth()->can('admin_angel_types')) { if (!auth()->can('admin_angel_types')) {
error(__('You are not allowed to set supporter rights.')); error(__('You are not allowed to set supporter rights.'));
throw_redirect(page_link_to('angeltypes')); throw_redirect(url('/angeltypes'));
} }
if (!$request->has('user_angeltype_id')) { if (!$request->has('user_angeltype_id')) {
error(__('User angeltype doesn\'t exist.')); error(__('User angeltype doesn\'t exist.'));
throw_redirect(page_link_to('angeltypes')); throw_redirect(url('/angeltypes'));
} }
if ($request->has('supporter') && preg_match('/^[01]$/', $request->input('supporter'))) { if ($request->has('supporter') && preg_match('/^[01]$/', $request->input('supporter'))) {
$supporter = $request->input('supporter') == '1'; $supporter = $request->input('supporter') == '1';
} else { } else {
error(__('No supporter update given.')); error(__('No supporter update given.'));
throw_redirect(page_link_to('angeltypes')); throw_redirect(url('/angeltypes'));
} }
/** @var UserAngelType $user_angeltype */ /** @var UserAngelType $user_angeltype */
@ -301,7 +301,7 @@ function user_angeltype_update_controller(): array
)); ));
success(sprintf($msg, $angeltype->name, $user_source->displayName)); success(sprintf($msg, $angeltype->name, $user_source->displayName));
throw_redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id])); throw_redirect(url('/angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id]));
} }
return [ return [
@ -362,7 +362,7 @@ function user_angeltype_add_controller(): array
user_angeltype_add_email($user_source, $angeltype); user_angeltype_add_email($user_source, $angeltype);
throw_redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id])); throw_redirect(url('/angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id]));
} }
} }
@ -386,7 +386,7 @@ function user_angeltype_join_controller(AngelType $angeltype)
$user_angeltype = UserAngelType::whereUserId($user->id)->where('angel_type_id', $angeltype->id)->first(); $user_angeltype = UserAngelType::whereUserId($user->id)->where('angel_type_id', $angeltype->id)->first();
if (!empty($user_angeltype)) { if (!empty($user_angeltype)) {
error(sprintf(__('You are already a %s.'), $angeltype->name)); error(sprintf(__('You are already a %s.'), $angeltype->name));
throw_redirect(page_link_to('angeltypes')); throw_redirect(url('/angeltypes'));
} }
$request = request(); $request = request();
@ -414,7 +414,7 @@ function user_angeltype_join_controller(AngelType $angeltype)
)); ));
} }
throw_redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id])); throw_redirect(url('/angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id]));
} }
return [ return [
@ -432,7 +432,7 @@ function user_angeltypes_controller(): array
{ {
$request = request(); $request = request();
if (!$request->has('action')) { if (!$request->has('action')) {
throw_redirect(page_link_to('angeltypes')); throw_redirect(url('/angeltypes'));
} }
return match ($request->input('action')) { return match ($request->input('action')) {
@ -442,6 +442,6 @@ function user_angeltypes_controller(): array
'delete' => user_angeltype_delete_controller(), 'delete' => user_angeltype_delete_controller(),
'update' => user_angeltype_update_controller(), 'update' => user_angeltype_update_controller(),
'add' => user_angeltype_add_controller(), 'add' => user_angeltype_add_controller(),
default => throw_redirect(page_link_to('angeltyps')), default => throw_redirect(url('/angeltyps')),
}; };
} }

22
includes/controller/users_controller.php
View File

@ -20,7 +20,7 @@ function users_controller()
$request = request(); $request = request();
if (!$user) { if (!$user) {
throw_redirect(page_link_to()); throw_redirect(url('/'));
} }
$action = 'list'; $action = 'list';
@ -55,7 +55,7 @@ function user_delete_controller()
} }
if (!auth()->can('admin_user')) { if (!auth()->can('admin_user')) {
throw_redirect(page_link_to()); throw_redirect(url('/'));
} }
// You cannot delete yourself // You cannot delete yourself
@ -101,7 +101,7 @@ function user_delete_controller()
*/ */
function users_link() function users_link()
{ {
return page_link_to('users'); return url('/users');
} }
/** /**
@ -110,7 +110,7 @@ function users_link()
*/ */
function user_edit_link($userId) function user_edit_link($userId)
{ {
return page_link_to('admin_user', ['user_id' => $userId]); return url('/admin-user', ['user_id' => $userId]);
} }
/** /**
@ -119,7 +119,7 @@ function user_edit_link($userId)
*/ */
function user_delete_link($userId) function user_delete_link($userId)
{ {
return page_link_to('users', ['action' => 'delete', 'user_id' => $userId]); return url('/users', ['action' => 'delete', 'user_id' => $userId]);
} }
/** /**
@ -128,7 +128,7 @@ function user_delete_link($userId)
*/ */
function user_link($userId) function user_link($userId)
{ {
return page_link_to('users', ['action' => 'view', 'user_id' => $userId]); return url('/users', ['action' => 'view', 'user_id' => $userId]);
} }
/** /**
@ -149,7 +149,7 @@ function user_edit_vouchers_controller()
(!auth()->can('admin_user') && !auth()->can('voucher.edit')) (!auth()->can('admin_user') && !auth()->can('voucher.edit'))
|| !config('enable_voucher') || !config('enable_voucher')
) { ) {
throw_redirect(page_link_to()); throw_redirect(url('/'));
} }
if ($request->hasPostData('submit')) { if ($request->hasPostData('submit')) {
@ -200,7 +200,7 @@ function user_controller()
$user_source = User::find($request->input('user_id')); $user_source = User::find($request->input('user_id'));
if (!$user_source) { if (!$user_source) {
error(__('User not found.')); error(__('User not found.'));
throw_redirect(page_link_to('/')); throw_redirect(url('/'));
} }
} }
@ -271,7 +271,7 @@ function users_list_controller()
$request = request(); $request = request();
if (!auth()->can('admin_user')) { if (!auth()->can('admin_user')) {
throw_redirect(page_link_to()); throw_redirect(url('/'));
} }
$order_by = 'name'; $order_by = 'name';
@ -343,13 +343,13 @@ function load_user()
{ {
$request = request(); $request = request();
if (!$request->has('user_id')) { if (!$request->has('user_id')) {
throw_redirect(page_link_to()); throw_redirect(url('/'));
} }
$user = User::find($request->input('user_id')); $user = User::find($request->input('user_id'));
if (!$user) { if (!$user) {
error(__('User doesn\'t exist.')); error(__('User doesn\'t exist.'));
throw_redirect(page_link_to()); throw_redirect(url('/'));
} }
return $user; return $user;

18
includes/pages/admin_active.php
View File

@ -47,11 +47,11 @@ function admin_active()
__('At least %s angels are forced to be active. The number has to be greater.'), __('At least %s angels are forced to be active. The number has to be greater.'),
$forced_count $forced_count
)); ));
throw_redirect(page_link_to('admin_active')); throw_redirect(url('/admin-active'));
} }
} else { } else {
$msg .= error(__('Please enter a number of angels to be marked as active.')); $msg .= error(__('Please enter a number of angels to be marked as active.'));
throw_redirect(page_link_to('admin_active')); throw_redirect(url('/admin-active'));
} }
if ($request->hasPostData('ack')) { if ($request->hasPostData('ack')) {
@ -97,9 +97,9 @@ function admin_active()
$msg = success(__('Marked angels.'), true); $msg = success(__('Marked angels.'), true);
} else { } else {
$set_active = form([ $set_active = form([
button(page_link_to('admin_active', ['search' => $search]), '&laquo; ' . __('back')), button(url('/admin-active', ['search' => $search]), '&laquo; ' . __('back')),
form_submit('ack', '&raquo; ' . __('apply')), form_submit('ack', '&raquo; ' . __('apply')),
], page_link_to('admin_active', ['search' => $search, 'count' => $count, 'set_active' => 1])); ], url('/admin-active', ['search' => $search, 'count' => $count, 'set_active' => 1]));
} }
} }
@ -237,7 +237,7 @@ function admin_active()
} }
$actions[] = form( $actions[] = form(
[form_submit('submit', __('set active'), 'btn-sm', false, 'secondary')], [form_submit('submit', __('set active'), 'btn-sm', false, 'secondary')],
page_link_to('admin_active', $parameters), url('/admin-active', $parameters),
false, false,
true true
); );
@ -252,7 +252,7 @@ function admin_active()
} }
$actions[] = form( $actions[] = form(
[form_submit('submit', __('remove active'), 'btn-sm', false, 'secondary')], [form_submit('submit', __('remove active'), 'btn-sm', false, 'secondary')],
page_link_to('admin_active', $parametersRemove), url('/admin-active', $parametersRemove),
false, false,
true true
); );
@ -269,7 +269,7 @@ function admin_active()
if ($goodie_enabled) { if ($goodie_enabled) {
$actions[] = form( $actions[] = form(
[form_submit('submit', ($goodie_tshirt ? __('got t-shirt') : __('got goodie')), 'btn-sm', false, 'secondary')], [form_submit('submit', ($goodie_tshirt ? __('got t-shirt') : __('got goodie')), 'btn-sm', false, 'secondary')],
page_link_to('admin_active', $parametersShirt), url('/admin-active', $parametersShirt),
false, false,
true true
); );
@ -287,7 +287,7 @@ function admin_active()
if ($goodie_enabled) { if ($goodie_enabled) {
$actions[] = form( $actions[] = form(
[form_submit('submit', ($goodie_tshirt ? __('remove t-shirt') : __('remove goodie')), 'btn-sm', false, 'secondary')], [form_submit('submit', ($goodie_tshirt ? __('remove t-shirt') : __('remove goodie')), 'btn-sm', false, 'secondary')],
page_link_to('admin_active', $parameters), url('/admin-active', $parameters),
false, false,
true true
); );
@ -329,7 +329,7 @@ function admin_active()
form_text('search', __('Search angel:'), $search), form_text('search', __('Search angel:'), $search),
form_checkbox('show_all_shifts', __('Show all shifts'), $show_all_shifts), form_checkbox('show_all_shifts', __('Show all shifts'), $show_all_shifts),
form_submit('submit', __('form.search')), form_submit('submit', __('form.search')),
], page_link_to('admin_active')), ], url('/admin-active')),
$set_active == '' ? form([ $set_active == '' ? form([
form_text('count', __('How much angels should be active?'), $count ?: $forced_count), form_text('count', __('How much angels should be active?'), $count ?: $forced_count),
form_submit('set_active', __('form.preview')), form_submit('set_active', __('form.preview')),

2
includes/pages/admin_arrive.php
View File

@ -198,7 +198,7 @@ function admin_arrive()
form([ form([
form_text('search', __('form.search'), $search), form_text('search', __('form.search'), $search),
form_submit('submit', __('form.search')), form_submit('submit', __('form.search')),
], page_link_to('admin_arrive')), ], url('/admin-arrive')),
table([ table([
'name' => __('general.name'), 'name' => __('general.name'),
'rendered_planned_arrival_date' => __('Planned arrival'), 'rendered_planned_arrival_date' => __('Planned arrival'),

2
includes/pages/admin_free.php
View File

@ -106,7 +106,7 @@ function admin_free()
: icon('eye-slash'), : icon('eye-slash'),
'actions' => 'actions' =>
auth()->can('admin_user') auth()->can('admin_user')
? button(page_link_to('admin_user', ['id' => $usr->id]), icon('pencil') . __('edit'), 'btn-sm') ? button(url('/admin-user', ['id' => $usr->id]), icon('pencil') . __('edit'), 'btn-sm')
: '', : '',
]; ];
} }

8
includes/pages/admin_groups.php
View File

@ -38,8 +38,8 @@ function admin_groups()
'name' => $group->name, 'name' => $group->name,
'privileges' => join(', ', $privileges_html), 'privileges' => join(', ', $privileges_html),
'actions' => button( 'actions' => button(
page_link_to( url(
'admin_groups', '/admin-groups',
['action' => 'edit', 'id' => $group->id] ['action' => 'edit', 'id' => $group->id]
), ),
icon('pencil') . __('edit'), icon('pencil') . __('edit'),
@ -83,7 +83,7 @@ function admin_groups()
$html .= page_with_title(__('Edit group') . ' ' . $group->name, [ $html .= page_with_title(__('Edit group') . ' ' . $group->name, [
form( form(
$privileges_form, $privileges_form,
page_link_to('admin_groups', ['action' => 'save', 'id' => $group->id]) url('/admin-groups', ['action' => 'save', 'id' => $group->id])
), ),
]); ]);
} else { } else {
@ -118,7 +118,7 @@ function admin_groups()
'Group privileges of group ' . $group->name 'Group privileges of group ' . $group->name
. ' edited: ' . join(', ', $privilege_names) . ' edited: ' . join(', ', $privilege_names)
); );
throw_redirect(page_link_to('admin_groups')); throw_redirect(url('/admin-groups'));
} else { } else {
return error('No Group found.', true); return error('No Group found.', true);
} }

10
includes/pages/admin_shifts.php
View File

@ -391,7 +391,7 @@ function admin_shifts()
!is_array($session->get('admin_shifts_shifts')) !is_array($session->get('admin_shifts_shifts'))
|| !is_array($session->get('admin_shifts_types')) || !is_array($session->get('admin_shifts_types'))
) { ) {
throw_redirect(page_link_to('admin_shifts')); throw_redirect(url('/admin-shifts'));
} }
$transactionId = Str::uuid(); $transactionId = Str::uuid();
@ -428,7 +428,7 @@ function admin_shifts()
} }
success('Shifts created.'); success('Shifts created.');
throw_redirect(page_link_to('admin_shifts')); throw_redirect(url('/admin-shifts'));
} else { } else {
$session->remove('admin_shifts_shifts'); $session->remove('admin_shifts_shifts');
$session->remove('admin_shifts_types'); $session->remove('admin_shifts_types');
@ -453,11 +453,11 @@ function admin_shifts()
. '</div>'; . '</div>';
} }
$link = button(page_link_to('user-shifts'), icon('chevron-left'), 'btn-sm'); $link = button(url('/user-shifts'), icon('chevron-left'), 'btn-sm');
return page_with_title( return page_with_title(
$link . ' ' . admin_shifts_title() . ' ' . sprintf( $link . ' ' . admin_shifts_title() . ' ' . sprintf(
'<a href="%s">%s</a>', '<a href="%s">%s</a>',
page_link_to('admin_shifts_history'), url('/admin-shifts-history'),
icon('clock-history') icon('clock-history')
), ),
[ [
@ -614,7 +614,7 @@ function admin_shifts_history(): string
} }
success(sprintf(__('%s shifts deleted.'), count($shifts))); success(sprintf(__('%s shifts deleted.'), count($shifts)));
throw_redirect(page_link_to('admin_shifts_history')); throw_redirect(url('/admin-shifts-history'));
} }
$schedules = Schedule::all()->pluck('name', 'id')->toArray(); $schedules = Schedule::all()->pluck('name', 'id')->toArray();

8
includes/pages/admin_user.php
View File

@ -50,7 +50,7 @@ function admin_user()
} }
$html .= '<br /><br />'; $html .= '<br /><br />';
$html .= '<form action="' $html .= '<form action="'
. page_link_to('admin_user', ['action' => 'save', 'id' => $user_id]) . url('/admin-user', ['action' => 'save', 'id' => $user_id])
. '" method="post">' . "\n"; . '" method="post">' . "\n";
$html .= form_csrf(); $html .= form_csrf();
$html .= '<table>' . "\n"; $html .= '<table>' . "\n";
@ -129,7 +129,7 @@ function admin_user()
$html .= form_info('', __('Please visit the angeltypes page or the users profile to manage the users angeltypes.')); $html .= form_info('', __('Please visit the angeltypes page or the users profile to manage the users angeltypes.'));
$html .= ' ' . __('Here you can reset the password of this angel:') . '<form action="' $html .= ' ' . __('Here you can reset the password of this angel:') . '<form action="'
. page_link_to('admin_user', ['action' => 'change_pw', 'id' => $user_id]) . url('/admin-user', ['action' => 'change_pw', 'id' => $user_id])
. '" method="post">' . "\n"; . '" method="post">' . "\n";
$html .= form_csrf(); $html .= form_csrf();
$html .= '<table>' . "\n"; $html .= '<table>' . "\n";
@ -158,7 +158,7 @@ function admin_user()
&& ($my_highest_group >= $angel_highest_group || is_null($angel_highest_group)) && ($my_highest_group >= $angel_highest_group || is_null($angel_highest_group))
) { ) {
$html .= __('Here you can define the user groups of the angel:') . '<form action="' $html .= __('Here you can define the user groups of the angel:') . '<form action="'
. page_link_to('admin_user', ['action' => 'save_groups', 'id' => $user_id]) . url('/admin-user', ['action' => 'save_groups', 'id' => $user_id])
. '" method="post">' . "\n"; . '" method="post">' . "\n";
$html .= form_csrf(); $html .= form_csrf();
$html .= '<div>'; $html .= '<div>';
@ -303,7 +303,7 @@ function admin_user()
} }
} }
$link = button(page_link_to('users', ['action' => 'view', 'user_id' => $user_id]), icon('chevron-left'), 'btn-sm'); $link = button(url('/users', ['action' => 'view', 'user_id' => $user_id]), icon('chevron-left'), 'btn-sm');
return page_with_title( return page_with_title(
$link . ' ' . __('Edit user'), $link . ' ' . __('Edit user'),
[ [

10
includes/pages/user_myshifts.php
View File

@ -37,14 +37,14 @@ function user_myshifts()
if ($request->input('reset') == 'ack') { if ($request->input('reset') == 'ack') {
User_reset_api_key($user); User_reset_api_key($user);
success(__('Key changed.')); success(__('Key changed.'));
throw_redirect(page_link_to('users', ['action' => 'view', 'user_id' => $shifts_user->id])); throw_redirect(url('/users', ['action' => 'view', 'user_id' => $shifts_user->id]));
} }
return page_with_title(__('Reset API key'), [ return page_with_title(__('Reset API key'), [
error( error(
__('If you reset the key, the url to your iCal- and JSON-export and your atom/rss feed changes! You have to update it in every application using one of these exports.'), __('If you reset the key, the url to your iCal- and JSON-export and your atom/rss feed changes! You have to update it in every application using one of these exports.'),
true true
), ),
button(page_link_to('user_myshifts', ['reset' => 'ack']), __('Continue'), 'btn-danger'), button(url('/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'))) {
$shift_entry_id = $request->input('edit'); $shift_entry_id = $request->input('edit');
@ -90,7 +90,7 @@ function user_myshifts()
. '. Freeloaded: ' . ($freeloaded ? 'YES Comment: ' . $freeloaded_comment : 'NO') . '. Freeloaded: ' . ($freeloaded ? 'YES Comment: ' . $freeloaded_comment : 'NO')
); );
success(__('Shift saved.')); success(__('Shift saved.'));
throw_redirect(page_link_to('users', ['action' => 'view', 'user_id' => $shifts_user->id])); throw_redirect(url('/users', ['action' => 'view', 'user_id' => $shifts_user->id]));
} }
} }
@ -106,10 +106,10 @@ function user_myshifts()
auth()->can('user_shifts_admin') auth()->can('user_shifts_admin')
); );
} else { } else {
throw_redirect(page_link_to('user_myshifts')); throw_redirect(url('/user-myshifts'));
} }
} }
throw_redirect(page_link_to('users', ['action' => 'view', 'user_id' => $shifts_user->id])); throw_redirect(url('/users', ['action' => 'view', 'user_id' => $shifts_user->id]));
return ''; return '';
} }

16
includes/pages/user_shifts.php
View File

@ -34,7 +34,7 @@ function user_shifts()
$request = request(); $request = request();
if (auth()->user()->isFreeloader()) { if (auth()->user()->isFreeloader()) {
throw_redirect(page_link_to('user_myshifts')); throw_redirect(url('/user-myshifts'));
} }
if ($request->has('edit_shift')) { if ($request->has('edit_shift')) {
@ -137,7 +137,7 @@ function load_locations(bool $onlyWithActiveShifts = false)
if ($locations->isEmpty()) { if ($locations->isEmpty()) {
error(__('The administration has not configured any locations yet.')); error(__('The administration has not configured any locations yet.'));
throw_redirect(page_link_to('/')); throw_redirect(url('/'));
} }
return $locations; return $locations;
@ -162,7 +162,7 @@ function load_days()
error(__('The administration has not configured any shifts yet.')); error(__('The administration has not configured any shifts yet.'));
// Do not try to redirect to the current page // Do not try to redirect to the current page
if (config('home_site') != 'user_shifts') { if (config('home_site') != 'user_shifts') {
throw_redirect(page_link_to('/')); throw_redirect(url('/'));
} }
} }
return $days; return $days;
@ -178,7 +178,7 @@ function load_types()
if (!AngelType::count()) { if (!AngelType::count()) {
error(__('The administration has not configured any angeltypes yet - or you are not subscribed to any angeltype.')); error(__('The administration has not configured any angeltypes yet - or you are not subscribed to any angeltype.'));
throw_redirect(page_link_to('/')); throw_redirect(url('/'));
} }
$types = Db::select( $types = Db::select(
@ -289,7 +289,7 @@ function view_user_shifts()
return Carbon::make($value)->format(__('Y-m-d')); return Carbon::make($value)->format(__('Y-m-d'));
})->toArray(); })->toArray();
$link = button(page_link_to('admin-shifts'), icon('plus-lg'), 'add'); $link = button(url('/admin-shifts'), icon('plus-lg'), 'add');
return page([ return page([
div('col-md-12', [ div('col-md-12', [
@ -371,9 +371,9 @@ function ical_hint()
return heading(__('iCal export and API') . ' ' . button_help('user/ical'), 2) return heading(__('iCal export and API') . ' ' . button_help('user/ical'), 2)
. '<p>' . sprintf( . '<p>' . sprintf(
__('Export your own shifts. <a href="%s">iCal format</a> or <a href="%s">JSON format</a> available (please keep secret, otherwise <a href="%s">reset the api key</a>).'), __('Export your own shifts. <a href="%s">iCal format</a> or <a href="%s">JSON format</a> available (please keep secret, otherwise <a href="%s">reset the api key</a>).'),
page_link_to('ical', ['key' => $user->api_key]), url('/ical', ['key' => $user->api_key]),
page_link_to('shifts_json_export', ['key' => $user->api_key]), url('/shifts-json-export', ['key' => $user->api_key]),
page_link_to('user_myshifts', ['reset' => 1]) url('/user-myshifts', ['reset' => 1])
) )
. ' <button class="btn btn-sm btn-danger" type="button" . ' <button class="btn btn-sm btn-danger" type="button"
data-bs-toggle="collapse" data-bs-target="#collapseApiKey" data-bs-toggle="collapse" data-bs-target="#collapseApiKey"

19
includes/sys_menu.php
View File

@ -4,17 +4,6 @@ use Engelsystem\Models\Location;
use Engelsystem\Models\Question; use Engelsystem\Models\Question;
use Engelsystem\UserHintsRenderer; use Engelsystem\UserHintsRenderer;
/**
* @param string $page
* @param array $parameters get parameters
* @return string
*/
function page_link_to($page = '', $parameters = [])
{
$page = str_replace('_', '-', $page);
return url($page, $parameters);
}
/** /**
* Render the user hints * Render the user hints
* *
@ -80,7 +69,7 @@ function make_navigation()
} }
$title = ((array) $options)[0]; $title = ((array) $options)[0];
$menu[] = toolbar_item_link(page_link_to($menu_page), '', $title, $menu_page == $page); $menu[] = toolbar_item_link(url(str_replace('_', '-', $menu_page)), '', $title, $menu_page == $page);
} }
$menu = make_location_navigation($menu); $menu = make_location_navigation($menu);
@ -114,7 +103,7 @@ function make_navigation()
$title = ((array) $options)[0]; $title = ((array) $options)[0];
$admin_menu[] = toolbar_dropdown_item( $admin_menu[] = toolbar_dropdown_item(
page_link_to($menu_page), url(str_replace('_', '-', $menu_page)),
__($title), __($title),
$menu_page == $page $menu_page == $page
); );
@ -162,7 +151,7 @@ function make_location_navigation($menu)
$location_menu = []; $location_menu = [];
if (auth()->can('admin_locations')) { if (auth()->can('admin_locations')) {
$location_menu[] = toolbar_dropdown_item( $location_menu[] = toolbar_dropdown_item(
page_link_to('admin/locations'), url('/admin/locations'),
__('Manage locations'), __('Manage locations'),
false, false,
'list' 'list'
@ -219,7 +208,7 @@ function admin_new_questions()
return null; return null;
} }
return '<a href="' . page_link_to('/admin/questions') . '">' return '<a href="' . url('/admin/questions') . '">'
. __('There are unanswered questions!') . __('There are unanswered questions!')
. '</a>'; . '</a>';
} }

48
includes/view/AngelTypes_view.php
View File

@ -61,13 +61,13 @@ function AngelType_render_membership(AngelType $user_angeltype)
function AngelType_delete_view(AngelType $angeltype) function AngelType_delete_view(AngelType $angeltype)
{ {
$link = button($angeltype->id $link = button($angeltype->id
? page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id]) ? url('/angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id])
: page_link_to('angeltypes'), icon('chevron-left'), 'btn-sm'); : url('/angeltypes'), icon('chevron-left'), 'btn-sm');
return page_with_title($link . ' ' . sprintf(__('Delete angeltype %s'), $angeltype->name), [ return page_with_title($link . ' ' . sprintf(__('Delete angeltype %s'), $angeltype->name), [
info(sprintf(__('Do you want to delete angeltype %s?'), $angeltype->name), true), info(sprintf(__('Do you want to delete angeltype %s?'), $angeltype->name), true),
form([ form([
buttons([ buttons([
button(page_link_to('angeltypes'), icon('x-lg') . __('form.cancel')), button(url('/angeltypes'), icon('x-lg') . __('form.cancel')),
form_submit('delete', icon('trash') . __('delete'), 'btn-danger', false), form_submit('delete', icon('trash') . __('delete'), 'btn-danger', false),
]), ]),
]), ]),
@ -84,13 +84,13 @@ function AngelType_delete_view(AngelType $angeltype)
function AngelType_edit_view(AngelType $angeltype, bool $supporter_mode) function AngelType_edit_view(AngelType $angeltype, bool $supporter_mode)
{ {
$link = button($angeltype->id $link = button($angeltype->id
? page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id]) ? url('/angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id])
: page_link_to('angeltypes'), icon('chevron-left'), 'btn-sm'); : url('/angeltypes'), icon('chevron-left'), 'btn-sm');
return page_with_title( return page_with_title(
$link . ' ' . sprintf(__('Edit %s'), $angeltype->name), $link . ' ' . sprintf(__('Edit %s'), $angeltype->name),
[ [
buttons([ buttons([
button(page_link_to('angeltypes'), icon('person-lines-fill') . __('angeltypes.angeltypes'), 'back'), button(url('/angeltypes'), icon('person-lines-fill') . __('angeltypes.angeltypes'), 'back'),
]), ]),
msg(), msg(),
form([ form([
@ -204,7 +204,7 @@ function AngelType_view_buttons(
if (is_null($user_angeltype)) { if (is_null($user_angeltype)) {
$buttons[] = button( $buttons[] = button(
page_link_to('user_angeltypes', ['action' => 'add', 'angeltype_id' => $angeltype->id]), url('/user-angeltypes', ['action' => 'add', 'angeltype_id' => $angeltype->id]),
icon('box-arrow-in-right') . __('join'), icon('box-arrow-in-right') . __('join'),
'add' 'add'
); );
@ -228,20 +228,20 @@ function AngelType_view_buttons(
)); ));
} }
$buttons[] = button( $buttons[] = button(
page_link_to('user_angeltypes', ['action' => 'delete', 'user_angeltype_id' => $user_angeltype->id]), url('/user-angeltypes', ['action' => 'delete', 'user_angeltype_id' => $user_angeltype->id]),
icon('box-arrow-right') . __('leave') icon('box-arrow-right') . __('leave')
); );
} }
if ($admin_angeltypes || $supporter) { if ($admin_angeltypes || $supporter) {
$buttons[] = button( $buttons[] = button(
page_link_to('angeltypes', ['action' => 'edit', 'angeltype_id' => $angeltype->id]), url('/angeltypes', ['action' => 'edit', 'angeltype_id' => $angeltype->id]),
icon('pencil') . __('edit') icon('pencil') . __('edit')
); );
} }
if ($admin_angeltypes) { if ($admin_angeltypes) {
$buttons[] = button( $buttons[] = button(
page_link_to('angeltypes', ['action' => 'delete', 'angeltype_id' => $angeltype->id]), url('/angeltypes', ['action' => 'delete', 'angeltype_id' => $angeltype->id]),
icon('trash') . __('delete') icon('trash') . __('delete')
); );
} }
@ -287,16 +287,16 @@ function AngelType_view_members(AngelType $angeltype, $members, $admin_user_ange
if ($angeltype->restricted && empty($member->pivot->confirm_user_id)) { if ($angeltype->restricted && empty($member->pivot->confirm_user_id)) {
$member['actions'] = table_buttons([ $member['actions'] = table_buttons([
button( button(
page_link_to( url(
'user_angeltypes', '/user-angeltypes',
['action' => 'confirm', 'user_angeltype_id' => $member->pivot->id] ['action' => 'confirm', 'user_angeltype_id' => $member->pivot->id]
), ),
__('confirm'), __('confirm'),
'btn-sm' 'btn-sm'
), ),
button( button(
page_link_to( url(
'user_angeltypes', '/user-angeltypes',
['action' => 'delete', 'user_angeltype_id' => $member->pivot->id] ['action' => 'delete', 'user_angeltype_id' => $member->pivot->id]
), ),
__('deny'), __('deny'),
@ -308,7 +308,7 @@ function AngelType_view_members(AngelType $angeltype, $members, $admin_user_ange
if ($admin_angeltypes) { if ($admin_angeltypes) {
$member['actions'] = table_buttons([ $member['actions'] = table_buttons([
button( button(
page_link_to('user_angeltypes', [ url('/user-angeltypes', [
'action' => 'update', 'action' => 'update',
'user_angeltype_id' => $member->pivot->id, 'user_angeltype_id' => $member->pivot->id,
'supporter' => 0, 'supporter' => 0,
@ -326,7 +326,7 @@ function AngelType_view_members(AngelType $angeltype, $members, $admin_user_ange
$member['actions'] = table_buttons([ $member['actions'] = table_buttons([
$admin_angeltypes ? $admin_angeltypes ?
button( button(
page_link_to('user_angeltypes', [ url('/user-angeltypes', [
'action' => 'update', 'action' => 'update',
'user_angeltype_id' => $member->pivot->id, 'user_angeltype_id' => $member->pivot->id,
'supporter' => 1, 'supporter' => 1,
@ -336,7 +336,7 @@ function AngelType_view_members(AngelType $angeltype, $members, $admin_user_ange
) : ) :
'', '',
button( button(
page_link_to('user_angeltypes', [ url('/user-angeltypes', [
'action' => 'delete', 'action' => 'delete',
'user_angeltype_id' => $member->pivot->id, 'user_angeltype_id' => $member->pivot->id,
]), ]),
@ -427,7 +427,7 @@ function AngelType_view(
ShiftCalendarRenderer $shiftCalendarRenderer, ShiftCalendarRenderer $shiftCalendarRenderer,
$tab $tab
) { ) {
$link = button(page_link_to('angeltypes'), icon('chevron-left'), 'btn-sm'); $link = button(url('/angeltypes'), icon('chevron-left'), 'btn-sm');
return page_with_title( return page_with_title(
$link . ' ' . sprintf(__('Team %s'), $angeltype->name), $link . ' ' . sprintf(__('Team %s'), $angeltype->name),
[ [
@ -460,7 +460,7 @@ function AngelType_view(
*/ */
function AngelType_view_shifts(AngelType $angeltype, $shiftsFilterRenderer, $shiftCalendarRenderer) function AngelType_view_shifts(AngelType $angeltype, $shiftsFilterRenderer, $shiftCalendarRenderer)
{ {
$shifts = $shiftsFilterRenderer->render(page_link_to('angeltypes', [ $shifts = $shiftsFilterRenderer->render(url('/angeltypes', [
'action' => 'view', 'action' => 'view',
'angeltype_id' => $angeltype->id, 'angeltype_id' => $angeltype->id,
]), ['type' => $angeltype->id]); ]), ['type' => $angeltype->id]);
@ -528,8 +528,8 @@ function AngelType_view_info(
if ($admin_user_angeltypes) { if ($admin_user_angeltypes) {
$info[] = buttons([ $info[] = buttons([
button( button(
page_link_to( url(
'user_angeltypes', '/user-angeltypes',
['action' => 'add', 'angeltype_id' => $angeltype->id] ['action' => 'add', 'angeltype_id' => $angeltype->id]
), ),
__('Add'), __('Add'),
@ -543,11 +543,11 @@ function AngelType_view_info(
$info[] = '<h3>' . __('Unconfirmed') . '</h3>'; $info[] = '<h3>' . __('Unconfirmed') . '</h3>';
$info[] = buttons([ $info[] = buttons([
button( button(
page_link_to('user_angeltypes', ['action' => 'confirm_all', 'angeltype_id' => $angeltype->id]), url('/user-angeltypes', ['action' => 'confirm_all', 'angeltype_id' => $angeltype->id]),
icon('check-lg') . __('confirm all') icon('check-lg') . __('confirm all')
), ),
button( button(
page_link_to('user_angeltypes', ['action' => 'delete_all', 'angeltype_id' => $angeltype->id]), url('/user-angeltypes', ['action' => 'delete_all', 'angeltype_id' => $angeltype->id]),
icon('trash') . __('deny all') icon('trash') . __('deny all')
), ),
]); ]);
@ -589,7 +589,7 @@ function AngelTypes_render_contact_info(AngelType $angeltype)
*/ */
function AngelTypes_list_view($angeltypes, bool $admin_angeltypes) function AngelTypes_list_view($angeltypes, bool $admin_angeltypes)
{ {
$link = button(page_link_to('angeltypes', ['action' => 'edit']), icon('plus-lg'), 'add'); $link = button(url('/angeltypes', ['action' => 'edit']), icon('plus-lg'), 'add');
return page_with_title( return page_with_title(
angeltypes_title() . ' ' . ($admin_angeltypes ? $link : ''), angeltypes_title() . ' ' . ($admin_angeltypes ? $link : ''),
[ [

6
includes/view/Locations_view.php
View File

@ -44,7 +44,7 @@ function location_view(Location $location, ShiftsFilterRenderer $shiftsFilterRen
} }
$tabs[__('Shifts')] = div('first', [ $tabs[__('Shifts')] = div('first', [
$shiftsFilterRenderer->render(page_link_to('locations', [ $shiftsFilterRenderer->render(url('/locations', [
'action' => 'view', 'action' => 'view',
'location_id' => $location->id, 'location_id' => $location->id,
]), ['locations' => [$location->id]]), ]), ['locations' => [$location->id]]),
@ -57,7 +57,7 @@ function location_view(Location $location, ShiftsFilterRenderer $shiftsFilterRen
$selected_tab = count($tabs) - 1; $selected_tab = count($tabs) - 1;
} }
$link = button(page_link_to('admin/locations'), icon('chevron-left'), 'btn-sm'); $link = button(url('/admin/locations'), icon('chevron-left'), 'btn-sm');
return page_with_title( return page_with_title(
(auth()->can('admin_locations') ? $link . ' ' : '') . (auth()->can('admin_locations') ? $link . ' ' : '') .
icon('pin-map-fill') . $location->name, icon('pin-map-fill') . $location->name,
@ -65,7 +65,7 @@ function location_view(Location $location, ShiftsFilterRenderer $shiftsFilterRen
$assignNotice, $assignNotice,
auth()->can('admin_locations') ? buttons([ auth()->can('admin_locations') ? buttons([
button( button(
page_link_to('admin/locations/edit/' . $location->id), url('/admin/locations/edit/' . $location->id),
icon('pencil') . __('edit') icon('pencil') . __('edit')
), ),
]) : '', ]) : '',

6
includes/view/ShiftCalendarShiftRenderer.php
View File

@ -196,7 +196,7 @@ class ShiftCalendarShiftRenderer
// Add link to join the angeltype first // Add link to join the angeltype first
: $inner_text . '<br />' : $inner_text . '<br />'
. button( . button(
page_link_to('user_angeltypes', ['action' => 'add', 'angeltype_id' => $angeltype->id]), url('/user-angeltypes', ['action' => 'add', 'angeltype_id' => $angeltype->id]),
sprintf(__('Become %s'), $angeltype->name), sprintf(__('Become %s'), $angeltype->name),
'btn-sm' 'btn-sm'
), ),
@ -247,12 +247,12 @@ class ShiftCalendarShiftRenderer
if (auth()->can('admin_shifts')) { if (auth()->can('admin_shifts')) {
$header_buttons = '<div class="ms-auto d-print-none">' . table_buttons([ $header_buttons = '<div class="ms-auto d-print-none">' . table_buttons([
button( button(
page_link_to('user_shifts', ['edit_shift' => $shift->id]), url('/user-shifts', ['edit_shift' => $shift->id]),
icon('pencil'), icon('pencil'),
'btn-' . $class . ' btn-sm border-light text-white' 'btn-' . $class . ' btn-sm border-light text-white'
), ),
button( button(
page_link_to('user_shifts', ['delete_shift' => $shift->id]), url('/user-shifts', ['delete_shift' => $shift->id]),
icon('trash'), icon('trash'),
'btn-' . $class . ' btn-sm border-light text-white' 'btn-' . $class . ' btn-sm border-light text-white'
), ),

2
includes/view/ShiftEntry_view.php
View File

@ -219,7 +219,7 @@ function ShiftEntry_edit_view(
} }
$link = button( $link = button(
page_link_to('users', ['action' => 'view', 'user_id' => $angel->id]), url('/users', ['action' => 'view', 'user_id' => $angel->id]),
icon('chevron-left'), icon('chevron-left'),
'btn-sm' 'btn-sm'
); );

24
includes/view/ShiftTypes_view.php
View File

@ -25,7 +25,7 @@ function ShiftType_delete_view(ShiftType $shifttype)
info(sprintf(__('Do you want to delete shifttype %s?'), $shifttype->name), true), info(sprintf(__('Do you want to delete shifttype %s?'), $shifttype->name), true),
form([ form([
buttons([ buttons([
button(page_link_to('shifttypes'), icon('x-lg') . __('form.cancel')), button(url('/shifttypes'), icon('x-lg') . __('form.cancel')),
form_submit( form_submit(
'delete', 'delete',
icon('trash') . __('delete'), icon('trash') . __('delete'),
@ -48,15 +48,15 @@ function ShiftType_edit_view($name, $description, $shifttype_id)
return page_with_title( return page_with_title(
$shifttype_id $shifttype_id
? (button( ? (button(
page_link_to('shifttypes', ['action' => 'view', 'shifttype_id' => $shifttype_id]), url('/shifttypes', ['action' => 'view', 'shifttype_id' => $shifttype_id]),
icon('chevron-left'), icon('chevron-left'),
'btn-sm' 'btn-sm'
) . ' ' . __('Edit shifttype')) ) . ' ' . __('Edit shifttype'))
: (button(page_link_to('shifttypes'), icon('chevron-left'), 'btn-sm') . ' ' . __('Create shifttype')), : (button(url('/shifttypes'), icon('chevron-left'), 'btn-sm') . ' ' . __('Create shifttype')),
[ [
msg(), msg(),
buttons([ buttons([
button(page_link_to('shifttypes'), shifttypes_title(), 'back'), button(url('/shifttypes'), shifttypes_title(), 'back'),
]), ]),
form([ form([
form_text('name', __('general.name'), $name), form_text('name', __('general.name'), $name),
@ -77,16 +77,16 @@ function ShiftType_view(ShiftType $shifttype)
{ {
$parsedown = new Parsedown(); $parsedown = new Parsedown();
$title = $shifttype->name; $title = $shifttype->name;
$link = button(page_link_to('shifttypes'), icon('chevron-left'), 'btn-sm'); $link = button(url('/shifttypes'), icon('chevron-left'), 'btn-sm');
return page_with_title($link . ' ' . $title, [ return page_with_title($link . ' ' . $title, [
msg(), msg(),
buttons([ buttons([
button( button(
page_link_to('shifttypes', ['action' => 'edit', 'shifttype_id' => $shifttype->id]), url('/shifttypes', ['action' => 'edit', 'shifttype_id' => $shifttype->id]),
icon('pencil') . __('edit') icon('pencil') . __('edit')
), ),
button( button(
page_link_to('shifttypes', ['action' => 'delete', 'shifttype_id' => $shifttype->id]), url('/shifttypes', ['action' => 'delete', 'shifttype_id' => $shifttype->id]),
icon('trash') . __('delete'), icon('trash') . __('delete'),
), ),
]), ]),
@ -103,28 +103,28 @@ function ShiftTypes_list_view($shifttypes)
{ {
foreach ($shifttypes as $shifttype) { foreach ($shifttypes as $shifttype) {
$shifttype->name = '<a href="' $shifttype->name = '<a href="'
. page_link_to('shifttypes', ['action' => 'view', 'shifttype_id' => $shifttype->id]) . url('/shifttypes', ['action' => 'view', 'shifttype_id' => $shifttype->id])
. '">' . '">'
. $shifttype->name . $shifttype->name
. '</a>'; . '</a>';
$shifttype->actions = table_buttons([ $shifttype->actions = table_buttons([
button( button(
page_link_to( url(
'shifttypes', '/shifttypes',
['action' => 'edit', 'shifttype_id' => $shifttype->id] ['action' => 'edit', 'shifttype_id' => $shifttype->id]
), ),
icon('pencil') . __('edit'), icon('pencil') . __('edit'),
'btn-sm' 'btn-sm'
), ),
button( button(
page_link_to('shifttypes', ['action' => 'delete', 'shifttype_id' => $shifttype->id]), url('/shifttypes', ['action' => 'delete', 'shifttype_id' => $shifttype->id]),
icon('trash') . __('delete'), icon('trash') . __('delete'),
'btn-sm' 'btn-sm'
), ),
]); ]);
} }
$link = button(page_link_to('shifttypes', ['action' => 'edit']), icon('plus-lg'), 'add'); $link = button(url('/shifttypes', ['action' => 'edit']), icon('plus-lg'), 'add');
return page_with_title( return page_with_title(
shifttypes_title() . ' ' . $link, shifttypes_title() . ' ' . $link,
[ [

6
includes/view/Shifts_view.php
View File

@ -95,7 +95,7 @@ function Shift_signup_button_render(Shift $shift, AngelType $angeltype)
return button(shift_entry_create_link($shift, $angeltype), __('Sign up')); return button(shift_entry_create_link($shift, $angeltype), __('Sign up'));
} elseif (empty($user_angeltype)) { } elseif (empty($user_angeltype)) {
return button( return button(
page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id]), url('/angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id]),
sprintf( sprintf(
__('Become %s'), __('Become %s'),
$angeltype->name $angeltype->name
@ -204,7 +204,7 @@ function Shift_view(
$start = $shift->start->format(__('Y-m-d H:i')); $start = $shift->start->format(__('Y-m-d H:i'));
$link = button(page_link_to('user-shifts'), icon('chevron-left'), 'btn-sm'); $link = button(url('/user-shifts'), icon('chevron-left'), 'btn-sm');
return page_with_title( return page_with_title(
$link . ' ' . $shift->shiftType->name . ' <small title="' . $start . '" data-countdown-ts="' . $shift->start->timestamp . '">%c</small>', $link . ' ' . $shift->shiftType->name . ' <small title="' . $start . '" data-countdown-ts="' . $shift->start->timestamp . '">%c</small>',
$content $content
@ -279,7 +279,7 @@ function Shift_view_render_shift_entry(ShiftEntry $shift_entry, $user_shift_admi
$entry .= ' <div class="btn-group m-1">'; $entry .= ' <div class="btn-group m-1">';
if ($user_shift_admin || $isUser) { if ($user_shift_admin || $isUser) {
$entry .= button_icon( $entry .= button_icon(
page_link_to('user_myshifts', ['edit' => $shift_entry->id, 'id' => $shift_entry->user_id]), url('/user-myshifts', ['edit' => $shift_entry->id, 'id' => $shift_entry->user_id]),
'pencil', 'pencil',
'btn-sm' 'btn-sm'
); );

22
includes/view/UserAngelTypes_view.php
View File

@ -25,12 +25,12 @@ function UserAngelType_update_view(UserAngelType $user_angeltype, User $user, An
form([ form([
buttons([ buttons([
button( button(
page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id]), url('/angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id]),
icon('x-lg') . __('form.cancel') icon('x-lg') . __('form.cancel')
), ),
form_submit('submit', icon('check-lg') . __('Yes'), 'btn-primary', false), form_submit('submit', icon('check-lg') . __('Yes'), 'btn-primary', false),
]), ]),
], page_link_to('user_angeltypes', [ ], url('/user-angeltypes', [
'action' => 'update', 'action' => 'update',
'user_angeltype_id' => $user_angeltype->id, 'user_angeltype_id' => $user_angeltype->id,
'supporter' => ($supporter ? '1' : '0'), 'supporter' => ($supporter ? '1' : '0'),
@ -50,15 +50,15 @@ function UserAngelTypes_delete_all_view(AngelType $angeltype)
form([ form([
buttons([ buttons([
button( button(
page_link_to( url(
'angeltypes', '/angeltypes',
['action' => 'view', 'angeltype_id' => $angeltype->id] ['action' => 'view', 'angeltype_id' => $angeltype->id]
), ),
icon('x-lg') . __('form.cancel') icon('x-lg') . __('form.cancel')
), ),
form_submit('deny_all', icon('check-lg') . __('Yes'), 'btn-primary', false), form_submit('deny_all', icon('check-lg') . __('Yes'), 'btn-primary', false),
]), ]),
], page_link_to('user_angeltypes', ['action' => 'delete_all', 'angeltype_id' => $angeltype->id])), ], url('/user-angeltypes', ['action' => 'delete_all', 'angeltype_id' => $angeltype->id])),
]); ]);
} }
@ -76,7 +76,7 @@ function UserAngelTypes_confirm_all_view(AngelType $angeltype)
button(angeltype_link($angeltype->id), icon('x-lg') . __('form.cancel')), button(angeltype_link($angeltype->id), icon('x-lg') . __('form.cancel')),
form_submit('confirm_all', icon('check-lg') . __('Yes'), 'btn-primary', false), form_submit('confirm_all', icon('check-lg') . __('Yes'), 'btn-primary', false),
]), ]),
], page_link_to('user_angeltypes', ['action' => 'confirm_all', 'angeltype_id' => $angeltype->id])), ], url('/user-angeltypes', ['action' => 'confirm_all', 'angeltype_id' => $angeltype->id])),
]); ]);
} }
@ -100,7 +100,7 @@ function UserAngelType_confirm_view(UserAngelType $user_angeltype, User $user, A
button(angeltype_link($angeltype->id), icon('x-lg') . __('form.cancel')), button(angeltype_link($angeltype->id), icon('x-lg') . __('form.cancel')),
form_submit('confirm_user', icon('check-lg') . __('Yes'), 'btn-primary', false), form_submit('confirm_user', icon('check-lg') . __('Yes'), 'btn-primary', false),
]), ]),
], page_link_to('user_angeltypes', ['action' => 'confirm', 'user_angeltype_id' => $user_angeltype->id])), ], url('/user-angeltypes', ['action' => 'confirm', 'user_angeltype_id' => $user_angeltype->id])),
]); ]);
} }
@ -124,7 +124,7 @@ function UserAngelType_delete_view(UserAngelType $user_angeltype, User $user, An
button(angeltype_link($angeltype->id), icon('x-lg') . __('form.cancel')), button(angeltype_link($angeltype->id), icon('x-lg') . __('form.cancel')),
form_submit('delete', icon('check-lg') . __('Yes'), 'btn-primary', false), form_submit('delete', icon('check-lg') . __('Yes'), 'btn-primary', false),
]), ]),
], page_link_to('user_angeltypes', ['action' => 'delete', 'user_angeltype_id' => $user_angeltype->id])), ], url('/user-angeltypes', ['action' => 'delete', 'user_angeltype_id' => $user_angeltype->id])),
], true); ], true);
} }
@ -145,7 +145,7 @@ function UserAngelType_add_view(AngelType $angeltype, $users_source, $user_id)
msg(), msg(),
buttons([ buttons([
button( button(
page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id]), url('/angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id]),
__('back'), __('back'),
'back' 'back'
), ),
@ -179,8 +179,8 @@ function UserAngelType_join_view($user, AngelType $angeltype)
button(angeltype_link($angeltype->id), icon('x-lg') . __('form.cancel')), button(angeltype_link($angeltype->id), icon('x-lg') . __('form.cancel')),
form_submit('submit', icon('check-lg') . __('form.save'), 'btn-primary', false), form_submit('submit', icon('check-lg') . __('form.save'), 'btn-primary', false),
]), ]),
], page_link_to( ], url(
'user_angeltypes', '/user-angeltypes',
['action' => 'add', 'angeltype_id' => $angeltype->id, 'user_id' => $user->id] ['action' => 'add', 'angeltype_id' => $angeltype->id, 'user_id' => $user->id]
)), )),
]); ]);

34
includes/view/User_view.php
View File

@ -59,7 +59,7 @@ function User_edit_vouchers_view($user)
form_spinner('vouchers', __('Number of vouchers given out'), $user->state->got_voucher), form_spinner('vouchers', __('Number of vouchers given out'), $user->state->got_voucher),
form_submit('submit', __('form.save')), form_submit('submit', __('form.save')),
], ],
page_link_to('users', ['action' => 'edit_vouchers', 'user_id' => $user->id]) url('/users', ['action' => 'edit_vouchers', 'user_id' => $user->id])
), ),
] ]
); );
@ -115,7 +115,7 @@ function Users_view(
? $user->personalData->planned_departure_date->format(__('Y-m-d')) : ''; ? $user->personalData->planned_departure_date->format(__('Y-m-d')) : '';
$u['last_login_at'] = $user->last_login_at ? $user->last_login_at->format(__('m/d/Y h:i a')) : ''; $u['last_login_at'] = $user->last_login_at ? $user->last_login_at->format(__('m/d/Y h:i a')) : '';
$u['actions'] = table_buttons([ $u['actions'] = table_buttons([
button_icon(page_link_to('admin_user', ['id' => $user->id]), 'pencil', 'btn-sm'), button_icon(url('/admin-user', ['id' => $user->id]), 'pencil', 'btn-sm'),
]); ]);
$usersList[] = $u; $usersList[] = $u;
} }
@ -190,7 +190,7 @@ function Users_view(
function Users_table_header_link($column, $label, $order_by) function Users_table_header_link($column, $label, $order_by)
{ {
return '<a href="' return '<a href="'
. page_link_to('users', ['OrderBy' => $column]) . url('/users', ['OrderBy' => $column])
. '">' . '">'
. $label . ($order_by == $column ? ' <span class="caret"></span>' : '') . $label . ($order_by == $column ? ' <span class="caret"></span>' : '')
. '</a>'; . '</a>';
@ -271,7 +271,7 @@ function User_last_shift_render($user)
function User_view_shiftentries($needed_angel_type) function User_view_shiftentries($needed_angel_type)
{ {
$shift_info = '<br><b><a href="' $shift_info = '<br><b><a href="'
. page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $needed_angel_type['id']]) . url('/angeltypes', ['action' => 'view', 'angeltype_id' => $needed_angel_type['id']])
. '">' . $needed_angel_type['name'] . '</a>:</b> '; . '">' . $needed_angel_type['name'] . '</a>:</b> ';
$shift_entries = []; $shift_entries = [];
@ -339,7 +339,7 @@ function User_view_myshift(Shift $shift, $user_source, $its_me)
]; ];
if ($its_me || auth()->can('user_shifts_admin')) { if ($its_me || auth()->can('user_shifts_admin')) {
$myshift['actions'][] = button( $myshift['actions'][] = button(
page_link_to('user_myshifts', ['edit' => $shift->shift_entry_id, 'id' => $user_source->id]), url('/user-myshifts', ['edit' => $shift->shift_entry_id, 'id' => $user_source->id]),
icon('pencil') . __('edit'), icon('pencil') . __('edit'),
'btn-sm' 'btn-sm'
); );
@ -554,7 +554,7 @@ function User_view(
icon('person') . ($goodie_tshirt ? __('Shirt') : __('Goodie')) icon('person') . ($goodie_tshirt ? __('Shirt') : __('Goodie'))
) : '', ) : '',
$admin_user_privilege ? button( $admin_user_privilege ? button(
page_link_to('admin_user', ['id' => $user_source->id]), url('/admin-user', ['id' => $user_source->id]),
icon('pencil') . __('edit') icon('pencil') . __('edit')
) : '', ) : '',
(($admin_user_privilege || $auth->can('admin_arrive')) && !$user_source->state->arrived) ? (($admin_user_privilege || $auth->can('admin_arrive')) && !$user_source->state->arrived) ?
@ -562,11 +562,11 @@ function User_view(
form_hidden('action', 'arrived'), form_hidden('action', 'arrived'),
form_hidden('user', $user_source->id), form_hidden('user', $user_source->id),
form_submit('submit', __('user.arrived'), '', false), form_submit('submit', __('user.arrived'), '', false),
], page_link_to('admin_arrive'), true) : '', ], url('/admin-arrive'), true) : '',
($admin_user_privilege || $auth->can('voucher.edit')) && config('enable_voucher') ? ($admin_user_privilege || $auth->can('voucher.edit')) && config('enable_voucher') ?
button( button(
page_link_to( url(
'users', '/users',
['action' => 'edit_vouchers', 'user_id' => $user_source->id] ['action' => 'edit_vouchers', 'user_id' => $user_source->id]
), ),
icon('valentine') . __('Vouchers') icon('valentine') . __('Vouchers')
@ -579,15 +579,15 @@ function User_view(
], 'mb-2'), ], 'mb-2'),
$its_me ? table_buttons([ $its_me ? table_buttons([
button( button(
page_link_to('settings/profile'), url('/settings/profile'),
icon('person-fill-gear') . __('settings.settings') icon('person-fill-gear') . __('settings.settings')
), ),
$auth->can('ical') ? button( $auth->can('ical') ? button(
page_link_to('ical', ['key' => $user_source->api_key]), url('/ical', ['key' => $user_source->api_key]),
icon('calendar-week') . __('iCal Export') icon('calendar-week') . __('iCal Export')
) : '', ) : '',
$auth->can('shifts_json_export') ? button( $auth->can('shifts_json_export') ? button(
page_link_to('shifts_json_export', ['key' => $user_source->api_key]), url('/shifts-json-export', ['key' => $user_source->api_key]),
icon('braces') . __('JSON Export') icon('braces') . __('JSON Export')
) : '', ) : '',
( (
@ -595,7 +595,7 @@ function User_view(
|| $auth->can('ical') || $auth->can('ical')
|| $auth->can('atom') || $auth->can('atom')
) ? button( ) ? button(
page_link_to('user_myshifts', ['reset' => 1]), url('/user-myshifts', ['reset' => 1]),
icon('arrow-repeat') . __('Reset API key') icon('arrow-repeat') . __('Reset API key')
) : '', ) : '',
], 'mb-2') : '', ], 'mb-2') : '',
@ -623,7 +623,7 @@ function User_view(
: '', : '',
$auth->can('user_messages') ? $auth->can('user_messages') ?
heading( heading(
'<a href="' . page_link_to('/messages/' . $user_source->id) . '">' '<a href="' . url('/messages/' . $user_source->id) . '">'
. icon('envelope') . icon('envelope')
. '</a>' . '</a>'
) )
@ -647,7 +647,7 @@ function User_view(
$its_me && count($shifts) == 0 $its_me && count($shifts) == 0
? error(sprintf( ? error(sprintf(
__('Go to the <a href="%s">shifts table</a> to sign yourself up for some shifts.'), __('Go to the <a href="%s">shifts table</a> to sign yourself up for some shifts.'),
page_link_to('user_shifts') url('/user-shifts')
), true) ), true)
: '', : '',
$its_me ? ical_hint() : '', $its_me ? ical_hint() : '',
@ -878,9 +878,9 @@ function User_Pronoun_render(User $user): string
*/ */
function render_profile_link($text, $user_id = null, $class = '') function render_profile_link($text, $user_id = null, $class = '')
{ {
$profile_link = page_link_to('settings/profile'); $profile_link = url('/settings/profile');
if (!is_null($user_id)) { if (!is_null($user_id)) {
$profile_link = page_link_to('users', ['action' => 'view', 'user_id' => $user_id]); $profile_link = url('/users', ['action' => 'view', 'user_id' => $user_id]);
} }
return sprintf( return sprintf(

2
resources/views/admin/locations/index.twig
View File

@ -52,7 +52,7 @@
<td> <td>
<div class="d-flex ms-auto"> <div class="d-flex ms-auto">
{{ m.button(m.icon('pencil'), url('admin/locations/edit/' ~ location.id), null, 'sm', __('form.edit')) }} {{ m.button(m.icon('pencil'), url('/admin/locations/edit/' ~ location.id), null, 'sm', __('form.edit')) }}
<form method="post" class="ps-1"> <form method="post" class="ps-1">
{{ csrf() }} {{ csrf() }}

2
resources/views/errors/403.twig
View File

@ -10,6 +10,6 @@
{% do session_set('previous_page', request.url) %} {% do session_set('previous_page', request.url) %}
<p>{{ __('page.403.login') }}</p> <p>{{ __('page.403.login') }}</p>
<p>{{ m.button(__('general.login'), url('login')) }}</p> <p>{{ m.button(__('general.login'), url('/login')) }}</p>
{% endif %} {% endif %}
{% endblock %} {% endblock %}

4
resources/views/layouts/app.twig
View File

@ -17,8 +17,8 @@
{% if page() == 'meetings' -%} {% if page() == 'meetings' -%}
{% set parameters = {'meetings': 1}|merge(parameters) -%} {% set parameters = {'meetings': 1}|merge(parameters) -%}
{% endif %} {% endif %}
<link href="{{ url('atom', parameters) }}" type="application/atom+xml" rel="alternate" title="Atom Feed"> <link href="{{ url('/atom', parameters) }}" type="application/atom+xml" rel="alternate" title="Atom Feed">
<link href="{{ url('rss', parameters) }}" type="application/rss+xml" rel="alternate" title="RSS Feed" /> <link href="{{ url('/rss', parameters) }}" type="application/rss+xml" rel="alternate" title="RSS Feed" />
{%- endif %} {%- endif %}
{% endblock %} {% endblock %}

2
resources/views/layouts/parts/footer.twig
View File

@ -44,6 +44,6 @@
{% endfor %} {% endfor %}
<a href="https://github.com/engelsystem/engelsystem/issues">{{ __('Bugs / Features') }}</a> <a href="https://github.com/engelsystem/engelsystem/issues">{{ __('Bugs / Features') }}</a>
· <a href="https://github.com/engelsystem/engelsystem/">{{ __('Development Platform') }}</a> · <a href="https://github.com/engelsystem/engelsystem/">{{ __('Development Platform') }}</a>
· <a href="{{ url('credits') }}">{{ __('Credits') }}</a> · <a href="{{ url('/credits') }}">{{ __('Credits') }}</a>
</div> </div>
</div> </div>

12
resources/views/layouts/parts/navbar.twig
View File

@ -63,17 +63,17 @@
{% endif %} {% endif %}
{% if has_permission_to('login') %} {% if has_permission_to('login') %}
{{ _self.toolbar_item(__('general.login'), url('login'), 'login', 'box-arrow-in-right') }} {{ _self.toolbar_item(__('general.login'), url('/login'), 'login', 'box-arrow-in-right') }}
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if is_user() %} {% if is_user() %}
{{ _self.toolbar_item(menuUserShiftState(user), url('shifts', {'action': 'next'}), '', 'clock', __('Next shift')) }} {{ _self.toolbar_item(menuUserShiftState(user), url('/shifts', {'action': 'next'}), '', 'clock', __('Next shift')) }}
{% if has_permission_to('user_messages') %} {% if has_permission_to('user_messages') %}
{{ _self.toolbar_item( {{ _self.toolbar_item(
user_messages ? '<span class="badge bg-danger">' ~ user_messages ~ '</span>' : '', user_messages ? '<span class="badge bg-danger">' ~ user_messages ~ '</span>' : '',
url('messages'), url('/messages'),
'messages', 'messages',
'envelope' 'envelope'
) }} ) }}
@ -88,15 +88,15 @@
</a> </a>
<ul class="dropdown-menu dropdown-menu-end"> <ul class="dropdown-menu dropdown-menu-end">
{% if has_permission_to('user_myshifts') %} {% if has_permission_to('user_myshifts') %}
{{ _self.dropdown_item(__('profile.my-shifts'), url('users', {'action': 'view'}), 'users', m.icon('calendar-range')) }} {{ _self.dropdown_item(__('profile.my-shifts'), url('/users', {'action': 'view'}), 'users', m.icon('calendar-range')) }}
{% endif %} {% endif %}
{% if has_permission_to('user_settings') %} {% if has_permission_to('user_settings') %}
{{ _self.dropdown_item(__('settings.settings'), url('settings/profile'), 'settings/profile', m.icon('person-fill-gear')) }} {{ _self.dropdown_item(__('settings.settings'), url('/settings/profile'), 'settings/profile', m.icon('person-fill-gear')) }}
{% endif %} {% endif %}
{% if has_permission_to('logout') %} {% if has_permission_to('logout') %}
{{ _self.dropdown_item(__('Logout'), url('logout'), 'logout', m.icon('box-arrow-left')) }} {{ _self.dropdown_item(__('Logout'), url('/logout'), 'logout', m.icon('box-arrow-left')) }}
{% endif %} {% endif %}
</ul> </ul>
</li> </li>

2
resources/views/macros/base.twig
View File

@ -23,7 +23,7 @@
{% endmacro %} {% endmacro %}
{% macro user(user, opt) %} {% macro user(user, opt) %}
<a href="{{ opt.url|default(url('users', {'action': 'view', 'user_id': user.id})) }}" <a href="{{ opt.url|default(url('/users', {'action': 'view', 'user_id': user.id})) }}"
{%- if not user.state.arrived %} class="text-muted"{% endif -%} {%- if not user.state.arrived %} class="text-muted"{% endif -%}
> >
{{ _self.angel() }} {{ user.displayName }} {{ _self.angel() }} {{ user.displayName }}

2
resources/views/pages/angeltypes/about.twig
View File

@ -49,7 +49,7 @@
{{ angeltype.name }} {{ angeltype.name }}
{% if is_user() %} {% if is_user() %}
<a href="{{ url('angeltypes', {'action': 'view', 'angeltype_id': angeltype.id}) }}" <a href="{{ url('/angeltypes', {'action': 'view', 'angeltype_id': angeltype.id}) }}"
class="btn btn-secondary float-end"> class="btn btn-secondary float-end">
{{ m.icon('arrow-right') }} {{ m.icon('arrow-right') }}
</a> </a>

2
resources/views/pages/design.twig
View File

@ -59,7 +59,7 @@
<ul> <ul>
{% for id,theme in themes %} {% for id,theme in themes %}
<li> <li>
<a href="{{ url('design', {'theme': id}) }}" <a href="{{ url('/design', {'theme': id}) }}"
{%- if id == themeId %} class="text-info"{% endif %}> {%- if id == themeId %} class="text-info"{% endif %}>
{{ theme['name'] }} {{ theme['name'] }}
</a> </a>

4
resources/views/pages/faq/overview.twig
View File

@ -12,7 +12,7 @@
{{ block('title') }} {{ block('title') }}
{%- if has_permission_to('faq.edit') -%} {%- if has_permission_to('faq.edit') -%}
{{ m.button(m.icon('plus-lg'), url('admin/faq'), 'secondary') }} {{ m.button(m.icon('plus-lg'), url('/admin/faq'), 'secondary') }}
{%- endif %} {%- endif %}
</h1> </h1>
@ -56,7 +56,7 @@
{% if has_permission_to('faq.edit') %} {% if has_permission_to('faq.edit') %}
<span class="ms-auto"> <span class="ms-auto">
{{ m.button(m.icon('pencil'), url('admin/faq/' ~ item.id), 'secondary', 'sm') }} {{ m.button(m.icon('pencil'), url('/admin/faq/' ~ item.id), 'secondary', 'sm') }}
</span> </span>
{% endif %} {% endif %}
</div> </div>

2
resources/views/pages/login.twig
View File

@ -78,7 +78,7 @@
<div class="row"> <div class="row">
<div class="mb-3 btn-group"> <div class="mb-3 btn-group">
{% for name,config in config('oauth') %} {% for name,config in config('oauth') %}
<a href="{{ url('oauth/' ~ name) }}" class="btn btn-primary btn-lg{% if config.hidden|default(false) %} d-none{% endif %}"> <a href="{{ url('/oauth/' ~ name) }}" class="btn btn-primary btn-lg{% if config.hidden|default(false) %} d-none{% endif %}">
{{ __( {{ __(
'oauth.login-using-provider', 'oauth.login-using-provider',
[__(config.name|default(name|capitalize))] [__(config.name|default(name|capitalize))]

4
resources/views/pages/messages/overview.twig
View File

@ -39,14 +39,14 @@
{% for c in conversations %} {% for c in conversations %}
<tr> <tr>
<td> <td>
{{ m.user(c.other_user, {'pronoun': true, 'url': url('messages/' ~ c.other_user.id ~ '#newest')}) }} {{ m.user(c.other_user, {'pronoun': true, 'url': url('/messages/' ~ c.other_user.id ~ '#newest')}) }}
{% if c.unread_messages > 0 %} {% if c.unread_messages > 0 %}
<span class="badge bg-danger">{{ c.unread_messages }}</span> <span class="badge bg-danger">{{ c.unread_messages }}</span>
{% endif %} {% endif %}
</td> </td>
<td> <td>
<a href="{{ url('messages/' ~ c.other_user.id ~ '#newest') }}"> <a href="{{ url('/messages/' ~ c.other_user.id ~ '#newest') }}">
{{ c.latest_message.text|length > 100 ? c.latest_message.text|slice(0, 100) ~ '…' : c.latest_message.text }} {{ c.latest_message.text|length > 100 ? c.latest_message.text|slice(0, 100) ~ '…' : c.latest_message.text }}
</a> </a>
</td> </td>

10
resources/views/pages/news/overview.twig
View File

@ -9,7 +9,7 @@
<h1> <h1>
{{ block('title') }} {{ block('title') }}
{%- if has_permission_to('admin_news') and is_overview|default(false) -%} {%- if has_permission_to('admin_news') and is_overview|default(false) -%}
{{ m.button(m.icon('plus-lg'), url('admin/news', only_meetings ? {'meeting': 1} : {}), 'secondary') }} {{ m.button(m.icon('plus-lg'), url('/admin/news', only_meetings ? {'meeting': 1} : {}), 'secondary') }}
{%- endif %} {%- endif %}
</h1> </h1>
@ -51,7 +51,7 @@
<div class="card {% if news.is_highlighted %}bg-warning{% elseif news.is_meeting %}bg-info{% elseif theme.type =='light' %}bg-light{% else %}bg-dark{% endif %} mb-4"> <div class="card {% if news.is_highlighted %}bg-warning{% elseif news.is_meeting %}bg-info{% elseif theme.type =='light' %}bg-light{% else %}bg-dark{% endif %} mb-4">
{% if is_overview|default(false) %} {% if is_overview|default(false) %}
<div class="card-header {% if news.is_meeting and theme.type == 'dark' %}text-white{% endif %}"> <div class="card-header {% if news.is_meeting and theme.type == 'dark' %}text-white{% endif %}">
<a href="{{ url('news/' ~ news.id) }}" class="text-inherit"> <a href="{{ url('/news/' ~ news.id) }}" class="text-inherit">
{% if news.is_pinned %}{{ m.icon('pin-angle') }}{% endif %} {% if news.is_pinned %}{{ m.icon('pin-angle') }}{% endif %}
{% if news.is_meeting %}{{ __('news.is_meeting') }}{% endif %} {% if news.is_meeting %}{{ __('news.is_meeting') }}{% endif %}
{{ news.title }} {{ news.title }}
@ -62,7 +62,7 @@
<div class="card-body bg-body"> <div class="card-body bg-body">
{{ news.text(not is_overview)|markdown }} {{ news.text(not is_overview)|markdown }}
{% if is_overview and news.text != news.text(false) %} {% if is_overview and news.text != news.text(false) %}
{{ m.button(__('news.read_more'), url('news/' ~ news.id), null, 'sm', null, null, 'chevron-double-right') }} {{ m.button(__('news.read_more'), url('/news/' ~ news.id), null, 'sm', null, null, 'chevron-double-right') }}
{% endif %} {% endif %}
</div> </div>
@ -85,7 +85,7 @@
{% if show_comments_link|default(false) %} {% if show_comments_link|default(false) %}
<div> <div>
<a href="{{ url('news/' ~ news.id) }}" class="me-1"> <a href="{{ url('/news/' ~ news.id) }}" class="me-1">
{{ m.icon('chat-left-text') }} {{ __('news.comments') }} {{ m.icon('chat-left-text') }} {{ __('news.comments') }}
</a> </a>
<span class="badge bg-primary">{{ news.comments.count() }}</span> <span class="badge bg-primary">{{ news.comments.count() }}</span>
@ -95,7 +95,7 @@
{% if has_permission_to('admin_news') %} {% if has_permission_to('admin_news') %}
<div> <div>
{{ m.button(m.icon('pencil'), url('admin/news/' ~ news.id), 'secondary', 'sm') }} {{ m.button(m.icon('pencil'), url('/admin/news/' ~ news.id), 'secondary', 'sm') }}
</div> </div>
{% endif %} {% endif %}
</div> </div>

4
resources/views/pages/questions/overview.twig
View File

@ -11,7 +11,7 @@
<div class="page-header"> <div class="page-header">
<h1> <h1>
{{ block('title') }} {{ block('title') }}
{{ m.button(m.icon('plus-lg'), url('questions/new'), 'secondary') }} {{ m.button(m.icon('plus-lg'), url('/questions/new'), 'secondary') }}
</h1> </h1>
</div> </div>
@ -59,7 +59,7 @@
{% endif %} {% endif %}
{% if has_permission_to('question.edit') %} {% if has_permission_to('question.edit') %}
{{ m.button(m.icon('pencil'), url('admin/questions/' ~ question.id), null, 'sm') }} {{ m.button(m.icon('pencil'), url('/admin/questions/' ~ question.id), null, 'sm') }}
</div> </div>
{% endif %} {% endif %}
</div> </div>

2
src/Middleware/LegacyMiddleware.php
View File

@ -133,7 +133,7 @@ class LegacyMiddleware implements MiddlewareInterface
return [admin_shifts_history_title(), admin_shifts_history()]; return [admin_shifts_history_title(), admin_shifts_history()];
} }
throw_redirect(page_link_to('login')); throw_redirect(url('/login'));
return []; return [];
} }