@@ -280,11 +280,15 @@ discard block |
||
280 | 280 | public function canLoginWith($provider) |
281 | 281 | { |
282 | 282 | $hosts = $this->getLoginProviders(); |
283 | - if($hosts === false) return false; |
|
283 | + if($hosts === false) { |
|
284 | + return false; |
|
285 | + } |
|
284 | 286 | $count = count($hosts); |
285 | 287 | for($i = 0; $i < $count; $i++) |
286 | 288 | { |
287 | - if(strcasecmp($hosts[$i], $provider) === 0) return true; |
|
289 | + if(strcasecmp($hosts[$i], $provider) === 0) { |
|
290 | + return true; |
|
291 | + } |
|
288 | 292 | } |
289 | 293 | return false; |
290 | 294 | } |
@@ -611,8 +615,7 @@ discard block |
||
611 | 615 | { |
612 | 616 | $this->change_pass($data->oldpass, $data->password); |
613 | 617 | unset($data->oldpass); |
614 | - } |
|
615 | - else if(isset($data->hash)) |
|
618 | + } else if(isset($data->hash)) |
|
616 | 619 | { |
617 | 620 | $this->change_pass($data->hash, $data->password, true); |
618 | 621 | unset($data->hash); |
@@ -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 | { |
@@ -573,7 +584,9 @@ discard block |
||
573 | 584 | $count = count($this->methods); |
574 | 585 | for($i = 0; $i < $count; $i++) |
575 | 586 | { |
576 | - if($this->methods[$i]->current === false) continue; |
|
587 | + if($this->methods[$i]->current === false) { |
|
588 | + continue; |
|
589 | + } |
|
577 | 590 | |
578 | 591 | $ret = $this->methods[$i]->getUserByAccessCode($key); |
579 | 592 | if($ret !== false) |
@@ -27,8 +27,7 @@ discard block |
||
27 | 27 | if(is_array($first)) |
28 | 28 | { |
29 | 29 | $keys = array_keys($first); |
30 | - } |
|
31 | - else if(is_object($first)) |
|
30 | + } else if(is_object($first)) |
|
32 | 31 | { |
33 | 32 | $keys = array_keys(get_object_vars($first)); |
34 | 33 | } |
@@ -62,14 +61,12 @@ discard block |
||
62 | 61 | $value = json_encode($value); |
63 | 62 | break; |
64 | 63 | } |
65 | - } |
|
66 | - else if(is_array($value)) |
|
64 | + } else if(is_array($value)) |
|
67 | 65 | { |
68 | 66 | $value = implode(',', $value); |
69 | 67 | } |
70 | 68 | $tmp[] = $value; |
71 | - } |
|
72 | - else |
|
69 | + } else |
|
73 | 70 | { |
74 | 71 | $tmp[] = false; |
75 | 72 | } |