Fix images starting with / or not

Reviewed-on: #17

app/Http/Controllers/CalendarController.php

@@ -17,7 +17,7 @@ class CalendarController extends Controller
 
     public function overview(Request $request)
     {
-        $apiResult = $this->API('agenda/overzicht');
+        $apiResult = $this->API('agenda/overzicht?aantal=100');
         $calendar = [];
         foreach($apiResult->events as $calendarItem)
         {

app/Http/Controllers/Controller.php

@@ -19,17 +19,17 @@ class Controller extends BaseController
 
     private function getDataFromFileAndConvert($file, $path, $class, $maxItems = 0)
     {
-        $data = json_decode(Storage::disk('local')->get($file));
+        $data = json_decode(Storage::get($file));
         foreach ($path as $subobject) {
-            $data = $data->$subobject;
+            $data = $data->$subobject ?? [];
-	}
+        }
         $items = [];
         foreach ($data as $item_data) {
             $items[] = new $class($item_data);
             if ($maxItems && count($items) == $maxItems) {
                 break;
             }
-	}
+        }
 
         return $items;
     }
@@ -47,7 +47,7 @@ class Controller extends BaseController
             $view->with('data', $this->getDataFromFileAndConvert('populair_nieuws.json', ['news'], '\Model\NewsItem'));
         });
         View::composer('widgets.nustraks', function ($view) {
-            $data = json_decode(Storage::disk('local')->get('nu_straks.json'))->schedule;
+            $data = json_decode(Storage::get('nu_straks.json'))->schedule;
             $programs = [];
             foreach ($data as $item_data) {
                 $programs[] = $program = new \Model\Program($item_data->program);
@@ -57,7 +57,7 @@ class Controller extends BaseController
 
             // Need a bit of slack here, otherwise the current program may show up
             $now = new \DateTimeImmutable('2 minutes ago');
-            $data = json_decode(Storage::disk('local')->get('zojuist.json'))->schedule;
+            $data = json_decode(Storage::get('zojuist.json'))->schedule;
             $i = 0;
             foreach (array_reverse($data) as $item_data) {
                 $recent = $program = new \Model\Program($item_data->program);
@@ -72,8 +72,10 @@ class Controller extends BaseController
             $view->with('data', $programs);
         });
         View::composer('widgets.laatstepodcasts', function ($view) {
-            $view->with('data',
+            $view->with(
-                $this->getDataFromFileAndConvert('laatste_podcasts.json', ['podcasts'], '\Model\Podcast'));
+                'data',
+                $this->getDataFromFileAndConvert('laatste_podcasts.json', ['podcasts'], '\Model\Podcast')
+            );
         });
         View::composer('widgets.regioagenda', function ($view) {
             $view->with('data', $this->getDataFromFileAndConvert('regioagenda.json', [], '\Model\CalendarEvent'));
@@ -84,8 +86,13 @@ class Controller extends BaseController
         View::composer('widgets.menu', function ($view) {
             $view->with('news', $this->getDataFromFileAndConvert('laatste_nieuws.json', ['news'], '\Model\NewsItem'))
                 ->with('popular', $this->getDataFromFileAndConvert('populair_nieuws.json', ['news'], '\Model\NewsItem', 3))
-                ->with('podcasts',
+                ->with(
-                    $this->getDataFromFileAndConvert('laatste_podcasts.json', ['podcasts'], '\Model\Podcast'));
+                    'podcasts',
+                    $this->getDataFromFileAndConvert('laatste_podcasts.json', ['podcasts'], '\Model\Podcast')
+                );
+        });
+        View::composer('widgets.menu', function($view) { 
+	    $view->with('items', json_decode(Storage::get('static/menu.json')));
         });
 
         View::share('disableBanners', env('DISABLE_BANNERS', false));
@@ -97,14 +104,16 @@ class Controller extends BaseController
             return;
         }
 
-        app('db')->insert('INSERT INTO `pagestats`(`type`, `item_id`, `visitor_ip`, `session`, `referer`) VALUES(:type, :id, :ip, :session, :referer)',
+        app('db')->insert(
+            'INSERT INTO `pagestats`(`type`, `item_id`, `visitor_ip`, `session`, `referer`) VALUES(:type, :id, :ip, :session, :referer)',
             [
                 'type' => $type,
                 'id' => $id,
                 'ip' => $request->server('REMOTE_ADDR'),
                 'session' => md5(Session::getId()),
                 'referer' => $request->server('HTTP_REFERRER')
-            ]);
+            ]
+        );
     }
 
     protected function API($url)
@@ -113,16 +122,16 @@ class Controller extends BaseController
             'ssl' => [
                 "verify_peer" => false,
                 "verify_peer_name" => false,
-	    ],
+            ],
-	    'http' => [
+            'http' => [
-		'method' => 'GET',
+                'method' => 'GET',
                 'header' => 'X-Api-Key: ' . sha1(request()->server('REMOTE_ADDR')) . "\r\n"
-                         . 'X-User-Agent: ' . request()->server('HTTP_USER_AGENT') . "\r\n"
+                    . 'X-User-Agent: ' . request()->server('HTTP_USER_AGENT') . "\r\n"
-	    ]
+            ]
         ];
-//\dump($http_response_header);
+        //\dump($http_response_header);
-	$result = @file_get_contents($this->API_URL . $url, false, stream_context_create($arrContextOptions));
+        $result = @file_get_contents($this->API_URL . $url, false, stream_context_create($arrContextOptions));
-	return $result ? json_decode($result) : null;
+        return $result ? json_decode($result) : null;
     }
 
     protected function checkAPI($url)
@@ -143,6 +152,7 @@ class Controller extends BaseController
         return is_object($obj) ? new \DateTime($obj->date, new \DateTimeZone($obj->timezone)) : \Carbon\Carbon::parse($obj)->setTimezone(date_default_timezone_get());
     }
 
+    /*
     public function __call($method, $arguments)
     {
         if (substr($method, 0, 5) == 'view_') {
@@ -152,13 +162,14 @@ class Controller extends BaseController
             }
         }
 
-        return abort(404);
+         return abort(404);
     }
+     */
 
     public function getSidebareData()
     {
         $populair = [];
-	$apiResult = $this->API('nieuws/populair?aantal=5');
+        $apiResult = $this->API('nieuws/populair?aantal=5');
         foreach ($apiResult->news as $_newsItem) {
             $populair[] = new \Model\NewsItem($_newsItem);
         }
@@ -171,4 +182,23 @@ class Controller extends BaseController
 
         return ['newsItems' => $newsItems, 'populair' => $populair];
     }
+
+    public function static_page($slug)
+    {
+	    if (view()->exists($slug)) {
+          return view($slug);
+	}
+
+        $page = $this->API('statisch/' . $slug);
+        if ($page == null) {
+            return abort(404);
+        }
+
+        $page->published = Controller::JsonToDateTime($page->published);
+        if ($page->edited) {
+            $page->edited = Controller::JsonToDateTime($page->edited);
+        }
+        
+        return view('static', compact('page'));
+    }
 }

app/Http/Controllers/NewsController.php

@@ -16,11 +16,11 @@ class NewsController extends Controller
 
     public function show(Request $request, $id)
     {
-	parent::registerView($request, 'nieuws', $id);
+        parent::registerView($request, 'nieuws', $id);
-	$preview = "";
+        $preview = "";
-	if(request()->get('preview', null) != null) {
+        if(request()->get('preview', null) != null) {
-	    $preview = "?preview=" . request()->get('preview');
+            $preview = "?preview=" . request()->get('preview');
-	}
+        }
         $apiResult = $this->API('nieuws/bericht/' . $id . $preview);
         $newsItem = new \Model\NewsItem($apiResult->news);
 
@@ -29,21 +29,18 @@ class NewsController extends Controller
 	        if (!$newsItem->content) return redirect('//nhnieuws.nl/gooi');
 
 	    case 2:
-		if(isset($apiResult->source->article)) {
+		    if(isset($apiResult->source->article)) {
                 $source = $apiResult->source->article;
                 $newsItem->published = self::TimestampToDateTime($source->created);
                 $newsItem->edited = self::TimestampToDateTime($source->updated);
                 $newsItem->author = $source->author;
                 $newsItem->images = null; // Images will be embedded
                 $newsItem->video = null; // Videos will be embedded
-		$newsItem->content = $source->blocks;
+		        $newsItem->content = $source->blocks;
-		} elseif(isset($apiResult->source->blocks)) {
+		    } elseif(isset($apiResult->source->blocks)) {
-			$newsItem->content = $apiResult->source->blocks; 
+			    $newsItem->content = $apiResult->source->blocks;
-		}
+		    }
-		
+            return view('newsitem', array_merge($this->getSidebareData(), ['type' => $apiResult->type, 'news' => $newsItem, 'metadata' => $newsItem->metadata, 'searchURL' => 'nieuws/zoeken']));
-
-
-                return view('newsitem', array_merge($this->getSidebareData(), ['type' => $apiResult->type, 'news' => $newsItem, 'metadata' => $newsItem->metadata, 'searchURL' => 'nieuws/zoeken']));
         }
     }
 
@@ -144,9 +141,12 @@ class NewsController extends Controller
             $total = 5;
         }
         $page = (int)$request->get('pagina', 1);
+        if ($url == 'overzicht' && $request->get('dateStart', null) && $request->get('dateEnd', null)) {
+            $url = 'datum/' . $request->get('dateStart', null) . '/' . $request->get('dateEnd', null);
+        }
         $apiResult = $this->API('nieuws/' . $url . '?pagina=' . (int)max(1, $page) . ($total ? '&aantal=' . $total : ''));
         $news = [];
-        foreach ($apiResult->news as $newsItem) {
+        foreach ($apiResult->news ?? [] as $newsItem) {
             $news[] = new \Model\NewsItem($newsItem);
         }
 

config/filesystems.php

@@ -48,12 +48,12 @@ return [
             'root' => storage_path('app'),
         ],
 
-        'public' => [
+        //'public' => [
-            'driver' => 'local',
+        //    'driver' => 'local',
-            'root' => storage_path('app/public'),
+        //    'root' => storage_path('app/public'),
-            'url' => env('APP_URL').'/storage',
+        //    'url' => env('APP_URL').'/storage',
-            'visibility' => 'public',
+        //    'visibility' => 'public',
-        ],
+        //],
 
         's3' => [
             'driver' => 's3',