Changeset 138 for trunk/Modules/ZdechovNET/UModuleZdechovNET.pas

Timestamp:

Sep 9, 2022, 8:20:25 PM (2 years ago)

Author:

chronos

Message:

• Modified: Removed TemplateGenerics package. Generics usage replaced by standard Generics.Collections.

File:

• trunk/Modules/ZdechovNET/UModuleZdechovNET.pas (modified) (4 diffs)

trunk/Modules/ZdechovNET/UModuleZdechovNET.pas

@@ -264 +264 @@
 procedure TModuleZdechovNET.Upgrade;
 begin
-  inherited Upgrade;
+  inherited;
 end;
 
@@ -277 +277 @@
 begin
   with Session do
-  with TXmlTag(HtmlDocument.Body.SubItems.AddNew(TXmlTag.Create)) do begin
-    Name := 'ul';
-    Attributes.Values['class'] := 'Footer';
-    with TXmlTag(SubElements.AddNew(TXmlTag.Create)) do begin
-      Name := 'li';
-      with TXmlString(SubElements.AddNew(TXmlString.Create)) do begin
-        Text := TCore(MainModule).Admin;
+  with HtmlDocument.Body.SubItems.AddList do begin
+    ClassId := 'Footer';
+    with SubItems.AddString do begin
+      Text := TCore(MainModule).Admin;
+    end;
+    with SubItems.AddString do begin
+      Text := TCore(MainModule).AdminEmail;
+    end;
+    if TCore(MainModule).ShowRuntimeInfo then begin
+      with SubItems.AddString do begin
+        Text := 'Doba generování: ' +
+          FloatToStr(Round(((Now - TimeStart) / OneMillisecond) * 100) / 100) + ' s / '; // + ini_get('max_execution_time') + ' s';
+      end;
+      with SubItems.AddString do begin
+        //Text := 'Použitá paměť: '  + System.PrefixMultiplier.AddPrefixMultipliers(memory_get_peak_usage(FALSE), 'B').' / '.ini_get('memory_limit').'B';
       end;
     end;
-    with TXmlTag(SubElements.AddNew(TXmlTag.Create)) do begin
-      Name := 'li';
-      with TXmlString(SubElements.AddNew(TXmlString.Create)) do begin
-        Text := TCore(MainModule).AdminEmail;
-      end;
-    end;
-    if TCore(MainModule).ShowRuntimeInfo then begin
-      with TXmlTag(SubElements.AddNew(TXmlTag.Create)) do begin
-        Name := 'li';
-        with TXmlString(SubElements.AddNew(TXmlString.Create)) do begin
-          Text := 'Doba generování: ' +
-            FloatToStr(Round(((Now - TimeStart) / OneMillisecond) * 100) / 100) + ' s / '; // + ini_get('max_execution_time') + ' s';
-        end;
-      end;
-      with TXmlTag(SubElements.AddNew(TXmlTag.Create)) do begin
-        Name := 'li';
-        with TXmlString(SubElements.AddNew(TXmlString.Create)) do begin
-          //Text := 'Použitá paměť: '  + System.PrefixMultiplier.AddPrefixMultipliers(memory_get_peak_usage(FALSE), 'B').' / '.ini_get('memory_limit').'B';
-        end;
-      end;
-    end;
   end;
 end;
 
 procedure TModuleZdechovNET.TopMenu(Session: TWebSession);
-begin
-  with Session, THtmlString(HtmlDocument.Body.SubItems.InsertNew(1, THtmlString.Create)) do begin
+var
+  Output: THtmlString;
+begin
+  Output := THtmlString.Create;
+  Session.HtmlDocument.Body.SubItems.Insert(1, Output);
+  with Output do begin
     Text := '<div class="Navigation">';
     // Visitor
@@ -326 +317 @@
       '<li>' + MakeLink('Kamery', NavigationLink('/kamery/')) + '</li>' +
       '<li><a href="https://mail.zdechov.net/">Pošta</a></li>' +
-      '<li><a href="http://wiki.zdechov.net/">Wiki</a></li>' +
+      '<li><a href="https://wiki.zdechov.net/">Wiki</a></li>' +
       '</ul><ul class="MenuItem2">'; //<li>&nbsp;</li>';
     if False and Assigned(ModuleBase.Pages.FindByName('uzivatel')) then begin
@@ -356 +347 @@
   with ASession do begin
     if Page.Raw then begin
-      Response.Content.WriteString(THtmlString(HtmlDocument.Body.SubItems[0]).Text);
+      Response.Content.WriteString(HtmlDocument.Body.AsXmlElement.AsString);
     end else begin
       HtmlDocument.ContentLanguage := 'cs';