diff --git a/adm/eyoom_admin/core/board/board_form.php b/adm/eyoom_admin/core/board/board_form.php index 2b3314e2..99dacae0 100644 --- a/adm/eyoom_admin/core/board/board_form.php +++ b/adm/eyoom_admin/core/board/board_form.php @@ -84,11 +84,11 @@ } if (!isset($board['bo_use_captcha'])) { - sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_use_captcha` TINYINT NOT NULL DEFAULT '0' AFTER `bo_use_sns` "); + sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_use_captcha` TINYINT NOT NULL DEFAULT '0' AFTER `bo_use_sns` ", false); } if (!isset($board['bo_select_editor'])) { - sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_select_editor` VARCHAR(50) NOT NULL DEFAULT '' AFTER `bo_use_dhtml_editor` "); + sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_select_editor` VARCHAR(50) NOT NULL DEFAULT '' AFTER `bo_use_dhtml_editor` ", false); } run_event('adm_board_form_before', $board, $w); diff --git a/adm/eyoom_admin/core/board/boardgroup_form_update.php b/adm/eyoom_admin/core/board/boardgroup_form_update.php index 6066560e..2e92fb5f 100644 --- a/adm/eyoom_admin/core/board/boardgroup_form_update.php +++ b/adm/eyoom_admin/core/board/boardgroup_form_update.php @@ -75,4 +75,6 @@ alert('제대로 된 값이 넘어오지 않았습니다.'); } +run_event('admin_boardgroup_form_update', $gr_id, $w); + alert($msg, G5_ADMIN_URL . '/?dir=board&pid=boardgroup_form&w=u&gr_id='.$gr_id.'&'.$qstr); \ No newline at end of file diff --git a/adm/eyoom_admin/core/board/boardgroup_list_update.php b/adm/eyoom_admin/core/board/boardgroup_list_update.php index 9d5b6862..2006fa7b 100644 --- a/adm/eyoom_admin/core/board/boardgroup_list_update.php +++ b/adm/eyoom_admin/core/board/boardgroup_list_update.php @@ -14,19 +14,24 @@ check_admin_token(); -$count = count($_POST['chk']); +$post_chk = isset($_POST['chk']) ? (array) $_POST['chk'] : array(); +$post_group_id = isset($_POST['group_id']) ? (array) $_POST['group_id'] : array(); +$act_button = isset($_POST['act_button']) ? $_POST['act_button'] : ''; + +$count = count($post_chk); if(!$count) - alert($_POST['act_button'].'할 게시판그룹을 1개이상 선택해 주세요.'); + alert($act_button.'할 게시판그룹을 1개이상 선택해 주세요.'); for ($i=0; $i<$count; $i++) { - $k = $_POST['chk'][$i]; - $gr_id = preg_replace('/[^a-z0-9_]/i', '', $_POST['group_id'][$k]); + $k = $post_chk[$i]; + $gr_id = preg_replace('/[^a-z0-9_]/i', '', $post_group_id[$k]); + $gr_subject = is_array($_POST['gr_subject']) ? strip_tags(clean_xss_attributes($_POST['gr_subject'][$k])) : ''; $gr_admin = is_array($_POST['gr_admin']) ? strip_tags(clean_xss_attributes($_POST['gr_admin'][$k])) : ''; - if($_POST['act_button'] == '선택수정') { + if($act_button == '선택수정') { $sql = " update {$g5['group_table']} set gr_subject = '{$gr_subject}', gr_device = '".sql_real_escape_string($_POST['gr_device'][$k])."', @@ -39,7 +44,7 @@ sql_query($sql); $msg = "선택한 게시판그룹의 정보를 수정하였습니다."; - } else if($_POST['act_button'] == '선택삭제') { + } else if($act_button == '선택삭제') { $row = sql_fetch(" select count(*) as cnt from {$g5['board_table']} where gr_id = '$gr_id' "); if ($row['cnt']) alert("이 그룹에 속한 게시판이 존재하여 게시판 그룹을 삭제할 수 없습니다.\\n\\n이 그룹에 속한 게시판을 먼저 삭제하여 주십시오.", G5_ADMIN_URL . '/?dir=board&pid=board_list&sfl=gr_id&stx='.$gr_id); @@ -53,4 +58,6 @@ } } +run_event('admin_boardgroup_list_update', $act_button, $chk, $post_group_id, $qstr); + alert($msg, G5_ADMIN_URL . '/?dir=board&pid=boardgroup_list&'.$qstr); \ No newline at end of file diff --git a/adm/eyoom_admin/core/config/config_form_update.php b/adm/eyoom_admin/core/config/config_form_update.php index 94a35465..782b5171 100644 --- a/adm/eyoom_admin/core/config/config_form_update.php +++ b/adm/eyoom_admin/core/config/config_form_update.php @@ -42,6 +42,24 @@ $_POST['cf_icode_server_port'] = isset($_POST['cf_icode_server_port']) ? preg_replace('/[^0-9]/', '', $_POST['cf_icode_server_port']) : '7295'; +if(isset($_POST['cf_intercept_ip']) && $_POST['cf_intercept_ip']){ + + $pattern = explode("\n", trim($_POST['cf_intercept_ip'])); + for ($i=0; $iaddworksheet(); // Put Excel data - $data = array('우편번호', '주소', '이름', '전화1', '전화2', '상품명', '수량', '선택사항', '배송비', '상품코드', '주문번호', '운송장번호', '전하실말씀'); + $data = array('보내는분_우편번호', '보내는분_주소', '보내는분_이름', '보내는분_전화1', '보내는분_전화2', '받는분_우편번호', '받는분_주소', '받는분_이름', '받는분_전화1', '받는분_전화2', '상품명', '수량', '선택사항', '배송비', '상품코드', '주문번호', '운송장번호', '전하실말씀'); $data = array_map('iconv_euckr', $data); $col = 0; @@ -209,19 +209,24 @@ function conv_telno($t) $row = array_map('iconv_euckr', $row); - $worksheet->write($i, 0, ' '.$row['od_b_zip1'].$row['od_b_zip2']); - $worksheet->write($i, 1, $pull_address); - $worksheet->write($i, 2, $row['od_b_name']); - $worksheet->write($i, 3, ' '.$row['od_b_tel']); - $worksheet->write($i, 4, ' '.$row['od_b_hp']); - $worksheet->write($i, 5, $row['it_name']); - $worksheet->write($i, 6, $row['ct_qty']); - $worksheet->write($i, 7, $row['ct_option']); - $worksheet->write($i, 8, $ct_send_cost); - $worksheet->write($i, 9, ' '.$row['it_id']); - $worksheet->write($i, 10, ' '.$row['od_id']); - $worksheet->write($i, 11, $row['od_invoice']); - $worksheet->write($i, 12, $row['od_memo']); + $worksheet->write($i, 0, ' '.$row['od_zip1'].$row['od_zip2']); + $worksheet->write($i, 1, $send_address); + $worksheet->write($i, 2, $row['od_name']); + $worksheet->write($i, 3, ' '.$row['od_tel']); + $worksheet->write($i, 4, ' '.$row['od_hp']); + $worksheet->write($i, 5, ' '.$row['od_b_zip1'].$row['od_b_zip2']); + $worksheet->write($i, 6, $pull_address); + $worksheet->write($i, 7, $row['od_b_name']); + $worksheet->write($i, 8, ' '.$row['od_b_tel']); + $worksheet->write($i, 9, ' '.$row['od_b_hp']); + $worksheet->write($i, 10, $row['it_name']); + $worksheet->write($i, 11, $row['ct_qty']); + $worksheet->write($i, 12, $row['ct_option']); + $worksheet->write($i, 13, $ct_send_cost); + $worksheet->write($i, 14, ' '.$row['it_id']); + $worksheet->write($i, 15, ' '.$row['od_id']); + $worksheet->write($i, 16, $row['od_invoice']); + $worksheet->write($i, 17, $row['od_memo']); } $workbook->close(); diff --git a/adm/eyoom_admin/theme/basic/skin/config/config_form.html.php b/adm/eyoom_admin/theme/basic/skin/config/config_form.html.php index ace97e5b..9bb3dba8 100644 --- a/adm/eyoom_admin/theme/basic/skin/config/config_form.html.php +++ b/adm/eyoom_admin/theme/basic/skin/config/config_form.html.php @@ -1643,7 +1643,7 @@ -
Note: 페이코 CallbackURL :
+
Note: 페이코 CallbackURL :
@@ -1718,7 +1718,7 @@ - 앱 등록하기 + 앱 등록하기 @@ -1781,7 +1781,7 @@ - 앱 등록하기 + 앱 등록하기 @@ -2166,6 +2166,26 @@ }); function fconfigform_submit(f) { + var current_user_ip = ""; + var cf_intercept_ip_val = f.cf_intercept_ip.value; + + if( cf_intercept_ip_val && current_user_ip ){ + var cf_intercept_ips = cf_intercept_ip_val.split("\n"); + + for(var i=0; i < cf_intercept_ips.length; i++){ + if ( cf_intercept_ips[i].trim() ) { + cf_intercept_ips[i] = cf_intercept_ips[i].replace(".", "\."); + cf_intercept_ips[i] = cf_intercept_ips[i].replace("+", "[0-9\.]+"); + + var re = new RegExp(cf_intercept_ips[i]); + if ( re.test(current_user_ip) ){ + alert("현재 접속 IP : "+ current_user_ip +" 가 차단될수 있기 때문에, 다른 IP를 입력해 주세요."); + return false; + } + } + } + } + f.action = ""; return true; } diff --git a/adm/eyoom_admin/theme/basic/skin/member/member_form.html.php b/adm/eyoom_admin/theme/basic/skin/member/member_form.html.php index b0dd575d..06dfb322 100644 --- a/adm/eyoom_admin/theme/basic/skin/member/member_form.html.php +++ b/adm/eyoom_admin/theme/basic/skin/member/member_form.html.php @@ -262,7 +262,7 @@
파일선택
- +
Note: 아이콘 크기는 넓이 픽셀 높이 픽셀로 해주세요.
@@ -278,8 +278,8 @@ - - + +
Note: 이미지 크기는 넓이 픽셀 높이 픽셀로 해주세요.
diff --git a/eyoom/core/board/view.skin.php b/eyoom/core/board/view.skin.php index a9528575..cba42d3d 100644 --- a/eyoom/core/board/view.skin.php +++ b/eyoom/core/board/view.skin.php @@ -101,12 +101,13 @@ * 링크 정보 가져오기 */ $i=1; -foreach ($view['link'] as $k => $v) { - if (!$v) break; - $view_link[$i]['link'] = cut_str($view['link'][$i], 70); - $view_link[$i]['href'] = $view['link_href'][$i]; - $view_link[$i]['hit'] = $view['link_hit'][$i]; - $i++; +if(isset($view['link']) && array_filter($view['link'])) { + foreach ($view['link'] as $k => $v) { + $view_link[$i]['link'] = cut_str($view['link'][$i], 70); + $view_link[$i]['href'] = $view['link_href'][$i]; + $view_link[$i]['hit'] = $view['link_hit'][$i]; + $i++; + } } /** diff --git a/eyoom/core/shop/search.php b/eyoom/core/shop/search.php index 55c77401..47e16f6a 100644 --- a/eyoom/core/shop/search.php +++ b/eyoom/core/shop/search.php @@ -151,8 +151,7 @@ * 리스트 유형별로 출력 */ $list_file = $skin_dir.'/'.$default['de_search_list_skin']; - -if (file_exists($list_file)) { +if (file_exists($list_file) && is_include_path_check($list_file)) { define('G5_SHOP_CSS_URL', G5_SHOP_SKIN_URL); $list = new item_list($list_file, $default['de_search_list_mod'], $default['de_search_list_row'], $default['de_search_img_width'], $default['de_search_img_height']); $list->set_query(" select * $sql_common $sql_where {$order_by} limit $from_record, $items "); diff --git a/eyoom/extend/eyoom4.version.php b/eyoom/extend/eyoom4.version.php index 84b3c8d2..1ed852e0 100644 --- a/eyoom/extend/eyoom4.version.php +++ b/eyoom/extend/eyoom4.version.php @@ -7,4 +7,4 @@ /** * 이윰빌더 시즌4 버전 */ -define('EYOOM_VERSION', '4.2.6'); \ No newline at end of file +define('EYOOM_VERSION', '4.2.7'); \ No newline at end of file diff --git a/theme/eb4_basic/skin/member/basic/social_login.skin.html.php b/theme/eb4_basic/skin/member/basic/social_login.skin.html.php index 79fd31e6..019ae72a 100644 --- a/theme/eb4_basic/skin/member/basic/social_login.skin.html.php +++ b/theme/eb4_basic/skin/member/basic/social_login.skin.html.php @@ -17,7 +17,7 @@ $self_url = G5_SOCIAL_LOGIN_URL.'/popup.php'; } -add_stylesheet('', 10); +add_stylesheet('', 10); ?>