Cadoles
/
nineschool
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Arnaud Fornerot 2021-02-17 13:18:14 +01:00
parent 9dd5c7d4b3 96382c0698
commit 0ab0958a8f
6 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/nineschool-1.0/.env
View File

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

1
src/nineschool-1.0/config/packages/twig.yaml
View File

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

1
src/nineschool-1.0/config/services.yaml
View File

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

1
src/nineschool-1.0/scripts/.env.model
View File

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

10
src/nineschool-1.0/src/Controller/SecurityController.php
View File

@ -38,6 +38,9 @@ class SecurityController extends AbstractController
} }
public function loginMYSQL(Request $request, AuthenticationUtils $authenticationUtils) { public function loginMYSQL(Request $request, AuthenticationUtils $authenticationUtils) {
// Initalisation de la session
$this->initSession();
return $this->render('Home/login.html.twig', array( return $this->render('Home/login.html.twig', array(
'last_username' => $authenticationUtils->getLastUsername(), 'last_username' => $authenticationUtils->getLastUsername(),
'error' => $authenticationUtils->getLastAuthenticationError(), 'error' => $authenticationUtils->getLastAuthenticationError(),
@ -121,6 +124,9 @@ class SecurityController extends AbstractController
// Sauvegarde des attributes en session // Sauvegarde des attributes en session
$this->get('session')->set('attributes', $attributes); $this->get('session')->set('attributes', $attributes);
// Initalisation de la session
$this->initSession();
// Mise à jour par rapport au maitre de l'identité // Mise à jour par rapport au maitre de l'identité
$masteridentity=$this->getParameter("appMasteridentity"); $masteridentity=$this->getParameter("appMasteridentity");
if($masteridentity=="Ninegate") { if($masteridentity=="Ninegate") {
@ -358,4 +364,8 @@ class SecurityController extends AbstractController
$em->flush(); $em->flush();
} }
} }
private function initSession() {
$this->get('session')->set('activeactivity', true);
}
} }

3
tmpl/nineschool-env.local
View File

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