diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/OnlyCommand.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/OnlyCommand.php index e561679b..4bf94b89 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/OnlyCommand.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/OnlyCommand.php @@ -108,7 +108,6 @@ class OnlyCommand extends Command $this->writeln($this->only_url); $this->writeln($this->only_host); $this->writeln($this->only_user); - $this->writeln($this->only_password); if($this->only_sync) { // Only Office est-il dans le domaine diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql index 9dd73405..7cb69baf 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql @@ -8,7 +8,7 @@ INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES (-100, 'DRAAF', '130007107'); INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES -(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}XeJxoO2l4dkHFX78WQ1Ik30sjLt3kffh +(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}iEIczoPGRG4AD3gT80NOruss2uA94dV9 ', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple'); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php index 7dbc9c04..dc4c379d 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php @@ -1025,7 +1025,7 @@ class GroupController 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/Niveau01Controller.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/Niveau01Controller.php index 14701547..d33cf22c 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 27366b37..a64c1b4a 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 ef997617..e6144d3f 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) }}
- Caractères interdits = accent, caractères spéciaux sauf @ . - _
+ Caractères interdits = caractères spéciaux sauf ' @ . - _
{% 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 6312241d..b7799e5b 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 @@
{{ form_row(form.label) }}
- Caractères interdits = accent, caractères spéciaux sauf @ . - _
+ Caractères interdits = caractères spéciaux sauf ' @ . - _
{{ 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 e6d973a6..89e31b0a 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) }}
- Caractères interdits = accent, caractères spéciaux sauf @ . - _
+ Caractères interdits = caractères spéciaux sauf ' @ . - _
{{ form_row(form.siret) }}