diff options
Diffstat (limited to 'includes/pages')
| -rw-r--r-- | includes/pages/admin_arrive.php | 1 | ||||
| -rw-r--r-- | includes/pages/guest_credits.php | 2 | ||||
| -rw-r--r-- | includes/pages/user_myshifts.php | 2 | ||||
| -rw-r--r-- | includes/pages/user_shifts.php | 4 |
4 files changed, 5 insertions, 4 deletions
diff --git a/includes/pages/admin_arrive.php b/includes/pages/admin_arrive.php index c6b3eccd..cb03437f 100644 --- a/includes/pages/admin_arrive.php +++ b/includes/pages/admin_arrive.php @@ -21,6 +21,7 @@ function admin_arrive() if ($request->has('search')) { $search = strip_request_item('search'); + $search = trim($search); } if ($request->has('reset') && preg_match('/^\d+$/', $request->input('reset'))) { diff --git a/includes/pages/guest_credits.php b/includes/pages/guest_credits.php index 5f90c97c..8388c386 100644 --- a/includes/pages/guest_credits.php +++ b/includes/pages/guest_credits.php @@ -13,5 +13,5 @@ function credits_title() */ function guest_credits() { - return view(__DIR__ . '/../../templates/pages/credits.html'); + return view(__DIR__ . '/../../resources/views/pages/credits.html'); } diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php index e679d788..2a8a5d5a 100644 --- a/includes/pages/user_myshifts.php +++ b/includes/pages/user_myshifts.php @@ -71,7 +71,7 @@ function user_myshifts() $shifts_user['UID'], ] ); - if (count($shift) > 0) { + if (!empty($shift)) { $freeloaded = $shift['freeloaded']; $freeload_comment = $shift['freeload_comment']; diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index 3c1ed6fa..6754292e 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -224,7 +224,7 @@ function view_user_shifts() return page([ div('col-md-12', [ msg(), - view(__DIR__ . '/../../templates/pages/user-shifts.html', [ + view(__DIR__ . '/../../resources/views/pages/user-shifts.html', [ 'title' => shifts_title(), 'room_select' => make_select($rooms, $shiftsFilter->getRooms(), 'rooms', __('Rooms')), 'start_select' => html_select_key( @@ -333,7 +333,7 @@ function make_select($items, $selected, $name, $title = null, $additionalButtons . (in_array($i['id'], $selected) ? ' checked="checked"' : '') . ' > ' . $i['name'] . '</label>' . (!isset($i['enabled']) || $i['enabled'] ? '' : glyph('lock')) - . '</div><br />'; + . '</div>'; } $html .= '<div id="selection_' . $name . '" class="selection ' . $name . '">' . "\n"; $html .= implode("\n", $htmlItems); |