Merge branch 'master' of ssh://gitolite@asdynamics.com:50005/projects/fdn2.git

2016-03-17 23:00:45 +01:00
parent b015b44ec7 6b5f822bbc
commit edadaec574
5 changed files with 138 additions and 24 deletions
@@ -6,6 +6,18 @@ Creation Date:	26/gen/2016

 class FDN_MailHelper {
 	
+	public static function generateMailFooter(){
+		$footer = '<div style="background-color:#14477c;height:177px;margin-top:10px;">'.
+				'<div style="text-align:center;color:#2e91d4;padding:10px;">'.
+				'<a style="color:#2e91d4;margin:10px;" href="http://www.ifattidinapoli.com/index.php">Home</a> | <a style="color:#2e91d4;margin:10px;" href="categorySummary.php?category=1>">Politica</a> | <a style="color:#2e91d4;margin:10px;" href="http://www.ifattidinapoli.com/categorySummary.php?category=2>">Cronaca</a> | <a style="color:#2e91d4;margin:10px;" href="http://www.ifattidinapoli.com/categorySummary.php?category=3>">Sport</a> | <a style="color:#2e91d4;margin:10px;" href="http://www.ifattidinapoli.com/categorySummary.php?category=4>">Cultura&Spettacolo</a> | <a style="color:#2e91d4;margin:10px;" href="http://www.ifattidinapoli.com/categorySummary.php?category=5>">Gossip</a>'.
+				'</div>'.
+				'<div style="text-align:center;color:white;margin-top:25px;">TESTATA REGISTRATA PRESSO IL TRIBUNALE DI NAPOLI AUT. NR. 8 DEL 27 GENNAIO 2006</div>'.
+				'<div style="text-align:center;color:white;margin-top:20px;">COPYRIGHT &copy 2016 <a href="www.ifattidinapoli.it" style="color:white;">www.ifattidinapoli.it</a> - Giornale della Terza Metropoli Italiana</div>'.
+				'<div style="text-align:center;color:white;margin-top:20px;"><a href="redazione.php" style="color:white;">REDAZIONE</a> | <a href="archivio.php" style="color:white;">ARCHIVIO STORICO</a></div>'.
+				'</div>';
+		echo $footer;
+	}
+	
 	public static function getAdminConfirmMail($admin){
 		$config = GlobalVariables::get("config");
 		
@@ -17,8 +29,9 @@ class FDN_MailHelper {
 		
 		$confirmLink = GUIHandler::getBaseUrl()."admin/confirmAdmin.php?regcode=".$admin->id."&email=".$admin->email;
 		
-		$tmp->body = "Per attivare il tuo account clicka sul link riportato in seguito o copialo e incollalo nel tuo browser.<br/><br/>";
-		$tmp->body.='<a href="'.$confirmLink.'">'.$confirmLink.'</a>';
+		$mailHead = '<div style="text-align:center;"><img src="http://www.ifattidinapoli.com/images/logo_uff.png" alt="" /><div><br/><br/>';
+		$tmp->body = $mailHead."Per attivare il tuo account clicka sul link riportato in seguito o copialo e incollalo nel tuo browser.<br/><br/>";
+		$tmp->body.='<a href="'.$confirmLink.'">'.$confirmLink.'</a><br/>'.self::generateMailFooter();
 		
 		return new MailModel($tmp);
 	}
@@ -36,10 +49,12 @@ class FDN_MailHelper {
 		
 		$confirmLink = GUIHandler::getBaseUrl()."admin/passwordRecovery.php?req=".$request->id."&u=".$request->target->id;
 		
-		$tmp->body = "Hai ricevuto questo messaggio perchè hai effettuato una richiesta di recupero password dal nostro sito.<br/><br/>";
+		$mailHead = '<div style="text-align:center;"><img src="http://www.ifattidinapoli.com/images/logo_uff.png" alt="" /><div><br/><br/>';
+		
+		$tmp->body = $mailHead."Hai ricevuto questo messaggio perchè hai effettuato una richiesta di recupero password dal nostro sito.<br/><br/>";
 		$tmp->body.= "Se non hai effettuato nessuna richiesta, semplicemente ignora questo messaggio.<br/><br/>";
 		$tmp->body.= "Clicka sul seguente link per generare una nuova password.<br/><br/>";
-		$tmp->body.='<a href="'.$confirmLink.'">'.$confirmLink.'</a>';
+		$tmp->body.='<a href="'.$confirmLink.'">'.$confirmLink.'</a><br/>'.self::generateMailFooter();
 		
 		return new MailModel($tmp);
 	}
@@ -55,8 +70,9 @@ class FDN_MailHelper {
 		
 		$confirmLink = GUIHandler::getBaseUrl()."confirmUser.php?regcode=".$user->id."&email=".$user->email;
 		
-		$tmp->body = "Per attivare il tuo account clicka sul link riportato in seguito o copialo e incollalo nel tuo browser.<br/><br/>";
-		$tmp->body.='<a href="'.$confirmLink.'">'.$confirmLink.'</a>';
+		$mailHead = '<div style="text-align:center;"><img src="http://www.ifattidinapoli.com/images/logo_uff.png" alt="" /><div><br/><br/>';
+		$tmp->body = $mailHead."Per attivare il tuo account clicka sul link riportato in seguito o copialo e incollalo nel tuo browser.<br/><br/>";
+		$tmp->body.='<a href="'.$confirmLink.'">'.$confirmLink.'</a><br/>'.self::generateMailFooter();
 		
 		return new MailModel($tmp);
 	}
@@ -74,10 +90,12 @@ class FDN_MailHelper {
 		
 		$confirmLink = GUIHandler::getBaseUrl()."passwordRecovery.php?req=".$request->id."&u=".$request->target->id;
 		
-		$tmp->body = "Hai ricevuto questo messaggio perchè hai effettuato una richiesta di recupero password dal nostro sito.<br/><br/>";
+		$mailHead = '<div style="text-align:center;"><img src="http://www.ifattidinapoli.com/images/logo_uff.png" alt="" /><div><br/><br/>';
+		
+		$tmp->body = $mailHead."Hai ricevuto questo messaggio perchè hai effettuato una richiesta di recupero password dal nostro sito.<br/><br/>";
 		$tmp->body.= "Se non hai effettuato nessuna richiesta, semplicemente ignora questo messaggio.<br/><br/>";
 		$tmp->body.= "Clicka sul seguente link per generare una nuova password.<br/><br/>";
-		$tmp->body.='<a href="'.$confirmLink.'">'.$confirmLink.'</a>';
+		$tmp->body.='<a href="'.$confirmLink.'">'.$confirmLink.'</a><br/>'.self::generateMailFooter();
 		
 		return new MailModel($tmp);
 	}
@@ -101,4 +119,4 @@ class FDN_MailHelper {
 	}
 }

-?>
+?>
@@ -277,8 +277,8 @@ class GUIHandler {
 	public static function generateFooter(){
 		?>
 		<div class="footer">
-		<div class="footerCategory">
-		<a href="index.php">Home</a>
+			<div class="footerCategory">
+				<a href="index.php">Home</a>
 		<?php
 		foreach(NotiziaModel::$NOTIZIE_CATEGORY as $category=>$data){
 			if($data["mainMenu"] && !$data["hidden"]){
@@ -289,12 +289,12 @@ class GUIHandler {
 						}
 					
 					?>
-				</div>
-				<div style="text-align:center;color:white;margin-top:25px;">TESTATA REGISTRATA PRESSO IL TRIBUNALE DI NAPOLI AUT. NR. 8 DEL 27 GENNAIO 2006</div>
-				<div style="text-align:center;color:white;margin-top:20px;">COPYRIGHT &copy 2016 <a href="www.ifattidinapoli.it" style="color:white;">www.ifattidinapoli.it</a> - Giornale della Terza Metropoli Italiana</div>
-				<div style="text-align:center;color:white;margin-top:20px;"><a href="redazione.php" style="color:white;">REDAZIONE</a> | <a href="archivio.php" style="color:white;">ARCHIVIO STORICO</a></div>
-				
 			</div>
+			<div style="text-align:center;color:white;margin-top:25px;">TESTATA REGISTRATA PRESSO IL TRIBUNALE DI NAPOLI AUT. NR. 8 DEL 27 GENNAIO 2006</div>
+			<div style="text-align:center;color:white;margin-top:20px;">COPYRIGHT &copy 2016 <a href="www.ifattidinapoli.it" style="color:white;">www.ifattidinapoli.it</a> - Giornale della Terza Metropoli Italiana</div>
+			<div style="text-align:center;color:white;margin-top:20px;"><a href="redazione.php" style="color:white;">REDAZIONE</a> | <a href="archivio.php" style="color:white;">ARCHIVIO STORICO</a></div>
+				
+		</div>
 	<?php 
 	}
 	
@@ -19,16 +19,46 @@ try {
 	$day = "";
 	$month= "";
 	$year = "";
+	
+	
 	if(array_key_exists("submit", $_POST) && strcmp($_POST["submit"], "Invia")==0){
 		$post = true;
+		
 		$day = $_POST["day"];
 		$month= $_POST["month"];
 		$year = $_POST["year"];
+		
+		$limit=12;
+		$page = 1;
+		$numPages = 1;
+		
+		if(array_key_exists("page", $_POST)){
+			$page = intval($_POST["page"]);
+		}
+		
+		$skip =($page - 1) * $limit;
+// 		var_dump($skip);
 		$dateString = $_POST["year"]."-".$_POST["month"]."-".$_POST["day"];

+		$notizieDateAll = GlobalVariables::get("dao")->query("NotiziaModel",
+				array("status"=>NotiziaModel::STATUS_ACCEPTED,"about.data"=>array('$gt'=>new MongoDate(strtotime($dateString)),
+						'$lt'=>new MongoDate(strtotime($dateString." +1 day"))))
+		);
+
+		if(sizeof($notizieDateAll)>0){
+			$dim = count($notizieDateAll);
+			$numPages = ceil($dim/$limit);
+			$found = true;
+		}
+		else{
+			$found = false;
+		}
+		
+		
 		$notizieDate = GlobalVariables::get("dao")->query("NotiziaModel",
 				array("status"=>NotiziaModel::STATUS_ACCEPTED,"about.data"=>array('$gt'=>new MongoDate(strtotime($dateString)),
-							'$lt'=>new MongoDate(strtotime($dateString." +1 day"))))
+							'$lt'=>new MongoDate(strtotime($dateString." +1 day")))),
+				array("limit"=>$limit,"skip"=>$page*$limit)
 				);
 		
 		if (sizeof($notizieDate)>0){
@@ -54,7 +84,7 @@ try {
 	GUIHandler::generateMenu();?>
 	
 	<div class="archivioDate">
-		<form method="POST">
+		<form method="POST" id="selectDate">
 			<select name="day">
 				<?php 
 					for($i=1;$i<=31;$i++){
@@ -136,6 +166,34 @@ try {
 							</script>
 				<?php
 						}
+				?>		
+						<div class="paging">
+							<form id="changePage" method="POST">
+								<input type="hidden" name ="day" value="<?php echo $day;?>">
+								<input type="hidden" name ="month" value="<?php echo $month;?>">
+								<input type="hidden" name ="year" value="<?php echo $year;?>">
+								<input type="hidden" name="submit" value="Invia" />
+								<?php
+								for($j = 1;$j<=$numPages;$j++){
+									?>
+										<div id ="page_<?php echo $j;?>" class="page" style="display:inline-block;padding:10px;cursor:pointer;">
+											<?php echo $j;?>
+										</div>
+										<script type="text/javascript">
+											$(document).ready(function(){
+												$("#page_<?php echo $j;?>").click(function(){
+													$("input#pageSend").val(<?php echo $j;?>);
+													$("form#changePage").submit();
+												});
+											});
+										</script>
+								<?php
+									}
+							?>
+									<input id="pageSend" type="hidden" name="page" />
+							</form>
+						</div>
+				<?php 	
 					}
 					else{
 				?>
@@ -144,7 +202,8 @@ try {
 					}
 				
 				}
-		?>	
+
+				?>
 	</div>
 	<div class="summaryRightBar">
 		<?php GUIHandler::generateRightBannerBlock();?>
@@ -177,7 +177,18 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders));
 							<div class="moreMedia"><span>Altri media bellissimi</span></div>
 						</div>
 						<div class="caroselContainer">
+						<?php 
+							if(sizeof($medias)>4){
+						?>
 							<div class="caroselArrow left"><img alt="" src="images/leftArrow.png"></div>
+						<?php 
+							}
+							else{
+						?>
+								<div class="caroselArrow left" style="display:none;"><img alt="" src="images/leftArrow.png"></div>
+						<?php 
+							}
+						?>	
 							<div class="imagesContainer_carosel">
 								<div id="carosel" class="insideCarosel">
 								<?php 
@@ -186,7 +197,18 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders));
 								<?php 	}?>
 								</div>
 							</div>
+							<?php 
+							if(sizeof($medias)>4){
+						?>
 							<div class="caroselArrow right"><img alt="" src="images/rightArrow.png"></div>
+						<?php 
+							}
+							else{
+						?>
+								<div class="caroselArrow right" style="display:none;"><img alt="" src="images/rightArrow.png"></div>
+						<?php 
+							}
+						?>	
 						</div>
 					</div>
 			<?php }?>
@@ -25,9 +25,14 @@ try {
 		}
 		
 		$skip =($page - 1) * $limit;
+		
 		$notizieAll = GlobalVariables::get("dao")->search("NotiziaModel",$searchParameters,
 				array("status"=>NotiziaModel::STATUS_ACCEPTED)
 		);
+
+// 		$notizieAll = GlobalVariables::get("dao")->query("NotiziaModel",
+// 				array("status"=>NotiziaModel::STATUS_ACCEPTED)
+// 		);
 		
 		if(sizeof($notizieAll)>0){
 			$dim = count($notizieAll);
@@ -113,16 +118,26 @@ try {
 		<?php GUIHandler::generateRightBannerBlock();?>
 	</div>
 	<div class="paging">
-		<form method="POST">
+		<form id="changePage" method="POST">
 			<input type="hidden" name ="search" value="<?php echo $searchParameters;?>">
 		<?php 
-// 			for($i = 1;$i<=$numPages;$i++){
+			for($j = 1;$j<=$numPages;$j++){
 		?>
-<!-- 				<div id ="page_<?php // echo $i;?>" class="page" style="display:inline-block;padding:10px;cursor:pointer;"><?php //echo $i;?></div>  -->
+				<div id ="page_<?php echo $j;?>" class="page" style="display:inline-block;padding:10px;cursor:pointer;">
+					<?php echo $j;?>
+				</div>
+				<script type="text/javascript">
+					$(document).ready(function(){
+						$("#page_<?php echo $j;?>").click(function(){
+							$("input#pageSend").val(<?php echo $j;?>);
+							$("form#changePage").submit();
+						});
+					});
+				</script>
 		<?php
-// 			}
+			}
 		?>
-<!-- 			<input type="hidden" name="page" value="javascript:$('#page_<?php //echo $i;?>').click(function(){$('.page').val('$(#page_<?php // echo $i;?>)')})">  -->
+				<input id="pageSend" type="hidden" name="page" />
 		</form>
 	</div>