From fad85533458278ac8bf46795dc74fd0b82b816ae Mon Sep 17 00:00:00 2001
From: engel <>
Date: Thu, 17 Mar 2022 15:00:35 +0000
Subject: [PATCH] =?UTF-8?q?param=C3=A8trage=20ville=20avant=20date=20sur?=
 =?UTF-8?q?=20formulaire?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

FossilOrigin-Name: 23ef0327f14e2bd7aff68dad738edcd2437bb31445b972c77131104fb891455b
---
 lib/RecusHTML.php               | 4 +++-
 www/admin/config.php            | 2 +-
 www/admin/generer_personnes.php | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/RecusHTML.php b/lib/RecusHTML.php
index c2c722f..82c36cb 100644
--- a/lib/RecusHTML.php
+++ b/lib/RecusHTML.php
@@ -23,6 +23,7 @@ class RecusHTML
                          $objetAsso,
                          $nomResponsable,
                          $fonctionResponsable,
+                         $villeAsso,
                          $articlesCGI,
                          $signature)
     {
@@ -31,6 +32,7 @@ class RecusHTML
         $this->objetAsso = $objetAsso;
         $this->nomResponsable = $nomResponsable;
         $this->fonctionResponsable = $fonctionResponsable;
+        $this->villeAsso = $villeAsso;
         $this->signature = $signature;
         $this->articlesCGI = $articlesCGI;
         $this->html = $this->entete();
@@ -116,7 +118,7 @@ FDD;
         $date = date("j/m/Y");
 echo <<<FDD
         <div class="cartouche" id="final">
-        <p>{this->villeAsso} le {$date}</p>
+        <p>{$this->villeAsso} le {$date}</p>
         <img id="signature" src="$this->signature" />
         <p id="nom">$this->nomResponsable</p>
         <p id="fonction">$this->fonctionResponsable</p>
diff --git a/www/admin/config.php b/www/admin/config.php
index 58c8b0b..ea4b386 100644
--- a/www/admin/config.php
+++ b/www/admin/config.php
@@ -61,7 +61,7 @@ if (f('save') && $form->check('recusfiscaux_config'))
 
         // autres informations
         // ville
-        $plugin->setConfig('ville_asso', trim(f('ville_asso'));
+        $plugin->setConfig('ville_asso', trim(f('ville_asso')));
 
         \Garradin\Utils::redirect(PLUGIN_URL . 'config.php?ok');
     }
diff --git a/www/admin/generer_personnes.php b/www/admin/generer_personnes.php
index 1b57127..763cd60 100644
--- a/www/admin/generer_personnes.php
+++ b/www/admin/generer_personnes.php
@@ -41,7 +41,7 @@ foreach ($versementsSelectionnes as $ligne)
         $plugin->getConfig('objet_asso'),
         $plugin->getConfig('nom_responsable'),
         $plugin->getConfig('fonction_responsable'),
-        $plugin->getConfig('ville_asso');
+        $plugin->getConfig('ville_asso'),
         $articlesCGI,
         $signature
     );