diff --git a/.env b/.env
old mode 100644
new mode 100755
diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/.jenkins/build-symfony-image.groovy b/.jenkins/build-symfony-image.groovy
old mode 100644
new mode 100755
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
old mode 100644
new mode 100755
diff --git a/.php-version b/.php-version
old mode 100644
new mode 100755
diff --git a/.vscode/settings.json b/.vscode/settings.json
old mode 100644
new mode 100755
diff --git a/Jenkinsfile b/Jenkinsfile
old mode 100644
new mode 100755
diff --git a/Makefile b/Makefile
old mode 100644
new mode 100755
diff --git a/assets/app.js b/assets/app.js
old mode 100644
new mode 100755
diff --git a/assets/bootstrap.js b/assets/bootstrap.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/html5video/dialogs/html5video.js b/assets/ckplugins/html5video/dialogs/html5video.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/html5video/icons/html5video.png b/assets/ckplugins/html5video/icons/html5video.png
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/html5video/lang/bg.js b/assets/ckplugins/html5video/lang/bg.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/html5video/lang/ca.js b/assets/ckplugins/html5video/lang/ca.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/html5video/lang/de.js b/assets/ckplugins/html5video/lang/de.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/html5video/lang/en.js b/assets/ckplugins/html5video/lang/en.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/html5video/lang/es.js b/assets/ckplugins/html5video/lang/es.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/html5video/lang/eu.js b/assets/ckplugins/html5video/lang/eu.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/html5video/lang/fa.js b/assets/ckplugins/html5video/lang/fa.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/html5video/lang/fr.js b/assets/ckplugins/html5video/lang/fr.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/html5video/lang/he.js b/assets/ckplugins/html5video/lang/he.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/html5video/lang/ko.js b/assets/ckplugins/html5video/lang/ko.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/html5video/lang/pl.js b/assets/ckplugins/html5video/lang/pl.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/html5video/lang/pt-br.js b/assets/ckplugins/html5video/lang/pt-br.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/html5video/lang/pt.js b/assets/ckplugins/html5video/lang/pt.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/html5video/lang/ru.js b/assets/ckplugins/html5video/lang/ru.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/html5video/lang/uk.js b/assets/ckplugins/html5video/lang/uk.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/html5video/lang/uz.js b/assets/ckplugins/html5video/lang/uz.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/html5video/lang/zh-cn.js b/assets/ckplugins/html5video/lang/zh-cn.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/html5video/plugin.js b/assets/ckplugins/html5video/plugin.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/images/icon-hdpi.png b/assets/ckplugins/youtube/images/icon-hdpi.png
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/images/icon.png b/assets/ckplugins/youtube/images/icon.png
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/ar.js b/assets/ckplugins/youtube/lang/ar.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/bg.js b/assets/ckplugins/youtube/lang/bg.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/cs.js b/assets/ckplugins/youtube/lang/cs.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/de.js b/assets/ckplugins/youtube/lang/de.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/el.js b/assets/ckplugins/youtube/lang/el.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/en.js b/assets/ckplugins/youtube/lang/en.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/es.js b/assets/ckplugins/youtube/lang/es.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/et.js b/assets/ckplugins/youtube/lang/et.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/eu.js b/assets/ckplugins/youtube/lang/eu.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/fi.js b/assets/ckplugins/youtube/lang/fi.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/fr.js b/assets/ckplugins/youtube/lang/fr.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/he.js b/assets/ckplugins/youtube/lang/he.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/hu.js b/assets/ckplugins/youtube/lang/hu.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/it.js b/assets/ckplugins/youtube/lang/it.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/ja.js b/assets/ckplugins/youtube/lang/ja.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/ko.js b/assets/ckplugins/youtube/lang/ko.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/nb.js b/assets/ckplugins/youtube/lang/nb.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/nl.js b/assets/ckplugins/youtube/lang/nl.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/nn.js b/assets/ckplugins/youtube/lang/nn.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/pl.js b/assets/ckplugins/youtube/lang/pl.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/pt-br.js b/assets/ckplugins/youtube/lang/pt-br.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/pt.js b/assets/ckplugins/youtube/lang/pt.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/ru.js b/assets/ckplugins/youtube/lang/ru.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/sk.js b/assets/ckplugins/youtube/lang/sk.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/tr.js b/assets/ckplugins/youtube/lang/tr.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/uk.js b/assets/ckplugins/youtube/lang/uk.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/vi.js b/assets/ckplugins/youtube/lang/vi.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/lang/zh.js b/assets/ckplugins/youtube/lang/zh.js
old mode 100644
new mode 100755
diff --git a/assets/ckplugins/youtube/plugin.js b/assets/ckplugins/youtube/plugin.js
old mode 100644
new mode 100755
diff --git a/assets/controllers.json b/assets/controllers.json
old mode 100644
new mode 100755
diff --git a/assets/controllers/hello_controller.js b/assets/controllers/hello_controller.js
old mode 100644
new mode 100755
diff --git a/assets/dropzone.js b/assets/dropzone.js
old mode 100644
new mode 100755
diff --git a/assets/fonts/ABeeZee-Regular.ttf b/assets/fonts/ABeeZee-Regular.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/Acme-Regular-webfont.ttf b/assets/fonts/Acme-Regular-webfont.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/AlfaSlabOne-Regular.ttf b/assets/fonts/AlfaSlabOne-Regular.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/Anton-Regular.ttf b/assets/fonts/Anton-Regular.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/Baloo-Regular.ttf b/assets/fonts/Baloo-Regular.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/Bebas-webfont.ttf b/assets/fonts/Bebas-webfont.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/CarterOne-Regular.ttf b/assets/fonts/CarterOne-Regular.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/Chewy-Regular.ttf b/assets/fonts/Chewy-Regular.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/Courgette-Regular.ttf b/assets/fonts/Courgette-Regular.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/FredokaOne-Regular.ttf b/assets/fonts/FredokaOne-Regular.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/Futura-Condensed-Extra-Bold.otf b/assets/fonts/Futura-Condensed-Extra-Bold.otf
old mode 100644
new mode 100755
diff --git a/assets/fonts/Grandstander-Black.ttf b/assets/fonts/Grandstander-Black.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/Justanotherhand-Regular-webfont.ttf b/assets/fonts/Justanotherhand-Regular-webfont.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/Lato-Regular.ttf b/assets/fonts/Lato-Regular.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/LexendDeca-Regular.ttf b/assets/fonts/LexendDeca-Regular.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/LuckiestGuy-Regular.ttf b/assets/fonts/LuckiestGuy-Regular.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/Overpass-Black.ttf b/assets/fonts/Overpass-Black.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/PassionOne-Regular.ttf b/assets/fonts/PassionOne-Regular.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/Peacesans-webfont.ttf b/assets/fonts/Peacesans-webfont.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/Redressed-webfont.ttf b/assets/fonts/Redressed-webfont.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/Righteous-Regular.ttf b/assets/fonts/Righteous-Regular.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/Roboto-Regular-webfont.ttf b/assets/fonts/Roboto-Regular-webfont.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/RubikMonoOne-Regular.ttf b/assets/fonts/RubikMonoOne-Regular.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/SigmarOne-Regular.ttf b/assets/fonts/SigmarOne-Regular.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/Signika-Regular.ttf b/assets/fonts/Signika-Regular.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/Snickles-webfont.ttf b/assets/fonts/Snickles-webfont.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/Teko-Bold.ttf b/assets/fonts/Teko-Bold.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/Viga-Regular.ttf b/assets/fonts/Viga-Regular.ttf
old mode 100644
new mode 100755
diff --git a/assets/fonts/theboldfont.ttf b/assets/fonts/theboldfont.ttf
old mode 100644
new mode 100755
diff --git a/assets/js/app.js b/assets/js/app.js
old mode 100644
new mode 100755
diff --git a/assets/js/datatables.init.js b/assets/js/datatables.init.js
old mode 100644
new mode 100755
diff --git a/assets/styles/app.css b/assets/styles/app.css
old mode 100644
new mode 100755
diff --git a/assets/styles/font.css b/assets/styles/font.css
old mode 100644
new mode 100755
diff --git a/bin/nineskeletor.cron b/bin/nineskeletor.cron
old mode 100644
new mode 100755
diff --git a/bin/nineskeletor.service b/bin/nineskeletor.service
old mode 100644
new mode 100755
diff --git a/commitlint.config.js b/commitlint.config.js
old mode 100644
new mode 100755
diff --git a/composer.json b/composer.json
old mode 100644
new mode 100755
diff --git a/composer.lock b/composer.lock
old mode 100644
new mode 100755
diff --git a/config/bundles.php b/config/bundles.php
old mode 100644
new mode 100755
diff --git a/config/packages/cache.yaml b/config/packages/cache.yaml
old mode 100644
new mode 100755
diff --git a/config/packages/debug.yaml b/config/packages/debug.yaml
old mode 100644
new mode 100755
diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml
old mode 100644
new mode 100755
diff --git a/config/packages/doctrine_migrations.yaml b/config/packages/doctrine_migrations.yaml
old mode 100644
new mode 100755
diff --git a/config/packages/fos_ckeditor.yaml b/config/packages/fos_ckeditor.yaml
old mode 100644
new mode 100755
diff --git a/config/packages/fos_rest.yaml b/config/packages/fos_rest.yaml
old mode 100644
new mode 100755
diff --git a/config/packages/framework.yaml b/config/packages/framework.yaml
old mode 100644
new mode 100755
diff --git a/config/packages/lock.yaml b/config/packages/lock.yaml
old mode 100644
new mode 100755
diff --git a/config/packages/mailer.yaml b/config/packages/mailer.yaml
old mode 100644
new mode 100755
diff --git a/config/packages/mercure.yaml b/config/packages/mercure.yaml
old mode 100644
new mode 100755
diff --git a/config/packages/messenger.yaml b/config/packages/messenger.yaml
old mode 100644
new mode 100755
diff --git a/config/packages/monolog.yaml b/config/packages/monolog.yaml
old mode 100644
new mode 100755
diff --git a/config/packages/nelmio_api_doc.yaml b/config/packages/nelmio_api_doc.yaml
old mode 100644
new mode 100755
diff --git a/config/packages/notifier.yaml b/config/packages/notifier.yaml
old mode 100644
new mode 100755
diff --git a/config/packages/oneup_uploader.yaml b/config/packages/oneup_uploader.yaml
old mode 100644
new mode 100755
diff --git a/config/packages/routing.yaml b/config/packages/routing.yaml
old mode 100644
new mode 100755
diff --git a/config/packages/security.yaml b/config/packages/security.yaml
old mode 100644
new mode 100755
diff --git a/config/packages/sensio_framework_extra.yaml b/config/packages/sensio_framework_extra.yaml
old mode 100644
new mode 100755
diff --git a/config/packages/sentry.yaml b/config/packages/sentry.yaml
old mode 100644
new mode 100755
diff --git a/config/packages/translation.yaml b/config/packages/translation.yaml
old mode 100644
new mode 100755
diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml
old mode 100644
new mode 100755
diff --git a/config/packages/validator.yaml b/config/packages/validator.yaml
old mode 100644
new mode 100755
diff --git a/config/packages/web_profiler.yaml b/config/packages/web_profiler.yaml
old mode 100644
new mode 100755
diff --git a/config/packages/webpack_encore.yaml b/config/packages/webpack_encore.yaml
old mode 100644
new mode 100755
diff --git a/config/preload.php b/config/preload.php
old mode 100644
new mode 100755
diff --git a/config/routes.yaml b/config/routes.yaml
old mode 100644
new mode 100755
diff --git a/config/routes/annotations.yaml b/config/routes/annotations.yaml
old mode 100644
new mode 100755
diff --git a/config/routes/framework.yaml b/config/routes/framework.yaml
old mode 100644
new mode 100755
diff --git a/config/routes/nelmio_api_doc.yaml b/config/routes/nelmio_api_doc.yaml
old mode 100644
new mode 100755
diff --git a/config/routes/oneup_uploader.yaml b/config/routes/oneup_uploader.yaml
old mode 100644
new mode 100755
diff --git a/config/routes/web_profiler.yaml b/config/routes/web_profiler.yaml
old mode 100644
new mode 100755
diff --git a/config/services.yaml b/config/services.yaml
old mode 100644
new mode 100755
diff --git a/containers/hydra-dispatcher/Dockerfile b/containers/hydra-dispatcher/Dockerfile
old mode 100644
new mode 100755
index 8ea96ef..1b0c3e1
--- a/containers/hydra-dispatcher/Dockerfile
+++ b/containers/hydra-dispatcher/Dockerfile
@@ -1,5 +1 @@
-FROM cadoles/hydra-dispatcher-v1:v0.0.0-111-g2e60bdb
-
-COPY hydra/providers.yml /var/www/config/hydra/providers.yml
-
-COPY theme.css /var/www/public/build/theme
\ No newline at end of file
+FROM cadoles/hydra-dispatcher-v1:v0.0.0-111-g2e60bdb
\ No newline at end of file
diff --git a/containers/hydra-dispatcher/hydra/providers.yml b/containers/hydra-dispatcher/hydra/providers.yml
old mode 100644
new mode 100755
diff --git a/containers/hydra-dispatcher/templates/base.html.twig b/containers/hydra-dispatcher/templates/base.html.twig
new file mode 100644
index 0000000..6b39b4e
--- /dev/null
+++ b/containers/hydra-dispatcher/templates/base.html.twig
@@ -0,0 +1,23 @@
+
+
+
+ {% block head %}
+
+
+ {% for error in errors %}
+ {{ error.message | trans({}, 'form', app.request.session.get('_locale')) }}
+ {% endfor %}
+
+
+ {% endif %}
+{% endblock form_errors %}
\ No newline at end of file
diff --git a/containers/hydra-dispatcher/templates/login.html.twig b/containers/hydra-dispatcher/templates/login.html.twig
new file mode 100644
index 0000000..86c5555
--- /dev/null
+++ b/containers/hydra-dispatcher/templates/login.html.twig
@@ -0,0 +1,88 @@
+{% extends 'base.html.twig' %}
+
+{% form_theme form 'form/error_theme.html.twig' %}
+
+{% block stylesheets %}
+ {{ parent() }}
+{% endblock %}
+
+{% block title %}{{ 'view.login.title'|trans({}, 'view', app.request.session.get('_locale')) }}{% endblock %}
+
+{% block body_content %}
+ {% set lang = app.request.session.get('_locale') is defined and app.request.session.get('_locale') is not null ? app.request.session.get('_locale') : app.request.server.get('DEFAULT_LOCALE') %}
+
+
+
+
+
+ {{ form_start(form) }}
+
+
+ {{ form_errors(form.app) }}
+
+
+
+ {% for choice in form.app.vars.choices %}
+ {% set choice_id = form.app.vars.full_name ~ '[' ~ choice.value ~ ']' %}
+ {% set label_id = form.app.vars.full_name ~ '-label-' ~ choice.value %}
+
+
+
+
+
+ {% endfor %}
+
+
+ {% do form.app.setRendered %}
+
+
+ {{form_row(form.submit, {'attr' : {'class' : 'btnlogin w-full px-7 py-5 mt-5 bg-sky-500 text-white font-medium text-sm cursor-pointer leading-snug uppercase rounded shadow-md hover:bg-sky-700 hover:shadow-lg focus:bg-sky-900 focus:shadow-lg focus:outline-none focus:ring-0 active:bg-sky-900 active:shadow-lg transition duration-150 ease-in-out'}})}}
+
+
+ {{ form_rest(form) }}
+ {{ form_end(form) }}
+
+
+{% endblock %}
diff --git a/containers/hydra-dispatcher/theme.css b/containers/hydra-dispatcher/theme.css
index 8a633c5..9652bc5 100644
--- a/containers/hydra-dispatcher/theme.css
+++ b/containers/hydra-dispatcher/theme.css
@@ -6,12 +6,12 @@ body {
place-items: normal;
}
-.flex.justify-around {
+#langcontainer{
display:none;
}
.container {
- max-width: 900px;
+ max-width: 1100px;
}
input[type="radio"]:checked ~ .app-item {
@@ -19,26 +19,26 @@ input[type="radio"]:checked ~ .app-item {
background-color: rgba(240, 240, 240, 0.507);
}
-
-form {
+#choicecontainer {
display: flex;
flex-wrap: wrap;
}
-form > * {
- flex: 1 1 50%;
+.choicelogin {
+ flex: 1 1 33.333333%;
padding: 10px;
- height: 300px;
+ height: 350px;
}
-label {
+.app-item {
height:100%;
display: flex;
flex-wrap: wrap;
text-align: center;
+ background-color: #ecf0f1;
}
-label > * {
+.app-item > * {
flex: 1 1 100%;
}
@@ -52,4 +52,8 @@ h2{
}
h5 {
font-size:30px !important;
+}
+
+#submitcontainer {
+ display:none;
}
\ No newline at end of file
diff --git a/containers/hydra/clients.d/nineskeletor.json b/containers/hydra/clients.d/nineskeletor.json
old mode 100644
new mode 100755
diff --git a/containers/minio/nginx.conf b/containers/minio/nginx.conf
old mode 100644
new mode 100755
diff --git a/docker-compose.yml b/docker-compose.yml
old mode 100644
new mode 100755
index 38e8f0b..d49f388
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,7 +17,7 @@ services:
# Service redis pour le stockage des sessions
redis:
image: redis:4.0
- container_name: redis
+ container_name: nineskeletor-redis
ports:
- 6379:6379
environment:
@@ -28,8 +28,8 @@ services:
# Service postgresql pour le stockage de la bdd applicative
postgresql:
image: postgres:13-alpine
- container_name: postgresql
- hostname: postgresql
+ container_name: nineskeletor-postgresql
+ hostname: nineskeletor-postgresql
environment:
POSTGRES_MULTIPLE_DATABASES: app,hydra
POSTGRES_PASSWORD: ChangeMe
@@ -43,7 +43,7 @@ services:
# Service websocket
mercure:
image: dunglas/mercure
- container_name: mercure
+ container_name: nineskeletor-mercure
restart: unless-stopped
ports:
- "80"
@@ -62,7 +62,7 @@ services:
# Service de stockage Minio
minio1:
image: minio/minio:RELEASE.2021-01-16T02-19-44Z
- container_name: minio1
+ container_name: nineskeletor-minio1
volumes:
- data1-1:/data1
- data1-2:/data2
@@ -81,7 +81,7 @@ services:
# Service de stockage Minio
minio2:
image: minio/minio:RELEASE.2021-01-16T02-19-44Z
- container_name: minio2
+ container_name: nineskeletor-minio2
volumes:
- data2-1:/data1
- data2-2:/data2
@@ -100,7 +100,7 @@ services:
# Service de stockage Minio
minio3:
image: minio/minio:RELEASE.2021-01-16T02-19-44Z
- container_name: minio3
+ container_name: nineskeletor-minio3
volumes:
- data3-1:/data1
- data3-2:/data2
@@ -119,7 +119,7 @@ services:
# Service de stockage Minio
minio4:
image: minio/minio:RELEASE.2021-01-16T02-19-44Z
- container_name: minio4
+ container_name: nineskeletor-minio4
volumes:
- data4-1:/data1
- data4-2:/data2
@@ -138,7 +138,7 @@ services:
# Service nginx orchestrateur des minio
nginx:
image: nginx:1.19.2-alpine
- container_name: nginx
+ container_name: nineskeletor-nginx
volumes:
- ./containers/minio/nginx.conf:/etc/nginx/nginx.conf:ro
ports:
@@ -152,7 +152,7 @@ services:
# Service hydra
hydra:
image: cadoles/hydra-v1
- container_name: hydra
+ container_name: nineskeletor-hydra
volumes:
- ./containers/hydra/clients.d:/etc/hydra/clients.d
ports:
@@ -178,7 +178,7 @@ services:
hydra-dispatcher:
build:
context: ./containers/hydra-dispatcher
- container_name: hydra-dispatcher
+ container_name: nineskeletor-hydra-dispatcher
links:
- hydra
ports:
@@ -196,11 +196,13 @@ services:
- APP_LOCALES=fr,en
volumes:
- ./containers/hydra-dispatcher/hydra:/var/www/config/hydra:ro
+ - ./containers/hydra-dispatcher/templates:/var/www/templates
+ - ./containers/hydra-dispatcher/theme.css:/var/www/public/build/theme/theme.css
# Service fake smtp = optionnel
mailer:
image: schickling/mailcatcher
- container_name: mailer
+ container_name: nineskeletor-mailer
ports:
- 1025:1025
- 1080:1080
@@ -208,7 +210,7 @@ services:
# Service fake openldap = optionnel si nineskeletor a une synchronisation avec un annuaire
openldap:
image: osixia/openldap:1.5.0
- container_name: openldap
+ container_name: nineskeletor-openldap
environment:
LDAP_LOG_LEVEL: "256"
LDAP_ORGANISATION: "nine"
@@ -230,7 +232,7 @@ services:
# Service tool phpldapadmin = optionnel dans le cas de la présence d'un fake openldap
phpldapadmin:
image: osixia/phpldapadmin:latest
- container_name: phpldapadmin
+ container_name: nineskeletor-phpldapadmin
environment:
PHPLDAPADMIN_LDAP_HOSTS: "openldap"
PHPLDAPADMIN_HTTPS: "false"
@@ -242,7 +244,7 @@ services:
# Service tool adminer = optionnel
adminer:
image: adminer
- container_name: adminer
+ container_name: nineskeletor-adminer
restart: always
ports:
- 6081:8080
diff --git a/migrations/.gitignore b/migrations/.gitignore
old mode 100644
new mode 100755
diff --git a/migrations/Version20221002124137.php b/migrations/Version20221002124137.php
old mode 100644
new mode 100755
diff --git a/package-lock.json b/package-lock.json
old mode 100644
new mode 100755
diff --git a/package.json b/package.json
old mode 100644
new mode 100755
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
old mode 100644
new mode 100755
diff --git a/public/index.php b/public/index.php
old mode 100644
new mode 100755
diff --git a/public/medias/avatar/admin.jpg b/public/medias/avatar/admin.jpg
old mode 100644
new mode 100755
diff --git a/public/medias/avatar/noavatar.png b/public/medias/avatar/noavatar.png
old mode 100644
new mode 100755
diff --git a/public/medias/avatar/system.jpg b/public/medias/avatar/system.jpg
old mode 100644
new mode 100755
diff --git a/public/medias/header/header.jpg b/public/medias/header/header.jpg
old mode 100644
new mode 100755
diff --git a/public/medias/icons/.gitkeep b/public/medias/icons/.gitkeep
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_adminer.png b/public/medias/icons/icon_adminer.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_anchor.png b/public/medias/icons/icon_anchor.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_aperture.png b/public/medias/icons/icon_aperture.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_arrow-down.png b/public/medias/icons/icon_arrow-down.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_arrow-up.png b/public/medias/icons/icon_arrow-up.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_art.png b/public/medias/icons/icon_art.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_balado.png b/public/medias/icons/icon_balado.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_bar-chart.png b/public/medias/icons/icon_bar-chart.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_batteryfull.png b/public/medias/icons/icon_batteryfull.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_batterylow.png b/public/medias/icons/icon_batterylow.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_bdd.png b/public/medias/icons/icon_bdd.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_bike.png b/public/medias/icons/icon_bike.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_biker.png b/public/medias/icons/icon_biker.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_bikewheel.png b/public/medias/icons/icon_bikewheel.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_blimp.png b/public/medias/icons/icon_blimp.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_bolt.png b/public/medias/icons/icon_bolt.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_bomb.png b/public/medias/icons/icon_bomb.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_booklet.png b/public/medias/icons/icon_booklet.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_bookshelf.png b/public/medias/icons/icon_bookshelf.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_briefcase.png b/public/medias/icons/icon_briefcase.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_brightness.png b/public/medias/icons/icon_brightness.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_browser.png b/public/medias/icons/icon_browser.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_brush-pencil.png b/public/medias/icons/icon_brush-pencil.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_cadoles.png b/public/medias/icons/icon_cadoles.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_calculator.png b/public/medias/icons/icon_calculator.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_calendar.png b/public/medias/icons/icon_calendar.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_camera.png b/public/medias/icons/icon_camera.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_car.png b/public/medias/icons/icon_car.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_cart.png b/public/medias/icons/icon_cart.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_carwheel.png b/public/medias/icons/icon_carwheel.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_caution.png b/public/medias/icons/icon_caution.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_chart.png b/public/medias/icons/icon_chart.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_chartpie.png b/public/medias/icons/icon_chartpie.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_chat.png b/public/medias/icons/icon_chat.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_check.png b/public/medias/icons/icon_check.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_circlecompass.png b/public/medias/icons/icon_circlecompass.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_clapboard.png b/public/medias/icons/icon_clapboard.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_clipboard.png b/public/medias/icons/icon_clipboard.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_clock.png b/public/medias/icons/icon_clock.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_cloud.png b/public/medias/icons/icon_cloud.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_cmyk.png b/public/medias/icons/icon_cmyk.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_colorwheel.png b/public/medias/icons/icon_colorwheel.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_compass.png b/public/medias/icons/icon_compass.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_compose.png b/public/medias/icons/icon_compose.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_computer.png b/public/medias/icons/icon_computer.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_cone.png b/public/medias/icons/icon_cone.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_contacts.png b/public/medias/icons/icon_contacts.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_contrast.png b/public/medias/icons/icon_contrast.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_countdown.png b/public/medias/icons/icon_countdown.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_creditcard.png b/public/medias/icons/icon_creditcard.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_crop.png b/public/medias/icons/icon_crop.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_crossroads.png b/public/medias/icons/icon_crossroads.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_crous.png b/public/medias/icons/icon_crous.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_cruise.png b/public/medias/icons/icon_cruise.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_cursor.png b/public/medias/icons/icon_cursor.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_denied.png b/public/medias/icons/icon_denied.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_dev.png b/public/medias/icons/icon_dev.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_die.png b/public/medias/icons/icon_die.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_document.png b/public/medias/icons/icon_document.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_dokuwiki.png b/public/medias/icons/icon_dokuwiki.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_dolly.png b/public/medias/icons/icon_dolly.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_door.png b/public/medias/icons/icon_door.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_download.png b/public/medias/icons/icon_download.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_easel.png b/public/medias/icons/icon_easel.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_econnect.png b/public/medias/icons/icon_econnect.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_email.png b/public/medias/icons/icon_email.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_etherhome.png b/public/medias/icons/icon_etherhome.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_euro.png b/public/medias/icons/icon_euro.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_eye.png b/public/medias/icons/icon_eye.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_eyedropper.png b/public/medias/icons/icon_eyedropper.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_fashion.png b/public/medias/icons/icon_fashion.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_filmreel.png b/public/medias/icons/icon_filmreel.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_filmroll.png b/public/medias/icons/icon_filmroll.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_flag.png b/public/medias/icons/icon_flag.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_flame.png b/public/medias/icons/icon_flame.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_flash.png b/public/medias/icons/icon_flash.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_flower.png b/public/medias/icons/icon_flower.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_focus.png b/public/medias/icons/icon_focus.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_folder.png b/public/medias/icons/icon_folder.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_frames.png b/public/medias/icons/icon_frames.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_gamecontroller.png b/public/medias/icons/icon_gamecontroller.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_gas.png b/public/medias/icons/icon_gas.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_gear.png b/public/medias/icons/icon_gear.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_genius.png b/public/medias/icons/icon_genius.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_gepi.png b/public/medias/icons/icon_gepi.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_global.png b/public/medias/icons/icon_global.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_globe.png b/public/medias/icons/icon_globe.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_gps.png b/public/medias/icons/icon_gps.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_grr.png b/public/medias/icons/icon_grr.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_hazard.png b/public/medias/icons/icon_hazard.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_heart.png b/public/medias/icons/icon_heart.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_helicopter.png b/public/medias/icons/icon_helicopter.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_hotair.png b/public/medias/icons/icon_hotair.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_hourglass.png b/public/medias/icons/icon_hourglass.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_image.png b/public/medias/icons/icon_image.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_info.png b/public/medias/icons/icon_info.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_interstate.png b/public/medias/icons/icon_interstate.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_key.png b/public/medias/icons/icon_key.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_keyboard.png b/public/medias/icons/icon_keyboard.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_lens.png b/public/medias/icons/icon_lens.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_lightbulb.png b/public/medias/icons/icon_lightbulb.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_limesurvey.png b/public/medias/icons/icon_limesurvey.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_loading.png b/public/medias/icons/icon_loading.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_location.png b/public/medias/icons/icon_location.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_locked.png b/public/medias/icons/icon_locked.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_loomio.png b/public/medias/icons/icon_loomio.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_magicwand.png b/public/medias/icons/icon_magicwand.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_magnifyingglass.png b/public/medias/icons/icon_magnifyingglass.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_mail.png b/public/medias/icons/icon_mail.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_map.png b/public/medias/icons/icon_map.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_mariane.png b/public/medias/icons/icon_mariane.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_megaphone.png b/public/medias/icons/icon_megaphone.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_megaphone2.png b/public/medias/icons/icon_megaphone2.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_memorycard.png b/public/medias/icons/icon_memorycard.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_merge.png b/public/medias/icons/icon_merge.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_mic.png b/public/medias/icons/icon_mic.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_microphone.png b/public/medias/icons/icon_microphone.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_mindmaps.png b/public/medias/icons/icon_mindmaps.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_money.png b/public/medias/icons/icon_money.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_moodle.png b/public/medias/icons/icon_moodle.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_motorcycle.png b/public/medias/icons/icon_motorcycle.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_music.png b/public/medias/icons/icon_music.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_news.png b/public/medias/icons/icon_news.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_nextcloud.png b/public/medias/icons/icon_nextcloud.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_opensondage.png b/public/medias/icons/icon_opensondage.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_paintbrush.png b/public/medias/icons/icon_paintbrush.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_paintbrush2.png b/public/medias/icons/icon_paintbrush2.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_paintcan.png b/public/medias/icons/icon_paintcan.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_paintroller.png b/public/medias/icons/icon_paintroller.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_parachute.png b/public/medias/icons/icon_parachute.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_pencil.png b/public/medias/icons/icon_pencil.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_phone.png b/public/medias/icons/icon_phone.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_phpldapadmin.png b/public/medias/icons/icon_phpldapadmin.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_piechart.png b/public/medias/icons/icon_piechart.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_pin.png b/public/medias/icons/icon_pin.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_pin2.png b/public/medias/icons/icon_pin2.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_piwik.png b/public/medias/icons/icon_piwik.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_plane.png b/public/medias/icons/icon_plane.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_play.png b/public/medias/icons/icon_play.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_plugin.png b/public/medias/icons/icon_plugin.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_polaroid.png b/public/medias/icons/icon_polaroid.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_polaroidcamera.png b/public/medias/icons/icon_polaroidcamera.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_polaroids.png b/public/medias/icons/icon_polaroids.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_power.png b/public/medias/icons/icon_power.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_present.png b/public/medias/icons/icon_present.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_profle.png b/public/medias/icons/icon_profle.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_quote.png b/public/medias/icons/icon_quote.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_racingflags.png b/public/medias/icons/icon_racingflags.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_radio.png b/public/medias/icons/icon_radio.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_radiotower.png b/public/medias/icons/icon_radiotower.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_rainbow.png b/public/medias/icons/icon_rainbow.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_recycle.png b/public/medias/icons/icon_recycle.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_rgb.png b/public/medias/icons/icon_rgb.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_ribbon.png b/public/medias/icons/icon_ribbon.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_roadblock.png b/public/medias/icons/icon_roadblock.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_rocket.png b/public/medias/icons/icon_rocket.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_roundcube.png b/public/medias/icons/icon_roundcube.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_rss.png b/public/medias/icons/icon_rss.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_rulertriangle.png b/public/medias/icons/icon_rulertriangle.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_rundeck.png b/public/medias/icons/icon_rundeck.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_running.png b/public/medias/icons/icon_running.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_sacoche.png b/public/medias/icons/icon_sacoche.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_sailboat.png b/public/medias/icons/icon_sailboat.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_schooolbus.png b/public/medias/icons/icon_schooolbus.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_scissors.png b/public/medias/icons/icon_scissors.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_scooter.png b/public/medias/icons/icon_scooter.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_security.png b/public/medias/icons/icon_security.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_selftimer.png b/public/medias/icons/icon_selftimer.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_settings.png b/public/medias/icons/icon_settings.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_shipwheel.png b/public/medias/icons/icon_shipwheel.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_shoeprints.png b/public/medias/icons/icon_shoeprints.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_shop.png b/public/medias/icons/icon_shop.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_skateboard.png b/public/medias/icons/icon_skateboard.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_slr.png b/public/medias/icons/icon_slr.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_smartphone.png b/public/medias/icons/icon_smartphone.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_spaceshuttle.png b/public/medias/icons/icon_spaceshuttle.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_speaker.png b/public/medias/icons/icon_speaker.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_speedometer.png b/public/medias/icons/icon_speedometer.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_spraypaint.png b/public/medias/icons/icon_spraypaint.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_stack.png b/public/medias/icons/icon_stack.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_star.png b/public/medias/icons/icon_star.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_steeringwheel.png b/public/medias/icons/icon_steeringwheel.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_stop.png b/public/medias/icons/icon_stop.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_sub.png b/public/medias/icons/icon_sub.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_submarine.png b/public/medias/icons/icon_submarine.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_support.png b/public/medias/icons/icon_support.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_swatches.png b/public/medias/icons/icon_swatches.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_tablet.png b/public/medias/icons/icon_tablet.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_takeoff.png b/public/medias/icons/icon_takeoff.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_target.png b/public/medias/icons/icon_target.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_taxi.png b/public/medias/icons/icon_taxi.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_tchap.png b/public/medias/icons/icon_tchap.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_toolbox.png b/public/medias/icons/icon_toolbox.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_tools.png b/public/medias/icons/icon_tools.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_tractor.png b/public/medias/icons/icon_tractor.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_traffic.png b/public/medias/icons/icon_traffic.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_train.png b/public/medias/icons/icon_train.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_travelerbag.png b/public/medias/icons/icon_travelerbag.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_trends.png b/public/medias/icons/icon_trends.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_tripod.png b/public/medias/icons/icon_tripod.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_trophy.png b/public/medias/icons/icon_trophy.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_truck.png b/public/medias/icons/icon_truck.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_tv.png b/public/medias/icons/icon_tv.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_typography.png b/public/medias/icons/icon_typography.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_ufo.png b/public/medias/icons/icon_ufo.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_umbrella.png b/public/medias/icons/icon_umbrella.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_unicycle.png b/public/medias/icons/icon_unicycle.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_unlocked.png b/public/medias/icons/icon_unlocked.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_upload.png b/public/medias/icons/icon_upload.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_users.png b/public/medias/icons/icon_users.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_video.png b/public/medias/icons/icon_video.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_videocameraclassic.png b/public/medias/icons/icon_videocameraclassic.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_videocameracompact.png b/public/medias/icons/icon_videocameracompact.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_volume.png b/public/medias/icons/icon_volume.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_water.png b/public/medias/icons/icon_water.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_windsock.png b/public/medias/icons/icon_windsock.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_windy.png b/public/medias/icons/icon_windy.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_wordpress.png b/public/medias/icons/icon_wordpress.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_zoomin.png b/public/medias/icons/icon_zoomin.png
old mode 100644
new mode 100755
diff --git a/public/medias/icons/icon_zoomout.png b/public/medias/icons/icon_zoomout.png
old mode 100644
new mode 100755
diff --git a/public/medias/logo/logo.png b/public/medias/logo/logo.png
old mode 100644
new mode 100755
diff --git a/public/themes/look.png b/public/themes/look.png
old mode 100644
new mode 100755
diff --git a/public/themes/look.xcf b/public/themes/look.xcf
old mode 100644
new mode 100755
diff --git a/public/themes/nineblue/info.yml b/public/themes/nineblue/info.yml
old mode 100644
new mode 100755
diff --git a/public/themes/nineblue/local.js b/public/themes/nineblue/local.js
old mode 100644
new mode 100755
diff --git a/public/themes/nineblue/look.png b/public/themes/nineblue/look.png
old mode 100644
new mode 100755
diff --git a/public/themes/nineblue/style.css b/public/themes/nineblue/style.css
old mode 100644
new mode 100755
diff --git a/public/themes/ninedark/info.yml b/public/themes/ninedark/info.yml
old mode 100644
new mode 100755
diff --git a/public/themes/ninedark/local.js b/public/themes/ninedark/local.js
old mode 100644
new mode 100755
diff --git a/public/themes/ninedark/look.png b/public/themes/ninedark/look.png
old mode 100644
new mode 100755
diff --git a/public/themes/ninedark/style.css b/public/themes/ninedark/style.css
old mode 100644
new mode 100755
diff --git a/public/themes/ninefulldark/info.yml b/public/themes/ninefulldark/info.yml
old mode 100644
new mode 100755
diff --git a/public/themes/ninefulldark/local.js b/public/themes/ninefulldark/local.js
old mode 100644
new mode 100755
diff --git a/public/themes/ninefulldark/look.png b/public/themes/ninefulldark/look.png
old mode 100644
new mode 100755
diff --git a/public/themes/ninefulldark/style.css b/public/themes/ninefulldark/style.css
old mode 100644
new mode 100755
diff --git a/public/themes/ninegray/info.yml b/public/themes/ninegray/info.yml
old mode 100644
new mode 100755
diff --git a/public/themes/ninegray/local.js b/public/themes/ninegray/local.js
old mode 100644
new mode 100755
diff --git a/public/themes/ninegray/look.png b/public/themes/ninegray/look.png
old mode 100644
new mode 100755
diff --git a/public/themes/ninegray/style.css b/public/themes/ninegray/style.css
old mode 100644
new mode 100755
diff --git a/public/themes/ninegreen/info.yml b/public/themes/ninegreen/info.yml
old mode 100644
new mode 100755
diff --git a/public/themes/ninegreen/local.js b/public/themes/ninegreen/local.js
old mode 100644
new mode 100755
diff --git a/public/themes/ninegreen/look.png b/public/themes/ninegreen/look.png
old mode 100644
new mode 100755
diff --git a/public/themes/ninegreen/style.css b/public/themes/ninegreen/style.css
old mode 100644
new mode 100755
diff --git a/public/themes/nineorange/info.yml b/public/themes/nineorange/info.yml
old mode 100644
new mode 100755
diff --git a/public/themes/nineorange/local.js b/public/themes/nineorange/local.js
old mode 100644
new mode 100755
diff --git a/public/themes/nineorange/look.png b/public/themes/nineorange/look.png
old mode 100644
new mode 100755
diff --git a/public/themes/nineorange/style.css b/public/themes/nineorange/style.css
old mode 100644
new mode 100755
diff --git a/public/themes/ninered/info.yml b/public/themes/ninered/info.yml
old mode 100644
new mode 100755
diff --git a/public/themes/ninered/local.js b/public/themes/ninered/local.js
old mode 100644
new mode 100755
diff --git a/public/themes/ninered/look.png b/public/themes/ninered/look.png
old mode 100644
new mode 100755
diff --git a/public/themes/ninered/style.css b/public/themes/ninered/style.css
old mode 100644
new mode 100755
diff --git a/public/themes/nineyellow/info.yml b/public/themes/nineyellow/info.yml
old mode 100644
new mode 100755
diff --git a/public/themes/nineyellow/local.js b/public/themes/nineyellow/local.js
old mode 100644
new mode 100755
diff --git a/public/themes/nineyellow/look.png b/public/themes/nineyellow/look.png
old mode 100644
new mode 100755
diff --git a/public/themes/nineyellow/style.css b/public/themes/nineyellow/style.css
old mode 100644
new mode 100755
diff --git a/src/Command/CleanRegistrationCommand.php b/src/Command/CleanRegistrationCommand.php
old mode 100644
new mode 100755
diff --git a/src/Command/CronCommand.php b/src/Command/CronCommand.php
old mode 100644
new mode 100755
diff --git a/src/Command/InitCommand.php b/src/Command/InitCommand.php
old mode 100644
new mode 100755
diff --git a/src/Command/SetPasswordCommand.php b/src/Command/SetPasswordCommand.php
old mode 100644
new mode 100755
diff --git a/src/Command/SynchroCommand.php b/src/Command/SynchroCommand.php
old mode 100644
new mode 100755
diff --git a/src/Controller/.gitignore b/src/Controller/.gitignore
old mode 100644
new mode 100755
diff --git a/src/Controller/AuditController.php b/src/Controller/AuditController.php
old mode 100644
new mode 100755
diff --git a/src/Controller/ConfigController.php b/src/Controller/ConfigController.php
old mode 100644
new mode 100755
diff --git a/src/Controller/CronController.php b/src/Controller/CronController.php
old mode 100644
new mode 100755
diff --git a/src/Controller/CropController.php b/src/Controller/CropController.php
old mode 100644
new mode 100755
diff --git a/src/Controller/GroupController.php b/src/Controller/GroupController.php
old mode 100644
new mode 100755
diff --git a/src/Controller/HomeController.php b/src/Controller/HomeController.php
old mode 100644
new mode 100755
diff --git a/src/Controller/HydraController.php b/src/Controller/HydraController.php
old mode 100644
new mode 100755
diff --git a/src/Controller/MinioController.php b/src/Controller/MinioController.php
old mode 100644
new mode 100755
diff --git a/src/Controller/Niveau01Controller.php b/src/Controller/Niveau01Controller.php
old mode 100644
new mode 100755
diff --git a/src/Controller/Niveau02Controller.php b/src/Controller/Niveau02Controller.php
old mode 100644
new mode 100755
diff --git a/src/Controller/Niveau03Controller.php b/src/Controller/Niveau03Controller.php
old mode 100644
new mode 100755
diff --git a/src/Controller/Niveau04Controller.php b/src/Controller/Niveau04Controller.php
old mode 100644
new mode 100755
diff --git a/src/Controller/PublishController.php b/src/Controller/PublishController.php
old mode 100644
new mode 100755
diff --git a/src/Controller/RestController.php b/src/Controller/RestController.php
old mode 100644
new mode 100755
diff --git a/src/Controller/ThemeController.php b/src/Controller/ThemeController.php
old mode 100644
new mode 100755
diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
old mode 100644
new mode 100755
diff --git a/src/Controller/WhitelistController.php b/src/Controller/WhitelistController.php
old mode 100644
new mode 100755
diff --git a/src/DataFixtures/AppFixtures.php b/src/DataFixtures/AppFixtures.php
old mode 100644
new mode 100755
diff --git a/src/DataFixtures/niveau01.csv b/src/DataFixtures/niveau01.csv
old mode 100644
new mode 100755
diff --git a/src/DataFixtures/niveau02.csv b/src/DataFixtures/niveau02.csv
old mode 100644
new mode 100755
diff --git a/src/DataFixtures/niveau03.csv b/src/DataFixtures/niveau03.csv
old mode 100644
new mode 100755
diff --git a/src/DataFixtures/niveau04.csv b/src/DataFixtures/niveau04.csv
old mode 100644
new mode 100755
diff --git a/src/Entity/.gitignore b/src/Entity/.gitignore
old mode 100644
new mode 100755
diff --git a/src/Entity/Audit.php b/src/Entity/Audit.php
old mode 100644
new mode 100755
diff --git a/src/Entity/Config.php b/src/Entity/Config.php
old mode 100644
new mode 100755
diff --git a/src/Entity/Cron.php b/src/Entity/Cron.php
old mode 100644
new mode 100755
diff --git a/src/Entity/Group.php b/src/Entity/Group.php
old mode 100644
new mode 100755
index e0f9542..f76a812
--- a/src/Entity/Group.php
+++ b/src/Entity/Group.php
@@ -2,6 +2,7 @@
namespace App\Entity;
+use App\Validator;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\Mapping as ORM;
@@ -25,6 +26,8 @@ class Group
private $id;
/**
+ * @Validator\Grouplabel()
+ * @Validator\Groupunique()
* @ORM\Column(type="string", length=250, unique=true)
*/
private $label;
diff --git a/src/Entity/Niveau01.php b/src/Entity/Niveau01.php
old mode 100644
new mode 100755
diff --git a/src/Entity/Niveau02.php b/src/Entity/Niveau02.php
old mode 100644
new mode 100755
diff --git a/src/Entity/Niveau03.php b/src/Entity/Niveau03.php
old mode 100644
new mode 100755
diff --git a/src/Entity/Niveau04.php b/src/Entity/Niveau04.php
old mode 100644
new mode 100755
diff --git a/src/Entity/Registration.php b/src/Entity/Registration.php
old mode 100644
new mode 100755
diff --git a/src/Entity/User.php b/src/Entity/User.php
old mode 100644
new mode 100755
diff --git a/src/Entity/UserGroup.php b/src/Entity/UserGroup.php
old mode 100644
new mode 100755
diff --git a/src/Entity/UserModo.php b/src/Entity/UserModo.php
old mode 100644
new mode 100755
diff --git a/src/Entity/Whitelist.php b/src/Entity/Whitelist.php
old mode 100644
new mode 100755
diff --git a/src/EventListener/AllSubscriber.php b/src/EventListener/AllSubscriber.php
old mode 100644
new mode 100755
diff --git a/src/EventListener/ExceptionListener.php b/src/EventListener/ExceptionListener.php
old mode 100644
new mode 100755
diff --git a/src/EventListener/GroupSubscriber.php b/src/EventListener/GroupSubscriber.php
old mode 100644
new mode 100755
diff --git a/src/EventListener/Niveau01Subscriber.php b/src/EventListener/Niveau01Subscriber.php
old mode 100644
new mode 100755
diff --git a/src/EventListener/Niveau02Subscriber.php b/src/EventListener/Niveau02Subscriber.php
old mode 100644
new mode 100755
diff --git a/src/EventListener/Niveau03Subscriber.php b/src/EventListener/Niveau03Subscriber.php
old mode 100644
new mode 100755
diff --git a/src/EventListener/Niveau04Subscriber.php b/src/EventListener/Niveau04Subscriber.php
old mode 100644
new mode 100755
diff --git a/src/EventListener/UserGroupSubscriber.php b/src/EventListener/UserGroupSubscriber.php
old mode 100644
new mode 100755
diff --git a/src/EventListener/UserSubscriber.php b/src/EventListener/UserSubscriber.php
old mode 100644
new mode 100755
diff --git a/src/Form/ConfigType.php b/src/Form/ConfigType.php
old mode 100644
new mode 100755
diff --git a/src/Form/CronType.php b/src/Form/CronType.php
old mode 100644
new mode 100755
diff --git a/src/Form/GroupType.php b/src/Form/GroupType.php
old mode 100644
new mode 100755
diff --git a/src/Form/LoginType.php b/src/Form/LoginType.php
old mode 100644
new mode 100755
diff --git a/src/Form/Niveau01Type.php b/src/Form/Niveau01Type.php
old mode 100644
new mode 100755
diff --git a/src/Form/Niveau02Type.php b/src/Form/Niveau02Type.php
old mode 100644
new mode 100755
diff --git a/src/Form/Niveau03Type.php b/src/Form/Niveau03Type.php
old mode 100644
new mode 100755
diff --git a/src/Form/Niveau04Type.php b/src/Form/Niveau04Type.php
old mode 100644
new mode 100755
diff --git a/src/Form/RegistrationType.php b/src/Form/RegistrationType.php
old mode 100644
new mode 100755
diff --git a/src/Form/ResetpwdType.php b/src/Form/ResetpwdType.php
old mode 100644
new mode 100755
diff --git a/src/Form/UserType.php b/src/Form/UserType.php
old mode 100644
new mode 100755
diff --git a/src/Form/WhitelistType.php b/src/Form/WhitelistType.php
old mode 100644
new mode 100755
diff --git a/src/Kernel.php b/src/Kernel.php
old mode 100644
new mode 100755
diff --git a/src/Repository/.gitignore b/src/Repository/.gitignore
old mode 100644
new mode 100755
diff --git a/src/Repository/AuditRepository.php b/src/Repository/AuditRepository.php
old mode 100644
new mode 100755
diff --git a/src/Repository/ConfigRepository.php b/src/Repository/ConfigRepository.php
old mode 100644
new mode 100755
diff --git a/src/Repository/CronRepository.php b/src/Repository/CronRepository.php
old mode 100644
new mode 100755
diff --git a/src/Repository/GroupRepository.php b/src/Repository/GroupRepository.php
old mode 100644
new mode 100755
diff --git a/src/Repository/Niveau01Repository.php b/src/Repository/Niveau01Repository.php
old mode 100644
new mode 100755
diff --git a/src/Repository/Niveau02Repository.php b/src/Repository/Niveau02Repository.php
old mode 100644
new mode 100755
diff --git a/src/Repository/Niveau03Repository.php b/src/Repository/Niveau03Repository.php
old mode 100644
new mode 100755
diff --git a/src/Repository/Niveau04Repository.php b/src/Repository/Niveau04Repository.php
old mode 100644
new mode 100755
diff --git a/src/Repository/RegistrationRepository.php b/src/Repository/RegistrationRepository.php
old mode 100644
new mode 100755
diff --git a/src/Repository/UserGroupRepository.php b/src/Repository/UserGroupRepository.php
old mode 100644
new mode 100755
diff --git a/src/Repository/UserRepository.php b/src/Repository/UserRepository.php
old mode 100644
new mode 100755
diff --git a/src/Service/ApiService.php b/src/Service/ApiService.php
old mode 100644
new mode 100755
diff --git a/src/Service/AppSession.php b/src/Service/AppSession.php
old mode 100644
new mode 100755
diff --git a/src/Service/LdapService.php b/src/Service/LdapService.php
old mode 100644
new mode 100755
index 66186be..c3cfae2
--- a/src/Service/LdapService.php
+++ b/src/Service/LdapService.php
@@ -193,22 +193,28 @@ class LdapService
{
$connection = $this->connect();
if (false == $recursive) {
- $removed = ldap_delete($connection, $dn);
- if (!$removed) {
- $this->ldapError();
- }
- } else {
- // searching for sub entries
- $sr = ldap_list($connection, $dn, 'ObjectClass=*', ['']);
- $info = ldap_get_entries($connection, $sr);
- for ($i = 0; $i < $info['count']; ++$i) {
- $result = $this->deleteByDN($info[$i]['dn'], $recursive);
- if (!$result) {
- return $result;
+ $ldapentrys = $this->searchdn($dn);
+ if (!empty($ldapentrys)) {
+ $removed = ldap_delete($connection, $dn);
+ if (!$removed) {
+ $this->ldapError();
}
}
+ } else {
+ $ldapentrys = $this->searchdn($dn);
+ if (!empty($ldapentrys)) {
+ // searching for sub entries
+ $sr = ldap_list($connection, $dn, 'ObjectClass=*', ['']);
+ $info = ldap_get_entries($connection, $sr);
+ for ($i = 0; $i < $info['count']; ++$i) {
+ $result = $this->deleteByDN($info[$i]['dn'], $recursive);
+ if (!$result) {
+ return $result;
+ }
+ }
- return ldap_delete($connection, $dn);
+ return ldap_delete($connection, $dn);
+ }
}
}
diff --git a/src/Service/MailService.php b/src/Service/MailService.php
old mode 100644
new mode 100755
diff --git a/src/Service/MinioService.php b/src/Service/MinioService.php
old mode 100644
new mode 100755
diff --git a/src/Service/PasswordEncoder.php b/src/Service/PasswordEncoder.php
old mode 100644
new mode 100755
diff --git a/src/Service/UploadListener.php b/src/Service/UploadListener.php
old mode 100644
new mode 100755
diff --git a/src/Service/UserChecker.php b/src/Service/UserChecker.php
old mode 100644
new mode 100755
diff --git a/src/Twig/AppExtension.php b/src/Twig/AppExtension.php
old mode 100644
new mode 100755
diff --git a/src/Validator/Grouplabel.php b/src/Validator/Grouplabel.php
old mode 100644
new mode 100755
diff --git a/src/Validator/GrouplabelValidator.php b/src/Validator/GrouplabelValidator.php
old mode 100644
new mode 100755
diff --git a/src/Validator/Groupunique.php b/src/Validator/Groupunique.php
new file mode 100755
index 0000000..4f9b9aa
--- /dev/null
+++ b/src/Validator/Groupunique.php
@@ -0,0 +1,17 @@
+em = $em;
+ }
+
+ public function validate($value, Constraint $constraint)
+ {
+ $niveau = $this->em->getRepository("App\Entity\Niveau01")->findOneBy(['label' => $value]);
+ if ($niveau) {
+ $this->context->addViolation($constraint->messageniveau01);
+ }
+
+ $niveau = $this->em->getRepository("App\Entity\Niveau02")->findOneBy(['label' => $value]);
+ if ($niveau) {
+ $this->context->addViolation($constraint->messageniveau02);
+ }
+
+ $niveau = $this->em->getRepository("App\Entity\Niveau03")->findOneBy(['label' => $value]);
+ if ($niveau) {
+ $this->context->addViolation($constraint->messageniveau03);
+ }
+
+ $niveau = $this->em->getRepository("App\Entity\Niveau04")->findOneBy(['label' => $value]);
+ if ($niveau) {
+ $this->context->addViolation($constraint->messageniveau04);
+ }
+ }
+}
diff --git a/src/Validator/Niveau01unique.php b/src/Validator/Niveau01unique.php
old mode 100644
new mode 100755
index 94a1b64..45ca81e
--- a/src/Validator/Niveau01unique.php
+++ b/src/Validator/Niveau01unique.php
@@ -10,5 +10,8 @@ use Symfony\Component\Validator\Constraint;
class Niveau01unique extends Constraint
{
public $messagegroup = 'Un groupe utilise déjà ce label';
+ public $messageniveau01 = 'Un niveau de rang 01 utilise déjà ce label';
public $messageniveau02 = 'Un niveau de rang 02 utilise déjà ce label';
+ public $messageniveau03 = 'Un niveau de rang 03 utilise déjà ce label';
+ public $messageniveau04 = 'Un niveau de rang 04 utilise déjà ce label';
}
diff --git a/src/Validator/Niveau01uniqueValidator.php b/src/Validator/Niveau01uniqueValidator.php
old mode 100644
new mode 100755
index bcdde00..7ebd1b4
--- a/src/Validator/Niveau01uniqueValidator.php
+++ b/src/Validator/Niveau01uniqueValidator.php
@@ -25,9 +25,19 @@ class Niveau01uniqueValidator extends ConstraintValidator
$this->context->addViolation($constraint->messagegroup);
}
- $niveau02 = $this->em->getRepository("App\Entity\Niveau02")->findOneBy(['label' => $value]);
- if ($niveau02) {
+ $niveau = $this->em->getRepository("App\Entity\Niveau02")->findOneBy(['label' => $value]);
+ if ($niveau) {
$this->context->addViolation($constraint->messageniveau02);
}
+
+ $niveau = $this->em->getRepository("App\Entity\Niveau03")->findOneBy(['label' => $value]);
+ if ($niveau) {
+ $this->context->addViolation($constraint->messageniveau03);
+ }
+
+ $niveau = $this->em->getRepository("App\Entity\Niveau04")->findOneBy(['label' => $value]);
+ if ($niveau) {
+ $this->context->addViolation($constraint->messageniveau04);
+ }
}
}
diff --git a/src/Validator/Niveau02unique.php b/src/Validator/Niveau02unique.php
old mode 100644
new mode 100755
index cd4fb5f..60e5bf2
--- a/src/Validator/Niveau02unique.php
+++ b/src/Validator/Niveau02unique.php
@@ -11,4 +11,7 @@ class Niveau02unique extends Constraint
{
public $messagegroup = 'Un groupe utilise déjà ce label';
public $messageniveau01 = 'Un niveau de rang 01 utilise déjà ce label';
+ public $messageniveau02 = 'Un niveau de rang 02 utilise déjà ce label';
+ public $messageniveau03 = 'Un niveau de rang 03 utilise déjà ce label';
+ public $messageniveau04 = 'Un niveau de rang 04 utilise déjà ce label';
}
diff --git a/src/Validator/Niveau02uniqueValidator.php b/src/Validator/Niveau02uniqueValidator.php
old mode 100644
new mode 100755
index 6153b90..1821e05
--- a/src/Validator/Niveau02uniqueValidator.php
+++ b/src/Validator/Niveau02uniqueValidator.php
@@ -25,9 +25,19 @@ class Niveau02uniqueValidator extends ConstraintValidator
$this->context->addViolation($constraint->messagegroup);
}
- $niveau02 = $this->em->getRepository("App\Entity\Niveau01")->findOneBy(['label' => $value]);
- if ($niveau02) {
+ $niveau = $this->em->getRepository("App\Entity\Niveau01")->findOneBy(['label' => $value]);
+ if ($niveau) {
$this->context->addViolation($constraint->messageniveau01);
}
+
+ $niveau = $this->em->getRepository("App\Entity\Niveau03")->findOneBy(['label' => $value]);
+ if ($niveau) {
+ $this->context->addViolation($constraint->messageniveau03);
+ }
+
+ $niveau = $this->em->getRepository("App\Entity\Niveau04")->findOneBy(['label' => $value]);
+ if ($niveau) {
+ $this->context->addViolation($constraint->messageniveau04);
+ }
}
}
diff --git a/src/Validator/Niveau03unique.php b/src/Validator/Niveau03unique.php
new file mode 100755
index 0000000..7943c26
--- /dev/null
+++ b/src/Validator/Niveau03unique.php
@@ -0,0 +1,17 @@
+em = $em;
+ }
+
+ public function validate($value, Constraint $constraint)
+ {
+ $group = $this->em->getRepository("App\Entity\Group")->findOneBy(['label' => $value]);
+ if ($group) {
+ $this->context->addViolation($constraint->messagegroup);
+ }
+
+ $niveau = $this->em->getRepository("App\Entity\Niveau01")->findOneBy(['label' => $value]);
+ if ($niveau) {
+ $this->context->addViolation($constraint->messageniveau01);
+ }
+
+ $niveau = $this->em->getRepository("App\Entity\Niveau02")->findOneBy(['label' => $value]);
+ if ($niveau) {
+ $this->context->addViolation($constraint->messageniveau02);
+ }
+
+ $niveau = $this->em->getRepository("App\Entity\Niveau04")->findOneBy(['label' => $value]);
+ if ($niveau) {
+ $this->context->addViolation($constraint->messageniveau04);
+ }
+ }
+}
diff --git a/src/Validator/Niveau04unique.php b/src/Validator/Niveau04unique.php
new file mode 100755
index 0000000..bdcf226
--- /dev/null
+++ b/src/Validator/Niveau04unique.php
@@ -0,0 +1,17 @@
+em = $em;
+ }
+
+ public function validate($value, Constraint $constraint)
+ {
+ $group = $this->em->getRepository("App\Entity\Group")->findOneBy(['label' => $value]);
+ if ($group) {
+ $this->context->addViolation($constraint->messagegroup);
+ }
+
+ $niveau = $this->em->getRepository("App\Entity\Niveau01")->findOneBy(['label' => $value]);
+ if ($niveau) {
+ $this->context->addViolation($constraint->messageniveau01);
+ }
+
+ $niveau = $this->em->getRepository("App\Entity\Niveau02")->findOneBy(['label' => $value]);
+ if ($niveau) {
+ $this->context->addViolation($constraint->messageniveau02);
+ }
+
+ $niveau = $this->em->getRepository("App\Entity\Niveau03")->findOneBy(['label' => $value]);
+ if ($niveau) {
+ $this->context->addViolation($constraint->messageniveau04);
+ }
+ }
+}
diff --git a/src/Validator/Password.php b/src/Validator/Password.php
old mode 100644
new mode 100755
diff --git a/src/Validator/PasswordValidator.php b/src/Validator/PasswordValidator.php
old mode 100644
new mode 100755
diff --git a/src/Validator/Userusername.php b/src/Validator/Userusername.php
old mode 100644
new mode 100755
diff --git a/src/Validator/UserusernameValidator.php b/src/Validator/UserusernameValidator.php
old mode 100644
new mode 100755
diff --git a/symfony.lock b/symfony.lock
old mode 100644
new mode 100755
diff --git a/templates/Audit/list.html.twig b/templates/Audit/list.html.twig
old mode 100644
new mode 100755
diff --git a/templates/Audit/render.html.twig b/templates/Audit/render.html.twig
old mode 100644
new mode 100755
diff --git a/templates/Config/list.html.twig b/templates/Config/list.html.twig
old mode 100644
new mode 100755
diff --git a/templates/Config/logo.html.twig b/templates/Config/logo.html.twig
old mode 100644
new mode 100755
diff --git a/templates/Config/render.html.twig b/templates/Config/render.html.twig
old mode 100644
new mode 100755
diff --git a/templates/Cron/edit.html.twig b/templates/Cron/edit.html.twig
old mode 100644
new mode 100755
diff --git a/templates/Cron/list.html.twig b/templates/Cron/list.html.twig
old mode 100644
new mode 100755
diff --git a/templates/Cron/logs.html.twig b/templates/Cron/logs.html.twig
old mode 100644
new mode 100755
diff --git a/templates/Crop/crop01.html.twig b/templates/Crop/crop01.html.twig
old mode 100644
new mode 100755
diff --git a/templates/Crop/crop02.html.twig b/templates/Crop/crop02.html.twig
old mode 100644
new mode 100755
diff --git a/templates/Form/fields.html.twig b/templates/Form/fields.html.twig
old mode 100644
new mode 100755
diff --git a/templates/Group/list.html.twig b/templates/Group/list.html.twig
old mode 100644
new mode 100755
diff --git a/templates/Group/users.html.twig b/templates/Group/users.html.twig
old mode 100644
new mode 100755
diff --git a/templates/Home/docrest.html.twig b/templates/Home/docrest.html.twig
old mode 100644
new mode 100755
diff --git a/templates/Home/home.html.twig b/templates/Home/home.html.twig
old mode 100644
new mode 100755
index 0174599..abbfac2
--- a/templates/Home/home.html.twig
+++ b/templates/Home/home.html.twig
@@ -8,10 +8,6 @@
{{ render(path("app_publish_sample",{id:1})) }}
-
diff --git a/templates/Home/mail.html.twig b/templates/Home/mail.html.twig
old mode 100644
new mode 100755
diff --git a/templates/Home/noperm.html.twig b/templates/Home/noperm.html.twig
old mode 100644
new mode 100755
diff --git a/templates/Home/publishsample.html.twig b/templates/Home/publishsample.html.twig
old mode 100644
new mode 100755
index 9441910..95d8057
--- a/templates/Home/publishsample.html.twig
+++ b/templates/Home/publishsample.html.twig
@@ -15,7 +15,8 @@
const eventSource = new EventSource("{{ mercure('chat-'~id)|escape('js') }}");
eventSource.onopen = function(e) {
- console.log("== ONOPEN");
+ console.log("== ONOPEN chat"+id{{idwidget}});
+ console.log("== SEND alive");
sendMessage{{idwidget}}(channel,id{{idwidget}},{command: "alive"});
};
@@ -87,6 +88,8 @@
function send{{idwidget}}() {
if($("#chat{{idwidget}} #pushmessage").val()) {
+ console.log("SEND push")
+
sendMessage{{idwidget}}('chat',1,{command: "push", message:$("#chat{{idwidget}} #pushmessage").val()});
$("#chat{{idwidget}} #pushmessage").val("");
}
diff --git a/templates/Include/sidebaradmin.html.twig b/templates/Include/sidebaradmin.html.twig
old mode 100644
new mode 100755
diff --git a/templates/Include/sidebarmodo.html.twig b/templates/Include/sidebarmodo.html.twig
old mode 100644
new mode 100755
diff --git a/templates/Include/style.css.twig b/templates/Include/style.css.twig
old mode 100644
new mode 100755
diff --git a/templates/Niveau01/list.html.twig b/templates/Niveau01/list.html.twig
old mode 100644
new mode 100755
diff --git a/templates/Niveau02/list.html.twig b/templates/Niveau02/list.html.twig
old mode 100644
new mode 100755
diff --git a/templates/Niveau03/edit.html.twig b/templates/Niveau03/edit.html.twig
index dbca0f5..0c2bc86 100755
--- a/templates/Niveau03/edit.html.twig
+++ b/templates/Niveau03/edit.html.twig
@@ -66,7 +66,7 @@
{% if auditUse and mode=="update" and (access=="admin" or access=="modo" or access=="audit") %}
- {{ render(path("app_"~access~"_audit_renderid",{entityname:"Niveau02",entityid:niveau03.id})) }}
+ {{ render(path("app_"~access~"_audit_renderid",{entityname:"Niveau03",entityid:niveau03.id})) }}
{% endif %}
{{ form_end(form) }}
diff --git a/templates/Niveau03/list.html.twig b/templates/Niveau03/list.html.twig
old mode 100644
new mode 100755
diff --git a/templates/Niveau04/edit.html.twig b/templates/Niveau04/edit.html.twig
index f3fcaad..f1f48f1 100755
--- a/templates/Niveau04/edit.html.twig
+++ b/templates/Niveau04/edit.html.twig
@@ -67,7 +67,7 @@
{% if auditUse and mode=="update" and (access=="admin" or access=="modo" or access=="audit") %}
- {{ render(path("app_"~access~"_audit_renderid",{entityname:"Niveau02",entityid:niveau03.id})) }}
+ {{ render(path("app_"~access~"_audit_renderid",{entityname:"Niveau04",entityid:niveau04.id})) }}
{% endif %}
{{ form_end(form) }}
diff --git a/templates/Niveau04/list.html.twig b/templates/Niveau04/list.html.twig
old mode 100644
new mode 100755
diff --git a/templates/Registration/info.html.twig b/templates/Registration/info.html.twig
old mode 100644
new mode 100755
diff --git a/templates/Registration/list.html.twig b/templates/Registration/list.html.twig
old mode 100644
new mode 100755
diff --git a/templates/Theme/list.html.twig b/templates/Theme/list.html.twig
old mode 100644
new mode 100755
diff --git a/templates/User/list.html.twig b/templates/User/list.html.twig
old mode 100644
new mode 100755
diff --git a/templates/Whitelist/list.html.twig b/templates/Whitelist/list.html.twig
old mode 100644
new mode 100755
diff --git a/templates/base.html.twig b/templates/base.html.twig
old mode 100644
new mode 100755
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
old mode 100644
new mode 100755
diff --git a/tools/php-cs-fixer/.gitignore b/tools/php-cs-fixer/.gitignore
old mode 100644
new mode 100755
diff --git a/tools/php-cs-fixer/composer.json b/tools/php-cs-fixer/composer.json
old mode 100644
new mode 100755
diff --git a/tools/php-cs-fixer/composer.lock b/tools/php-cs-fixer/composer.lock
old mode 100644
new mode 100755
diff --git a/tools/phpstan/.gitignore b/tools/phpstan/.gitignore
old mode 100644
new mode 100755
diff --git a/tools/phpstan/composer.json b/tools/phpstan/composer.json
old mode 100644
new mode 100755
diff --git a/tools/phpstan/composer.lock b/tools/phpstan/composer.lock
old mode 100644
new mode 100755
diff --git a/translations/.gitignore b/translations/.gitignore
old mode 100644
new mode 100755
diff --git a/webpack.config.js b/webpack.config.js
old mode 100644
new mode 100755
diff --git a/yarn.lock b/yarn.lock
old mode 100644
new mode 100755