4 files changed, 85 insertions, 38 deletions

diff --git a/src/view/FormBuilder.php b/src/view/FormBuilder.php
index 7a2adcb..cb438b9 100644
--- a/src/view/FormBuilder.php
+++ b/src/view/FormBuilder.php
@@ -7,41 +7,38 @@ use App\Entity\Node;
 
 class FormBuilder extends AbstractBuilder
 {
+    static private ?Captcha $captcha = null;
+
     public function __construct(Node $node)
     {
         parent::__construct($node);
-        $viewFile = self::VIEWS_PATH . $node->getName() . '.php';
         
-        if(file_exists($viewFile))
+        if(!empty($node->getNodeData()->getData()))
         {
-            if(!empty($node->getNodeData()->getData()))
-            {
-                extract($node->getNodeData()->getData());
-            }
-
-            $captcha = new Captcha;
-            $_SESSION['captcha'] = $captcha->getSolution();
-
-            $email = $email ?? Config::$email_dest;
-
-            $admin_content = '';
-            if($_SESSION['admin'])
-            {
-                $admin_content = '<div class="admin_form">
-                    <p>
-                        <label for="recipient">E-mail de destination de ce formulaire</label>
-                        <input id="recipient" type="email" name="recipient" placeholder="mon-adresse@email.fr" value="' . $email . '">
-                        <input type="hidden" id="recipient_hidden" value="">
-                        <button onclick="changeRecipient(' . $node->getNodeData()->getId() . ')">Valider</button>
-                    </p>
-                    <p><button onclick="sendTestEmail(' . $node->getNodeData()->getId() . ')">Envoi d\'un e-mail de test</button></p>
-                    <p class="test_email_success full_width_column"></p>
-                </div>' . "\n";
-            }
+            extract($node->getNodeData()->getData());
+        }
+
+        // un seul captcha à la fois!
+        if(!self::$captcha){
+            self::$captcha = new Captcha;
+            $_SESSION['captcha'] = self::$captcha->getSolution();
+        }
 
+        $smtp_host = $smtp_host ?? Config::$smtp_host;
+        $smtp_secure = $smtp_secure ?? Config::$smtp_secure;
+        $smtp_username = $smtp_username ?? Config::$smtp_username;
+        $email_dest = $email_dest ?? Config::$email_dest;
+
+        $admin_content = '';
+        if($_SESSION['admin'])
+        {
             ob_start();
-            require $viewFile;
-            $this->html = ob_get_clean(); // pas de concaténation ici, on écrase
+            require self::VIEWS_PATH . 'form_params.php';
+            $admin_content = ob_get_clean();
         }
+
+        ob_start();
+        require self::VIEWS_PATH . $node->getName() . '.php';
+        $this->html = ob_get_clean(); // pas de concaténation ici, on écrase
     }
 }
\ No newline at end of file
diff --git a/src/view/templates/form.php b/src/view/templates/form.php
index 25446c1..5c959a0 100644
--- a/src/view/templates/form.php
+++ b/src/view/templates/form.php
@@ -1,33 +1,33 @@
 <?php declare(strict_types=1); ?>
 <section class="form" id="<?= $this->id_node ?>">
-        <?= $admin_content ?>
         <h3><?= $title ?></h3>
+        <?= $admin_content ?>
         <div class="form_inputs">
                 <label for="email_name">Votre nom</label>
-                <input id="email_name" type="text" name="email_name" value="">
+                <input id="email_name_<?= $node->getNodeData()->getId() ?>" type="text" name="email_name" value="">
                 
                 <label for="email_address">Votre e-mail</label>
-                <input id="email_address" type="email" name="email_address" placeholder="mon-adresse@email.fr" value="" onchange="checkCase()">
+                <input id="email_address_<?= $node->getNodeData()->getId() ?>" type="email" name="email_address" placeholder="mon-adresse@email.fr" value="" onchange="checkCase()">
 
                 <label for="email_message">Votre message</label>
-                <textarea id="email_message" type="text" name="email_message" rows="4"></textarea>
+                <textarea id="email_message_<?= $node->getNodeData()->getId() ?>" type="text" name="email_message" rows="4"></textarea>
 
                 <div class="full_width_column">
                         <label for="captcha" >Montrez que vous n'êtes pas un robot</label>
                 </div>
 
-                <label for="email_captcha" >Combien font <?= $captcha->getA() ?> fois <?= $captcha->getB() ?>?</label>
+                <label for="email_captcha" >Combien font <?= self::$captcha->getA() ?> fois <?= self::$captcha->getB() ?>?</label>
                 <div>
-                        <input id="email_captcha" type="text" name="email_captcha" size="1" autocomplete="off">
+                        <input id="email_captcha_<?= $node->getNodeData()->getId() ?>" type="text" name="email_captcha" size="1" autocomplete="off">
                 </div>
 
                 <input id="form_id_hidden" type="hidden" name="form_id_hidden" value="">
-                <input id="email_hidden" type="hidden" name="email_hidden">
+                <input id="email_hidden_<?= $node->getNodeData()->getId() ?>" type="hidden" name="email_hidden">
 
                 <div class="full_width_column">
                         <input type="submit" value="Envoyez votre message" onclick="sendVisitorEmail(<?= $node->getNodeData()->getId() ?>)">
                 </div>
 
-                <p class="send_email_success full_width_column"></p>
+                <p class="send_email_success_<?= $node->getNodeData()->getId() ?> full_width_column"></p>
         </div>
 </section>
\ No newline at end of file
diff --git a/src/view/templates/form_params.php b/src/view/templates/form_params.php
new file mode 100644
index 0000000..a7bf1d8
--- /dev/null
+++ b/src/view/templates/form_params.php
@@ -0,0 +1,50 @@
+<?php
+// src/view/templates/form_params.php 
+declare(strict_types=1);
+// note: l'id ici n'est pas celui du noeud bloc mais celui de l'entrée dans node_data correspondante
+?>
+<div class="admin_form">
+        <h3>Paramètres d'envoi</h3>
+        <p>
+            <label for="smtp_host_<?= $node->getNodeData()->getId() ?>">Adresse serveur SMTP</label>
+            <input id="smtp_host_<?= $node->getNodeData()->getId() ?>" type="text" name="smtp_host" placeholder="smtp.messagerie.fr" value="<?= htmlspecialchars($smtp_host) ?>">
+            <input type="hidden" id="smtp_host_hidden_<?= $node->getNodeData()->getId() ?>" value="">
+            <button onclick="setEmailParam('smtp_host', <?= $node->getNodeData()->getId() ?>)">Valider</button>
+        </p>
+        <p>
+                <label for="smtp_secure_<?= $node->getNodeData()->getId() ?>">Chiffrement</label>
+                <select id="smtp_secure_<?= $node->getNodeData()->getId() ?>" name="smtp_secure" onchange="setEmailParam('smtp_secure', <?= $node->getNodeData()->getId() ?>)">
+                        <option value="plain_text" >Aucun (port 25)</option>
+                        <option value="tls" <?php echo htmlspecialchars($smtp_secure) === 'tls' ? 'selected' : '' ?>>StartTLS (port 587)</option>
+                        <option value="ssl" <?php echo htmlspecialchars($smtp_secure) === 'ssl' ? 'selected' : '' ?>>SSL (port 465)</option>
+                </select>
+                <input type="hidden" id="smtp_secure_hidden_<?= $node->getNodeData()->getId() ?>" value="">
+        </p>
+        <p>
+            <label for="smtp_username_<?= $node->getNodeData()->getId() ?>">Identifiant (adresse e-mail)</label>
+            <input id="smtp_username_<?= $node->getNodeData()->getId() ?>" type="email" name="smtp_username" placeholder="mon-adresse@email.fr" value="<?= htmlspecialchars($smtp_username) ?>">
+            <input type="hidden" id="smtp_username_hidden_<?= $node->getNodeData()->getId() ?>" value="">
+            <button onclick="setEmailParam('smtp_username', <?= $node->getNodeData()->getId() ?>)">Valider</button>
+        </p>
+        <p>
+            <label for="smtp_password_<?= $node->getNodeData()->getId() ?>">Mot de passe</label>
+            <input id="smtp_password_<?= $node->getNodeData()->getId() ?>" type="password" name="smtp_password">
+            <input type="hidden" id="smtp_password_hidden_<?= $node->getNodeData()->getId() ?>" value="">
+            <button onclick="setEmailParam('smtp_password', <?= $node->getNodeData()->getId() ?>)">Valider</button>
+        </p>
+        <p><i>Il s'agit du service qui acheminera les messages envoyés par ce formulaire. Les services d'envoi de courriels nécéssitent généralement de s'y connecter avec un identifiant et un mot de passe. Les adresses d'envoi et de réception peuvent être identiques. Le site web peut ne pas réussir à se connecter à certains fournisseurs.</i></p>
+</div>
+<div class="admin_form">
+        <p><button onclick="sendTestEmail(<?= $node->getNodeData()->getId() ?>)">Envoi d'un e-mail de test</button></p>
+        <p><i>Vérifie la connexion au serveur d'envoi. Pour tester la réception, consultez vos e-mails à l'adresse de réception.</i></p>
+        <p class="test_email_success_<?= $node->getNodeData()->getId() ?> full_width_column"></p>
+</div>
+<div class="admin_form">
+        <h3>Paramètres de réception</h3>
+        <p>
+            <label for="email_dest_<?= $node->getNodeData()->getId() ?>">Adresse e-mail</label>
+            <input id="email_dest_<?= $node->getNodeData()->getId() ?>" type="email" name="email_dest" placeholder="mon-adresse@email.fr" value="<?= htmlspecialchars($email_dest) ?>">
+            <input type="hidden" id="email_dest_hidden_<?= $node->getNodeData()->getId() ?>" value="">
+            <button onclick="setEmailParam('email_dest', <?= $node->getNodeData()->getId() ?>)">Valider</button>
+        </p>
+</div>
\ No newline at end of file
diff --git a/src/view/templates/user_edit.php b/src/view/templates/user_edit.php
index 77cd9f2..18eb037 100644
--- a/src/view/templates/user_edit.php
+++ b/src/view/templates/user_edit.php
@@ -10,7 +10,7 @@
                         </div>
                         <div class="user_edit_flex">
                     <div class="login_form">
-                            <p class="connexionP" >Modifier mon nom d'utilisateur.</p>
+                            <p class="connexionP" >Modifier mon <b>nom d'utilisateur</b>.</p>
                             <p style="color: red; font-style: italic;"><?= $error_username ?></p>
                             <p style="color: green; font-style: italic;"><?= $success_username ?></p>
                                         <form class="connexionFormulaire" method="post" action="<?= $link_user_form ?>" >
@@ -31,7 +31,7 @@
                                         </form>
                                 </div>
                                 <div class="login_form">
-                                        <p class="connexionP" >Modifier mon mot de passe.</p>
+                                        <p class="connexionP" >Modifier mon <b>mot de passe</b>.</p>
                             <p style="color: red; font-style: italic;"><?= $error_password ?></p>
                             <p style="color: green; font-style: italic;"><?= $success_password ?></p>
                                         <form class="connexionFormulaire" method="post" action="<?= $link_password_form ?>" >