Changeset 130 for trunk/Application

Timestamp:

Mar 18, 2022, 1:32:32 PM (3 years ago)

Author:

chronos

Message:

• Modified: Build with Lazarus 2.2.0.
• Modified: Code cleanup.

Location:

trunk/Application

Files:

• UWebObjects.pas (modified) (1 diff)
• UWebSession.pas (modified) (4 diffs)

trunk/Application/UWebObjects.pas

@@ -174 +174 @@
     with THtmlCell(Row.Cells.AddNew(THtmlCell.Create)) do begin
       ColSpan := 2;
+      Value := THtmlBlock.Create;
       for I := 0 to Actions.Count - 1 do
-      Value := THtmlBlock.Create;
       with THtmlInput(THtmlBlock(Value).SubItems.AddNew(THtmlInput.Create)) do begin
         Value := TQueryAction(Actions[I]).Caption;

trunk/Application/UWebSession.pas

@@ -34 +34 @@
   end;
 
+
 implementation
 
@@ -43 +44 @@
 resourcestring
   SError = '<div>Error: %s</div>';
-
 
 { TWebSession }
@@ -86 +86 @@
   ModuleManager.StartInstalled;
 
-      try
-        BaseUrlParts := TListString.Create;
-        BaseUrlParts.Explode(BaseURL, '/', StrToStr);
-        while (BaseUrlParts.Count > 0) and (Request.Path.Count > 0) and
-           (BaseUrlParts[0] = Request.Path[0]) do begin
-             BaseUrlParts.Delete(0);
-             Request.Path.Delete(0);
-           end;
-      finally
-        BaseUrlParts.Free;
+  try
+    BaseUrlParts := TListString.Create;
+    BaseUrlParts.Explode(BaseURL, '/', StrToStr);
+    while (BaseUrlParts.Count > 0) and (Request.Path.Count > 0) and
+      (BaseUrlParts[0] = Request.Path[0]) do begin
+        BaseUrlParts.Delete(0);
+        Request.Path.Delete(0);
       end;
-      if Request.Path.Count > 0 then PageName := Request.Path[0]
-        else PageName := '';
-      ModuleBase := TModuleBase(ModuleManager.FindModuleByName('Base'));
-      Page := ModuleBase.Pages.FindByName(PageName);
-      if Assigned(Page) then begin
-        try
-          Page.Page.OnProduce(Self);
-        except
-          on E: Exception do begin
-            THTMLString(Self.HtmlDocument.Body.SubItems.AddNew(THtmlString.Create)).
-              Text := Format(SError, [E.Message]);
-            GeneratePage(Page.Page);
-          end;
-        end;
-      end else begin
-        Core.WebApp1.HTTPServer.FileResponse(Self)
+  finally
+    BaseUrlParts.Free;
+  end;
+  if Request.Path.Count > 0 then PageName := Request.Path[0]
+    else PageName := '';
+  ModuleBase := TModuleBase(ModuleManager.FindModuleByName('Base'));
+  Page := ModuleBase.Pages.FindByName(PageName);
+  if Assigned(Page) then begin
+    try
+      if Assigned(Page.Page) then Page.Page.OnProduce(Self);
+    except
+      on E: Exception do begin
+        THTMLString(Self.HtmlDocument.Body.SubItems.AddNew(THtmlString.Create)).
+          Text := Format(SError, [E.Message]);
+        GeneratePage(Page.Page);
       end;
+    end;
+  end else begin
+    Core.WebApp1.HTTPServer.FileResponse(Self)
+  end;
 end;
 
@@ -124 +124 @@
     GlobalTitle := 'WebSystem';
 
-      //Page.Page.OnProduce(HandlerData);
-      HtmlDocument.Title := Page.Caption;
-      with HtmlDocument.AsXmlDocument do
-      try
-        Formated := TCore(MainModule).FormatHTML;
-        Response.Content.WriteString(AsString);
-      finally
-        Free;
-      end;
+    //Page.Page.OnProduce(HandlerData);
+    HtmlDocument.Title := Page.Caption;
+    with HtmlDocument.AsXmlDocument do
+    try
+      Formated := TCore(MainModule).FormatHTML;
+      Response.Content.WriteString(AsString);
+    finally
+      Free;
     end;
+  end;
 end;
-
 
 procedure TWebSession.InitDatabase;