NLPO API endpoint zonder HTML encoding

Reviewed-on: #2

api/.gitignore

@@ -1,5 +1,5 @@
-/vendor
+syntax: glob
-/.idea
+
-Homestead.json
-Homestead.yaml
 .env
+api/storage
+*.orig

api/app/Http/Controllers/NewsController.php

@@ -103,13 +103,19 @@ QUERY;
 
     public function retrieveNewsItems($page, $count, $filter, $params) {
         $filterSql = "";
-        $params = ['target' => self::$WEBSITE_TARGET, 'category' => self::$NEWS_CATEGORY, 'secondarycategory' => self::$EXTERNAL_NEWS_CATEGORY];
+	$params['target'] = self::$WEBSITE_TARGET;
-        if($filter) { 
+	$params['category'] = self::$NEWS_CATEGORY;
-            foreach($filter as $field => $value) {
+	$params['secondarycategory'] = self::$EXTERNAL_NEWS_CATEGORY;
-                $paramName = preg_replace('/[^A-Za-z0-9]/', '', $field);
+	if($filter) {
-                $filterSql .= " AND $field = :$paramName";
+	    if(is_array($filter)) {
-                $params[$paramName] = $value;
+              foreach($filter as $field => $value) {
-            }
+                  $paramName = preg_replace('/[^A-Za-z0-9]/', '', $field);
+                  $filterSql .= " AND $field = :$paramName";
+                  $params[$paramName] = $value;
+              }
+	    } else {
+	      $filterSql .= ' AND ' . $filter;
+	    }
         }
 
         $start = ($page - 1) * $count;
@@ -397,6 +403,70 @@ QUERY
       return $item ? response()->json(new \Model\CalendarEvent($item['data'], $item['images'], $item['podcast'])) : abort(404);
     }
 
+    /** 
+     * Overzicht voor het NLPO-dashboard
+     */
+    public function nlpo(Request $request) {
+	$from = $request->get('from');
+	if(!$from) { $from = date('Y-m-d', strtotime('-7 days')); }	    
+	$to = $request->get('to');
+	if(!$to) { $to = date('Y-m-d'); }
+
+	$filter = 'DATE(`news`.`creationdt`) >= :from AND DATE(`news`.`creationdt`) <= :to'; 
+        $items = $this->retrieveNewsItems(1, 10000, 
+	    $filter,
+	    ['from' => $from, 'to' => $to]);
+	$result = [];
+	foreach($items as $item) {
+		$tags = [];
+		if($item->theme) $tags[] = $item->theme->title;
+		if($item->region) $tags[] = $item->region->title;
+
+		$text = $item->content;
+		$source = app('db')->select('SELECT content FROM `news_target_content` WHERE news = :news AND target = 0 AND published = 1 AND active = 1',
+			['news' => $item->id]);
+		if(count($source)) {
+			$text = $source[0]->content;
+			$source_data = json_decode($source[0]->content);
+			if($source_data) {
+				$text = "";
+				foreach($source_data->article->blocks as $block) {
+					if($block->type == 'authors') {
+						$authors = [];
+						foreach($block->authors as $author) {
+							$authors[] = $author->name;
+						}
+						$item->author = implode(', ', $authors);
+					} else if(isset($block->text) && $block->type != 'info') {
+						$text .= strip_tags($block->text);
+					}
+				}
+			} else {
+			       $text = $source[0];
+			}
+		}
+		$result[] = [
+			'title' => $this->nlpo_convert_utf8($item->title),
+			'url' => 'https://nhgooi.nl/' . $item->url,
+			'text' => $this->nlpo_convert_utf8($text),
+			'date' => $item->published->format('Y-m-d\TH:i:s.z\Z'),
+ 			'art_id' => $item->id,
+			'author' => $item->author,
+			'excerpt' => $this->nlpo_convert_utf8(strip_tags($item->content)),
+			'categories' => $tags,
+			'tags' => $tags,
+			'comment_count' => 0
+		];
+	}
+	header('Content-Type: application/json; charset=utf-8');
+	return json_encode($result, JSON_UNESCAPED_UNICODE);
+    }
+
+    private function nlpo_convert_utf8($str) {
+	    $str = html_entity_decode($str, ENT_QUOTES, 'UTF-8');
+	    return $str;
+    }
+
     private function itemFromCategory($category, $id) {
         $params = ['id' => (int)$id, 'target' => self::$WEBSITE_TARGET];
         if(is_array($category)) {

api/app/Http/Controllers/PodcastController.php

@@ -6,9 +6,6 @@ use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
-error_reporting(E_ALL);
-ini_set('display_errors', true);
-
 class PodcastController extends Controller
 {
     public static $BASE_SQL = <<<QUERY

api/app/Http/Controllers/TvController.php

@@ -0,0 +1,21 @@
+<?php
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class TvController extends Controller
+{
+  public function ticker() {
+    $programController = new ProgramController();
+    $program = $programController->comingup();
+
+    $newsController = new NewsController();
+    $news = $newsController->retrieveNewsItems(1, 3, null, []);
+
+    return view('tv_ticker', [
+      'onair' => $program->getData(),
+      'news' => $news
+    ]);
+  }
+}
+

api/resources/views/rss/news.blade.php

@@ -1,5 +1,6 @@
 <?php header('Access-Control-Allow-Origin: *'); ?>
-<?xml version="1.0" encoding="UTF-8"?>
+<?php header('Content-Type: text/xml'); ?>
+<{{ '' /* avoid PHP parsing this as short open tag */ }}?xml version="1.0" encoding="UTF-8" ?>
 <rss version="2.0"
 	xmlns:atom="http://www.w3.org/2005/Atom" 
 	xmlns:content="http://purl.org/rss/1.0/modules/content/" 

api/resources/views/rss/podcasts.blade.php

@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?php header('Access-Control-Allow-Origin: *'); ?>
+<?php header('Content-Type: text/xml'); ?>
+<{{ '' /* avoid PHP parsing this as short open tag */ }}?xml version="1.0" encoding="UTF-8" ?>
 <rss version="2.0" 
   xmlns:atom="http://www.w3.org/2005/Atom" 
   xmlns:spotify="http://www.spotify.com/ns/rss"
@@ -6,7 +8,7 @@
 
   <channel>
     <title>{{isset($program) ? $program->name : "NH Gooi Gemist"}}</title>
-    <description>{{isset($program) ? $program->description : "Fragmenten en interviews eerder te horen op NH Gooi Radio"}}</description>
+    <description><![CDATA[{!! isset($program) ? html_entity_decode($program->description) : "Fragmenten en interviews eerder te horen op NH Gooi Radio" !!}]]></description>
     <link>https://nhgooi.nl{{isset($program) ? $program->url : ""}}</link>
     <language>nl-nl</language>
 
@@ -19,7 +21,7 @@
 
     <itunes:author>NH Gooi Radio</itunes:author>
     <itunes:explicit>no</itunes:explicit>
-    <itunes:image href="https://nhgooi.nl/images/logo_sqr_hq.png" />
+    <itunes:image href="https://nhgooi.nl/images/{{ isset($program) && $program->id == 1097 ? "hilversum_oorlog.jpg" : "logo_sqr_hq.png" }}" />
     <itunes:owner>
       <itunes:name>NH Gooi Radio</itunes:name>
       <itunes:email>{{isset($program) ? $program->email : 'info' }}@nhgooi.nl</itunes:email>
@@ -34,19 +36,21 @@
     <item>
         <guid>https://nhgooi.nl/podcast-{{$podcast->id}}</guid>
         <title>{{html_entity_decode($podcast->title)}}</title>
-        <description>{{html_entity_decode($podcast->content)}}</description>
+        <description><![CDATA[{!! html_entity_decode($podcast->content) !!}]]></description>
         <link>https://nhgooi.nl/gemist/fragment/{{$podcast->url}}</link>
         <enclosure url="{{url('podcast/download' . $podcast->url . '?auth=' . $podcast->auth)}}" type="audio/mpeg" length="{{filesize($podcast->getSoundFile())}}"></enclosure>
         <pubDate>{{$podcast->created->format('r')}}</pubDate>
 
         <itunes:title>{{$podcast->title}}</itunes:title>
         <itunes:author>NH Gooi Radio</itunes:author>
-        <itunes:summary>{{$podcast->content}}</itunes:summary>
+        <itunes:summary><![CDATA[{!! html_entity_decode($podcast->content) !!}]]></itunes:summary>
         <itunes:duration>{{$podcast->formatDuration()}}</itunes:duration>
         <itunes:explicit>no</itunes:explicit>
-    @if($podcast->image)
+        @if($podcast->image)
-        <itunes:image href="https://nhgooi.nl{{$podcast->image->url}}"/>
+	<itunes:image href="https://nhgooi.nl{{$podcast->image->url}}"/>
-    @endif
+        @elseif($podcast->program && $podcast->program->image)
+	<itunes:image href="https://nhgooi.nl{{$podcast->program->image->url}}"/>
+        @endif
     </item> 
     @endforeach
        

api/resources/views/tv_ticker.blade.php

@@ -0,0 +1,37 @@
+NH Gooi 92.0 FM *** 
+
+@if($onair && $onair->schedule && count($onair->schedule))
+<?
+    $current = $onair->schedule[0];
+    $ends = new \DateTimeImmutable($current->end->date, new \DateTimeZone($current->end->timezone));
+?>
+    Met nu tot {{ $ends->format('H:i') }} uur:  
+    {{ $current->program->name }}
+    @if($current->program->tagline
+            && ($tagline = trim(html_entity_decode($current->program->tagline)))) 
+    &ndash; {{ $tagline }}
+    @endif
+    ***
+  
+    @if(count($onair->schedule) > 1) 
+    <? $next = $onair->schedule[1]->program; ?>
+        Daarna: {{ $next->name }}
+    @if($current->program->tagline 
+        && ($tagline = trim(html_entity_decode($next->tagline)))) 
+    &ndash; {{ $tagline }}
+    @endif
+    *** 
+    @endif
+@endif
+
+@if(count($news))
+    Laatste nieuws van nhgooi.nl:
+    @foreach($news as $item) 
+        {{ $item->title }} 
+    @if($item->video)
+        - bekijk de video op nhgooi.nl 
+    @endif
+    ***
+    @endforeach
+@endif
+Meer nieuws op nhgooi.nl ***

api/routes/web.php

@@ -24,6 +24,7 @@ $app->get( 'menu/special', 'MenuController@special' );
 
 $app->get('nieuws/overzicht', 'NewsController@newslist' );
 $app->get('nieuws/kabelkrant', 'NewsController@tvlist' );
+$app->get('nieuws/nlpo', 'NewsController@nlpo' );
 $app->get('nieuws/regio/{region:[a-z0-9-]+}', 'NewsController@regionlist' );
 $app->get('nieuws/thema/{theme:[a-z0-9-]+}', 'NewsController@themelist' );
 $app->get('nieuws/zoeken/{query}', 'NewsController@findnews' );
@@ -63,6 +64,8 @@ $app->get('programma/details/{id:\d+}', 'ProgramController@details' );
 $app->get('programma/download/{year:20\d\d}/{month:\d\d?}/{day:\d\d?}/{hour:\d\d?}/{duration:\d\d?}', 'PodcastController@complete');
 $app->get('programma/studiocam/onair', 'ProgramController@studiocam' );
 
+$app->get('/tv/ticker', 'TvController@ticker');
+
 $app->get('kerkdienst', 'KerkdienstController@get');
 $app->get('kerkdienst/stream', 'KerkdienstController@podcast');
 $app->get('kerkdienst/download', 'KerkdienstController@download');