diff --git a/private/lib/dao/mediaModels/DaoMediaHandler.php b/private/lib/dao/mediaModels/DaoMediaHandler.php index 6003c5c..fabc6d9 100644 --- a/private/lib/dao/mediaModels/DaoMediaHandler.php +++ b/private/lib/dao/mediaModels/DaoMediaHandler.php @@ -81,8 +81,20 @@ class DaoMediaHandler implements MediaHandlerInterface{ $model->setMediaReferences($mediaArr); if($model->getMainMediaReference() == $mediaId){ + $medias = self::getMedias($model); + if (sizeof($medias)>0){ + if ($media->getReference() == $medias[0]->getReference()){ + $model->setMainMedia($medias[1]); + } + else { + $model->setMainMedia($medias[0]); + } + } + else { + $model->setMainMedia(null); + } // echo "UGUALE!"; - $model->setMainMedia(null); + } GlobalVariables::get("dao")->save($model); @@ -146,7 +158,7 @@ class DaoMediaHandler implements MediaHandlerInterface{ * @param MediaInterface $media * @throws MediaException */ - public static function setMainMediaToModel(HasMediaInterface $model, MediaInterface $media=null){ + public static function setMainMediaToModel(HasMediaInterface $model, MediaInterface $media){ try{ self::addMedia($model, $media); $model->setMainMedia($media); diff --git a/private/lib/dao/mediaModels/HasMediaModel.php b/private/lib/dao/mediaModels/HasMediaModel.php index 40397c6..9a6f4da 100644 --- a/private/lib/dao/mediaModels/HasMediaModel.php +++ b/private/lib/dao/mediaModels/HasMediaModel.php @@ -53,7 +53,7 @@ abstract class HasMediaModel extends Model implements HasMediaInterface{ * (non-PHPdoc) * @see HasMediaInterface::setMainMedia() */ - public function setMainMedia(MediaInterface $media=null){ + public function setMainMedia(MediaInterface $media = null){ if(!is_null($media)){ $this->mainMedia = $media->getReference(); } diff --git a/private/lib/dao/mediaModels/MediaModel.php b/private/lib/dao/mediaModels/MediaModel.php index d976af4..cc3446a 100644 --- a/private/lib/dao/mediaModels/MediaModel.php +++ b/private/lib/dao/mediaModels/MediaModel.php @@ -59,13 +59,13 @@ class MediaModel extends Model implements MediaInterface{ } } - public function asText(){ - return $this->mediaRenderer->asText(); + public function asText(array $opts = array()){ + return $this->mediaRenderer->asText($opts); } - public function renderMedia(){ + public function renderMedia(array $opts = array()){ // var_dump($this->mediaRenderer); - $this->mediaRenderer->render(); + $this->mediaRenderer->render($opts); } public function getType(){ diff --git a/private/lib/gui/FDN2Components.php b/private/lib/gui/FDN2Components.php index cbd9827..9b66701 100644 --- a/private/lib/gui/FDN2Components.php +++ b/private/lib/gui/FDN2Components.php @@ -15,7 +15,7 @@ class NotiziaBlock { $mainMedia = DaoMediaHandler::getMainMediaFromModel($this->notizia); $mediaText = ""; if (!is_null($mainMedia)){ - $mediaText = $mainMedia->asText(); + $mediaText = $mainMedia->asText(array("clickable"=>true)); } $rval = '
';
+ }
+ else {
+ return '
';
+ }
+
+// return GlobalVariables::get("config")->paths->media."/".$this->id.".pdf";
}
public function render(array $opt = array()){
diff --git a/private/lib/media/mediaRenderers/MediaRenderer.php b/private/lib/media/mediaRenderers/MediaRenderer.php
new file mode 100644
index 0000000..897fe5a
--- /dev/null
+++ b/private/lib/media/mediaRenderers/MediaRenderer.php
@@ -0,0 +1,16 @@
+ array("width"=>MediaRendererInterface::SIZE_SMALL_W,"height"=>MediaRendererInterface::SIZE_SMALL_H),
+ MediaRendererInterface::SIZE_MEDIUM => array("width"=>MediaRendererInterface::SIZE_MEDIUM_W,"height"=>MediaRendererInterface::SIZE_MEDIUM_H),
+ MediaRendererInterface::SIZE_BIG => array("width"=>MediaRendererInterface::SIZE_BIG_W,"height"=>MediaRendererInterface::SIZE_BIG_H),
+ MediaRendererInterface::SIZE_ORIGINAL => array("width"=>MediaRendererInterface::SIZE_ORIGINAL_W,"height"=>MediaRendererInterface::SIZE_ORIGINAL_H)
+ );
+}
+
+?>
\ No newline at end of file
diff --git a/private/lib/media/mediaRenderers/MediaYoutube.php b/private/lib/media/mediaRenderers/MediaYoutube.php
index 10c0ecb..1343afd 100644
--- a/private/lib/media/mediaRenderers/MediaYoutube.php
+++ b/private/lib/media/mediaRenderers/MediaYoutube.php
@@ -1,6 +1,6 @@
link;
-// return '';
+// return $this->link;
+ return '';
+// return '';
}
public function render(array $opt = array()){
diff --git a/public/admin/homeBanner.php b/public/admin/homeBanner.php
index f9e35e5..d5a10d9 100644
--- a/public/admin/homeBanner.php
+++ b/public/admin/homeBanner.php
@@ -97,7 +97,7 @@ try{