Changeset 138 for trunk/Modules/Portal/UPagePortal.pas

Timestamp:

Sep 9, 2022, 8:20:25 PM (21 months ago)

Author:

chronos

Message:

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

File:

• trunk/Modules/Portal/UPagePortal.pas (modified) (14 diffs)

trunk/Modules/Portal/UPagePortal.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, USqlDatabase, UUtils,
-  SpecializedDictionary, UWebSession, UHtmlClasses, UModularSystem, UModuleUser,
+  UGenerics, UWebSession, UHtmlClasses, UModularSystem, UModuleUser,
   UModuleNews;
 
@@ -70 +70 @@
     for I := 0 to HyperLinks.Count - 1 do begin
       HyperLink := Hyperlinks[I];
-      if HyperLink.Values['IconFile'] = '' then
-          HyperLink.Values['IconFile'] := 'clear.png';
-        if Copy(HyperLink.Values['URL'], 1, 4) <> 'http' then
-          HyperLink.Values['URL'] := NavigationLink(HyperLink.Values['URL']);
-        if ((HyperLink.Values['PermissionModule'] = '') or
-        ((HyperLink.Values['PermissionModule'] <> '') and
-        ModuleUser.User.CheckPermission(HyperLink.Values['PermissionModule'], HyperLink.Values['PermissionOperation']))) then
-        Result := Result + '<img alt="' + HyperLink.Values['Name'] + '" src="images/favicons/' + HyperLink.Values['IconFile'] + '" width="16" height="16" /> <a href="' + HyperLink.Values['URL'] + '">' + HyperLink.Values['Name'] + '</a><br />';
+      if HyperLink.Items['IconFile'] = '' then
+          HyperLink.Items['IconFile'] := 'clear.png';
+        if Copy(HyperLink.Items['URL'], 1, 4) <> 'http' then
+          HyperLink.Items['URL'] := NavigationLink(HyperLink.Items['URL']);
+        if ((HyperLink.Items['PermissionModule'] = '') or
+        ((HyperLink.Items['PermissionModule'] <> '') and
+        ModuleUser.User.CheckPermission(HyperLink.Items['PermissionModule'], HyperLink.Items['PermissionOperation']))) then
+        Result := Result + '<img alt="' + HyperLink.Items['Name'] + '" src="images/favicons/' + HyperLink.Items['IconFile'] + '" width="16" height="16" /> <a href="' + HyperLink.Items['URL'] + '">' + HyperLink.Items['Name'] + '</a><br />';
     end;
-    Result := ShowPanel(HyperlinkGroups[0].Values['Name'], Result);
+    Result := ShowPanel(HyperlinkGroups[0].Items['Name'], Result);
 
   finally
@@ -98 +98 @@
   DbRows2: TDbRows;
   I, J: Integer;
+  Action: string;
 begin
   try
@@ -104 +105 @@
   Output := '';
   with Session.Request do
-  if Query.SearchKey('Action') <> -1 then begin
-    if Query.Values['Action'] = 'CustomizeNewsSave' then begin
+  if Query.TryGetValue('Action', Action) then begin
+    if Action = 'CustomizeNewsSave' then begin
       //Output := $this->System->Modules['News']->CustomizeSave();
     end else
-    if Query.Values['Action'] = 'LoginForm' then begin
+    if Action = 'LoginForm' then begin
       Form := TQueryForm.Create; // UserLogin
       Form.AddNewAction('Přihlásit', '?Action=Login');
@@ -115 +116 @@
         '<a href="?Action=PasswordRecovery">Obnova zapomenutého hesla</a></div>';
     end else
-    if Query.Values['Action'] = 'Login' then begin
+    if Action = 'Login' then begin
       Form := TQueryForm.Create; // UserLogin
       Form.Load(Session.Request.Post);
@@ -131 +132 @@
       end;
     end else
-    if Query.Values['Action'] = 'Logout' then begin
+    if Action = 'Logout' then begin
       ModuleUser.UserOnline.Logout;
       Output := Output + SystemMessage('Odhlášení', 'Uživatel odhlášen');
     end else
-    if Query.Values['Action'] = 'UserOptions' then begin
+    if Action = 'UserOptions' then begin
       UserOptions := TQueryForm.Create; // UserOptions
       //UserOptions.LoadValuesFromDatabase(Session.User.Id);
@@ -141 +142 @@
       Output := Output + UserOptions.AsXmlElement.AsString;
     end else
-    if Query.Values['Action'] = 'UserOptionsSave' then begin
+    if Action = 'UserOptionsSave' then begin
       UserOptions := TQueryForm.Create; // UserOptions
       UserOptions.Load(Session.Request.Post);
@@ -151 +152 @@
       Output := Output + UserOptions.AsXmlElement.AsString;
     end else
-    if Query.Values['Action'] = 'UserRegister' then begin
+    if Action = 'UserRegister' then begin
       Form := TQueryForm.Create; //'UserRegister');
       Form.Load(Session.Request.Post);
@@ -157 +158 @@
       Output := Output + Form.AsXmlElement.AsString;
     end else
-    if Query.Values['Action'] = 'UserRegisterConfirm' then begin
+    if Action = 'UserRegisterConfirm' then begin
       //Session.User.RegisterConfirm($_GET['User'], $_GET['H']);
       Output := Output + SystemMessage('Potvrzení registrace', 'Registrace potvrzena');
     end else
-    if Query.Values['Action'] = 'PasswordRecovery' then begin
+    if Action = 'PasswordRecovery' then begin
       Form := TQueryForm.Create; // PasswordRecovery
       Form.AddNewAction('Obnovit', '?Action=PasswordRecovery2');
       Output := Output + Form.AsXmlElement.AsString;
     end else
-    if Query.Values['Action'] = 'PasswordRecovery2' then begin
+    if Action = 'PasswordRecovery2' then begin
       Form := TQueryForm.Create; // PasswordRecovery
       Form.Load(Session.Request.Post);
@@ -175 +176 @@
       //end;
     end else
-    if Query.Values['Action'] = 'PasswordRecoveryConfirm' then begin
+    if Action = 'PasswordRecoveryConfirm' then begin
       //Session.User.PasswordRecoveryConfirm($_GET['User'], $_GET['H'], $_GET['P']);
       Output := Output + SystemMessage('Obnova hesla', 'Potvrzení obnovení hesla');
     end (*else
-    if Query.Values['Action'] = 'UserRegisterSave' then begin
+    if Action = 'UserRegisterSave' then begin
           Form := TQueryForm.Create; // UserRegister
           Form.Load(Session.Request.Post);
@@ -189 +190 @@
       end;
     end else
-    if Query.Values['Action'] = 'MemberOptions' then begin
+    if Action = 'MemberOptions' then begin
           $UserOptions = new Form('MemberOptions');
           $DbResult = $this->Database->query('SELECT Member.Id, Member.InternetTariffNextMonth, Member.FamilyMemberCount, Member.BillingPeriodNext, Subject.Name, Subject.AddressStreet, Subject.AddressTown, Subject.AddressPSC, Subject.IC, Subject.DIC FROM Member JOIN Subject ON Subject.Id = Member.Subject WHERE Member.Id='.$this->System->Modules['User']->User['Member']);
@@ -200 +201 @@
           $Output .= $UserOptions->ShowEditForm();
      end else
-     if Query.Values['Action'] = 'MemberOptionsSave' then begin
+     if Action = 'MemberOptionsSave' then begin
           $UserOptions = new Form('MemberOptions');
           $UserOptions->LoadValuesFromForm();
@@ -235 +236 @@
     for I := 0 to DbRows.Count - 1 do begin
       PanelColumn := DbRows[I];
-      if PanelColumn.Values['Width'] <> '' then
-          Width := ' width="' + PanelColumn.Values['Width'] + '"'
+      if PanelColumn.Items['Width'] <> '' then
+          Width := ' width="' + PanelColumn.Items['Width'] + '"'
         else Width := '';
       Output := Output + '<td valign="top"' + Width + '>';
       Session.Database.Query(DbRows2, 'SELECT * FROM `Panel` WHERE `PanelColumn`=' +
-        PanelColumn.Values['Id'] + ' ORDER BY `Order`');
+        PanelColumn.Items['Id'] + ' ORDER BY `Order`');
       for J := 0 to DbRows2.Count - 1 do begin
         Panel := DbRows2[J];
-        if Panel.Values['Module'] = 'HyperlinkGroup' then
-          Output := Output + ShowLinks(StrToInt(Panel.Values['Parameters']))
-        else if Panel.Values['Module'] = 'OnlineHostList' then
+        if Panel.Items['Module'] = 'HyperlinkGroup' then
+          Output := Output + ShowLinks(StrToInt(Panel.Items['Parameters']))
+        else if Panel.Items['Module'] = 'OnlineHostList' then
           Output := Output + ShowPanel('Online počítače', OnlineHostList)
-        else if Panel.Values['Module'] = 'UserOptions' then
+        else if Panel.Items['Module'] = 'UserOptions' then
         begin
           if ModuleUser.User.Id <> UnknownUser then
             Output := Output + ShowPanel('Přihlášený uživatel', UserPanel);
         end else
-        if Panel.Values['Module'] = 'Webcam' then
+        if Panel.Items['Module'] = 'Webcam' then
           Output := Output + ShowPanel('Kamery', WebcamPanel)
-        else if Panel.Values['Module'] = 'NewsGroupList' then
+        else if Panel.Items['Module'] = 'NewsGroupList' then
           Output := Output + ShowPanel('Aktuality',
           ModuleNews.Show(HandlerData)); //,
@@ -263 +264 @@
     Output := Output + '</tr></table>';
     with TWebSession(HandlerData) do begin
-      with HtmlDocument.Body, THtmlString(SubItems.AddNew(THtmlString.Create)) do
+      with HtmlDocument.Body, SubItems.AddString do
         Text := Text + Output;
     end;