Changeset 615

Timestamp:

Dec 20, 2013, 11:57:02 PM (11 years ago)

Author:

chronos

Message:

• Přidáno: Další položky do tabulky "Bezdrátové rozhraní".
• Přidáno: Příprava tabulky NewsImport pro zobecnění importu aktualit z jiných webů.

Location:

trunk

Files:

• Application/FormClasses.php (modified) (1 diff)
• Application/Version.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/Network/Network.php (modified) (2 diffs)
• Modules/NetworkConfigRouterOS/Generators/FirewallNAT.php (modified) (2 diffs)
• Modules/SpeedTest/SpeedTest.php (modified) (1 diff)

trunk/Application/FormClasses.php

@@ -171 +171 @@
     'States' => array('Neplánováno', 'V plánu', 'Provádí se'),
   ),    
+  'TAntennaPolarity' => array(
+    'Type' => 'Enumeration',
+    'States' => array('Vertikální', 'Horizontální', 'Kruhová', 'Vertikální i horizontální'),
+  ),    
   'TNetworkDeviceState' => array(
     'Type' => 'Enumeration',

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 614; // Subversion revision
-$DatabaseRevision = 601; // SQL structure revision
+$Revision = 615; // Subversion revision
+$DatabaseRevision = 615; // SQL structure revision
 $ReleaseTime = '2013-12-20';

trunk/Common/Setup/Updates.php

@@ -489 +489 @@
 }
 
+function UpdateTo615($Manager)
+{
+  $Manager->Execute('ALTER TABLE `NetworkInterfaceWireless` ADD `AntennaPolarity` INT NOT NULL ,
+ADD `Description` VARCHAR( 255 ) NOT NULL ;');
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `NewsImport` (
+  `Id` int(11) NOT NULL,
+  `Name` varchar(255) NOT NULL,
+  `Enabled` int(11) NOT NULL,
+  `Source` varchar(255) NOT NULL,
+  `Category` int(11) NOT NULL,
+  `BlockStart` varchar(255) NOT NULL,
+  `BlockEnd` varchar(255) NOT NULL,
+  `ItemStart` varchar(255) NOT NULL,
+  `ItemEnd` varchar(255) NOT NULL,
+  `TitleStart` varchar(255) NOT NULL,
+  `TitleEnd` varchar(255) NOT NULL,
+  `ContentStart` varchar(255) NOT NULL,
+  `ContentEnd` varchar(255) NOT NULL,
+  `LinkStart` varchar(255) NOT NULL,
+  `LinkEnd` varchar(255) NOT NULL,
+  `DateStart` varchar(255) NOT NULL,
+  `DateEnd` varchar(255) NOT NULL,
+  KEY `Category` (`Category`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;');
+  $Manager->Execute('ALTER TABLE `NewsImport` '.
+    'ADD CONSTRAINT `NewsImport_ibfk_1` FOREIGN KEY (`Category`) '.
+    ' REFERENCES `NewsCategory` (`Id`);');
+  $Manager->Execute('ALTER TABLE `NetworkInterfaceWireless` ADD `Product` INT NULL AFTER `AntennaPolarity` ,
+ADD INDEX ( `Product` ) ;');
+  $Manager->Execute('ALTER TABLE `NetworkInterfaceWireless` ADD FOREIGN KEY ( `Product` ) REFERENCES `Product` (
+`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT ;');
+  $Manager->Execute('ALTER TABLE `NetworkInterfaceWireless` ADD `MAC` VARCHAR( 17 ) NOT NULL ;');
+}
+
 class Updates
 {
@@ -519 +553 @@
       591 => array('Revision' => 597, 'Function' => 'UpdateTo597'),
       597 => array('Revision' => 601, 'Function' => 'UpdateTo601'),
+      601 => array('Revision' => 615, 'Function' => 'UpdateTo615'),
     ));
   }

trunk/Modules/Network/Network.php

@@ -280 +280 @@
       'Items' => array(
         'SSID' => array('Type' => 'String', 'Caption' => 'SSID', 'Default' => ''),
+        'MAC' => array('Type' => 'MacAddress', 'Caption' => 'MAC', 'Default' => ''),
         'NetworkInterface' => array('Type' => 'TNetworkInterface', 'Caption' => 'Rozhraní', 'Default' => ''),
         'TxPower' => array('Type' => 'Integer', 'Caption' => 'Výstupní výkon', 'Default' => '18', 'Suffix' => 'dBm'),
         'CableAttenuation' => array('Type' => 'Integer', 'Caption' => 'Útlum vedení', 'Default' => '0', 'Suffix' => 'dB'),
+        'Antenna' => array('Type' => 'TProduct', 'Caption' => 'Anténa', 'Default' => '', 'Null' => true),
         'AntenaGain' => array('Type' => 'Integer', 'Caption' => 'Zisk antény', 'Default' => '', 'Suffix' => 'dBi'),
+        'AntennaPolarity' => array('Type' => 'TAntennaPolarity', 'Caption' => 'Polarizace antény', 'Default' => '0'),
         'Frequency' => array('Type' => 'Float', 'Caption' => 'Frekvence', 'Default' => '5600', 'Suffix' => 'MHz'),
         'ChannelWidth' => array('Type' => 'Integer', 'Caption' => 'Šírka kanálu', 'Default' => '20', 'Suffix' => 'MHz'),
@@ -292 +295 @@
         'UnderLimit' => array('Type' => 'Boolean', 'Caption' => 'V limitu', 'Default' => '', 'Suffix' => '',
           'ReadOnly' => true, 'SQL' => '((`TxPower` - `CableAttenuation` + `AntenaGain`) <= (CASE WHEN `Frequency` >= 5450 AND `Frequency` <= 5725 THEN 27 ELSE 20 END))'),
+        'Description' => array('Type' => 'String', 'Caption' => 'Popis', 'Default' => ''),
       ),
     ));

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallNAT.php

@@ -45 +45 @@
   $DbResult2 = $System->Database->query('SELECT `NetworkInterface`.*, `NetworkDevice`.`Name` AS `DeviceName`, `NetworkDevice`.`InboundNATPriority` FROM `NetworkInterface`'.
   ' LEFT JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` WHERE (`NetworkInterface`.`ExternalIP` <> "")'.
+  ' AND (`NetworkInterface`.`LocalIP` <> "")'.  
   ' AND (`NetworkDevice`.`Member` = '.$Member['Id'].') AND (`NetworkInterface`.`LocalIP` != `NetworkInterface`.`ExternalIP`) ORDER BY `id` DESC');
   while($Interface = $DbResult2->fetch_assoc())
@@ -101 +102 @@
 
 // Masquerade hosts without public ip
-$Items[] = array('chain' => 'inet-out', 'action' => 'src-nat', 'to-addresses' => '77.92.221.106', 'comment' => 'Default_NAT');
+$Items[] = array('chain' => 'inet-out', 'action' => 'src-nat', 'to-addresses' => '77.92.221.188', 'comment' => 'Default_NAT');
 
 // Redirect DNS port

trunk/Modules/SpeedTest/SpeedTest.php

@@ -28 +28 @@
   {
     $this->System->Pages['speedtest'] = 'PageSpeedTest';
-    
   }  
 }