diff --git a/private/lib/dao/mediaModels/DaoMediaHandler.php b/private/lib/dao/mediaModels/DaoMediaHandler.php index ee78ee5..15b4886 100644 --- a/private/lib/dao/mediaModels/DaoMediaHandler.php +++ b/private/lib/dao/mediaModels/DaoMediaHandler.php @@ -53,7 +53,7 @@ class DaoMediaHandler implements MediaHandlerInterface{ } /** - * Elimina l'id del media dal model e deleta il media + * Elimina l'id del media dal model e deleta il media. * * @param HasMediaInterface $model * @param MediaInterface $media @@ -126,7 +126,7 @@ class DaoMediaHandler implements MediaHandlerInterface{ * @param MediaInterface $media * @throws MediaException */ - public static function setMainMediaToModel(HasMediaInterface $model, MediaInterface $media){ + public static function setMainMediaToModel(HasMediaInterface $model, MediaInterface $media=null){ try{ $model->setMainMedia($media); GlobalVariables::get("dao")->save($model); @@ -158,11 +158,10 @@ class DaoMediaHandler implements MediaHandlerInterface{ * @param string $filePath * @return MediaModel */ - public static function createNewFileBasedMedia($saveableObj, $filePath){ + public static function createNewFileBasedMedia($saveableObj, $filePath,$extension){ $basepath = GlobalVariables::get("config")->paths->media; - $info = pathinfo($filePath); $media = new MediaModel($saveableObj); - $media->extension = $info["extension"]; + $media->extension = $extension; GlobalVariables::get("dao")->save($media); SFSManager::copyFile($filePath, $basepath."/".$media->id.".".$media->extension); return $media; @@ -179,6 +178,14 @@ class DaoMediaHandler implements MediaHandlerInterface{ return $media; } + public static function hasMainMedia(HasMediaInterface $model){ + $hasMainMedia = false; + if(!is_null($model->getMainMediaReference())){ + $hasMainMedia = true; + } + return $hasMainMedia; + } + } ?> \ No newline at end of file diff --git a/private/lib/gui/html.inclusion.php b/private/lib/gui/html.inclusion.php index 7ebf910..ba17b21 100644 --- a/private/lib/gui/html.inclusion.php +++ b/private/lib/gui/html.inclusion.php @@ -10,7 +10,7 @@ GUIHandler::addStylesheet(GUIHandler::STYLESHEET_ADMIN, "jquery-ui.css"); GUIHandler::addStylesheet(GUIHandler::STYLESHEET_ADMIN, "chosen.css"); -GUIHandler::addStylesheet(GUIHandler::STYLESHEET_ADMIN, "admin.css"); +GUIHandler::addStylesheet(GUIHandler::STYLESHEET_ADMIN, "admin.css?rev=".time()); GUIHandler::addStylesheet(GUIHandler::STYLESHEET_ADMIN, "datatables.css"); diff --git a/private/lib/media/MediaHandlerInterface.php b/private/lib/media/MediaHandlerInterface.php index b262dbd..33445c7 100644 --- a/private/lib/media/MediaHandlerInterface.php +++ b/private/lib/media/MediaHandlerInterface.php @@ -56,7 +56,7 @@ interface MediaHandlerInterface{ * @param MediaInterface $media * @throws MediaException */ - public static function setMainMediaToModel(HasMediaInterface $model, MediaInterface $media); + public static function setMainMediaToModel(HasMediaInterface $model, MediaInterface $media=null); /** * Prende in ingresso un HasMediaInterface ritorna un array di un elemento array("mainMedia"=>"&value"); diff --git a/private/lib/media/MediaRendererInterface.php b/private/lib/media/MediaRendererInterface.php index 577f248..9e1bcbb 100644 --- a/private/lib/media/MediaRendererInterface.php +++ b/private/lib/media/MediaRendererInterface.php @@ -2,7 +2,7 @@ interface MediaRendererInterface{ - public function asText(); - public function render(); + public function asText(array $opt = array()) ; + public function render(array $opt = array()); } ?> \ No newline at end of file diff --git a/private/lib/media/mediaRenderers/MediaHtml5.php b/private/lib/media/mediaRenderers/MediaHtml5.php index a0555b1..93860d1 100644 --- a/private/lib/media/mediaRenderers/MediaHtml5.php +++ b/private/lib/media/mediaRenderers/MediaHtml5.php @@ -7,12 +7,12 @@ class MediaHtml5 implements MediaRendererInterface{ $this->code = $code; } - public function asText(){ + public function asText(array $opt = array()){ return $this->code; } - public function render(){ - echo $this->asText(); + public function render(array $opt = array()){ + echo $this->asText($opt); } } ?> \ No newline at end of file diff --git a/private/lib/media/mediaRenderers/MediaImage.php b/private/lib/media/mediaRenderers/MediaImage.php index 7d0124c..55c83c4 100644 --- a/private/lib/media/mediaRenderers/MediaImage.php +++ b/private/lib/media/mediaRenderers/MediaImage.php @@ -6,14 +6,16 @@ class MediaImage implements MediaRendererInterface{ $this->id = $id; } - //NON PUOI DICHIARARE UN asText DIVERSO DA QUELLO DELL'INTERFACCIA!!!!!!! -// public function asText($size){ - public function asText(){ + public function asText(array $opt = array()){ + $size = "small"; + if(sizeof($opt)>0 && array_key_exists("size", $opt)){ + $size = $opt["size"]; + } return ''; } - public function render($size = "small"){ - echo $this->asText($size); + public function render(array $opt = array ()){ + echo $this->asText($opt); } } -?> \ No newline at end of file +?> diff --git a/private/lib/media/mediaRenderers/MediaLocalVideo.php b/private/lib/media/mediaRenderers/MediaLocalVideo.php index 7e8ee0c..5434b0e 100644 --- a/private/lib/media/mediaRenderers/MediaLocalVideo.php +++ b/private/lib/media/mediaRenderers/MediaLocalVideo.php @@ -3,16 +3,16 @@ class MediaLocalVideo implements MediaRendererInterface{ private $id; - public function __construct($id){ - $this->id = $id; + public function __construct($model){ + $this->id = $model->id; } - public function asText(){ + public function asText(array $opt = array()){ return $this->id; } - public function render(){ - echo $this->asText(); + public function render(array $opt = array()){ + echo $this->asText($opt); } } ?> \ No newline at end of file diff --git a/private/lib/media/mediaRenderers/MediaPdf.php b/private/lib/media/mediaRenderers/MediaPdf.php index 4ad7eb1..d7eef16 100644 --- a/private/lib/media/mediaRenderers/MediaPdf.php +++ b/private/lib/media/mediaRenderers/MediaPdf.php @@ -3,16 +3,16 @@ class MediaPdf implements MediaRendererInterface{ private $id; - public function __construct($id){ - $this->id = $model; + public function __construct($model){ + $this->id = $model->id; } - public function asText(){ - return $this->id; + public function asText(array $opt = array()){ + return GlobalVariables::get("config")->paths->media."/".$this->id.".pdf"; } - public function render(){ - echo $this->asText(); + public function render(array $opt = array()){ + echo $this->asText($opt); } } ?> \ No newline at end of file diff --git a/private/lib/media/mediaRenderers/MediaYoutube.php b/private/lib/media/mediaRenderers/MediaYoutube.php index 3397a46..10c0ecb 100644 --- a/private/lib/media/mediaRenderers/MediaYoutube.php +++ b/private/lib/media/mediaRenderers/MediaYoutube.php @@ -3,18 +3,18 @@ class MediaYoutube implements MediaRendererInterface{ private $link; - public function __construct($link){ - $this->link = $link; + public function __construct($model){ + $this->link = $model->link; } - public function asText(){ - return ''; + public function asText(array $opt = array()){ + return $this->link; +// return '