diff --git a/private/bin/importOldData.php b/private/bin/importOldData.php index 2f6d260..8fd47a3 100644 --- a/private/bin/importOldData.php +++ b/private/bin/importOldData.php @@ -31,10 +31,13 @@ else { GlobalVariables::get("dao")->save($admin); } +$count = 0; $imgDir = "/home/r.didato/mediaimg/notizie"; -$statement = $pdo->query("select * from notizia order by id desc limit 0,100"); +$statement = $pdo->query("select * from notizia order by id desc limit $count,100"); $dati = $statement->fetchALL(PDO::FETCH_CLASS,"stdClass"); -// while (is_array($dati) && sizeof($dati)==0){ + +while (is_array($dati) && sizeof($dati)>0){ + foreach ($dati as $ele){ $notizia = new stdClass(); $notizia->status = NotiziaModel::STATUS_ACCEPTED; @@ -130,6 +133,9 @@ $dati = $statement->fetchALL(PDO::FETCH_CLASS,"stdClass"); // } } -// } + $count+=100; + $statement = $pdo->query("select * from notizia order by id desc limit $count,100"); + $dati = $statement->fetchALL(PDO::FETCH_CLASS,"stdClass"); +} ?> \ No newline at end of file diff --git a/private/crontab/core.hourly.php b/private/crontab/core.hourly.php index 8c259c5..cb0c65e 100644 --- a/private/crontab/core.hourly.php +++ b/private/crontab/core.hourly.php @@ -2,7 +2,7 @@ 0){ foreach ($tasks as $taskName){ diff --git a/private/lib/FDN_MailHelper.php b/private/lib/FDN_MailHelper.php index 3522c6d..2ecce69 100644 --- a/private/lib/FDN_MailHelper.php +++ b/private/lib/FDN_MailHelper.php @@ -9,13 +9,13 @@ class FDN_MailHelper { public static function generateMailFooter(){ $footer = '
'. '
'. - 'Home | Politica | Cronaca | Sport | Cultura&Spettacolo | Gossip'. + 'Home | Politica | Cronaca | Sport | Cultura&Spettacolo | Gossip'. '
'. '
TESTATA REGISTRATA PRESSO IL TRIBUNALE DI NAPOLI AUT. NR. 8 DEL 27 GENNAIO 2006
'. - '
COPYRIGHT © 2016 www.ifattidinapoli.it - Giornale della Terza Metropoli Italiana
'. - '
REDAZIONE | ARCHIVIO STORICO
'. + '
COPYRIGHT © 2016 www.ifattidinapoli.it - Giornale della Terza Metropoli Italiana
'. + '
REDAZIONE | ARCHIVIO STORICO
'. '
'; - echo $footer; + return $footer; } public static function getAdminConfirmMail($admin){ @@ -29,9 +29,9 @@ class FDN_MailHelper { $confirmLink = GUIHandler::getBaseUrl()."admin/confirmAdmin.php?regcode=".$admin->id."&email=".$admin->email; - $mailHead = '


'; + $mailHead = '


'; $tmp->body = $mailHead."Per attivare il tuo account clicka sul link riportato in seguito o copialo e incollalo nel tuo browser.

"; - $tmp->body.=''.$confirmLink.'
'.self::generateMailFooter(); + $tmp->body.=''.$confirmLink.'
'.self::generateMailFooter().'
'; return new MailModel($tmp); } @@ -49,12 +49,12 @@ class FDN_MailHelper { $confirmLink = GUIHandler::getBaseUrl()."admin/passwordRecovery.php?req=".$request->id."&u=".$request->target->id; - $mailHead = '


'; + $mailHead = '


'; $tmp->body = $mailHead."Hai ricevuto questo messaggio perchè hai effettuato una richiesta di recupero password dal nostro sito.

"; $tmp->body.= "Se non hai effettuato nessuna richiesta, semplicemente ignora questo messaggio.

"; $tmp->body.= "Clicka sul seguente link per generare una nuova password.

"; - $tmp->body.=''.$confirmLink.'
'.self::generateMailFooter(); + $tmp->body.=''.$confirmLink.'
'.self::generateMailFooter().'
'; return new MailModel($tmp); } @@ -70,9 +70,9 @@ class FDN_MailHelper { $confirmLink = GUIHandler::getBaseUrl()."confirmUser.php?regcode=".$user->id."&email=".$user->email; - $mailHead = '


'; + $mailHead = '


'; $tmp->body = $mailHead."Per attivare il tuo account clicka sul link riportato in seguito o copialo e incollalo nel tuo browser.

"; - $tmp->body.=''.$confirmLink.'
'.self::generateMailFooter(); + $tmp->body.=''.$confirmLink.'
'.self::generateMailFooter().'
'; return new MailModel($tmp); } @@ -90,15 +90,35 @@ class FDN_MailHelper { $confirmLink = GUIHandler::getBaseUrl()."passwordRecovery.php?req=".$request->id."&u=".$request->target->id; - $mailHead = '


'; + $mailHead = '


'; $tmp->body = $mailHead."Hai ricevuto questo messaggio perchè hai effettuato una richiesta di recupero password dal nostro sito.

"; $tmp->body.= "Se non hai effettuato nessuna richiesta, semplicemente ignora questo messaggio.

"; $tmp->body.= "Clicka sul seguente link per generare una nuova password.

"; - $tmp->body.=''.$confirmLink.'
'.self::generateMailFooter(); + $tmp->body.=''.$confirmLink.'
'.self::generateMailFooter().'
'; return new MailModel($tmp); } + + public static function getNewCommentoMail(CommentoModel $commento, AdminModel $admin){ + $config = GlobalVariables::get("config"); + + $tmp = new stdClass(); + $tmp->from = $config->emails->postmaster; + $tmp->fromName = "I Fatti di Napoli - Automailer"; + $tmp->recipient = $admin->email; + $tmp->subject = "I Fatti di Napoli - Nuovo commento"; + + $confirmLink = GUIHandler::getBaseUrl()."/admin/validateCommento.php?i=".$commento->id; + + $mailHead = '


'; + + $tmp->body = $mailHead."Un nuovo commento è stato inserito su I Fatti di Napoli ed è in attesa di essere accettato.

"; + $tmp->body.= "Verifica i contenuti del commento utilizzando il link di seguito.

"; + $tmp->body.=''.$confirmLink.''.self::generateMailFooter().'
'; + + return new MailModel($tmp); + } } -?> \ No newline at end of file +?> diff --git a/private/lib/dao/models/CommentoModel.php b/private/lib/dao/models/CommentoModel.php index a3c120a..b35fef1 100644 --- a/private/lib/dao/models/CommentoModel.php +++ b/private/lib/dao/models/CommentoModel.php @@ -32,6 +32,10 @@ class CommentoModel extends Model{ $this->status = self::STATUS_PENDING; } + if (!$this->hasProperty("mailSent")){ + $this->mailSent = false; + } + if (!$this->hasProperty("date")){ $this->date = new MongoDate(); } diff --git a/private/lib/task/GenerateCommentiWarningMailTask.php b/private/lib/task/GenerateCommentiWarningMailTask.php new file mode 100644 index 0000000..4365bb3 --- /dev/null +++ b/private/lib/task/GenerateCommentiWarningMailTask.php @@ -0,0 +1,36 @@ +query("AdminModel",array("active"=>true)); + + $commenti = GlobalVariables::get("dao")->query("CommentoModel",array("mailSent"=>false),array("limit"=>10)); + + if(sizeof($commenti)>0 && sizeof($admins)>0){ + foreach ($admins as $admin){ + if ($admin->hasRole(AdminModel::ADMIN_TYPE_COMMENTI_SUPERVISOR) && !$admin->hasRole(AdminModel::ADMIN_TYPE_SUPERADMIN)){ + foreach ($commenti as $commento){ + $mail = FDN_MailHelper::getNewCommentoMail($commento,$admin); + GlobalVariables::get("dao")->save($mail); + $commento->mailSent = true; + GlobalVariables::get("dao")->save($commento); + } + } + } + } + } +} + +?> \ No newline at end of file diff --git a/private/lib/task/lib.inclusion.php b/private/lib/task/lib.inclusion.php index d2862ae..97699c1 100644 --- a/private/lib/task/lib.inclusion.php +++ b/private/lib/task/lib.inclusion.php @@ -21,4 +21,6 @@ require_once(dirname(__FILE__)."/DeleteOldPasswordResetRequestsTask.php"); require_once(dirname(__FILE__)."/GenerateUserActivationMailTask.php"); require_once(dirname(__FILE__)."/UpdateMeteoCacheTask.php"); + +require_once(dirname(__FILE__)."/GenerateCommentiWarningMailTask.php"); ?> \ No newline at end of file diff --git a/public/admin/addMultimedia.php b/public/admin/addMultimedia.php index 9d97ff8..88bb145 100644 --- a/public/admin/addMultimedia.php +++ b/public/admin/addMultimedia.php @@ -78,12 +78,12 @@ try{ } } - $formFile = ' + $formFile = 'Selezionare un file '; - $formYoutube = 'url: '; + $formYoutube = 'Link '; - $formHtml = 'Inserire html: '; + $formHtml = 'Codice HTML'; }catch(GUIException $ex){ $error = $ex->getMessage(); @@ -99,7 +99,8 @@ HTMLHelper::generateAdminHead();
-
Selezionare tipo multimedia: +
+ Tipo di multimedia
-
diff --git a/public/admin/confirmNewsletter.php b/public/admin/confirmNewsletter.php index cae1ff8..271cc6b 100644 --- a/public/admin/confirmNewsletter.php +++ b/public/admin/confirmNewsletter.php @@ -59,7 +59,8 @@ try { ?>
Oggettosubject; ?>
Giornodate->sec); ?>
@@ -77,6 +78,10 @@ try { $("form#mailForm input[type=hidden][name=action]").val("cancel"); $("form#mailForm").submit(); }); + + $("#mailForm_elimina").click(function(event){ + openPagePost("deleteNewsletter.php", [{name:"id",value:""}]); + }); });
diff --git a/public/admin/deleteAmministratori.php b/public/admin/deleteAmministratori.php index 8f0559c..b86d8ba 100644 --- a/public/admin/deleteAmministratori.php +++ b/public/admin/deleteAmministratori.php @@ -38,16 +38,18 @@ if (!is_null($confirm) && strcmp("", $confirm)!=0){ } ?> -
-nome." ".$giornalista->cognome."?"; -?> - - - - - Conferma - Annulla +
+
+ nome." ".$giornalista->cognome."?"; + ?> +
+ + +
+ Conferma + Annulla +
\ No newline at end of file diff --git a/public/admin/deleteNotizie.php b/public/admin/deleteNotizie.php index ee38fe0..557732b 100644 --- a/public/admin/deleteNotizie.php +++ b/public/admin/deleteNotizie.php @@ -38,16 +38,18 @@ if (!is_null($confirm) && strcmp("", $confirm)!=0){ } ?> -
-".$notizia->titolo." ?"; -?> -
- - -
- Conferma - Annulla +
+
+ ".$notizia->titolo." ?"; + ?> +
+ + +
+ Conferma + Annulla +