Changeset 92

Timestamp:

Sep 7, 2012, 9:52:38 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: Administrační stránka pro instalaci a odinstalaci modulů.
• Přidáno: Modul System je zodpovědný za udržování seznamu všech modulů.

Location:

trunk

Files:

• Modules/System (added)
• Modules/System/UModuleSystem.pas (added)
• Modules/User/UModuleUser.pas (modified) (2 diffs)
• Modules/ZdechovNET (added)
• Modules/ZdechovNET/UModuleZdechovNET.pas (added)
• Packages/ModularSystem/ModularSystem.lpk (modified) (1 diff)
• Packages/ModularSystem/UModularSystem.pas (modified) (2 diffs)
• Pages/UPageAdmin.lfm (added)
• Pages/UPageAdmin.pas (added)
• UCore.pas (modified) (6 diffs)
• ZdechovNET.lpi (modified) (3 diffs)

trunk/Modules/User/UModuleUser.pas

@@ -36 +36 @@
   Identification := 'User';
   Title := 'User management';
-  Version := '0.1';
+  Version := '1.0';
   License := 'GNU/LGPL v3';
   Author := 'Chronosoft';
@@ -65 +65 @@
   try
     DbRows := TDbRows.Create;
-    Core.CommonDatabase.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `User` (' +
-  '`Id` int(11) NOT NULL AUTO_INCREMENT,' +
-  '`Name` varchar(255) NOT NULL,' +
-  '`FullName` varchar(255) NOT NULL,' +
-  '`Password` varchar(255) NOT NULL,' +
-  '`Salt` varchar(255) NOT NULL,' +
-  '`Email` varchar(255) NOT NULL,' +
-  '`RegistrationTime` datetime NOT NULL,' +
-  'PRIMARY KEY (`Id`)' +
-  ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
-    Core.CommonDatabase.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `UserOnline` (' +
-  '`Id` int(11) NOT NULL AUTO_INCREMENT,' +
-  '`User` int(11) NOT NULL DEFAULT ''0'',' +
-  '`ActivityTime` datetime NOT NULL DEFAULT ''0000-00-00 00:00:00'',' +
-  '`LoginTime` datetime NOT NULL DEFAULT ''0000-00-00 00:00:00'',' +
-  '`SessionId` varchar(255) COLLATE utf8_czech_ci NOT NULL DEFAULT '''',' +
-  '`IpAddress` varchar(16) COLLATE utf8_czech_ci NOT NULL DEFAULT '''',' +
-  '`HostName` varchar(255) COLLATE utf8_czech_ci NOT NULL DEFAULT '''',' +
-  '`ScriptName` varchar(255) COLLATE utf8_czech_ci NOT NULL,' +
-  'PRIMARY KEY (`Id`),' +
-  'KEY `User` (`User`)' +
-  ') ENGINE=MEMORY  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=2 ;');
+    Core.CommonDatabase.Query(DbRows,
+    'CREATE TABLE IF NOT EXISTS `User` (' +
+    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
+    '  `Name` varchar(255) NOT NULL,' +
+    '  `FullName` varchar(255) NOT NULL,' +
+    '  `Password` varchar(255) NOT NULL,' +
+    '  `Salt` varchar(255) NOT NULL,' +
+    '  `Email` varchar(255) NOT NULL,' +
+    '  `RegistrationTime` datetime NOT NULL,' +
+    '  PRIMARY KEY (`Id`)' +
+    ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
+    Core.CommonDatabase.Query(DbRows,
+    'CREATE TABLE IF NOT EXISTS `UserOnline` (' +
+    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
+    '  `User` int(11) NOT NULL DEFAULT ''0'',' +
+    '  `ActivityTime` datetime NOT NULL DEFAULT ''0000-00-00 00:00:00'',' +
+    '  `LoginTime` datetime NOT NULL DEFAULT ''0000-00-00 00:00:00'',' +
+    '  `SessionId` varchar(255) COLLATE utf8_czech_ci NOT NULL DEFAULT '''',' +
+    '  `IpAddress` varchar(16) COLLATE utf8_czech_ci NOT NULL DEFAULT '''',' +
+    '  `HostName` varchar(255) COLLATE utf8_czech_ci NOT NULL DEFAULT '''',' +
+    '  `ScriptName` varchar(255) COLLATE utf8_czech_ci NOT NULL,' +
+    '  PRIMARY KEY (`Id`),' +
+    '  KEY `User` (`User`)' +
+    ') ENGINE=MEMORY  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
   finally
     DbRows.Free;

trunk/Packages/ModularSystem/ModularSystem.lpk

@@ -20 +20 @@
     <Description Value="Modular system"/>
     <License Value="GNU/LGPLv3"/>
-    <Version Minor="1"/>
+    <Version Minor="2"/>
     <Files Count="1">
       <Item1>

trunk/Packages/ModularSystem/UModularSystem.pas

@@ -43 +43 @@
     procedure EnumModulesInstall(ModuleList: TStringList);
     procedure EnumModulesUninstall(ModuleList: TStringList);
+    procedure SetInstalledState(Value: Boolean);
     constructor Create(Owner: TComponent); virtual;
     destructor Destroy; override;
@@ -366 +367 @@
 end;
 
+procedure TModule.SetInstalledState(Value: Boolean);
+begin
+  FInstalled := Value;
+end;
+
 constructor TModule.Create(Owner: TComponent);
 begin

trunk/UCore.pas

@@ -9 +9 @@
   UHTTPServer, USqlDatabase, INIFiles, DateUtils, UWebPage, UWebApp,
   UXmlClasses, UHtmlClasses, UUtils, UApplicationInfo, UHTTPServerTCP,
-  UModuleUser, UHTTPSessionFile, UUser, SpecializedList, Registry,
+  UHTTPSessionFile, UUser, SpecializedList, Registry,
   UModularSystem;
 
@@ -50 +50 @@
     procedure Show(Content: string);
     procedure RegisterModules;
+    procedure CheckModules;
   public
     CommonDatabase: TSqlDatabase;
@@ -85 +86 @@
 
 uses
-  UInternetPage, UHostingPage, UHistoryPage, UDocumentsPage, UVoIPPage,
-  ULinksPage, UPlansPage, UServerInfoPage, UWebCamPage, UUserControlPage,
-  UNetworkPage, UAboutPage, UContactPage, UProjectsPage;
+  UModuleSystem, UModuleZdechovNET, UModuleUser, UPageAdmin;
 
 { TWebSession }
@@ -178 +177 @@
   LoadFromRegistry;
   with Pages 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(TPlansPage, PlansPage, 'plany');
-    RegisterPage(TNetworkPage, NetworkPage, 'sit');
-    RegisterPage(TProjectsPage, ProjectsPage, 'projekty');
-    RegisterPage(TAboutPage, AboutPage, '');
+    RegisterPage(TPageAdmin, PageAdmin, 'administration');
   end;
   with WebApp1 do begin
@@ -282 +269 @@
 begin
   with ModuleManager do begin
+    RegisterModule(TModuleSystem.Create(nil), True);
     RegisterModule(TModuleUser.Create(nil), True);
+    RegisterModule(TModuleZdechovNET.Create(nil), True);
+  end;
+end;
+
+procedure TCore.CheckModules;
+var
+  DbRows: TDbRows;
+  Module: TModule;
+begin
+  try
+    DbRows := TDbRows.Create;
+    CommonDatabase.Query(DbRows, 'SELECT * FROM INFORMATION_SCHEMA.TABLES ' +
+      'WHERE TABLE_SCHEMA = "' + CommonDatabase.Database + '" AND TABLE_NAME = "SystemModule"');
+    Module := ModuleManager.FindModuleByName('System');
+    if DbRows.Count > 0 then Module.SetInstalledState(True)
+      else Module.SetInstalledState(False);
+  finally
+    DbRows.Free;
   end;
 end;
@@ -425 +431 @@
 
   RegisterModules;
+  CheckModules;
   ModuleManager.StartInstalled;
 

trunk/ZdechovNET.lpi

@@ -68 +68 @@
       </Item7>
     </RequiredPackages>
-    <Units Count="22">
+    <Units Count="25">
       <Unit0>
         <Filename Value="ZdechovNET.lpr"/>
@@ -212 +212 @@
         <UnitName Value="UUserControlPage"/>
       </Unit21>
+      <Unit22>
+        <Filename Value="Modules/System/UModuleSystem.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="UModuleSystem"/>
+      </Unit22>
+      <Unit23>
+        <Filename Value="Pages/UPageAdmin.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="PageAdmin"/>
+        <ResourceBaseClass Value="DataModule"/>
+        <UnitName Value="UPageAdmin"/>
+      </Unit23>
+      <Unit24>
+        <Filename Value="Modules/ZdechovNET/UModuleZdechovNET.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="UModuleZdechovNET"/>
+      </Unit24>
     </Units>
   </ProjectOptions>
@@ -220 +237 @@
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="/usr/lib/mysql/;/usr/lib64/mysql/;Application;WebServer;Network;Pages;Modules/User;Common"/>
+      <OtherUnitFiles Value="/usr/lib/mysql/;/usr/lib64/mysql/;Application;WebServer;Network;Pages;Modules/User;Common;Modules/System;Modules/ZdechovNET"/>
       <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>