Changeset 525

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

Files:

• Common/Global.php (modified) (4 diffs)
• Common/Page.php (modified) (2 diffs)
• Common/System.php (added)
• Modules/Chat/Chat.php (modified) (1 diff)
• Modules/Network/Administration.php (modified) (1 diff)
• Modules/Network/Subnet.php (modified) (1 diff)
• Modules/News/NewsPage.php (modified) (3 diffs)
• Modules/System/System.php (modified) (1 diff)

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;

trunk/Modules/Chat/Chat.php

@@ -3 +3 @@
 class PageChatHistory extends Page
 {
-  function __construct()
+  function __construct($System)
   {
-    parent::__construct();
+    parent::__construct($System);
     $this->FullTitle = 'Výpis z historie chatu';
     $this->ShortTitle = 'Historie chatu';

trunk/Modules/Network/Administration.php

@@ -3 +3 @@
 class PageNetworkAdministration extends Page
 {
-  function __construct()
+  function __construct($System)
   {
-    parent::__construct();
+    parent::__construct($System);
     $this->FullTitle = 'Administrace sítě';
     $this->ShortTitle = 'Administrace sítě';

trunk/Modules/Network/Subnet.php

@@ -3 +3 @@
 class PageSubnet extends Page
 {
-  function __construct()
+  function __construct($System)
   {
-    parent::__construct();
+    parent::__construct($System);
     $this->FullTitle = 'Informace o podsítích';
     $this->ShortTitle = 'Podsítě';

trunk/Modules/News/NewsPage.php

@@ -163 +163 @@
         $DbResult = $this->Database->query('SELECT * FROM News WHERE Id='.$_GET['id']);
         $Row = $DbResult->fetch_array();
-        if($this->System->Modules['User']->User['Id'] == $Row['User'])
+        if($this->System->User->User['Id'] == $Row['User'])
         {
           if($Row['Enclosure'] != '')
@@ -179 +179 @@
         break;
       default:
-        if($this->System->Modules['User']->CheckPermission('News', 'Display', 'Group', $Category))
+        if($this->System->User->CheckPermission('News', 'Display', 'Group', $Category))
         {
           $PerPage = 20;
@@ -197 +197 @@
               else $Author = $Row['Name'];
             $Output .= '<div class="Panel"><div class="Title"><a href="?action=view&amp;id='.$Row['Id'].'">'.$Row['Title'].'</a> ('.HumanDate($Row['Date']).', '.$Author.')';
-            if($this->System->Modules['User']->User['Id'] == $Row['User'])
+            if($this->System->User->User['Id'] == $Row['User'])
             {
               $Output .= '<div class="Action">';

trunk/Modules/System/System.php

@@ -3 +3 @@
 class PageModules extends Page
 { 
-  function __construct()
-  {
-    parent::__construct();
+  function __construct($System)
+  {
+    parent::__construct($System);
     $this->FullTitle = 'Správa modulů';
     $this->ShortTitle = 'Moduly';