@@ -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 | } |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | $this->part_number = $part->part_number; |
| 105 | 105 | |
| 106 | 106 | $default_mask = $this->oMessage->getClient()->getDefaultAttachmentMask(); |
| 107 | - if($default_mask != null) { |
|
| 107 | + if ($default_mask != null) { |
|
| 108 | 108 | $this->mask = $default_mask; |
| 109 | 109 | } |
| 110 | 110 | |
@@ -121,10 +121,10 @@ discard block |
||
| 121 | 121 | * @throws MethodNotFoundException |
| 122 | 122 | */ |
| 123 | 123 | public function __call($method, $arguments) { |
| 124 | - if(strtolower(substr($method, 0, 3)) === 'get') { |
|
| 124 | + if (strtolower(substr($method, 0, 3)) === 'get') { |
|
| 125 | 125 | $name = Str::snake(substr($method, 3)); |
| 126 | 126 | |
| 127 | - if(isset($this->attributes[$name])) { |
|
| 127 | + if (isset($this->attributes[$name])) { |
|
| 128 | 128 | return $this->attributes[$name]; |
| 129 | 129 | } |
| 130 | 130 | |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | * @return mixed|null |
| 161 | 161 | */ |
| 162 | 162 | public function __get($name) { |
| 163 | - if(isset($this->attributes[$name])) { |
|
| 163 | + if (isset($this->attributes[$name])) { |
|
| 164 | 164 | return $this->attributes[$name]; |
| 165 | 165 | } |
| 166 | 166 | |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | if (IMAP::ATTACHMENT_TYPE_MESSAGE == $this->part->type) { |
| 230 | 230 | if ($this->part->ifdescription) { |
| 231 | 231 | $this->setName($this->part->description); |
| 232 | - } else { |
|
| 232 | + }else { |
|
| 233 | 233 | $this->setName($this->part->subtype); |
| 234 | 234 | } |
| 235 | 235 | } |
@@ -255,9 +255,9 @@ discard block |
||
| 255 | 255 | public function setName($name) { |
| 256 | 256 | $decoder = $this->config['decoder']['attachment']; |
| 257 | 257 | if ($name !== null) { |
| 258 | - if($decoder === 'utf-8' && extension_loaded('imap')) { |
|
| 258 | + if ($decoder === 'utf-8' && extension_loaded('imap')) { |
|
| 259 | 259 | $this->name = \imap_utf8($name); |
| 260 | - }else{ |
|
| 260 | + }else { |
|
| 261 | 261 | $this->name = mb_decode_mimeheader($name); |
| 262 | 262 | } |
| 263 | 263 | } |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | * |
| 269 | 269 | * @return string|null |
| 270 | 270 | */ |
| 271 | - public function getMimeType(){ |
|
| 271 | + public function getMimeType() { |
|
| 272 | 272 | return (new \finfo())->buffer($this->getContent(), FILEINFO_MIME_TYPE); |
| 273 | 273 | } |
| 274 | 274 | |
@@ -277,9 +277,9 @@ discard block |
||
| 277 | 277 | * |
| 278 | 278 | * @return string|null |
| 279 | 279 | */ |
| 280 | - public function getExtension(){ |
|
| 280 | + public function getExtension() { |
|
| 281 | 281 | $deprecated_guesser = "\Symfony\Component\HttpFoundation\File\MimeType\ExtensionGuesser"; |
| 282 | - if (class_exists($deprecated_guesser) !== false){ |
|
| 282 | + if (class_exists($deprecated_guesser) !== false) { |
|
| 283 | 283 | return $deprecated_guesser::getInstance()->guess($this->getMimeType()); |
| 284 | 284 | } |
| 285 | 285 | $guesser = "\Symfony\Component\Mime\MimeTypes"; |
@@ -292,14 +292,14 @@ discard block |
||
| 292 | 292 | * |
| 293 | 293 | * @return array |
| 294 | 294 | */ |
| 295 | - public function getAttributes(){ |
|
| 295 | + public function getAttributes() { |
|
| 296 | 296 | return $this->attributes; |
| 297 | 297 | } |
| 298 | 298 | |
| 299 | 299 | /** |
| 300 | 300 | * @return Message |
| 301 | 301 | */ |
| 302 | - public function getMessage(){ |
|
| 302 | + public function getMessage() { |
|
| 303 | 303 | return $this->oMessage; |
| 304 | 304 | } |
| 305 | 305 | |
@@ -309,8 +309,8 @@ discard block |
||
| 309 | 309 | * |
| 310 | 310 | * @return $this |
| 311 | 311 | */ |
| 312 | - public function setMask($mask){ |
|
| 313 | - if(class_exists($mask)){ |
|
| 312 | + public function setMask($mask) { |
|
| 313 | + if (class_exists($mask)) { |
|
| 314 | 314 | $this->mask = $mask; |
| 315 | 315 | } |
| 316 | 316 | |
@@ -322,7 +322,7 @@ discard block |
||
| 322 | 322 | * |
| 323 | 323 | * @return string |
| 324 | 324 | */ |
| 325 | - public function getMask(){ |
|
| 325 | + public function getMask() { |
|
| 326 | 326 | return $this->mask; |
| 327 | 327 | } |
| 328 | 328 | |
@@ -333,9 +333,9 @@ discard block |
||
| 333 | 333 | * @return mixed |
| 334 | 334 | * @throws MaskNotFoundException |
| 335 | 335 | */ |
| 336 | - public function mask($mask = null){ |
|
| 336 | + public function mask($mask = null) { |
|
| 337 | 337 | $mask = $mask !== null ? $mask : $this->mask; |
| 338 | - if(class_exists($mask)){ |
|
| 338 | + if (class_exists($mask)) { |
|
| 339 | 339 | return new $mask($this); |
| 340 | 340 | } |
| 341 | 341 | |
@@ -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 | } |
@@ -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) { |
@@ -176,11 +176,11 @@ discard block |
||
| 176 | 176 | * @param array $config |
| 177 | 177 | * @param array $default_config |
| 178 | 178 | */ |
| 179 | - private function setAccountConfig($key, $config, $default_config){ |
|
| 179 | + private function setAccountConfig($key, $config, $default_config) { |
|
| 180 | 180 | $value = $this->default_account_config[$key]; |
| 181 | - if(isset($config[$key])) { |
|
| 181 | + if (isset($config[$key])) { |
|
| 182 | 182 | $value = $config[$key]; |
| 183 | - }elseif(isset($default_config[$key])) { |
|
| 183 | + }elseif (isset($default_config[$key])) { |
|
| 184 | 184 | $value = $default_config[$key]; |
| 185 | 185 | } |
| 186 | 186 | $this->$key = $value; |
@@ -192,9 +192,9 @@ discard block |
||
| 192 | 192 | */ |
| 193 | 193 | protected function setEventsFromConfig($config) { |
| 194 | 194 | $this->events = ClientManager::get("events"); |
| 195 | - if(isset($config['events'])){ |
|
| 196 | - if(isset($config['events'])) { |
|
| 197 | - foreach($config['events'] as $section => $events) { |
|
| 195 | + if (isset($config['events'])) { |
|
| 196 | + if (isset($config['events'])) { |
|
| 197 | + foreach ($config['events'] as $section => $events) { |
|
| 198 | 198 | $this->events[$section] = array_merge($this->events[$section], $events); |
| 199 | 199 | } |
| 200 | 200 | } |
@@ -208,45 +208,45 @@ discard block |
||
| 208 | 208 | * @throws MaskNotFoundException |
| 209 | 209 | */ |
| 210 | 210 | protected function setMaskFromConfig($config) { |
| 211 | - $default_config = ClientManager::get("masks"); |
|
| 211 | + $default_config = ClientManager::get("masks"); |
|
| 212 | 212 | |
| 213 | - if(isset($config['masks'])){ |
|
| 214 | - if(isset($config['masks']['message'])) { |
|
| 215 | - if(class_exists($config['masks']['message'])) { |
|
| 213 | + if (isset($config['masks'])) { |
|
| 214 | + if (isset($config['masks']['message'])) { |
|
| 215 | + if (class_exists($config['masks']['message'])) { |
|
| 216 | 216 | $this->default_message_mask = $config['masks']['message']; |
| 217 | - }else{ |
|
| 217 | + }else { |
|
| 218 | 218 | throw new MaskNotFoundException("Unknown mask provided: ".$config['masks']['message']); |
| 219 | 219 | } |
| 220 | - }else{ |
|
| 221 | - if(class_exists($default_config['message'])) { |
|
| 220 | + }else { |
|
| 221 | + if (class_exists($default_config['message'])) { |
|
| 222 | 222 | $this->default_message_mask = $default_config['message']; |
| 223 | - }else{ |
|
| 223 | + }else { |
|
| 224 | 224 | throw new MaskNotFoundException("Unknown mask provided: ".$default_config['message']); |
| 225 | 225 | } |
| 226 | 226 | } |
| 227 | - if(isset($config['masks']['attachment'])) { |
|
| 228 | - if(class_exists($config['masks']['attachment'])) { |
|
| 227 | + if (isset($config['masks']['attachment'])) { |
|
| 228 | + if (class_exists($config['masks']['attachment'])) { |
|
| 229 | 229 | $this->default_message_mask = $config['masks']['attachment']; |
| 230 | - }else{ |
|
| 230 | + }else { |
|
| 231 | 231 | throw new MaskNotFoundException("Unknown mask provided: ".$config['masks']['attachment']); |
| 232 | 232 | } |
| 233 | - }else{ |
|
| 234 | - if(class_exists($default_config['attachment'])) { |
|
| 233 | + }else { |
|
| 234 | + if (class_exists($default_config['attachment'])) { |
|
| 235 | 235 | $this->default_message_mask = $default_config['attachment']; |
| 236 | - }else{ |
|
| 236 | + }else { |
|
| 237 | 237 | throw new MaskNotFoundException("Unknown mask provided: ".$default_config['attachment']); |
| 238 | 238 | } |
| 239 | 239 | } |
| 240 | - }else{ |
|
| 241 | - if(class_exists($default_config['message'])) { |
|
| 240 | + }else { |
|
| 241 | + if (class_exists($default_config['message'])) { |
|
| 242 | 242 | $this->default_message_mask = $default_config['message']; |
| 243 | - }else{ |
|
| 243 | + }else { |
|
| 244 | 244 | throw new MaskNotFoundException("Unknown mask provided: ".$default_config['message']); |
| 245 | 245 | } |
| 246 | 246 | |
| 247 | - if(class_exists($default_config['attachment'])) { |
|
| 247 | + if (class_exists($default_config['attachment'])) { |
|
| 248 | 248 | $this->default_message_mask = $default_config['attachment']; |
| 249 | - }else{ |
|
| 249 | + }else { |
|
| 250 | 250 | throw new MaskNotFoundException("Unknown mask provided: ".$default_config['attachment']); |
| 251 | 251 | } |
| 252 | 252 | } |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | $timeout = $this->connection !== false ? $this->connection->getConnectionTimeout() : null; |
| 311 | 311 | $this->connection = new ImapProtocol($this->validate_cert); |
| 312 | 312 | $this->connection->setConnectionTimeout($timeout); |
| 313 | - }else{ |
|
| 313 | + }else { |
|
| 314 | 314 | if (extension_loaded('imap') === false) { |
| 315 | 315 | throw new ConnectionFailedException("connection setup failed", 0, new ProtocolNotSupportedException($protocol." is an unsupported protocol")); |
| 316 | 316 | } |
@@ -336,7 +336,7 @@ discard block |
||
| 336 | 336 | try { |
| 337 | 337 | if ($this->authentication == "oauth") { |
| 338 | 338 | $this->connection->authenticate($this->username, $this->password); |
| 339 | - }else{ |
|
| 339 | + }else { |
|
| 340 | 340 | $this->connection->login($this->username, $this->password); |
| 341 | 341 | } |
| 342 | 342 | } catch (\Exception $e) { |
@@ -387,7 +387,7 @@ discard block |
||
| 387 | 387 | $pattern = $parent_folder.($hierarchical ? '%' : '*'); |
| 388 | 388 | $items = $this->connection->folders('', $pattern); |
| 389 | 389 | |
| 390 | - if(is_array($items)){ |
|
| 390 | + if (is_array($items)) { |
|
| 391 | 391 | foreach ($items as $folder_name => $item) { |
| 392 | 392 | $folder = new Folder($this, $folder_name, $item["delimiter"], $item["flags"]); |
| 393 | 393 | |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | } |
| 403 | 403 | |
| 404 | 404 | return $folders; |
| 405 | - }else{ |
|
| 405 | + }else { |
|
| 406 | 406 | throw new FolderFetchingException("failed to fetch any folders"); |
| 407 | 407 | } |
| 408 | 408 | } |
@@ -436,10 +436,10 @@ discard block |
||
| 436 | 436 | public function createFolder($folder, $expunge = true) { |
| 437 | 437 | $this->checkConnection(); |
| 438 | 438 | $status = $this->connection->createFolder($folder); |
| 439 | - if($expunge) $this->expunge(); |
|
| 439 | + if ($expunge) $this->expunge(); |
|
| 440 | 440 | |
| 441 | 441 | $folder = $this->getFolder($folder); |
| 442 | - if($status && $folder) { |
|
| 442 | + if ($status && $folder) { |
|
| 443 | 443 | $event = $this->getEvent("folder", "new"); |
| 444 | 444 | $event::dispatch($folder); |
| 445 | 445 | } |
@@ -464,7 +464,7 @@ discard block |
||
| 464 | 464 | * |
| 465 | 465 | * @return Folder |
| 466 | 466 | */ |
| 467 | - public function getFolderPath(){ |
|
| 467 | + public function getFolderPath() { |
|
| 468 | 468 | return $this->active_folder; |
| 469 | 469 | } |
| 470 | 470 | |
@@ -518,7 +518,7 @@ discard block |
||
| 518 | 518 | * |
| 519 | 519 | * @return int |
| 520 | 520 | */ |
| 521 | - public function getTimeout($type){ |
|
| 521 | + public function getTimeout($type) { |
|
| 522 | 522 | return $this->connection->getConnectionTimeout(); |
| 523 | 523 | } |
| 524 | 524 | |
@@ -527,7 +527,7 @@ discard block |
||
| 527 | 527 | * |
| 528 | 528 | * @return string |
| 529 | 529 | */ |
| 530 | - public function getDefaultMessageMask(){ |
|
| 530 | + public function getDefaultMessageMask() { |
|
| 531 | 531 | return $this->default_message_mask; |
| 532 | 532 | } |
| 533 | 533 | |
@@ -537,7 +537,7 @@ discard block |
||
| 537 | 537 | * |
| 538 | 538 | * @return array |
| 539 | 539 | */ |
| 540 | - public function getDefaultEvents($section){ |
|
| 540 | + public function getDefaultEvents($section) { |
|
| 541 | 541 | return $this->events[$section]; |
| 542 | 542 | } |
| 543 | 543 | |
@@ -549,7 +549,7 @@ discard block |
||
| 549 | 549 | * @throws MaskNotFoundException |
| 550 | 550 | */ |
| 551 | 551 | public function setDefaultMessageMask($mask) { |
| 552 | - if(class_exists($mask)) { |
|
| 552 | + if (class_exists($mask)) { |
|
| 553 | 553 | $this->default_message_mask = $mask; |
| 554 | 554 | |
| 555 | 555 | return $this; |
@@ -563,7 +563,7 @@ discard block |
||
| 563 | 563 | * |
| 564 | 564 | * @return string |
| 565 | 565 | */ |
| 566 | - public function getDefaultAttachmentMask(){ |
|
| 566 | + public function getDefaultAttachmentMask() { |
|
| 567 | 567 | return $this->default_attachment_mask; |
| 568 | 568 | } |
| 569 | 569 | |
@@ -575,7 +575,7 @@ discard block |
||
| 575 | 575 | * @throws MaskNotFoundException |
| 576 | 576 | */ |
| 577 | 577 | public function setDefaultAttachmentMask($mask) { |
| 578 | - if(class_exists($mask)) { |
|
| 578 | + if (class_exists($mask)) { |
|
| 579 | 579 | $this->default_attachment_mask = $mask; |
| 580 | 580 | |
| 581 | 581 | return $this; |
@@ -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 | |