From 5c69cb84ed2578ff044c40385288e956bbd939c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0?= <choi.jh@prime-idc.jp>
Date: Mon, 14 Oct 2024 14:32:25 +0900
Subject: [PATCH] cfmgrv4 init...2

---
 app/Controllers/MVController.php | 2 +-
 app/Filters/AuthFilter.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/MVController.php b/app/Controllers/MVController.php
index 40d4ce7..45241d6 100644
--- a/app/Controllers/MVController.php
+++ b/app/Controllers/MVController.php
@@ -355,7 +355,7 @@ abstract class MVController extends CommonController
             //모델 처리
             $this->entitys = $this->list_entitys_process();
             // 현재 URL을 스택에 저장
-            $this->myauth->pushCurrentUrl($this->request->getUri()->getPath() . "?" . $this->request->getUri()->getQuery());
+            $this->myauth->pushCurrentUrl($this->request->getUri()->getPath() . ($this->request->getUri()->getQuery() ? "?" . $this->request->getUri()->getQuery() : ""));
             return view(
                 $this->view_path . "index",
                 ['viewDatas' => $this->getViewDatas()]
diff --git a/app/Filters/AuthFilter.php b/app/Filters/AuthFilter.php
index b0c3079..b3835b3 100644
--- a/app/Filters/AuthFilter.php
+++ b/app/Filters/AuthFilter.php
@@ -30,7 +30,7 @@ class AuthFilter implements FilterInterface
         // log_message("debug", var_export($arguments, true));
         // 로그인 않했으면
         if (!$auth->isLoggedIn()) {
-            $auth->pushCurrentUrl($request->getUri()->getPath() . "?" . $request->getUri()->getQuery());
+            $auth->pushCurrentUrl($request->getUri()->getPath() . ($request->getUri()->getQuery() ? "?" . $request->getUri()->getQuery() : ""));
             return redirect()->to(URLS['LOGIN'])->with('error', '로그인을하셔야합니다.');
         }
         //User Role 비교 // 회원 ROLES이 필요ROLE($arguments) 목록에 존재하지 않으면(ACL)