@@ -37,11 +37,11 @@ discard block |
||
37 | 37 | protected function __construct() |
38 | 38 | { |
39 | 39 | $this->methods = array(); |
40 | - if(isset(FlipsideSettings::$email_providers)) |
|
40 | + if (isset(FlipsideSettings::$email_providers)) |
|
41 | 41 | { |
42 | 42 | $keys = array_keys(FlipsideSettings::$email_providers); |
43 | 43 | $count = count($keys); |
44 | - for($i = 0; $i < $count; $i++) |
|
44 | + for ($i = 0; $i < $count; $i++) |
|
45 | 45 | { |
46 | 46 | $class = $keys[$i]; |
47 | 47 | array_push($this->methods, new $class(FlipsideSettings::$email_providers[$keys[$i]])); |
@@ -59,9 +59,9 @@ discard block |
||
59 | 59 | public function getEmailMethod($methodName) |
60 | 60 | { |
61 | 61 | $count = count($this->methods); |
62 | - for($i = 0; $i < $count; $i++) |
|
62 | + for ($i = 0; $i < $count; $i++) |
|
63 | 63 | { |
64 | - if(strcasecmp(get_class($this->methods[$i]), $methodName) === 0) |
|
64 | + if (strcasecmp(get_class($this->methods[$i]), $methodName) === 0) |
|
65 | 65 | { |
66 | 66 | return $this->methods[$i]; |
67 | 67 | } |
@@ -79,14 +79,14 @@ discard block |
||
79 | 79 | */ |
80 | 80 | public function sendEmail($email, $methodName = false) |
81 | 81 | { |
82 | - if($methodName === false) |
|
82 | + if ($methodName === false) |
|
83 | 83 | { |
84 | 84 | $res = false; |
85 | 85 | $count = count($this->methods); |
86 | - for($i = 0; $i < $count; $i++) |
|
86 | + for ($i = 0; $i < $count; $i++) |
|
87 | 87 | { |
88 | 88 | $res = $this->methods[$i]->sendEmail($email); |
89 | - if($res !== false) |
|
89 | + if ($res !== false) |
|
90 | 90 | { |
91 | 91 | return $res; |
92 | 92 | } |
@@ -92,8 +92,7 @@ |
||
92 | 92 | } |
93 | 93 | } |
94 | 94 | return $res; |
95 | - } |
|
96 | - else |
|
95 | + } else |
|
97 | 96 | { |
98 | 97 | $method = $this->getEmailMethod($methodName); |
99 | 98 | return $method->sendEmail($email); |
@@ -14,7 +14,7 @@ |
||
14 | 14 | 'version' => 'latest', |
15 | 15 | 'region' => 'us-west-2', |
16 | 16 | 'credentials' => $credentials |
17 | - ]); |
|
17 | + ]); |
|
18 | 18 | } |
19 | 19 | |
20 | 20 | public function canSend() |
@@ -27,7 +27,7 @@ |
||
27 | 27 | |
28 | 28 | public function sendEmail($email) |
29 | 29 | { |
30 | - if($email->hasAttachments()) |
|
30 | + if ($email->hasAttachments()) |
|
31 | 31 | { |
32 | 32 | //Amazeon sendEmail doesn't support attachments. We need to use sendRawEmail |
33 | 33 | $args = array(); |
@@ -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(); |
@@ -3,19 +3,19 @@ discard block |
||
3 | 3 | |
4 | 4 | class LDAPObject extends \SerializableObject |
5 | 5 | { |
6 | - public $server; |
|
6 | + public $server; |
|
7 | 7 | |
8 | - function __construct($array=false, $server=false) |
|
9 | - { |
|
10 | - parent::__construct($array); |
|
11 | - $this->server = $server; |
|
12 | - } |
|
8 | + function __construct($array=false, $server=false) |
|
9 | + { |
|
10 | + parent::__construct($array); |
|
11 | + $this->server = $server; |
|
12 | + } |
|
13 | 13 | |
14 | - public function jsonSerialize() |
|
15 | - { |
|
16 | - $ret = array(); |
|
17 | - foreach ($this as $key => $value) |
|
18 | - { |
|
14 | + public function jsonSerialize() |
|
15 | + { |
|
16 | + $ret = array(); |
|
17 | + foreach ($this as $key => $value) |
|
18 | + { |
|
19 | 19 | if($key === 'server' || $key === 'count') continue; |
20 | 20 | if(is_numeric($key)) continue; |
21 | 21 | if($key === 'jpegphoto') |
@@ -31,9 +31,9 @@ discard block |
||
31 | 31 | { |
32 | 32 | $ret[$key] = $value; |
33 | 33 | } |
34 | - } |
|
35 | - return $ret; |
|
36 | - } |
|
34 | + } |
|
35 | + return $ret; |
|
36 | + } |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | ?> |
@@ -5,7 +5,7 @@ discard block |
||
5 | 5 | { |
6 | 6 | public $server; |
7 | 7 | |
8 | - function __construct($array=false, $server=false) |
|
8 | + function __construct($array = false, $server = false) |
|
9 | 9 | { |
10 | 10 | parent::__construct($array); |
11 | 11 | $this->server = $server; |
@@ -16,14 +16,14 @@ discard block |
||
16 | 16 | $ret = array(); |
17 | 17 | foreach ($this as $key => $value) |
18 | 18 | { |
19 | - if($key === 'server' || $key === 'count') continue; |
|
20 | - if(is_numeric($key)) continue; |
|
21 | - if($key === 'jpegphoto') |
|
19 | + if ($key === 'server' || $key === 'count') continue; |
|
20 | + if (is_numeric($key)) continue; |
|
21 | + if ($key === 'jpegphoto') |
|
22 | 22 | { |
23 | 23 | $ret[$key] = base64_encode($value[0]); |
24 | 24 | continue; |
25 | 25 | } |
26 | - if(is_array($value) && $value['count'] === 1) |
|
26 | + if (is_array($value) && $value['count'] === 1) |
|
27 | 27 | { |
28 | 28 | $ret[$key] = $value[0]; |
29 | 29 | } |
@@ -16,8 +16,12 @@ discard block |
||
16 | 16 | $ret = array(); |
17 | 17 | foreach ($this as $key => $value) |
18 | 18 | { |
19 | - if($key === 'server' || $key === 'count') continue; |
|
20 | - if(is_numeric($key)) continue; |
|
19 | + if($key === 'server' || $key === 'count') { |
|
20 | + continue; |
|
21 | + } |
|
22 | + if(is_numeric($key)) { |
|
23 | + continue; |
|
24 | + } |
|
21 | 25 | if($key === 'jpegphoto') |
22 | 26 | { |
23 | 27 | $ret[$key] = base64_encode($value[0]); |
@@ -26,8 +30,7 @@ discard block |
||
26 | 30 | if(is_array($value) && $value['count'] === 1) |
27 | 31 | { |
28 | 32 | $ret[$key] = $value[0]; |
29 | - } |
|
30 | - else |
|
33 | + } else |
|
31 | 34 | { |
32 | 35 | $ret[$key] = $value; |
33 | 36 | } |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | /** |
15 | 15 | * use the FlipsideSettings class |
16 | 16 | */ |
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 | } |
@@ -59,11 +59,11 @@ discard block |
||
59 | 59 | static function getDataSetByName($setName) |
60 | 60 | { |
61 | 61 | static $instances = array(); |
62 | - if(isset($instances[$setName])) |
|
62 | + if (isset($instances[$setName])) |
|
63 | 63 | { |
64 | 64 | return $instances[$setName]; |
65 | 65 | } |
66 | - if(!isset(FlipsideSettings::$dataset) || !isset(FlipsideSettings::$dataset[$setName])) |
|
66 | + if (!isset(FlipsideSettings::$dataset) || !isset(FlipsideSettings::$dataset[$setName])) |
|
67 | 67 | { |
68 | 68 | throw new Exception('Unknown dataset name '.$setName); |
69 | 69 | } |
@@ -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 | } |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | |
23 | 23 | public function send_HTML($mail) |
24 | 24 | { |
25 | - if(isset($mail['from'])) |
|
25 | + if (isset($mail['from'])) |
|
26 | 26 | { |
27 | 27 | $this->From = $mail['from']; |
28 | 28 | } |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | { |
31 | 31 | $this->From = $this->Username; |
32 | 32 | } |
33 | - if(isset($mail['from_name'])) |
|
33 | + if (isset($mail['from_name'])) |
|
34 | 34 | { |
35 | 35 | $this->FromName = $mail['from_name']; |
36 | 36 | } |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | $this->FromName = 'Burning Flipside'; |
40 | 40 | } |
41 | 41 | $this->clearAllRecipients(); |
42 | - if(is_array($mail['to'])) |
|
42 | + if (is_array($mail['to'])) |
|
43 | 43 | { |
44 | 44 | array_walk($mail['to'], 'FlipsideMail::addTo', $this); |
45 | 45 | } |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | { |
48 | 48 | $this->addAddress($mail['to']); |
49 | 49 | } |
50 | - if(isset($mail['reply_to'])) |
|
50 | + if (isset($mail['reply_to'])) |
|
51 | 51 | { |
52 | 52 | $this->addReplyTo($mail['reply_to']); |
53 | 53 | } |
@@ -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 | } |
@@ -28,7 +28,7 @@ |
||
28 | 28 | { |
29 | 29 | static $instances = array(); |
30 | 30 | $class = get_called_class(); |
31 | - if(!isset($instances[$class])) |
|
31 | + if (!isset($instances[$class])) |
|
32 | 32 | { |
33 | 33 | $instances[$class] = new static(); |
34 | 34 | } |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | } else { |
59 | 59 | $host = FCgetHostName(); |
60 | 60 | } |
61 | - $pattern = '#^https?://' . str_replace('.', '\.', $host) . '(:\d*)?/#'; |
|
61 | + $pattern = '#^https?://'.str_replace('.', '\.', $host).'(:\d*)?/#'; |
|
62 | 62 | if (!preg_match($pattern, $_SERVER['HTTP_REFERER'])) { |
63 | 63 | exit; |
64 | 64 | } |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | } |
74 | 74 | |
75 | 75 | // Percent-encode special characters in the URL |
76 | -$search = array( '%', '#', ' '); |
|
76 | +$search = array('%', '#', ' '); |
|
77 | 77 | $replace = array('%25', '%23', '%20'); |
78 | 78 | $url = str_replace($search, $replace, $_GET['url']); |
79 | 79 |
@@ -41,7 +41,7 @@ |
||
41 | 41 | |
42 | 42 | // Force download |
43 | 43 | header('Content-Type: application/octet-stream'); |
44 | - header('Content-Disposition: attachment; filename="' . $filename . '"'); |
|
44 | + header('Content-Disposition: attachment; filename="'.$filename.'"'); |
|
45 | 45 | |
46 | 46 | if (isset($_POST['dataurl'])) { |
47 | 47 | // Decode the base64-encoded data |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | } else { |
59 | 59 | $host = FCgetHostName(); |
60 | 60 | } |
61 | - $pattern = '#^https?://' . str_replace('.', '\.', $host) . '(:\d*)?/#'; |
|
61 | + $pattern = '#^https?://'.str_replace('.', '\.', $host).'(:\d*)?/#'; |
|
62 | 62 | if (!preg_match($pattern, $_SERVER['HTTP_REFERER'])) { |
63 | 63 | exit; |
64 | 64 | } |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | } |
74 | 74 | |
75 | 75 | // Percent-encode special characters in the URL |
76 | -$search = array( '%', '#', ' '); |
|
76 | +$search = array('%', '#', ' '); |
|
77 | 77 | $replace = array('%25', '%23', '%20'); |
78 | 78 | $url = str_replace($search, $replace, $_GET['url']); |
79 | 79 |