Commit: 79d3c26df0e85d406201dc510b919987c3df2d91 - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revision: 79d3c26df0e85d406201dc510b919987c3df2d91 (tree)
• Time: 2011-02-27 10:25:25
• Author: h677 <h677>
• Commiter: h677

Log Message

冒険の書→忍法帖
すいとんされた時に、Cookieを削除するように修正

Change Summary

• modified: Editor.pas
• modified: GikoSystem.pas
• modified: Setting.pas
• modified: gikoNavi.res

Incremental Difference

--- a/Editor.pas
+++ b/Editor.pas
@@ -22,7 +22,7 @@ uses
 type
 //	TSetLayeredWindowAttributes = function(wnd: HWND; crKey: DWORD; bAlpha: BYTE; dwFlag: DWORD): Boolean; stdcall;
 	//‘‚«ž‚Ý–ß‚è’lƒ^ƒCƒv
-	TGikoResultType = (grtOK, grtCookie, grtCheck, grtError, grtBouken, grtBoukenErr);
+	TGikoResultType = (grtOK, grtCookie, grtCheck, grtError, grtNinpou, grtNinpouErr, grtSuiton);
 
 	TEditorForm = class(TForm)
 		MainMenu: TMainMenu;
@@ -220,6 +220,7 @@ type
 		FInputAssistKey: String;	///< “ü—̓AƒVƒXƒg‚̃L[
 		FResistWords: TStringList;	///< “ü—̓AƒVƒXƒg‚ÌŽ«‘‚©‚ç‚ÌŒŸõŒ‹‰Ê
         FSambaTimer: TSambaTimer;   ///< Samba‘΍ô‚̃^ƒCƒ}[
+        FCookieDomain: string;        ///< ”E–@’ŸƒhƒƒCƒ“
 		procedure Preview;
 		function Check: Boolean;
 		procedure SetNameList(sName, sMail: string);
@@ -784,7 +785,7 @@ begin
 	Indy.Request.AcceptLanguage := 'ja';
 	Indy.Request.Accept := 'image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*';
 	Indy.Request.ContentType := 'application/x-www-form-urlencoded';
-	Indy.Request.CustomHeaders.Add(getHeaderStr(ACOOKIE, SPID, PON, GikoSys.GetBoukenCookie(URL), Board));
+	Indy.Request.CustomHeaders.Add(getHeaderStr(ACOOKIE, SPID, PON, GikoSys.GetBouken(URL, FCookieDomain), Board));
 	TextStream := TStringStream.Create('');
 	Source := TStringStream.Create('');
 	try
@@ -887,23 +888,40 @@ begin
 					CancelSend( Board, SysMenu );
 					Exit;
 				end;
-			end else if ResultType = grtBouken then begin
+			end else if ResultType = grtNinpou then begin
 				MsgBox( Handle,
-						'‹M•û‚Ì–`Œ¯‚̏‘‚ðì¬’†‚Å‚·Bˆø‚«•Ô‚·‚È‚ç‚¢‚Ü‚¾B(‚Q•ª‚Ù‚Ç‚©‚©‚è‚Ü‚·)' + #13#10
+						'‹M•û‚Ì”E–@’Ÿ‚ðì¬’†‚Å‚·Bˆø‚«•Ô‚·‚È‚ç‚¢‚Ü‚¾B(‚Q•ª‚Ù‚Ç‚©‚©‚è‚Ü‚·)' + #13#10
 						, 'Šm”F',
-						MB_OK or MB_ICONQUESTION);
+						MB_OK or MB_ICONINFORMATION);
+				if (GikoSys.Setting.UseSamba)  and  (FSambaTimer.Enabled) then
+                begin
+					FSambaTimer.WriteSambaTime(Now());
+                end;
                 Board.PON  := '';
                 Board.SPID := '';
                 Board.Cookie := '';
                 GetCookie(Indy.CookieManager, Board);
 				Exit;
+            end else if ResultType = grtSuiton then begin
+				MsgBox( Handle,
+						'‹M•û‚Ì”E–@’Ÿ‚͏Ă©‚ê‚Ü‚µ‚½B' + #13#10 +
+                        '”E–@’Ÿ‚ðíœ‚µ‚Ü‚µ‚½AÄ‘—M‚µ‚Ä‚­‚¾‚³‚¢B'
+						, 'Šm”F',
+						MB_OK or MB_ICONINFORMATION);
+                // ”E–@’ŸŠª•¨‚ðÁ‚·
+                GikoSys.DelBoukenCookie(FCookieDomain);
+                GikoSys.Setting.WriteBoukenSettingFile;
+                Board.PON  := '';
+                Board.SPID := '';
+                Board.Cookie := '';
+                Exit;
 			end else begin
 				if (GikoSys.Setting.UseSamba)  and  (FSambaTimer.Enabled) then
                 begin
 					FSambaTimer.WriteSambaTime(Now());
                 end;
-                // –`Œ¯‚̏‘ƒGƒ‰[‚ÍCookie‚ðXV‚·‚é
-                if ResultType = grtBoukenErr then begin
+                // ”E–@’ŸŠª•¨ƒGƒ‰[‚ÍCookie‚ðXV‚·‚é
+                if ResultType = grtNinpouErr then begin
                     GetCookie(Indy.CookieManager, Board);
                 end;
 				State := gdsError;
@@ -981,13 +999,17 @@ function TEditorForm.GetResultType(ResponseText: string): TGikoResultType;
 begin
 	if AnsiPos('‘‚«‚±‚Ý‚ªI‚í‚è‚Ü‚µ‚½', ResponseText) <> 0 then
 		Result := grtOK
-    else if (AnsiPos('‚d‚q‚q‚n‚qF‹M•û‚Ì–`Œ¯‚̏‘‚ðì¬’†‚Å‚·', ResponseText) > 0)
+    else if ( (AnsiPos('<b>‚悤‚±‚»F‹M•û‚Ì”E–@’Ÿ‚ðì¬‚µ‚Ü‚·B‚Q•ªŒã‚ɍēx‘‚«ž‚Þ‚©A‚¨‹A‚è‚­‚¾‚³‚¢', ResponseText) > 0) or
+              (AnsiPos('‚d‚q‚q‚n‚qF‹M•û‚Ì–`Œ¯‚̏‘‚ðì¬’†‚Å‚·', ResponseText) > 0) )
                 and (AnsiPos(RES2CH_COOKIE, ResponseText) > 0) 	then
-        Result := grtBouken
+        Result := grtNinpou
     else if ( (AnsiPos('‚d‚q‚q‚n‚qFCs‚ª‘«‚è‚Ü‚¹‚ñ', ResponseText) > 0) or   // ƒGƒ‰[ˆµ‚¢
               (AnsiPos('‚d‚q‚q‚n‚qFLv‚ª‘«‚è‚È‚­‚ăXƒŒƒbƒh—§‚Ä', ResponseText) > 0) ) // ƒGƒ‰[ˆµ‚¢
               and (AnsiPos(RES2CH_COOKIE, ResponseText) > 0) 	then
-        Result := grtBoukenErr
+        Result := grtNinpouErr
+    else if( AnsiPos('<b>‚â‚ç‚ꂽ‚Å‚²‚´‚éFLv=0 <br>‚³‚ÄŽ©—Í‚Å•œŠˆ‚Å‚«‚é‚©‚È?', ResponseText) > 0) 
+              and (AnsiPos(RES2CH_COOKIE, ResponseText) > 0) 	then
+        Result := grtSuiton
 	else if ( AnsiPos('ƒNƒbƒL[‚ª‚È‚¢‚©ŠúŒÀØ‚ê‚Å‚·', ResponseText) > 0) or
 					(AnsiPos('<title>ƒNƒbƒL[Šm”FI</title>', ResponseText) > 0)	or
 					(AnsiPos('<title>¡ƒNƒbƒL[Šm”FI¡</title>', ResponseText) > 0) or
@@ -1920,6 +1942,8 @@ begin
     curCookies := TStringList.Create;
     curCookies.Delimiter := ';';
     curCookies.DelimitedText := ABoard.Cookie;
+    curCookies.Sort;
+    curCookies.Duplicates := dupIgnore;
 	ABoard.Cookie := '';
     try
         for i := 0 to CookieMng.CookieCollection.Count - 1 do begin
@@ -1941,7 +1965,7 @@ begin
                 if Length( curCookies.Values[ Cookie.CookieName ] ) > 0 then begin
                     // Šù‘¶’l‚Ì•t‚¯‘Ö‚¦
                     curCookies[curCookies.IndexOfName(Cookie.CookieName)] :=
-                        Cookie.Value;
+                        Cookie.ClientCookie;
                 end else begin
                     // ’ljÁ
                     curCookies.Add(Cookie.ClientCookie);
@@ -1949,8 +1973,8 @@ begin
             end;
         end;
         for i := 0 to curCookies.Count - 1 do begin
-            if (curCookies.Strings[i] <> '') then begin
-                ABoard.Cookie := ABoard.Cookie + curCookies.Strings[i] + '; ';
+            if (curCookies[i] <> '') then begin
+                ABoard.Cookie := ABoard.Cookie + curCookies[i] + '; ';
             end;
         end;
     finally

--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -265,6 +265,8 @@ type
         procedure DelBoukenCookie(ADomain: String);
         //! –`Œ¯‚̏‘Domainˆê——Žæ“¾
         procedure GetBoukenDomain(var ADomain: TStringList);
+        //! –`Œ¯‚̏‘ƒhƒƒCƒ“–¼CookieŽæ“¾
+        function GetBouken(AURL: String; var Domain: String): String;
 	end;
 
 var
@@ -3497,7 +3499,19 @@ begin
         end;
     end;
 end;
-
+function TGikoSys.GetBouken(AURL: String; var Domain: String): String;
+var
+	Protocol, Host, Path, Document, Port,Bookmark : String;
+    Cookie : String;
+begin
+    Domain := '';
+    Cookie := '';
+    GikoSys.ParseURI(AURL, Protocol, Host, Path, Document, Port,Bookmark);
+    if ( Length(Host) > 0 ) then begin
+        Setting.GetBouken(Host, Domain, Cookie);
+        Result := Cookie;
+    end;
+end;
 
 initialization
 	GikoSys := TGikoSys.Create;

--- a/Setting.pas
+++ b/Setting.pas
@@ -550,6 +550,7 @@ type
         function GetExtprevieFileName: String;
         function GetBoukenCookie(AHostName: String): String;
         procedure SetBoukenCookie(ACookieValue, AHostName: String);
+        procedure GetBouken(AHostName: String; var Domain:String; var Cookie:String);
         {
         \brief  ƒŠƒ“ƒN—š—ð‚Ì•ÛŽƒTƒCƒY‚Ìsetter
         \param  AVal    Ý’è‚·‚éƒTƒCƒY( >0)
@@ -2503,5 +2504,19 @@ begin
         FBoukenCookieList.Add(AHostName + '=' + ACookieValue);
     end;
 end;
+procedure TSetting.GetBouken(AHostName: String; var Domain:String; var Cookie:String);
+var
+    i : Integer;
+begin
+    Cookie := '';
+    for i := 0 to FBoukenCookieList.Count - 1 do begin
+        if ( AnsiPos(FBoukenCookieList.Names[i], AHostName) > 0 ) then begin
+            Domain := FBoukenCookieList.Names[i];
+            Cookie := FBoukenCookieList.Values[FBoukenCookieList.Names[i]];
+            Break;
+        end;
+    end;
+end;
+
 end.
 

Binary files a/gikoNavi.res and b/gikoNavi.res differ