Changeset 108

Timestamp:

Oct 10, 2012, 3:30:34 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Opět zprovozněno zobrazování oficiálního webu sítě.

Location:

trunk

Files:

• Application/UWebSession.pas (modified) (1 diff)
• Modules/Portal/UModulePortal.pas (modified) (2 diffs)
• Modules/User/UModuleUser.pas (modified) (1 diff)
• Modules/User/UUser.pas (modified) (3 diffs)
• Modules/ZdechovNET/UHostingPage.lfm (modified) (1 diff)
• Modules/ZdechovNET/UModuleZdechovNET.pas (modified) (1 diff)
• Packages/CoolWeb/WebServer/UWebApp.pas (modified) (2 diffs)
• ZdechovNET.lpi (modified) (1 diff)

trunk/Application/UWebSession.pas

@@ -166 +166 @@
     ModuleBase := TModuleBase(ModuleManager.FindModuleByName('Base'));
     if Assigned(ModuleBase) then ModuleBase.Session := Self;
+    if Assigned(ModuleBase) then ModuleBase.HandlerData := Self;
   end;
 end;

trunk/Modules/Portal/UModulePortal.pas

@@ -224 +224 @@
     '<div class="Navigation"><span class="MenuItem"><strong>Navigace :: </strong> ';
     Output := Output + Navigation + '</span><div class="MenuItem2">';
+    if Assigned(ModuleUser) then begin
     if ModuleUser.User.Id = UnknownUser then
       Output := Output + '<a href="' + MakeLink('Přihlášení',
@@ -230 +231 @@
       else Output := Output + ModuleUser.User.Name + ' ' + MakeLink('Odhlásit',
         NavigationLink('/?Action=Logout'));
+    end;
 // <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=UserOptions">Nastavení</a>';
   Output := Output + '</div></div>';

trunk/Modules/User/UModuleUser.pas

@@ -62 +62 @@
   User := TWebUser.Create;
   User.Database := ModuleBase.Session.Database;
+  User.HandlerData := ModuleBase.Session;
   UserOnline := TWebOnlineUser.Create;
   UserOnline.Database := ModuleBase.Session.Database;
+  UserOnline.HandlerData := ModuleBase.Session;
   AfterStart;
 end;

trunk/Modules/User/UUser.pas

@@ -46 +46 @@
     procedure Login(User: Integer);
     procedure Logout;
+    constructor Create;
   end;
 
@@ -123 +124 @@
 end;
 
+constructor TWebOnlineUser.Create;
+begin
+  User := UnknownUser;
+end;
+
 { TUser }
 
@@ -218 +224 @@
   DbRows: TDbRows;
 begin
+  if Id <> -1 then
   try
     DbRows := TDbRows.Create;

trunk/Modules/ZdechovNET/UHostingPage.lfm

@@ -3 +3 @@
   Caption = 'Hosting'
   OnProduce = DataModuleProduce
-  Height = 50
-  HorizontalOffset = 259
-  VerticalOffset = 250
-  Width = 50
+  Height = 224
+  HorizontalOffset = 550
+  VerticalOffset = 280
+  Width = 329
 end

trunk/Modules/ZdechovNET/UModuleZdechovNET.pas

@@ -75 +75 @@
   BeforeStart;
   ModuleBase := TModuleBase(Manager.FindModuleByName('Base'));
+  ModuleBase.GeneratePage := GeneratePage;
   ModuleUser := TModuleUser(Manager.FindModuleByName('User'));
   with ModuleBase, Pages do begin
     //GeneratePage := GeneratePage;
     InternetPage := TInternetPage.Create(nil);
+    InternetPage.ModuleUser := ModuleUser;
     RegisterPage(InternetPage, 'internet');
     HostingPage := THostingPage.Create(nil);
+    HostingPage.ModuleUser := ModuleUser;
     RegisterPage(HostingPage, 'hosting');
     HistoryPage := THistoryPage.Create(nil);
+    HistoryPage.ModuleUser := ModuleUser;
     RegisterPage(HistoryPage, 'historie');
     DocumentsPage := TDocumentsPage.Create(nil);
+    DocumentsPage.ModuleUser := ModuleUser;
     RegisterPage(DocumentsPage, 'dokumenty');
     VoIPPage := TVoIPPage.Create(nil);
+    VoIPPage.ModuleUser := ModuleUser;
     RegisterPage(VoIPPage, 'voip');
     LinksPage := TLinksPage.Create(nil);
+    LinksPage.ModuleUser := ModuleUser;
     RegisterPage(LinksPage, 'odkazy');
     ContactPage := TContactPage.Create(nil);
+    ContactPage.ModuleUser := ModuleUser;
     RegisterPage(ContactPage, 'kontakt');
     ServerInfoPage := TServerInfoPage.Create(nil);
+    ServerInfoPage.ModuleUser := ModuleUser;
     RegisterPage(ServerInfoPage, 'serverinfo');
     WebCamPage := TWebCamPage.Create(nil);
+    WebCamPage.ModuleUser := ModuleUser;
     RegisterPage(WebCamPage, 'kamery');
     PlansPage := TPlansPage.Create(nil);
+    PlansPage.ModuleUser := ModuleUser;
     RegisterPage(PlansPage, 'plany');
     NetworkPage := TNetworkPage.Create(nil);
+    NetworkPage.ModuleUser := ModuleUser;
     RegisterPage(NetworkPage, 'sit');
     ProjectsPage := TProjectsPage.Create(nil);
+    ProjectsPage.ModuleUser := ModuleUser;
     RegisterPage(ProjectsPage, 'projekty');
     AboutPage := TAboutPage.Create(nil);
+    AboutPage.ModuleUser := ModuleUser;
     RegisterPage(AboutPage, '');
   end;

trunk/Packages/CoolWeb/WebServer/UWebApp.pas

@@ -29 +29 @@
     procedure UnregisterPage(Page: TWebPage);
     function ProducePage(HandlerData: THTTPHandlerData): Boolean;
+    constructor Create; override;
   end;
 
@@ -163 +164 @@
 end;
 
+constructor TPageList.Create;
+begin
+  inherited Create;
+  OwnsObjects := False;
+end;
+
 procedure TWebApp.HTTPServerRequest(HandlerData: THTTPHandlerData);
 begin

trunk/ZdechovNET.lpi

@@ -210 +210 @@
         <Filename Value="Modules/ZdechovNET/UHostingPage.pas"/>
         <IsPartOfProject Value="True"/>
-        <HasResources Value="True"/>
+        <ComponentName Value="HostingPage"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="DataModule"/>
         <UnitName Value="UHostingPage"/>
       </Unit15>