Changeset 105 for trunk/Modules/Portal

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/Portal

Files:

• UModulePortal.pas (modified) (5 diffs)
• UPagePortal.pas (modified) (8 diffs)

trunk/Modules/Portal/UModulePortal.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, UModularSystem, SpecializedDictionary, USqlDatabase,
-  UUtils, UWebSession, SpecializedList, UUser, UWebPage, UHtmlClasses;
+  UUtils, UWebSession, SpecializedList, UUser, UWebPage, UHtmlClasses,
+  UModuleBase, UModuleUser;
 
 type
@@ -16 +17 @@
   private
     Time: TDateTime;
+    WebPagePortal: TWebPage;
     function ShowFooter(Session: TWebSession): string;
     function ShowHeader(Session: TWebSession): string;
     procedure GeneratePage(ASession: TWebSession; Page: TWebPage);
   public
+    ModuleBase: TModuleBase;
+    ModuleUser: TModuleUser;
     constructor Create(Owner: TComponent); override;
     destructor Destroy; override;
@@ -46 +50 @@
   Author := 'Chronosoft';
   Dependencies.Add('User');
+  Dependencies.Add('Finance');
+  Dependencies.Add('News');
 end;
 
@@ -55 +61 @@
 procedure TModulePortal.Start;
 begin
-  Core.GeneratePage := GeneratePage;
-  Core.Pages.RegisterPage(TWebPagePortal, WebPagePortal, 'portal');
-  inherited;
+  BeforeStart;
+  ModuleBase := TModuleBase(Manager.FindModuleByName('Base'));
+  ModuleBase.GeneratePage := GeneratePage;
+  WebPagePortal := TWebPagePortal.Create(nil);
+  ModuleBase.Pages.RegisterPage(WebPagePortal, '');
+  TWebPagePortal(WebPagePortal).ModuleUser := TModuleUser(Manager.FindModuleByName('User'));
+  AfterStart;
 end;
 
 procedure TModulePortal.Stop;
 begin
-  inherited;
-  Core.Pages.UnregisterPage('portal');
+  BeforeStop;
+  ModuleBase.Pages.UnregisterPage(WebPagePortal);
+  FreeAndNil(WebPagePortal);
+  ModuleBase := nil;
+  AfterStop;
 end;
 
@@ -208 +221 @@
     '<div class="Navigation"><span class="MenuItem"><strong>Navigace :: </strong> ';
     Output := Output + Navigation + '</span><div class="MenuItem2">';
-    if Session.User.Id = UnknownUser then
+    if ModuleUser.User.Id = UnknownUser then
       Output := Output + '<a href="' + MakeLink('Přihlášení',
         NavigationLink('/?Action=LoginForm')) + ' ' +
         MakeLink('Registrace', NavigationLink('/?Action=UserRegister'))
-      else Output := Output + Session.User.Name + ' ' + MakeLink('Odhlásit',
+      else Output := Output + ModuleUser.User.Name + ' ' + MakeLink('Odhlásit',
         NavigationLink('/?Action=Logout'));
 // <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=UserOptions">Nastavení</a>';

trunk/Modules/Portal/UPagePortal.pas

@@ -8 +8 @@
   Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, USqlDatabase, UUtils,
   SpecializedDictionary, UWebSession, SpecializedList, UHtmlClasses,
-  UModularSystem;
+  UModularSystem, UModuleUser, UModuleNews;
 
 type
@@ -26 +26 @@
     function WebcamPanel: string;
   public
-    { public declarations }
+    ModuleUser: TModuleUser;
+    ModuleNews: TModuleNews;
   end;
 
@@ -37 +38 @@
 
 uses
-  UCore, UModuleUser, UWebObjects, UUser;
+  UCore, UWebObjects, UUser;
 
 function TWebPagePortal.SystemMessage(Title, Text: string): string;
@@ -76 +77 @@
         if ((HyperLink.Values['PermissionModule'] = '') or
         ((HyperLink.Values['PermissionModule'] <> '') and
-        Session.User.CheckPermission(HyperLink.Values['PermissionModule'], HyperLink.Values['PermissionOperation']))) then
+        ModuleUser.User.CheckPermission(HyperLink.Values['PermissionModule'], HyperLink.Values['PermissionOperation']))) then
         Result := Result + '<img alt="' + HyperLink.Values['Name'] + '" src="images/favicons/' + HyperLink.Values['IconFile'] + '" width="16" height="16" /> <a href="' + HyperLink.Values['URL'] + '">' + HyperLink.Values['Name'] + '</a><br />';
     end;
@@ -118 +119 @@
       Form := TQueryForm.Create; // UserLogin
       Form.Load(Session.Request.Post);
-      Session.UserOnline.Login(
-        Session.User.GetIdByNamePassword(
+      ModuleUser.UserOnline.Login(
+        ModuleUser.User.GetIdByNamePassword(
       TQueryFormGroup(Form.Groups[0]).Rows.FindByName('Username').Value.Value,
         TQueryFormGroup(Form.Groups[0]).Rows.FindByName('Password').Value.Value));
       Output := Output + SystemMessage('Přihlášení', 'Přihlášení provedeno');
-      if Session.User.Id <> UnknownUser then begin
+      if ModuleUser.User.Id <> UnknownUser then begin
         //Form.LoadValuesFromForm;
         TQueryFormGroup(Form.Groups[0]).Rows.FindByName('Password').Value.Value := '';
@@ -132 +133 @@
     end else
     if Query.Values['Action'] = 'Logout' then begin
-      Session.UserOnline.Logout;
+      ModuleUser.UserOnline.Logout;
       Output := Output + SystemMessage('Odhlášení', 'Uživatel odhlášen');
     end else
@@ -249 +250 @@
         else if Panel.Values['Module'] = 'UserOptions' then
         begin
-          if Session.User.Id <> UnknownUser then
+          if ModuleUser.User.Id <> UnknownUser then
             Output := Output + ShowPanel('Přihlášený uživatel', UserPanel);
         end else
@@ -255 +256 @@
           Output := Output + ShowPanel('Kamery', WebcamPanel)
         else if Panel.Values['Module'] = 'NewsGroupList' then
-//          Output := Output + Panel('Aktuality', $this->System->Modules['News']->Show(), array('<a href="?Action=CustomizeNews">Upravit</a>'));
+          //Output := Output + ShowPanel('Aktuality',
+          //ModuleNews.Show,
+          //['<a href="?Action=CustomizeNews">Upravit</a>']);
       end;
       Output := Output + '</td>';