From c949e797b0adb68bf64ce45ab0dc5216786a6a04 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sat, 14 Jun 2025 12:16:31 +0900
Subject: [PATCH 01/19] Separate default value from options in member extra
 vars, too

---
 modules/member/member.admin.controller.php  | 26 ++++++----
 modules/member/member.admin.model.php       | 21 ++++++--
 modules/member/member.admin.view.php        |  3 +-
 modules/member/member.class.php             |  9 ++++
 modules/member/member.controller.php        |  4 +-
 modules/member/member.model.php             | 54 +++++++++++++--------
 modules/member/member.view.php              |  1 +
 modules/member/queries/insertJoinForm.xml   |  1 +
 modules/member/queries/updateJoinForm.xml   |  1 +
 modules/member/schemas/member_join_form.xml |  1 +
 modules/member/tpl/insert_join_form.html    | 15 ++++--
 11 files changed, 92 insertions(+), 44 deletions(-)

diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index bde74ac60..f9ee4c530 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -878,21 +878,27 @@ class MemberAdminController extends Member
 		$args->column_type = Context::get('column_type');
 		$args->column_name = strtolower(Context::get('column_id'));
 		$args->column_title = Context::get('column_title');
-		$args->default_value = explode("\n", str_replace("\r", '', Context::get('default_value')));
-		$args->required = Context::get('required');
-		$args->is_active = (isset($args->required));
-		if(!in_array(strtoupper($args->required), array('Y','N')))$args->required = 'N';
-		$args->description = Context::get('description') ? Context::get('description') : '';
-		// Default values
-		if(in_array($args->column_type, array('checkbox','select','radio')) && count($args->default_value))
+		$args->default_value = trim(utf8_clean(Context::get('default_value')));
+		$args->options = trim(utf8_clean(Context::get('options')));
+		if ($args->options !== '')
 		{
-			$args->default_value = serialize($args->default_value);
+			$args->options = array_map('trim', explode("\n", $args->options));
+			$args->options = json_encode($args->options, \JSON_UNESCAPED_UNICODE | \JSON_UNESCAPED_SLASHES);
 		}
 		else
 		{
-			$args->default_value = '';
+			$args->options = null;
 		}
 
+		$args->required = Context::get('required');
+		if (!in_array(strtoupper($args->required), array('Y','N')))
+		{
+			$args->required = 'N';
+		}
+
+		$args->is_active = (isset($args->required));
+		$args->description = Context::get('description') ? Context::get('description') : '';
+
 		// Check ID duplicated
 		if (Context::isReservedWord($args->column_name))
 		{
@@ -909,7 +915,7 @@ class MemberAdminController extends Member
 			}
 		}
 		// Fix if member_join_form_srl exists. Add if not exists.
-		$isInsert;
+		$isInsert = false;
 		if(!$args->member_join_form_srl)
 		{
 			$isInsert = true;
diff --git a/modules/member/member.admin.model.php b/modules/member/member.admin.model.php
index 4a3b9c23e..18f434a03 100644
--- a/modules/member/member.admin.model.php
+++ b/modules/member/member.admin.model.php
@@ -288,13 +288,24 @@ class MemberAdminModel extends Member
 		if($output->toBool() && $output->data)
 		{
 			$formInfo = $output->data;
-			$default_value = $formInfo->default_value;
-			if($default_value)
+			$default_value = '';
+			$options = '';
+			if (isset($formInfo->options) && $formInfo->options !== '')
 			{
-				$default_value = unserialize($default_value);
-				Context::set('default_value', $default_value);
+				$default_value = $formInfo->default_value;
+				$options = json_decode($formInfo->options, true);
+			}
+			elseif (preg_match('/^a:\d+:\{i:/', $formInfo->default_value))
+			{
+				$options = unserialize($formInfo->default_value);
+			}
+			else
+			{
+				$default_value = $formInfo->default_value;
 			}
 			Context::set('formInfo', $output->data);
+			Context::set('default_value', $default_value);
+			Context::set('options', $options);
 		}
 
 		$oMemberModel = getModel('member');
@@ -314,7 +325,7 @@ class MemberAdminModel extends Member
 		$oTemplate = TemplateHandler::getInstance();
 		$tpl = $oTemplate->compile($this->module_path.'tpl', 'insert_join_form');
 
-		$this->add('tpl', str_replace("\n"," ",$tpl));
+		$this->add('tpl', $tpl);
 	}
 
 	/**
diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php
index 88b44d034..0b46709f2 100644
--- a/modules/member/member.admin.view.php
+++ b/modules/member/member.admin.view.php
@@ -486,7 +486,7 @@ class MemberAdminView extends Member
 	{
 		$extend_form_list = MemberModel::getCombineJoinForm($memberInfo);
 		$security = new Security($extend_form_list);
-		$security->encodeHTML('..column_title', '..description', '..default_value.');
+		$security->encodeHTML('..column_title', '..description', '..default_value', '..options.');
 
 		if ($memberInfo)
 		{
@@ -725,6 +725,7 @@ class MemberAdminView extends Member
 					$input->input_id = $extendForm->column_name;
 					$input->value = $extendForm->value ?? '';
 					$input->default = $extendForm->default_value ?? null;
+					$input->options = $extendForm->options ?? null;
 					if ($extendForm->column_type === 'tel' || $extendForm->column_type === 'tel_intl')
 					{
 						$input->style = 'width:33.3px';
diff --git a/modules/member/member.class.php b/modules/member/member.class.php
index daf61158d..32cf596b2 100644
--- a/modules/member/member.class.php
+++ b/modules/member/member.class.php
@@ -167,6 +167,9 @@ class Member extends ModuleObject
 		if(!$oDB->isIndexExists('member_auth_mail', 'idx_member_srl')) return true;
 		if($oDB->isIndexExists('member_auth_mail', 'unique_key')) return true;
 
+		// Check join form options column
+		if(!$oDB->isColumnExists('member_join_form', 'options')) return true;
+
 		// Update status column
 		$output = executeQuery('member.getDeniedAndStatus');
 		if ($output->data->count)
@@ -403,6 +406,12 @@ class Member extends ModuleObject
 			$oDB->dropIndex('member_auth_mail', 'unique_key');
 		}
 
+		// Check join form options column
+		if(!$oDB->isColumnExists('member_join_form', 'options'))
+		{
+			$oDB->addColumn('member_join_form', 'options', 'text', null, null, null, 'default_value');
+		}
+
 		// Update status column
 		$output = executeQuery('member.getDeniedAndStatus');
 		if ($output->data->count)
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 9e2a488e8..26b3ea4d4 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -2871,7 +2871,7 @@ class MemberController extends Member
 
 		$extend_form_list = MemberModel::getJoinFormlist();
 		$security = new Security($extend_form_list);
-		$security->encodeHTML('..column_title', '..description', '..default_value.');
+		$security->encodeHTML('..column_title', '..description', '..default_value', '..options.');
 		if($config->signupForm)
 		{
 			foreach($config->signupForm as $no => $formInfo)
@@ -3167,7 +3167,7 @@ class MemberController extends Member
 
 		$extend_form_list = MemberModel::getJoinFormlist();
 		$security = new Security($extend_form_list);
-		$security->encodeHTML('..column_title', '..description', '..default_value.');
+		$security->encodeHTML('..column_title', '..description', '..default_value', '..options.');
 		if($config->signupForm)
 		{
 			foreach($config->signupForm as $no => $formInfo)
diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index 03013abe2..2cdda377e 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -806,31 +806,38 @@ class MemberModel extends Member
 			if(!$join_form_list) return NULL;
 			// Need to unserialize because serialized array is inserted into DB in case of default_value
 			if(!is_array($join_form_list)) $join_form_list = array($join_form_list);
-			$join_form_count = count($join_form_list);
-			for($i=0;$i<$join_form_count;$i++)
+			foreach ($join_form_list as $i => $join_form)
 			{
-				$join_form_list[$i]->column_name = strtolower($join_form_list[$i]->column_name);
+				$join_form->column_name = strtolower($join_form->column_name);
 
-				$member_join_form_srl = $join_form_list[$i]->member_join_form_srl;
-				$column_type = $join_form_list[$i]->column_type;
-				$column_name = $join_form_list[$i]->column_name;
-				$column_title = $join_form_list[$i]->column_title;
-				$default_value = $join_form_list[$i]->default_value;
 				// Add language variable
-				if(!isset($lang->extend_vars)) $lang->extend_vars = array();
-				$lang->extend_vars[$column_name] = $column_title;
-				// unserialize if the data type if checkbox, select and so on
-				if(in_array($column_type, array('checkbox','select','radio')))
+				$column_name = $join_form->column_name;
+				$column_title = $join_form->column_title;
+				if (!isset($lang->extend_vars))
 				{
-					$join_form_list[$i]->default_value = unserialize($default_value);
-					if(!$join_form_list[$i]->default_value[0]) $join_form_list[$i]->default_value = '';
+					$lang->extend_vars = array();
+				}
+				$lang->extend_vars[$column_name] = $column_title;
+
+				// unserialize if the data type if checkbox, select and so on
+				if (in_array($join_form->column_type, ['checkbox','select','radio']))
+				{
+					if (isset($join_form->options) && $join_form->options !== '')
+					{
+						$join_form->options = json_decode($join_form->options, true);
+					}
+					elseif (preg_match('/^a:\d+:\{i:/', $join_form->default_value))
+					{
+						$join_form->options = unserialize($join_form->default_value);
+						$join_form->default_value = '';
+					}
 				}
 				else
 				{
-					$join_form_list[$i]->default_value = '';
+					$join_form->default_value = '';
 				}
 
-				$list[$member_join_form_srl] = $join_form_list[$i];
+				$list[$join_form->member_join_form_srl] = $join_form;
 			}
 			self::$_join_form_list = $list;
 		}
@@ -958,12 +965,17 @@ class MemberModel extends Member
 		$join_form = $output->data;
 		if(!$join_form) return NULL;
 
-		$column_type = $join_form->column_type;
-		$default_value = $join_form->default_value;
-
-		if(in_array($column_type, array('checkbox','select','radio')))
+		if (in_array($join_form->column_type, ['checkbox','select','radio']))
 		{
-			$join_form->default_value = unserialize($default_value);
+			if (isset($join_form->options) && $join_form->options !== '')
+			{
+				$join_form->options = json_decode($join_form->options, true);
+			}
+			elseif (preg_match('/^a:\d+:\{i:/', $join_form->default_value))
+			{
+				$join_form->options = unserialize($join_form->default_value);
+				$join_form->default_value = '';
+			}
 		}
 		else
 		{
diff --git a/modules/member/member.view.php b/modules/member/member.view.php
index d6afba4af..9523b6cc6 100644
--- a/modules/member/member.view.php
+++ b/modules/member/member.view.php
@@ -280,6 +280,7 @@ class MemberView extends Member
 				$extvalue->input_id = $formInfo->name;
 				$extvalue->value = $extendFormInfo[$formInfo->member_join_form_srl]->value ?? null;
 				$extvalue->default = $extendFormInfo[$formInfo->member_join_form_srl]->default_value ?? null;
+				$extvalue->options = $extendFormInfo[$formInfo->member_join_form_srl]->options ?? null;
 				$item->value = $extvalue->getValueHTML();
 			}
 
diff --git a/modules/member/queries/insertJoinForm.xml b/modules/member/queries/insertJoinForm.xml
index 808ff4160..9b8be3c54 100644
--- a/modules/member/queries/insertJoinForm.xml
+++ b/modules/member/queries/insertJoinForm.xml
@@ -9,6 +9,7 @@
         <column name="column_title" var="column_title" />
         <column name="required" var="required" default="N" />
         <column name="default_value" var="default_value" />
+		<column name="options" var="options" />
         <column name="is_active" var="is_active" default="N" />
         <column name="description" var="description" />
         <column name="regdate" default="curdate()" />
diff --git a/modules/member/queries/updateJoinForm.xml b/modules/member/queries/updateJoinForm.xml
index 5b6082682..3d18f78bc 100644
--- a/modules/member/queries/updateJoinForm.xml
+++ b/modules/member/queries/updateJoinForm.xml
@@ -8,6 +8,7 @@
         <column name="column_title" var="column_title" />
         <column name="required" var="required" default="N" />
         <column name="default_value" var="default_value" />
+		<column name="options" var="options" />
         <column name="is_active" var="is_active" default="N" />
         <column name="description" var="description" />
     </columns>
diff --git a/modules/member/schemas/member_join_form.xml b/modules/member/schemas/member_join_form.xml
index e69076e8f..9c3e8f5e3 100644
--- a/modules/member/schemas/member_join_form.xml
+++ b/modules/member/schemas/member_join_form.xml
@@ -5,6 +5,7 @@
     <column name="column_title" type="varchar" size="60" notnull="notnull" />
     <column name="required" type="char" size="1" default="N" notnull="notnull" />
     <column name="default_value" type="text" />
+	<column name="options" type="text" />
     <column name="is_active" type="char" size="1" default="Y" />
     <column name="description" type="text" />
     <column name="list_order" type="number" size="11" notnull="notnull" default="1" index="idx_list_order" />
diff --git a/modules/member/tpl/insert_join_form.html b/modules/member/tpl/insert_join_form.html
index 18f2a4c21..d59983f12 100644
--- a/modules/member/tpl/insert_join_form.html
+++ b/modules/member/tpl/insert_join_form.html
@@ -26,11 +26,17 @@
 				</select>
 			</div>
 		</div>
-		<div class="x_control-group multiExample">
-			<label for="multiSelect" class="x_control-label"><em style="color:red">*</em> {$lang->options}</label>
+		<div class="x_control-group">
+			<label for="default_value" class="x_control-label"> {$lang->default_value}</label>
 			<div class="x_controls">
-				<textarea rows="4" cols="42" id="multiSelect" name="default_value" style="vertical-align:top"><block cond="$default_value">{implode('|@|', $default_value)}</block></textarea>
-				<p class="x_help-inline">{$lang->about_multi_type}</p>
+				<input type="text" id="default_value" name="default_value" value="{$default_value}" />
+			</div>
+		</div>
+		<div class="x_control-group multiExample">
+			<label for="multiSelect" class="x_control-label"> {$lang->options}</label>
+			<div class="x_controls">
+				<textarea rows="4" cols="42" id="multiSelect" name="options" style="vertical-align:top"><block cond="$options">{implode("\n", $options)}</block></textarea>
+				<p class="x_help-block">{$lang->about_multi_type}</p>
 			</div>
 		</div>
 		<div class="x_control-group">
@@ -51,7 +57,6 @@
 		<span class="x_pull-right"><button class="x_btn x_btn-primary" type="submit" name="mode" <!--@if($formInfo)-->value="update"<!--@else-->value="insert"<!--@end--> >{$lang->cmd_save}</button></span>
 	</div>
 <script>
-	var $ = jQuery;
 	var typeSelect = $('.typeSelect');
 	var multiOption = $('.typeSelect>option[value=checkbox], .typeSelect>option[value=radio], .typeSelect>option[value=select_multiple], .typeSelect>option[value=select]');
 	var multiExample = $('.multiExample');

From b15fc8deb3b8d3aa42927b3fdf2c16a511cf8237 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sat, 14 Jun 2025 12:19:42 +0900
Subject: [PATCH 02/19] Fix not_member granted menu showing up as group
 restricted

---
 modules/menu/menu.admin.model.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/menu/menu.admin.model.php b/modules/menu/menu.admin.model.php
index d9461460d..4f4907675 100644
--- a/modules/menu/menu.admin.model.php
+++ b/modules/menu/menu.admin.model.php
@@ -216,6 +216,10 @@ class MenuAdminModel extends Menu
 			{
 				$menuItem->grant = 'manager';
 			}
+			else if($menuItem->group_srls[0] == -4)
+			{
+				$menuItem->grant = 'not_member';
+			}
 			else
 			{
 				$menuItem->grant = 'group';

From 3c44f96f63edeb9b68bac96c263efd7f4612249f Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sat, 14 Jun 2025 13:49:48 +0900
Subject: [PATCH 03/19] Fix empty procDocumentAddCart request (2.1.24
 regression) #2568

---
 common/js/common.js                      | 16 ++++++++++------
 modules/document/document.controller.php | 23 +++++++++++++++--------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/common/js/common.js b/common/js/common.js
index 9033e49e2..dda9ae1ed 100644
--- a/common/js/common.js
+++ b/common/js/common.js
@@ -653,7 +653,7 @@ Rhymix.ajaxForm = function(form, success, error) {
  * @return void
  */
 Rhymix.checkboxToggleAll = function(name) {
-	if (!window[name]) {
+	if (typeof name === 'undefined') {
 		name='cart';
 	}
 	let options = {
@@ -1457,12 +1457,16 @@ function popopen(url, target) {
  * @return void
  */
 function doAddDocumentCart(obj) {
-	Rhymix.addedDocument.push(obj.value);
+	if (obj && obj.value) {
+		Rhymix.addedDocument.push(obj.value);
+	}
 	setTimeout(function() {
-		exec_json('document.procDocumentAddCart', {
-			srls: Rhymix.addedDocument.join(',')
-		});
-		Rhymix.addedDocument = [];
+		if (Rhymix.addedDocument.length > 0) {
+			exec_json('document.procDocumentAddCart', {
+				srls: Rhymix.addedDocument
+			});
+			Rhymix.addedDocument = [];
+		}
 	}, 100);
 }
 
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 0bc2dc7c9..418857e29 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -3301,16 +3301,23 @@ class DocumentController extends Document
 		}
 
 		// Get document_srl
-		$srls = explode(',',Context::get('srls'));
-		for($i = 0; $i < count($srls); $i++)
+		$srls = Context::get('srls');
+		if (is_array($srls))
 		{
-			$srl = trim($srls[$i]);
-
-			if(!$srl) continue;
-
-			$document_srls[] = $srl;
+			$document_srls = array_map('intval', $srls);
+		}
+		else
+		{
+			$document_srls = array_map('intval', explode(',', $srls));
+		}
+
+		$document_srls = array_unique(array_filter($document_srls, function($srl) {
+			return $srl > 0;
+		}));
+		if (!count($document_srls))
+		{
+			return;
 		}
-		if(!count($document_srls)) return;
 
 		// Get module_srl of the documents
 		$args = new stdClass;

From 388091ed826bd54b50cdfbdf0dc827ef2b7c347b Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sat, 14 Jun 2025 13:52:14 +0900
Subject: [PATCH 04/19] Fix incorrect migration of is_def() from previous
 version

---
 common/js/common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/js/common.js b/common/js/common.js
index dda9ae1ed..ebe57c415 100644
--- a/common/js/common.js
+++ b/common/js/common.js
@@ -1012,7 +1012,7 @@ $(function() {
 		e.preventDefault();
 		e.stopPropagation();
 
-		if (window[Rhymix.loadedPopupMenus[params.menu_id]]) {
+		if (Rhymix.loadedPopupMenus[params.menu_id]) {
 			return Rhymix.displayPopupMenu(params, response_tags, params);
 		}
 

From 20f6703f794c6d1e48977b130bb71b5a0fef6172 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sat, 14 Jun 2025 15:53:43 +0900
Subject: [PATCH 05/19] Revert "Call Rhymix.ajax() in procFilter()"

Don't call new function from legacy function

This reverts commit 64f0ffbd91750c03acb5a3a4a3c82c042e25e6dd.
---
 common/js/xml_js_filter.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/js/xml_js_filter.js b/common/js/xml_js_filter.js
index 83459d213..414c175d8 100644
--- a/common/js/xml_js_filter.js
+++ b/common/js/xml_js_filter.js
@@ -467,13 +467,13 @@ function legacy_filter(filter_name, form, module, act, callback, responses, conf
 		};
 
 		if (!hasFile) {
-			Rhymix.ajax(module + '.' + act, params, callback_wrapper);
+			exec_json(module + '.' + act, params, callback_wrapper);
 		} else {
 			var fd = new FormData();
 			for (let key in params) {
 				fd.append(key, params[key]);
 			}
-			Rhymix.ajax(null, fd, callback_wrapper);
+			exec_json('raw', fd, callback_wrapper);
 		}
 	};
 

From c85544089360075e2a5f8239587ce81647207788 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sat, 14 Jun 2025 16:29:41 +0900
Subject: [PATCH 06/19] Change number extravar input to <input type="text"
 inputmode="numeric">

---
 modules/extravar/skins/default/form_types/text.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/extravar/skins/default/form_types/text.blade.php b/modules/extravar/skins/default/form_types/text.blade.php
index ca9122298..89360188f 100644
--- a/modules/extravar/skins/default/form_types/text.blade.php
+++ b/modules/extravar/skins/default/form_types/text.blade.php
@@ -17,7 +17,7 @@
 		@readonly(toBool($definition->is_readonly))
 	/>
 @elseif ($type === 'number')
-	<input type="number" name="{{ $input_name }}"
+	<input type="text" inputmode="numeric" name="{{ $input_name }}"
 		id="{{ $input_id }}"|if="$input_id" class="number rx_ev_number"
 		style="{{ $definition->style }}"|if="$definition->style"
 		value="{{ strval($value) !== '' ? $value : strval($default) }}"

From f29080bb62cfc4afa7166c6929b717fc5ef44ada Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sat, 14 Jun 2025 16:35:46 +0900
Subject: [PATCH 07/19] Disable autocomplete and autocapitalize for password
 extravar input

---
 modules/extravar/skins/default/form_types/password.blade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/extravar/skins/default/form_types/password.blade.php b/modules/extravar/skins/default/form_types/password.blade.php
index 4936c05bd..d304e691e 100644
--- a/modules/extravar/skins/default/form_types/password.blade.php
+++ b/modules/extravar/skins/default/form_types/password.blade.php
@@ -2,6 +2,7 @@
 	id="{{ $input_id }}"|if="$input_id" class="password rx_ev_password"
 	style="{{ $definition->style }}"|if="$definition->style"
 	value="{{ strval($value) !== '' ? $value : strval($default) }}"
+	autocomplete="off" autocapitalize="none"
 	@required(toBool($definition->is_required))
 	@disabled(toBool($definition->is_disabled))
 	@readonly(toBool($definition->is_readonly))

From 3ac26150d506c0db7ffed2c204093134064deae6 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sat, 14 Jun 2025 16:36:03 +0900
Subject: [PATCH 08/19] Fix error when adding a new extra var

---
 modules/document/tpl/extra_keys.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/document/tpl/extra_keys.html b/modules/document/tpl/extra_keys.html
index 407d99a41..8bdb07b6d 100644
--- a/modules/document/tpl/extra_keys.html
+++ b/modules/document/tpl/extra_keys.html
@@ -61,7 +61,7 @@
 			<div class="x_control-group" data-invisible-types="file">
 				<label class="x_control-label" for="default">{$lang->default_value}</label>
 				<div class="x_controls">
-					<input type="text" name="default" id="default" value="{$selected_var->getDefaultValue()}" />
+					<input type="text" name="default" id="default" value="{$selected_var ? $selected_var->getDefaultValue() : ''}" />
 					<p class="x_help-block">{$lang->about_extra_vars_default_value}</p>
 				</div>
 			</div>

From d7fb2422feb4f5948d2123632ca21cb47aa24700 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sun, 15 Jun 2025 01:28:45 +0900
Subject: [PATCH 09/19] Clean up extravar support script for upload type

---
 .../extravar/skins/default/assets/file_upload.js   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/extravar/skins/default/assets/file_upload.js b/modules/extravar/skins/default/assets/file_upload.js
index 878ac15af..d280ea1e9 100644
--- a/modules/extravar/skins/default/assets/file_upload.js
+++ b/modules/extravar/skins/default/assets/file_upload.js
@@ -1,16 +1,16 @@
 'use strict';
 
-(function($) {
-	$(function() {
-		$('button.evFileRemover').on('click', function() {
-			const container = $(this).parents('.ev_file_upload');
+$(function() {
+	$('.ev_file_upload').each(function() {
+		const container = $(this);
+		container.find('button.evFileRemover').on('click', function() {
 			container.find('span.filename').text('');
 			container.find('span.filesize').text('');
 			container.find('input[type=hidden][name^=_delete_]').val('Y');
 			container.find('input[type=file]').val('');
+			$(this).remove();
 		});
-		$('input.rx_ev_file').on('change', function() {
-			const container = $(this).parents('.ev_file_upload');
+		container.find('input.rx_ev_file').on('change', function() {
 			const max_size = parseInt($(this).data('allowedFilesize'), 10);
 			const file_count = this.files.length;
 			for (let i = 0; i < file_count; i++) {
@@ -23,4 +23,4 @@
 			container.find('input[type=hidden][name^=_delete_]').val('N');
 		});
 	});
-})(jQuery);
+});

From 0ea9778682f77bf400a85eb5ec191fc45ac7afa6 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sun, 15 Jun 2025 01:33:35 +0900
Subject: [PATCH 10/19] Add script to support <input type="text"
 inputmode="numeric">

---
 modules/extravar/skins/default/assets/number.js          | 7 +++++++
 modules/extravar/skins/default/form_types/text.blade.php | 1 +
 2 files changed, 8 insertions(+)
 create mode 100644 modules/extravar/skins/default/assets/number.js

diff --git a/modules/extravar/skins/default/assets/number.js b/modules/extravar/skins/default/assets/number.js
new file mode 100644
index 000000000..eccbd7474
--- /dev/null
+++ b/modules/extravar/skins/default/assets/number.js
@@ -0,0 +1,7 @@
+'use strict';
+
+$(function() {
+	$('input.rx_ev_number').on('input', function() {
+		this.value = this.value.replace(/[^0-9]/g, '');
+	});
+});
diff --git a/modules/extravar/skins/default/form_types/text.blade.php b/modules/extravar/skins/default/form_types/text.blade.php
index 89360188f..754b6f145 100644
--- a/modules/extravar/skins/default/form_types/text.blade.php
+++ b/modules/extravar/skins/default/form_types/text.blade.php
@@ -17,6 +17,7 @@
 		@readonly(toBool($definition->is_readonly))
 	/>
 @elseif ($type === 'number')
+	@load('../assets/number.js')
 	<input type="text" inputmode="numeric" name="{{ $input_name }}"
 		id="{{ $input_id }}"|if="$input_id" class="number rx_ev_number"
 		style="{{ $definition->style }}"|if="$definition->style"

From ad6aeb4c006933eb4dd83dd89d9f3b9ff868b152 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Mon, 16 Jun 2025 10:22:13 +0900
Subject: [PATCH 11/19] Fix incorrect pattern due to template syntax

---
 modules/extravar/skins/default/form_types/datetime.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/extravar/skins/default/form_types/datetime.blade.php b/modules/extravar/skins/default/form_types/datetime.blade.php
index dfa97f589..0448cf86c 100644
--- a/modules/extravar/skins/default/form_types/datetime.blade.php
+++ b/modules/extravar/skins/default/form_types/datetime.blade.php
@@ -7,7 +7,7 @@
 		value="{{ $value }}"
 	/>
 	<input type="date" class="date" value="{{ $formatted_value }}"
-		pattern="\d{4}-\d{2}-\d{2}" placeholder="YYYY-MM-DD"
+		pattern="\d\d\d\d-\d\d-\d\d" placeholder="YYYY-MM-DD"
 		style="{{ $definition->style }}"|if="$definition->style"
 		onchange="jQuery(this).prev('.rx_ev_date').val(this.value.replace(/-/g, ''));"
 		@required(toBool($definition->is_required))
@@ -21,7 +21,7 @@
 @else
 	<input type="time" name="{{ $input_name }}"
 		id="{{ $input_id }}"|if="$input_id" class="rx_ev_time"
-		value="{{ $value }}" pattern="\d{2}:\d{2}"
+		value="{{ $value }}" pattern="\d\d:\d\d"
 		style="{{ $definition->style }}"|if="$definition->style"
 		@required(toBool($definition->is_required))
 		@disabled(toBool($definition->is_disabled))

From 5e9cf872e7bf2343481d899d641cbaa0aafe04e3 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Mon, 16 Jun 2025 23:36:32 +0900
Subject: [PATCH 12/19] Fix incorrect permission check when check_var is set
 but mid is not

---
 classes/module/ModuleObject.class.php | 32 ++++++++++++++++++++-------
 modules/module/models/Permission.php  |  6 ++++-
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php
index a736136f4..0d5b4d3d8 100644
--- a/classes/module/ModuleObject.class.php
+++ b/classes/module/ModuleObject.class.php
@@ -254,15 +254,15 @@ class ModuleObject extends BaseObject
 			// Get privileges(granted) information for target module by <permission check> of module.xml
 			if(($permission = $this->xml_info->action->{$this->act}->permission) && $permission->check_var)
 			{
-				// Check parameter
-				if(empty($check_module_srl = trim(Context::get($permission->check_var))))
+				// Ensure that the list of modules to check is the right type and not empty
+				$check_var = Context::get($permission->check_var);
+				if (is_scalar($check_var))
 				{
-					return false;
-				}
+					if (empty($check_module_srl = trim($check_var)))
+					{
+						return false;
+					}
 
-				// If value is not array
-				if(!is_array($check_module_srl))
-				{
 					// Convert string to array. delimiter is ,(comma) or |@|
 					if(preg_match('/,|\|@\|/', $check_module_srl, $delimiter) && $delimiter[0])
 					{
@@ -273,6 +273,14 @@ class ModuleObject extends BaseObject
 						$check_module_srl = array($check_module_srl);
 					}
 				}
+				else
+				{
+					$check_module_srl = array_map('trim', $check_var);
+					if (!count($check_var))
+					{
+						return false;
+					}
+				}
 
 				// Check permission by privileges(granted) information for target module
 				foreach($check_module_srl as $target_srl)
@@ -295,7 +303,15 @@ class ModuleObject extends BaseObject
 		}
 
 		// Check permission based on the grant information for the current module.
-		$grant = ModuleModel::getInstance()->getGrant($this->module_info, $this->user, $this->xml_info);
+		if (isset($check_grant))
+		{
+			$grant = $check_grant;
+		}
+		else
+		{
+			$grant = ModuleModel::getInstance()->getGrant($this->module_info, $this->user, $this->xml_info);
+		}
+
 		if(!$this->checkPermission($grant, $this->user, $failed_requirement))
 		{
 			$this->stop($this->_generatePermissionError($failed_requirement));
diff --git a/modules/module/models/Permission.php b/modules/module/models/Permission.php
index 4f680a164..eea059b84 100644
--- a/modules/module/models/Permission.php
+++ b/modules/module/models/Permission.php
@@ -103,7 +103,11 @@ class Permission
 		// Check if each permission is granted to the current user.
 		foreach ($this->_spec as $key => $requirement)
 		{
-			if ($requirement === 'guest')
+			if ($key === 'manager' && $this->manager)
+			{
+				continue;
+			}
+			elseif ($requirement === 'guest')
 			{
 				$this->{$key} = true;
 			}

From eaa0aee98854733631997dc0605078bcb4c98be9 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Tue, 17 Jun 2025 13:37:26 +0900
Subject: [PATCH 13/19] Update file count after copying document or comment
 with its files #2569

---
 modules/comment/comment.controller.php        | 35 +++++++++++++++++++
 .../comment/queries/updateUploadedCount.xml   | 11 ++++++
 modules/document/document.controller.php      | 15 ++++++--
 modules/file/file.controller.php              |  4 +++
 4 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 modules/comment/queries/updateUploadedCount.xml

diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php
index f57f067f6..3eb2baee8 100644
--- a/modules/comment/comment.controller.php
+++ b/modules/comment/comment.controller.php
@@ -2001,6 +2001,41 @@ class CommentController extends Comment
 		$this->setMessage('success_declared_cancel');
 	}
 
+	/**
+	 * Update the number of uploaded files in the comment
+	 *
+	 * @param int|array $comment_srl_list
+	 * @return void
+	 */
+	public function updateUploadedCount($comment_srl_list)
+	{
+		if (!is_array($comment_srl_list))
+		{
+			$comment_srl_list = array($comment_srl_list);
+		}
+
+		if (!count($comment_srl_list))
+		{
+			return;
+		}
+
+		$comment_srl_list = array_unique($comment_srl_list);
+
+		foreach($comment_srl_list as $comment_srl)
+		{
+			$comment_srl = (int)$comment_srl;
+			if ($comment_srl <= 0)
+			{
+				continue;
+			}
+
+			$args = new stdClass;
+			$args->comment_srl = $comment_srl;
+			$args->uploaded_count = FileModel::getFilesCount($comment_srl);
+			executeQuery('comment.updateUploadedCount', $args);
+		}
+	}
+
 	/**
 	 * Method to add a pop-up menu when clicking for displaying child comments
 	 * @param string $url
diff --git a/modules/comment/queries/updateUploadedCount.xml b/modules/comment/queries/updateUploadedCount.xml
new file mode 100644
index 000000000..9a9bfab15
--- /dev/null
+++ b/modules/comment/queries/updateUploadedCount.xml
@@ -0,0 +1,11 @@
+<query id="updateUploadedCount" action="update">
+	<tables>
+		<table name="comments" />
+	</tables>
+	<columns>
+		<column name="uploaded_count" var="uploaded_count" default="0" filter="number" />
+	</columns>
+	<conditions>
+		<condition operation="equal" column="comment_srl" var="comment_srl" filter="number" notnull="notnull" />
+	</conditions>
+</query>
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 418857e29..4c281b0d4 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -3788,7 +3788,17 @@ Content;
 		}
 	}
 
+	/**
+	 * A typo of updateUploadedCount, maintained for backward compatibility.
+	 *
+	 * @deprecated
+	 */
 	public function updateUploaedCount($document_srl_list)
+	{
+		return $this->updateUploadedCount($document_srl_list);
+	}
+
+	public function updateUploadedCount($document_srl_list)
 	{
 		if(!is_array($document_srl_list))
 		{
@@ -3804,7 +3814,8 @@ Content;
 
 		foreach($document_srl_list as $document_srl)
 		{
-			if(!$document_srl = (int) $document_srl)
+			$document_srl = (int)$document_srl;
+			if ($document_srl <= 0)
 			{
 				continue;
 			}
@@ -3824,7 +3835,7 @@ Content;
 			return;
 		}
 
-		$this->updateUploaedCount($file->upload_target_srl);
+		$this->updateUploadedCount($file->upload_target_srl);
 	}
 
 	/**
diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php
index c46e633c1..c9ae4e628 100644
--- a/modules/file/file.controller.php
+++ b/modules/file/file.controller.php
@@ -2002,6 +2002,8 @@ class FileController extends File
 		}
 
 		$this->copyFiles($obj->source->document_srl, $obj->copied->module_srl, $obj->copied->document_srl, $obj->copied->content);
+		$this->setFilesValid($obj->copied->document_srl, 'doc');
+		DocumentController::getInstance()->updateUploadedCount($obj->copied->document_srl);
 	}
 
 	function triggerAddCopyCommentByDocument(&$obj)
@@ -2012,6 +2014,8 @@ class FileController extends File
 		}
 
 		$this->copyFiles($obj->source->comment_srl, $obj->copied->module_srl, $obj->copied->comment_srl, $obj->copied->content);
+		$this->setFilesValid($obj->copied->comment_srl, 'com');
+		CommentController::getInstance()->updateUploadedCount($obj->copied->comment_srl);
 	}
 
 	function triggerCopyModule(&$obj)

From 170aab3ca8ec742f1e42576a2ad4aa6a43a1242b Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Tue, 17 Jun 2025 17:08:16 +0900
Subject: [PATCH 14/19] Fix exposure of menu items that should be visible only
 to non-members

---
 modules/menu/menu.admin.controller.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php
index 137be685e..0c999346e 100644
--- a/modules/menu/menu.admin.controller.php
+++ b/modules/menu/menu.admin.controller.php
@@ -2003,7 +2003,7 @@ class MenuAdminController extends Menu
 			// If the value of node->group_srls exists
 			if($node->group_srls) {
 				$group_srls_exported = json_encode(array_values(is_array($node->group_srls) ? $node->group_srls : array_map('intval', explode(',', $node->group_srls))));
-				$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, %s)))||($is_logged&&%s))', $group_srls_exported, $node->group_srls == '-1' ? 1 : 0);
+				$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, %s)))||($is_logged&&%s)||(!$is_logged&&%s))', $group_srls_exported, $node->group_srls == '-1' ? 1 : 0, $node->group_srls == '-4' ? 1 : 0);
 			}
 			else
 			{
@@ -2099,7 +2099,7 @@ class MenuAdminController extends Menu
 			if($node->group_srls)
 			{
 				$group_srls_exported = json_encode(array_values(is_array($node->group_srls) ? $node->group_srls : array_map('intval', explode(',', $node->group_srls))));
-				$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, %s)))||($is_logged && %s))', $group_srls_exported, $node->group_srls == '-1' ? 1 : 0);
+				$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, %s)))||($is_logged && %s)||(!$is_logged && %s))', $group_srls_exported, $node->group_srls == '-1' ? 1 : 0, $node->group_srls == '-4' ? 1 : 0);
 			}
 			else
 			{

From dd4d4fe9799123bd8be08b5808e180fadae2754f Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Tue, 17 Jun 2025 17:15:49 +0900
Subject: [PATCH 15/19] Treat pattern attribute of form elements as JS context
 in Template v2

---
 common/framework/parsers/template/TemplateParser_v2.php | 2 +-
 tests/unit/framework/parsers/TemplateParserV2Test.php   | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/common/framework/parsers/template/TemplateParser_v2.php b/common/framework/parsers/template/TemplateParser_v2.php
index 501845a2a..399e45d97 100644
--- a/common/framework/parsers/template/TemplateParser_v2.php
+++ b/common/framework/parsers/template/TemplateParser_v2.php
@@ -185,7 +185,7 @@ class TemplateParser_v2
 		}, $content);
 
 		// Inline scripts.
-		$content = preg_replace_callback('#(?<=\s)(href="javascript:|on[a-z]+=")([^"]*?)"#i', function($match) {
+		$content = preg_replace_callback('#(?<=\s)(href="javascript:|pattern="|on[a-z]+=")([^"]*?)"#i', function($match) {
 			return $match[1] . '<?php $this->config->context = \'JS\'; ?>' . $match[2] . '<?php $this->config->context = \'HTML\'; ?>"';
 		}, $content);
 
diff --git a/tests/unit/framework/parsers/TemplateParserV2Test.php b/tests/unit/framework/parsers/TemplateParserV2Test.php
index ce6e68ab7..d220f4da9 100644
--- a/tests/unit/framework/parsers/TemplateParserV2Test.php
+++ b/tests/unit/framework/parsers/TemplateParserV2Test.php
@@ -265,6 +265,14 @@ class TemplateParserV2Test extends \Codeception\Test\Unit
 		$target = '<div class="foo" onClick="<?php $this->config->context = \'JS\'; ?>bar.barr()<?php $this->config->context = \'HTML\'; ?>">Hello</div>';
 		$this->assertEquals($target, $this->_parse($source, true, false));
 
+		// pattern attribute in <input> tag
+		$source = '<input type="text" pattern="[a-z0-9]{4,8}" value="Hello" />';
+		$target = '<input type="text" pattern="<?php $this->config->context = \'JS\'; ?>[a-z0-9]{4,8}<?php $this->config->context = \'HTML\'; ?>" value="Hello" />';
+		$this->assertEquals($target, $this->_parse($source, true, false));
+		$source = '<input type="text" pattern="[{{ $chars }}]{4,8}" value="Hello" />';
+		$target = '<input type="text" pattern="<?php $this->config->context = \'JS\'; ?>[<?php echo $this->config->context === \'HTML\' ? htmlspecialchars($__Context->chars ?? \'\', \ENT_QUOTES, \'UTF-8\', false) : $this->_v2_escape($__Context->chars ?? \'\'); ?>]{4,8}<?php $this->config->context = \'HTML\'; ?>" value="Hello" />';
+		$this->assertEquals($target, $this->_parse($source, true, false));
+
 		// <style> tag
 		$source = '<style> body { font-size: 16px; } </style>';
 		$target = '<style<?php $this->config->context = \'CSS\'; ?>> body { font-size: 16px; } <?php $this->config->context = \'HTML\'; ?></style>';

From 18b0e28a766aa7b8070da21c1f9a85cea9628158 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Tue, 17 Jun 2025 17:16:25 +0900
Subject: [PATCH 16/19] Revert "Fix incorrect pattern due to template syntax"

This reverts commit ad6aeb4c006933eb4dd83dd89d9f3b9ff868b152.
---
 modules/extravar/skins/default/form_types/datetime.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/extravar/skins/default/form_types/datetime.blade.php b/modules/extravar/skins/default/form_types/datetime.blade.php
index 0448cf86c..dfa97f589 100644
--- a/modules/extravar/skins/default/form_types/datetime.blade.php
+++ b/modules/extravar/skins/default/form_types/datetime.blade.php
@@ -7,7 +7,7 @@
 		value="{{ $value }}"
 	/>
 	<input type="date" class="date" value="{{ $formatted_value }}"
-		pattern="\d\d\d\d-\d\d-\d\d" placeholder="YYYY-MM-DD"
+		pattern="\d{4}-\d{2}-\d{2}" placeholder="YYYY-MM-DD"
 		style="{{ $definition->style }}"|if="$definition->style"
 		onchange="jQuery(this).prev('.rx_ev_date').val(this.value.replace(/-/g, ''));"
 		@required(toBool($definition->is_required))
@@ -21,7 +21,7 @@
 @else
 	<input type="time" name="{{ $input_name }}"
 		id="{{ $input_id }}"|if="$input_id" class="rx_ev_time"
-		value="{{ $value }}" pattern="\d\d:\d\d"
+		value="{{ $value }}" pattern="\d{2}:\d{2}"
 		style="{{ $definition->style }}"|if="$definition->style"
 		@required(toBool($definition->is_required))
 		@disabled(toBool($definition->is_disabled))

From 34840508f72a2196b2fa15fa010b14033b319b2b Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Tue, 17 Jun 2025 18:45:16 +0900
Subject: [PATCH 17/19] Fix warnings in widget editor and support default
 values in info.xml

---
 .../tpl/widget_generate_code.include.html     | 18 +++----
 .../tpl/widget_generate_code_in_page.html     |  2 +-
 .../widget_style_generate_code_in_page.html   | 33 ++++++------
 modules/widget/widget.controller.php          | 53 +++++++++++++------
 modules/widget/widget.model.php               |  2 +-
 widgets/content/conf/info.xml                 |  4 +-
 6 files changed, 68 insertions(+), 44 deletions(-)

diff --git a/modules/widget/tpl/widget_generate_code.include.html b/modules/widget/tpl/widget_generate_code.include.html
index 5e7656d04..d59d6c9f5 100644
--- a/modules/widget/tpl/widget_generate_code.include.html
+++ b/modules/widget/tpl/widget_generate_code.include.html
@@ -37,15 +37,15 @@
 	</div>
 </div>
 
-{@$suggestion_id = 0}
+{@ $group = ''; $not_first = false; $suggestion_id = 0; }
 <block loop="$widget_info->extra_var => $id, $var">
-	{@$suggestion_id++}
+	{@ $suggestion_id++; }
 	<block cond="!$not_first && !$var->group"><section class="extra_vars section"></block>
 	<block cond="$group != $var->group">
 		<block cond="$not_first"></section></block>
 		<section class="extra_vars section">
 		<h1>{$var->group}</h1>
-		{@$group = $var->group}
+		{@ $group = $var->group; }
 	</block>
 
 	{@$not_first = true}
@@ -53,21 +53,21 @@
 		<label class="x_control-label" for="{$id}"|cond="$var->type != 'radio' && $var->type != 'checkbox'">{$var->name}</label>
 		<div class="x_controls">
 			<block cond="$var->type == 'text'">
-				<input type="text" name="{$id}" />
+				<input type="text" name="{$id}" value="{$var->default}" />
 			</block>
 			<block cond="$var->type == 'color'">
 				<input type="text" name="{$id}" value="" id="{$id}" class="rx-spectrum" style="width:178px" />
 			</block>
 			<block cond="$var->type == 'textarea'">
-				<textarea cond="$var->type == 'textarea'" name="{$id}" id="{$id}" rows="8" cols="42"></textarea>
+				<textarea cond="$var->type == 'textarea'" name="{$id}" id="{$id}" rows="8" cols="42">{$var->default}</textarea>
 			</block>
 			<block cond="$var->type == 'select'">
 				<select name="{$id}" id="{$id}">
-					<option loop="$var->options => $key, $val" value="{$key}">{$val}</option>
+					<option loop="$var->options => $key, $val" value="{$key}" selected="selected"|cond="$var->default !== '' && $key == $var->default">{$val}</option>
 				</select>
 			</block>
 			<block cond="$var->type == 'select-multi-order'">
-				<!--@if($var->init_options && is_array($var->init_options))-->
+				<!--@if(isset($var->init_options) && is_array($var->init_options))-->
 				{@$inits = array_keys($var->init_options)}
 				<input type="hidden" name="{$id}" value="{implode(',', $inits)}" />
 				<!--@else-->
@@ -76,7 +76,7 @@
 				<div style="display:inline-block;padding-top:3px">
 					<label>{$lang->display_no}</label>
 					<select class="multiorder_show" size="8" multiple="multiple" style="vertical-align:top;margin-bottom:5px">
-						<option loop="$var->options => $key, $val" cond="!$var->init_options[$key]" value="{$key}" default="true"|cond="$var->default_options[$key]">{$val}</option>
+						<option loop="$var->options => $key, $val" cond="empty($var->init_options[$key])" value="{$key}" default="true"|cond="!empty($var->default_options[$key])">{$val}</option>
 					</select>
 					<br>
 					<button type="button" class="x_btn multiorder_add" style="vertical-align:top">{$lang->cmd_insert}</button>
@@ -84,7 +84,7 @@
 				<div style="display:inline-block;padding-top:3px">
 					<label>{$lang->display_yes}</label>
 					<select class="multiorder_selected" size="8" multiple="multiple" style="vertical-align:top;margin-bottom:5px">
-						<option loop="$var->options => $key, $val" cond="$var->init_options[$key]" value="{$key}" default="true"|cond="$var->default_options[$key]">{$val}</option>
+						<option loop="$var->options => $key, $val" cond="!empty($var->init_options[$key])" value="{$key}" default="true"|cond="!empty($var->default_options[$key])">{$val}</option>
 					</select>
 					<br>
 					<button type="button" class="x_btn multiorder_up" style="margin:0 -5px 0 0;border-radius:2px 0 0 2px">{$lang->cmd_move_up}</button>
diff --git a/modules/widget/tpl/widget_generate_code_in_page.html b/modules/widget/tpl/widget_generate_code_in_page.html
index 9fc0f407c..d30ca6c56 100644
--- a/modules/widget/tpl/widget_generate_code_in_page.html
+++ b/modules/widget/tpl/widget_generate_code_in_page.html
@@ -21,7 +21,7 @@
 	</div>
 	<div id="content" class="x_modal-body">
 		<p>{$widget_info->description} {$lang->about_widget_code_in_page}</p>
-		<form cond="$type=='faceoff'" class="x_form-horizontal">
+		<form cond="isset($type) && $type === 'faceoff'" class="x_form-horizontal">
 			<input type="hidden" name="module" value="widget" />
 			<input type="hidden" name="type" value="faceoff" />
 			<input type="hidden" name="act" value="dispWidgetGenerateCodeInPage" />
diff --git a/modules/widget/tpl/widget_style_generate_code_in_page.html b/modules/widget/tpl/widget_style_generate_code_in_page.html
index b7127a8e0..72c7fc132 100644
--- a/modules/widget/tpl/widget_style_generate_code_in_page.html
+++ b/modules/widget/tpl/widget_style_generate_code_in_page.html
@@ -28,9 +28,9 @@
 		</div>
 		<div class="x_modal-body x_form-horizontal">
 			<a href="{getUrl('widgetstyle','none')}" class="widgetStyle"><img src="images/widgetstyle_none.gif" title="{$lang->notuse}" /></a>
-			<a loop="$widgetStyle_list => $key, $widgetStyle" cond="$widgetStyle->preview" href="{getUrl('widgetstyle',$widgetStyle->widgetStyle)}" class="widgetStyle <!--@if($widgetStyle->widgetStyle==$widgetstyle)-->selected<!--@end-->"><img src="{getUrl()}{$widgetStyle->preview}" title="{$widgetStyle->title}" /><span>{$widgetStyle->title}</span></a>
+			<a loop="$widgetStyle_list => $key, $widgetStyle" cond="$widgetStyle->preview" href="{getUrl('widgetstyle',$widgetStyle->widgetStyle)}" class="widgetStyle <!--@if($widgetStyle->widgetStyle == ($widgetstyle ?? ''))-->selected<!--@end-->"><img src="{getUrl()}{$widgetStyle->preview}" title="{$widgetStyle->title}" /><span>{$widgetStyle->title}</span></a>
 			<block cond="$widgetstyle_info">
-	
+
 				<h2>{$widgetstyle_info->title} ver {$widgetstyle_info->version}</h2>
 				<div class="x_control-group">
 					<label class="x_control-label">{$lang->description}</label>
@@ -52,45 +52,46 @@
 						{zdate($widgetstyle_info->date,'Y-m-d')}
 					</div>
 				</div>
-	
+
+				{@ $group = ''; $not_first = false; $suggestion_id = 0; }
 				<block loop="$widgetstyle_info->extra_var => $id, $var">
-					{@$suggestion_id++}
+					{@ $suggestion_id++; }
 					<block cond="!$not_first && !$var->group"><section class="section"></block>
 					<block cond="$group != $var->group">
 						<block cond="$not_first"></section></block>
 						<h1>{$var->group}</h1>
 						<section class="section">
-						{@$group = $var->group}
+						{@ $group = $var->group; }
 					</block>
-					{@$not_first = true}
+					{@ $not_first = true; }
 					<div class="x_control-group">
 						<label class="x_control-label" for="{$id}"|cond="$var->type!='text'&&$var->type!='textarea'" for="lang_{$id}"|cond="$var->type=='text'||$var->type=='textarea'">{$var->name}</label>
 						<div class="x_controls extra_vars">
 							<div cond="$var->type == 'text'">
-								<input type="text" name="{$id}" value="" class="lang_code" />
+								<input type="text" name="{$id}" value="{$var->default}" class="lang_code" />
 							</div>
-	
-							<input cond="$var->type == 'color'" type="text" name="{$id}" class="rx-spectrum" />
-	
+
+							<input cond="$var->type == 'color'" type="text" name="{$id}" value="{$var->default}" class="rx-spectrum" />
+
 							<div cond="$var->type == 'textarea'">
-								<textarea name="{$id}" rows="8" cols="42" class="lang_code"></textarea>
+								<textarea name="{$id}" rows="8" cols="42" class="lang_code">{$var->default}</textarea>
 							</div>
-	
+
 							<select cond="$var->type == 'select'" name="{$id}">
-								<option loop="$var->options => $key, $val" value="{$key}">{$val}</option>
+								<option loop="$var->options ?? [] => $key, $val" value="{$key}" selected="selected"|cond="$var->default !== '' && $key == $var->default">{$val}</option>
 							</select>
-	
+
 							<block cond="$var->type == 'filebox'">
 								<input type="hidden" name="{$id}" />
 								<a href="#modalFilebox" class="modalAnchor filebox">{$lang->cmd_select}</a>
 								{@$use_filebox = TRUE}
 							</block>
 
-							<label loop="$var->options => $key, $val" cond="$var->type == 'radio'">
+							<label loop="$var->options ?? [] => $key, $val" cond="$var->type == 'radio'">
 								<input type="radio" name="{$id}" id="{$id}_{$key}" value="{$key}" > {$val}
 							</label>
 
-							<label loop="$var->options => $key, $val" cond="$var->type == 'checkbox'">
+							<label loop="$var->options ?? [] => $key, $val" cond="$var->type == 'checkbox'">
 								<input type="checkbox" name="{$id}" id="{$id}_{$key}" value="{$key}" > {$val}
 							</label>
 							<span class="x_help-block">{$var->description}</span>
diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php
index aa4b6c7a8..5e2046e87 100644
--- a/modules/widget/widget.controller.php
+++ b/modules/widget/widget.controller.php
@@ -600,25 +600,30 @@ class WidgetController extends Widget
 					{
 						foreach($args as $key => $val)
 						{
+							$val = (string)$val;
 							if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) continue;
 							if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
 							$attribute[] = sprintf('%s="%s"', $key, htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 						}
 					}
 
-					$oWidgetController = getController('widget');
-
-					$widget_content_header = sprintf(
-						'<div class="rhymix_content xe_content widgetOutput ' . $args->css_class . '" widgetstyle="%s" style="%s" widget_padding_left="%s" widget_padding_right="%s" widget_padding_top="%s" widget_padding_bottom="%s" widget="widgetContent" document_srl="%d" %s>'.
+					$widget_content_header = vsprintf(
+						'<div class="rhymix_content xe_content widgetOutput ' . ($args->css_class ?? '') . '" widgetstyle="%s" style="%s" widget_padding_left="%s" widget_padding_right="%s" widget_padding_top="%s" widget_padding_bottom="%s" widget="widgetContent" document_srl="%d" %s>'.
 						'<div class="widgetResize"></div>'.
 						'<div class="widgetResizeLeft"></div>'.
 						'<div class="widgetBorder">'.
-						'<div style="%s">',$args->widgetstyle,
+						'<div style="%s">',
+					[
+						$args->widgetstyle ?? '',
 						$style,
-						$args->widget_padding_left, $args->widget_padding_right, $args->widget_padding_top, $args->widget_padding_bottom,
+						$args->widget_padding_left,
+						$args->widget_padding_right,
+						$args->widget_padding_top,
+						$args->widget_padding_bottom,
 						$args->document_srl,
-						implode(' ',$attribute),
-						$inner_style);
+						implode(' ', $attribute),
+						$inner_style,
+					]);
 
 					$widget_content_body = $body;
 					$widget_content_footer = sprintf('</div>'.
@@ -642,11 +647,21 @@ class WidgetController extends Widget
 						}
 					}
 
-					$widget_content_header = sprintf(
-						'<div class="widgetOutput ' . $args->css_class . '" widgetstyle="%s" widget="widgetBox" style="%s;" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s" %s >'.
+					$widget_content_header = vsprintf(
+						'<div class="widgetOutput ' . ($args->css_class ?? '') . '" widgetstyle="%s" widget="widgetBox" style="%s;" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s" %s >'.
 						'<div class="widgetBoxResize"></div>'.
 						'<div class="widgetBoxResizeLeft"></div>'.
-						'<div class="widgetBoxBorder"><div class="nullWidget" style="%s">',$args->widgetstyle,$style, $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left,implode(' ',$attribute),$inner_style);
+						'<div class="widgetBoxBorder"><div class="nullWidget" style="%s">',
+					[
+						$args->widgetstyle ?? '',
+						$style,
+						$widget_padding_top,
+						$widget_padding_right,
+						$widget_padding_bottom,
+						$widget_padding_left,
+						implode(' ', $attribute),
+						$inner_style,
+					]);
 
 					$widget_content_body = $widgetbox_content;
 
@@ -667,12 +682,20 @@ class WidgetController extends Widget
 						}
 					}
 
-					$widget_content_header = sprintf('<div class="widgetOutput ' . $args->css_class . '" widgetstyle="%s" style="%s" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s" widget="%s" %s >'.
+					$widget_content_header = vsprintf('<div class="widgetOutput ' . ($args->css_class ?? '') . '" widgetstyle="%s" style="%s" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s" widget="%s" %s >'.
 						'<div class="widgetResize"></div>'.
 						'<div class="widgetResizeLeft"></div>'.
-						'<div class="widgetBorder">',$args->widgetstyle,$style,
-						$widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left,
-						$widget, implode(' ',$attribute));
+						'<div class="widgetBorder">',
+					[
+						$args->widgetstyle ?? '',
+						$style,
+						$widget_padding_top,
+						$widget_padding_right,
+						$widget_padding_bottom,
+						$widget_padding_left,
+						$widget,
+						implode(' ', $attribute),
+					]);
 
 					$widget_content_body = sprintf('<div style="%s">%s</div>',$inner_style, $widget_content);
 
diff --git a/modules/widget/widget.model.php b/modules/widget/widget.model.php
index 819a20e54..e7aede7d5 100644
--- a/modules/widget/widget.model.php
+++ b/modules/widget/widget.model.php
@@ -155,7 +155,7 @@ class WidgetModel extends Widget
 	public static function getWidgetStyleInfo($widgetStyle)
 	{
 		// Check the widget style path.
-		$widgetStyle = preg_replace('/[^a-zA-Z0-9-_]/', '', $widgetStyle);
+		$widgetStyle = preg_replace('/[^a-zA-Z0-9-_]/', '', (string)$widgetStyle);
 		$widgetStyle_path = self::getWidgetStylePath($widgetStyle);
 		if (!$widgetStyle_path)
 		{
diff --git a/widgets/content/conf/info.xml b/widgets/content/conf/info.xml
index ca28e37de..cfef3d17e 100644
--- a/widgets/content/conf/info.xml
+++ b/widgets/content/conf/info.xml
@@ -246,7 +246,7 @@
                     <name xml:lang="tr">UL (list)</name>
                 </options>
             </var>
-            <var id="list_count" type="text">
+            <var id="list_count" type="text" default="5">
                 <name xml:lang="ko">목록수</name>
                 <name xml:lang="zh-CN">目录数</name>
                 <name xml:lang="jp">リスト数</name>
@@ -266,7 +266,7 @@
                 <description xml:lang="zh-TW">設置要顯示的目錄數。(預設是5個)</description>
                 <description xml:lang="tr">Görüntülenecek yazıların sayısını ayarlayabilirsiniz. (varsayılan değer 5'tir)</description>
             </var>
-            <var id="cols_list_count" type="text">
+            <var id="cols_list_count" type="text" default="5">
                 <name xml:lang="ko">가로 이미지 수</name>
                 <name xml:lang="jp">横並びイメージ数</name>
                 <name xml:lang="zh-CN">横向图片数</name>

From 69a27d7835345dff9e771ac19d68afab3fc44cad Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Tue, 17 Jun 2025 21:15:37 +0900
Subject: [PATCH 18/19] Ensure that all widget variables always exist #2564

---
 modules/widget/widget.controller.php | 39 ++++++++++++++++++----------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php
index 5e2046e87..e1c651fb8 100644
--- a/modules/widget/widget.controller.php
+++ b/modules/widget/widget.controller.php
@@ -382,7 +382,7 @@ class WidgetController extends Widget
 			}
 
 			$args->widget_sequence = $args->widget_sequence ?? 0;
-			$args->colorset = $args->colorset ?? null;
+			$args->colorset = $args->colorset ?? '';
 
 			foreach ($lang_list as $lang_type => $val)
 			{
@@ -430,6 +430,14 @@ class WidgetController extends Widget
 				return;
 			}
 
+			foreach (WidgetModel::getWidgetInfo($widget)->extra_var ?? [] as $key => $val)
+			{
+				if (!isset($args->{$key}))
+				{
+					$args->{$key} = $val->default;
+				}
+			}
+
 			$widget_content = $oWidget->proc($args);
 			return Context::replaceUserLang($widget_content);
 		}
@@ -453,6 +461,14 @@ class WidgetController extends Widget
 			return;
 		}
 
+		foreach (WidgetModel::getWidgetInfo($widget)->extra_var ?? [] as $key => $val)
+		{
+			if (!isset($args->{$key}))
+			{
+				$args->{$key} = $val->default;
+			}
+		}
+
 		$oFrontEndFileHandler = FrontEndFileHandler::getInstance();
 		$oFrontEndFileHandler->startLog();
 
@@ -498,7 +514,7 @@ class WidgetController extends Widget
 		// Set default
 		$args->widget_sequence = $args->widget_sequence ?? 0;
 		$args->widget_cache = $args->widget_cache ?? 0;
-		$args->colorset = $args->colorset ?? null;
+		$args->colorset = $args->colorset ?? '';
 
 		/**
 		 * Widgets widgetContent/widgetBox Wanted If you are not content
@@ -854,25 +870,20 @@ class WidgetController extends Widget
 		$vars->widget_padding_bottom = trim($request_vars->widget_padding_bottom);
 		$vars->document_srl= trim($request_vars->document_srl);
 
-		if(countobj($widget_info->extra_var))
+		foreach ($widget_info->extra_var ?? [] as $key => $val)
 		{
-			foreach($widget_info->extra_var as $key=>$val)
-			{
-				$vars->{$key} = trim($request_vars->{$key} ?? '');
-			}
+			$vars->{$key} = trim($request_vars->{$key} ?? '');
 		}
-		// If the widget style
+
+		// Additional configuration for widget styles
 		if($request_vars->widgetstyle)
 		{
 			$widgetStyle_info = WidgetModel::getWidgetStyleInfo($request_vars->widgetstyle);
-			if(countobj($widgetStyle_info->extra_var))
+			foreach ($widgetStyle_info->extra_var ?? [] as $key => $val)
 			{
-				foreach($widgetStyle_info->extra_var as $key=>$val)
+				if (in_array($val->type, ['color', 'text', 'select', 'filebox', 'textarea']))
 				{
-					if($val->type =='color' || $val->type =='text' || $val->type =='select' || $val->type =='filebox' || $val->type == 'textarea')
-					{
-						$vars->{$key} = trim($request_vars->{$key} ?? '');
-					}
+					$vars->{$key} = trim($request_vars->{$key} ?? '');
 				}
 			}
 		}

From 52a1178528aa0a1f71a80e4dab3b78e8d90312b9 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Tue, 17 Jun 2025 21:22:14 +0900
Subject: [PATCH 19/19] Add local cache for widget and widgetstyle info

---
 modules/widget/widget.model.php | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/modules/widget/widget.model.php b/modules/widget/widget.model.php
index e7aede7d5..f9cd09d45 100644
--- a/modules/widget/widget.model.php
+++ b/modules/widget/widget.model.php
@@ -128,12 +128,19 @@ class WidgetModel extends Widget
 			return;
 		}
 
-		// Check the cache.
+		// Check the local cache.
 		$xml_mtime = filemtime($xml_file);
+		if (isset($GLOBALS['__widget_info__'][$widget][$xml_mtime]))
+		{
+			return $GLOBALS['__widget_info__'][$widget][$xml_mtime];
+		}
+
+		// Check the system cache.
 		$cache_key = sprintf('widget_info:%s:%d', $widget, $xml_mtime);
 		$widget_info = Rhymix\Framework\Cache::get($cache_key);
 		if ($widget_info)
 		{
+			$GLOBALS['__widget_info__'][$widget][$xml_mtime] = $widget_info;
 			return $widget_info;
 		}
 
@@ -145,6 +152,7 @@ class WidgetModel extends Widget
 		}
 
 		Rhymix\Framework\Cache::set($cache_key, $widget_info);
+		$GLOBALS['__widget_info__'][$widget][$xml_mtime] = $widget_info;
 		return $widget_info;
 	}
 
@@ -169,12 +177,19 @@ class WidgetModel extends Widget
 			return;
 		}
 
-		// Check the cache.
+		// Check the local cache.
 		$xml_mtime = filemtime($xml_file);
+		if (isset($GLOBALS['__widgetstyle_info__'][$widgetStyle][$xml_mtime]))
+		{
+			return $GLOBALS['__widgetstyle_info__'][$widgetStyle][$xml_mtime];
+		}
+
+		// Check the system cache.
 		$cache_key = sprintf('widgetstyle_info:%s:%d', $widgetStyle, $xml_mtime);
 		$widgetStyle_info = Rhymix\Framework\Cache::get($cache_key);
 		if ($widgetStyle_info)
 		{
+			$GLOBALS['__widgetstyle_info__'][$widgetStyle][$xml_mtime] = $widgetStyle_info;
 			return $widgetStyle_info;
 		}
 
@@ -186,6 +201,7 @@ class WidgetModel extends Widget
 		}
 
 		Rhymix\Framework\Cache::set($cache_key, $widgetStyle_info);
+		$GLOBALS['__widgetstyle_info__'][$widgetStyle][$xml_mtime] = $widgetStyle_info;
 		return $widgetStyle_info;
 	}
 }