OSDN Git Service

trip12桁のプレビューが出来ない不具合の修正
authorh677 <h677>
Sun, 25 Sep 2011 11:11:03 +0000 (11:11 +0000)
committerh677 <h677>
Sun, 25 Sep 2011 11:11:03 +0000 (11:11 +0000)
オフラインの時のエラーメッセージを修正。

Editor.pas
Trip.pas
gikoNavi.res

index aeb7304..79c54a4 100644 (file)
@@ -932,7 +932,7 @@ begin
                                State := gdsError;
                                ResponseText := '<html><body>'
                                                                                        + '<div>\90Ú\91±\82ª\8e¸\94s\82µ\82Ü\82µ\82½<br>'
-                                                                                       + '\89ñ\90ü\82â\83v\83\8d\83L\83V\82Ì\8fó\91Ô\82ð\92²\82×\82Ä\82­\82¾\82³\82¢<br></div>'
+                                                                                       + '\89ñ\90ü\82Ì\8fó\91Ô\82ð\92²\82×\82Ä\82­\82¾\82³\82¢<br></div>'
                                                                                        + '<br><br><div>' + E.Message + '</div>'
                                                                                        + '</body></html>';
             end;
index 1d6d242..262268f 100644 (file)
--- a/Trip.pas
+++ b/Trip.pas
@@ -494,18 +494,18 @@ begin
             Result := '???';
         end else begin
             convpw := '';
-            // \90\83L\81[\95û\8e®
-            if pw[ 0 ] = '#' then begin
-                get_pw_salt(pw, convpw, salt);
-            end;
             if (pw[ 0 ] = '#') and (Length(pw) >= 20) then begin
                 // \8f«\97\88\82Ì\8ag\92£\97p
                 Result := '???';
-            end else if Length(convpw) = 0 then begin
-                // \90\83L\81[\95û\8e®\83G\83\89\81[
-                Result := '???';
-            end else if Length(convpw) = 8 then begin
-                Result := Copy( crypt_r( PChar(convpw), salt, s ), 4, 100 );
+            end else if pw[ 0 ] = '#' then begin
+                // \90\83L\81[\95û\8e®
+                get_pw_salt(pw, convpw, salt);
+                if Length(convpw) = 0 then begin
+                    // \90\83L\81[\95û\8e®\83G\83\89\81[
+                    Result := '???';
+                end else if Length(convpw) = 8 then begin
+                    Result := Copy( crypt_r( PChar(convpw), salt, s ), 4, 100 );
+                end
             end else begin
                 // \90V\95û\8e®
                 StringHashSHA1(digest, pw);
index 273db11..b011f90 100644 (file)
Binary files a/gikoNavi.res and b/gikoNavi.res differ