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

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

Browse Source
This commit is contained in:
Arnaud Fornerot 2020-11-12 16:30:58 +01:00
commit 8f17591995
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nineschool-1.0/src/Command/SynchroUsersCommand.php
View File

@ -564,7 +564,7 @@ class SynchroUsersCommand extends Command
$this->writeln($group->getName()); $this->writeln($group->getName());
$usergroups=[]; $usergroups=[];
if($tabgroups[$group->getIdexternal()]) if(array_key_exists($group->getIdexternal(),$tabgroups)&&$tabgroups[$group->getIdexternal()])
$usergroups = $tabgroups[$group->getIdexternal()]["users"]; $usergroups = $tabgroups[$group->getIdexternal()]["users"];
$tbusers=[]; $tbusers=[];
foreach($usergroups as $user) { foreach($usergroups as $user) {

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

@ -37,6 +37,9 @@ class SecurityController extends AbstractController
} }
public function loginMYSQL(Request $request, AuthenticationUtils $authenticationUtils) { public function loginMYSQL(Request $request, AuthenticationUtils $authenticationUtils) {
// activer les activités par défaut
$this->get('session')->set('activeactivity',true);
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(),
@ -117,6 +120,8 @@ class SecurityController extends AbstractController
$this->updateLDAP($user); $this->updateLDAP($user);
} }
// activer les activités par défaut
$this->get('session')->set('activeactivity',true);
// Autoconnexion // Autoconnexion
// Récupérer le token de l'utilisateur // Récupérer le token de l'utilisateur