Changeset 777

Timestamp:

Jan 2, 2016, 3:45:31 PM (9 years ago)

Author:

chronos

Message:

• Fixed: Now DNS server items are correctly configured to RouterOS DNS server.

File:

• trunk/Modules/NetworkConfigRouterOS/Generators/DNS.php (modified) (1 diff)

trunk/Modules/NetworkConfigRouterOS/Generators/DNS.php

@@ -27 +27 @@
   }
 
+  $Items = array();
+
   // 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');
+    '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');
+    $NameFull = $Name.'.'.$DomainName;
+    $NameExtFull = $Name.'-ext.'.$DomainName;
+    if($Interface['LocalIP'] != '')
+      $Items[] = array('name' => $NameFull, 'address' => $Interface['LocalIP']);
+    if($Interface['IPv6'] != '')
+      $Items[] = array('name' => $NameFull, 'address' => $Interface['IPv6']);
+    if($Interface['ExternalIP'] != '')
+      $Items[] = array('name' => $NameExtFull, 'address' => $Interface['ExternalIP']);
   }
 
   // Domain aliases
-  $DbResult2 = $System->Database->query('SELECT `NetworkDomainAlias`.*, `NetworkInterface`.`LocalIP` AS `LocalIP` FROM `NetworkDomainAlias` '.
-    'JOIN `NetworkDevice` ON `NetworkDomainAlias`.`Target`=`NetworkDevice`.`Name` '.
+  $DbResult2 = $System->Database->query('SELECT `NetworkDomainAlias`.*, `NetworkInterface`.`LocalIP` AS `LocalIP`, '.
+    '`NetworkInterface`.`IPv6` AS `IPv6`, `NetworkInterface`.`ExternalIP` AS `ExternalIP` FROM `NetworkDomainAlias` '.
+    'JOIN `NetworkDevice` ON SUBSTR(`NetworkDomainAlias`.`Target`, 1, LENGTH(`NetworkDevice`.`Name` ))=`NetworkDevice`.`Name` '.
     'JOIN `NetworkInterface` ON `NetworkInterface`.`Device`=`NetworkDevice`.`Id` '.
-    'WHERE `NetworkDevice`.`Used`=1');
+    'WHERE (`NetworkDevice`.`Used`=1) AND '.
+    '(CONCAT_WS("-", `NetworkDevice`.`Name`, NULLIF(`NetworkInterface`.`Name`, "")) = `NetworkDomainAlias`.`Target`)');
   while($Alias = $DbResult2->fetch_assoc())
   {
     $Name = $Alias['Name'];
-    $Name .= '.'.$DomainName;
-    $Items[] = array('name' => $Name, 'address' => $Alias['LocalIP'], 'ttl' => $Domain['TTL']);
+    $NameFull = $Name.'.'.$DomainName;
+    $NameExtFull = $Name.'-ext.'.$DomainName;
+    if($Alias['LocalIP'] != '')
+      $Items[] = array('name' => $NameFull, 'address' => $Alias['LocalIP']);
+    if($Alias['IPv6'] != '')
+      $Items[] = array('name' => $NameFull, 'address' => $Alias['IPv6']);
+    if($Alias['ExternalIP'] != '')
+      $Items[] = array('name' => $NameExtFull, 'address' => $Alias['ExternalIP']);
   }
 
   $DbResult2 = $System->Database->query('SELECT * FROM `NetworkDomainServer` WHERE `Domain`='.$Domain['Id']);
-  if($DbResult2->num_rows > 0)
+  while($Server = $DbResult2->fetch_assoc())
   {
-    $Server = $DbResult2->fetch_assoc();
     $Routerboard->HostName = $Server['Address'];
-    $Routerboard->ListUpdate($Path, array('name', 'address', 'ttl'), $Items);
+    $Routerboard->ListUpdate($Path, array('name', 'address'), $Items);
   }
 }