Changeset 404 for branches

Timestamp:

Jun 12, 2012, 6:41:12 PM (13 years ago)

Author:

chronos

Message:

• Opraveno: Odinstalování nyní respektuje závislé moduly, které odinstaluje dříve než samotný modul.
• Přidáno: Modul system obsahuje rozhraní pro zobrazení seznamu modulů.

Location:

branches/Modular

Files:

• .htaccess (modified) (1 diff)
• Common/Module.php (modified) (5 diffs)
• Common/Page.php (modified) (1 diff)
• Common/TableHeader.php (modified) (1 diff)
• Common/ViewList.php (modified) (1 diff)
• Modules/System/System.php (modified) (4 diffs)

branches/Modular/.htaccess

@@ -11 +11 @@
 RewriteCond  %{REQUEST_FILENAME}  !-f
 RewriteCond  %{REQUEST_FILENAME}  !-d
-RewriteRule   ^(.*)$ centrala/index.php?$1
-#RewriteRule   ^(.*)$ index.php?$1
+#RewriteRule   ^(.*)$ centrala/index.php?$1
+RewriteRule   ^(.*)$ dev/centrala/branches/Modular/index.php?$1
 
 # Pretty urls 

branches/Modular/Common/Module.php

@@ -32 +32 @@
     DebugLog('Installing module '.$this->Name.'...');
     $this->Installed = true;
+
+    // Install dependencies first
     foreach($this->Dependencies as $Dependency)  
       $this->System->Modules[$Dependency]->Install();
+
     $this->LoadModels();
     foreach($this->Models as $Index => $Module)
@@ -45 +48 @@
   {
     DebugLog('Uninstalling module '.$this->Name.'...');
+    $this->Installed = false;
+    
+    // Remove dependent modules first
+    foreach($this->System->Modules as $Module)  
+      foreach($Module->Dependencies as $Dependency)
+        if(($Dependency == $this->Name) and ($Module->Installed)) $this->System->Modules[$Module->Name]->UnInstall();
+        
     $this->LoadModels();
     foreach(array_reverse($this->Models, true) as $Index => $Model)
@@ -51 +61 @@
     }
     $this->Database->query('UPDATE SystemModule SET Installed=0 WHERE Name="'.$this->Name.'"');
-    $this->Installed = false;
   }
   
@@ -115 +124 @@
     $this->LoadModules();
     foreach($this->Modules as $Index => $Module)
+    {
+      //DebugLog('Init module '.$Module->Name);
       $this->Modules[$Index]->Init();
+    }
   }
   
@@ -171 +183 @@
     $this->ReloadList();
     $this->LoadModules(false);
-    //$this->Modules['System']->Install();
-    foreach($this->Modules as $Index => $Module)
+    $this->Modules['System']->Install();
+    /*foreach($this->Modules as $Index => $Module)
     {      
       $this->Modules[$Index]->Install();
-    }
+    }*/
   }
   

branches/Modular/Common/Page.php

@@ -55 +55 @@
     <div id="Title">'.$Title.'</div>
     <div class="Navigation"><span class="MenuItem"><strong>Navigace :: </strong> '.$Navigation.'</span><div class="MenuItem2">';
-    if($this->System->Config['Web']['UserSupport'] == 1)
+    if(array_key_exists('User', $this->System->Modules))
     {
       if($this->System->Modules['User']->Models['User']->User['Id'] == $this->System->Modules['User']->Models['User']->AnonymousUserId)

branches/Modular/Common/TableHeader.php

@@ -92 +92 @@
       {
         $this->QueryItems->Data['OrderDir'] = 1 - $OrderDir;
-        $ArrowImage = '<img style="vertical-align: middle; border: 0px;" src="'.$this->System->RootFolder.'/Style/'.$this->System->Style.'/Images/'.$this->OrderArrowImage[$OrderDir].'" alt="order arrow">';
+        $ArrowImage = '<img style="vertical-align: middle; border: 0px;" src="'.$this->System->RootFolder.'/style/'.$this->System->Style.'/images/'.$this->OrderArrowImage[$OrderDir].'" alt="order arrow">';
       } else
       {

branches/Modular/Common/ViewList.php

@@ -131 +131 @@
   }   
 
+  function AddItemBoolean($Name, $Title)
+  {
+    $this->Columns[$Name] = array('Name' => $Name, 'Title' => $Title, 
+      'Type' => ViewItemTypeBoolean, 'SQL' => $Name);
+  }   
+
   function AddItemDateTime($Name, $Title)
   {

branches/Modular/Modules/System/System.php

@@ -1 +1 @@
 <?php
+
+class PageModules extends Page
+{ 
+  function __construct()
+  {
+    parent::__construct();
+    $this->FullTitle = 'Správa modulů';
+    $this->ShortTitle = 'Moduly';
+  }
+  
+  function Show()
+  {
+    $View = new ViewModules($this->System);
+    $View->LoadFromDatabase();
+    return($View->Show());
+  }
+}
+  
+class ViewModules extends ViewList
+{
+  function __construct($System)
+  {
+    parent::__construct($System);
+    $this->Name = 'SystemModule';
+    $this->AddItemString('Name', 'Jméno');
+    $this->AddItemString('Creator', 'Tvůrce');
+    $this->AddItemString('Version', 'Verze');
+    $this->AddItemString('License', 'Licence');
+    $this->AddItemBoolean('Installed', 'Instalováno');
+    $this->AddItemText('Description', 'Popis');
+  }
+}
 
 class SystemView extends Model
@@ -34 +66 @@
 }
 
+class SystemModule extends Model
+{
+  function __construct($Database, $System)
+  {
+    parent::__construct($Database, $System);
+    $this->Name = 'SystemModule';
+    $this->AddPropertyString('Name');
+    $this->AddPropertyString('Creator');
+    $this->AddPropertyString('Version');
+    $this->AddPropertyString('License');
+    $this->AddPropertyBoolean('Installed');
+    $this->AddPropertyText('Description');
+  }
+
+  function Install()
+  {
+    // Do nothing, already installed by ModuleManager
+  }
+  
+  function UnInstall()
+  {
+    // Do nothing, managed by ModuleManager
+  }  
+}
+
 class ModuleSystem extends Module
 {
@@ -44 +101 @@
     $this->License = 'GNU/GPL';
     $this->Description = 'Base system module';
-    $this->Dependencies = array('User');
-    $this->SupportedModels = array('SystemView', 'SystemAction', 'SystemMenu');
+    $this->Dependencies = array();
+    $this->SupportedModels = array('SystemView', 'SystemAction', 'SystemMenu', 
+      'SystemModule');
   }
   
@@ -60 +118 @@
   function Init()
   {
+    $this->System->Pages['modules'] = 'PageModules';
   }
 }