Changeset 38 for trunk/Application/UUser.pas

Timestamp:

Nov 13, 2010, 4:32:15 PM (14 years ago)

Author:

george

Message:

• Přidáno: Zobrazení seznamu hostovaných projektů.
• Upraveno: Funkce Query jednotky SQLDatabase nyní nevrací novou instanci, ale výsledné řádky vrací v parametru. Bezpečnější metoda předcházející únikům paměti.

File:

• trunk/Application/UUser.pas (modified) (8 diffs)

trunk/Application/UUser.pas

@@ -52 +52 @@
 begin
   try
-    DbRows := Database.Query('SELECT * FROM `UserOnline` WHERE `SessionId`="' +
+    DbRows := TDbRows.Create;
+    Database.Query(DbRows, 'SELECT * FROM `UserOnline` WHERE `SessionId`="' +
       HandlerData.Request.Cookies.Values['SessionId'] + '"');
     if DbRows.Count > 0 then begin
@@ -58 +59 @@
       Id := StrToInt(DbRows[0].Values['Id']);
       User := StrToInt(DbRows[0].Values['User']);
-      DbRows.Free;
-      DbRows := Database.Query('UPDATE `UserOnline` SET `ActivityTime` = NOW() WHERE `Id`=' + IntToStr(Id));
+      Database.Query(DbRows, 'UPDATE `UserOnline` SET `ActivityTime` = NOW() WHERE `Id`=' + IntToStr(Id));
     end else begin
       // Create new record
-      DbRows.Free;
-      DbRows := Database.Query('INSERT INTO `UserOnline` (`User`, `ActivityTime`, `SessionId`) ' +
+      Database.Query(DbRows, 'INSERT INTO `UserOnline` (`User`, `ActivityTime`, `SessionId`) ' +
         'VALUES (1, NOW(), "' + HandlerData.Request.Cookies.Values['SessionId'] + '")');
       Id := Database.LastInsertId;
@@ -79 +78 @@
   Logout;
   try
-    DbRows := Database.Query('UPDATE `UserOnline` SET `User` = ' + IntToStr(User) + ', `LoginTime` = NOW() WHERE `SessionId`="' +
+    DbRows := TDbRows.Create;
+    Database.Query(DbRows, 'UPDATE `UserOnline` SET `User` = ' + IntToStr(User) + ', `LoginTime` = NOW() WHERE `SessionId`="' +
       HandlerData.Request.Cookies.Values['SessionId'] + '"');
   finally
@@ -93 +93 @@
   if Id = AnonymousUserId then Update;
   if User <> AnonymousUserId then begin
-    DbRows := Database.Query('UPDATE `UserOnline` SET `User` = ' + IntToStr(AnonymousUserId) + ' WHERE `SessionId`="' +
-      HandlerData.Request.Cookies.Values['SessionId'] + '"');
-    DbRows.Destroy;
+    try
+      DbRows := TDbRows.Create;
+      Database.Query(DbRows, 'UPDATE `UserOnline` SET `User` = ' + IntToStr(AnonymousUserId) + ' WHERE `SessionId`="' +
+        HandlerData.Request.Cookies.Values['SessionId'] + '"');
+    finally
+      DbRows.Free;
+    end;
     User := AnonymousUserId;
   end;
@@ -103 +107 @@
 
 procedure TWebUser.Delete(Id: Integer);
+var
+  DbRows: TDbRows;
 begin
-  Database.Query('DELETE FROM `User` WHERE `Id`=' + IntToStr(Id));
+  try
+    DbRows := TDbRows.Create;
+    Database.Query(DbRows, 'DELETE FROM `User` WHERE `Id`=' + IntToStr(Id));
+  finally
+    DbRows.Free;
+  end;
 end;
 
@@ -112 +123 @@
   DbRows: TDbRows;
 begin
-  DbRows := Database.Query('SELECT `Id` FROM `User` WHERE `Name`="' + Name + '"');
   try
+    DbRows := TDbRows.Create;
+    Database.Query(DbRows, 'SELECT `Id` FROM `User` WHERE `Name`="' + Name + '"');
     if DbRows.Count = 0 then begin
       Salt := EncodeBase64(Copy(BinToHexString(SHA1(FloatToStr(Now))), 1, 8));
-      Database.Query('INSERT INTO `User` (`Name`, `Password`, `Salt`, `Email`, `RegistrationTime`) VALUES ("' +
+      Database.Query(DbRows, 'INSERT INTO `User` (`Name`, `Password`, `Salt`, `Email`, `RegistrationTime`) VALUES ("' +
         Name + '", SHA1(CONCAT("' + Password + '", "' + Salt + '")), "' + Salt +
         '", "' + Email + '", NOW())');
     end else raise EDuplicateItem.Create(SDuplicateUserItem);
   finally
-    DbRows.Destroy;
+    DbRows.Free;
   end;
 end;
@@ -129 +141 @@
   DbRows: TDbRows;
 begin
-  DbRows := Database.Query('SELECT `Id` FROM `User` WHERE `Name`="' + Name + '"');
   try
+    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)
       else raise ENotFound.Create('User "' + Name + '" not found');
   finally
-    DBRows.Destroy;
+    DBRows.Free;
   end;
 end;
@@ -142 +155 @@
   DbRows: TDbRows;
 begin
-  DbRows := Database.Query('SELECT `Id` FROM `User` WHERE `Name`="' + Name + '" AND ' +
-    '`Password` = SHA1(CONCAT("' + Password + '", Salt))');
   try
+    DbRows := TDbRows.Create;
+    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)
       else raise ENotFound.Create('User "' + Name + '" not found');
   finally
-    DBRows.Destroy;
+    DBRows.Free;
   end;
 end;