Changeset 138 for trunk/Packages/CoolWeb/Modules

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.

Location:

trunk/Packages/CoolWeb/Modules

Files:

• UPageList.pas (modified) (3 diffs)
• UWebUser.pas (modified) (10 diffs)

trunk/Packages/CoolWeb/Modules/UPageList.pas

@@ -7 +7 @@
 
 type
+
+  { TPageList }
+
   TPageList = class
     TotalCount: Integer;
@@ -19 +22 @@
     Around: Integer;
     constructor Create;
+    destructor Destroy; override;
     function Hyperlink: string;
     function Process: string;
@@ -33 +37 @@
   QueryItems.SetStringServer;
   HTMLId := '';
+end;
+
+destructor TPageList.Destroy;
+begin
+  FreeAndNil(QueryItems);
+  inherited;
 end;
 

trunk/Packages/CoolWeb/Modules/UWebUser.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, synacode, USqlDatabase, UCommon, UHTTPServer,
-  SpecializedDictionary;
+  UGenerics;
 
 const
@@ -60 +60 @@
   DbRows: TDbRows;
   Id: Integer;
-begin
-  try
-    DbRows := TDbRows.Create;
-    if HandlerData.Request.Cookies.SearchKey('SessionId') <> -1 then begin
+  Value: string;
+begin
+  try
+    DbRows := TDbRows.Create;
+    if HandlerData.Request.Cookies.TryGetValue('SessionId', Value) then begin
     Database.Query(DbRows, 'SELECT * FROM `UserOnline` WHERE `SessionId`="' +
-      HandlerData.Request.Cookies.Values['SessionId'] + '"');
+      Value + '"');
     if DbRows.Count > 0 then begin
       // Update exited
-      Id := StrToInt(DbRows[0].Values['Id']);
-      User := StrToInt(DbRows[0].Values['User']);
+      Id := StrToInt(DbRows[0].Items['Id']);
+      User := StrToInt(DbRows[0].Items['User']);
       Database.Query(DbRows, 'UPDATE `UserOnline` SET `ActivityTime` = NOW() WHERE `Id`=' + IntToStr(Id));
     end else begin
       // Create new record
       Database.Query(DbRows, 'INSERT INTO `UserOnline` (`User`, `ActivityTime`, `SessionId`, `ScriptName`) ' +
-        'VALUES (1, NOW(), "' + HandlerData.Request.Cookies.Values['SessionId'] + '", "")');
+        'VALUES (1, NOW(), "' + Value + '", "")');
       Id := Database.LastInsertId;
       User := 1;
@@ -88 +89 @@
 var
   DbRows: TDbRows;
+  SessionId: string;
 begin
   Logout;
+  if HandlerData.Request.Cookies.TryGetValue('SessionId', SessionId) then
   try
     DbRows := TDbRows.Create;
     Database.Query(DbRows, 'UPDATE `UserOnline` SET `User` = ' + IntToStr(User) + ', `LoginTime` = NOW() WHERE `SessionId`="' +
-      HandlerData.Request.Cookies.Values['SessionId'] + '"');
+      SessionId + '"');
   finally
     DbRows.Free;
@@ -103 +106 @@
 var
   DbRows: TDbRows;
+  SessionId: string;
 begin
   if Id = AnonymousUserId then Update;
-  if User <> AnonymousUserId then begin
+  if (User <> AnonymousUserId) and
+    HandlerData.Request.Cookies.TryGetValue('SessionId', SessionId) then begin
     try
       DbRows := TDbRows.Create;
       Database.Query(DbRows, 'UPDATE `UserOnline` SET `User` = ' + IntToStr(AnonymousUserId) + ' WHERE `SessionId`="' +
-        HandlerData.Request.Cookies.Values['SessionId'] + '"');
+        SessionId + '"');
     finally
       DbRows.Free;
@@ -178 +183 @@
     DbRows := TDbRows.Create;
     Database.Query(DbRows, 'SELECT `Id` FROM `User` WHERE `Name`="' + Name + '"');
-    if DbRows.Count = 1 then Result := StrToInt(DbRows[0].Items[0].Value)
+    if DbRows.Count = 1 then Result := StrToInt(DbRows[0].Items['Id'])
       else Result := -1;
   finally
@@ -193 +198 @@
     Database.Query(DbRows, 'SELECT `Id` FROM `User` WHERE `Name`="' + Name + '" AND ' +
       '`Password` = SHA1(CONCAT("' + Password + '", Salt))');
-    if DbRows.Count = 1 then Result := StrToInt(DbRows[0].Items[0].Value)
+    if DbRows.Count = 1 then Result := StrToInt(DbRows[0].Items['Id'])
       else Result := -1;
   finally
@@ -208 +213 @@
     Database.Query(DbRows, 'SELECT * FROM `User` WHERE `Id`="' + IntToStr(Id) + '"');
     if DbRows.Count = 1 then begin
-      Name := DbRows[0].Values['Name'];
-      FullName := DbRows[0].Values['FullName'];
-      Email := DbRows[0].Values['Email'];
+      Name := DbRows[0].Items['Name'];
+      FullName := DbRows[0].Items['FullName'];
+      Email := DbRows[0].Items['Email'];
     end; // else raise ENotFound.Create(Format(SUserNotFound, [IntToStr(Id)]));
   finally
@@ -233 +238 @@
     try
       DbRows2 := TDbRows.Create;
-      OperationId := StrToInt(DbRows[0].Values['Id']);
+      OperationId := StrToInt(DbRows[0].Items['Id']);
 
       // Check user-operation relation
@@ -247 +252 @@
         '`User` = ' + IntToStr(Id) + ' AND `AssignedGroup` IS NOT NULL');
       if DbRows2.Count > 0 then begin
-        if CheckGroupPermission(StrToInt(DbRows2[0].Values['AssignedGroup']), OperationId) then begin
+        if CheckGroupPermission(StrToInt(DbRows2[0].Items['AssignedGroup']), OperationId) then begin
           Result := True;
           Exit;
@@ -280 +285 @@
       '`User` = ' + IntToStr(Id) + ' AND `AssignedGroup` IS NOT NULL');
     if DbRows2.Count > 0 then begin
-      if CheckGroupPermission(StrToInt(DbRows2[0].Values['AssignedGroup']), Operation) then begin
+      if CheckGroupPermission(StrToInt(DbRows2[0].Items['AssignedGroup']), Operation) then begin
         Result := True;
         Exit;