From 72f9fbeeaa3430b046635b07ea4e35c7f26205d6 Mon Sep 17 00:00:00 2001
From: Riccardo Di Dato <r.didato@asdynamics.it>
Date: Thu, 17 Mar 2016 12:33:45 +0100
Subject: [PATCH] Fix immagini notizia e video youtube; Fix limit ai risultati
 di ricerca; Corretto bug che faceva generare mail di attivazioni admin
 all'infinito;

---
 private/lib/task/GenerateAdminActivationMailTask.php | 2 ++
 public/searchResults.php                             | 9 +++++----
 public/style/public.css                              | 4 +++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/private/lib/task/GenerateAdminActivationMailTask.php b/private/lib/task/GenerateAdminActivationMailTask.php
index 3553b74..44acc63 100644
--- a/private/lib/task/GenerateAdminActivationMailTask.php
+++ b/private/lib/task/GenerateAdminActivationMailTask.php
@@ -20,6 +20,8 @@ class GenerateAdminActivationMailTask extends Task {
 			foreach ($admins as $admin){
 				$mail = FDN_MailHelper::getAdminConfirmMail($admin);
 				GlobalVariables::get("dao")->save($mail);
+				$admin->activationSent = true;
+				GlobalVariables::get("dao")->save($admin);
 			}
 		}
 	}
diff --git a/public/searchResults.php b/public/searchResults.php
index bf39988..33502f2 100644
--- a/public/searchResults.php
+++ b/public/searchResults.php
@@ -14,10 +14,7 @@ try {
 // 		var_dump($_POST["search"]);
 		$searchParameters = strip_tags(PostHandler::get("search"));
 		
-		$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;
@@ -40,6 +37,10 @@ try {
 			$found = false;
 		}
 		
+		$notizie = GlobalVariables::get("dao")->query("NotiziaModel",
+				array("status"=>NotiziaModel::STATUS_ACCEPTED),
+				array("sort"=>array("about.data"=>-1),"limit"=>$limit,"skip"=>$page*$limit)
+		);
 // 		$notizie = GlobalVariables::get("dao")->query("NotiziaModel",
 // 				array("status"=>NotiziaModel::STATUS_ACCEPTED),
 // 				array("sort"=>array("about.data"=>-1),"skip"=>$skip,"limit"=>$limit)
diff --git a/public/style/public.css b/public/style/public.css
index e063f23..29d68a2 100644
--- a/public/style/public.css
+++ b/public/style/public.css
@@ -310,7 +310,9 @@ display: inline-block;
 
 .headArticolo{margin-bottom:25px;}
 
-.articoloMainMedia{display:inline-block;vertical-align:top;width:400px;text-align:center;}
+.articoloMainMedia{display:inline-block;vertical-align:top;width:400px;text-align:center; max-height:225px;}
+.articoloMainMedia iframe{min-height:180px;}
+.articoloMainMedia.mediaContent img{max-height:225px;}
 
 .articoloTitle{display:inline-block;width:550px;padding:0px 20px;vertical-align:top;}
 .articoloTitle > .title{font-size:20px;font-weight:bold;text-transform:uppercase;font-family:"Arial Bold";}