diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 4430dd8..9fca826 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -53,14 +53,6 @@ $routes->group('admin', ['namespace' => 'App\Controllers\Admin', 'filter' => 'au $routes->post('batchjob_delete', 'UserController::batchjob_delete'); $routes->get('download/(:alpha)', 'UserController::download/$1'); }); - $routes->group('usersns', ['namespace' => 'App\Controllers\Admin', 'filter' => 'authFilter:master'], function ($routes) { - $routes->get('/', 'UserSNSController::index'); - $routes->get('delete/(:num)', 'UserSNSController::delete/$1'); - $routes->get('toggle/(:num)/(:any)', 'UserSNSController::toggle/$1/$2'); - $routes->post('batchjob', 'UserSNSController::batchjob'); - $routes->post('batchjob_delete', 'UserSNSController::batchjob_delete'); - $routes->get('download/(:alpha)', 'UserSNSController::download/$1'); - }); $routes->group('mapurl', ['namespace' => 'App\Controllers\Admin'], function ($routes) { $routes->get('/', 'MapurlController::index'); $routes->get('create', 'MapurlController::create_form'); diff --git a/app/Controllers/Admin/UserSNSController.php b/app/Controllers/Admin/UserSNSController.php deleted file mode 100644 index 56a93ac..0000000 --- a/app/Controllers/Admin/UserSNSController.php +++ /dev/null @@ -1,62 +0,0 @@ -title = lang("{$this->getService()->getClassPath()}.title"); - $this->helper = new UserSNSHelper(); - } - protected function getService(): UserSNSService - { - if ($this->service === null) { - $this->service = new UserSNSService(); - $this->class_name = $this->service->getClassName(); - $this->class_path = $this->service->getClassPath(); - } - return $this->service; - } - protected function getFormFieldOption(string $field, array $options = []): array - { - switch ($field) { - case $this->getService()->getModel()::PARENT: - $userModel = model(UserModel::class); - // $this->getUserModel()->where('status', DEFAULTS['STATUS']); - $options[$field] = $userModel->getFormFieldOption($field); - // echo $this->getUserModel()->getLastQuery(); - // dd($options); - break; - default: - $options = parent::getFormFieldOption($field, $options); - break; - } - return $options; - } - - //생성 - protected function create_init(string $action, $fields = []): void - { - $fields = [ - 'fields' => [$this->getService()->getModel()::PARENT, 'site', 'id', $this->getService()->getModel()::TITLE, 'email'], - ]; - parent::create_init($action, fields: $fields); - } - //수정 - protected function modify_init(string $action, $fields = []): void - { - $fields = [ - 'fields' => [$this->getService()->getModel()::PARENT, 'site', 'id', $this->getService()->getModel()::TITLE, 'email', 'status'], - ]; - parent::modify_init($action, $fields); - } -} diff --git a/app/Entities/UserSNSEntity.php b/app/Entities/UserSNSEntity.php deleted file mode 100644 index 69f99ba..0000000 --- a/app/Entities/UserSNSEntity.php +++ /dev/null @@ -1,43 +0,0 @@ -getPK()}|{$this->getID()}|{$this->getTitle()}"; - } - public function getPK(): int - { - return $this->attributes[UserSNSModel::PK]; - } - public function getTitle(): string - { - return $this->attributes[UserSNSModel::TITLE]; - } - public function setTitle(string $title): void - { - $this->attributes[UserSNSModel::TITLE] = $title; - } - //Common Function - public function getParent(): int|null - { - return $this->attributes[UserSNSModel::PARENT]; - } - public function getID(): string - { - return $this->attributes['id']; - } - public function getSite(): string - { - return $this->attributes['site']; - } - public function getEmail(): string - { - return $this->attributes['email']; - } -} diff --git a/app/Helpers/UserSNSHelper.php b/app/Helpers/UserSNSHelper.php deleted file mode 100644 index a9d3ba4..0000000 --- a/app/Helpers/UserSNSHelper.php +++ /dev/null @@ -1,92 +0,0 @@ - "form-control", "required" => "", ...$extras] : ["class" => "form-control", ...$extras]; - } - $value = $value ?: DEFAULTS['EMPTY']; - switch ($field) { - case UserSNSModel::PARENT: - $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], $value, ['class' => $extra_class, ...array_diff_key($extras, ['class' => ''])]); - break; - case 'id': - case UserSNSModel::TITLE: - $form = form_input($field, $value, $extras); - break; - case 'email': - $form = form_input($field, $value, ["placeholder" => "예)test@example.com", ...$extras]); - break; - case 'detail': - $form = form_textarea($field, $value == DEFAULTS['EMPTY'] ? "@\n*\nm\nwww" : $value, [ - 'rows' => '20', - ...$extras - ]); - break; - default: - $form = parent::getFieldForm($field, $value, $viewDatas, $extras); - break; - } - return $form; - } // - public function getFieldView(string $field, array $viewDatas, array $extras = []): string - { - $value = $viewDatas['entity']->$field ?: DEFAULTS['EMPTY']; - switch ($field) { - case UserSNSModel::TITLE: - $value = form_label( - $value, - 'view', - [ - "data-src" => current_url() . '/view/' . $viewDatas['entity']->getPK(), - "data-bs-toggle" => "modal", - "data-bs-target" => "#index_action_form", - "style" => "color: blue; cursor: pointer; font-weight:bold;", - ...$extras, - ] - ); - break; - default: - $value = parent::getFieldView($field, $viewDatas, $extras); - break; - } - return $value; - } // - public function getListButton(string $action, array $viewDatas, array $extras = []): string - { - switch ($action) { - case 'create': - $action = ""; - break; - case 'modify': - $action = $viewDatas['cnt']; - break; - case 'delete': - $action = ""; - break; - case 'batchjob': - $action = ""; - break; - case 'batchjob_delete': - $action = ""; - break; - default: - $action = parent::getListButton($action, $viewDatas, $extras); - break; - } - return $action; - } -} diff --git a/app/Language/en/UserSNS.php b/app/Language/en/UserSNS.php deleted file mode 100644 index 3b7ff48..0000000 --- a/app/Language/en/UserSNS.php +++ /dev/null @@ -1,20 +0,0 @@ - "SNS 계정정보", - 'label' => [ - 'uid' => "번호", - 'user_uid' => "local계정", - 'site' => "사이트", - 'id' => "계정", - 'name' => "이름", - 'email' => "메일", - 'detail' => "상세정보", - 'status' => "상태", - 'updated_at' => "수정일", - 'created_at' => "작성일", - ], - "STATUS" => [ - "use" => "사용", - "unuse" => "승인대기", - ], -]; diff --git a/app/Models/UserSNSModel.php b/app/Models/UserSNSModel.php deleted file mode 100644 index d44d8eb..0000000 --- a/app/Models/UserSNSModel.php +++ /dev/null @@ -1,110 +0,0 @@ -table}.{$field}]"; - break; - case $this->getTitleField(): - $rule = "required|trim|string"; - break; - case "site": - $rule = "required|trim|string"; - break; - case "email": - $rule = "required|trim|valid_email"; - break; - case "detail": - $rule = "required|trim|string"; - break; - default: - $rule = parent::getFieldRule($action, $field); - break; - } - return $rule; - } - protected function convertEntityData(string $field, array $formDatas): mixed - { - switch ($field) { - case "detail": //content등 textarea를 사용한 Field - $value = htmlentities($formDatas[$field], ENT_QUOTES); - break; - default: - $value = parent::convertEntityData($field, $formDatas); - break; - } - return $value; - } - public function getEntityByPK(string $uid): null|UserSNSEntity - { - $this->where($this->getPKField(), intval($uid)); - return $this->getEntity(); - } - public function getEntityByID(string $id): null|UserSNSEntity - { - $this->where('id', $id); - return $this->getEntity(); - } - //create용 - public function create(array $formDatas = []): UserSNSEntity - { - return $this->create_process(new UserSNSEntity(), $formDatas); - } - //modify용 - public function modify(UserSNSEntity $entity, array $formDatas): UserSNSEntity - { - return $this->modify_process($entity, $formDatas); - } - //List 검색용 - public function setList_WordFilter(string $word): void - { - $this->orLike(self::TABLE . '.id', $word, 'both'); - $this->orLike(self::TABLE . "." . self::TITLE, $word, 'both'); - $this->orLike(self::TABLE . '.email', $word, 'both'); - } -} diff --git a/app/Services/Cloudflare/ZoneService.php b/app/Services/Cloudflare/ZoneService.php index 5ca1782..061e803 100644 --- a/app/Services/Cloudflare/ZoneService.php +++ b/app/Services/Cloudflare/ZoneService.php @@ -18,7 +18,7 @@ class ZoneService extends CloudflareService 'ipv6' => 'off', 'security_level' => 'medium', 'ssl' => 'flexible', - 'always_use_https' => 'off' + // 'always_use_https' => 'off' ]; public function __construct() diff --git a/app/Services/UserSNSService.php b/app/Services/UserSNSService.php deleted file mode 100644 index d95b2e2..0000000 --- a/app/Services/UserSNSService.php +++ /dev/null @@ -1,43 +0,0 @@ -getClassName(); - } - public function getModel(): UserSNSModel - { - if ($this->_model === null) { - $this->_model = new UserSNSModel(); - } - return $this->_model; - } - public function create(array $formDatas): UserSNSEntity - { - return $this->getModel()->create($formDatas); - } - public function modify(UserSNSEntity $entity, array $formDatas): UserSNSEntity - { - return $this->getModel()->modify($entity, $formDatas); - } - public function delete(UserSNSEntity $entity): void - { - $this->getModel()->delete($entity->getPK()); - } -} diff --git a/app/Views/layouts/admin/left_menu/base.php b/app/Views/layouts/admin/left_menu/base.php index b895b2a..b96190c 100644 --- a/app/Views/layouts/admin/left_menu/base.php +++ b/app/Views/layouts/admin/left_menu/base.php @@ -1,9 +1,6 @@
계정 관리
-
- SNS 계정 관리 -
Log 관리