소셜 로그인 일부 소스 수정

bbs/login_check.php

@@ -115,6 +115,7 @@ if ($url) {
 if(function_exists('social_login_success_after')){
     // 로그인 성공시 소셜 데이터를 기존의 데이터와 비교하여 바뀐 부분이 있으면 업데이트 합니다.
     $link = social_login_success_after($mb, $link);
+    social_login_session_clear(1);
 }
 
 goto_url($link);

bbs/member_confirm.php

@@ -11,8 +11,9 @@ else
     $urlencode = urlencode($_SERVER[REQUEST_URI]);
 */
 
-if( function_exists('is_social_member_type') && 'is_social' == is_social_member_type($member) ){
-    goto_url( G5_PLUGIN_URL.'/oauth/register_member.php' );
+//소셜 로그인 한 경우
+if( function_exists('social_member_comfirm_redirect') ){    
+    social_member_comfirm_redirect();
 }
 
 $g5['title'] = '회원 비밀번호 확인';

extend/version.extend.php

@@ -1,6 +1,6 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
-define('G5_JS_VER',  '161020');
-define('G5_CSS_VER', '161020');
+define('G5_JS_VER',  '171106');
+define('G5_CSS_VER', '171106');
 ?>

lib/social_member.lib.php

@@ -1,51 +0,0 @@
-<?php
-if (!defined('_GNUBOARD_')) exit;
-
-function is_social_member_type($member){
-
-    global $config, $g5;
-
-    if( !isset($member['mb_id']) || empty($member['mb_id']) ){
-        return '';
-    }
-
-    //실제 회원인지 검색
-    $mb = get_member($member['mb_id'], 'mb_id');
-
-    if( !empty($mb['mb_id']) ){
-        return 'is_member';
-    }
-
-    if($oauth_mb_no = get_session('ss_oauth_member_no')) {
-        return 'is_social';
-    }
-
-    return '';
-}
-
-function oauth_goto_url($msg='', $url=''){
-
-	if( !$url ){
-		$url = G5_URL;
-	}
-
-	//새창인 경우에는
-    if( defined('G5_OAUTH_USE_POPUP') && G5_OAUTH_USE_POPUP ){
-        alert_opener_url( $msg, $url );
-    } else {
-        if( $msg ){
-            alert( $msg, $url );
-        } else {
-            goto_url( $url );
-        }
-    }
-}
-
-function sociallogin_used_check($type=''){
-    global $config;
-
-    if( ! $config['cf_social_login_use'] ){
-        oauth_goto_url('소셜 로그인을 사용하지 않습니다.');
-    }
-}
-?>

mobile/skin/member/basic/register_form.skin.php

@@ -222,6 +222,13 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
         </li>
         <?php } ?>
 
+        <?php
+        //회원정보 수정인 경우 소셜 계정 출력
+        if( $w == 'u' && function_exists('social_member_provider_manage') ){
+            social_member_provider_manage();
+        }
+        ?>
+
         <?php if ($w == "" && $config['cf_use_recommend']) { ?>
         <li>
             <label for="reg_mb_recommend" class="sound_only">추천인아이디</label>

plugin/social/Hybrid/Providers/Naver.php

@@ -38,7 +38,7 @@ class Hybrid_Providers_Naver extends Hybrid_Provider_Model_OAuth2
     {
         $token = $this->generate_state_token();
         Hybrid_Auth::storage()->set("naver_state_token", $token);
-
+        
         $parameters = array(
             "response_type" => "code",
             "client_id" => $this->api->client_id,

plugin/social/includes/functions.php

@@ -347,12 +347,14 @@ function social_get_request_provider(){
     return $provider_name;
 }
 
-function social_login_session_clear(){
+function social_login_session_clear($mycf=0){
 	$_SESSION["HA::STORE"]        = array(); // used by hybridauth library. to clear as soon as the auth process ends.
 	$_SESSION["HA::CONFIG"]       = array(); // used by hybridauth library. to clear as soon as the auth process ends.
     set_session('sl_userprofile', '');
-    set_session('ss_social_provider', '');
     set_session('social_login_redirect', '');
+    if(!$mycf){
+        set_session('ss_social_provider', '');
+    }
 }
 
 function social_session_exists_check(){
@@ -360,13 +362,6 @@ function social_session_exists_check(){
     $provider_name = social_get_request_provider();
 
     if(!$provider_name){
-        /*
-        if( isset($_SESSION['sl_userprofile']) ){
-            $sl_userprofile = $_SESSION['sl_userprofile'];
-            reset($sl_userprofile);
-            $provider_name = key($sl_userprofile);
-        }
-        */
         return false;
     }
 
@@ -425,11 +420,11 @@ if( !function_exists('replaceQueryParams') ){
     }
 }
 
-function social_check_login_before(){
+function social_check_login_before($p_service=''){
     global $is_member, $member;
 
     $action = isset( $_REQUEST['action'] ) ? social_escape_request($_REQUEST['action']) : '';
-    $provider_name = social_get_request_provider();
+    $provider_name = $p_service ? $p_service : social_get_request_provider();
     $url = isset($_REQUEST['url']) ? $_REQUEST['url'] : G5_URL;
     $mode = isset($_REQUEST['mode']) ? $_REQUEST['mode'] : 'login';
     $use_popup = G5_SOCIAL_USE_POPUP ? 1 : 2;
@@ -471,6 +466,7 @@ function social_check_login_before(){
         if( $user_provider = social_get_data('provider', $provider_name, $user_profile) ){
 
             if( $is_member ){
+
                 $msg = "이미 로그인 하셨거나 잘못된 요청입니다.";
                 
                 if( $mylink ){
@@ -482,6 +478,10 @@ function social_check_login_before(){
                 } else {
                     alert( $msg );
                 }
+
+                if( is_object( $adapter ) ){    //연결한것은 인증 받은 즉시 로그아웃한다.
+                    social_logout_with_adapter($adapter);
+                }
                 exit;
             }
 
@@ -504,7 +504,7 @@ function social_check_login_before(){
                     social_user_profile_replace($member['mb_id'], $provider_name, $user_profile);
 
                     if( is_object( $adapter ) ){    //연결한것은 인증 받은 즉시 로그아웃한다.
-                        $adapter->logout();
+                        social_logout_with_adapter($adapter);
                     }
 
                     if( $use_popup == 1 || ! $use_popup ){   //팝업이면
@@ -608,6 +608,70 @@ function social_is_login_check(){
     return false;
 }
 
+function social_logout_with_adapter($adapter=null){
+    if( is_object( $adapter ) ){
+        $adapter->logout();
+    }
+    social_login_session_clear(1);
+}
+
+function social_member_provider_manage(){
+    global $member;
+
+    return social_login_link_account($member['mb_id'], false, 'mb_form');
+}
+
+function social_member_comfirm_redirect(){
+    global $is_member;
+
+    if( !$is_member ){
+        return;
+    }
+
+    $provider_name = get_session('ss_social_provider');
+
+    if( social_get_provider_service_name($provider_name) ){
+
+        try
+        {
+            $adapter = social_login_get_provider_adapter( $provider_name );
+            
+            // then grab the user profile 
+            $user_profile = $adapter->getUserProfile();
+        }
+
+        catch( Exception $e )
+        {
+            $get_error = social_get_error_msg( $e->getCode() );
+
+            if( is_object( $adapter ) ){
+                social_logout_with_adapter($adapter);
+            }
+
+            alert('SNS 사용자 인증에 실패하였습니다.', G5_URL);
+        }
+
+        if( $user_provider = social_get_data('provider', $provider_name, $user_profile) ){
+            
+            social_login_session_clear(1);
+
+            $url = G5_BBS_URL.'/register_form.php';
+
+            $social_token = social_nonce_create($provider_name);
+            set_session('social_link_token', $social_token);
+            
+            $params = array('provider'=>$provider_name);
+
+            $url = replaceQueryParams($url, $params);
+            goto_url($url);
+
+        }
+
+        set_session('ss_social_provider', '');
+        alert('잘못된 요청입니다.', G5_URL);
+    }
+}
+
 function social_is_login_password_check($mb_id){
     global $g5;
 
@@ -670,16 +734,7 @@ function social_login_success_after($mb, $link='', $mode='', $tmp_create_info=ar
             set_session('ss_mb_key', md5($mb['mb_datetime'] . $_SERVER['REMOTE_ADDR'] . $_SERVER['HTTP_USER_AGENT']));
 
             if( !empty($user_profile->photoURL) ){  //회원 프로필 사진이 있다면
-                $url = $user_profile->photoURL;
-                
-                $mb_dir = G5_DATA_PATH."/member_image";
-                $mb_dir .= "/".substr($mb_id,0,2);
-                @mkdir($mb_dir, 0707);
-                @chmod($mb_dir, 0707);
-
-                $dest_path = "$mb_dir/$mb_id.gif";
-                
-                social_profile_img_resize($dest_path, $user_profile->photoURL, 58, 58 );
+                //해당 처리
             }
 
             return;
@@ -690,48 +745,6 @@ function social_login_success_after($mb, $link='', $mode='', $tmp_create_info=ar
     return $link;
 }
 
-function social_profile_img_resize($path, $file_url, $width, $height){
-
-    list($w, $h, $ext) = @getimagesize($file_url);
-    if( $w && $h && $ext ){
-        $ratio = max($width/$w, $height/$h);
-        $h = ceil($height / $ratio);
-        $x = ($w - $width / $ratio) / 2;
-        $w = ceil($width / $ratio);
-
-        $tmp = imagecreatetruecolor($width, $height);
-        
-        if($ext == 1){
-            $image = imagecreatefromgif($file_url);
-        } else if($ext == 3) {
-            $image = imagecreatefrompng($file_url);
-        } else {
-            $image = imagecreatefromjpeg($file_url);
-        }
-        imagecopyresampled($tmp, $image,
-        0, 0,
-        $x, 0,
-        $width, $height,
-        $w, $h);
-
-        switch ($ext) {
-        case '2':
-          imagejpeg($tmp, $path, 100);
-          break;
-        case '3':
-          imagepng($tmp, $path, 0);
-          break;
-        case '1':
-          imagegif($tmp, $path);
-          break;
-        }
-
-        /* cleanup memory */
-        imagedestroy($image);
-        imagedestroy($tmp);
-    }
-}
-
 function social_login_link_account($mb_id, $is_buffer=false, $is_type=''){
     global $g5, $is_admin, $is_guest, $member, $config;
 
@@ -813,18 +826,25 @@ function social_provider_logout($provider='', $session_delete=1){
 
         try
         {
-            if( $adapter = social_login_get_provider_adapter( $provider ) ){
-                if( $session_delete )
-                    set_session('ss_social_provider', '');
+            if( ! class_exists( 'Hybrid_Auth', false ) )
+            {
+                include_once G5_SOCIAL_LOGIN_PATH . "/Hybrid/Auth.php";
+            }
 
-                //Hybrid_Auth::logoutAllProviders();
+            Hybrid_Auth::logoutAllProviders();
+            
+            /*
+            if( $adapter = social_login_get_provider_adapter( $provider ) ){
                 $adapter->logout();
             }
+            */
+            if( $session_delete )
+                set_session('ss_social_provider', '');
         }
 
         catch( Exception $e ){
             if( is_object( $adapter ) ){
-                $adapter->logout();
+                social_logout_with_adapter($adapter);
             }
         }
     }
@@ -873,10 +893,10 @@ function social_service_check($provider){
 function exist_mb_id_recursive($mb_id){
     static $count = 0;
 
-    $mb_id = ($count > 0) ? $mb_id.(string)$count : $mb_id;
+    $mb_id_add = ($count > 0) ? $mb_id.(string)$count : $mb_id;
 
-    if( ! exist_mb_id($mb_id) ){
-        return $mb_id;
+    if( ! exist_mb_id($mb_id_add) ){
+        return $mb_id_add;
     }
     
     $count++;
@@ -886,10 +906,10 @@ function exist_mb_id_recursive($mb_id){
 function exist_mb_nick_recursive($mb_nick){
     static $count = 0;
 
-    $mb_nick = ($count > 0) ? $mb_nick.(string)$count : $mb_nick;
+    $mb_nick_add = ($count > 0) ? $mb_nick.(string)$count : $mb_nick;
 
-    if( ! exist_mb_nick($mb_nick, '') ){
-        return $mb_nick;
+    if( ! exist_mb_nick($mb_nick_add, '') ){
+        return $mb_nick_add;
     }
     
     $count++;

plugin/social/register_member_update.php

@@ -1,6 +1,5 @@
 <?php
 include_once('./_common.php');
-include_once(G5_PLUGIN_PATH.'/oauth/functions.php');
 include_once(G5_LIB_PATH.'/register.lib.php');
 include_once(G5_LIB_PATH.'/mailer.lib.php');
 
@@ -121,7 +120,7 @@ if($result) {
 }
 
 // 사용자 코드 실행
-@include_once (G5_SOCIAL_SKIN_PATH.'/register_form_update.tail.skin.php');
+@include_once (get_social_skin_path().'/register_form_update.tail.skin.php');
 
 goto_url(G5_HTTP_BBS_URL.'/register_result.php');
 ?>

skin/latest/basic/latest.skin.php

@@ -3,6 +3,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">', 0);
+add_javascript('<script src="'.G5_JS_URL.'/jquery.bxslider.js"></script>', 10);
 ?>
 
 <div class="lat">

skin/member/basic/register_form.skin.php

@@ -230,8 +230,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 
             <?php
             //회원정보 수정인 경우 소셜 계정 출력
-            if( $w == 'u' && function_exists('social_login_link_account') ){
-                social_login_link_account($member['mb_id'], false, 'mb_form');
+            if( $w == 'u' && function_exists('social_member_provider_manage') ){
+                social_member_provider_manage();
             }
             ?>
 

theme/basic/mobile/skin/member/basic/register_form.skin.php

@@ -222,6 +222,13 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
         </li>
         <?php } ?>
 
+        <?php
+        //회원정보 수정인 경우 소셜 계정 출력
+        if( $w == 'u' && function_exists('social_member_provider_manage') ){
+            social_member_provider_manage();
+        }
+        ?>
+
         <?php if ($w == "" && $config['cf_use_recommend']) { ?>
         <li>
             <label for="reg_mb_recommend" class="sound_only">추천인아이디</label>

theme/basic/skin/latest/notice/latest.skin.php

@@ -3,6 +3,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">', 0);
+add_javascript('<script src="'.G5_JS_URL.'/jquery.bxslider.js"></script>', 10);
 ?>
 
 <div class="notice">
@@ -40,6 +41,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">',
     </ul>
 
 </div>
+<?php if (count($list)) { //게시물이 있다면 ?>
 <script>
     $('.notice ul').bxSlider({
         hideControlOnEnd: true,
@@ -47,4 +49,5 @@ add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">',
         nextText: '<i class="fa fa-angle-right" aria-hidden="true"></i>',
         prevText: '<i class="fa fa-angle-left" aria-hidden="true"></i>'
     });
-</script>
+</script>
+<?php } ?>

theme/basic/skin/member/basic/register_form.skin.php

@@ -230,8 +230,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 
             <?php
             //회원정보 수정인 경우 소셜 계정 출력
-            if( $w == 'u' && function_exists('social_login_link_account') ){
-                social_login_link_account($member['mb_id'], false, 'mb_form');
+            if( $w == 'u' && function_exists('social_member_provider_manage') ){
+                social_member_provider_manage();
             }
             ?>