@@ -50,10 +50,10 @@ |
||
| 50 | 50 | ], |
| 51 | 51 | ]); |
| 52 | 52 | } |
| 53 | - public function ssoAction($integration,Request $request) |
|
| 53 | + public function ssoAction($integration, Request $request) |
|
| 54 | 54 | { |
| 55 | 55 | $session = $this->request->getSession(); |
| 56 | - if (isset($_SERVER['PHP_AUTH_USER'])){ |
|
| 56 | + if (isset($_SERVER['PHP_AUTH_USER'])) { |
|
| 57 | 57 | //$session->remove('_security.last_error'); |
| 58 | 58 | //$session->remove('_csrf/https-authenticate'); |
| 59 | 59 | |
@@ -154,12 +154,12 @@ discard block |
||
| 154 | 154 | $ldap_auth_bind_dn = $settings['bind_dn']; |
| 155 | 155 | $ldap_auth_bind_passwd = $settings['bind_passwd']; |
| 156 | 156 | $ad_domain = $settings['ad_domain']; |
| 157 | - $basic_auth= false; |
|
| 157 | + $basic_auth = false; |
|
| 158 | 158 | |
| 159 | 159 | if (!empty($request->server->get("PHP_AUTH_USER"))) { |
| 160 | 160 | $basic_auth = true; |
| 161 | 161 | $login = $request->server->get("PHP_AUTH_USER"); |
| 162 | - }else { |
|
| 162 | + } else { |
|
| 163 | 163 | $login = $parameters['login']; |
| 164 | 164 | } |
| 165 | 165 | $password = $parameters['password']; |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | if ($is_ad) { |
| 169 | 169 | if (!$basic_auth) { |
| 170 | 170 | $dn = "$login@$ad_domain"; |
| 171 | - }else{ |
|
| 171 | + } else { |
|
| 172 | 172 | $dn = $ldap_auth_bind_dn; |
| 173 | 173 | $password = $ldap_auth_bind_passwd; |
| 174 | 174 | } |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | if (!empty($request->server->get("PHP_AUTH_USER"))) { |
| 160 | 160 | $basic_auth = true; |
| 161 | 161 | $login = $request->server->get("PHP_AUTH_USER"); |
| 162 | - }else { |
|
| 162 | + } else { |
|
| 163 | 163 | $login = $parameters['login']; |
| 164 | 164 | } |
| 165 | 165 | $password = $parameters['password']; |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | if ($is_ad) { |
| 169 | 169 | if (!$basic_auth) { |
| 170 | 170 | $dn = "$login@$ad_domain"; |
| 171 | - }else{ |
|
| 171 | + } else{ |
|
| 172 | 172 | $dn = $ldap_auth_bind_dn; |
| 173 | 173 | $password = $ldap_auth_bind_passwd; |
| 174 | 174 | } |
@@ -267,7 +267,9 @@ discard block |
||
| 267 | 267 | |
| 268 | 268 | $login = self::arrayGet($data, $userKey, [null])[0]; |
| 269 | 269 | $email = self::arrayGet($data, $userEmail, [null])[0]; |
| 270 | - if (empty($email))$email = self::arrayGet($data, $fbEmail, [null])[0]; |
|
| 270 | + if (empty($email)) { |
|
| 271 | + $email = self::arrayGet($data, $fbEmail, [null])[0]; |
|
| 272 | + } |
|
| 271 | 273 | if (empty($login) || empty($email)) { |
| 272 | 274 | // Login or email could not be found so bail |
| 273 | 275 | return false; |