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

Conflicts: shop/orderform.php
2013-06-27 16:55:58 +09:00
parent acaff22840 225fa4a75d
commit 0e36ab93a4
6 changed files with 110 additions and 1 deletions
--- a/adm/admin.menu100.php
+++ b/adm/admin.menu100.php
@ -9,6 +9,7 @@ $menu['menu100'] = array (
    array('100900', '캐쉬파일 일괄삭제',G4_ADMIN_URL.'/cache_file_delete.php',   'cf_cache', 1),
    array('100910', '캡챠파일 일괄삭제',G4_ADMIN_URL.'/gcaptcha_file_delete.php',   'cf_captcha', 1),
    array('100920', '썸네일파일 일괄삭제',G4_ADMIN_URL.'/thumbnail_file_delete.php',   'cf_thumbnail', 1),
+    array('100930', '네이버 신디케이션 핑',G4_SYNDI_URL.'/ping.php',   'cf_syndi_ping', 1),
    array('100500', 'phpinfo()',        G4_ADMIN_URL.'/phpinfo.php',       'cf_phpinfo'),
    //array('100600', '업그레이드', G4_ADMIN_URL.'/upgrade.php', 'cf_upgrade'),
    //array('100700', '복구/최적화', G4_ADMIN_URL.'/repair.php', 'cf_repair'),
--- a/css/admin.css
+++ b/css/admin.css
@ -419,7 +419,7 @@ fieldset button {padding:0 15px;height:23px;border:0;background:#617d46;color:#f
 .sort_odr {float:left;margin:0 0 10px;padding-left:1px;list-style:none;zoom:1}
 .sort_odr:after {display:block;visibility:hidden;clear:both;content:""}
 .sort_odr li {float:left;margin-bottom:-1px}
-.sort_odr a {display:block;position:relative;margin-left:-1px;padding:8px 0 6px;width:70px;border:1px solid #e9e9e9;background:#f5f6fa;color:#000;text-align:center;letter-spacing:-0.1em;line-height:1.2em;cursor:pointer}
+.sort_odr a {display:inline-block;position:relative;margin-left:-1px;padding:8px 0 6px;width:70px;border:1px solid #e9e9e9;background:#f5f6fa;color:#000;text-align:center;letter-spacing:-0.1em;line-height:1.2em;cursor:pointer}
 .sort_odr a:focus, .sort_odr a:hover, .sort_odr a:active {text-decoration:none}

 .sort_with {float:right}
@ -435,6 +435,7 @@ table {clear:both;margin-bottom:10px;width:100%;border-collapse:collapse;border-
 caption {padding:10px 0 15px;font-weight:bold;text-align:left}
 thead th {padding:12px 0 8px;border-bottom:1px solid #666;background:#565e60;color:#fff}
 thead th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
+thead a {color:#fff}
 tfoot th {border-top:1px solid #666;border-bottom:1px solid #666;background:#484848;color:#fff}
 tfoot td {border-color:#666;background:#484848;color:#fff;font-weight:bold;text-align:center}
 td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;line-height:1.5em;word-break:break-all}
--- a/css/default_shop.css
+++ b/css/default_shop.css
@ -665,6 +665,9 @@ td.empty_table {padding:85px 0;text-align:center}
 #sod_frm {}
 #sod_frm h2 {margin:0 0 10px}

+#display_setup_message {padding:15px;border:1px solid #fccdff;background:#ffeef9}
+#display_setup_message strong {display:block;margin:0 0 10px}
+
 #sod_list {position:relative}
 #sod_list #it_coupon_frm {z-index:10000;position:absolute;top:0;left:99px;padding:20px;width:500px;height:auto !important;height:500px;max-height:500px;border:1px solid #000;background:#f5f6fa;overflow-y:scroll;overflow-x:none}

--- a/js/shop.js
+++ b/js/shop.js
@ -3,6 +3,23 @@ var supply_add = false;

 $(function() {
    // 선택옵션
+    /* 가상서커 ctrl keyup 이베트 대응 */
+    $("select[name='it_option[]']").live("keyup", function(e) {
+        var sel_count = $("select[name='it_option[]']").size();
+        var idx = $("select[name='it_option[]']").index($(this));
+        var code = e.keyCode;
+        var val = $(this).val();
+
+        option_add = false;
+        if(code == 17 && sel_count == idx + 1) {
+            if(val == "")
+                return;
+
+            sel_option_process(true);
+        }
+    });
+
+    /* 키보드 접근 후 옵션 선택 Enter keydown 이벤트 대응 */
    $("select[name='it_option[]']").live("keydown", function(e) {
        var sel_count = $("select[name='it_option[]']").size();
        var idx = $("select[name='it_option[]']").index($(this));
@ -82,6 +99,22 @@ $(function() {
    });

    // 추가옵션
+    /* 가상서커 ctrl keyup 이베트 대응 */
+    $("select[name='it_supply[]']").live("keyup", function(e) {
+        var $el = $(this);
+        var code = e.keyCode;
+        var val = $(this).val();
+
+        supply_add = false;
+        if(code == 17) {
+            if(val == "")
+                return;
+
+            sel_supply_process($el, true);
+        }
+    });
+
+    /* 키보드 접근 후 옵션 선택 Enter keydown 이벤트 대응 */
    $("select[name='it_supply[]']").live("keydown", function(e) {
        var $el = $(this);
        var code = e.keyCode;
--- a/plugin/syndi/ping.php
+++ b/plugin/syndi/ping.php
@ -0,0 +1,61 @@
+<?php
+include_once('./_common.php');
+
+header('Content-Type: text/html; charset=UTF-8');
+header('Pragma: no-cache');
+
+if(version_compare(PHP_VERSION, '5.3.0') >= 0)
+{
+    date_default_timezone_set(@date_default_timezone_get());
+}
+
+error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT);
+
+$syndi_path = dirname(__FILE__);
+
+include $syndi_path . '/config/site.config.php';
+
+$sql = " select bo_table from " . $g4['board_table'] . " b, ". $g4['group_table'] . " g where b.bo_read_level=1 and b.bo_list_level=1 and g.gr_use_access=0 and g.gr_id = b.gr_id order by b.gr_id, b.bo_table limit 1 ";
+$channel = sql_fetch($sql);
+
+$sql = " select wr_id from {$g4['write_prefix']}{$channel['bo_table']} where wr_is_comment = 0 order by wr_num, wr_reply desc limit 1 ";
+$article = sql_fetch($sql);
+?>
+
+<!doctype html>
+<html lang="ko">
+<head>
+<meta charset="utf-8">
+<title>네이버 신디케이션 핑</title>
+<style>
+body {background:#f5f6fa;color:#000}
+h1 {padding:20px 0 0;text-align:center}
+ul {margin:30px;padding:0;border:1px solid #aaa;border:1px solid #aaa;list-style:none;zoom:1}
+ul:after {display:block;visibility:hidden;clear:both;content:""}
+li {float:left;width:50%;border-bottom:1px solid #e9e9e9}
+a {display:block;padding:1em;height:2em;background:#fff;color:#000;font-weight:bold;text-decoration:none}
+a:focus, a:hover {background:#333;color:#fff;text-decoration:none}
+.left_line {border-left:1px solid #e9e9e9}
+.no_bottom_line {border-bottom:0 !important}
+.bg {background:#f7f7f7}
+</style>
+</head>
+
+<body>
+<h1>네이버 신디케이션 핑 (Naver Syndication PING)</h1>
+
+<ul>
+    <li><a href="http://dev.naver.com/openapi/apis/function/syndication">Syndication API</a></li>
+    <li><a href="http://syndication.openapi.naver.com/status/?site=<?php echo $syndi_tag_domain; ?>" class="left_line">Naver Syndication 연결확인</a></li>
+    <li><a href="<?php echo G4_SYNDI_URL; ?>/syndi_echo.php?id=tag:<?php echo $syndi_tag_domain.','.$syndi_tag_year; ?>:site&amp;type=site" class="bg">사이트 정보</a></li>
+    <li><a href="<?php echo G4_SYNDI_URL; ?>/syndi_echo.php?id=tag:<?php echo $syndi_tag_domain.','.$syndi_tag_year; ?>:channel:<?php echo $channel['bo_table']; ?>&type=channel" class="bg left_line">특정 채널 정보</a></li>
+    <li><a href="<?php echo G4_SYNDI_URL; ?>/syndi_echo.php?id=tag:<?php echo $syndi_tag_domain.','.$syndi_tag_year; ?>:site&type=channel" class="bg">채널 목록</a></li>
+    <li><a href="<?php echo G4_SYNDI_URL; ?>/syndi_echo.php?id=tag:<?php echo $syndi_tag_domain.','.$syndi_tag_year; ?>:site&type=article" class="left_line">사이트의 모든 문서 목록</a></li>
+    <li><a href="<?php echo G4_SYNDI_URL; ?>/syndi_echo.php?id=tag:<?php echo $syndi_tag_domain.','.$syndi_tag_year; ?>:channel:<?php echo $channel['bo_table']; ?>&type=article">특정 채널의 문서 목록</a></li>
+    <li><a href="<?php echo G4_SYNDI_URL; ?>/syndi_echo.php?id=tag:<?php echo $syndi_tag_domain.','.$syndi_tag_year; ?>:article:<?php echo $channel['bo_table']; ?>-<?php echo $article['wr_id']; ?>&type=article" class="left_line">특정 문서 정보</a></li>
+    <li class="no_bottom_line"><a href="<?php echo G4_SYNDI_URL; ?>/syndi_echo.php?id=tag:<?php echo $syndi_tag_domain.','.$syndi_tag_year; ?>:site&amp;type=deleted" class="bg">사이트의 모든 삭제문서 목록</a></li>
+    <li class="no_bottom_line"><a href="<?php echo G4_SYNDI_URL; ?>/syndi_echo.php?id=tag:<?php echo $syndi_tag_domain.','.$syndi_tag_year; ?>:channel:<?php echo $channel['bo_table']; ?>&type=deleted" class="bg left_line">특정 채널의 삭제 문서 목록</a></li>
+</ul>
+
+</body>
+</html>
--- a/shop/orderform.php
+++ b/shop/orderform.php
@ -157,6 +157,13 @@ function get_intall_file()
 }
 </script>

+    <!-- Payplus Plug-in 설치 안내 -->
+    <p id="display_setup_message" style="display:block">
+        <strong>결제안내</strong>
+        <span class="red">결제를 하시려면 상단의 노란색 표시줄을 클릭</span>하시거나, <a href="https://pay.kcp.co.kr/plugin_new/file/KCPPluginSetup.exe" onclick="return get_intall_file();"><span class="bold">[수동설치]</span></a>를 눌러 Payplus Plug-in을 설치하시기 바랍니다.<br>
+        [수동설치]를 눌러 설치하신 경우 <span class="red bold">새로고침(F5)키</span>를 눌러 진행하시기 바랍니다.
+    </p>
+
 <form name="forderform" method="post" action="<?php echo $order_action_url; ?>" onsubmit="return forderform_check(this);" autocomplete="off">
 <div id="sod_frm">
    <p>주문하실 상품을 확인하세요.</p>
@ -938,6 +945,7 @@ function get_intall_file()
        ?>
    </section>

+<<<<<<< HEAD
    <!-- Payplus Plug-in 설치 안내 -->
    <p id="display_setup_message" style="display:block">
        <span class="red">결제를 계속 하시려면 상단의 노란색 표시줄을 클릭</span>하시거나 <a href="https://pay.kcp.co.kr/plugin_new/file/KCPPluginSetup.exe" onclick="return get_intall_file();"><b><u>[수동설치]</u></b></a>를 눌러 다운로드 된 Payplus Plug-in을 설치하시기 바랍니다.<br>
@ -946,6 +954,8 @@ function get_intall_file()
        브라우저가 익스플로러가 아닌 경우 Payplus Plug-in 설치에 문제가 있을수 있음을 알려 드립니다.
    </p>

+=======
+>>>>>>> 225fa4a75dd51016367658455d6c416890c90b64
    <div id="display_pay_button" class="btn_confirm" style="display:none">
        <input type="submit" value="주문하기" class="btn_submit">
        <a href="javascript:history.go(-1);" class="btn01">취소</a>