diff --git a/oth/docs/listaCategorie.txt b/oth/docs/listaCategorie.txt
new file mode 100644
index 0000000..21ef158
--- /dev/null
+++ b/oth/docs/listaCategorie.txt
@@ -0,0 +1,18 @@
+Nel Menu:
+Home
+Politica
+Cronaca
+Sport
+Cultura e Spettacolo
+
+Tutte le categorie:
+Ristoranti
+Viaggi
+Mondo animale
+Gossip
+
+Categorie Nascoste:
+Antichi mestieri
+Casa
+Salute
+Annunci
diff --git a/private/lib/dao/models/BannerModel.php b/private/lib/dao/models/BannerModel.php
index 55e90cf..75ed82e 100644
--- a/private/lib/dao/models/BannerModel.php
+++ b/private/lib/dao/models/BannerModel.php
@@ -10,6 +10,13 @@ class BannerModel extends HasMediaModel{
self::TYPE_HTML=>array("label"=>"Html")
);
+ public function __set($attr,$value){
+ if (strcmp("type", $attr)==0){
+ $value = intval($value);
+ }
+ return parent::__set($attr, $value);
+ }
+
public static function getCollectionName(){
return "banner";
}
diff --git a/public/admin/editBanner.php b/public/admin/editBanner.php
index 14de4b3..b46aa23 100644
--- a/public/admin/editBanner.php
+++ b/public/admin/editBanner.php
@@ -1,4 +1,9 @@
hasRole(AdminModel::ADMIN_TYPE_BANNER_SUPERVISOR)){
- GUIHandler::redirect("admin/index.php");
+ GUIHandler::redirect("admin/listBanner.php");
}
MenuGenerator::generateMenu();
-
HTMLHelper::generateAdminHead();
-$bannerId = PostHandler::get("id");
try{
- $error="";
- $edit=false;
+ $error = "";
+ $bannerId = PostHandler::get("id");
+
$banner = new BannerModel();
- $newMedia = null;
- $mediaTypeSaved = PostHandler::get("mediaType");
-
- if(!is_null($bannerId) && strcmp($bannerId, "")!=0){
- $edit = true;
+ if (!is_null($bannerId) && strcmp("",$bannerId)!=0){
$banner = GlobalVariables::get("dao")->getFirst("BannerModel",array("id"=>$bannerId));
- $newMedias = DaoMediaHandler::getMedias($banner);
- if(sizeof($newMedias)>0){
- $newMedia = reset($newMedias);
- }
- if($banner->hasProperty("type") && !is_null($banner->type)){
- $mediaTypeSaved = $banner->type;
- }
- }
-
- if(array_key_exists("action", $_POST) && strcmp(PostHandler::get("action"), "save")==0){
- if(is_null($bannerId) || strcmp($bannerId, "")==0){
- $banner->customer = PostHandler::get("customer");
- $banner->type = PostHandler::get("mediaType");
- $banner->start = new Mongodate(strtotime(PostHandler::get("dateStart")));
- $banner->end = new Mongodate(strtotime(PostHandler::get("dateEnd")));
- GlobalVariables::get("dao")->save($banner);
- $bannerId = $banner->id;
- }
-
- if(!is_null($bannerId) && strcmp($bannerId, "")!=0){
- $edit=true;
-// $banner = GlobalVariables::get("dao")->getFirst("BannerModel",array("id"=>$bannerId));
- $file = "";
-
- $mediaType = PostHandler::get("mediaType");
- $banner->type=$mediaType;
- if(strcmp($mediaType, "")!=0){
- $tmp = array();
- $saveable = new stdClass();
- $saveable->mediaType = $mediaType;
- if(strcmp($mediaType,MediaModel::TYPE_HTML5)==0){
- $saveable->code = PostHandler::get("data");
- $media = DaoMediaHandler::createNewTextBasedMedia($saveable);
- }
- else if(strcmp($mediaType,MediaModel::TYPE_IMAGE)==0){
- $file = $_FILES['data']['tmp_name'];
- $info = pathinfo($_FILES['data']['name']);
-// $file = PostHandler::get("data");
- $media = DaoMediaHandler::createNewFileBasedMedia($saveable, $file,$info["extension"]);
- }
-
- if(!is_null($media)){
- GlobalVariables::get("dao")->save($media);
- DaoMediaHandler::addMedia($banner, $media);
- GlobalVariables::get("dao")->save($banner);
- }
- else{
- throw new Exception("Cannot save a null media in the news with id '".$bannerId."'");
- }
- }
- else{
- throw new Exception("Invalid mediaType '".$mediaType."' while trying to add the media in editBanner");
- }
-
+ if (is_null($banner)){
GUIHandler::redirect("admin/listBanner.php");
}
}
-// else if(array_key_exists("action", $_POST) && strcmp(PostHandler::get("action"), "delete")==0){
-// if(!is_null($bannerId) && strcmp($bannerId, "")!=0){
-// $banner = GlobalVariables::get("dao")->getFirst("BannerModel",array("id"=>$bannerId));
-// $medias = DaoMediaHandler::getMedias($banner);
-// // $media = reset($medias);
-// // $media = GlobalVariables::get("dao")->getFirst("MediaModel",array("id"=>$mediaId));
-// foreach ($medias as $media){
-// DaoMediaHandler::deleteMedia($banner, $media);
-// $banner->type = null;
-// GlobalVariables::get("dao")->save($banner);
-// }
-// }
-// GUIHandler::redirect("admin/listBanner.php");
-// }
- $formFile = '
- Seleziona file ';
- if($edit && !is_null($newMedia)){
- $formHtml = 'Inserire html: ';
- }
- else{
- $formHtml = 'Inserire html: ';
- }
-
+
}catch(GUIException $ex){
$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.";
+ $msg = LogModel::fromException($exec);
+ GlobalVariables::get("dao")->save($msg);
+ $error = "Si è verificato un errore inatteso durante l'esecuzione della pagina. Contattare il supporto tecnico comunicando il seguente codice di erore '".$msg->getCode()."'";
+
}
-?>
-
-
\ No newline at end of file
+?>
\ No newline at end of file
diff --git a/public/admin/homeBanner.php b/public/admin/homeBanner.php
new file mode 100644
index 0000000..65b7ba8
--- /dev/null
+++ b/public/admin/homeBanner.php
@@ -0,0 +1,74 @@
+hasRole(AdminModel::ADMIN_TYPE_BANNER_SUPERVISOR)){
+ GUIHandler::redirect("admin/listBanner.php");
+}
+
+MenuGenerator::generateMenu();
+HTMLHelper::generateAdminHead();
+
+try{
+ $error = "";
+ $bannerId = PostHandler::get("id");
+ if (is_null($bannerId) || strcmp("",$bannerId)==0){
+ GUIHandler::redirect("admin/listBanner.php");
+ }
+
+ $banner = GlobalVariables::get("dao")->getFirst("BannerModel",array("id"=>$bannerId));
+
+ if (is_null($banner)){
+ GUIHandler::redirect("admin/listBanner.php");
+ }
+
+ $media = DaoMediaHandler::getMainMediaFromModel($banner);
+
+ if (is_null($media)){
+ throw new Exception("Impossibile mostrare il banner in quanto associato ad un media non valido. (Banner: '".$bannerId."')");
+ }
+
+ $bannerTypeString = "Sconosciuto";
+ if(array_key_exists($banner->type, MediaModel::$MEDIA_TYPES)){
+ $bannerTypeString = MediaModel::$MEDIA_TYPES[$banner->type]["label"];
+ }
+ else {
+ throw new Exception("Impossibile mostrare il tipo banner in quanto non presente nella lista dei tipi MediaModel::\$MEDIA_TYPES. (Banner: '".$bannerId."', BannerType: {$banner->type})");
+ }
+
+}catch(GUIException $ex){
+ $error = $ex->getMessage();
+}catch (Exception $exec){
+ $msg = LogModel::fromException($exec);
+ GlobalVariables::get("dao")->save($msg);
+ $error = "Si è verificato un errore inatteso durante l'esecuzione della pagina. Contattare il supporto tecnico comunicando il seguente codice di erore '".$msg->getCode()."'";
+
+}
+
+?>
+
+ '.$error.'
';
+ }
+ ?>
+
+
Cliente customer;?>
+
Data Inizio start->sec);?>
+
Data Fine end->sec);?>
+
Tipo
+
+
+ renderMedia(); ?>
+
+
+
\ No newline at end of file
diff --git a/public/admin/homeNotizie.php b/public/admin/homeNotizie.php
index 198a2eb..4b40ad7 100644
--- a/public/admin/homeNotizie.php
+++ b/public/admin/homeNotizie.php
@@ -199,7 +199,7 @@ try{
hasProperty("sondaggio") && !is_null($notizia->sondaggio)){?>
$("#sondaggioGraph").highcharts({
chart:{type:'bar'},
- title:{text:'sondaggio->titolo); ?>'},
+ title:{text:'sondaggio->titolo)); ?>'},
xAxis:{
categories:[sondaggio->voci as $voce){
echo ($i++==0?"":", ")."\"".trim($voce->nome)."\"";
diff --git a/public/admin/listBanner.php b/public/admin/listBanner.php
index d49df2a..1911535 100644
--- a/public/admin/listBanner.php
+++ b/public/admin/listBanner.php
@@ -21,10 +21,15 @@ $columns = array(
array("label"=>"Fine","data"=>"end")
);
-$buttons = array(
- array("icon"=>"icon-medium-blue icon-editmed","page"=>"editBanner.php"),
- array("icon"=>"icon-medium-blue icon-remove","page"=>"deleteBanner.php")
-);
+$buttons = array();
+if (AdminLoginManager::getLogged()->hasRole(AdminModel::ADMIN_TYPE_BANNER_SUPERVISOR)){
+ $buttons[] = array("icon"=>"icon-medium-blue icon-home","page"=>"homeBanner.php");
+}
+if (AdminLoginManager::getLogged()->hasRole(AdminModel::ADMIN_TYPE_BANNER)){
+ $buttons[] = array("icon"=>"icon-medium-blue icon-editmed","page"=>"editBanner.php");
+}
+$buttons[] = array("icon"=>"icon-medium-blue icon-remove","page"=>"deleteBanner.php");
+
?>
hasRole(AdminModel::ADMIN_TYPE_BANNER_SUPERVISOR)){
+ GUIHandler::redirect("admin/index.php");
+}
+
+MenuGenerator::generateMenu();
+
+HTMLHelper::generateAdminHead();
+
+// $bannerId = PostHandler::get("id");
+
+try{
+ $error="";
+// $edit=false;
+ $banner = new BannerModel();
+ $newMedia = null;
+ $mediaTypeSaved = PostHandler::get("mediaType");
+
+// if(!is_null($bannerId) && strcmp($bannerId, "")!=0){
+// $edit = true;
+// $banner = GlobalVariables::get("dao")->getFirst("BannerModel",array("id"=>$bannerId));
+// $newMedias = DaoMediaHandler::getMedias($banner);
+// if(sizeof($newMedias)>0){
+// $newMedia = reset($newMedias);
+// }
+// if($banner->hasProperty("type") && !is_null($banner->type)){
+// $mediaTypeSaved = $banner->type;
+// }
+// }
+
+ if(array_key_exists("action", $_POST) && strcmp(PostHandler::get("action"), "save")==0){
+ $mediaType = PostHandler::get("mediaType");
+ if (!is_null($mediaType) && strcmp($mediaType, "")!=0){
+ $banner->type=$mediaType;
+
+ $banner->customer = PostHandler::get("customer");
+ $banner->start = new Mongodate(strtotime(PostHandler::get("dateStart")));
+ $banner->end = new Mongodate(strtotime(PostHandler::get("dateEnd")));
+
+ $media = null;
+ if ($banner->type == MediaModel::TYPE_HTML5){
+ $saveableMedia = new stdClass();
+ $saveableMedia->mediaType = MediaModel::TYPE_HTML5;
+ $saveableMedia->code = PostHandler::get("data");
+ $media = DaoMediaHandler::createNewTextBasedMedia($saveableMedia);
+ }
+ else if ($banner->type == MediaModel::TYPE_IMAGE){
+ $saveableMedia = new stdClass();
+ $saveableMedia->mediaType = MediaModel::TYPE_IMAGE;
+
+ $file = $_FILES['data']['tmp_name'];
+ $extension = pathinfo($_FILES['data']['name'], PATHINFO_EXTENSION);
+
+ $media = DaoMediaHandler::createNewFileBasedMedia($saveable, $file, $extension);
+ }
+
+ if (!is_null($media)){
+ GlobalVariables::get("dao")->save($banner);
+ GlobalVariables::get("dao")->save($media);
+ DaoMediaHandler::addMedia($banner, $media);
+ GlobalVariables::get("dao")->save($banner);
+ GUIHandler::redirect("admin/listBanner.php");
+ }
+ else {
+ throw new GUIException("I dati inseriti per il file multimediale non sono validi");
+ }
+ }
+ else {
+ throw new GUIException("Selezionare il tipo di file multimediale da utilizzare");
+ }
+
+
+// if(is_null($bannerId) || strcmp($bannerId, "")==0){
+// $banner->customer = PostHandler::get("customer");
+// $banner->type = PostHandler::get("mediaType");
+// $banner->start = new Mongodate(strtotime(PostHandler::get("dateStart")));
+// $banner->end = new Mongodate(strtotime(PostHandler::get("dateEnd")));
+// GlobalVariables::get("dao")->save($banner);
+// $bannerId = $banner->id;
+// }
+
+// if(!is_null($bannerId) && strcmp($bannerId, "")!=0){
+// $edit=true;
+// // $banner = GlobalVariables::get("dao")->getFirst("BannerModel",array("id"=>$bannerId));
+// $file = "";
+
+// $mediaType = PostHandler::get("mediaType");
+// $banner->type=$mediaType;
+// if(strcmp($mediaType, "")!=0){
+// $tmp = array();
+// $saveable = new stdClass();
+// $saveable->mediaType = $mediaType;
+// if(strcmp($mediaType,MediaModel::TYPE_HTML5)==0){
+// $saveable->code = PostHandler::get("data");
+// $media = DaoMediaHandler::createNewTextBasedMedia($saveable);
+// }
+// else if(strcmp($mediaType,MediaModel::TYPE_IMAGE)==0){
+// $file = $_FILES['data']['tmp_name'];
+// $info = pathinfo($_FILES['data']['name']);
+// // $file = PostHandler::get("data");
+// $media = DaoMediaHandler::createNewFileBasedMedia($saveable, $file,$info["extension"]);
+// }
+
+// if(!is_null($media)){
+// GlobalVariables::get("dao")->save($media);
+// DaoMediaHandler::addMedia($banner, $media);
+// GlobalVariables::get("dao")->save($banner);
+// }
+// else{
+// throw new Exception("Cannot save a null media in the news with id '".$bannerId."'");
+// }
+// }
+// else{
+// throw new Exception("Invalid mediaType '".$mediaType."' while trying to add the media in editBanner");
+// }
+
+// GUIHandler::redirect("admin/listBanner.php");
+// }
+ }
+// else if(array_key_exists("action", $_POST) && strcmp(PostHandler::get("action"), "delete")==0){
+// if(!is_null($bannerId) && strcmp($bannerId, "")!=0){
+// $banner = GlobalVariables::get("dao")->getFirst("BannerModel",array("id"=>$bannerId));
+// $medias = DaoMediaHandler::getMedias($banner);
+// // $media = reset($medias);
+// // $media = GlobalVariables::get("dao")->getFirst("MediaModel",array("id"=>$mediaId));
+// foreach ($medias as $media){
+// DaoMediaHandler::deleteMedia($banner, $media);
+// $banner->type = null;
+// GlobalVariables::get("dao")->save($banner);
+// }
+// }
+// GUIHandler::redirect("admin/listBanner.php");
+// }
+ $formFile = '
+
Seleziona file ';
+ if($edit && !is_null($newMedia)){
+ $formHtml = '
Inserire html: ';
+ }
+ else{
+ $formHtml = '
Inserire html: ';
+ }
+
+}catch(GUIException $ex){
+ $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.";
+}
+?>
+
+
\ No newline at end of file
diff --git a/public/admin/unacceptedCommenti.php b/public/admin/unacceptedCommenti.php
index 09abe07..359f030 100644
--- a/public/admin/unacceptedCommenti.php
+++ b/public/admin/unacceptedCommenti.php
@@ -27,8 +27,6 @@ $columns = array(
$buttons = array(
array("icon"=>"icon-medium-blue icon-home","page"=>"validateCommento.php")
- // array("icon"=>"icon-medium-blue icon-editmed","page"=>"editNotizie.php"),
-// array("icon"=>"icon-medium-blue icon-remove","page"=>"deleteNotizie.php")
);
?>