From 9372ee4cceb3e66f29f5b35bf46d428c56247ffd Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Thu, 18 Jun 2020 21:20:23 +0900
Subject: [PATCH] Change some internal methods to protected in ModuleHandler

---
 classes/module/ModuleHandler.class.php | 38 ++++++++++++++------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 951ed2005..bce2365ae 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -784,10 +784,26 @@ class ModuleHandler extends Handler
 	}
 	 
 	/**
-	 * set error message to Session.
+	 * Save input values to session so that they can be recovered after returning to the previous form.
+	 * 
 	 * @return void
-	 * */
-	public static function _setInputErrorToContext()
+	 */
+	protected static function _setInputValueToSession()
+	{
+		$requestVars = getDestroyXeVars(Context::getRequestVars());
+		unset($requestVars->act, $requestVars->mid, $requestVars->vid);
+		foreach($requestVars as $key => $value)
+		{
+			$_SESSION['INPUT_ERROR'][$key] = $value;
+		}
+	}
+
+	/**
+	 * Get previous error information and restore it to Context so that it is available to templates.
+	 * 
+	 * @return void
+	 */
+	protected static function _setInputErrorToContext()
 	{
 		if($_SESSION['XE_VALIDATOR_ERROR'] && !Context::get('XE_VALIDATOR_ERROR'))
 		{
@@ -821,7 +837,7 @@ class ModuleHandler extends Handler
 	 * clear error message to Session.
 	 * @return void
 	 * */
-	public static function _clearErrorSession()
+	protected static function _clearErrorSession()
 	{
 		unset($_SESSION['XE_VALIDATOR_ERROR']);
 		unset($_SESSION['XE_VALIDATOR_MESSAGE']);
@@ -831,20 +847,6 @@ class ModuleHandler extends Handler
 		unset($_SESSION['INPUT_ERROR']);
 	}
 
-	/**
-	 * occured error when, set input values to session.
-	 * @return void
-	 * */
-	public static function _setInputValueToSession()
-	{
-		$requestVars = Context::getRequestVars();
-		unset($requestVars->act, $requestVars->mid, $requestVars->vid, $requestVars->success_return_url, $requestVars->error_return_url, $requestVars->xe_validator_id);
-		foreach($requestVars AS $key => $value)
-		{
-			$_SESSION['INPUT_ERROR'][$key] = $value;
-		}
-	}
-
 	/**
 	 * Create a message module instance with an error message.
 	 */