@@ -8,12 +8,13 @@ discard block |
||
8 | 8 | try |
9 | 9 | { |
10 | 10 | return $this->server->update($obj); |
11 | - } |
|
12 | - catch(\Exception $ex) |
|
11 | + } catch(\Exception $ex) |
|
13 | 12 | { |
14 | 13 | $auth = \AuthProvider::getInstance(); |
15 | 14 | $ldap = $auth->getAuthenticator('Auth\LDAPAuthenticator'); |
16 | - if($ldap === false) return false; |
|
15 | + if($ldap === false) { |
|
16 | + return false; |
|
17 | + } |
|
17 | 18 | $this->server = $ldap->get_and_bind_server(true); |
18 | 19 | return $this->server->update($obj); |
19 | 20 | } |
@@ -116,8 +117,7 @@ discard block |
||
116 | 117 | if($fieldValue !== null && strlen($fieldValue) > 0) |
117 | 118 | { |
118 | 119 | $obj[$fieldName] = $fieldValue; |
119 | - } |
|
120 | - else |
|
120 | + } else |
|
121 | 121 | { |
122 | 122 | $obj[$fieldName] = null; |
123 | 123 | } |
@@ -134,8 +134,7 @@ discard block |
||
134 | 134 | $obj[$fieldName] = $this->ldapObj->{$fieldName}; |
135 | 135 | $obj[$fieldName][$obj[$fieldName]['count']] = $fieldValue; |
136 | 136 | $obj[$fieldName]['count']++; |
137 | - } |
|
138 | - else |
|
137 | + } else |
|
139 | 138 | { |
140 | 139 | $obj[$fieldName] = $fieldValue; |
141 | 140 | } |
@@ -21,8 +21,7 @@ discard block |
||
21 | 21 | if(isset($GLOBALS['FLIPSIDE_SETTINGS_LOC'])) |
22 | 22 | { |
23 | 23 | require_once($GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php'); |
24 | -} |
|
25 | -else |
|
24 | +} else |
|
26 | 25 | { |
27 | 26 | require_once('/var/www/secure_settings/class.FlipsideSettings.php'); |
28 | 27 | } |
@@ -381,7 +380,9 @@ discard block |
||
381 | 380 | $count = count($this->methods); |
382 | 381 | for($i = 0; $i < $count; $i++) |
383 | 382 | { |
384 | - if($this->methods[$i]->supplement === false) continue; |
|
383 | + if($this->methods[$i]->supplement === false) { |
|
384 | + continue; |
|
385 | + } |
|
385 | 386 | |
386 | 387 | array_push($ret, $this->methods[$i]->getSupplementLink()); |
387 | 388 | } |
@@ -420,7 +421,9 @@ discard block |
||
420 | 421 | $count = count($this->methods); |
421 | 422 | for($i = 0; $i < $count; $i++) |
422 | 423 | { |
423 | - if($this->methods[$i]->pending === false) continue; |
|
424 | + if($this->methods[$i]->pending === false) { |
|
425 | + continue; |
|
426 | + } |
|
424 | 427 | |
425 | 428 | $ret = $this->methods[$i]->getTempUserByHash($hash); |
426 | 429 | if($ret !== false) |
@@ -449,7 +452,9 @@ discard block |
||
449 | 452 | $count = count($this->methods); |
450 | 453 | for($i = 0; $i < $count; $i++) |
451 | 454 | { |
452 | - if($this->methods[$i]->pending === false) continue; |
|
455 | + if($this->methods[$i]->pending === false) { |
|
456 | + continue; |
|
457 | + } |
|
453 | 458 | |
454 | 459 | $ret = $this->methods[$i]->createPendingUser($user); |
455 | 460 | if($ret !== false) |
@@ -481,7 +486,9 @@ discard block |
||
481 | 486 | $count = count($this->methods); |
482 | 487 | for($i = 0; $i < $count; $i++) |
483 | 488 | { |
484 | - if($this->methods[$i]->current === false) continue; |
|
489 | + if($this->methods[$i]->current === false) { |
|
490 | + continue; |
|
491 | + } |
|
485 | 492 | |
486 | 493 | $ret = $this->methods[$i]->activatePendingUser($user); |
487 | 494 | if($ret !== false) |
@@ -511,7 +518,9 @@ discard block |
||
511 | 518 | $count = count($this->methods); |
512 | 519 | for($i = 0; $i < $count; $i++) |
513 | 520 | { |
514 | - if($this->methods[$i]->current === false) continue; |
|
521 | + if($this->methods[$i]->current === false) { |
|
522 | + continue; |
|
523 | + } |
|
515 | 524 | |
516 | 525 | $ret = $this->methods[$i]->getUserByResetHash($hash); |
517 | 526 | if($ret !== false) |
@@ -541,7 +550,9 @@ discard block |
||
541 | 550 | $count = count($this->methods); |
542 | 551 | for($i = 0; $i < $count; $i++) |
543 | 552 | { |
544 | - if($this->methods[$i]->supplement === false) continue; |
|
553 | + if($this->methods[$i]->supplement === false) { |
|
554 | + continue; |
|
555 | + } |
|
545 | 556 | |
546 | 557 | if($this->methods[$i]->getHostName() === $host) |
547 | 558 | { |