From 1b0a3912d1c11c697442cebb9ba41e0eec905491 Mon Sep 17 00:00:00 2001
From: Riccardo Di Dato <r.didato@asdynamics.it>
Date: Tue, 22 Mar 2016 17:46:26 +0100
Subject: [PATCH] Corretta importazione dati per account antonio Diminuita
 frequenza di aggiornamento del meteo Inserito check per il meteo in caso di
 richiesta fallita Inserito status accepted automatico sulla creazione di
 notizie in caso di amministratori Corretto social share in caso di dati open
 graph

---
 private/bin/importOldData.php             |  2 +-
 private/lib/task/UpdateMeteoCacheTask.php | 14 +++++++++-----
 public/admin/editNotizie.php              |  4 ++++
 public/articolo.php                       |  4 ++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/private/bin/importOldData.php b/private/bin/importOldData.php
index 8fd47a3..853c960 100644
--- a/private/bin/importOldData.php
+++ b/private/bin/importOldData.php
@@ -19,7 +19,7 @@ if (is_null($admin)){
 	$admin->password = $data->password;
 	$admin->nome = $data->nome;
 	$admin->cognome = $data->cognome;
-	$admin->roles = 1020;
+	$admin->roles = 1022;
 	$admin->active = true;
 	$admin->activationSent = true;
 	$admin->email = "info@ifattidinapoli.it";
diff --git a/private/lib/task/UpdateMeteoCacheTask.php b/private/lib/task/UpdateMeteoCacheTask.php
index b08ad0f..26a816e 100644
--- a/private/lib/task/UpdateMeteoCacheTask.php
+++ b/private/lib/task/UpdateMeteoCacheTask.php
@@ -15,11 +15,15 @@ class UpdateMeteoCacheTask extends Task {
 	}
 
 	public static function execute(){
-		$config = GlobalVariables::get("config");
-		
-		$cont = file_get_contents("http://api.openweathermap.org/data/2.5/forecast?q=Naples,IT&appid=b1b15e88fa797225412429c1c50c122a&units=metric&lang=it");
-		
-		file_put_contents($config->files->meteoCache, $cont);
+		if (intval(date("H"))%2==0){
+			$config = GlobalVariables::get("config");
+			
+			$cont = file_get_contents("http://api.openweathermap.org/data/2.5/forecast?q=Naples,IT&appid=7a40fdbd3d7d36fca7c3e4e5f40c47f6&units=metric&lang=it");
+			
+			if (strcmp($cont, "")!=0){
+				file_put_contents($config->files->meteoCache, $cont);
+			}
+		}
 	}
 }
 
diff --git a/public/admin/editNotizie.php b/public/admin/editNotizie.php
index 7c363a9..08e84d8 100644
--- a/public/admin/editNotizie.php
+++ b/public/admin/editNotizie.php
@@ -68,6 +68,10 @@ try{
 			
 			if(!$edit){
 				$notizia->status = NotiziaModel::STATUS_PENDING;
+				if (AdminLoginManager::getLogged()->hasRole(AdminModel::ADMIN_TYPE_EDITORE_SUPERVISOR)){
+					$notizia->status = NotiziaModel::STATUS_ACCEPTED;
+				}
+				
 				$notizia->about->owner = AdminLoginManager::getLogged()->id;
 			}
 			
diff --git a/public/articolo.php b/public/articolo.php
index 89b3dbf..1987740 100644
--- a/public/articolo.php
+++ b/public/articolo.php
@@ -40,8 +40,8 @@ try {
 	$additionalHeaders = array();
 	$additionalHeaders[] = '<meta property="og:url" content="'.$_SERVER['REQUEST_URI'].'"/>';
 	$additionalHeaders[] = '<meta property="og:site_name" content="I Fatti di Napoli"/>';
-	$additionalHeaders[] = '<meta property="og:title" content="'.preg_replace('/"/', '\"', strip_tags($articolo->titolo)).'"/>';
-	$additionalHeaders[] = '<meta property="og:description" content="'.preg_replace('/"/', '\"', strip_tags($articolo->sottotitolo)).'"/>';
+	$additionalHeaders[] = '<meta property="og:title" content="'.htmlentities(strip_tags($articolo->titolo),ENT_QUOTES).'"/>';
+	$additionalHeaders[] = '<meta property="og:description" content="'.htmlentities(strip_tags($articolo->sottotitolo),ENT_QUOTES).'"/>';
 	
 	$mediaMetaInfo = '';
 	if ($media->mediaType == MediaModel::TYPE_LOCALVIDEO || $media->mediaType == MediaModel::TYPE_YOUTUBE){