g5 merge 충돌 수정

2014-02-14 13:41:49 +09:00
parent 989e5d6fdd 619e5c223c
commit dcb75a7735
96 changed files with 1942 additions and 209 deletions
--- a/bbs/content.php
+++ b/bbs/content.php
@ -0,0 +1,94 @@
+<?php
+include_once('./_common.php');
+
+//dbconfig파일에 $g5['content_table'] 배열변수가 있는지 체크
+if( !isset($g5['content_table']) ){
+    die('<meta charset="utf-8">관리자 모드에서 게시판관리->내용 관리를 먼저 확인해 주세요.');
+}
+
+// 내용
+$sql = " select * from {$g5['content_table']} where co_id = '$co_id' ";
+$co = sql_fetch($sql);
+if (!$co['co_id'])
+    alert('등록된 내용이 없습니다.');
+
+$g5['title'] = $co['co_subject'];
+
+if ($co['co_include_head'])
+    @include_once($co['co_include_head']);
+else
+    include_once('./_head.php');
+
+$str = conv_content($co['co_content'], $co['co_html']);
+
+// $src 를 $dst 로 변환
+unset($src);
+unset($dst);
+$src[] = "/{{쇼핑몰명}}|{{홈페이지제목}}/";
+//$dst[] = $default[de_subject];
+$dst[] = $config['cf_title'];
+$src[] = "/{{회사명}}|{{상호}}/";
+$dst[] = $default['de_admin_company_name'];
+$src[] = "/{{대표자명}}/";
+$dst[] = $default['de_admin_company_owner'];
+$src[] = "/{{사업자등록번호}}/";
+$dst[] = $default['de_admin_company_saupja_no'];
+$src[] = "/{{대표전화번호}}/";
+$dst[] = $default['de_admin_company_tel'];
+$src[] = "/{{팩스번호}}/";
+$dst[] = $default['de_admin_company_fax'];
+$src[] = "/{{통신판매업신고번호}}/";
+$dst[] = $default['de_admin_company_tongsin_no'];
+$src[] = "/{{사업장우편번호}}/";
+$dst[] = $default['de_admin_company_zip'];
+$src[] = "/{{사업장주소}}/";
+$dst[] = $default['de_admin_company_addr'];
+$src[] = "/{{운영자명}}|{{관리자명}}/";
+$dst[] = $default['de_admin_name'];
+$src[] = "/{{운영자e-mail}}|{{관리자e-mail}}/i";
+$dst[] = $default['de_admin_email'];
+$src[] = "/{{정보관리책임자명}}/";
+$dst[] = $default['de_admin_info_name'];
+$src[] = "/{{정보관리책임자e-mail}}|{{정보책임자e-mail}}/i";
+$dst[] = $default['de_admin_info_email'];
+
+$str = preg_replace($src, $dst, $str);
+
+if ($is_admin)
+    echo '<div class="ctt_admin"><a href="'.G5_ADMIN_URL.'/contentform.php?w=u&amp;co_id='.$co_id.'" class="btn_admin">내용 수정</a></div>';
+?>
+
+<!-- 등록내용 시작 { -->
+<?php
+$himg = G5_DATA_PATH.'/content/'.$co_id.'_h';
+if (file_exists($himg)) // 상단 이미지
+    echo '<div id="ctt_himg" class="ctt_img"><img src="'.G5_DATA_URL.'/content/'.$co_id.'_h" alt=""></div>';
+?>
+
+<article id="ctt" class="ctt_<?php echo $co_id; ?>">
+    <header>
+        <h1><?php echo $g5['title']; ?></h1>
+    </header>
+
+    <div id="ctt_con">
+        <?php echo $str; ?>
+    </div>
+
+</article>
+
+<?php
+$timg = G5_DATA_PATH.'/content/'.$co_id.'_t';
+if (file_exists($timg)) // 하단 이미지
+    echo '<div id="ctt_timg" class="ctt_img"><img src="'.G5_DATA_URL.'/content/'.$co_id.'_t" alt=""></div>';
+
+if ($is_admin)
+    echo '<div class="ctt_admin"><a href="'.G5_ADMIN_URL.'/contentform.php?w=u&amp;co_id='.$co_id.'" class="btn_admin">내용 수정</a></div>';
+?>
+<!-- } 등록내용 끝 -->
+
+<?php
+if ($co['co_include_tail'])
+    @include_once($co['co_include_tail']);
+else
+    include_once('./_tail.php');
+?>
--- a/bbs/faq.php
+++ b/bbs/faq.php
@ -0,0 +1,96 @@
+<?php
+include_once('./_common.php');
+
+if (!$fm_id) $fm_id = 1;
+
+//dbconfig파일에 $g5['faq_table'] , $g5['faq_master_table'] 배열변수가 있는지 체크
+if( !isset($g5['faq_table']) || !isset($g5['faq_master_table']) ){
+    die('<meta charset="utf-8">관리자 모드에서 게시판관리->FAQ관리를 먼저 확인해 주세요.');
+}
+
+// FAQ MASTER
+$sql = " select * from {$g5['faq_master_table']} where fm_id = '$fm_id' ";
+$fm = sql_fetch($sql);
+if (!$fm['fm_id'])
+    alert('등록된 내용이 없습니다.');
+
+$g5['title'] = $fm['fm_subject'];
+include_once('./_head.php');
+?>
+
+<?php
+if ($is_admin)
+    echo '<div class="faq_admin"><a href="'.G5_ADMIN_URL.'/faqmasterform.php?w=u&amp;fm_id='.$fm_id.'" class="btn_admin">FAQ 수정</a></div>';
+?>
+
+<!-- FAQ 시작 { -->
+<?php
+$himg = G5_DATA_PATH.'/faq/'.$fm_id.'_h';
+if (file_exists($himg))
+    echo '<div id="faq_himg" class="faq_img"><img src="'.G5_DATA_URL.'/faq/'.$fm_id.'_h" alt=""></div>';
+
+// 상단 HTML
+echo '<div id="faq_hhtml">'.stripslashes($fm['fm_head_html']).'</div>';
+?>
+
+<div id="faq_wrap" class="faq_<?php echo $fm_id; ?>">
+    <?php // FAQ 목차
+    $sql = " select * from {$g5['faq_table']}
+              where fm_id = '$fm_id'
+              order by fa_order , fa_id ";
+    $result = sql_query($sql);
+    for ($i=1; $row=sql_fetch_array($result); $i++)
+    {
+        if ($i == 1)
+        {
+    ?>
+    <section id="faq_list">
+        <h2><?php echo $g5['title']; ?> 목차</h2>
+        <ol>
+    <?php } ?>
+            <li><a href="#faq_<?php echo $fm_id.'_'.$i; ?>"><?php echo stripslashes($row['fa_subject']); ?></a></li>
+    <?php }
+    if ($i > 1) echo '</ol></section>';
+    ?>
+
+    <?php // FAQ 내용
+    $resultb = sql_query($sql);
+    for ($i=1; $row=sql_fetch_array($resultb); $i++)
+    {
+        if ($i == 1)
+        {
+    ?>
+    <section id="faq_con">
+        <h2><?php echo $g5['title']; ?> 내용</h2>
+        <ol>
+    <?php } ?>
+        <li id="faq_<?php echo $fm_id.'_'.$i; ?>">
+            <h3><?php echo stripslashes($row['fa_subject']); ?></h3>
+            <div id="con_inner">
+                <?php echo stripslashes($row['fa_content']); ?>
+            </div>
+            <div class="faq_tolist"><a href="#faq_list" class="btn01">FAQ 목차</a></div>
+        </li>
+    <?php }
+    if ($i > 1) echo '</ol></section>';
+
+    if ($i == 1) echo '<p>등록된 FAQ가 없습니다.<br><a href="'.G5_ADMIN_URL.'/faqmasterlist.php">FAQ를 새로 등록하시려면 FAQ관리</a> 메뉴를 이용하십시오.</p>';
+    ?>
+</div>
+
+<?php
+// 하단 HTML
+echo '<div id="faq_thtml">'.stripslashes($fm['fm_tail_html']).'</div>';
+
+$timg = G5_DATA_PATH.'/faq/'.$fm_id.'_t';
+if (file_exists($timg))
+    echo '<div id="faq_timg" class="faq_img"><img src="'.G5_DATA_URL.'/faq/'.$fm_id.'_t" alt=""></div>';
+?>
+<!-- } FAQ 끝 -->
+
+<?php
+if ($is_admin)
+    echo '<div class="faq_admin"><a href="'.G5_ADMIN_URL.'/faqmasterform.php?w=u&amp;fm_id='.$fm_id.'" class="btn_admin">FAQ 수정</a></div>';
+
+include_once('./_tail.php');
+?>
--- a/bbs/newwin.inc.php
+++ b/bbs/newwin.inc.php
@ -0,0 +1,48 @@
+<?php
+if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
+
+$sql = " select * from {$g5['new_win_table']}
+          where '".G5_TIME_YMDHIS."' between nw_begin_time and nw_end_time
+            and nw_device IN ( 'both', 'pc' )
+          order by nw_id asc ";
+$result = sql_query($sql);
+for ($i=0; $row_nw=sql_fetch_array($result); $i++)
+{
+    // 이미 체크 되었다면 Continue
+    if ($_COOKIE["hd_pops_{$row_nw['nw_id']}"])
+        continue;
+
+    $sql = " select * from {$g5['new_win_table']} where nw_id = '{$row_nw['nw_id']}' ";
+    $nw = sql_fetch($sql);
+?>
+
+<!-- 팝업레이어 시작 { -->
+<div id="hd_pops_<?php echo $nw['nw_id'] ?>" class="hd_pops" style="top:<?php echo $nw['nw_top']?>px;left:<?php echo $nw['nw_left']?>px;width:<?php echo $nw['nw_width'] ?>px;height:<?php echo $nw['nw_height'] ?>px">
+    <div class="hd_pops_con">
+        <?php echo conv_content($nw['nw_content'], 1); ?>
+    </div>
+    <div class="hd_pops_footer">
+        <button class="hd_pops_reject hd_pops_<?php echo $nw['nw_id']; ?> <?php echo $nw['nw_disable_hours']; ?>"><strong><?php echo $nw['nw_disable_hours']; ?></strong>시간 동안 다시 열람하지 않습니다.</button>
+        <button class="hd_pops_close hd_pops_<?php echo $nw['nw_id']; ?>">닫기</button>
+    </div>
+</div>
+<?php }
+if ($i == 0) echo '<span class="sound_only">팝업레이어 알림이 없습니다.</span>';
+?>
+
+<script>
+$(function() {
+    $(".hd_pops_reject").click(function() {
+        var id = $(this).attr('class').split(' ');
+        var ck_name = id[1];
+        var exp_time = parseInt(id[2]);
+        $("#"+id[1]).css("display", "none");
+        set_cookie(ck_name, 1, exp_time, g5_cookie_domain);
+    });
+    $('.hd_pops_close').click(function() {
+        var idb = $(this).attr('class').split(' ');
+        $('#'+idb[1]).css('display','none');
+    });
+});
+</script>
+<!-- } 팝업레이어 끝 -->