Changeset 731 for trunk/Modules/Network/Network.php

Timestamp:

Jan 17, 2015, 9:24:47 PM (10 years ago)

Author:

chronos

Message:

• Added: NetworkDomain table for managing multiple network domains. It is not completed and linked to real functionality yet.
• Added: ModuleLinks and Model tables as preparation for better modules and models in-database representation.

File:

• trunk/Modules/Network/Network.php (modified) (4 diffs)

trunk/Modules/Network/Network.php

@@ -15 +15 @@
   function Show()
   {
-        // http://en.wikipedia.org/wiki/List_of_WLAN_channels
-        //$ChannelList = array(2412 => 1, 2417 => 2, 2422 => 3, 2427 => 4, 2432 => 5, 2437 => 6, 2442 => 7, 2447 => 8, 2452 => 9, 2457 => 10, 2462 => 11, 2467 => 12, 2472 => 13, 5200 => 40, 5205 => 41, 5210 => 42, 5215 => 43, 5220 => 44, 5225 => 45, 5230 => 46, 5235 => 47, 5240 => 48, 5245 => 49, 5250 => 50, 5255 => 51, 5260 => 52, 5265 => 53, 5270 => 54, 5275 => 55, 5280 => 56, 5285 => 57, 5290 => 58, 5295 => 59, 5300 => 60, 5500 => 100, 5520 => 104, 5540 => 108, 5560 => 112, 5580 => 116, 5600 => 120, 5620 => 124, 5640 => 128, 5660 => 132, 5700 => 140, 5720 => 144);
-        $Output = '<div align="center">'.
-        '<a href="?section=obsazeni_wifi_kanalu&range=a">Pásmo 2,4 GHz (a)</a> '.
-        '<a href="?section=obsazeni_wifi_kanalu&amp;range=bc">Pásmo 5 GHz dolní (b, c)</a> '.
-        '<a href="?section=obsazeni_wifi_kanalu&amp;range=d">Pásmo 5 GHz horní (d)</a> '.
-        '<a href="http://www.ctu.cz/1/download/Opatreni%20obecne%20povahy/VO_R_12_08_2005_34.pdf">VO_R_12_08_2005_34</a><br/>'.
-        '<strong>Seznam známých AP a obsazení kmitočtových pásem:</strong></div>'.
-        '<table class="WideTable">'.
-        '<tr><th/><br/>SSID<br/><br/></th>';
-        $ChannelList = array();
-        if(!array_key_exists('range', $_GET)) $_GET['range'] = 'a';
-        if($_GET['range'] == 'a')
-        {
-          $Where = '(Frequency < 5000)';
-          for($Freq = 2402; $Freq <= 2482; $Freq = $Freq + 5) $ChannelList[] = $Freq;
-        }
-        if($_GET['range'] == 'bc')
-        {
-          $Where = '(Frequency >= 5000) AND (Frequency <= 5350)';
-          for($Freq = 5150; $Freq <= 5350; $Freq = $Freq + 5) $ChannelList[] = $Freq;
-        }
-        if($_GET['range'] == 'd')
-        {
-          $Where = '(Frequency >= 5470)';
-          for($Freq = 5470; $Freq <= 5725; $Freq = $Freq + 5) $ChannelList[] = $Freq;
-        }
-
+    // http://en.wikipedia.org/wiki/List_of_WLAN_channels
+    //$ChannelList = array(2412 => 1, 2417 => 2, 2422 => 3, 2427 => 4, 2432 => 5, 2437 => 6, 2442 => 7, 2447 => 8, 2452 => 9, 2457 => 10, 2462 => 11, 2467 => 12, 2472 => 13, 5200 => 40, 5205 => 41, 5210 => 42, 5215 => 43, 5220 => 44, 5225 => 45, 5230 => 46, 5235 => 47, 5240 => 48, 5245 => 49, 5250 => 50, 5255 => 51, 5260 => 52, 5265 => 53, 5270 => 54, 5275 => 55, 5280 => 56, 5285 => 57, 5290 => 58, 5295 => 59, 5300 => 60, 5500 => 100, 5520 => 104, 5540 => 108, 5560 => 112, 5580 => 116, 5600 => 120, 5620 => 124, 5640 => 128, 5660 => 132, 5700 => 140, 5720 => 144);
+    $Output = '<div align="center">'.
+    '<a href="?section=obsazeni_wifi_kanalu&range=a">Pásmo 2,4 GHz (a)</a> '.
+    '<a href="?section=obsazeni_wifi_kanalu&amp;range=bc">Pásmo 5 GHz dolní (b, c)</a> '.
+    '<a href="?section=obsazeni_wifi_kanalu&amp;range=d">Pásmo 5 GHz horní (d)</a> '.
+    '<a href="http://www.ctu.cz/1/download/Opatreni%20obecne%20povahy/VO_R_12_08_2005_34.pdf">VO_R_12_08_2005_34</a><br/>'.
+    '<strong>Seznam známých AP a obsazení kmitočtových pásem:</strong></div>'.
+    '<table class="WideTable">'.
+    '<tr><th/><br/>SSID<br/><br/></th>';
+    $ChannelList = array();
+    if(!array_key_exists('range', $_GET)) $_GET['range'] = 'a';
+    if($_GET['range'] == 'a')
+    {
+      $Where = '(Frequency < 5000)';
+      for($Freq = 2402; $Freq <= 2482; $Freq = $Freq + 5) $ChannelList[] = $Freq;
+    }
+    if($_GET['range'] == 'bc')
+    {
+      $Where = '(Frequency >= 5000) AND (Frequency <= 5350)';
+      for($Freq = 5150; $Freq <= 5350; $Freq = $Freq + 5) $ChannelList[] = $Freq;
+    }
+    if($_GET['range'] == 'd')
+    {
+      $Where = '(Frequency >= 5470)';
+      for($Freq = 5470; $Freq <= 5725; $Freq = $Freq + 5) $ChannelList[] = $Freq;
+    }
+
+    foreach($ChannelList as $Frequency)
+    {
+      $Output .= '<th><div class="RotatedHeader">'.$Frequency.'<div></th>';
+    }
+    $Output .= '</tr>';
+    $DbResult = $this->Database->query('SELECT `Frequency` FROM `NetworkInterfaceWireless` WHERE '.$Where.' AND (`Mode`=0) GROUP BY `Frequency`');
+    while($DbRow = $DbResult->fetch_assoc())
+    {
+      $DbResult2 = $this->Database->query('SELECT * FROM `NetworkInterfaceWireless` WHERE (`Frequency`='.$DbRow['Frequency'].') AND '.$Where);
+      while($DbRow2 = $DbResult2->fetch_assoc())
+      {
+        $LowFrequency = $DbRow['Frequency'] - $DbRow2['ChannelWidth'] / 2 - $DbRow2['ChannelWidthLower'];
+        $HighFrequency = $DbRow['Frequency'] + $DbRow2['ChannelWidth'] / 2 + $DbRow2['ChannelWidthUpper'];
+        $Output .= '<tr><td>'.$DbRow2['SSID'].'</td>';
         foreach($ChannelList as $Frequency)
         {
-          $Output .= '<th><div class="RotatedHeader">'.$Frequency.'<div></th>';
+          if(($DbRow2['Frequency'] == $Frequency)) $Color = '#000000';
+            else if(($LowFrequency <= ($Frequency - 2.5)) and ($HighFrequency >= ($Frequency + 2.5))) $Color = '#808080';
+            else if(($LowFrequency == $Frequency) or ($HighFrequency == $Frequency)) $Color = '#c0c0c0';
+            else $Color = '#ffffff';
+          $Output .= '<td style="background-color: '.$Color.';">&nbsp;</td>';
         }
-        $Output .= '</tr>';
-        $DbResult = $this->Database->query('SELECT `Frequency` FROM `NetworkInterfaceWireless` WHERE '.$Where.' AND (`Mode`=0) GROUP BY `Frequency`');
-        while($DbRow = $DbResult->fetch_assoc())
-        {
-          $DbResult2 = $this->Database->query('SELECT * FROM `NetworkInterfaceWireless` WHERE (`Frequency`='.$DbRow['Frequency'].') AND '.$Where);
-          while($DbRow2 = $DbResult2->fetch_assoc())
-          {
-            $LowFrequency = $DbRow['Frequency'] - $DbRow2['ChannelWidth'] / 2 - $DbRow2['ChannelWidthLower'];
-            $HighFrequency = $DbRow['Frequency'] + $DbRow2['ChannelWidth'] / 2 + $DbRow2['ChannelWidthUpper'];
-            $Output .= '<tr><td>'.$DbRow2['SSID'].'</td>';
-            foreach($ChannelList as $Frequency)
-            {
-              if(($DbRow2['Frequency'] == $Frequency)) $Color = '#000000';
-                else if(($LowFrequency <= ($Frequency - 2.5)) and ($HighFrequency >= ($Frequency + 2.5))) $Color = '#808080';
-                else if(($LowFrequency == $Frequency) or ($HighFrequency == $Frequency)) $Color = '#c0c0c0';
-
-                else $Color = '#ffffff';
-              $Output .= '<td style="background-color: '.$Color.';">&nbsp;</td>';
-            }
-
-            $Output .= '</tr>';
-          }
-        }
-        $Output .= '</table>';
+                    
+        $Output .= '</tr>';        
+      }
+    }
+    $Output .= '</table>';
     return($Output);
   }
@@ -250 +249 @@
       ),
     ));
-    $this->System->FormManager->RegisterClass('NetworkDeviceConfig',array(
+    $this->System->FormManager->RegisterClass('NetworkDeviceConfig', array(
       'Title' => 'Nastavení zařízení',
       'Table' => 'NetworkDeviceConfig',
@@ -261 +260 @@
         'ConfigCompact' => array('Type' => 'Text', 'Caption' => 'Rozdílové nastavení', 'Default' => ''),
       ),
+    ));
+    $this->System->FormManager->RegisterClass('NetworkDomain', array(
+      'Title' => 'Síťová doména',
+      'Table' => 'NetworkDomain',
+      'DefaultSortColumn' => 'Name',
+      'DefaultSortOrder' => 1,
+      'Items' => array(
+        'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
+        'Description' => array('Type' => 'String', 'Caption' => 'Popis', 'Default' => ''),
+        'Parent' => array('Type' => 'TNetworkDomain', 'Caption' => 'Nadřazená doména', 'Default' => '', 'Null' => true),
+        'Serial' => array('Type' => 'Integer', 'Caption' => 'Sériové číslo', 'Default' => '1'),
+        'Minimum' => array('Type' => 'Integer', 'Caption' => 'Minimum', 'Default' => '10800'),
+        'Retry' => array('Type' => 'Integer', 'Caption' => 'Opakování', 'Default' => '7200'),
+        'Expire' => array('Type' => 'Integer', 'Caption' => 'Čas vypršení', 'Default' => '2419200'),
+        'Refresh' => array('Type' => 'Integer', 'Caption' => 'Obnovení', 'Default' => '28800'),
+        'TTL' => array('Type' => 'Integer', 'Caption' => 'TTL', 'Default' => '86400', 'Suffix' => 'sekund'),
+      ),
+    ));
+    $this->System->FormManager->RegisterFormType('TNetworkDomain', array(
+      'Type' => 'Reference',
+      'Table' => 'NetworkDomain',
+      'Id' => 'Id',
+      'Name' => 'Name',
+      'Filter' => '1',
     ));
     $this->System->FormManager->RegisterClass('DeviceAPIType', array(
@@ -358 +381 @@
         'Name' => 'Name',
         'Filter' => '1',
-    ));    
+    ));
     $this->System->FormManager->RegisterFormType('TDeviceList', array(
       'Type' => 'ManyToOne',