Changeset 361 for trunk

Timestamp:

Jan 18, 2012, 2:03:43 PM (13 years ago)

Author:

chronos

Message:

• Opraveno: Zobrazování některých stránek modulu sítě.

Location:

trunk/Modules/Network

Files:

• Network.php (modified) (3 diffs)
• NetworkInformation.php (moved) (moved from trunk/network.php ) (3 diffs)
• administration.php (modified) (4 diffs)
• dostupnost.php (modified) (2 diffs)
• hosting.php (modified) (2 diffs)
• restart.php (modified) (2 diffs)
• subnet.php (modified) (2 diffs)
• user_hosts.php (modified) (2 diffs)

trunk/Modules/Network/Network.php

@@ -1 +1 @@
 <?php
+
+include('dostupnost.php');
+include('administration.php');
+include('hosting.php');
+include('restart.php');
+include('subnet.php');
+include('user_hosts.php');
+include('NetworkInformation.php');
+
+class NetworkPage extends Page
+{
+var $FullTitle = 'Síť';
+  var $ShortTitle = 'Síť';
+  var $RowPerPage = 20;
+
+  function Show()
+  {
+    $PageClass = '';
+    if(count($this->System->PathItems) > 1)
+    { 
+      if($this->System->PathItems[1] == 'dostupnost') $PageClass = 'AvailabilityPage';
+        else if($this->System->PathItems[1] == 'hosting') $PageClass = 'HostingPage';
+        else if($this->System->PathItems[1] == 'sprava') $PageClass = 'NetworkAdministrationPage';
+        else if($this->System->PathItems[1] == 'restart-sluzeb') $PageClass = 'ServiceRestartPage';
+        else if($this->System->PathItems[1] == 'pocitace') $PageClass = 'HostListPage';
+        else if($this->System->PathItems[1] == 'podsite') $PageClass = 'SubnetPage';
+        else return(PAGE_NOT_FOUND);
+    } else $PageClass = 'NetworkInformationPage';
+    if($PageClass != '') 
+    {
+      $Page = new $PageClass();
+      $Page->Database = &$this->Database;
+      $Page->Config = &$this->Config;
+      $Page->System = &$this->System;
+      return($Page->Show());
+    }
+  }  
+}
 
 class NetworkPoint extends Model
@@ -123 +161 @@
     $this->License = 'GNU/GPL';
     $this->Description = 'Network device, interface and interconnection management';
-    $this->Dependencies = array('Member');
+    $this->Dependencies = array('User', 'Member');
     $this->Models = array('NetworkDevice', 'NetworkDeviceType', 'NetworkInterface',
       'NetworkInterfaceType', 'NetworkPoint', 'NetworkLink', 'NetworkSubnet');
@@ -130 +168 @@
   function Init()
   {
-    $this->System->Pages['tv'] = 'TVChannelsPage';
+    $this->System->Pages['sit'] = 'NetworkPage';
   }
   

trunk/Modules/Network/NetworkInformation.php

@@ -1 +1 @@
 <?php
-include_once('global.php');
 
 class NetworkInformationPage extends Page
@@ -71 +70 @@
       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="dostupnost/">Měření dostupnosti zařízení</a><br />';
+        $Output .= '<a href="podsite/">Výpis registrovaných podsítí</a><br />';
         //$Output .= '<a href="tkr.php">Kanály kabelové televize</a>';
     }
@@ -79 +78 @@
 }
 
-$System->AddModule(new NetworkInformationPage());
-$System->Modules['NetworkInformationPage']->GetOutput();
-
 ?>

trunk/Modules/Network/administration.php

@@ -1 +1 @@
 <?php
-include_once('../global.php');
 
 class NetworkAdministrationPage extends Page
@@ -9 +8 @@
   function Show()
   {
-    if(!$this->System->Models['User']->CheckPermission('Network', 'Administration')) return('Nemáte oprávnění');
+    if(!$this->System->Models['User']->CheckPermission('Network', 'Administration')) 
+      return('Nemáte oprávnění');
     $Output = '';
     if(array_key_exists('Action', $_GET))
@@ -37 +37 @@
       //'<a href="'.$this->System->Config['Web']['RootFolder'].'/statistic/bandwidth.php">Zatížení linky do internetu</a><br />'.
       //'<a href="'.$this->System->Config['Web']['RootFolder'].'/statistic/bandwidth_full.php">Zatížení linky do internetu všechny počítače</a><br />'.
-      '<a href="'.$this->System->Config['Web']['RootFolder'].'/network/dostupnost.php">Dostupnost sítě</a><br />'.
+      '<a href="'.$this->System->Config['Web']['RootFolder'].'/sit/dostupnost/">Dostupnost sítě</a><br />'.
       //'<a href="'.$this->System->Config['Web']['RootFolder'].'/is/wlan.php">Bezdrátové sítě v okolí</a><br />'.
-      '<a href="'.$this->System->Config['Web']['RootFolder'].'/network/restart.php">Ruční restart konfigurace sítě</a><br />'.
+      '<a href="'.$this->System->Config['Web']['RootFolder'].'/sit/restart-sluzeb/">Ruční restart konfigurace sítě</a><br />'.
       //'<a href="'.$this->System->Config['Web']['RootFolder'].'/backup/index.php">Nastavení zálohování</a><br />'.
-      '<a href="'.$this->System->Config['Web']['RootFolder'].'/LogShow.php">Záznamy operací</a><br />'.
+      '<a href="'.$this->System->Config['Web']['RootFolder'].'/log/">Záznamy operací</a><br />'.
       '<a href="?Action=SendEmail">Zaslat email</a><br />'.
       '<a href="?Action=ProcessEmailQueue">Zpracovat frontu emailů</a><br />';
@@ -51 +51 @@
 }
 
-$System->AddModule(new NetworkAdministrationPage());
-$System->Modules['NetworkAdministrationPage']->GetOutput();
-
 ?>

trunk/Modules/Network/dostupnost.php

@@ -1 +1 @@
 <?php
 
-include_once('../global.php');
-
-class Availability extends Page
+class AvailabilityPage 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('../global.php');
 
 class HostingPage extends Page
@@ -20 +19 @@
 }
 
-$System->AddModule(new HostingPage());
-$System->Modules['HostingPage']->GetOutput();
-
 ?>

trunk/Modules/Network/restart.php

@@ -1 +1 @@
 <?php
-include_once('../global.php');
 
 class ServiceRestartPage extends Page
@@ -61 +60 @@
 }
 
-$System->AddModule(new ServiceRestartPage());
-$System->Modules['ServiceRestartPage']->GetOutput();
-
 ?>

trunk/Modules/Network/subnet.php

@@ -1 +1 @@
 <?php
-include_once('../global.php');
 
-class HostingPage extends Page
+class SubnetPage extends Page
 {
   var $FullTitle = 'Informace o podsítích';
@@ -54 +53 @@
 }
 
-$System->AddModule(new HostingPage());
-$System->Modules['HostingPage']->GetOutput();
-
 ?>

trunk/Modules/Network/user_hosts.php

@@ -1 +1 @@
 <?php
-
-include_once('../global.php');
 
 class NetworkHostList extends Page
@@ -33 +31 @@
 }
 
-$System->AddModule(new NetworkHostList());
-$System->Modules['NetworkHostList']->GetOutput();
-
 ?>