From 9823909cfdea5d16244a94b9dc37ea40ac2143a7 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 9 Jul 2014 10:12:06 +0900 Subject: [PATCH 1/9] =?UTF-8?q?escape=20=ED=8C=A8=ED=84=B4=EC=9D=B4=20?= =?UTF-8?q?=EC=A0=95=EC=9D=98=EB=90=98=EC=96=B4=20=EC=9E=88=EC=9D=84=20?= =?UTF-8?q?=EA=B2=BD=EC=9A=B0=EC=97=90=EB=A7=8C=20=EC=A0=81=EC=9A=A9?= =?UTF-8?q?=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=BD=94=EB=93=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/common.php b/common.php index 91a930548..4a6a4d37d 100644 --- a/common.php +++ b/common.php @@ -68,10 +68,14 @@ function array_map_deep($fn, $array) // SQL Injection 대응 문자열 필터링 function sql_escape_string($str) { - $pattern = G5_ESCAPE_PATTERN; - $replace = G5_ESCAPE_REPLACE; + if(defined('G5_ESCAPE_PATTERN') && defined('G5_ESCAPE_REPLACE')) { + $pattern = G5_ESCAPE_PATTERN; + $replace = G5_ESCAPE_REPLACE; + + if($pattern) + $str = preg_replace($pattern, $replace, $str); + } - $str = preg_replace($pattern, $replace, $str); $str = call_user_func('addslashes', $str); return $str; From 1f33d7db0cf19d421e551f74d4b9e74c8281be3c Mon Sep 17 00:00:00 2001 From: SIR Date: Wed, 9 Jul 2014 10:46:47 +0900 Subject: [PATCH 2/9] =?UTF-8?q?PHP=205.1.3=20=EC=9D=B4=EC=A0=84=20?= =?UTF-8?q?=EB=B2=84=EC=A0=84=EC=97=90=EC=84=9C=EB=8F=84=20curl=5Fsetopt?= =?UTF-8?q?=5Farray=20=EA=B0=80=20=EC=A0=95=EC=83=81=20=EC=9E=91=EB=8F=99?= =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/naver_syndi.lib.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/naver_syndi.lib.php b/lib/naver_syndi.lib.php index 7964c9305..f3d9ab73a 100644 --- a/lib/naver_syndi.lib.php +++ b/lib/naver_syndi.lib.php @@ -1,6 +1,20 @@ $value) { + if (!curl_setopt($ch, $option, $value)) { + return false; + } + } + return true; + } +} + + // 네이버 신디케이션에 ping url 을 curl 로 전달합니다. function naver_syndi_ping($bo_table, $wr_id) { From 843705822777ad28ddc11092aaace151234c265e Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 10 Jul 2014 09:32:01 +0900 Subject: [PATCH 3/9] =?UTF-8?q?=EA=B2=80=EC=83=89=EC=96=B4=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0=20=ED=8A=B9=EC=88=98=EB=AC=B8=EC=9E=90=20=ED=8C=A8?= =?UTF-8?q?=ED=84=B4=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index c702dfc4c..7c8b9f833 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -2640,7 +2640,7 @@ function get_search_string($stx) $stx_pattern[] = '#\.*/+#'; $stx_pattern[] = '#\\\*#'; $stx_pattern[] = '#\.{2,}#'; - $stx_pattern[] = '#[/\'\"%=*\#\(\)\|\+\-\&\!\$@~\{\}\[\]`;:\?\^\,]+#'; + $stx_pattern[] = '#[/\'\"%=*\#\(\)\|\+\&\!\$~\{\}\[\]`;:\?\^\,]+#'; $stx_replace = array(); $stx_replace[] = ''; From 51527db42e6bca1fcc8452583cbcb2b2d63573b4 Mon Sep 17 00:00:00 2001 From: SIR Date: Thu, 10 Jul 2014 09:35:13 +0900 Subject: [PATCH 4/9] =?UTF-8?q?=EC=98=A4=ED=83=80=20bO=5Fread=5Flevel=20?= =?UTF-8?q?=EC=9D=84=20bo=5Fread=5Flevel=20=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/write_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bbs/write_update.php b/bbs/write_update.php index d2b8a9fd3..e8beab91b 100644 --- a/bbs/write_update.php +++ b/bbs/write_update.php @@ -478,7 +478,7 @@ if ($w == '' || $w == 'r') { } // 게시판그룹접근사용을 하지 않아야 하고 비회원 글읽기가 가능해야 하며 비밀글이 아니어야 합니다. -if (!$group['gr_use_access'] && $board['bO_read_level'] < 2 && !$secret) { +if (!$group['gr_use_access'] && $board['bo_read_level'] < 2 && !$secret) { naver_syndi_ping($bo_table, $wr_id); } From fd7ee9be7a66d6ae7ed35a72d7c1bfe05de6bdc9 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 10 Jul 2014 14:10:57 +0900 Subject: [PATCH 5/9] =?UTF-8?q?=EC=B9=B4=EC=B9=B4=EC=98=A4=ED=86=A1=20?= =?UTF-8?q?=EB=A7=81=ED=81=AC=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/config_form.php | 10 ++++++++++ adm/config_form_update.php | 1 + install/gnuboard5.sql | 1 + js/kakaolink.js | 10 ++++++++++ plugin/sns/icon/kakaotalk.png | Bin 0 -> 1532 bytes plugin/sns/icon/kakaotalk_off.png | Bin 0 -> 1173 bytes plugin/sns/view.sns.skin.php | 13 +++++++++++++ 7 files changed, 35 insertions(+) create mode 100644 js/kakaolink.js create mode 100644 plugin/sns/icon/kakaotalk.png create mode 100644 plugin/sns/icon/kakaotalk_off.png diff --git a/adm/config_form.php b/adm/config_form.php index a6e4f067c..b2fc57f7a 100644 --- a/adm/config_form.php +++ b/adm/config_form.php @@ -177,6 +177,12 @@ if(!isset($config['cf_optimize_date'])) { ADD `cf_optimize_date` date NOT NULL default '0000-00-00' AFTER `cf_popular_del` ", true); } +// 카카오톡링크 api 키 +if(!isset($config['cf_kakao_js_apikey'])) { + sql_query(" ALTER TABLE `{$g5['config_table']}` + ADD `cf_kakao_js_apikey` varchar(255) NOT NULL DEFAULT '' AFTER `cf_googl_shorturl_apikey` ", true); +} + if(!$config['cf_faq_skin']) $config['cf_faq_skin'] = "basic"; if(!$config['cf_mobile_faq_skin']) $config['cf_mobile_faq_skin'] = "basic"; @@ -1056,6 +1062,10 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) { API Key 등록하기 + + + 앱 등록하기 + diff --git a/adm/config_form_update.php b/adm/config_form_update.php index db852d38b..33e49d1a4 100644 --- a/adm/config_form_update.php +++ b/adm/config_form_update.php @@ -127,6 +127,7 @@ $sql = " update {$g5['config_table']} cf_icode_server_ip = '{$_POST['cf_icode_server_ip']}', cf_icode_server_port = '{$_POST['cf_icode_server_port']}', cf_googl_shorturl_apikey = '{$_POST['cf_googl_shorturl_apikey']}', + cf_kakao_js_apikey = '{$_POST['cf_kakao_js_apikey']}', cf_facebook_appid = '{$_POST['cf_facebook_appid']}', cf_facebook_secret = '{$_POST['cf_facebook_secret']}', cf_twitter_key = '{$_POST['cf_twitter_key']}', diff --git a/install/gnuboard5.sql b/install/gnuboard5.sql index e55db57db..a50b5ff79 100644 --- a/install/gnuboard5.sql +++ b/install/gnuboard5.sql @@ -294,6 +294,7 @@ CREATE TABLE IF NOT EXISTS `g5_config` ( `cf_facebook_secret` varchar(255) NOT NULL, `cf_twitter_key` varchar(255) NOT NULL, `cf_twitter_secret` varchar(255) NOT NULL, + `cf_kakao_js_apikey` varchar(255) NOT NULL, `cf_1_subj` varchar(255) NOT NULL DEFAULT '', `cf_2_subj` varchar(255) NOT NULL DEFAULT '', `cf_3_subj` varchar(255) NOT NULL DEFAULT '', diff --git a/js/kakaolink.js b/js/kakaolink.js new file mode 100644 index 000000000..8ac822a0b --- /dev/null +++ b/js/kakaolink.js @@ -0,0 +1,10 @@ +function kakaolink_send(text, url) +{ + // 카카오톡 링크 버튼을 생성합니다. 처음 한번만 호출하면 됩니다. + Kakao.Link.sendTalkLink({ + webLink : { + text: String(text), + url: url // 앱 설정의 웹 플랫폼에 등록한 도메인의 URL이어야 합니다. + } + }); +} \ No newline at end of file diff --git a/plugin/sns/icon/kakaotalk.png b/plugin/sns/icon/kakaotalk.png new file mode 100644 index 0000000000000000000000000000000000000000..78fe26ca7a44efcab004d7ae4fb634ad270f83f2 GIT binary patch literal 1532 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 literal 0 HcmV?d00001 diff --git a/plugin/sns/view.sns.skin.php b/plugin/sns/view.sns.skin.php index 204d372a3..0af55cbca 100644 --- a/plugin/sns/view.sns.skin.php +++ b/plugin/sns/view.sns.skin.php @@ -21,8 +21,21 @@ $facebook_url = $sns_send.'&sns=facebook'; $twitter_url = $sns_send.'&sns=twitter'; $gplus_url = $sns_send.'&sns=gplus'; ?> + + + + + + +
  • 페이스북으로 보내기
  • 트위터로 보내기
  • 구글플러스로 보내기
    • + +
  • 카카오톡으로 보내기 +
From 251a01d7ac111497b56edaa81f9240fa79c455a0 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 11 Jul 2014 09:30:42 +0900 Subject: [PATCH 6/9] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=ED=9A=8C?= =?UTF-8?q?=EC=9B=90=EC=95=84=EC=9D=B4=EC=BD=98=20gif=EB=A7=8C=20=EB=90=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/member_form.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adm/member_form.php b/adm/member_form.php index 3410c242b..dd40d6f28 100644 --- a/adm/member_form.php +++ b/adm/member_form.php @@ -352,8 +352,8 @@ this.form.mb_intercept_date.value=this.form.mb_intercept_date.defaultValue; }"> diff --git a/mobile/skin/board/gallery/view_comment.skin.php b/mobile/skin/board/gallery/view_comment.skin.php index 7ebcce47d..946d56c44 100644 --- a/mobile/skin/board/gallery/view_comment.skin.php +++ b/mobile/skin/board/gallery/view_comment.skin.php @@ -309,7 +309,12 @@ var char_max = parseInt(); // 최대 // sns 등록 $(function() { - $("#bo_vc_send_sns").load( "/view_comment_write.sns.skin.php?bo_table=" ); + $("#bo_vc_send_sns").load( + "/view_comment_write.sns.skin.php?bo_table=", + function() { + save_html = document.getElementById('bo_vc_w').innerHTML; + } + ); }); diff --git a/skin/board/basic/view_comment.skin.php b/skin/board/basic/view_comment.skin.php index db0d2f9ff..287c7a29c 100644 --- a/skin/board/basic/view_comment.skin.php +++ b/skin/board/basic/view_comment.skin.php @@ -317,7 +317,12 @@ comment_box('', 'c'); // 댓글 입력폼이 보이도록 처리하기위해서 // sns 등록 $(function() { - $("#bo_vc_send_sns").load( "/view_comment_write.sns.skin.php?bo_table=" ); + $("#bo_vc_send_sns").load( + "/view_comment_write.sns.skin.php?bo_table=", + function() { + save_html = document.getElementById('bo_vc_w').innerHTML; + } + ); }); diff --git a/skin/board/gallery/view_comment.skin.php b/skin/board/gallery/view_comment.skin.php index 56e62aa0e..97529e075 100644 --- a/skin/board/gallery/view_comment.skin.php +++ b/skin/board/gallery/view_comment.skin.php @@ -317,7 +317,12 @@ comment_box('', 'c'); // 댓글 입력폼이 보이도록 처리하기위해서 // sns 등록 $(function() { - $("#bo_vc_send_sns").load( "/view_comment_write.sns.skin.php?bo_table=" ); + $("#bo_vc_send_sns").load( + "/view_comment_write.sns.skin.php?bo_table=", + function() { + save_html = document.getElementById('bo_vc_w').innerHTML; + } + ); });