diff --git a/app/Controllers/Admin/Cloudflare/API/FirewallController.php b/app/Controllers/Admin/Cloudflare/API/FirewallController.php index 47c1928..a3ba91e 100644 --- a/app/Controllers/Admin/Cloudflare/API/FirewallController.php +++ b/app/Controllers/Admin/Cloudflare/API/FirewallController.php @@ -83,7 +83,7 @@ class FirewallController extends APIController return parent::sync_process($entity); } - //index 모델 전처리 + //Index관련 private function index_setCondition_builder($builder) { foreach ($this->_viewDatas['fieldFilters'] as $field) { @@ -104,8 +104,7 @@ class FirewallController extends APIController } return $builder; } - //Index관련 - protected function index_getRows(int $page = 0, int $per_page = 0): array + private function index_getRows_builder(int $page = 0, int $per_page = 0): array { //Totalcount 처리 $builder = $this->_model->builder(); @@ -126,6 +125,11 @@ class FirewallController extends APIController //Limit $builder->limit($per_page, $page * $per_page - $per_page); // log_message("debug", __METHOD__ . "에서 호출\n" . $builder->getCompiledSelect(false)); + return $builder->get()->getResultArray(); } + protected function index_getRows(int $page = 0, int $per_page = 0): array + { + return $this->index_getRows_builder($page, $per_page); + } } diff --git a/app/Controllers/Admin/Cloudflare/API/RecordController.php b/app/Controllers/Admin/Cloudflare/API/RecordController.php index 4463677..23461c3 100644 --- a/app/Controllers/Admin/Cloudflare/API/RecordController.php +++ b/app/Controllers/Admin/Cloudflare/API/RecordController.php @@ -137,7 +137,7 @@ class RecordController extends APIController $entity = $api->sync($entity); return parent::sync_process($entity); } - //index 모델 전처리 + //Index관련 private function index_setCondition_builder($builder) { foreach ($this->_viewDatas['fieldFilters'] as $field) { @@ -159,8 +159,7 @@ class RecordController extends APIController } return $builder; } - //Index관련 - protected function index_getRows(int $page = 0, int $per_page = 0): array + private function index_getRows_builder(int $page = 0, int $per_page = 0): array { //Totalcount 처리 $builder = $this->_model->builder(); @@ -182,6 +181,10 @@ class RecordController extends APIController log_message("debug", __METHOD__ . "에서 호출\n" . $builder->getCompiledSelect(false)); return $builder->get()->getResultArray(); } + protected function index_getRows(int $page = 0, int $per_page = 0): array + { + return $this->index_getRows_builder($page, $per_page); + } //CDN고정관련 final public function cdnToggle(string $uid) { diff --git a/app/Controllers/Admin/Cloudflare/API/ZoneController.php b/app/Controllers/Admin/Cloudflare/API/ZoneController.php index db954a9..f6b7122 100644 --- a/app/Controllers/Admin/Cloudflare/API/ZoneController.php +++ b/app/Controllers/Admin/Cloudflare/API/ZoneController.php @@ -224,6 +224,10 @@ class ZoneController extends APIController // log_message("debug", __METHOD__ . "에서 호출\n" . $builder->getCompiledSelect(false)); return $builder->get()->getResultArray(); } + protected function index_getRows(int $page = 0, int $per_page = 0): array + { + return parent::index_getRows($page, $per_page); + } //Reload관련 final public function reload($uid) {