diff --git a/adm/config_form.php b/adm/config_form.php index c1960e7c0..286626896 100644 --- a/adm/config_form.php +++ b/adm/config_form.php @@ -1089,7 +1089,7 @@ include_once('_rewrite_config_form.php'); >
-

카카오 웹 Redirect Path

+

카카오 로그인 Redirect URI

diff --git a/adm/qa_config.php b/adm/qa_config.php index 92e9a4632..b73062251 100644 --- a/adm/qa_config.php +++ b/adm/qa_config.php @@ -306,7 +306,7 @@ if(!isset($qaconfig['qa_include_head'])) { - + diff --git a/adm/qa_config_update.php b/adm/qa_config_update.php index 1072b765f..a269c45ee 100644 --- a/adm/qa_config_update.php +++ b/adm/qa_config_update.php @@ -50,6 +50,8 @@ if( $qa_include_tail && ! is_include_path_check($qa_include_tail, 1) ){ $error_msg = '/data/file/ 또는 /data/editor/ 포함된 문자를 하단 파일 경로에 포함시킬수 없습니다.'; } +$_POST['qa_title'] = strip_tags($_POST['qa_title']); + $sql = " update {$g5['qa_config_table']} set qa_title = '{$_POST['qa_title']}', qa_category = '{$_POST['qa_category']}', diff --git a/adm/sms_admin/history_view.php b/adm/sms_admin/history_view.php index 43e144fa4..a62558385 100644 --- a/adm/sms_admin/history_view.php +++ b/adm/sms_admin/history_view.php @@ -12,6 +12,10 @@ if( $st && !in_array($st, array('hs_name', 'hs_hp', 'bk_no')) ){ $st = ''; } +if( $sst && !in_array($sst, array('mb_id', 'bk_no', 'hs_name', 'hs_hp', 'hs_datetime', 'hs_flag', 'hs_code', 'hs_memo', 'hs_log')) ){ + $sst = ''; +} + auth_check($auth[$sub_menu], "r"); $g5['title'] = "문자전송 상세내역"; @@ -22,7 +26,7 @@ if (!is_numeric($wr_no)) if ($spage < 1) $spage = 1; if ($sst && trim($ssv)) - $sql_search = " and $sst like '%$ssv%' "; + $sql_search = " and $sst like '%".sql_real_escape_string($ssv)."%' "; else $sql_search = ""; diff --git a/bbs/qawrite.php b/bbs/qawrite.php index 5a7a47345..484f271b5 100644 --- a/bbs/qawrite.php +++ b/bbs/qawrite.php @@ -67,7 +67,7 @@ if(is_file($skin_file)) { $content = ''; if ($w == '') { - $content = $qaconfig['qa_insert_content']; + $content = html_purifier($qaconfig['qa_insert_content']); } else if($w == 'r') { if($is_dhtml_editor) $content = '



====== 이전 답변내용 =======
'; diff --git a/lib/common.lib.php b/lib/common.lib.php index 1fef56ac3..bf4ea5be4 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -3709,12 +3709,15 @@ function is_include_path_check($path='', $is_input='') if( preg_match('/\/data\/(file|editor|qa|cache|member|member_image|session|tmp)\/[A-Za-z0-9_]{1,20}\//i', $replace_path) ){ return false; } - if( (preg_match('/\.\.\//i', $replace_path) || preg_match('/^\/.*/i', $replace_path)) && preg_match('/plugin\//i', $replace_path) && preg_match('/okname\//i', $replace_path) ){ + if( preg_match('/'.G5_PLUGIN_DIR.'\//i', $replace_path) && (preg_match('/'.G5_OKNAME_DIR.'\//i', $replace_path) || preg_match('/'.G5_KCPCERT_DIR.'\//i', $replace_path) || preg_match('/'.G5_LGXPAY_DIR.'\//i', $replace_path)) ){ return false; } if( substr_count($replace_path, './') > 5 ){ return false; } + if( defined('G5_SHOP_DIR') && preg_match('/'.G5_SHOP_DIR.'\//i', $replace_path) && preg_match('/kcp\//i', $replace_path) ){ + return false; + } } $extension = pathinfo($path, PATHINFO_EXTENSION); diff --git a/plugin/sns/view.sns.skin.php b/plugin/sns/view.sns.skin.php index 7a4f5cf91..4d3533c74 100644 --- a/plugin/sns/view.sns.skin.php +++ b/plugin/sns/view.sns.skin.php @@ -24,11 +24,38 @@ $bo_v_sns_class = $config['cf_kakao_js_apikey'] ? 'show_kakao' : ''; ?> - - - + + @@ -37,7 +64,6 @@ $bo_v_sns_class = $config['cf_kakao_js_apikey'] ? 'show_kakao' : '';
  • 트위터로 공유트위터 공유
  • 구글플러스로 공유구글+ 공유
    • -
  • 카카오톡으로 보내기
    • +
  • 카카오톡으로 보내기
    • - diff --git a/plugin/social/includes/functions.php b/plugin/social/includes/functions.php index fab949a88..50fb6af81 100644 --- a/plugin/social/includes/functions.php +++ b/plugin/social/includes/functions.php @@ -48,10 +48,6 @@ function get_social_callbackurl($provider, $no_domain=false){ $base_url = G5_SOCIAL_LOGIN_BASE_URL; - if( $provider === 'kakao' && $no_domain ){ - $base_url = '/'.ltrim(parse_url($base_url, PHP_URL_PATH), '/'); - } - if ( $provider === 'twitter' ){ return $base_url; } diff --git a/plugin/social/register_member_update.php b/plugin/social/register_member_update.php index 2fbec2f98..748a82281 100644 --- a/plugin/social/register_member_update.php +++ b/plugin/social/register_member_update.php @@ -44,6 +44,7 @@ if( ! $mb_nick || ! $mb_name ){ $tmp = explode('@', $mb_email); $mb_nick = $mb_nick ? $mb_nick : $tmp[0]; $mb_name = $mb_name ? $mb_name : $tmp[0]; + $mb_nick = exist_mb_nick_recursive($mb_nick, ''); } if( ! isset($mb_password) || ! $mb_password ){ diff --git a/skin/board/gallery/style.css b/skin/board/gallery/style.css index ee9ddd2f3..85d515bb4 100644 --- a/skin/board/gallery/style.css +++ b/skin/board/gallery/style.css @@ -103,6 +103,7 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)} #bo_gall .gall_li {} #bo_gall .gall_li .gall_chk {position:absolute;top:0;left:0;padding:5px} #bo_gall .gall_box {position:relative;margin:0 0 50px 0;border-radius:0 0 2px 2px} +#bo_gall .gall_con {position:relative} .gall_row .col-gn-0,.gall_row .col-gn-1,.gall_row .col-gn-2,.gall_row .col-gn-3,.gall_row .col-gn-4,.gall_row .col-gn-5,.gall_row .col-gn-6,.gall_row .col-gn-7,.gall_row .col-gn-8,.gall_row .col-gn-9,.gall_row .col-gn-10 {position:relative;min-height:1px;padding-left:10px;*padding-left:0;padding-right:10px;*padding-right:0;float:left;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin-left:0} .gall_row .col-gn-0,.latest_row .col-gn-1 {width:100%} @@ -147,7 +148,7 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)} #bo_gall .gall_info .gall_date, #bo_gall .gall_info .gall_view {display:inline-block;margin-left:10px;color:#777} -#bo_gall .gall_option {position:absolute;top:170px;left:10px} +#bo_gall .gall_option {position:absolute;top:10px;right:10px} #bo_gall .gall_option strong {background:#fff;padding:5px 10px;border-radius:30px;-webkit-box-shadow:2px 2px 3px 0px rgba(0,0,0,0.2); -moz-box-shadow:2px 2px 3px 0px rgba(0,0,0,0.2); box-shadow:2px 2px 3px 0px rgba(0,0,0,0.2)} diff --git a/theme/basic/skin/board/gallery/style.css b/theme/basic/skin/board/gallery/style.css index ee9ddd2f3..85d515bb4 100644 --- a/theme/basic/skin/board/gallery/style.css +++ b/theme/basic/skin/board/gallery/style.css @@ -103,6 +103,7 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)} #bo_gall .gall_li {} #bo_gall .gall_li .gall_chk {position:absolute;top:0;left:0;padding:5px} #bo_gall .gall_box {position:relative;margin:0 0 50px 0;border-radius:0 0 2px 2px} +#bo_gall .gall_con {position:relative} .gall_row .col-gn-0,.gall_row .col-gn-1,.gall_row .col-gn-2,.gall_row .col-gn-3,.gall_row .col-gn-4,.gall_row .col-gn-5,.gall_row .col-gn-6,.gall_row .col-gn-7,.gall_row .col-gn-8,.gall_row .col-gn-9,.gall_row .col-gn-10 {position:relative;min-height:1px;padding-left:10px;*padding-left:0;padding-right:10px;*padding-right:0;float:left;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin-left:0} .gall_row .col-gn-0,.latest_row .col-gn-1 {width:100%} @@ -147,7 +148,7 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)} #bo_gall .gall_info .gall_date, #bo_gall .gall_info .gall_view {display:inline-block;margin-left:10px;color:#777} -#bo_gall .gall_option {position:absolute;top:170px;left:10px} +#bo_gall .gall_option {position:absolute;top:10px;right:10px} #bo_gall .gall_option strong {background:#fff;padding:5px 10px;border-radius:30px;-webkit-box-shadow:2px 2px 3px 0px rgba(0,0,0,0.2); -moz-box-shadow:2px 2px 3px 0px rgba(0,0,0,0.2); box-shadow:2px 2px 3px 0px rgba(0,0,0,0.2)}