From 310130906c31dc6f6483c557a47100ae4075a7d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0?= Date: Mon, 30 Sep 2024 20:34:48 +0900 Subject: [PATCH] cfmgrv4 init...1 --- .../Admin/Cloudflare/AccountController.php | 6 +++--- app/Controllers/Admin/Cloudflare/RecordController.php | 8 ++++---- app/Controllers/Admin/Cloudflare/ZoneController.php | 6 +++--- app/Controllers/MVController.php | 1 + app/Helpers/Admin/Cloudflare/Zone_helper.php | 4 +++- app/Models/Cloudflare/AuthModel.php | 4 ++-- app/Models/Cloudflare/RecordModel.php | 11 +++++------ app/Models/CommonModel.php | 2 ++ app/Views/admin/cloudflare/account/index.php | 3 --- 9 files changed, 23 insertions(+), 22 deletions(-) diff --git a/app/Controllers/Admin/Cloudflare/AccountController.php b/app/Controllers/Admin/Cloudflare/AccountController.php index d5d13b0..4df64cc 100644 --- a/app/Controllers/Admin/Cloudflare/AccountController.php +++ b/app/Controllers/Admin/Cloudflare/AccountController.php @@ -41,11 +41,11 @@ class AccountController extends CloudflareController { switch ($field) { case $this->getModel()::PARENT: - $this->getAuthModel()->where('status', DEFAULTS['STATUS']); - $options[$field] = [ + $temps = [ DEFAULTS['EMPTY'] => lang($this->class_path . '.label.' . $field) . ' 선택', - ...$this->getAuthModel()->getFormFieldOption($field, $options), ]; + // $this->getAuthModel()->where('status', DEFAULTS['STATUS']); + $options[$field] = $this->getAuthModel()->getFormFieldOption($field, $temps); // echo $this->getAuthModel()->getLastQuery(); // dd($options); break; diff --git a/app/Controllers/Admin/Cloudflare/RecordController.php b/app/Controllers/Admin/Cloudflare/RecordController.php index 9ff00e9..0e80e43 100644 --- a/app/Controllers/Admin/Cloudflare/RecordController.php +++ b/app/Controllers/Admin/Cloudflare/RecordController.php @@ -38,12 +38,12 @@ class RecordController extends CloudflareController { switch ($field) { case $this->getModel()::PARENT: - $this->getZoneModel()->where('status', 'active'); - $options[$field] = [ + $temps = [ DEFAULTS['EMPTY'] => lang($this->class_path . '.label.' . $field) . ' 선택', - ...$this->getZoneModel()->getFormFieldOption($field, $options), ]; - // echo $this->getZoneModel()->getLastQuery(); + // $this->getZoneModel()->where('status', 'active'); + $options[$field] = $this->getZoneModel()->getFormFieldOption($field, $temps); + // echo $this->getAccountModel()->getLastQuery(); // dd($options); break; default: diff --git a/app/Controllers/Admin/Cloudflare/ZoneController.php b/app/Controllers/Admin/Cloudflare/ZoneController.php index cb31eb6..c64dd8e 100644 --- a/app/Controllers/Admin/Cloudflare/ZoneController.php +++ b/app/Controllers/Admin/Cloudflare/ZoneController.php @@ -42,11 +42,11 @@ class ZoneController extends CloudflareController { switch ($field) { case $this->getModel()::PARENT: - $this->getAccountModel()->where('status', DEFAULTS['STATUS']); - $options[$field] = [ + $temps = [ DEFAULTS['EMPTY'] => lang($this->class_path . '.label.' . $field) . ' 선택', - ...$this->getAccountModel()->getFormFieldOption($field, $options), ]; + // $this->getAccountModel()->where('status', DEFAULTS['STATUS']); + $options[$field] = $this->getAccountModel()->getFormFieldOption($field, $temps); // echo $this->getAccountModel()->getLastQuery(); // dd($options); break; diff --git a/app/Controllers/MVController.php b/app/Controllers/MVController.php index 3fa2b53..d777575 100644 --- a/app/Controllers/MVController.php +++ b/app/Controllers/MVController.php @@ -37,6 +37,7 @@ abstract class MVController extends CommonController } $options = $this->getFormFieldOption($field, $options); } + // dd($options); return $options; } //전송된 데이터 diff --git a/app/Helpers/Admin/Cloudflare/Zone_helper.php b/app/Helpers/Admin/Cloudflare/Zone_helper.php index 1fa9536..7c75ee0 100644 --- a/app/Helpers/Admin/Cloudflare/Zone_helper.php +++ b/app/Helpers/Admin/Cloudflare/Zone_helper.php @@ -34,8 +34,10 @@ function getFieldForm_ZoneHelper(string $field, mixed $value, array $viewDatas, $form = form_input($field, $value, ["placeholder" => "예)exmaple.com", "style" => "width:60%; ::placeholder{color:silver; opacity: 1;}"]); break; case 'domains': + $form = form_textarea($field, $value, ['class' => 'editor', 'rows' => '5']); + break; case 'hosts': - $form = form_textarea($field, html_entity_decode($value), ['class' => 'editor', 'rows' => '5']); + $form = form_textarea($field, $value == DEFAULTS['EMPTY'] ? "@\n*\nm\nwww" : $value, ['class' => 'editor', 'rows' => '5']); break; case 'content': $form = form_input($field, $value, ["placeholder" => "예)123.123.123.123", "style" => "width:200px; ::placeholder{color:silver; opacity: 1;}"]); diff --git a/app/Models/Cloudflare/AuthModel.php b/app/Models/Cloudflare/AuthModel.php index 3d9b900..71574f2 100644 --- a/app/Models/Cloudflare/AuthModel.php +++ b/app/Models/Cloudflare/AuthModel.php @@ -48,7 +48,7 @@ class AuthModel extends CommonModel { switch ($field) { default: - $this->orderBy(self::TITLE, 'asc'); + $this->orderBy(self::PK, 'asc'); $options = parent::getFormFieldOption($field, $options); break; } @@ -61,7 +61,7 @@ class AuthModel extends CommonModel } public function getEntityByID(string $id): null|AuthEntity { - $this->where('id', $id); + $this->where(self::TITLE, $id); return $this->getEntity(); } //create용 diff --git a/app/Models/Cloudflare/RecordModel.php b/app/Models/Cloudflare/RecordModel.php index 1be7007..e07824c 100644 --- a/app/Models/Cloudflare/RecordModel.php +++ b/app/Models/Cloudflare/RecordModel.php @@ -75,7 +75,11 @@ class RecordModel extends CommonModel $this->where(self::TITLE, $id); return $this->getEntity(); } - + public function getEntitysByParent(ZoneEntity $zone_entity) + { + $this->where(self::PARENT, $zone_entity->getPK()); + return $this->getEntitys(); + } //create용 public function create(array $formDatas = []): RecordEntity { @@ -86,11 +90,6 @@ class RecordModel extends CommonModel { return $this->modify_process($entity, $formDatas); } - public function getEntitysByParent(ZoneEntity $zone_entity) - { - $this->where(self::PARENT, $zone_entity->getPK()); - return $this->getEntitys(); - } //도메인이 이미 존재하는지 체크 public function isUniqueHost($zone_uid, string $host, string $content): bool { diff --git a/app/Models/CommonModel.php b/app/Models/CommonModel.php index 797750c..d9c1948 100644 --- a/app/Models/CommonModel.php +++ b/app/Models/CommonModel.php @@ -125,6 +125,8 @@ abstract class CommonModel extends Model } break; } + // dd($options); + // exit; return $options; } final public function getEntity(): array|object|null diff --git a/app/Views/admin/cloudflare/account/index.php b/app/Views/admin/cloudflare/account/index.php index fb3ac01..17b5737 100644 --- a/app/Views/admin/cloudflare/account/index.php +++ b/app/Views/admin/cloudflare/account/index.php @@ -46,9 +46,6 @@ $old_auth]) ?> -