master 와 merge
This commit is contained in:
commit
b83f82b3d7
21 files changed
+97
-20
No files matched your search
@@ -11,4 +11,5 @@ www.microsoft.com/showcase/video.aspx/
|
||||
w.soundcloud.com/
|
||||
www.facebook.com/
|
||||
kakaotv.daum.net/
|
||||
v.afree.ca/
|
||||
v.afree.ca/
|
||||
play-tv.kakao.com/
|
||||
@@ -143,7 +143,7 @@ if( $cert_enc_use == "Y" )
|
||||
$sql = " select mb_id from {$g5['member_table']} where mb_id <> '{$member['mb_id']}' and mb_dupinfo = '{$mb_dupinfo}' ";
|
||||
$row = sql_fetch($sql);
|
||||
if ($row['mb_id']) {
|
||||
alert_close("입력하신 본인학인 정보로 가입된 내역이 존재합니다.\\n회원아이디 : ".$row['mb_id']);
|
||||
alert_close("입력하신 본인확인 정보로 가입된 내역이 존재합니다.\\n회원아이디 : ".$row['mb_id']);
|
||||
}
|
||||
|
||||
// hash 데이터
|
||||
|
||||
@@ -165,6 +165,8 @@ $_SESSION['lgd_certify'] = $payReqMap;
|
||||
<input type="hidden" name="LGD_ENCODING" value="UTF-8"/>
|
||||
<?php
|
||||
foreach ($payReqMap as $key => $value) {
|
||||
$key = htmlspecialchars(strip_tags($key));
|
||||
$value = htmlspecialchars(strip_tags($value));
|
||||
echo "<input type='hidden' name='$key' id='$key' value='$value'/>".PHP_EOL;
|
||||
}
|
||||
?>
|
||||
|
||||
@@ -57,6 +57,8 @@ $payReqMap = $_SESSION['lgd_certify'];//결제 요청시, Session에 저장했
|
||||
<form method="post" name="LGD_RETURNINFO" id="LGD_RETURNINFO">
|
||||
<?php
|
||||
foreach ($payReqMap as $key => $value) {
|
||||
$key = htmlspecialchars(strip_tags($key));
|
||||
$value = htmlspecialchars(strip_tags($value));
|
||||
echo "<input type='hidden' name='$key' id='$key' value='$value'>";
|
||||
}
|
||||
?>
|
||||
|
||||
@@ -52,6 +52,10 @@ function get_social_callbackurl($provider, $no_domain=false){
|
||||
$base_url = '/'.ltrim(parse_url($base_url, PHP_URL_PATH), '/');
|
||||
}
|
||||
|
||||
if ( $provider === 'twitter' ){
|
||||
return $base_url;
|
||||
}
|
||||
|
||||
$base_url = $base_url . ( strpos($base_url, '?') ? '&' : '?' ).G5_SOCIAL_LOGIN_DONE_PARAM.'='.$provider;
|
||||
|
||||
return $base_url;
|
||||
@@ -764,6 +768,23 @@ function social_member_comfirm_redirect(){
|
||||
}
|
||||
}
|
||||
|
||||
function social_is_edit_page($url=''){
|
||||
global $is_member;
|
||||
|
||||
if( !$is_member ) return false;
|
||||
|
||||
if($url){
|
||||
$p = @parse_url($url);
|
||||
$host = preg_replace('/:[0-9]+$/', '', $_SERVER['HTTP_HOST']);
|
||||
|
||||
if ( isset($p['host']) && ($p['host'] === $host) && preg_match('/register_form\.php$/i', $url) ){
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
function social_is_login_password_check($mb_id){
|
||||
global $g5;
|
||||
|
||||
|
||||
Reference in new issue
Block a user