From 235ce5716edc2f7cbe80fdccf26eac7269587839 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Mon, 08 Jun 2026 04:38:18 +0000
Subject: [PATCH] =FavouritesManager.php and FavouritesRoutes.php fixes. Moving all logic to FavouritesManager.php. Still some left to do
---
inc/managers/CustomTable.php | 49 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/inc/managers/CustomTable.php b/inc/managers/CustomTable.php
index 572d8a2..1a6719c 100644
--- a/inc/managers/CustomTable.php
+++ b/inc/managers/CustomTable.php
@@ -319,16 +319,16 @@
}
/**
- * Set LIMIT
+ * Set pagination
*
- * @param int $limit Number of records
- * @param int $offset Optional offset
+ * @param int $perPage Number of records per page
+ * @param int $page Page number (1-based)
* @return self
*/
- public function limit(int $limit, int $offset = 0): self
+ public function limit(int $perPage, int $page = 1): self
{
- $this->builder['limit'] = $limit;
- $this->builder['offset'] = $offset;
+ $this->builder['per_page'] = $perPage;
+ $this->builder['page'] = $page;
return $this;
}
@@ -601,12 +601,12 @@
* 'where' => ['user_id' => 1],
* 'orderby' => 'date_added',
* 'order' => 'DESC',
- * 'limit' => 20
+ * 'per_page' => 20
* ]);
*/
- public function getMany(array $args = [], string $output = OBJECT): array
+ public function getMany(array $args = [], bool $itemsOnly = true, string $output = OBJECT): array
{
- return $this->cache->remember(
+ $items = $this->cache->remember(
$this->cache->generateKey(array_merge($args, ['output' => $output])),
function () use ($args, $output) {
$query = "SELECT * FROM {$this->fullTableName}";
@@ -628,10 +628,19 @@
}
// LIMIT
- if (!empty($args['limit'])) {
- $limit = absint($args['limit']);
- $offset = !empty($args['offset']) ? absint($args['offset']) : 0;
- $query .= " LIMIT {$offset}, {$limit}";
+ if (array_key_exists('limit', $args)) {
+ error_log('[CustomTable]::getMany deprecated key \'limit\' - use \'per_page\' instead. '.print_r($args, true));
+ $args['per_page'] = $args['limit'];
+ }
+ if (array_key_exists('offset', $args)) {
+ error_log('[CustomTable]::getMany deprecated key \'offset\' - use \'page\' instead. '.print_r($args, true));
+ $args['page'] = $args['offset'] / $args['limit'];
+ }
+ if (!empty($args['per_page'])) {
+ $perPage = absint($args['per_page']);
+ $page = !empty($args['page']) ? absint($args['page']) : 1;
+ $offset = ($page - 1) * $perPage;
+ $query .= " LIMIT {$offset}, {$perPage}";
}
if (empty($values)) {
@@ -642,8 +651,20 @@
}
);
+ if ($itemsOnly) {
+ return $items;
+ }
+ $page = max(1, $args['page'] ?? 1);
+ $perPage = $args['per_page']??false;
+ $total = $this->count($args['where']);
+ return [
+ 'items' => $items,
+ 'total' => $total,
+ 'has_more' => $perPage && ($page * $perPage) < $total,
+ ];
}
+
/**
* Get a specific column value from all matches
* @param string $column
@@ -669,7 +690,7 @@
$args['order'] = $order;
}
if ($limit) {
- $args['limit'] = $limit;
+ $args['per_page'] = $limit;
}
return array_column($this->getMany($args), $column);
--
Gitblit v1.10.0