devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

팝업 차단에 막히는 문제 해결...

Browse Source
This commit is contained in:
Hide_D
2018-04-14 02:52:03 +09:00
parent b797bab7e0
commit b56919a343
2 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.php
+6 -14
View File
@@ -53,15 +53,12 @@ function getOAuthToken(mode='login', scope_list = null){
} }
function sendTempPasswordToKakaoTalk(retry=false){ function sendTempPasswordToKakaoTalk(){
$.post({ $.post({
url:'j_change_pw.php', url:'j_change_pw.php',
dataType:'json' dataType:'json'
}).then(function(obj){ }).then(function(obj){
if (!obj.result && retry) { if(!obj.result){
getOAuthToken('change_pw', 'talk_message');
}
else if(!obj.result){
alert(obj.reason); alert(obj.reason);
} }
else{ else{
@@ -70,18 +67,13 @@ function sendTempPasswordToKakaoTalk(retry=false){
}); });
} }
function doLoginUsingOAuth(retry=false){ function doLoginUsingOAuth(){
$.post({ $.post({
url:'oauth_kakao/j_login_oauth.php', url:'oauth_kakao/j_login_oauth.php',
dataType:'json' dataType:'json'
}).then(function(obj){ }).then(function(obj){
if(!obj.result){ if(!obj.result){
if(obj.noRetry || !retry){ alert(obj.reason);
alert(obj.reason);
}
else{
getOAuthToken('login');
}
} }
else{ else{
window.location.href = "./"; window.location.href = "./";
@@ -140,7 +132,7 @@ function postOAuthResult(result){
<input type="hidden" id="global_salt" name="global_salt" value="<?=RootDB::getGlobalSalt()?>"> <input type="hidden" id="global_salt" name="global_salt" value="<?=RootDB::getGlobalSalt()?>">
<div class="form-group row"> <div class="form-group row">
<div class="col-sm-4" style="position:relative;"><a href="javascript:doLoginUsingOAuth(true);"><img style="height:46px;margin-top:6px;" src="oauth_kakao/kakao_btn.png"></a></div> <div class="col-sm-4" style="position:relative;"><a href="javascript:getOAuthToken('login');"><img style="height:46px;margin-top:6px;" src="oauth_kakao/kakao_btn.png"></a></div>
<div class="col-sm-8"> <div class="col-sm-8">
<button type="submit" class="btn btn-primary btn-lg btn-block login-button">로그인</button> <button type="submit" class="btn btn-primary btn-lg btn-block login-button">로그인</button>
</div> </div>
@@ -148,7 +140,7 @@ function postOAuthResult(result){
</form> </form>
<!-- <!--
<div class="form-group row"> <div class="form-group row">
<div class="col-sm-4"><a href="javascript:sendTempPasswordToKakaoTalk(true);">비밀번호 찾기<img src="oauth_kakao/kakao_to_me.png"></a></div> <div class="col-sm-4"><a href="javascript:getOAuthToken('change_pw', 'talk_message');">비밀번호 찾기<img src="oauth_kakao/kakao_to_me.png"></a></div>
<div class="col-sm-8"> <div class="col-sm-8">
</div> </div>
oauth_kakao/index.php
+6 -14
View File
@@ -29,15 +29,12 @@ function getOAuthToken(mode='login', scope_list = null){
} }
function sendTempPasswordToKakaoTalk(retry=false){ function sendTempPasswordToKakaoTalk(){
$.post({ $.post({
url:'j_change_pw.php', url:'j_change_pw.php',
dataType:'json' dataType:'json'
}).then(function(obj){ }).then(function(obj){
if (!obj.result && retry) { if(!obj.result){
getOAuthToken('change_pw', 'talk_message');
}
else if(!obj.result){
alert(obj.reason); alert(obj.reason);
} }
else{ else{
@@ -46,18 +43,13 @@ function sendTempPasswordToKakaoTalk(retry=false){
}); });
} }
function doLoginUsingOAuth(retry=false){ function doLoginUsingOAuth(){
$.post({ $.post({
url:'j_login_oauth.php', url:'j_login_oauth.php',
dataType:'json' dataType:'json'
}).then(function(obj){ }).then(function(obj){
if(!obj.result){ if(!obj.result){
if(obj.noRetry || !retry){ alert(obj.reason);
alert(obj.reason);
}
else{
getOAuthToken('login');
}
} }
else{ else{
window.location.href = "../"; window.location.href = "../";
@@ -89,10 +81,10 @@ function postOAuthResult(result){
</head> </head>
<body> <body>
<a href="javascript:doLoginUsingOAuth(true);"><img src="kakao_btn.png"></a><br> <a href="javascript:getOAuthToken('login');"><img src="kakao_btn.png"></a><br>
<br> <br>
비밀번호 찾기<br> 비밀번호 찾기<br>
<a href="javascript:sendTempPasswordToKakaoTalk(true);"><img src="kakao_to_me.png"></a> <a href="javascript:getOAuthToken('change_pw', 'talk_message');"><img src="kakao_to_me.png"></a>
<input type='hidden' name="login_mode" id="login_mode"> <input type='hidden' name="login_mode" id="login_mode">
</body> </body>
</html> </html>