Skip to content

Commit

Permalink
Eyoom Builder 4 - [4.2.7]
Browse files Browse the repository at this point in the history
  • Loading branch information
@eyoom
eyoom committed Feb 8, 2021
1 parent cea9740 commit 203fb1c
Show file tree
Hide file tree
Showing 15 changed files with 97 additions and 46 deletions.
4 changes: 2 additions & 2 deletions adm/eyoom_admin/core/board/board_form.php
View file
Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions adm/eyoom_admin/core/board/boardgroup_form_update.php
View file
Expand Up @@ -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);
19 changes: 13 additions & 6 deletions adm/eyoom_admin/core/board/boardgroup_list_update.php
View file
Expand Up @@ -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])."',
Expand All @@ -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&amp;pid=board_list&amp;sfl=gr_id&amp;stx='.$gr_id);
Expand All @@ -53,4 +58,6 @@
}
}

run_event('admin_boardgroup_list_update', $act_button, $chk, $post_group_id, $qstr);

alert($msg, G5_ADMIN_URL . '/?dir=board&amp;pid=boardgroup_list&amp;'.$qstr);
18 changes: 18 additions & 0 deletions adm/eyoom_admin/core/config/config_form_update.php
View file
Expand Up @@ -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; $i<count($pattern); $i++) {
$pattern[$i] = trim($pattern[$i]);
if (empty($pattern[$i]))
continue;

$pattern[$i] = str_replace(".", "\.", $pattern[$i]);
$pattern[$i] = str_replace("+", "[0-9\.]+", $pattern[$i]);
$pat = "/^{$pattern[$i]}$/";

if( preg_match($pat, $_SERVER['REMOTE_ADDR']) ){
alert("현재 접속 IP : ".$_SERVER['REMOTE_ADDR']." 가 차단될수 있기 때문에, 다른 IP를 입력해 주세요.");
}
}
}

$sql = " update {$g5['config_table']}
set cf_title = '{$_POST['cf_title']}',
cf_admin = '{$_POST['cf_admin']}',
Expand Down
4 changes: 1 addition & 3 deletions adm/eyoom_admin/core/member/member_form.php
View file
Expand Up @@ -148,14 +148,12 @@
$icon_file = G5_DATA_PATH.'/member/'.$mb_dir.'/'.get_mb_icon_name($mb['mb_id']).'.gif';
if (file_exists($icon_file)) {
$icon_url = str_replace(G5_DATA_PATH, G5_DATA_URL, $icon_file);
$icon_filemtile = (defined('G5_USE_MEMBER_IMAGE_FILETIME') && G5_USE_MEMBER_IMAGE_FILETIME) ? '?'.filemtime($icon_file) : '';
}

// 회원이미지
$mb_dir = substr($mb['mb_id'],0,2);
$photo_file = G5_DATA_PATH.'/member_image/'.$mb_dir.'/'.get_mb_icon_name($mb['mb_id']).'.gif';
if (file_exists($photo_file)) {
$photo_url = str_replace(G5_DATA_PATH, G5_DATA_URL, $photo_file);
}

// query string
$lev = clean_xss_tags(trim($_GET['lev']));
Expand Down
1 change: 0 additions & 1 deletion adm/eyoom_admin/core/shop/configformupdate.php
View file
Expand Up @@ -477,7 +477,6 @@
if( $warning_msg ){
alert($warning_msg, G5_ADMIN_URL . "/?dir=shop&amp;pid=configform");
} else {
goto_url("./configform.php");
alert('쇼핑몰 설정을 적용하였습니다.', G5_ADMIN_URL . "/?dir=shop&amp;pid=configform");
}
}
35 changes: 20 additions & 15 deletions adm/eyoom_admin/core/shopetc/orderprintresult.php
View file
Expand Up @@ -132,7 +132,7 @@ function conv_telno($t)
$fr_date = date_conv($fr_date);
$to_date = date_conv($to_date);

$sql = " SELECT a.od_id, od_b_zip1, od_b_zip2, od_b_addr1, od_b_addr2, od_b_addr3, od_b_addr_jibeon, od_b_name, od_b_tel, od_b_hp, b.it_name, ct_qty, b.it_id, a.od_id, od_memo, od_invoice, b.ct_option, b.ct_send_cost, b.it_sc_type, a.od_time
$sql = " SELECT a.od_id, od_zip1, od_zip2, od_addr1, od_addr2, od_addr3, od_addr_jibeon, od_name, od_tel, od_hp, od_b_zip1, od_b_zip2, od_b_addr1, od_b_addr2, od_b_addr3, od_b_addr_jibeon, od_b_name, od_b_tel, od_b_hp, b.it_name, ct_qty, b.it_id, a.od_id, od_memo, od_invoice, b.ct_option, b.ct_send_cost, b.it_sc_type, a.od_time
FROM {$g5['g5_shop_order_table']} a, {$g5['g5_shop_cart_table']} b
where a.od_id = b.od_id ";
if ($case == 1) // 출력기간
Expand All @@ -159,7 +159,7 @@ function conv_telno($t)
$worksheet = $workbook->addworksheet();

// Put Excel data
$data = array('우편번호', '주소', '이름', '전화1', '전화2', '상품명', '수량', '선택사항', '배송비', '상품코드', '주문번호', '운송장번호', '전하실말씀');
$data = array('보내는분_우편번호', '보내는분_주소', '보내는분_이름', '보내는분_전화1', '보내는분_전화2', '받는분_우편번호', '받는분_주소', '받는분_이름', '받는분_전화1', '받는분_전화2', '상품명', '수량', '선택사항', '배송비', '상품코드', '주문번호', '운송장번호', '전하실말씀');
$data = array_map('iconv_euckr', $data);

$col = 0;
Expand Down Expand Up @@ -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();
Expand Down
26 changes: 23 additions & 3 deletions adm/eyoom_admin/theme/basic/skin/config/config_form.html.php
View file
Expand Up @@ -1643,7 +1643,7 @@
<label class="checkbox">
<input type="checkbox" name="cf_social_servicelist[]" id="check_social_payco" value="payco" <?php echo option_array_checked('payco', $config['cf_social_servicelist']); ?>><i></i> 페이코 로그인을 사용합니다.
</label>
<div class="note margin-bottom-10"><strong>Note:</strong> 페이코 CallbackURL : <?php echo get_social_callbackurl('payco'); ?></div>
<div class="note margin-bottom-10"><strong>Note:</strong> 페이코 CallbackURL : <?php echo get_social_callbackurl('payco', false, true); ?></div>
</td>
</tr>
</tbody>
Expand Down Expand Up @@ -1718,7 +1718,7 @@
<span>
<label class="input form-width-220px"><input type="text" name="cf_twitter_key" id="cf_twitter_key" value="<?php echo $config['cf_twitter_key']; ?>"> </label>
</span>
<span><a href="https://dev.twitter.com/apps" target="_blank" class="btn-e btn-e-md btn-e-dark">앱 등록하기</a></span>
<span><a href="https://developer.twitter.com/en/apps" target="_blank" class="btn-e btn-e-md btn-e-dark">앱 등록하기</a></span>
</div>
</td>
<?php if (G5_IS_MOBILE) { ?>
Expand Down Expand Up @@ -1781,7 +1781,7 @@
<span>
<label class="input form-width-220px"><input type="text" name="cf_kakao_rest_key" id="cf_kakao_rest_key" value="<?php echo $config['cf_kakao_rest_key']; ?>"> </label>
</span>
<span><a href="https://developers.kakao.com/apps/new" target="_blank" class="btn-e btn-e-md btn-e-dark">앱 등록하기</a></span>
<span><a href="https://developers.kakao.com/product/kakaoLogin" target="_blank" class="btn-e btn-e-md btn-e-dark">앱 등록하기</a></span>
</div>
</td>
<?php if (G5_IS_MOBILE) { ?>
Expand Down Expand Up @@ -2166,6 +2166,26 @@
});

function fconfigform_submit(f) {
var current_user_ip = "<?php echo $_SERVER['REMOTE_ADDR']; ?>";
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 = "<?php echo $action_url1; ?>";
return true;
}
Expand Down
6 changes: 3 additions & 3 deletions adm/eyoom_admin/theme/basic/skin/member/member_form.html.php
View file
Expand Up @@ -262,7 +262,7 @@
<div class="button bg-color-light-grey"><input type="file" id="mb_icon" name="mb_icon" value="파일선택" onchange="this.parentNode.nextSibling.value = this.value">파일선택</div><input type="text" readonly>
</label>
<?php if ($icon_url) { ?>
<img src="<?php echo $icon_url; ?>" alt="">
<img src="<?php echo $icon_url.$icon_filemtile; ?>" alt="">
<label for="del_mb_icon" class="checkbox"><input type="checkbox" id="del_mb_icon" name="del_mb_icon" value="1"><i></i> 삭제</label>
<?php } ?>
<div class="note"><strong>Note:</strong> 아이콘 크기는 <strong>넓이 <?php echo $config['cf_member_icon_width']; ?>픽셀 높이 <?php echo $config['cf_member_icon_height']; ?>픽셀</strong>로 해주세요.</div>
Expand All @@ -278,8 +278,8 @@
<label for="file" class="input input-file">
<div class="button bg-color-light-grey"><input type="file" id="mb_img" name="mb_img" value="파일선택" onchange="this.parentNode.nextSibling.value = this.value">파일선택</div><input type="text" readonly>
</label>
<?php if ($photo_url) { ?>
<img src="<?php echo $photo_url; ?>" alt="">
<?php if (file_exists($photo_file)) { ?>
<?php echo get_member_profile_img($mb['mb_id']); ?>
<label for="del_mb_img" class="checkbox"><input type="checkbox" id="del_mb_img" name="del_mb_img" value="1"><i></i> 삭제</label>
<?php } ?>
<div class="note"><strong>Note:</strong> 이미지 크기는 <strong>넓이 <?php echo $config['cf_member_img_width']; ?>픽셀 높이 <?php echo $config['cf_member_img_height']; ?>픽셀</strong>로 해주세요.</div>
Expand Down
13 changes: 7 additions & 6 deletions eyoom/core/board/view.skin.php
View file
Expand Up @@ -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++;
}
}

/**
Expand Down
3 changes: 1 addition & 2 deletions eyoom/core/shop/search.php
View file
Expand Up @@ -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 ");
Expand Down
2 changes: 1 addition & 1 deletion eyoom/extend/eyoom4.version.php
View file
Expand Up @@ -7,4 +7,4 @@
/**
* 이윰빌더 시즌4 버전
*/
define('EYOOM_VERSION', '4.2.6');
define('EYOOM_VERSION', '4.2.7');
4 changes: 2 additions & 2 deletions theme/eb4_basic/skin/member/basic/social_login.skin.html.php
View file
Expand Up @@ -17,7 +17,7 @@
$self_url = G5_SOCIAL_LOGIN_URL.'/popup.php';
}

add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css">', 10);
add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css?ver='.G5_CSS_VER.'">', 10);
?>

<style>
Expand Down Expand Up @@ -57,7 +57,7 @@
<li><a href="<?php echo $self_url;?>?provider=facebook&amp;url=<?php echo $urlencode;?>" class="social_link facebook-sl-btn" title="페이스북"><img src="<?php echo EYOOM_THEME_URL; ?>/image/social/facebook.png"><span>페이스북 로그인</span></a></li>
<?php } //end if ?>
<?php if( social_service_check('google') ) { //구글 로그인을 사용한다면 ?>
<li><a href="<?php echo $self_url;?>?provider=google&amp;url=<?php echo $urlencode;?>" class="social_link google-sl-btn" title="구글"><img src="<?php echo EYOOM_THEME_URL; ?>/image/social/google.png"><span>구글+ 로그인</span></a></li>
<li><a href="<?php echo $self_url;?>?provider=google&amp;url=<?php echo $urlencode;?>" class="social_link google-sl-btn" title="구글"><img src="<?php echo EYOOM_THEME_URL; ?>/image/social/google.png"><span>구글 로그인</span></a></li>
<?php } //end if ?>
<?php if( social_service_check('twitter') ) { //트위터 로그인을 사용한다면 ?>
<li><a href="<?php echo $self_url;?>?provider=twitter&amp;url=<?php echo $urlencode;?>" class="social_link twitter-sl-btn" title="트위터"><img src="<?php echo EYOOM_THEME_URL; ?>/image/social/twitter.png"><span>트위터 로그인</span></a></li>
Expand Down
2 changes: 2 additions & 0 deletions theme/eb4_basic/skin/outlogin/basic/social_outlogin.skin.1.html.php
View file
Expand Up @@ -16,6 +16,8 @@
if( G5_SOCIAL_USE_POPUP ) {
$self_url = G5_SOCIAL_LOGIN_URL.'/popup.php';
}

add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css?ver='.G5_CSS_VER.'">', 10);
?>

<style>
Expand Down
4 changes: 2 additions & 2 deletions theme/eb4_basic/skin/shop/basic/event.skin.html.php
View file
Expand Up @@ -23,7 +23,7 @@
<?php } ?>

<?php /* 상단 HTML */ ?>
<div id="sev_hhtml" class="margin-bottom-20"><?php echo conv_content($ca['ev_head_html'], 1); ?></div>
<div id="sev_hhtml" class="margin-bottom-20"><?php echo conv_content($ev['ev_head_html'], 1); ?></div>

<div class="shop-list-sort-wrap">
<?php include $sort_skin; ?>
Expand All @@ -36,7 +36,7 @@
<?php echo eb_paging($eyoom['paging_skin']);?>

<?php /* 하단 HTML */ ?>
<div id="sev_thtml"><?php echo conv_content($ca['ev_tail_html'], 1); ?></div>
<div id="sev_thtml"><?php echo conv_content($ev['ev_tail_html'], 1); ?></div>

<?php /* 이벤트 테일 이미지 */ ?>
<?php if (file_exists($timg)) { ?>
Expand Down

0 comments on commit 203fb1c

Please sign in to comment.