paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-03 06:37:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

TurboPower_iPro: Fix HotURL containing Content-Type instead of URL (patch by Sei Lisa, issue #31030)

Browse Source 
git-svn-id: trunk@53475 -
This commit is contained in:
wp 2016-11-29 10:47:54 +00:00
parent 5a0a867be7
commit 385348cde8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/turbopower_ipro/iphtml.pas
View File

@ -14192,9 +14192,9 @@ begin
raise EIpHtmlException.Create(SHtmlNoDataProvider); raise EIpHtmlException.Create(SHtmlNoDataProvider);
if not FDataProvider.DoCheckURL(St, ResourceType) then if not FDataProvider.DoCheckURL(St, ResourceType) then
raise EIpHtmlException.Create(SHtmlResUnavail + St); raise EIpHtmlException.Create(SHtmlResUnavail + St);
St := LowerCase(ResourceType); ResourceType := LowerCase(ResourceType);
if ( Pos('text/', St) = 0) and (pos('image/', St) = 0) then begin if ( Pos('text/', ResourceType) <> 1) and (pos('image/', ResourceType) <> 1) then begin
FViewer.FHotURL := St; FViewer.FHotURL := St;
FViewer.DoHotClick; FViewer.DoHotClick;
Result := True; Result := True;
@ -14381,12 +14381,13 @@ begin
raise EIpHtmlException.Create(SHtmlResUnavail + St); raise EIpHtmlException.Create(SHtmlResUnavail + St);
IsImage := False; IsImage := False;
S := nil; S := nil;
if pos('image/', LowerCase(ResourceType)) <> 0 then begin ResourceType := Lowercase(ResourceType);
if pos('image/', ResourceType) = 1 then begin
IsImage := True; IsImage := True;
S := BuildImagePage(St); S := BuildImagePage(St);
end else end else
if Pos('text/', LowerCase(ResourceType)) = 0 then begin if Pos('text/', ResourceType) <> 1 then begin
FViewer.FHotURL := St; FViewer.FHotURL := St;
FViewer.DoHotClick; FViewer.DoHotClick;
Exit; Exit;
@ -15132,8 +15133,7 @@ begin
raise EIpHtmlException.Create(SHtmlNoDataProvider); raise EIpHtmlException.Create(SHtmlNoDataProvider);
if (FMasterFrame = nil) if (FMasterFrame = nil)
or ((FMasterFrame <> nil) and (not FMasterFrame.IsExternal(URL))) then begin or ((FMasterFrame <> nil) and (not FMasterFrame.IsExternal(URL))) then begin
if (FMasterFrame <> nil) if (FMasterFrame <> nil) and (FMasterFrame.FHtml <> nil) then
and (FMasterFrame.FHtml <> nil) then
FDataProvider.DoLeave(FMasterFrame.FHtml); FDataProvider.DoLeave(FMasterFrame.FHtml);
FMasterFrame.Free; FMasterFrame.Free;
FMasterFrame := nil; FMasterFrame := nil;