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

Timestamp:

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

Author:

chronos

Message:

• Modified: Improved code format.

File:

• trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php (modified) (16 diffs)

trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php

@@ -48 +48 @@
   function CheckName($Name, &$UsedNames)
   {
-    if(in_array($Name, $UsedNames)) die("\n".'Duplicate name: '.$Name);
+    if (in_array($Name, $UsedNames)) die("\n".'Duplicate name: '.$Name);
       else $UsedNames[] = $Name;
   }
@@ -189 +189 @@
     $DbResult = $this->Database->query('SELECT `Member`.*, `Subject`.`Name` FROM `Member` '.
       'LEFT JOIN `Subject` ON `Subject`.`Id` = `Member`.`Subject` WHERE `Member`.`Blocked`=0');
-    while($Member = $DbResult->fetch_assoc())
+    while ($Member = $DbResult->fetch_assoc())
     {
       $ServiceIndex = 1;
@@ -198 +198 @@
         'WHERE (`ServiceCustomerRel`.`Customer` = '.$Member['Id'].') AND (`ServiceCustomerRel`.`ChangeAction` IS NULL) '.
         'AND (`Service`.`InternetSpeedMax` > 0) AND (`Service`.`InternetSpeedMin` > 0)');
-      while($Service = $DbResult4->fetch_assoc())
+      while ($Service = $DbResult4->fetch_assoc())
       {
         echo('Služba '.$Service['Name'].': ');
@@ -231 +231 @@
         $Row = $DbResult2->fetch_row();
         $HostCount = $Row[0];
-        if($HostCount > 0)
+        if ($HostCount > 0)
         {
           $HostSpeedIn = round($SpeedIn / $HostCount);
@@ -242 +242 @@
 
         $DbResult2 = $this->Database->select('NetworkDevice', '*', $Filter);
-        while($Device = $DbResult2->fetch_assoc())
+        while ($Device = $DbResult2->fetch_assoc())
         {
           $DbResult3 = $this->Database->select('NetworkInterface', '*', '`Device` = '.$Device['Id'].' AND `LocalIP` != ""');
-          while($Interface = $DbResult3->fetch_assoc())
+          while ($Interface = $DbResult3->fetch_assoc())
           {
             $DeviceName = $Device['Name'];
-            if($Interface['Name'] != '') $DeviceName .= '-'.$Interface['Name'];
+            if ($Interface['Name'] != '') $DeviceName .= '-'.$Interface['Name'];
             $DeviceName = RouterOSIdent($DeviceName);
             echo($DeviceName.', ');
@@ -258 +258 @@
 
         $DbResult2 = $this->Database->select('NetworkSubnet', '*', '`Service`='.$Service['RelId']);
-        while($Subnet = $DbResult2->fetch_assoc())
+        while ($Subnet = $DbResult2->fetch_assoc())
         {
           $SubnetName = RouterOSIdent('subnet-'.$Subnet['Name']);
@@ -329 +329 @@
   {
     $MinSpeed = 0;
-    foreach($this->Devices[$DeviceId]['Childs'] as $DeviceChild)
+    foreach ($this->Devices[$DeviceId]['Childs'] as $DeviceChild)
     {
       $this->UpdateMinSpeed($DeviceChild);
@@ -335 +335 @@
     }
     $this->Devices[$DeviceId]['MinSpeed'] = $MinSpeed;
-    if($this->Devices[$DeviceId]['DeviceCount'] > 0)
+    if ($this->Devices[$DeviceId]['DeviceCount'] > 0)
       $this->Devices[$DeviceId]['MinSpeed'] += round($this->Devices[$DeviceId]['InternetSpeedMin'] / $this->Devices[$DeviceId]['DeviceCount']);
   }
@@ -349 +349 @@
       'LEFT JOIN `ServiceCustomerRel` ON `ServiceCustomerRel`.`Id`=`NetworkDevice`.`Service` '.
       'LEFT JOIN `Service` ON `Service`.`Id` = `ServiceCustomerRel`.`Service`');
-    while($Device = $DbResult->fetch_assoc())
+    while ($Device = $DbResult->fetch_assoc())
     {
       $Device['Interfaces'] = array();
@@ -364 +364 @@
     $Interfaces = array();
     $DbResult = $this->Database->query('SELECT `Device`,`Name`,`Id` FROM `NetworkInterface`');
-    while($Interface = $DbResult->fetch_assoc())
+    while ($Interface = $DbResult->fetch_assoc())
     {
       $Interface['Links'] = array();
@@ -376 +376 @@
       '`NetworkLink`.`Interface2`,`NetworkLinkType`.`MaxRealSpeed` FROM `NetworkLink` '.
       'LEFT JOIN `NetworkLinkType` ON `NetworkLinkType`.`Id`=`NetworkLink`.`Type`');
-    while($Link = $DbResult->fetch_assoc())
+    while ($Link = $DbResult->fetch_assoc())
     {
       $Links[$Link['Id']] = $Link;
@@ -388 +388 @@
     $this->Devices[$RootDeviceId]['Calculated'] = true;
 
-    while(count($DevicesToCheck) > 0)
+    while (count($DevicesToCheck) > 0)
     {
       //echo('Pass'."\n");
       $NewDevicesToCheck = array();
-      foreach($DevicesToCheck as $DeviceId)
+      foreach ($DevicesToCheck as $DeviceId)
       {
         //echo($this->Devices[$DeviceId]['Name'].': ');
-        foreach($this->Devices[$DeviceId]['Interfaces'] as $InterfaceId)
+        foreach ($this->Devices[$DeviceId]['Interfaces'] as $InterfaceId)
         {
-          foreach($Interfaces[$InterfaceId]['Links'] as $LinkId)
+          foreach ($Interfaces[$InterfaceId]['Links'] as $LinkId)
           {
             $Link = $Links[$LinkId];
             $Interface2Id = $Link['Interface1'];
-            if($Interface2Id == $InterfaceId) $Interface2Id = $Links[$LinkId]['Interface2'];
+            if ($Interface2Id == $InterfaceId) $Interface2Id = $Links[$LinkId]['Interface2'];
 
             $Device2Id = $Interfaces[$Interface2Id]['Device'];
-            if($this->Devices[$Device2Id]['Calculated'] == false)
+            if ($this->Devices[$Device2Id]['Calculated'] == false)
             {
               $this->Devices[$Device2Id]['Calculated'] = true;
               $NewMaxSpeed = $this->Devices[$DeviceId]['MaxSpeed'];
-              if($NewMaxSpeed > $Link['MaxRealSpeed'])
+              if ($NewMaxSpeed > $Link['MaxRealSpeed'])
                 $NewMaxSpeed = $Link['MaxRealSpeed'];
               //echo($this->Devices[$Device2Id]['Name'].' '.$Device2Id.', ');
@@ -431 +431 @@
 
     echo('Not linked network devices: ');
-    foreach($this->Devices as $Device)
-    {
-      if($Device['MaxSpeed'] == 0) echo($Device['Name'].', ');
+    foreach ($this->Devices as $Device)
+    {
+      if ($Device['MaxSpeed'] == 0) echo($Device['Name'].', ');
     }
     echo("\n");
@@ -455 +455 @@
     $DbResult3 = $this->Database->select('NetworkInterface', '*', '`Device` = '.$DeviceId.' AND `LocalIP` != ""');
     $IntCount = $DbResult3->num_rows;
-    while($Interface = $DbResult3->fetch_assoc())
+    while ($Interface = $DbResult3->fetch_assoc())
     {
       $InterfaceName = $Device['Name'];
-      if($Interface['Name'] != '') $InterfaceName .= '-'.$Interface['Name'];
+      if ($Interface['Name'] != '') $InterfaceName .= '-'.$Interface['Name'];
         else $InterfaceName .= '-';
       $InterfaceName = RouterOSIdent($InterfaceName);
@@ -469 +469 @@
 
     // Process childs
-    foreach($Device['Childs'] as $DeviceChild)
+    foreach ($Device['Childs'] as $DeviceChild)
     {
       $this->BuildQueueItems($DeviceChild, $LimitDevice);
@@ -505 +505 @@
 
     $DbResult = $this->Database->select('Service', '*', '(`ChangeAction` IS NULL) AND (`Id`='.TARIFF_FREE.')');
-    if($DbResult->num_rows == 1)
+    if ($DbResult->num_rows == 1)
     {
       $Service = $DbResult->fetch_array();