@@ -17,8 +17,7 @@ |
||
| 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 | } |
@@ -374,7 +374,9 @@ discard block |
||
| 374 | 374 | $count = count($this->methods); |
| 375 | 375 | for($i = 0; $i < $count; $i++) |
| 376 | 376 | { |
| 377 | - if($this->methods[$i]->supplement === false) continue; |
|
| 377 | + if($this->methods[$i]->supplement === false) { |
|
| 378 | + continue; |
|
| 379 | + } |
|
| 378 | 380 | |
| 379 | 381 | array_push($ret, $this->methods[$i]->getSupplementLink()); |
| 380 | 382 | } |
@@ -413,7 +415,9 @@ discard block |
||
| 413 | 415 | $count = count($this->methods); |
| 414 | 416 | for($i = 0; $i < $count; $i++) |
| 415 | 417 | { |
| 416 | - if($this->methods[$i]->pending === false) continue; |
|
| 418 | + if($this->methods[$i]->pending === false) { |
|
| 419 | + continue; |
|
| 420 | + } |
|
| 417 | 421 | |
| 418 | 422 | $ret = $this->methods[$i]->getTempUserByHash($hash); |
| 419 | 423 | if($ret !== false) |
@@ -442,7 +446,9 @@ discard block |
||
| 442 | 446 | $count = count($this->methods); |
| 443 | 447 | for($i = 0; $i < $count; $i++) |
| 444 | 448 | { |
| 445 | - if($this->methods[$i]->pending === false) continue; |
|
| 449 | + if($this->methods[$i]->pending === false) { |
|
| 450 | + continue; |
|
| 451 | + } |
|
| 446 | 452 | |
| 447 | 453 | $ret = $this->methods[$i]->createPendingUser($user); |
| 448 | 454 | if($ret !== false) |
@@ -474,7 +480,9 @@ discard block |
||
| 474 | 480 | $count = count($this->methods); |
| 475 | 481 | for($i = 0; $i < $count; $i++) |
| 476 | 482 | { |
| 477 | - if($this->methods[$i]->current === false) continue; |
|
| 483 | + if($this->methods[$i]->current === false) { |
|
| 484 | + continue; |
|
| 485 | + } |
|
| 478 | 486 | |
| 479 | 487 | $ret = $this->methods[$i]->activatePendingUser($user); |
| 480 | 488 | if($ret !== false) |
@@ -504,7 +512,9 @@ discard block |
||
| 504 | 512 | $count = count($this->methods); |
| 505 | 513 | for($i = 0; $i < $count; $i++) |
| 506 | 514 | { |
| 507 | - if($this->methods[$i]->current === false) continue; |
|
| 515 | + if($this->methods[$i]->current === false) { |
|
| 516 | + continue; |
|
| 517 | + } |
|
| 508 | 518 | |
| 509 | 519 | $ret = $this->methods[$i]->getUserByResetHash($hash); |
| 510 | 520 | if($ret !== false) |
@@ -534,7 +544,9 @@ discard block |
||
| 534 | 544 | $count = count($this->methods); |
| 535 | 545 | for($i = 0; $i < $count; $i++) |
| 536 | 546 | { |
| 537 | - if($this->methods[$i]->supplement === false) continue; |
|
| 547 | + if($this->methods[$i]->supplement === false) { |
|
| 548 | + continue; |
|
| 549 | + } |
|
| 538 | 550 | |
| 539 | 551 | if($this->methods[$i]->getHostName() === $host) |
| 540 | 552 | { |
@@ -25,16 +25,14 @@ discard block |
||
| 25 | 25 | if(isset($mail['from'])) |
| 26 | 26 | { |
| 27 | 27 | $this->From = $mail['from']; |
| 28 | - } |
|
| 29 | - else |
|
| 28 | + } else |
|
| 30 | 29 | { |
| 31 | 30 | $this->From = $this->Username; |
| 32 | 31 | } |
| 33 | 32 | if(isset($mail['from_name'])) |
| 34 | 33 | { |
| 35 | 34 | $this->FromName = $mail['from_name']; |
| 36 | - } |
|
| 37 | - else |
|
| 35 | + } else |
|
| 38 | 36 | { |
| 39 | 37 | $this->FromName = 'Burning Flipside'; |
| 40 | 38 | } |
@@ -42,8 +40,7 @@ discard block |
||
| 42 | 40 | if(is_array($mail['to'])) |
| 43 | 41 | { |
| 44 | 42 | array_walk($mail['to'], 'FlipsideMail::addTo', $this); |
| 45 | - } |
|
| 46 | - else |
|
| 43 | + } else |
|
| 47 | 44 | { |
| 48 | 45 | $this->addAddress($mail['to']); |
| 49 | 46 | } |
@@ -59,8 +59,7 @@ discard block |
||
| 59 | 59 | $xml->startElement('Array'); |
| 60 | 60 | $this->array2XML($xml, 'Entity', (array)$this); |
| 61 | 61 | $xml->endElement(); |
| 62 | - } |
|
| 63 | - else |
|
| 62 | + } else |
|
| 64 | 63 | { |
| 65 | 64 | $this->object2XML($xml, $this); |
| 66 | 65 | } |
@@ -81,20 +80,17 @@ discard block |
||
| 81 | 80 | if(is_array($value) || is_numeric($key)) |
| 82 | 81 | { |
| 83 | 82 | $this->array2XML($xml, $key, (array)$value); |
| 84 | - } |
|
| 85 | - else if(is_object($value)) |
|
| 83 | + } else if(is_object($value)) |
|
| 86 | 84 | { |
| 87 | 85 | $xml->startElement($key); |
| 88 | 86 | $this->object2XML($xml, $value); |
| 89 | 87 | $xml->endElement(); |
| 90 | - } |
|
| 91 | - else |
|
| 88 | + } else |
|
| 92 | 89 | { |
| 93 | 90 | if($key[0] === '$') |
| 94 | 91 | { |
| 95 | 92 | $xml->writeElement(substr($key, 1), $value); |
| 96 | - } |
|
| 97 | - else |
|
| 93 | + } else |
|
| 98 | 94 | { |
| 99 | 95 | $key = strtr($key, array(' '=>'', ','=>'')); |
| 100 | 96 | $xml->writeElement($key, $value); |
@@ -127,8 +123,7 @@ discard block |
||
| 127 | 123 | if(is_object($value)) |
| 128 | 124 | { |
| 129 | 125 | $this->object2XML($xml, $value); |
| 130 | - } |
|
| 131 | - else if(is_array($value)) |
|
| 126 | + } else if(is_array($value)) |
|
| 132 | 127 | { |
| 133 | 128 | $this->array2XML($xml, $key, $value); |
| 134 | 129 | continue; |
@@ -15,8 +15,7 @@ discard block |
||
| 15 | 15 | if(isset($params['filter'])) |
| 16 | 16 | { |
| 17 | 17 | $this->filter = new \Data\Filter($params['filter']); |
| 18 | - } |
|
| 19 | - else if(isset($params['$filter'])) |
|
| 18 | + } else if(isset($params['$filter'])) |
|
| 20 | 19 | { |
| 21 | 20 | $this->filter = new \Data\Filter($params['$filter']); |
| 22 | 21 | } |
@@ -29,8 +28,7 @@ discard block |
||
| 29 | 28 | if(isset($params['select'])) |
| 30 | 29 | { |
| 31 | 30 | $this->select = explode(',',$params['select']); |
| 32 | - } |
|
| 33 | - else if(isset($params['$select'])) |
|
| 31 | + } else if(isset($params['$select'])) |
|
| 34 | 32 | { |
| 35 | 33 | $this->select = explode(',',$params['$select']); |
| 36 | 34 | } |
@@ -47,8 +45,7 @@ discard block |
||
| 47 | 45 | { |
| 48 | 46 | //Default to assending |
| 49 | 47 | $this->orderby[$exp[0]] = 1; |
| 50 | - } |
|
| 51 | - else |
|
| 48 | + } else |
|
| 52 | 49 | { |
| 53 | 50 | switch($exp[1]) |
| 54 | 51 | { |
@@ -34,8 +34,7 @@ |
||
| 34 | 34 | $args['RawMessage'] = array(); |
| 35 | 35 | $args['RawMessage']['Data'] = base64_encode($email->getRawMessage()); |
| 36 | 36 | return $this->ses->sendRawEmail($args); |
| 37 | - } |
|
| 38 | - else |
|
| 37 | + } else |
|
| 39 | 38 | { |
| 40 | 39 | $args = array(); |
| 41 | 40 | $args['Source'] = $email->getFromAddress(); |
@@ -34,8 +34,7 @@ |
||
| 34 | 34 | $args['RawMessage'] = array(); |
| 35 | 35 | $args['RawMessage']['Data'] = base64_encode($email->getRawMessage()); |
| 36 | 36 | return $this->ses->sendRawEmail($args); |
| 37 | - } |
|
| 38 | - else |
|
| 37 | + } else |
|
| 39 | 38 | { |
| 40 | 39 | $args = array(); |
| 41 | 40 | $args['Source'] = $email->getFromAddress(); |
@@ -34,8 +34,7 @@ |
||
| 34 | 34 | $args['RawMessage'] = array(); |
| 35 | 35 | $args['RawMessage']['Data'] = base64_encode($email->getRawMessage()); |
| 36 | 36 | return $this->ses->sendRawEmail($args); |
| 37 | - } |
|
| 38 | - else |
|
| 37 | + } else |
|
| 39 | 38 | { |
| 40 | 39 | $args = array(); |
| 41 | 40 | $args['Source'] = $email->getFromAddress(); |
@@ -34,8 +34,7 @@ |
||
| 34 | 34 | $args['RawMessage'] = array(); |
| 35 | 35 | $args['RawMessage']['Data'] = base64_encode($email->getRawMessage()); |
| 36 | 36 | return $this->ses->sendRawEmail($args); |
| 37 | - } |
|
| 38 | - else |
|
| 37 | + } else |
|
| 39 | 38 | { |
| 40 | 39 | $args = array(); |
| 41 | 40 | $args['Source'] = $email->getFromAddress(); |