Changeset 98 for trunk/Packages/CoolWeb

Timestamp:

Oct 2, 2012, 12:24:00 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Přihlašování, odhlašování, registrace a nastavení profilu uživatele.

Location:

trunk/Packages/CoolWeb

Files:

• Modules/UUser.pas (modified) (8 diffs)
• WebServer/UHTTPServerTCP.pas (modified) (3 diffs)

trunk/Packages/CoolWeb/Modules/UUser.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, synacode, USqlDatabase, UCommon, UHTTPServer;
+  Classes, SysUtils, synacode, USqlDatabase, UCommon, UHTTPServer,
+  SpecializedDictionary;
 
 const
@@ -24 +25 @@
     Database: TSqlDatabase;
     HandlerData: THTTPHandlerData;
+    procedure Save;
     procedure Delete(Id: Integer);
     procedure Add(Name, Password, Email: string);
@@ -112 +114 @@
 { TUser }
 
+procedure TWebUser.Save;
+var
+  DbRows: TDbRows;
+  Data: TDictionaryStringString;
+begin
+  try
+    DbRows := TDbRows.Create;
+    Data := TDictionaryStringString.Create;
+    Data.Add('FullName', FullName);
+    Data.Add('Email', Email);
+    Data.Add('Name', Name);
+    //Data.Add('Password', 'SHA1(CONCAT("' + Password + '", "' + Salt + '"))');
+    Database.Update('User', Data, '`Id`=' + IntToStr(Id));
+  finally
+    Data.Free;
+    DbRows.Free;
+  end;
+end;
+
 procedure TWebUser.Delete(Id: Integer);
 var
@@ -129 +150 @@
   DbRows: TDbRows;
 begin
-  if (Name = '') or (Password = '') or (Email = '') then raise Exception.Create(SEmptyUserParameters);
+  if (Name = '') or (Password = '') or (Email = '') then
+  raise Exception.Create(SEmptyUserParameters);
   try
     DbRows := TDbRows.Create;
@@ -135 +157 @@
     if DbRows.Count = 0 then begin
       Salt := EncodeBase64(Copy(BinToHexString(SHA1(FloatToStr(Now))), 1, 8));
-      Database.Query(DbRows, 'INSERT INTO `User` (`Name`, `Password`, `Salt`, `Email`, `RegistrationTime`) VALUES ("' +
+      Database.Query(DbRows, 'INSERT INTO `User` (`Name`, `Password`, `Salt`, `Email`, `RegistrationTime`, `FullName`) VALUES ("' +
         Name + '", SHA1(CONCAT("' + Password + '", "' + Salt + '")), "' + Salt +
-        '", "' + Email + '", NOW())');
+        '", "' + Email + '", NOW(), "")');
     end else raise EDuplicateItem.Create(Format(SDuplicateUserItem, [Name]));
   finally
@@ -152 +174 @@
     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(Format(SUserNotFound, [Name]));
+      else Result := -1;
   finally
     DBRows.Free;
@@ -167 +189 @@
       '`Password` = SHA1(CONCAT("' + Password + '", Salt))');
     if DbRows.Count = 1 then Result := StrToInt(DbRows[0].Items[0].Value)
-      else raise ENotFound.Create(Format(SUserNotFound, [Name]));
+      else Result := -1;
   finally
     DBRows.Free;
@@ -184 +206 @@
       FullName := DbRows[0].Values['FullName'];
       Email := DbRows[0].Values['Email'];
-    end else raise ENotFound.Create(Format(SUserNotFound, [IntToStr(Id)]));
+    end; // else raise ENotFound.Create(Format(SUserNotFound, [IntToStr(Id)]));
   finally
     DBRows.Free;

trunk/Packages/CoolWeb/WebServer/UHTTPServerTCP.pas

@@ -42 +42 @@
   HandlerData: THTTPHandlerData;
   I: Integer;
+  ContentLength: Integer;
 begin
   with TTCPClientThread(Sender), Socket do begin
@@ -81 +82 @@
           Inc(LineIndex);
         until Line = '';
+
+        if Request.Method = 'POST' then begin
+          ContentLength := StrToInt(Request.Headers.Values['Content-Length']);
+          SetLength(Line, ContentLength);
+          RecvBufferEx(PByte(Line), ContentLength, 1000);
+          Request.Post.Parse(Line);
+        end;
       finally
         LineParts.Free;
       end;
+
+
 
     // Process cookies
@@ -95 +105 @@
     Response.Content.Clear;
     Response.Headers.Add('Content-Type', 'text/html');
+
+
 
     if Assigned(OnRequest) then OnRequest(HandlerData)