From c47481795be5ced949dcd8a8f590bf2ee1a9619b Mon Sep 17 00:00:00 2001 From: AnthonyAxenov Date: Mon, 27 Oct 2025 08:33:06 +0800 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=BF=D1=82=D0=B8=D0=BC=D0=B8=D0=B7?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B2=D1=8B=D1=87=D0=B8=D1=82=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=BB=D0=B8=D1=81=D1=82=D0=BE=D0=B2=20=D0=B8=D0=B7=20?= =?UTF-8?q?=D0=BA=D1=8D=D1=88=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=B3=D0=B5?= =?UTF-8?q?=D0=BD=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20qr-=D0=BA=D0=BE?= =?UTF-8?q?=D0=B4=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controllers/ApiController.php | 3 ++- app/Controllers/WebController.php | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/Controllers/ApiController.php b/app/Controllers/ApiController.php index ab4dd7c..631abd4 100644 --- a/app/Controllers/ApiController.php +++ b/app/Controllers/ApiController.php @@ -55,8 +55,9 @@ class ApiController extends BasicController */ public function makeQrCode(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface { + $ini = ini()->load(); $code = $request->getAttribute('code'); - $codes = array_keys(ini()->getPlaylists()); + $codes = array_keys($ini); if (!in_array($code, $codes, true)) { return $response->withStatus(404); } diff --git a/app/Controllers/WebController.php b/app/Controllers/WebController.php index 66d9dd5..e68ad89 100644 --- a/app/Controllers/WebController.php +++ b/app/Controllers/WebController.php @@ -37,19 +37,20 @@ class WebController extends BasicController public function home(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface { $ini = ini()->load(); - + $keys = []; $count = count($ini); $pageSize = config('app.page_size'); + if ($pageSize > 0) { $pageCurrent = (int)($request->getAttributes()['page'] ?? $request->getQueryParams()['page'] ?? 1); $pageCount = ceil($count / $pageSize); $offset = max(0, ($pageCurrent - 1) * $pageSize); $ini = array_slice($ini, $offset, $pageSize, true); - $playlists = ini()->getPlaylists(array_keys($ini)); - } else { - $playlists = ini()->getPlaylists(); + $keys = array_keys($ini); } + $playlists = ini()->getPlaylists($keys); + return $this->view($request, $response, 'list.twig', [ 'updatedAt' => ini()->updatedAt(), 'playlists' => $playlists,