Changeset 373 for trunk/Common/Module.php

Timestamp:

Jan 19, 2012, 9:43:36 PM (13 years ago)

Author:

chronos

Message:

• Přidáno: Různé knihovny pro zpracování HTML kódu, tabulek, stránkování, zasílání emailů, aj.
• Přidáno: Kód zpracování fronty emailů přesunut z Global do modulu EmailQueue.

File:

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

trunk/Common/Module.php

@@ -28 +28 @@
     {
       $Model = new $ModelName($this->Database, $this->System);
+      $Model->Module = &$this;
       $Model->Install();
       unset($Model);
     }
-    $this->Database->query('UPDATE Module SET Installed=1 WHERE Name="'.$this->Name.'"');
+    $this->Database->query('UPDATE SystemModule SET Installed=1 WHERE Name="'.$this->Name.'"');
   }
   
@@ -43 +44 @@
       unset($Model);
     }
-    $this->Database->query('UPDATE Module SET Installed=0 WHERE Name="'.$this->Name.'"');
+    $this->Database->query('UPDATE SystemModule SET Installed=0 WHERE Name="'.$this->Name.'"');
   }
   
@@ -69 +70 @@
   function Init($Installed = true)
   {
-    $Query = 'SELECT Name FROM `Module`';
+    $Query = 'SELECT `Id`, `Name` FROM `SystemModule`';
     if($Installed) $Query .= ' WHERE `Installed`=1';
       else $Query .= ' WHERE `Installed`=0';
@@ -78 +79 @@
       $ModuleClassName = 'Module'.$Module['Name'];
       $this->Modules[$Module['Name']] = new $ModuleClassName($this->Database, $this);
+      $this->Modules[$Module['Name']]->Id = $Module['Id'];
       $this->Modules[$Module['Name']]->Init();
     }     
@@ -85 +87 @@
   {
     //DebugLog('Installing modular system core...');
-    $this->Database->query('CREATE TABLE IF NOT EXISTS `Module` (
+    $this->Database->query('CREATE TABLE IF NOT EXISTS `SystemModule` (
   `Id` int(11) NOT NULL AUTO_INCREMENT,
   `Name` varchar(255) COLLATE utf8_czech_ci NOT NULL,
@@ -94 +96 @@
   `Description` text COLLATE utf8_czech_ci NOT NULL,
   `Dependecies` varchar(255) COLLATE utf8_czech_ci NOT NULL,
+  PRIMARY KEY (`Id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1;');
+    $this->Database->query('CREATE TABLE IF NOT EXISTS `SystemModel` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) COLLATE utf8_czech_ci NOT NULL,
+  `Module` int(11) NOT NULL,
+  KEY (`Module`),
+  PRIMARY KEY (`Id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1;');
+    $this->Database->query('CREATE TABLE IF NOT EXISTS `SystemModelProperty` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) COLLATE utf8_czech_ci NOT NULL,
+  `Type` varchar(255) COLLATE utf8_czech_ci NOT NULL,
+  `Model` int(11) NOT NULL,
+  KEY (`Model`),
   PRIMARY KEY (`Id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1;');
@@ -109 +126 @@
     foreach($this->Modules as $Index => $Module)
       $this->Modules[$Index]->UnInstall();
-    $this->Database->query('DROP TABLE IF EXISTS `Module`');
+    
+    // Delete tables with reverse order
+    $this->Database->query('DROP TABLE IF EXISTS `SystemModelProperty`');
+    $this->Database->query('DROP TABLE IF EXISTS `SystemModel`');
+    $this->Database->query('DROP TABLE IF EXISTS `SystemModule`');
   }
   
@@ -116 +137 @@
     // Load list of modules from database
     $Modules = array();
-    $DbResult = $this->Database->query('SELECT * FROM `Module`');
+    $DbResult = $this->Database->query('SELECT * FROM `SystemModule`');
     while($DbRow = $DbResult->fetch_assoc())
       $Modules[$DbRow['Name']] = $DbRow;
@@ -139 +160 @@
       {
         $Module = new $ModuleClassName($this->Database, $this); 
-        $this->Database->insert('Module', array('Name' => $Module->Name, 
+        $this->Database->insert('SystemModule', array('Name' => $Module->Name, 
           'Version' => $Module->Version, 'Creator' => $Module->Creator, 
           'Description' => $Module->Description, 'License' => $Module->License,
@@ -152 +173 @@
     {
       DebugLog('Removing module '.$Module['Name'].' from list');
-      $this->Database->query('DELETE FROM `Module` WHERE `Id` = '.$Module['Id']);
+      $this->Database->query('DELETE FROM `SystemModule` WHERE `Id` = '.$Module['Id']);
     }
   }