From e1bdd1928b971b89a6daa65530a5c328d0b6032d Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Mon, 16 Dec 2019 17:14:32 +0100
Subject: [PATCH] espace possible dans nom de groupe

---
 .../src/Cadoles/CoreBundle/Controller/Niveau01Controller.php    | 2 +-
 .../src/Cadoles/CoreBundle/Controller/Niveau02Controller.php    | 2 +-
 .../src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig | 2 +-
 .../Cadoles/CoreBundle/Resources/views/Niveau01/edit.html.twig  | 2 +-
 .../Cadoles/CoreBundle/Resources/views/Niveau02/edit.html.twig  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/Niveau01Controller.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/Niveau01Controller.php
index e5f5f40f..14701547 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/Niveau01Controller.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/Niveau01Controller.php
@@ -284,7 +284,7 @@ class Niveau01Controller extends Controller
             if($tmp) $form->addError(new FormError('Un niveau de rang 02 utilise déjà ce label'));
 
             // On s'assure que le label ne contient pas des caractères speciaux
-            $string = preg_replace('~[^@a-zA-Z0-9._-]~', '', $data->getLabel());
+            $string = preg_replace('~[^ @a-zA-Z0-9._-]~', '', $data->getLabel());
             if($string!=$data->getLabel())
             {
                 $form->addError(new FormError('Caractères interdit dans ce label'));
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/Niveau02Controller.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/Niveau02Controller.php
index 4a39c44a..27366b37 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/Niveau02Controller.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/Niveau02Controller.php
@@ -269,7 +269,7 @@ class Niveau02Controller extends Controller
             if($tmp) $form->addError(new FormError('Un niveau de rang 01 utilise déjà ce label'));
 
             // On s'assure que le label ne contient pas des caractères speciaux
-            $string = preg_replace('~[^@a-zA-Z0-9._-]~', '', $data->getLabel());
+            $string = preg_replace('~[^ @a-zA-Z0-9._-]~', '', $data->getLabel());
             if($string!=$data->getLabel())
             {
                 $form->addError(new FormError('Caractères interdit dans ce label'));
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig
index 56c9d576..ef997617 100755
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig
@@ -46,7 +46,7 @@
                     {% if form.label is defined %}
                         {{ form_row(form.label) }}
                         <div class='alert alert-info' style='font-size: 80%;padding: 5px;margin-top: -10px;'>
-                            Caractères interdits = accent, espace, caractères spéciaux sauf @ . - _<br>
+                            Caractères interdits = accent, caractères spéciaux sauf @ . - _<br>
                         </div>
 
                         {% if form.fgassoc is defined %}
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau01/edit.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau01/edit.html.twig
index ebc256bd..6312241d 100755
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau01/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau01/edit.html.twig
@@ -41,7 +41,7 @@
         <div class="panel-body">
             {{ form_row(form.label) }}
             <div class='alert alert-info' style='font-size: 80%;padding: 5px;margin-top: -10px;'>
-                Caractères interdits = accent, espace, caractères spéciaux sauf @ . - _<br>
+                Caractères interdits = accent, caractères spéciaux sauf @ . - _<br>
             </div>
 
             {{ form_row(form.siren) }}
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau02/edit.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau02/edit.html.twig
index a73677c3..e6d973a6 100755
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau02/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau02/edit.html.twig
@@ -42,7 +42,7 @@
             {{ form_row(form.niveau01) }}
             {{ form_row(form.label) }}
             <div class='alert alert-info' style='font-size: 80%;padding: 5px;margin-top: -10px;'>
-                Caractères interdits = accent, espace, caractères spéciaux sauf @ . - _<br>
+                Caractères interdits = accent, caractères spéciaux sauf @ . - _<br>
             </div>
 
             {{ form_row(form.siret) }}