Changeset 518

Timestamp:

Apr 14, 2013, 5:15:25 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Síťové informace přetvořeny na aplikační modul.

Location:

trunk

Files:

• Common/Global.php (modified) (3 diffs)
• Common/Page.php (modified) (1 diff)
• Modules/Network/Administration.php (copied) (copied from trunk/network/administration.php ) (2 diffs)
• Modules/Network/Availability.php (copied) (copied from trunk/network/dostupnost.php ) (2 diffs)
• Modules/Network/Hosting.php (copied) (copied from trunk/network/hosting.php ) (2 diffs)
• Modules/Network/Network.php (modified) (4 diffs)
• Modules/Network/Subnet.php (copied) (copied from trunk/network/subnet.php ) (2 diffs)
• Modules/Network/UserHosts.php (copied) (copied from trunk/network/user_hosts.php ) (2 diffs)
• Modules/Portal/Portal.php (modified) (1 diff)
• network (deleted)

trunk/Common/Global.php

@@ -56 +56 @@
   var $ModuleManager;
   var $PathItems;
+  var $RootURLFolder;
 
   function __construct()
@@ -153 +154 @@
   function Link($Target)
   {
-    global $Config;
-   
-    return($Config['Web']['RootFolder'].$Target);
+    return($this->RootURLFolder.$Target);
   }   
 }
@@ -182 +181 @@
   $System->Database->ShowSQLError = $Config['Web']['ShowSQLError'];
   $System->Database->ShowSQLQuery = $Config['Web']['ShowSQLQuery'];
+  $System->RootURLFolder = $Config['Web']['RootFolder'];
   
   // Check database persistence structure

trunk/Common/Page.php

@@ -188 +188 @@
     echo($Output);
   }
+  
+  function NewPage($ClassName)
+  {
+    $Page = new $ClassName();
+    $Page->System = $this->System;
+    $Page->Database = $this->Database;
+    return($Page);
+  }
 
   // Funkce formatovani vystupu

trunk/Modules/Network/Administration.php

@@ -1 +1 @@
 <?php
 
-include_once('../Common/Global.php');
-
-class NetworkAdministrationPage extends Page
+class PageNetworkAdministration extends Page
 {
-  var $FullTitle = 'Administrace sítě';
-  var $ShortTitle = 'Administrace sítě';
+  function __construct()
+  {
+    parent::__construct();
+    $this->FullTitle = 'Administrace sítě';
+    $this->ShortTitle = 'Administrace sítě';
+    $this->NavigationPath[] = array('Name' => $this->ShortTitle, 'URL' => 'sprava');     
+  }
 
   function Show()
@@ -43 +46 @@
 }
 
-$System->AddModule(new NetworkAdministrationPage());
-$System->Modules['NetworkAdministrationPage']->GetOutput();
-
 ?>

trunk/Modules/Network/Availability.php

@@ -1 +1 @@
 <?php
 
-include_once('../Common/Global.php');
-
-class Availability extends Page
+class PageAvailability extends Page
 {
   var $FullTitle = 'Dostupnost aktivních prvků sítě';
@@ -113 +111 @@
 }
 
-$System->AddModule(new Availability());
-$System->Modules['Availability']->GetOutput();
-
 ?>

trunk/Modules/Network/Hosting.php

@@ -1 +1 @@
 <?php
 
-include_once('../Common/Global.php');
-
-class HostingPage extends Page
+class PageHosting extends Page
 {
   var $FullTitle = 'Hostované projekty';
@@ -21 +19 @@
 }
 
-$System->AddModule(new HostingPage());
-$System->Modules['HostingPage']->GetOutput();
-
 ?>

trunk/Modules/Network/Network.php

@@ -1 +1 @@
 <?php
 
-include_once('HostList.php');
+include_once(dirname(__FILE__).'/HostList.php');
+include_once(dirname(__FILE__).'/Administration.php');
+include_once(dirname(__FILE__).'/Availability.php');
+include_once(dirname(__FILE__).'/Subnet.php');
+include_once(dirname(__FILE__).'/Hosting.php');
+include_once(dirname(__FILE__).'/UserHosts.php');
 
-class PageNetworkInformation extends Page
+class PageNetwork extends Page
 {
   var $FullTitle = 'Technické informace o síti';
@@ -9 +14 @@
 
   function Show()
+  {
+    if(count($this->System->PathItems) > 1)
+    {
+      if($this->System->PathItems[1] == 'administration') $Output = $this->NewPage('PageNetworkAdministration')->Show();
+      else if($this->System->PathItems[1] == 'availability') $Output = $this->NewPage('PageAvailability')->Show();
+      else if($this->System->PathItems[1] == 'subnet') $Output = $this->NewPage('PageSubnet')->Show();
+      else if($this->System->PathItems[1] == 'user_hosts') $Output = $this->NewPage('PageNetworkHostList')->Show();
+      else if($this->System->PathItems[1] == 'hosting') $Output = $this->NewPage('PageHosting')->Show();
+      else if($this->System->PathItems[1] == 'hosts') $Output = $this->NewPage('PageHostList')->Show();
+      else $Output = $this->ShowInformation();
+    } else $Output = $this->ShowInformation();
+    return($Output);  
+  }
+  
+  function ShowInformation()
   {
     $Output = '';
@@ -72 +92 @@
       default: 
         $Output .= '<a href="?section=obsazeni_wifi_kanalu">Obsazení Wi-Fi kanálů</a><br />';
-        $Output .= '<a href="network/dostupnost.php">Měření dostupnosti zařízení</a><br />';
-        $Output .= '<a href="network/subnet.php">Výpis registrovaných podsítí</a><br />';
+        $Output .= '<a href="'.$this->System->Link('/network/availability/').'">Měření dostupnosti zařízení</a><br />';
+        $Output .= '<a href="'.$this->System->Link('/network/subnet/').'">Výpis registrovaných podsítí</a><br />';
         //$Output .= '<a href="tkr.php">Kanály kabelové televize</a>';
     }
@@ -104 +124 @@
   {
     parent::Start();
-    $this->System->RegisterPage('hostlist.php', 'PageHostList');
-    $this->System->RegisterPage('network.php', 'PageNetworkInformation');    
+    $this->System->RegisterPage('network', 'PageNetwork');    
   }  
   

trunk/Modules/Network/Subnet.php

@@ -1 +1 @@
 <?php
 
-include_once('../Common/Global.php');
-
-class HostingPage extends Page
+class PageSubnet extends Page
 {
-  var $FullTitle = 'Informace o podsítích';
-  var $ShortTitle = 'Podsítě';
+  function __construct()
+  {
+    parent::__construct();
+    $this->FullTitle = 'Informace o podsítích';
+    $this->ShortTitle = 'Podsítě';
+  }
 
   function Show()
@@ -55 +57 @@
 }
 
-$System->AddModule(new HostingPage());
-$System->Modules['HostingPage']->GetOutput();
-
 ?>

trunk/Modules/Network/UserHosts.php

@@ -1 +1 @@
 <?php
 
-include_once('../Common/Global.php');
-
-class NetworkHostList extends Page
+class PageNetworkHostList extends Page
 {
-  var $FullTitle = 'Registrované počítače';
-  var $ShortTitle = 'Registrované počítače';
+  function __construct()
+  {
+    parent::__construct();
+    $this->FullTitle = 'Registrované počítače';
+    $this->ShortTitle = 'Registrované počítače';
+  }
 
   function Show()
@@ -36 +38 @@
 }
 
-$System->AddModule(new NetworkHostList());
-$System->Modules['NetworkHostList']->GetOutput();
-
 ?>

trunk/Modules/Portal/Portal.php

@@ -71 +71 @@
   function UserPanel()
   {
-    $Output = '<a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=UserOptions">Profil</a><br />';
+    $Output = '<a href="'.$this->System->Link('/?Action=UserOptions').'">Profil</a><br />';
     if($this->System->Modules['User']->CheckPermission('Finance', 'MemberOptions')) 
-      $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'?Action=MemberOptions">Domácnost</a><br />';
+      $Output .= '<a href="'.$this->System->Link('/?Action=MemberOptions').'">Domácnost</a><br />';
     if($this->System->Modules['User']->CheckPermission('Finance', 'DisplaySubjectState')) 
-      $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/finance/user_state.php">Finance</a><br />';
+      $Output .= '<a href="'.$this->System->Link('/finance/user_state.php').'">Finance</a><br />';
     if($this->System->Modules['User']->CheckPermission('Network', 'RegistredHostList')) 
-      $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/network/user_hosts.php">Počítače</a><br />';
+      $Output .= '<a href="'.$this->System->Link('/network/user_hosts/').'">Počítače</a><br />';
     if($this->System->Modules['User']->CheckPermission('News', 'Insert')) 
-      $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/aktuality/?action=add">Vložení aktuality</a><br />';
+      $Output .= '<a href="'.$this->System->Link('/aktuality/?action=add').'">Vložení aktuality</a><br />';
     if($this->System->Modules['User']->CheckPermission('EatingPlace', 'Edit'))
-      $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/jidelna/menuedit.php">Editace jídelníčků</a><br />';
+      $Output .= '<a href="'.$this->System->Link('/jidelna/menuedit.php').'">Úprava jídelníčků</a><br />';
     if($this->System->Modules['User']->CheckPermission('Finance', 'Manage'))
-      $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/finance/manage.php">Správa financí</a><br />';
+      $Output .= '<a href="'.$this->System->Link('/finance/manage.php').'">Správa financí</a><br />';
     if($this->System->Modules['User']->CheckPermission('Network', 'Administration'))
-      $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/network/administration.php">Správa sítě</a><br />';
+      $Output .= '<a href="'.$this->System->Link('/network/administration/').'">Správa sítě</a><br />';
     if($this->System->Modules['User']->CheckPermission('IS', 'Manage'))
       $Output .= '<a href="'.$this->System->Link('/is/').'">Správa dat</a><br />';