diff --git a/app/Controllers/Admin/Cloudflare/ZoneController.php b/app/Controllers/Admin/Cloudflare/ZoneController.php index 37382c1..6d4a1ad 100644 --- a/app/Controllers/Admin/Cloudflare/ZoneController.php +++ b/app/Controllers/Admin/Cloudflare/ZoneController.php @@ -82,11 +82,11 @@ class ZoneController extends CloudflareController private function init(string $action, array $fields = []): void { $this->action = $action; - $this->fields = count($fields) ? $fields : [$this->getModel()::PARENT, $this->getModel()::TITLE, 'name_servers', 'original_name_servers', 'plan', 'development_mode', 'ipv6', 'security_level', 'ssl_mode', 'status', 'updated_at', 'created_at']; + $this->fields = count($fields) ? $fields : [$this->getModel()::PARENT, $this->getModel()::TITLE, 'name_servers', 'original_name_servers', 'plan', 'development_mode', 'ipv6', 'security_level', 'ssl_mode', 'always_use_https', 'status', 'updated_at', 'created_at']; $this->field_rules = $this->getModel()->getFieldRules($this->action, $this->fields); - $this->filter_fields = [$this->getModel()::PARENT, 'plan', 'development_mode', 'ipv6', 'security_level', 'ssl_mode']; + $this->filter_fields = [$this->getModel()::PARENT, 'plan', 'development_mode', 'ipv6', 'security_level', 'ssl_mode', 'always_use_https']; $this->field_options = $this->getFormFieldOptions($this->filter_fields); - $this->batchjob_fields = ['development_mode', 'ipv6', 'security_level', 'ssl_mode']; + $this->batchjob_fields = ['development_mode', 'ipv6', 'security_level', 'ssl_mode', 'always_use_https']; } //생성 public function create_form(): RedirectResponse|string diff --git a/app/Helpers/Cloudflare/ZoneHelper.php b/app/Helpers/Cloudflare/ZoneHelper.php index 0663a4f..493ff89 100644 --- a/app/Helpers/Cloudflare/ZoneHelper.php +++ b/app/Helpers/Cloudflare/ZoneHelper.php @@ -48,6 +48,7 @@ class ZoneHelper extends MVCHelper case "ipv6": case "security_level": case "ssl_mode": + case "always_use_https": case 'status': $form = form_dropdown($field, [ "" => lang($viewDatas['class_path'] . '.label.' . $field) . ' 선택', diff --git a/app/Language/en/Cloudflare/Zone.php b/app/Language/en/Cloudflare/Zone.php index 23bb660..b7cbacf 100644 --- a/app/Language/en/Cloudflare/Zone.php +++ b/app/Language/en/Cloudflare/Zone.php @@ -12,6 +12,7 @@ return [ 'ipv6' => "ipv6", 'security_level' => "공격방어", 'ssl_mode' => "SSL모드", + 'always_use_https' => "https사용", 'status' => "서비스", 'updated_at' => "수정일", 'created_at' => "작성일", @@ -27,9 +28,9 @@ return [ "off" => "사용않함", ], "PLAN" => [ - "Free Website" => "Free Website", - "Pro Website" => "Pro Website", - "Business Website" => "Business Website", + "Free Website" => "Free", + "Pro Website" => "Pro", + "Business Website" => "Business", ], "IPV6" => [ "on" => "사용", @@ -41,6 +42,10 @@ return [ "low" => "low", "essentially_off" => "essentially_off", ], + "ALWAYS_USE_HTTPS" => [ + "on" => "사용", + "off" => "사용않함", + ], "SSL_MODE" => [ "off" => "off", "flexible" => "flexible", diff --git a/app/Libraries/Cloudflare/Zone.php b/app/Libraries/Cloudflare/Zone.php index 191abc4..89474f7 100644 --- a/app/Libraries/Cloudflare/Zone.php +++ b/app/Libraries/Cloudflare/Zone.php @@ -11,7 +11,13 @@ class Zone extends Cloudflare { private $_model = null; private $_account_entity = null; - private $_setting_fields = ['development_mode' => 'off', 'ipv6' => 'off', 'security_level' => 'medium', 'ssl' => 'off']; + private $_setting_fields = [ + 'development_mode' => 'off', + 'ipv6' => 'off', + 'security_level' => 'medium', + 'ssl' => 'off', + 'always_use_https' => 'off' + ]; public function __construct(AccountEntity $account_entity) { $this->_account_entity = $account_entity; diff --git a/app/Models/Cloudflare/ZoneModel.php b/app/Models/Cloudflare/ZoneModel.php index a7fea98..c19fdf6 100644 --- a/app/Models/Cloudflare/ZoneModel.php +++ b/app/Models/Cloudflare/ZoneModel.php @@ -16,7 +16,7 @@ class ZoneModel extends CommonModel protected $primaryKey = self::PK; protected $useAutoIncrement = false; protected $returnType = ZoneEntity::class; //object,array,entity명::class - protected $allowedFields = [self::PK, self::PARENT, self::TITLE, 'name_servers', 'original_name_servers', 'plan', 'development_mode', 'ipv6', 'security_level', 'ssl_mode', 'status', 'updated_at', 'crated_at ']; + protected $allowedFields = [self::PK, self::PARENT, self::TITLE, 'name_servers', 'original_name_servers', 'plan', 'development_mode', 'ipv6', 'security_level', 'ssl_mode', 'always_use_https', 'status', 'updated_at', 'crated_at ']; protected $useTimestamps = true; public function __construct() { @@ -47,6 +47,7 @@ class ZoneModel extends CommonModel break; case "development_mode": case "ipv6": + case "always_use_https": $rule = "if_exist|in_list[on,off]"; break; case "status": diff --git a/app/Views/templates/admin/index_content_top.php b/app/Views/templates/admin/index_content_top.php index 7c74c48..7b3be07 100644 --- a/app/Views/templates/admin/index_content_top.php +++ b/app/Views/templates/admin/index_content_top.php @@ -1,8 +1,8 @@ - "get")) ?> + "get"], ['class' => 'd-flex']) ?>