瓶からののURLジャンプができなくなっていた問題を修正

http://以外のプロトコルに対応する時用対策（仮）

diff --git a/bottleclient/LogForm.pas b/bottleclient/LogForm.pas
index b298fd0..04f0a14 100755 (executable)
--- a/bottleclient/LogForm.pas
+++ b/bottleclient/LogForm.pas
@@ -623,7 +623,7 @@ var LogItem: TLogItem;
     Urls: TStringList;
 
 begin
-  if (lvwLog.ItemIndex <> -1) or (SelectedBottleLog = nil) then Exit;
+  if (lvwLog.ItemIndex < 0) or (SelectedBottleLog = nil) then Exit;
   LogItem := SelectedBottleLog[lvwLog.ItemIndex] as TLogItem;
   Urls := TStringList.Create;
   try
@@ -652,7 +652,8 @@ begin
             '-', '%b', [rfReplaceAll]))) > 0 then begin
           for j := 1 to u do begin
             s := SsParser.GetParam(SsParser[i], j*2);
-            if Pos('http://', s) > 0 then begin
+            //https\82È\82Ç\82ª\92Ç\89Á\82³\82ê\82é\8e\9e\91Î\8dô\81c\81c://\82ð\8c\9f\8dõ\82·\82ê\82Î\82½\82Ô\82ñ\91å\8fä\95v
+            if Pos('://', s) > 0 then begin
               if Urls <> nil then Urls.Add(s);
               count := count + 1;
             end;
@@ -667,7 +668,8 @@ begin
       if SsParser.Match(SsParser[i], '\URL%b%b') = 0 then begin
         //\8aÈ\88Õ\8c`\8e®\URL\83^\83O\95Ï\8a·
         s := SsParser.GetParam(SsParser[i], 1);
-        if Pos('http://', s) > 0 then begin
+        //https\82È\82Ç\82ª\92Ç\89Á\82³\82ê\82é\8e\9e\91Î\8dô\81c\81c://\82ð\8c\9f\8dõ\82·\82ê\82Î\82½\82Ô\82ñ\91å\8fä\95v
+        if Pos('://', s) > 0 then begin
           if Urls <> nil then Urls.Add(s);
           count := count + 1;
         end
@@ -1554,20 +1556,16 @@ begin
 end;
 
 procedure TfrmLog.CheckBottleURL(Bottle: TLogItem);
-var
-  DummyStr: TStringList;
 begin
   if Bottle.HasURL = huUndefined then
   begin
-    DummyStr := TStringList.Create;
     try
-      ExtractURLs(Bottle.Script, DummyStr, nil);
-      if DummyStr.Count > 0 then
+      //nil,nil\82ð\88ø\82«\93n\82µ\82Ä\82àTRUE/FALSE\82ÅURL\82ª\82 \82é\82©\82Ç\82¤\82©\82ª\82«\82¿\82ñ\82Æ\95Ô\82é
+      if ExtractURLs(Bottle.Script, nil, nil) then
         Bottle.HasURL := huYes
       else
         Bottle.HasURL := huNo;
     finally
-      DummyStr.Free;
     end;
   end;
 end;

diff --git a/bottleclient/MainForm.pas b/bottleclient/MainForm.pas
index ed1c69f..b96716a 100755 (executable)
--- a/bottleclient/MainForm.pas
+++ b/bottleclient/MainForm.pas
@@ -1286,7 +1286,8 @@ begin
                 Url[UrlCount] := SsParser.GetParam(SsParser[i], UrlCount*2+2);
                 UrlName[UrlCount] := SsParser.GetParam(SsParser[i], UrlCount*2+3);
                 if UrlName[UrlCount] = '' then UrlName[UrlCount] := Url[UrlCount];
-                if Pos('http://', Url[UrlCount]) > 0 then Inc(UrlCount);
+                //https\82È\82Ç\82ª\92Ç\89Á\82³\82ê\82é\8e\9e\91Î\8dô\81c\81c://\82ð\8c\9f\8dõ\82·\82ê\82Î\82½\82Ô\82ñ\91å\8fä\95v
+                if Pos('://', Url[UrlCount]) > 0 then Inc(UrlCount);
               end;
             end;
             if UrlCount > 0 then UrlCancel := SsParser.GetParam(SsParser[i], 1);
@@ -1297,7 +1298,8 @@ begin
             Url[0] := SsParser.GetParam(SsParser[i], 1);
             UrlName[0] := '\8ds\82­\81@\81@\81@\81@\81@\81@';
             UrlCancel  := '\8ds\82©\82È\82¢\81@\81@\81@\81@';
-            if Pos('http://', Url[0]) > 0 then begin
+            //https\82È\82Ç\82ª\92Ç\89Á\82³\82ê\82é\8e\9e\91Î\8dô\81c\81c://\82ð\8c\9f\8dõ\82·\82ê\82Î\82½\82Ô\82ñ\91å\8fä\95v
+            if Pos('://', Url[0]) > 0 then begin
               UrlCount := 1;
               if not QuickSection then
                 Script := Script + '\_q' + Url[0] + '\_q'