Changeset 425 for branches/Modular/Modules/System/System.php

Timestamp:

Oct 10, 2012, 12:21:38 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Automatické spouštění instalovaných modulů.

File:

• branches/Modular/Modules/System/System.php (modified) (8 diffs)

branches/Modular/Modules/System/System.php

@@ -205 +205 @@
     parent::Start();
     $this->System->Pages['module'] = 'PageModules';
-    $this->ModularSystem->OnModuleChange = array($this, 'ModuleChange');
+    $this->Manager->OnModuleChange = array($this, 'ModuleChange');
     $this->LoadFromDatabase();
   }
@@ -224 +224 @@
   function ModuleChange($Module)
   {
-    if($this->IsInstalled())
-    {
-      if($Module->Installed) 
+    //if($this->IsInstalled())
+    {
+      if($Module->IsInstalled()) 
       $this->Database->query('UPDATE `SystemModule` SET `Installed`=1 WHERE `Name`="'.$Module->Name.'"');
         else $this->Database->query('UPDATE `SystemModule` SET `Installed`=0 WHERE `Name`="'.$Module->Name.'"');
@@ -243 +243 @@
       include_once('Modules/'.$Module['Name'].'/'.$Module['Name'].'.php');
       $ModuleClassName = 'Module'.$Module['Name'];
-      $NewModule = new $ModuleClassName($this->Database, $this);      
+      $NewModule = new $ModuleClassName($this->Database, $this->Manager);      
       $NewModule->Id = $Module['Id'];
       $NewModule->Installed = $Module['Installed'];      
-      $this->ModularSystem->RegisterModule($NewModule);
+      $this->Manager->RegisterModule($NewModule);
     }     
   }
@@ -258 +258 @@
 
     // Add missing
-    foreach($this->ModularSystem->Modules as $Module)    
+    foreach($this->Manager->Modules as $Module)    
     {      
       if(!array_key_exists($Module->Name, $Modules))
@@ -273 +273 @@
     // Remove exceeding
     foreach($Modules as $Module)    
-    if(!$this->ModularSystem->ModulePresent($Module['Name']))
+    if(!$this->Manager->ModulePresent($Module['Name']))
     {
       DebugLog('Removing module '.$Module['Name'].' from list');
@@ -285 +285 @@
       $DbDependency[$DbRow['Module']][] = $DbRow['DependencyModule'];
     
-    foreach($this->ModularSystem->Modules as $Module)
+    foreach($this->Manager->Modules as $Module)
     {
       // Add missing
@@ -291 +291 @@
       {
         if(!array_key_exists($Module->Id, $DbDependency) or
-        !in_array($this->ModularSystem->Modules[$Dependency]->Id, $DbDependency[$Module->Id]))
+        !in_array($this->Manager->Modules[$Dependency]->Id, $DbDependency[$Module->Id]))
         $this->Database->insert('SystemModuleDependency', array('Module' => $Module->Id, 
-          'DependencyModule' => $this->ModularSystem->Modules[$Dependency]->Id));        
+          'DependencyModule' => $this->Manager->Modules[$Dependency]->Id));        
       }
       
@@ -300 +300 @@
       foreach($DbDependency[$Module->Id] as $Dep)
       {
-        $DepModName = $this->ModularSystem->SearchModuleById($Dep);
+        $DepModName = $this->Manager->SearchModuleById($Dep);
         if(!in_array($DepModName, $Module->Dependencies))
         $this->Database->query('DELETE FROM `SystemModuleDependency` WHERE `Module` = '.