@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | public function add($value, $strict = false) { |
| 75 | 75 | if (is_array($value)) { |
| 76 | 76 | return $this->merge($value, $strict); |
| 77 | - }elseif ($value !== null) { |
|
| 77 | + } elseif ($value !== null) { |
|
| 78 | 78 | $this->attach($value, $strict); |
| 79 | 79 | } |
| 80 | 80 | |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | if ($this->contains($value) === false) { |
| 124 | 124 | $this->values[] = $value; |
| 125 | 125 | } |
| 126 | - }else{ |
|
| 126 | + } else{ |
|
| 127 | 127 | $this->values[] = $value; |
| 128 | 128 | } |
| 129 | 129 | } |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | * |
| 61 | 61 | * @return string |
| 62 | 62 | */ |
| 63 | - public function toString(){ |
|
| 63 | + public function toString() { |
|
| 64 | 64 | return $this->__toString(); |
| 65 | 65 | } |
| 66 | 66 | |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | * |
| 70 | 70 | * @return array |
| 71 | 71 | */ |
| 72 | - public function __serialize(){ |
|
| 72 | + public function __serialize() { |
|
| 73 | 73 | return $this->values; |
| 74 | 74 | } |
| 75 | 75 | |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | * |
| 79 | 79 | * @return array |
| 80 | 80 | */ |
| 81 | - public function toArray(){ |
|
| 81 | + public function toArray() { |
|
| 82 | 82 | return $this->__serialize(); |
| 83 | 83 | } |
| 84 | 84 | |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | if ($this->contains($value) === false) { |
| 142 | 142 | $this->values[] = $value; |
| 143 | 143 | } |
| 144 | - }else{ |
|
| 144 | + }else { |
|
| 145 | 145 | $this->values[] = $value; |
| 146 | 146 | } |
| 147 | 147 | } |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | * |
| 153 | 153 | * @return Attribute |
| 154 | 154 | */ |
| 155 | - public function setName($name){ |
|
| 155 | + public function setName($name) { |
|
| 156 | 156 | $this->name = $name; |
| 157 | 157 | |
| 158 | 158 | return $this; |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | * |
| 164 | 164 | * @return string |
| 165 | 165 | */ |
| 166 | - public function getName(){ |
|
| 166 | + public function getName() { |
|
| 167 | 167 | return $this->name; |
| 168 | 168 | } |
| 169 | 169 | |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | * |
| 173 | 173 | * @return array |
| 174 | 174 | */ |
| 175 | - public function get(){ |
|
| 175 | + public function get() { |
|
| 176 | 176 | return $this->values; |
| 177 | 177 | } |
| 178 | 178 | |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | * |
| 182 | 182 | * @return array |
| 183 | 183 | */ |
| 184 | - public function all(){ |
|
| 184 | + public function all() { |
|
| 185 | 185 | return $this->get(); |
| 186 | 186 | } |
| 187 | 187 | |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | * |
| 191 | 191 | * @return mixed|null |
| 192 | 192 | */ |
| 193 | - public function first(){ |
|
| 193 | + public function first() { |
|
| 194 | 194 | if (count($this->values) > 0) { |
| 195 | 195 | return $this->values[0]; |
| 196 | 196 | } |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | * |
| 203 | 203 | * @return mixed|null |
| 204 | 204 | */ |
| 205 | - public function last(){ |
|
| 205 | + public function last() { |
|
| 206 | 206 | $cnt = count($this->values); |
| 207 | 207 | if ($cnt > 0) { |
| 208 | 208 | return $this->values[$cnt - 1]; |
@@ -73,10 +73,10 @@ discard block |
||
| 73 | 73 | * @throws MethodNotFoundException |
| 74 | 74 | */ |
| 75 | 75 | public function __call($method, $arguments) { |
| 76 | - if(strtolower(substr($method, 0, 3)) === 'get') { |
|
| 76 | + if (strtolower(substr($method, 0, 3)) === 'get') { |
|
| 77 | 77 | $name = preg_replace('/(.)(?=[A-Z])/u', '$1_', substr(strtolower($method), 3)); |
| 78 | 78 | |
| 79 | - if(in_array($name, array_keys($this->attributes))) { |
|
| 79 | + if (in_array($name, array_keys($this->attributes))) { |
|
| 80 | 80 | return $this->attributes[$name]; |
| 81 | 81 | } |
| 82 | 82 | |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | * @return Attribute|null |
| 103 | 103 | */ |
| 104 | 104 | public function get($name) { |
| 105 | - if(isset($this->attributes[$name])) { |
|
| 105 | + if (isset($this->attributes[$name])) { |
|
| 106 | 106 | return $this->attributes[$name]; |
| 107 | 107 | } |
| 108 | 108 | |
@@ -118,9 +118,9 @@ discard block |
||
| 118 | 118 | * @return Attribute |
| 119 | 119 | */ |
| 120 | 120 | public function set($name, $value, $strict = false) { |
| 121 | - if(isset($this->attributes[$name]) && $strict === false) { |
|
| 121 | + if (isset($this->attributes[$name]) && $strict === false) { |
|
| 122 | 122 | $this->attributes[$name]->add($value, true); |
| 123 | - }else{ |
|
| 123 | + }else { |
|
| 124 | 124 | $this->attributes[$name] = new Attribute($name, $value); |
| 125 | 125 | } |
| 126 | 126 | |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | public function find($pattern) { |
| 137 | 137 | if (preg_match_all($pattern, $this->raw, $matches)) { |
| 138 | 138 | if (isset($matches[1])) { |
| 139 | - if(count($matches[1]) > 0) { |
|
| 139 | + if (count($matches[1]) > 0) { |
|
| 140 | 140 | return $matches[1][0]; |
| 141 | 141 | } |
| 142 | 142 | } |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | * |
| 150 | 150 | * @throws InvalidMessageDateException |
| 151 | 151 | */ |
| 152 | - protected function parse(){ |
|
| 152 | + protected function parse() { |
|
| 153 | 153 | $header = $this->rfc822_parse_headers($this->raw); |
| 154 | 154 | |
| 155 | 155 | $this->extractAddresses($header); |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | $this->parseDate($header); |
| 168 | 168 | foreach ($header as $key => $value) { |
| 169 | 169 | $key = trim(rtrim(strtolower($key))); |
| 170 | - if(!isset($this->attributes[$key])){ |
|
| 170 | + if (!isset($this->attributes[$key])) { |
|
| 171 | 171 | $this->set($key, $value); |
| 172 | 172 | } |
| 173 | 173 | } |
@@ -183,12 +183,12 @@ discard block |
||
| 183 | 183 | * |
| 184 | 184 | * @return object |
| 185 | 185 | */ |
| 186 | - public function rfc822_parse_headers($raw_headers){ |
|
| 186 | + public function rfc822_parse_headers($raw_headers) { |
|
| 187 | 187 | $headers = []; |
| 188 | 188 | $imap_headers = []; |
| 189 | 189 | if (extension_loaded('imap')) { |
| 190 | 190 | $raw_imap_headers = (array) \imap_rfc822_parse_headers($this->raw); |
| 191 | - foreach($raw_imap_headers as $key => $values) { |
|
| 191 | + foreach ($raw_imap_headers as $key => $values) { |
|
| 192 | 192 | $key = str_replace("-", "_", $key); |
| 193 | 193 | $imap_headers[$key] = $values; |
| 194 | 194 | } |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | |
| 197 | 197 | $lines = explode("\r\n", $raw_headers); |
| 198 | 198 | $prev_header = null; |
| 199 | - foreach($lines as $line) { |
|
| 199 | + foreach ($lines as $line) { |
|
| 200 | 200 | if (substr($line, 0, 1) === "\n") { |
| 201 | 201 | $line = substr($line, 1); |
| 202 | 202 | } |
@@ -216,19 +216,19 @@ discard block |
||
| 216 | 216 | } |
| 217 | 217 | if (is_array($headers[$prev_header])) { |
| 218 | 218 | $headers[$prev_header][] = $line; |
| 219 | - }else{ |
|
| 219 | + }else { |
|
| 220 | 220 | $headers[$prev_header] .= $line; |
| 221 | 221 | } |
| 222 | 222 | } |
| 223 | - }else{ |
|
| 223 | + }else { |
|
| 224 | 224 | if (($pos = strpos($line, ":")) > 0) { |
| 225 | 225 | $key = trim(rtrim(strtolower(substr($line, 0, $pos)))); |
| 226 | 226 | $key = str_replace("-", "_", $key); |
| 227 | 227 | |
| 228 | 228 | $value = trim(rtrim(substr($line, $pos + 1))); |
| 229 | 229 | if (isset($headers[$key])) { |
| 230 | - $headers[$key][] = $value; |
|
| 231 | - }else{ |
|
| 230 | + $headers[$key][] = $value; |
|
| 231 | + }else { |
|
| 232 | 232 | $headers[$key] = [$value]; |
| 233 | 233 | } |
| 234 | 234 | $prev_header = $key; |
@@ -236,10 +236,10 @@ discard block |
||
| 236 | 236 | } |
| 237 | 237 | } |
| 238 | 238 | |
| 239 | - foreach($headers as $key => $values) { |
|
| 239 | + foreach ($headers as $key => $values) { |
|
| 240 | 240 | if (isset($imap_headers[$key])) continue; |
| 241 | 241 | $value = null; |
| 242 | - switch($key){ |
|
| 242 | + switch ($key) { |
|
| 243 | 243 | case 'from': |
| 244 | 244 | case 'to': |
| 245 | 245 | case 'cc': |
@@ -254,7 +254,7 @@ discard block |
||
| 254 | 254 | break; |
| 255 | 255 | default: |
| 256 | 256 | if (is_array($values)) { |
| 257 | - foreach($values as $k => $v) { |
|
| 257 | + foreach ($values as $k => $v) { |
|
| 258 | 258 | if ($v == "") { |
| 259 | 259 | unset($values[$k]); |
| 260 | 260 | } |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | $value = implode(" ", $values); |
| 267 | 267 | } elseif ($available_values > 2) { |
| 268 | 268 | $value = array_values($values); |
| 269 | - } else { |
|
| 269 | + }else { |
|
| 270 | 270 | $value = ""; |
| 271 | 271 | } |
| 272 | 272 | } |
@@ -286,12 +286,12 @@ discard block |
||
| 286 | 286 | * @return array The decoded elements are returned in an array of objects, where each |
| 287 | 287 | * object has two properties, charset and text. |
| 288 | 288 | */ |
| 289 | - public function mime_header_decode($text){ |
|
| 289 | + public function mime_header_decode($text) { |
|
| 290 | 290 | if (extension_loaded('imap')) { |
| 291 | 291 | return \imap_mime_header_decode($text); |
| 292 | 292 | } |
| 293 | 293 | $charset = $this->getEncoding($text); |
| 294 | - return [(object)[ |
|
| 294 | + return [(object) [ |
|
| 295 | 295 | "charset" => $charset, |
| 296 | 296 | "text" => $this->convertEncoding($text, $charset) |
| 297 | 297 | ]]; |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | try { |
| 346 | 346 | if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7') { |
| 347 | 347 | return iconv($from, $to, $str); |
| 348 | - } else { |
|
| 348 | + }else { |
|
| 349 | 349 | if (!$from) { |
| 350 | 350 | return mb_convert_encoding($str, $to); |
| 351 | 351 | } |
@@ -355,7 +355,7 @@ discard block |
||
| 355 | 355 | if (strstr($from, '-')) { |
| 356 | 356 | $from = str_replace('-', '', $from); |
| 357 | 357 | return $this->convertEncoding($str, $from, $to); |
| 358 | - } else { |
|
| 358 | + }else { |
|
| 359 | 359 | return $str; |
| 360 | 360 | } |
| 361 | 361 | } |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | } |
| 377 | 377 | }elseif (property_exists($structure, 'charset')) { |
| 378 | 378 | return EncodingAliases::get($structure->charset, $this->fallback_encoding); |
| 379 | - }elseif (is_string($structure) === true){ |
|
| 379 | + }elseif (is_string($structure) === true) { |
|
| 380 | 380 | return mb_detect_encoding($structure); |
| 381 | 381 | } |
| 382 | 382 | |
@@ -397,7 +397,7 @@ discard block |
||
| 397 | 397 | $decoder = $this->config['decoder']['message']; |
| 398 | 398 | |
| 399 | 399 | if ($value !== null) { |
| 400 | - if($decoder === 'utf-8' && extension_loaded('imap')) { |
|
| 400 | + if ($decoder === 'utf-8' && extension_loaded('imap')) { |
|
| 401 | 401 | $value = \imap_utf8($value); |
| 402 | 402 | if (strpos(strtolower($value), '=?utf-8?') === 0) { |
| 403 | 403 | $value = mb_decode_mimeheader($value); |
@@ -405,14 +405,14 @@ discard block |
||
| 405 | 405 | if ($this->notDecoded($original_value, $value)) { |
| 406 | 406 | $decoded_value = $this->mime_header_decode($value); |
| 407 | 407 | if (count($decoded_value) > 0) { |
| 408 | - if(property_exists($decoded_value[0], "text")) { |
|
| 408 | + if (property_exists($decoded_value[0], "text")) { |
|
| 409 | 409 | $value = $decoded_value[0]->text; |
| 410 | 410 | } |
| 411 | 411 | } |
| 412 | 412 | } |
| 413 | - }elseif($decoder === 'iconv') { |
|
| 413 | + }elseif ($decoder === 'iconv') { |
|
| 414 | 414 | $value = iconv_mime_decode($value); |
| 415 | - }else{ |
|
| 415 | + }else { |
|
| 416 | 416 | $value = mb_decode_mimeheader($value); |
| 417 | 417 | } |
| 418 | 418 | |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | * @return array |
| 436 | 436 | */ |
| 437 | 437 | private function decodeArray($values) { |
| 438 | - foreach($values as $key => $value) { |
|
| 438 | + foreach ($values as $key => $value) { |
|
| 439 | 439 | $values[$key] = $this->decode($value); |
| 440 | 440 | } |
| 441 | 441 | return $values; |
@@ -445,8 +445,8 @@ discard block |
||
| 445 | 445 | * Try to extract the priority from a given raw header string |
| 446 | 446 | */ |
| 447 | 447 | private function findPriority() { |
| 448 | - if(($priority = $this->get("x_priority")) === null) return; |
|
| 449 | - switch((int)"$priority"){ |
|
| 448 | + if (($priority = $this->get("x_priority")) === null) return; |
|
| 449 | + switch ((int) "$priority") { |
|
| 450 | 450 | case IMAP::MESSAGE_PRIORITY_HIGHEST; |
| 451 | 451 | $priority = IMAP::MESSAGE_PRIORITY_HIGHEST; |
| 452 | 452 | break; |
@@ -478,7 +478,7 @@ discard block |
||
| 478 | 478 | */ |
| 479 | 479 | private function decodeAddresses($values) { |
| 480 | 480 | $addresses = []; |
| 481 | - foreach($values as $address) { |
|
| 481 | + foreach ($values as $address) { |
|
| 482 | 482 | $address = trim(rtrim($address)); |
| 483 | 483 | if (strpos($address, ",") == strlen($address) - 1) { |
| 484 | 484 | $address = substr($address, 0, -1); |
@@ -487,7 +487,7 @@ discard block |
||
| 487 | 487 | '/^(?:(?P<name>.+)\s)?(?(name)<|<?)(?P<email>[^\s]+?)(?(name)>|>?)$/', |
| 488 | 488 | $address, |
| 489 | 489 | $matches |
| 490 | - )){ |
|
| 490 | + )) { |
|
| 491 | 491 | $name = trim(rtrim($matches["name"])); |
| 492 | 492 | $email = trim(rtrim($matches["email"])); |
| 493 | 493 | list($mailbox, $host) = array_pad(explode("@", $email), 2, null); |
@@ -506,7 +506,7 @@ discard block |
||
| 506 | 506 | * @param object $header |
| 507 | 507 | */ |
| 508 | 508 | private function extractAddresses($header) { |
| 509 | - foreach(['from', 'to', 'cc', 'bcc', 'reply_to', 'sender'] as $key){ |
|
| 509 | + foreach (['from', 'to', 'cc', 'bcc', 'reply_to', 'sender'] as $key) { |
|
| 510 | 510 | if (property_exists($header, $key)) { |
| 511 | 511 | $this->set($key, $this->parseAddresses($header->$key)); |
| 512 | 512 | } |
@@ -537,10 +537,10 @@ discard block |
||
| 537 | 537 | } |
| 538 | 538 | if (!property_exists($address, 'personal')) { |
| 539 | 539 | $address->personal = false; |
| 540 | - } else { |
|
| 540 | + }else { |
|
| 541 | 541 | $personalParts = $this->mime_header_decode($address->personal); |
| 542 | 542 | |
| 543 | - if(is_array($personalParts)) { |
|
| 543 | + if (is_array($personalParts)) { |
|
| 544 | 544 | $address->personal = ''; |
| 545 | 545 | foreach ($personalParts as $p) { |
| 546 | 546 | $address->personal .= $this->convertEncoding($p->text, $this->getEncoding($p)); |
@@ -564,19 +564,19 @@ discard block |
||
| 564 | 564 | /** |
| 565 | 565 | * Search and extract potential header extensions |
| 566 | 566 | */ |
| 567 | - private function extractHeaderExtensions(){ |
|
| 567 | + private function extractHeaderExtensions() { |
|
| 568 | 568 | foreach ($this->attributes as $key => $value) { |
| 569 | - $value = (string)$value; |
|
| 569 | + $value = (string) $value; |
|
| 570 | 570 | // Only parse strings and don't parse any attributes like the user-agent |
| 571 | 571 | if (in_array($key, ["user_agent"]) === false) { |
| 572 | - if (($pos = strpos($value, ";")) !== false){ |
|
| 572 | + if (($pos = strpos($value, ";")) !== false) { |
|
| 573 | 573 | $original = substr($value, 0, $pos); |
| 574 | 574 | $this->set($key, trim(rtrim($original)), true); |
| 575 | 575 | |
| 576 | 576 | // Get all potential extensions |
| 577 | 577 | $extensions = explode(";", substr($value, $pos + 1)); |
| 578 | - foreach($extensions as $extension) { |
|
| 579 | - if (($pos = strpos($extension, "=")) !== false){ |
|
| 578 | + foreach ($extensions as $extension) { |
|
| 579 | + if (($pos = strpos($extension, "=")) !== false) { |
|
| 580 | 580 | $key = substr($extension, 0, $pos); |
| 581 | 581 | $key = trim(rtrim(strtolower($key))); |
| 582 | 582 | |
@@ -619,7 +619,7 @@ discard block |
||
| 619 | 619 | $parsed_date = null; |
| 620 | 620 | $date = $header->date; |
| 621 | 621 | |
| 622 | - if(preg_match('/\+0580/', $date)) { |
|
| 622 | + if (preg_match('/\+0580/', $date)) { |
|
| 623 | 623 | $date = str_replace('+0580', '+0530', $date); |
| 624 | 624 | } |
| 625 | 625 | |
@@ -642,7 +642,7 @@ discard block |
||
| 642 | 642 | $date = trim(array_pop($array)); |
| 643 | 643 | break; |
| 644 | 644 | } |
| 645 | - try{ |
|
| 645 | + try { |
|
| 646 | 646 | $parsed_date = Carbon::parse($date); |
| 647 | 647 | } catch (\Exception $_e) { |
| 648 | 648 | throw new InvalidMessageDateException("Invalid message date. ID:".$this->get("message_id"), 1100, $e); |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | public function set($name, $value, $strict = false) { |
| 121 | 121 | if(isset($this->attributes[$name]) && $strict === false) { |
| 122 | 122 | $this->attributes[$name]->add($value, true); |
| 123 | - }else{ |
|
| 123 | + } else{ |
|
| 124 | 124 | $this->attributes[$name] = new Attribute($name, $value); |
| 125 | 125 | } |
| 126 | 126 | |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | if ($prev_header !== null) { |
| 208 | 208 | $headers[$prev_header][] = $line; |
| 209 | 209 | } |
| 210 | - }elseif (substr($line, 0, 1) === " ") { |
|
| 210 | + } elseif (substr($line, 0, 1) === " ") { |
|
| 211 | 211 | $line = substr($line, 1); |
| 212 | 212 | $line = trim(rtrim($line)); |
| 213 | 213 | if ($prev_header !== null) { |
@@ -216,11 +216,11 @@ discard block |
||
| 216 | 216 | } |
| 217 | 217 | if (is_array($headers[$prev_header])) { |
| 218 | 218 | $headers[$prev_header][] = $line; |
| 219 | - }else{ |
|
| 219 | + } else{ |
|
| 220 | 220 | $headers[$prev_header] .= $line; |
| 221 | 221 | } |
| 222 | 222 | } |
| 223 | - }else{ |
|
| 223 | + } else{ |
|
| 224 | 224 | if (($pos = strpos($line, ":")) > 0) { |
| 225 | 225 | $key = trim(rtrim(strtolower(substr($line, 0, $pos)))); |
| 226 | 226 | $key = str_replace("-", "_", $key); |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | $value = trim(rtrim(substr($line, $pos + 1))); |
| 229 | 229 | if (isset($headers[$key])) { |
| 230 | 230 | $headers[$key][] = $value; |
| 231 | - }else{ |
|
| 231 | + } else{ |
|
| 232 | 232 | $headers[$key] = [$value]; |
| 233 | 233 | } |
| 234 | 234 | $prev_header = $key; |
@@ -237,7 +237,9 @@ discard block |
||
| 237 | 237 | } |
| 238 | 238 | |
| 239 | 239 | foreach($headers as $key => $values) { |
| 240 | - if (isset($imap_headers[$key])) continue; |
|
| 240 | + if (isset($imap_headers[$key])) { |
|
| 241 | + continue; |
|
| 242 | + } |
|
| 241 | 243 | $value = null; |
| 242 | 244 | switch($key){ |
| 243 | 245 | case 'from': |
@@ -374,9 +376,9 @@ discard block |
||
| 374 | 376 | return EncodingAliases::get($parameter->value, $this->fallback_encoding); |
| 375 | 377 | } |
| 376 | 378 | } |
| 377 | - }elseif (property_exists($structure, 'charset')) { |
|
| 379 | + } elseif (property_exists($structure, 'charset')) { |
|
| 378 | 380 | return EncodingAliases::get($structure->charset, $this->fallback_encoding); |
| 379 | - }elseif (is_string($structure) === true){ |
|
| 381 | + } elseif (is_string($structure) === true){ |
|
| 380 | 382 | return mb_detect_encoding($structure); |
| 381 | 383 | } |
| 382 | 384 | |
@@ -410,9 +412,9 @@ discard block |
||
| 410 | 412 | } |
| 411 | 413 | } |
| 412 | 414 | } |
| 413 | - }elseif($decoder === 'iconv') { |
|
| 415 | + } elseif($decoder === 'iconv') { |
|
| 414 | 416 | $value = iconv_mime_decode($value); |
| 415 | - }else{ |
|
| 417 | + } else{ |
|
| 416 | 418 | $value = mb_decode_mimeheader($value); |
| 417 | 419 | } |
| 418 | 420 | |
@@ -445,7 +447,9 @@ discard block |
||
| 445 | 447 | * Try to extract the priority from a given raw header string |
| 446 | 448 | */ |
| 447 | 449 | private function findPriority() { |
| 448 | - if(($priority = $this->get("x_priority")) === null) return; |
|
| 450 | + if(($priority = $this->get("x_priority")) === null) { |
|
| 451 | + return; |
|
| 452 | + } |
|
| 449 | 453 | switch((int)"$priority"){ |
| 450 | 454 | case IMAP::MESSAGE_PRIORITY_HIGHEST; |
| 451 | 455 | $priority = IMAP::MESSAGE_PRIORITY_HIGHEST; |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | public function __construct($uid, $msglist, Client $client, $fetch_options = null, $fetch_body = false, $fetch_flags = false, $sequence = null) { |
| 203 | 203 | |
| 204 | 204 | $default_mask = $client->getDefaultMessageMask(); |
| 205 | - if($default_mask != null) { |
|
| 205 | + if ($default_mask != null) { |
|
| 206 | 206 | $this->mask = $default_mask; |
| 207 | 207 | } |
| 208 | 208 | $this->events["message"] = $client->getDefaultEvents("message"); |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | if ($this->sequence === IMAP::ST_UID) { |
| 228 | 228 | $this->uid = $uid; |
| 229 | 229 | $this->msgn = $this->client->getConnection()->getMessageNumber($this->uid); |
| 230 | - }else{ |
|
| 230 | + }else { |
|
| 231 | 231 | $this->msgn = $uid; |
| 232 | 232 | $this->uid = $this->client->getConnection()->getUid($this->msgn); |
| 233 | 233 | } |
@@ -268,13 +268,13 @@ discard block |
||
| 268 | 268 | * @throws MessageFlagException |
| 269 | 269 | * @throws Exceptions\RuntimeException |
| 270 | 270 | */ |
| 271 | - public static function make($uid, $msglist, Client $client, $raw_header, $raw_body, $raw_flags, $fetch_options = null, $sequence = null){ |
|
| 271 | + public static function make($uid, $msglist, Client $client, $raw_header, $raw_body, $raw_flags, $fetch_options = null, $sequence = null) { |
|
| 272 | 272 | $reflection = new \ReflectionClass(self::class); |
| 273 | 273 | /** @var self $instance */ |
| 274 | 274 | $instance = $reflection->newInstanceWithoutConstructor(); |
| 275 | 275 | |
| 276 | 276 | $default_mask = $client->getDefaultMessageMask(); |
| 277 | - if($default_mask != null) { |
|
| 277 | + if ($default_mask != null) { |
|
| 278 | 278 | $instance->setMask($default_mask); |
| 279 | 279 | } |
| 280 | 280 | $instance->setEvents([ |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | if ($instance->getSequence() === IMAP::ST_UID) { |
| 295 | 295 | $instance->setUid($uid); |
| 296 | 296 | $instance->setMsglist($msglist); |
| 297 | - }else{ |
|
| 297 | + }else { |
|
| 298 | 298 | $instance->setMsgn($uid, $msglist); |
| 299 | 299 | } |
| 300 | 300 | |
@@ -315,13 +315,13 @@ discard block |
||
| 315 | 315 | * @throws MethodNotFoundException |
| 316 | 316 | */ |
| 317 | 317 | public function __call($method, $arguments) { |
| 318 | - if(strtolower(substr($method, 0, 3)) === 'get') { |
|
| 318 | + if (strtolower(substr($method, 0, 3)) === 'get') { |
|
| 319 | 319 | $name = Str::snake(substr($method, 3)); |
| 320 | 320 | return $this->get($name); |
| 321 | 321 | }elseif (strtolower(substr($method, 0, 3)) === 'set') { |
| 322 | 322 | $name = Str::snake(substr($method, 3)); |
| 323 | 323 | |
| 324 | - if(in_array($name, array_keys($this->attributes))) { |
|
| 324 | + if (in_array($name, array_keys($this->attributes))) { |
|
| 325 | 325 | return $this->__set($name, array_pop($arguments)); |
| 326 | 326 | } |
| 327 | 327 | |
@@ -360,7 +360,7 @@ discard block |
||
| 360 | 360 | * @return mixed|null |
| 361 | 361 | */ |
| 362 | 362 | public function get($name) { |
| 363 | - if(isset($this->attributes[$name])) { |
|
| 363 | + if (isset($this->attributes[$name])) { |
|
| 364 | 364 | return $this->attributes[$name]; |
| 365 | 365 | } |
| 366 | 366 | |
@@ -434,7 +434,7 @@ discard block |
||
| 434 | 434 | * |
| 435 | 435 | * @throws InvalidMessageDateException |
| 436 | 436 | */ |
| 437 | - public function parseRawHeader($raw_header){ |
|
| 437 | + public function parseRawHeader($raw_header) { |
|
| 438 | 438 | $this->header = new Header($raw_header); |
| 439 | 439 | } |
| 440 | 440 | |
@@ -445,8 +445,8 @@ discard block |
||
| 445 | 445 | public function parseRawFlags($raw_flags) { |
| 446 | 446 | $this->flags = FlagCollection::make([]); |
| 447 | 447 | |
| 448 | - foreach($raw_flags as $flag) { |
|
| 449 | - if (strpos($flag, "\\") === 0){ |
|
| 448 | + foreach ($raw_flags as $flag) { |
|
| 449 | + if (strpos($flag, "\\") === 0) { |
|
| 450 | 450 | $flag = substr($flag, 1); |
| 451 | 451 | } |
| 452 | 452 | $flag_key = strtolower($flag); |
@@ -516,7 +516,7 @@ discard block |
||
| 516 | 516 | * @throws Exceptions\EventNotFoundException |
| 517 | 517 | * @throws MessageFlagException |
| 518 | 518 | */ |
| 519 | - public function peek(){ |
|
| 519 | + public function peek() { |
|
| 520 | 520 | if ($this->fetch_options == IMAP::FT_PEEK) { |
| 521 | 521 | if ($this->getFlags()->get("seen") == null) { |
| 522 | 522 | $this->unsetFlag("Seen"); |
@@ -563,7 +563,7 @@ discard block |
||
| 563 | 563 | private function fetchPart(Part $part) { |
| 564 | 564 | if ($part->isAttachment()) { |
| 565 | 565 | $this->fetchAttachment($part); |
| 566 | - }else{ |
|
| 566 | + }else { |
|
| 567 | 567 | $encoding = $this->getEncoding($part); |
| 568 | 568 | |
| 569 | 569 | $content = $this->decodeString($part->content, $part->encoding); |
@@ -600,7 +600,7 @@ discard block |
||
| 600 | 600 | if ($oAttachment->getName() !== null && $oAttachment->getSize() > 0) { |
| 601 | 601 | if ($oAttachment->getId() !== null) { |
| 602 | 602 | $this->attachments->put($oAttachment->getId(), $oAttachment); |
| 603 | - } else { |
|
| 603 | + }else { |
|
| 604 | 604 | $this->attachments->push($oAttachment); |
| 605 | 605 | } |
| 606 | 606 | } |
@@ -734,7 +734,7 @@ discard block |
||
| 734 | 734 | |
| 735 | 735 | if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7') { |
| 736 | 736 | return @iconv($from, $to.'//IGNORE', $str); |
| 737 | - } else { |
|
| 737 | + }else { |
|
| 738 | 738 | if (!$from) { |
| 739 | 739 | return mb_convert_encoding($str, $to); |
| 740 | 740 | } |
@@ -755,9 +755,9 @@ discard block |
||
| 755 | 755 | return EncodingAliases::get($parameter->value); |
| 756 | 756 | } |
| 757 | 757 | } |
| 758 | - }elseif (property_exists($structure, 'charset')){ |
|
| 758 | + }elseif (property_exists($structure, 'charset')) { |
|
| 759 | 759 | return EncodingAliases::get($structure->charset); |
| 760 | - }elseif (is_string($structure) === true){ |
|
| 760 | + }elseif (is_string($structure) === true) { |
|
| 761 | 761 | return mb_detect_encoding($structure); |
| 762 | 762 | } |
| 763 | 763 | |
@@ -771,7 +771,7 @@ discard block |
||
| 771 | 771 | * @throws Exceptions\ConnectionFailedException |
| 772 | 772 | * @throws Exceptions\FolderFetchingException |
| 773 | 773 | */ |
| 774 | - public function getFolder(){ |
|
| 774 | + public function getFolder() { |
|
| 775 | 775 | return $this->client->getFolder($this->folder_path); |
| 776 | 776 | } |
| 777 | 777 | |
@@ -786,13 +786,13 @@ discard block |
||
| 786 | 786 | * @throws Exceptions\FolderFetchingException |
| 787 | 787 | * @throws Exceptions\GetMessagesFailedException |
| 788 | 788 | */ |
| 789 | - public function thread($sent_folder = null, &$thread = null, $folder = null){ |
|
| 789 | + public function thread($sent_folder = null, &$thread = null, $folder = null) { |
|
| 790 | 790 | $thread = $thread ? $thread : MessageCollection::make([]); |
| 791 | - $folder = $folder ? $folder : $this->getFolder(); |
|
| 791 | + $folder = $folder ? $folder : $this->getFolder(); |
|
| 792 | 792 | $sent_folder = $sent_folder ? $sent_folder : $this->client->getFolder(ClientManager::get("options.common_folders.sent", "INBOX/Sent")); |
| 793 | 793 | |
| 794 | 794 | /** @var Message $message */ |
| 795 | - foreach($thread as $message) { |
|
| 795 | + foreach ($thread as $message) { |
|
| 796 | 796 | if ($message->message_id == $this->message_id) { |
| 797 | 797 | return $thread; |
| 798 | 798 | } |
@@ -813,7 +813,7 @@ discard block |
||
| 813 | 813 | }); |
| 814 | 814 | |
| 815 | 815 | if (is_array($this->in_reply_to)) { |
| 816 | - foreach($this->in_reply_to as $in_reply_to) { |
|
| 816 | + foreach ($this->in_reply_to as $in_reply_to) { |
|
| 817 | 817 | $folder->query()->messageId($in_reply_to) |
| 818 | 818 | ->setFetchBody($this->getFetchBodyOption()) |
| 819 | 819 | ->leaveUnread()->get()->each(function($message) use(&$thread, $folder, $sent_folder){ |
@@ -858,13 +858,13 @@ discard block |
||
| 858 | 858 | |
| 859 | 859 | $this->client->openFolder($this->folder_path); |
| 860 | 860 | if ($this->client->getConnection()->copyMessage($folder->path, $this->getSequenceId(), null, $this->sequence === IMAP::ST_UID) == true) { |
| 861 | - if($expunge) $this->client->expunge(); |
|
| 861 | + if ($expunge) $this->client->expunge(); |
|
| 862 | 862 | |
| 863 | 863 | $this->client->openFolder($folder->path); |
| 864 | 864 | |
| 865 | 865 | if ($this->sequence === IMAP::ST_UID) { |
| 866 | 866 | $sequence_id = $next_uid; |
| 867 | - }else{ |
|
| 867 | + }else { |
|
| 868 | 868 | $sequence_id = $this->client->getConnection()->getMessageNumber($next_uid); |
| 869 | 869 | } |
| 870 | 870 | |
@@ -905,13 +905,13 @@ discard block |
||
| 905 | 905 | |
| 906 | 906 | $this->client->openFolder($this->folder_path); |
| 907 | 907 | if ($this->client->getConnection()->moveMessage($folder->path, $this->getSequenceId(), null, $this->sequence === IMAP::ST_UID) == true) { |
| 908 | - if($expunge) $this->client->expunge(); |
|
| 908 | + if ($expunge) $this->client->expunge(); |
|
| 909 | 909 | |
| 910 | 910 | $this->client->openFolder($folder->path); |
| 911 | 911 | |
| 912 | 912 | if ($this->sequence === IMAP::ST_UID) { |
| 913 | 913 | $sequence_id = $next_uid; |
| 914 | - }else{ |
|
| 914 | + }else { |
|
| 915 | 915 | $sequence_id = $this->client->getConnection()->getMessageNumber($next_uid); |
| 916 | 916 | } |
| 917 | 917 | |
@@ -937,7 +937,7 @@ discard block |
||
| 937 | 937 | */ |
| 938 | 938 | public function delete($expunge = true) { |
| 939 | 939 | $status = $this->setFlag("Deleted"); |
| 940 | - if($expunge) $this->client->expunge(); |
|
| 940 | + if ($expunge) $this->client->expunge(); |
|
| 941 | 941 | |
| 942 | 942 | $event = $this->getEvent("message", "deleted"); |
| 943 | 943 | $event::dispatch($this); |
@@ -956,7 +956,7 @@ discard block |
||
| 956 | 956 | */ |
| 957 | 957 | public function restore($expunge = true) { |
| 958 | 958 | $status = $this->unsetFlag("Deleted"); |
| 959 | - if($expunge) $this->client->expunge(); |
|
| 959 | + if ($expunge) $this->client->expunge(); |
|
| 960 | 960 | |
| 961 | 961 | $event = $this->getEvent("message", "restored"); |
| 962 | 962 | $event::dispatch($this); |
@@ -1057,7 +1057,7 @@ discard block |
||
| 1057 | 1057 | * |
| 1058 | 1058 | * @return AttachmentCollection |
| 1059 | 1059 | */ |
| 1060 | - public function attachments(){ |
|
| 1060 | + public function attachments() { |
|
| 1061 | 1061 | return $this->getAttachments(); |
| 1062 | 1062 | } |
| 1063 | 1063 | |
@@ -1154,7 +1154,7 @@ discard block |
||
| 1154 | 1154 | * |
| 1155 | 1155 | * @return FlagCollection |
| 1156 | 1156 | */ |
| 1157 | - public function flags(){ |
|
| 1157 | + public function flags() { |
|
| 1158 | 1158 | return $this->getFlags(); |
| 1159 | 1159 | } |
| 1160 | 1160 | |
@@ -1163,7 +1163,7 @@ discard block |
||
| 1163 | 1163 | * |
| 1164 | 1164 | * @return Structure|null |
| 1165 | 1165 | */ |
| 1166 | - public function getStructure(){ |
|
| 1166 | + public function getStructure() { |
|
| 1167 | 1167 | return $this->structure; |
| 1168 | 1168 | } |
| 1169 | 1169 | |
@@ -1189,7 +1189,7 @@ discard block |
||
| 1189 | 1189 | * |
| 1190 | 1190 | * @return array |
| 1191 | 1191 | */ |
| 1192 | - public function getAttributes(){ |
|
| 1192 | + public function getAttributes() { |
|
| 1193 | 1193 | return array_merge($this->attributes, $this->header->getAttributes()); |
| 1194 | 1194 | } |
| 1195 | 1195 | |
@@ -1199,8 +1199,8 @@ discard block |
||
| 1199 | 1199 | * |
| 1200 | 1200 | * @return $this |
| 1201 | 1201 | */ |
| 1202 | - public function setMask($mask){ |
|
| 1203 | - if(class_exists($mask)){ |
|
| 1202 | + public function setMask($mask) { |
|
| 1203 | + if (class_exists($mask)) { |
|
| 1204 | 1204 | $this->mask = $mask; |
| 1205 | 1205 | } |
| 1206 | 1206 | |
@@ -1212,7 +1212,7 @@ discard block |
||
| 1212 | 1212 | * |
| 1213 | 1213 | * @return string |
| 1214 | 1214 | */ |
| 1215 | - public function getMask(){ |
|
| 1215 | + public function getMask() { |
|
| 1216 | 1216 | return $this->mask; |
| 1217 | 1217 | } |
| 1218 | 1218 | |
@@ -1223,9 +1223,9 @@ discard block |
||
| 1223 | 1223 | * @return mixed |
| 1224 | 1224 | * @throws MaskNotFoundException |
| 1225 | 1225 | */ |
| 1226 | - public function mask($mask = null){ |
|
| 1226 | + public function mask($mask = null) { |
|
| 1227 | 1227 | $mask = $mask !== null ? $mask : $this->mask; |
| 1228 | - if(class_exists($mask)){ |
|
| 1228 | + if (class_exists($mask)) { |
|
| 1229 | 1229 | return new $mask($this); |
| 1230 | 1230 | } |
| 1231 | 1231 | |
@@ -1238,7 +1238,7 @@ discard block |
||
| 1238 | 1238 | * |
| 1239 | 1239 | * @return $this |
| 1240 | 1240 | */ |
| 1241 | - public function setFolderPath($folder_path){ |
|
| 1241 | + public function setFolderPath($folder_path) { |
|
| 1242 | 1242 | $this->folder_path = $folder_path; |
| 1243 | 1243 | |
| 1244 | 1244 | return $this; |
@@ -1250,7 +1250,7 @@ discard block |
||
| 1250 | 1250 | * |
| 1251 | 1251 | * @return $this |
| 1252 | 1252 | */ |
| 1253 | - public function setConfig($config){ |
|
| 1253 | + public function setConfig($config) { |
|
| 1254 | 1254 | $this->config = $config; |
| 1255 | 1255 | |
| 1256 | 1256 | return $this; |
@@ -1262,7 +1262,7 @@ discard block |
||
| 1262 | 1262 | * |
| 1263 | 1263 | * @return $this |
| 1264 | 1264 | */ |
| 1265 | - public function setAvailableFlags($available_flags){ |
|
| 1265 | + public function setAvailableFlags($available_flags) { |
|
| 1266 | 1266 | $this->available_flags = $available_flags; |
| 1267 | 1267 | |
| 1268 | 1268 | return $this; |
@@ -1274,7 +1274,7 @@ discard block |
||
| 1274 | 1274 | * |
| 1275 | 1275 | * @return $this |
| 1276 | 1276 | */ |
| 1277 | - public function setAttachments($attachments){ |
|
| 1277 | + public function setAttachments($attachments) { |
|
| 1278 | 1278 | $this->attachments = $attachments; |
| 1279 | 1279 | |
| 1280 | 1280 | return $this; |
@@ -1286,7 +1286,7 @@ discard block |
||
| 1286 | 1286 | * |
| 1287 | 1287 | * @return $this |
| 1288 | 1288 | */ |
| 1289 | - public function setFlags($flags){ |
|
| 1289 | + public function setFlags($flags) { |
|
| 1290 | 1290 | $this->flags = $flags; |
| 1291 | 1291 | |
| 1292 | 1292 | return $this; |
@@ -1299,7 +1299,7 @@ discard block |
||
| 1299 | 1299 | * @throws Exceptions\ConnectionFailedException |
| 1300 | 1300 | * @return $this |
| 1301 | 1301 | */ |
| 1302 | - public function setClient($client){ |
|
| 1302 | + public function setClient($client) { |
|
| 1303 | 1303 | $this->client = $client; |
| 1304 | 1304 | $this->client->openFolder($this->folder_path); |
| 1305 | 1305 | |
@@ -1314,7 +1314,7 @@ discard block |
||
| 1314 | 1314 | * @throws Exceptions\RuntimeException |
| 1315 | 1315 | * @return $this |
| 1316 | 1316 | */ |
| 1317 | - public function setUid($uid){ |
|
| 1317 | + public function setUid($uid) { |
|
| 1318 | 1318 | $this->uid = $uid; |
| 1319 | 1319 | $this->msgn = $this->client->getConnection()->getMessageNumber($this->uid); |
| 1320 | 1320 | $this->msglist = null; |
@@ -1331,7 +1331,7 @@ discard block |
||
| 1331 | 1331 | * @throws Exceptions\RuntimeException |
| 1332 | 1332 | * @return $this |
| 1333 | 1333 | */ |
| 1334 | - public function setMsgn($msgn, $msglist = null){ |
|
| 1334 | + public function setMsgn($msgn, $msglist = null) { |
|
| 1335 | 1335 | $this->msgn = $msgn; |
| 1336 | 1336 | $this->msglist = $msglist; |
| 1337 | 1337 | $this->uid = $this->client->getConnection()->getUid($this->msgn); |
@@ -1344,7 +1344,7 @@ discard block |
||
| 1344 | 1344 | * |
| 1345 | 1345 | * @return int |
| 1346 | 1346 | */ |
| 1347 | - public function getSequence(){ |
|
| 1347 | + public function getSequence() { |
|
| 1348 | 1348 | return $this->sequence; |
| 1349 | 1349 | } |
| 1350 | 1350 | |
@@ -1353,7 +1353,7 @@ discard block |
||
| 1353 | 1353 | * |
| 1354 | 1354 | * @return int |
| 1355 | 1355 | */ |
| 1356 | - public function getSequenceId(){ |
|
| 1356 | + public function getSequenceId() { |
|
| 1357 | 1357 | return $this->sequence === IMAP::ST_UID ? $this->uid : $this->msgn; |
| 1358 | 1358 | } |
| 1359 | 1359 | } |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | if ($this->sequence === IMAP::ST_UID) { |
| 228 | 228 | $this->uid = $uid; |
| 229 | 229 | $this->msgn = $this->client->getConnection()->getMessageNumber($this->uid); |
| 230 | - }else{ |
|
| 230 | + } else{ |
|
| 231 | 231 | $this->msgn = $uid; |
| 232 | 232 | $this->uid = $this->client->getConnection()->getUid($this->msgn); |
| 233 | 233 | } |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | if ($instance->getSequence() === IMAP::ST_UID) { |
| 295 | 295 | $instance->setUid($uid); |
| 296 | 296 | $instance->setMsglist($msglist); |
| 297 | - }else{ |
|
| 297 | + } else{ |
|
| 298 | 298 | $instance->setMsgn($uid, $msglist); |
| 299 | 299 | } |
| 300 | 300 | |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | if(strtolower(substr($method, 0, 3)) === 'get') { |
| 319 | 319 | $name = Str::snake(substr($method, 3)); |
| 320 | 320 | return $this->get($name); |
| 321 | - }elseif (strtolower(substr($method, 0, 3)) === 'set') { |
|
| 321 | + } elseif (strtolower(substr($method, 0, 3)) === 'set') { |
|
| 322 | 322 | $name = Str::snake(substr($method, 3)); |
| 323 | 323 | |
| 324 | 324 | if(in_array($name, array_keys($this->attributes))) { |
@@ -521,7 +521,7 @@ discard block |
||
| 521 | 521 | if ($this->getFlags()->get("seen") == null) { |
| 522 | 522 | $this->unsetFlag("Seen"); |
| 523 | 523 | } |
| 524 | - }elseif ($this->getFlags()->get("seen") != null) { |
|
| 524 | + } elseif ($this->getFlags()->get("seen") != null) { |
|
| 525 | 525 | $this->setFlag("Seen"); |
| 526 | 526 | } |
| 527 | 527 | } |
@@ -563,7 +563,7 @@ discard block |
||
| 563 | 563 | private function fetchPart(Part $part) { |
| 564 | 564 | if ($part->isAttachment()) { |
| 565 | 565 | $this->fetchAttachment($part); |
| 566 | - }else{ |
|
| 566 | + } else{ |
|
| 567 | 567 | $encoding = $this->getEncoding($part); |
| 568 | 568 | |
| 569 | 569 | $content = $this->decodeString($part->content, $part->encoding); |
@@ -755,9 +755,9 @@ discard block |
||
| 755 | 755 | return EncodingAliases::get($parameter->value); |
| 756 | 756 | } |
| 757 | 757 | } |
| 758 | - }elseif (property_exists($structure, 'charset')){ |
|
| 758 | + } elseif (property_exists($structure, 'charset')){ |
|
| 759 | 759 | return EncodingAliases::get($structure->charset); |
| 760 | - }elseif (is_string($structure) === true){ |
|
| 760 | + } elseif (is_string($structure) === true){ |
|
| 761 | 761 | return mb_detect_encoding($structure); |
| 762 | 762 | } |
| 763 | 763 | |
@@ -858,13 +858,15 @@ discard block |
||
| 858 | 858 | |
| 859 | 859 | $this->client->openFolder($this->folder_path); |
| 860 | 860 | if ($this->client->getConnection()->copyMessage($folder->path, $this->getSequenceId(), null, $this->sequence === IMAP::ST_UID) == true) { |
| 861 | - if($expunge) $this->client->expunge(); |
|
| 861 | + if($expunge) { |
|
| 862 | + $this->client->expunge(); |
|
| 863 | + } |
|
| 862 | 864 | |
| 863 | 865 | $this->client->openFolder($folder->path); |
| 864 | 866 | |
| 865 | 867 | if ($this->sequence === IMAP::ST_UID) { |
| 866 | 868 | $sequence_id = $next_uid; |
| 867 | - }else{ |
|
| 869 | + } else{ |
|
| 868 | 870 | $sequence_id = $this->client->getConnection()->getMessageNumber($next_uid); |
| 869 | 871 | } |
| 870 | 872 | |
@@ -905,13 +907,15 @@ discard block |
||
| 905 | 907 | |
| 906 | 908 | $this->client->openFolder($this->folder_path); |
| 907 | 909 | if ($this->client->getConnection()->moveMessage($folder->path, $this->getSequenceId(), null, $this->sequence === IMAP::ST_UID) == true) { |
| 908 | - if($expunge) $this->client->expunge(); |
|
| 910 | + if($expunge) { |
|
| 911 | + $this->client->expunge(); |
|
| 912 | + } |
|
| 909 | 913 | |
| 910 | 914 | $this->client->openFolder($folder->path); |
| 911 | 915 | |
| 912 | 916 | if ($this->sequence === IMAP::ST_UID) { |
| 913 | 917 | $sequence_id = $next_uid; |
| 914 | - }else{ |
|
| 918 | + } else{ |
|
| 915 | 919 | $sequence_id = $this->client->getConnection()->getMessageNumber($next_uid); |
| 916 | 920 | } |
| 917 | 921 | |
@@ -937,7 +941,9 @@ discard block |
||
| 937 | 941 | */ |
| 938 | 942 | public function delete($expunge = true) { |
| 939 | 943 | $status = $this->setFlag("Deleted"); |
| 940 | - if($expunge) $this->client->expunge(); |
|
| 944 | + if($expunge) { |
|
| 945 | + $this->client->expunge(); |
|
| 946 | + } |
|
| 941 | 947 | |
| 942 | 948 | $event = $this->getEvent("message", "deleted"); |
| 943 | 949 | $event::dispatch($this); |
@@ -956,7 +962,9 @@ discard block |
||
| 956 | 962 | */ |
| 957 | 963 | public function restore($expunge = true) { |
| 958 | 964 | $status = $this->unsetFlag("Deleted"); |
| 959 | - if($expunge) $this->client->expunge(); |
|
| 965 | + if($expunge) { |
|
| 966 | + $this->client->expunge(); |
|
| 967 | + } |
|
| 960 | 968 | |
| 961 | 969 | $event = $this->getEvent("message", "restored"); |
| 962 | 970 | $event::dispatch($this); |