@@ -46,7 +46,9 @@ discard block |
||
46 | 46 | */ |
47 | 47 | public function getCustomHTMLBody($callback = false) { |
48 | 48 | $body = $this->getHtmlBody(); |
49 | - if($body === null) return null; |
|
49 | + if($body === null) { |
|
50 | + return null; |
|
51 | + } |
|
50 | 52 | |
51 | 53 | if ($callback !== false) { |
52 | 54 | $aAttachment = $this->parent->getAttachments(); |
@@ -54,7 +56,7 @@ discard block |
||
54 | 56 | /** @var Attachment $oAttachment */ |
55 | 57 | if(is_callable($callback)) { |
56 | 58 | $body = $callback($body, $oAttachment); |
57 | - }elseif(is_string($callback)) { |
|
59 | + } elseif(is_string($callback)) { |
|
58 | 60 | call_user_func($callback, [$body, $oAttachment]); |
59 | 61 | } |
60 | 62 | }); |
@@ -67,7 +67,7 @@ |
||
67 | 67 | return $this->attributes[$name]; |
68 | 68 | } |
69 | 69 | |
70 | - }elseif (strtolower(substr($method, 0, 3)) === 'set') { |
|
70 | + } elseif (strtolower(substr($method, 0, 3)) === 'set') { |
|
71 | 71 | $name = Str::snake(substr($method, 3)); |
72 | 72 | |
73 | 73 | if(isset($this->attributes[$name])) { |
@@ -55,7 +55,7 @@ |
||
55 | 55 | // so add them back in manually if we can |
56 | 56 | if (defined('STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT')) { |
57 | 57 | $cryptoMethod = STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT; |
58 | - }elseif (defined('STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT')) { |
|
58 | + } elseif (defined('STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT')) { |
|
59 | 59 | $cryptoMethod = STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT; |
60 | 60 | } |
61 | 61 |
@@ -72,13 +72,13 @@ discard block |
||
72 | 72 | if($value === null) { |
73 | 73 | if(isset(self::$config[$part])) { |
74 | 74 | $value = self::$config[$part]; |
75 | - }else{ |
|
75 | + } else{ |
|
76 | 76 | break; |
77 | 77 | } |
78 | - }else{ |
|
78 | + } else{ |
|
79 | 79 | if(isset($value[$part])) { |
80 | 80 | $value = $value[$part]; |
81 | - }else{ |
|
81 | + } else{ |
|
82 | 82 | break; |
83 | 83 | } |
84 | 84 | } |
@@ -227,11 +227,15 @@ discard block |
||
227 | 227 | $arrays = func_get_args(); |
228 | 228 | $base = array_shift($arrays); |
229 | 229 | |
230 | - if(!is_array($base)) $base = empty($base) ? array() : array($base); |
|
230 | + if(!is_array($base)) { |
|
231 | + $base = empty($base) ? array() : array($base); |
|
232 | + } |
|
231 | 233 | |
232 | 234 | foreach($arrays as $append) { |
233 | 235 | |
234 | - if(!is_array($append)) $append = array($append); |
|
236 | + if(!is_array($append)) { |
|
237 | + $append = array($append); |
|
238 | + } |
|
235 | 239 | |
236 | 240 | foreach($append as $key => $value) { |
237 | 241 | |
@@ -243,7 +247,9 @@ discard block |
||
243 | 247 | if(is_array($value) or is_array($base[$key])) { |
244 | 248 | $base[$key] = $this->array_merge_recursive_distinct($base[$key], $append[$key]); |
245 | 249 | } else if(is_numeric($key)) { |
246 | - if(!in_array($value, $base)) $base[] = $value; |
|
250 | + if(!in_array($value, $base)) { |
|
251 | + $base[] = $value; |
|
252 | + } |
|
247 | 253 | } else { |
248 | 254 | $base[$key] = $value; |
249 | 255 | } |
@@ -35,11 +35,14 @@ |
||
35 | 35 | <td><?php echo $message->getAttachments()->count() > 0 ? 'yes' : 'no'; ?></td> |
36 | 36 | </tr> |
37 | 37 | <?php endforeach; ?> |
38 | - <?php else: ?> |
|
38 | + <?php else { |
|
39 | + : ?> |
|
39 | 40 | <tr> |
40 | 41 | <td colspan="4">No messages found</td> |
41 | 42 | </tr> |
42 | - <?php endif; ?> |
|
43 | + <?php endif; |
|
44 | +} |
|
45 | +?> |
|
43 | 46 | </tbody> |
44 | 47 | </table> |
45 | 48 |
@@ -31,11 +31,14 @@ |
||
31 | 31 | <td><?php echo $folder->search()->unseen()->setFetchBody(false)->count(); ?></td> |
32 | 32 | </tr> |
33 | 33 | <?php endforeach; ?> |
34 | - <?php else: ?> |
|
34 | + <?php else { |
|
35 | + : ?> |
|
35 | 36 | <tr> |
36 | 37 | <td colspan="4">No folders found</td> |
37 | 38 | </tr> |
38 | - <?php endif; ?> |
|
39 | + <?php endif; |
|
40 | +} |
|
41 | +?> |
|
39 | 42 | </tbody> |
40 | 43 | </table> |
41 | 44 |
@@ -121,7 +121,7 @@ |
||
121 | 121 | protected function parse(){ |
122 | 122 | if ($this->header === null) { |
123 | 123 | $body = $this->findHeaders(); |
124 | - }else{ |
|
124 | + } else{ |
|
125 | 125 | $body = $this->raw; |
126 | 126 | } |
127 | 127 |
@@ -252,7 +252,7 @@ |
||
252 | 252 | */ |
253 | 253 | public function paginate($per_page = 5, $page = null, $page_name = 'imap_page'){ |
254 | 254 | if ( |
255 | - $page === null |
|
255 | + $page === null |
|
256 | 256 | && isset($_GET[$page_name]) |
257 | 257 | && $_GET[$page_name] > 0 |
258 | 258 | ) { |
@@ -84,7 +84,9 @@ discard block |
||
84 | 84 | $this->setClient($client); |
85 | 85 | |
86 | 86 | $this->sequence = ClientManager::get('options.sequence', IMAP::ST_MSGN); |
87 | - if (ClientManager::get('options.fetch') === IMAP::FT_PEEK) $this->leaveUnread(); |
|
87 | + if (ClientManager::get('options.fetch') === IMAP::FT_PEEK) { |
|
88 | + $this->leaveUnread(); |
|
89 | + } |
|
88 | 90 | |
89 | 91 | if (ClientManager::get('options.fetch_order') === 'desc') { |
90 | 92 | $this->fetch_order = 'desc'; |
@@ -129,7 +131,9 @@ discard block |
||
129 | 131 | * @throws MessageSearchValidationException |
130 | 132 | */ |
131 | 133 | protected function parse_date($date) { |
132 | - if ($date instanceof Carbon) return $date; |
|
134 | + if ($date instanceof Carbon) { |
|
135 | + return $date; |
|
136 | + } |
|
133 | 137 | |
134 | 138 | try { |
135 | 139 | $date = Carbon::parse($date); |
@@ -363,7 +367,7 @@ discard block |
||
363 | 367 | } else { |
364 | 368 | if($statement[1] === null){ |
365 | 369 | $query .= $statement[0]; |
366 | - }else{ |
|
370 | + } else{ |
|
367 | 371 | $query .= $statement[0].' "'.$statement[1].'"'; |
368 | 372 | } |
369 | 373 | } |
@@ -393,7 +397,9 @@ discard block |
||
393 | 397 | * @return $this |
394 | 398 | */ |
395 | 399 | public function limit($limit, $page = 1) { |
396 | - if ($page >= 1) $this->page = $page; |
|
400 | + if ($page >= 1) { |
|
401 | + $this->page = $page; |
|
402 | + } |
|
397 | 403 | $this->limit = $limit; |
398 | 404 | |
399 | 405 | return $this; |
@@ -377,7 +377,7 @@ |
||
377 | 377 | if (strpos($folder_name, $delimiter) !== false) { |
378 | 378 | return $this->getFolderByPath($folder_name); |
379 | 379 | } |
380 | - } |
|
380 | + } |
|
381 | 381 | |
382 | 382 | return $this->getFolderByName($folder_name); |
383 | 383 | } |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | $value = $this->default_account_config[$key]; |
206 | 206 | if(isset($config[$key])) { |
207 | 207 | $value = $config[$key]; |
208 | - }elseif(isset($default_config[$key])) { |
|
208 | + } elseif(isset($default_config[$key])) { |
|
209 | 209 | $value = $default_config[$key]; |
210 | 210 | } |
211 | 211 | $this->$key = $value; |
@@ -239,39 +239,39 @@ discard block |
||
239 | 239 | if(isset($config['masks']['message'])) { |
240 | 240 | if(class_exists($config['masks']['message'])) { |
241 | 241 | $this->default_message_mask = $config['masks']['message']; |
242 | - }else{ |
|
242 | + } else{ |
|
243 | 243 | throw new MaskNotFoundException("Unknown mask provided: ".$config['masks']['message']); |
244 | 244 | } |
245 | - }else{ |
|
245 | + } else{ |
|
246 | 246 | if(class_exists($default_config['message'])) { |
247 | 247 | $this->default_message_mask = $default_config['message']; |
248 | - }else{ |
|
248 | + } else{ |
|
249 | 249 | throw new MaskNotFoundException("Unknown mask provided: ".$default_config['message']); |
250 | 250 | } |
251 | 251 | } |
252 | 252 | if(isset($config['masks']['attachment'])) { |
253 | 253 | if(class_exists($config['masks']['attachment'])) { |
254 | 254 | $this->default_message_mask = $config['masks']['attachment']; |
255 | - }else{ |
|
255 | + } else{ |
|
256 | 256 | throw new MaskNotFoundException("Unknown mask provided: ".$config['masks']['attachment']); |
257 | 257 | } |
258 | - }else{ |
|
258 | + } else{ |
|
259 | 259 | if(class_exists($default_config['attachment'])) { |
260 | 260 | $this->default_message_mask = $default_config['attachment']; |
261 | - }else{ |
|
261 | + } else{ |
|
262 | 262 | throw new MaskNotFoundException("Unknown mask provided: ".$default_config['attachment']); |
263 | 263 | } |
264 | 264 | } |
265 | - }else{ |
|
265 | + } else{ |
|
266 | 266 | if(class_exists($default_config['message'])) { |
267 | 267 | $this->default_message_mask = $default_config['message']; |
268 | - }else{ |
|
268 | + } else{ |
|
269 | 269 | throw new MaskNotFoundException("Unknown mask provided: ".$default_config['message']); |
270 | 270 | } |
271 | 271 | |
272 | 272 | if(class_exists($default_config['attachment'])) { |
273 | 273 | $this->default_message_mask = $default_config['attachment']; |
274 | - }else{ |
|
274 | + } else{ |
|
275 | 275 | throw new MaskNotFoundException("Unknown mask provided: ".$default_config['attachment']); |
276 | 276 | } |
277 | 277 | } |
@@ -335,7 +335,7 @@ discard block |
||
335 | 335 | $this->connection = new ImapProtocol($this->validate_cert, $this->encryption); |
336 | 336 | $this->connection->setConnectionTimeout($this->timeout); |
337 | 337 | $this->connection->setProxy($this->proxy); |
338 | - }else{ |
|
338 | + } else{ |
|
339 | 339 | if (extension_loaded('imap') === false) { |
340 | 340 | throw new ConnectionFailedException("connection setup failed", 0, new ProtocolNotSupportedException($protocol." is an unsupported protocol")); |
341 | 341 | } |
@@ -473,7 +473,7 @@ discard block |
||
473 | 473 | } |
474 | 474 | |
475 | 475 | return $folders; |
476 | - }else{ |
|
476 | + } else{ |
|
477 | 477 | throw new FolderFetchingException("failed to fetch any folders"); |
478 | 478 | } |
479 | 479 | } |
@@ -511,7 +511,9 @@ discard block |
||
511 | 511 | $this->checkConnection(); |
512 | 512 | $status = $this->connection->createFolder($folder); |
513 | 513 | |
514 | - if($expunge) $this->expunge(); |
|
514 | + if($expunge) { |
|
515 | + $this->expunge(); |
|
516 | + } |
|
515 | 517 | |
516 | 518 | $folder = $this->getFolder($folder); |
517 | 519 | if($status && $folder) { |