diff --git a/app/Controllers/MVController.php b/app/Controllers/MVController.php index 83fcb66..a9ed62e 100644 --- a/app/Controllers/MVController.php +++ b/app/Controllers/MVController.php @@ -89,9 +89,7 @@ abstract class MVController extends CommonController )); } } - protected function create_form_process(): void - { - } + protected function create_form_process(): void {} final protected function create_form_procedure(): RedirectResponse|string { try { @@ -190,7 +188,7 @@ abstract class MVController extends CommonController try { helper(['form']); $this->modify_process($uid); - $this->message = "{$this->class_name} : 수정작업이 완료되었습니다."; + $this->message = "{$this->class_name} : 생성작업이 완료되었습니다."; $this->getModel()->transCommit(); log_message("notice", __FUNCTION__ . $this->message); return view( @@ -214,10 +212,10 @@ abstract class MVController extends CommonController try { //변경할 UIDS $uids = $this->request->getVar('batchjob_uids'); - if ($uids === null || !is_array($uids) || count($uids) === 0) { + if (!$uids) { throw new \Exception("적용할 리스트를 선택하셔야합니다."); } - foreach ($uids as $uid) { + foreach (explode(",", $uids) as $uid) { $this->modify_process($uid); } $this->message = "{$this->class_name} : 일괄처리작업이 완료되었습니다."; @@ -351,7 +349,7 @@ abstract class MVController extends CommonController $this->order_value = $this->request->getVar('order_value') ?: DEFAULTS['EMPTY']; $this->getModel()->setList_OrderBy( $this->order_field !== DEFAULTS['EMPTY'] && - $this->order_value !== DEFAULTS['EMPTY'] ? "{$this->order_field} {$this->order_value}" : "" + $this->order_value !== DEFAULTS['EMPTY'] ? "{$this->order_field} {$this->order_value}" : "" ); if ($this->page) { $this->getModel()->limit( diff --git a/app/Helpers/Cloudflare/AccountHelper.php b/app/Helpers/Cloudflare/AccountHelper.php index 95dda56..d36ddea 100644 --- a/app/Helpers/Cloudflare/AccountHelper.php +++ b/app/Helpers/Cloudflare/AccountHelper.php @@ -17,19 +17,14 @@ class AccountHelper extends CommonHelper $value = $value ?: DEFAULTS['EMPTY']; switch ($field) { case AccountModel::PARENT: - $extraClass = isset($extras['class']) ? $extras['class'] . ' select-field' : 'select-field'; + $extra_class = isset($extras['class']) ? $extras['class'] . ' select-field' : 'select-field'; $form = form_dropdown($field, [ "" => lang($viewDatas['class_path'] . '.label.' . $field) . ' 선택', ...$viewDatas['field_options'][$field] - ], isset($viewDatas[$field]) ? $viewDatas[$field] : $value, ['class' => $extraClass, ...array_diff_key($extras, ['class' => ''])]); + ], isset($viewDatas[$field]) ? $viewDatas[$field] : $value, ['class' => $extra_class, ...array_diff_key($extras, ['class' => ''])]); break; case AccountModel::TITLE: - $form = form_input($field, $value, [ - "placeholder" => "예)test@exmaple.com", - "style" => - "width:100%; ::placeholder{color:silver; opacity: 1;}", - ...$extras - ]); + $form = form_input($field, $value, ["placeholder" => "예)test@exmaple.com", ...$extras]); break; case 'type': $form = form_dropdown($field, [ diff --git a/app/Helpers/Cloudflare/AuthHelper.php b/app/Helpers/Cloudflare/AuthHelper.php index 00f1a77..be804f0 100644 --- a/app/Helpers/Cloudflare/AuthHelper.php +++ b/app/Helpers/Cloudflare/AuthHelper.php @@ -16,11 +16,7 @@ class AuthHelper extends CommonHelper $value = $value ?: DEFAULTS['EMPTY']; switch ($field) { case AuthModel::TITLE: - $form = form_input($field, $value, [ - "placeholder" => "예)test@example.com", - "style" => "width:100%; ::placeholder{color:silver; opacity: 1;}", - ...$extras - ]); + $form = form_input($field, $value, ["placeholder" => "예)test@example.com", ...$extras]); break; default: $form = parent::getFieldForm($field, $value, $viewDatas, $extras); diff --git a/app/Helpers/Cloudflare/RecordHelper.php b/app/Helpers/Cloudflare/RecordHelper.php index faee2cc..dbf7cb4 100644 --- a/app/Helpers/Cloudflare/RecordHelper.php +++ b/app/Helpers/Cloudflare/RecordHelper.php @@ -17,19 +17,14 @@ class RecordHelper extends CommonHelper $value = $value ?: DEFAULTS['EMPTY']; switch ($field) { case RecordModel::PARENT: - $extraClass = isset($extras['class']) ? $extras['class'] . ' select-field' : 'select-field'; + $extra_class = isset($extras['class']) ? $extras['class'] . ' select-field' : 'select-field'; $form = form_dropdown($field, [ "" => lang($viewDatas['class_path'] . '.label.' . $field) . ' 선택', ...$viewDatas['field_options'][$field] - ], isset($viewDatas[$field]) ? $viewDatas[$field] : $value, ['class' => $extraClass, ...array_diff_key($extras, ['class' => ''])]); + ], isset($viewDatas[$field]) ? $viewDatas[$field] : $value, ['class' => $extra_class, ...array_diff_key($extras, ['class' => ''])]); break; case RecordModel::TITLE: //host - $form = form_input($field, $value, [ - "placeholder" => "예)www.example.com", - "style" => - "width:200px; ::placeholder{color:silver; opacity: 1;}", - ...$extras - ]); + $form = form_input($field, $value, $extras); break; case 'hosts': $form = form_textarea($field, html_entity_decode($value), [ @@ -38,12 +33,7 @@ class RecordHelper extends CommonHelper ]); break; case 'content': - $form = form_input($field, $value, [ - "placeholder" => "예)123.123.123.123", - "style" => - "width:200px; ::placeholder{color:silver; opacity: 1;}", - ...$extras - ]); + $form = form_input($field, $value, ["placeholder" => "예)123.123.123.123", ...$extras]); break; case "type": case "fixed": diff --git a/app/Helpers/Cloudflare/ZoneHelper.php b/app/Helpers/Cloudflare/ZoneHelper.php index 1c3d148..6c93759 100644 --- a/app/Helpers/Cloudflare/ZoneHelper.php +++ b/app/Helpers/Cloudflare/ZoneHelper.php @@ -17,19 +17,14 @@ class ZoneHelper extends CommonHelper $value = $value ?: DEFAULTS['EMPTY']; switch ($field) { case ZoneModel::PARENT: - $extraClass = isset($extras['class']) ? $extras['class'] . ' select-field' : 'select-field'; + $extra_class = isset($extras['class']) ? $extras['class'] . ' select-field' : 'select-field'; $form = form_dropdown($field, [ "" => lang($viewDatas['class_path'] . '.label.' . $field) . ' 선택', ...$viewDatas['field_options'][$field] - ], isset($viewDatas[$field]) ? $viewDatas[$field] : $value, ['class' => $extraClass, ...array_diff_key($extras, ['class' => ''])]); + ], isset($viewDatas[$field]) ? $viewDatas[$field] : $value, ['class' => $extra_class, ...array_diff_key($extras, ['class' => ''])]); break; case ZoneModel::TITLE: - $form = form_input($field, $value, [ - "placeholder" => "예)exmaple.com", - "style" => - "width:100%; ::placeholder{color:silver; opacity: 1;}", - ...$extras - ]); + $form = form_input($field, $value, ["placeholder" => "예)exampel.com", ...$extras]); break; case 'domains': $form = form_textarea($field, $value, ['rows' => '5', ...$extras]); @@ -41,12 +36,7 @@ class ZoneHelper extends CommonHelper ]); break; case 'content': - $form = form_input($field, $value, [ - "placeholder" => "예)123.123.123.123", - "style" => - "width:200px; ::placeholder{color:silver; opacity: 1;}", - ...$extras - ]); + $form = form_input($field, $value, ["placeholder" => "예)123.123.123.123", ...$extras]); break; case "development_mode": case "ipv6": diff --git a/app/Helpers/CommonHelper.php b/app/Helpers/CommonHelper.php index 35e533b..19cb17a 100644 --- a/app/Helpers/CommonHelper.php +++ b/app/Helpers/CommonHelper.php @@ -4,9 +4,7 @@ namespace App\Helpers; abstract class CommonHelper { - protected function __construct() - { - } + protected function __construct() {} final public function getRandomString($length = 10, $characters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789") { return substr(str_shuffle($characters), 0, $length); @@ -156,10 +154,11 @@ abstract class CommonHelper break; case 'updated_at': case 'created_at': - $form = form_input($field, $value, ["class" => "calender", ...$extras]); + $extra_class = isset($extras['class']) ? $extras['class'] . ' calender' : 'calender'; + $form = form_input($field, $value, ['class' => $extra_class, ...array_diff_key($extras, ['class' => ''])]); break; default: - $form = form_input($field, $value, $extras); + $form = form_input($field, $value, ["autocomplete" => $field, ...$extras]); break; } return $form; diff --git a/app/Helpers/MapurlHelper.php b/app/Helpers/MapurlHelper.php index f2bf327..2a8785e 100644 --- a/app/Helpers/MapurlHelper.php +++ b/app/Helpers/MapurlHelper.php @@ -15,21 +15,10 @@ class MapurlHelper extends CommonHelper $value = $value ?: DEFAULTS['EMPTY']; switch ($field) { case MapurlModel::TITLE: - $form = form_input($field, $value, [ - "placeholder" => "예)http://old.example.com", - "style" => "width:100%; ::placeholder{color:silver; opacity: 1;}", - "class" => "form-control", - "required" => "" - ]); + $form = form_input($field, $value, ["placeholder" => "예)http://old.example.com", ...$extras]); break; case 'newurl': - $form = form_input($field, $value, [ - "placeholder" => "예)https://new.example.com", - "style" => - "width:100%; ::placeholder{color:silver; opacity: 1;}", - "class" => "form-control", - "required" => "" - ]); + $form = form_input($field, $value, ["placeholder" => "예)http://new.example.com", ...$extras]); break; default: $form = parent::getFieldForm($field, $value, $viewDatas, $extras); diff --git a/app/Helpers/UserHelper.php b/app/Helpers/UserHelper.php index 2c02401..51343e1 100644 --- a/app/Helpers/UserHelper.php +++ b/app/Helpers/UserHelper.php @@ -16,39 +16,28 @@ class UserHelper extends CommonHelper switch ($field) { case 'id': case UserModel::TITLE: - $form = form_input($field, $value, [ - "placeholder" => "예)", - "style" => "width:100%; ::placeholder{color:silver; opacity: 1;}", - ...$extras - ]); + $form = form_input($field, $value, $extras); break; case 'passwd': case 'confirmpassword': - $form = form_password($field, "", [ - "style" => "width:100%;", - ...$extras - ]); + $form = form_password($field, "", ["autocomplete" => $field, ...$extras]); break; case 'email': - $form = form_input($field, $value, [ - "placeholder" => "예)test@example.com", - "style" => "width:100%; ::placeholder{color:silver; opacity: 1;}", - ...$extras - ]); + $form = form_input($field, $value, ["placeholder" => "예)test@example.com", ...$extras]); break; case 'mobile': - $form = form_input($field, $value, [ - "placeholder" => "예)010-0010-0010", - "style" => "width:100%; ::placeholder{color:silver; opacity: 1;}", - ...$extras - ]); + $form = form_input($field, $value, ["placeholder" => "예)010-0010-0010", ...$extras]); break; case 'role': if (in_array($viewDatas['action'], ['create', 'modify'])) { $forms = []; foreach ($viewDatas['field_options'][$field] as $key => $label) { $values = is_array($value) ? $value : explode(DEFAULTS["DELIMITER_ROLE"], $value); - $forms[] = form_checkbox($field . "[]", $key, in_array($key, $values)) . $label; + $forms[] = form_checkbox( + "{$field}[]", + $key, + in_array($key, $values) + ) . $label; } $form = implode(" ", $forms); } else { diff --git a/app/Views/admin/create.php b/app/Views/admin/create.php index f41de2e..9ae9eff 100644 --- a/app/Views/admin/create.php +++ b/app/Views/admin/create.php @@ -11,7 +11,7 @@ getFieldLabel($field, $viewDatas) ?> 'form-control']; + $extras = ["class" => "form-control"]; if (strpos($viewDatas['field_rules'][$field], 'required') !== false) { $extras = ["required" => "", ...$extras]; } diff --git a/app/Views/admin/index.php b/app/Views/admin/index.php index 8d2bd40..9c043f5 100644 --- a/app/Views/admin/index.php +++ b/app/Views/admin/index.php @@ -10,7 +10,6 @@
include("templates/{$viewDatas['layout']}/index_content_top"); ?> - 'batchjob_form', 'method' => "post"]) ?> @@ -42,10 +41,9 @@
include("templates/{$viewDatas['layout']}/index_content_batchjob"); ?> -
-
include("templates/{$viewDatas['layout']}/modal_form"); ?>
+
include("templates/common/modal_iframe"); ?>
diff --git a/app/Views/admin/modify.php b/app/Views/admin/modify.php index 39466d9..18f05b1 100644 --- a/app/Views/admin/modify.php +++ b/app/Views/admin/modify.php @@ -2,7 +2,7 @@ section('content') ?>
- + 'action_form', ...$viewDatas['forms']['attributes']], $viewDatas['forms']['hiddens']) ?>
@@ -24,7 +24,7 @@
- "btn btn-outline btn-primary")); ?> + "btn btn-outline btn-primary"]) ?>
diff --git a/app/Views/templates/admin/index_content_batchjob.php b/app/Views/templates/admin/index_content_batchjob.php index 6dd30e1..f363f4a 100644 --- a/app/Views/templates/admin/index_content_batchjob.php +++ b/app/Views/templates/admin/index_content_batchjob.php @@ -1,4 +1,6 @@
+ 'batchjob_form', 'method' => "post"]) ?> + +
\ No newline at end of file diff --git a/app/Views/templates/admin/index_header.php b/app/Views/templates/admin/index_header.php index 8d400a8..e4989ca 100644 --- a/app/Views/templates/admin/index_header.php +++ b/app/Views/templates/admin/index_header.php @@ -6,84 +6,8 @@ - + include("templates/{$viewDatas['layout']}/index_header/dns"); ?>
\ No newline at end of file diff --git a/app/Views/templates/admin/index_header/dns.php b/app/Views/templates/admin/index_header/dns.php new file mode 100644 index 0000000..8432b80 --- /dev/null +++ b/app/Views/templates/admin/index_header/dns.php @@ -0,0 +1,79 @@ + \ No newline at end of file diff --git a/app/Views/templates/admin/modal_form.php b/app/Views/templates/common/modal_iframe.php similarity index 80% rename from app/Views/templates/admin/modal_form.php rename to app/Views/templates/common/modal_iframe.php index 4b797db..503e7dc 100644 --- a/app/Views/templates/admin/modal_form.php +++ b/app/Views/templates/common/modal_iframe.php @@ -1,20 +1,20 @@ -