From 22bd15b6ef193d2a90ca030bbb9ca3f9ee895592 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Thu, 16 Nov 2017 15:38:35 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B9=B4=EC=B9=B4=EC=98=A4=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/config_form.php                  | 4 ++--
 config.php                           | 2 +-
 plugin/social/includes/functions.php | 7 ++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/adm/config_form.php b/adm/config_form.php
index cda2b8292..8f1f48990 100644
--- a/adm/config_form.php
+++ b/adm/config_form.php
@@ -1014,7 +1014,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
         <tr>
             <th scope="row"><label for="cf_social_login_use">소셜로그인설정</label></th>
             <td colspan="3">
-                <?php echo help('소셜로그인을 사용합니다.') ?>
+                <?php echo help('소셜로그인을 사용합니다. <a href="https://sir.kr/manual/g5/276" class="btn btn_03" target="_blank" style="margin-left:10px" >설정 관련 메뉴얼 보기</a> ') ?>
                 <input type="checkbox" name="cf_social_login_use" value="1" id="cf_social_login_use" <?php echo (!empty($config['cf_social_login_use']))?'checked':''; ?>> 사용
             </td>
         </tr>
@@ -1034,7 +1034,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
                     <label for="check_social_kakao">카카오 로그인을 사용합니다</label>
                     <div>
                     <h3>카카오 웹 Redirect Path</h3>
-                    <p><?php echo get_social_callbackurl('kakao'); ?></p>
+                    <p><?php echo get_social_callbackurl('kakao', true); ?></p>
                     </p>
                     </div>
                 </p>
diff --git a/config.php b/config.php
index 71a0c4cf2..57e6136d8 100644
--- a/config.php
+++ b/config.php
@@ -5,7 +5,7 @@
 ********************/
 
 define('G5_VERSION', '그누보드5');
-define('G5_GNUBOARD_VER', '5.2.9.6');
+define('G5_GNUBOARD_VER', '5.3');
 
 // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음
 define('_GNUBOARD_', true);
diff --git a/plugin/social/includes/functions.php b/plugin/social/includes/functions.php
index 02902b447..f1bd33f3c 100644
--- a/plugin/social/includes/functions.php
+++ b/plugin/social/includes/functions.php
@@ -44,9 +44,14 @@ function get_social_convert_id($identifier, $service)
     return strtolower($service).'_'.hash('adler32', md5($identifier));
 }
 
-function get_social_callbackurl($provider){
+function get_social_callbackurl($provider, $no_domain=false){
 
     $base_url = SOCIAL_LOGIN_BASE_URL;
+
+    if( $provider === 'kakao' && $no_domain ){
+        $base_url = '/'.ltrim(parse_url($base_url, PHP_URL_PATH), '/');
+    }
+
     $base_url = $base_url . ( strpos($base_url, '?') ? '&' : '?' ).G5_SOCIAL_LOGIN_DONE_PARAM.'='.$provider;
 
     return $base_url;