Merge branch 'master' into dist/envole/7/master
This commit is contained in:
commit
5c03e3b44f
|
@ -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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue