ギコナビ
| Revision | d928f9ab5697ccf661aeed0657e626c2037d11ec (tree) |
|---|---|
| Time | 2011-09-25 20:11:03 |
| Author | h677 <h677> |
| Commiter | h677 |
trip１２桁のプレビューが出来ない不具合の修正
オフラインの時のエラーメッセージを修正。
Editor.pas (diff) Trip.pas (diff)
gikoNavi.res (diff)| @@ -932,7 +932,7 @@ begin | ||
| 932 | 932 | State := gdsError; |
| 933 | 933 | ResponseText := '<html><body>' |
| 934 | 934 | + '<div>Ú±ª¸sµÜµ½<br>' |
| 935 | - + 'ñüâvLVÌóÔð²×ľ³¢<br></div>' | |
| 935 | + + 'ñüÌóÔð²×ľ³¢<br></div>' | |
| 936 | 936 | + '<br><br><div>' + E.Message + '</div>' |
| 937 | 937 | + '</body></html>'; |
| 938 | 938 | end; |
| @@ -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); |
sado
Fork