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/admin/homeNotizie.php b/public/admin/homeNotizie.php index 57d0ec5..0123fe6 100644 --- a/public/admin/homeNotizie.php +++ b/public/admin/homeNotizie.php @@ -27,7 +27,7 @@ try{ } if (!is_null($notizia)){ - if (!AdminLoginManager::getLogged()->hasRole(AdminModel::ADMIN_TYPE_EDITORE_SUPERVISOR)){// LA CONDIZIONE ERA SBAGLIATA... NON ERO NE SUPERVISOR NE EDITOR VEDEVO LE NOTIZIE..... + if (!AdminLoginManager::getLogged()->hasRole(AdminModel::ADMIN_TYPE_EDITORE_SUPERVISOR)){ if(strcmp($notizia->about->owner, AdminLoginManager::getLogged()->id) != 0){ GUIHandler::redirect("admin/myNotizie.php"); } @@ -35,20 +35,23 @@ try{ if(!$notizia->hasProperty("isAnsa")){ $notizia->isAnsa = false; -// $ansa = false;// SBAGLIATO, DOPO LO CAMBI E IGNORI IL VALORE CHE METTI QUI } - $postAnsa = PostHandler::get("ansa"); - if(!is_null($postAnsa)){ - if(strcmp($postAnsa, "true")==0){ - $notizia->isAnsa = true; + if (AdminLoginManager::getLogged()->hasRole(AdminModel::ADMIN_TYPE_EDITORE_SUPERVISOR)){ + $postAnsa = PostHandler::get("ansa"); + if(!is_null($postAnsa)){ + if(strcmp($postAnsa, "true")==0){ + $notizia->isAnsa = true; + } + else{ + $notizia->isAnsa = false; + } + + GlobalVariables::get("dao")->save($notizia); } - else{ - $notizia->isAnsa = false; - } - GlobalVariables::get("dao")->save($notizia); + $ansa = $notizia->isAnsa; } - $ansa = $notizia->isAnsa; + } } @@ -58,15 +61,17 @@ try{ GUIHandler::redirect("admin/myNotizie.php"); } - $changeStatus = PostHandler::get("status"); - if(!is_null($changeStatus)){ - if(strcmp($changeStatus, "accept")==0){ - $notizia->status = NotiziaModel::STATUS_ACCEPTED; - GlobalVariables::get("dao")->save($notizia); - } - else if(strcmp($changeStatus, "reject")==0){ - $notizia->status = NotiziaModel::STATUS_REJECTED; - GlobalVariables::get("dao")->save($notizia); + if (AdminLoginManager::getLogged()->hasRole(AdminModel::ADMIN_TYPE_EDITORE_SUPERVISOR)){ + $changeStatus = PostHandler::get("status"); + if(!is_null($changeStatus)){ + if(strcmp($changeStatus, "accept")==0){ + $notizia->status = NotiziaModel::STATUS_ACCEPTED; + GlobalVariables::get("dao")->save($notizia); + } + else if(strcmp($changeStatus, "reject")==0){ + $notizia->status = NotiziaModel::STATUS_REJECTED; + GlobalVariables::get("dao")->save($notizia); + } } } @@ -127,6 +132,7 @@ try{ + hasRole(AdminModel::ADMIN_TYPE_STATISTICHE_SUPERVISOR)){ ?>