OSDN Git Service

1.52.0.653
authorgenyakun <genyakun>
Sat, 27 May 2006 14:00:13 +0000 (14:00 +0000)
committergenyakun <genyakun>
Sat, 27 May 2006 14:00:13 +0000 (14:00 +0000)
変更点
・2chの仕様変更(確認画面関連)に対する緊急暫定処置

Editor.dfm
Editor.pas
gikoNavi.res

index b67f20e..e91f591 100644 (file)
@@ -1,6 +1,6 @@
 object EditorForm: TEditorForm
-  Left = 432
-  Top = 258
+  Left = 306
+  Top = 172
   Width = 640
   Height = 449
   HorzScrollBar.Visible = False
@@ -482,7 +482,7 @@ object EditorForm: TEditorForm
     Left = 72
     Top = 124
     Bitmap = {
-      494C01010C000E00040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
+      494C01010C000E00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000004000000001002000000000000040
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -1014,13 +1014,14 @@ object EditorForm: TEditorForm
       FFF3000FFFFFF0CFFF010007FFFFF08700000003FFFFF08700010003FFF7F887
       0003003FC1F7FE8F0003003FC3FBFE3F00038FFFC7FBFF7F0003FC00CBFBFE3F
       0003C400DCF7FEBF0003CC00FF0FFC9F0003D400FFFFFDDF0003F800FFFFFDDF
-      FFFFFC00FFFFFDDFFFFFFC00FFFFFFFF}
+      FFFFFC00FFFFFDDFFFFFFC00FFFFFFFF00000000000000000000000000000000
+      000000000000}
   end
   object HotToobarImageList: TImageList
     Left = 104
     Top = 124
     Bitmap = {
-      494C01010C000E00040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
+      494C01010C000E00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000004000000001002000000000000040
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -1552,7 +1553,8 @@ object EditorForm: TEditorForm
       FFF3000FFFFFF0CFFF010007FFFFF08700000003FFFFF08700010003FFE7F887
       0003003FC1F3FE8F0003003FC3FBFE3F00038FFFC7FBFF7F0003FC00CBFBFE3F
       0003C400DCF3FEBF0003CC00FF07FC9F0003D400FFFFFDDF0003F800FFFFFDDF
-      FFFFFC00FFFFFDDFFFFFFC00FFFFFFFF}
+      FFFFFC00FFFFFDDFFFFFFC00FFFFFFFF00000000000000000000000000000000
+      000000000000}
   end
   object Indy: TIdHTTP
     Intercept = IdLogDebug
index 38d8356..a58d32d 100644 (file)
@@ -947,35 +947,35 @@ begin
 
                                if ABoard = nil then Exit;
 
-                                                               if FileExists(ABoard.GetSETTINGTXTFileName)  then begin
-                                                                               body := TStringList.Create;
-                                                                               try
-                                                                                               body.LoadFromFile(ABoard.GetSETTINGTXTFileName);
-                                                                                               Remote := GetFusianaName(body, ABoard);
-                                                                               finally
-                                                                                               body.Free;
-                                                                               end;
-                                                               end;
-
-                                                               //Setting.txt\82ª\82È\82©\82Á\82½\82ç\8eæ\93¾
-                                                               //\8eI\82É\95\89\89×\82ª\82©\82©\82è\82»\82¤\82Å\95|\82¢\81E\81E\81E
-                                                               if not FileExists(ABoard.GetSETTINGTXTFileName) then begin
-                                                                               //GetSETTINGTXTAction\82ð\8cÄ\82Ñ\8fo\82·\82ÆIndy\82ª\8f\89\8aú\89»\82³\82ê\82é\82Ì\82Å\81A
-                                                                               //\82±\82±\82ÅCookie\82ð\95Û\91\82µ\82È\82­\82Ä\82Í\82¢\82¯\82È\82¢
-                                                                               tmpRawheader := Indy.Response.RawHeaders.Text;
-                                                                               GetSETTINGTXTAction.Execute;
-                                                                               body := TStringList.Create;
-                                                                               try
-                                                                                               if FileExists(ABoard.GetSETTINGTXTFileName) then begin
-                                                                                                       body.LoadFromFile(ABoard.GetSETTINGTXTFileName);
-                                                                                                       Remote := GetFusianaName(body, ABoard);
-                                                                                               end;
-                                                                               finally
-                                                                                               body.Free;
-                                                                               end;
+                                if FileExists(ABoard.GetSETTINGTXTFileName)  then begin
+                                        body := TStringList.Create;
+                                        try
+                                                body.LoadFromFile(ABoard.GetSETTINGTXTFileName);
+                                                Remote := GetFusianaName(body, ABoard);
+                                        finally
+                                                body.Free;
+                                        end;
+                                end;
+
+                                //Setting.txt\82ª\82È\82©\82Á\82½\82ç\8eæ\93¾
+                                //\8eI\82É\95\89\89×\82ª\82©\82©\82è\82»\82¤...
+                                if not FileExists(ABoard.GetSETTINGTXTFileName) then begin
+                                        //GetSETTINGTXTAction\82ð\8cÄ\82Ñ\8fo\82·\82ÆIndy\82ª\8f\89\8aú\89»\82³\82ê\82é\82Ì\82Å\81A
+                                        //\82±\82±\82ÅCookie\82ð\95Û\91\82µ\82È\82­\82Ä\82Í\82¢\82¯\82È\82¢
+                                        tmpRawheader := Indy.Response.RawHeaders.Text;
+                                        GetSETTINGTXTAction.Execute;
+                                        body := TStringList.Create;
+                                        try
+                                                if FileExists(ABoard.GetSETTINGTXTFileName) then begin
+                                                        body.LoadFromFile(ABoard.GetSETTINGTXTFileName);
+                                                        Remote := GetFusianaName(body, ABoard);
+                                                end;
+                                        finally
+                                                body.Free;
+                                        end;
                                 end;
 
-                                                               if Remote = 'fusianasan' then begin
+                                if Remote = 'fusianasan' then begin
                                        MsgResult := MsgBox(
                                                        Handle,
                                                '\83\8a\83\82\81[\83g\83z\83X\83g\82ð\95\\8e¦\82·\82é\8b@\94\\82ª\8eg\82í\82ê\82Ä\82¢\82Ü\82·' + #13#10 +
@@ -991,83 +991,83 @@ begin
                                                DrawMenuBar(Handle);
                                                Exit;
                                                end;
-                                                               end;
-                        end;
+                                        end;
+                                end;
 
-                       if ResultType = grtOK then begin
-                               if (GikoSys.Setting.UseSamba) and  (Timer1.Enabled) then
-                                       WriteSambaTime(FHost, Now());
-                               State := gdsComplete;
-                       end else if ResultType = grtCookie then begin
-                               //\83\8b\81[\83v\96h\8e~
-                               if not FirstWriting then
-                                       raise Exception.Create('');
-                               MsgResult := MsgBox(
-                                       Handle,
-                                       '\81E\93\8a\8de\82³\82ê\82½\93à\97e\82Í\83R\83s\81[\81A\95Û\91\81A\88ø\97p\81A\93]\8dÚ\93\99\82³\82ê\82é\8fê\8d\87\82ª\82 \82è\82Ü\82·\81B' + #13#10 +
-                                       '\81E\93\8a\8de\82É\8aÖ\82µ\82Ä\94­\90\82·\82é\90Ó\94C\82Í\91S\82Ä\93\8a\8de\8eÒ\82É\8bA\82µ\82Ü\82·\81B' + #13#10#13#10 +
-                                       '\91S\90Ó\94C\82ð\95\89\82¤\82±\82Æ\82ð\8f³\91ø\82µ\82Ä\8f\91\82«\8d\9e\82Ý\82Ü\82·\82©\81H',
-                                       '\8fî\95ñ',
-                                       MB_YESNO or MB_ICONQUESTION);
-                               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;
-                                       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);
-                                       Exit;
-                               end else begin
-                                       Board.SPID := '';
-                                       Board.PON := '';
-                                       FWork := false;
-                                       EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED);
-                                       DrawMenuBar(Handle);
-                                       Exit;
-                               end;
-                       end else if ResultType = grtCheck then begin
-                               //
-                               //\83\8b\81[\83v\96h\8e~
-                               if not FirstWriting then
-                                       raise Exception.Create('');
-
-                               MsgResult := MsgBox(
-                                       Handle,
-                                       '\8f\91\82«\8d\9e\82Ý\82É\8aÖ\82µ\82Ä\82Í\97l\81X\82È\83\8d\83O\8fî\95ñ\82ª\8bL\98^\82³\82ê\82Ä\82¢\82Ü\82·\81B' + #13#10 +
-                                       '\93\8a\8de\82É\8aÖ\82µ\82Ä\94­\90\82·\82é\90Ó\94C\82Í\91S\82Ä\93\8a\8de\8eÒ\82É\8bA\82µ\82Ü\82·\81B' + #13#10 +
-                                       '\8cö\8f\98\97Ç\91­\82É\94½\82µ\82½\82è\81A\91¼\90l\82É\96À\98f\82ð\82©\82¯\82é\8f\91\82«\8d\9e\82Ý\82Í\8dT\82¦\82Ä\89º\82³\82¢\81B' + #13#10 +
-                                       '\93\8a\8de\82³\82ê\82½\93à\97e\82Í\83R\83s\81[\81E\95Û\91\81E\88ø\97p\81E\93]\8dÚ\93\99\82³\82ê\82é\8fê\8d\87\82ª\82 \82è\82Ü\82·\81B' + #13#10 +
-                                       #13#10 +
-                                       '\91S\90Ó\94C\82ð\95\89\82¤\82±\82Æ\82ð\8f³\91ø\82µ\82Ä\8f\91\82«\8d\9e\82Ý\82Ü\82·\82©\81H',
-                                       '\8am\94F',
-                                       MB_YESNO or MB_ICONQUESTION);
-
-                               if MsgResult = IDYES then begin
-                    if (GikoSys.Setting.RemoteTrapAtt) and (tmpRawheader <> '') then begin
-                                               GetCookie(tmpRawheader, Board);
+                               if ResultType = grtOK then begin
+                                       if (GikoSys.Setting.UseSamba) and  (Timer1.Enabled) then
+                                               WriteSambaTime(FHost, Now());
+                                        State := gdsComplete;
+                                end else if ResultType = grtCookie then begin
+                                       //\83\8b\81[\83v\96h\8e~
+                                       if not FirstWriting then
+                                               raise Exception.Create('');
+                                        MsgResult := MsgBox(
+                                                Handle,
+                                                '\81E\93\8a\8de\82³\82ê\82½\93à\97e\82Í\83R\83s\81[\81A\95Û\91\81A\88ø\97p\81A\93]\8dÚ\93\99\82³\82ê\82é\8fê\8d\87\82ª\82 \82è\82Ü\82·\81B' + #13#10 +
+                                                '\81E\93\8a\8de\82É\8aÖ\82µ\82Ä\94­\90\82·\82é\90Ó\94C\82Í\91S\82Ä\93\8a\8de\8eÒ\82É\8bA\82µ\82Ü\82·\81B' + #13#10#13#10 +
+                                                '\91S\90Ó\94C\82ð\95\89\82¤\82±\82Æ\82ð\8f³\91ø\82µ\82Ä\8f\91\82«\8d\9e\82Ý\82Ü\82·\82©\81H',
+                                                '\8fî\95ñ',
+                                                MB_YESNO or MB_ICONQUESTION);
+                                       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;
+                                               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);
+                                               Exit;
+                                       end else begin
+                                               Board.SPID := '';
+                                               Board.PON := '';
+                                               FWork := False;
+                                               EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED);
+                                               DrawMenuBar(Handle);
+                                               Exit;
+                                       end;
+                               end else if ResultType = grtCheck then begin
+                                       //\83\8b\81[\83v\96h\8e~
+                                       if not FirstWriting then
+                                               raise Exception.Create('');
+
+                                       MsgResult := MsgBox(
+                                               Handle,
+                                               '\8f\91\82«\8d\9e\82Ý\82É\8aÖ\82µ\82Ä\82Í\97l\81X\82È\83\8d\83O\8fî\95ñ\82ª\8bL\98^\82³\82ê\82Ä\82¢\82Ü\82·\81B' + #13#10 +
+                                               '\93\8a\8de\82É\8aÖ\82µ\82Ä\94­\90\82·\82é\90Ó\94C\82Í\91S\82Ä\93\8a\8de\8eÒ\82É\8bA\82µ\82Ü\82·\81B' + #13#10 +
+                                               '\8cö\8f\98\97Ç\91­\82É\94½\82µ\82½\82è\81A\91¼\90l\82É\96À\98f\82ð\82©\82¯\82é\8f\91\82«\8d\9e\82Ý\82Í\8dT\82¦\82Ä\89º\82³\82¢\81B' + #13#10 +
+                                               '\93\8a\8de\82³\82ê\82½\93à\97e\82Í\83R\83s\81[\81E\95Û\91\81E\88ø\97p\81E\93]\8dÚ\93\99\82³\82ê\82é\8fê\8d\87\82ª\82 \82è\82Ü\82·\81B' + #13#10 +
+                                               #13#10 +
+                                               '\91S\90Ó\94C\82ð\95\89\82¤\82±\82Æ\82ð\8f³\91ø\82µ\82Ä\8f\91\82«\8d\9e\82Ý\82Ü\82·\82©\81H',
+                                               '\8am\94F',
+                                               MB_YESNO or MB_ICONQUESTION);
+
+                                       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;
-                                       if (Board.SPID = '') and (Board.PON = '') and (Board.Cookie = '') then
-                                               raise Exception.Create('');
-                                       Send(Board.Cookie, Board.SPID, Board.PON, False);
-                                       Exit;
-                               end else begin
-                                       EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED);
-                                       DrawMenuBar(Handle);
-                                       Board.SPID := '';
-                                       Board.PON := '';
-                                       FWork := false;
-                                       Exit;
+                                        end;
+
+                                        if (Board.SPID = '') and (Board.PON = '') and (Board.Cookie = '') then
+                                                raise Exception.Create('');
+                                               Send(Board.Cookie, Board.SPID, Board.PON, False);
+                                               Exit;
+                                       end else begin
+                                               EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED);
+                                               DrawMenuBar(Handle);
+                                               Board.SPID := '';
+                                               Board.PON := '';
+                                               FWork := false;
+                                               Exit;
                                        end;
                                end else begin
-                        if (GikoSys.Setting.UseSamba)  and  (Timer1.Enabled) then
-                                                       WriteSambaTime(FHost, Now());
-                                       State := gdsError;
-                                       raise Exception.Create('');
+                                        if (GikoSys.Setting.UseSamba)  and  (Timer1.Enabled) then
+                                               WriteSambaTime(FHost, Now());
+                                        State := gdsError;
+                                        raise Exception.Create('');
                                end;
 
                except
@@ -1110,8 +1110,9 @@ begin
                DrawMenuBar(Handle);
        end;
        FWork := false;
-    //\94ñ\8cö\8e®\83M\83R\83i\83r\94Â\82È\82Ç\82Ì\83X\83N\83\8a\83v\83g\97p
-    //ResponceCode\82ª302Found\82Å\8f\91\82«\8d\9e\82Ý\8a®\97¹
+    //\94ñ\8cö\8e®\83M\83R\83i\83r\94Â\82È\82Ç\82Ì2ch\8cÝ\8a·\83X\83N\83\8a\83v\83g\97p
+    //2ch\88È\8aO\82Å\82©\82ÂResponceCode\82ª302Found\82Å\8f\91\82«\8d\9e\82Ý\8a®\97¹
+    //if (not Board.Is2ch) and (FStatusCode = 302) then begin
     if FStatusCode = 302 then begin
         GikoForm.PlaySound('ResEnd');
         SaveSendFile;
@@ -1202,12 +1203,15 @@ begin
                s := 'sid=' + HttpEncode(SessionID) + '&'
        else
                s := '';
-       s := s + 'subject=&'
-                                + 'FROM=' + HttpEncode(NameComboBox.Text) + '&'
-                                + 'mail=' + HttpEncode(MailComboBox.Text) + '&'
-                                + 'MESSAGE=' + HttpEncode(body) + '&'
-                                + 'bbs=' + Board.BBSID + '&'
-                                + 'time=' + IntToStr(SendTime) + '&';
+        s := s + 'subject=&'
+               + 'FROM=' + HttpEncode(NameComboBox.Text) + '&'
+               + '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&';
        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;
index d332f5e..54dff90 100644 (file)
Binary files a/gikoNavi.res and b/gikoNavi.res differ