Merge remote-tracking branch 'origin/master'

# Conflicts:
#	public/css/theme0.css
#	public/css/theme1.css
#	public/css/theme2.css
#	public/css/theme3.css
#	public/css/theme4.css
#	public/css/theme5.css
#	public/css/theme6.css

3 files changed, 2 insertions, 27 deletions

diff --git a/includes/controller/shifts_controller.php b/includes/controller/shifts_controller.php
index 5930595e..73a5d29f 100644
--- a/includes/controller/shifts_controller.php
+++ b/includes/controller/shifts_controller.php
@@ -346,32 +346,6 @@ function shift_next_controller()
 }
 
 /**
- * Export all shifts using api-key.
- */
-function shifts_json_export_all_controller()
-{
-    $api_key = config('api_key');
-    $request = request();
-
-    if (empty($api_key)) {
-        engelsystem_error('Config contains empty apikey.');
-    }
-
-    if (!$request->has('api_key')) {
-        engelsystem_error('Missing parameter api_key.');
-    }
-
-    if ($request->input('api_key') != $api_key) {
-        engelsystem_error('Invalid api_key.');
-    }
-
-    $shifts_source = Shifts();
-
-    header('Content-Type: application/json; charset=utf-8');
-    raw_output(json_encode($shifts_source));
-}
-
-/**
  * Export filtered shifts via JSON.
  * (Like iCal Export or shifts view)
  */
diff --git a/includes/pages/admin_arrive.php b/includes/pages/admin_arrive.php
index 48e2c91f..e925bfd4 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/user_shifts.php b/includes/pages/user_shifts.php
index 81b405b1..f3ffd501 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -332,7 +332,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);