Changeset 76 for trunk/Modules

Timestamp:

Apr 29, 2012, 9:44:14 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Třída WebApp typu TCustomApplication je nyní použita jako komponenta namísto aplikační třídy.

Location:

trunk/Modules

Files:

• UMainModule.lfm (modified) (1 diff)
• UMainModule.lrs (modified) (1 diff)
• UMainModule.pas (modified) (9 diffs)

trunk/Modules/UMainModule.lfm

@@ -19 +19 @@
     top = 86
   end
+  object WebApp1: TWebApp
+    OnBeforePageProduce = DoBeforePageProduce
+    ServerType = stCGI
+    left = 160
+    top = 88
+  end
 end

trunk/Modules/UMainModule.lrs

@@ -7 +7 @@
   +'base'#7'Timeout'#3'0*'#19'SessionIdCookieName'#6#9'SessionId'#4'left'#3'0'#1
   +#3'top'#2' '#0#0#12'TSqlDatabase'#8'Database'#9'Connected'#8#4'Port'#3#234#12
-  +#8'Encoding'#6#4'utf8'#4'left'#2'Q'#3'top'#2'V'#0#0#0
+  +#8'Encoding'#6#4'utf8'#4'left'#2'Q'#3'top'#2'V'#0#0#7'TWebApp'#7'WebApp1'#19
+  +'OnBeforePageProduce'#7#19'DoBeforePageProduce'#10'ServerType'#7#5'stCGI'#4
+  +'left'#3#160#0#3'top'#2'X'#0#0#0
 ]);

trunk/Modules/UMainModule.pas

@@ -20 +20 @@
     HTTPSessionStorageMySQL1: THTTPSessionStorageMySQL;
     Database: TSqlDatabase;
+    WebApp1: TWebApp;
+    procedure DoBeforePageProduce(HandlerData: THTTPHandlerData);
   private
     procedure Footer;
@@ -25 +27 @@
     procedure Show(Content: string);
     procedure TopMenu;
-    procedure DoBeforePageProduce(HandlerData: THTTPHandlerData);
   public
     TimeStart: TDateTime;
@@ -60 +61 @@
 
 uses
-  UApplicationInfo;
+  UApplicationInfo, UInternetPage, UHostingPage, UHistoryPage, UDocumentsPage, UVoIPPage,
+  ULinksPage, UPlansPage, UServerInfoPage, UWebCamPage, UUserControlPage,
+  UNetworkPage, UAboutPage, UContactPage;
 
 { TMainModule }
@@ -112 +115 @@
 begin
   inherited;
+  with WebApp1 do begin
+    RegisterPage(TInternetPage, InternetPage, 'internet');
+    RegisterPage(THostingPage, HostingPage, 'hosting');
+    RegisterPage(THistoryPage, HistoryPage, 'historie');
+    RegisterPage(TDocumentsPage, DocumentsPage, 'dokumenty');
+    RegisterPage(TVoIPPage, VoIPPage, 'voip');
+    RegisterPage(TLinksPage, LinksPage, 'odkazy');
+    RegisterPage(TContactPage, ContactPage, 'kontakt');
+    RegisterPage(TServerInfoPage, ServerInfoPage, 'serverinfo');
+    RegisterPage(TWebCamPage, WebCamPage, 'kamery');
+    RegisterPage(TUserControlPage, UserControlPage, 'uzivatel');
+    RegisterPage(TPlansPage, PlansPage, 'plany');
+    RegisterPage(TNetworkPage, NetworkPage, 'sit');
+    RegisterPage(TAboutPage, AboutPage, '');
+    //RegisterPage(TUserControlPage, UserControlPage, '');
+    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;
@@ -122 +147 @@
 destructor TMainModule.Destroy;
 begin
-  SaveToRegistry;
+  //SaveToRegistry;
   HtmlDocument.Free;
   User.Free;
@@ -215 +240 @@
       '<li><a href="http://wiki.zdechov.net/">Wiki</a></li>' +
       '</ul><ul class="MenuItem2">'; //<li>&nbsp;</li>';
-    if Assigned(Application.Pages.FindByName('uzivatel')) then begin
+    if Assigned(MainModule.WebApp1.Pages.FindByName('uzivatel')) then begin
       if UserOnline.User = AnonymousUserId then begin
         Text := Text + '</ul>' +
@@ -261 +286 @@
     Database.Password := ReadString(SectionDatabase, 'DatabasePassword', 'password');
     FormatHTML := ReadBool(SectionGeneral, 'FormatHTML', False);
-    Application.LogException := not ReadBool(SectionGeneral, 'ShowException', False);
+    //MainModule.WebApp1.LogException := not ReadBool(SectionGeneral, 'ShowException', False);
     NetworkAddress := ReadString(SectionHTTPServer, 'NetworkAddress', 'localhost');
     NetworkPort := ReadInteger(SectionHTTPServer, 'NetworkPort', 80);
@@ -287 +312 @@
     WriteString(SectionDatabase, 'DatabasePassword', Database.Password);
     WriteBool(SectionGeneral, 'FormatHTML', FormatHTML);
-    WriteBool(SectionGeneral, 'ShowException', not Application.LogException);
+    //WriteBool(SectionGeneral, 'ShowException', not MainModule.WebApp1.LogException);
     WriteString(SectionHTTPServer, 'NetworkAddress', NetworkAddress);
     WriteInteger(SectionHTTPServer, 'NetworkPort', NetworkPort);
@@ -300 +325 @@
   InitDatabase;
   //Database.Query('SELECT * FROM ssss');
-  Application.OnBeforePageProduce := DoBeforePageProduce;
+  WebApp1.Run;
 end;