Commit: 0e7bdfff84cce9947279048c12c2d26f32ce3fb0 - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revision: 0e7bdfff84cce9947279048c12c2d26f32ce3fb0 (tree)
• Time: 2006-05-29 23:54:52
• Author: h677 <h677>
• Commiter: h677

Log Message

Cookieの仕様変更を容易にしておいた

Change Summary

• modified: Editor.pas
• modified: KuroutSetting.dfm
• modified: KuroutSetting.pas
• modified: Option.dfm
• modified: Setting.pas

Incremental Difference

--- a/Editor.pas
+++ b/Editor.pas
@@ -855,7 +855,7 @@ begin
 
 	Cookie := '';
 	if ACOOKIE <> '' then
-       Cookie := ACOOKIE;
+	   Cookie := ACOOKIE;
 	if SPID <> '' then
 		Cookie := Cookie + 'SPID=' + SPID + '; ';
 	if PON <> '' then
@@ -864,9 +864,19 @@ begin
 	//ƒzƒXƒg‚ª2ch‚ŁABe‚ÉLogin‚µ‚Ä‚¢‚ê‚ÎBE‚̃f[ƒ^‚ð‘—‚é
 	//GikoSys.ParseURI( URL, Protocol,Host, Path, Document, Port, Bookmark );
 	//if GikoSys.Is2chHost(Host) and GikoSys.Setting.BeLogin then
-	if (Board.Is2ch) and (GikoSys.Setting.BeLogin) then
-	    Cookie := Cookie + 'MDMD=' + GikoSys.Setting.BeCode + '; '
-    			+ 'DMDM=' + GikoSys.Setting.BeUserID + '; ';
+	if (Board.Is2ch) then begin
+		// ŒÅ’è‚̃NƒbƒL[‚ª‚ ‚ê‚ΐH‚킹‚é
+		if Length(GikoSys.Setting.FixedCookie) > 0 then begin
+			// ƒzƒXƒg‚ª2ch‚̏ꍇCŒÅ’è‚̃NƒbƒL[‚ðH‚킹‚é
+			Cookie := Cookie + GikoSys.Setting.FixedCookie + '; ';
+		end;
+		if (GikoSys.Setting.BeLogin) then begin
+			Cookie := Cookie + 'MDMD=' + GikoSys.Setting.BeCode + '; '
+					+ 'DMDM=' + GikoSys.Setting.BeUserID + '; ';
+		end;
+
+	end;
+
 	Cookie := 'Cookie: ' + Cookie + 'NAME=' + NameComboBox.Text + '; MAIL=' + MailComboBox.Text;
 
 	sysMenu := GetSystemMenu( Handle, false );
@@ -1012,13 +1022,13 @@ begin
 				        if MsgResult = IDYES then begin
 					        if (GikoSys.Setting.RemoteTrapAtt) and (tmpRawheader <> '') then begin
 						        GetCookie(tmpRawheader, Board);
-					        end else begin
-						        GetCookie(Indy.Response.RawHeaders.Text, Board);
+							end else begin
+								GetCookie(Indy.Response.RawHeaders.Text, Board);
 					        end;
 					        if (Board.SPID = '') and (Board.PON = '') and (Board.Cookie = '') then
 						        raise Exception.Create('');
 					        //‚à‚¤ˆê‰ñ‚±‚̃ƒ\ƒbƒh
-					        Send(Board.Cookie, Board.SPID, Board.PON, False);
+							Send(Board.Cookie, Board.SPID, Board.PON, False);
 					        Exit;
 				        end else begin
 					        Board.SPID := '';
@@ -1208,10 +1218,8 @@ begin
                + 'mail=' + HttpEncode(MailComboBox.Text) + '&'
                + 'MESSAGE=' + HttpEncode(body) + '&'
                + 'bbs=' + Board.BBSID + '&'
-               + 'time=' + IntToStr(SendTime) + '&' //;
-               //2005/05/27 2chŽd—l•ÏXŽb’菈’u
-               //‚½‚¾‚µAŠm”Fƒ_ƒCƒAƒƒO‚ªo‚È‚¢‚Æ‚¢‚¤–â‘è—L‚èB
-               + 'hana=mogera&';
+			   + 'time=' + IntToStr(SendTime) + '&';
+			   
 	if FThreadItem = nil then begin
 		s := s + 'subject=' + HttpEncode(TitleEdit.Text) + '&';
 		s := s + 'submit=' + HttpEncode('‘SÓ”C‚𕉂¤‚±‚Æ‚ð³‘ø‚µ‚ď‘‚«ž‚Þ') + #13#10;
@@ -2174,7 +2182,7 @@ begin
 		end else if( AnsiPos(VAL_PON, val) > 0 ) then begin
 			ABoard.PON := Copy(val, AnsiPos(VAL_PON, val) + Length(VAL_PON), Length(val));
 		end else begin
-			ABoard.Cookie := val + '; ';
+			ABoard.Cookie := ABoard.Cookie + val + '; ';
 		end;
 		//expires‚ðØ‚èo‚·
 		val := Trim(GikoSys.GetTokenIndex(tmp, ';', 1));

--- a/KuroutSetting.dfm
+++ b/KuroutSetting.dfm
@@ -363,6 +363,39 @@ object KuroutOption: TKuroutOption
         end
       end
     end
+    object KakikomiTabSheet: TTabSheet
+      Caption = #35443#32048#35373#23450'3'
+      ImageIndex = 2
+      object CookieGroupBox: TGroupBox
+        Left = 16
+        Top = 16
+        Width = 473
+        Height = 105
+        Caption = #12463#12483#12461#12540
+        TabOrder = 0
+        object Label8: TLabel
+          Left = 16
+          Top = 20
+          Width = 59
+          Height = 12
+          Caption = #22266#23450'Cookie'
+        end
+        object Label9: TLabel
+          Left = 20
+          Top = 67
+          Width = 321
+          Height = 12
+          Caption = '2'#12385#12419#12435#12397#12427#12408#12398#26360#12365#36796#12415#12398#38555#12395#65380#19978#35352#12398#25991#23383#21015#12434#24120#12395#36865#20449#12377#12427
+        end
+        object FixedCookieEdit: TEdit
+          Left = 16
+          Top = 40
+          Width = 441
+          Height = 20
+          TabOrder = 0
+        end
+      end
+    end
   end
   object OkBotton: TButton
     Left = 224

--- a/KuroutSetting.pas
+++ b/KuroutSetting.pas
@@ -56,6 +56,11 @@ type
     Label6: TLabel;
     ReadTimeOut: TEdit;
     Label7: TLabel;
+    KakikomiTabSheet: TTabSheet;
+    CookieGroupBox: TGroupBox;
+    Label8: TLabel;
+    FixedCookieEdit: TEdit;
+    Label9: TLabel;
 	procedure OkBottonClick(Sender: TObject);
 	procedure FormCreate(Sender: TObject);
 	procedure CDeleteButtonClick(Sender: TObject);
@@ -116,6 +121,8 @@ begin
 	//FusianaSet
 	LocalTrapAtt.Checked := GikoSys.Setting.LocalTrapAtt;
 	RemoteTrapAtt.Checked := GikoSys.Setting.RemoteTrapAtt;
+	// Cookie
+    FixedCookieEdit.Text := GikoSys.Setting.FixedCookie;
 end;
 
 procedure TKuroutOption.SaveSetting;
@@ -134,12 +141,15 @@ begin
 	else
 		GikoSys.Setting.TimeAdjustSec := 0;
 	GikoSys.Setting.TimeAdjust := PutPostTimeRadioButton.Checked;
-		//2chŒ¾ŒêƒTƒ|[ƒg
-		GikoSys.Setting.GengoSupport := GengoSupport.Checked;
-        GikoSys.SetGikoMessage;
-		//ƒ[ƒJƒ‹EƒŠƒ‚[ƒg̼±ÅŒx
-		GikoSys.Setting.LocalTrapAtt := LocalTrapAtt.Checked;
-		GikoSys.Setting.RemoteTrapAtt := RemoteTrapAtt.Checked;
+	//2chŒ¾ŒêƒTƒ|[ƒg
+	GikoSys.Setting.GengoSupport := GengoSupport.Checked;
+	GikoSys.SetGikoMessage;
+	//ƒ[ƒJƒ‹EƒŠƒ‚[ƒg̼±ÅŒx
+	GikoSys.Setting.LocalTrapAtt := LocalTrapAtt.Checked;
+	GikoSys.Setting.RemoteTrapAtt := RemoteTrapAtt.Checked;
+	// Cookie
+	GikoSys.Setting.FixedCookie := FixedCookieEdit.Text;
+
 
 	GikoSys.Setting.KuroutSettingTabIndex := PageControl1.ActivePageIndex;
 end;

--- a/Option.dfm
+++ b/Option.dfm
@@ -61,9 +61,9 @@ object OptionDialog: TOptionDialog
     Top = 4
     Width = 509
     Height = 389
-    ActivePage = TabSheet3
+    ActivePage = TabSheet4
     MultiLine = True
-    TabIndex = 3
+    TabIndex = 7
     TabOrder = 3
     OnChange = OptionTabChange
     object ConnectSheet: TTabSheet
@@ -1207,8 +1207,8 @@ object OptionDialog: TOptionDialog
         end
       end
       object GroupBox19: TGroupBox
-        Left = 16
-        Top = 80
+        Left = 11
+        Top = 74
         Width = 465
         Height = 49
         Caption = #23653#27508

--- a/Setting.pas
+++ b/Setting.pas
@@ -411,7 +411,7 @@ type
 		//ƒXƒŒiž‚Ý‚Å–¢Šm’蕶Žš‚à—LŒø‚É‚·‚é‚©
 		FUseUndecided: Boolean;
 
-                //Be2ch
+				//Be2ch
                 //”FØ—pƒ†[ƒUIDEƒpƒXƒ[ƒh
 		FBeUserID: String;
 		FBeCode: String;
@@ -430,6 +430,9 @@ type
 		FInputAssistFormWidth: Integer;
 		FInputAssistFormHeight: Integer;
 
+		// Cookie‚É•t‰Á‚·‚éŒÅ’èƒR[ƒh
+		FFixedCookie: String;
+
 		function GetMainCoolSet(Index: Integer): TCoolSet;
 		function GetBoardCoolSet(Index: Integer): TCoolSet;
 		function GetBrowserCoolSet(Index: Integer): TCoolSet;
@@ -753,6 +756,8 @@ type
 		//! InputAssistƒtƒH[ƒ€‚̃TƒCƒY
 		property InputAssistFormWidth: Integer read FInputAssistFormWidth write FInputAssistFormWidth;
 		property InputAssistFormHeight: Integer read FInputAssistFormHeight write FInputAssistFormHeight;
+		//! Cookie‚É•t‰Á‚·‚éŒÅ’èƒR[ƒh
+		property FixedCookie: String read FFixedCookie write FFixedCookie;
 
 end;
 
@@ -789,7 +794,7 @@ const
 	SPAMFILTER_FILE_NAME					= 'SpamFilter.ini';
 		LANGUAGE_FILE_NAME    = 'language.ini';
 	INPUTASSIST_FILE_NAME	= 'InputAssist.ini';
-
+    FIXED_COOKIE =           'hana=mogera';
 
 
 implementation
@@ -1373,6 +1378,9 @@ begin
 		FInputAssistFormWidth := ini.ReadInteger('IAtWindowsSize', 'Width', 400);
 		FInputAssistFormHeight := ini.ReadInteger('IAtWindowsSize', 'Height', 460);
 
+		// Cookie‚É•t‰Á‚·‚éŒÅ’èƒR[ƒh
+		FFixedCookie := ini.ReadString('Cookie', 'fixedString', FIXED_COOKIE);
+
 		ini.UpdateFile;
 	finally
 		ini.Free;
@@ -1741,6 +1749,8 @@ begin
 
 		//—š—ð‚̍őå•Û‘¶Œ”
 		ini.WriteInteger('Recode', 'Max', FMaxRecordCount);
+		// ŒÅ’è‚ÌCookie•¶Žš—ñ
+        ini.WriteString('Cookie', 'fixedString', FFixedCookie);
 
 		ini.UpdateFile;
 	finally