Changeset 873 for trunk/Modules/NetworkConfigRouterOS/Generators/DNS.php

Timestamp:

Apr 6, 2020, 11:17:40 PM (4 years ago)

Author:

chronos

Message:

• Modified: Improved code format.

File:

• trunk/Modules/NetworkConfigRouterOS/Generators/DNS.php (modified) (4 diffs)

trunk/Modules/NetworkConfigRouterOS/Generators/DNS.php

@@ -13 +13 @@
 
     $DbResult = $this->Database->query('SELECT * FROM `NetworkDomain`');
-    while($Domain = $DbResult->fetch_assoc())
+    while ($Domain = $DbResult->fetch_assoc())
     {
       $DomainName = $Domain['Name'];
@@ -19 +19 @@
       // Get full domain name from parent items
       $CurrentDomain = $Domain;
-      while($CurrentDomain['Parent'] > 0)
+      while ($CurrentDomain['Parent'] > 0)
       {
         $DbResult2 = $this->Database->query('SELECT * FROM `NetworkDomain` WHERE `Id`='.$CurrentDomain['Parent']);
@@ -32 +32 @@
           'JOIN `NetworkDevice` ON `NetworkInterface`.`Device`=`NetworkDevice`.`Id` '.
           'WHERE (`NetworkDevice`.`Used`=1)');
-      while($Interface = $DbResult2->fetch_assoc())
+      while ($Interface = $DbResult2->fetch_assoc())
       {
         $Name = $Interface['DeviceName'];
-        if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+        if ($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
         $NameFull = $Name.'.'.$DomainName;
         $NameExtFull = $Name.'-ext.'.$DomainName;
-        if($Interface['LocalIP'] != '')
+        if ($Interface['LocalIP'] != '')
           $Items[] = array('name' => $NameFull, 'address' => $Interface['LocalIP']);
-        if($Interface['IPv6'] != '')
+        if ($Interface['IPv6'] != '')
           $Items[] = array('name' => $NameFull, 'address' => $Interface['IPv6']);
-        if($Interface['ExternalIP'] != '')
+        if ($Interface['ExternalIP'] != '')
           $Items[] = array('name' => $NameExtFull, 'address' => $Interface['ExternalIP']);
       }
@@ -53 +53 @@
           'WHERE (`NetworkDevice`.`Used`=1) AND '.
           '(CONCAT_WS("-", `NetworkDevice`.`Name`, NULLIF(`NetworkInterface`.`Name`, "")) = `NetworkDomainAlias`.`Target`)');
-      while($Alias = $DbResult2->fetch_assoc())
+      while ($Alias = $DbResult2->fetch_assoc())
       {
         $Name = $Alias['Name'];
         $NameFull = $Name.'.'.$DomainName;
         $NameExtFull = $Name.'-ext.'.$DomainName;
-        if($Alias['LocalIP'] != '')
+        if ($Alias['LocalIP'] != '')
           $Items[] = array('name' => $NameFull, 'address' => $Alias['LocalIP']);
-        if($Alias['IPv6'] != '')
+        if ($Alias['IPv6'] != '')
           $Items[] = array('name' => $NameFull, 'address' => $Alias['IPv6']);
-        if($Alias['ExternalIP'] != '')
+        if ($Alias['ExternalIP'] != '')
           $Items[] = array('name' => $NameExtFull, 'address' => $Alias['ExternalIP']);
       }
 
       $DbResult2 = $this->Database->query('SELECT * FROM `NetworkDomainServer` WHERE `Domain`='.$Domain['Id']);
-      while($Server = $DbResult2->fetch_assoc())
+      while ($Server = $DbResult2->fetch_assoc())
       {
         $Routerboard->HostName = $Server['Address'];