@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | * @throws ConnectionFailedException |
| 85 | 85 | * @throws RuntimeException |
| 86 | 86 | */ |
| 87 | - protected function enableTls(){ |
|
| 87 | + protected function enableTls() { |
|
| 88 | 88 | $response = $this->requestAndResponse('STARTTLS'); |
| 89 | 89 | $result = $response && stream_socket_enable_crypto($this->stream, true, $this->getCryptoMethod()); |
| 90 | 90 | if (!$result) { |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | $stack = []; |
| 147 | 147 | |
| 148 | 148 | // replace any trailing <NL> including spaces with a single space |
| 149 | - $line = rtrim($line) . ' '; |
|
| 149 | + $line = rtrim($line).' '; |
|
| 150 | 150 | while (($pos = strpos($line, ' ')) !== false) { |
| 151 | 151 | $token = substr($line, 0, $pos); |
| 152 | 152 | if (!strlen($token)) { |
@@ -176,11 +176,11 @@ discard block |
||
| 176 | 176 | if (strlen($token) > $chars) { |
| 177 | 177 | $line = substr($token, $chars); |
| 178 | 178 | $token = substr($token, 0, $chars); |
| 179 | - } else { |
|
| 179 | + }else { |
|
| 180 | 180 | $line .= $this->nextLine(); |
| 181 | 181 | } |
| 182 | 182 | $tokens[] = $token; |
| 183 | - $line = trim($line) . ' '; |
|
| 183 | + $line = trim($line).' '; |
|
| 184 | 184 | continue; |
| 185 | 185 | } |
| 186 | 186 | } |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | $line = $this->nextTaggedLine($tag); // get next tag |
| 231 | 231 | if (!$dontParse) { |
| 232 | 232 | $tokens = $this->decodeLine($line); |
| 233 | - } else { |
|
| 233 | + }else { |
|
| 234 | 234 | $tokens = $line; |
| 235 | 235 | } |
| 236 | 236 | if ($this->debug) echo "<< ".$line."\n"; |
@@ -280,27 +280,27 @@ discard block |
||
| 280 | 280 | public function sendRequest($command, $tokens = [], &$tag = null) { |
| 281 | 281 | if (!$tag) { |
| 282 | 282 | $this->noun++; |
| 283 | - $tag = 'TAG' . $this->noun; |
|
| 283 | + $tag = 'TAG'.$this->noun; |
|
| 284 | 284 | } |
| 285 | 285 | |
| 286 | - $line = $tag . ' ' . $command; |
|
| 286 | + $line = $tag.' '.$command; |
|
| 287 | 287 | |
| 288 | 288 | foreach ($tokens as $token) { |
| 289 | 289 | if (is_array($token)) { |
| 290 | - if (fwrite($this->stream, $line . ' ' . $token[0] . "\r\n") === false) { |
|
| 290 | + if (fwrite($this->stream, $line.' '.$token[0]."\r\n") === false) { |
|
| 291 | 291 | throw new RuntimeException('failed to write - connection closed?'); |
| 292 | 292 | } |
| 293 | 293 | if (!$this->assumedNextLine('+ ')) { |
| 294 | 294 | throw new RuntimeException('failed to send literal string'); |
| 295 | 295 | } |
| 296 | 296 | $line = $token[1]; |
| 297 | - } else { |
|
| 298 | - $line .= ' ' . $token; |
|
| 297 | + }else { |
|
| 298 | + $line .= ' '.$token; |
|
| 299 | 299 | } |
| 300 | 300 | } |
| 301 | 301 | if ($this->debug) echo ">> ".$line."\n"; |
| 302 | 302 | |
| 303 | - if (fwrite($this->stream, $line . "\r\n") === false) { |
|
| 303 | + if (fwrite($this->stream, $line."\r\n") === false) { |
|
| 304 | 304 | throw new RuntimeException('failed to write - connection closed?'); |
| 305 | 305 | } |
| 306 | 306 | } |
@@ -330,9 +330,9 @@ discard block |
||
| 330 | 330 | public function escapeString($string) { |
| 331 | 331 | if (func_num_args() < 2) { |
| 332 | 332 | if (strpos($string, "\n") !== false) { |
| 333 | - return ['{' . strlen($string) . '}', $string]; |
|
| 334 | - } else { |
|
| 335 | - return '"' . str_replace(['\\', '"'], ['\\\\', '\\"'], $string) . '"'; |
|
| 333 | + return ['{'.strlen($string).'}', $string]; |
|
| 334 | + }else { |
|
| 335 | + return '"'.str_replace(['\\', '"'], ['\\\\', '\\"'], $string).'"'; |
|
| 336 | 336 | } |
| 337 | 337 | } |
| 338 | 338 | $result = []; |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | } |
| 358 | 358 | $result[] = $this->escapeList($v); |
| 359 | 359 | } |
| 360 | - return '(' . implode(' ', $result) . ')'; |
|
| 360 | + return '('.implode(' ', $result).')'; |
|
| 361 | 361 | } |
| 362 | 362 | |
| 363 | 363 | /** |
@@ -397,12 +397,12 @@ discard block |
||
| 397 | 397 | error_log("got an extra server challenge: $response"); |
| 398 | 398 | // respond with an empty response. |
| 399 | 399 | $this->sendRequest(''); |
| 400 | - } else { |
|
| 400 | + }else { |
|
| 401 | 401 | if (preg_match('/^NO /i', $response) || |
| 402 | 402 | preg_match('/^BAD /i', $response)) { |
| 403 | 403 | error_log("got failure response: $response"); |
| 404 | 404 | return false; |
| 405 | - } else if (preg_match("/^OK /i", $response)) { |
|
| 405 | + }else if (preg_match("/^OK /i", $response)) { |
|
| 406 | 406 | return true; |
| 407 | 407 | } |
| 408 | 408 | } |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | * |
| 436 | 436 | * @return bool |
| 437 | 437 | */ |
| 438 | - public function connected(){ |
|
| 438 | + public function connected() { |
|
| 439 | 439 | return (boolean) $this->stream; |
| 440 | 440 | } |
| 441 | 441 | |
@@ -482,10 +482,10 @@ discard block |
||
| 482 | 482 | $result[strtolower($tokens[1])] = $tokens[0]; |
| 483 | 483 | break; |
| 484 | 484 | case '[UIDVALIDITY': |
| 485 | - $result['uidvalidity'] = (int)$tokens[2]; |
|
| 485 | + $result['uidvalidity'] = (int) $tokens[2]; |
|
| 486 | 486 | break; |
| 487 | 487 | case '[UIDNEXT': |
| 488 | - $result['uidnext'] = (int)$tokens[2]; |
|
| 488 | + $result['uidnext'] = (int) $tokens[2]; |
|
| 489 | 489 | break; |
| 490 | 490 | default: |
| 491 | 491 | // ignore |
@@ -539,17 +539,17 @@ discard block |
||
| 539 | 539 | if (is_array($from)) { |
| 540 | 540 | $set = implode(',', $from); |
| 541 | 541 | } elseif ($to === null) { |
| 542 | - $set = (int)$from; |
|
| 542 | + $set = (int) $from; |
|
| 543 | 543 | } elseif ($to === INF) { |
| 544 | - $set = (int)$from . ':*'; |
|
| 545 | - } else { |
|
| 546 | - $set = (int)$from . ':' . (int)$to; |
|
| 544 | + $set = (int) $from.':*'; |
|
| 545 | + }else { |
|
| 546 | + $set = (int) $from.':'.(int) $to; |
|
| 547 | 547 | } |
| 548 | 548 | |
| 549 | - $items = (array)$items; |
|
| 549 | + $items = (array) $items; |
|
| 550 | 550 | $itemList = $this->escapeList($items); |
| 551 | 551 | |
| 552 | - $this->sendRequest(($uid ? 'UID ' : '') . 'FETCH', [$set, $itemList], $tag); |
|
| 552 | + $this->sendRequest(($uid ? 'UID ' : '').'FETCH', [$set, $itemList], $tag); |
|
| 553 | 553 | |
| 554 | 554 | $result = []; |
| 555 | 555 | $tokens = null; // define $tokens variable before first use |
@@ -564,9 +564,9 @@ discard block |
||
| 564 | 564 | $count = count($tokens[2]); |
| 565 | 565 | if ($tokens[2][$count - 2] == 'UID') { |
| 566 | 566 | $uidKey = $count - 1; |
| 567 | - } else if ($tokens[2][0] == 'UID') { |
|
| 567 | + }else if ($tokens[2][0] == 'UID') { |
|
| 568 | 568 | $uidKey = 1; |
| 569 | - } else { |
|
| 569 | + }else { |
|
| 570 | 570 | $uidKey = array_search('UID', $tokens[2]) + 1; |
| 571 | 571 | } |
| 572 | 572 | } |
@@ -582,7 +582,7 @@ discard block |
||
| 582 | 582 | $data = $tokens[2][1]; |
| 583 | 583 | } elseif ($uid && $tokens[2][2] == $items[0]) { |
| 584 | 584 | $data = $tokens[2][3]; |
| 585 | - } else { |
|
| 585 | + }else { |
|
| 586 | 586 | // maybe the server send an other field we didn't wanted |
| 587 | 587 | $count = count($tokens[2]); |
| 588 | 588 | // we start with 2, because 0 was already checked |
@@ -594,7 +594,7 @@ discard block |
||
| 594 | 594 | break; |
| 595 | 595 | } |
| 596 | 596 | } |
| 597 | - } else { |
|
| 597 | + }else { |
|
| 598 | 598 | $data = []; |
| 599 | 599 | while (key($tokens[2]) !== null) { |
| 600 | 600 | $data[current($tokens[2])] = next($tokens[2]); |
@@ -611,7 +611,7 @@ discard block |
||
| 611 | 611 | } |
| 612 | 612 | if ($uid) { |
| 613 | 613 | $result[$tokens[2][$uidKey]] = $data; |
| 614 | - }else{ |
|
| 614 | + }else { |
|
| 615 | 615 | $result[$tokens[0]] = $data; |
| 616 | 616 | } |
| 617 | 617 | } |
@@ -645,7 +645,7 @@ discard block |
||
| 645 | 645 | * @return array |
| 646 | 646 | * @throws RuntimeException |
| 647 | 647 | */ |
| 648 | - public function headers($uids, $rfc = "RFC822", $uid = false){ |
|
| 648 | + public function headers($uids, $rfc = "RFC822", $uid = false) { |
|
| 649 | 649 | return $this->fetch(["$rfc.HEADER"], $uids, null, $uid); |
| 650 | 650 | } |
| 651 | 651 | |
@@ -657,7 +657,7 @@ discard block |
||
| 657 | 657 | * @return array |
| 658 | 658 | * @throws RuntimeException |
| 659 | 659 | */ |
| 660 | - public function flags($uids, $uid = false){ |
|
| 660 | + public function flags($uids, $uid = false) { |
|
| 661 | 661 | return $this->fetch(["FLAGS"], $uids, null, $uid); |
| 662 | 662 | } |
| 663 | 663 | |
@@ -742,23 +742,23 @@ discard block |
||
| 742 | 742 | public function store(array $flags, $from, $to = null, $mode = null, $silent = true, $uid = false) { |
| 743 | 743 | $item = 'FLAGS'; |
| 744 | 744 | if ($mode == '+' || $mode == '-') { |
| 745 | - $item = $mode . $item; |
|
| 745 | + $item = $mode.$item; |
|
| 746 | 746 | } |
| 747 | 747 | if ($silent) { |
| 748 | 748 | $item .= '.SILENT'; |
| 749 | 749 | } |
| 750 | 750 | |
| 751 | 751 | $flags = $this->escapeList($flags); |
| 752 | - $set = (int)$from; |
|
| 752 | + $set = (int) $from; |
|
| 753 | 753 | if ($to !== null) { |
| 754 | - $set .= ':' . ($to == INF ? '*' : (int)$to); |
|
| 754 | + $set .= ':'.($to == INF ? '*' : (int) $to); |
|
| 755 | 755 | } |
| 756 | 756 | |
| 757 | 757 | $command = ($uid ? "UID " : "")."STORE"; |
| 758 | 758 | $result = $this->requestAndResponse($command, [$set, $item, $flags], $silent); |
| 759 | 759 | |
| 760 | 760 | if ($silent) { |
| 761 | - return (bool)$result; |
|
| 761 | + return (bool) $result; |
|
| 762 | 762 | } |
| 763 | 763 | |
| 764 | 764 | $tokens = $result; |
@@ -809,9 +809,9 @@ discard block |
||
| 809 | 809 | * @throws RuntimeException |
| 810 | 810 | */ |
| 811 | 811 | public function copyMessage($folder, $from, $to = null, $uid = false) { |
| 812 | - $set = (int)$from; |
|
| 812 | + $set = (int) $from; |
|
| 813 | 813 | if ($to !== null) { |
| 814 | - $set .= ':' . ($to == INF ? '*' : (int)$to); |
|
| 814 | + $set .= ':'.($to == INF ? '*' : (int) $to); |
|
| 815 | 815 | } |
| 816 | 816 | $command = ($uid ? "UID " : "")."COPY"; |
| 817 | 817 | |
@@ -830,9 +830,9 @@ discard block |
||
| 830 | 830 | * @throws RuntimeException |
| 831 | 831 | */ |
| 832 | 832 | public function moveMessage($folder, $from, $to = null, $uid = false) { |
| 833 | - $set = (int)$from; |
|
| 833 | + $set = (int) $from; |
|
| 834 | 834 | if ($to !== null) { |
| 835 | - $set .= ':' . ($to == INF ? '*' : (int)$to); |
|
| 835 | + $set .= ':'.($to == INF ? '*' : (int) $to); |
|
| 836 | 836 | } |
| 837 | 837 | $command = ($uid ? "UID " : "")."MOVE"; |
| 838 | 838 | |
@@ -1002,7 +1002,7 @@ discard block |
||
| 1002 | 1002 | $ids = []; |
| 1003 | 1003 | foreach ($uids as $msgn => $v) { |
| 1004 | 1004 | $id = $uid ? $v : $msgn; |
| 1005 | - if ( ($to >= $id && $from <= $id) || ($to === "*" && $from <= $id) ){ |
|
| 1005 | + if (($to >= $id && $from <= $id) || ($to === "*" && $from <= $id)) { |
|
| 1006 | 1006 | $ids[] = $id; |
| 1007 | 1007 | } |
| 1008 | 1008 | } |
@@ -1016,14 +1016,14 @@ discard block |
||
| 1016 | 1016 | /** |
| 1017 | 1017 | * Enable the debug mode |
| 1018 | 1018 | */ |
| 1019 | - public function enableDebug(){ |
|
| 1019 | + public function enableDebug() { |
|
| 1020 | 1020 | $this->debug = true; |
| 1021 | 1021 | } |
| 1022 | 1022 | |
| 1023 | 1023 | /** |
| 1024 | 1024 | * Disable the debug mode |
| 1025 | 1025 | */ |
| 1026 | - public function disableDebug(){ |
|
| 1026 | + public function disableDebug() { |
|
| 1027 | 1027 | $this->debug = false; |
| 1028 | 1028 | } |
| 1029 | 1029 | } |
| 1030 | 1030 | \ No newline at end of file |
@@ -159,10 +159,10 @@ discard block |
||
| 159 | 159 | * |
| 160 | 160 | * @throws InvalidMessageDateException |
| 161 | 161 | */ |
| 162 | - protected function parse(){ |
|
| 162 | + protected function parse() { |
|
| 163 | 163 | if ($this->header === null) { |
| 164 | 164 | $body = $this->findHeaders(); |
| 165 | - }else{ |
|
| 165 | + }else { |
|
| 166 | 166 | $body = $this->raw; |
| 167 | 167 | } |
| 168 | 168 | |
@@ -174,11 +174,11 @@ discard block |
||
| 174 | 174 | $this->name = $this->header->get("name"); |
| 175 | 175 | $this->filename = $this->header->get("filename"); |
| 176 | 176 | |
| 177 | - if(!empty($this->header->get("id"))) { |
|
| 177 | + if (!empty($this->header->get("id"))) { |
|
| 178 | 178 | $this->id = $this->header->get("id"); |
| 179 | - } else if(!empty($this->header->get("x_attachment_id"))){ |
|
| 179 | + }else if (!empty($this->header->get("x_attachment_id"))) { |
|
| 180 | 180 | $this->id = $this->header->get("x_attachment_id"); |
| 181 | - } else if(!empty($this->header->get("content_id"))){ |
|
| 181 | + }else if (!empty($this->header->get("content_id"))) { |
|
| 182 | 182 | $this->id = strtr($this->header->get("content_id"), [ |
| 183 | 183 | '<' => '', |
| 184 | 184 | '>' => '' |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | } |
| 187 | 187 | |
| 188 | 188 | $content_types = $this->header->get("content_type"); |
| 189 | - if(!empty($content_types)){ |
|
| 189 | + if (!empty($content_types)) { |
|
| 190 | 190 | $this->subtype = $this->parseSubtype($content_types); |
| 191 | 191 | $content_type = $content_types; |
| 192 | 192 | if (is_array($content_types)) { |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | * @return string |
| 208 | 208 | * @throws InvalidMessageDateException |
| 209 | 209 | */ |
| 210 | - private function findHeaders(){ |
|
| 210 | + private function findHeaders() { |
|
| 211 | 211 | $body = $this->raw; |
| 212 | 212 | while (($pos = strpos($body, "\r\n")) > 0) { |
| 213 | 213 | $body = substr($body, $pos + 2); |
@@ -226,16 +226,16 @@ discard block |
||
| 226 | 226 | * |
| 227 | 227 | * @return string |
| 228 | 228 | */ |
| 229 | - private function parseSubtype($content_type){ |
|
| 229 | + private function parseSubtype($content_type) { |
|
| 230 | 230 | if (is_array($content_type)) { |
| 231 | - foreach ($content_type as $part){ |
|
| 232 | - if ((strpos($part, "/")) !== false){ |
|
| 231 | + foreach ($content_type as $part) { |
|
| 232 | + if ((strpos($part, "/")) !== false) { |
|
| 233 | 233 | return $this->parseSubtype($part); |
| 234 | 234 | } |
| 235 | 235 | } |
| 236 | 236 | return null; |
| 237 | 237 | } |
| 238 | - if (($pos = strpos($content_type, "/")) !== false){ |
|
| 238 | + if (($pos = strpos($content_type, "/")) !== false) { |
|
| 239 | 239 | return substr($content_type, $pos + 1); |
| 240 | 240 | } |
| 241 | 241 | return null; |
@@ -244,9 +244,9 @@ discard block |
||
| 244 | 244 | /** |
| 245 | 245 | * Try to parse the disposition if any is present |
| 246 | 246 | */ |
| 247 | - private function parseDisposition(){ |
|
| 247 | + private function parseDisposition() { |
|
| 248 | 248 | $content_disposition = $this->header->get("content_disposition"); |
| 249 | - if($content_disposition !== null) { |
|
| 249 | + if ($content_disposition !== null) { |
|
| 250 | 250 | $this->ifdisposition = true; |
| 251 | 251 | $this->disposition = (is_array($content_disposition)) ? implode(' ', $content_disposition) : $content_disposition; |
| 252 | 252 | } |
@@ -255,9 +255,9 @@ discard block |
||
| 255 | 255 | /** |
| 256 | 256 | * Try to parse the description if any is present |
| 257 | 257 | */ |
| 258 | - private function parseDescription(){ |
|
| 258 | + private function parseDescription() { |
|
| 259 | 259 | $content_description = $this->header->get("content_description"); |
| 260 | - if($content_description !== null) { |
|
| 260 | + if ($content_description !== null) { |
|
| 261 | 261 | $this->ifdescription = true; |
| 262 | 262 | $this->description = $content_description; |
| 263 | 263 | } |
@@ -266,9 +266,9 @@ discard block |
||
| 266 | 266 | /** |
| 267 | 267 | * Try to parse the encoding if any is present |
| 268 | 268 | */ |
| 269 | - private function parseEncoding(){ |
|
| 269 | + private function parseEncoding() { |
|
| 270 | 270 | $encoding = $this->header->get("content_transfer_encoding"); |
| 271 | - if($encoding !== null) { |
|
| 271 | + if ($encoding !== null) { |
|
| 272 | 272 | switch (strtolower($encoding)) { |
| 273 | 273 | case "quoted-printable": |
| 274 | 274 | $this->encoding = IMAP::MESSAGE_ENC_QUOTED_PRINTABLE; |
@@ -298,7 +298,7 @@ discard block |
||
| 298 | 298 | * |
| 299 | 299 | * @return bool |
| 300 | 300 | */ |
| 301 | - public function isAttachment(){ |
|
| 301 | + public function isAttachment() { |
|
| 302 | 302 | $valid_disposition = in_array(strtolower($this->disposition), ClientManager::get('options.dispositions')); |
| 303 | 303 | |
| 304 | 304 | if ($this->type == IMAP::MESSAGE_TYPE_TEXT && ($this->ifdisposition == 0 || (empty($this->disposition))) && !$valid_disposition) { |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | * @throws MessageContentFetchingException |
| 78 | 78 | * @throws InvalidMessageDateException |
| 79 | 79 | */ |
| 80 | - protected function parse(){ |
|
| 80 | + protected function parse() { |
|
| 81 | 81 | $this->findContentType(); |
| 82 | 82 | $this->parts = $this->find_parts(); |
| 83 | 83 | } |
@@ -85,12 +85,12 @@ discard block |
||
| 85 | 85 | /** |
| 86 | 86 | * Determine the message content type |
| 87 | 87 | */ |
| 88 | - public function findContentType(){ |
|
| 88 | + public function findContentType() { |
|
| 89 | 89 | $content_type = $this->header->get("content_type"); |
| 90 | 90 | $content_type = (is_array($content_type)) ? implode(' ', $content_type) : $content_type; |
| 91 | - if(stripos($content_type, 'multipart') === 0) { |
|
| 91 | + if (stripos($content_type, 'multipart') === 0) { |
|
| 92 | 92 | $this->type = IMAP::MESSAGE_TYPE_MULTIPART; |
| 93 | - }else{ |
|
| 93 | + }else { |
|
| 94 | 94 | $this->type = IMAP::MESSAGE_TYPE_TEXT; |
| 95 | 95 | } |
| 96 | 96 | } |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | * @return Part[] |
| 104 | 104 | * @throws InvalidMessageDateException |
| 105 | 105 | */ |
| 106 | - private function parsePart($context, $part_number = 0){ |
|
| 106 | + private function parsePart($context, $part_number = 0) { |
|
| 107 | 107 | $body = $context; |
| 108 | 108 | while (($pos = strpos($body, "\r\n")) > 0) { |
| 109 | 109 | $body = substr($body, $pos + 2); |
@@ -126,10 +126,10 @@ discard block |
||
| 126 | 126 | * @return array |
| 127 | 127 | * @throws InvalidMessageDateException |
| 128 | 128 | */ |
| 129 | - private function detectParts($boundary, $context, $part_number = 0){ |
|
| 130 | - $base_parts = explode( $boundary, $context); |
|
| 129 | + private function detectParts($boundary, $context, $part_number = 0) { |
|
| 130 | + $base_parts = explode($boundary, $context); |
|
| 131 | 131 | $final_parts = []; |
| 132 | - foreach($base_parts as $ctx) { |
|
| 132 | + foreach ($base_parts as $ctx) { |
|
| 133 | 133 | $ctx = substr($ctx, 2); |
| 134 | 134 | if ($ctx !== "--" && $ctx != "") { |
| 135 | 135 | $parts = $this->parsePart($ctx, $part_number); |
@@ -150,9 +150,9 @@ discard block |
||
| 150 | 150 | * @throws MessageContentFetchingException |
| 151 | 151 | * @throws InvalidMessageDateException |
| 152 | 152 | */ |
| 153 | - public function find_parts(){ |
|
| 154 | - if($this->type === IMAP::MESSAGE_TYPE_MULTIPART) { |
|
| 155 | - if (($boundary = $this->header->getBoundary()) === null) { |
|
| 153 | + public function find_parts() { |
|
| 154 | + if ($this->type === IMAP::MESSAGE_TYPE_MULTIPART) { |
|
| 155 | + if (($boundary = $this->header->getBoundary()) === null) { |
|
| 156 | 156 | throw new MessageContentFetchingException("no content found", 0); |
| 157 | 157 | } |
| 158 | 158 | |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | * @return string|null |
| 169 | 169 | * @Depricated since version 2.4.4 |
| 170 | 170 | */ |
| 171 | - public function getBoundary(){ |
|
| 171 | + public function getBoundary() { |
|
| 172 | 172 | return $this->header->getBoundary(); |
| 173 | 173 | } |
| 174 | 174 | } |
@@ -85,8 +85,8 @@ discard block |
||
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | if (strpos(strtolower($name), "where") === false) { |
| 88 | - $method = 'where' . ucfirst($name); |
|
| 89 | - } else { |
|
| 88 | + $method = 'where'.ucfirst($name); |
|
| 89 | + }else { |
|
| 90 | 90 | $method = lcfirst($name); |
| 91 | 91 | } |
| 92 | 92 | |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | return call_user_func_array([$that, $method], $arguments); |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | - throw new MethodNotFoundException("Method " . self::class . '::' . $method . '() is not supported'); |
|
| 97 | + throw new MethodNotFoundException("Method ".self::class.'::'.$method.'() is not supported'); |
|
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | /** |
@@ -131,13 +131,13 @@ discard block |
||
| 131 | 131 | } |
| 132 | 132 | return $this->where($key, $value); |
| 133 | 133 | } |
| 134 | - } else { |
|
| 134 | + }else { |
|
| 135 | 135 | $criteria = $this->validate_criteria($criteria); |
| 136 | 136 | $value = $this->parse_value($value); |
| 137 | 137 | |
| 138 | 138 | if ($value === null || $value === '') { |
| 139 | 139 | $this->query->push([$criteria]); |
| 140 | - } else { |
|
| 140 | + }else { |
|
| 141 | 141 | $this->query->push([$criteria, $value]); |
| 142 | 142 | } |
| 143 | 143 | } |
@@ -30,13 +30,13 @@ discard block |
||
| 30 | 30 | * |
| 31 | 31 | * @return null |
| 32 | 32 | */ |
| 33 | - public function getHtmlBody(){ |
|
| 33 | + public function getHtmlBody() { |
|
| 34 | 34 | $bodies = $this->parent->getBodies(); |
| 35 | 35 | if (!isset($bodies['html'])) { |
| 36 | 36 | return null; |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | - if(is_object($bodies['html']) && property_exists($bodies['html'], 'content')) { |
|
| 39 | + if (is_object($bodies['html']) && property_exists($bodies['html'], 'content')) { |
|
| 40 | 40 | return $bodies['html']->content; |
| 41 | 41 | } |
| 42 | 42 | return $bodies['html']; |
@@ -50,15 +50,15 @@ discard block |
||
| 50 | 50 | */ |
| 51 | 51 | public function getCustomHTMLBody($callback = false) { |
| 52 | 52 | $body = $this->getHtmlBody(); |
| 53 | - if($body === null) return null; |
|
| 53 | + if ($body === null) return null; |
|
| 54 | 54 | |
| 55 | 55 | if ($callback !== false) { |
| 56 | 56 | $aAttachment = $this->parent->getAttachments(); |
| 57 | 57 | $aAttachment->each(function($oAttachment) use(&$body, $callback) { |
| 58 | 58 | /** @var Attachment $oAttachment */ |
| 59 | - if(is_callable($callback)) { |
|
| 59 | + if (is_callable($callback)) { |
|
| 60 | 60 | $body = $callback($body, $oAttachment); |
| 61 | - }elseif(is_string($callback)) { |
|
| 61 | + }elseif (is_string($callback)) { |
|
| 62 | 62 | call_user_func($callback, [$body, $oAttachment]); |
| 63 | 63 | } |
| 64 | 64 | }); |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | * @return string|null |
| 75 | 75 | */ |
| 76 | 76 | public function getHTMLBodyWithEmbeddedBase64Images() { |
| 77 | - return $this->getCustomHTMLBody(function($body, $oAttachment){ |
|
| 77 | + return $this->getCustomHTMLBody(function($body, $oAttachment) { |
|
| 78 | 78 | /** @var Attachment $oAttachment */ |
| 79 | 79 | if ($oAttachment->id) { |
| 80 | 80 | $body = str_replace('cid:'.$oAttachment->id, 'data:'.$oAttachment->getContentType().';base64, '.base64_encode($oAttachment->getContent()), $body); |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | |
| 123 | 123 | $this->setDelimiter($delimiter); |
| 124 | 124 | $this->path = $folder_name; |
| 125 | - $this->full_name = $this->decodeName($folder_name); |
|
| 125 | + $this->full_name = $this->decodeName($folder_name); |
|
| 126 | 126 | $this->name = $this->getSimpleName($this->delimiter, $this->full_name); |
| 127 | 127 | |
| 128 | 128 | $this->parseAttributes($attributes); |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | * @throws Exceptions\ConnectionFailedException |
| 137 | 137 | * @throws Exceptions\RuntimeException |
| 138 | 138 | */ |
| 139 | - public function query($charset = 'UTF-8'){ |
|
| 139 | + public function query($charset = 'UTF-8') { |
|
| 140 | 140 | $this->getClient()->checkConnection(); |
| 141 | 141 | $this->getClient()->openFolder($this->path); |
| 142 | 142 | |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | * @throws Exceptions\ConnectionFailedException |
| 149 | 149 | * @throws Exceptions\RuntimeException |
| 150 | 150 | */ |
| 151 | - public function search($charset = 'UTF-8'){ |
|
| 151 | + public function search($charset = 'UTF-8') { |
|
| 152 | 152 | return $this->query($charset); |
| 153 | 153 | } |
| 154 | 154 | |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | * @throws Exceptions\ConnectionFailedException |
| 158 | 158 | * @throws Exceptions\RuntimeException |
| 159 | 159 | */ |
| 160 | - public function messages($charset = 'UTF-8'){ |
|
| 160 | + public function messages($charset = 'UTF-8') { |
|
| 161 | 161 | return $this->query($charset); |
| 162 | 162 | } |
| 163 | 163 | |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | public function move($new_name, $expunge = true) { |
| 233 | 233 | $this->client->checkConnection(); |
| 234 | 234 | $status = $this->client->getConnection()->renameFolder($this->full_name, $new_name); |
| 235 | - if($expunge) $this->client->expunge(); |
|
| 235 | + if ($expunge) $this->client->expunge(); |
|
| 236 | 236 | |
| 237 | 237 | $folder = $this->client->getFolder($new_name); |
| 238 | 238 | $event = $this->getEvent("folder", "moved"); |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | * @throws Exceptions\MessageNotFoundException |
| 252 | 252 | * @throws Exceptions\RuntimeException |
| 253 | 253 | */ |
| 254 | - public function overview($sequence = null){ |
|
| 254 | + public function overview($sequence = null) { |
|
| 255 | 255 | $this->client->openFolder($this->path); |
| 256 | 256 | $sequence = $sequence === null ? "1:*" : $sequence; |
| 257 | 257 | $uid = ClientManager::get('options.sequence', IMAP::ST_MSGN) == IMAP::ST_UID; |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | */ |
| 277 | 277 | |
| 278 | 278 | if ($internal_date != null) { |
| 279 | - if ($internal_date instanceof Carbon){ |
|
| 279 | + if ($internal_date instanceof Carbon) { |
|
| 280 | 280 | $internal_date = $internal_date->format('d-M-Y H:i:s O'); |
| 281 | 281 | } |
| 282 | 282 | } |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | */ |
| 311 | 311 | public function delete($expunge = true) { |
| 312 | 312 | $status = $this->client->getConnection()->deleteFolder($this->path); |
| 313 | - if($expunge) $this->client->expunge(); |
|
| 313 | + if ($expunge) $this->client->expunge(); |
|
| 314 | 314 | |
| 315 | 315 | $event = $this->getEvent("folder", "deleted"); |
| 316 | 316 | $event::dispatch($this); |
@@ -371,7 +371,7 @@ discard block |
||
| 371 | 371 | try { |
| 372 | 372 | $line = $connection->nextLine(); |
| 373 | 373 | if (($pos = strpos($line, "EXISTS")) !== false) { |
| 374 | - $msgn = (int) substr($line, 2, $pos -2); |
|
| 374 | + $msgn = (int) substr($line, 2, $pos - 2); |
|
| 375 | 375 | $connection->done(); |
| 376 | 376 | |
| 377 | 377 | $this->client->openFolder($this->path, true); |
@@ -384,8 +384,8 @@ discard block |
||
| 384 | 384 | |
| 385 | 385 | $connection->idle(); |
| 386 | 386 | } |
| 387 | - }catch (Exceptions\RuntimeException $e) { |
|
| 388 | - if(strpos($e->getMessage(), "connection closed") === false) { |
|
| 387 | + } catch (Exceptions\RuntimeException $e) { |
|
| 388 | + if (strpos($e->getMessage(), "connection closed") === false) { |
|
| 389 | 389 | throw $e; |
| 390 | 390 | } |
| 391 | 391 | if ($auto_reconnect === true) { |
@@ -434,8 +434,8 @@ discard block |
||
| 434 | 434 | * Set the delimiter |
| 435 | 435 | * @param $delimiter |
| 436 | 436 | */ |
| 437 | - public function setDelimiter($delimiter){ |
|
| 438 | - if(in_array($delimiter, [null, '', ' ', false]) === true) { |
|
| 437 | + public function setDelimiter($delimiter) { |
|
| 438 | + if (in_array($delimiter, [null, '', ' ', false]) === true) { |
|
| 439 | 439 | $delimiter = ClientManager::get('options.delimiter', '/'); |
| 440 | 440 | } |
| 441 | 441 | |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | |
| 96 | 96 | if (ClientManager::get('options.fetch_order') === 'desc') { |
| 97 | 97 | $this->fetch_order = 'desc'; |
| 98 | - } else { |
|
| 98 | + }else { |
|
| 99 | 99 | $this->fetch_order = 'asc'; |
| 100 | 100 | } |
| 101 | 101 | |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | break; |
| 127 | 127 | } |
| 128 | 128 | |
| 129 | - return (string)$value; |
|
| 129 | + return (string) $value; |
|
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | /** |
@@ -158,11 +158,11 @@ discard block |
||
| 158 | 158 | $this->query->each(function($statement) use (&$query) { |
| 159 | 159 | if (count($statement) == 1) { |
| 160 | 160 | $query .= $statement[0]; |
| 161 | - } else { |
|
| 161 | + }else { |
|
| 162 | 162 | if ($statement[1] === null) { |
| 163 | 163 | $query .= $statement[0]; |
| 164 | - } else { |
|
| 165 | - $query .= $statement[0] . ' "' . $statement[1] . '"'; |
|
| 164 | + }else { |
|
| 165 | + $query .= $statement[0].' "'.$statement[1].'"'; |
|
| 166 | 166 | } |
| 167 | 167 | } |
| 168 | 168 | $query .= ' '; |
@@ -247,18 +247,18 @@ discard block |
||
| 247 | 247 | * @throws GetMessagesFailedException |
| 248 | 248 | * @throws ReflectionException |
| 249 | 249 | */ |
| 250 | - protected function make($uid, $msglist, $header, $content, $flags){ |
|
| 250 | + protected function make($uid, $msglist, $header, $content, $flags) { |
|
| 251 | 251 | try { |
| 252 | 252 | return Message::make($uid, $msglist, $this->getClient(), $header, $content, $flags, $this->getFetchOptions(), $this->sequence); |
| 253 | - }catch (MessageNotFoundException $e) { |
|
| 253 | + } catch (MessageNotFoundException $e) { |
|
| 254 | 254 | $this->setError($uid, $e); |
| 255 | - }catch (RuntimeException $e) { |
|
| 255 | + } catch (RuntimeException $e) { |
|
| 256 | 256 | $this->setError($uid, $e); |
| 257 | - }catch (MessageFlagException $e) { |
|
| 257 | + } catch (MessageFlagException $e) { |
|
| 258 | 258 | $this->setError($uid, $e); |
| 259 | - }catch (InvalidMessageDateException $e) { |
|
| 259 | + } catch (InvalidMessageDateException $e) { |
|
| 260 | 260 | $this->setError($uid, $e); |
| 261 | - }catch (MessageContentFetchingException $e) { |
|
| 261 | + } catch (MessageContentFetchingException $e) { |
|
| 262 | 262 | $this->setError($uid, $e); |
| 263 | 263 | } |
| 264 | 264 | |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | * |
| 276 | 276 | * @return string |
| 277 | 277 | */ |
| 278 | - protected function getMessageKey($message_key, $msglist, $message){ |
|
| 278 | + protected function getMessageKey($message_key, $msglist, $message) { |
|
| 279 | 279 | switch ($message_key) { |
| 280 | 280 | case 'number': |
| 281 | 281 | $key = $message->getMessageNo(); |
@@ -290,7 +290,7 @@ discard block |
||
| 290 | 290 | $key = $message->getMessageId(); |
| 291 | 291 | break; |
| 292 | 292 | } |
| 293 | - return (string)$key; |
|
| 293 | + return (string) $key; |
|
| 294 | 294 | } |
| 295 | 295 | |
| 296 | 296 | /** |
@@ -782,7 +782,7 @@ discard block |
||
| 782 | 782 | * |
| 783 | 783 | * @return boolean |
| 784 | 784 | */ |
| 785 | - public function hasErrors($uid = null){ |
|
| 785 | + public function hasErrors($uid = null) { |
|
| 786 | 786 | if ($uid !== null) { |
| 787 | 787 | return $this->hasError($uid); |
| 788 | 788 | } |
@@ -795,7 +795,7 @@ discard block |
||
| 795 | 795 | * |
| 796 | 796 | * @return boolean |
| 797 | 797 | */ |
| 798 | - public function hasError($uid){ |
|
| 798 | + public function hasError($uid) { |
|
| 799 | 799 | return isset($this->errors[$uid]); |
| 800 | 800 | } |
| 801 | 801 | |
@@ -804,7 +804,7 @@ discard block |
||
| 804 | 804 | * |
| 805 | 805 | * @return array |
| 806 | 806 | */ |
| 807 | - public function errors(){ |
|
| 807 | + public function errors() { |
|
| 808 | 808 | return $this->getErrors(); |
| 809 | 809 | } |
| 810 | 810 | |
@@ -813,7 +813,7 @@ discard block |
||
| 813 | 813 | * |
| 814 | 814 | * @return array |
| 815 | 815 | */ |
| 816 | - public function getErrors(){ |
|
| 816 | + public function getErrors() { |
|
| 817 | 817 | return $this->errors; |
| 818 | 818 | } |
| 819 | 819 | |
@@ -823,7 +823,7 @@ discard block |
||
| 823 | 823 | * |
| 824 | 824 | * @return Exception|null |
| 825 | 825 | */ |
| 826 | - public function error($uid){ |
|
| 826 | + public function error($uid) { |
|
| 827 | 827 | return $this->getError($uid); |
| 828 | 828 | } |
| 829 | 829 | |
@@ -833,7 +833,7 @@ discard block |
||
| 833 | 833 | * |
| 834 | 834 | * @return Exception|null |
| 835 | 835 | */ |
| 836 | - public function getError($uid){ |
|
| 836 | + public function getError($uid) { |
|
| 837 | 837 | if ($this->hasError($uid)) { |
| 838 | 838 | return $this->errors[$uid]; |
| 839 | 839 | } |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | $this->boot(); |
| 193 | 193 | |
| 194 | 194 | $default_mask = $client->getDefaultMessageMask(); |
| 195 | - if($default_mask != null) { |
|
| 195 | + if ($default_mask != null) { |
|
| 196 | 196 | $this->mask = $default_mask; |
| 197 | 197 | } |
| 198 | 198 | $this->events["message"] = $client->getDefaultEvents("message"); |
@@ -246,14 +246,14 @@ discard block |
||
| 246 | 246 | * @throws Exceptions\RuntimeException |
| 247 | 247 | * @throws Exceptions\MessageNotFoundException |
| 248 | 248 | */ |
| 249 | - public static function make($uid, $msglist, Client $client, $raw_header, $raw_body, $raw_flags, $fetch_options = null, $sequence = null){ |
|
| 249 | + public static function make($uid, $msglist, Client $client, $raw_header, $raw_body, $raw_flags, $fetch_options = null, $sequence = null) { |
|
| 250 | 250 | $reflection = new ReflectionClass(self::class); |
| 251 | 251 | /** @var self $instance */ |
| 252 | 252 | $instance = $reflection->newInstanceWithoutConstructor(); |
| 253 | 253 | $instance->boot(); |
| 254 | 254 | |
| 255 | 255 | $default_mask = $client->getDefaultMessageMask(); |
| 256 | - if($default_mask != null) { |
|
| 256 | + if ($default_mask != null) { |
|
| 257 | 257 | $instance->setMask($default_mask); |
| 258 | 258 | } |
| 259 | 259 | $instance->setEvents([ |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | /** |
| 279 | 279 | * Boot a new instance |
| 280 | 280 | */ |
| 281 | - public function boot(){ |
|
| 281 | + public function boot() { |
|
| 282 | 282 | $this->attributes = []; |
| 283 | 283 | |
| 284 | 284 | $this->config = ClientManager::get('options'); |
@@ -297,13 +297,13 @@ discard block |
||
| 297 | 297 | * @throws MethodNotFoundException |
| 298 | 298 | */ |
| 299 | 299 | public function __call($method, $arguments) { |
| 300 | - if(strtolower(substr($method, 0, 3)) === 'get') { |
|
| 300 | + if (strtolower(substr($method, 0, 3)) === 'get') { |
|
| 301 | 301 | $name = Str::snake(substr($method, 3)); |
| 302 | 302 | return $this->get($name); |
| 303 | 303 | }elseif (strtolower(substr($method, 0, 3)) === 'set') { |
| 304 | 304 | $name = Str::snake(substr($method, 3)); |
| 305 | 305 | |
| 306 | - if(in_array($name, array_keys($this->attributes))) { |
|
| 306 | + if (in_array($name, array_keys($this->attributes))) { |
|
| 307 | 307 | return $this->__set($name, array_pop($arguments)); |
| 308 | 308 | } |
| 309 | 309 | |
@@ -342,7 +342,7 @@ discard block |
||
| 342 | 342 | * @return Attribute|mixed|null |
| 343 | 343 | */ |
| 344 | 344 | public function get($name) { |
| 345 | - if(isset($this->attributes[$name])) { |
|
| 345 | + if (isset($this->attributes[$name])) { |
|
| 346 | 346 | return $this->attributes[$name]; |
| 347 | 347 | } |
| 348 | 348 | |
@@ -416,7 +416,7 @@ discard block |
||
| 416 | 416 | * |
| 417 | 417 | * @throws InvalidMessageDateException |
| 418 | 418 | */ |
| 419 | - public function parseRawHeader($raw_header){ |
|
| 419 | + public function parseRawHeader($raw_header) { |
|
| 420 | 420 | $this->header = new Header($raw_header); |
| 421 | 421 | } |
| 422 | 422 | |
@@ -427,8 +427,8 @@ discard block |
||
| 427 | 427 | public function parseRawFlags($raw_flags) { |
| 428 | 428 | $this->flags = FlagCollection::make([]); |
| 429 | 429 | |
| 430 | - foreach($raw_flags as $flag) { |
|
| 431 | - if (strpos($flag, "\\") === 0){ |
|
| 430 | + foreach ($raw_flags as $flag) { |
|
| 431 | + if (strpos($flag, "\\") === 0) { |
|
| 432 | 432 | $flag = substr($flag, 1); |
| 433 | 433 | } |
| 434 | 434 | $flag_key = strtolower($flag); |
@@ -501,7 +501,7 @@ discard block |
||
| 501 | 501 | * @throws MessageFlagException |
| 502 | 502 | * @throws Exceptions\RuntimeException |
| 503 | 503 | */ |
| 504 | - public function peek(){ |
|
| 504 | + public function peek() { |
|
| 505 | 505 | if ($this->fetch_options == IMAP::FT_PEEK) { |
| 506 | 506 | if ($this->getFlags()->get("seen") == null) { |
| 507 | 507 | $this->unsetFlag("Seen"); |
@@ -550,7 +550,7 @@ discard block |
||
| 550 | 550 | private function fetchPart(Part $part) { |
| 551 | 551 | if ($part->isAttachment()) { |
| 552 | 552 | $this->fetchAttachment($part); |
| 553 | - }else{ |
|
| 553 | + }else { |
|
| 554 | 554 | $encoding = $this->getEncoding($part); |
| 555 | 555 | |
| 556 | 556 | $content = $this->decodeString($part->content, $part->encoding); |
@@ -575,7 +575,7 @@ discard block |
||
| 575 | 575 | |
| 576 | 576 | if (isset($this->bodies[$subtype])) { |
| 577 | 577 | $this->bodies[$subtype] .= "\n".$content; |
| 578 | - }else{ |
|
| 578 | + }else { |
|
| 579 | 579 | $this->bodies[$subtype] = $content; |
| 580 | 580 | } |
| 581 | 581 | } |
@@ -591,7 +591,7 @@ discard block |
||
| 591 | 591 | if ($oAttachment->getName() !== null && $oAttachment->getSize() > 0) { |
| 592 | 592 | if ($oAttachment->getId() !== null) { |
| 593 | 593 | $this->attachments->put($oAttachment->getId(), $oAttachment); |
| 594 | - } else { |
|
| 594 | + }else { |
|
| 595 | 595 | $this->attachments->push($oAttachment); |
| 596 | 596 | } |
| 597 | 597 | } |
@@ -725,7 +725,7 @@ discard block |
||
| 725 | 725 | |
| 726 | 726 | if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7') { |
| 727 | 727 | return @iconv($from, $to.'//IGNORE', $str); |
| 728 | - } else { |
|
| 728 | + }else { |
|
| 729 | 729 | if (!$from) { |
| 730 | 730 | return mb_convert_encoding($str, $to); |
| 731 | 731 | } |
@@ -746,9 +746,9 @@ discard block |
||
| 746 | 746 | return EncodingAliases::get($parameter->value); |
| 747 | 747 | } |
| 748 | 748 | } |
| 749 | - }elseif (property_exists($structure, 'charset')){ |
|
| 749 | + }elseif (property_exists($structure, 'charset')) { |
|
| 750 | 750 | return EncodingAliases::get($structure->charset); |
| 751 | - }elseif (is_string($structure) === true){ |
|
| 751 | + }elseif (is_string($structure) === true) { |
|
| 752 | 752 | return mb_detect_encoding($structure); |
| 753 | 753 | } |
| 754 | 754 | |
@@ -763,7 +763,7 @@ discard block |
||
| 763 | 763 | * @throws Exceptions\FolderFetchingException |
| 764 | 764 | * @throws Exceptions\RuntimeException |
| 765 | 765 | */ |
| 766 | - public function getFolder(){ |
|
| 766 | + public function getFolder() { |
|
| 767 | 767 | return $this->client->getFolderByPath($this->folder_path); |
| 768 | 768 | } |
| 769 | 769 | |
@@ -779,13 +779,13 @@ discard block |
||
| 779 | 779 | * @throws Exceptions\GetMessagesFailedException |
| 780 | 780 | * @throws Exceptions\RuntimeException |
| 781 | 781 | */ |
| 782 | - public function thread($sent_folder = null, &$thread = null, $folder = null){ |
|
| 782 | + public function thread($sent_folder = null, &$thread = null, $folder = null) { |
|
| 783 | 783 | $thread = $thread ? $thread : MessageCollection::make([]); |
| 784 | - $folder = $folder ? $folder : $this->getFolder(); |
|
| 784 | + $folder = $folder ? $folder : $this->getFolder(); |
|
| 785 | 785 | $sent_folder = $sent_folder ? $sent_folder : $this->client->getFolderByPath(ClientManager::get("options.common_folders.sent", "INBOX/Sent")); |
| 786 | 786 | |
| 787 | 787 | /** @var Message $message */ |
| 788 | - foreach($thread as $message) { |
|
| 788 | + foreach ($thread as $message) { |
|
| 789 | 789 | if ($message->message_id->first() == $this->message_id->first()) { |
| 790 | 790 | return $thread; |
| 791 | 791 | } |
@@ -796,7 +796,7 @@ discard block |
||
| 796 | 796 | $this->fetchThreadByInReplyTo($thread, $this->message_id, $sent_folder, $folder, $sent_folder); |
| 797 | 797 | |
| 798 | 798 | if (is_array($this->in_reply_to)) { |
| 799 | - foreach($this->in_reply_to as $in_reply_to) { |
|
| 799 | + foreach ($this->in_reply_to as $in_reply_to) { |
|
| 800 | 800 | $this->fetchThreadByMessageId($thread, $in_reply_to, $folder, $folder, $sent_folder); |
| 801 | 801 | $this->fetchThreadByMessageId($thread, $in_reply_to, $sent_folder, $folder, $sent_folder); |
| 802 | 802 | } |
@@ -817,7 +817,7 @@ discard block |
||
| 817 | 817 | * @throws Exceptions\GetMessagesFailedException |
| 818 | 818 | * @throws Exceptions\RuntimeException |
| 819 | 819 | */ |
| 820 | - protected function fetchThreadByInReplyTo(&$thread, $in_reply_to, $primary_folder, $secondary_folder, $sent_folder){ |
|
| 820 | + protected function fetchThreadByInReplyTo(&$thread, $in_reply_to, $primary_folder, $secondary_folder, $sent_folder) { |
|
| 821 | 821 | $primary_folder->query()->inReplyTo($in_reply_to) |
| 822 | 822 | ->setFetchBody($this->getFetchBodyOption()) |
| 823 | 823 | ->leaveUnread()->get()->each(function($message) use(&$thread, $secondary_folder, $sent_folder){ |
@@ -838,7 +838,7 @@ discard block |
||
| 838 | 838 | * @throws Exceptions\GetMessagesFailedException |
| 839 | 839 | * @throws Exceptions\RuntimeException |
| 840 | 840 | */ |
| 841 | - protected function fetchThreadByMessageId(&$thread, $message_id, $primary_folder, $secondary_folder, $sent_folder){ |
|
| 841 | + protected function fetchThreadByMessageId(&$thread, $message_id, $primary_folder, $secondary_folder, $sent_folder) { |
|
| 842 | 842 | $primary_folder->query()->messageId($message_id) |
| 843 | 843 | ->setFetchBody($this->getFetchBodyOption()) |
| 844 | 844 | ->leaveUnread()->get()->each(function($message) use(&$thread, $secondary_folder, $sent_folder){ |
@@ -934,14 +934,14 @@ discard block |
||
| 934 | 934 | * @throws MessageFlagException |
| 935 | 935 | * @throws MessageHeaderFetchingException |
| 936 | 936 | */ |
| 937 | - protected function fetchNewMail($folder, $next_uid, $event, $expunge){ |
|
| 938 | - if($expunge) $this->client->expunge(); |
|
| 937 | + protected function fetchNewMail($folder, $next_uid, $event, $expunge) { |
|
| 938 | + if ($expunge) $this->client->expunge(); |
|
| 939 | 939 | |
| 940 | 940 | $this->client->openFolder($folder->path); |
| 941 | 941 | |
| 942 | 942 | if ($this->sequence === IMAP::ST_UID) { |
| 943 | 943 | $sequence_id = $next_uid; |
| 944 | - }else{ |
|
| 944 | + }else { |
|
| 945 | 945 | $sequence_id = $this->client->getConnection()->getMessageNumber($next_uid); |
| 946 | 946 | } |
| 947 | 947 | |
@@ -964,7 +964,7 @@ discard block |
||
| 964 | 964 | */ |
| 965 | 965 | public function delete($expunge = true) { |
| 966 | 966 | $status = $this->setFlag("Deleted"); |
| 967 | - if($expunge) $this->client->expunge(); |
|
| 967 | + if ($expunge) $this->client->expunge(); |
|
| 968 | 968 | |
| 969 | 969 | $event = $this->getEvent("message", "deleted"); |
| 970 | 970 | $event::dispatch($this); |
@@ -984,7 +984,7 @@ discard block |
||
| 984 | 984 | */ |
| 985 | 985 | public function restore($expunge = true) { |
| 986 | 986 | $status = $this->unsetFlag("Deleted"); |
| 987 | - if($expunge) $this->client->expunge(); |
|
| 987 | + if ($expunge) $this->client->expunge(); |
|
| 988 | 988 | |
| 989 | 989 | $event = $this->getEvent("message", "restored"); |
| 990 | 990 | $event::dispatch($this); |
@@ -1089,7 +1089,7 @@ discard block |
||
| 1089 | 1089 | * |
| 1090 | 1090 | * @return AttachmentCollection |
| 1091 | 1091 | */ |
| 1092 | - public function attachments(){ |
|
| 1092 | + public function attachments() { |
|
| 1093 | 1093 | return $this->getAttachments(); |
| 1094 | 1094 | } |
| 1095 | 1095 | |
@@ -1187,7 +1187,7 @@ discard block |
||
| 1187 | 1187 | * |
| 1188 | 1188 | * @return FlagCollection |
| 1189 | 1189 | */ |
| 1190 | - public function flags(){ |
|
| 1190 | + public function flags() { |
|
| 1191 | 1191 | return $this->getFlags(); |
| 1192 | 1192 | } |
| 1193 | 1193 | |
@@ -1196,7 +1196,7 @@ discard block |
||
| 1196 | 1196 | * |
| 1197 | 1197 | * @return Structure|null |
| 1198 | 1198 | */ |
| 1199 | - public function getStructure(){ |
|
| 1199 | + public function getStructure() { |
|
| 1200 | 1200 | return $this->structure; |
| 1201 | 1201 | } |
| 1202 | 1202 | |
@@ -1222,7 +1222,7 @@ discard block |
||
| 1222 | 1222 | * |
| 1223 | 1223 | * @return array |
| 1224 | 1224 | */ |
| 1225 | - public function getAttributes(){ |
|
| 1225 | + public function getAttributes() { |
|
| 1226 | 1226 | return array_merge($this->attributes, $this->header->getAttributes()); |
| 1227 | 1227 | } |
| 1228 | 1228 | |
@@ -1232,8 +1232,8 @@ discard block |
||
| 1232 | 1232 | * |
| 1233 | 1233 | * @return $this |
| 1234 | 1234 | */ |
| 1235 | - public function setMask($mask){ |
|
| 1236 | - if(class_exists($mask)){ |
|
| 1235 | + public function setMask($mask) { |
|
| 1236 | + if (class_exists($mask)) { |
|
| 1237 | 1237 | $this->mask = $mask; |
| 1238 | 1238 | } |
| 1239 | 1239 | |
@@ -1245,7 +1245,7 @@ discard block |
||
| 1245 | 1245 | * |
| 1246 | 1246 | * @return string |
| 1247 | 1247 | */ |
| 1248 | - public function getMask(){ |
|
| 1248 | + public function getMask() { |
|
| 1249 | 1249 | return $this->mask; |
| 1250 | 1250 | } |
| 1251 | 1251 | |
@@ -1256,9 +1256,9 @@ discard block |
||
| 1256 | 1256 | * @return mixed |
| 1257 | 1257 | * @throws MaskNotFoundException |
| 1258 | 1258 | */ |
| 1259 | - public function mask($mask = null){ |
|
| 1259 | + public function mask($mask = null) { |
|
| 1260 | 1260 | $mask = $mask !== null ? $mask : $this->mask; |
| 1261 | - if(class_exists($mask)){ |
|
| 1261 | + if (class_exists($mask)) { |
|
| 1262 | 1262 | return new $mask($this); |
| 1263 | 1263 | } |
| 1264 | 1264 | |
@@ -1271,7 +1271,7 @@ discard block |
||
| 1271 | 1271 | * |
| 1272 | 1272 | * @return $this |
| 1273 | 1273 | */ |
| 1274 | - public function setFolderPath($folder_path){ |
|
| 1274 | + public function setFolderPath($folder_path) { |
|
| 1275 | 1275 | $this->folder_path = $folder_path; |
| 1276 | 1276 | |
| 1277 | 1277 | return $this; |
@@ -1283,7 +1283,7 @@ discard block |
||
| 1283 | 1283 | * |
| 1284 | 1284 | * @return $this |
| 1285 | 1285 | */ |
| 1286 | - public function setConfig($config){ |
|
| 1286 | + public function setConfig($config) { |
|
| 1287 | 1287 | $this->config = $config; |
| 1288 | 1288 | |
| 1289 | 1289 | return $this; |
@@ -1295,7 +1295,7 @@ discard block |
||
| 1295 | 1295 | * |
| 1296 | 1296 | * @return $this |
| 1297 | 1297 | */ |
| 1298 | - public function setAvailableFlags($available_flags){ |
|
| 1298 | + public function setAvailableFlags($available_flags) { |
|
| 1299 | 1299 | $this->available_flags = $available_flags; |
| 1300 | 1300 | |
| 1301 | 1301 | return $this; |
@@ -1307,7 +1307,7 @@ discard block |
||
| 1307 | 1307 | * |
| 1308 | 1308 | * @return $this |
| 1309 | 1309 | */ |
| 1310 | - public function setAttachments($attachments){ |
|
| 1310 | + public function setAttachments($attachments) { |
|
| 1311 | 1311 | $this->attachments = $attachments; |
| 1312 | 1312 | |
| 1313 | 1313 | return $this; |
@@ -1319,7 +1319,7 @@ discard block |
||
| 1319 | 1319 | * |
| 1320 | 1320 | * @return $this |
| 1321 | 1321 | */ |
| 1322 | - public function setFlags($flags){ |
|
| 1322 | + public function setFlags($flags) { |
|
| 1323 | 1323 | $this->flags = $flags; |
| 1324 | 1324 | |
| 1325 | 1325 | return $this; |
@@ -1333,7 +1333,7 @@ discard block |
||
| 1333 | 1333 | * @throws Exceptions\RuntimeException |
| 1334 | 1334 | * @throws Exceptions\ConnectionFailedException |
| 1335 | 1335 | */ |
| 1336 | - public function setClient($client){ |
|
| 1336 | + public function setClient($client) { |
|
| 1337 | 1337 | $this->client = $client; |
| 1338 | 1338 | $this->client->openFolder($this->folder_path); |
| 1339 | 1339 | |
@@ -1348,7 +1348,7 @@ discard block |
||
| 1348 | 1348 | * @throws Exceptions\MessageNotFoundException |
| 1349 | 1349 | * @throws Exceptions\ConnectionFailedException |
| 1350 | 1350 | */ |
| 1351 | - public function setUid($uid){ |
|
| 1351 | + public function setUid($uid) { |
|
| 1352 | 1352 | $this->uid = $uid; |
| 1353 | 1353 | $this->msgn = $this->client->getConnection()->getMessageNumber($this->uid); |
| 1354 | 1354 | $this->msglist = null; |
@@ -1365,7 +1365,7 @@ discard block |
||
| 1365 | 1365 | * @throws Exceptions\MessageNotFoundException |
| 1366 | 1366 | * @throws Exceptions\ConnectionFailedException |
| 1367 | 1367 | */ |
| 1368 | - public function setMsgn($msgn, $msglist = null){ |
|
| 1368 | + public function setMsgn($msgn, $msglist = null) { |
|
| 1369 | 1369 | $this->msgn = $msgn; |
| 1370 | 1370 | $this->msglist = $msglist; |
| 1371 | 1371 | $this->uid = $this->client->getConnection()->getUid($this->msgn); |
@@ -1378,7 +1378,7 @@ discard block |
||
| 1378 | 1378 | * |
| 1379 | 1379 | * @return int |
| 1380 | 1380 | */ |
| 1381 | - public function getSequence(){ |
|
| 1381 | + public function getSequence() { |
|
| 1382 | 1382 | return $this->sequence; |
| 1383 | 1383 | } |
| 1384 | 1384 | |
@@ -1387,7 +1387,7 @@ discard block |
||
| 1387 | 1387 | * |
| 1388 | 1388 | * @return int |
| 1389 | 1389 | */ |
| 1390 | - public function getSequenceId(){ |
|
| 1390 | + public function getSequenceId() { |
|
| 1391 | 1391 | return $this->sequence === IMAP::ST_UID ? $this->uid : $this->msgn; |
| 1392 | 1392 | } |
| 1393 | 1393 | |
@@ -1399,11 +1399,11 @@ discard block |
||
| 1399 | 1399 | * @throws Exceptions\ConnectionFailedException |
| 1400 | 1400 | * @throws Exceptions\MessageNotFoundException |
| 1401 | 1401 | */ |
| 1402 | - public function setSequenceId($uid, $msglist = null){ |
|
| 1402 | + public function setSequenceId($uid, $msglist = null) { |
|
| 1403 | 1403 | if ($this->getSequence() === IMAP::ST_UID) { |
| 1404 | 1404 | $this->setUid($uid); |
| 1405 | 1405 | $this->setMsglist($msglist); |
| 1406 | - }else{ |
|
| 1406 | + }else { |
|
| 1407 | 1407 | $this->setMsgn($uid, $msglist); |
| 1408 | 1408 | } |
| 1409 | 1409 | } |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | * |
| 58 | 58 | * @return string |
| 59 | 59 | */ |
| 60 | - public function toString(){ |
|
| 60 | + public function toString() { |
|
| 61 | 61 | return $this->__toString(); |
| 62 | 62 | } |
| 63 | 63 | |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | * |
| 67 | 67 | * @return array |
| 68 | 68 | */ |
| 69 | - public function __serialize(){ |
|
| 69 | + public function __serialize() { |
|
| 70 | 70 | return $this->values; |
| 71 | 71 | } |
| 72 | 72 | |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | * |
| 76 | 76 | * @return array |
| 77 | 77 | */ |
| 78 | - public function toArray(){ |
|
| 78 | + public function toArray() { |
|
| 79 | 79 | return $this->__serialize(); |
| 80 | 80 | } |
| 81 | 81 | |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | * |
| 85 | 85 | * @return Carbon|null |
| 86 | 86 | */ |
| 87 | - public function toDate(){ |
|
| 87 | + public function toDate() { |
|
| 88 | 88 | $date = $this->first(); |
| 89 | 89 | if ($date instanceof Carbon) return $date; |
| 90 | 90 | |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | public function offsetSet($key, $value) { |
| 122 | 122 | if (is_null($key)) { |
| 123 | 123 | $this->values[] = $value; |
| 124 | - } else { |
|
| 124 | + }else { |
|
| 125 | 125 | $this->values[$key] = $value; |
| 126 | 126 | } |
| 127 | 127 | } |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | if ($this->contains($value) === false) { |
| 196 | 196 | $this->values[] = $value; |
| 197 | 197 | } |
| 198 | - }else{ |
|
| 198 | + }else { |
|
| 199 | 199 | $this->values[] = $value; |
| 200 | 200 | } |
| 201 | 201 | } |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | * |
| 207 | 207 | * @return Attribute |
| 208 | 208 | */ |
| 209 | - public function setName($name){ |
|
| 209 | + public function setName($name) { |
|
| 210 | 210 | $this->name = $name; |
| 211 | 211 | |
| 212 | 212 | return $this; |
@@ -217,7 +217,7 @@ discard block |
||
| 217 | 217 | * |
| 218 | 218 | * @return string |
| 219 | 219 | */ |
| 220 | - public function getName(){ |
|
| 220 | + public function getName() { |
|
| 221 | 221 | return $this->name; |
| 222 | 222 | } |
| 223 | 223 | |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | * |
| 227 | 227 | * @return array |
| 228 | 228 | */ |
| 229 | - public function get(){ |
|
| 229 | + public function get() { |
|
| 230 | 230 | return $this->values; |
| 231 | 231 | } |
| 232 | 232 | |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | * |
| 236 | 236 | * @return array |
| 237 | 237 | */ |
| 238 | - public function all(){ |
|
| 238 | + public function all() { |
|
| 239 | 239 | return $this->get(); |
| 240 | 240 | } |
| 241 | 241 | |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | * |
| 245 | 245 | * @return mixed|null |
| 246 | 246 | */ |
| 247 | - public function first(){ |
|
| 247 | + public function first() { |
|
| 248 | 248 | if ($this->offsetExists(0)) { |
| 249 | 249 | return $this->values[0]; |
| 250 | 250 | } |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | * |
| 257 | 257 | * @return mixed|null |
| 258 | 258 | */ |
| 259 | - public function last(){ |
|
| 259 | + public function last() { |
|
| 260 | 260 | if (($cnt = $this->count()) > 0) { |
| 261 | 261 | return $this->values[$cnt - 1]; |
| 262 | 262 | } |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | * |
| 269 | 269 | * @return int |
| 270 | 270 | */ |
| 271 | - public function count(){ |
|
| 271 | + public function count() { |
|
| 272 | 272 | return count($this->values); |
| 273 | 273 | } |
| 274 | 274 | } |
| 275 | 275 | \ No newline at end of file |