From 246ce7f4d1b119897a3b89cd3dcf1b25d763c3eb Mon Sep 17 00:00:00 2001
From: h677 <h677>
Date: Sun, 20 Mar 2005 03:01:32 +0000
Subject: [PATCH] =?utf8?q?=E3=83=AA=E3=83=A2=E3=83=BC=E3=83=88=E3=83=95?=
 =?utf8?q?=E3=82=B7=E3=82=A2=E3=83=8A=E3=83=88=E3=83=A9=E3=83=83=E3=83=97?=
 =?utf8?q?=E3=81=8CON=E3=81=AE=E6=99=82=E3=81=ABCookie=E7=A2=BA=E8=AA=8D?=
 =?utf8?q?=E3=81=8C=E3=81=82=E3=82=8B=E3=81=A8=E3=80=81=E9=80=81=E4=BF=A1?=
 =?utf8?q?=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E4=B8=8D=E5=85=B7=E5=90=88?=
 =?utf8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Editor.pas | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/Editor.pas b/Editor.pas
index adb01ab..9ed0a45 100644
--- a/Editor.pas
+++ b/Editor.pas
@@ -784,9 +784,10 @@ var
 	sysMenu	: HMENU;
 	//fusianasanƒgƒ‰ƒbƒv by’èŠú•Ö
 	Namae : String;
-        body : TStringList;
-        Remote : String;
-        ABoard : TBoard;
+    tmpSPID, tmpPON : String;	//ƒŠƒ‚[ƒgƒgƒ‰ƒbƒv‚ªON‚ÌŽž‚ÉCookie‚̈ꎞ•Û‘¶—p
+	body : TStringList;
+	Remote : String;
+	ABoard : TBoard;
 begin
 	FAbort := False;
 	State := gdsError;
@@ -798,6 +799,8 @@ begin
 
 
 	InitIdHTTP(Indy);
+    tmpSPID := '';
+    tmpPON  := '';
 	if FThreadItem = nil then begin
 		URL := FBoard.GetSendURL;
 		RefURL := GikoSys.UrlToServer(FBoard.URL) + 'test/bbs.cgi';
@@ -902,6 +905,10 @@ begin
                                 //Setting.txt‚ª‚È‚©‚Á‚½‚çŽæ“¾
                                 //ŽI‚É•‰‰×‚ª‚©‚©‚è‚»‚¤‚Å•|‚¢EEE
                                 if not FileExists(ABoard.GetSETTINGTXTFileName) then begin
+                                        //GetSETTINGTXTAction‚ðŒÄ‚яo‚·‚ÆIndy‚ª‰Šú‰»‚³‚ê‚é‚̂ŁA
+                                        //‚±‚±‚ÅCookie‚ð•Û‘¶‚µ‚È‚­‚Ä‚Í‚¢‚¯‚È‚¢
+                                        tmpSPID := GetSPID(Indy.Response.RawHeaders.Values['Set-Cookie']);
+                                        tmpPON  := GetPON(Indy.Response.RawHeaders.Values['Set-Cookie']);
                                         GetSETTINGTXTAction.Execute;
                                         body := TStringList.Create;
                                         try
@@ -947,8 +954,13 @@ begin
 					'î•ñ',
 					MB_YESNO or MB_ICONQUESTION);
 				if MsgResult = IDYES then begin
-					Board.SPID := GetSPID(Indy.Response.RawHeaders.Values['Set-Cookie']);
-					Board.PON := GetPON(Indy.Response.RawHeaders.Values['Set-Cookie']);
+                    if (GikoSys.Setting.RemoteTrapAtt) and ((tmpSPID <> '') or (tmpPON <> '')) then begin
+						Board.SPID := tmpSPID;
+						Board.PON := tmpPON;
+                    end else begin
+						Board.SPID := GetSPID(Indy.Response.RawHeaders.Values['Set-Cookie']);
+						Board.PON := GetPON(Indy.Response.RawHeaders.Values['Set-Cookie']);
+                    end;
 					if (Board.SPID = '') and (Board.PON = '') then
 						raise Exception.Create('');
 					//‚à‚¤ˆê‰ñ‚±‚̃ƒ\ƒbƒh
@@ -980,8 +992,13 @@ begin
 					MB_YESNO or MB_ICONQUESTION);
 
 				if MsgResult = IDYES then begin
-					Board.SPID := GetSPID(Indy.Response.RawHeaders.Values['Set-Cookie']);
-					Board.PON := GetPON(Indy.Response.RawHeaders.Values['Set-Cookie']);
+                    if (GikoSys.Setting.RemoteTrapAtt) and ((tmpSPID <> '') or (tmpPON <> '')) then begin
+						Board.SPID := tmpSPID;
+						Board.PON := tmpPON;
+                    end else begin
+						Board.SPID := GetSPID(Indy.Response.RawHeaders.Values['Set-Cookie']);
+						Board.PON := GetPON(Indy.Response.RawHeaders.Values['Set-Cookie']);
+                    end;
 					if (Board.SPID = '') and (Board.PON = '') then
 						raise Exception.Create('');
 					Send(Board.SPID, Board.PON, False);
-- 
2.11.0