Changeset 899 for trunk/Packages/Common/Modules/Setup.php

Timestamp:

Feb 17, 2021, 12:30:23 PM (3 years ago)

Author:

chronos

Message:

• Modified: AppModule renamed to Module. AppModuleManger renamed to ModuleManager.
• Fixed: Keep Modules Id in ModulesConfig.php in sync with database list of modules.

File:

• trunk/Packages/Common/Modules/Setup.php (modified) (4 diffs)

trunk/Packages/Common/Modules/Setup.php

@@ -1 +1 @@
 <?php
+
+class ModuleSetup extends Module
+{
+  public UpdateManager $UpdateManager;
+
+  function __construct(System $System)
+  {
+    global $DatabaseRevision;
+
+    parent::__construct($System);
+    $this->Name = 'Setup';
+    $this->Version = '1.0';
+    $this->Creator = 'Chronos';
+    $this->License = 'GNU/GPLv3';
+    $this->Description = 'Base setup module';
+    $this->Revision = 1;
+    $this->Type = ModuleType::System;
+
+    // Check database persistence structure
+    $this->UpdateManager = new UpdateManager();
+    $this->UpdateManager->Database = &$this->Database;
+    $this->UpdateManager->Revision = $DatabaseRevision;
+    $this->UpdateManager->InstallMethod = 'FullInstall';
+  }
+
+  static function Cast(Module $Module): ModuleSetup
+  {
+    if ($Module instanceof ModuleSetup)
+    {
+      return $Module;
+    }
+    throw new Exception('Expected ModuleSetup type but '.gettype($Module));
+  }
+
+  function DoStart(): void
+  {
+    Core::Cast($this->System)->RegisterPage([''], 'PageSetupRedirect');
+    Core::Cast($this->System)->RegisterPage(['setup'], 'PageSetup');
+  }
+
+  function DoStop(): void
+  {
+    unset($this->UpdateManager);
+    Core::Cast($this->System)->UnregisterPage(['']);
+    Core::Cast($this->System)->UnregisterPage(['setup']);
+  }
+
+  function CheckState(): bool
+  {
+    return $this->Database->Connected() and $this->UpdateManager->IsInstalled() and
+      $this->UpdateManager->IsUpToDate();
+  }
+
+  function DoUpgrade(): string
+  {
+    $Updates = new Updates();
+    $this->UpdateManager->Trace = $Updates->Get();
+    $Output = $this->UpdateManager->Upgrade();
+    return $Output;
+  }
+
+  function InsertSampleData(): void
+  {
+  }
+}
 
 class PageSetup extends Page
@@ -111 +176 @@
         {
           $Output .= '<h3>Instalace systém</h3>';
+          global $DatabaseRevision;
+
+          $this->Database->query("CREATE TABLE IF NOT EXISTS `".$this->UpdateManager->VersionTable."` (".
+            '`Id` int(11) NOT NULL AUTO_INCREMENT, '.
+            '`Revision` int(11) NOT NULL, '.
+            'PRIMARY KEY (`Id`) '.
+            ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
+          $DbResult = $this->Database->select($this->UpdateManager->VersionTable, 'Id');
+          if ($DbResult->num_rows == 0)
+          {
+            $this->Database->query("INSERT INTO `".$this->UpdateManager->VersionTable.
+              "` (`Id`, `Revision`) VALUES (1, ".$DatabaseRevision.");");
+          }
           $this->System->ModuleManager->InstallAll(array(ModuleCondition::System));
           $this->System->ModuleManager->LoadModules();
@@ -121 +199 @@
           $Output .= '<h3>Odinstalace vše</h3>';
           $this->System->ModuleManager->UninstallAll(array(ModuleCondition::System));
+          $this->Database->query('DROP TABLE IF EXISTS `'.$this->UpdateManager->VersionTable.'`');
           $Output .= $this->ControlPanel();
         }
@@ -296 +375 @@
   }
 }
-
-class ModuleSetup extends AppModule
-{
-  public UpdateManager $UpdateManager;
-
-  function __construct(System $System)
-  {
-    global $DatabaseRevision;
-
-    parent::__construct($System);
-    $this->Name = 'Setup';
-    $this->Version = '1.0';
-    $this->Creator = 'Chronos';
-    $this->License = 'GNU/GPLv3';
-    $this->Description = 'Base setup module';
-    $this->Dependencies = array();
-    $this->Revision = 1;
-    $this->Type = ModuleType::System;
-
-    // Check database persistence structure
-    $this->UpdateManager = new UpdateManager();
-    $this->UpdateManager->Database = &$this->Database;
-    $this->UpdateManager->Revision = $DatabaseRevision;
-    $this->UpdateManager->InstallMethod = 'FullInstall';
-  }
-
-  static function Cast(AppModule $AppModule): ModuleSetup
-  {
-    if ($AppModule instanceof ModuleSetup)
-    {
-      return $AppModule;
-    }
-    throw new Exception('Expected ModuleSetup type but '.gettype($AppModule));
-  }
-
-  function DoStart(): void
-  {
-    Core::Cast($this->System)->RegisterPage([''], 'PageSetupRedirect');
-    Core::Cast($this->System)->RegisterPage(['setup'], 'PageSetup');
-  }
-
-  function DoStop(): void
-  {
-    unset($this->UpdateManager);
-    Core::Cast($this->System)->UnregisterPage(['']);
-    Core::Cast($this->System)->UnregisterPage(['setup']);
-  }
-
-  function CheckState(): bool
-  {
-    return $this->Database->Connected() and $this->UpdateManager->IsInstalled() and
-      $this->UpdateManager->IsUpToDate();
-  }
-
-  function DoUpgrade(): string
-  {
-    $Updates = new Updates();
-    $this->UpdateManager->Trace = $Updates->Get();
-    $Output = $this->UpdateManager->Upgrade();
-    return $Output;
-  }
-}