Completed
Push — master ( 34c026...7ba512 )
by Patrick
03:01
created
Auth/class.LDAPAuthenticator.php 2 patches
Spacing   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 namespace Auth;
15 15
 
16 16
 /** We need the FlipsideSettings class to determine how to connect to the LDAP server */
17
-if(isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
17
+if (isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
18 18
 {
19 19
     require_once($GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php');
20 20
 }
@@ -33,18 +33,18 @@  discard block
 block discarded – undo
33 33
 {
34 34
     $count = count($array);
35 35
     $keys  = array_keys($orderby);
36
-    for($i = 0; $i < $count; $i++)
36
+    for ($i = 0; $i < $count; $i++)
37 37
     {
38
-        for($j = $i; $j < $count; $j++)
38
+        for ($j = $i; $j < $count; $j++)
39 39
         {
40 40
             $d = strcasecmp($array[$i][$keys[0]][0], $array[$j][$keys[0]][0]);
41
-            switch($orderby[$keys[0]])
41
+            switch ($orderby[$keys[0]])
42 42
             {
43 43
                 case 1:
44
-                    if($d > 0) swap($array, $i, $j);
44
+                    if ($d > 0) swap($array, $i, $j);
45 45
                     break;
46 46
                 case 0:
47
-                    if($d < 0) swap($array, $i, $j);
47
+                    if ($d < 0) swap($array, $i, $j);
48 48
                     break;
49 49
             }
50 50
         }
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
         $this->host       = $this->getHostParam($params);
93 93
         $this->user_base  = $this->getParam($params, 'user_base');
94 94
         $this->group_base = $this->getParam($params, 'group_base');
95
-        $this->bind_dn    = $this->getParam($params, 'bind_dn',   '$ldap_auth', 'read_write_pass');
95
+        $this->bind_dn    = $this->getParam($params, 'bind_dn', '$ldap_auth', 'read_write_pass');
96 96
         $this->bind_pass  = $this->getParam($params, 'bind_pass', '$ldap_auth', 'read_write_user');
97 97
     }
98 98
 
@@ -107,11 +107,11 @@  discard block
 block discarded – undo
107 107
      */
108 108
     private function getHostParam($params)
109 109
     {
110
-        if(isset($params['host']))
110
+        if (isset($params['host']))
111 111
         {
112 112
             return $params['host'];
113 113
         }
114
-        if(isset(\FlipsideSettings::$ldap['proto']))
114
+        if (isset(\FlipsideSettings::$ldap['proto']))
115 115
         {
116 116
             return \FlipsideSettings::$ldap['proto'].'://'.\FlipsideSettings::$ldap['host'];
117 117
         }
@@ -130,17 +130,17 @@  discard block
 block discarded – undo
130 130
      *
131 131
      * @SuppressWarnings("StaticAccess")
132 132
      */
133
-    private function getParam($params, $paramName, $settingsLocation='$ldap', $settingsName=false)
133
+    private function getParam($params, $paramName, $settingsLocation = '$ldap', $settingsName = false)
134 134
     {
135
-        if($settingsName === false)
135
+        if ($settingsName === false)
136 136
         {
137 137
             $settingsName = $paramName;
138 138
         }
139
-        if(isset($params[$paramName]))
139
+        if (isset($params[$paramName]))
140 140
         {
141 141
             return $params[$paramName];
142 142
         }
143
-        if($settingsLocation === '$ldap')
143
+        if ($settingsLocation === '$ldap')
144 144
         {
145 145
             return \FlipsideSettings::$ldap[$settingsName];
146 146
         }
@@ -156,13 +156,13 @@  discard block
 block discarded – undo
156 156
      *
157 157
      * @SuppressWarnings("StaticAccess")
158 158
      */
159
-    public function get_and_bind_server($bind_write=false)
159
+    public function get_and_bind_server($bind_write = false)
160 160
     {
161 161
         $server = \LDAP\LDAPServer::getInstance();
162 162
         $server->user_base = $this->user_base;
163 163
         $server->group_base = $this->group_base;
164 164
         $server->connect($this->host);
165
-        if($bind_write === false)
165
+        if ($bind_write === false)
166 166
         {
167 167
             $ret = $server->bind();
168 168
         }
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
         {
171 171
             $ret = $server->bind($this->bind_dn, $this->bind_pass);
172 172
         }
173
-        if($ret === false)
173
+        if ($ret === false)
174 174
         {
175 175
             return false;
176 176
         }
@@ -188,20 +188,20 @@  discard block
 block discarded – undo
188 188
     public function login($username, $password)
189 189
     {
190 190
         $server = $this->get_and_bind_server();
191
-        if($server === false)
191
+        if ($server === false)
192 192
         {
193 193
             return false;
194 194
         }
195 195
         $filter = new \Data\Filter("uid eq $username or mail eq $username");
196 196
         $user = $server->read($this->user_base, $filter);
197
-        if($user === false || count($user) === 0)
197
+        if ($user === false || count($user) === 0)
198 198
         {
199 199
             return false;
200 200
         }
201 201
         $user = $user[0];
202 202
         $server->unbind();
203 203
         $ret = $server->bind($user->dn, $password);
204
-        if($ret !== false)
204
+        if ($ret !== false)
205 205
         {
206 206
             return array('res'=>true, 'extended'=>$user); 
207 207
         }
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
      */
218 218
     public function isLoggedIn($data)
219 219
     {
220
-        if(isset($data['res']))
220
+        if (isset($data['res']))
221 221
         {
222 222
             return $data['res'];
223 223
         }
@@ -239,35 +239,35 @@  discard block
 block discarded – undo
239 239
     public function getGroupByName($name)
240 240
     {
241 241
         $server = $this->get_and_bind_server();
242
-        if($server === false)
242
+        if ($server === false)
243 243
         {
244 244
             return false;
245 245
         }
246 246
         return LDAPGroup::from_name($name, $server);
247 247
     }
248 248
 
249
-    public function getGroupsByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false)
249
+    public function getGroupsByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false)
250 250
     {
251 251
         $server = $this->get_and_bind_server();
252
-        if($server === false)
252
+        if ($server === false)
253 253
         {
254 254
             return false;
255 255
         }
256
-        if($filter === false)
256
+        if ($filter === false)
257 257
         {
258 258
             $filter = new \Data\Filter('cn eq *');
259 259
         }
260 260
         $groups = $server->read($this->group_base, $filter);
261
-        if($groups === false)
261
+        if ($groups === false)
262 262
         {
263 263
             return false;
264 264
         }
265 265
         $this->processFilteringParams($groups, $select, $top, $skip, $orderby);
266 266
         $count = count($groups);
267
-        for($i = 0; $i < $count; $i++)
267
+        for ($i = 0; $i < $count; $i++)
268 268
         {
269 269
             $groups[$i] = new LDAPGroup($groups[$i]);
270
-            if($select !== false)
270
+            if ($select !== false)
271 271
             {
272 272
                 $groups[$i] = json_decode(json_encode($groups[$i]), true);
273 273
                 $groups[$i] = array_intersect_key($groups[$i], array_flip($select));
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
     public function getActiveUserCount()
280 280
     {
281 281
         $server = $this->get_and_bind_server();
282
-        if($server === false)
282
+        if ($server === false)
283 283
         {
284 284
             return false;
285 285
         }
@@ -288,50 +288,50 @@  discard block
 block discarded – undo
288 288
 
289 289
     private function processFilteringParams(&$data, &$select, $top, $skip, $orderby)
290 290
     {
291
-        if($orderby !== false)
291
+        if ($orderby !== false)
292 292
         {
293 293
             sort_array($data, $orderby);
294 294
         }
295
-        if($select !== false)
295
+        if ($select !== false)
296 296
         {
297 297
             $select = array_flip($select);
298 298
         }
299
-        if($skip !== false && $top !== false)
299
+        if ($skip !== false && $top !== false)
300 300
         {
301 301
             $data = array_slice($data, $skip, $top);
302 302
         }
303
-        else if($top !== false)
303
+        else if ($top !== false)
304 304
         {
305 305
             $data = array_slice($data, 0, $top);
306 306
         }
307
-        else if($skip !== false)
307
+        else if ($skip !== false)
308 308
         {
309 309
             $data = array_slice($data, $skip);
310 310
         }
311 311
     }
312 312
 
313
-    public function getUsersByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false)
313
+    public function getUsersByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false)
314 314
     {
315 315
         $server = $this->get_and_bind_server();
316
-        if($server === false)
316
+        if ($server === false)
317 317
         {
318 318
             return false;
319 319
         }
320
-        if($filter === false)
320
+        if ($filter === false)
321 321
         {
322 322
             $filter = new \Data\Filter('cn eq *');
323 323
         }
324 324
         $users = $server->read($this->user_base, $filter, false, $select);
325
-        if($users === false)
325
+        if ($users === false)
326 326
         {
327 327
             return false;
328 328
         }
329 329
         $this->processFilteringParams($users, $select, $top, $skip, $orderby);
330 330
         $count = count($users);
331
-        for($i = 0; $i < $count; $i++)
331
+        for ($i = 0; $i < $count; $i++)
332 332
         {
333 333
             $tmp = new LDAPUser($users[$i]);
334
-            if($select !== false)
334
+            if ($select !== false)
335 335
             {
336 336
                 $tmp = $tmp->jsonSerialize();
337 337
                 $tmp = array_intersect_key($tmp, $select);
@@ -349,36 +349,36 @@  discard block
 block discarded – undo
349 349
         $email = $user->getEmail();
350 350
         $new_user->setEmail($email);
351 351
         $pass = $user->getPassword();
352
-        if($pass !== false)
352
+        if ($pass !== false)
353 353
         {
354 354
             $new_user->setPass($pass);
355 355
         }
356 356
         $sn = $user->getLastName();
357
-        if($sn !== false)
357
+        if ($sn !== false)
358 358
         {
359 359
             $new_user->setLastName($sn);
360 360
         }
361 361
         $givenName = $user->getGivenName();
362
-        if($givenName !== false)
362
+        if ($givenName !== false)
363 363
         {
364 364
             $new_user->setGivenName($givenName);
365 365
         }
366 366
         $hosts = $user->getLoginProviders();
367
-        if($hosts !== false)
367
+        if ($hosts !== false)
368 368
         {
369 369
             $count = count($hosts);
370
-            for($i = 0; $i < $count; $i++)
370
+            for ($i = 0; $i < $count; $i++)
371 371
             {
372 372
                 $new_user->addLoginProvider($hosts[$i]);
373 373
             }
374 374
         }
375 375
         $ret = $new_user->flushUser();
376
-        if($ret)
376
+        if ($ret)
377 377
         {
378 378
             $user->delete();
379 379
         }
380 380
         $users = $this->getUsersByFilter(new \Data\Filter('mail eq '.$email));
381
-        if($users === false || !isset($users[0]))
381
+        if ($users === false || !isset($users[0]))
382 382
         {
383 383
             throw new \Exception('Error creating user!');
384 384
         }
@@ -388,7 +388,7 @@  discard block
 block discarded – undo
388 388
     public function getUserByResetHash($hash)
389 389
     {
390 390
         $users = $this->getUsersByFilter(new \Data\Filter("uniqueIdentifier eq $hash"));
391
-        if($users === false || !isset($users[0]))
391
+        if ($users === false || !isset($users[0]))
392 392
         {
393 393
             return false;
394 394
         }
Please login to merge, or discard this patch.
Braces   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -17,8 +17,7 @@  discard block
 block discarded – undo
17 17
 if(isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
18 18
 {
19 19
     require_once($GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php');
20
-}
21
-else
20
+} else
22 21
 {
23 22
     require_once('/var/www/secure_settings/class.FlipsideSettings.php');
24 23
 }
@@ -41,10 +40,14 @@  discard block
 block discarded – undo
41 40
             switch($orderby[$keys[0]])
42 41
             {
43 42
                 case 1:
44
-                    if($d > 0) swap($array, $i, $j);
43
+                    if($d > 0) {
44
+                        swap($array, $i, $j);
45
+                    }
45 46
                     break;
46 47
                 case 0:
47
-                    if($d < 0) swap($array, $i, $j);
48
+                    if($d < 0) {
49
+                        swap($array, $i, $j);
50
+                    }
48 51
                     break;
49 52
             }
50 53
         }
@@ -165,8 +168,7 @@  discard block
 block discarded – undo
165 168
         if($bind_write === false)
166 169
         {
167 170
             $ret = $server->bind();
168
-        }
169
-        else
171
+        } else
170 172
         {
171 173
             $ret = $server->bind($this->bind_dn, $this->bind_pass);
172 174
         }
@@ -299,12 +301,10 @@  discard block
 block discarded – undo
299 301
         if($skip !== false && $top !== false)
300 302
         {
301 303
             $data = array_slice($data, $skip, $top);
302
-        }
303
-        else if($top !== false)
304
+        } else if($top !== false)
304 305
         {
305 306
             $data = array_slice($data, 0, $top);
306
-        }
307
-        else if($skip !== false)
307
+        } else if($skip !== false)
308 308
         {
309 309
             $data = array_slice($data, $skip);
310 310
         }
Please login to merge, or discard this patch.