Changeset 105 for trunk/Modules/User

Timestamp:

Oct 9, 2012, 1:58:45 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: Hlavní modul Base, který slouží jako základní rozhraní k aplikaci pro ostatní moduly. Modul System zajistí udržování seznamu instalovaných modulů v perzistentním úložišti v databázi.
• Upraveno: Správce modulů ModuleManager je nyní použit pro každé komunikační spojení zvlášť.

Location:

trunk/Modules/User

Files:

• UModuleUser.pas (modified) (6 diffs)
• UUserControlPage.pas (modified) (10 diffs)

trunk/Modules/User/UModuleUser.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UModularSystem, SpecializedDictionary;
+  Classes, SysUtils, UModularSystem, SpecializedDictionary, UUser,
+  UModuleBase, UWebPage;
 
 type
-
   { TModuleUser }
 
   TModuleUser = class(TModule)
+  private
+    UserControlPage: TWebPage; //TUserControlPage;
   public
+    User: TWebUser;
+    UserOnline: TWebOnlineUser;
+    ModuleBase: TModuleBase;
     constructor Create(Owner: TComponent); override;
     destructor Destroy; override;
@@ -21 +26 @@
     procedure Uninstall; override;
     procedure Upgrade; override;
+    procedure LoadUserInfo;
   end;
 
@@ -27 +33 @@
 
 uses
-  UCore, UUserControlPage, USqlDatabase;
+  UCore, USqlDatabase, UUserControlPage;
 
 { TModuleUser }
@@ -39 +45 @@
   License := 'GNU/LGPL v3';
   Author := 'Chronosoft';
+  Dependencies.Add('Base');
 end;
 
@@ -48 +55 @@
 procedure TModuleUser.Start;
 begin
-  Core.Pages.RegisterPage(TUserControlPage, UserControlPage, 'uzivatel');
+  BeforeStart;
+  ModuleBase := TModuleBase(Manager.FindModuleByName('Base'));
+  UserControlPage := TUserControlPage.Create(nil);
+  ModuleBase.Pages.RegisterPage(UserControlPage, 'uzivatel');
   //RegisterPage(TUserControlPage, UserControlPage, '');
-  inherited;
+  User := TWebUser.Create;
+  //User.Database := Database;
+  UserOnline := TWebOnlineUser.Create;
+  //UserOnline.Database := Database;
+  AfterStart;
 end;
 
 procedure TModuleUser.Stop;
 begin
-  inherited;
-  Core.Pages.UnregisterPage('uzivatel');
+  BeforeStop;
+  FreeAndNil(User);
+  FreeAndNil(UserOnline);
+  ModuleBase.Pages.UnregisterPage(UserControlPage);
+  FreeAndNil(UserControlPage);
+  ModuleBase := nil;
+  AfterStop;
 end;
 
@@ -183 +202 @@
 end;
 
+procedure TModuleUser.LoadUserInfo;
+begin
+  User.HandlerData := ModuleBase.HandlerData;
+  UserOnline.HandlerData := ModuleBase.HandlerData;
+  UserOnline.Update;
+  User.Id := UserOnline.User;
+  User.Load;
+end;
+
+
+
 end.
 

trunk/Modules/User/UUserControlPage.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, UHtmlClasses, UXmlClasses,
-  UWebObjects;
+  UWebObjects, UModuleUser, UModuleBase;
 
 type
@@ -21 +21 @@
     procedure HandleProfile(HandlerData: THTTPHandlerData);
   public
-    { public declarations }
-  end; 
+    ModuleUser: TModuleUser;
+    ModuleBase: TModuleBase;
+  end;
 
 var
@@ -47 +48 @@
       else PageName := '';
     with HtmlDocument.Body do begin
-      LoadUserInfo;
+      ModuleUser.LoadUserInfo;
       if PageName = '' then PageName := 'prihlaseni';
       if PageName = 'prihlaseni' then HandleLogin(HandlerData)
@@ -91 +92 @@
       with THtmlString(SubItems.AddNew(THtmlString.Create)) do
         Text := 'Přihlášení uživatele: ' + TQueryFormGroup(Form.Groups[0]).Rows.FindByName('UserName').Value.Value;
-      UserId := User.GetIdByNamePassword(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
           Text := '<br/>Chybné jméno nebo heslo';
-      end else UserOnline.Login(UserId);
+      end else ModuleUser.UserOnline.Login(UserId);
       Form.Free;
     end else
@@ -149 +150 @@
       with THtmlString(SubItems.AddNew(THtmlString.Create)) do
         Text := 'Registrace uživatele: ' + TQueryFormGroup(Form.Groups[0]).Rows.FindByName('UserName').Value.Value;
-      User.Add(TQueryFormGroup(Form.Groups[0]).Rows.FindByName('UserName').Value.Value,
+      ModuleUser.User.Add(TQueryFormGroup(Form.Groups[0]).Rows.FindByName('UserName').Value.Value,
         TQueryFormGroup(Form.Groups[0]).Rows.FindByName('Password').Value.Value,
         TQueryFormGroup(Form.Groups[0]).Rows.FindByName('Email').Value.Value);
-      UserId := User.GetIdByNamePassword(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 UserOnline.Login(UserId);
+      if UserId <> -1 then ModuleUser.UserOnline.Login(UserId);
       Form.Free;
     end else SubItems.AddNew(Form);
@@ -163 +164 @@
 begin
   with TWebSession(HandlerData), Core, HtmlDocument.Body do begin
-    UserOnline.Logout;
+    ModuleUser.UserOnline.Logout;
     with THtmlString(SubItems.AddNew(THtmlString.Create)) do
       Text := 'Uživatel odhlášen';
@@ -185 +186 @@
           Hint := 'Zadejte vaše přihlašovací jméno';
           Required := True;
-          Value.Value := User.Name;
+          Value.Value := ModuleUser.User.Name;
         end;
         with AddNewItem do begin
@@ -200 +201 @@
           Required := True;
           ItemType := fitText;
-          Value.Value := User.Email;
+          Value.Value := ModuleUser.User.Email;
         end;
         with AddNewItem do begin
@@ -208 +209 @@
           Required := False;
           ItemType := fitText;
-          Value.Value := User.FullName;
+          Value.Value := ModuleUser.User.FullName;
         end;
       end;
@@ -218 +219 @@
       with THtmlString(SubItems.AddNew(THtmlString.Create)) do
         Text := 'Profil uživatele: ' + TQueryFormGroup(Form.Groups[0]).Rows.FindByName('UserName').Value.Value + ' uložen';
-      User.Name := TQueryFormGroup(Form.Groups[0]).Rows.FindByName('UserName').Value.Value;
-      User.FullName := TQueryFormGroup(Form.Groups[0]).Rows.FindByName('FullName').Value.Value;
-      User.Email := TQueryFormGroup(Form.Groups[0]).Rows.FindByName('Email').Value.Value;
-      User.Save;
+      ModuleUser.User.Name := TQueryFormGroup(Form.Groups[0]).Rows.FindByName('UserName').Value.Value;
+      ModuleUser.User.FullName := TQueryFormGroup(Form.Groups[0]).Rows.FindByName('FullName').Value.Value;
+      ModuleUser.User.Email := TQueryFormGroup(Form.Groups[0]).Rows.FindByName('Email').Value.Value;
+      ModuleUser.User.Save;
       Form.Free;
     end else SubItems.AddNew(Form);