@@ -65,7 +65,7 @@ |
||
65 | 65 | * |
66 | 66 | * @return array |
67 | 67 | */ |
68 | - public function getEvents(){ |
|
68 | + public function getEvents() { |
|
69 | 69 | return $this->events; |
70 | 70 | } |
71 | 71 |
@@ -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 = Str::snake(substr($method, 3)); |
123 | 123 | |
124 | 124 | $this->attributes[$name] = array_pop($arguments); |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | if (($name = $this->part->name) !== null) { |
209 | 209 | $this->setName($name); |
210 | 210 | $this->disposition = $this->part->disposition; |
211 | - }elseif (($filename = $this->part->filename) !== null) { |
|
211 | + } elseif (($filename = $this->part->filename) !== null) { |
|
212 | 212 | $this->setName($filename); |
213 | 213 | $this->disposition = $this->part->disposition; |
214 | 214 | } |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | if ($name !== null) { |
245 | 245 | if($decoder === 'utf-8' && extension_loaded('imap')) { |
246 | 246 | $this->name = \imap_utf8($name); |
247 | - }else{ |
|
247 | + } else{ |
|
248 | 248 | $this->name = mb_decode_mimeheader($name); |
249 | 249 | } |
250 | 250 | } |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | $this->part_number = $part->part_number; |
95 | 95 | |
96 | 96 | $default_mask = $this->oMessage->getClient()->getDefaultAttachmentMask(); |
97 | - if($default_mask != null) { |
|
97 | + if ($default_mask != null) { |
|
98 | 98 | $this->mask = $default_mask; |
99 | 99 | } |
100 | 100 | |
@@ -111,10 +111,10 @@ discard block |
||
111 | 111 | * @throws MethodNotFoundException |
112 | 112 | */ |
113 | 113 | public function __call($method, $arguments) { |
114 | - if(strtolower(substr($method, 0, 3)) === 'get') { |
|
114 | + if (strtolower(substr($method, 0, 3)) === 'get') { |
|
115 | 115 | $name = Str::snake(substr($method, 3)); |
116 | 116 | |
117 | - if(isset($this->attributes[$name])) { |
|
117 | + if (isset($this->attributes[$name])) { |
|
118 | 118 | return $this->attributes[$name]; |
119 | 119 | } |
120 | 120 | |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | * @return mixed|null |
149 | 149 | */ |
150 | 150 | public function __get($name) { |
151 | - if(isset($this->attributes[$name])) { |
|
151 | + if (isset($this->attributes[$name])) { |
|
152 | 152 | return $this->attributes[$name]; |
153 | 153 | } |
154 | 154 | |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | if (IMAP::ATTACHMENT_TYPE_MESSAGE == $this->part->type) { |
218 | 218 | if ($this->part->ifdescription) { |
219 | 219 | $this->setName($this->part->description); |
220 | - } else { |
|
220 | + }else { |
|
221 | 221 | $this->setName($this->part->subtype); |
222 | 222 | } |
223 | 223 | } |
@@ -243,9 +243,9 @@ discard block |
||
243 | 243 | public function setName($name) { |
244 | 244 | $decoder = $this->config['decoder']['attachment']; |
245 | 245 | if ($name !== null) { |
246 | - if($decoder === 'utf-8' && extension_loaded('imap')) { |
|
246 | + if ($decoder === 'utf-8' && extension_loaded('imap')) { |
|
247 | 247 | $this->name = \imap_utf8($name); |
248 | - }else{ |
|
248 | + }else { |
|
249 | 249 | $this->name = mb_decode_mimeheader($name); |
250 | 250 | } |
251 | 251 | } |
@@ -254,16 +254,16 @@ discard block |
||
254 | 254 | /** |
255 | 255 | * @return string|null |
256 | 256 | */ |
257 | - public function getMimeType(){ |
|
257 | + public function getMimeType() { |
|
258 | 258 | return (new \finfo())->buffer($this->getContent(), FILEINFO_MIME_TYPE); |
259 | 259 | } |
260 | 260 | |
261 | 261 | /** |
262 | 262 | * @return string|null |
263 | 263 | */ |
264 | - public function getExtension(){ |
|
264 | + public function getExtension() { |
|
265 | 265 | $deprecated_guesser = "\Symfony\Component\HttpFoundation\File\MimeType\ExtensionGuesser"; |
266 | - if (class_exists($deprecated_guesser) !== false){ |
|
266 | + if (class_exists($deprecated_guesser) !== false) { |
|
267 | 267 | return $deprecated_guesser::getInstance()->guess($this->getMimeType()); |
268 | 268 | } |
269 | 269 | $guesser = "\Symfony\Component\Mime\MimeTypes"; |
@@ -274,14 +274,14 @@ discard block |
||
274 | 274 | /** |
275 | 275 | * @return array |
276 | 276 | */ |
277 | - public function getAttributes(){ |
|
277 | + public function getAttributes() { |
|
278 | 278 | return $this->attributes; |
279 | 279 | } |
280 | 280 | |
281 | 281 | /** |
282 | 282 | * @return Message |
283 | 283 | */ |
284 | - public function getMessage(){ |
|
284 | + public function getMessage() { |
|
285 | 285 | return $this->oMessage; |
286 | 286 | } |
287 | 287 | |
@@ -289,8 +289,8 @@ discard block |
||
289 | 289 | * @param $mask |
290 | 290 | * @return $this |
291 | 291 | */ |
292 | - public function setMask($mask){ |
|
293 | - if(class_exists($mask)){ |
|
292 | + public function setMask($mask) { |
|
293 | + if (class_exists($mask)) { |
|
294 | 294 | $this->mask = $mask; |
295 | 295 | } |
296 | 296 | |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | /** |
301 | 301 | * @return string |
302 | 302 | */ |
303 | - public function getMask(){ |
|
303 | + public function getMask() { |
|
304 | 304 | return $this->mask; |
305 | 305 | } |
306 | 306 | |
@@ -311,9 +311,9 @@ discard block |
||
311 | 311 | * @return mixed |
312 | 312 | * @throws MaskNotFoundException |
313 | 313 | */ |
314 | - public function mask($mask = null){ |
|
314 | + public function mask($mask = null) { |
|
315 | 315 | $mask = $mask !== null ? $mask : $this->mask; |
316 | - if(class_exists($mask)){ |
|
316 | + if (class_exists($mask)) { |
|
317 | 317 | return new $mask($this); |
318 | 318 | } |
319 | 319 |
@@ -80,7 +80,7 @@ |
||
80 | 80 | public function findContentType(){ |
81 | 81 | if(stripos($this->header->get("content-type"), 'multipart') === 0) { |
82 | 82 | $this->type = IMAP::MESSAGE_TYPE_MULTIPART; |
83 | - }else{ |
|
83 | + } else{ |
|
84 | 84 | $this->type = IMAP::MESSAGE_TYPE_TEXT; |
85 | 85 | } |
86 | 86 | } |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | * @throws MessageContentFetchingException |
70 | 70 | * @throws InvalidMessageDateException |
71 | 71 | */ |
72 | - protected function parse(){ |
|
72 | + protected function parse() { |
|
73 | 73 | $this->findContentType(); |
74 | 74 | $this->parts = $this->find_parts(); |
75 | 75 | } |
@@ -77,10 +77,10 @@ discard block |
||
77 | 77 | /** |
78 | 78 | * Determine the message content type |
79 | 79 | */ |
80 | - public function findContentType(){ |
|
81 | - if(stripos($this->header->get("content-type"), 'multipart') === 0) { |
|
80 | + public function findContentType() { |
|
81 | + if (stripos($this->header->get("content-type"), 'multipart') === 0) { |
|
82 | 82 | $this->type = IMAP::MESSAGE_TYPE_MULTIPART; |
83 | - }else{ |
|
83 | + }else { |
|
84 | 84 | $this->type = IMAP::MESSAGE_TYPE_TEXT; |
85 | 85 | } |
86 | 86 | } |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | /** |
89 | 89 | * Determine the message content type |
90 | 90 | */ |
91 | - public function getBoundary(){ |
|
91 | + public function getBoundary() { |
|
92 | 92 | return $this->header->find("/boundary\=\"(.*)\"/"); |
93 | 93 | } |
94 | 94 | |
@@ -97,16 +97,16 @@ discard block |
||
97 | 97 | * @throws MessageContentFetchingException |
98 | 98 | * @throws InvalidMessageDateException |
99 | 99 | */ |
100 | - public function find_parts(){ |
|
101 | - if($this->type === IMAP::MESSAGE_TYPE_MULTIPART) { |
|
102 | - if (($boundary = $this->getBoundary()) === null) { |
|
100 | + public function find_parts() { |
|
101 | + if ($this->type === IMAP::MESSAGE_TYPE_MULTIPART) { |
|
102 | + if (($boundary = $this->getBoundary()) === null) { |
|
103 | 103 | throw new MessageContentFetchingException("no content found", 0); |
104 | 104 | } |
105 | 105 | |
106 | 106 | $raw_parts = explode($boundary, $this->raw); |
107 | 107 | $parts = []; |
108 | 108 | $part_number = 0; |
109 | - foreach($raw_parts as $part) { |
|
109 | + foreach ($raw_parts as $part) { |
|
110 | 110 | $part = trim(rtrim($part)); |
111 | 111 | if ($part !== "--") { |
112 | 112 | $parts[] = new Part($part, null, $part_number); |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | public function __construct(Client $client, $charset = 'UTF-8') { |
74 | 74 | $this->setClient($client); |
75 | 75 | |
76 | - if(ClientManager::get('options.fetch') === IMAP::FT_PEEK) $this->leaveUnread(); |
|
76 | + if (ClientManager::get('options.fetch') === IMAP::FT_PEEK) $this->leaveUnread(); |
|
77 | 77 | |
78 | 78 | $this->date_format = ClientManager::get('date_format', 'd M y'); |
79 | 79 | |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | /** |
86 | 86 | * Instance boot method for additional functionality |
87 | 87 | */ |
88 | - protected function boot(){} |
|
88 | + protected function boot() {} |
|
89 | 89 | |
90 | 90 | /** |
91 | 91 | * Parse a given value |
@@ -93,8 +93,8 @@ discard block |
||
93 | 93 | * |
94 | 94 | * @return string |
95 | 95 | */ |
96 | - protected function parse_value($value){ |
|
97 | - switch(true){ |
|
96 | + protected function parse_value($value) { |
|
97 | + switch (true) { |
|
98 | 98 | case $value instanceof \Carbon\Carbon: |
99 | 99 | $value = $value->format($this->date_format); |
100 | 100 | break; |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | * @throws MessageSearchValidationException |
112 | 112 | */ |
113 | 113 | protected function parse_date($date) { |
114 | - if($date instanceof \Carbon\Carbon) return $date; |
|
114 | + if ($date instanceof \Carbon\Carbon) return $date; |
|
115 | 115 | |
116 | 116 | try { |
117 | 117 | $date = Carbon::parse($date); |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | * @return Collection |
151 | 151 | * @throws GetMessagesFailedException |
152 | 152 | */ |
153 | - protected function search(){ |
|
153 | + protected function search() { |
|
154 | 154 | $this->generate_query(); |
155 | 155 | |
156 | 156 | try { |
@@ -195,15 +195,15 @@ discard block |
||
195 | 195 | |
196 | 196 | $options = ClientManager::get('options'); |
197 | 197 | |
198 | - if(strtolower($options['fetch_order']) === 'desc'){ |
|
198 | + if (strtolower($options['fetch_order']) === 'desc') { |
|
199 | 199 | $available_messages = $available_messages->reverse(); |
200 | 200 | } |
201 | 201 | |
202 | - $query =& $this; |
|
202 | + $query = & $this; |
|
203 | 203 | |
204 | 204 | $available_messages->forPage($this->page, $this->limit)->each(function($msgno, $msglist) use(&$messages, $options, $query) { |
205 | 205 | $message = $query->getMessage($msgno, $msglist); |
206 | - switch ($options['message_key']){ |
|
206 | + switch ($options['message_key']) { |
|
207 | 207 | case 'number': |
208 | 208 | $message_key = $message->getMessageNo(); |
209 | 209 | break; |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | |
222 | 222 | return $messages; |
223 | 223 | } catch (\Exception $e) { |
224 | - throw new GetMessagesFailedException($e->getMessage(),0, $e); |
|
224 | + throw new GetMessagesFailedException($e->getMessage(), 0, $e); |
|
225 | 225 | } |
226 | 226 | } |
227 | 227 | |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | * @throws MessageContentFetchingException |
238 | 238 | * @throws MessageHeaderFetchingException |
239 | 239 | */ |
240 | - public function getMessage($msgno, $msglist = null){ |
|
240 | + public function getMessage($msgno, $msglist = null) { |
|
241 | 241 | return new Message($msgno, $msglist, $this->getClient(), $this->getFetchOptions(), $this->getFetchBody(), $this->getFetchFlags()); |
242 | 242 | } |
243 | 243 | |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | * @return LengthAwarePaginator |
251 | 251 | * @throws GetMessagesFailedException |
252 | 252 | */ |
253 | - public function paginate($per_page = 5, $page = null, $page_name = 'imap_page'){ |
|
253 | + public function paginate($per_page = 5, $page = null, $page_name = 'imap_page') { |
|
254 | 254 | $this->page = $page > $this->page ? $page : $this->page; |
255 | 255 | $this->limit = $per_page; |
256 | 256 | |
@@ -261,7 +261,7 @@ discard block |
||
261 | 261 | $messages->each(function($message) use(&$collection){ |
262 | 262 | $collection[] = $message; |
263 | 263 | }); |
264 | - }else{ |
|
264 | + }else { |
|
265 | 265 | $collection = array_fill(0, $messages->total(), true); |
266 | 266 | } |
267 | 267 | |
@@ -278,10 +278,10 @@ discard block |
||
278 | 278 | $this->query->each(function($statement) use(&$query) { |
279 | 279 | if (count($statement) == 1) { |
280 | 280 | $query .= $statement[0]; |
281 | - } else { |
|
282 | - if($statement[1] === null){ |
|
281 | + }else { |
|
282 | + if ($statement[1] === null) { |
|
283 | 283 | $query .= $statement[0]; |
284 | - }else{ |
|
284 | + }else { |
|
285 | 285 | $query .= $statement[0].' "'.$statement[1].'"'; |
286 | 286 | } |
287 | 287 | } |
@@ -311,7 +311,7 @@ discard block |
||
311 | 311 | * @return $this |
312 | 312 | */ |
313 | 313 | public function limit($limit, $page = 1) { |
314 | - if($page >= 1) $this->page = $page; |
|
314 | + if ($page >= 1) $this->page = $page; |
|
315 | 315 | $this->limit = $limit; |
316 | 316 | |
317 | 317 | return $this; |
@@ -73,7 +73,9 @@ discard block |
||
73 | 73 | public function __construct(Client $client, $charset = 'UTF-8') { |
74 | 74 | $this->setClient($client); |
75 | 75 | |
76 | - if(ClientManager::get('options.fetch') === IMAP::FT_PEEK) $this->leaveUnread(); |
|
76 | + if(ClientManager::get('options.fetch') === IMAP::FT_PEEK) { |
|
77 | + $this->leaveUnread(); |
|
78 | + } |
|
77 | 79 | |
78 | 80 | $this->date_format = ClientManager::get('date_format', 'd M y'); |
79 | 81 | |
@@ -111,7 +113,9 @@ discard block |
||
111 | 113 | * @throws MessageSearchValidationException |
112 | 114 | */ |
113 | 115 | protected function parse_date($date) { |
114 | - if($date instanceof \Carbon\Carbon) return $date; |
|
116 | + if($date instanceof \Carbon\Carbon) { |
|
117 | + return $date; |
|
118 | + } |
|
115 | 119 | |
116 | 120 | try { |
117 | 121 | $date = Carbon::parse($date); |
@@ -261,7 +265,7 @@ discard block |
||
261 | 265 | $messages->each(function($message) use(&$collection){ |
262 | 266 | $collection[] = $message; |
263 | 267 | }); |
264 | - }else{ |
|
268 | + } else{ |
|
265 | 269 | $collection = array_fill(0, $messages->total(), true); |
266 | 270 | } |
267 | 271 | |
@@ -281,7 +285,7 @@ discard block |
||
281 | 285 | } else { |
282 | 286 | if($statement[1] === null){ |
283 | 287 | $query .= $statement[0]; |
284 | - }else{ |
|
288 | + } else{ |
|
285 | 289 | $query .= $statement[0].' "'.$statement[1].'"'; |
286 | 290 | } |
287 | 291 | } |
@@ -311,7 +315,9 @@ discard block |
||
311 | 315 | * @return $this |
312 | 316 | */ |
313 | 317 | public function limit($limit, $page = 1) { |
314 | - if($page >= 1) $this->page = $page; |
|
318 | + if($page >= 1) { |
|
319 | + $this->page = $page; |
|
320 | + } |
|
315 | 321 | $this->limit = $limit; |
316 | 322 | |
317 | 323 | return $this; |
@@ -76,18 +76,18 @@ 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 | - if (strpos(strtolower($name), "where") === false){ |
|
84 | + if (strpos(strtolower($name), "where") === false) { |
|
85 | 85 | $method = 'where'.ucfirst($name); |
86 | - }else{ |
|
86 | + }else { |
|
87 | 87 | $method = lcfirst($name); |
88 | 88 | } |
89 | 89 | |
90 | - if(method_exists($this, $method) === true){ |
|
90 | + if (method_exists($this, $method) === true) { |
|
91 | 91 | return call_user_func_array([$that, $method], $arguments); |
92 | 92 | } |
93 | 93 | |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | if (substr($criteria, 0, 7) === "CUSTOM ") { |
107 | 107 | return substr($criteria, 7); |
108 | 108 | } |
109 | - if(in_array($criteria, $this->available_criteria) === false) { |
|
109 | + if (in_array($criteria, $this->available_criteria) === false) { |
|
110 | 110 | throw new InvalidWhereQueryCriteriaException(); |
111 | 111 | } |
112 | 112 | |
@@ -121,20 +121,20 @@ discard block |
||
121 | 121 | * @throws InvalidWhereQueryCriteriaException |
122 | 122 | */ |
123 | 123 | public function where($criteria, $value = null) { |
124 | - if(is_array($criteria)){ |
|
125 | - foreach($criteria as $key => $value){ |
|
126 | - if(is_numeric($key)){ |
|
124 | + if (is_array($criteria)) { |
|
125 | + foreach ($criteria as $key => $value) { |
|
126 | + if (is_numeric($key)) { |
|
127 | 127 | return $this->where($value); |
128 | 128 | } |
129 | 129 | return $this->where($key, $value); |
130 | 130 | } |
131 | - }else{ |
|
131 | + }else { |
|
132 | 132 | $criteria = $this->validate_criteria($criteria); |
133 | 133 | $value = $this->parse_value($value); |
134 | 134 | |
135 | - if($value === null || $value === ''){ |
|
135 | + if ($value === null || $value === '') { |
|
136 | 136 | $this->query->push([$criteria]); |
137 | - }else{ |
|
137 | + }else { |
|
138 | 138 | $this->query->push([$criteria, $value]); |
139 | 139 | } |
140 | 140 | } |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | */ |
150 | 150 | public function orWhere(\Closure $closure = null) { |
151 | 151 | $this->query->push(['OR']); |
152 | - if($closure !== null) $closure($this); |
|
152 | + if ($closure !== null) $closure($this); |
|
153 | 153 | |
154 | 154 | return $this; |
155 | 155 | } |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | */ |
162 | 162 | public function andWhere(\Closure $closure = null) { |
163 | 163 | $this->query->push(['AND']); |
164 | - if($closure !== null) $closure($this); |
|
164 | + if ($closure !== null) $closure($this); |
|
165 | 165 | |
166 | 166 | return $this; |
167 | 167 | } |
@@ -401,7 +401,7 @@ discard block |
||
401 | 401 | * @return WhereQuery |
402 | 402 | * @throws InvalidWhereQueryCriteriaException |
403 | 403 | */ |
404 | - public function whereNoXSpam(){ |
|
404 | + public function whereNoXSpam() { |
|
405 | 405 | return $this->where("CUSTOM X-Spam-Flag NO"); |
406 | 406 | } |
407 | 407 | |
@@ -409,7 +409,7 @@ discard block |
||
409 | 409 | * @return WhereQuery |
410 | 410 | * @throws InvalidWhereQueryCriteriaException |
411 | 411 | */ |
412 | - public function whereIsXSpam(){ |
|
412 | + public function whereIsXSpam() { |
|
413 | 413 | return $this->where("CUSTOM X-Spam-Flag YES"); |
414 | 414 | } |
415 | 415 | |
@@ -419,7 +419,7 @@ discard block |
||
419 | 419 | * @return WhereQuery |
420 | 420 | * @throws InvalidWhereQueryCriteriaException |
421 | 421 | */ |
422 | - public function whereLanguage($country_code){ |
|
422 | + public function whereLanguage($country_code) { |
|
423 | 423 | return $this->where("Content-Language $country_code"); |
424 | 424 | } |
425 | 425 | } |
426 | 426 | \ No newline at end of file |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | |
84 | 84 | if (strpos(strtolower($name), "where") === false){ |
85 | 85 | $method = 'where'.ucfirst($name); |
86 | - }else{ |
|
86 | + } else{ |
|
87 | 87 | $method = lcfirst($name); |
88 | 88 | } |
89 | 89 | |
@@ -128,13 +128,13 @@ discard block |
||
128 | 128 | } |
129 | 129 | return $this->where($key, $value); |
130 | 130 | } |
131 | - }else{ |
|
131 | + } else{ |
|
132 | 132 | $criteria = $this->validate_criteria($criteria); |
133 | 133 | $value = $this->parse_value($value); |
134 | 134 | |
135 | 135 | if($value === null || $value === ''){ |
136 | 136 | $this->query->push([$criteria]); |
137 | - }else{ |
|
137 | + } else{ |
|
138 | 138 | $this->query->push([$criteria, $value]); |
139 | 139 | } |
140 | 140 | } |
@@ -149,7 +149,9 @@ discard block |
||
149 | 149 | */ |
150 | 150 | public function orWhere(\Closure $closure = null) { |
151 | 151 | $this->query->push(['OR']); |
152 | - if($closure !== null) $closure($this); |
|
152 | + if($closure !== null) { |
|
153 | + $closure($this); |
|
154 | + } |
|
153 | 155 | |
154 | 156 | return $this; |
155 | 157 | } |
@@ -161,7 +163,9 @@ discard block |
||
161 | 163 | */ |
162 | 164 | public function andWhere(\Closure $closure = null) { |
163 | 165 | $this->query->push(['AND']); |
164 | - if($closure !== null) $closure($this); |
|
166 | + if($closure !== null) { |
|
167 | + $closure($this); |
|
168 | + } |
|
165 | 169 | |
166 | 170 | return $this; |
167 | 171 | } |
@@ -68,17 +68,17 @@ discard block |
||
68 | 68 | public static function get($key, $default = null) { |
69 | 69 | $parts = explode('.', $key); |
70 | 70 | $value = null; |
71 | - foreach($parts as $part) { |
|
72 | - if($value === null) { |
|
73 | - if(isset(self::$config[$part])) { |
|
71 | + foreach ($parts as $part) { |
|
72 | + if ($value === null) { |
|
73 | + if (isset(self::$config[$part])) { |
|
74 | 74 | $value = self::$config[$part]; |
75 | - }else{ |
|
75 | + }else { |
|
76 | 76 | break; |
77 | 77 | } |
78 | - }else{ |
|
79 | - if(isset($value[$part])) { |
|
78 | + }else { |
|
79 | + if (isset($value[$part])) { |
|
80 | 80 | $value = $value[$part]; |
81 | - }else{ |
|
81 | + }else { |
|
82 | 82 | break; |
83 | 83 | } |
84 | 84 | } |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | */ |
172 | 172 | public function setConfig($config) { |
173 | 173 | |
174 | - if(is_array($config) === false) { |
|
174 | + if (is_array($config) === false) { |
|
175 | 175 | $config = require $config; |
176 | 176 | } |
177 | 177 | |
@@ -181,17 +181,17 @@ discard block |
||
181 | 181 | $vendor_config = require $path; |
182 | 182 | $config = $this->array_merge_recursive_distinct($vendor_config, $config); |
183 | 183 | |
184 | - if(is_array($config)){ |
|
185 | - if(isset($config['default'])){ |
|
186 | - if(isset($config['accounts']) && $config['default'] != false){ |
|
184 | + if (is_array($config)) { |
|
185 | + if (isset($config['default'])) { |
|
186 | + if (isset($config['accounts']) && $config['default'] != false) { |
|
187 | 187 | |
188 | 188 | $default_config = $vendor_config['accounts']['default']; |
189 | - if(isset($config['accounts'][$config['default']])){ |
|
189 | + if (isset($config['accounts'][$config['default']])) { |
|
190 | 190 | $default_config = array_merge($default_config, $config['accounts'][$config['default']]); |
191 | 191 | } |
192 | 192 | |
193 | - if(is_array($config['accounts'])){ |
|
194 | - foreach($config['accounts'] as $account_key => $account){ |
|
193 | + if (is_array($config['accounts'])) { |
|
194 | + foreach ($config['accounts'] as $account_key => $account) { |
|
195 | 195 | $config['accounts'][$account_key] = array_merge($default_config, $account); |
196 | 196 | } |
197 | 197 | } |
@@ -227,24 +227,24 @@ discard block |
||
227 | 227 | $arrays = func_get_args(); |
228 | 228 | $base = array_shift($arrays); |
229 | 229 | |
230 | - if(!is_array($base)) $base = empty($base) ? array() : array($base); |
|
230 | + if (!is_array($base)) $base = empty($base) ? array() : array($base); |
|
231 | 231 | |
232 | - foreach($arrays as $append) { |
|
232 | + foreach ($arrays as $append) { |
|
233 | 233 | |
234 | - if(!is_array($append)) $append = array($append); |
|
234 | + if (!is_array($append)) $append = array($append); |
|
235 | 235 | |
236 | - foreach($append as $key => $value) { |
|
236 | + foreach ($append as $key => $value) { |
|
237 | 237 | |
238 | - if(!array_key_exists($key, $base) and !is_numeric($key)) { |
|
238 | + if (!array_key_exists($key, $base) and !is_numeric($key)) { |
|
239 | 239 | $base[$key] = $append[$key]; |
240 | 240 | continue; |
241 | 241 | } |
242 | 242 | |
243 | - if(is_array($value) or is_array($base[$key])) { |
|
243 | + if (is_array($value) or is_array($base[$key])) { |
|
244 | 244 | $base[$key] = $this->array_merge_recursive_distinct($base[$key], $append[$key]); |
245 | - } else if(is_numeric($key)) { |
|
246 | - if(!in_array($value, $base)) $base[] = $value; |
|
247 | - } else { |
|
245 | + }else if (is_numeric($key)) { |
|
246 | + if (!in_array($value, $base)) $base[] = $value; |
|
247 | + }else { |
|
248 | 248 | $base[$key] = $value; |
249 | 249 | } |
250 | 250 |
@@ -72,13 +72,13 @@ discard block |
||
72 | 72 | if($value === null) { |
73 | 73 | if(isset(self::$config[$part])) { |
74 | 74 | $value = self::$config[$part]; |
75 | - }else{ |
|
75 | + } else{ |
|
76 | 76 | break; |
77 | 77 | } |
78 | - }else{ |
|
78 | + } else{ |
|
79 | 79 | if(isset($value[$part])) { |
80 | 80 | $value = $value[$part]; |
81 | - }else{ |
|
81 | + } else{ |
|
82 | 82 | break; |
83 | 83 | } |
84 | 84 | } |
@@ -227,11 +227,15 @@ discard block |
||
227 | 227 | $arrays = func_get_args(); |
228 | 228 | $base = array_shift($arrays); |
229 | 229 | |
230 | - if(!is_array($base)) $base = empty($base) ? array() : array($base); |
|
230 | + if(!is_array($base)) { |
|
231 | + $base = empty($base) ? array() : array($base); |
|
232 | + } |
|
231 | 233 | |
232 | 234 | foreach($arrays as $append) { |
233 | 235 | |
234 | - if(!is_array($append)) $append = array($append); |
|
236 | + if(!is_array($append)) { |
|
237 | + $append = array($append); |
|
238 | + } |
|
235 | 239 | |
236 | 240 | foreach($append as $key => $value) { |
237 | 241 | |
@@ -243,7 +247,9 @@ discard block |
||
243 | 247 | if(is_array($value) or is_array($base[$key])) { |
244 | 248 | $base[$key] = $this->array_merge_recursive_distinct($base[$key], $append[$key]); |
245 | 249 | } else if(is_numeric($key)) { |
246 | - if(!in_array($value, $base)) $base[] = $value; |
|
250 | + if(!in_array($value, $base)) { |
|
251 | + $base[] = $value; |
|
252 | + } |
|
247 | 253 | } else { |
248 | 254 | $base[$key] = $value; |
249 | 255 | } |
@@ -168,11 +168,11 @@ discard block |
||
168 | 168 | * @param array $config |
169 | 169 | * @param array $default_config |
170 | 170 | */ |
171 | - private function setAccountConfig($key, $config, $default_config){ |
|
171 | + private function setAccountConfig($key, $config, $default_config) { |
|
172 | 172 | $value = $this->default_account_config[$key]; |
173 | - if(isset($config[$key])) { |
|
173 | + if (isset($config[$key])) { |
|
174 | 174 | $value = $config[$key]; |
175 | - }elseif(isset($default_config[$key])) { |
|
175 | + }elseif (isset($default_config[$key])) { |
|
176 | 176 | $value = $default_config[$key]; |
177 | 177 | } |
178 | 178 | $this->$key = $value; |
@@ -184,9 +184,9 @@ discard block |
||
184 | 184 | */ |
185 | 185 | protected function setEventsFromConfig($config) { |
186 | 186 | $this->events = ClientManager::get("events"); |
187 | - if(isset($config['events'])){ |
|
188 | - if(isset($config['events'])) { |
|
189 | - foreach($config['events'] as $section => $events) { |
|
187 | + if (isset($config['events'])) { |
|
188 | + if (isset($config['events'])) { |
|
189 | + foreach ($config['events'] as $section => $events) { |
|
190 | 190 | $this->events[$section] = array_merge($this->events[$section], $events); |
191 | 191 | } |
192 | 192 | } |
@@ -200,45 +200,45 @@ discard block |
||
200 | 200 | * @throws MaskNotFoundException |
201 | 201 | */ |
202 | 202 | protected function setMaskFromConfig($config) { |
203 | - $default_config = ClientManager::get("masks"); |
|
203 | + $default_config = ClientManager::get("masks"); |
|
204 | 204 | |
205 | - if(isset($config['masks'])){ |
|
206 | - if(isset($config['masks']['message'])) { |
|
207 | - if(class_exists($config['masks']['message'])) { |
|
205 | + if (isset($config['masks'])) { |
|
206 | + if (isset($config['masks']['message'])) { |
|
207 | + if (class_exists($config['masks']['message'])) { |
|
208 | 208 | $this->default_message_mask = $config['masks']['message']; |
209 | - }else{ |
|
209 | + }else { |
|
210 | 210 | throw new MaskNotFoundException("Unknown mask provided: ".$config['masks']['message']); |
211 | 211 | } |
212 | - }else{ |
|
213 | - if(class_exists($default_config['message'])) { |
|
212 | + }else { |
|
213 | + if (class_exists($default_config['message'])) { |
|
214 | 214 | $this->default_message_mask = $default_config['message']; |
215 | - }else{ |
|
215 | + }else { |
|
216 | 216 | throw new MaskNotFoundException("Unknown mask provided: ".$default_config['message']); |
217 | 217 | } |
218 | 218 | } |
219 | - if(isset($config['masks']['attachment'])) { |
|
220 | - if(class_exists($config['masks']['attachment'])) { |
|
219 | + if (isset($config['masks']['attachment'])) { |
|
220 | + if (class_exists($config['masks']['attachment'])) { |
|
221 | 221 | $this->default_message_mask = $config['masks']['attachment']; |
222 | - }else{ |
|
222 | + }else { |
|
223 | 223 | throw new MaskNotFoundException("Unknown mask provided: ".$config['masks']['attachment']); |
224 | 224 | } |
225 | - }else{ |
|
226 | - if(class_exists($default_config['attachment'])) { |
|
225 | + }else { |
|
226 | + if (class_exists($default_config['attachment'])) { |
|
227 | 227 | $this->default_message_mask = $default_config['attachment']; |
228 | - }else{ |
|
228 | + }else { |
|
229 | 229 | throw new MaskNotFoundException("Unknown mask provided: ".$default_config['attachment']); |
230 | 230 | } |
231 | 231 | } |
232 | - }else{ |
|
233 | - if(class_exists($default_config['message'])) { |
|
232 | + }else { |
|
233 | + if (class_exists($default_config['message'])) { |
|
234 | 234 | $this->default_message_mask = $default_config['message']; |
235 | - }else{ |
|
235 | + }else { |
|
236 | 236 | throw new MaskNotFoundException("Unknown mask provided: ".$default_config['message']); |
237 | 237 | } |
238 | 238 | |
239 | - if(class_exists($default_config['attachment'])) { |
|
239 | + if (class_exists($default_config['attachment'])) { |
|
240 | 240 | $this->default_message_mask = $default_config['attachment']; |
241 | - }else{ |
|
241 | + }else { |
|
242 | 242 | throw new MaskNotFoundException("Unknown mask provided: ".$default_config['attachment']); |
243 | 243 | } |
244 | 244 | } |
@@ -302,7 +302,7 @@ discard block |
||
302 | 302 | $timeout = $this->connection !== false ? $this->connection->getConnectionTimeout() : null; |
303 | 303 | $this->connection = new ImapProtocol($this->validate_cert); |
304 | 304 | $this->connection->setConnectionTimeout($timeout); |
305 | - }else{ |
|
305 | + }else { |
|
306 | 306 | if (extension_loaded('imap') === false) { |
307 | 307 | throw new ConnectionFailedException("connection setup failed", 0, new ProtocolNotSupportedException($protocol." is an unsupported protocol")); |
308 | 308 | } |
@@ -328,7 +328,7 @@ discard block |
||
328 | 328 | try { |
329 | 329 | if ($this->authentication == "oauth") { |
330 | 330 | $this->connection->authenticate($this->username, $this->password); |
331 | - }else{ |
|
331 | + }else { |
|
332 | 332 | $this->connection->login($this->username, $this->password); |
333 | 333 | } |
334 | 334 | } catch (\Exception $e) { |
@@ -378,7 +378,7 @@ discard block |
||
378 | 378 | $pattern = $parent_folder.($hierarchical ? '%' : '*'); |
379 | 379 | $items = $this->connection->folders('', $pattern); |
380 | 380 | |
381 | - if(is_array($items)){ |
|
381 | + if (is_array($items)) { |
|
382 | 382 | foreach ($items as $folder_name => $item) { |
383 | 383 | $folder = new Folder($this, $folder_name, $item["delimiter"], $item["flags"]); |
384 | 384 | |
@@ -393,7 +393,7 @@ discard block |
||
393 | 393 | } |
394 | 394 | |
395 | 395 | return $folders; |
396 | - }else{ |
|
396 | + }else { |
|
397 | 397 | throw new FolderFetchingException("failed to fetch any folders"); |
398 | 398 | } |
399 | 399 | } |
@@ -427,10 +427,10 @@ discard block |
||
427 | 427 | public function createFolder($folder, $expunge = true) { |
428 | 428 | $this->checkConnection(); |
429 | 429 | $status = $this->connection->createFolder($folder); |
430 | - if($expunge) $this->expunge(); |
|
430 | + if ($expunge) $this->expunge(); |
|
431 | 431 | |
432 | 432 | $folder = $this->getFolder($folder); |
433 | - if($status && $folder) { |
|
433 | + if ($status && $folder) { |
|
434 | 434 | $event = $this->getEvent("folder", "new"); |
435 | 435 | $event::dispatch($folder); |
436 | 436 | } |
@@ -454,7 +454,7 @@ discard block |
||
454 | 454 | * |
455 | 455 | * @return Folder |
456 | 456 | */ |
457 | - public function getFolderPath(){ |
|
457 | + public function getFolderPath() { |
|
458 | 458 | return $this->active_folder; |
459 | 459 | } |
460 | 460 | |
@@ -509,14 +509,14 @@ discard block |
||
509 | 509 | * |
510 | 510 | * @return int |
511 | 511 | */ |
512 | - public function getTimeout($type){ |
|
512 | + public function getTimeout($type) { |
|
513 | 513 | return $this->connection->getConnectionTimeout(); |
514 | 514 | } |
515 | 515 | |
516 | 516 | /** |
517 | 517 | * @return string |
518 | 518 | */ |
519 | - public function getDefaultMessageMask(){ |
|
519 | + public function getDefaultMessageMask() { |
|
520 | 520 | return $this->default_message_mask; |
521 | 521 | } |
522 | 522 | |
@@ -524,7 +524,7 @@ discard block |
||
524 | 524 | * @param $section |
525 | 525 | * @return array |
526 | 526 | */ |
527 | - public function getDefaultEvents($section){ |
|
527 | + public function getDefaultEvents($section) { |
|
528 | 528 | return $this->events[$section]; |
529 | 529 | } |
530 | 530 | |
@@ -535,7 +535,7 @@ discard block |
||
535 | 535 | * @throws MaskNotFoundException |
536 | 536 | */ |
537 | 537 | public function setDefaultMessageMask($mask) { |
538 | - if(class_exists($mask)) { |
|
538 | + if (class_exists($mask)) { |
|
539 | 539 | $this->default_message_mask = $mask; |
540 | 540 | |
541 | 541 | return $this; |
@@ -547,7 +547,7 @@ discard block |
||
547 | 547 | /** |
548 | 548 | * @return string |
549 | 549 | */ |
550 | - public function getDefaultAttachmentMask(){ |
|
550 | + public function getDefaultAttachmentMask() { |
|
551 | 551 | return $this->default_attachment_mask; |
552 | 552 | } |
553 | 553 | |
@@ -558,7 +558,7 @@ discard block |
||
558 | 558 | * @throws MaskNotFoundException |
559 | 559 | */ |
560 | 560 | public function setDefaultAttachmentMask($mask) { |
561 | - if(class_exists($mask)) { |
|
561 | + if (class_exists($mask)) { |
|
562 | 562 | $this->default_attachment_mask = $mask; |
563 | 563 | |
564 | 564 | return $this; |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | $value = $this->default_account_config[$key]; |
173 | 173 | if(isset($config[$key])) { |
174 | 174 | $value = $config[$key]; |
175 | - }elseif(isset($default_config[$key])) { |
|
175 | + } elseif(isset($default_config[$key])) { |
|
176 | 176 | $value = $default_config[$key]; |
177 | 177 | } |
178 | 178 | $this->$key = $value; |
@@ -206,39 +206,39 @@ discard block |
||
206 | 206 | if(isset($config['masks']['message'])) { |
207 | 207 | if(class_exists($config['masks']['message'])) { |
208 | 208 | $this->default_message_mask = $config['masks']['message']; |
209 | - }else{ |
|
209 | + } else{ |
|
210 | 210 | throw new MaskNotFoundException("Unknown mask provided: ".$config['masks']['message']); |
211 | 211 | } |
212 | - }else{ |
|
212 | + } else{ |
|
213 | 213 | if(class_exists($default_config['message'])) { |
214 | 214 | $this->default_message_mask = $default_config['message']; |
215 | - }else{ |
|
215 | + } else{ |
|
216 | 216 | throw new MaskNotFoundException("Unknown mask provided: ".$default_config['message']); |
217 | 217 | } |
218 | 218 | } |
219 | 219 | if(isset($config['masks']['attachment'])) { |
220 | 220 | if(class_exists($config['masks']['attachment'])) { |
221 | 221 | $this->default_message_mask = $config['masks']['attachment']; |
222 | - }else{ |
|
222 | + } else{ |
|
223 | 223 | throw new MaskNotFoundException("Unknown mask provided: ".$config['masks']['attachment']); |
224 | 224 | } |
225 | - }else{ |
|
225 | + } else{ |
|
226 | 226 | if(class_exists($default_config['attachment'])) { |
227 | 227 | $this->default_message_mask = $default_config['attachment']; |
228 | - }else{ |
|
228 | + } else{ |
|
229 | 229 | throw new MaskNotFoundException("Unknown mask provided: ".$default_config['attachment']); |
230 | 230 | } |
231 | 231 | } |
232 | - }else{ |
|
232 | + } else{ |
|
233 | 233 | if(class_exists($default_config['message'])) { |
234 | 234 | $this->default_message_mask = $default_config['message']; |
235 | - }else{ |
|
235 | + } else{ |
|
236 | 236 | throw new MaskNotFoundException("Unknown mask provided: ".$default_config['message']); |
237 | 237 | } |
238 | 238 | |
239 | 239 | if(class_exists($default_config['attachment'])) { |
240 | 240 | $this->default_message_mask = $default_config['attachment']; |
241 | - }else{ |
|
241 | + } else{ |
|
242 | 242 | throw new MaskNotFoundException("Unknown mask provided: ".$default_config['attachment']); |
243 | 243 | } |
244 | 244 | } |
@@ -302,7 +302,7 @@ discard block |
||
302 | 302 | $timeout = $this->connection !== false ? $this->connection->getConnectionTimeout() : null; |
303 | 303 | $this->connection = new ImapProtocol($this->validate_cert); |
304 | 304 | $this->connection->setConnectionTimeout($timeout); |
305 | - }else{ |
|
305 | + } else{ |
|
306 | 306 | if (extension_loaded('imap') === false) { |
307 | 307 | throw new ConnectionFailedException("connection setup failed", 0, new ProtocolNotSupportedException($protocol." is an unsupported protocol")); |
308 | 308 | } |
@@ -328,7 +328,7 @@ discard block |
||
328 | 328 | try { |
329 | 329 | if ($this->authentication == "oauth") { |
330 | 330 | $this->connection->authenticate($this->username, $this->password); |
331 | - }else{ |
|
331 | + } else{ |
|
332 | 332 | $this->connection->login($this->username, $this->password); |
333 | 333 | } |
334 | 334 | } catch (\Exception $e) { |
@@ -393,7 +393,7 @@ discard block |
||
393 | 393 | } |
394 | 394 | |
395 | 395 | return $folders; |
396 | - }else{ |
|
396 | + } else{ |
|
397 | 397 | throw new FolderFetchingException("failed to fetch any folders"); |
398 | 398 | } |
399 | 399 | } |
@@ -427,7 +427,9 @@ discard block |
||
427 | 427 | public function createFolder($folder, $expunge = true) { |
428 | 428 | $this->checkConnection(); |
429 | 429 | $status = $this->connection->createFolder($folder); |
430 | - if($expunge) $this->expunge(); |
|
430 | + if($expunge) { |
|
431 | + $this->expunge(); |
|
432 | + } |
|
431 | 433 | |
432 | 434 | $folder = $this->getFolder($folder); |
433 | 435 | if($status && $folder) { |
@@ -26,8 +26,8 @@ |
||
26 | 26 | </tr> |
27 | 27 | </thead> |
28 | 28 | <tbody> |
29 | - <?php if($paginator->count() > 0): ?> |
|
30 | - <?php foreach($paginator as $message): ?> |
|
29 | + <?php if ($paginator->count() > 0): ?> |
|
30 | + <?php foreach ($paginator as $message): ?> |
|
31 | 31 | <tr> |
32 | 32 | <td><?php echo $message->getUid(); ?></td> |
33 | 33 | <td><?php echo $message->getSubject(); ?></td> |
@@ -35,11 +35,14 @@ |
||
35 | 35 | <td><?php echo $message->getAttachments()->count() > 0 ? 'yes' : 'no'; ?></td> |
36 | 36 | </tr> |
37 | 37 | <?php endforeach; ?> |
38 | - <?php else: ?> |
|
38 | + <?php else { |
|
39 | + : ?> |
|
39 | 40 | <tr> |
40 | 41 | <td colspan="4">No messages found</td> |
41 | 42 | </tr> |
42 | - <?php endif; ?> |
|
43 | + <?php endif; |
|
44 | +} |
|
45 | +?> |
|
43 | 46 | </tbody> |
44 | 47 | </table> |
45 | 48 |
@@ -24,8 +24,8 @@ |
||
24 | 24 | </tr> |
25 | 25 | </thead> |
26 | 26 | <tbody> |
27 | - <?php if($paginator->count() > 0): ?> |
|
28 | - <?php foreach($paginator as $folder): ?> |
|
27 | + <?php if ($paginator->count() > 0): ?> |
|
28 | + <?php foreach ($paginator as $folder): ?> |
|
29 | 29 | <tr> |
30 | 30 | <td><?php echo $folder->name; ?></td> |
31 | 31 | <td><?php echo $folder->search()->unseen()->setFetchBody(false)->count(); ?></td> |
@@ -31,11 +31,14 @@ |
||
31 | 31 | <td><?php echo $folder->search()->unseen()->setFetchBody(false)->count(); ?></td> |
32 | 32 | </tr> |
33 | 33 | <?php endforeach; ?> |
34 | - <?php else: ?> |
|
34 | + <?php else { |
|
35 | + : ?> |
|
35 | 36 | <tr> |
36 | 37 | <td colspan="4">No folders found</td> |
37 | 38 | </tr> |
38 | - <?php endif; ?> |
|
39 | + <?php endif; |
|
40 | +} |
|
41 | +?> |
|
39 | 42 | </tbody> |
40 | 43 | </table> |
41 | 44 |