Changeset 341 for trunk

Timestamp:

Jan 17, 2012, 8:40:51 AM (13 years ago)

Author:

chronos

Message:

• Přesunuto: Jednotky code a error.
• Přidáno: Třída ModularSystem pro správu modulů systému.
• Přidáno: Synchronizace seznamu modulů na disku a v databázi.

Location:

trunk

Files:

• Common (added)
• Common/Code.php (added)
• Common/Error.php (added)
• Model.php (added)
• Modules/Module.php (modified) (2 diffs)
• Modules/Project/Project.php (modified) (3 diffs)
• Modules/User/user.php (modified) (1 diff)
• code.php (deleted)
• error.php (deleted)
• global.php (modified) (4 diffs)
• sql/.htaccess (added)

trunk/Modules/Module.php

@@ -1 +1 @@
 <?php
+
+include_once(dirname(__FILE__).'/../Model.php');
 
 class Module
@@ -9 +11 @@
   var $Description;
   var $Dependencies;
+  var $Models;
+  var $Database;
+  var $Installed;
+  
+  function __construct($Database)
+  {
+    $this->Database = &$Database;    
+  }
   
   function Install()
-  {  
+  {
+    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);
+    }
+    unset($Model);
   }
   
   function UnInstall()
   {
+    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.'`');
+      unset($Model);
+    }
+  }
+}
+
+class ModularSystem
+{
+  var $Database;
+  var $Modules = array();
+  
+  function __construct($Database)
+  {
+    $this->Database = &$Database;
+    $DbResult = $this->Database->query('SELECT * FROM Module WHERE Installed=1');
+    while($Module = $DbResult->fetch_array())
+    {
+      include_once('Modules/'.$File.'/'.$File.'.php');
+      $this->Modules[] = new $Module['Name']($this->Database);
+    }
+  }
+  
+  function Install()
+  {
+    DebugLog('Installing modular system core...');
+    $this->Database->query('CREATE TABLE IF NOT EXISTS `Module` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) COLLATE utf8_czech_ci NOT NULL,
+  `Creator` varchar(255) COLLATE utf8_czech_ci NOT NULL,
+  `Version` varchar(255) COLLATE utf8_czech_ci NOT NULL,
+  `License` varchar(255) COLLATE utf8_czech_ci NOT NULL,
+  `Installed` int(11) NOT NULL,
+  PRIMARY KEY (`Id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
+    foreach($this->Modules as $Module)
+    {
+      $Module->Install();
+    }
+  }
+  
+  function UnInstall()
+  {
+    DebugLog('Uninstalling modular system core...');
+    foreach($this->Modules as $Module)
+      $Module->UnInstall();
+    $this->Database->query('DROP TABLE IF EXISTS `Module`');
+  }
+  
+  function ReloadList()
+  {
+    // Load list of modules from database
+    $Modules = array();
+    $DbResult = $this->Database->query('SELECT * FROM Module');
+    while($DbRow = $DbResult->fetch_assoc())
+      $Modules[$DbRow['Name']] = $DbRow;
+    
+    // Load list of modules on disk
+    $ModulesOnDisk = array();
+    $Files = scandir('Modules'); 
+    foreach($Files as $File)
+    if(is_dir('Modules/'.$File) and ($File != '.') and ($File != '..'))
+    {
+      DebugLog($File.',');        
+      $ModulesOnDisk[] = $File;
+    }   
+
+    // Add new 
+    foreach($ModulesOnDisk as $ModuleName)
+    if(!array_key_exists($ModuleName, $Modules))
+    {
+      DebugLog('Adding module '.$ModuleName.' to list');
+      include_once('Modules/'.$ModuleName.'/'.$ModuleName.'.php');
+      $ModuleClassName = 'Module'.$ModuleName;
+      if(class_exists($ModuleClassName))
+      {
+        $Module = new $ModuleClassName($this->Database);       
+        $this->Database->insert('Module', array('Name' => $Module->Name, 
+          'Version' => $Module->Version, 'Creator' => $Module->Creator, 
+          'Description' => $Module->Description, 'License' => $Module->License,
+          'Installed' => 0));
+        unset($Module);
+      } else throw new Exception('Missing class '.$ModuleClassName.' in module '.$ModuleName);
+    }
+    
+    // Remove missing
+    foreach($Modules as $Module)
+    if($Module['Installed'] == 0)
+    {
+      DebugLog('Removing module '.$ModuleName.' from list');
+      $this->Database->query('DELETE FROM Module WHERE Id = '.$Module['Id']);
+    }
   }
 }

trunk/Modules/Project/Project.php

@@ -2 +2 @@
 
 include_once(dirname(__FILE__).'/../Module.php');
+include_once(dirname(__FILE__).'/../../Model.php');
 
-class Project extends Module
+class Project extends Model
+{
+  function __construct($Database)
+  {
+    parent::__construct($Database);
+    $this->Name = 'Project';
+    $this->AddPropertyDateTime('TimeSchedule');
+    $this->AddPropertyOneToMany('UserAssignedTo', 'User');
+    $this->AddPropertyManyToOne('Comments', 'ProjectComment', 'Project');
+    $this->AddPropertyText('Description');
+  }
+}
+
+class ProjectComment extends Model
 {
   function __construct()
   {
+    parent::__construct();
+    $this->Name = 'ProjectComment';
+    $this->AddPropertyOneToMany('Project', 'Project');
+    $this->AddPropertyText('Text');      
+  }
+}
+
+class ModuleProject extends Module
+{
+  function __construct($Database)
+  {
+    parent::__construct($Database);
     $this->Name = 'Project';
     $this->Version = '1.0';
@@ -13 +39 @@
     $this->Description = 'Project and task management';
     $this->Dependencies = array('User');
+    $this->Models = array('Project', 'ProjectComment');
   }
   
   function Install()
   {
-     $Query = 'CREATE TABLE IF NOT EXISTS `Project` (
-  `Id` int(11) NOT NULL AUTO_INCREMENT,
-  `Name` varchar(255) COLLATE utf8_czech_ci NOT NULL,
-  `TimeCreate` datetime NOT NULL,
-  `UserCreate` int(11) NOT NULL,
-  `Description` text COLLATE utf8_czech_ci NOT NULL,
-  `UserAssignedTo` int(11) DEFAULT NULL,
-  `TimeSchedule` datetime DEFAULT NULL,
-  PRIMARY KEY (`Id`),
-  KEY `UserCreate` (`UserCreate`),
-  KEY `UserAssignedTo` (`UserAssignedTo`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;
-
-CREATE TABLE IF NOT EXISTS `ProjectComment` (
-  `Id` int(11) NOT NULL AUTO_INCREMENT,
-  `Project` int(11) NOT NULL,
-  `Text` text COLLATE utf8_czech_ci NOT NULL,
-  `TimeCreate` datetime NOT NULL,
-  `UserCreate` int(11) NOT NULL,
-  PRIMARY KEY (`Id`),
-  KEY `Project` (`Project`),
-  KEY `UserCreate` (`UserCreate`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;';          
   }
   
@@ -50 +54 @@
 }
 
+
 ?>

trunk/Modules/User/user.php

@@ -266 +266 @@
 }
 
+class ModuleUser extends Module
+{
+  function __construct($Database)
+  {
+    parent::__construct($Database);
+    $this->Name = 'User';
+    $this->Version = '1.0';
+    $this->Creator = 'Chronos';
+    $this->License = 'GNU/GPL';
+    $this->Description = 'User management';
+    $this->Dependencies = array();
+    //$this->Models = array('User', 'UserOnline');
+  }
+}
+
+
 ?>

trunk/global.php

@@ -7 +7 @@
   
 include_once('database.php');
-//include('error.php');
-include_once('code.php');
+include_once('Common/Error.php');
+include_once('Common/Code.php');
 include_once('module.php');
 include_once('forms.php');
@@ -19 +19 @@
 include_once('finance/finance.php');
 include_once('Modules/Module.php');
+include_once('Model.php');
 include_once('Modules/User/user.php');
 include_once('Modules/Project/Project.php');
@@ -221 +222 @@
   $System->AddModule(new Bill());
   $System->AddModule(new Finance());
-  $System->Modules['Finance']->LoadMonthParameters(0);
+  $System->Modules['Finance']->LoadMonthParameters(0); 
+  
+  $System->ModularSystem = new ModularSystem($Database);
+  $System->ModularSystem->ReloadList();
 }
 
@@ -521 +525 @@
 } 
 
+function DebugLog($Text)
+{
+  global $Config;
+  
+  if($Config['Web']['ShowDebug']) 
+  {
+    if(isset($_SERVER['REMOTE_ADDR'])) $Ending = '<br/>'."\n";
+      else $Ending = "\n";
+      echo($Text.$Ending);
+  }
+}
+
 GlobalInit();