From 0986ddf87d031aa54667fa0d465af9d4fe90f3a2 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Mon, 8 Feb 2021 21:40:39 +0900
Subject: [PATCH] Fix #1607 denied/limited reason not being saved as extra vars

---
 modules/member/member.admin.controller.php |  7 +++++++
 modules/member/member.class.php            | 11 +++++------
 modules/member/member.controller.php       |  7 +++++++
 modules/member/tpl/insert_member.html      | 15 ++++++---------
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index 674058cc0..23472357a 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -86,6 +86,13 @@ class memberAdminController extends member
 				$extra_vars->{$formInfo->name} = $all_args->{$formInfo->name};
 			}
 		}
+		foreach($this->admin_extra_vars as $key)
+		{
+			if (isset($all_args->{$key}))
+			{
+				$extra_vars->{$key} = escape(utf8_clean($all_args->{$key}));
+			}
+		}
 		$args->extra_vars = serialize($extra_vars);
 
 		// Delete invalid or past limit dates #1334
diff --git a/modules/member/member.class.php b/modules/member/member.class.php
index 102b91eac..0240e58fa 100644
--- a/modules/member/member.class.php
+++ b/modules/member/member.class.php
@@ -5,14 +5,13 @@
  * @author NAVER (developers@xpressengine.com)
  * high class of the member module
  */
-class member extends ModuleObject {
+class member extends ModuleObject
+{
 	/**
-	 * Use sha1 encryption
-	 *
-	 * @var boolean
+	 * Extra vars for admin purposes
 	 */
-	var $useSha1 = false;
-
+	public $admin_extra_vars = ['refused_reason', 'limited_reason'];
+	
 	/**
 	 * constructor
 	 *
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 99f379304..ae558ff0a 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -1167,6 +1167,13 @@ class memberController extends member
 				$extra_vars->{$formInfo->name} = $all_args->{$formInfo->name};
 			}
 		}
+		foreach($this->admin_extra_vars as $key)
+		{
+			if (isset($logged_info->{$key}))
+			{
+				$extra_vars->{$key} = $logged_info->{$key};
+			}
+		}
 		$args->extra_vars = serialize($extra_vars);
 
 		// remove whitespace
diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html
index a31eb59d1..fdc4cfa47 100644
--- a/modules/member/tpl/insert_member.html
+++ b/modules/member/tpl/insert_member.html
@@ -161,14 +161,9 @@
 				dateFormat:'yy-mm-dd',
 				defaultDate: new Date("{date('Y-m-d',time())}"),
 				minDate: new Date("{date('Y-m-d',strtotime('-200 years'))}"),
-
 				onSelect:function(){
 					$(this).prev('input[type="hidden"]').val(this.value.replace(/-/g,""))
-					if($('#until').val()){
-						limited_reason_division.slideDown(200);
-					} else {
-						limited_reason_division.slideUp(200);
-					}
+					$('.div_limited_reason').slideDown(200);
 				}
 			};
 			$.extend($.datepicker.regional['{$lang_type}'],option);
@@ -177,10 +172,13 @@
 			$(".inputDate").datepicker(option);
 		} else {
 			$(".inputDate").prop('readonly', false);
+			$(".inputDate").on('change', function() {
+				$('.div_limited_reason').slideDown(200);
+			});
 		}
 		$(".dateRemover").click(function() {
 			$(this).prevAll('input').val('');
-			limited_reason_division.slideUp(200);
+			$('.div_limited_reason').slideUp(200);
 			return false;
 		});
     });
@@ -201,10 +199,9 @@
 		}
 	});
 	
-	var limited_reason_division = $('.div_limited_reason');
 	if(!$('#until').val())
 	{
-		limited_reason_division.hide();
+		$('.div_limited_reason').hide();
 	}
 })(jQuery);
 </script>