Changeset 569

Timestamp:

Sep 16, 2013, 11:31:25 PM (11 years ago)

Author:

chronos

Message:

• Přidáno: Základní statické generování DNS záznamů do RouterOS. Původní soubor generování pro Linux přesunut do NetworkConfigLinux.

Location:

trunk

Files:

• Common/Version.php (modified) (1 diff)
• Modules/NetworkConfigLinux/Generators/DNS.php (moved) (moved from trunk/Modules/NetworkConfigRouterOS/Generators/DNS.php ) (6 diffs)
• Modules/NetworkConfigRouterOS/Generators/DHCP.php (modified) (1 diff)
• Modules/TimeMeasure/Graph.php (modified) (1 diff)
• Modules/TimeMeasure/Main.php (modified) (2 diffs)
• Modules/TimeMeasure/Measure.php (modified) (1 diff)
• Modules/TimeMeasure/TimeMeasure.php (modified) (1 diff)

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 568; // Subversion revision
+$Revision = 569; // Subversion revision
 $DatabaseRevision = 565; // SQL structure revision
-$ReleaseTime = '2013-09-08';
+$ReleaseTime = '2013-09-16';

trunk/Modules/NetworkConfigLinux/Generators/DNS.php

@@ -121 +121 @@
 
 // Local records
-$DbResult = $System->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.LocalIP <> ""');
+$DbResult = $System->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface '.
+  'JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.LocalIP <> ""');
 while($Interface = $DbResult->fetch_assoc())
 {
@@ -130 +131 @@
 
 // External records in internal server
-$DbResult = $System->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.ExternalIP <> ""');
+$DbResult = $System->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface '.
+  'JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.ExternalIP <> ""');
 while($Interface = $DbResult->fetch_assoc())
 {
@@ -140 +142 @@
 // CZFree records in internal server
 /*
-$DbResult = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.CZFreeIP <> ""');
+$DbResult = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface '.
+  'JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.CZFreeIP <> ""');
 while($Interface = $DbResult->fetch_assoc())
 {
@@ -176 +179 @@
 );
 
-$DbResult = $System->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.ExternalIP != ""');
+$DbResult = $System->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface '.
+  'JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.ExternalIP != ""');
 while($Interface = $DbResult->fetch_assoc())
 {
@@ -214 +218 @@
 
 // Hosts
-$DbResult = $System->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.LocalIP != ""');
+$DbResult = $System->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface '.
+  'JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.LocalIP != ""');
 while($Interface = $DbResult->fetch_assoc())
 {
@@ -251 +256 @@
 
 // Hosts
-$DbResult = $System->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.LocalIP != ""');
+$DbResult = $System->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface '.
+  'JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.LocalIP != ""');
 while($Interface = $DbResult->fetch_assoc())
 {

trunk/Modules/NetworkConfigRouterOS/Generators/DHCP.php

@@ -18 +18 @@
   $Items = array();
   $Server = 'dhcp'.$Subnet['Id'];
-  $DbResult2 = $System->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM `NetworkInterface` LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE '.
-  ' CompareNetworkPrefix(INET_ATON(LocalIP), INET_ATON("'.$Subnet['AddressRange'].'"), '.$Subnet['Mask'].') AND (`MAC` != "00:00:00:00:00:00") ORDER BY `LocalIP`');
+  $DbResult2 = $System->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM `NetworkInterface` '.
+    ' LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE '.
+    ' CompareNetworkPrefix(INET_ATON(LocalIP), INET_ATON("'.$Subnet['AddressRange'].'"), '.$Subnet['Mask'].') AND (`MAC` != "00:00:00:00:00:00") ORDER BY `LocalIP`');
   while($Interface = $DbResult2->fetch_assoc())
   {

trunk/Modules/TimeMeasure/Graph.php

@@ -1 +1 @@
 <?php
-
-include_once(dirname(__FILE__).'/../../Base/View.php');
-include_once(dirname(__FILE__).'/../Model/Measure.php');
 
 class GraphView extends View

trunk/Modules/TimeMeasure/Main.php

@@ -1 +1 @@
 <?php
 
-include_once(dirname(__FILE__).'/../../Base/View.php');
-
-class MainView extends View
+class MainPage extends Page
 {
   var $Months = array('', 'Leden', 'Únor', 'Březen', 'Duben', 'Květen', 'Červen', 'Červenec', 'Srpen', 'Září', 'Říjen', 'Listopad', 'Prosinec');
@@ -169 +167 @@
     $Output .= '<img alt="Graf" src="?M=Graph&amp;Measure='.$_SESSION['Measure'].'&amp;From='.$_SESSION['TimeStart'].'&amp;To='.$_SESSION['TimeEnd'].'&amp;Width='.$this->Config['Application']['GraphSize']['Width'].'&amp;Height='.$this->Config['Application']['GraphSize']['Height'].'&amp;Differential='.$_SESSION['Differential'].'" width="'.$this->Config['Application']['GraphSize']['Width'].'" height="'.$this->Config['Application']['GraphSize']['Height'].'"><br>';
     $Output .= '<a href="?Measure='.$_SESSION['Measure'].'&amp;TimeStart='.$_SESSION['TimeStart'].'&amp;TimeEnd='.$_SESSION['TimeEnd'].'&amp;TimeSpecify=1&amp;Differential='.$_SESSION['Differential'].'">Odkaz na vybraný graf</a><br>';
-//print_r(GetValues($Measure, $TimeStart, $TimeEnd));
     return($Output);
   }

trunk/Modules/TimeMeasure/Measure.php

@@ -1 +1 @@
 <?php
-
-include_once(dirname(__FILE__).'/../../Base/Model.php');
 
 class Measure extends Model

trunk/Modules/TimeMeasure/TimeMeasure.php

@@ -1 +1 @@
 <?php
+
+include_once(dirname(__FILE__).'/Measure.php');
+include_once(dirname(__FILE__).'/Graph.php');
+include_once(dirname(__FILE__).'/Main.php');
 
 class ModuleTimeMeasure extends AppModule