From: genyakun Date: Sat, 27 May 2006 14:00:13 +0000 (+0000) Subject: 1.52.0.653 X-Git-Tag: v1_64_1_820~424 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=937daf6543a404309d3d01e3429674358a075b18;p=gikonavigoeson%2Fgikonavi.git 1.52.0.653 変更点 ・2chの仕様変更(確認画面関連)に対する緊急暫定処置 --- diff --git a/Editor.dfm b/Editor.dfm index b67f20e..e91f591 100644 --- a/Editor.dfm +++ b/Editor.dfm @@ -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 diff --git a/Editor.pas b/Editor.pas index 38d8356..a58d32d 100644 --- a/Editor.pas +++ b/Editor.pas @@ -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‚ª‚È‚©‚Á‚½‚çŽæ“¾ - //ŽI‚É•‰‰×‚ª‚©‚©‚è‚»‚¤‚Å•|‚¢EEE - if not FileExists(ABoard.GetSETTINGTXTFileName) then begin - //GetSETTINGTXTAction‚ðŒÄ‚яo‚·‚ÆIndy‚ª‰Šú‰»‚³‚ê‚é‚̂ŁA - //‚±‚±‚ÅCookie‚ð•Û‘¶‚µ‚È‚­‚Ä‚Í‚¢‚¯‚È‚¢ - 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‚ª‚È‚©‚Á‚½‚çŽæ“¾ + //ŽI‚É•‰‰×‚ª‚©‚©‚è‚»‚¤... + if not FileExists(ABoard.GetSETTINGTXTFileName) then begin + //GetSETTINGTXTAction‚ðŒÄ‚яo‚·‚ÆIndy‚ª‰Šú‰»‚³‚ê‚é‚̂ŁA + //‚±‚±‚ÅCookie‚ð•Û‘¶‚µ‚È‚­‚Ä‚Í‚¢‚¯‚È‚¢ + 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, 'ƒŠƒ‚[ƒgƒzƒXƒg‚ð•\Ž¦‚·‚é‹@”\‚ªŽg‚í‚ê‚Ä‚¢‚Ü‚·' + #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 - //ƒ‹[ƒv–hŽ~ - if not FirstWriting then - raise Exception.Create(''); - MsgResult := MsgBox( - Handle, - 'E“Še‚³‚ꂽ“à—e‚̓Rƒs[A•Û‘¶Aˆø—pA“]Ú“™‚³‚ê‚éê‡‚ª‚ ‚è‚Ü‚·B' + #13#10 + - 'E“Še‚ÉŠÖ‚µ‚Ä”­¶‚·‚éÓ”C‚Í‘S‚Ä“ŠeŽÒ‚É‹A‚µ‚Ü‚·B' + #13#10#13#10 + - '‘SÓ”C‚𕉂¤‚±‚Æ‚ð³‘ø‚µ‚ď‘‚«ž‚Ý‚Ü‚·‚©H', - 'î•ñ', - 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(''); - //‚à‚¤ˆê‰ñ‚±‚̃ƒ\ƒbƒh - 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 - // - //ƒ‹[ƒv–hŽ~ - if not FirstWriting then - raise Exception.Create(''); - - MsgResult := MsgBox( - Handle, - '‘‚«ž‚Ý‚ÉŠÖ‚µ‚Ä‚Í—lX‚ȃƒOî•ñ‚ª‹L˜^‚³‚ê‚Ä‚¢‚Ü‚·B' + #13#10 + - '“Še‚ÉŠÖ‚µ‚Ä”­¶‚·‚éÓ”C‚Í‘S‚Ä“ŠeŽÒ‚É‹A‚µ‚Ü‚·B' + #13#10 + - 'Œö˜—Ç‘­‚É”½‚µ‚½‚èA‘¼l‚É–À˜f‚ð‚©‚¯‚鏑‚«ž‚݂͍T‚¦‚ĉº‚³‚¢B' + #13#10 + - '“Še‚³‚ꂽ“à—e‚̓Rƒs[E•Û‘¶Eˆø—pE“]Ú“™‚³‚ê‚éê‡‚ª‚ ‚è‚Ü‚·B' + #13#10 + - #13#10 + - '‘SÓ”C‚𕉂¤‚±‚Æ‚ð³‘ø‚µ‚ď‘‚«ž‚Ý‚Ü‚·‚©H', - 'Šm”F', - 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 + //ƒ‹[ƒv–hŽ~ + if not FirstWriting then + raise Exception.Create(''); + MsgResult := MsgBox( + Handle, + 'E“Še‚³‚ꂽ“à—e‚̓Rƒs[A•Û‘¶Aˆø—pA“]Ú“™‚³‚ê‚éê‡‚ª‚ ‚è‚Ü‚·B' + #13#10 + + 'E“Še‚ÉŠÖ‚µ‚Ä”­¶‚·‚éÓ”C‚Í‘S‚Ä“ŠeŽÒ‚É‹A‚µ‚Ü‚·B' + #13#10#13#10 + + '‘SÓ”C‚𕉂¤‚±‚Æ‚ð³‘ø‚µ‚ď‘‚«ž‚Ý‚Ü‚·‚©H', + 'î•ñ', + 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(''); + //‚à‚¤ˆê‰ñ‚±‚̃ƒ\ƒbƒh + 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 + //ƒ‹[ƒv–hŽ~ + if not FirstWriting then + raise Exception.Create(''); + + MsgResult := MsgBox( + Handle, + '‘‚«ž‚Ý‚ÉŠÖ‚µ‚Ä‚Í—lX‚ȃƒOî•ñ‚ª‹L˜^‚³‚ê‚Ä‚¢‚Ü‚·B' + #13#10 + + '“Še‚ÉŠÖ‚µ‚Ä”­¶‚·‚éÓ”C‚Í‘S‚Ä“ŠeŽÒ‚É‹A‚µ‚Ü‚·B' + #13#10 + + 'Œö˜—Ç‘­‚É”½‚µ‚½‚èA‘¼l‚É–À˜f‚ð‚©‚¯‚鏑‚«ž‚݂͍T‚¦‚ĉº‚³‚¢B' + #13#10 + + '“Še‚³‚ꂽ“à—e‚̓Rƒs[E•Û‘¶Eˆø—pE“]Ú“™‚³‚ê‚éê‡‚ª‚ ‚è‚Ü‚·B' + #13#10 + + #13#10 + + '‘SÓ”C‚𕉂¤‚±‚Æ‚ð³‘ø‚µ‚ď‘‚«ž‚Ý‚Ü‚·‚©H', + 'Šm”F', + 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; - //”ñŒöŽ®ƒMƒRƒiƒr”‚Ȃǂ̃XƒNƒŠƒvƒg—p - //ResponceCode‚ª302Found‚ŏ‘‚«ž‚ÝŠ®—¹ + //”ñŒöŽ®ƒMƒRƒiƒr”‚ȂǂÌ2chŒÝŠ·ƒXƒNƒŠƒvƒg—p + //2chˆÈŠO‚Å‚©‚ÂResponceCode‚ª302Found‚ŏ‘‚«ž‚ÝŠ®—¹ + //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Žd—l•ÏXŽb’菈’u + //‚½‚¾‚µAŠm”Fƒ_ƒCƒAƒƒO‚ªo‚È‚¢‚Æ‚¢‚¤–â‘è—L‚èB + + 'hana=mogera&'; if FThreadItem = nil then begin s := s + 'subject=' + HttpEncode(TitleEdit.Text) + '&'; s := s + 'submit=' + HttpEncode('‘SÓ”C‚𕉂¤‚±‚Æ‚ð³‘ø‚µ‚ď‘‚«ž‚Þ') + #13#10; diff --git a/gikoNavi.res b/gikoNavi.res index d332f5e..54dff90 100644 Binary files a/gikoNavi.res and b/gikoNavi.res differ