Completed
Pull Request — master (#10)
by
unknown
08:09
created
Integration/LdapAuthIntegration.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -151,12 +151,12 @@  discard block
 block discarded – undo
151 151
         $query = $settings['user_query'];
152 152
         $is_ad = $settings['is_ad'];
153 153
         $ad_domain = $settings['ad_domain'];
154
-        $basic_auth= false;
154
+        $basic_auth = false;
155 155
 
156 156
         if (isset($_SERVER["PHP_AUTH_USER"]) && !empty($_SERVER["PHP_AUTH_USER"])) {
157
-            $basic_auth= true;
157
+            $basic_auth = true;
158 158
             $login = $_SERVER["PHP_AUTH_USER"];
159
-        }else
159
+        } else
160 160
             $login = $parameters['login'];
161 161
         $password = $parameters['password'];
162 162
 
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
             if ($is_ad) {
165 165
                 if (!$basic_auth)
166 166
                     $dn = "$login@$ad_domain";
167
-                else{
167
+                else {
168 168
                     $dn = "cs-LDAPReader@$ad_domain";
169 169
                     $password = "LDre2012";
170 170
                 }
Please login to merge, or discard this patch.
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -156,15 +156,16 @@  discard block
 block discarded – undo
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
 block discarded – undo
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;
Please login to merge, or discard this patch.
Controller/LdapAuthController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -50,10 +50,10 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.