Changeset 5946 in spip-zone

Timestamp:

Oct 6, 2006, 3:46:49 PM (13 years ago)

Author:

cedric@…

Message:

generalisation de l'API de forms pour la personalisation des emails

Location:

_plugins_/_stable_

Files:

• ecard/envoi_ecard.html (modified) (1 diff)
• ecard/modeles/form_ecard.html (modified) (1 diff)
• ecard/modeles/form_reponse_email_ecard.html (added)
• ecard/plugin.xml (modified) (1 diff)
• forms/1_9_1/inc/forms.php (modified) (2 diffs)
• forms/1_9_1/valide_form.html (modified) (1 diff)

_plugins_/_stable_/ecard/envoi_ecard.html

@@ -1 @@
-<?php
-
-$renvoyer_image = false;
-
-
-if ($mel_confirm == 'oui' AND ($id_reponse = intval($id_reponse))
-                && (isset($id_article)) && ($id_article = intval($id_article)) ) {
-        $query = "SELECT * FROM spip_reponses WHERE id_reponse=$id_reponse";
-        $result = spip_query($query);
-        if ($row = spip_fetch_array($result)) {
-                $id_form = $row['id_form'];
-                // D'abord verifier que l'URL est legitime, donc que la demande a bien
-                // ete generee par SPIP
-                if (verifier_action_auteur("forms confirme reponse $id_reponse", $hash)) {
-                        include_spip('ecard_filtres');
-                        generer_mail_ecard_formulaire($id_form, $id_reponse, $id_article);
-                }
-        }
-        $renvoyer_image = true;
-}
-
-if ($renvoyer_image) {
-        $image = "47494638396118001800800000ffffff00000021f90401000000002c0000000018001800000216848fa9cbed0fa39cb4da8bb3debcfb0f86e248965301003b";
-        $image = pack("H*", $image);
-        $size = strlen($image);
-        
-        Header("Content-Type: image/gif");
-        Header("Content-Length: ".$size);
-        Header("Cache-Control: no-cache,no-store");
-        Header("Pragma: no-cache");
-        Header("Connection: close");
-        
-        echo $image;
-}
-
-
-?>
+[(#HTTP_HEADER{Content-Type: image/gif})][(#INCLURE{fond=valide_form}{mel_confirm}{id_reponse}{hash}{id_article}{modele=form_reponse_email_ecard})]

_plugins_/_stable_/ecard/modeles/form_ecard.html

@@ -1 +1 @@
 <BOUCLE_f(FORMS){id_form}>
-#FORMS{'envoi_ecard','ecard:avis_message_confirmation'}
+<BOUCLE_a(ARTICLES){id_article=#ENV{id_article}}>
+#FORMS{'envoi_ecard','ecard:avis_message_confirmation','Merci !'}
+</BOUCLE_a>
 </BOUCLE_f>

_plugins_/_stable_/ecard/plugin.xml

@@ -16 +16 @@
         Envoi d'e-card a partir d'un formulaire de forms
 _ Necessite le plugin forms
-_ Ce plugin illustre le mecanisme de personalisation des squelettes de formulaire : un formulaire d'ecard s'insere par le raccourci <formxx|ecard> qui declenche l'appel au formulaire personalis&eacute; modele_form_ecard.html
+_ Ce plugin illustre le mecanisme de personalisation des squelettes de formulaire : un formulaire d'ecard s'insere par le raccourci <code><formxx|ecard></code> qui declenche l'appel au formulaire personalis&eacute; modele_form_ecard.html
         </description>
         <prefix> 

_plugins_/_stable_/forms/1_9_1/inc/forms.php

@@ -253 +253 @@
         }
 
-        function Forms_generer_mail_reponse_formulaire($id_form, $id_reponse, $modele_mail = 'form_reponse_email'){
+        function Forms_generer_mail_reponse_formulaire($id_form, $id_reponse, $env){
+                if (!is_array($env)) $env=array();
+                $modele_mail = 'form_reponse_email';
+                if (isset($env['modele']))
+                        $modele_mail = $env['modele'];
                 $result = spip_query("SELECT * FROM spip_forms WHERE id_form=$id_form");
                 if ($row = spip_fetch_array($result)) {
@@ -259 +263 @@
                         if ($f = find_in_path(($m = "$modele-$id_form").".html"))
                                 $modele = $m;
-                        $corps_mail = recuperer_fond($modele,array('id_reponse'=>$id_reponse));
-                        $corps_mail_admin = recuperer_fond($modele,array('id_reponse'=>$id_reponse,'mail_admin'=>'oui'));
+                        $corps_mail = recuperer_fond($modele,array_merge($env,array('id_reponse'=>$id_reponse)));
+                        $corps_mail_admin = recuperer_fond($modele,array_merge($env,array('id_reponse'=>$id_reponse,'mail_admin'=>'oui')));
                         $champconfirm = $row['champconfirm'];
                         $email = unserialize($row['email']);

_plugins_/_stable_/forms/1_9_1/valide_form.html

@@ -56 +56 @@
                         // ete generee par SPIP
                         if (verifier_action_auteur("forms confirme reponse $id_reponse", $hash)) {
-                                $modele = '[(#ENV{modele,''}|texte_script)]';
-                                if ($modele)
-                                        Forms_generer_mail_reponse_formulaire($id_form, $id_reponse, $modele);
-                                else
-                                        Forms_generer_mail_reponse_formulaire($id_form, $id_reponse);
+                                $env = unserialize('[(#ENV|texte_script)]');
+                                Forms_generer_mail_reponse_formulaire($id_form, $id_reponse, $env);
                         }
                 }