Changeset 898 for trunk/Packages/Common/AppModule.php

Timestamp:

Feb 4, 2021, 11:55:44 PM (4 years ago)

Author:

chronos

Message:

• Modified: Initialization of modular system base tables.

File:

• trunk/Packages/Common/AppModule.php (modified) (9 diffs)

trunk/Packages/Common/AppModule.php

@@ -71 +71 @@
     $this->Version = '';
     $this->Creator = '';
+    $this->Title = '';
     $this->Description = '';
     $this->Dependencies = array();
@@ -85 +86 @@
   {
     if ($this->Installed) return;
+    echo('Install mod '.$this->Name.'<br/>');
     $List = array();
     $this->Manager->EnumDependenciesCascade($this, $List, array(ModuleCondition::NotInstalled));
     $this->Manager->PerformList($List, array(ModuleAction::Install), array(ModuleCondition::NotInstalled));
-    $this->DoBeforeInstall();
-    $this->InstallModels();
-    $this->DoInstall();
     $this->Installed = true;
     $this->Enabled = true; // Automatically enable installed module
     $this->InstalledVersion = $this->Version;
     $this->Manager->Modules[$this->Name] = $this;
+    $this->DoBeforeInstall();
+    if ($this->Manager->OnInstallModule != null)
+    {
+      call_user_func($this->Manager->OnInstallModule, $this);
+    }
+    $this->InstallModels();
+    $this->DoInstall();
   }
 
@@ -107 +113 @@
     $this->DoUninstall();
     $this->UninstallModels();
+    if ($this->Manager->OnUninstallModule != null)
+    {
+      call_user_func($this->Manager->OnUninstallModule, $this);
+    }
     $this->DoAfterUninstall();
   }
@@ -214 +224 @@
       foreach ($this->GetModels() as $Model)
       {
-        call_user_func($this->Manager->OnInstallModel, $Model::GetDesc());
+        call_user_func($this->Manager->OnInstallModel, $Model::GetDesc(), $this);
       }
     }
@@ -225 +235 @@
       foreach (array_reverse($this->GetModels()) as $Model)
       {
-        call_user_func($this->Manager->OnUninstallModel, $Model::GetDesc());
+        call_user_func($this->Manager->OnUninstallModel, $Model::GetDesc(), $this);
       }
     }
@@ -241 +251 @@
   public $OnInstallModel;
   public $OnUninstsallModel;
+  public $OnInstallModule;
+  public $OnUninstsallModule;
 
   function __construct(System $System)
@@ -250 +262 @@
     $this->OnInstallModel = null;
     $this->OnUninstallModel = null;
+    $this->OnInstallModule = null;
+    $this->OnUninstallModule = null;
   }
 
@@ -456 +470 @@
   }
 
+  function GetUniqueModuleId()
+  {
+    $Id = 1;
+    foreach ($this->Modules as $Module)
+    {
+      if ($Module->Id >= $Id) $Id = $Module->Id + 1;
+    }
+    return $Id;
+  }
+
   function LoadModule(string $FileName): AppModule
   {
@@ -461 +485 @@
     $ModuleName = 'Module'.pathinfo($FileName, PATHINFO_FILENAME);
     $Module = new $ModuleName($this->System);
+    $Module->Id = $this->GetUniqueModuleId();
     $this->RegisterModule($Module);
     return $Module;