Merge branch 'master' into dist/envole/7/master

dicos/90_ninesurvey.xml

@@ -22,6 +22,7 @@
 	<variables>
         <family name='ninesurvey' icon='ticket'>
             <variable name="ninegate_test_ninegate" type="oui/non" hidden='True' exists='False'><value>non</value></variable>
+            <variable name="activer_revprox" type="oui/non" description="Activer le reverse proxy Nginx" hidden='True' exists='False'><value>non</value></variable>
 
 			<variable name='activer_ninesurvey' type='oui/non' description='Activer Ninesurvey'>
 				<value>oui</value>

src/ninesurvey-1.0/config/routes.yaml

@@ -258,6 +258,10 @@ app_quest_byloginkey:
     path: /user/quest/byloginkey/{key}
     defaults: { _controller: App\Controller\QuestController:byloginkey }       
 
-app_quest_pdf:
-    path: /pdf/{id}
-    defaults: { _controller: App\Controller\QuestController:result }
+app_quest_byguestkey_result:
+    path: /quest/result/byguestkey/{key}
+    defaults: { _controller: App\Controller\QuestController:resultbyguestkey }    
+
+app_quest_byuserkey_result:
+    path: /quest/result/byuserkey/{key}
+    defaults: { _controller: App\Controller\QuestController:resultbyuserkey }    

src/ninesurvey-1.0/config/services.yaml

@@ -28,6 +28,7 @@ parameters:
   ldapModel: '%env(resolve:LDAP_MODEL)%'
   ldapHost: '%env(resolve:LDAP_HOST)%'
   ldapPort: '%env(resolve:LDAP_PORT)%'
+  ldapTls: '%env(resolve:LDAP_TLS)%'
   ldapUser: '%env(resolve:LDAP_USER)%'
   ldapPassword: '%env(resolve:LDAP_PASSWORD)%'
   ldapBasedn: '%env(resolve:LDAP_BASEDN)%'
@@ -66,6 +67,7 @@ services:
         bind:
             $ldapHost: '%ldapHost%'
             $ldapPort: '%ldapPort%'
+            $ldapTls: '%ldapTls%'
             $ldapUser: '%ldapUser%'
             $ldapPassword: '%ldapPassword%'
             $ldapBasedn: '%ldapBasedn%'
@@ -105,7 +107,7 @@ services:
     app.ldap.service:
         public: true
         class: App\Service\ldapService
-        arguments: ["%ldapHost%","%ldapPort%","%ldapUser%","%ldapPassword%","%ldapBasedn%"]
+        arguments: ["%ldapHost%","%ldapPort%","%ldapTls%","%ldapUser%","%ldapPassword%","%ldapBasedn%"]
 
     app.upload.samename:
         public: true