From 14627e6da6ee4a4b02130ca3cc27a8e53d095263 Mon Sep 17 00:00:00 2001
From: Riccardo Di Dato <r.didato@asdynamics.it>
Date: Mon, 17 Jul 2017 13:52:51 +0200
Subject: [PATCH] Aggiunta estensione al costruttore di media model image

Fixato bug per cui la get path del media image renderer non funzionava
Aggiunto campo estensione al costruttore dei media image renderer
Fixato rss helper che non riusciva ad ottenere la dimensione delle
immaginni

Signed-off-by: Riccardo Di Dato <r.didato@asdynamics.it>
---
 private/lib/RSSHelper.php                       | 10 +++++-----
 private/lib/dao/mediaModels/MediaModel.php      |  2 +-
 private/lib/media/mediaRenderers/MediaImage.php |  5 +++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/private/lib/RSSHelper.php b/private/lib/RSSHelper.php
index 590f460..fb82062 100644
--- a/private/lib/RSSHelper.php
+++ b/private/lib/RSSHelper.php
@@ -11,7 +11,7 @@ class RSSHelper {
 		header('Content-Type: application/xml');
 		
 		echo '<?xml version="1.0"?>',PHP_EOL;
-		echo '<rss version="2.0">',PHP_EOL;
+		echo '<rss version="2.0" encoding="UTF-8">',PHP_EOL;
 		echo '<channel>',PHP_EOL;
 		
 		self::generateChannelInfo();
@@ -30,7 +30,7 @@ class RSSHelper {
 		
 		echo '<title>'.$conf->info->projectName.'</title>',PHP_EOL;
 		echo '<link>'.GUIHandler::getBaseUrl().'</link>',PHP_EOL;
-		echo '<description>'.$conf->info->projectDescription.'</description>',PHP_EOL;
+		echo '<description>'.html_entity_decode($conf->info->projectDescription).'</description>',PHP_EOL; // Entity decode perchè in config contiene &agrave; e non ho intenzione di controllare tutta l'applicazione
 		echo '<language>it-IT</language>',PHP_EOL;
 		echo '<webMaster>webmaster@ifattidinapoli.it</webMaster>',PHP_EOL;
 		
@@ -47,9 +47,9 @@ class RSSHelper {
 		$conf = GlobalVariables::get("config");
 		
 		echo '<item>',PHP_EOL;
-		echo '<title>'.htmlentities($notizia->titolo).'</title>',PHP_EOL;
+		echo '<title>'.$notizia->titolo.'</title>',PHP_EOL;
 		echo '<description>'.htmlentities($notizia->testo).'</description>',PHP_EOL;
-		echo '<link>'.GUIHandler::getBaseUrl().'/articolo_'.$notizia->id.'</link>',PHP_EOL;
+		echo '<link>'.GUIHandler::getBaseUrl().'articolo_'.$notizia->id.'</link>',PHP_EOL;
 		
 		$mainMedia = DaoMediaHandler::getMainMediaFromModel($notizia);
 		if (!is_null($mainMedia) && $mainMedia->hasProperty("mediaType") && $mainMedia->mediaType == MediaModel::TYPE_IMAGE){
@@ -61,7 +61,7 @@ class RSSHelper {
 		}
 		
 		echo '<pubDate>'.date(DATE_RFC2822,$notizia->about->data->sec).'</pubDate>',PHP_EOL;
-		echo '<guid>'.GUIHandler::getBaseUrl().'/articolo_'.$notizia->id.'</guid>',PHP_EOL;
+		echo '<guid>'.GUIHandler::getBaseUrl().'articolo_'.$notizia->id.'</guid>',PHP_EOL;
 		
 		echo '</item>',PHP_EOL;
 		
diff --git a/private/lib/dao/mediaModels/MediaModel.php b/private/lib/dao/mediaModels/MediaModel.php
index 89a31c5..27ac63a 100644
--- a/private/lib/dao/mediaModels/MediaModel.php
+++ b/private/lib/dao/mediaModels/MediaModel.php
@@ -48,7 +48,7 @@ class MediaModel extends Model implements MediaInterface{
 				$this->mediaRenderer = new MediaLocalVideo($this);
 			}
 			if ($this->mediaType == self::TYPE_IMAGE){
-				$this->mediaRenderer = new MediaImage($this->id);
+				$this->mediaRenderer = new MediaImage($this->id, $this->extension);
 			}
 			if ($this->mediaType == self::TYPE_PDF){
 				$this->mediaRenderer = new MediaPdf($this);
diff --git a/private/lib/media/mediaRenderers/MediaImage.php b/private/lib/media/mediaRenderers/MediaImage.php
index 5df7170..6a43e24 100644
--- a/private/lib/media/mediaRenderers/MediaImage.php
+++ b/private/lib/media/mediaRenderers/MediaImage.php
@@ -1,11 +1,12 @@
 <?php
 class MediaImage extends MediaRenderer{
 	private $id;
+	private $extension;
 	
 	
-	
-	public function __construct($id){
+	public function __construct($id, $extension){
 		$this->id = $id;
+		$this->extension = $extension;
 	}
 
 	public function asText(array $opt = array()){