| Revision | e0eb14d7e2fb5f72819e511b8bbbe759088a8473 (tree) |
|---|---|
| Time | 2010-03-23 23:53:32 |
| Author | cvs2git <cvs2git> |
| Commiter | cvs2git |
This commit was manufactured by cvs2svn to create tag 'v1_62_0_804'.
GikoSystem.pas (diff) ResPopupBrowser.pas (diff) Trip.pas (diff)
gikoNavi.res (diff)
readme/readme.txt (diff)| @@ -264,7 +264,7 @@ const | ||
| 264 | 264 | ZERO_DATE: Integer = 25569; |
| 265 | 265 | BETA_VERSION_NAME_E = 'beta'; |
| 266 | 266 | BETA_VERSION_NAME_J = 'ﾊﾞﾀ'; |
| 267 | - BETA_VERSION = 61; | |
| 267 | + BETA_VERSION = 62; | |
| 268 | 268 | BETA_VERSION_BUILD = ''; //!< debug版など |
| 269 | 269 | APP_NAME = 'gikoNavi'; |
| 270 | 270 | BE_PHP_URL = 'http://be.2ch.net/test/p.php?i='; |
| @@ -370,7 +370,7 @@ begin | ||
| 370 | 370 | end; |
| 371 | 371 | if (Result.Right > WorkArea.Right) then begin |
| 372 | 372 | // 逆サイドに余裕があれば、出力位置の左右転換 |
| 373 | - if ((p.X - WorkArea.Left) * 2 > WorkArea.Right) then begin | |
| 373 | + if ((p.X - WorkArea.Left) * 2 > MaxWidth) then begin | |
| 374 | 374 | if( (GikoSys.Setting.PopupPosition = gppTop) or |
| 375 | 375 | (GikoSys.Setting.PopupPosition = gppBottom)) then begin |
| 376 | 376 | OffsetRect(Result, -(Result.Right - WorkArea.Right), 0); |
| @@ -424,18 +424,18 @@ procedure get_pw_salt( | ||
| 424 | 424 | const pw : PChar; |
| 425 | 425 | var convpw : String; |
| 426 | 426 | const salt : PChar |
| 427 | -); | |
| 427 | +) ; | |
| 428 | 428 | var |
| 429 | 429 | i : integer; |
| 430 | 430 | begin |
| 431 | 431 | // ^([0-9A-Fa-f]{16})([./0-9A-Za-z]{0,2})$ |
| 432 | - if (Length(pw) >= 17) or (Length(pw) <= 19) then begin | |
| 432 | + if (Length(pw) >= 17) and (Length(pw) <= 19) then begin | |
| 433 | 433 | // キー部分 |
| 434 | 434 | for i := 0 to 7 do begin |
| 435 | 435 | if (Pos(pw[2*i + 0 + 1], '0123456789abcdefABCDEF') > 0) and |
| 436 | 436 | (Pos(pw[2*i + 1 + 1], '0123456789abcdefABCDEF') > 0) then begin |
| 437 | 437 | convpw := convpw + |
| 438 | - Char(StrToInt( pw[2*i + 0 + 1] ) shl 4 + StrToInt( pw[2*i + 1 + 1] )); | |
| 438 | + Char(StrToInt( 'x' + pw[2*i + 0 + 1] ) shl 4 + StrToInt( 'x' + pw[2*i + 1 + 1] )); | |
| 439 | 439 | end else begin |
| 440 | 440 | convpw := ''; |
| 441 | 441 | Break; |
| @@ -498,7 +498,13 @@ begin | ||
| 498 | 498 | if pw[ 0 ] = '#' then begin |
| 499 | 499 | get_pw_salt(pw, convpw, salt); |
| 500 | 500 | end; |
| 501 | - if Length(convpw) = 8 then begin | |
| 501 | + if (pw[ 0 ] = '#') and (Length(pw) >= 20) then begin | |
| 502 | + // 将来の拡張用 | |
| 503 | + Result := '???'; | |
| 504 | + end else if Length(convpw) = 0 then begin | |
| 505 | + // 生キー方式エラー | |
| 506 | + Result := '???'; | |
| 507 | + end else if Length(convpw) = 8 then begin | |
| 502 | 508 | Result := Copy( crypt_r( PChar(convpw), salt, s ), 4, 100 ); |
| 503 | 509 | end else begin |
| 504 | 510 | // 新方式 |
| @@ -1,4 +1,4 @@ | ||
| 1 | -■ギコナビ Version1.00 ﾊﾞﾀ61 Readme.txt | |
| 1 | +■ギコナビ Version1.00 ﾊﾞﾀ62 Readme.txt | |
| 2 | 2 | |
| 3 | 3 | |
| 4 | 4 | ------------------------------ |
| @@ -121,6 +121,9 @@ LICENSE | ||
| 121 | 121 | ------------------------------ |
| 122 | 122 | 履歴 |
| 123 | 123 | ------------------------------ |
| 124 | +200X/XX/XX | |
| 125 | + Version ﾊﾞﾀ62 | |
| 126 | + | |
| 124 | 127 | 2009/10/18 |
| 125 | 128 | Version ﾊﾞﾀ61 |
| 126 | 129 | したらばJBBSでスレッドを建てることができない不具合の修正 |
Fork