From 2658dde159ebe2605336943ac00870a75fbcb09e Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 15 Jul 2014 16:59:54 +0900
Subject: [PATCH] =?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=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80=20?=
 =?UTF-8?q?=EB=B0=8F=20=EA=B8=B0=ED=83=80=20=EB=B2=84=EA=B7=B8=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

---
 adm/config_form.php                             | 10 ++++++++++
 adm/config_form_update.php                      |  1 +
 adm/member_form.php                             |  4 ++--
 bbs/password.php                                |  9 +++++++++
 bbs/password_check.php                          | 13 +++++++++++++
 bbs/view_comment.php                            |  9 +++++++++
 bbs/write_update.php                            |  2 +-
 common.php                                      | 10 +++++++---
 config.php                                      |  4 ++--
 install/gnuboard5.sql                           |  1 +
 js/kakaolink.js                                 | 10 ++++++++++
 lib/common.lib.php                              |  2 +-
 lib/naver_syndi.lib.php                         | 14 ++++++++++++++
 mobile/skin/board/basic/style.css               |  1 +
 mobile/skin/board/basic/view_comment.skin.php   |  7 ++++++-
 mobile/skin/board/gallery/style.css             |  1 +
 mobile/skin/board/gallery/view_comment.skin.php |  7 ++++++-
 plugin/sns/view.sns.skin.php                    | 13 +++++++++++++
 skin/board/basic/style.css                      |  1 +
 skin/board/basic/view_comment.skin.php          |  7 ++++++-
 skin/board/gallery/style.css                    |  1 +
 skin/board/gallery/view_comment.skin.php        |  7 ++++++-
 22 files changed, 121 insertions(+), 13 deletions(-)
 create mode 100644 js/kakaolink.js

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']) {
             <td>
                 <input type="text" name="cf_googl_shorturl_apikey" value="<?php echo $config['cf_googl_shorturl_apikey'] ?>" id="cf_googl_shorturl_apikey" class="frm_input"> <a href="http://code.google.com/apis/console/" target="_blank" class="btn_frmline">API Key 등록하기</a>
             </td>
+            <th scope="row"><label for="cf_kakao_js_apikey">카카오 Javascript API Key</label></th>
+            <td>
+                <input type="text" name="cf_kakao_js_apikey" value="<?php echo $config['cf_kakao_js_apikey'] ?>" id="cf_kakao_js_apikey" class="frm_input"> <a href="http://developers.kakao.com/" target="_blank" class="btn_frmline">앱 등록하기</a>
+            </td>
         </tr>
         </tbody>
         </table>
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/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; }">
 <script>
 function fmember_submit(f)
 {
-    if (!f.mb_icon.value.match(/\.(gif|jp['e']g|png)$/i) && f.mb_icon.value) {
-        alert('아이콘이 이미지 파일이 아닙니다. (bmp 제외)');
+    if (!f.mb_icon.value.match(/\.gif$/i) && f.mb_icon.value) {
+        alert('아이콘은 gif 파일만 가능합니다.');
         return false;
     }
 
diff --git a/bbs/password.php b/bbs/password.php
index 6c3d77aad..b29681143 100644
--- a/bbs/password.php
+++ b/bbs/password.php
@@ -26,6 +26,15 @@ switch ($w) {
             $return_url = './board.php?bo_table='.$bo_table;
         }
         break;
+    case 'sc' :
+        // 비밀번호 창에서 로그인 하는 경우 관리자 또는 자신의 글이면 바로 글보기로 감
+        if ($is_admin || ($member['mb_id'] == $write['mb_id'] && $write['mb_id']))
+            goto_url('./board.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id);
+        else {
+            $action = './password_check.php';
+            $return_url = './board.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id;
+        }
+        break;
     default :
         alert('w 값이 제대로 넘어오지 않았습니다.');
 }
diff --git a/bbs/password_check.php b/bbs/password_check.php
index c28f059ce..4f2f63e9b 100644
--- a/bbs/password_check.php
+++ b/bbs/password_check.php
@@ -15,6 +15,19 @@ if ($w == 's') {
     //set_session("ss_secret", "$bo_table|$wr[wr_num]");
     set_session($ss_name, TRUE);
 
+} else if ($w == 'sc') {
+    $qstr = 'bo_table='.$bo_table.'&amp;sfl='.$sfl.'&amp;stx='.$stx.'&amp;sop='.$sop.'&amp;wr_id='.$wr_id.'&amp;page='.$page;
+
+    $wr = get_write($write_table, $wr_id);
+
+    if (sql_password($wr_password) != $wr['wr_password'])
+        alert('비밀번호가 틀립니다.');
+
+    // 세션에 아래 정보를 저장. 하위번호는 비밀번호없이 보아야 하기 때문임.
+    $ss_name = 'ss_secret_comment_'.$bo_table.'_'.$wr['wr_id'];
+    //set_session("ss_secret", "$bo_table|$wr[wr_num]");
+    set_session($ss_name, TRUE);
+
 } else
     alert('w 값이 제대로 넘어오지 않았습니다.');
 
diff --git a/bbs/view_comment.php b/bbs/view_comment.php
index 48feadc5a..6eb1c8cd4 100644
--- a/bbs/view_comment.php
+++ b/bbs/view_comment.php
@@ -49,6 +49,15 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
         $list[$i]['content1'] = $row['wr_content'];
         $list[$i]['content'] = conv_content($row['wr_content'], 0, 'wr_content');
         $list[$i]['content'] = search_font($stx, $list[$i]['content']);
+    } else {
+        $ss_name = 'ss_secret_comment_'.$bo_table.'_'.$list[$i]['wr_id'];
+
+        if(!get_session($ss_name))
+            $list[$i]['content'] = '<a href="./password.php?w=sc&amp;bo_table='.$bo_table.'&amp;wr_id='.$list[$i]['wr_id'].$qstr.'" class="s_cmt">댓글내용 확인</a>';
+        else {
+            $list[$i]['content'] = conv_content($row['wr_content'], 0, 'wr_content');
+            $list[$i]['content'] = search_font($stx, $list[$i]['content']);
+        }
     }
 
     $list[$i]['datetime'] = substr($row['wr_datetime'],2,14);
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);
 }
 
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;
diff --git a/config.php b/config.php
index 7095065e0..518d7cae7 100644
--- a/config.php
+++ b/config.php
@@ -165,8 +165,8 @@ define('G5_DISPLAY_SQL_ERROR', TRUE);
 define('G5_ESCAPE_FUNCTION', 'sql_escape_string');
 
 // sql_escape_string 함수에서 사용될 패턴
-define('G5_ESCAPE_PATTERN',  '/(and|or).*(union|select|insert|update|delete|from|where|limit|create|drop).*/i');
-define('G5_ESCAPE_REPLACE',  '');
+//define('G5_ESCAPE_PATTERN',  '/(and|or).*(union|select|insert|update|delete|from|where|limit|create|drop).*/i');
+//define('G5_ESCAPE_REPLACE',  '');
 
 // 게시판에서 링크의 기본개수를 말합니다.
 // 필드를 추가하면 이 숫자를 필드수에 맞게 늘려주십시오.
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/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[] = '';
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 @@
 <?php
 if (!defined('_GNUBOARD_')) exit;
 
+// http://kr1.php.net/manual/en/function.curl-setopt-array.php 참고
+if (!function_exists('curl_setopt_array')) {
+   function curl_setopt_array(&$ch, $curl_options)
+   {
+       foreach ($curl_options as $option => $value) {
+           if (!curl_setopt($ch, $option, $value)) {
+               return false;
+           } 
+       }
+       return true;
+   }
+}
+
+
 // 네이버 신디케이션에 ping url 을 curl 로 전달합니다.
 function naver_syndi_ping($bo_table, $wr_id)
 {
diff --git a/mobile/skin/board/basic/style.css b/mobile/skin/board/basic/style.css
index 389ba3b5c..b1d433d3a 100644
--- a/mobile/skin/board/basic/style.css
+++ b/mobile/skin/board/basic/style.css
@@ -216,6 +216,7 @@
 #bo_vc a {color:#000;text-decoration:none}
 #bo_vc p {padding:0 0 5px;line-height:1.8em}
 #bo_vc p a {text-decoration:underline}
+#bo_vc p a.s_cmt {text-decoration:none}
 #bo_vc_empty {margin:0;padding:15px !important;text-align:center}
 #bo_vc #bo_vc_winfo {float:left}
 #bo_vc footer {zoom:1}
diff --git a/mobile/skin/board/basic/view_comment.skin.php b/mobile/skin/board/basic/view_comment.skin.php
index 7ebcce47d..946d56c44 100644
--- a/mobile/skin/board/basic/view_comment.skin.php
+++ b/mobile/skin/board/basic/view_comment.skin.php
@@ -309,7 +309,12 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
     <?php if($board['bo_use_sns'] && ($config['cf_facebook_appid'] || $config['cf_twitter_key'])) { ?>
     // sns 등록
     $(function() {
-        $("#bo_vc_send_sns").load( "<?php echo G5_SNS_URL; ?>/view_comment_write.sns.skin.php?bo_table=<?php echo $bo_table; ?>" );
+        $("#bo_vc_send_sns").load(
+            "<?php echo G5_SNS_URL; ?>/view_comment_write.sns.skin.php?bo_table=<?php echo $bo_table; ?>",
+            function() {
+                save_html = document.getElementById('bo_vc_w').innerHTML;
+            }
+        );
     });
     <?php } ?>
     </script>
diff --git a/mobile/skin/board/gallery/style.css b/mobile/skin/board/gallery/style.css
index 9fcf341af..4f69e8f65 100644
--- a/mobile/skin/board/gallery/style.css
+++ b/mobile/skin/board/gallery/style.css
@@ -203,6 +203,7 @@
 #bo_vc a {color:#000;text-decoration:none}
 #bo_vc p {padding:0 0 5px;line-height:1.8em}
 #bo_vc p a {text-decoration:underline}
+#bo_vc p a.s_cmt {text-decoration:none}
 #bo_vc_empty {margin:0;padding:15px !important;text-align:center}
 #bo_vc #bo_vc_winfo {float:left}
 #bo_vc footer {zoom:1}
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(<?php echo $comment_max ?>); // 최대
     <?php if($board['bo_use_sns'] && ($config['cf_facebook_appid'] || $config['cf_twitter_key'])) { ?>
     // sns 등록
     $(function() {
-        $("#bo_vc_send_sns").load( "<?php echo G5_SNS_URL; ?>/view_comment_write.sns.skin.php?bo_table=<?php echo $bo_table; ?>" );
+        $("#bo_vc_send_sns").load(
+            "<?php echo G5_SNS_URL; ?>/view_comment_write.sns.skin.php?bo_table=<?php echo $bo_table; ?>",
+            function() {
+                save_html = document.getElementById('bo_vc_w').innerHTML;
+            }
+        );
     });
     <?php } ?>
     </script>
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.'&amp;sns=facebook';
 $twitter_url  = $sns_send.'&amp;sns=twitter';
 $gplus_url    = $sns_send.'&amp;sns=gplus';
 ?>
+
+<?php if(G5_IS_MOBILE && $config['cf_kakao_js_apikey']) { ?>
+<script src="https://developers.kakao.com/sdk/js/kakao.min.js"></script>
+<script src="<?php echo G5_JS_URL; ?>/kakaolink.js"></script>
+<script>
+    // 사용할 앱의 Javascript 키를 설정해 주세요.
+    Kakao.init("<?php echo $config['cf_kakao_js_apikey']; ?>");
+</script>
+<?php } ?>
+
 <ul id="bo_v_sns">
     <li><a href="<?php echo $facebook_url; ?>" target="_blank"><img src="<?php echo G5_SNS_URL; ?>/icon/facebook.png" alt="페이스북으로 보내기"></a></li>
     <li><a href="<?php echo $twitter_url; ?>" target="_blank"><img src="<?php echo G5_SNS_URL; ?>/icon/twitter.png" alt="트위터로 보내기"></a></li>
     <li><a href="<?php echo $gplus_url; ?>" target="_blank"><img src="<?php echo G5_SNS_URL; ?>/icon/gplus.png" alt="구글플러스로 보내기"></a></li>
+    <?php if(G5_IS_MOBILE && $config['cf_kakao_js_apikey']) { ?>
+    <li><a href="javascript:kakaolink_send('<?php echo $sns_msg; ?>', '<?php echo urlencode('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']); ?>');"><img src="<?php echo G5_SNS_URL; ?>/icon/kakaotalk.png" alt="카카오톡으로 보내기"></a>
+    <?php } ?>
 </ul>
diff --git a/skin/board/basic/style.css b/skin/board/basic/style.css
index 7b6510eff..29a31a5f4 100644
--- a/skin/board/basic/style.css
+++ b/skin/board/basic/style.css
@@ -236,6 +236,7 @@ html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !importa
 #bo_vc a {color:#000;text-decoration:none}
 #bo_vc p {padding:0 0 5px;line-height:1.8em}
 #bo_vc p a {text-decoration:underline}
+#bo_vc p a.s_cmt {text-decoration:none}
 #bo_vc_empty {margin:0;padding:20px !important;text-align:center}
 #bo_vc #bo_vc_winfo {float:left}
 #bo_vc footer {zoom:1}
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'); // 댓글 입력폼이 보이도록 처리하기위해서
 <?php if($board['bo_use_sns'] && ($config['cf_facebook_appid'] || $config['cf_twitter_key'])) { ?>
 // sns 등록
 $(function() {
-    $("#bo_vc_send_sns").load( "<?php echo G5_SNS_URL; ?>/view_comment_write.sns.skin.php?bo_table=<?php echo $bo_table; ?>" );
+    $("#bo_vc_send_sns").load(
+        "<?php echo G5_SNS_URL; ?>/view_comment_write.sns.skin.php?bo_table=<?php echo $bo_table; ?>",
+        function() {
+            save_html = document.getElementById('bo_vc_w').innerHTML;
+        }
+    );
 });
 <?php } ?>
 </script>
diff --git a/skin/board/gallery/style.css b/skin/board/gallery/style.css
index bfb4c3956..43bea9758 100644
--- a/skin/board/gallery/style.css
+++ b/skin/board/gallery/style.css
@@ -229,6 +229,7 @@ html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !importa
 #bo_vc a {color:#000;text-decoration:none}
 #bo_vc p {padding:0 0 5px;line-height:1.8em}
 #bo_vc p a {text-decoration:underline}
+#bo_vc p a.s_cmt {text-decoration:none}
 #bo_vc_empty {margin:0;padding:20px !important;text-align:center}
 #bo_vc #bo_vc_winfo {float:left}
 #bo_vc footer {zoom:1}
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'); // 댓글 입력폼이 보이도록 처리하기위해서
 <?php if($board['bo_use_sns'] && ($config['cf_facebook_appid'] || $config['cf_twitter_key'])) { ?>
 // sns 등록
 $(function() {
-    $("#bo_vc_send_sns").load( "<?php echo G5_SNS_URL; ?>/view_comment_write.sns.skin.php?bo_table=<?php echo $bo_table; ?>" );
+    $("#bo_vc_send_sns").load(
+        "<?php echo G5_SNS_URL; ?>/view_comment_write.sns.skin.php?bo_table=<?php echo $bo_table; ?>",
+        function() {
+            save_html = document.getElementById('bo_vc_w').innerHTML;
+        }
+    );
 });
 <?php } ?>
 </script>