Changeset 102 for trunk/UCore.pas

Timestamp:

Oct 4, 2012, 2:06:55 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: Kostra modulů IS a Portal. TWebSession je nutno oddělit z UCore.

File:

• trunk/UCore.pas (modified) (3 diffs)

trunk/UCore.pas

@@ -19 +19 @@
   TCore = class;
 
-  { TWebSession }
-
-  TWebSession = class(THTTPHandlerData)
-  private
-    procedure TopMenu;
-    procedure Footer;
-  public
-    MainModule: TCore;
-    Database: TSqlDatabase;
-    SessionStorage: THTTPSessionStorageMySQL;
-    User: TWebUser;
-    UserOnline: TWebOnlineUser;
-    HtmlDocument: THtmlDocument;
-    GlobalTitle: string;
-    TimeStart: TDateTime;
-    procedure LoadUserInfo;
-    procedure InitDatabase;
-    procedure GeneratePage(Page: TWebPage);
-    constructor Create; override;
-    destructor Destroy; override;
-  end;
 
   { TCore }
@@ -87 +66 @@
 uses
   UModuleSystem, UModuleZdechovNET, UModuleUser, UPageAdmin, UModuleTV,
-  UModuleFinance, UModuleNetwork;
+  UModuleFinance, UModuleNetwork, UModulePortal, UModuleIS;
 
 resourcestring
   SError = '<div>Error: %s</div>';
-
-{ TWebSession }
-
-constructor TWebSession.Create;
-begin
-  inherited;
-  Database := TSqlDatabase.Create(nil);
-  SessionStorage := THTTPSessionStorageMySQL.Create(nil);
-  SessionStorage.Database := Database;
-  HtmlDocument := THtmlDocument.Create;
-  User := TWebUser.Create;
-  User.Database := Database;
-  UserOnline := TWebOnlineUser.Create;
-  UserOnline.Database := Database;
-end;
-
-destructor TWebSession.Destroy;
-begin
-  FreeAndNil(HtmlDocument);
-  FreeAndNil(User);
-  FreeAndNil(UserOnline);
-  FreeAndNil(SessionStorage);
-  FreeAndNil(Database);
-  inherited;
-end;
-
-procedure TWebSession.InitDatabase;
-var
-  DbRows: TDbRows;
-begin
-  with Database do begin
-    Connect;
-  end;
-  try
-    DbRows := TDbRows.Create;
-    Database.Query(DbRows, 'SET NAMES utf8');
-  finally
-    DbRows.Free;
-  end;
-end;
-
-procedure TWebSession.LoadUserInfo;
-begin
-  if Core.ModuleManager.ModuleRunning('User') then begin
-    User.HandlerData := Self;
-    UserOnline.HandlerData := Self;
-    UserOnline.Update;
-    User.Id := UserOnline.User;
-    User.Load;
-  end;
-end;
-
-procedure TWebSession.GeneratePage(Page: TWebPage);
-var
-  I: Integer;
-  TitleTag: THtmlString;
-begin
-    HtmlDocument.ContentLanguage := 'cs';
-    GlobalTitle := 'ZděchovNET';
-    HtmlDocument.Styles.Add(NavigationLink('/Style/' + MainModule.Style + '/Style.css'));
-    HtmlDocument.Scripts.Add(NavigationLink('/Style/' + MainModule.Style + '/Global.js'));
-    HtmlDocument.Scripts.Add(NavigationLink('/Style/' + MainModule.Style + '/jquery.js'));
-
-      TitleTag := THtmlString.Create;
-      HtmlDocument.Body.SubItems.Insert(0, TitleTag);
-      TopMenu;
-      //Page.Page.OnProduce(HandlerData);
-      HtmlDocument.Title := Page.Caption;
-      TitleTag.Text := '<div class="TitlePanel"><span class="GlobalTitle">' + GlobalTitle +
-        '</span> - ' + HtmlDocument.Title + '</div>';
-      HtmlDocument.Title := GlobalTitle + ' - ' + HtmlDocument.Title;
-      with HtmlDocument.AsXmlDocument do
-      try
-        Formated := MainModule.FormatHTML;
-        Response.Content.WriteString(AsString);
-      finally
-        Free;
-      end;
-end;
 
 
@@ -282 +182 @@
     RegisterModule(TModuleFinance.Create(nil), True);
     RegisterModule(TModuleNetwork.Create(nil), True);
+    RegisterModule(TModulePortal.Create(nil), True);
+    RegisterModule(TModuleIS.Create(nil), True);
   end;
 end;