firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

g4s merge 충돌 수정

Browse Source
This commit is contained in:
chicpro
2013-05-31 08:57:58 +09:00
parent 462f843175 37734d3abc
commit 2f80daf2d5
30 changed files with 471 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
plugin/kcp/kcpcert.head.skin.php
View File

@ -1,41 +0,0 @@
<?php
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
// 휴대폰번호 체크
if ($msg = valid_mb_hp($mb_hp)) alert($msg, "", true, true);
if ($msg = exist_mb_hp($mb_hp, $mb_id)) alert($msg, "", true, true);
$reg_mb_hp = preg_replace("/[^0-9]/", "", trim($_POST['mb_hp']));
/* ======================================================================================================= */
/* = 휴대폰인증 및 성인인증 = */
/* ======================================================================================================= */
if($w == '') {
// 본인인증체크
$kcpcert_no = get_session('ss_kcpcert_no');
if(!$kcpcert_no)
alert('휴대폰인증이 되지 않았습니다. 휴대폰인증을 해주세요.', '', true, true);
// 본인인증 hash 체크
$reg_hash = md5($reg_mb_hp.$mb_name.$kcpcert_no);
if(get_session('ss_kcpcert_hash') != $reg_hash)
alert('이름 또는 휴대폰번호가 올바르지 않습니다. 정상적인 방법으로 이용해 주세요.', '', true, true);
} else if($w == 'u') {
// 휴대폰번호 변경체크
$old_hp = preg_replace("/[^0-9]/", "", trim($_POST['old_mb_hp']));
if($old_hp !== $reg_mb_hp) {
// 본인인증체크
$kcpcert_no = get_session('ss_kcpcert_no');
if(!$kcpcert_no)
alert('휴대폰번호가 변경됐습니다. 휴대폰인증을 해주세요.', '', true, true);
// 본인인증 hash 체크
$reg_hash = md5($reg_mb_hp.$mb_name.$kcpcert_no);
if(get_session('ss_kcpcert_hash') != $reg_hash)
alert('이름 또는 휴대폰인증 정보가 올바르지 않습니다. 정상적인 방법으로 이용해 주세요.', '', true, true);
}
}
/* ======================================================================================================= */
?>

22
plugin/kcpcert/kcpcert_result.php
View File

@ -1,9 +1,6 @@
<?php
include_once('./kcpcert_config.php');
set_session('ss_kcpcert_no', '');
set_session('ss_kcpcert_hash', '');
$site_cd = "";
$ordr_idxx = "";
@ -134,24 +131,31 @@ if( $cert_enc_use == "Y" )
$phone_no = hyphen_hp_number($phone_no);
$sql = " select count(*) as cnt from {$g4['member_table']} where mb_id <> '{$member['mb_id']}' and mb_hp = '{$phone_no}' ";
$sql = " select mb_id from {$g4['member_table']} where mb_id <> '{$member['mb_id']}' and mb_hp = '{$phone_no}' ";
$row = sql_fetch($sql);
if ($row['cnt']) {
alert_close("이미 가입되어 있는 휴대폰번호 입니다.");
if ($row['mb_id']) {
alert_close("이미 가입되어 있는 휴대폰번호 입니다.\\n회원아이디 : ".$row['mb_id']);
}
// hash 데이터
$md5_cert_no = md5($cert_no);
$hash_data = md5($phone_no.$user_name.$md5_cert_no);
set_session("ss_kcpcert_no", $md5_cert_no);
set_session("ss_kcpcert_hash", $hash_data);
$hash_data = md5($phone_no.$user_name.$md5_cert_no);
// 성인인증결과
$adult_day = date("Ymd", strtotime("-19 years", G4_SERVER_TIME));
$adult = ((int)$birth_day <= (int)$adult_day) ? 1 : 0;
set_session("ss_kcpcert_no", $md5_cert_no);
set_session("ss_kcpcert_hash", $hash_data);
set_session("ss_kcpcert_hp_certify", 1);
set_session("ss_kcpcert_adult", $adult);
set_session("ss_kcpcert_birth", $birth_day);
set_session("ss_kcpcert_sex", ($sex_code=="01"?"M":"F"));
/*
$sql = " update {$g4['member_table']} set mb_name = '$user_name', mb_hp = '$phone_no', mb_hp_certify = 1, mb_adult = $adult, mb_birth = '$birth_day', mb_sex = '$sex_code' where mb_id = '{$member['mb_id']}' ";
sql_query($sql);
*/
}
else if( $res_cd != "0000" )
{

7
plugin/sns/facebook/callback.php
View File

@ -22,10 +22,13 @@ $g4['title'] = '페이스북 콜백';
include_once(G4_PATH.'/head.sub.php');
if ($user) {
$sns_name = $user_profile['name'];
$g4_sns_url = G4_SNS_URL;
$sns_name = $user_profile['name'];
$sns_user = $user;
set_cookie('ck_sns_name', $sns_name, 86400);
set_session('ss_facebook_user', $user);
$g4_sns_url = G4_SNS_URL;
echo <<<EOT
<script>

9
plugin/sns/me2day/callback.php
View File

@ -14,11 +14,14 @@ include_once(G4_PATH.'/head.sub.php');
$result = json_decode(file_get_contents("http://me2day.net/api/noop.json?uid={$user_id}&ukey={$auth_key}&akey=".$config['cf_me2day_key']));
if ($result->code == 0) {
$user = json_decode(file_get_contents("http://me2day.net/api/get_person/{$user_id}.json"));
$sns_name = $user->nickname;
$g4_sns_url = G4_SNS_URL;
$user = json_decode(file_get_contents("http://me2day.net/api/get_person/{$user_id}.json"));
$sns_name = $user->nickname;
$sns_user = $user->id;
set_cookie('ck_sns_name', $sns_name, 86400);
set_session('ss_me2day_user', $sns_user);
$g4_sns_url = G4_SNS_URL;
echo <<<EOT
<script>

14
plugin/sns/twitter/callback.php
View File

@ -16,8 +16,8 @@ require_once(G4_SNS_PATH.'/twitter/twitterconfig.php');
/* If the oauth_token is old redirect to the connect page. */
if (isset($_REQUEST['oauth_token']) && $_SESSION['oauth_token'] !== $_REQUEST['oauth_token']) {
$_SESSION['oauth_status'] = 'oldtoken';
header('Location: ./clearsessions.php');
$_SESSION['oauth_status'] = 'oldtoken';
header('Location: ./clearsessions.php');
}
/* Create TwitteroAuth object with app key/secret and token key/secret from default phase */
@ -47,12 +47,14 @@ $g4['title'] = '트위터 콜백';
include_once(G4_PATH.'/head.sub.php');
if (200 == $connection->http_code) {
$content = $connection->get('account/verify_credentials');
$sns_name = $content->name;
$g4_sns_url = G4_SNS_URL;
$content = $connection->get('account/verify_credentials');
$sns_name = $content->name;
$sns_user = $content->screen_name;
set_cookie('ck_sns_name', $sns_name, 86400);
set_session('ss_twitter_user', $sns_user);
$g4_sns_url = G4_SNS_URL;
echo <<<EOT
<script>

4
plugin/sns/twitter/twitterconfig.php
View File

@ -6,5 +6,5 @@
define('CONSUMER_KEY', $config['cf_twitter_key']);
define('CONSUMER_SECRET', $config['cf_twitter_secret']);
//define('OAUTH_CALLBACK', G4_SNS_URL.'/twitter/callback.php');
define('OAUTH_CALLBACK', '');
define('OAUTH_CALLBACK', G4_SNS_URL.'/twitter/callback.php');
//define('OAUTH_CALLBACK', '');