Changeset 378 for trunk/Common/Module.php

Timestamp:

Jan 20, 2012, 3:32:02 PM (13 years ago)

Author:

chronos

Message:

• Přidáno: Model pro NetworkSegment.
• Upraveno: Přepracován model systém pro načítání modelů modulů.

File:

• trunk/Common/Module.php (modified) (4 diffs)

trunk/Common/Module.php

@@ -12 +12 @@
   var $Dependencies;
   var $Models = array();
+  var $SupportedModels = array();
   var $Database;
   var $Installed;
@@ -33 +34 @@
       $this->System->Modules[$Dependency]->Install();
     $this->LoadModels();
-    foreach($this->Models as $ModelName)
-    {
-      $this->System->Models[$ModelName]->Install();
+    foreach($this->Models as $Index => $Module)
+    {
+      $this->Models[$Index]->Install();
     }
     $this->Database->query('UPDATE SystemModule SET Installed=1 WHERE Name="'.$this->Name.'"');
@@ -43 +44 @@
   {
     DebugLog('Uninstalling module '.$this->Name.'...');
-    foreach($this->Models as $ModelName)
-    {
-      $Model = new $ModelName($this->Database, $this->System);
-      $Model->UnInstall();
-      unset($Model);
+    foreach($this->Models as $Index => $Model)
+    {
+      $this->Models[$Index]->UnInstall();
     }
     $this->Database->query('UPDATE SystemModule SET Installed=0 WHERE Name="'.$this->Name.'"');
+    $this->Installed = false;
   }
   
@@ -62 +62 @@
   function LoadModels()
   {
-    foreach($this->Models as $ModelName)
-    {
-      $this->System->Models[$ModelName] = new $ModelName($this->Database, $this->System);
-      $this->System->Models[$ModelName]->Module = &$this;
+    $this->Models = array();
+    foreach($this->SupportedModels as $ModelName)
+    {
+      $NewModel = new $ModelName($this->Database, $this->System);
+      $NewModel->Module = &$this;
+      $this->Models[$ModelName] = $NewModel;
     }       
   }