Changeset 94

Timestamp:

Sep 7, 2012, 10:43:02 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Zobrazení stránek s a bez modulu User.

Location:

trunk

Files:

• Modules/User/UModuleUser.pas (modified) (4 diffs)
• Packages/ModularSystem/UModularSystem.pas (modified) (3 diffs)
• UCore.pas (modified) (1 diff)

trunk/Modules/User/UModuleUser.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UModularSystem;
+  Classes, SysUtils, UModularSystem, SpecializedDictionary;
 
 type
@@ -62 +62 @@
 var
   DbRows: TDbRows;
+  Data: TDictionaryStringString;
 begin
   try
     DbRows := TDbRows.Create;
+    Data := TDictionaryStringString.Create;
+
     Core.CommonDatabase.Query(DbRows,
     'CREATE TABLE IF NOT EXISTS `User` (' +
@@ -76 +79 @@
     '  PRIMARY KEY (`Id`)' +
     ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
+
+    Data.Add('Id', '1');
+    Data.Add('Name', 'anonymous');
+    Data.Add('FullName', 'Anonymous');
+    Data.Add('RegistrationTime', 'NOW()');
+    Core.CommonDatabase.Insert('User', Data);
+
     Core.CommonDatabase.Query(DbRows,
     'CREATE TABLE IF NOT EXISTS `UserOnline` (' +
@@ -90 +100 @@
     ') ENGINE=MEMORY  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
   finally
+    Data.Free;
     DbRows.Free;
   end;

trunk/Packages/ModularSystem/UModularSystem.pas

@@ -44 +44 @@
     procedure EnumModulesUninstall(ModuleList: TStringList);
     procedure SetInstalledState(Value: Boolean);
-    constructor Create(Owner: TComponent); virtual;
+    constructor Create(Owner: TComponent); override;
     destructor Destroy; override;
     property Running: Boolean read FRunning write SetRunning;
@@ -70 +70 @@
     Modules: TObjectList; // TObjectList<TModule>
     function FindModuleByName(Name: string): TModule;
+    function ModuleRunning(Name: string): Boolean;
     procedure StartDependencies(ModuleName: string; Dependencies: TStringList);
     procedure StopDependencies(ModuleName: string);
@@ -125 +126 @@
 end;
 
+function TModuleManager.ModuleRunning(Name: string): Boolean;
+var
+  Module: TModule;
+begin
+  Module := FindModuleByName(Name);
+  if Assigned(Module) then begin
+    Result := Module.Running;
+  end else Result := False;
+end;
+
 procedure TModuleManager.StartDependencies(ModuleName: string; Dependencies: TStringList);
 var

trunk/UCore.pas

@@ -130 +130 @@
 procedure TWebSession.LoadUserInfo;
 begin
-  User.HandlerData := Self;
-  UserOnline.HandlerData := Self;
-  UserOnline.Update;
-  User.Id := UserOnline.User;
-  User.Load;
+  if Core.ModuleManager.ModuleRunning('User') then begin
+    User.HandlerData := Self;
+    UserOnline.HandlerData := Self;
+    UserOnline.Update;
+    User.Id := UserOnline.User;
+    User.Load;
+  end;
 end;