Changeset 138 for trunk/Modules/News/UNews.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/News/UNews.pas (modified) (6 diffs)

trunk/Modules/News/UNews.pas

@@ -97 +97 @@
   DbRows := TDbRows.Create;
   Database.Select(DbRows, 'NewsCategory', '*', 'Id=' + IntToStr(Category));
-  Output := '<div class="NewsPanel"><div class="Title">' + DbRows[0].Values['Caption'];
+  Output := '<div class="NewsPanel"><div class="Title">' + DbRows[0].Items['Caption'];
   Output := Output + '<div class="Action"><a href="aktuality/index.php?category=' + IntToStr(Category) + '">Zobrazit</a>';
   if ModuleUser.User.CheckPermission('News', 'Insert', 'Group', Category) then
@@ -113 +113 @@
     Output := Output + '<table class="NewsTable">';
     for I := 0 to DbRows.Count - 1 do begin
-      if DbRows[I].Values['Name'] = '' then Author := DbRows[I].Values['Author']
-        else Author := DbRows[I].Values['Name'];
+      if DbRows[I].Items['Name'] = '' then Author := DbRows[I].Items['Author']
+        else Author := DbRows[I].Items['Name'];
       Output := Output + '<tr><td onclick="window.location=''aktuality/index.php?action=view&amp;id=' +
-        DbRows[I].Values['Id'] + '''" onmouseover="zobraz(' + '''new' + IntToStr(Category) +
-          IntToStr(Index) + ''')" style="cursor: pointer; margin: 0px;"><table class="NewsItemFrame"><tr><td style="font-size: ' + IntToStr(FontSize) + 'pt"><strong>' + DbRows[I].Values['Title'] +
+        DbRows[I].Items['Id'] + '''" onmouseover="zobraz(' + '''new' + IntToStr(Category) +
+          IntToStr(Index) + ''')" style="cursor: pointer; margin: 0px;"><table class="NewsItemFrame"><tr><td style="font-size: ' +
+          IntToStr(FontSize) + 'pt"><strong>' + DbRows[I].Items['Title'] +
           '</strong></td><td align="right" style="font-size: ' + IntToStr(FontSize) + 'pt">' +
-          Author + ' (' + HumanDate(SQLToDateTime(DbRows[I].Values['Date'])) + ')</td></tr></table>';
-      Output := Output + '<div id="new' + IntToStr(Category) + IntToStr(Index) + '" class="NewsTableItem">' + ModifyContent(DbRows[I].Values['Content']);
-      if DbRows[I].Values['Link'] <> '' then Output := Output + '<br/><a href="' + DbRows[I].Values['Link'] + '">Odkaz</a>';
-
-      if DbRows[I].Values['Enclosure'] <> '' then begin
+          Author + ' (' + HumanDate(SQLToDateTime(DbRows[I].Items['Date'])) + ')</td></tr></table>';
+      Output := Output + '<div id="new' + IntToStr(Category) + IntToStr(Index) + '" class="NewsTableItem">' + ModifyContent(DbRows[I].Items['Content']);
+      if DbRows[I].Items['Link'] <> '' then Output := Output + '<br/><a href="' + DbRows[I].Items['Link'] + '">Odkaz</a>';
+
+      if DbRows[I].Items['Enclosure'] <> '' then begin
         Output := Output + '<br />Přílohy: ';
-        Enclosures := Explode(';', DbRows[I].Values['Enclosure']);
+        Enclosures := Explode(';', DbRows[I].Items['Enclosure']);
         for J := 0 to Length(Enclosures) - 1  do begin
           if FileExists(UploadedFilesFolder + Enclosures[J]) then
@@ -173 +174 @@
     NewSetting := TNewsSettingItem.Create;
     with NewSetting do begin
-      CategoryId := StrToInt(DbRows[I].Values['Id']);
+      CategoryId := StrToInt(DbRows[I].Items['Id']);
       Index := I;
       Enabled := True;
       ItemCount := 6; // System->Config['Web']['News']['Count']
       DaysAgo := 30; // System->Config['Web']['News']['DaysAgo']
-      Group := StrToInt(DbRows[I].Values['Group']);
+      Group := StrToInt(DbRows[I].Items['Group']);
     end;
     Settings.Add(NewSetting);
@@ -205 +206 @@
   Column: Integer;
   I: Integer;
+  Action: string;
 begin
   Output := '';
@@ -211 +213 @@
   LoadSettingsFromCookies;
 
-  if HandlerData.Request.Query.SearchKey('Action') <> -1 then begin
+  if HandlerData.Request.Query.TryGetValue('Action', Action) then begin
     // Show news customize menu
-    if HandlerData.Request.Query.Values['Action'] = 'CustomizeNews' then begin
+    if Action = 'CustomizeNews' then begin
       Output := Output + ShowCustomizeMenu;
     end;
@@ -251 +253 @@
   with TNewsSettingItem(Settings[I]) do begin
     Database.Select(DbRows, 'NewsCategory', '*', 'Id=' + IntToStr(CategoryId));
-    Output := Output + '<tr><td>' + DbRows[0].Values['Caption'] +
+    Output := Output + '<tr><td>' + DbRows[0].Items['Caption'] +
       '</td><td align="center"><input type="text" size="2" name="NewsCategoryIndex' +
       IntToStr(I) + '" value="' + IntToStr(Index) + '" /></td><td align="center"><input type="checkbox" name="NewsCategoryEnabled' + IntToStr(I) + '"';