ギコナビ
Revision | 098dd0ae26b49e6f22c1fd775c3fa4c5e4199d10 (tree) |
---|---|
Time | 2011-03-04 00:17:39 |
Author | cvs2git <cvs2git> |
Commiter | cvs2git |
This commit was manufactured by cvs2svn to create tag 'v1_62_0_809'.
@@ -215,7 +215,6 @@ begin | ||
215 | 215 | MakeError(FSession, ERROR_INVALID_DATA) |
216 | 216 | else begin |
217 | 217 | body := Buf; |
218 | - body := EUCtoSJIS(body); // 2byte¶ÌªÍgíÈ¢¯ÇOÌ½ß | |
219 | 218 | FSession.FDMDM := Copy(body, Pos('"DMDM=', body) + 6, Length(body)); |
220 | 219 | FSession.FDMDM := Copy(FSession.FDMDM, 1, Pos(';', FSession.FDMDM) - 1); |
221 | 220 | FSession.FMDMD := Copy(body, Pos('"MDMD=', body) + 6, Length(body)); |
@@ -22,7 +22,7 @@ uses | ||
22 | 22 | type |
23 | 23 | // TSetLayeredWindowAttributes = function(wnd: HWND; crKey: DWORD; bAlpha: BYTE; dwFlag: DWORD): Boolean; stdcall; |
24 | 24 | //«Ýßèl^Cv |
25 | - TGikoResultType = (grtOK, grtCookie, grtCheck, grtError, grtNinpou, grtNinpouErr, grtSuiton); | |
25 | + TGikoResultType = (grtOK, grtCookie, grtCheck, grtError, grtBouken, grtBoukenErr); | |
26 | 26 | |
27 | 27 | TEditorForm = class(TForm) |
28 | 28 | MainMenu: TMainMenu; |
@@ -220,7 +220,6 @@ type | ||
220 | 220 | FInputAssistKey: String; ///< üÍAVXgÌL[ |
221 | 221 | FResistWords: TStringList; ///< üÍAVXgÌ«©çÌõÊ |
222 | 222 | FSambaTimer: TSambaTimer; ///< SambaÎôÌ^C}[ |
223 | - FCookieDomain: string; ///< E@hC | |
224 | 223 | procedure Preview; |
225 | 224 | function Check: Boolean; |
226 | 225 | procedure SetNameList(sName, sMail: string); |
@@ -785,7 +784,7 @@ begin | ||
785 | 784 | Indy.Request.AcceptLanguage := 'ja'; |
786 | 785 | Indy.Request.Accept := 'image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*'; |
787 | 786 | 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)); | |
789 | 788 | TextStream := TStringStream.Create(''); |
790 | 789 | Source := TStringStream.Create(''); |
791 | 790 | try |
@@ -888,40 +887,23 @@ begin | ||
888 | 887 | CancelSend( Board, SysMenu ); |
889 | 888 | Exit; |
890 | 889 | end; |
891 | - end else if ResultType = grtNinpou then begin | |
890 | + end else if ResultType = grtBouken then begin | |
892 | 891 | MsgBox( Handle, |
893 | - 'MûÌE@ðì¬Å·Bø«Ô·Èç¢Ü¾B(QªÙÇ©©èÜ·)' + #13#10 | |
892 | + 'MûÌ`¯Ìðì¬Å·Bø«Ô·Èç¢Ü¾B(QªÙÇ©©èÜ·)' + #13#10 | |
894 | 893 | , 'mF', |
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); | |
900 | 895 | Board.PON := ''; |
901 | 896 | Board.SPID := ''; |
902 | 897 | Board.Cookie := ''; |
903 | 898 | GetCookie(Indy.CookieManager, Board); |
904 | 899 | Exit; |
905 | - end else if ResultType = grtSuiton then begin | |
906 | - MsgBox( Handle, | |
907 | - 'MûÌE@ÍÄ©êܵ½B' + #13#10 + | |
908 | - 'E@ðíµÜµ½AÄMµÄ¾³¢B' | |
909 | - , 'mF', | |
910 | - MB_OK or MB_ICONINFORMATION); | |
911 | - // E@ª¨ðÁ· | |
912 | - GikoSys.DelBoukenCookie(FCookieDomain); | |
913 | - GikoSys.Setting.WriteBoukenSettingFile; | |
914 | - Board.PON := ''; | |
915 | - Board.SPID := ''; | |
916 | - Board.Cookie := ''; | |
917 | - Exit; | |
918 | 900 | end else begin |
919 | 901 | if (GikoSys.Setting.UseSamba) and (FSambaTimer.Enabled) then |
920 | 902 | begin |
921 | 903 | FSambaTimer.WriteSambaTime(Now()); |
922 | 904 | end; |
923 | - // E@ª¨G[ÍCookieðXV·é | |
924 | - if ResultType = grtNinpouErr then begin | |
905 | + // `¯ÌG[ÍCookieðXV·é | |
906 | + if ResultType = grtBoukenErr then begin | |
925 | 907 | GetCookie(Indy.CookieManager, Board); |
926 | 908 | end; |
927 | 909 | State := gdsError; |
@@ -999,17 +981,13 @@ function TEditorForm.GetResultType(ResponseText: string): TGikoResultType; | ||
999 | 981 | begin |
1000 | 982 | if AnsiPos('«±ÝªIíèܵ½', ResponseText) <> 0 then |
1001 | 983 | Result := grtOK |
1002 | - else if ( (AnsiPos('<b>椱»FMûÌE@ð쬵ܷBQªãÉÄx«Þ©A¨Aè¾³¢', ResponseText) > 0) or | |
1003 | - (AnsiPos('dqqnqFMûÌ`¯Ìðì¬Å·', ResponseText) > 0) ) | |
984 | + else if (AnsiPos('dqqnqFMûÌ`¯Ìðì¬Å·', ResponseText) > 0) | |
1004 | 985 | and (AnsiPos(RES2CH_COOKIE, ResponseText) > 0) then |
1005 | - Result := grtNinpou | |
986 | + Result := grtBouken | |
1006 | 987 | else if ( (AnsiPos('dqqnqFCsª«èܹñ', ResponseText) > 0) or // G[µ¢ |
1007 | 988 | (AnsiPos('dqqnqFLvª«èÈÄXbh§Ä', ResponseText) > 0) ) // G[µ¢ |
1008 | 989 | and (AnsiPos(RES2CH_COOKIE, ResponseText) > 0) then |
1009 | - Result := grtNinpouErr | |
1010 | - else if( AnsiPos('<b>âçê½Å²´éFLv=0 <br>³Ä©ÍÅÅ«é©È?', ResponseText) > 0) | |
1011 | - and (AnsiPos(RES2CH_COOKIE, ResponseText) > 0) then | |
1012 | - Result := grtSuiton | |
990 | + Result := grtBoukenErr | |
1013 | 991 | else if ( AnsiPos('NbL[ªÈ¢©úÀØêÅ·', ResponseText) > 0) or |
1014 | 992 | (AnsiPos('<title>NbL[mFI</title>', ResponseText) > 0) or |
1015 | 993 | (AnsiPos('<title>¡NbL[mFI¡</title>', ResponseText) > 0) or |
@@ -1942,8 +1920,6 @@ begin | ||
1942 | 1920 | curCookies := TStringList.Create; |
1943 | 1921 | curCookies.Delimiter := ';'; |
1944 | 1922 | curCookies.DelimitedText := ABoard.Cookie; |
1945 | - curCookies.Sort; | |
1946 | - curCookies.Duplicates := dupIgnore; | |
1947 | 1923 | ABoard.Cookie := ''; |
1948 | 1924 | try |
1949 | 1925 | for i := 0 to CookieMng.CookieCollection.Count - 1 do begin |
@@ -1955,17 +1931,14 @@ begin | ||
1955 | 1931 | ABoard.SPID := Cookie.Value; |
1956 | 1932 | ABoard.Expires := GMTToLocalDateTime(Cookie.Expires); |
1957 | 1933 | end else if ( Cookie.CookieName = VAL_HAP ) then begin |
1958 | - // HAPípÌCookieªzz³êéÌÅALøúÀð`FbN·é | |
1959 | - if CompareDateTime(GMTToLocalDateTime(Cookie.Expires) ,Now) > 0 then begin | |
1960 | - GikoSys.SetBoukenCookie(Cookie.Value, Cookie.Domain); | |
1961 | - // `¯ÌÌÛ¶ | |
1962 | - GikoSys.Setting.WriteBoukenSettingFile; | |
1963 | - end; | |
1934 | + GikoSys.SetBoukenCookie(Cookie.Value, Cookie.Domain); | |
1935 | + // `¯ÌÌÛ¶ | |
1936 | + GikoSys.Setting.WriteBoukenSettingFile; | |
1964 | 1937 | end else begin |
1965 | 1938 | if Length( curCookies.Values[ Cookie.CookieName ] ) > 0 then begin |
1966 | 1939 | // ù¶lÌt¯Ö¦ |
1967 | 1940 | curCookies[curCookies.IndexOfName(Cookie.CookieName)] := |
1968 | - Cookie.ClientCookie; | |
1941 | + Cookie.Value; | |
1969 | 1942 | end else begin |
1970 | 1943 | // ÇÁ |
1971 | 1944 | curCookies.Add(Cookie.ClientCookie); |
@@ -1973,8 +1946,8 @@ begin | ||
1973 | 1946 | end; |
1974 | 1947 | end; |
1975 | 1948 | for i := 0 to curCookies.Count - 1 do begin |
1976 | - if (curCookies[i] <> '') then begin | |
1977 | - ABoard.Cookie := ABoard.Cookie + curCookies[i] + '; '; | |
1949 | + if (curCookies.Strings[i] <> '') then begin | |
1950 | + ABoard.Cookie := ABoard.Cookie + curCookies.Strings[i] + '; '; | |
1978 | 1951 | end; |
1979 | 1952 | end; |
1980 | 1953 | finally |
@@ -2515,7 +2488,7 @@ begin | ||
2515 | 2488 | Result := 'Cookie: ' + Result + 'NAME=' + NameComboBox.Text + '; MAIL=' + MailComboBox.Text; |
2516 | 2489 | |
2517 | 2490 | if HAP <> '' then |
2518 | - Result := Result + '; HAP=' + HAP + '; '; | |
2491 | + Result := Result + #13#10'Cookie: HAP=' + HAP + '; '; | |
2519 | 2492 | |
2520 | 2493 | end; |
2521 | 2494 |
@@ -265,8 +265,6 @@ type | ||
265 | 265 | procedure DelBoukenCookie(ADomain: String); |
266 | 266 | //! `¯ÌDomainêæ¾ |
267 | 267 | procedure GetBoukenDomain(var ADomain: TStringList); |
268 | - //! `¯ÌhC¼Cookieæ¾ | |
269 | - function GetBouken(AURL: String; var Domain: String): String; | |
270 | 268 | end; |
271 | 269 | |
272 | 270 | var |
@@ -3499,19 +3497,7 @@ begin | ||
3499 | 3497 | end; |
3500 | 3498 | end; |
3501 | 3499 | 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 | + | |
3515 | 3501 | |
3516 | 3502 | initialization |
3517 | 3503 | GikoSys := TGikoSys.Create; |
@@ -253,7 +253,7 @@ object OptionDialog: TOptionDialog | ||
253 | 253 | Top = 43 |
254 | 254 | Width = 417 |
255 | 255 | Height = 20 |
256 | - ItemHeight = 0 | |
256 | + ItemHeight = 12 | |
257 | 257 | TabOrder = 0 |
258 | 258 | Text = 'BoardURLComboBox' |
259 | 259 | end |
@@ -1689,7 +1689,7 @@ object OptionDialog: TOptionDialog | ||
1689 | 1689 | Top = 256 |
1690 | 1690 | Width = 477 |
1691 | 1691 | Height = 81 |
1692 | - Caption = #24525#27861#24086 | |
1692 | + Caption = #20882#38522#12398#26360 | |
1693 | 1693 | TabOrder = 2 |
1694 | 1694 | object Label25: TLabel |
1695 | 1695 | Left = 40 |
@@ -1725,7 +1725,7 @@ procedure TOptionDialog.BoukenDelButtonClick(Sender: TObject); | ||
1725 | 1725 | begin |
1726 | 1726 | if ( BoukenComboBox.Items.IndexOf( BoukenComboBox.Text ) <> -1 ) then begin |
1727 | 1727 | if MsgBox(Self.Handle, BoukenComboBox.Text + ' ðíµÜ·B'#13#10 + |
1728 | - 'í·éƳūܹñBæ뵢ŷ©H', 'E@@hCí', MB_YESNO or MB_ICONQUESTION) = IDYES then begin | |
1728 | + 'í·éƳūܹñBæ뵢ŷ©H', '`¯Ì@hCí', MB_YESNO or MB_ICONQUESTION) = IDYES then begin | |
1729 | 1729 | GikoSys.DelBoukenCookie(BoukenComboBox.Text); |
1730 | 1730 | GikoSys.Setting.WriteBoukenSettingFile; |
1731 | 1731 | BoukenComboBox.Items.Delete(BoukenComboBox.ItemIndex); |
@@ -550,7 +550,6 @@ type | ||
550 | 550 | function GetExtprevieFileName: String; |
551 | 551 | function GetBoukenCookie(AHostName: String): String; |
552 | 552 | procedure SetBoukenCookie(ACookieValue, AHostName: String); |
553 | - procedure GetBouken(AHostName: String; var Domain:String; var Cookie:String); | |
554 | 553 | { |
555 | 554 | \brief NðÌÛTCYÌsetter |
556 | 555 | \param AVal Ýè·éTCY( >0) |
@@ -2504,19 +2503,5 @@ begin | ||
2504 | 2503 | FBoukenCookieList.Add(AHostName + '=' + ACookieValue); |
2505 | 2504 | end; |
2506 | 2505 | 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 | - | |
2521 | 2506 | end. |
2522 | 2507 |
@@ -9,12 +9,12 @@ DefaultDirName={pf}\gikonavi | ||
9 | 9 | VersionInfoDescription=MRirZbgAbvvO |
10 | 10 | DefaultGroupName=MRir |
11 | 11 | ; ©ªÌ«Éí¹Ä¾³¢ |
12 | -SourceDir=G:\Release62 | |
12 | +SourceDir=G:\Release61 | |
13 | 13 | OutputDir=G:\InnoSetup\Output |
14 | 14 | SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico" |
15 | 15 | ; MRirÌo[WÉ í¹Ä¾³¢ |
16 | -VersionInfoVersion=1.62.1.813 | |
17 | -OutputBaseFilename=gikoNavi_b62_setup | |
16 | +VersionInfoVersion=1.61.1.801 | |
17 | +OutputBaseFilename=gikoNavi_b61_setup | |
18 | 18 | |
19 | 19 | |
20 | 20 |
@@ -14,12 +14,12 @@ DefaultDirName={pf}\gikonavi | ||
14 | 14 | VersionInfoDescription=MRirZbgAbvvO |
15 | 15 | DefaultGroupName=MRir |
16 | 16 | ; ©ªÌ«Éí¹Ä¾³¢ |
17 | -SourceDir=G:\Release | |
17 | +SourceDir=G:\Release61 | |
18 | 18 | OutputDir=G:\InnoSetup\Output |
19 | 19 | SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico" |
20 | 20 | ; MRirÌo[WÉ í¹Ä¾³¢ |
21 | -VersionInfoVersion=1.62.1.813 | |
22 | -OutputBaseFilename=gikoNavi_b62_usetup | |
21 | +VersionInfoVersion=1.61.1.801 | |
22 | +OutputBaseFilename=gikoNavi_b61_usetup | |
23 | 23 | CreateUninstallRegKey=no |
24 | 24 | |
25 | 25 | [Tasks] |
@@ -12,6 +12,4 @@ Error=[ | ||
12 | 12 | NewRes=[VXMI¹µÜ·½(M¥Ö¥L)] |
13 | 13 | NewSure=[VXMI¹µÜ·½(M¥Ö¥L)] |
14 | 14 | ResError=[XM¸s(L¥Ö¥`)] |
15 | -SureError=[VXM¸s(L¥Ö¥`)] | |
16 | -BELogout=BEOAEgµÜ·½ | |
17 | -BELogin=BEOCµÜ·½ - | |
15 | +SureError= [VXM¸s(L¥Ö¥`)] |
@@ -121,13 +121,9 @@ LICENSE | ||
121 | 121 | ------------------------------ |
122 | 122 | ð |
123 | 123 | ------------------------------ |
124 | -2011/03/06 | |
124 | +200X/XX/XX | |
125 | 125 | Version ÊÞÀ62 |
126 | - XGfB^ÅÌgbvÌvr [ÌsïC³ | |
127 | - X|bvAbvÅA¡j^«ÅAE[ÅØêésïÌC³ | |
128 | - E@Î | |
129 | - BEOCÉÎ | |
130 | - | |
126 | + | |
131 | 127 | 2009/10/18 |
132 | 128 | Version ÊÞÀ61 |
133 | 129 | µ½çÎJBBSÅXbhðÄé±ÆªÅ«È¢sïÌC³ |