From 552192efded4720d77b8ef9eeec301e5e218f385 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0?= <choi.jh@prime-idc.jp>
Date: Tue, 20 Jun 2023 19:14:14 +0900
Subject: [PATCH] cfmgr init...3

---
 app/Controllers/Admin/Cloudflare/API/FirewallController.php | 4 ++--
 app/Controllers/Admin/Cloudflare/API/RecordController.php   | 6 +++---
 app/Controllers/Common/CommonController.php                 | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Controllers/Admin/Cloudflare/API/FirewallController.php b/app/Controllers/Admin/Cloudflare/API/FirewallController.php
index b496dac..8c797b6 100644
--- a/app/Controllers/Admin/Cloudflare/API/FirewallController.php
+++ b/app/Controllers/Admin/Cloudflare/API/FirewallController.php
@@ -96,8 +96,8 @@ class FirewallController extends APIController
         $order_value = $this->request->getVar('order_value') ? $this->request->getVar('order_value') : 'DESC';
         $builder->orderBy("cloudflarezone.domain ASC, description ASC, {$order_field} {$order_value}");
         //Limit
-        $builder->limit($per_page, $page);
-        log_message("debug", __METHOD__ . "에서 호출\n" . $builder->getCompiledSelect(false));
+        $builder->limit($page * $per_page - $per_page, $per_page);
+        // log_message("debug", __METHOD__ . "에서 호출\n" . $builder->getCompiledSelect(false));
         $rows = $builder->get()->getResultArray();
         // foreach ($builder->get()->getResultArray() as $row) {
         //     array_push($rows, new FirewallEntity($row));
diff --git a/app/Controllers/Admin/Cloudflare/API/RecordController.php b/app/Controllers/Admin/Cloudflare/API/RecordController.php
index 973f582..207a40b 100644
--- a/app/Controllers/Admin/Cloudflare/API/RecordController.php
+++ b/app/Controllers/Admin/Cloudflare/API/RecordController.php
@@ -138,7 +138,7 @@ class RecordController extends APIController
         return parent::sync_process($entity);
     }
     //Index관련
-    protected function index_getRows_backup(int $page = 0, int $per_page = 0): array
+    protected function index_getRowss(int $page = 0, int $per_page = 0): array
     {
         //모델 조건절 처리작업
         $this->index_setCondition();
@@ -151,8 +151,8 @@ class RecordController extends APIController
         $order_value = $this->request->getVar('order_value') ? $this->request->getVar('order_value') : 'DESC';
         $builder->orderBy("cloudflarezone.domain ASC, host ASC, {$order_field} {$order_value}");
         //Limit
-        $builder->limit($per_page, $page);
-        log_message("debug", __METHOD__ . "에서 호출\n" . $builder->getCompiledSelect(false));
+        $builder->limit($page * $per_page - $per_page, $per_page);
+        // log_message("debug", __METHOD__ . "에서 호출\n" . $builder->getCompiledSelect(false));
         $rows = $builder->get()->getResultArray();
         // foreach ($builder->get()->getResultArray() as $row) {
         //     array_push($rows, new RecordEntity($row));
diff --git a/app/Controllers/Common/CommonController.php b/app/Controllers/Common/CommonController.php
index 6c8c3f2..d09d83e 100644
--- a/app/Controllers/Common/CommonController.php
+++ b/app/Controllers/Common/CommonController.php
@@ -447,7 +447,7 @@ class CommonController extends BaseController
         $this->_model->setIndexOrderBy($order_field, $order_value);
         //Limit
         $rows = $per_page ? $this->_model->findAll($per_page, $page * $per_page - $per_page) : $this->_model->findAll();
-        log_message("debug", __METHOD__ . "에서 호출[{$per_page}:{$page}=>{$page}*{$per_page}-{$per_page}]\n" . $this->_model->getLastQuery());
+        // log_message("debug", __METHOD__ . "에서 호출[{$per_page}:{$page}=>{$page}*{$per_page}-{$per_page}]\n" . $this->_model->getLastQuery());
         return $rows;
     }
     private function index_getPagination($pager_group = 'default', int $segment = 0, $template = 'bootstrap_full'): string