@@ -238,14 +238,14 @@ |
||
238 | 238 | /** |
239 | 239 | * @return string|null |
240 | 240 | */ |
241 | - public function getMimeType(){ |
|
241 | + public function getMimeType() { |
|
242 | 242 | return (new \finfo())->buffer($this->getContent(), FILEINFO_MIME_TYPE); |
243 | 243 | } |
244 | 244 | |
245 | 245 | /** |
246 | 246 | * @return string|null |
247 | 247 | */ |
248 | - public function getExtension(){ |
|
248 | + public function getExtension() { |
|
249 | 249 | return ExtensionGuesser::getInstance()->guess($this->getMimeType()); |
250 | 250 | } |
251 | 251 | } |
252 | 252 | \ No newline at end of file |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | */ |
43 | 43 | public function __call($name, $arguments) { |
44 | 44 | $method = 'where'.ucfirst($name); |
45 | - if(method_exists($this, $method) === true){ |
|
45 | + if (method_exists($this, $method) === true) { |
|
46 | 46 | return call_user_func_array([$this, $method], $arguments); |
47 | 47 | } |
48 | 48 | |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | protected function validate_criteria($criteria) { |
60 | 60 | $criteria = strtoupper($criteria); |
61 | 61 | |
62 | - if(in_array($criteria, $this->available_criteria) === false) { |
|
62 | + if (in_array($criteria, $this->available_criteria) === false) { |
|
63 | 63 | throw new InvalidWhereQueryCriteriaException(); |
64 | 64 | } |
65 | 65 | |
@@ -73,21 +73,21 @@ discard block |
||
73 | 73 | * @return $this |
74 | 74 | */ |
75 | 75 | public function where($criteria, $value = null) { |
76 | - if(is_array($criteria)){ |
|
77 | - foreach($criteria as $arguments){ |
|
78 | - if(count($arguments) == 1){ |
|
76 | + if (is_array($criteria)) { |
|
77 | + foreach ($criteria as $arguments) { |
|
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 | - if($value === null || $value === ''){ |
|
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,7 @@ 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) $closure($this); |
|
106 | 106 | |
107 | 107 | return $this; |
108 | 108 | } |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | */ |
115 | 115 | public function andWhere(\Closure $closure = null) { |
116 | 116 | $this->query->push(['AND']); |
117 | - if($closure !== null) $closure($this); |
|
117 | + if ($closure !== null) $closure($this); |
|
118 | 118 | |
119 | 119 | return $this; |
120 | 120 | } |
@@ -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 | } |
@@ -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; |
@@ -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(), $this->getFetchFlags()); |
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; |
@@ -346,13 +346,13 @@ |
||
346 | 346 | return imap_renamemailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($old_name), $this->getAddress() . imap_utf7_encode($new_name)); |
347 | 347 | } |
348 | 348 | |
349 | - /** |
|
350 | - * Delete Folder |
|
351 | - * @param string $name |
|
352 | - * |
|
353 | - * @return bool |
|
354 | - * @throws ConnectionFailedException |
|
355 | - */ |
|
349 | + /** |
|
350 | + * Delete Folder |
|
351 | + * @param string $name |
|
352 | + * |
|
353 | + * @return bool |
|
354 | + * @throws ConnectionFailedException |
|
355 | + */ |
|
356 | 356 | public function deleteFolder($name) { |
357 | 357 | $this->checkConnection(); |
358 | 358 | return imap_deletemailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($name)); |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | * |
114 | 114 | * @var array $validConfigKeys |
115 | 115 | */ |
116 | - protected $validConfigKeys = ['host', 'port', 'encryption', 'validate_cert', 'username', 'password','protocol']; |
|
116 | + protected $validConfigKeys = ['host', 'port', 'encryption', 'validate_cert', 'username', 'password', 'protocol']; |
|
117 | 117 | |
118 | 118 | /** |
119 | 119 | * Client constructor. |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | */ |
331 | 331 | public function createFolder($name) { |
332 | 332 | $this->checkConnection(); |
333 | - return imap_createmailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($name)); |
|
333 | + return imap_createmailbox($this->getConnection(), $this->getAddress().imap_utf7_encode($name)); |
|
334 | 334 | } |
335 | 335 | |
336 | 336 | /** |
@@ -343,7 +343,7 @@ discard block |
||
343 | 343 | */ |
344 | 344 | public function renameFolder($old_name, $new_name) { |
345 | 345 | $this->checkConnection(); |
346 | - return imap_renamemailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($old_name), $this->getAddress() . imap_utf7_encode($new_name)); |
|
346 | + return imap_renamemailbox($this->getConnection(), $this->getAddress().imap_utf7_encode($old_name), $this->getAddress().imap_utf7_encode($new_name)); |
|
347 | 347 | } |
348 | 348 | |
349 | 349 | /** |
@@ -355,7 +355,7 @@ discard block |
||
355 | 355 | */ |
356 | 356 | public function deleteFolder($name) { |
357 | 357 | $this->checkConnection(); |
358 | - return imap_deletemailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($name)); |
|
358 | + return imap_deletemailbox($this->getConnection(), $this->getAddress().imap_utf7_encode($name)); |
|
359 | 359 | } |
360 | 360 | |
361 | 361 | /** |
@@ -443,7 +443,7 @@ discard block |
||
443 | 443 | if (!$this->validate_cert) { |
444 | 444 | $address .= '/novalidate-cert'; |
445 | 445 | } |
446 | - if (in_array($this->encryption,['tls','ssl'])) { |
|
446 | + if (in_array($this->encryption, ['tls', 'ssl'])) { |
|
447 | 447 | $address .= '/'.$this->encryption; |
448 | 448 | } |
449 | 449 | $address .= '}'; |
@@ -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 | } |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | * |
131 | 131 | * @return WhereQuery |
132 | 132 | */ |
133 | - public function query($charset = 'UTF-8'){ |
|
133 | + public function query($charset = 'UTF-8') { |
|
134 | 134 | $this->getClient()->checkConnection(); |
135 | 135 | $this->getClient()->openFolder($this); |
136 | 136 | |
@@ -140,14 +140,14 @@ discard block |
||
140 | 140 | /** |
141 | 141 | * @inheritdoc self::query($charset = 'UTF-8') |
142 | 142 | */ |
143 | - public function search($charset = 'UTF-8'){ |
|
143 | + public function search($charset = 'UTF-8') { |
|
144 | 144 | return $this->query($charset); |
145 | 145 | } |
146 | 146 | |
147 | 147 | /** |
148 | 148 | * @inheritdoc self::query($charset = 'UTF-8') |
149 | 149 | */ |
150 | - public function messages($charset = 'UTF-8'){ |
|
150 | + public function messages($charset = 'UTF-8') { |
|
151 | 151 | return $this->query($charset); |
152 | 152 | } |
153 | 153 | |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | * @deprecated 1.2.1:2.0.0 No longer needed. Use Folder::query() instead |
309 | 309 | * @see Folder::query() |
310 | 310 | */ |
311 | - public function searchMessages(array $where, $fetch_options = null, $fetch_body = true, $fetch_attachment = true, $fetch_flags = true, $limit = null, $page = 1, $charset = "UTF-8") { |
|
311 | + public function searchMessages(array $where, $fetch_options = null, $fetch_body = true, $fetch_attachment = true, $fetch_flags = true, $limit = null, $page = 1, $charset = "UTF-8") { |
|
312 | 312 | $this->getClient()->checkConnection(); |
313 | 313 | |
314 | 314 | return $this->query($charset)->where($where)->setFetchOptions($fetch_options)->setFetchBody($fetch_body) |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | $this->msglist = $msglist; |
185 | 185 | $this->client = $client; |
186 | 186 | |
187 | - $this->uid = ($this->fetch_options == FT_UID) ? $uid : $uid; |
|
187 | + $this->uid = ($this->fetch_options == FT_UID) ? $uid : $uid; |
|
188 | 188 | $this->msgn = ($this->fetch_options == FT_UID) ? imap_msgno($this->client->getConnection(), $uid) : $uid; |
189 | 189 | |
190 | 190 | $this->parseHeader(); |
@@ -288,9 +288,9 @@ discard block |
||
288 | 288 | $header = imap_rfc822_parse_headers($this->header); |
289 | 289 | } |
290 | 290 | |
291 | - if(preg_match('/x\-priority\:.*([0-9]{1,2})/i', $this->header, $priority)){ |
|
291 | + if (preg_match('/x\-priority\:.*([0-9]{1,2})/i', $this->header, $priority)) { |
|
292 | 292 | $priority = isset($priority[1]) ? (int) $priority[1] : 0; |
293 | - switch($priority){ |
|
293 | + switch ($priority) { |
|
294 | 294 | case self::PRIORITY_HIGHEST; |
295 | 295 | $this->priority = self::PRIORITY_HIGHEST; |
296 | 296 | break; |
@@ -475,12 +475,12 @@ discard block |
||
475 | 475 | public function parseBody() { |
476 | 476 | $structure = imap_fetchstructure($this->client->getConnection(), $this->uid, FT_UID); |
477 | 477 | |
478 | - if(property_exists($structure, 'parts')){ |
|
478 | + if (property_exists($structure, 'parts')) { |
|
479 | 479 | $parts = $structure->parts; |
480 | 480 | |
481 | - foreach ($parts as $part) { |
|
482 | - foreach ($part->parameters as $parameter) { |
|
483 | - if($parameter->attribute == "charset") { |
|
481 | + foreach ($parts as $part) { |
|
482 | + foreach ($part->parameters as $parameter) { |
|
483 | + if ($parameter->attribute == "charset") { |
|
484 | 484 | $encoding = $parameter->value; |
485 | 485 | $parameter->value = preg_replace('/Content-Transfer-Encoding/', '', $encoding); |
486 | 486 | } |