Changeset 677

Timestamp:

Jul 25, 2014, 9:12:10 PM (10 years ago)

Author:

chronos

Message:

• Upraveno: Zobrazovat online stav zařízení a rozhraní.
• Přidáno: Zobrazení bezdrátových spojení vztažených k rozhraní.

Location:

trunk

Files:

• Application/FormClasses.php (modified) (1 diff)
• Application/Version.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (1 diff)
• Modules/Network/Network.php (modified) (5 diffs)
• Modules/NetworkConfigRouterOS/RouterboardAPI.php (modified) (3 diffs)

trunk/Application/FormClasses.php

@@ -457 +457 @@
     'Filter' => '1',
   ),
+  'TNetworkInterfaceWirelessListInterface' => array(
+    'Type' => 'ManyToOne',
+    'Table' => 'NetworkInterfaceWireless',
+    'Id' => 'Id',
+    'Ref' => 'NetworkInterface',
+    'Filter' => '1',
+  ),
   'TInterfaceList' => array(
     'Type' => 'ManyToOne',

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 676; // Subversion revision
+$Revision = 677; // Subversion revision
 $DatabaseRevision = 676; // SQL structure revision
-$ReleaseTime = strtotime('2014-07-22');
+$ReleaseTime = strtotime('2014-07-25');

trunk/Common/Setup/Updates.php

@@ -844 +844 @@
   $Manager->Execute('ALTER TABLE `NetworkSignal` ADD `Device` INT NULL ,
 ADD INDEX ( `Device` ) ;');
-  $Manager->Execute('ALTER TABLE `NetworkSignal` ADD FOREIGN KEY ( `Device` ) REFERENCES `centrala_big`.`NetworkDevice` (
+  $Manager->Execute('ALTER TABLE `NetworkSignal` ADD FOREIGN KEY ( `Device` ) REFERENCES `NetworkDevice` (
 `Id`) ON DELETE RESTRICT ON UPDATE RESTRICT ;');
 }

trunk/Modules/Network/Network.php

@@ -151 +151 @@
         'Service' => array('Type' => 'TServiceCustomerRel', 'Caption' => 'Služba', 'Default' => '', 'Null' => true),
         'Used' => array('Type' => 'Boolean', 'Caption' => 'Použito', 'Default' => '1'),
-        'Online' => array('Type' => 'Boolean', 'Caption' => 'Běží', 'Default' => '0', 'ReadOnly' => true),
+        'Online' => array('Type' => 'TOnlineState', 'Caption' => 'Běží', 'Default' => '0', 'ReadOnly' => true),
         'LastOnline' => array('Type' => 'DateTime', 'Caption' => 'Naposledy běželo', 'Default' => '', 'ReadOnly' => true),
         'PermanentOnline' => array('Type' => 'Boolean', 'Caption' => 'Běží stále', 'Default' => '0'),
@@ -184 +184 @@
         'ExternalIP' => array('Type' => 'IPv4Address', 'Caption' => 'Veřejná IPv4', 'Default' => '', 'Null' => true),
         'Device' => array('Type' => 'TNetworkDevice', 'Caption' => 'Zařízení', 'Default' => ''),
-        'Online' => array('Type' => 'Boolean', 'Caption' => 'Běží', 'Default' => '0', 'ReadOnly' => true),
+        'Online' => array('Type' => 'TOnlineState', 'Caption' => 'Běží', 'Default' => '0', 'ReadOnly' => true),
         'LastOnline' => array('Type' => 'DateTime', 'Caption' => 'Naposledy běželo', 'Default' => '', 'ReadOnly' => true),
         'Links1' => array('Type' => 'TNetworkLinkListInterface1', 'Caption' => 'Propojení 1', 'Default' => ''),
@@ -190 +190 @@
         'UpDown' => array('Type' => 'TNetworkInterfaceUpDown', 'Caption' => 'Změny stavu', 'Default' => ''),
         'Signal' => array('Type' => 'TNetworkSignalListInterface', 'Caption' => 'Signál', 'Default' => ''),
+        'Wireless' => array('Type' => 'TNetworkInterfaceWirelessListInterface', 'Caption' => 'Bezdrátové spoje', 'Default' => ''),
+
       ),
     ));
@@ -235 +237 @@
       'Title' => 'Signál rozhraní',
       'Table' => 'NetworkSignal',
+      'DefaultSortColumn' => 'Time',
+      'DefaultSortOrder' => 1,
       'Items' => array(
         'Time' => array('Type' => 'DateTime', 'Caption' => 'Čas', 'Default' => ''),
@@ -240 +244 @@
         'Interface' => array('Type' => 'TNetworkInterface', 'Caption' => 'Rozhraní', 'Default' => '', 'Null' => true),
         'Value' => array('Type' => 'Integer', 'Caption' => 'Signál', 'Default' => '0', 'Suffix' => 'dBm'),
-        'RateRx' => array('Type' => 'Integer', 'Caption' => 'Rychlost', 'Default' => '0', 'Suffix' => 'MHz'),
-        'RateTx' => array('Type' => 'Integer', 'Caption' => 'Rychlost', 'Default' => '0', 'Suffix' => 'MHz'),
+        'RateRx' => array('Type' => 'Integer', 'Caption' => 'Rychlost Rx', 'Default' => '0', 'Suffix' => 'MHz'),
+        'RateTx' => array('Type' => 'Integer', 'Caption' => 'Rychlost Tx', 'Default' => '0', 'Suffix' => 'MHz'),
         'Device' => array('Type' => 'TNetworkDevice', 'Caption' => 'Měřeno z', 'Default' => '0'),
       ),

trunk/Modules/NetworkConfigRouterOS/RouterboardAPI.php

@@ -12 +12 @@
   var $Socket;             // Variable for storing socket resource
   var $Debug;
+  var $SSL; // If SSL API connection is used. You need also change port to 8729
 
   function __construct()
@@ -21 +22 @@
     $this->Timeout = 3;
     $this->Debug = false;
+    $this->SSL = false;
   }
 
@@ -44 +46 @@
   {
     if($this->Connected) $this->Disconnect();
+    if($this->SSL)
+    {
+        $IP = 'ssl://'.$IP;
+    }
+
     $this->Socket = @fsockopen($IP, $this->Port, $this->ErrorNo, $this->ErrorStr, $this->Timeout);
     if($this->Socket)