Merge remote-tracking branch '그누보드/master'

# Conflicts:
#	adm/shop_admin/orderform.php
#	bbs/register_form_update.php
#	lib/common.lib.php
#	mobile/shop/personalpayform.sub.php
#	plugin/htmlpurifier/extend.video.php
#	plugin/kcaptcha/kcaptcha.lib.php
#	shop/orderformupdate.php
#	skin/social/social_register_member.skin.php
#	version.php

plugin/htmlpurifier/extend.video.php

@@ -77,4 +77,33 @@ if( !class_exists('HTMLPurifier_Filter_Iframevideo') ){
 			}
 		}
 	}
+}
+
+if( !class_exists('HTMLPurifierContinueParamFilter') ){
+	class HTMLPurifierContinueParamFilter extends HTMLPurifier_URIFilter
+	{
+		public $name = 'ContinueParamFilter';
+        
+        public function filter(&$uri, $config, $context)
+        {
+            // 쿼리 파라미터 검사
+            $query = $uri->query;
+            $path = $uri->path;
+            
+            if ($path && preg_match('#[\\\\/]logout#i', $path)) {
+                return false;
+            }
+            
+            if ($query) {
+                
+                parse_str($query, $query_params);
+                
+                if (isset($query_params['continue']) || isset($query_params['pcurl'])) {
+                    return false;
+                }
+            }
+
+            return true; // 조건 통과 시 허용
+        }
+	}
 }

plugin/kcaptcha/kcaptcha.lib.php

@@ -278,6 +278,8 @@ function captcha_html($class="captcha")
     $html .= "\n".'#captcha.m_captcha {border:1px solid #ddd; width: 100%; padding: 10px; box-sizing: border-box; border-radius: 6px; text-align:center}';
     $html .= "\n".'</style>';
     return $html;
+    
+    return run_replace('kcaptcha_captcha_html', $html, $class);
 }
 
 

plugin/social/register_member_update.php

@@ -97,6 +97,44 @@ if( defined('G5_SOCIAL_CERTIFY_MAIL') && G5_SOCIAL_CERTIFY_MAIL && $config['cf_u
 $mb_mailling = (isset($_POST['mb_mailling']) && $_POST['mb_mailling']) ? 1 : 0;
 //회원 정보 공개
 $mb_open = (isset($_POST['mb_open']) && $_POST['mb_open']) ? 1 : 0;
+//회원 SMS 동의
+$mb_sms = isset($_POST['mb_sms']) ? trim($_POST['mb_sms']) : "0";
+//마케팅 목적의 개인정보 수집 및 이용 동의
+$mb_marketing_agree = isset($_POST['mb_marketing_agree']) ? trim($_POST['mb_marketing_agree']) : "0";
+//개인정보 제3자 제공 동의
+$mb_thirdparty_agree = isset($_POST['mb_thirdparty_agree']) ? trim($_POST['mb_thirdparty_agree']) : "0";
+
+$agree_items = [];
+$sql_agree = "";
+// 마케팅 목적의 개인정보 수집 및 이용
+if ($mb_marketing_agree == 1) {
+    $sql_agree .=  " , mb_marketing_date = '".G5_TIME_YMDHIS."' ";
+    $agree_items[] = "마케팅 목적의 개인정보 수집 및 이용(동의)";
+}
+
+// 광고성 이메일 수신
+if ($mb_mailling == 1) {
+    $sql_agree .=  " , mb_mailling_date = '".G5_TIME_YMDHIS."' ";
+    $agree_items[] = "광고성 이메일 수신(동의)";
+}
+
+// 광고성 SMS/카카오톡 수신
+if ($mb_sms == 1) {
+    $sql_agree .=  " , mb_sms_date = '".G5_TIME_YMDHIS."' ";
+    $agree_items[] = "광고성 SMS/카카오톡 수신(동의)";
+}
+
+// 개인정보 제3자 제공
+if ($mb_thirdparty_agree == 1) {
+    $sql_agree .=  " , mb_thirdparty_date = '".G5_TIME_YMDHIS."' ";
+    $agree_items[] = "개인정보 제3자 제공(동의)";
+}
+
+// 동의 로그 추가
+if (!empty($agree_items)) {
+    $agree_log = "[".G5_TIME_YMDHIS.", ". $provider_name ." 회원가입] " . implode(' | ', $agree_items) . "\n";
+    $sql_agree .= " , mb_agree_log = CONCAT('{$agree_log}', IFNULL(mb_agree_log, ''))";
+}
 
 //===============================================================
 //  본인확인
@@ -164,9 +202,12 @@ $sql = " insert into {$g5['member_table']}
                 mb_level = '{$config['cf_register_level']}',
                 mb_login_ip = '{$_SERVER['REMOTE_ADDR']}',
                 mb_mailling = '{$mb_mailling}',
-                mb_sms = '0',
+                mb_sms = '{$mb_sms}',
                 mb_open = '{$mb_open}',
-                mb_open_date = '".G5_TIME_YMD."'
+                mb_open_date = '".G5_TIME_YMD."',
+                mb_marketing_agree = '{$mb_marketing_agree}',
+                mb_thirdparty_agree = '{$mb_thirdparty_agree}'
+                {$sql_agree}
                 {$sql_certify} ";
 $result = sql_query($sql, false);