@@ -77,17 +77,17 @@ discard block |
||
| 77 | 77 | foreach($criteria as $arguments){ |
| 78 | 78 | if(count($arguments) == 1){ |
| 79 | 79 | $this->where($arguments[0]); |
| 80 | - }elseif(count($arguments) == 2){ |
|
| 80 | + } elseif(count($arguments) == 2){ |
|
| 81 | 81 | $this->where($arguments[0], $arguments[1]); |
| 82 | 82 | } |
| 83 | 83 | } |
| 84 | - }else{ |
|
| 84 | + } else{ |
|
| 85 | 85 | $criteria = $this->validate_criteria($criteria); |
| 86 | 86 | $value = $this->parse_value($value); |
| 87 | 87 | |
| 88 | 88 | if($value === null || $value === ''){ |
| 89 | 89 | $this->query->push([$criteria]); |
| 90 | - }else{ |
|
| 90 | + } else{ |
|
| 91 | 91 | $this->query->push([$criteria, $value]); |
| 92 | 92 | } |
| 93 | 93 | } |
@@ -102,7 +102,9 @@ discard block |
||
| 102 | 102 | */ |
| 103 | 103 | public function orWhere(\Closure $closure = null) { |
| 104 | 104 | $this->query->push(['OR']); |
| 105 | - if($closure !== null) $closure($this); |
|
| 105 | + if($closure !== null) { |
|
| 106 | + $closure($this); |
|
| 107 | + } |
|
| 106 | 108 | |
| 107 | 109 | return $this; |
| 108 | 110 | } |
@@ -114,7 +116,9 @@ discard block |
||
| 114 | 116 | */ |
| 115 | 117 | public function andWhere(\Closure $closure = null) { |
| 116 | 118 | $this->query->push(['AND']); |
| 117 | - if($closure !== null) $closure($this); |
|
| 119 | + if($closure !== null) { |
|
| 120 | + $closure($this); |
|
| 121 | + } |
|
| 118 | 122 | |
| 119 | 123 | return $this; |
| 120 | 124 | } |
@@ -75,13 +75,13 @@ discard block |
||
| 75 | 75 | |
| 76 | 76 | $name = camel_case($name); |
| 77 | 77 | |
| 78 | - if(strtolower(substr($name, 0, 3)) === 'not') { |
|
| 78 | + if (strtolower(substr($name, 0, 3)) === 'not') { |
|
| 79 | 79 | $that = $that->whereNot(); |
| 80 | 80 | $name = substr($name, 3); |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | $method = 'where'.ucfirst($name); |
| 84 | - if(method_exists($this, $method) === true){ |
|
| 84 | + if (method_exists($this, $method) === true) { |
|
| 85 | 85 | return call_user_func_array([$that, $method], $arguments); |
| 86 | 86 | } |
| 87 | 87 | |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | protected function validate_criteria($criteria) { |
| 99 | 99 | $criteria = strtoupper($criteria); |
| 100 | 100 | |
| 101 | - if(in_array($criteria, $this->available_criteria) === false) { |
|
| 101 | + if (in_array($criteria, $this->available_criteria) === false) { |
|
| 102 | 102 | throw new InvalidWhereQueryCriteriaException(); |
| 103 | 103 | } |
| 104 | 104 | |
@@ -113,21 +113,21 @@ discard block |
||
| 113 | 113 | * @throws InvalidWhereQueryCriteriaException |
| 114 | 114 | */ |
| 115 | 115 | public function where($criteria, $value = null) { |
| 116 | - if(is_array($criteria)){ |
|
| 117 | - foreach($criteria as $arguments){ |
|
| 118 | - if(count($arguments) == 1){ |
|
| 116 | + if (is_array($criteria)) { |
|
| 117 | + foreach ($criteria as $arguments) { |
|
| 118 | + if (count($arguments) == 1) { |
|
| 119 | 119 | $this->where($arguments[0]); |
| 120 | - }elseif(count($arguments) == 2){ |
|
| 120 | + }elseif (count($arguments) == 2) { |
|
| 121 | 121 | $this->where($arguments[0], $arguments[1]); |
| 122 | 122 | } |
| 123 | 123 | } |
| 124 | - }else{ |
|
| 124 | + } else { |
|
| 125 | 125 | $criteria = $this->validate_criteria($criteria); |
| 126 | 126 | $value = $this->parse_value($value); |
| 127 | 127 | |
| 128 | - if($value === null || $value === ''){ |
|
| 128 | + if ($value === null || $value === '') { |
|
| 129 | 129 | $this->query->push([$criteria]); |
| 130 | - }else{ |
|
| 130 | + } else { |
|
| 131 | 131 | $this->query->push([$criteria, $value]); |
| 132 | 132 | } |
| 133 | 133 | } |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | */ |
| 143 | 143 | public function orWhere(\Closure $closure = null) { |
| 144 | 144 | $this->query->push(['OR']); |
| 145 | - if($closure !== null) $closure($this); |
|
| 145 | + if ($closure !== null) $closure($this); |
|
| 146 | 146 | |
| 147 | 147 | return $this; |
| 148 | 148 | } |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | */ |
| 155 | 155 | public function andWhere(\Closure $closure = null) { |
| 156 | 156 | $this->query->push(['AND']); |
| 157 | - if($closure !== null) $closure($this); |
|
| 157 | + if ($closure !== null) $closure($this); |
|
| 158 | 158 | |
| 159 | 159 | return $this; |
| 160 | 160 | } |
@@ -404,7 +404,7 @@ discard block |
||
| 404 | 404 | * @return WhereQuery |
| 405 | 405 | * @throws InvalidWhereQueryCriteriaException |
| 406 | 406 | */ |
| 407 | - public function whereNoXSpam(){ |
|
| 407 | + public function whereNoXSpam() { |
|
| 408 | 408 | return $this->where("X-Spam-Flag NO"); |
| 409 | 409 | } |
| 410 | 410 | |
@@ -412,7 +412,7 @@ discard block |
||
| 412 | 412 | * @return WhereQuery |
| 413 | 413 | * @throws InvalidWhereQueryCriteriaException |
| 414 | 414 | */ |
| 415 | - public function whereIsXSpam(){ |
|
| 415 | + public function whereIsXSpam() { |
|
| 416 | 416 | return $this->where("X-Spam-Flag YES"); |
| 417 | 417 | } |
| 418 | 418 | |
@@ -422,7 +422,7 @@ discard block |
||
| 422 | 422 | * @return WhereQuery |
| 423 | 423 | * @throws InvalidWhereQueryCriteriaException |
| 424 | 424 | */ |
| 425 | - public function whereLanguage($country_code){ |
|
| 425 | + public function whereLanguage($country_code) { |
|
| 426 | 426 | return $this->where("Content-Language $country_code"); |
| 427 | 427 | } |
| 428 | 428 | } |
| 429 | 429 | \ No newline at end of file |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | * If however the default account is missing a parameter the package default account parameter will be used. |
| 59 | 59 | * This can be disabled by setting imap.default in your config file to 'false' |
| 60 | 60 | */ |
| 61 | - private function setVendorConfig(){ |
|
| 61 | + private function setVendorConfig() { |
|
| 62 | 62 | |
| 63 | 63 | $config_key = 'imap'; |
| 64 | 64 | $path = __DIR__.'/../../config/'.$config_key.'.php'; |
@@ -70,17 +70,17 @@ discard block |
||
| 70 | 70 | |
| 71 | 71 | $config = $this->app['config']->get($config_key); |
| 72 | 72 | |
| 73 | - if(is_array($config)){ |
|
| 74 | - if(isset($config['default'])){ |
|
| 75 | - if(isset($config['accounts']) && $config['default'] != false){ |
|
| 73 | + if (is_array($config)) { |
|
| 74 | + if (isset($config['default'])) { |
|
| 75 | + if (isset($config['accounts']) && $config['default'] != false) { |
|
| 76 | 76 | |
| 77 | 77 | $default_config = $vendor_config['accounts']['default']; |
| 78 | - if(isset($config['accounts'][$config['default']])){ |
|
| 78 | + if (isset($config['accounts'][$config['default']])) { |
|
| 79 | 79 | $default_config = array_merge($default_config, $config['accounts'][$config['default']]); |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | - if(is_array($config['accounts'])){ |
|
| 83 | - foreach($config['accounts'] as $account_key => $account){ |
|
| 82 | + if (is_array($config['accounts'])) { |
|
| 83 | + foreach ($config['accounts'] as $account_key => $account) { |
|
| 84 | 84 | $config['accounts'][$account_key] = array_merge($default_config, $account); |
| 85 | 85 | } |
| 86 | 86 | } |
@@ -114,23 +114,23 @@ discard block |
||
| 114 | 114 | $arrays = func_get_args(); |
| 115 | 115 | $base = array_shift($arrays); |
| 116 | 116 | |
| 117 | - if(!is_array($base)) $base = empty($base) ? array() : array($base); |
|
| 117 | + if (!is_array($base)) $base = empty($base) ? array() : array($base); |
|
| 118 | 118 | |
| 119 | - foreach($arrays as $append) { |
|
| 119 | + foreach ($arrays as $append) { |
|
| 120 | 120 | |
| 121 | - if(!is_array($append)) $append = array($append); |
|
| 121 | + if (!is_array($append)) $append = array($append); |
|
| 122 | 122 | |
| 123 | - foreach($append as $key => $value) { |
|
| 123 | + foreach ($append as $key => $value) { |
|
| 124 | 124 | |
| 125 | - if(!array_key_exists($key, $base) and !is_numeric($key)) { |
|
| 125 | + if (!array_key_exists($key, $base) and !is_numeric($key)) { |
|
| 126 | 126 | $base[$key] = $append[$key]; |
| 127 | 127 | continue; |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | - if(is_array($value) or is_array($base[$key])) { |
|
| 130 | + if (is_array($value) or is_array($base[$key])) { |
|
| 131 | 131 | $base[$key] = $this->array_merge_recursive_distinct($base[$key], $append[$key]); |
| 132 | - } else if(is_numeric($key)) { |
|
| 133 | - if(!in_array($value, $base)) $base[] = $value; |
|
| 132 | + } else if (is_numeric($key)) { |
|
| 133 | + if (!in_array($value, $base)) $base[] = $value; |
|
| 134 | 134 | } else { |
| 135 | 135 | $base[$key] = $value; |
| 136 | 136 | } |
@@ -114,11 +114,15 @@ discard block |
||
| 114 | 114 | $arrays = func_get_args(); |
| 115 | 115 | $base = array_shift($arrays); |
| 116 | 116 | |
| 117 | - if(!is_array($base)) $base = empty($base) ? array() : array($base); |
|
| 117 | + if(!is_array($base)) { |
|
| 118 | + $base = empty($base) ? array() : array($base); |
|
| 119 | + } |
|
| 118 | 120 | |
| 119 | 121 | foreach($arrays as $append) { |
| 120 | 122 | |
| 121 | - if(!is_array($append)) $append = array($append); |
|
| 123 | + if(!is_array($append)) { |
|
| 124 | + $append = array($append); |
|
| 125 | + } |
|
| 122 | 126 | |
| 123 | 127 | foreach($append as $key => $value) { |
| 124 | 128 | |
@@ -130,7 +134,9 @@ discard block |
||
| 130 | 134 | if(is_array($value) or is_array($base[$key])) { |
| 131 | 135 | $base[$key] = $this->array_merge_recursive_distinct($base[$key], $append[$key]); |
| 132 | 136 | } else if(is_numeric($key)) { |
| 133 | - if(!in_array($value, $base)) $base[] = $value; |
|
| 137 | + if(!in_array($value, $base)) { |
|
| 138 | + $base[] = $value; |
|
| 139 | + } |
|
| 134 | 140 | } else { |
| 135 | 141 | $base[$key] = $value; |
| 136 | 142 | } |
@@ -355,14 +355,14 @@ |
||
| 355 | 355 | return $status; |
| 356 | 356 | } |
| 357 | 357 | |
| 358 | - /** |
|
| 359 | - * Delete Folder |
|
| 360 | - * @param string $name |
|
| 361 | - * @param boolean $expunge |
|
| 362 | - * |
|
| 363 | - * @return bool |
|
| 364 | - * @throws ConnectionFailedException |
|
| 365 | - */ |
|
| 358 | + /** |
|
| 359 | + * Delete Folder |
|
| 360 | + * @param string $name |
|
| 361 | + * @param boolean $expunge |
|
| 362 | + * |
|
| 363 | + * @return bool |
|
| 364 | + * @throws ConnectionFailedException |
|
| 365 | + */ |
|
| 366 | 366 | public function deleteFolder($name, $expunge = true) { |
| 367 | 367 | $this->checkConnection(); |
| 368 | 368 | $status = imap_deletemailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($name)); |
@@ -172,45 +172,45 @@ discard block |
||
| 172 | 172 | * @throws MaskNotFoundException |
| 173 | 173 | */ |
| 174 | 174 | protected function setMaskFromConfig($config) { |
| 175 | - $default_config = config("imap.masks"); |
|
| 175 | + $default_config = config("imap.masks"); |
|
| 176 | 176 | |
| 177 | - if(isset($config['masks'])){ |
|
| 178 | - if(isset($config['masks']['message'])) { |
|
| 179 | - if(class_exists($config['masks']['message'])) { |
|
| 177 | + if (isset($config['masks'])) { |
|
| 178 | + if (isset($config['masks']['message'])) { |
|
| 179 | + if (class_exists($config['masks']['message'])) { |
|
| 180 | 180 | $this->default_message_mask = $config['masks']['message']; |
| 181 | - }else{ |
|
| 181 | + } else { |
|
| 182 | 182 | throw new MaskNotFoundException("Unknown mask provided: ".$config['masks']['message']); |
| 183 | 183 | } |
| 184 | - }else{ |
|
| 185 | - if(class_exists($default_config['message'])) { |
|
| 184 | + } else { |
|
| 185 | + if (class_exists($default_config['message'])) { |
|
| 186 | 186 | $this->default_message_mask = $default_config['message']; |
| 187 | - }else{ |
|
| 187 | + } else { |
|
| 188 | 188 | throw new MaskNotFoundException("Unknown mask provided: ".$default_config['message']); |
| 189 | 189 | } |
| 190 | 190 | } |
| 191 | - if(isset($config['masks']['attachment'])) { |
|
| 192 | - if(class_exists($config['masks']['attachment'])) { |
|
| 191 | + if (isset($config['masks']['attachment'])) { |
|
| 192 | + if (class_exists($config['masks']['attachment'])) { |
|
| 193 | 193 | $this->default_message_mask = $config['masks']['attachment']; |
| 194 | - }else{ |
|
| 194 | + } else { |
|
| 195 | 195 | throw new MaskNotFoundException("Unknown mask provided: ".$config['masks']['attachment']); |
| 196 | 196 | } |
| 197 | - }else{ |
|
| 198 | - if(class_exists($default_config['attachment'])) { |
|
| 197 | + } else { |
|
| 198 | + if (class_exists($default_config['attachment'])) { |
|
| 199 | 199 | $this->default_message_mask = $default_config['attachment']; |
| 200 | - }else{ |
|
| 200 | + } else { |
|
| 201 | 201 | throw new MaskNotFoundException("Unknown mask provided: ".$default_config['attachment']); |
| 202 | 202 | } |
| 203 | 203 | } |
| 204 | - }else{ |
|
| 205 | - if(class_exists($default_config['message'])) { |
|
| 204 | + } else { |
|
| 205 | + if (class_exists($default_config['message'])) { |
|
| 206 | 206 | $this->default_message_mask = $default_config['message']; |
| 207 | - }else{ |
|
| 207 | + } else { |
|
| 208 | 208 | throw new MaskNotFoundException("Unknown mask provided: ".$default_config['message']); |
| 209 | 209 | } |
| 210 | 210 | |
| 211 | - if(class_exists($default_config['attachment'])) { |
|
| 211 | + if (class_exists($default_config['attachment'])) { |
|
| 212 | 212 | $this->default_message_mask = $default_config['attachment']; |
| 213 | - }else{ |
|
| 213 | + } else { |
|
| 214 | 214 | throw new MaskNotFoundException("Unknown mask provided: ".$default_config['attachment']); |
| 215 | 215 | } |
| 216 | 216 | } |
@@ -400,8 +400,8 @@ discard block |
||
| 400 | 400 | */ |
| 401 | 401 | public function createFolder($name, $expunge = true) { |
| 402 | 402 | $this->checkConnection(); |
| 403 | - $status = imap_createmailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($name)); |
|
| 404 | - if($expunge) $this->expunge(); |
|
| 403 | + $status = imap_createmailbox($this->getConnection(), $this->getAddress().imap_utf7_encode($name)); |
|
| 404 | + if ($expunge) $this->expunge(); |
|
| 405 | 405 | |
| 406 | 406 | return $status; |
| 407 | 407 | } |
@@ -417,8 +417,8 @@ discard block |
||
| 417 | 417 | */ |
| 418 | 418 | public function renameFolder($old_name, $new_name, $expunge = true) { |
| 419 | 419 | $this->checkConnection(); |
| 420 | - $status = imap_renamemailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($old_name), $this->getAddress() . imap_utf7_encode($new_name)); |
|
| 421 | - if($expunge) $this->expunge(); |
|
| 420 | + $status = imap_renamemailbox($this->getConnection(), $this->getAddress().imap_utf7_encode($old_name), $this->getAddress().imap_utf7_encode($new_name)); |
|
| 421 | + if ($expunge) $this->expunge(); |
|
| 422 | 422 | |
| 423 | 423 | return $status; |
| 424 | 424 | } |
@@ -433,8 +433,8 @@ discard block |
||
| 433 | 433 | */ |
| 434 | 434 | public function deleteFolder($name, $expunge = true) { |
| 435 | 435 | $this->checkConnection(); |
| 436 | - $status = imap_deletemailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($name)); |
|
| 437 | - if($expunge) $this->expunge(); |
|
| 436 | + $status = imap_deletemailbox($this->getConnection(), $this->getAddress().imap_utf7_encode($name)); |
|
| 437 | + if ($expunge) $this->expunge(); |
|
| 438 | 438 | |
| 439 | 439 | return $status; |
| 440 | 440 | } |
@@ -528,7 +528,7 @@ discard block |
||
| 528 | 528 | if (!$this->validate_cert) { |
| 529 | 529 | $address .= '/novalidate-cert'; |
| 530 | 530 | } |
| 531 | - if (in_array($this->encryption,['tls','ssl'])) { |
|
| 531 | + if (in_array($this->encryption, ['tls', 'ssl'])) { |
|
| 532 | 532 | $address .= '/'.$this->encryption; |
| 533 | 533 | } |
| 534 | 534 | $address .= '}'; |
@@ -648,7 +648,7 @@ discard block |
||
| 648 | 648 | * @throws InvalidImapTimeoutTypeException |
| 649 | 649 | */ |
| 650 | 650 | public function setTimeout($type, $timeout) { |
| 651 | - if(0 <= $type && $type <= 4) { |
|
| 651 | + if (0 <= $type && $type <= 4) { |
|
| 652 | 652 | return imap_timeout($type, $timeout); |
| 653 | 653 | } |
| 654 | 654 | |
@@ -662,8 +662,8 @@ discard block |
||
| 662 | 662 | * @return mixed |
| 663 | 663 | * @throws InvalidImapTimeoutTypeException |
| 664 | 664 | */ |
| 665 | - public function getTimeout($type){ |
|
| 666 | - if(0 <= $type && $type <= 4) { |
|
| 665 | + public function getTimeout($type) { |
|
| 666 | + if (0 <= $type && $type <= 4) { |
|
| 667 | 667 | return imap_timeout($type); |
| 668 | 668 | } |
| 669 | 669 | |
@@ -673,7 +673,7 @@ discard block |
||
| 673 | 673 | /** |
| 674 | 674 | * @return string |
| 675 | 675 | */ |
| 676 | - public function getDefaultMessageMask(){ |
|
| 676 | + public function getDefaultMessageMask() { |
|
| 677 | 677 | return $this->default_message_mask; |
| 678 | 678 | } |
| 679 | 679 | |
@@ -684,7 +684,7 @@ discard block |
||
| 684 | 684 | * @throws MaskNotFoundException |
| 685 | 685 | */ |
| 686 | 686 | public function setDefaultMessageMask($mask) { |
| 687 | - if(class_exists($mask)) { |
|
| 687 | + if (class_exists($mask)) { |
|
| 688 | 688 | $this->default_message_mask = $mask; |
| 689 | 689 | |
| 690 | 690 | return $this; |
@@ -696,7 +696,7 @@ discard block |
||
| 696 | 696 | /** |
| 697 | 697 | * @return string |
| 698 | 698 | */ |
| 699 | - public function getDefaultAttachmentMask(){ |
|
| 699 | + public function getDefaultAttachmentMask() { |
|
| 700 | 700 | return $this->default_attachment_mask; |
| 701 | 701 | } |
| 702 | 702 | |
@@ -707,7 +707,7 @@ discard block |
||
| 707 | 707 | * @throws MaskNotFoundException |
| 708 | 708 | */ |
| 709 | 709 | public function setDefaultAttachmentMask($mask) { |
| 710 | - if(class_exists($mask)) { |
|
| 710 | + if (class_exists($mask)) { |
|
| 711 | 711 | $this->default_attachment_mask = $mask; |
| 712 | 712 | |
| 713 | 713 | return $this; |
@@ -178,39 +178,39 @@ discard block |
||
| 178 | 178 | if(isset($config['masks']['message'])) { |
| 179 | 179 | if(class_exists($config['masks']['message'])) { |
| 180 | 180 | $this->default_message_mask = $config['masks']['message']; |
| 181 | - }else{ |
|
| 181 | + } else{ |
|
| 182 | 182 | throw new MaskNotFoundException("Unknown mask provided: ".$config['masks']['message']); |
| 183 | 183 | } |
| 184 | - }else{ |
|
| 184 | + } else{ |
|
| 185 | 185 | if(class_exists($default_config['message'])) { |
| 186 | 186 | $this->default_message_mask = $default_config['message']; |
| 187 | - }else{ |
|
| 187 | + } else{ |
|
| 188 | 188 | throw new MaskNotFoundException("Unknown mask provided: ".$default_config['message']); |
| 189 | 189 | } |
| 190 | 190 | } |
| 191 | 191 | if(isset($config['masks']['attachment'])) { |
| 192 | 192 | if(class_exists($config['masks']['attachment'])) { |
| 193 | 193 | $this->default_message_mask = $config['masks']['attachment']; |
| 194 | - }else{ |
|
| 194 | + } else{ |
|
| 195 | 195 | throw new MaskNotFoundException("Unknown mask provided: ".$config['masks']['attachment']); |
| 196 | 196 | } |
| 197 | - }else{ |
|
| 197 | + } else{ |
|
| 198 | 198 | if(class_exists($default_config['attachment'])) { |
| 199 | 199 | $this->default_message_mask = $default_config['attachment']; |
| 200 | - }else{ |
|
| 200 | + } else{ |
|
| 201 | 201 | throw new MaskNotFoundException("Unknown mask provided: ".$default_config['attachment']); |
| 202 | 202 | } |
| 203 | 203 | } |
| 204 | - }else{ |
|
| 204 | + } else{ |
|
| 205 | 205 | if(class_exists($default_config['message'])) { |
| 206 | 206 | $this->default_message_mask = $default_config['message']; |
| 207 | - }else{ |
|
| 207 | + } else{ |
|
| 208 | 208 | throw new MaskNotFoundException("Unknown mask provided: ".$default_config['message']); |
| 209 | 209 | } |
| 210 | 210 | |
| 211 | 211 | if(class_exists($default_config['attachment'])) { |
| 212 | 212 | $this->default_message_mask = $default_config['attachment']; |
| 213 | - }else{ |
|
| 213 | + } else{ |
|
| 214 | 214 | throw new MaskNotFoundException("Unknown mask provided: ".$default_config['attachment']); |
| 215 | 215 | } |
| 216 | 216 | } |
@@ -401,7 +401,9 @@ discard block |
||
| 401 | 401 | public function createFolder($name, $expunge = true) { |
| 402 | 402 | $this->checkConnection(); |
| 403 | 403 | $status = imap_createmailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($name)); |
| 404 | - if($expunge) $this->expunge(); |
|
| 404 | + if($expunge) { |
|
| 405 | + $this->expunge(); |
|
| 406 | + } |
|
| 405 | 407 | |
| 406 | 408 | return $status; |
| 407 | 409 | } |
@@ -418,7 +420,9 @@ discard block |
||
| 418 | 420 | public function renameFolder($old_name, $new_name, $expunge = true) { |
| 419 | 421 | $this->checkConnection(); |
| 420 | 422 | $status = imap_renamemailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($old_name), $this->getAddress() . imap_utf7_encode($new_name)); |
| 421 | - if($expunge) $this->expunge(); |
|
| 423 | + if($expunge) { |
|
| 424 | + $this->expunge(); |
|
| 425 | + } |
|
| 422 | 426 | |
| 423 | 427 | return $status; |
| 424 | 428 | } |
@@ -434,7 +438,9 @@ discard block |
||
| 434 | 438 | public function deleteFolder($name, $expunge = true) { |
| 435 | 439 | $this->checkConnection(); |
| 436 | 440 | $status = imap_deletemailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($name)); |
| 437 | - if($expunge) $this->expunge(); |
|
| 441 | + if($expunge) { |
|
| 442 | + $this->expunge(); |
|
| 443 | + } |
|
| 438 | 444 | |
| 439 | 445 | return $status; |
| 440 | 446 | } |
@@ -370,7 +370,9 @@ discard block |
||
| 370 | 370 | */ |
| 371 | 371 | public function delete($expunge = true) { |
| 372 | 372 | $status = imap_deletemailbox($this->client->getConnection(), $this->path); |
| 373 | - if($expunge) $this->client->expunge(); |
|
| 373 | + if($expunge) { |
|
| 374 | + $this->client->expunge(); |
|
| 375 | + } |
|
| 374 | 376 | |
| 375 | 377 | return $status; |
| 376 | 378 | } |
@@ -387,7 +389,9 @@ discard block |
||
| 387 | 389 | */ |
| 388 | 390 | public function move($target_mailbox, $expunge = true) { |
| 389 | 391 | $status = imap_renamemailbox($this->client->getConnection(), $this->path, $target_mailbox); |
| 390 | - if($expunge) $this->client->expunge(); |
|
| 392 | + if($expunge) { |
|
| 393 | + $this->client->expunge(); |
|
| 394 | + } |
|
| 391 | 395 | |
| 392 | 396 | return $status; |
| 393 | 397 | } |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | |
| 119 | 119 | $this->setDelimiter($structure->delimiter); |
| 120 | 120 | $this->path = $structure->name; |
| 121 | - $this->full_name = $this->decodeName($structure->name); |
|
| 121 | + $this->full_name = $this->decodeName($structure->name); |
|
| 122 | 122 | $this->name = $this->getSimpleName($this->delimiter, $this->full_name); |
| 123 | 123 | |
| 124 | 124 | $this->parseAttributes($structure->attributes); |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | * @return WhereQuery |
| 132 | 132 | * @throws Exceptions\ConnectionFailedException |
| 133 | 133 | */ |
| 134 | - public function query($charset = 'UTF-8'){ |
|
| 134 | + public function query($charset = 'UTF-8') { |
|
| 135 | 135 | $this->getClient()->checkConnection(); |
| 136 | 136 | $this->getClient()->openFolder($this); |
| 137 | 137 | |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | * @inheritdoc self::query($charset = 'UTF-8') |
| 143 | 143 | * @throws Exceptions\ConnectionFailedException |
| 144 | 144 | */ |
| 145 | - public function search($charset = 'UTF-8'){ |
|
| 145 | + public function search($charset = 'UTF-8') { |
|
| 146 | 146 | return $this->query($charset); |
| 147 | 147 | } |
| 148 | 148 | |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | * @inheritdoc self::query($charset = 'UTF-8') |
| 151 | 151 | * @throws Exceptions\ConnectionFailedException |
| 152 | 152 | */ |
| 153 | - public function messages($charset = 'UTF-8'){ |
|
| 153 | + public function messages($charset = 'UTF-8') { |
|
| 154 | 154 | return $this->query($charset); |
| 155 | 155 | } |
| 156 | 156 | |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | * @deprecated 1.2.1:2.0.0 No longer needed. Use Folder::query() instead |
| 315 | 315 | * @see Folder::query() |
| 316 | 316 | */ |
| 317 | - public function searchMessages(array $where, $fetch_options = null, $fetch_body = true, $fetch_attachment = true, $fetch_flags = true, $limit = null, $page = 1, $charset = "UTF-8") { |
|
| 317 | + public function searchMessages(array $where, $fetch_options = null, $fetch_body = true, $fetch_attachment = true, $fetch_flags = true, $limit = null, $page = 1, $charset = "UTF-8") { |
|
| 318 | 318 | $this->getClient()->checkConnection(); |
| 319 | 319 | |
| 320 | 320 | return $this->query($charset)->where($where)->setFetchOptions($fetch_options)->setFetchBody($fetch_body) |
@@ -373,7 +373,7 @@ discard block |
||
| 373 | 373 | */ |
| 374 | 374 | public function delete($expunge = true) { |
| 375 | 375 | $status = imap_deletemailbox($this->client->getConnection(), $this->path); |
| 376 | - if($expunge) $this->client->expunge(); |
|
| 376 | + if ($expunge) $this->client->expunge(); |
|
| 377 | 377 | |
| 378 | 378 | return $status; |
| 379 | 379 | } |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | */ |
| 391 | 391 | public function move($target_mailbox, $expunge = true) { |
| 392 | 392 | $status = imap_renamemailbox($this->client->getConnection(), $this->path, $target_mailbox); |
| 393 | - if($expunge) $this->client->expunge(); |
|
| 393 | + if ($expunge) $this->client->expunge(); |
|
| 394 | 394 | |
| 395 | 395 | return $status; |
| 396 | 396 | } |
@@ -439,8 +439,8 @@ discard block |
||
| 439 | 439 | /** |
| 440 | 440 | * @param $delimiter |
| 441 | 441 | */ |
| 442 | - public function setDelimiter($delimiter){ |
|
| 443 | - if(in_array($delimiter, [null, '', ' ', false]) === true) { |
|
| 442 | + public function setDelimiter($delimiter) { |
|
| 443 | + if (in_array($delimiter, [null, '', ' ', false]) === true) { |
|
| 444 | 444 | $delimiter = config('imap.options.delimiter', '/'); |
| 445 | 445 | } |
| 446 | 446 | |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | $this->part_number = ($part_number) ? $part_number : $this->part_number; |
| 94 | 94 | |
| 95 | 95 | $default_mask = $this->oMessage->getClient()->getDefaultAttachmentMask(); |
| 96 | - if($default_mask != null) { |
|
| 96 | + if ($default_mask != null) { |
|
| 97 | 97 | $this->mask = $default_mask; |
| 98 | 98 | } |
| 99 | 99 | |
@@ -110,10 +110,10 @@ discard block |
||
| 110 | 110 | * @throws MethodNotFoundException |
| 111 | 111 | */ |
| 112 | 112 | public function __call($method, $arguments) { |
| 113 | - if(strtolower(substr($method, 0, 3)) === 'get') { |
|
| 113 | + if (strtolower(substr($method, 0, 3)) === 'get') { |
|
| 114 | 114 | $name = snake_case(substr($method, 3)); |
| 115 | 115 | |
| 116 | - if(isset($this->attributes[$name])) { |
|
| 116 | + if (isset($this->attributes[$name])) { |
|
| 117 | 117 | return $this->attributes[$name]; |
| 118 | 118 | } |
| 119 | 119 | |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | * @return mixed|null |
| 148 | 148 | */ |
| 149 | 149 | public function __get($name) { |
| 150 | - if(isset($this->attributes[$name])) { |
|
| 150 | + if (isset($this->attributes[$name])) { |
|
| 151 | 151 | return $this->attributes[$name]; |
| 152 | 152 | } |
| 153 | 153 | |
@@ -255,9 +255,9 @@ discard block |
||
| 255 | 255 | * @param $name |
| 256 | 256 | */ |
| 257 | 257 | public function setName($name) { |
| 258 | - if($this->config['decoder']['message']['subject'] === 'utf-8') { |
|
| 258 | + if ($this->config['decoder']['message']['subject'] === 'utf-8') { |
|
| 259 | 259 | $this->name = imap_utf8($name); |
| 260 | - }else{ |
|
| 260 | + } else { |
|
| 261 | 261 | $this->name = mb_decode_mimeheader($name); |
| 262 | 262 | } |
| 263 | 263 | } |
@@ -277,28 +277,28 @@ discard block |
||
| 277 | 277 | /** |
| 278 | 278 | * @return string|null |
| 279 | 279 | */ |
| 280 | - public function getMimeType(){ |
|
| 280 | + public function getMimeType() { |
|
| 281 | 281 | return (new \finfo())->buffer($this->getContent(), FILEINFO_MIME_TYPE); |
| 282 | 282 | } |
| 283 | 283 | |
| 284 | 284 | /** |
| 285 | 285 | * @return string|null |
| 286 | 286 | */ |
| 287 | - public function getExtension(){ |
|
| 287 | + public function getExtension() { |
|
| 288 | 288 | return ExtensionGuesser::getInstance()->guess($this->getMimeType()); |
| 289 | 289 | } |
| 290 | 290 | |
| 291 | 291 | /** |
| 292 | 292 | * @return array |
| 293 | 293 | */ |
| 294 | - public function getAttributes(){ |
|
| 294 | + public function getAttributes() { |
|
| 295 | 295 | return $this->attributes; |
| 296 | 296 | } |
| 297 | 297 | |
| 298 | 298 | /** |
| 299 | 299 | * @return Message |
| 300 | 300 | */ |
| 301 | - public function getMessage(){ |
|
| 301 | + public function getMessage() { |
|
| 302 | 302 | return $this->oMessage; |
| 303 | 303 | } |
| 304 | 304 | |
@@ -306,8 +306,8 @@ discard block |
||
| 306 | 306 | * @param $mask |
| 307 | 307 | * @return $this |
| 308 | 308 | */ |
| 309 | - public function setMask($mask){ |
|
| 310 | - if(class_exists($mask)){ |
|
| 309 | + public function setMask($mask) { |
|
| 310 | + if (class_exists($mask)) { |
|
| 311 | 311 | $this->mask = $mask; |
| 312 | 312 | } |
| 313 | 313 | |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | /** |
| 318 | 318 | * @return string |
| 319 | 319 | */ |
| 320 | - public function getMask(){ |
|
| 320 | + public function getMask() { |
|
| 321 | 321 | return $this->mask; |
| 322 | 322 | } |
| 323 | 323 | |
@@ -328,9 +328,9 @@ discard block |
||
| 328 | 328 | * @return mixed |
| 329 | 329 | * @throws MaskNotFoundException |
| 330 | 330 | */ |
| 331 | - public function mask($mask = null){ |
|
| 331 | + public function mask($mask = null) { |
|
| 332 | 332 | $mask = $mask !== null ? $mask : $this->mask; |
| 333 | - if(class_exists($mask)){ |
|
| 333 | + if (class_exists($mask)) { |
|
| 334 | 334 | return new $mask($this); |
| 335 | 335 | } |
| 336 | 336 | |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | return null; |
| 121 | - }elseif (strtolower(substr($method, 0, 3)) === 'set') { |
|
| 121 | + } elseif (strtolower(substr($method, 0, 3)) === 'set') { |
|
| 122 | 122 | $name = snake_case(substr($method, 3)); |
| 123 | 123 | |
| 124 | 124 | $this->attributes[$name] = array_pop($arguments); |
@@ -257,7 +257,7 @@ discard block |
||
| 257 | 257 | public function setName($name) { |
| 258 | 258 | if($this->config['decoder']['message']['subject'] === 'utf-8') { |
| 259 | 259 | $this->name = imap_utf8($name); |
| 260 | - }else{ |
|
| 260 | + } else{ |
|
| 261 | 261 | $this->name = mb_decode_mimeheader($name); |
| 262 | 262 | } |
| 263 | 263 | } |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | * |
| 48 | 48 | * @return Attachment |
| 49 | 49 | */ |
| 50 | - public function getAttachment(){ |
|
| 50 | + public function getAttachment() { |
|
| 51 | 51 | return $this->parent; |
| 52 | 52 | } |
| 53 | 53 | } |
| 54 | 54 | \ No newline at end of file |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | public function __construct($parent) { |
| 39 | 39 | $this->parent = $parent; |
| 40 | 40 | |
| 41 | - if(method_exists($this->parent, 'getAttributes')){ |
|
| 41 | + if (method_exists($this->parent, 'getAttributes')) { |
|
| 42 | 42 | $this->attributes = array_merge($this->attributes, $this->parent->getAttributes()); |
| 43 | 43 | } |
| 44 | 44 | } |
@@ -53,17 +53,17 @@ discard block |
||
| 53 | 53 | * @throws MethodNotFoundException |
| 54 | 54 | */ |
| 55 | 55 | public function __call($method, $arguments) { |
| 56 | - if(strtolower(substr($method, 0, 3)) === 'get') { |
|
| 56 | + if (strtolower(substr($method, 0, 3)) === 'get') { |
|
| 57 | 57 | $name = snake_case(substr($method, 3)); |
| 58 | 58 | |
| 59 | - if(isset($this->attributes[$name])) { |
|
| 59 | + if (isset($this->attributes[$name])) { |
|
| 60 | 60 | return $this->attributes[$name]; |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | }elseif (strtolower(substr($method, 0, 3)) === 'set') { |
| 64 | 64 | $name = snake_case(substr($method, 3)); |
| 65 | 65 | |
| 66 | - if(isset($this->attributes[$name])) { |
|
| 66 | + if (isset($this->attributes[$name])) { |
|
| 67 | 67 | $this->attributes[$name] = array_pop($arguments); |
| 68 | 68 | |
| 69 | 69 | return $this->attributes[$name]; |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | - if(method_exists($this->parent, $method) === true){ |
|
| 74 | + if (method_exists($this->parent, $method) === true) { |
|
| 75 | 75 | return call_user_func_array([$this->parent, $method], $arguments); |
| 76 | 76 | } |
| 77 | 77 | |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | * @return mixed|null |
| 97 | 97 | */ |
| 98 | 98 | public function __get($name) { |
| 99 | - if(isset($this->attributes[$name])) { |
|
| 99 | + if (isset($this->attributes[$name])) { |
|
| 100 | 100 | return $this->attributes[$name]; |
| 101 | 101 | } |
| 102 | 102 | |
@@ -106,14 +106,14 @@ discard block |
||
| 106 | 106 | /** |
| 107 | 107 | * @return mixed |
| 108 | 108 | */ |
| 109 | - public function getParent(){ |
|
| 109 | + public function getParent() { |
|
| 110 | 110 | return $this->parent; |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | /** |
| 114 | 114 | * @return array |
| 115 | 115 | */ |
| 116 | - public function getAttributes(){ |
|
| 116 | + public function getAttributes() { |
|
| 117 | 117 | return $this->attributes; |
| 118 | 118 | } |
| 119 | 119 | |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | return $this->attributes[$name]; |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | - }elseif (strtolower(substr($method, 0, 3)) === 'set') { |
|
| 63 | + } elseif (strtolower(substr($method, 0, 3)) === 'set') { |
|
| 64 | 64 | $name = snake_case(substr($method, 3)); |
| 65 | 65 | |
| 66 | 66 | if(isset($this->attributes[$name])) { |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | * Get the message html body |
| 30 | 30 | * @return null |
| 31 | 31 | */ |
| 32 | - public function getHtmlBody(){ |
|
| 32 | + public function getHtmlBody() { |
|
| 33 | 33 | $bodies = $this->parent->getBodies(); |
| 34 | 34 | if (!isset($bodies['html'])) { |
| 35 | 35 | return null; |
@@ -45,15 +45,15 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | public function getCustomHTMLBody($callback = false) { |
| 47 | 47 | $body = $this->getHtmlBody(); |
| 48 | - if($body === null) return null; |
|
| 48 | + if ($body === null) return null; |
|
| 49 | 49 | |
| 50 | 50 | if ($callback !== false) { |
| 51 | 51 | $aAttachment = $this->parent->getAttachments(); |
| 52 | 52 | $aAttachment->each(function($oAttachment) use(&$body, $callback) { |
| 53 | 53 | /** @var Attachment $oAttachment */ |
| 54 | - if(is_callable($callback)) { |
|
| 54 | + if (is_callable($callback)) { |
|
| 55 | 55 | $body = $callback($body, $oAttachment); |
| 56 | - }elseif(is_string($callback)) { |
|
| 56 | + }elseif (is_string($callback)) { |
|
| 57 | 57 | call_user_func($callback, [$body, $oAttachment]); |
| 58 | 58 | } |
| 59 | 59 | }); |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | * @return string|null |
| 70 | 70 | */ |
| 71 | 71 | public function getHTMLBodyWithEmbeddedBase64Images() { |
| 72 | - return $this->getCustomHTMLBody(function($body, $oAttachment){ |
|
| 72 | + return $this->getCustomHTMLBody(function($body, $oAttachment) { |
|
| 73 | 73 | /** @var \Webklex\IMAP\Attachment $oAttachment */ |
| 74 | 74 | if ($oAttachment->id && $oAttachment->getImgSrc() != null) { |
| 75 | 75 | $body = str_replace('cid:'.$oAttachment->id, $oAttachment->getImgSrc(), $body); |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | * |
| 114 | 114 | * @return Message |
| 115 | 115 | */ |
| 116 | - public function getMessage(){ |
|
| 116 | + public function getMessage() { |
|
| 117 | 117 | return $this->parent; |
| 118 | 118 | } |
| 119 | 119 | |
@@ -45,7 +45,9 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | public function getCustomHTMLBody($callback = false) { |
| 47 | 47 | $body = $this->getHtmlBody(); |
| 48 | - if($body === null) return null; |
|
| 48 | + if($body === null) { |
|
| 49 | + return null; |
|
| 50 | + } |
|
| 49 | 51 | |
| 50 | 52 | if ($callback !== false) { |
| 51 | 53 | $aAttachment = $this->parent->getAttachments(); |
@@ -53,7 +55,7 @@ discard block |
||
| 53 | 55 | /** @var Attachment $oAttachment */ |
| 54 | 56 | if(is_callable($callback)) { |
| 55 | 57 | $body = $callback($body, $oAttachment); |
| 56 | - }elseif(is_string($callback)) { |
|
| 58 | + } elseif(is_string($callback)) { |
|
| 57 | 59 | call_user_func($callback, [$body, $oAttachment]); |
| 58 | 60 | } |
| 59 | 61 | }); |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | public function __construct(Client $client, $charset = 'UTF-8') { |
| 66 | 66 | $this->setClient($client); |
| 67 | 67 | |
| 68 | - if(config('imap.options.fetch') === IMAP::FT_PEEK) $this->leaveUnread(); |
|
| 68 | + if (config('imap.options.fetch') === IMAP::FT_PEEK) $this->leaveUnread(); |
|
| 69 | 69 | |
| 70 | 70 | $this->charset = $charset; |
| 71 | 71 | $this->query = collect(); |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | /** |
| 76 | 76 | * Instance boot method for additional functionality |
| 77 | 77 | */ |
| 78 | - protected function boot(){} |
|
| 78 | + protected function boot() {} |
|
| 79 | 79 | |
| 80 | 80 | /** |
| 81 | 81 | * Parse a given value |
@@ -83,8 +83,8 @@ discard block |
||
| 83 | 83 | * |
| 84 | 84 | * @return string |
| 85 | 85 | */ |
| 86 | - protected function parse_value($value){ |
|
| 87 | - switch(true){ |
|
| 86 | + protected function parse_value($value) { |
|
| 87 | + switch (true) { |
|
| 88 | 88 | case $value instanceof \Carbon\Carbon: |
| 89 | 89 | $value = $value->format('d M y'); |
| 90 | 90 | break; |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | * @throws MessageSearchValidationException |
| 102 | 102 | */ |
| 103 | 103 | protected function parse_date($date) { |
| 104 | - if($date instanceof \Carbon\Carbon) return $date; |
|
| 104 | + if ($date instanceof \Carbon\Carbon) return $date; |
|
| 105 | 105 | |
| 106 | 106 | try { |
| 107 | 107 | $date = Carbon::parse($date); |
@@ -150,9 +150,9 @@ discard block |
||
| 150 | 150 | * Don't set the charset if it isn't used - prevent strange outlook mail server errors |
| 151 | 151 | * @see https://github.com/Webklex/laravel-imap/issues/100 |
| 152 | 152 | */ |
| 153 | - if($this->getCharset() === null){ |
|
| 153 | + if ($this->getCharset() === null) { |
|
| 154 | 154 | $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), IMAP::SE_UID); |
| 155 | - }else{ |
|
| 155 | + } else { |
|
| 156 | 156 | $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), IMAP::SE_UID, $this->getCharset()); |
| 157 | 157 | } |
| 158 | 158 | |
@@ -161,13 +161,13 @@ discard block |
||
| 161 | 161 | $available_messages = collect($available_messages); |
| 162 | 162 | $options = config('imap.options'); |
| 163 | 163 | |
| 164 | - if(strtolower($options['fetch_order']) === 'desc'){ |
|
| 164 | + if (strtolower($options['fetch_order']) === 'desc') { |
|
| 165 | 165 | $available_messages = $available_messages->reverse(); |
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | $available_messages->forPage($this->page, $this->limit)->each(function($msgno, $msglist) use(&$messages, $options) { |
| 169 | 169 | $oMessage = new Message($msgno, $msglist, $this->getClient(), $this->getFetchOptions(), $this->getFetchBody(), $this->getFetchAttachment(), $this->getFetchFlags()); |
| 170 | - switch ($options['message_key']){ |
|
| 170 | + switch ($options['message_key']) { |
|
| 171 | 171 | case 'number': |
| 172 | 172 | $message_key = $oMessage->getMessageNo(); |
| 173 | 173 | break; |
@@ -202,9 +202,9 @@ discard block |
||
| 202 | 202 | if (count($statement) == 1) { |
| 203 | 203 | $query .= $statement[0]; |
| 204 | 204 | } else { |
| 205 | - if($statement[1] === null){ |
|
| 205 | + if ($statement[1] === null) { |
|
| 206 | 206 | $query .= $statement[0]; |
| 207 | - }else{ |
|
| 207 | + } else { |
|
| 208 | 208 | $query .= $statement[0].' "'.$statement[1].'"'; |
| 209 | 209 | } |
| 210 | 210 | } |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | * @return $this |
| 235 | 235 | */ |
| 236 | 236 | public function limit($limit, $page = 1) { |
| 237 | - if($page >= 1) $this->page = $page; |
|
| 237 | + if ($page >= 1) $this->page = $page; |
|
| 238 | 238 | $this->limit = $limit; |
| 239 | 239 | |
| 240 | 240 | return $this; |
@@ -65,7 +65,9 @@ discard block |
||
| 65 | 65 | public function __construct(Client $client, $charset = 'UTF-8') { |
| 66 | 66 | $this->setClient($client); |
| 67 | 67 | |
| 68 | - if(config('imap.options.fetch') === IMAP::FT_PEEK) $this->leaveUnread(); |
|
| 68 | + if(config('imap.options.fetch') === IMAP::FT_PEEK) { |
|
| 69 | + $this->leaveUnread(); |
|
| 70 | + } |
|
| 69 | 71 | |
| 70 | 72 | $this->charset = $charset; |
| 71 | 73 | $this->query = collect(); |
@@ -101,7 +103,9 @@ discard block |
||
| 101 | 103 | * @throws MessageSearchValidationException |
| 102 | 104 | */ |
| 103 | 105 | protected function parse_date($date) { |
| 104 | - if($date instanceof \Carbon\Carbon) return $date; |
|
| 106 | + if($date instanceof \Carbon\Carbon) { |
|
| 107 | + return $date; |
|
| 108 | + } |
|
| 105 | 109 | |
| 106 | 110 | try { |
| 107 | 111 | $date = Carbon::parse($date); |
@@ -152,7 +156,7 @@ discard block |
||
| 152 | 156 | */ |
| 153 | 157 | if($this->getCharset() === null){ |
| 154 | 158 | $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), IMAP::SE_UID); |
| 155 | - }else{ |
|
| 159 | + } else{ |
|
| 156 | 160 | $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), IMAP::SE_UID, $this->getCharset()); |
| 157 | 161 | } |
| 158 | 162 | |
@@ -204,7 +208,7 @@ discard block |
||
| 204 | 208 | } else { |
| 205 | 209 | if($statement[1] === null){ |
| 206 | 210 | $query .= $statement[0]; |
| 207 | - }else{ |
|
| 211 | + } else{ |
|
| 208 | 212 | $query .= $statement[0].' "'.$statement[1].'"'; |
| 209 | 213 | } |
| 210 | 214 | } |
@@ -234,7 +238,9 @@ discard block |
||
| 234 | 238 | * @return $this |
| 235 | 239 | */ |
| 236 | 240 | public function limit($limit, $page = 1) { |
| 237 | - if($page >= 1) $this->page = $page; |
|
| 241 | + if($page >= 1) { |
|
| 242 | + $this->page = $page; |
|
| 243 | + } |
|
| 238 | 244 | $this->limit = $limit; |
| 239 | 245 | |
| 240 | 246 | return $this; |