From b401eb7bced523246253fc112423742228453d7b Mon Sep 17 00:00:00 2001
From: Riccardo Di Dato <r.didato@asdynamics.it>
Date: Fri, 18 Mar 2016 11:10:55 +0100
Subject: [PATCH] Correzioni su form notizie

---
 public/admin/addMultimedia.php |  6 +++---
 public/admin/editNotizie.php   | 27 +++++++++------------------
 public/style/admin.css         |  2 +-
 3 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/public/admin/addMultimedia.php b/public/admin/addMultimedia.php
index 9d97ff8..8fa88bc 100644
--- a/public/admin/addMultimedia.php
+++ b/public/admin/addMultimedia.php
@@ -124,9 +124,9 @@ HTMLHelper::generateAdminHead();
 				else if(strcmp($mediaTypeSaved, MediaModel::TYPE_HTML5)==0){
 					echo $formHtml;
 				}
-				else{
-					echo $formFile;
-				}
+// 				else{
+// 					echo $formFile;
+// 				}
 		?>		<input type="hidden" name="id" value="<?php echo $notiziaId;?>" />
 				<input type="hidden" name="action" value=""/>
 			</div>
diff --git a/public/admin/editNotizie.php b/public/admin/editNotizie.php
index ec92588..7c363a9 100644
--- a/public/admin/editNotizie.php
+++ b/public/admin/editNotizie.php
@@ -19,6 +19,7 @@ try{
 	$notiziaId = PostHandler::get("id");
 	
 	$notizia = new NotiziaModel();
+	$notizia->about->data = new MongoDate();
 	// 	var_dump($notizia);
 	if(!is_null($notiziaId) && strcmp($notiziaId, "")!=0){
 		
@@ -55,28 +56,14 @@ try{
 			$notizia->sottotitolo = strip_tags(PostHandler::get("sottotitolo"));
 			$notizia->testo = PostHandler::get("testo");
 			$notizia->category = PostHandler::get("category");
-			
-			if (!array_key_exists($notizia->category,NotiziaModel::$NOTIZIE_CATEGORY)){
-				throw new GUIException("La categoria inserita non è valida");
-			}
-			
 			$notizia->about->author = PostHandler::get("author");
-			// Vedi cambiamento in riga 44
-// 			if(strcmp(PostHandler::get("author"), "")==0){
-// 				$notizia->about->author = AdminLoginManager::getLogged()->nome." ".AdminLoginManager::getLogged()->cognome;
-// 			}
-// 			else{
-// 				$notizia->about->author = PostHandler::get("author");
-// 			}
+			
 			$dateString = PostHandler::get("data")." ".PostHandler::get("time");
 			if(!preg_match("/^[0-9]{2}[-][0-9]{2}[-][0-9]{4} [0-9]{2}[:][0-9]{2}$/", $dateString)){
 				throw new GUIException("Il formato della data inserita non è corretto. Per favore segui il seguente formato Date: dd-mm-yyyy hh:ii");
 			}
-			$mongoDate = new MongoDate(strtotime($dateString));
-	// 		$mongoDate = new DateTime('2013-09-22T10:41:44.451999');
-	// 		$seconds = $mongoDate->getTimestamp();
 			
-	// 		$microseconds = $mongoDate->format("u");
+			$mongoDate = new MongoDate(strtotime($dateString));
 			$notizia->about->data =  $mongoDate;
 			
 			if(!$edit){
@@ -84,6 +71,9 @@ try{
 				$notizia->about->owner = AdminLoginManager::getLogged()->id;
 			}
 			
+			if (!array_key_exists($notizia->category,NotiziaModel::$NOTIZIE_CATEGORY)){
+				throw new GUIException("La categoria inserita non è valida");
+			}
 			
 			GlobalVariables::get("dao")->save($notizia);
 			if (AdminLoginManager::getLogged()->hasRole(AdminModel::ADMIN_TYPE_EDITORE_SUPERVISOR)){
@@ -143,9 +133,10 @@ try{
 			<span class="label">Sottotitolo:</span> 
 			<textarea name="sottotitolo" rows="3" cols="80" style="resize:none;"><?php echo $notizia->sottotitolo;?></textarea> 
 		</div>
+		<div style="text-align:center;">Corpo della notizia</div>
 		<textarea name="testo" id="editore_testo" rows="10" cols="80"><?php echo $notizia->testo;?></textarea>		
-		<div style="display:inline-block;"><span class="label">Data:</span><input type="text" id="datepicker" name="data" value="<?php echo ($edit)? date("d-m-Y",$notizia->about->data->sec):date("d-m-Y");?>"></div>
-		<div style="display:inline-block;"><span class="label">Ora:</span><input type="text" id="timepicker" name="time" value="<?php echo ($edit)? date("H:i",$notizia->about->data->sec):date("H:i");?>"></div>
+		<div style="display:inline-block;"><span class="label">Data:</span><input type="text" id="datepicker" name="data" value="<?php echo date("d-m-Y",$notizia->about->data->sec);?>"></div>
+		<div style="display:inline-block;"><span class="label">Ora:</span><input type="text" id="timepicker" name="time" value="<?php echo date("H:i",$notizia->about->data->sec);?>"></div>
 		
 		<input type="hidden" name="action" value=""/>
 	</form>
diff --git a/public/style/admin.css b/public/style/admin.css
index fee7656..68fef2d 100644
--- a/public/style/admin.css
+++ b/public/style/admin.css
@@ -50,7 +50,7 @@ span.label{display:inline-block; width:210px; text-align:right; padding:5px;}
 div.formBtns{padding:15px 165px;}
 div.formBtns a{text-decoration:none; color:rgb(51, 102, 255); font-weight:bold; margin-right:5px; padding:5px;}
 div.formBtns a:hover{background-color:rgb(204, 217, 255);}
-form input[type="text"], form textarea{padding:6px 5px;}
+form input[type="text"], form input[type="password"], form textarea{padding:6px 5px;}
 form > div{margin:5px 0;}