Merge branch 'master' of

ssh://gitolite@asdynamics.com:50005/projects/fdn2.git

Conflicts:
	private/lib/gui/GUIHandler.php

private/bin/importOldData.php

@@ -81,7 +81,17 @@ $dati = $statement->fetchALL(PDO::FETCH_CLASS,"stdClass");
 		if (preg_match("/^http/",$ele->img)){
 			$media = new stdClass();
 			$media->mediaType = MediaModel::TYPE_YOUTUBE;
-			$media->link = $ele->img;
+			$matches = array();
+			if ( preg_match("~^http[s]?[:]//youtu\.be/(.+)$~", trim($ele->img), $matches) ){
+				$media->link = $matches[1];
+			}
+			else if (preg_match("~http[s]?[:]//www\.youtube\.com/embed/([^\"]+)[\"]~", trim($ele->img), $matches)){
+				$media->link = $matches[1];
+			}
+			else if (preg_match("~http[s]?[:]//www\.youtube\.com/watch[?]v[=](.+)$~", trim($ele->img), $matches)){
+				$media->link = $matches[1];
+			}
+// 			$media->link = $ele->img;
 			$media = new MediaModel($media);
 			GlobalVariables::get("dao")->save($media);
 			DaoMediaHandler::addMedia($notizia, $media);

private/lib/gui/GUIHandler.php

@@ -172,7 +172,7 @@ class GUIHandler {
 								echo UserLoginManager::getLogged()->nome." ".UserLoginManager::getLogged()->cognome.' | <a href="javascript:logout();">LOGOUT</a>';
 							}
 							else {
-								echo '<a href="javascript:openLoginModal();">LOGIN</a> | <a id="regButton" href="javascript:openRegistrationModal();">REGISTRATI</a>';
+								echo '<a id="loginLink" href="javascript:openLoginModal();">LOGIN</a> | <a id="regButton" href="javascript:openRegistrationModal();">REGISTRATI</a>';
 							}
 						?>
 					</div>

private/lib/gui/html.inclusion.php

@@ -37,7 +37,7 @@ GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN,"ckeditor/ckeditor.js"
 
 GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN,"datetimepicker-master/build/jquery.datetimepicker.full.min.js");
 
-GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN,"highcharts.js");
+GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_GENERAL,"highcharts.js");
 
 GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_GENERAL,"functions.js?rev=".time());
 

public/admin/addMultimedia.php

@@ -34,7 +34,7 @@ try{
 				$saveable->mediaType = $mediaType;
 				if(strcmp($mediaType,MediaModel::TYPE_YOUTUBE)==0){
 					$matches = array();
-					var_dump(PostHandler::get("data"));
+// 					var_dump(PostHandler::get("data"));
 					if ( preg_match("~^https[:]//youtu\.be/(.+)$~", trim(PostHandler::get("data")), $matches) ){
 						$saveable->link = $matches[1];
 					}

public/articolo.php

@@ -7,8 +7,10 @@ Creation Date:	05/feb/2016
 require_once(dirname(__FILE__)."/load.php");
 
 try {
+// 	UserLoginManager::logout();
 	$sendComment = false;
 	$articolo = null;
+	
 	if (array_key_exists("id", $_GET)){
 		$articolo = GlobalVariables::get("dao")->getFirst("NotiziaModel",array("id"=>$_GET["id"],"status"=>NotiziaModel::STATUS_ACCEPTED));
 	}
@@ -18,10 +20,15 @@ try {
 	AnalyticsHelper::logNotiziaImpression($articolo->id);
 	AnalyticsHelper::logPageImpression();
 
-	
+	$user = UserLoginManager::getLogged();
 	
 	$media = DaoMediaHandler::getMainMediaFromModel($articolo);
 	$medias = DaoMediaHandler::getMedias($articolo);
+	
+	$commenti = GlobalVariables::get("dao")->query("CommentiModel",
+					array("notizia"=>$articolo->id,"status"=>CommentoModel::STATUS_ACCEPTED),
+					array("sort"=>array("about.data"=>-1))
+				);
 // 	echo $articolo->titolo;
 // 	var_dump($medias);
 	$mesi = array(1=>'Gennaio', 'Febbraio', 'Marzo', 'Aprile',
@@ -53,6 +60,38 @@ try {
 		$additionalHeaders[] = '<meta property="og:image" content="'.$media->getRenderer()->getImageLink(MediaRenderer::SIZE_SMALL).'"/>';
 	}
 	
+	if(array_key_exists("submit", $_POST) && strcmp($_POST["submit"] ,"Submit")==0){
+// 		var_dump($articolo->sondaggio->voci);
+		if($articolo->hasProperty("sondaggio") && !is_null($articolo->sondaggio)){
+			if(!in_array($user->username, $articolo->sondaggio->votanti)){
+			$selectedVoice = $_POST["voce"];
+				foreach ($articolo->sondaggio->voci as $voce){
+	// 				var_dump($voce);
+					if(strcmp($voce->nome, $selectedVoice)==0){
+						$voce->voti +=1;
+					}
+	// 				var_dump($voce);
+				}
+				
+				$articolo->sondaggio->votanti[] = $user->username;
+				GlobalVariables::get("dao")->save($articolo);
+			}
+		}
+// 		var_dump($articolo->sondaggio);
+	}
+	
+	if(array_key_exists("sendCommento", $_POST) && strcmp($_POST["sendCommento"] ,"Send")==0){
+		$saveable = new stdClass();
+		$saveable->user = UserLoginManager::getLogged();
+		$saveable->notizia = $articolo->id;
+		$saveable->titolo = $_POST["titolo"];
+		$saveable->testo = $_POST["commento"];
+		$saveable->status = CommentoModel::STATUS_PENDING;
+		
+		$commento = new CommentoModel($savable);
+		GlobalVariables::get("dao")->save($commento);
+	}
+	
 }catch(GUIException $ex){
 	$error = $ex->getMessage();
 }catch (Exception $exec){
@@ -79,7 +118,7 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders));
 		<div class="headArticolo">
 			<div class="articoloMainMedia mediaContent" <?php echo $mediaMetaInfo;?>>
 			<?php 	if(!is_null($media)) {
-						$media->renderMedia(array("size"=>MediaRenderer::SIZE_MEDIUM));
+						$media->renderMedia(array("size"=>MediaRenderer::SIZE_BIG));
 					}
 			?>
 			</div>
@@ -91,6 +130,33 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders));
 				</div>
 			</div>
 		</div>
+		<?php if($articolo->hasProperty("sondaggio") && !is_null($articolo->sondaggio)){?>
+				<div class="sondaggioContainer">
+					<div id="sondaggioGraph" style="height:300px;margin-right:280px;margin-top:10px;"></div>
+					<div class="votanti">Votanti: <?php $i=0; foreach ($articolo->sondaggio->votanti as $votante){ echo ($i++==0?"":", ").$votante;}?></div>
+					<?php if(UserLoginManager::isLogged()){
+							if(!in_array($user->username, $articolo->sondaggio->votanti)){?>	
+								<div class="sondaggioOptions">
+									<form method="POST">
+										<?php foreach ($articolo->sondaggio->voci as $voce){?>	
+													<input type="radio" name="voce" value="<?php echo $voce->nome;?>"><?php echo $voce->nome;?>
+										<?php } ?>
+										<input type="submit" name="submit" value="Submit" />
+									</form>
+								</div>
+					<?php	}
+							else{
+					?>
+									<div class="noLogin">Hai già votato per questo sondaggio</div>
+					<?php		}
+						 }
+						else{
+					?>
+							<div class="noLogin">Effettua il <a href="#loginLink">login</a> per votare o se non hai ancora un account <a href="#regButton">registrati</a></div>
+					<?php }
+					?>
+				</div>
+		<?php }?>
 		<div class="articoloLeftBar">
 			<div class="utilityBar">
 				<div class="socialBarArticolo">
@@ -122,20 +188,39 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders));
 			<?php }?>
 			<div class="commentiContainer">
 				<div id="sentMessage"></div>
-			<?php //if(UserLoginManager::isLogged()){?>
+			<?php if(UserLoginManager::isLogged()){?>
 					<div id="commentoArea" class="newCommento">
 						<form method="POST" id="commentoForm">
-							<div>Titolo commento:<textarea name="titolo" rows="2" cols="10"></textarea></div>
-								
-							<div>Commento:<textarea name="commento"rows="10" cols="10"></textarea></div>
+							<div>Titolo commento:</div>
+							<textarea name="titolo" rows="2" cols="30"></textarea>
+							<div>Commento:</div>
+							<textarea name="commento"rows="5" cols="80"></textarea>
 							<input type="hidden" name="id" value="<?php echo $articolo->id;?>" />
+							<input type="submit" name="sendCommento" value="Send" />
 						</form>
-						<div class="formBtns">
-							<a href="javascript:void(0);" id="submit" >Invia</a>
-						</div>
 					</div>
-			<?php //}?>
-				<div>TUTTI I COMMENTI</div>
+			<?php }
+				  else{
+			?>
+					<div class="noLogin">Effettua il <a href="#loginLink">login</a> per commentare o se non hai ancora un account <a href="#regButton">registrati</a></div>
+			<?php }
+				  
+				  if(sizeof($commenti)>0){
+			?>
+				  	<div class="oldCommentiContainer">
+			<?php	foreach ($commenti as $oldCommento){
+			?>
+						<div class="commento">
+							<div>Username</div>
+							<span>Titolo</span>
+							<span>Testo</span>
+						</div>
+			<?php 	}
+			?>
+					</div>
+			<?php 
+				  }
+			?>
 			</div>
 		</div>
 		<div class="articoloRightBar" style="width:280px;display:inline-block;">
@@ -149,30 +234,32 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders));
 
 <script type="text/javascript">
 	$(document).ready(function(event){
-		var size = $("#carosel").children().length;
-		var childrenWidth = $(".carosImage").outerWidth();
-
-		$("#carosel").width((size+1 )* childrenWidth);
-
-		var minLeft = (size - 4)*childrenWidth;
-		var actualLeft =  $("#carosel").position().left;
-		
-		$(".left").click(function(){
-			if(actualLeft > -minLeft){
-				$("#carosel").animate({left:"-=" + childrenWidth});
-				actualLeft = $("#carosel").position().left;
-// 				alert(actualLeft);
-			}
-		});
-
-		$(".right").click(function(){
-			if(actualLeft < minLeft){
-				$("#carosel").animate({left:"+=" + childrenWidth});
-				actualLeft = $("#carosel").position().left;
-// 				alert(actualLeft);
-			}
-		});
 
+<?php if(sizeof($medias)>1){?>
+			var size = $("#carosel").children().length;
+			var childrenWidth = $(".carosImage").outerWidth();
+	
+			$("#carosel").width((size+1 )* childrenWidth);
+	
+			var minLeft = (size - 4)*childrenWidth;
+			var actualLeft =  $("#carosel").position().left;
+			
+			$(".left").click(function(){
+				if(actualLeft > -minLeft){
+					$("#carosel").animate({left:"-=" + childrenWidth});
+					actualLeft = $("#carosel").position().left;
+	// 				alert(actualLeft);
+				}
+			});
+	
+			$(".right").click(function(){
+				if(actualLeft < minLeft){
+					$("#carosel").animate({left:"+=" + childrenWidth});
+					actualLeft = $("#carosel").position().left;
+	// 				alert(actualLeft);
+				}
+			});
+<?php } ?>
 		$("#submit").click(function (){
 // 			$("form#commentoForm").submit(function (){
 				$.ajax({
@@ -188,7 +275,28 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders));
 // 			});
 		});
 
-
+<?php if($articolo->hasProperty("sondaggio") && !is_null($articolo->sondaggio)){?>
+		$("#sondaggioGraph").highcharts({
+			chart:{type:'bar'},
+			title:{text:'<?php echo trim(html_entity_decode($articolo->sondaggio->titolo)); ?>'},
+			xAxis:{
+				categories:[<?php $i =0; foreach($articolo->sondaggio->voci as $voce){
+								echo ($i++==0?"":", ")."\"".trim($voce->nome)."\"";
+							}
+				?>]
+			},
+			yAxis:{
+				title:{text:"Numero Voti"}
+			},
+			series:[{
+				name:"Voti",
+				data:[<?php $i =0; foreach($articolo->sondaggio->voci as $voce){
+									echo ($i++==0?"":", ").$voce->voti;
+								}
+				?>]
+			}]
+		});
+<?php }?>
 // 		$("form#commentoForm").on('submit',function (){
 // 			$.ajax({
 // 				type:'post',

public/categorySummary.php

@@ -3,13 +3,18 @@
 require_once(dirname(__FILE__)."/load.php");
 
 try{
-
+	
 	AnalyticsHelper::logPageImpression();
 	GUIHandler::generateHtmlHeaders();
 	
+	
 	$category = "";
 	if(array_key_exists("category", $_GET) && strcmp($_GET["category"], "")!=0){
 		
+		var_dump(NotiziaModel::$NOTIZIE_CATEGORY[intval($_GET["category"])]["hidden"]);
+		if(NotiziaModel::$NOTIZIE_CATEGORY[$_GET["category"]]["hidden"]){
+			GUIHandler::redirect("index.php");
+		}
 		$category = $_GET["category"];
 		
 // 		$category = NotiziaModel::CATEGORY_CRONACA;

public/searchResults.php

@@ -4,26 +4,56 @@ require_once(dirname(__FILE__)."/load.php");
 
 try {
 
+// 	AnalyticsHelper::logNotiziaImpression($articolo->id);
 	AnalyticsHelper::logPageImpression();
 	
 	GUIHandler::generateHtmlHeaders();
-	
-	$found = false;
+	$searchParameters = "";
 	if(array_key_exists("search", $_POST) && strcmp($_POST["search"], "")!=0){
+
+		var_dump($_POST["search"]);
 		$searchParameters = strip_tags(PostHandler::get("search"));
 		
-		$notizie = GlobalVariables::get("dao")->search("NotiziaModel",$searchParameters,
+// 		$notizie = GlobalVariables::get("dao")->query("NotiziaModel",
+// 				array("status"=>NotiziaModel::STATUS_ACCEPTED),
+// 				array("sort"=>array("about.data"=>-1),"limit"=>$limit,"skip"=>$page*$limit)
+// 		);
+		$found = false;
+		$limit=12;
+		$page = 1;
+		$numPages = 1;
+				
+		if(array_key_exists("page", $_POST)){
+			$page = intval($_POST["page"]);
+		}
+		
+		$skip =($page - 1) * $limit;
+		$notizieAll = GlobalVariables::get("dao")->query("NotiziaModel",
+				array("status"=>NotiziaModel::STATUS_ACCEPTED)
+		);
+		
+		if(sizeof($notizieAll)>0){
+			$dim = count($notizieAll);
+			$numPages = ceil($dim/$limit);
+		}
+		else{
+			$found = false;
+		}
+		
+		$notizie = GlobalVariables::get("dao")->query("NotiziaModel",
 				array("status"=>NotiziaModel::STATUS_ACCEPTED),
-				array("limit"=>10)
+				array("sort"=>array("about.data"=>-1),"skip"=>$skip,"limit"=>$limit)
 		);
 		
 		if (sizeof($notizie)>0){
 			$found=true;
 			$notizie = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $notizie);
 		}
+		
 	}
 	else{
-		GUIHandler::redirect("index.php");
+// 		GUIHandler::redirect("index.php");
+		echo "Errore";
 	}
 	
 
@@ -33,7 +63,7 @@ try {
 	$msg = LogModel::fromException($exec);
 	GlobalVariables::get("dao")->save($msg);
 	
-	GUIHandler::redirect("index.php");
+// 	GUIHandler::redirect("index.php");
 }
 ?>
 
@@ -80,6 +110,19 @@ try {
 	<div class="summaryRightBar">
 		<?php GUIHandler::generateRightBannerBlock();?>
 	</div>
+	<div class="paging">
+		<form method="POST">
+			<input type="hidden" value="<?php echo $searchParameters;?>">
+		<?php 
+// 			for($i = 1;$i<=$numPages;$i++){
+		?>
+<!-- 				<div id ="page_<?php // echo $i;?>" class="page" style="padding:10px;cursor:pointer;"><?php //echo $i;?></div>  -->
+		<?php
+// 			}
+		?>
+<!-- 			<input type="hidden" name="page" value="javascript:$('#page<?php //echo $i;?>').click(function(){$('.page').val('$(#page_<?php // echo $i;?>)')})">  -->
+		</form>
+	</div>
 	
 	<?php 
 		GUIHandler::generateFooter();

public/style/public.css

@@ -367,10 +367,10 @@ display: inline-block;
 .summaryRightBar{width:370px;padding:5px;vertical-align:top;display:inline-block;}
 .rightBarContainer{width:100%;height:100%;}
 
+.noLogin{padding:10px;border:solid #C0C0C0 2px;margin:5px;border-radius:10px;}
+.noLogin a {color:#68A2C1;}
 
-
-
-
+.newCommento textarea{resize:none;}
 
 .bannerContainer{width:45%;padding:5px;display:inline-block;}
 
@@ -394,4 +394,4 @@ display: inline-block;
 .archivioDate select, .archivioDate input{padding:2px 10px; margin:5px 5px 0px; border:solid #1a9ee9 1px;}
 
 
-.contattiRedazione{text-align:center;font-size:23px;padding:10px 5px;}
+.contattiRedazione{text-align:center;font-size:23px;padding:10px 5px;}