From d47d0b9dfbb97c3170c43dc683c2377801c623d1 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Sat, 25 Dec 2004 22:49:42 +0000
Subject: [PATCH] simplification de l'appel du squelette des signatures
---
formulaire_signature-dist.html | 5 +++--
inc-formulaire_signature.php3 | 20 ++++----------------
inc-public.php3 | 5 +----
3 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/formulaire_signature-dist.html b/formulaire_signature-dist.html
index dfd3a62725..a8093a3d16 100644
--- a/formulaire_signature-dist.html
+++ b/formulaire_signature-dist.html
@@ -18,7 +18,8 @@
<br />
[<fieldset>
<p>
- (#HTTP_VARS{site_obli}) <:form_pet_votre_site:><br />
+ (#HTTP_VARS{site_obli}|choixsiegal{oui,'', ' '})
+ <:form_pet_votre_site:><br />
<b><:form_pet_nom_site2:></b><br />
<input type="text" class="forml" name="nom_site" value="" size="20" />
</p>
@@ -27,7 +28,7 @@
<input type="text" class="forml" name="url_site" value="http://" size="20" />
</p>
</fieldset>][
- (#HTTP_VARS{message})
+ (#HTTP_VARS{message}|choixsiegal{oui,' ', ''})
<br />
<fieldset>
<b><:form_pet_message_commentaire:></b><br />
diff --git a/inc-formulaire_signature.php3 b/inc-formulaire_signature.php3
index 7b705dc6a5..99b700617c 100644
--- a/inc-formulaire_signature.php3
+++ b/inc-formulaire_signature.php3
@@ -19,25 +19,13 @@ function balise_FORMULAIRE_SIGNATURE_dyn($id_article) {
return reponse_signature($id_article);
else {
include(_FILE_CONNECT);
- $query_petition = "SELECT * FROM spip_petitions WHERE id_article='$id_article'";
- $result_petition = spip_query($query_petition);
-
- if (!$row = spip_fetch_array($result_petition)) return '';
- $site_obli = $row['site_obli'];
- $message = $row['message'];
- $texte = $row['texte'];
- return array('formulaire_signature',
- 0,
- array(
- 'id_article' => $id_article,
- 'texte' => $texte,
- 'message' => (($message == 'oui') ? ' ' : ''),
- 'site_obli' => (($site_obli != 'oui') ? ' ' : '')
- )
- );
+ $row = spip_fetch_array(spip_query("SELECT * FROM spip_petitions WHERE id_article='$id_article'"));
+ return !$row ? '': array('formulaire_signature', 0, $row);
}
}
+function choixsiegal($a1,$a2,$v,$f) {return ($a1 == $a2) ? $v : $f;}
+
//
// Retour a l'ecran du lien de confirmation d'une signature de petition
//
diff --git a/inc-public.php3 b/inc-public.php3
index c69827ca0c..4fe61e6df1 100644
--- a/inc-public.php3
+++ b/inc-public.php3
@@ -52,10 +52,7 @@ else {
if ($redirect) redirige_par_entete($redirect);
}
if ($val_confirm) {
- // il nous faut id_article ! C'est donc encore a nettoyer...
- include_local('inc-calcul.php3');
- calculer_contexte();
- include_local('inc-signature.php3');
+ include_local('inc-formulaire_signature.php3');
reponse_confirmation($id_article, $val_confirm);
}
--
GitLab