Merge branch 'master' into dist/envole/7/master
This commit is contained in:
commit
38ec005383
@ -67,7 +67,6 @@ class SecurityController extends AbstractController
|
||||
$attributes = \phpCAS::getAttributes();
|
||||
|
||||
// Init
|
||||
$username = "";
|
||||
$email = "";
|
||||
$lastname = "";
|
||||
$firstname = "";
|
||||
@ -85,14 +84,13 @@ class SecurityController extends AbstractController
|
||||
|
||||
if(isset($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));
|
||||
$exists = $user ? true : false;
|
||||
|
||||
if (!$exists) {
|
||||
if(empty($email)) $email = $username."@nomail.com";
|
||||
|
||||
$user = new User();
|
||||
$key = Uuid::uuid4();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user