• R/O
  • HTTP
  • SSH
  • HTTPS

gikonavi: Commit


Commit MetaInfo

Revisione98d85937f2eefc63706d39dca8bdf4e229acc2e (tree)
Time2011-03-04 00:17:41
Authorcvs2git <cvs2git>
Commitercvs2git

Log Message

This commit was manufactured by cvs2svn to create tag 'v1_62_0_811'.

Change Summary

Incremental Difference

--- a/Belib.pas
+++ b/Belib.pas
@@ -215,7 +215,6 @@ begin
215215 MakeError(FSession, ERROR_INVALID_DATA)
216216 else begin
217217 body := Buf;
218- body := EUCtoSJIS(body); // 2byte文字の部分は使わないけど念のため
219218 FSession.FDMDM := Copy(body, Pos('"DMDM=', body) + 6, Length(body));
220219 FSession.FDMDM := Copy(FSession.FDMDM, 1, Pos(';', FSession.FDMDM) - 1);
221220 FSession.FMDMD := Copy(body, Pos('"MDMD=', body) + 6, Length(body));
--- a/Editor.pas
+++ b/Editor.pas
@@ -22,7 +22,7 @@ uses
2222 type
2323 // TSetLayeredWindowAttributes = function(wnd: HWND; crKey: DWORD; bAlpha: BYTE; dwFlag: DWORD): Boolean; stdcall;
2424 //書き込み戻り値タイプ
25- TGikoResultType = (grtOK, grtCookie, grtCheck, grtError, grtNinpou, grtNinpouErr, grtSuiton);
25+ TGikoResultType = (grtOK, grtCookie, grtCheck, grtError, grtBouken, grtBoukenErr);
2626
2727 TEditorForm = class(TForm)
2828 MainMenu: TMainMenu;
@@ -220,7 +220,6 @@ type
220220 FInputAssistKey: String; ///< 入力アシストのキー
221221 FResistWords: TStringList; ///< 入力アシストの辞書からの検索結果
222222 FSambaTimer: TSambaTimer; ///< Samba対策のタイマー
223- FCookieDomain: string; ///< 忍法帖ドメイン
224223 procedure Preview;
225224 function Check: Boolean;
226225 procedure SetNameList(sName, sMail: string);
@@ -785,7 +784,7 @@ begin
785784 Indy.Request.AcceptLanguage := 'ja';
786785 Indy.Request.Accept := 'image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*';
787786 Indy.Request.ContentType := 'application/x-www-form-urlencoded';
788- Indy.Request.CustomHeaders.Add(getHeaderStr(ACOOKIE, SPID, PON, GikoSys.GetBouken(URL, FCookieDomain), Board));
787+ Indy.Request.CustomHeaders.Add(getHeaderStr(ACOOKIE, SPID, PON, GikoSys.GetBoukenCookie(URL), Board));
789788 TextStream := TStringStream.Create('');
790789 Source := TStringStream.Create('');
791790 try
@@ -888,40 +887,23 @@ begin
888887 CancelSend( Board, SysMenu );
889888 Exit;
890889 end;
891- end else if ResultType = grtNinpou then begin
890+ end else if ResultType = grtBouken then begin
892891 MsgBox( Handle,
893- '貴方の忍法帖を作成中です。引き返すならいまだ。(2分ほどかかります)' + #13#10
892+ '貴方の冒険の書を作成中です。引き返すならいまだ。(2分ほどかかります)' + #13#10
894893 , '確認',
895- MB_OK or MB_ICONINFORMATION);
896- if (GikoSys.Setting.UseSamba) and (FSambaTimer.Enabled) then
897- begin
898- FSambaTimer.WriteSambaTime(Now());
899- end;
894+ MB_OK or MB_ICONQUESTION);
900895 Board.PON := '';
901896 Board.SPID := '';
902897 Board.Cookie := '';
903898 GetCookie(Indy.CookieManager, Board);
904899 Exit;
905- end else if ResultType = grtSuiton then begin
906- MsgBox( Handle,
907- '貴方の忍法帖は焼かれました。' + #13#10 +
908- '忍法帖を削除しました、再送信してください。'
909- , '確認',
910- MB_OK or MB_ICONINFORMATION);
911- // 忍法帖巻物を消す
912- GikoSys.DelBoukenCookie(FCookieDomain);
913- GikoSys.Setting.WriteBoukenSettingFile;
914- Board.PON := '';
915- Board.SPID := '';
916- Board.Cookie := '';
917- Exit;
918900 end else begin
919901 if (GikoSys.Setting.UseSamba) and (FSambaTimer.Enabled) then
920902 begin
921903 FSambaTimer.WriteSambaTime(Now());
922904 end;
923- // 忍法帖巻物エラーはCookieを更新する
924- if ResultType = grtNinpouErr then begin
905+ // 冒険の書エラーはCookieを更新する
906+ if ResultType = grtBoukenErr then begin
925907 GetCookie(Indy.CookieManager, Board);
926908 end;
927909 State := gdsError;
@@ -999,17 +981,13 @@ function TEditorForm.GetResultType(ResponseText: string): TGikoResultType;
999981 begin
1000982 if AnsiPos('書きこみが終わりました', ResponseText) <> 0 then
1001983 Result := grtOK
1002- else if ( (AnsiPos('<b>ようこそ:貴方の忍法帖を作成します。2分後に再度書き込むか、お帰りください', ResponseText) > 0) or
1003- (AnsiPos('ERROR:貴方の冒険の書を作成中です', ResponseText) > 0) )
984+ else if (AnsiPos('ERROR:貴方の冒険の書を作成中です', ResponseText) > 0)
1004985 and (AnsiPos(RES2CH_COOKIE, ResponseText) > 0) then
1005- Result := grtNinpou
986+ Result := grtBouken
1006987 else if ( (AnsiPos('ERROR:修行が足りません', ResponseText) > 0) or // エラー扱い
1007988 (AnsiPos('ERROR:Lvが足りなくてスレッド立て', ResponseText) > 0) ) // エラー扱い
1008989 and (AnsiPos(RES2CH_COOKIE, ResponseText) > 0) then
1009- Result := grtNinpouErr
1010- else if( AnsiPos('<b>やられたでござる:Lv=0 <br>さて自力で復活できるかな?', ResponseText) > 0)
1011- and (AnsiPos(RES2CH_COOKIE, ResponseText) > 0) then
1012- Result := grtSuiton
990+ Result := grtBoukenErr
1013991 else if ( AnsiPos('クッキーがないか期限切れです', ResponseText) > 0) or
1014992 (AnsiPos('<title>クッキー確認!</title>', ResponseText) > 0) or
1015993 (AnsiPos('<title>■クッキー確認!■</title>', ResponseText) > 0) or
@@ -1942,8 +1920,6 @@ begin
19421920 curCookies := TStringList.Create;
19431921 curCookies.Delimiter := ';';
19441922 curCookies.DelimitedText := ABoard.Cookie;
1945- curCookies.Sort;
1946- curCookies.Duplicates := dupIgnore;
19471923 ABoard.Cookie := '';
19481924 try
19491925 for i := 0 to CookieMng.CookieCollection.Count - 1 do begin
@@ -1965,7 +1941,7 @@ begin
19651941 if Length( curCookies.Values[ Cookie.CookieName ] ) > 0 then begin
19661942 // 既存値の付け替え
19671943 curCookies[curCookies.IndexOfName(Cookie.CookieName)] :=
1968- Cookie.ClientCookie;
1944+ Cookie.Value;
19691945 end else begin
19701946 // 追加
19711947 curCookies.Add(Cookie.ClientCookie);
@@ -1973,8 +1949,8 @@ begin
19731949 end;
19741950 end;
19751951 for i := 0 to curCookies.Count - 1 do begin
1976- if (curCookies[i] <> '') then begin
1977- ABoard.Cookie := ABoard.Cookie + curCookies[i] + '; ';
1952+ if (curCookies.Strings[i] <> '') then begin
1953+ ABoard.Cookie := ABoard.Cookie + curCookies.Strings[i] + '; ';
19781954 end;
19791955 end;
19801956 finally
--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -265,8 +265,6 @@ type
265265 procedure DelBoukenCookie(ADomain: String);
266266 //! 冒険の書Domain一覧取得
267267 procedure GetBoukenDomain(var ADomain: TStringList);
268- //! 冒険の書ドメイン名Cookie取得
269- function GetBouken(AURL: String; var Domain: String): String;
270268 end;
271269
272270 var
@@ -3499,19 +3497,7 @@ begin
34993497 end;
35003498 end;
35013499 end;
3502-function TGikoSys.GetBouken(AURL: String; var Domain: String): String;
3503-var
3504- Protocol, Host, Path, Document, Port,Bookmark : String;
3505- Cookie : String;
3506-begin
3507- Domain := '';
3508- Cookie := '';
3509- GikoSys.ParseURI(AURL, Protocol, Host, Path, Document, Port,Bookmark);
3510- if ( Length(Host) > 0 ) then begin
3511- Setting.GetBouken(Host, Domain, Cookie);
3512- Result := Cookie;
3513- end;
3514-end;
3500+
35153501
35163502 initialization
35173503 GikoSys := TGikoSys.Create;
--- a/Option.dfm
+++ b/Option.dfm
@@ -253,7 +253,7 @@ object OptionDialog: TOptionDialog
253253 Top = 43
254254 Width = 417
255255 Height = 20
256- ItemHeight = 0
256+ ItemHeight = 12
257257 TabOrder = 0
258258 Text = 'BoardURLComboBox'
259259 end
@@ -1689,7 +1689,7 @@ object OptionDialog: TOptionDialog
16891689 Top = 256
16901690 Width = 477
16911691 Height = 81
1692- Caption = #24525#27861#24086
1692+ Caption = #20882#38522#12398#26360
16931693 TabOrder = 2
16941694 object Label25: TLabel
16951695 Left = 40
--- a/Option.pas
+++ b/Option.pas
@@ -1725,7 +1725,7 @@ procedure TOptionDialog.BoukenDelButtonClick(Sender: TObject);
17251725 begin
17261726 if ( BoukenComboBox.Items.IndexOf( BoukenComboBox.Text ) <> -1 ) then begin
17271727 if MsgBox(Self.Handle, BoukenComboBox.Text + ' を削除します。'#13#10 +
1728- '削除すると復元できません。よろしいですか?', '忍法帖 ドメイン削除', MB_YESNO or MB_ICONQUESTION) = IDYES then begin
1728+ '削除すると復元できません。よろしいですか?', '冒険の書 ドメイン削除', MB_YESNO or MB_ICONQUESTION) = IDYES then begin
17291729 GikoSys.DelBoukenCookie(BoukenComboBox.Text);
17301730 GikoSys.Setting.WriteBoukenSettingFile;
17311731 BoukenComboBox.Items.Delete(BoukenComboBox.ItemIndex);
--- a/Setting.pas
+++ b/Setting.pas
@@ -550,7 +550,6 @@ type
550550 function GetExtprevieFileName: String;
551551 function GetBoukenCookie(AHostName: String): String;
552552 procedure SetBoukenCookie(ACookieValue, AHostName: String);
553- procedure GetBouken(AHostName: String; var Domain:String; var Cookie:String);
554553 {
555554 \brief リンク履歴の保持サイズのsetter
556555 \param AVal 設定するサイズ( >0)
@@ -2504,19 +2503,5 @@ begin
25042503 FBoukenCookieList.Add(AHostName + '=' + ACookieValue);
25052504 end;
25062505 end;
2507-procedure TSetting.GetBouken(AHostName: String; var Domain:String; var Cookie:String);
2508-var
2509- i : Integer;
2510-begin
2511- Cookie := '';
2512- for i := 0 to FBoukenCookieList.Count - 1 do begin
2513- if ( AnsiPos(FBoukenCookieList.Names[i], AHostName) > 0 ) then begin
2514- Domain := FBoukenCookieList.Names[i];
2515- Cookie := FBoukenCookieList.Values[FBoukenCookieList.Names[i]];
2516- Break;
2517- end;
2518- end;
2519-end;
2520-
25212506 end.
25222507
Binary files a/gikoNavi.res and b/gikoNavi.res differ
--- a/readme/gikoSetup.iss
+++ b/readme/gikoSetup.iss
@@ -9,12 +9,12 @@ DefaultDirName={pf}\gikonavi
99 VersionInfoDescription=ギコナビセットアッププログラム
1010 DefaultGroupName=ギコナビ
1111 ; 自分の環境に合わせてください
12-SourceDir=G:\Release62
12+SourceDir=G:\Release61
1313 OutputDir=G:\InnoSetup\Output
1414 SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico"
1515 ; ギコナビのバージョンにあわせてください
16-VersionInfoVersion=1.62.1.813
17-OutputBaseFilename=gikoNavi_b62_setup
16+VersionInfoVersion=1.61.1.801
17+OutputBaseFilename=gikoNavi_b61_setup
1818
1919
2020
--- a/readme/gikoUSetup.iss
+++ b/readme/gikoUSetup.iss
@@ -18,8 +18,8 @@ SourceDir=G:\Release
1818 OutputDir=G:\InnoSetup\Output
1919 SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico"
2020 ; ギコナビのバージョンにあわせてください
21-VersionInfoVersion=1.62.1.813
22-OutputBaseFilename=gikoNavi_b62_usetup
21+VersionInfoVersion=1.62.0.810
22+OutputBaseFilename=gikoNavi_b62_810_usetup
2323 CreateUninstallRegKey=no
2424
2525 [Tasks]
--- a/readme/language.ini
+++ b/readme/language.ini
@@ -12,6 +12,4 @@ Error=[
1212 NewRes=[新レス送信終了しますた(`・ω・´)]
1313 NewSure=[新スレ送信終了しますた(`・ω・´)]
1414 ResError=[レス送信失敗(´・ω・`)]
15-SureError=[新スレ送信失敗(´・ω・`)]
16-BELogout=BEログアウトしますた
17-BELogin=BEログインしますた -
15+SureError= [新スレ送信失敗(´・ω・`)]
--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -121,13 +121,9 @@ LICENSE
121121 ------------------------------
122122 履歴
123123 ------------------------------
124-2011/03/06
124+200X/XX/XX
125125 Version バタ62
126- レスエディタでのトリップのプレビューの不具合修正
127- レスポップアップで、複数モニタ環境で、右端で切れる不具合の修正
128- 忍法帖対応
129- BEログインに対応
130-
126+
131127 2009/10/18
132128 Version バタ61
133129 したらばJBBSでスレッドを建てることができない不具合の修正
Show on old repository browser