diff --git a/app/Controllers/CLI/Cloudflare.php b/app/Controllers/CLI/Cloudflare.php index 4d5a634..2d2e5ce 100644 --- a/app/Controllers/CLI/Cloudflare.php +++ b/app/Controllers/CLI/Cloudflare.php @@ -6,9 +6,10 @@ use App\Controllers\BaseController; use App\Entities\Cloudflare\AccountEntity; use App\Entities\Cloudflare\AuthEntity; use App\Entities\Cloudflare\ZoneEntity; -use App\Libraries\Cloudflare\Account; -use App\Libraries\Cloudflare\Record; -use App\Libraries\Cloudflare\Zone; +use App\Services\Cloudflare\Account; +use App\Services\Cloudflare\Zone; +use App\Services\Cloudflare\Record; +use App\Services\Cloudflare\Firewall; use App\Models\Cloudflare\AuthModel; use CodeIgniter\HTTP\RequestInterface; use CodeIgniter\HTTP\ResponseInterface; @@ -49,6 +50,11 @@ class Cloudflare extends BaseController $record = new Record($zone_entity); return $record->reload(); } + private function firewall_process(ZoneEntity $zone_entity): array + { + $firewall = new Firewall($zone_entity); + return $firewall->reload(); + } public function reload(mixed $uid = false): void { //Transaction Start @@ -66,6 +72,9 @@ class Cloudflare extends BaseController foreach ($zones as $key => $zone) { $this->record_process($zone); } + foreach ($zones as $key => $zone) { + $this->firewall_process($zone); + } log_message("notice", "Reload 작업을 완료하였습니다."); // $this->_db->transCommit(); } catch (\Exception $e) { @@ -74,8 +83,8 @@ class Cloudflare extends BaseController log_message( "error", "Reload 작업을 실패하였습니다.\n--------------\n" . - $e->getMessage() . - "\n--------------\n" + $e->getMessage() . + "\n--------------\n" ); } } diff --git a/app/Helpers/Cloudflare/ZoneHelper.php b/app/Helpers/Cloudflare/ZoneHelper.php index b8065f0..cea74f9 100644 --- a/app/Helpers/Cloudflare/ZoneHelper.php +++ b/app/Helpers/Cloudflare/ZoneHelper.php @@ -127,7 +127,7 @@ class ZoneHelper extends MVCHelper "
%s%s
%s
", $record, parent::getFieldView($field, $viewDatas, ['class' => "label_zones", ...$extras]), - (in_array($viewDatas['myauth']->getAuthInfo('id'), ['choi.jh', 'kim.yh'])) ? $firewall : "" + (in_array($viewDatas['myauth']->getAuthInfo('id'), explode(",", env("cloudflare.firewall.acl")))) ? $firewall : "" ); break; case 'name_servers': diff --git a/app/Views/layouts/admin/left_menu/cloudflare.php b/app/Views/layouts/admin/left_menu/cloudflare.php index e24a415..a836849 100644 --- a/app/Views/layouts/admin/left_menu/cloudflare.php +++ b/app/Views/layouts/admin/left_menu/cloudflare.php @@ -17,7 +17,7 @@
Record
- getAuthInfo('id'), ['choi.jh', 'kim.yh'])): ?> + getAuthInfo('id'), explode(",", env("cloudflare.firewall.acl")))): ?>
Firewall