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

src/ninesurvey-1.0/.env

@@ -65,3 +65,4 @@ PROXY_PORT=
 
 # Sonde statistic
 SONDE_USE=0
+SONDE_URL=

src/ninesurvey-1.0/config/packages/twig.yaml

@@ -16,4 +16,5 @@ twig:
       wssuse: '%wssuse%'
       wssurl: '%wssurl%'      
       sondeUse: '%sondeUse%'
+      sondeUrl: '%sondeUrl%'
 

src/ninesurvey-1.0/config/services.yaml

@@ -56,6 +56,7 @@ parameters:
   proxyPort: '%env(resolve:PROXY_PORT)%'
 
   sondeUse: '%env(resolve:SONDE_USE)%'
+  sondeUrl: '%env(resolve:SONDE_URL)%'
 
 services:
     # default configuration for services in *this* file

src/ninesurvey-1.0/scripts/.env.model

@@ -65,3 +65,4 @@ PROXY_PORT=
 
 # Sonde statistic
 SONDE_USE=0
+SONDE_URL=

tmpl/ninesurvey-env.local

@@ -112,10 +112,14 @@ PROXY_PORT=
 # Sonde statistic
 %if %%getVar("activer_sondepiwik_local", 'non') == "oui" 
 SONDE_USE=1
+SONDE_URL=/sondepiwik/envoleTrackeur.js.php
 %else if %%getVar("activer_piwik", 'non') == "oui"  
 SONDE_USE=1
+SONDE_URL=/piwik/envoleTrackeur.js.php
 %else if %%getVar("activer_sondednma", 'non') == "oui"  
 SONDE_USE=1
+SONDE_URL=/sondepiwik/envoleTrackeur.js.php
 %else
 SONDE_USE=0
+SONDE_URL=
 %end if