From b7aafbe07dded4b8b91250caa8d35af1c9c8d8af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0git=20config=20git=20config=20-?= =?UTF-8?q?-helpgit=20config=20--global=20user=2Ename=20=EC=B5=9C=EC=A4=80?= =?UTF-8?q?=ED=9D=A0?= Date: Sun, 6 Aug 2023 13:42:18 +0900 Subject: [PATCH] shoppingmallv2 init... --- app/Config/Routes.php | 16 ++++++++-------- app/Controllers/Front/FrontController.php | 6 ++++++ app/Models/UserModel.php | 4 ++-- app/Views/layouts/front.php | 16 +++++++++++----- 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index bf4af24..5bcea36 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -46,7 +46,7 @@ $routes->group('ecommerce', ['namespace' => 'App\Controllers'], function ($route $routes->get('cancelCart', 'EcommerceController::cancelCart'); }); // authGuard는 App\Config\Filters.php의 $aliases에 선언한 이름이어야 함 -$routes->group('admin', ['namespace' => 'App\Controllers\Admin', 'filter' => 'authFilter:master,director,cloudflare,manager'], static function ($routes) { +$routes->group('admin', ['namespace' => 'App\Controllers\Admin', 'filter' => 'authFilter:manager'], static function ($routes) { $routes->get('/', 'Home::index'); $routes->group('user', static function ($routes) { $routes->get('', 'UserController::index'); @@ -57,16 +57,16 @@ $routes->group('admin', ['namespace' => 'App\Controllers\Admin', 'filter' => 'au $routes->post('update/(:uuid)', 'UserController::update/$1'); $routes->get('view/(:uuid)', 'UserController::view/$1'); $routes->get('delete/(:uuid)', 'UserController::delete/$1', ['filter' => 'authFilter:master']); - $routes->get('toggle/(:uuid)/(:hash)', 'UserController::toggle/$1/$2'); - $routes->post('batchjob', 'UserController::batchjob'); + $routes->get('toggle/(:uuid)/(:hash)', 'UserController::toggle/$1/$2', ['filter' => 'authFilter:master']); + $routes->post('batchjob', 'UserController::batchjob', ['filter' => 'authFilter:master']); }); $routes->group('usersns', static function ($routes) { $routes->get('', 'UserSNSController::index'); $routes->get('excel', 'UserSNSController::excel'); $routes->get('view/(:num)', 'UserSNSController::view/$1'); - $routes->get('delete/(:num)', 'UserSNSController::delete/$1'); - $routes->get('toggle/(:num)/(:hash)', 'UserSNSController::toggle/$1/$2'); - $routes->post('batchjob', 'UserSNSController::batchjob'); + $routes->get('delete/(:num)', 'UserSNSController::delete/$1', ['filter' => 'authFilter:master']); + $routes->get('toggle/(:num)/(:hash)', 'UserSNSController::toggle/$1/$2', ['filter' => 'authFilter:master']); + $routes->post('batchjob', 'UserSNSController::batchjob', ['filter' => 'authFilter:master']); }); $routes->group('category', static function ($routes) { $routes->get('', 'CategoryController::index'); @@ -119,7 +119,7 @@ $routes->group('admin', ['namespace' => 'App\Controllers\Admin', 'filter' => 'au }); }); $routes->group('front', ['namespace' => 'App\Controllers\Front'], function ($routes) { - $routes->group('user', ['namespace' => 'App\Controllers\Front', 'filter' => 'authFilter:master,director,cloudflare,manager,gold,silver,brone,vip,user'], static function ($routes) { + $routes->group('user', ['namespace' => 'App\Controllers\Front', 'filter' => 'authFilter:user'], static function ($routes) { $routes->get('update/(:uuid)', 'UserController::update_form/$1'); $routes->post('update/(:uuid)', 'UserController::update/R1'); $routes->get('view/(:uuid)', 'UserController::view/$1'); @@ -134,7 +134,7 @@ $routes->group('front', ['namespace' => 'App\Controllers\Front'], function ($rou $routes->get('view/(:num)', 'BoardController::view/$1'); $routes->get('reply/(:num)', 'BoardController::reply_form/$1'); $routes->post('reply/(:num)', 'BoardController::reply/$1'); - $routes->get('delete/(:num)', 'BoardController::delete/$1', ['filter' => 'authFilter:master']); + $routes->get('delete/(:num)', 'BoardController::delete/$1'); $routes->get('download/(:any)/(:num)', 'BoardController::download/$1/$2'); }); $routes->group('product', static function ($routes) { diff --git a/app/Controllers/Front/FrontController.php b/app/Controllers/Front/FrontController.php index c4acb33..c39edc3 100644 --- a/app/Controllers/Front/FrontController.php +++ b/app/Controllers/Front/FrontController.php @@ -55,6 +55,12 @@ abstract class FrontController extends BaseController $this->_viewDatas['category'], $category_field, )) { + echo var_export($this->_viewDatas['currentRoles'], true); + echo "
"; + echo var_export($this->_viewDatas['category'], true); + echo "
"; + echo "field->", $action . ":" . $category_field; + exit; throw new \Exception("고객님은 " . lang($this->getCategoryModel()->getClassName() . ".label." . $category_field) . "이 없습니다."); } } diff --git a/app/Models/UserModel.php b/app/Models/UserModel.php index c41b5a5..a6d65fb 100644 --- a/app/Models/UserModel.php +++ b/app/Models/UserModel.php @@ -31,9 +31,9 @@ class UserModel extends BaseModel $rules[$field] .= $action == "insert" ? "|is_unique[{$this->table}.{$field}]" : ""; break; case "passwd": - $rules[$field] = "required|trim|string"; + $rules[$field] = $action == "insert" ? "required|trim|string" : "if_exists|trim|string"; if ($action != "") { - $rules["confirmpassword"] = "required|trim|string|matches[passwd]"; + $rules["confirmpassword"] = $action == "insert" ? "required|trim|string|matches[passwd]" : "if_exists|trim|string|matches[passwd]"; } break; case $this->getTitleField(): diff --git a/app/Views/layouts/front.php b/app/Views/layouts/front.php index 055b5a8..979edf0 100644 --- a/app/Views/layouts/front.php +++ b/app/Views/layouts/front.php @@ -1,10 +1,16 @@ - - + + - - - + + + + + + + + +