Changeset 1441

Timestamp:

Sep 26, 2010, 9:59:08 PM (10 years ago)

Author:

teymour

Message:

Gestion de l'envoi de confirmation + qq correction de bug

Location:

cpc/trunk/project

Files:

• apps/frontend/config/routing.yml (modified) (1 diff)
• apps/frontend/modules/alerte/actions/actions.class.php (modified) (2 diffs)
• config/doctrine/schema.yml (modified) (1 diff)
• lib/model/doctrine/Alerte.class.php (modified) (2 diffs)

cpc/trunk/project/apps/frontend/config/routing.yml

@@ -394 +394 @@
   url: /alerte/delete/:verif
   param: {module: alerte, action: delete}
+alerte_confirmation:
+  url: /alerte/confirmation/:verif
+  param: {module: alerte, action: confirmation}
 
 parlementaire:

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

@@ -66 +66 @@
   }
 
+  public function executeConfirmation(sfWebRequest $request) 
+  {
+    $this->forward404Unless($alerte = Doctrine::getTable('Alerte')->createQuery('a')->where('verif = ?', $request->getParameter('verif'))->fetchOne());
+    $alerte->confirmed = 1;
+    $alerte->save();
+    $this->getUser()->setFlash('notice', 'Merci d\'avoir confirmé votre alerte');
+    return $this->redirect("@homepage");
+  }
   private function redirectPostSave($alerte = null) {
     if ($citoyen_id = $this->getUser()->getAttribute('user_id'))
       return $this->redirect('alerte/list');
-    else if ($alerte_id)
-      return $this->redirect('alerte/edit?id='.$alerte_id);
+    else if ($alerte)
+      return $this->redirect('alerte/edit?verif='.$alerte->verif);
     else
       return $this->redirect('@homepage');
@@ -83 +91 @@
       $form->bind($request->getParameter($form->getName()));
       if ($form->isValid()) {
-        $form->save();
+        try {
+          if (!$form->save()) {
+            throw new Exception();
+          }
+        }catch(Exception $e) {
+          $this->getUser()->setFlash('error', 'Désolé nous n\'avons pu créer votre alerte, vous y étiez sans doute déjà abonné');
+          return $this->redirect('@homepage');
+        }
         if ($this->submit == 'Créer') {
-          $this->getUser()->setFlash('notice', 'Votre alerte email a été créée');
+          if ($alerte->confirmed)
+            $this->getUser()->setFlash('notice', 'Votre alerte email a été créée');
+          else {
+            $this->confirmeAlerte($alerte);
+            $this->getUser()->setFlash('notice', 'Votre alerte email a été créée, merci de confirmer votre abonnement par email');
+          }
         }else {
           $this->getUser()->setFlash('notice', 'Votre alerte email a été modifiée');
         }
-        return $this->redirectPostSave($form->getObject()->id);
+        return $this->redirectPostSave($form->getObject());
       }
     }
     return $form;
   }
+  private function confirmeAlerte($alerte) {
+    $message = $this->getMailer()->compose(array('no-reply@nosdeputes.fr' => 'Regards Citoyens (ne pas répondre)'), 
+                                           $alerte->email,
+                                           '[NosDeputes.fr] Confirmation d\'Alerte email - '.$alerte->titre);
+    $text = $this->getPartial('mail/sendConfirmationAlerte', array('alerte' => $alerte));
+    $message->setBody($text, 'text/plain');
+    try {
+      $this->getMailer()->send($message);
+    }catch(Exception $e) {
+      echo "Oups could not send email ($text)\n";
+    }
+  }
 }

cpc/trunk/project/config/doctrine/schema.yml

@@ -674 +674 @@
   relations:
     Citoyen:
-      class: Citoyen
       foreignAlias: Alertes
+  indexes:
+    index_uniq:
+      fields: [email, citoyen_id, query, filter]
+      type: unique
     

cpc/trunk/project/lib/model/doctrine/Alerte.class.php

@@ -14 +14 @@
 {
   public function getEmail() {
-    if ($c = $this->Citoyen) {
-      return $c->email;
+    if ($this->citoyen_id) {
+      return $this->getCitoyen()->email;
     }
     return $this->_get('email');
@@ -31 +31 @@
   }
 
-  public function save(Doctrine_Connection $c = null) {
+   public function save(Doctrine_Connection $c = null) {
     if (!$this->last_mail)
       $this->last_mail = date('Y-m-d H:i:s');
     if (!$this->verif)
       $this->generateVerif();
+    if ($this->citoyen_id)
+      $this->confirmed = 1;
     return parent::save($c);
   }