Changeset 139 for trunk/Modules/ZdechovNET/UWebCamPage.pas

Timestamp:

Sep 9, 2022, 9:41:42 PM (2 years ago)

Author:

chronos

Message:

• Fixed: Better handle invalid not found pages including correct HTTP code.

File:

• trunk/Modules/ZdechovNET/UWebCamPage.pas (modified) (3 diffs)

trunk/Modules/ZdechovNET/UWebCamPage.pas

@@ -53 +53 @@
       CameraId := -1;
       NotFound := False;
-      if Request.Path.Count >= 2 then begin
+      if Request.Path.Count = 2 then begin
         SubPageName := Request.Path[1];
         if TryStrToInt(SubPageName, Value) then
           CameraId := Value else
           NotFound := True;
-      end;
-      if not NotFound then begin
-    //for I := 0 to HandlerData.Request.Query.Count - 1 do
-      //Text := Text + HandlerData.Request.Query[I] + ' ';
-
-      //HandlerData.Request.Query.Values['W'] := 'dsd';
-      //HandlerData.Request.Query.Values['H'] := 'dsd';
+      end else
+      if Request.Path.Count > 2 then NotFound := True;
+      if NotFound then begin
+        PageNotFound;
+        Exit;
+      end;
+
       if HandlerData.Request.Query.TryGetValue('W', WidthValue) then
         ImageWidth := StrToInt(WidthValue)
@@ -91 +91 @@
 
       Text := Text + '<br/><strong>Kamery v okolí:</strong><br />' +
-        '<a href="http://www.mestovsetin.cz/vismo/dokumenty2.asp?id_org=18676&amp;id=480245">Vsetínské kamery</a><br />' +
+        '<a href="https://www.mestovsetin.cz/webove%2Dkamery/d-480245">Vsetínské kamery</a><br />' +
         '<a href="https://www.huslenky.cz/webkamery%2Dhuslenky/ds-1119/archiv=0&amp;p1=1020">Kamery v Huslenkách</a><br/>' +
-        '<a href="http://kamery.hovnet.cz/">Kamery v Hovnetu</a><br/>' +
+        '<a href="https://kamery.hovnet.cz/">Kamery v Hovnetu</a><br/>' +
         '</td><td style="width: 80%" valign="top">';
 
@@ -101 +101 @@
         Text := Text + GetSingle(HandlerData, CameraId);
       end;
-
       Text := Text + '</td></tr></table>';
-      end else Text := 'Stránka nenalezena.';
     end;
     GeneratePage(Self);