Changeset 403 for branches

Timestamp:

Jun 11, 2012, 10:08:38 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Instalace a odinstalace základních modulů v opačném pořadí.

Location:

branches/Modular

Files:

• Common/Model.php (modified) (4 diffs)
• Common/Module.php (modified) (3 diffs)
• FileDownload.php (modified) (1 diff)
• Modules/Hosting (added)
• Modules/Hosting/Hosting.php (added)
• Modules/System/System.php (modified) (1 diff)

branches/Modular/Common/Model.php

@@ -41 +41 @@
     $this->AddPropertyOneToMany('ItemOwnerModule', 'SystemModule', true);
     $this->AddPropertyDateTime('ItemTimeCreate', true);
-    $this->AddPropertyOneToMany('ItemUserCreate', 'User', true);
+    //$this->AddPropertyOneToMany('ItemUserCreate', 'User', true);
     $this->AddPropertyDateTime('ItemTimeModify', true);
-    $this->AddPropertyOneToMany('ItemUserModify', 'User', true);   
+    //$this->AddPropertyOneToMany('ItemUserModify', 'User', true);   
   }
   
@@ -169 +169 @@
   function Install()
   {
+    DebugLog('Installing model '.$this->Name.'...');
     if($this->Installed) return;
     $this->Installed = true;
@@ -243 +244 @@
   function UnInstall()
   {
+    DebugLog('Uninstalling model '.$this->Name.'...');
     foreach($this->Properties as $Property)
     {
@@ -251 +253 @@
         $this->Database->query('ALTER TABLE `'.$this->Name.'` DROP FOREIGN KEY `'.
           $this->Name.'_ibfk_'.$Property['Name'].'`');
-      echo('ss');
       }
     }
-    //$this->Database->query('DROP TABLE IF EXISTS `'.$this->Name.'`');
+    $this->Database->query('DROP TABLE IF EXISTS `'.$this->Name.'`');
     $this->Installed = false;
   }

branches/Modular/Common/Module.php

@@ -45 +45 @@
   {
     DebugLog('Uninstalling module '.$this->Name.'...');
-    foreach($this->Models as $Index => $Model)
+    $this->LoadModels();
+    foreach(array_reverse($this->Models, true) as $Index => $Model)
     {
       $this->Models[$Index]->UnInstall();
@@ -170 +171 @@
     $this->ReloadList();
     $this->LoadModules(false);
-    $this->Modules['System']->Install();
-    //foreach($this->Modules as $Index => $Module)
-    //{      
-    //  $this->Modules[$Index]->Install();
-    //}
+    //$this->Modules['System']->Install();
+    foreach($this->Modules as $Index => $Module)
+    {      
+      $this->Modules[$Index]->Install();
+    }
   }
   
@@ -180 +181 @@
   {
     DebugLog('Uninstalling modular system core...');
-    foreach($this->Modules as $Index => $Module)
+    foreach(array_reverse($this->Modules, true) as $Index => $Module)
       $this->Modules[$Index]->UnInstall();
     

branches/Modular/FileDownload.php

@@ -1 +1 @@
 <?php
 
-include('global.php');
+include('Common/Global.php');
 if(array_key_exists('Id', $_GET))
 {

branches/Modular/Modules/System/System.php

@@ -45 +45 @@
     $this->Description = 'Base system module';
     $this->Dependencies = array('User');
-    $this->SupportedModels = array('SystemMenu', 'SystemView', 'SystemAction');
+    $this->SupportedModels = array('SystemView', 'SystemAction', 'SystemMenu');
   }