From 937c59c9f24a566221ef1cd50bd99785aec33c2a Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 27 Jun 2013 13:08:31 +0900 Subject: [PATCH 01/10] =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A6=B0=EB=A6=AC?= =?UTF-8?q?=EB=8D=94=20=EA=B0=80=EC=83=81=EC=BB=A4=EC=84=9C=20=EB=8C=80?= =?UTF-8?q?=EC=9D=91=20=EC=98=B5=EC=85=98=20=EC=84=A0=ED=83=9D=20=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/shop.js | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/js/shop.js b/js/shop.js index caaf177a3..b16ebf6da 100644 --- 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; From 5b382dbdd6f3f9722d19c036fb0143bee804f412 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 27 Jun 2013 15:06:49 +0900 Subject: [PATCH 02/10] =?UTF-8?q?=EC=8B=A0=EB=94=94=EC=BC=80=EC=9D=B4?= =?UTF-8?q?=EC=85=98=20#480=20=ED=95=91=20=EB=A7=88=ED=81=AC=EC=97=85=20?= =?UTF-8?q?=EB=B0=8F=20=EC=8A=A4=ED=83=80=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/syndi/ping.php | 59 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 plugin/syndi/ping.php diff --git a/plugin/syndi/ping.php b/plugin/syndi/ping.php new file mode 100644 index 000000000..571b6d98e --- /dev/null +++ b/plugin/syndi/ping.php @@ -0,0 +1,59 @@ += 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); +?> + + + + + +네이버 신디케이션 핑 + + + + +

네이버 신디케이션 핑 (Naver Syndication PING)

+ + + + + From dba29a7ae6dd8764620400c4608066a434368fd1 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 27 Jun 2013 15:26:18 +0900 Subject: [PATCH 03/10] =?UTF-8?q?=EB=84=A4=EC=9D=B4=EB=B2=84=20=EC=8B=A0?= =?UTF-8?q?=EB=94=94=EC=BC=80=EC=9D=B4=EC=85=98=20=ED=95=91=20=EB=A7=81?= =?UTF-8?q?=ED=81=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/admin.menu100.php | 1 + 1 file changed, 1 insertion(+) diff --git a/adm/admin.menu100.php b/adm/admin.menu100.php index d65cb8fbf..0c8edbb8c 100644 --- 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'), From 8a8a6dbf1d56c1cd8fc091c2fc0f07cd0b71b9ff Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 27 Jun 2013 15:28:03 +0900 Subject: [PATCH 04/10] . --- css/admin.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/css/admin.css b/css/admin.css index 9fb50309d..4d66783dd 100644 --- a/css/admin.css +++ b/css/admin.css @@ -179,7 +179,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} @@ -191,6 +191,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} From e6f635e906ecbd0c1cdf19014dc0fa52b4b20bfd Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 27 Jun 2013 16:19:42 +0900 Subject: [PATCH 05/10] =?UTF-8?q?=EC=8B=A0=EB=94=94=EC=BC=80=EC=9D=B4?= =?UTF-8?q?=EC=85=98=20#480=20=ED=95=91=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?= =?UTF-8?q?=EB=B3=B4=EC=99=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/syndi/ping.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/plugin/syndi/ping.php b/plugin/syndi/ping.php index 571b6d98e..5c2169d9a 100644 --- a/plugin/syndi/ping.php +++ b/plugin/syndi/ping.php @@ -33,8 +33,10 @@ 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;border-left:1px solid #e9e9e9;background:#fff;color:#000;font-weight:bold;text-decoration:none} +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} @@ -44,15 +46,15 @@ a:focus, a:hover {background:#333;color:#fff;text-decoration:none} From acaff22840e62b9444179f7716a5cc3a2e32fcc4 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Thu, 27 Jun 2013 16:55:23 +0900 Subject: [PATCH 06/10] =?UTF-8?q?=EC=88=98=EB=8F=99=EC=84=A4=EC=B9=98=20?= =?UTF-8?q?=EB=AC=B8=EA=B5=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/orderform.php | 7 +- skin/board/itemuse/_common.php | 4 - skin/board/itemuse/_common.skin.php | 12 - skin/board/itemuse/img/icon_file.gif | Bin 107 -> 0 bytes skin/board/itemuse/img/icon_hot.gif | Bin 97 -> 0 bytes skin/board/itemuse/img/icon_img.gif | Bin 145 -> 0 bytes skin/board/itemuse/img/icon_link.gif | Bin 104 -> 0 bytes skin/board/itemuse/img/icon_mobile.gif | Bin 62 -> 0 bytes skin/board/itemuse/img/icon_movie.gif | Bin 110 -> 0 bytes skin/board/itemuse/img/icon_new.gif | Bin 71 -> 0 bytes skin/board/itemuse/img/icon_reply.gif | Bin 77 -> 0 bytes skin/board/itemuse/img/icon_secret.gif | Bin 97 -> 0 bytes skin/board/itemuse/img/icon_sound.gif | Bin 113 -> 0 bytes skin/board/itemuse/list.skin.php | 243 ----------------- skin/board/itemuse/style.css | 139 ---------- skin/board/itemuse/view.skin.php | 324 ----------------------- skin/board/itemuse/view_comment.skin.php | 301 --------------------- skin/board/itemuse/write.skin.php | 171 ------------ 18 files changed, 4 insertions(+), 1197 deletions(-) delete mode 100644 skin/board/itemuse/_common.php delete mode 100644 skin/board/itemuse/_common.skin.php delete mode 100644 skin/board/itemuse/img/icon_file.gif delete mode 100644 skin/board/itemuse/img/icon_hot.gif delete mode 100644 skin/board/itemuse/img/icon_img.gif delete mode 100644 skin/board/itemuse/img/icon_link.gif delete mode 100644 skin/board/itemuse/img/icon_mobile.gif delete mode 100644 skin/board/itemuse/img/icon_movie.gif delete mode 100644 skin/board/itemuse/img/icon_new.gif delete mode 100644 skin/board/itemuse/img/icon_reply.gif delete mode 100644 skin/board/itemuse/img/icon_secret.gif delete mode 100644 skin/board/itemuse/img/icon_sound.gif delete mode 100644 skin/board/itemuse/list.skin.php delete mode 100644 skin/board/itemuse/style.css delete mode 100644 skin/board/itemuse/view.skin.php delete mode 100644 skin/board/itemuse/view_comment.skin.php delete mode 100644 skin/board/itemuse/write.skin.php diff --git a/shop/orderform.php b/shop/orderform.php index a2224d65e..745b2bed0 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -940,9 +940,10 @@ function get_intall_file()

- 결제를 계속 하시려면 상단의 노란색 표시줄을 클릭하시거나
- [수동설치]를 눌러 Payplus Plug-in을 설치하시기 바랍니다.
- [수동설치]를 눌러 설치하신 경우 새로고침(F5)키를 눌러 진행하시기 바랍니다. + 결제를 계속 하시려면 상단의 노란색 표시줄을 클릭하시거나 [수동설치]를 눌러 다운로드 된 Payplus Plug-in을 설치하시기 바랍니다.
+ [수동설치]를 눌러 설치하신 경우 새로고침(F5)키를 눌러 진행하시기 바랍니다.
+ 새로고침(F5) 한후에도 계속 설치파일이 다운로드 되거나 결제가 되지 않으면 브라우저를 새로 열어서 주문해 주시기 바랍니다.
+ 브라우저가 익스플로러가 아닌 경우 Payplus Plug-in 설치에 문제가 있을수 있음을 알려 드립니다.

\n"; - } - ?> - -
- - -

- - -
- 스크랩 - - 추천 - - - - 비추천 - - -
- -
- 추천 - 비추천 -
- - - - - - - -
- - -
- - - - - - - - \ No newline at end of file diff --git a/skin/board/itemuse/view_comment.skin.php b/skin/board/itemuse/view_comment.skin.php deleted file mode 100644 index c66d0d934..000000000 --- a/skin/board/itemuse/view_comment.skin.php +++ /dev/null @@ -1,301 +0,0 @@ - - - - - -
-

댓글목록

- \]/i", "", $comment); - ?> - -
style="margin-left:px;border-top-color:#e0e0e0"> -
-

님의 댓글

- - 댓글의 댓글 - - 아이피 - - - 작성일 - - -
- - -

- 비밀글 - -

- - - - - " id="secret_comment_"> - - - - - -
- -

등록된 댓글이 없습니다.

- -
- - - - - - diff --git a/skin/board/itemuse/write.skin.php b/skin/board/itemuse/write.skin.php deleted file mode 100644 index a1eb0c5ac..000000000 --- a/skin/board/itemuse/write.skin.php +++ /dev/null @@ -1,171 +0,0 @@ - - - - -

- -
- - - - - - - - - - - - -'."\n".''; - } - - if ($is_html) { - if ($is_dhtml_editor) { - $option_hidden .= ''; - } else { - $option .= "\n".''."\n".''; - } - } - - if ($is_secret) { - if ($is_admin || $is_secret==1) { - $option .= "\n".''."\n".''; - } else { - $option_hidden .= ''; - } - } - - if ($is_mail) { - $option .= "\n".''."\n".''; - } -} - -echo $option_hidden; -?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
class="frm_input " maxlength="20">
옵션
자동등록방지 - -
- -
-

- 작성하신 내용을 제출하시려면 글쓰기 버튼을, 작성을 취소하고 목록으로 돌아가시려면 취소 링크를 누르세요. -

- - 취소 -
-
- - From 8dd78d5b8ee8f273f6606972febd270cf82e5da0 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 27 Jun 2013 17:10:50 +0900 Subject: [PATCH 07/10] =?UTF-8?q?=EB=8F=99=EC=9D=BCID=EB=A1=9C=EC=9D=B8?= =?UTF-8?q?=ED=95=9C=20=EA=B2=B0=EC=A0=9C=EB=AA=A8=EB=93=88=20=EC=84=A4?= =?UTF-8?q?=EC=B9=98=EC=95=88=EB=82=B4=20=EB=A9=94=EC=84=B8=EC=A7=80=20?= =?UTF-8?q?=EA=B3=84=EC=86=8D=20=EC=B6=9C=EB=A0=A5=EB=90=98=EB=8A=94=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/orderform.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/shop/orderform.php b/shop/orderform.php index 0f99e7900..04dfd73f9 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -140,10 +140,12 @@ function init_pay_button() */ // 체크 방법이 변경 if( GetPluginObject() == null ){ + document.getElementById("display_setup_message_top").style.display = "block" ; document.getElementById("display_setup_message").style.display = "block" ; document.getElementById("display_pay_button").style.display = "none" ; } else{ + document.getElementById("display_setup_message_top").style.display = "none" ; document.getElementById("display_setup_message").style.display = "none" ; document.getElementById("display_pay_button").style.display = "block" ; } @@ -158,7 +160,7 @@ function get_intall_file() -

+

결제안내 결제를 하시려면 상단의 노란색 표시줄을 클릭하시거나, [수동설치]를 눌러 Payplus Plug-in을 설치하시기 바랍니다.
[수동설치]를 눌러 설치하신 경우 새로고침(F5)키를 눌러 진행하시기 바랍니다. @@ -945,7 +947,6 @@ function get_intall_file() ?> -<<<<<<< HEAD

결제를 계속 하시려면 상단의 노란색 표시줄을 클릭하시거나 [수동설치]를 눌러 다운로드 된 Payplus Plug-in을 설치하시기 바랍니다.
@@ -953,9 +954,6 @@ function get_intall_file() 새로고침(F5) 한후에도 계속 설치파일이 다운로드 되거나 결제가 되지 않으면 브라우저를 새로 열어서 주문해 주시기 바랍니다.
브라우저가 익스플로러가 아닌 경우 Payplus Plug-in 설치에 문제가 있을수 있음을 알려 드립니다.

- -======= ->>>>>>> 225fa4a75dd51016367658455d6c416890c90b64