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 '',PHP_EOL; - echo '',PHP_EOL; + echo '',PHP_EOL; echo '',PHP_EOL; self::generateChannelInfo(); @@ -30,7 +30,7 @@ class RSSHelper { echo ''.$conf->info->projectName.'',PHP_EOL; echo ''.GUIHandler::getBaseUrl().'',PHP_EOL; - echo ''.$conf->info->projectDescription.'',PHP_EOL; + echo ''.html_entity_decode($conf->info->projectDescription).'',PHP_EOL; // Entity decode perchè in config contiene à e non ho intenzione di controllare tutta l'applicazione echo 'it-IT',PHP_EOL; echo 'webmaster@ifattidinapoli.it',PHP_EOL; @@ -47,9 +47,9 @@ class RSSHelper { $conf = GlobalVariables::get("config"); echo '',PHP_EOL; - echo ''.htmlentities($notizia->titolo).'',PHP_EOL; + echo ''.$notizia->titolo.'',PHP_EOL; echo ''.htmlentities($notizia->testo).'',PHP_EOL; - echo ''.GUIHandler::getBaseUrl().'/articolo_'.$notizia->id.'',PHP_EOL; + echo ''.GUIHandler::getBaseUrl().'articolo_'.$notizia->id.'',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 ''.date(DATE_RFC2822,$notizia->about->data->sec).'',PHP_EOL; - echo ''.GUIHandler::getBaseUrl().'/articolo_'.$notizia->id.'',PHP_EOL; + echo ''.GUIHandler::getBaseUrl().'articolo_'.$notizia->id.'',PHP_EOL; echo '',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 @@ id = $id; + $this->extension = $extension; } public function asText(array $opt = array()){