#10 - Completo

app/os/webserver-entrypoint

@@ -12,5 +12,8 @@ mkdir -p "/tmp/${DDNINJA_AUTHOR}/${DDNINJA_BUILDNAME}"
 chown -R www-data:www-data "/tmp/${DDNINJA_AUTHOR}/${DDNINJA_BUILDNAME}"
 chown -R www-data:www-data /var/log/${DDNINJA_AUTHOR}
 
+mkdir -p "/home/${DDNINJA_AUTHOR}/storage/${DDNINJA_BUILDNAME}/media/"
+chown -R www-data:www-data "/home/${DDNINJA_AUTHOR}/storage/${DDNINJA_BUILDNAME}/media/"
+
 asdphp-entrypoint & wait
 exit $?

app/private/lib/BannerHelper.php

@@ -19,9 +19,7 @@ class BannerHelper {
     }
 	
 	public static function printBanner($position = BannerModel::POSITION_HEAD){
-        $category = BannerModel::GENERAL_CATEGORY;
-		
-		$cur = self::getPlaceholderId();
+        $cur = self::getPlaceholderId();
 
         if (!array_key_exists($position, self::$positions)) {
             self::$positions[$position] = [];

app/private/lib/SimpleConfigHelper.php

@@ -0,0 +1,71 @@
+<?php
+
+
+class SimpleConfigHelper {
+
+    private Memcached $memcached;
+    private GenericDao $dao;
+
+    private stdClass $config;
+
+    public function __construct() {
+        $this->memcached = new Memcached();
+        $this->memcached->addServer('memcached', 11211);
+        $this->dao = GlobalVariables::get("dao");
+
+        $this->reload();
+    }
+
+    public function hasValue(string $name) : bool {
+        return property_exists($this->config, $name);
+    }
+
+    public function getValue(string $name) {
+        return $this->config->$name;
+    }
+
+    public function setValue(string $name, $val) {
+        $model = $this->dao->getFirst(SimpleConfig::class);
+        $model->details->$name = $val;
+        $this->dao->save($model);
+        $this->reload($model);
+    }
+
+    
+
+    private function reload($model = null) {
+        if (!is_null($model)) {
+            $this->memcached->set($this->getCacheKey(), json_encode($model->details, JSON_FORCE_OBJECT));
+        }
+        else if ( !$this->isCached() ) {
+            $model = $this->dao->getFirst(SimpleConfig::class);
+            if (is_null($model)) {
+                $model = new SimpleConfig();
+                $this->dao->save($model);
+            }
+            $this->memcached->set($this->getCacheKey(), json_encode($model->details, JSON_FORCE_OBJECT));
+        }
+        
+        $rval = $this->memcached->get(
+            $this->getCacheKey()
+        );
+        $this->config = json_decode($rval, false);
+    }
+
+    private function getCacheKey() {
+        return 'glob.fdn2.simpleConfig';
+    }
+
+    private function isCached(): bool {
+        return $this->memcached->get( $this->getCacheKey() ) ? true : false;
+    }
+
+    private function flush() {
+        $this->memcached->set( $this->getCacheKey(), false );
+    }
+
+
+}
+
+
+?>

app/private/lib/dao/lib.inclusion.php

@@ -45,6 +45,8 @@ require_once(dirname(__FILE__)."/models/stats/ArticleStatsModel.php");
 require_once(dirname(__FILE__)."/models/stats/BannerStatsModel.php");
 require_once(dirname(__FILE__)."/models/stats/PageViewStatsModel.php");
 
+require_once(dirname(__FILE__)."/models/SimpleConfig.php");
+
 $dao = new GenericDao($database->dbName,$database->connectionString);
 GlobalVariables::set("dao", $dao);
 ?>

app/private/lib/dao/models/NotiziaModel.php

@@ -47,6 +47,8 @@ class NotiziaModel extends HasMediaModel implements DaoSearchable{
 	const CATEGORY_CONSIGLI_ESPERTI = 18;
 
 	const CATEGORY_MONDO_SPOSI = 19;
+
+    const CATEGORY_VARIE = 99;
 	
 	public static $NOTIZIE_CATEGORY = array(
 			self::CATEGORY_POLITICA=>array("label"=>"Politica","mainMenu"=>true,"hidden"=>false,"pages"=>array("list"=>"politica.php"),"color"=>"#3e3e3e","isSubmenu"=>null),
@@ -69,6 +71,8 @@ class NotiziaModel extends HasMediaModel implements DaoSearchable{
 			self::CATEGORY_CONSIGLI_ESPERTI=>array("label"=>"I consigli degli esperti","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"consigliEsperti.php"),"color"=>"#3e3e3e","isSubmenu"=>null),
 
 			self::CATEGORY_MONDO_SPOSI=>array("label"=>"Mondo Sposi","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"mondoSposi.php"),"color"=>"#dd603a","isSubmenu"=>null),
+
+            self::CATEGORY_VARIE=>array("label"=>"Varie","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"varie.php"),"color"=>"#dd603a","isSubmenu"=>null),
 	);
 	
 	public function __construct($saveableObject = null){

app/private/lib/dao/models/SimpleConfig.php

@@ -0,0 +1,26 @@
+<?php
+/*
+Author: 		Riccardo Di Dato
+Creation Date:	13/gen/2016
+*/
+
+
+class SimpleConfig extends Model {
+    const VARIE_LABEL = "varie_home_label";
+    
+
+    public function __construct($saveableObject = null) {
+        parent::__construct($saveableObject);
+        if (!$this->hasProperty("data") || !is_object($this->details)) {
+            $this->details = new stdClass();
+        }
+    }
+
+	public static function getCollectionName(){
+		return "simpleConfig";
+	}
+
+}
+
+
+?>

app/private/lib/gui/GUIHandler.php

@@ -19,9 +19,7 @@ class GUIHandler {
 	private static $onLoadEvents = array();
 	
 	public static function generateHtmlHeaders(array $data = array(), $admin = false){
-        if ($admin) {
-            ASDSessionHandler::getSessionId();
-        }
+        ASDSessionHandler::getSessionId();
 		$conf = GlobalVariables::get("config");
 		
 		$title = $conf->info->projectName;
@@ -222,7 +220,10 @@ class GUIHandler {
 						<?php BannerHelper::printBanner(BannerModel::POSITION_HEAD);?>
 					</div>
 				</div>
-				<div class="bottomBar" style="height:40px;width:1000px;"></div>
+				<div class="bottomBar" style="width:1000px;"></div>
+                <div class="banner subheadBanner mediaContent">
+                    <?php BannerHelper::printBanner(BannerModel::POSITION_TOP);?>
+                </div>
 			</div>
 		<?php 	
 	}
@@ -329,6 +330,9 @@ class GUIHandler {
 			self::setCookieSeen(); 
 		}
 		?>
+        <div class="banner footerBanner mediaContent">
+            <?php BannerHelper::printBanner(BannerModel::POSITION_BOTTOM);?>
+        </div>
 		<div class="footer">
 			<div class="footerCategory">
 				<a href="index.php">Home</a>

app/private/lib/gui/GUIHandlerMobile.php

@@ -343,12 +343,6 @@ class GUIHandlerMobile {
 	public static function generateFooter(){
 		if (!self::hasSeenCookieMessage()){
 			?>
-<!-- 				<div class="cookieAdvice"> -->
-<!-- 					<div>Questo sito utilizza cookie tecnici per offrirti una migliore esperienza di navigazione sul sito.</div> -->
-<!-- 					<div>Navigando su questo sito accetti l'utilizzo dei cookie.</div><br/> -->
-<!-- 					<a class="closeAdvice">Chiudi</a> -->
-<!-- 				<br/><br/> -->
-<!-- 				</div> -->
 				<script type="text/javascript">
 					$(document).ready(function(){
 						$('.closeAdvice').click(function(){
@@ -363,6 +357,9 @@ class GUIHandlerMobile {
 			self::setCookieSeen(); 
 		}
 		?>
+        <div class="banner footerBanner mediaContent">
+            <?php BannerHelper::printBanner(BannerModel::POSITION_BOTTOM);?>
+        </div>
 		<div class="footer">
 			<div class="footerButton" style="text-align:center;">
 				<a href="#">

app/private/lib/gui/MenuGenerator.php

@@ -47,7 +47,9 @@ class MenuGenerator {
 			array("label"=>"Config","page"=>"editConfig.php","requires"=>AdminModel::ADMIN_TYPE_SUPERADMIN),
 			array("label"=>"Logs","page"=>"logs.php","requires"=>AdminModel::ADMIN_TYPE_SUPERADMIN)
 		)),
-			
+		
+        array("label"=>"Config","page"=>"simpleConfig.php"),
+
 		array("label"=>"Guida","page"=>"index.php"),
 			
 		array("label"=>"Logout","page"=>"logout.php")

app/private/lib/lib.inclusions.php

@@ -48,5 +48,8 @@ require_once(dirname(__FILE__)."/BannerHelper.php");
 
 require_once(dirname(__FILE__)."/RSSHelper.php");
 
+require_once(dirname(__FILE__)."/SimpleConfigHelper.php");
+
+GlobalVariables::set("cfg", new SimpleConfigHelper());
 
 ?>

app/public/admin/editBanner.php

@@ -91,9 +91,17 @@ try{
 				<span class="label">Posizione:</span> 
 				<select name="position">
 					<option disabled selected style="display:none;">Seleziona Posizione</option>
-					<option <?php echo $banner->position==BannerModel::POSITION_HEAD?"selected":"";?> value="<?php echo BannerModel::POSITION_HEAD;?>"><?php echo BannerModel::$BANNER_POSITIONS[BannerModel::POSITION_HEAD]["label"];?></option>
-					<option <?php echo $banner->position==BannerModel::POSITION_BODY?"selected":"";?> value="<?php echo BannerModel::POSITION_BODY;?>"><?php echo BannerModel::$BANNER_POSITIONS[BannerModel::POSITION_BODY]["label"];?></option>
-					<option <?php echo $banner->position==BannerModel::POSITION_LONG?"selected":"";?> value="<?php echo BannerModel::POSITION_LONG;?>"><?php echo BannerModel::$BANNER_POSITIONS[BannerModel::POSITION_LONG]["label"];?></option>
+                    <?php 
+                        foreach (BannerModel::$BANNER_POSITIONS as $type => $data) {
+                            printf(
+                                '<option %s value="%s">%s</option>',
+                                $banner->position==$type ? "selected" : "",
+                                $type,
+                                $data['label']
+                            );
+
+                        }
+                    ?>
 				</select>
 			</div>
 			<div>

app/public/admin/index.php

@@ -74,6 +74,8 @@ HTMLHelper::generateAdminHead();
 			<li>Banner testata:<b>180x60px</b></li>
 			<li>Banner corpo:<b>160x120px</b></li>
 			<li>Banner lungo:<b>160x240px</b></li>
+            <li>Banner Inizio pagina:<b>1000x120px</b></li>
+            <li>Banner Fine pagina:<b>1000x200px</b></li>
 		</ul>
 		Tale restizione &egrave; consigliata anche per i banner di tipo <i>HTML5</i>.
 	</p>

app/public/admin/newBanner.php

@@ -23,18 +23,6 @@ try{
 	$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){
@@ -98,69 +86,7 @@ try{
 		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 = '<input type="hidden" name="MAX_FILE_SIZE" value="52428800" />
 				<span class="label">Seleziona file</span><input type="file" name="data" />';
 	if($edit && !is_null($newMedia)){
@@ -173,6 +99,7 @@ try{
 }catch(GUIException $ex){
 	$error = $ex->getMessage();
 }catch (Exception $exec){
+    var_dump($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.";
 }

app/public/admin/simpleConfig.php

@@ -0,0 +1,69 @@
+<?php
+/*
+Author: 		Riccardo Di Dato
+Creation Date:	25/gen/2016
+*/
+
+
+require_once(dirname(__FILE__)."/../load.php");
+
+GUIHandler::generateHtmlHeaders(array(),true);
+
+if (!AdminLoginManager::isLogged()){
+	GUIHandler::redirect("admin/login.php");
+}
+else if (!AdminLoginManager::getLogged()->hasRole(AdminModel::ADMIN_TYPE_NORMALADMIN)){
+	GUIHandler::redirect("admin/index.php");
+}
+
+MenuGenerator::generateMenu();
+
+HTMLHelper::generateAdminHead();
+
+$saved = false;
+$action = PostHandler::get("action");
+if (!is_null($action) && strcmp("", $action)!=0){
+	if (strcmp("save", $action)==0){
+
+        if (PostHandler::get(SimpleConfig::VARIE_LABEL)) {
+            GlobalVariables::get("cfg")->setValue(SimpleConfig::VARIE_LABEL, PostHandler::get(SimpleConfig::VARIE_LABEL));
+        }
+
+		$saved = true;
+	}
+}
+
+?>
+<div>
+	<?php 
+		if ($saved){
+			echo '<div style="color:green;">Dati salvati con successo</div>';
+		}
+	?>
+	<form id="taskForm" method="POST" action="">
+		<input type="hidden" name="action" value="" />
+		<div><span class="label">&nbsp;</span><b>Tasks</b></div>
+        <?php
+            printf(
+                '<div><span class="label">Varie (home)</span><input type="text" name="%s" value="%s" /><br/>',
+                SimpleConfig::VARIE_LABEL,
+                GlobalVariables::get("cfg")->hasValue(SimpleConfig::VARIE_LABEL) ? GlobalVariables::get("cfg")->getValue(SimpleConfig::VARIE_LABEL) : ""
+            )
+        ?>
+	</form>
+	<div class="formBtns">
+		<a href="#" id="taskForm_salva" >Salva</a>
+	</div>
+</div>
+<script type="text/javascript">
+	$(document).ready(function(event){
+		$("#taskForm_salva").click(function(event){
+			$("form#taskForm input[type=hidden][name=action]").val("save");
+			$("form#taskForm").submit();
+		});
+		$("#taskForm_annulla").click(function(event){
+			$("form#taskForm input[type=hidden][name=action]").val("cancel");
+			$("form#taskForm").submit();
+		});	
+	});
+</script>

app/public/articolo.php

@@ -133,6 +133,13 @@ GUIHandler::generateHtmlHeaders(array("additionalMetadata"=>$additionalHeaders,"
 <div class="clickableImageContainer" onclick="javascript:hidePreview()"></div> -->
 <div style="width:1000px;margin-left:auto;margin-right:auto;" itemscope itemtype="http://schema.org/Article">
 <?php 	
+
+    $categoryName = NotiziaModel::$NOTIZIE_CATEGORY[$articolo->category]["label"];
+    if ($articolo->category == NotiziaModel::CATEGORY_VARIE) {
+        if ( GlobalVariables::get("cfg")->hasValue(SimpleConfig::VARIE_LABEL) ) {
+            $categoryName = GlobalVariables::get("cfg")->getValue(SimpleConfig::VARIE_LABEL);
+        }
+    }
 	
 	GUIHandler::generateHeadPublic();
 	GUIHandler::generateMenu();	
@@ -140,7 +147,7 @@ GUIHandler::generateHtmlHeaders(array("additionalMetadata"=>$additionalHeaders,"
 	<div class="articoloCategory">
 		<div class="categoryStyle">
 			<div class="icon"><img alt="" src="images/categoryIcon.png"></div>
-			<div class="articoloCategoryName" style="background-color:<?php echo NotiziaModel::$NOTIZIE_CATEGORY[$articolo->category]["color"] ?>"><span itemprop="articleSection"><?php echo strtoupper(NotiziaModel::$NOTIZIE_CATEGORY[$articolo->category]["label"]);?></span></div>
+			<div class="articoloCategoryName" style="background-color:<?php echo NotiziaModel::$NOTIZIE_CATEGORY[$articolo->category]["color"] ?>"><span itemprop="articleSection"><?php echo strtoupper($categoryName);?></span></div>
 		</div>
 	</div>
 	<div class="articoloContainer" >

app/public/index.php

@@ -154,15 +154,27 @@ try {
 // 	}
 	
 	
-	$animalNews = GlobalVariables::get("dao")->getFirst("NotiziaModel",
-			array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_MONDO_SPOSI,'_id'=>array('$nin'=>$ansaIds),
-					"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
-			array("sort"=>array("about.lastEdit"=>-1))
-	);
-	if (!is_null($animalNews)){
-		$animalNews->testo = strip_tags($animalNews->testo);
-		$animalNews->sottotitolo = strip_tags($animalNews->sottotitolo);
-	}
+    $varie = GlobalVariables::get("dao")->query(
+        NotiziaModel::class,
+        [
+            "status"=>NotiziaModel::STATUS_ACCEPTED,
+            "category"=>NotiziaModel::CATEGORY_VARIE,
+            '_id'=> [ '$nin'=>$ansaIds ],
+            "about.lastEdit" =>  [ '$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ) ]
+        ]
+    );
+    $varie = array_map(
+        function ($model) {
+            $model->testo = strip_tags($model->testo);
+		    $model->sottotitolo = strip_tags($model->sottotitolo);
+            return $model;
+        },
+        $varie
+    );
+    $varieName = "Varie";
+    if ( GlobalVariables::get("cfg")->hasValue(SimpleConfig::VARIE_LABEL) ) {
+        $varieName = GlobalVariables::get("cfg")->getValue(SimpleConfig::VARIE_LABEL);
+    }
 	
 	$saluteNews = GlobalVariables::get("dao")->query("NotiziaModel",
 			array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_SALUTE,'_id'=>array('$nin'=>$ansaIds),
@@ -467,7 +479,7 @@ catch (Exception $ex){
 	<?php 
 		if(sizeof($elezioni)>0){
 	?>
-			<div class="lastViaggi">
+        <div class="rightCategory">
 			<div class="categoryBar" style="text-align:left;">
 				<div class="categoryTag"><span>SPECIALE ELEZIONI</span></div>
 				<div class="categoryLine"></div>
@@ -489,7 +501,7 @@ catch (Exception $ex){
 		}
 		else{	
 	?>
-			<div class="lastViaggi">
+			<div class="rightCategory">
 				<div class="categoryBar" style="text-align:left;">
 					<div class="categoryTag"><span>VIAGGI</span></div>
 					<div class="categoryLine"></div>
@@ -513,23 +525,22 @@ catch (Exception $ex){
 	<?php 
 		}
 	?>
-		<div class="animali">
-			<div class="categoryBar" style="text-align:left;">
-				<div class="categoryTag"><span>MONDO SPOSI</span></div>
+		<div class="rightCategory">
+			<div class="categoryBar" style="text-align:left;" >
+				<div class="categoryTag"><span><?php echo strtoupper($varieName); ?></span></div>
 				<div class="categoryLine"></div>
 			</div>
-			<?php if(!is_null($animalNews)){
-// 					$stringTitle = (strlen($animalNews->titolo) > 53) ? htmlentities( substr( html_entity_decode( $animalNews->titolo ) ,0,50) ) .'...' : $animalNews->titolo;
-					$stringTitle = $animalNews->cutTextHtmlSafe("titolo",50);
-					?>
-					<a href="<?php echo $animalNews->getAbsoluteUrl();?>" class="animaliContainer">
-						<?php $media = DaoMediaHandler::getMainMediaFromModel($animalNews);
-								if(!is_null($media)){?>
-									<div class="culturaMainMedia mediaContent"><?php $media->renderMedia(['size' => MediaImage::SIZE_MEDIUM]);?></div>
-						<?php 	}?>
-						<div class="animaliTitle"><?php echo $stringTitle;?></div>
-					</a>
-		<?php	}?>			
+            <?php 
+                foreach ($varie as $model) {
+                    $media = DaoMediaHandler::hasMainMedia($model) ? DaoMediaHandler::getMainMediaFromModel($model) : null;
+                    printf(
+                        '<a href="%s" class=""><div class="mediaContent">%s</div><div class="rightColumnTitle" >%s</div></a>',
+                        $model->getAbsoluteUrl(),
+                        is_null($media) ? "" : $media->asText(['size' => MediaImage::SIZE_MEDIUM]),
+                        $model->cutTextHtmlSafe("titolo",50)
+                    );
+                }
+            ?>
 		</div>
 		<div class="middleRightLongBanner mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_LONG);?></div>
 	</div>

app/public/mobile/archivio.php

@@ -152,8 +152,9 @@ try {
 	</div>
 	<div class="archivioResults">
 		<div style="text-align:center;">
-			<div class="middleBanner mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_HEAD);?></div>
-			<div class="middleBanner mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_HEAD);?></div>
+            <div class="banner subheadBanner mediaContent">
+                <?php BannerHelper::printBanner(BannerModel::POSITION_TOP);?>
+            </div>
 		</div>
 		<?php 	if(!$post){
 		?>

app/public/mobile/articolo.php

@@ -128,6 +128,13 @@ GUIHandlerMobile::generateHtmlHeaders(array("additionalMetadata"=>$additionalHea
 <div style="margin-top:32vw;width:100vw;margin-left:auto;margin-right:auto;" itemscope itemtype="http://schema.org/Article">
 <?php 	
 	
+    $categoryName = NotiziaModel::$NOTIZIE_CATEGORY[$articolo->category]["label"];
+    if ($articolo->category == NotiziaModel::CATEGORY_VARIE) {
+        if ( GlobalVariables::get("cfg")->hasValue(SimpleConfig::VARIE_LABEL) ) {
+            $categoryName = GlobalVariables::get("cfg")->getValue(SimpleConfig::VARIE_LABEL);
+        }
+    }
+
 	GUIHandlerMobile::generateHeadPublic();
 	GUIHandlerMobile::generateMenu();
 ?>
@@ -136,11 +143,12 @@ GUIHandlerMobile::generateHtmlHeaders(array("additionalMetadata"=>$additionalHea
 </script>
 <div class="newsContainer">
 	<div style="text-align:center;">
-		<div class="middleBanner mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_HEAD);?></div>
-		<div class="middleBanner mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_HEAD);?></div>
+        <div class="banner subheadBanner mediaContent">
+            <?php BannerHelper::printBanner(BannerModel::POSITION_TOP);?>
+        </div>
 	</div>
 	<div class="articoloCategoryName" style="color:white;background-color:<?php echo NotiziaModel::$NOTIZIE_CATEGORY[$articolo->category]["color"] ?>;">
-		<span itemprop="articleSection"><?php echo strtoupper(NotiziaModel::$NOTIZIE_CATEGORY[$articolo->category]["label"]);?></span>
+		<span itemprop="articleSection"><?php echo strtoupper($categoryName);?></span>
 	</div>
 	<div class="headArticolo">
 		<div class="newsImage" >

app/public/mobile/categorySummary.php

@@ -65,9 +65,10 @@ try{
 	GUIHandlerMobile::generateHeadPublic();
 	GUIHandlerMobile::generateMenu();?>
 	<div class="categorySummaryContainer">
-	<div style="text-align:center;">	
-			<div class="middleBanner mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_HEAD);?></div>
-			<div class="middleBanner mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_HEAD);?></div>
+	    <div style="text-align:center;">	
+            <div class="banner subheadBanner mediaContent">
+                <?php BannerHelper::printBanner(BannerModel::POSITION_TOP);?>
+            </div>
 		</div>
 		<?php $i=0;
 		if(sizeof($notizie)>0){

app/public/mobile/index.php

@@ -6,9 +6,13 @@ Creation Date:	22/dic/2015
 
 require_once(dirname(__FILE__)."/../load.php");
 
+function stripModelText($model) {
+    $model->testo = strip_tags($model->testo);
+    $model->sottotitolo = strip_tags($model->sottotitolo);
+    return $model;
+}
+
 try {
-// 	AnalyticsHelper::logPageImpression();
-	
 	$config = GlobalVariables::get("config");
 	$directLink = $config->pages->remoteLocationPath."index.php";
 	
@@ -17,122 +21,107 @@ try {
 	
 	GUIHandlerMobile::generateHtmlHeaders(array("additionalMetadata"=>$additionalHeaders));
 	
-// 	echo "OK";
-	
-// 	var_dump(date("n"));
+
 	$mesi = array(1=>'Gennaio', 'Febbraio', 'Marzo', 'Aprile',
                 'Maggio', 'Giugno', 'Luglio', 'Agosto',
                 'Settembre', 'Ottobre', 'Novembre','Dicembre');
-// 	$day = date("d");
 	$pageSelected="home";
 	
-// 	$ansaNews = GlobalVariables::get("dao")->query("NotiziaModel",
-// 				array("isAnsa"=>true,"status"=>NotiziaModel::STATUS_ACCEPTED,"about.data"=>array('$lte'=>new MongoDate())),
-// 				array("sort"=>array("about.data"=>-1),"limit"=>4));
 	$ansaNews = GlobalVariables::get("dao")->query("NotiziaModel",
 			array("isAnsa"=>true,"status"=>NotiziaModel::STATUS_ACCEPTED,"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
 			array("sort"=>array("about.lastEdit"=>-1),"limit"=>8));
-	$ansaIds = array();
-	if (sizeof($ansaNews)>0){
-		$ansaIds = array_map(function($ele){return new MongoDB\BSON\ObjectID($ele->id);}, $ansaNews);
-		
-		$ansaNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $ansaNews);
-	}
 	
+
+    $ansaIds = array_map(
+        function($ele){
+            return new MongoDB\BSON\ObjectID($ele->id);
+        },
+        $ansaNews
+    );
+    $ansaNews = array_map(
+        'stripModelText',
+        $ansaNews
+    );
 	
-	
-// 	$politicaNews = GlobalVariables::get("dao")->query("NotiziaModel",
-// 				array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_POLITICA,'_id'=>array('$nin'=>$ansaIds),
-// 						"about.data"=>array('$lte'=>new MongoDate())),
-// 				array("sort"=>array("about.data"=>-1),"limit"=>4)
-// 	);
 	$politicaNews = GlobalVariables::get("dao")->query("NotiziaModel",
 			array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_POLITICA,'_id'=>array('$nin'=>$ansaIds),
 					"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
 			array("sort"=>array("about.lastEdit"=>-1),"limit"=>4)
 	);
-	if (sizeof($politicaNews)>0){
-		$politicaNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $politicaNews);
-	}
+    $politicaNews = array_map(
+        'stripModelText',
+        $politicaNews
+    );
+	
 	
-// 	$cronacaNews = GlobalVariables::get("dao")->query("NotiziaModel",
-// 			array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_CRONACA,'_id'=>array('$nin'=>$ansaIds),
-// 					"about.data"=>array('$lte'=>new MongoDate())),
-// 			array("sort"=>array("about.data"=>-1),"limit"=>4)
-// 	);
 	$cronacaNews = GlobalVariables::get("dao")->query("NotiziaModel",
 			array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_CRONACA,'_id'=>array('$nin'=>$ansaIds),
 					"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
 			array("sort"=>array("about.lastEdit"=>-1),"limit"=>6)
 			);
-	if (sizeof($cronacaNews)>0){
-		$cronacaNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $cronacaNews);
-	}
+    $cronacaNews = array_map(
+        'stripModelText',
+         $cronacaNews
+    );
 	
-// 	$sportNews = GlobalVariables::get("dao")->query("NotiziaModel",
-// 			array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_SPORT,'_id'=>array('$nin'=>$ansaIds),
-// 					"about.data"=>array('$lte'=>new MongoDate())),
-// 			array("sort"=>array("about.data"=>-1),"limit"=>4)
-// 	);
 	$sportNews = GlobalVariables::get("dao")->query("NotiziaModel",
 			array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_SPORT,'_id'=>array('$nin'=>$ansaIds),
 					"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
 			array("sort"=>array("about.lastEdit"=>-1),"limit"=>4)
 			);
-	if (sizeof($sportNews)>0){
-		$sportNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $sportNews);
-	}
-	
-// 	$culturaNews = GlobalVariables::get("dao")->query("NotiziaModel",
-// 			array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_CULTURA,'_id'=>array('$nin'=>$ansaIds),
-// 					"about.data"=>array('$lte'=>new MongoDate())),
-// 			array("sort"=>array("about.data"=>-1),"limit"=>4)
-// 	);
+    $sportNews = array_map(
+        'stripModelText',
+        $sportNews
+    );
+    
 	$culturaNews = GlobalVariables::get("dao")->query("NotiziaModel",
 			array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_CULTURA,'_id'=>array('$nin'=>$ansaIds),
 					"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
 			array("sort"=>array("about.lastEdit"=>-1),"limit"=>4)
 	);
-	if (sizeof($culturaNews)>0){
-		$culturaNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $culturaNews);
-	}
+    $culturaNews = array_map(
+        'stripModelText',
+        $culturaNews
+    );
+	
 	
-// 	$foodNews = GlobalVariables::get("dao")->query("NotiziaModel",
-// 			array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_RISTORANTI,'_id'=>array('$nin'=>$ansaIds),
-// 					"about.data"=>array('$lte'=>new MongoDate())),
-// 			array("sort"=>array("about.data"=>-1),"limit"=>4)
-// 	);
 	$foodNews = GlobalVariables::get("dao")->query("NotiziaModel",
 			array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_RISTORANTI,'_id'=>array('$nin'=>$ansaIds),
 					"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
 			array("sort"=>array("about.lastEdit"=>-1),"limit"=>4)
 	);
-	if (sizeof($foodNews)>0){
-		$foodNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $foodNews);
-	}
+    $foodNews = array_map(
+        'stripModelText',
+        $foodNews
+    );
 	
-// 	$professioniNews = GlobalVariables::get("dao")->query("NotiziaModel",
-// 			array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_MESTIERI,'_id'=>array('$nin'=>$ansaIds),
-// 					"about.data"=>array('$lte'=>new MongoDate())),
-// 			array("sort"=>array("about.data"=>-1),"limit"=>4)
-// 	);
 	$professioniNews = GlobalVariables::get("dao")->query("NotiziaModel",
 			array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_MESTIERI,'_id'=>array('$nin'=>$ansaIds),
 					"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
 			array("sort"=>array("about.lastEdit"=>-1),"limit"=>4)
 	);
-	if (sizeof($professioniNews)>0){
-		$professioniNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $professioniNews);
-	}
+    $professioniNews = array_map(
+        'stripModelText',
+        $professioniNews
+    );
 
-	$mondoSposiNews = GlobalVariables::get("dao")->query("NotiziaModel",
-			array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_MONDO_SPOSI,'_id'=>array('$nin'=>$ansaIds),
-					"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
-			array("sort"=>array("about.lastEdit"=>-1),"limit"=>4)
-	);
-	if (sizeof($mondoSposiNews)>0){
-		$mondoSposiNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $mondoSposiNews);
-	}
+	$varie = GlobalVariables::get("dao")->query(
+        NotiziaModel::class,
+        [
+            "status"=>NotiziaModel::STATUS_ACCEPTED,
+            "category"=>NotiziaModel::CATEGORY_VARIE,
+            '_id'=> [ '$nin'=>$ansaIds ],
+            "about.lastEdit" =>  [ '$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ) ]
+        ]
+    );
+    $varie = array_map(
+        'stripModelText',
+        $varie
+    );
+    $varieName = "Varie";
+    if ( GlobalVariables::get("cfg")->hasValue(SimpleConfig::VARIE_LABEL) ) {
+        $varieName = GlobalVariables::get("cfg")->getValue(SimpleConfig::VARIE_LABEL);
+    }
 }
 catch (Exception $ex){
 	echo $ex->getMessage();
@@ -144,15 +133,15 @@ catch (Exception $ex){
 ?>
 	<div class="newsBarMobile">
 		<div style="text-align:center;">
-			<div class="middleBanner mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_HEAD);?></div>
-			<div class="middleBanner mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_HEAD);?></div>
+            <div class="banner subheadBanner mediaContent">
+                <?php BannerHelper::printBanner(BannerModel::POSITION_TOP);?>
+            </div>
 		</div>
 		<div class="newsContainer" >
 			<?php $i=0; foreach($ansaNews as $ansa){
 				$i++;
 				$stringTitolo = (strlen($ansa->titolo) > 103) ? htmlentities ( substr( html_entity_decode( $ansa->titolo ),0,100) ) .'...' : $ansa->titolo;
-// 				$stringSottotitolo = (strlen($ansa->sottotitolo) > 73) ? substr($ansa->sottotitolo,0,70).'...' : $ansa->sottotitolo;
-// 				$stringTesto = (strlen($ansa->testo) > 33) ? substr($ansa->testo,0,30).'...' : $ansa->testo;?>
+            ?>
 				<div class="primaryNews"> 
 					<a href="articolo.php?id=<?php echo $ansa->id;?>" id="ansa_<?php echo $i;?>" class="ansaNews"><?php
 					$media = DaoMediaHandler::getMainMediaFromModel($ansa);
@@ -357,12 +346,12 @@ catch (Exception $ex){
 		</div>
 
 		<div class="newsContainer">
-			<div class="categoryBar" style="background-color:<?php echo NotiziaModel::$NOTIZIE_CATEGORY[NotiziaModel::CATEGORY_MONDO_SPOSI]["color"] ?>">
-				<span><?php echo NotiziaModel::$NOTIZIE_CATEGORY[NotiziaModel::CATEGORY_MONDO_SPOSI]["label"] ?></span>
+			<div class="categoryBar" style="background-color: <?php echo NotiziaModel::$NOTIZIE_CATEGORY[NotiziaModel::CATEGORY_VARIE]["color"] ?>">
+				<span><?php echo strtoupper($varieName); ?></span>
 			</div>
-			<?php if(sizeof($mondoSposiNews)>0){
+			<?php if(sizeof($varie)>0){
 				$i=0;
-					foreach ($mondoSposiNews as $articolo){
+					foreach ($varie as $articolo){
 						
 						$stringTitolo = (strlen($articolo->titolo) > 53) ? htmlentities ( substr( html_entity_decode( $articolo->titolo ) ,0,50) ) .'...' : $articolo->titolo;
 // 						$string = (strlen($politica->sottotitolo) > 33) ? substr($politica->sottotitolo,0,30).'...' : $politica->sottotitolo;?>
@@ -429,8 +418,6 @@ catch (Exception $ex){
 	</div>
 	<script type="text/javascript">
 		$(document).ready(function(){
-			$(".newsBarMobile").css({"margin-top":$(".headContainer").outerHeight()});
-
 			$("img.poster").hide();
 			$("video.localVideo").attr("style","");
 				

app/public/mobile/searchResults.php

@@ -88,8 +88,9 @@ try {
 	GUIHandlerMobile::generateMenu();?>
 	<div class="searchResultsContainer">
 		<div style="text-align:center;">
-				<div class="middleBanner mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_HEAD);?></div>
-				<div class="middleBanner mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_HEAD);?></div>
+            <div class="banner subheadBanner mediaContent">
+                <?php BannerHelper::printBanner(BannerModel::POSITION_TOP);?>
+            </div>
 		</div>
 	<?php
 		if ($found){

app/public/mobile/style/public.css

@@ -4,7 +4,7 @@ a{text-decoration:none;}
 body{font-family:lato, arial;}
 
 /* TOP HEAD BAR/Menu/Footer (GUIHandler)*/
-.headContainer{position:fixed;background-color:white;width:100vw;top:0;left:0;z-index:10;overflow:hidden;}
+.headContainer{position:sticky;background-color:white;width:100vw;top:0;left:0;z-index:10;overflow:hidden;}
 .upperBar{text-align:center;border:1px solid #949494;border-left:0px;border-right:0px;margin:5px 0;padding:2px;font-size:8pt;color:#949494;}
 .logo{text-align:center;}
 .logo img{width:50vw;margin:auto;}
@@ -102,7 +102,7 @@ body{font-family:lato, arial;}
 }
 
 
-.newsBarMobile{margin-top:32vw;width:100vw;}
+.newsBarMobile{width:100vw;}
 .newsContainer{width:100vw;}
 .newsContainer .categoryBar{padding:5px 10px;}
 .newsContainer .categoryBar > span{color:white;font-weight:bold;font-size:14pt;}

app/public/style/public.css

@@ -22,11 +22,14 @@ body{font-family:lato, arial;}
 .socialBar > a > div{display:inline-block;width:22px;height:22px;background-repeat:no-repeat;}
 
 .middleBar{position:relative;height:138px;border:solid #d6d6d6 1px;border-top:0px;border-left:0px;border-right:0px;}
+.banner img{ width: 100%; height: 100%; overflow: hidden; }
 .leftBanner{position:absolute;top:45px;left:10px;}
 .logo{display:inline-block;width:50%;text-align:center;margin:12px 250px;}
 .rightBanner{position:absolute;top:45px;right:10px;}
 .topBanner{width:180px;height:60px;}
-.topBanner > *{max-widht:100%;max-height:100%;}
+.topBanner > * { max-width:100%; max-height:100%; }
+.subheadBanner { width:1000px; height:120px; }
+.footerBanner { width:1000px; height:200px; }
 
 
 .menuContainer{position:relative;}
@@ -312,26 +315,29 @@ display: inline-block;
 .meteo div span{font-weight:bold;}
 
 .middleRightBanner{width:210px;overflow: hidden;height: 157px;margin: 5px 0;}
-.middleRightBanner  img{width:100%; heigth:100%;}
+.middleRightBanner  img{width:100%; height:100%;}
 .middleRightLongBanner img{height:100%;width:100%;}
 .middleRightLongBanner{height:314px; width:210px;overflow: hidden;margin: 5px 0;}
 
-.reader > .lastContainer, .lastContainer{/* max-height:120px */;display:block;padding:5px;border-bottom:dotted #C1B4B4 1px;cursor:pointer;text-decoration:none;color:black;}
+.reader > .lastContainer, .lastContainer{ display:block;padding:5px;border-bottom:dotted #C1B4B4 1px;cursor:pointer;text-decoration:none;color:black;}
 .reader > .lastContainer:last-child, .lastContainer:last-child {border-bottom: none;}
 .reader >  .lastData, .lastData{font-size:12px;}
 .reader >  .lastTitle, .lastTitle{font-size:12px;font-weight:bold;}
 .reader >  .lastContinua, .lastContinua{text-align:right; font-size:12px;font-weight:bold;padding-bottom:5px;} 
 .reader >  .lastContinua a, .lastContinua a{color:#64bff0;}
 
-.gossipContainer{/* max-height:165px */;/* margin-top:5px */;margin-bottom:5px;border-bottom:dotted #C1B4B4 1px;cursor:pointer;overflow:hidden;text-decoration:none;color:black;}
+.gossipContainer{margin-bottom:5px;border-bottom:dotted #C1B4B4 1px;cursor:pointer;overflow:hidden;text-decoration:none;color:black;}
 .gossipContainer#gossip_2{border-bottom:none;}
 .gossipTitle{margin-bottom:5px;font-weight:bold;font-size:20px;}
 .gossipSubtitle{margin-bottom:5px;color:#64bff0;font-weight:bold;font-size:15px;}
 
-.animaliContainer,.viaggiContainer{/* max-height:165px; *//* margin-top:5px */;display:block;margin-bottom:5px;text-decoration:none;color:black;}
+.animaliContainer, .viaggiContainer, .variousContainer {display:block;margin-bottom:5px;text-decoration:none;color:black;}
 .animaliContainer > .culturaMainMedia,.viaggiContainer > .culturaMainMedia{text-align:left;}
 .animaliTitle,.viaggiTitle{cursor:pointer;margin-bottom:5px;font-weight:bold;font-size:17px;}
 
+.rightCategory .categoryBar{ margin-bottom: 5px;}
+.rightColumnTitle{ margin-bottom:5px; font-weight:bold; font-size:17px; color: black; }
+
 /*
     _         _   _           _       
    / \   _ __| |_(_) ___ ___ | | ___  

cicd/environments/common/webserver.env

@@ -1,2 +1,3 @@
 DDNINJA_PROJECTNAME=FDN2
 DDNINJA_BUILDNAME=fdn2
+DDNINJA_AUTHOR=ddninja