From 1c3c178846a73b8ef2656379d7c1434967e6a343 Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Thu, 31 Mar 2016 13:05:55 +0200 Subject: [PATCH 1/6] Aggiunta nuova categoria notizie Corretto download pdf in articolo Modificato menu amministrazione --- private/lib/AnalyticsHelper.php | 2 -- private/lib/dao/models/NotiziaModel.php | 4 +++- public/admin/editNotizie.php | 3 --- public/articolo.php | 26 ++++++++++++++++--------- public/style/admin.css | 14 ++++++++++--- 5 files changed, 31 insertions(+), 18 deletions(-) diff --git a/private/lib/AnalyticsHelper.php b/private/lib/AnalyticsHelper.php index 09e8ba9..b47f38e 100644 --- a/private/lib/AnalyticsHelper.php +++ b/private/lib/AnalyticsHelper.php @@ -6,8 +6,6 @@ Creation Date: 27/gen/2016 class AnalyticsHelper { private static $COOKIE_NAME = "FDN_STAT_NUM"; - //TODO: Switch this value to +1 year in production environment -// private static $COOKIE_TIME = "+5 minutes"; private static $COOKIE_TIME = "+1 year"; /** diff --git a/private/lib/dao/models/NotiziaModel.php b/private/lib/dao/models/NotiziaModel.php index e0d1952..1c816d2 100644 --- a/private/lib/dao/models/NotiziaModel.php +++ b/private/lib/dao/models/NotiziaModel.php @@ -40,6 +40,7 @@ class NotiziaModel extends HasMediaModel{ const CATEGORY_SALUTE = 11; const CATEGORY_ANNUNCI = 12; const CATEGORY_FISCOELAVORO = 13; + const CATEGORY_RUBRICHE = 14; public static $NOTIZIE_CATEGORY = array( self::CATEGORY_POLITICA=>array("label"=>"Politica","mainMenu"=>true,"hidden"=>false,"pages"=>array("list"=>"politica.php")), @@ -54,7 +55,8 @@ class NotiziaModel extends HasMediaModel{ self::CATEGORY_CASA=>array("label"=>"Casa","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"casa.php")), self::CATEGORY_SALUTE=>array("label"=>"Salute","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"salute.php")), self::CATEGORY_ANNUNCI=>array("label"=>"Annunci","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"annunci.php")), - self::CATEGORY_FISCOELAVORO=>array("label"=>"Fisco e Lavoro","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"fiscoelavoro.php")) + self::CATEGORY_FISCOELAVORO=>array("label"=>"Fisco e Lavoro","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"fiscoelavoro.php")), + self::CATEGORY_RUBRICHE=>array("label"=>"Rubriche","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"rubriche.php")) ); public static function getCollectionName(){ diff --git a/public/admin/editNotizie.php b/public/admin/editNotizie.php index 08e84d8..db0f0c1 100644 --- a/public/admin/editNotizie.php +++ b/public/admin/editNotizie.php @@ -88,9 +88,6 @@ try{ } } } - else{ - echo "post nullo"; - } }catch(GUIException $ex){ $error = $ex->getMessage(); }catch (Exception $exec){ diff --git a/public/articolo.php b/public/articolo.php index 0892ca4..75d7f26 100644 --- a/public/articolo.php +++ b/public/articolo.php @@ -207,14 +207,14 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders)); -
- -
renderMedia(array("size"=>MediaRenderer::SIZE_MINI,"clickable"=>true));?>
-
- mediaType == MediaModel::TYPE_IMAGE){ + foreach($medias as $mediaImage){ + if($mediaImage->mediaType == MediaModel::TYPE_IMAGE){ $imageArray = getimagesize($mediaImage->getRenderer()->getImageLink(array("size"=>MediaRenderer::SIZE_BIG))); - ?> + ?> +
+ +
renderMedia(array("size"=>MediaRenderer::SIZE_MINI,"clickable"=>true));?>
+
- +
+ +
renderMedia(array("size"=>MediaRenderer::SIZE_MINI,"clickable"=>true));?>
+
+ diff --git a/public/style/admin.css b/public/style/admin.css index 80a943b..62913aa 100644 --- a/public/style/admin.css +++ b/public/style/admin.css @@ -2,7 +2,7 @@ .hidden{display:none;} -#admin_menu{position:fixed; left:0; top:0; bottom:0; width:300px; background-color:#393939; display:inline-block;} +#admin_menu{position:fixed; left:0; top:0; bottom:0; width:15%; min-width:180px; background-color:#393939; display:inline-block;} #admin_menu ul{list-style: none; width:100%; border:0; margin:0; padding:0; display:block; overflow:hidden;} #admin_menu ul li{width:100%; height:50px; display:inline-block;} @@ -12,8 +12,12 @@ #admin_menu ul ul li a{padding-left:25px; } #admin_menu ul ul{height:0px;} + .admin_head{margin-left:300px; text-align:center;} -.admin_head + div{margin-left:300px; padding: 20px; position:relative;min-height:50px;} +.admin_head + div{padding: 20px; position:relative;min-height:50px;} + +body:before{content: ""; float:left; width:15%; min-width: 180px; height:100vh; min-height:600px;} +body > div {overflow:hidden;} table.dataTable th{text-align:left; } @@ -27,6 +31,10 @@ table.dataTable tr.even td{background-color:rgba(126, 151, 214, 0.4); } .deletionConfirm a {text-decoration: none;color: #36F;font-weight: bold;margin-right: 5px;padding: 5px;display: inline-block;} .deletionConfirm a:hover{background-color: #FFABAB;} +.mediaContent{overflow:hidden;} +.mediaContent *{max-height:100%;max-width:100%;} +.mediaContent > a{height:100%; width:100%;display:inline-block;} + /* _ _ ____ | | ___ __ _(_)_ __ | _ \ __ _ __ _ ___ @@ -92,7 +100,7 @@ div.notiziaStat >div > div {text-align:center;} */ .mediaElement.mainElement{background-color:yellow;} -.mediaElement{display:inline-block; padding:15px;} +.mediaElement{display:inline-block; padding:15px; max-width:160px;} .mediaElement.selected {opacity:0.4;background-color:orange;} /* From fd8c01af931120df60e3e5d9bf347877161d3141 Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Thu, 31 Mar 2016 13:09:08 +0200 Subject: [PATCH 2/6] Bugfix amministrazione per cellulari --- public/style/admin.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/public/style/admin.css b/public/style/admin.css index 62913aa..2b45b9b 100644 --- a/public/style/admin.css +++ b/public/style/admin.css @@ -1,5 +1,9 @@ @CHARSET "UTF-8"; +body{min-width:1000px;} +body:before{content: ""; float:left; width:15%; min-width: 180px; height:100vh; min-height:600px;} +body > div {overflow:hidden;} + .hidden{display:none;} #admin_menu{position:fixed; left:0; top:0; bottom:0; width:15%; min-width:180px; background-color:#393939; display:inline-block;} @@ -16,8 +20,7 @@ .admin_head{margin-left:300px; text-align:center;} .admin_head + div{padding: 20px; position:relative;min-height:50px;} -body:before{content: ""; float:left; width:15%; min-width: 180px; height:100vh; min-height:600px;} -body > div {overflow:hidden;} + table.dataTable th{text-align:left; } From 05d926d582de0cd270d8a73cad2794c40e964564 Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Thu, 31 Mar 2016 14:11:41 +0200 Subject: [PATCH 3/6] Inserito intval in add multimedia sul tipo --- public/admin/addMultimedia.php | 2 +- public/getPDF.php | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/public/admin/addMultimedia.php b/public/admin/addMultimedia.php index 88bb145..7ceaab1 100644 --- a/public/admin/addMultimedia.php +++ b/public/admin/addMultimedia.php @@ -21,7 +21,7 @@ try{ throw new CoreException("Trying to add a media to an invalid model with id '".$notiziaId. "'"); } else{ - $mediaTypeSaved = PostHandler::get("mediaType"); + $mediaTypeSaved = intval(PostHandler::get("mediaType")); if(array_key_exists("action", $_POST) && strcmp(PostHandler::get("action"), "save")==0){ $notizia = GlobalVariables::get("dao")->getFirst("NotiziaModel",array("id"=>$notiziaId)); diff --git a/public/getPDF.php b/public/getPDF.php index e1bf0c1..5ab897a 100644 --- a/public/getPDF.php +++ b/public/getPDF.php @@ -11,14 +11,16 @@ if (array_key_exists("id",$_GET)) { $id = $_GET["id"]; if (!is_null($pdfModel)){ $localFilePath = GlobalVariables::get("config")->paths->media."/".$id.".pdf"; - $exposedFilePath = GlobalVariables::get("config")->paths->xsendfile."/".$id.".pdf"; - if (!SFSManager::fileExists($exposedFilePath)){ - SystemController::shellExec("ln",'-s "'.$localFilePath.'" "'.$exposedFilePath.'"'); + if (SFSManager::fileExists($localFilePath)){ + $exposedFilePath = GlobalVariables::get("config")->paths->xsendfile."/".$id.".pdf"; + if (!SFSManager::fileExists($exposedFilePath)){ + SystemController::shellExec("ln",'-s "'.$localFilePath.'" "'.$exposedFilePath.'"'); + } + header('X-Sendfile: '.$exposedFilePath.''); + + header("Content-type: application/octet-stream"); + header('Content-Disposition: attachment; filename="' . basename($exposedFilePath) . '"'); } - header('X-Sendfile: '.$exposedFilePath.''); - - header("Content-type: application/octet-stream"); - header('Content-Disposition: attachment; filename="' . basename($exposedFilePath) . '"'); } } From 6459055567898a1934e9a6855fb3baddb69ff8b2 Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Thu, 31 Mar 2016 14:14:20 +0200 Subject: [PATCH 4/6] supporto per estensione diversa da .pdf per i pdf --- public/getPDF.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/getPDF.php b/public/getPDF.php index 5ab897a..5eec27e 100644 --- a/public/getPDF.php +++ b/public/getPDF.php @@ -10,9 +10,9 @@ if (array_key_exists("id",$_GET)) { $pdfModel = GlobalVariables::get("dao")->getFirst("MediaModel",array("id"=>$_GET['id'])); $id = $_GET["id"]; if (!is_null($pdfModel)){ - $localFilePath = GlobalVariables::get("config")->paths->media."/".$id.".pdf"; + $localFilePath = GlobalVariables::get("config")->paths->media."/".$id.".".$pdfModel->extension; if (SFSManager::fileExists($localFilePath)){ - $exposedFilePath = GlobalVariables::get("config")->paths->xsendfile."/".$id.".pdf"; + $exposedFilePath = GlobalVariables::get("config")->paths->xsendfile."/".$id.".".$pdfModel->extension; if (!SFSManager::fileExists($exposedFilePath)){ SystemController::shellExec("ln",'-s "'.$localFilePath.'" "'.$exposedFilePath.'"'); } From 9a7a193565304c47e99fe9736f85ea892f920b35 Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Thu, 31 Mar 2016 14:23:01 +0200 Subject: [PATCH 5/6] Corretta funzione per generare i link pdf in xsendfile --- public/getPDF.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/getPDF.php b/public/getPDF.php index 5eec27e..b4ed888 100644 --- a/public/getPDF.php +++ b/public/getPDF.php @@ -14,7 +14,7 @@ if (array_key_exists("id",$_GET)) { if (SFSManager::fileExists($localFilePath)){ $exposedFilePath = GlobalVariables::get("config")->paths->xsendfile."/".$id.".".$pdfModel->extension; if (!SFSManager::fileExists($exposedFilePath)){ - SystemController::shellExec("ln",'-s "'.$localFilePath.'" "'.$exposedFilePath.'"'); + SystemController::shellExec("ln",'-nFs "'.$localFilePath.'" "'.$exposedFilePath.'"'); } header('X-Sendfile: '.$exposedFilePath.''); From 61a3dbb8b01319c26c6e801cabf16d93f956989b Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Thu, 31 Mar 2016 14:32:01 +0200 Subject: [PATCH 6/6] Messe alcune categorie visibili --- private/lib/dao/models/NotiziaModel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/private/lib/dao/models/NotiziaModel.php b/private/lib/dao/models/NotiziaModel.php index 1c816d2..f05d3c1b1 100644 --- a/private/lib/dao/models/NotiziaModel.php +++ b/private/lib/dao/models/NotiziaModel.php @@ -51,9 +51,9 @@ class NotiziaModel extends HasMediaModel{ self::CATEGORY_ANIMALI=>array("label"=>"Mondo Animale","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"animali.php")), self::CATEGORY_VIAGGI=>array("label"=>"Viaggi","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"viaggi.php")), self::CATEGORY_RISTORANTI=>array("label"=>"Food&Drink","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"ristoranti.php")), - self::CATEGORY_MESTIERI=>array("label"=>"Professioni e Mestieri","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"mestieri.php")), + self::CATEGORY_MESTIERI=>array("label"=>"Professioni e Mestieri","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"mestieri.php")), self::CATEGORY_CASA=>array("label"=>"Casa","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"casa.php")), - self::CATEGORY_SALUTE=>array("label"=>"Salute","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"salute.php")), + self::CATEGORY_SALUTE=>array("label"=>"Salute","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"salute.php")), self::CATEGORY_ANNUNCI=>array("label"=>"Annunci","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"annunci.php")), self::CATEGORY_FISCOELAVORO=>array("label"=>"Fisco e Lavoro","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"fiscoelavoro.php")), self::CATEGORY_RUBRICHE=>array("label"=>"Rubriche","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"rubriche.php"))