Changeset 525 for trunk/Common

Timestamp:

Apr 20, 2013, 11:47:25 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Třída Page dědí Module a tedy v konstruktoru očekává odkaz na System.

Location:

trunk/Common

Files:

• Global.php (modified) (4 diffs)
• Page.php (modified) (2 diffs)
• System.php (added)

trunk/Common/Global.php

@@ -22 +22 @@
  
 // Application modules
+// TODO: Should be configurable
 include_once(dirname(__FILE__).'/../Modules/System/System.php');
 include_once(dirname(__FILE__).'/../Modules/Error/Error.php');
@@ -63 +64 @@
 
   $System = new System();
+  // TODO: unset general global variable $Config after setting is loaded to objects 
   $System->Config = &$Config;
   $System->Database->Connect($Config['Database']['Host'], $Config['Database']['User'], $Config['Database']['Password'], $Config['Database']['Database']);
@@ -82 +84 @@
   
   // Register new modules
+  // TODO: Should be configurable
   $System->ModuleManager->RegisterModule(new ModuleError($System));
   $System->ModuleManager->RegisterModule(new ModuleSystem($System));
   $System->ModuleManager->RegisterModule(new ModuleLog($System));
   $System->ModuleManager->RegisterModule(new ModuleFile($System));
+  $System->ModuleManager->RegisterModule(new ModuleUser($System));
   $System->ModuleManager->RegisterModule(new ModuleMeteostation($System));
   $System->ModuleManager->RegisterModule(new ModulePortal($System));
@@ -95 +99 @@
   $System->ModuleManager->RegisterModule(new ModuleChat($System));
   $System->ModuleManager->RegisterModule(new ModuleWebCam($System));
-  $System->ModuleManager->RegisterModule(new ModuleUser($System));
   $System->ModuleManager->RegisterModule(new ModuleFinance($System));
   $System->ModuleManager->RegisterModule(new ModuleFinanceBankAPI($System));

trunk/Common/Page.php

@@ -13 +13 @@
   var $FullTitle;
   
-  function __construct()
+  function __construct($System)
   {
     global $Config;
+    
+    parent::__construct($System);
     
     $this->FormatHTML = $Config['Web']['FormatHTML'];
@@ -46 +48 @@
       {
         $PageClass = $Page->ParentClass;
-        $Page = new $PageClass();
+        $Page = new $PageClass($this->System);
         $ScriptName = substr($ScriptName, 0, strrpos($ScriptName, '/'));
       } else $Page = null;