Changeset 342 for trunk/Modules/Module.php

Timestamp:

Jan 17, 2012, 10:37:59 AM (13 years ago)

Author:

chronos

Message:

• Upraveno: Databáze nyní hlásí chyby dotazů přes výjimky.
• Opraveno: Inicializace modulů.

File:

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

trunk/Modules/Module.php

@@ -11 +11 @@
   var $Description;
   var $Dependencies;
-  var $Models;
+  var $Models = array();
   var $Database;
   var $Installed;
@@ -23 +23 @@
   {
     DebugLog('Installing module '.$this->Name.'...');
-    parent::Install();
     foreach($this->Models as $ModelName)
     {
-      $Model = new $ModelName();
-      $Query = 'CREATE TABLE IF NOT EXISTS `'.$ModelName.'` (
-  `Id` int(11) NOT NULL AUTO_INCREMENT,';
-      foreach($Model->Properties as $Property)
-      {
-        if($Property['Type'] == PropertyDateTime) 
-          $Query .= '`'.$Property['Name'].'` DATETIME NOT NULL,';
-        else if($Property['Type'] == PropertyString) 
-          $Query .= '`'.$Property['Name'].'` VARCHAR(255) COLLATE utf8_general_ci NOT NULL,';
-        else if($Property['Type'] == PropertyText) 
-          $Query .= '`'.$Property['Name'].'` TEXT COLLATE utf8_general_ci NOT NULL,';
-        else if($Property['Type'] == PropertyInteger) 
-          $Query .= '`'.$Property['Name'].'` INT(11) NOT NULL,';
-        else if($Property['Type'] == PropertyFloat) 
-          $Query .= '`'.$Property['Name'].'` FLOAT NOT NULL,';
-        else if($Property['Type'] == PropertyOneToMany) 
-          $Query .= '`'.$Property['Name'].'` INT(255) NOT NULL,'.
-            'KEY `'.$Property['Name'].'` (`'.$Property['Name'].'`),';
-        else if($Property['Type'] == PropertyManyToOne) 
-          $Query .= '';
-        else if($Property['Type'] == PropertyManyToMany) 
-          ; // Create many-to-many table
-          //$Query .= '`'.$Property['Name'].'` INT(255) NOT NULL,'.
-          //  'KEY `'.$Property['Name'].'` (`'.$Property['Name'].'`),';
-      }
-      $Query .= 'PRIMARY KEY (`Id`),'.
-        ') ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci AUTO_INCREMENT=1 ;';          
-      $this->Database->query($Query);
+      $Model = new $ModelName($this->Database);
+      $Model->Install();
+      unset($Model);
     }
-    unset($Model);
+    $this->Database->query('UPDATE Module SET Installed=1 WHERE Name="'.$this->Name.'"');
   }
   
@@ -61 +35 @@
   {
     DebugLog('Uninstalling module '.$this->Name.'...');
-    parent::UnInstall();
     foreach($this->Models as $ModelName)
     {
-      $Model = new $ModelName();
-      if($Model['Type'] == PropertyManyToMany)
-        ; // Delete many-to-many table
-      $this->Database->query('DROP TABLE IF EXISTS `'.$ModelName.'`');
+      $Model = new $ModelName($this->Database);
+      $Model->UnInstall();
       unset($Model);
     }
+    $this->Database->query('UPDATE Module SET Installed=0 WHERE Name="'.$this->Name.'"');
   }
 }
@@ -81 +53 @@
   {
     $this->Database = &$Database;
-    $DbResult = $this->Database->query('SELECT * FROM Module WHERE Installed=1');
+  }
+  
+  function Init($Installed = true)
+  {
+    $Query = 'SELECT * FROM `Module`';
+    if($Installed) $Query .= ' WHERE `Installed`=1';
+      else $Query .= ' WHERE `Installed`=0';
+    $DbResult = $this->Database->query($Query);
     while($Module = $DbResult->fetch_array())
     {
-      include_once('Modules/'.$File.'/'.$File.'.php');
-      $this->Modules[] = new $Module['Name']($this->Database);
-    }
+      include_once('Modules/'.$Module['Name'].'/'.$Module['Name'].'.php');
+      $ModuleClassName = 'Module'.$Module['Name'];
+      $this->Modules[$Module['Name']] = new $ModuleClassName($this->Database);
+    }     
   }
   
@@ -99 +79 @@
   `License` varchar(255) COLLATE utf8_czech_ci NOT NULL,
   `Installed` int(11) NOT NULL,
+  `Description` text COLLATE utf8_czech_ci NOT NULL,
   PRIMARY KEY (`Id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
-    foreach($this->Modules as $Module)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1;');
+    $this->ReloadList();
+    $this->Init(false);
+    foreach($this->Modules as $Index => $Module)
     {
-      $Module->Install();
+      $this->Modules[$Index]->Install();
     }
   }
@@ -110 +93 @@
   {
     DebugLog('Uninstalling modular system core...');
-    foreach($this->Modules as $Module)
-      $Module->UnInstall();
+    foreach($this->Modules as $Index => $Module)
+      $this->Modules[$Index]->UnInstall();
     $this->Database->query('DROP TABLE IF EXISTS `Module`');
   }
@@ -119 +102 @@
     // Load list of modules from database
     $Modules = array();
-    $DbResult = $this->Database->query('SELECT * FROM Module');
+    $DbResult = $this->Database->query('SELECT * FROM `Module`');
     while($DbRow = $DbResult->fetch_assoc())
       $Modules[$DbRow['Name']] = $DbRow;
@@ -129 +112 @@
     if(is_dir('Modules/'.$File) and ($File != '.') and ($File != '..'))
     {
-      DebugLog($File.',');        
       $ModulesOnDisk[] = $File;
     }   
@@ -153 +135 @@
     // Remove missing
     foreach($Modules as $Module)
-    if($Module['Installed'] == 0)
+    if(($Module['Installed'] == 0) and !in_array($Module['Name'], $ModulesOnDisk))
     {
-      DebugLog('Removing module '.$ModuleName.' from list');
-      $this->Database->query('DELETE FROM Module WHERE Id = '.$Module['Id']);
+      DebugLog('Removing module '.$Module['Name'].' from list');
+      $this->Database->query('DELETE FROM `Module` WHERE `Id` = '.$Module['Id']);
     }
   }