From 51c4ca115aba6153618bd9300ff98192bd4122f7 Mon Sep 17 00:00:00 2001 From: Lorenzo Giacomelli Date: Tue, 26 Jan 2016 14:59:13 +0100 Subject: [PATCH 1/3] Fix asText dei mediaRender ora richiede array default nullo --- private/lib/media/MediaRendererInterface.php | 4 ++-- private/lib/media/mediaRenderers/MediaHtml5.php | 6 +++--- private/lib/media/mediaRenderers/MediaImage.php | 10 +++++++--- private/lib/media/mediaRenderers/MediaLocalVideo.php | 6 +++--- private/lib/media/mediaRenderers/MediaPdf.php | 6 +++--- private/lib/media/mediaRenderers/MediaYoutube.php | 6 +++--- 6 files changed, 21 insertions(+), 17 deletions(-) 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 61ac098..1895c4a 100644 --- a/private/lib/media/mediaRenderers/MediaImage.php +++ b/private/lib/media/mediaRenderers/MediaImage.php @@ -6,12 +6,16 @@ class MediaImage implements MediaRendererInterface{ $this->id = $id; } - public function asText($size){ + 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..bd5ba78 100644 --- a/private/lib/media/mediaRenderers/MediaLocalVideo.php +++ b/private/lib/media/mediaRenderers/MediaLocalVideo.php @@ -7,12 +7,12 @@ class MediaLocalVideo implements MediaRendererInterface{ $this->id = $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..1ef3efb 100644 --- a/private/lib/media/mediaRenderers/MediaPdf.php +++ b/private/lib/media/mediaRenderers/MediaPdf.php @@ -7,12 +7,12 @@ class MediaPdf implements MediaRendererInterface{ $this->id = $model; } - 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/MediaYoutube.php b/private/lib/media/mediaRenderers/MediaYoutube.php index 3397a46..72aa514 100644 --- a/private/lib/media/mediaRenderers/MediaYoutube.php +++ b/private/lib/media/mediaRenderers/MediaYoutube.php @@ -7,14 +7,14 @@ class MediaYoutube implements MediaRendererInterface{ $this->link = $link; } - public function asText(){ + public function asText(array $opt = array()){ return ''; } - public function render(){ - echo $this->asText(); + public function render(array $opt = array()){ + echo $this->asText($opt); } } ?> \ No newline at end of file From 2b93ae88356e212262fe1efdfe5f4babf4a1ce8e Mon Sep 17 00:00:00 2001 From: Lorenzo Giacomelli Date: Tue, 26 Jan 2016 15:02:56 +0100 Subject: [PATCH 2/3] Mergiato MediaImage --- private/lib/media/mediaRenderers/MediaImage.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/private/lib/media/mediaRenderers/MediaImage.php b/private/lib/media/mediaRenderers/MediaImage.php index 54d9d5a..55c83c4 100644 --- a/private/lib/media/mediaRenderers/MediaImage.php +++ b/private/lib/media/mediaRenderers/MediaImage.php @@ -6,17 +6,11 @@ class MediaImage implements MediaRendererInterface{ $this->id = $id; } -<<<<<<< HEAD public function asText(array $opt = array()){ $size = "small"; if(sizeof($opt)>0 && array_key_exists("size", $opt)){ $size = $opt["size"]; } -======= - //NON PUOI DICHIARARE UN asText DIVERSO DA QUELLO DELL'INTERFACCIA!!!!!!! -// public function asText($size){ - public function asText(){ ->>>>>>> branch 'master' of ssh://gitolite@asdynamics.com:50005/projects/fdn2.git return ''; } From 281606294240038834d506e32784f6038dd24719 Mon Sep 17 00:00:00 2001 From: Lorenzo Giacomelli Date: Tue, 26 Jan 2016 19:22:25 +0100 Subject: [PATCH 3/3] Aggiunta funzione a DaoMediaHandler che riporta true se un hasmediamodel ha un meinmedia false altrimenti; admin.css force di ricaricamento; Aggiustati i mediarender che non mostravano correttamente i correspettiivi esText e uniformata la firma della funzione; addMultimedia aggiunge correttamente i meultimedia; homeMultimedia in testing; --- .../lib/dao/mediaModels/DaoMediaHandler.php | 17 ++- private/lib/gui/html.inclusion.php | 2 +- private/lib/media/MediaHandlerInterface.php | 2 +- .../media/mediaRenderers/MediaLocalVideo.php | 4 +- private/lib/media/mediaRenderers/MediaPdf.php | 6 +- .../lib/media/mediaRenderers/MediaYoutube.php | 10 +- public/admin/addMultimedia.php | 44 ++++---- public/admin/homeMultimedia.php | 101 ++++++++++++++---- public/style/admin.css | 12 ++- 9 files changed, 139 insertions(+), 59 deletions(-) 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/mediaRenderers/MediaLocalVideo.php b/private/lib/media/mediaRenderers/MediaLocalVideo.php index bd5ba78..5434b0e 100644 --- a/private/lib/media/mediaRenderers/MediaLocalVideo.php +++ b/private/lib/media/mediaRenderers/MediaLocalVideo.php @@ -3,8 +3,8 @@ class MediaLocalVideo implements MediaRendererInterface{ private $id; - public function __construct($id){ - $this->id = $id; + public function __construct($model){ + $this->id = $model->id; } public function asText(array $opt = array()){ diff --git a/private/lib/media/mediaRenderers/MediaPdf.php b/private/lib/media/mediaRenderers/MediaPdf.php index 1ef3efb..d7eef16 100644 --- a/private/lib/media/mediaRenderers/MediaPdf.php +++ b/private/lib/media/mediaRenderers/MediaPdf.php @@ -3,12 +3,12 @@ class MediaPdf implements MediaRendererInterface{ private $id; - public function __construct($id){ - $this->id = $model; + public function __construct($model){ + $this->id = $model->id; } public function asText(array $opt = array()){ - return $this->id; + return GlobalVariables::get("config")->paths->media."/".$this->id.".pdf"; } public function render(array $opt = array()){ diff --git a/private/lib/media/mediaRenderers/MediaYoutube.php b/private/lib/media/mediaRenderers/MediaYoutube.php index 72aa514..10c0ecb 100644 --- a/private/lib/media/mediaRenderers/MediaYoutube.php +++ b/private/lib/media/mediaRenderers/MediaYoutube.php @@ -3,14 +3,14 @@ class MediaYoutube implements MediaRendererInterface{ private $link; - public function __construct($link){ - $this->link = $link; + public function __construct($model){ + $this->link = $model->link; } public function asText(array $opt = array()){ - return ''; + return $this->link; +// return '