Changeset 310 for Network

Timestamp:

Jan 4, 2012, 2:23:16 PM (12 years ago)

Author:

chronos

Message:

• Modified: Enhanced TWebUser and TWebOnlineUser classes.

File:

• Network/CoolWeb/Modules/UUser.pas (modified) (7 diffs)

Network/CoolWeb/Modules/UUser.pas

@@ -18 +18 @@
 
   TWebUser = class
+    Id: Integer;
+    Name: string;
     FullName: string;
+    Email: string;
     Database: TSqlDatabase;
     HandlerData: THTTPHandlerData;
@@ -25 +28 @@
     function GetIdByName(Name: string): Integer;
     function GetIdByNamePassword(Name: string; PassWord: string): Integer;
+    procedure Load;
   end;
 
@@ -42 +46 @@
 
 resourcestring
-  SDuplicateUserItem = 'User name already used.';
+  SDuplicateUserItem = 'User name "%s" already used.';
+  SEmptyUserParameters = 'Missing user parameters';
+  SUserNotFound = 'User "%s" not found';
 
 { TOnlineUser }
@@ -123 +129 @@
   DbRows: TDbRows;
 begin
+  if (Name = '') or (Password = '') or (Email = '') then raise Exception.Create(SEmptyUserParameters);
   try
     DbRows := TDbRows.Create;
@@ -131 +138 @@
         Name + '", SHA1(CONCAT("' + Password + '", "' + Salt + '")), "' + Salt +
         '", "' + Email + '", NOW())');
-    end else raise EDuplicateItem.Create(SDuplicateUserItem);
+    end else raise EDuplicateItem.Create(Format(SDuplicateUserItem, [Name]));
   finally
     DbRows.Free;
@@ -145 +152 @@
     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');
+      else raise ENotFound.Create(Format(SUserNotFound, [Name]));
   finally
     DBRows.Free;
@@ -160 +167 @@
       '`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');
+      else raise ENotFound.Create(Format(SUserNotFound, [Name]));
+  finally
+    DBRows.Free;
+  end;
+end;
+
+procedure TWebUser.Load;
+var
+  DbRows: TDbRows;
+begin
+  try
+    DbRows := TDbRows.Create;
+    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'];
+    end else raise ENotFound.Create(Format(SUserNotFound, [IntToStr(Id)]));
   finally
     DBRows.Free;