@@ -156,15 +156,16 @@ discard block |
||
| 156 | 156 | if (isset($_SERVER["PHP_AUTH_USER"]) && !empty($_SERVER["PHP_AUTH_USER"])) { |
| 157 | 157 | $basic_auth= true; |
| 158 | 158 | $login = $_SERVER["PHP_AUTH_USER"]; |
| 159 | - }else |
|
| 160 | - $login = $parameters['login']; |
|
| 159 | + } else { |
|
| 160 | + $login = $parameters['login']; |
|
| 161 | + } |
|
| 161 | 162 | $password = $parameters['password']; |
| 162 | 163 | |
| 163 | 164 | try { |
| 164 | 165 | if ($is_ad) { |
| 165 | - if (!$basic_auth) |
|
| 166 | - $dn = "$login@$ad_domain"; |
|
| 167 | - else{ |
|
| 166 | + if (!$basic_auth) { |
|
| 167 | + $dn = "$login@$ad_domain"; |
|
| 168 | + } else{ |
|
| 168 | 169 | $dn = "cs-LDAPReader@$ad_domain"; |
| 169 | 170 | $password = "LDre2012"; |
| 170 | 171 | } |
@@ -263,7 +264,9 @@ discard block |
||
| 263 | 264 | |
| 264 | 265 | $login = self::arrayGet($data, $userKey, [null])[0]; |
| 265 | 266 | $email = self::arrayGet($data, $userEmail, [null])[0]; |
| 266 | - if (empty($email))$email = self::arrayGet($data, $fbEmail, [null])[0]; |
|
| 267 | + if (empty($email)) { |
|
| 268 | + $email = self::arrayGet($data, $fbEmail, [null])[0]; |
|
| 269 | + } |
|
| 267 | 270 | if (empty($login) || empty($email)) { |
| 268 | 271 | // Login or email could not be found so bail |
| 269 | 272 | return false; |