Changeset 343 for trunk/Modules/Module.php

Timestamp:

Jan 17, 2012, 1:00:26 PM (13 years ago)

Author:

chronos

Message:

• Upraveno: Správa uživatelů je nyní přetvořena na modul modulárního systému.
• Upraveno: Hlavní objekt System je nyní odvozen z třídy ModularSystem.

File:

• trunk/Modules/Module.php (modified) (8 diffs)

trunk/Modules/Module.php

@@ -14 +14 @@
   var $Database;
   var $Installed;
+  var $System;
   
-  function __construct($Database)
+  function __construct($Database, $System)
   {
     $this->Database = &$Database;    
+    $this->System = &$System;    
   }
   
@@ -25 +27 @@
     foreach($this->Models as $ModelName)
     {
-      $Model = new $ModelName($this->Database);
+      $Model = new $ModelName($this->Database, $this->System);
       $Model->Install();
       unset($Model);
@@ -37 +39 @@
     foreach($this->Models as $ModelName)
     {
-      $Model = new $ModelName($this->Database);
+      $Model = new $ModelName($this->Database, $this->System);
       $Model->UnInstall();
       unset($Model);
     }
     $this->Database->query('UPDATE Module SET Installed=0 WHERE Name="'.$this->Name.'"');
+  }
+  
+  function Init()
+  {
   }
 }
@@ -49 +55 @@
   var $Database;
   var $Modules = array();
+  var $Models = array();
   
   function __construct($Database)
@@ -55 +62 @@
   }
   
+  function ModulePresent($Name)
+  {
+    return(array_key_exists($Name, $this->Modules));
+  }
+
   function Init($Installed = true)
   {
@@ -63 +75 @@
     while($Module = $DbResult->fetch_array())
     {
-      include_once('Modules/'.$Module['Name'].'/'.$Module['Name'].'.php');
+      include_once(dirname(__FILE__).'/'.$Module['Name'].'/'.$Module['Name'].'.php');
       $ModuleClassName = 'Module'.$Module['Name'];
-      $this->Modules[$Module['Name']] = new $ModuleClassName($this->Database);
+      $this->Modules[$Module['Name']] = new $ModuleClassName($this->Database, $this);
+      $this->Modules[$Module['Name']]->Init();
     }     
   }
@@ -108 +121 @@
     // Load list of modules on disk
     $ModulesOnDisk = array();
-    $Files = scandir('Modules'); 
+    $Files = scandir(dirname(__FILE__)); 
     foreach($Files as $File)
-    if(is_dir('Modules/'.$File) and ($File != '.') and ($File != '..'))
+    if(is_dir(dirname(__FILE__).'/'.$File) and ($File != '.') and ($File != '..'))
     {
       $ModulesOnDisk[] = $File;
@@ -120 +133 @@
     {
       DebugLog('Adding module '.$ModuleName.' to list');
-      include_once('Modules/'.$ModuleName.'/'.$ModuleName.'.php');
+      include_once(dirname(__FILE__).'/'.$ModuleName.'/'.$ModuleName.'.php');
       $ModuleClassName = 'Module'.$ModuleName;
       if(class_exists($ModuleClassName))
       {
-        $Module = new $ModuleClassName($this->Database);       
+        $Module = new $ModuleClassName($this->Database, $this); 
         $this->Database->insert('Module', array('Name' => $Module->Name, 
           'Version' => $Module->Version, 'Creator' => $Module->Creator,