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

diff --git a/Editor.pas b/Editor.pas
index a58d32d..41bb40c 100644 (file)
--- 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
        //\83z\83X\83g\82ª2ch\82Å\81ABe\82ÉLogin\82µ\82Ä\82¢\82ê\82ÎBE\82Ì\83f\81[\83^\82ð\91\97\82é
        //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
+               // \8cÅ\92è\82Ì\83N\83b\83L\81[\82ª\82 \82ê\82Î\90H\82í\82¹\82é
+               if Length(GikoSys.Setting.FixedCookie) > 0 then begin
+                       // \83z\83X\83g\82ª2ch\82Ì\8fê\8d\87\81C\8cÅ\92è\82Ì\83N\83b\83L\81[\82ð\90H\82í\82¹\82é
+                       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('');
                                                //\82à\82¤\88ê\89ñ\82±\82Ì\83\81\83\\83b\83h
-                                               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\8ed\97l\95Ï\8dX\8eb\92è\8f\88\92u
-               //\82½\82¾\82µ\81A\8am\94F\83_\83C\83A\83\8d\83O\82ª\8fo\82È\82¢\82Æ\82¢\82¤\96â\91è\97L\82è\81B
-               + 'hana=mogera&';
+                          + 'time=' + IntToStr(SendTime) + '&';
+                          
        if FThreadItem = nil then begin
                s := s + 'subject=' + HttpEncode(TitleEdit.Text) + '&';
                s := s + 'submit=' + HttpEncode('\91S\90Ó\94C\82ð\95\89\82¤\82±\82Æ\82ð\8f³\91ø\82µ\82Ä\8f\91\82«\8d\9e\82Þ') + #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\82ð\90Ø\82è\8fo\82·
                val := Trim(GikoSys.GetTokenIndex(tmp, ';', 1));

diff --git a/KuroutSetting.dfm b/KuroutSetting.dfm
index 5c20522..af703b7 100644 (file)
--- 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

diff --git a/KuroutSetting.pas b/KuroutSetting.pas
index 6182a79..bc2d32a 100644 (file)
--- 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\8c¾\8cê\83T\83|\81[\83g
-               GikoSys.Setting.GengoSupport := GengoSupport.Checked;
-        GikoSys.SetGikoMessage;
-               //\83\8d\81[\83J\83\8b\81E\83\8a\83\82\81[\83g̼±Å\8cx\8d\90
-               GikoSys.Setting.LocalTrapAtt := LocalTrapAtt.Checked;
-               GikoSys.Setting.RemoteTrapAtt := RemoteTrapAtt.Checked;
+       //2ch\8c¾\8cê\83T\83|\81[\83g
+       GikoSys.Setting.GengoSupport := GengoSupport.Checked;
+       GikoSys.SetGikoMessage;
+       //\83\8d\81[\83J\83\8b\81E\83\8a\83\82\81[\83g̼±Å\8cx\8d\90
+       GikoSys.Setting.LocalTrapAtt := LocalTrapAtt.Checked;
+       GikoSys.Setting.RemoteTrapAtt := RemoteTrapAtt.Checked;
+       // Cookie
+       GikoSys.Setting.FixedCookie := FixedCookieEdit.Text;
+
 
        GikoSys.Setting.KuroutSettingTabIndex := PageControl1.ActivePageIndex;
 end;

diff --git a/Option.dfm b/Option.dfm
index 51ce5b8..c51d90c 100644 (file)
--- 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

diff --git a/Setting.pas b/Setting.pas
index ccf6e46..38713ea 100644 (file)
--- a/Setting.pas
+++ b/Setting.pas
@@ -411,7 +411,7 @@ type
                //\83X\83\8c\8di\8d\9e\82Ý\82Å\96¢\8am\92è\95¶\8e\9a\82à\97L\8cø\82É\82·\82é\82©
                FUseUndecided: Boolean;
 
-                //Be2ch
+                               //Be2ch
                 //\94F\8fØ\97p\83\86\81[\83UID\81E\83p\83X\83\8f\81[\83h
                FBeUserID: String;
                FBeCode: String;
@@ -430,6 +430,9 @@ type
                FInputAssistFormWidth: Integer;
                FInputAssistFormHeight: Integer;
 
+               // Cookie\82É\95t\89Á\82·\82é\8cÅ\92è\83R\81[\83h
+               FFixedCookie: String;
+
                function GetMainCoolSet(Index: Integer): TCoolSet;
                function GetBoardCoolSet(Index: Integer): TCoolSet;
                function GetBrowserCoolSet(Index: Integer): TCoolSet;
@@ -753,6 +756,8 @@ type
                //! InputAssist\83t\83H\81[\83\80\82Ì\83T\83C\83Y
                property InputAssistFormWidth: Integer read FInputAssistFormWidth write FInputAssistFormWidth;
                property InputAssistFormHeight: Integer read FInputAssistFormHeight write FInputAssistFormHeight;
+               //! Cookie\82É\95t\89Á\82·\82é\8cÅ\92è\83R\81[\83h
+               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\82É\95t\89Á\82·\82é\8cÅ\92è\83R\81[\83h
+               FFixedCookie := ini.ReadString('Cookie', 'fixedString', FIXED_COOKIE);
+
                ini.UpdateFile;
        finally
                ini.Free;
@@ -1741,6 +1749,8 @@ begin
 
                //\97\9a\97ð\82Ì\8dÅ\91å\95Û\91¶\8c\8f\90\94
                ini.WriteInteger('Recode', 'Max', FMaxRecordCount);
+               // \8cÅ\92è\82ÌCookie\95¶\8e\9a\97ñ
+        ini.WriteString('Cookie', 'fixedString', FFixedCookie);
 
                ini.UpdateFile;
        finally