ギコナビ
Revisión | 2b3b40b718f9acb00d624a714c3cb3eefc7b52b1 (tree) |
---|---|
Tiempo | 2011-09-25 20:11:04 |
Autor | cvs2git <cvs2git> |
Commiter | cvs2git |
This commit was manufactured by cvs2svn to create tag 'v1_63_0_816'.
@@ -928,6 +928,14 @@ begin | ||
928 | 928 | raise Exception.Create(''); |
929 | 929 | end; |
930 | 930 | except |
931 | + on E: EIdSocketError do begin | |
932 | + State := gdsError; | |
933 | + ResponseText := '<html><body>' | |
934 | + + '<div>Ú±ª¸sµÜµ½<br>' | |
935 | + + 'ñüÌóÔð²×ľ³¢<br></div>' | |
936 | + + '<br><br><div>' + E.Message + '</div>' | |
937 | + + '</body></html>'; | |
938 | + end; | |
931 | 939 | on E: EIdConnectException do begin |
932 | 940 | State := gdsError; |
933 | 941 | ResponseText := '<html><body>' |
@@ -962,7 +970,9 @@ begin | ||
962 | 970 | finally |
963 | 971 | Source.Free; |
964 | 972 | TextStream.Free; |
965 | - Indy.CookieManager.CookieCollection.Clear; | |
973 | + if ( Indy.CookieManager <> nil ) then begin | |
974 | + Indy.CookieManager.CookieCollection.Clear; | |
975 | + end; | |
966 | 976 | //sysMenu := GetSystemMenu( Handle, true ); |
967 | 977 | EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED); |
968 | 978 | DrawMenuBar(Handle); |
@@ -2064,7 +2064,7 @@ begin | ||
2064 | 2064 | |
2065 | 2065 | if FResPopupBrowser <> nil then begin |
2066 | 2066 | if not(Sender is TResPopupBrowser) then begin |
2067 | - if (FResPopupBrowser.Visible) then begin | |
2067 | + if ((doc <> nil) and (FResPopupBrowser.Visible)) then begin | |
2068 | 2068 | if ResPopupClearTimer.Interval > 0 then begin |
2069 | 2069 | ResPopupClearTimer.Enabled := True; |
2070 | 2070 | ResPopupClearTimer.Tag := 0; |
@@ -276,7 +276,7 @@ const | ||
276 | 276 | ZERO_DATE: Integer = 25569; |
277 | 277 | BETA_VERSION_NAME_E = 'beta'; |
278 | 278 | BETA_VERSION_NAME_J = 'ÊÞÀ'; |
279 | - BETA_VERSION = 62; | |
279 | + BETA_VERSION = 63; | |
280 | 280 | BETA_VERSION_BUILD = ''; //!< debugÅÈÇ |
281 | 281 | APP_NAME = 'gikoNavi'; |
282 | 282 | BE_PHP_URL = 'http://be.2ch.net/test/p.php?i='; |
@@ -494,18 +494,18 @@ begin | ||
494 | 494 | Result := '???'; |
495 | 495 | end else begin |
496 | 496 | convpw := ''; |
497 | - // ¶L[û® | |
498 | - if pw[ 0 ] = '#' then begin | |
499 | - get_pw_salt(pw, convpw, salt); | |
500 | - end; | |
501 | 497 | if (pw[ 0 ] = '#') and (Length(pw) >= 20) then begin |
502 | 498 | // «Ìg£p |
503 | 499 | Result := '???'; |
504 | - end else if Length(convpw) = 0 then begin | |
505 | - // ¶L[û®G[ | |
506 | - Result := '???'; | |
507 | - end else if Length(convpw) = 8 then begin | |
508 | - Result := Copy( crypt_r( PChar(convpw), salt, s ), 4, 100 ); | |
500 | + end else if pw[ 0 ] = '#' then begin | |
501 | + // ¶L[û® | |
502 | + get_pw_salt(pw, convpw, salt); | |
503 | + if Length(convpw) = 0 then begin | |
504 | + // ¶L[û®G[ | |
505 | + Result := '???'; | |
506 | + end else if Length(convpw) = 8 then begin | |
507 | + Result := Copy( crypt_r( PChar(convpw), salt, s ), 4, 100 ); | |
508 | + end | |
509 | 509 | end else begin |
510 | 510 | // Vû® |
511 | 511 | StringHashSHA1(digest, pw); |
@@ -1,4 +1,4 @@ | ||
1 | -¡MRir Version1.00 ÊÞÀ62 Readme.txt | |
1 | +¡MRir Version1.00 ÊÞÀ63 Readme.txt | |
2 | 2 | |
3 | 3 | |
4 | 4 | ------------------------------ |
@@ -121,6 +121,9 @@ LICENSE | ||
121 | 121 | ------------------------------ |
122 | 122 | ð |
123 | 123 | ------------------------------ |
124 | +20XX/XX/XX | |
125 | + Version ÊÞÀ63 | |
126 | + | |
124 | 127 | 2011/03/06 |
125 | 128 | Version ÊÞÀ62 |
126 | 129 | XGfB^ÅÌgbvÌvr [ÌsïC³ |