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

trunk/Modules/User/UUserControlPage.pas

@@ -87 +87 @@
       AddNewAction('Přihlásit', 'Login');
     end;
-    if HandlerData.Request.Post.SearchKey('Login') <> -1 then begin
+    if HandlerData.Request.Post.ContainsKey('Login') then begin
       Form.Load(HandlerData.Request.Post);
-      with THtmlString(SubItems.AddNew(THtmlString.Create)) do
+      with SubItems.AddString do
         Text := 'Přihlášení uživatele: ' + TQueryFormGroup(Form.Groups[0]).Rows.FindByName('UserName').Value.Value;
       UserId := ModuleUser.User.GetIdByNamePassword(TQueryFormGroup(Form.Groups[0]).Rows.FindByName('UserName').Value.Value,
         TQueryFormGroup(Form.Groups[0]).Rows.FindByName('Password').Value.Value);
       if UserId = -1 then begin
-        with THtmlString(SubItems.AddNew(THtmlString.Create)) do
+        with SubItems.AddString do
           Text := '<br/>Chybné jméno nebo heslo';
       end else ModuleUser.UserOnline.Login(UserId);
       Form.Free;
     end else
-      SubItems.AddNew(Form);
+      SubItems.Add(Form);
   end;
 end;
@@ -144 +144 @@
       AddNewAction('Registrovat', 'Register');
     end;
-    if HandlerData.Request.Post.SearchKey('Register') <> -1 then
+    if HandlerData.Request.Post.ContainsKey('Register') then
     with HandlerData.Request do begin
       Form.Load(HandlerData.Request.Post);
-      with THtmlString(SubItems.AddNew(THtmlString.Create)) do
+      with SubItems.AddString do
         Text := 'Registrace uživatele: ' + TQueryFormGroup(Form.Groups[0]).Rows.FindByName('UserName').Value.Value;
       ModuleUser.User.Add(TQueryFormGroup(Form.Groups[0]).Rows.FindByName('UserName').Value.Value,
@@ -156 +156 @@
       if UserId <> -1 then ModuleUser.UserOnline.Login(UserId);
       Form.Free;
-    end else SubItems.AddNew(Form);
+    end else SubItems.Add(Form);
   end;
 end;
@@ -164 +164 @@
   with TWebSession(HandlerData), Core, HtmlDocument.Body do begin
     ModuleUser.UserOnline.Logout;
-    with THtmlString(SubItems.AddNew(THtmlString.Create)) do
+    with SubItems.AddString do
       Text := 'Uživatel odhlášen';
   end;
@@ -213 +213 @@
       AddNewAction('Uložit', 'Save');
     end;
-    if HandlerData.Request.Post.SearchKey('Save') <> -1 then
+    if HandlerData.Request.Post.ContainsKey('Save') then
     with HandlerData.Request do begin
       Form.Load(HandlerData.Request.Post);
-      with THtmlString(SubItems.AddNew(THtmlString.Create)) do
+      with SubItems.AddString do
         Text := 'Profil uživatele: ' + TQueryFormGroup(Form.Groups[0]).Rows.FindByName('UserName').Value.Value + ' uložen';
       ModuleUser.User.Name := TQueryFormGroup(Form.Groups[0]).Rows.FindByName('UserName').Value.Value;
@@ -223 +223 @@
       ModuleUser.User.Save;
       Form.Free;
-    end else SubItems.AddNew(Form);
+    end else SubItems.Add(Form);
   end;
 end;