diff --git a/app/Controllers/CommonController.php b/app/Controllers/CommonController.php index 65d4ee6..90c6af7 100644 --- a/app/Controllers/CommonController.php +++ b/app/Controllers/CommonController.php @@ -18,7 +18,6 @@ use App\Services\MyLogService; abstract class CommonController extends BaseController { private $_viewDatas = []; - abstract protected function getService(): mixed; public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger) { @@ -74,6 +73,7 @@ abstract class CommonController extends BaseController switch ($field) { default: $options[$field] = lang($this->getService()->getClassPath() . '.' . strtoupper($field)); + // dd($options); break; } return $options; @@ -86,6 +86,7 @@ abstract class CommonController extends BaseController } $options = $this->getFormFieldOption($field, $options); } + // dd($options); return $options; } // 생성 diff --git a/app/Filters/AuthFilter.php b/app/Filters/AuthFilter.php index b3835b3..0e70f1e 100644 --- a/app/Filters/AuthFilter.php +++ b/app/Filters/AuthFilter.php @@ -38,7 +38,7 @@ class AuthFilter implements FilterInterface // dd($auth->popPreviousUrl()); return redirect()->back()->with( 'error', - "회원[{$auth->getAuthInfo('name')}]님은 접속에 필요한 권한이 없습니다. " + "회원[{$auth->getNameByAuthInfo()}]님은 접속에 필요한 권한이 없습니다. " ); } } diff --git a/app/Helpers/Cloudflare/AccountHelper.php b/app/Helpers/Cloudflare/AccountHelper.php index e7e8a19..9c62fc0 100644 --- a/app/Helpers/Cloudflare/AccountHelper.php +++ b/app/Helpers/Cloudflare/AccountHelper.php @@ -2,10 +2,9 @@ namespace App\Helpers\Cloudflare; -use App\Helpers\MVCHelper; use App\Models\Cloudflare\AccountModel; -class AccountHelper extends MVCHelper +class AccountHelper extends CloudflareHelper { public $old_parent = ""; diff --git a/app/Helpers/Cloudflare/AuditLogHelper.php b/app/Helpers/Cloudflare/AuditLogHelper.php index 942f115..9384263 100644 --- a/app/Helpers/Cloudflare/AuditLogHelper.php +++ b/app/Helpers/Cloudflare/AuditLogHelper.php @@ -2,10 +2,10 @@ namespace App\Helpers\Cloudflare; -use App\Helpers\MVCHelper; +use App\Helpers\CommonHelper; use App\Models\Cloudflare\AuditLogModel; -class AuditLogHelper extends MVCHelper +class AuditLogHelper extends CloudflareHelper { public $old_parent = ""; public function __construct() diff --git a/app/Helpers/Cloudflare/AuthHelper.php b/app/Helpers/Cloudflare/AuthHelper.php index 4191472..b0f94d6 100644 --- a/app/Helpers/Cloudflare/AuthHelper.php +++ b/app/Helpers/Cloudflare/AuthHelper.php @@ -5,7 +5,7 @@ namespace App\Helpers\Cloudflare; use App\Helpers\MVCHelper; use App\Models\Cloudflare\AuthModel; -class AuthHelper extends MVCHelper +class AuthHelper extends CloudflareHelper { public function __construct() { diff --git a/app/Helpers/Cloudflare/CloudflareHelper.php b/app/Helpers/Cloudflare/CloudflareHelper.php new file mode 100644 index 0000000..df22971 --- /dev/null +++ b/app/Helpers/Cloudflare/CloudflareHelper.php @@ -0,0 +1,14 @@ +getAuthInfo('id'), explode(",", env("cloudflare.firewall.acl")))) { + if (in_array($viewDatas['myauth']->getIDByAuthInfo('id'), explode(",", env("cloudflare.firewall.acl")))) { $firewall_reload = anchor( base_url() . $viewDatas['uri_path'] . 'firewall/reload/' . $viewDatas['entity']->getPK(), ICONS["RELOAD"], diff --git a/app/Services/Auth/AuthService.php b/app/Services/Auth/AuthService.php index efc7cb8..013ef56 100644 --- a/app/Services/Auth/AuthService.php +++ b/app/Services/Auth/AuthService.php @@ -69,7 +69,7 @@ class AuthService extends CommonService final public function isAccessRole(array $roles): bool { - $role = $this->getAuthInfo(key: 'role'); + $role = $this->getRoleByAuthInfo(); if ($role === "") { return false; } diff --git a/app/Services/Cloudflare/AccountService.php b/app/Services/Cloudflare/AccountService.php index 47dfd3b..de40ac9 100644 --- a/app/Services/Cloudflare/AccountService.php +++ b/app/Services/Cloudflare/AccountService.php @@ -14,7 +14,7 @@ class AccountService extends CloudflareService public function __construct() { - parent::__construct("Account"); + parent::__construct("Account", "Account"); } private function getParentEntity(): AuthEntity diff --git a/app/Services/Cloudflare/AuditLogService.php b/app/Services/Cloudflare/AuditLogService.php index 9cd3a95..1683cc8 100644 --- a/app/Services/Cloudflare/AuditLogService.php +++ b/app/Services/Cloudflare/AuditLogService.php @@ -15,7 +15,7 @@ class AuditLogService extends CloudflareService public function __construct() { - parent::__construct("AuditLog"); + parent::__construct("AuditLog", "AuditLog"); } public function getModel(): AuditLogModel diff --git a/app/Services/Cloudflare/AuthService.php b/app/Services/Cloudflare/AuthService.php index ba44625..4206e16 100644 --- a/app/Services/Cloudflare/AuthService.php +++ b/app/Services/Cloudflare/AuthService.php @@ -11,7 +11,7 @@ class AuthService extends CloudflareService public function __construct() { - parent::__construct("Auth"); + parent::__construct("Auth", "Auth"); } public function getModel(): AuthModel diff --git a/app/Services/Cloudflare/CloudflareService.php b/app/Services/Cloudflare/CloudflareService.php index 2882772..4d8ddc9 100644 --- a/app/Services/Cloudflare/CloudflareService.php +++ b/app/Services/Cloudflare/CloudflareService.php @@ -13,7 +13,7 @@ abstract class CloudflareService extends CommonService private array $_mySockets = []; private ?AuthEntity $_auth_entity = null; private ?AuthModel $_authModel = null; - protected function __construct(string $class_name, string $class_path = "") + protected function __construct(string $class_name, string $class_path) { parent::__construct($class_name, "Cloudflare/" . $class_path); } diff --git a/app/Services/Cloudflare/FirewallService.php b/app/Services/Cloudflare/FirewallService.php index ba6147c..bf8bda8 100644 --- a/app/Services/Cloudflare/FirewallService.php +++ b/app/Services/Cloudflare/FirewallService.php @@ -16,7 +16,7 @@ class FirewallService extends CloudflareService public function __construct() { - parent::__construct("Firewall"); + parent::__construct("Firewall", "Firewall"); } private function getParentEntity(): ZoneEntity diff --git a/app/Services/Cloudflare/RecordService.php b/app/Services/Cloudflare/RecordService.php index 7b2b6b9..19d2b7c 100644 --- a/app/Services/Cloudflare/RecordService.php +++ b/app/Services/Cloudflare/RecordService.php @@ -16,7 +16,7 @@ class RecordService extends CloudflareService public function __construct() { - parent::__construct("Record"); + parent::__construct("Record", "Record"); } private function getParentEntity(): ZoneEntity diff --git a/app/Services/Cloudflare/ZoneService.php b/app/Services/Cloudflare/ZoneService.php index af1bdca..182c04f 100644 --- a/app/Services/Cloudflare/ZoneService.php +++ b/app/Services/Cloudflare/ZoneService.php @@ -21,7 +21,7 @@ class ZoneService extends CloudflareService public function __construct() { - parent::__construct("Zone"); + parent::__construct("Zone", class_path: "Zone"); } private function getParentEntity(): AccountEntity diff --git a/app/Services/CommonService.php b/app/Services/CommonService.php index 15dd03d..82445b1 100644 --- a/app/Services/CommonService.php +++ b/app/Services/CommonService.php @@ -7,10 +7,11 @@ abstract class CommonService private $_serviceDatas = []; private $class_name = ""; private $class_path = ""; - public function __construct(string $class_name, string $class_path = "") + public function __construct(string $class_name, string $class_path) { $this->class_name = $class_name; - $this->class_path = $class_path ? $class_path : $this->class_name; + $this->class_path = $class_path; + // dd($this->class_name, $this->class_path); } abstract public function getModel(): mixed; diff --git a/app/Services/MapurlService.php b/app/Services/MapurlService.php index e3d5ee2..4e2e78d 100644 --- a/app/Services/MapurlService.php +++ b/app/Services/MapurlService.php @@ -10,7 +10,7 @@ class MapurlService extends CommonService private ?MapurlModel $_model = null; public function __construct() { - parent::__construct("Mapurl"); + parent::__construct("Mapurl", "Mapurl"); } public function getModel(): MapurlModel { diff --git a/app/Services/UserSNSService.php b/app/Services/UserSNSService.php index ace0f97..5b1d238 100644 --- a/app/Services/UserSNSService.php +++ b/app/Services/UserSNSService.php @@ -10,7 +10,7 @@ class UserSNSService extends CommonService private ?UserSNSModel $_model = null; public function __construct() { - parent::__construct("UserSNS"); + parent::__construct("UserSNS", "UserSNS"); } public function getModel(): UserSNSModel { diff --git a/app/Services/UserService.php b/app/Services/UserService.php index 06944f7..5a920ab 100644 --- a/app/Services/UserService.php +++ b/app/Services/UserService.php @@ -10,7 +10,7 @@ class UserService extends CommonService private ?UserModel $_model = null; public function __construct() { - parent::__construct("User"); + parent::__construct("User", "User"); } public function getModel(): UserModel { diff --git a/app/Views/layouts/front/top.php b/app/Views/layouts/front/top.php index 546aed8..3498bcf 100644 --- a/app/Views/layouts/front/top.php +++ b/app/Views/layouts/front/top.php @@ -14,7 +14,7 @@