Changeset 739 for trunk/Modules

Timestamp:

May 23, 2015, 12:07:08 AM (10 years ago)

Author:

chronos

Message:

• Added: NetworkDomainServer table to configure DNS servers for domains.

Location:

trunk/Modules

Files:

• Network/Network.php (modified) (2 diffs)
• NetworkConfigRouterOS/Generators/DNS.php (modified) (1 diff)

trunk/Modules/Network/Network.php

@@ -294 +294 @@
         'Refresh' => array('Type' => 'Integer', 'Caption' => 'Obnovení', 'Default' => '28800'),
         'TTL' => array('Type' => 'Integer', 'Caption' => 'TTL', 'Default' => '86400', 'Suffix' => 'sekund'),
+        'Servers' => array('Type' => 'TNetworkDomainServerList', 'Caption' => 'Servery', 'Default' => ''),
       ),
     ));
@@ -301 +302 @@
       'Id' => 'Id',
       'Name' => 'Name',
+      'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterClass('NetworkDomainServer', array(
+      'Title' => 'Doménový server',
+      'Table' => 'NetworkDomainServer',
+      'DefaultSortColumn' => 'Address',
+      'DefaultSortOrder' => 1,
+      'Items' => array(
+        'Address' => array('Type' => 'String', 'Caption' => 'Adresa', 'Default' => ''),
+        'Domain' => array('Type' => 'TNetworkDomain', 'Caption' => 'Doména', 'Default' => ''),
+        'Sequence' => array('Type' => 'Integer', 'Caption' => 'Pořadí', 'Default' => '1'),
+      ),
+    ));
+    $this->System->FormManager->RegisterFormType('TNetworkDomainServerList', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'NetworkDomainServer',
+      'Id' => 'Id',
+      'Ref' => 'Domain',
       'Filter' => '1',
     ));

trunk/Modules/NetworkConfigRouterOS/Generators/DNS.php

@@ -13 +13 @@
 $Routerboard->Debug = true;
 
-// Devices, Interfaces
-$Items = array();
-$DbResult = $System->Database->query('SELECT `NetworkInterface`.*, `NetworkDevice`.`Name` AS `DeviceName` FROM `NetworkInterface` '.
-  'JOIN `NetworkDevice` ON `NetworkInterface`.`Device`=`NetworkDevice`.`Id` '.
-  'WHERE `NetworkDevice`.`Used`=1');
-while($Interface = $DbResult->fetch_assoc())
+$DbResult = $System->Database->query('SELECT * FROM `NetworkDomain`');
+while($Domain = $DbResult->fetch_assoc())
 {
-  $Name = $Interface['DeviceName'];
-  if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
-  $Name .= '.zdechov.net';
-  $Items[] = array('name' => $Name, 'address' => $Interface['LocalIP'], 'ttl' => '1d');
+  $DomainName = $Domain['Name'];
+
+  // Get full domain name from parent items
+  $CurrentDomain = $Domain;
+  while($CurrentDomain['Parent'] > 0)
+  {
+    $DbResult2 = $System->Database->query('SELECT * FROM `NetworkDomain` WHERE `Id`='.$CurrentDomain['Parent']);
+    $CurrentDomain = $DbResult2->fetch_assoc();
+    $DomainName .= '.'.$CurrentDomain['Name'];
+  }
+
+  // Devices, Interfaces
+  $Items = array();
+  $DbResult2 = $System->Database->query('SELECT `NetworkInterface`.*, `NetworkDevice`.`Name` AS `DeviceName` FROM `NetworkInterface` '.
+    'JOIN `NetworkDevice` ON `NetworkInterface`.`Device`=`NetworkDevice`.`Id` '.
+    'WHERE `NetworkDevice`.`Used`=1');
+  while($Interface = $DbResult2->fetch_assoc())
+  {
+    $Name = $Interface['DeviceName'];
+    if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+    $Name .= '.'.$DomainName;
+    $Items[] = array('name' => $Name, 'address' => $Interface['LocalIP'], 'ttl' => '1d');
+  }
+
+  // Domain aliases
+  $DbResult2 = $System->Database->query('SELECT `NetworkDomainAlias`.*, `NetworkInterface`.`LocalIP` AS `LocalIP` FROM `NetworkDomainAlias` '.
+    'JOIN `NetworkDevice` ON `NetworkDomainAlias`.`Target`=`NetworkDevice`.`Name` '.
+    'JOIN `NetworkInterface` ON `NetworkInterface`.`Device`=`NetworkDevice`.`Id` '.
+    'WHERE `NetworkDevice`.`Used`=1');
+  while($Alias = $DbResult2->fetch_assoc())
+  {
+    $Name = $Alias['Name'];
+    $Name .= '.'.$DomainName;
+    $Items[] = array('name' => $Name, 'address' => $Alias['LocalIP'], 'ttl' => $Domain['TTL']);
+  }
+
+  $DbResult2 = $System->Database->query('SELECT * FROM `NetworkDomainServer` WHERE `Domain`='.$Domain['Id']);
+  if($DbResult2->num_rows > 0)
+  {
+    $Server = $DbResult2->fetch_assoc();
+    $Routerboard->HostName = $Server['Address'];
+    $Routerboard->ListUpdate($Path, array('name', 'address', 'ttl'), $Items);
+  }
 }
-
-// Domain aliases
-$DbResult = $System->Database->query('SELECT `NetworkDomainAlias`.*, `NetworkInterface`.`LocalIP` AS `LocalIP` FROM `NetworkDomainAlias` '.
-  'JOIN `NetworkDevice` ON `NetworkDomainAlias`.`Target`=`NetworkDevice`.`Name` '.
-  'JOIN `NetworkInterface` ON `NetworkInterface`.`Device`=`NetworkDevice`.`Id` '.
-  'WHERE `NetworkDevice`.`Used`=1');
-while($Alias = $DbResult->fetch_assoc())
-{
-  $Name = $Alias['Name'];
-  $Name .= '.zdechov.net';
-  $Items[] = array('name' => $Name, 'address' => $Alias['LocalIP'], 'ttl' => '1d');
-}
-
-$Routerboard->HostName = '192.168.10.1';
-$Routerboard->ListUpdate($Path, array('name', 'address', 'ttl'), $Items);