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

Merge

Browse Source
This commit is contained in:
Mischa Spelt
2022-03-16 13:50:03 +01:00
parent c8be1fb2c0 ab9900ac12
commit a2d467ad53
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/app/Http/Controllers/NewsController.php
View File

@@ -375,12 +375,12 @@ QUERY
if($externalId = (int)$item['data']->external_id) { if($externalId = (int)$item['data']->external_id) {
try { try {
$externalSource = json_decode(file_get_contents($url = $this->EXTERNAL_NEWS_API . 'news?source=api&externalid=' . (int)$externalId)); $externalSource = json_decode(file_get_contents($url = $this->EXTERNAL_NEWS_API . 'article/' . (int)$externalId));
if($externalSource) { if($externalSource) {
$data['version'] = 2; $data['version'] = 2;
$data['source'] = $externalSource->news; $data['source'] = $externalSource->article;
} }
} catch(\Exception $ex) { $data['error'] = array('source' => $url, 'exception' => $ex); } } catch(\Exception $ex) { $data['error'] = array('source' => $url, 'exception' => $ex->getMessage()); }
} }
return response()->json($data); return response()->json($data);

4
common/classes/Model.php
View File

@@ -51,7 +51,9 @@ class Model {
} }
// Vervang alles dat niet een woord-karakter is (letter, cijfer), een streepje of spatie // Vervang alles dat niet een woord-karakter is (letter, cijfer), een streepje of spatie
$text = preg_replace('/[^\w_\-\s]/', '', $text); if(strlen($text) > 3) {
$text = preg_replace('/[^\w_\-\s]/', '', $text);
}
// Reeksen van één of meer spaties / streepjes vervangen door een enkel streepje // Reeksen van één of meer spaties / streepjes vervangen door een enkel streepje
$text = preg_replace('/[\-\s]+/', '-', $text); $text = preg_replace('/[\-\s]+/', '-', $text);