idcjp/cfmgrv3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cfmgr init...3

Browse Source
This commit is contained in:
최준흠 2023-06-20 19:27:48 +09:00
parent 552192efde
commit b429ff2821
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controllers/Admin/Cloudflare/API/FirewallController.php
View File

@ -92,9 +92,9 @@ class FirewallController extends APIController
$builder->select("cloudflarefirewall.*");
$builder->join("cloudflarezone", "cloudflarezone.uid = cloudflarefirewall.zone_uid");
//OrderBy
$order_field = $this->request->getVar('order_field') ? $this->request->getVar('order_field') : 'uid';
$order_field = $this->request->getVar('order_field') ? $this->request->getVar('order_field') : 'cloudflarefirewall.uid';
$order_value = $this->request->getVar('order_value') ? $this->request->getVar('order_value') : 'DESC';
$builder->orderBy("cloudflarezone.domain ASC, description ASC, {$order_field} {$order_value}");
$builder->orderBy("cloudflarezone.domain ASC, cloudflarefirewall.description ASC, {$order_field} {$order_value}");
//Limit
$builder->limit($page * $per_page - $per_page, $per_page);
// log_message("debug", __METHOD__ . "에서 호출\n" . $builder->getCompiledSelect(false));

8
app/Controllers/Admin/Cloudflare/API/RecordController.php
View File

@ -138,7 +138,7 @@ class RecordController extends APIController
return parent::sync_process($entity);
}
//Index관련
protected function index_getRowss(int $page = 0, int $per_page = 0): array
protected function index_getRows(int $page = 0, int $per_page = 0): array
{
//모델 조건절 처리작업
$this->index_setCondition();
@ -147,12 +147,12 @@ class RecordController extends APIController
$builder->select("cloudflarerecord.*");
$builder->join("cloudflarezone", "cloudflarezone.uid = cloudflarerecord.zone_uid");
//OrderBy
$order_field = $this->request->getVar('order_field') ? $this->request->getVar('order_field') : 'uid';
$order_field = $this->request->getVar('order_field') ? $this->request->getVar('order_field') : 'cloudflarerecord.uid';
$order_value = $this->request->getVar('order_value') ? $this->request->getVar('order_value') : 'DESC';
$builder->orderBy("cloudflarezone.domain ASC, host ASC, {$order_field} {$order_value}");
$builder->orderBy("cloudflarezone.domain ASC, cloudflarerecord.host ASC, {$order_field} {$order_value}");
//Limit
$builder->limit($page * $per_page - $per_page, $per_page);
// log_message("debug", __METHOD__ . "에서 호출\n" . $builder->getCompiledSelect(false));
log_message("debug", __METHOD__ . "에서 호출\n" . $builder->getCompiledSelect(false));
$rows = $builder->get()->getResultArray();
// foreach ($builder->get()->getResultArray() as $row) {
// array_push($rows, new RecordEntity($row));