From 3cb2109afd78dc5598a95cacc735592e6981ca41 Mon Sep 17 00:00:00 2001
From: James Brooks <jbrooksuk@me.com>
Date: Fri, 30 Dec 2016 19:21:45 +0000
Subject: [PATCH] Simplify how we fetch incidents

---
 app/Http/Controllers/StatusPageController.php | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/StatusPageController.php b/app/Http/Controllers/StatusPageController.php
index 982ed6c9..f7af2bed 100644
--- a/app/Http/Controllers/StatusPageController.php
+++ b/app/Http/Controllers/StatusPageController.php
@@ -75,17 +75,10 @@ class StatusPageController extends AbstractApiController
             }
         }
 
-        $daysToShow = Config::get('setting.app_incident_days', 0) - 1;
-        if ($daysToShow < 0) {
-            $daysToShow = 0;
-            $incidentDays = [];
-        } else {
-            $incidentDays = range(0, $daysToShow);
-        }
+        $daysToShow = max(0, (int) Config::get('setting.app_incident_days', 0) - 1);
+        $incidentDays = range(0, $daysToShow);
 
-        $incidentVisibility = Auth::check() ? 0 : 1;
-
-        $allIncidents = Incident::where('visible', '>=', $incidentVisibility)->whereBetween('occurred_at', [
+        $allIncidents = Incident::where('visible', '>=', (int) !Auth::check())->whereBetween('occurred_at', [
             $startDate->copy()->subDays($daysToShow)->format('Y-m-d').' 00:00:00',
             $startDate->format('Y-m-d').' 23:59:59',
         ])->orderBy('occurred_at', 'desc')->get()->groupBy(function (Incident $incident) {
@@ -106,7 +99,7 @@ class StatusPageController extends AbstractApiController
         // Sort the array so it takes into account the added days
         $allIncidents = $allIncidents->sortBy(function ($value, $key) {
             return strtotime($key);
-        }, SORT_REGULAR, true)->all();
+        }, SORT_REGULAR, true);
 
         return View::make('index')
             ->withDaysToShow($daysToShow)