From a55796904d8a694625b1e60ad7ed82ac263fd53a Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 20 Oct 2014 11:04:50 +0900 Subject: [PATCH] =?UTF-8?q?DHTML=20=EC=97=90=EB=94=94=ED=84=B0=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/categoryform.php | 8 ++++---- adm/shop_admin/configform.php | 6 +++--- adm/shop_admin/itemeventform.php | 4 ++-- adm/shop_admin/itemform.php | 12 ++++++------ adm/shop_admin/itemqaform.php | 4 ++-- adm/shop_admin/itemuseform.php | 2 +- mobile/shop/event.php | 4 ++-- mobile/shop/item.php | 4 ++-- mobile/shop/itemqaform.php | 2 +- mobile/shop/itemuseform.php | 2 +- mobile/shop/list.php | 4 ++-- mobile/skin/shop/basic/itemqa.skin.php | 6 +++--- mobile/skin/shop/basic/itemqalist.skin.php | 6 +++--- mobile/skin/shop/basic/itemuse.skin.php | 2 +- mobile/skin/shop/basic/itemuselist.skin.php | 2 +- shop/event.php | 4 ++-- shop/item.php | 4 ++-- shop/itemqaform.php | 2 +- shop/itemuseform.php | 2 +- shop/list.php | 4 ++-- skin/shop/basic/itemqa.skin.php | 6 +++--- skin/shop/basic/itemqalist.skin.php | 6 +++--- skin/shop/basic/itemuse.skin.php | 2 +- skin/shop/basic/itemuselist.skin.php | 2 +- 24 files changed, 50 insertions(+), 50 deletions(-) diff --git a/adm/shop_admin/categoryform.php b/adm/shop_admin/categoryform.php index b379f00f9..ce14ae624 100644 --- a/adm/shop_admin/categoryform.php +++ b/adm/shop_admin/categoryform.php @@ -361,28 +361,28 @@ else 상단내용 - + 하단내용 - + 모바일 상단내용 - + 모바일 하단내용 - + diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php index c5092a5e6..3cffbcc41 100644 --- a/adm/shop_admin/configform.php +++ b/adm/shop_admin/configform.php @@ -762,11 +762,11 @@ if(!isset($default['de_pg_service'])) { 배송정보 - + 교환/반품 - + @@ -1055,7 +1055,7 @@ if(!isset($default['de_pg_service'])) { 비회원에 대한
개인정보수집 내용 - + MYSQL USER diff --git a/adm/shop_admin/itemeventform.php b/adm/shop_admin/itemeventform.php index bb2869d90..632eed997 100644 --- a/adm/shop_admin/itemeventform.php +++ b/adm/shop_admin/itemeventform.php @@ -296,13 +296,13 @@ include_once (G5_ADMIN_PATH.'/admin.head.php'); 상단내용 - + 하단내용 - + diff --git a/adm/shop_admin/itemform.php b/adm/shop_admin/itemform.php index 2a8f8bd91..93326a78d 100644 --- a/adm/shop_admin/itemform.php +++ b/adm/shop_admin/itemform.php @@ -450,11 +450,11 @@ if(!sql_query(" select it_skin from {$g5['g5_shop_item_table']} limit 1", false) 상품설명 - + 모바일 상품설명 - + @@ -1595,7 +1595,7 @@ $(function(){ 상품상단내용 - + @@ -1605,7 +1605,7 @@ $(function(){ 상품하단내용 - + @@ -1615,7 +1615,7 @@ $(function(){ 모바일 상품상단내용 - + @@ -1625,7 +1625,7 @@ $(function(){ 모바일 상품하단내용 - + diff --git a/adm/shop_admin/itemqaform.php b/adm/shop_admin/itemqaform.php index e94b4381f..a1655b722 100644 --- a/adm/shop_admin/itemqaform.php +++ b/adm/shop_admin/itemqaform.php @@ -68,11 +68,11 @@ $qstr = 'page='.$page.'&sort1='.$sort1.'&sort2='.$sort2; - + - + diff --git a/adm/shop_admin/itemuseform.php b/adm/shop_admin/itemuseform.php index faa9ee367..f37d740a5 100644 --- a/adm/shop_admin/itemuseform.php +++ b/adm/shop_admin/itemuseform.php @@ -62,7 +62,7 @@ $qstr = 'page='.$page.'&sort1='.$sort1.'&sort2='.$sort2; 내용 - + 확인 diff --git a/mobile/shop/event.php b/mobile/shop/event.php index eb6081a89..da4f8e698 100644 --- a/mobile/shop/event.php +++ b/mobile/shop/event.php @@ -18,7 +18,7 @@ if ($is_admin) '.stripslashes($ev['ev_head_html']).''; +echo '
'.conv_content($ev['ev_head_html'], 1).'
'; // 상품 출력순서가 있다면 if ($sort != "") @@ -77,7 +77,7 @@ echo get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_S '.stripslashes($ev['ev_tail_html']).''; +echo '
'.conv_content($ev['ev_tail_html'], 1).'
'; ?> diff --git a/mobile/shop/item.php b/mobile/shop/item.php index 0b1e042b5..89832de61 100644 --- a/mobile/shop/item.php +++ b/mobile/shop/item.php @@ -190,7 +190,7 @@ if(!is_file($nav_skin)) include $nav_skin; // 상단 HTML -echo '
'.stripslashes($it['it_mobile_head_html']).'
'; +echo '
'.conv_content($it['it_mobile_head_html'], 1).'
'; ?> @@ -215,7 +215,7 @@ else diff --git a/mobile/shop/itemqaform.php b/mobile/shop/itemqaform.php index d3cb23f75..e0e338263 100644 --- a/mobile/shop/itemqaform.php +++ b/mobile/shop/itemqaform.php @@ -47,7 +47,7 @@ $is_dhtml_editor = false; if ($config['cf_editor'] && !G5_IS_MOBILE) { $is_dhtml_editor = true; } -$editor_html = editor_html('iq_question', $qa['iq_question'], $is_dhtml_editor); +$editor_html = editor_html('iq_question', get_text($qa['iq_question'], 0), $is_dhtml_editor); $editor_js = ''; $editor_js .= get_editor_js('iq_question', $is_dhtml_editor); $editor_js .= chk_editor_js('iq_question', $is_dhtml_editor); diff --git a/mobile/shop/itemuseform.php b/mobile/shop/itemuseform.php index 445145f6c..3792c9463 100644 --- a/mobile/shop/itemuseform.php +++ b/mobile/shop/itemuseform.php @@ -42,7 +42,7 @@ $is_dhtml_editor = false; if ($config['cf_editor'] && !G5_IS_MOBILE) { $is_dhtml_editor = true; } -$editor_html = editor_html('is_content', $use['is_content'], $is_dhtml_editor); +$editor_html = editor_html('is_content', get_text($use['is_content'], 0), $is_dhtml_editor); $editor_js = ''; $editor_js .= get_editor_js('is_content', $is_dhtml_editor); $editor_js .= chk_editor_js('is_content', $is_dhtml_editor); diff --git a/mobile/shop/list.php b/mobile/shop/list.php index 91444f0fe..98fd8c5b3 100644 --- a/mobile/shop/list.php +++ b/mobile/shop/list.php @@ -48,7 +48,7 @@ define('G5_SHOP_CSS_URL', str_replace(G5_PATH, G5_URL, $skin_dir)); include $nav_skin; // 상단 HTML - echo '
'.stripslashes($ca['ca_mobile_head_html']).'
'; + echo '
'.conv_content($ca['ca_mobile_head_html'], 1).'
'; // 상품 출력순서가 있다면 if ($sort != "") @@ -110,7 +110,7 @@ define('G5_SHOP_CSS_URL', str_replace(G5_PATH, G5_URL, $skin_dir)); '.stripslashes($ca['ca_mobile_tail_html']).''; + echo '
'.conv_content($ca['ca_mobile_tail_html'], 1).'
'; ?> diff --git a/mobile/skin/shop/basic/itemqa.skin.php b/mobile/skin/shop/basic/itemqa.skin.php index 466fc1e5a..8165ee98d 100644 --- a/mobile/skin/shop/basic/itemqa.skin.php +++ b/mobile/skin/shop/basic/itemqa.skin.php @@ -24,13 +24,13 @@ add_stylesheet('', $iq_subject .= ' 비밀글'; if($is_admin || $member['mb_id' ] == $row['mb_id']) { - $iq_question = get_view_thumbnail($row['iq_question'], $thumbnail_width); + $iq_question = get_view_thumbnail(conv_content($row['iq_question'], 1), $thumbnail_width); } else { $iq_question = '비밀글로 보호된 문의입니다.'; $is_secret = true; } } else { - $iq_question = get_view_thumbnail($row['iq_question'], $thumbnail_width); + $iq_question = get_view_thumbnail(conv_content($row['iq_question'], 1), $thumbnail_width); } $iq_time = substr($row['iq_time'], 2, 8); @@ -42,7 +42,7 @@ add_stylesheet('', if ($row['iq_answer']) { - $iq_answer = get_view_thumbnail($row['iq_answer'], $thumbnail_width); + $iq_answer = get_view_thumbnail(conv_content($row['iq_answer'], 1), $thumbnail_width); $iq_stats = '답변완료'; $iq_style = 'sit_qaa_done'; $is_answer = true; diff --git a/mobile/skin/shop/basic/itemqalist.skin.php b/mobile/skin/shop/basic/itemqalist.skin.php index d40f6ba3f..d1643f7d3 100644 --- a/mobile/skin/shop/basic/itemqalist.skin.php +++ b/mobile/skin/shop/basic/itemqalist.skin.php @@ -45,20 +45,20 @@ add_stylesheet('', $iq_subject .= ' 비밀글'; if($is_admin || $member['mb_id' ] == $row['mb_id']) { - $iq_question = get_view_thumbnail($row['iq_question'], $thumbnail_width); + $iq_question = get_view_thumbnail(conv_content($row['iq_question'], 1), $thumbnail_width); } else { $iq_question = '비밀글로 보호된 문의입니다.'; $is_secret = true; } } else { - $iq_question = get_view_thumbnail($row['iq_question'], $thumbnail_width); + $iq_question = get_view_thumbnail(conv_content($row['iq_question'], 1), $thumbnail_width); } $it_href = G5_SHOP_URL.'/item.php?it_id='.$row['it_id']; if ($row['iq_answer']) { - $iq_answer = get_view_thumbnail($row['iq_answer'], $thumbnail_width); + $iq_answer = get_view_thumbnail(conv_content($row['iq_answer'], 1), $thumbnail_width); $iq_stats = '답변완료'; $iq_style = 'sit_qaa_done'; $is_answer = true; diff --git a/mobile/skin/shop/basic/itemuse.skin.php b/mobile/skin/shop/basic/itemuse.skin.php index 7ec07f072..3761076e5 100644 --- a/mobile/skin/shop/basic/itemuse.skin.php +++ b/mobile/skin/shop/basic/itemuse.skin.php @@ -20,7 +20,7 @@ add_stylesheet('', $is_name = get_text($row['is_name']); $is_subject = conv_subject($row['is_subject'],50,"…"); //$is_content = ($row['wr_content']); - $is_content = get_view_thumbnail($row['is_content'], $thumbnail_width); + $is_content = get_view_thumbnail(conv_content($row['is_content'], 1), $thumbnail_width); $is_time = substr($row['is_time'], 2, 8); $is_href = './itemuselist.php?bo_table=itemuse&wr_id='.$row['wr_id']; diff --git a/mobile/skin/shop/basic/itemuselist.skin.php b/mobile/skin/shop/basic/itemuselist.skin.php index fe2dd4190..948b7f3af 100644 --- a/mobile/skin/shop/basic/itemuselist.skin.php +++ b/mobile/skin/shop/basic/itemuselist.skin.php @@ -39,7 +39,7 @@ add_stylesheet('', $num = $total_count - ($page - 1) * $rows - $i; $star = get_star($row['is_score']); - $is_content = get_view_thumbnail($row['is_content'], $thumbnail_width); + $is_content = get_view_thumbnail(conv_content($row['is_content'], 1), $thumbnail_width); $row2 = sql_fetch(" select it_name from {$g5['g5_shop_item_table']} where it_id = '{$row['it_id']}' "); $it_href = G5_SHOP_URL."/item.php?it_id={$row['it_id']}"; diff --git a/shop/event.php b/shop/event.php index 3653e0a59..786ba7b2c 100644 --- a/shop/event.php +++ b/shop/event.php @@ -32,7 +32,7 @@ if (file_exists($himg)) echo '
'; // 상단 HTML -echo '
'.stripslashes($ev['ev_head_html']).'
'; +echo '
'.conv_content($ev['ev_head_html'], 1).'
'; // 상품 출력순서가 있다면 if ($sort != "") @@ -93,7 +93,7 @@ echo get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_S '.stripslashes($ev['ev_tail_html']).''; +echo '
'.conv_content($ev['ev_tail_html'], 1).'
'; $timg = G5_DATA_PATH.'/event/'.$ev_id.'_t'; if (file_exists($timg)) diff --git a/shop/item.php b/shop/item.php index 809ce7920..ff85e34b5 100644 --- a/shop/item.php +++ b/shop/item.php @@ -119,7 +119,7 @@ if ($is_admin) { '.stripslashes($it['it_head_html']).''; +echo '
'.conv_content($it['it_head_html'], 1).'
'; // 보안서버경로 if (G5_HTTPS_DOMAIN) @@ -247,7 +247,7 @@ function pg_anchor($anc_id) { "; include $nav_skin; // 상단 HTML - echo '
'.stripslashes($ca['ca_head_html']).'
'; + echo '
'.conv_content($ca['ca_head_html'], 1).'
'; $cate_skin = $skin_dir.'/listcategory.skin.php'; if(!is_file($cate_skin)) @@ -138,7 +138,7 @@ var itemlist_ca_id = ""; '.stripslashes($ca['ca_tail_html']).''; + echo '
'.conv_content($ca['ca_tail_html'], 1).'
'; ?> diff --git a/skin/shop/basic/itemqa.skin.php b/skin/shop/basic/itemqa.skin.php index 981783f8e..6b661e8bd 100644 --- a/skin/shop/basic/itemqa.skin.php +++ b/skin/shop/basic/itemqa.skin.php @@ -25,13 +25,13 @@ add_stylesheet('', $iq_subject .= ' 비밀글'; if($is_admin || $member['mb_id' ] == $row['mb_id']) { - $iq_question = get_view_thumbnail($row['iq_question'], $thumbnail_width); + $iq_question = get_view_thumbnail(conv_content($row['iq_question'], 1), $thumbnail_width); } else { $iq_question = '비밀글로 보호된 문의입니다.'; $is_secret = true; } } else { - $iq_question = get_view_thumbnail($row['iq_question'], $thumbnail_width); + $iq_question = get_view_thumbnail(conv_content($row['iq_question'], 1), $thumbnail_width); } $iq_time = substr($row['iq_time'], 2, 8); @@ -43,7 +43,7 @@ add_stylesheet('', if ($row['iq_answer']) { - $iq_answer = get_view_thumbnail($row['iq_answer'], $thumbnail_width); + $iq_answer = get_view_thumbnail(conv_content($row['iq_answer'], 1), $thumbnail_width); $iq_stats = '답변완료'; $iq_style = 'sit_qaa_done'; $is_answer = true; diff --git a/skin/shop/basic/itemqalist.skin.php b/skin/shop/basic/itemqalist.skin.php index a48374d15..e9f167d04 100644 --- a/skin/shop/basic/itemqalist.skin.php +++ b/skin/shop/basic/itemqalist.skin.php @@ -46,20 +46,20 @@ add_stylesheet('', $iq_subject .= ' 비밀글'; if($is_admin || $member['mb_id' ] == $row['mb_id']) { - $iq_question = get_view_thumbnail($row['iq_question'], $thumbnail_width); + $iq_question = get_view_thumbnail(conv_content($row['iq_question'], 1), $thumbnail_width); } else { $iq_question = '비밀글로 보호된 문의입니다.'; $is_secret = true; } } else { - $iq_question = get_view_thumbnail($row['iq_question'], $thumbnail_width); + $iq_question = get_view_thumbnail(conv_content($row['iq_question'], 1), $thumbnail_width); } $it_href = G5_SHOP_URL.'/item.php?it_id='.$row['it_id']; if ($row['iq_answer']) { - $iq_answer = get_view_thumbnail($row['iq_answer'], $thumbnail_width); + $iq_answer = get_view_thumbnail(conv_content($row['iq_answer'], 1), $thumbnail_width); $iq_stats = '답변완료'; $iq_style = 'sit_qaa_done'; $is_answer = true; diff --git a/skin/shop/basic/itemuse.skin.php b/skin/shop/basic/itemuse.skin.php index 4d1389237..320445065 100644 --- a/skin/shop/basic/itemuse.skin.php +++ b/skin/shop/basic/itemuse.skin.php @@ -20,7 +20,7 @@ add_stylesheet('', $is_star = get_star($row['is_score']); $is_name = get_text($row['is_name']); $is_subject = conv_subject($row['is_subject'],50,"…"); - $is_content = get_view_thumbnail($row['is_content'], $thumbnail_width); + $is_content = get_view_thumbnail(conv_content($row['is_content'], 1), $thumbnail_width); $is_time = substr($row['is_time'], 2, 8); $is_href = './itemuselist.php?bo_table=itemuse&wr_id='.$row['wr_id']; diff --git a/skin/shop/basic/itemuselist.skin.php b/skin/shop/basic/itemuselist.skin.php index 8d2ba9f23..741929d75 100644 --- a/skin/shop/basic/itemuselist.skin.php +++ b/skin/shop/basic/itemuselist.skin.php @@ -39,7 +39,7 @@ add_stylesheet('', $num = $total_count - ($page - 1) * $rows - $i; $star = get_star($row['is_score']); - $is_content = get_view_thumbnail($row['is_content'], $thumbnail_width); + $is_content = get_view_thumbnail(conv_content($row['is_content'], 1), $thumbnail_width); $row2 = sql_fetch(" select it_name from {$g5['g5_shop_item_table']} where it_id = '{$row['it_id']}' "); $it_href = G5_SHOP_URL."/item.php?it_id={$row['it_id']}";