contrôle sur les input type url

6 files changed, 18 insertions, 7 deletions

diff --git a/public/js/Input.js b/public/js/Input.js
index 0ebbbbb..854e5d1 100644
--- a/public/js/Input.js
+++ b/public/js/Input.js
@@ -11,7 +11,7 @@ class InputToggler{
                 this.submit_elem = this.parent.querySelector(options.submit_selector || `#${name}_submit`);
                 this.cancel_elem = this.parent.querySelector(options.cancel_selector || `#${name}_cancel`);
 
-                // balises à ne pas gérer (fonctionne mais inutilisé pour l'instant)
+                // balises à ne pas gérer
                 this.ignored_tags = {
                         has_content: options.has_content !== false, // => true sauf si le paramètre vaut false
                         has_input: options.has_input !== false,
@@ -42,7 +42,7 @@ class InputToggler{
 
 
 // enfants
-class InputText extends InputToggler{
+class InputText extends InputToggler{ // pour input type text ou url
         constructor(name, options = {}){
                 super(name, options);
                 this.fetcher = new Fetcher({
diff --git a/public/js/main.js b/public/js/main.js
index 42bae70..1e47ebe 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -36,6 +36,18 @@ function toastNotify(message){
     setTimeout(function(){ toast.className = toast.className.replace('show', ''); }, 5000);
 }
 
+function controlURL(input){
+        const url = input.value.trim();
+        if(!url){
+                return;
+        }
+        if(/^[a-z][a-z0-9+.-]*:/i.test(url) // un "protocole" (https://, ftp://, mailto:, etc)
+                || url.startsWith('/') || url.startsWith('./') || url.startsWith('../')){ // Lien local (commence par /, ./ ou ../)
+                return;
+        }
+        input.value = 'https://' + url; // Cas par défaut
+}
+
 // exécuté à la fin du chargement de la page
 document.addEventListener('DOMContentLoaded', () => {
 
diff --git a/src/controller/ArticleController.php b/src/controller/ArticleController.php
index 7061897..7dc7f49 100644
--- a/src/controller/ArticleController.php
+++ b/src/controller/ArticleController.php
@@ -14,7 +14,6 @@ class ArticleController
         static public function fetch(EntityManager $entityManager, Request $request): void
         {
                 if($request->query->has('id') && !empty($request->query->get('id')) && $request->query->has('last_article')){
-                        //var_dump($request->query->get('last_article'));
                         $id = (int)$request->get('id'); // type et nettoie
                         $model = new Model($entityManager);
                         $model->findNodeById($id);
diff --git a/src/view/HeaderBuilder.php b/src/view/HeaderBuilder.php
index 266aab8..c36f6a5 100644
--- a/src/view/HeaderBuilder.php
+++ b/src/view/HeaderBuilder.php
@@ -90,7 +90,7 @@ class HeaderBuilder extends AbstractBuilder
                         <a ' . $href . ' target="_blank" rel="noopener noreferrer">'
                             . $this->insertSVG(self::ICON_PATH . $network . '.svg', ['id' => 'header_' . $network . '_content', 'class' => ($checked ? 'svg_fill_red' : '')])
                         . '</a>
-                        <input type="text" id="header_' . $network . '_input" class="hidden" value="' . ($social[$network] ?? "") . '" placeholder="lien http://..." size="30">
+                        <input type="url" id="header_' . $network . '_input" class="hidden" value="' . ($social[$network] ?? "") . '" placeholder="https://..." size="30" onchange="controlURL(this)">
                             <img id="header_' . $network . '_open" class="action_icon" src="assets/edit.svg" onclick="header_' . $network . '.open()">
                             <img id="header_' . $network . '_submit" class="action_icon hidden" src="assets/save.svg" onclick="header_' . $network . '.submit()">
                             <img id="header_' . $network . '_cancel" class="action_icon hidden" src="assets/close.svg" onclick="header_' . $network . '.cancel()">
diff --git a/src/view/MenuBuilder.php b/src/view/MenuBuilder.php
index 8e8b9a9..e9bc4bc 100644
--- a/src/view/MenuBuilder.php
+++ b/src/view/MenuBuilder.php
@@ -64,11 +64,11 @@ class MenuBuilder extends AbstractBuilder
                         <input type="image" class="move_entry_icon" src="assets/delete-bin.svg" alt="delete link button" onclick="return confirm(\'Voulez-vous vraiment supprimer cette entrée?\');">
                     </form>
                     <span class="url_name">
-                        <button class="url_name"><input type="" value="' . htmlspecialchars($entry->getPageName()) . '"></button>
+                        <button class="url_name"><input type="text" value="' . htmlspecialchars($entry->getPageName()) . '"></button>
                         <img class="move_entry_icon" src="assets/save.svg" onclick="editUrl(' . $entry->getId() . ', \'url_name\')">
                     </span>
                     <span class="url_content">
-                        <input type="url" value="' . htmlspecialchars($entry->getEndOfPath()) . '">
+                        <input type="url" value="' . htmlspecialchars($entry->getEndOfPath()) . '" placeholder="https://..." onchange="controlURL(this)">
                         <img class="move_entry_icon" src="assets/save.svg" onclick="editUrl(' . $entry->getId() . ', \'url_content\')">
                     </span>';
             }
diff --git a/src/view/templates/menu.php b/src/view/templates/menu.php
index 4f11756..6ad4f7c 100644
--- a/src/view/templates/menu.php
+++ b/src/view/templates/menu.php
@@ -13,7 +13,7 @@
                         </p>
                         <p>
                                 <label for="url_input">Adresse (collez votre lien):</label>
-                                <input id="url_input" type="url" name="url_input" placeholder="http://">
+                                <input id="url_input" type="url" name="url_input" placeholder="https://..." onchange="controlURL(this)">
                         </p>
                         <p>
                                 <label>Placer le lien juste après cette entrée:</label>