Changeset 77 for trunk/Modules/UMainModule.pas

Timestamp:

Jun 18, 2012, 8:48:28 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Obsluhuj generování stránek dle vlastního seznamu stránek a pokud nenajdeš přímou obsluhu, tak zkus generovat ze souboru.

File:

• trunk/Modules/UMainModule.pas (modified) (10 diffs)

trunk/Modules/UMainModule.pas

@@ -15 +15 @@
 
 type
+  TSession = class
+
+  end;
+
   { TMainModule }
 
@@ -21 +25 @@
     Database: TSqlDatabase;
     WebApp1: TWebApp;
-    procedure DoBeforePageProduce(HandlerData: THTTPHandlerData);
+    procedure WebApp1PageProduce(HandlerData: THTTPHandlerData);
   private
     procedure Footer;
@@ -46 +50 @@
     NetworkPort: Integer;
     MaxConnections: Integer;
+    Pages: TPageList;
+    procedure LoadUserInfo(HandlerData: THTTPHandlerData);
     procedure LoadFromRegistry;
     procedure SaveToRegistry;
@@ -115 +121 @@
 begin
   inherited;
-  with WebApp1 do begin
+  Pages := TPageList.Create;
+  HtmlDocument := THtmlDocument.Create;
+  User := TWebUser.Create;
+  User.Database := Database;
+  UserOnline := TWebOnlineUser.Create;
+  UserOnline.Database := Database;
+  LoadFromRegistry;
+  with Pages do begin
     RegisterPage(TInternetPage, InternetPage, 'internet');
     RegisterPage(THostingPage, HostingPage, 'hosting');
@@ -130 +143 @@
     RegisterPage(TAboutPage, AboutPage, '');
     //RegisterPage(TUserControlPage, UserControlPage, '');
+  end;
+  with WebApp1 do begin
     if ServerType = stTCP then begin
-      THTTPServerTCP(HTTPServer).Socket.Address := MainModule.NetworkAddress;
-      THTTPServerTCP(HTTPServer).Socket.Port := MainModule.NetworkPort;
-      THTTPServerTCP(HTTPServer).MaxConnection := MainModule.MaxConnections;
-    end;
-  end;
-
-  HtmlDocument := THtmlDocument.Create;
-  User := TWebUser.Create;
-  User.Database := Database;
-  UserOnline := TWebOnlineUser.Create;
-  UserOnline.Database := Database;
-  LoadFromRegistry;
+      THTTPServerTCP(HTTPServer).Socket.Address := NetworkAddress;
+      THTTPServerTCP(HTTPServer).Socket.Port := NetworkPort;
+      THTTPServerTCP(HTTPServer).MaxConnection := MaxConnections;
+    end;
+  end;
 end;
 
@@ -151 +159 @@
   User.Free;
   UserOnline.Free;
+  Pages.Free;
   inherited Destroy;
 end;
@@ -240 +249 @@
       '<li><a href="http://wiki.zdechov.net/">Wiki</a></li>' +
       '</ul><ul class="MenuItem2">'; //<li>&nbsp;</li>';
-    if Assigned(MainModule.WebApp1.Pages.FindByName('uzivatel')) then begin
+    if Assigned(MainModule.Pages.FindByName('uzivatel')) then begin
       if UserOnline.User = AnonymousUserId then begin
         Text := Text + '</ul>' +
@@ -260 +269 @@
 end;
 
-procedure TMainModule.DoBeforePageProduce(HandlerData: THTTPHandlerData);
+procedure TMainModule.LoadUserInfo(HandlerData: THTTPHandlerData);
 begin
   User.HandlerData := HandlerData;
@@ -267 +276 @@
   User.Id := UserOnline.User;
   User.Load;
+end;
+
+procedure TMainModule.WebApp1PageProduce(HandlerData: THTTPHandlerData);
+var
+  FileName: string;
+begin
+  with HandlerData do begin
+    if not Pages.ProducePage(HandlerData) then begin
+      WebApp1.HTTPServer.FileResponse(HandlerData)
+    end;
+  end;
 end;
 
@@ -325 +345 @@
   InitDatabase;
   //Database.Query('SELECT * FROM ssss');
+
   WebApp1.Run;
 end;