Merge branch 'master' of github.com:gnuboard/yc5

This commit is contained in:
SIR
2014-10-20 16:29:39 +09:00
38 changed files with 83 additions and 86 deletions

View File

@ -842,7 +842,7 @@ $frm_submit .= '</div>';
<tr>
<th scope="row"><label for="bo_content_head">상단 내용</label></th>
<td>
<?php echo editor_html("bo_content_head", $board['bo_content_head']); ?>
<?php echo editor_html("bo_content_head", get_text($board['bo_content_head'], 0)); ?>
</td>
<td class="td_grpset">
<input type="checkbox" name="chk_grp_content_head" value="1" id="chk_grp_content_head">
@ -854,7 +854,7 @@ $frm_submit .= '</div>';
<tr>
<th scope="row"><label for="bo_content_tail">하단 내용</label></th>
<td>
<?php echo editor_html("bo_content_tail", $board['bo_content_tail']); ?>
<?php echo editor_html("bo_content_tail", get_text($board['bo_content_tail'], 0)); ?>
</td>
<td class="td_grpset">
<input type="checkbox" name="chk_grp_content_tail" value="1" id="chk_grp_content_tail">
@ -866,7 +866,7 @@ $frm_submit .= '</div>';
<tr>
<th scope="row"><label for="bo_mobile_content_head">모바일 상단 내용</label></th>
<td>
<?php echo editor_html("bo_mobile_content_head", $board['bo_mobile_content_head']); ?>
<?php echo editor_html("bo_mobile_content_head", get_text($board['bo_mobile_content_head'], 0)); ?>
</td>
<td class="td_grpset">
<input type="checkbox" name="chk_grp_mobile_content_head" value="1" id="chk_grp_mobile_content_head">
@ -878,7 +878,7 @@ $frm_submit .= '</div>';
<tr>
<th scope="row"><label for="bo_mobile_content_tail">모바일 하단 내용</label></th>
<td>
<?php echo editor_html("bo_mobile_content_tail", $board['bo_mobile_content_tail']); ?>
<?php echo editor_html("bo_mobile_content_tail", get_text($board['bo_mobile_content_tail'], 0)); ?>
</td>
<td class="td_grpset">
<input type="checkbox" name="chk_grp_mobile_content_tail" value="1" id="chk_grp_mobile_content_tail">

View File

@ -18,9 +18,6 @@ if ($w == "u")
$sql = " select * from {$g5['faq_table']} where fa_id = '$fa_id' ";
$fa = sql_fetch($sql);
if (!$fa['fa_id']) alert("등록된 자료가 없습니다.");
$fa['fa_subject'] = htmlspecialchars2($fa['fa_subject']);
$fa['fa_content'] = htmlspecialchars2($fa['fa_content']);
}
else
$html_title .= ' 항목 입력';
@ -53,11 +50,11 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
</tr>
<tr>
<th scope="row">질문</th>
<td><?php echo editor_html('fa_subject', $fa['fa_subject']); ?></td>
<td><?php echo editor_html('fa_subject', get_text($fa['fa_subject'], 0)); ?></td>
</tr>
<tr>
<th scope="row">답변</th>
<td><?php echo editor_html('fa_content', $fa['fa_content']); ?></td>
<td><?php echo editor_html('fa_content', get_text($fa['fa_content'], 0)); ?></td>
</tr>
</tbody>
</table>

View File

@ -113,25 +113,25 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
<tr>
<th scope="row">상단 내용</th>
<td>
<?php echo editor_html('fm_head_html', $fm['fm_head_html']); ?>
<?php echo editor_html('fm_head_html', get_text($fm['fm_head_html'], 0)); ?>
</td>
</tr>
<tr>
<th scope="row">하단 내용</th>
<td>
<?php echo editor_html('fm_tail_html', $fm['fm_tail_html']); ?>
<?php echo editor_html('fm_tail_html', get_text($fm['fm_tail_html'], 0)); ?>
</td>
</tr>
<tr>
<th scope="row">모바일상단 내용</th>
<td>
<?php echo editor_html('fm_mobile_head_html', $fm['fm_mobile_head_html']); ?>
<?php echo editor_html('fm_mobile_head_html', get_text($fm['fm_mobile_head_html'], 0)); ?>
</td>
</tr>
<tr>
<th scope="row">모바일하단 내용</th>
<td>
<?php echo editor_html('fm_mobile_tail_html', $fm['fm_mobile_tail_html']); ?>
<?php echo editor_html('fm_mobile_tail_html', get_text($fm['fm_mobile_tail_html'], 0)); ?>
</td>
</tr>
</tbody>

View File

@ -46,7 +46,7 @@ include_once('./admin.head.php');
</tr>
<tr>
<th scope="row"><label for="ma_content">메일 내용<strong class="sound_only">필수</strong></label></th>
<td><?php echo editor_html("ma_content", $ma['ma_content']); ?></td>
<td><?php echo editor_html("ma_content", get_text($ma['ma_content'], 0)); ?></td>
</tr>
</tbody>
</table>
@ -74,7 +74,7 @@ function fmailform_check(f)
<?php echo get_editor_js("ma_content"); ?>
<?php echo chk_editor_js("ma_content"); ?>
return true;
}

View File

@ -8,7 +8,7 @@ auth_check($auth[$sub_menu], 'r');
$se = sql_fetch("select ma_subject, ma_content from {$g5['mail_table']} where ma_id = '{$ma_id}' ");
$subject = $se['ma_subject'];
$content = $se['ma_content'] . "<hr size=0><p><span style='font-size:9pt; font-family:굴림'>▶ 더 이상 정보 수신을 원치 않으시면 [<a href='".G5_BBS_URL."/email_stop.php?mb_id=***&amp;mb_md5=***' target='_blank'>수신거부</a>] 해 주십시오.</span></p>";
$content = conv_content($se['ma_content'], 1) . "<hr size=0><p><span style='font-size:9pt; font-family:굴림'>▶ 더 이상 정보 수신을 원치 않으시면 [<a href='".G5_BBS_URL."/email_stop.php?mb_id=***&amp;mb_md5=***' target='_blank'>수신거부</a>] 해 주십시오.</span></p>";
?>
<!doctype html>
@ -20,10 +20,10 @@ $content = $se['ma_content'] . "<hr size=0><p><span style='font-size:9pt; font-f
<body>
<h1><?php echo $subject ?></h1>
<h1><?php echo $subject; ?></h1>
<p>
<?php echo $se['ma_content'] ?>
<?php echo $content; ?>
</p>
<p>

View File

@ -126,7 +126,7 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
</tr>
<tr>
<th scope="row"><label for="nw_content">내용</label></th>
<td><?php echo editor_html('nw_content', $nw['nw_content']); ?></td>
<td><?php echo editor_html('nw_content', get_text($nw['nw_content'], 0)); ?></td>
</tr>
</tbody>
</table>

View File

@ -268,25 +268,25 @@ if(!isset($qaconfig['qa_include_head'])) {
<tr>
<th scope="row"><label for="qa_content_head">상단 내용</label></th>
<td>
<?php echo editor_html("qa_content_head", $qaconfig['qa_content_head']); ?>
<?php echo editor_html("qa_content_head", get_text($qaconfig['qa_content_head'], 0)); ?>
</td>
</tr>
<tr>
<th scope="row"><label for="qa_content_tail">하단 내용</label></th>
<td>
<?php echo editor_html("qa_content_tail", $qaconfig['qa_content_tail']); ?>
<?php echo editor_html("qa_content_tail", get_text($qaconfig['qa_content_tail'], 0)); ?>
</td>
</tr>
<tr>
<th scope="row"><label for="qa_mobile_content_head">모바일 상단 내용</label></th>
<td>
<?php echo editor_html("qa_mobile_content_head", $qaconfig['qa_mobile_content_head']); ?>
<?php echo editor_html("qa_mobile_content_head", get_text($qaconfig['qa_mobile_content_head'], 0)); ?>
</td>
</tr>
<tr>
<th scope="row"><label for="qa_mobile_content_tail">모바일 하단 내용</label></th>
<td>
<?php echo editor_html("qa_mobile_content_tail", $qaconfig['qa_mobile_content_tail']); ?>
<?php echo editor_html("qa_mobile_content_tail", get_text($qaconfig['qa_mobile_content_tail'], 0)); ?>
</td>
</tr>
<tr>

View File

@ -361,28 +361,28 @@ else
<th scope="row">상단내용</th>
<td>
<?php echo help("상품리스트 페이지 상단에 출력하는 HTML 내용입니다."); ?>
<?php echo editor_html('ca_head_html', $ca['ca_head_html']); ?>
<?php echo editor_html('ca_head_html', get_text($ca['ca_head_html'], 0)); ?>
</td>
</tr>
<tr>
<th scope="row">하단내용</th>
<td>
<?php echo help("상품리스트 페이지 하단에 출력하는 HTML 내용입니다."); ?>
<?php echo editor_html('ca_tail_html', $ca['ca_tail_html']); ?>
<?php echo editor_html('ca_tail_html', get_text($ca['ca_tail_html'], 0)); ?>
</td>
</tr>
<tr>
<th scope="row">모바일 상단내용</th>
<td>
<?php echo help("상품리스트 페이지 상단에 출력하는 HTML 내용입니다."); ?>
<?php echo editor_html('ca_mobile_head_html', $ca['ca_mobile_head_html']); ?>
<?php echo editor_html('ca_mobile_head_html', get_text($ca['ca_mobile_head_html'], 0)); ?>
</td>
</tr>
<tr>
<th scope="row">모바일 하단내용</th>
<td>
<?php echo help("상품리스트 페이지 하단에 출력하는 HTML 내용입니다."); ?>
<?php echo editor_html('ca_mobile_tail_html', $ca['ca_mobile_tail_html']); ?>
<?php echo editor_html('ca_mobile_tail_html', get_text($ca['ca_mobile_tail_html'], 0)); ?>
</td>
</tr>
</tbody>

View File

@ -762,11 +762,11 @@ if(!isset($default['de_pg_service'])) {
</tr>
<tr>
<th scope="row">배송정보</th>
<td><?php echo editor_html('de_baesong_content', $default['de_baesong_content']); ?></td>
<td><?php echo editor_html('de_baesong_content', get_text($default['de_baesong_content'], 0)); ?></td>
</tr>
<tr>
<th scope="row">교환/반품</th>
<td><?php echo editor_html('de_change_content', $default['de_change_content']); ?></td>
<td><?php echo editor_html('de_change_content', get_text($default['de_change_content'], 0)); ?></td>
</tr>
</tbody>
</table>
@ -1055,7 +1055,7 @@ if(!isset($default['de_pg_service'])) {
</tr>
<tr>
<th scope="row">비회원에 대한<br/>개인정보수집 내용</th>
<td><?php echo editor_html('de_guest_privacy', $default['de_guest_privacy']); ?></td>
<td><?php echo editor_html('de_guest_privacy', get_text($default['de_guest_privacy'], 0)); ?></td>
</tr>
<tr>
<th scope="row">MYSQL USER</th>

View File

@ -296,13 +296,13 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
<tr>
<th scope="row">상단내용</th>
<td>
<?php echo editor_html('ev_head_html', $ev['ev_head_html']); ?>
<?php echo editor_html('ev_head_html', get_text($ev['ev_head_html'], 0)); ?>
</td>
</tr>
<tr>
<th scope="row">하단내용</th>
<td>
<?php echo editor_html('ev_tail_html', $ev['ev_tail_html']); ?>
<?php echo editor_html('ev_tail_html', get_text($ev['ev_tail_html'], 0)); ?>
</td>
</tr>
</tbody>

View File

@ -450,11 +450,11 @@ if(!sql_query(" select it_skin from {$g5['g5_shop_item_table']} limit 1", false)
</tr>
<tr>
<th scope="row">상품설명</th>
<td colspan="2"> <?php echo editor_html('it_explan', $it['it_explan']); ?></td>
<td colspan="2"> <?php echo editor_html('it_explan', get_text($it['it_explan'], 0)); ?></td>
</tr>
<tr>
<th scope="row">모바일 상품설명</th>
<td colspan="2"> <?php echo editor_html('it_mobile_explan', $it['it_mobile_explan']); ?></td>
<td colspan="2"> <?php echo editor_html('it_mobile_explan', get_text($it['it_mobile_explan'], 0)); ?></td>
</tr>
<tr>
<th scope="row"><label for="it_sell_email">판매자 e-mail</label></th>
@ -1595,7 +1595,7 @@ $(function(){
<tbody>
<tr>
<th scope="row">상품상단내용</th>
<td><?php echo help("상품상세설명 페이지 상단에 출력하는 HTML 내용입니다."); ?><?php echo editor_html('it_head_html', $it['it_head_html']); ?></td>
<td><?php echo help("상품상세설명 페이지 상단에 출력하는 HTML 내용입니다."); ?><?php echo editor_html('it_head_html', get_text($it['it_head_html'], 0)); ?></td>
<td class="td_grpset">
<input type="checkbox" name="chk_ca_it_head_html" value="1" id="chk_ca_it_head_html">
<label for="chk_ca_it_head_html">분류적용</label>
@ -1605,7 +1605,7 @@ $(function(){
</tr>
<tr>
<th scope="row">상품하단내용</th>
<td><?php echo help("상품상세설명 페이지 하단에 출력하는 HTML 내용입니다."); ?><?php echo editor_html('it_tail_html', $it['it_tail_html']); ?></td>
<td><?php echo help("상품상세설명 페이지 하단에 출력하는 HTML 내용입니다."); ?><?php echo editor_html('it_tail_html', get_text($it['it_tail_html'], 0)); ?></td>
<td class="td_grpset">
<input type="checkbox" name="chk_ca_it_tail_html" value="1" id="chk_ca_it_tail_html">
<label for="chk_ca_it_tail_html">분류적용</label>
@ -1615,7 +1615,7 @@ $(function(){
</tr>
<tr>
<th scope="row">모바일 상품상단내용</th>
<td><?php echo help("모바일 상품상세설명 페이지 상단에 출력하는 HTML 내용입니다."); ?><?php echo editor_html('it_mobile_head_html', $it['it_mobile_head_html']); ?></td>
<td><?php echo help("모바일 상품상세설명 페이지 상단에 출력하는 HTML 내용입니다."); ?><?php echo editor_html('it_mobile_head_html', get_text($it['it_mobile_head_html'], 0)); ?></td>
<td class="td_grpset">
<input type="checkbox" name="chk_ca_it_mobile_head_html" value="1" id="chk_ca_it_mobile_head_html">
<label for="chk_ca_it_mobile_head_html">분류적용</label>
@ -1625,7 +1625,7 @@ $(function(){
</tr>
<tr>
<th scope="row">모바일 상품하단내용</th>
<td><?php echo help("모바일 상품상세설명 페이지 하단에 출력하는 HTML 내용입니다."); ?><?php echo editor_html('it_mobile_tail_html', $it['it_mobile_tail_html']); ?></td>
<td><?php echo help("모바일 상품상세설명 페이지 하단에 출력하는 HTML 내용입니다."); ?><?php echo editor_html('it_mobile_tail_html', get_text($it['it_mobile_tail_html'], 0)); ?></td>
<td class="td_grpset">
<input type="checkbox" name="chk_ca_it_mobile_tail_html" value="1" id="chk_ca_it_mobile_tail_html">
<label for="chk_ca_it_mobile_tail_html">분류적용</label>

View File

@ -68,11 +68,11 @@ $qstr = 'page='.$page.'&amp;sort1='.$sort1.'&amp;sort2='.$sort2;
</tr>
<tr>
<th scope="row"><label for="iq_question">질문</label></th>
<td><?php echo editor_html('iq_question', $iq['iq_question']); ?></td>
<td><?php echo editor_html('iq_question', get_text($iq['iq_question'], 0)); ?></td>
</tr>
<tr>
<th scope="row"><label for="iq_answer">답변</label></th>
<td><?php echo editor_html('iq_answer', $iq['iq_answer']); ?></td>
<td><?php echo editor_html('iq_answer', get_text($iq['iq_answer'], 0)); ?></td>
<!-- <td><textarea name="iq_answer" id="iq_answer" rows="7"><?php echo get_text($iq['iq_answer']); ?></textarea></td> -->
</tr>
</tbody>

View File

@ -62,7 +62,7 @@ $qstr = 'page='.$page.'&amp;sort1='.$sort1.'&amp;sort2='.$sort2;
</tr>
<tr>
<th scope="row">내용</th>
<td><?php echo editor_html('is_content', $is['is_content']); ?></td>
<td><?php echo editor_html('is_content', get_text($is['is_content'], 0)); ?></td>
</tr>
<tr>
<th scope="row">확인</th>