NH_Gooi/api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fragment terugluisteren toegevoegd aan nieuws en agenda

Browse Source
This commit is contained in:
Mischa Spelt
2017-09-01 19:20:46 +02:00
parent cbfd38e1ea
commit ec122e1d9a
4 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/classes/CalendarEvent.php
View File

@@ -14,7 +14,7 @@ class CalendarEvent extends Model {
public $keywords;
public $url;
public function __construct($data, $images = null) {
public function __construct($data, $images = null, $podcast = null) {
parent::__construct($data);
parent::ConvertToDateTime($this->starts);
parent::ConvertToDateTime($this->ends);
@@ -28,7 +28,12 @@ class CalendarEvent extends Model {
}
}
$this->podcast = isset($data->podcast) && $data->podcast ? $data->podcast : null;
if($podcast)
{
$this->podcast = new \Model\Podcast($podcast);
} else if(isset($data->podcast) && $data->podcast) {
$this->podcast = new \Model\Podcast($data->podcast);
}
$images = ($images != null) ? $images
: (isset($data->images) ? $data->images : null);

24
common/classes/NewsItem.php
View File

@@ -17,14 +17,14 @@ class NewsItem extends Model {
public $category;
public $theme;
public $region;
public $podcast;
public $images;
public $video;
public $url;
public function __construct($data, $images = null) {
public function __construct($data, $images = null, $podcast = null) {
parent::__construct($data);
parent::ConvertToDateTime($this->published);
parent::ConvertToDateTime($this->edited);
@@ -35,11 +35,21 @@ class NewsItem extends Model {
}
$this->source = null;
if(is_object($data->source))
if(isset($data->source))
{
$this->source = new \Model\NewsSource($data->source->title, $data->source->url, $data->source->url);
} else if($data->source) {
$this->source = new \Model\NewsSource($data->source, $data->source_url, $data->showsource);
if(is_object($data->source))
{
$this->source = new \Model\NewsSource($data->source->title, $data->source->url, $data->source->show);
} else if($data->source) {
$this->source = new \Model\NewsSource($data->source, $data->source_url, $data->showsource);
}
}
if($podcast)
{
$this->podcast = new \Model\Podcast($podcast);
} else if(isset($data->podcast) && $data->podcast) {
$this->podcast = new \Model\Podcast($data->podcast);
}
$this->keywords = null;
@@ -49,8 +59,6 @@ class NewsItem extends Model {
$this->keywords = explode(' ', $data->keywords);
}
$this->podcast = $data->podcast ? $data->podcast : null;
$images = ($images != null) ? $images
: (isset($data->images) ? $data->images : null);
if($images) {