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

This commit is contained in:
Arnaud Fornerot 2021-01-21 17:31:42 +01:00
commit 38ec005383
1 changed files with 2 additions and 4 deletions

View File

@ -67,7 +67,6 @@ class SecurityController extends AbstractController
$attributes = \phpCAS::getAttributes(); $attributes = \phpCAS::getAttributes();
// Init // Init
$username = "";
$email = ""; $email = "";
$lastname = ""; $lastname = "";
$firstname = ""; $firstname = "";
@ -86,13 +85,12 @@ class SecurityController extends AbstractController
if(isset($attributes[$this->getParameter('casFirstname')])) if(isset($attributes[$this->getParameter('casFirstname')]))
$firstname = $attributes[$this->getParameter('casFirstname')]; $firstname = $attributes[$this->getParameter('casFirstname')];
// Cas nomail
if(empty($email)) $email = $username."@nomail.com";
$user = $em->getRepository('App:User')->findOneBy(array("username"=>$username)); $user = $em->getRepository('App:User')->findOneBy(array("username"=>$username));
$exists = $user ? true : false; $exists = $user ? true : false;
if (!$exists) { if (!$exists) {
if(empty($email)) $email = $username."@nomail.com";
$user = new User(); $user = new User();
$key = Uuid::uuid4(); $key = Uuid::uuid4();