From 96382c06986d22988fd941cc7194ce95b7880746 Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Wed, 17 Feb 2021 12:51:42 +0100
Subject: [PATCH] sonde dnma alone

---
 src/nineschool-1.0/.env                                |  1 +
 src/nineschool-1.0/config/packages/twig.yaml           |  1 +
 src/nineschool-1.0/config/services.yaml                |  1 +
 src/nineschool-1.0/scripts/.env.model                  |  1 +
 .../src/Controller/SecurityController.php              | 10 ++++++++++
 tmpl/nineschool-env.local                              |  3 +++
 6 files changed, 17 insertions(+)

diff --git a/src/nineschool-1.0/.env b/src/nineschool-1.0/.env
index c3c8e0a..6c22fe8 100644
--- a/src/nineschool-1.0/.env
+++ b/src/nineschool-1.0/.env
@@ -65,3 +65,4 @@ PROXY_PORT=
 
 # Sonde statistic
 SONDE_USE=0
+SONDE_URL=
diff --git a/src/nineschool-1.0/config/packages/twig.yaml b/src/nineschool-1.0/config/packages/twig.yaml
index 6940dba..acd6bfe 100644
--- a/src/nineschool-1.0/config/packages/twig.yaml
+++ b/src/nineschool-1.0/config/packages/twig.yaml
@@ -15,4 +15,5 @@ twig:
       wssuse: '%wssuse%'
       wssurl: '%wssurl%'      
       sondeUse: '%sondeUse%'
+      sondeUrl: '%sondeUrl%'
 
diff --git a/src/nineschool-1.0/config/services.yaml b/src/nineschool-1.0/config/services.yaml
index f049393..46e54d8 100644
--- a/src/nineschool-1.0/config/services.yaml
+++ b/src/nineschool-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
diff --git a/src/nineschool-1.0/scripts/.env.model b/src/nineschool-1.0/scripts/.env.model
index c3c8e0a..6c22fe8 100644
--- a/src/nineschool-1.0/scripts/.env.model
+++ b/src/nineschool-1.0/scripts/.env.model
@@ -65,3 +65,4 @@ PROXY_PORT=
 
 # Sonde statistic
 SONDE_USE=0
+SONDE_URL=
diff --git a/src/nineschool-1.0/src/Controller/SecurityController.php b/src/nineschool-1.0/src/Controller/SecurityController.php
index addb116..8f626ad 100755
--- a/src/nineschool-1.0/src/Controller/SecurityController.php
+++ b/src/nineschool-1.0/src/Controller/SecurityController.php
@@ -38,6 +38,9 @@ class SecurityController extends AbstractController
     }           
 
     public function loginMYSQL(Request $request, AuthenticationUtils $authenticationUtils) {
+        // Initalisation de la session
+        $this->initSession();
+
         return $this->render('Home/login.html.twig', array(
             'last_username' =>  $authenticationUtils->getLastUsername(),
             'error' => $authenticationUtils->getLastAuthenticationError(),
@@ -121,6 +124,9 @@ class SecurityController extends AbstractController
         // Sauvegarde des attributes en session
         $this->get('session')->set('attributes', $attributes);
 
+        // Initalisation de la session
+        $this->initSession();
+                
         // Mise à jour par rapport au maitre de l'identité
         $masteridentity=$this->getParameter("appMasteridentity");
         if($masteridentity=="Ninegate") {
@@ -358,4 +364,8 @@ class SecurityController extends AbstractController
             $em->flush();
         }
     }
+
+    private function initSession() {
+        $this->get('session')->set('activeactivity', true);
+    }    
 }
diff --git a/tmpl/nineschool-env.local b/tmpl/nineschool-env.local
index a088609..dab03a1 100644
--- a/tmpl/nineschool-env.local
+++ b/tmpl/nineschool-env.local
@@ -112,10 +112,13 @@ 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=