Changeset 1739

Timestamp:

Nov 2, 2010, 1:04:02 PM (10 years ago)

Author:

goya

Message:

Un peu plus d'alerte :

• activer que qd l'utilisateur le demande pour les commentaires
• gestion date plus simple

Location:

cpc/trunk/project

Files:

• apps/frontend/modules/commentaire/actions/actions.class.php (modified) (1 diff)
• lib/task/sendAlertTask.class.php (modified) (2 diffs)

cpc/trunk/project/apps/frontend/modules/commentaire/actions/actions.class.php

@@ -157 +157 @@
     $commentaire->save();
 
-    $alerte = new Alerte();
-    $alerte->citoyen_id = $citoyen_id;
-    $alerte->query = "object_name:Commentaire tag:object_type=".$commentaire->object_type." tag:object_id=".$commentaire->object_id;
-    $alerte->no_human_query = 1;
-    $alerte->period = 'HOUR';
-    $alerte->titre = "Suivi de votre conversation sur $present";
-    $alerte->save();
-
+    if ($this->follow_talk) {
+        $alerte = new Alerte();
+        $alerte->citoyen_id = $citoyen_id;
+        $alerte->query = "object_name:Commentaire tag:object_type=".$commentaire->object_type." tag:object_id=".$commentaire->object_id;
+        $alerte->no_human_query = 1;
+        $alerte->period = 'HOUR';
+        $alerte->titre = "Suivi de votre conversation sur $present";
+        $alerte->save();
+    }
     $object->updateNbCommentaires();
     $object->save();

cpc/trunk/project/lib/task/sendAlertTask.class.php

@@ -24 +24 @@
     $query = Doctrine::getTable('Alerte')->createQuery('a')->where('next_mail < NOW()')->andWhere('confirmed = 1');
     foreach($query->execute() as $alerte) {
-      $date = strtotime(preg_replace('/ /', 'T', $alerte->last_mail)."Z")-3600*2+1;
+      $date = strtotime(preg_replace('/ /', 'T', $alerte->last_mail)."Z")+1;
       $query = $alerte->query." date:[".date('Y-m-d', $date).'T'.date('H:i:s', $date)."Z TO ".date('Y-m-d').'T'.date('H:i:s')."Z]";
       $results = $solr->search($query, array('sort' => 'date desc', 'hl' => 'yes', 'hl.fragsize'=>500));
@@ -33 +33 @@
       }
       echo "sending mail to : ".$alerte->email."\n";
-      $message = $this->getMailer()->compose(array('no-reply@nosdeputes.fr' => 'Regards Citoyens (ne pas répondre)'), 
+      $message = $this->getMailer()->compose(array('contact@regardscitoyens.org' => '"Regards Citoyens"'), 
                                              $alerte->email,
                                              '[NosDeputes.fr] Alerte - '.$alerte->titre);
+
       echo $alerte->titre."\n";
       $text = get_partial('mail/sendAlerteTxt', array('alerte' => $alerte, 'results' => $results['response']));
+//      echo "$text\n";
       $message->setBody($text, 'text/plain');
       try {
         $this->getMailer()->send($message);
-        $alerte->last_mail = preg_replace('/T/', ' ', preg_replace('/Z/', '', $results['response']['docs'][$results['response']['numFound'] -1]['date']));
+        $alerte->last_mail = preg_replace('/T/', ' ', preg_replace('/Z/', '', $results['response']['docs'][0]['date']));
         $alerte->save();
       }catch(Exception $e) {