Fixed Query::paginate()

Author: Max13

src/Query/Query.php

@@ -251,21 +251,26 @@ public function getMessage($msgno, $msglist = null){
  * @throws GetMessagesFailedException
  */
  public function paginate($per_page = 5, $page = null, $page_name = 'imap_page'){
- $this->page = $page > $this->page ? $page : $this->page;
+ if (
+ $page === null
+ && isset($_GET[$page_name])
+ && $_GET[$page_name] > 0
+ ) {
+ $this->page = intval($_GET[$page_name]);
+ } elseif ($page > 0) {
+ $this->page = $page;
+ }
  $this->limit = $per_page;
-
  $messages = $this->get();
- if (($count = $messages->count()) > 0) {
- $limit = $this->limit > $count ? $count : $this->limit;
- $collection = array_fill(0, $messages->total() - $limit, true);
- $messages->each(function($message) use(&$collection){
- $collection[] = $message;
- });
- }else{
- $collection = array_fill(0, $messages->total(), true);
+
+ if ($messages->isEmpty()) {
+ $n_last_page = $messages->total() % $per_page;
+ $last_page = $messages->total() / $per_page + min(1, $n_last_page);
+ $count = $page == $last_page ? $n_last_page : $per_page;
+ $messages->merge(array_fill(0, $count, true));
  }
 
- return MessageCollection::make($collection)->paginate($per_page, $this->page, $page_name);
+ return $messages->paginate($per_page, $this->page, $page_name);
  }
 
  /**