@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | public function __construct(Client $client, $charset = 'UTF-8') { |
| 65 | 65 | $this->setClient($client); |
| 66 | 66 | |
| 67 | - if(config('imap.options.fetch') === FT_PEEK) $this->leaveUnread(); |
|
| 67 | + if (config('imap.options.fetch') === FT_PEEK) $this->leaveUnread(); |
|
| 68 | 68 | |
| 69 | 69 | $this->charset = $charset; |
| 70 | 70 | $this->query = collect(); |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | /** |
| 75 | 75 | * Instance boot method for additional functionality |
| 76 | 76 | */ |
| 77 | - protected function boot(){} |
|
| 77 | + protected function boot() {} |
|
| 78 | 78 | |
| 79 | 79 | /** |
| 80 | 80 | * Parse a given value |
@@ -82,8 +82,8 @@ discard block |
||
| 82 | 82 | * |
| 83 | 83 | * @return string |
| 84 | 84 | */ |
| 85 | - protected function parse_value($value){ |
|
| 86 | - switch(true){ |
|
| 85 | + protected function parse_value($value) { |
|
| 86 | + switch (true) { |
|
| 87 | 87 | case $value instanceof \Carbon\Carbon: |
| 88 | 88 | $value = $value->format('d M y'); |
| 89 | 89 | break; |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | * @throws MessageSearchValidationException |
| 101 | 101 | */ |
| 102 | 102 | protected function parse_date($date) { |
| 103 | - if($date instanceof \Carbon\Carbon) return $date; |
|
| 103 | + if ($date instanceof \Carbon\Carbon) return $date; |
|
| 104 | 104 | |
| 105 | 105 | try { |
| 106 | 106 | $date = Carbon::parse($date); |
@@ -149,9 +149,9 @@ discard block |
||
| 149 | 149 | * Don't set the charset if it isn't used - prevent strange outlook mail server errors |
| 150 | 150 | * @see https://github.com/Webklex/laravel-imap/issues/100 |
| 151 | 151 | */ |
| 152 | - if($this->getCharset() === null){ |
|
| 152 | + if ($this->getCharset() === null) { |
|
| 153 | 153 | $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), SE_UID); |
| 154 | - }else{ |
|
| 154 | + } else { |
|
| 155 | 155 | $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), SE_UID, $this->getCharset()); |
| 156 | 156 | } |
| 157 | 157 | |
@@ -160,13 +160,13 @@ discard block |
||
| 160 | 160 | $available_messages = collect($available_messages); |
| 161 | 161 | $options = config('imap.options'); |
| 162 | 162 | |
| 163 | - if(strtolower($options['fetch_order']) === 'desc'){ |
|
| 163 | + if (strtolower($options['fetch_order']) === 'desc') { |
|
| 164 | 164 | $available_messages = $available_messages->reverse(); |
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | $available_messages->forPage($this->page, $this->limit)->each(function($msgno, $msglist) use(&$messages, $options) { |
| 168 | 168 | $oMessage = new Message($msgno, $msglist, $this->getClient(), $this->getFetchOptions(), $this->getFetchBody(), $this->getFetchAttachment()); |
| 169 | - switch ($options['message_key']){ |
|
| 169 | + switch ($options['message_key']) { |
|
| 170 | 170 | case 'number': |
| 171 | 171 | $message_key = $oMessage->getMessageNo(); |
| 172 | 172 | break; |
@@ -201,9 +201,9 @@ discard block |
||
| 201 | 201 | if (count($statement) == 1) { |
| 202 | 202 | $query .= $statement[0]; |
| 203 | 203 | } else { |
| 204 | - if($statement[1] === null){ |
|
| 204 | + if ($statement[1] === null) { |
|
| 205 | 205 | $query .= $statement[0]; |
| 206 | - }else{ |
|
| 206 | + } else { |
|
| 207 | 207 | $query .= $statement[0].' "'.$statement[1].'"'; |
| 208 | 208 | } |
| 209 | 209 | } |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | * @return $this |
| 233 | 233 | */ |
| 234 | 234 | public function limit($limit, $page = 1) { |
| 235 | - if($page >= 1) $this->page = $page; |
|
| 235 | + if ($page >= 1) $this->page = $page; |
|
| 236 | 236 | $this->limit = $limit; |
| 237 | 237 | |
| 238 | 238 | return $this; |
@@ -64,7 +64,9 @@ discard block |
||
| 64 | 64 | public function __construct(Client $client, $charset = 'UTF-8') { |
| 65 | 65 | $this->setClient($client); |
| 66 | 66 | |
| 67 | - if(config('imap.options.fetch') === FT_PEEK) $this->leaveUnread(); |
|
| 67 | + if(config('imap.options.fetch') === FT_PEEK) { |
|
| 68 | + $this->leaveUnread(); |
|
| 69 | + } |
|
| 68 | 70 | |
| 69 | 71 | $this->charset = $charset; |
| 70 | 72 | $this->query = collect(); |
@@ -100,7 +102,9 @@ discard block |
||
| 100 | 102 | * @throws MessageSearchValidationException |
| 101 | 103 | */ |
| 102 | 104 | protected function parse_date($date) { |
| 103 | - if($date instanceof \Carbon\Carbon) return $date; |
|
| 105 | + if($date instanceof \Carbon\Carbon) { |
|
| 106 | + return $date; |
|
| 107 | + } |
|
| 104 | 108 | |
| 105 | 109 | try { |
| 106 | 110 | $date = Carbon::parse($date); |
@@ -151,7 +155,7 @@ discard block |
||
| 151 | 155 | */ |
| 152 | 156 | if($this->getCharset() === null){ |
| 153 | 157 | $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), SE_UID); |
| 154 | - }else{ |
|
| 158 | + } else{ |
|
| 155 | 159 | $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), SE_UID, $this->getCharset()); |
| 156 | 160 | } |
| 157 | 161 | |
@@ -203,7 +207,7 @@ discard block |
||
| 203 | 207 | } else { |
| 204 | 208 | if($statement[1] === null){ |
| 205 | 209 | $query .= $statement[0]; |
| 206 | - }else{ |
|
| 210 | + } else{ |
|
| 207 | 211 | $query .= $statement[0].' "'.$statement[1].'"'; |
| 208 | 212 | } |
| 209 | 213 | } |
@@ -232,7 +236,9 @@ discard block |
||
| 232 | 236 | * @return $this |
| 233 | 237 | */ |
| 234 | 238 | public function limit($limit, $page = 1) { |
| 235 | - if($page >= 1) $this->page = $page; |
|
| 239 | + if($page >= 1) { |
|
| 240 | + $this->page = $page; |
|
| 241 | + } |
|
| 236 | 242 | $this->limit = $limit; |
| 237 | 243 | |
| 238 | 244 | return $this; |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | $this->msglist = $msglist; |
| 176 | 176 | $this->client = $client; |
| 177 | 177 | |
| 178 | - $this->uid = ($this->fetch_options == FT_UID) ? $uid : $uid; |
|
| 178 | + $this->uid = ($this->fetch_options == FT_UID) ? $uid : $uid; |
|
| 179 | 179 | $this->msgn = ($this->fetch_options == FT_UID) ? imap_msgno($this->client->getConnection(), $uid) : $uid; |
| 180 | 180 | |
| 181 | 181 | $this->parseHeader(); |
@@ -439,12 +439,12 @@ discard block |
||
| 439 | 439 | public function parseBody() { |
| 440 | 440 | $structure = imap_fetchstructure($this->client->getConnection(), $this->uid, FT_UID); |
| 441 | 441 | |
| 442 | - if(property_exists($structure, 'parts')){ |
|
| 442 | + if (property_exists($structure, 'parts')) { |
|
| 443 | 443 | $parts = $structure->parts; |
| 444 | 444 | |
| 445 | - foreach ($parts as $part) { |
|
| 446 | - foreach ($part->parameters as $parameter) { |
|
| 447 | - if($parameter->attribute == "charset") { |
|
| 445 | + foreach ($parts as $part) { |
|
| 446 | + foreach ($part->parameters as $parameter) { |
|
| 447 | + if ($parameter->attribute == "charset") { |
|
| 448 | 448 | $encoding = $parameter->value; |
| 449 | 449 | $parameter->value = preg_replace('/Content-Transfer-Encoding/', '', $encoding); |
| 450 | 450 | } |