diff --git a/modifichePhpini b/modifichePhpini new file mode 100644 index 0000000..3135642 --- /dev/null +++ b/modifichePhpini @@ -0,0 +1,2 @@ +post_max_size = 60M +upload_max_filesize = 60M \ No newline at end of file diff --git a/private/common/config.local.php b/private/common/config.local.php index 75406c5..58e1f71 100644 --- a/private/common/config.local.php +++ b/private/common/config.local.php @@ -29,7 +29,7 @@ $currentSystem->apache->user = "var-www"; $currentSystem->apache->group = "var-www"; $currentSystem->apache->workdir = "/var/www"; // Il path in cui inserire la cartella con le pagine html -$currentSystem->remoteLocationPath = "http://10.0.0.249/fdn2/"; +$currentSystem->remoteLocationPath = "http://localhost/fdn2/"; $backupSystem = new stdClass(); $backupSystem->account = "40a911e14db8ad6faf0a0e7385e7c267"; diff --git a/private/lib/media/mediaRenderers/MediaLocalVideo.php b/private/lib/media/mediaRenderers/MediaLocalVideo.php index e3185aa..6a98ffb 100644 --- a/private/lib/media/mediaRenderers/MediaLocalVideo.php +++ b/private/lib/media/mediaRenderers/MediaLocalVideo.php @@ -8,11 +8,36 @@ class MediaLocalVideo extends MediaRenderer{ } public function asText(array $opt = array()){ - return $this->id; + $size = MediaRendererInterface::SIZE_ORIGINAL; + if(array_key_exists("size", $opt) && array_key_exists($opt["size"], self::$SIZES)){ + $size = self::$SIZES[$opt["size"]]; + } + + return ''; } public function render(array $opt = array()){ echo $this->asText($opt); } + + public function getPath(){ + $basepath = GlobalVariables::get("config")->paths->media; + return $basepath."/".$this->id.".".$this->extension; + } + + public function getExtension(){ + $video = GlobalVariables::get("dao")->getFirst("MediaModel",array("id"=>$this->id)); + return $video->extension; + } + + public function getVideoLink($size){ + if(!array_key_exists($size, self::$SIZES)){ + $size = MediaRendererInterface::SIZE_ORIGINAL; + } + return GUIHandler::getBaseUrl().'getLocalVideo.php?id='.$this->id.'&size='.$size; + } + } ?> \ No newline at end of file diff --git a/public/admin/addMultimedia.php b/public/admin/addMultimedia.php index 7ceaab1..aeae877 100644 --- a/public/admin/addMultimedia.php +++ b/public/admin/addMultimedia.php @@ -55,10 +55,10 @@ try{ $media = DaoMediaHandler::createNewTextBasedMedia($saveable); } else { - $file = $_FILES['data']['tmp_name']; - $info = pathinfo($_FILES['data']['name']); -// $file = PostHandler::get("data"); - $media = DaoMediaHandler::createNewFileBasedMedia($saveable, $file,$info["extension"]); + $file = $_FILES['data']['tmp_name']; + $info = pathinfo($_FILES['data']['name']); + $media = DaoMediaHandler::createNewFileBasedMedia($saveable, $file,$info["extension"]); +// var_dump($media); } if(!is_null($media)){ @@ -67,7 +67,7 @@ try{ GlobalVariables::get("dao")->save($notizia); } else{ - throw new Exception("Cannot save a null media in the news with id '".$notiziaId."'"); + throw new Exception("Cannot save a null media '".$media."' in the news with id '".$notiziaId."'"); } } else{ @@ -78,7 +78,7 @@ try{ } } - $formFile = 'Selezionare un file + $formFile = 'Selezionare un file '; $formYoutube = 'Link '; @@ -89,7 +89,7 @@ try{ $error = $ex->getMessage(); }catch (Exception $exec){ LoggingFacilityManager::getLogger("gui")->log(LoggingFacility::$LEVEL_ERROR, $exec->getMessage()); - $error = "Si è verificato un errore inaspettato durante l'esecuzione della pagina. Se l'errore persiste contattare il supporto tecnico."; + $error = "Si è verificato un errore inaspettato durante l'esecuzione della pagina. Se l'errore persiste contattare il supporto tecnico.".$exec->getMessage(); } MenuGenerator::generateMenu(); @@ -97,6 +97,8 @@ HTMLHelper::generateAdminHead(); ?>
+
+
@@ -154,5 +156,18 @@ HTMLHelper::generateAdminHead(); $("form#loadFile").attr("action","homeMultimedia.php"); $("form#loadFile").submit(); }); + + $("input[name=data]").on("change",function(){ + var fileSize = this.files[0].size/1024/1024; + if(fileSize > 60){ + $("#submit").hide(); + $(".errorShow").append("Dimesioni file non consentite. Max 60MB.") + } + else{ + $("#submit").show(); + $(".errorShow").html(""); + } + }); + }); \ No newline at end of file diff --git a/public/admin/homeNotizie.php b/public/admin/homeNotizie.php index 0123fe6..f1b9b5a 100644 --- a/public/admin/homeNotizie.php +++ b/public/admin/homeNotizie.php @@ -38,6 +38,7 @@ try{ } if (AdminLoginManager::getLogged()->hasRole(AdminModel::ADMIN_TYPE_EDITORE_SUPERVISOR)){ + $postAnsa = PostHandler::get("ansa"); if(!is_null($postAnsa)){ if(strcmp($postAnsa, "true")==0){ @@ -50,6 +51,12 @@ try{ GlobalVariables::get("dao")->save($notizia); } $ansa = $notizia->isAnsa; + + $delSondaggio = PostHandler::get("deleteSondaggio"); + if(!is_null($delSondaggio) && strcmp($delSondaggio, "true")==0){ + $notizia->sondaggio = null; + GlobalVariables::get("dao")->save($notizia); + } } } @@ -75,6 +82,7 @@ try{ } } +// var_dump($notizia); MenuGenerator::generateMenu(); HTMLHelper::generateAdminHead(); @@ -167,20 +175,31 @@ try{ hasRole(AdminModel::ADMIN_TYPE_COMMENTI_SUPERVISOR)){ ?>
  • Visualizza Commenti
    • - hasRole(AdminModel::ADMIN_TYPE_SONDAGGI)){ ?> - sondaggio->votanti)==0){ - if($notizia->hasProperty("sondaggio") && !is_null($notizia->sondaggio)){?> -
  • Modifica Sondaggio
    • - -
  • Crea Sondaggio
    • - - + hasRole(AdminModel::ADMIN_TYPE_SONDAGGI)){ + if($notizia->hasProperty("sondaggio") && !is_null($notizia->sondaggio)){ + if(sizeof($notizia->sondaggio->votanti)==0){ + ?> +
  • Modifica Sondaggio
    • + +
  • Cancella Sondaggio
    • + +
  • Crea Sondaggio
    • +
  • Torna alla lista notizie
    • +
    hasProperty("sondaggio") && !is_null($notizia->sondaggio)){?> @@ -208,6 +227,13 @@ try{ $("form#notiziaForm").submit(); }); + $("#notiziaMenu_deleteSondaggi").click(function(event){ + $("form#notiziaForm").attr("action","homeNotizie.php"); + + $("form#notiziaForm input[type=hidden][name=deleteSondaggio]").val("true"); + $("form#notiziaForm").submit(); + }); + $("#notiziaMenu_ansa").click(function(event){ $("form#notiziaForm").attr("action","homeNotizie.php"); diff --git a/public/admin/index.php b/public/admin/index.php index da8d92c..95b86ca 100644 --- a/public/admin/index.php +++ b/public/admin/index.php @@ -108,6 +108,12 @@ HTMLHelper::generateAdminHead(); Le newsletter nella lista Inviate sono invece già lavorate o in fase di lavorazione e sono quindi solo visibili ma non modificabili.

    +

    Contenuti Multimediali

    +

    + Caricare contenuti multimediali in proporzione 16:9. + La dimensione minima deve essere 500x375. + Non possono essere caricati file più grandi di 60MB. +

    hasRole(AdminModel::ADMIN_TYPE_NEWSLETTER)){ ?>

    Statistiche

    diff --git a/public/articolo.php b/public/articolo.php index b067ada..9822ebe 100644 --- a/public/articolo.php +++ b/public/articolo.php @@ -142,11 +142,16 @@ GUIHandler::generateHtmlHeaders(array("additionalMetadata"=>$additionalHeaders," if(sizeof($medias)>0){ $pos = array_search($media, $medias); } + if($media->mediaType == MediaModel::TYPE_IMAGE){ ?> -

    - renderMedia(array("size"=>MediaRenderer::SIZE_BIG,"clickable"=>true));?> -
    - ')"> + renderMedia(array("size"=>MediaRenderer::SIZE_BIG,"clickable"=>true));?> +
    + + renderMedia(array("size"=>MediaRenderer::SIZE_ORIGINAL,"clickable"=>false)); + } } ?>
    diff --git a/public/getLocalVideo.php b/public/getLocalVideo.php new file mode 100644 index 0000000..a1f0e9e --- /dev/null +++ b/public/getLocalVideo.php @@ -0,0 +1,23 @@ +array("width"=>800,"height"=>600), +// "small"=>array("width"=>160,"height"=>120) +// ); + +if (array_key_exists("id",$_GET)) { + $video = GlobalVariables::get("dao")->getFirst("MediaModel",array("id"=>$_GET['id'])); + + if (!is_null($video)){ + $basepath = GlobalVariables::get("config")->paths->media; + $videoPath= $basepath."/".$video->id.".".$video->extension; + $lenght = filesize($videoPath); + + header('Content-type: '.mime_content_type($videoPath)); + header('Content-Lenght: '.$lenght); + readfile($videoPath); + } +} +?> \ No newline at end of file diff --git a/public/style/public.css b/public/style/public.css index 4e7f899..73999f5 100644 --- a/public/style/public.css +++ b/public/style/public.css @@ -6,6 +6,7 @@ font-weight: normal; src: local('Bebas Neue'), url('BebasNeue.woff') format('woff'); } + a{text-decoration:none;} body{font-family:lato, arial;} @@ -609,4 +610,15 @@ Password Recovery color:white; text-decoration:none; cursor:pointer; +} +/** + DISABILITAZIONE TASTO DOWNLOAD DAL PLAYER VIDEO +*/ + +video::-internal-media-controls-download-button { + display:none; +} + +video::-webkit-media-controls-enclosure { + overflow:hidden; } \ No newline at end of file