From b56919a343cee82415047dd44a477f64b2b6f2ef Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 14 Apr 2018 02:52:03 +0900
Subject: [PATCH] =?UTF-8?q?=ED=8C=9D=EC=97=85=20=EC=B0=A8=EB=8B=A8?=
 =?UTF-8?q?=EC=97=90=20=EB=A7=89=ED=9E=88=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?=
 =?UTF-8?q?=ED=95=B4=EA=B2=B0...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.php             | 20 ++++++--------------
 oauth_kakao/index.php | 20 ++++++--------------
 2 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/index.php b/index.php
index 34fcb004..9a4c6d94 100644
--- a/index.php
+++ b/index.php
@@ -53,15 +53,12 @@ function getOAuthToken(mode='login', scope_list = null){
 
 }
 
-function sendTempPasswordToKakaoTalk(retry=false){
+function sendTempPasswordToKakaoTalk(){
     $.post({
         url:'j_change_pw.php',
         dataType:'json'
     }).then(function(obj){
-        if (!obj.result && retry) {
-            getOAuthToken('change_pw', 'talk_message');
-        }
-        else if(!obj.result){
+        if(!obj.result){
             alert(obj.reason);
         }
         else{
@@ -70,18 +67,13 @@ function sendTempPasswordToKakaoTalk(retry=false){
     });
 }
 
-function doLoginUsingOAuth(retry=false){
+function doLoginUsingOAuth(){
     $.post({
         url:'oauth_kakao/j_login_oauth.php',
         dataType:'json'
     }).then(function(obj){
         if(!obj.result){
-            if(obj.noRetry || !retry){
-                alert(obj.reason);
-            }
-            else{
-                getOAuthToken('login');
-            }
+            alert(obj.reason);
         }
         else{
             window.location.href = "./";
@@ -140,7 +132,7 @@ function postOAuthResult(result){
 
                     <input type="hidden" id="global_salt" name="global_salt" value="<?=RootDB::getGlobalSalt()?>">
                     <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">
                             <button type="submit" class="btn btn-primary btn-lg btn-block login-button">로그인</button>
                         </div>
@@ -148,7 +140,7 @@ function postOAuthResult(result){
                 </form>
 <!--
                 <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>
diff --git a/oauth_kakao/index.php b/oauth_kakao/index.php
index 09d53324..09ca64ef 100644
--- a/oauth_kakao/index.php
+++ b/oauth_kakao/index.php
@@ -29,15 +29,12 @@ function getOAuthToken(mode='login', scope_list = null){
 
 }
 
-function sendTempPasswordToKakaoTalk(retry=false){
+function sendTempPasswordToKakaoTalk(){
     $.post({
         url:'j_change_pw.php',
         dataType:'json'
     }).then(function(obj){
-        if (!obj.result && retry) {
-            getOAuthToken('change_pw', 'talk_message');
-        }
-        else if(!obj.result){
+        if(!obj.result){
             alert(obj.reason);
         }
         else{
@@ -46,18 +43,13 @@ function sendTempPasswordToKakaoTalk(retry=false){
     });
 }
 
-function doLoginUsingOAuth(retry=false){
+function doLoginUsingOAuth(){
     $.post({
         url:'j_login_oauth.php',
         dataType:'json'
     }).then(function(obj){
         if(!obj.result){
-            if(obj.noRetry || !retry){
-                alert(obj.reason);
-            }
-            else{
-                getOAuthToken('login');
-            }
+            alert(obj.reason);
         }
         else{
             window.location.href = "../";
@@ -89,10 +81,10 @@ function postOAuthResult(result){
 </head>
 <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>
-    <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">
 </body>
 </html>
\ No newline at end of file