Changeset 469 for trunk/Common

Timestamp:

Dec 30, 2012, 9:13:55 PM (13 years ago)

Author:

chronos

Message:

• Upraveno: Hlavní stránka přetvořena jako aplikační modul.

Location:

trunk/Common

Files:

• AppModule.php (modified) (2 diffs)
• Error.php (modified) (1 diff)
• Global.php (modified) (5 diffs)

trunk/Common/AppModule.php

@@ -18 +18 @@
   /** @var ModularSystem */
   var $Manager;
+  var $OnChange;
   
-  function __construct($Database, $System)
+  function __construct($System)
   {
     $this->System = &$System;
-    $this->Database = &$Database;
+    $this->Database = &$System->Database;
   }
   
@@ -39 +40 @@
   function Stop()
   {
+  } 
+}
+
+class AppModuleManager 
+{
+  var $Modules;
+  
+  function __construct()
+  {
+    $this->Modules = array();      
   }
   
+  function StartAll()
+  {
+    foreach($this->Modules as $Index => $Module)
+    {
+      //DebugLog('Init module '.$Module->Name);
+      $this->Modules[$Index]->Start();
+    }
+  }
+
+  function StopAll()
+  {
+    foreach($this->Modules as $Index => $Module)
+    {
+      //DebugLog('Init module '.$Module->Name);
+      $this->Modules[$Index]->Stop();
+    }
+  }
+  
+  function ModulePresent($Name)
+  {
+    return(array_key_exists($Name, $this->Modules));
+  }
+  
+  function RegisterModule(AppModule $Module)
+  {
+    $this->Modules[$Module->Name] = &$Module;  
+    $Module->Manager = &$this;
+    $Module->OnChange = &$this->OnModuleChange;
+  }
+  
+  function UnregisterModule($Module)
+  {
+    unset($this->Modules[array_search($Module, $this->Modules)]);  
+  }
 }
 

trunk/Common/Error.php

@@ -57 +57 @@
         foreach($Item['args'] as $Item)
         {
-          if(is_array($Item)) $Arguments .= "'".serialize($Item)."',";
+          if(is_array($Item) || is_object($Item)) $Arguments .= "'".serialize($Item)."',";
           else $Arguments .= "'".$Item."',";
         }

trunk/Common/Global.php

@@ -2 +2 @@
 
 $ConfigFileName = dirname(__FILE__).'/../config.php';
+/* @var $System System */
+$System = NULL;
+/* @var $Database Database */
+$Database = NULL;
       
 if(file_exists($ConfigFileName)) include_once($ConfigFileName);
@@ -23 +27 @@
   
 include_once(dirname(__FILE__).'/../Modules/Meteostation/Meteostation.php');
+include_once(dirname(__FILE__).'/../Modules/Portal/Portal.php');
 
 $PrefixMultipliers = array
@@ -95 +100 @@
 class System extends Module
 {
-  var $Modules = array(); 
+  var $Modules; 
   /** @var Type */
   var $Type;
+  var $Pages;
+  /** @var AppModuleManager */
+  var $ModuleManager;
 
   function __construct()
   {
     parent::__construct();
+    $this->Modules = array();
     $this->Type = new Type($this);
+    $this->Pages = array();
+    $this->ModuleManager = new AppModuleManager();
+  }  
+  
+  function RegisterPage($Path, $Handler)
+  {
+    $this->Pages[$Path] = $Handler;
+  }
+  
+  function ShowPage($Path)
+  {
+    /* @var $Page Page */
+    $ClassName = $this->Pages[$Path];
+    $Page = new $ClassName();
+    $Page->System = &$this;
+    $Page->Database = &$this->Database;
+    $Page->GetOutput();
   }
   
@@ -209 +235 @@
    
     return($Config['Web']['RootFolder'].$Target);
-  } 
+  }   
 }
 
@@ -243 +269 @@
   $System->AddModule(new Finance());
   $System->Modules['Finance']->LoadMonthParameters(0);
+  
+  // Register new modules
+  $System->ModuleManager->RegisterModule(new Meteostation($System));
+  $System->ModuleManager->RegisterModule(new Portal($System));
+  $System->ModuleManager->StartAll();
 }