@@ -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 | } |
@@ -76,13 +76,13 @@ discard block |
||
| 76 | 76 | |
| 77 | 77 | $name = Str::camel($name); |
| 78 | 78 | |
| 79 | - if(strtolower(substr($name, 0, 3)) === 'not') { |
|
| 79 | + if (strtolower(substr($name, 0, 3)) === 'not') { |
|
| 80 | 80 | $that = $that->whereNot(); |
| 81 | 81 | $name = substr($name, 3); |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | $method = 'where'.ucfirst($name); |
| 85 | - if(method_exists($this, $method) === true){ |
|
| 85 | + if (method_exists($this, $method) === true) { |
|
| 86 | 86 | return call_user_func_array([$that, $method], $arguments); |
| 87 | 87 | } |
| 88 | 88 | |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | if (substr($criteria, 0, 6) === "CUSTOM") { |
| 103 | 103 | return substr($criteria, 6); |
| 104 | 104 | } |
| 105 | - if(in_array($criteria, $this->available_criteria) === false) { |
|
| 105 | + if (in_array($criteria, $this->available_criteria) === false) { |
|
| 106 | 106 | throw new InvalidWhereQueryCriteriaException(); |
| 107 | 107 | } |
| 108 | 108 | |
@@ -117,21 +117,21 @@ discard block |
||
| 117 | 117 | * @throws InvalidWhereQueryCriteriaException |
| 118 | 118 | */ |
| 119 | 119 | public function where($criteria, $value = null) { |
| 120 | - if(is_array($criteria)){ |
|
| 121 | - foreach($criteria as $arguments){ |
|
| 122 | - if(count($arguments) == 1){ |
|
| 120 | + if (is_array($criteria)) { |
|
| 121 | + foreach ($criteria as $arguments) { |
|
| 122 | + if (count($arguments) == 1) { |
|
| 123 | 123 | $this->where($arguments[0]); |
| 124 | - }elseif(count($arguments) == 2){ |
|
| 124 | + }elseif (count($arguments) == 2) { |
|
| 125 | 125 | $this->where($arguments[0], $arguments[1]); |
| 126 | 126 | } |
| 127 | 127 | } |
| 128 | - }else{ |
|
| 128 | + } else { |
|
| 129 | 129 | $criteria = $this->validate_criteria($criteria); |
| 130 | 130 | $value = $this->parse_value($value); |
| 131 | 131 | |
| 132 | - if($value === null || $value === ''){ |
|
| 132 | + if ($value === null || $value === '') { |
|
| 133 | 133 | $this->query->push([$criteria]); |
| 134 | - }else{ |
|
| 134 | + } else { |
|
| 135 | 135 | $this->query->push([$criteria, $value]); |
| 136 | 136 | } |
| 137 | 137 | } |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | */ |
| 147 | 147 | public function orWhere(\Closure $closure = null) { |
| 148 | 148 | $this->query->push(['OR']); |
| 149 | - if($closure !== null) $closure($this); |
|
| 149 | + if ($closure !== null) $closure($this); |
|
| 150 | 150 | |
| 151 | 151 | return $this; |
| 152 | 152 | } |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | */ |
| 159 | 159 | public function andWhere(\Closure $closure = null) { |
| 160 | 160 | $this->query->push(['AND']); |
| 161 | - if($closure !== null) $closure($this); |
|
| 161 | + if ($closure !== null) $closure($this); |
|
| 162 | 162 | |
| 163 | 163 | return $this; |
| 164 | 164 | } |
@@ -398,7 +398,7 @@ discard block |
||
| 398 | 398 | * @return WhereQuery |
| 399 | 399 | * @throws InvalidWhereQueryCriteriaException |
| 400 | 400 | */ |
| 401 | - public function whereNoXSpam(){ |
|
| 401 | + public function whereNoXSpam() { |
|
| 402 | 402 | return $this->where("X-Spam-Flag NO"); |
| 403 | 403 | } |
| 404 | 404 | |
@@ -406,7 +406,7 @@ discard block |
||
| 406 | 406 | * @return WhereQuery |
| 407 | 407 | * @throws InvalidWhereQueryCriteriaException |
| 408 | 408 | */ |
| 409 | - public function whereIsXSpam(){ |
|
| 409 | + public function whereIsXSpam() { |
|
| 410 | 410 | return $this->where("X-Spam-Flag YES"); |
| 411 | 411 | } |
| 412 | 412 | |
@@ -416,7 +416,7 @@ discard block |
||
| 416 | 416 | * @return WhereQuery |
| 417 | 417 | * @throws InvalidWhereQueryCriteriaException |
| 418 | 418 | */ |
| 419 | - public function whereLanguage($country_code){ |
|
| 419 | + public function whereLanguage($country_code) { |
|
| 420 | 420 | return $this->where("Content-Language $country_code"); |
| 421 | 421 | } |
| 422 | 422 | } |
@@ -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 | } |
@@ -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 | }); |
@@ -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; |
@@ -46,15 +46,15 @@ discard block |
||
| 46 | 46 | */ |
| 47 | 47 | public function getCustomHTMLBody($callback = false) { |
| 48 | 48 | $body = $this->getHtmlBody(); |
| 49 | - if($body === null) return null; |
|
| 49 | + if ($body === null) return null; |
|
| 50 | 50 | |
| 51 | 51 | if ($callback !== false) { |
| 52 | 52 | $aAttachment = $this->parent->getAttachments(); |
| 53 | 53 | $aAttachment->each(function($oAttachment) use(&$body, $callback) { |
| 54 | 54 | /** @var Attachment $oAttachment */ |
| 55 | - if(is_callable($callback)) { |
|
| 55 | + if (is_callable($callback)) { |
|
| 56 | 56 | $body = $callback($body, $oAttachment); |
| 57 | - }elseif(is_string($callback)) { |
|
| 57 | + }elseif (is_string($callback)) { |
|
| 58 | 58 | call_user_func($callback, [$body, $oAttachment]); |
| 59 | 59 | } |
| 60 | 60 | }); |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | * @return string|null |
| 71 | 71 | */ |
| 72 | 72 | public function getHTMLBodyWithEmbeddedBase64Images() { |
| 73 | - return $this->getCustomHTMLBody(function($body, $oAttachment){ |
|
| 73 | + return $this->getCustomHTMLBody(function($body, $oAttachment) { |
|
| 74 | 74 | /** @var \Webklex\IMAP\Attachment $oAttachment */ |
| 75 | 75 | if ($oAttachment->id && $oAttachment->getImgSrc() != null) { |
| 76 | 76 | $body = str_replace('cid:'.$oAttachment->id, $oAttachment->getImgSrc(), $body); |
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | * New custom method which can be called through a mask |
| 17 | 17 | * @return string |
| 18 | 18 | */ |
| 19 | - public function token(){ |
|
| 19 | + public function token() { |
|
| 20 | 20 | return implode('-', [$this->message_id, $this->uid, $this->message_no]); |
| 21 | 21 | } |
| 22 | 22 | |
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | * New custom method which can be called through a mask |
| 17 | 17 | * @return string |
| 18 | 18 | */ |
| 19 | - public function token(){ |
|
| 19 | + public function token() { |
|
| 20 | 20 | return implode('-', [$this->id, $this->getMessage()->getUid(), $this->name]); |
| 21 | 21 | } |
| 22 | 22 | |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | /** @var \Webklex\IMAP\Message $message */ |
| 21 | 21 | $message = $folder->query()->limit(1)->get()->first(); |
| 22 | 22 | |
| 23 | -$html = $message->getHTMLBody(function($body, $oAttachment){ |
|
| 23 | +$html = $message->getHTMLBody(function($body, $oAttachment) { |
|
| 24 | 24 | /** @var \Webklex\IMAP\Attachment $oAttachment */ |
| 25 | 25 | if ($oAttachment->id && $oAttachment->getImgSrc() != null) { |
| 26 | 26 | $oMessage = $oAttachment->getMessage(); |
@@ -69,7 +69,7 @@ |
||
| 69 | 69 | * @return int|null |
| 70 | 70 | */ |
| 71 | 71 | public function total($total = null) { |
| 72 | - if($total === null) { |
|
| 72 | + if ($total === null) { |
|
| 73 | 73 | return $this->total; |
| 74 | 74 | } |
| 75 | 75 | |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | public function __construct($parent) { |
| 40 | 40 | $this->parent = $parent; |
| 41 | 41 | |
| 42 | - if(method_exists($this->parent, 'getAttributes')){ |
|
| 42 | + if (method_exists($this->parent, 'getAttributes')) { |
|
| 43 | 43 | $this->attributes = array_merge($this->attributes, $this->parent->getAttributes()); |
| 44 | 44 | } |
| 45 | 45 | |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | /** |
| 50 | 50 | * Boot method made to be used by any custom mask |
| 51 | 51 | */ |
| 52 | - protected function boot(){} |
|
| 52 | + protected function boot() {} |
|
| 53 | 53 | |
| 54 | 54 | /** |
| 55 | 55 | * Call dynamic attribute setter and getter methods and inherit the parent calls |
@@ -60,17 +60,17 @@ discard block |
||
| 60 | 60 | * @throws MethodNotFoundException |
| 61 | 61 | */ |
| 62 | 62 | public function __call($method, $arguments) { |
| 63 | - if(strtolower(substr($method, 0, 3)) === 'get') { |
|
| 63 | + if (strtolower(substr($method, 0, 3)) === 'get') { |
|
| 64 | 64 | $name = Str::snake(substr($method, 3)); |
| 65 | 65 | |
| 66 | - if(isset($this->attributes[$name])) { |
|
| 66 | + if (isset($this->attributes[$name])) { |
|
| 67 | 67 | return $this->attributes[$name]; |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | }elseif (strtolower(substr($method, 0, 3)) === 'set') { |
| 71 | 71 | $name = Str::snake(substr($method, 3)); |
| 72 | 72 | |
| 73 | - if(isset($this->attributes[$name])) { |
|
| 73 | + if (isset($this->attributes[$name])) { |
|
| 74 | 74 | $this->attributes[$name] = array_pop($arguments); |
| 75 | 75 | |
| 76 | 76 | return $this->attributes[$name]; |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - if(method_exists($this->parent, $method) === true){ |
|
| 81 | + if (method_exists($this->parent, $method) === true) { |
|
| 82 | 82 | return call_user_func_array([$this->parent, $method], $arguments); |
| 83 | 83 | } |
| 84 | 84 | |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | * @return mixed|null |
| 104 | 104 | */ |
| 105 | 105 | public function __get($name) { |
| 106 | - if(isset($this->attributes[$name])) { |
|
| 106 | + if (isset($this->attributes[$name])) { |
|
| 107 | 107 | return $this->attributes[$name]; |
| 108 | 108 | } |
| 109 | 109 | |
@@ -113,14 +113,14 @@ discard block |
||
| 113 | 113 | /** |
| 114 | 114 | * @return mixed |
| 115 | 115 | */ |
| 116 | - public function getParent(){ |
|
| 116 | + public function getParent() { |
|
| 117 | 117 | return $this->parent; |
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | /** |
| 121 | 121 | * @return array |
| 122 | 122 | */ |
| 123 | - public function getAttributes(){ |
|
| 123 | + public function getAttributes() { |
|
| 124 | 124 | return $this->attributes; |
| 125 | 125 | } |
| 126 | 126 | |
@@ -67,7 +67,7 @@ |
||
| 67 | 67 | return $this->attributes[$name]; |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | - }elseif (strtolower(substr($method, 0, 3)) === 'set') { |
|
| 70 | + } elseif (strtolower(substr($method, 0, 3)) === 'set') { |
|
| 71 | 71 | $name = Str::snake(substr($method, 3)); |
| 72 | 72 | |
| 73 | 73 | if(isset($this->attributes[$name])) { |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | public function __construct(Client $client, $charset = 'UTF-8') { |
| 69 | 69 | $this->setClient($client); |
| 70 | 70 | |
| 71 | - if(config('imap.options.fetch') === IMAP::FT_PEEK) $this->leaveUnread(); |
|
| 71 | + if (config('imap.options.fetch') === IMAP::FT_PEEK) $this->leaveUnread(); |
|
| 72 | 72 | |
| 73 | 73 | $this->date_format = config('imap.date_format', 'd M y'); |
| 74 | 74 | |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | /** |
| 81 | 81 | * Instance boot method for additional functionality |
| 82 | 82 | */ |
| 83 | - protected function boot(){} |
|
| 83 | + protected function boot() {} |
|
| 84 | 84 | |
| 85 | 85 | /** |
| 86 | 86 | * Parse a given value |
@@ -88,8 +88,8 @@ discard block |
||
| 88 | 88 | * |
| 89 | 89 | * @return string |
| 90 | 90 | */ |
| 91 | - protected function parse_value($value){ |
|
| 92 | - switch(true){ |
|
| 91 | + protected function parse_value($value) { |
|
| 92 | + switch (true) { |
|
| 93 | 93 | case $value instanceof \Carbon\Carbon: |
| 94 | 94 | $value = $value->format($this->date_format); |
| 95 | 95 | break; |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | * @throws MessageSearchValidationException |
| 107 | 107 | */ |
| 108 | 108 | protected function parse_date($date) { |
| 109 | - if($date instanceof \Carbon\Carbon) return $date; |
|
| 109 | + if ($date instanceof \Carbon\Carbon) return $date; |
|
| 110 | 110 | |
| 111 | 111 | try { |
| 112 | 112 | $date = Carbon::parse($date); |
@@ -145,16 +145,16 @@ discard block |
||
| 145 | 145 | * @return \Illuminate\Support\Collection |
| 146 | 146 | * @throws \Webklex\IMAP\Exceptions\ConnectionFailedException |
| 147 | 147 | */ |
| 148 | - protected function search(){ |
|
| 148 | + protected function search() { |
|
| 149 | 149 | $this->generate_query(); |
| 150 | 150 | |
| 151 | 151 | /** |
| 152 | 152 | * Don't set the charset if it isn't used - prevent strange outlook mail server errors |
| 153 | 153 | * @see https://github.com/Webklex/laravel-imap/issues/100 |
| 154 | 154 | */ |
| 155 | - if($this->getCharset() === null){ |
|
| 155 | + if ($this->getCharset() === null) { |
|
| 156 | 156 | $available_messages = \imap_search($this->getClient()->getConnection(), $this->getRawQuery(), IMAP::SE_UID); |
| 157 | - }else{ |
|
| 157 | + } else { |
|
| 158 | 158 | $available_messages = \imap_search($this->getClient()->getConnection(), $this->getRawQuery(), IMAP::SE_UID, $this->getCharset()); |
| 159 | 159 | } |
| 160 | 160 | |
@@ -194,15 +194,15 @@ discard block |
||
| 194 | 194 | |
| 195 | 195 | $options = config('imap.options'); |
| 196 | 196 | |
| 197 | - if(strtolower($options['fetch_order']) === 'desc'){ |
|
| 197 | + if (strtolower($options['fetch_order']) === 'desc') { |
|
| 198 | 198 | $available_messages = $available_messages->reverse(); |
| 199 | 199 | } |
| 200 | 200 | |
| 201 | - $query =& $this; |
|
| 201 | + $query = & $this; |
|
| 202 | 202 | |
| 203 | 203 | $available_messages->forPage($this->page, $this->limit)->each(function($msgno, $msglist) use(&$messages, $options, $query) { |
| 204 | 204 | $oMessage = new Message($msgno, $msglist, $query->getClient(), $query->getFetchOptions(), $query->getFetchBody(), $query->getFetchAttachment(), $query->getFetchFlags()); |
| 205 | - switch ($options['message_key']){ |
|
| 205 | + switch ($options['message_key']) { |
|
| 206 | 206 | case 'number': |
| 207 | 207 | $message_key = $oMessage->getMessageNo(); |
| 208 | 208 | break; |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | * @return \Illuminate\Pagination\LengthAwarePaginator |
| 234 | 234 | * @throws GetMessagesFailedException |
| 235 | 235 | */ |
| 236 | - public function paginate($per_page = 5, $page = null, $page_name = 'imap_page'){ |
|
| 236 | + public function paginate($per_page = 5, $page = null, $page_name = 'imap_page') { |
|
| 237 | 237 | $this->page = $page > $this->page ? $page : $this->page; |
| 238 | 238 | $this->limit = $per_page; |
| 239 | 239 | |
@@ -251,9 +251,9 @@ discard block |
||
| 251 | 251 | if (count($statement) == 1) { |
| 252 | 252 | $query .= $statement[0]; |
| 253 | 253 | } else { |
| 254 | - if($statement[1] === null){ |
|
| 254 | + if ($statement[1] === null) { |
|
| 255 | 255 | $query .= $statement[0]; |
| 256 | - }else{ |
|
| 256 | + } else { |
|
| 257 | 257 | $query .= $statement[0].' "'.$statement[1].'"'; |
| 258 | 258 | } |
| 259 | 259 | } |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | * @return $this |
| 284 | 284 | */ |
| 285 | 285 | public function limit($limit, $page = 1) { |
| 286 | - if($page >= 1) $this->page = $page; |
|
| 286 | + if ($page >= 1) $this->page = $page; |
|
| 287 | 287 | $this->limit = $limit; |
| 288 | 288 | |
| 289 | 289 | return $this; |
@@ -68,7 +68,9 @@ discard block |
||
| 68 | 68 | public function __construct(Client $client, $charset = 'UTF-8') { |
| 69 | 69 | $this->setClient($client); |
| 70 | 70 | |
| 71 | - if(config('imap.options.fetch') === IMAP::FT_PEEK) $this->leaveUnread(); |
|
| 71 | + if(config('imap.options.fetch') === IMAP::FT_PEEK) { |
|
| 72 | + $this->leaveUnread(); |
|
| 73 | + } |
|
| 72 | 74 | |
| 73 | 75 | $this->date_format = config('imap.date_format', 'd M y'); |
| 74 | 76 | |
@@ -106,7 +108,9 @@ discard block |
||
| 106 | 108 | * @throws MessageSearchValidationException |
| 107 | 109 | */ |
| 108 | 110 | protected function parse_date($date) { |
| 109 | - if($date instanceof \Carbon\Carbon) return $date; |
|
| 111 | + if($date instanceof \Carbon\Carbon) { |
|
| 112 | + return $date; |
|
| 113 | + } |
|
| 110 | 114 | |
| 111 | 115 | try { |
| 112 | 116 | $date = Carbon::parse($date); |
@@ -154,7 +158,7 @@ discard block |
||
| 154 | 158 | */ |
| 155 | 159 | if($this->getCharset() === null){ |
| 156 | 160 | $available_messages = \imap_search($this->getClient()->getConnection(), $this->getRawQuery(), IMAP::SE_UID); |
| 157 | - }else{ |
|
| 161 | + } else{ |
|
| 158 | 162 | $available_messages = \imap_search($this->getClient()->getConnection(), $this->getRawQuery(), IMAP::SE_UID, $this->getCharset()); |
| 159 | 163 | } |
| 160 | 164 | |
@@ -253,7 +257,7 @@ discard block |
||
| 253 | 257 | } else { |
| 254 | 258 | if($statement[1] === null){ |
| 255 | 259 | $query .= $statement[0]; |
| 256 | - }else{ |
|
| 260 | + } else{ |
|
| 257 | 261 | $query .= $statement[0].' "'.$statement[1].'"'; |
| 258 | 262 | } |
| 259 | 263 | } |
@@ -283,7 +287,9 @@ discard block |
||
| 283 | 287 | * @return $this |
| 284 | 288 | */ |
| 285 | 289 | public function limit($limit, $page = 1) { |
| 286 | - if($page >= 1) $this->page = $page; |
|
| 290 | + if($page >= 1) { |
|
| 291 | + $this->page = $page; |
|
| 292 | + } |
|
| 287 | 293 | $this->limit = $limit; |
| 288 | 294 | |
| 289 | 295 | return $this; |