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

Timestamp:

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

Author:

chronos

Message:

• Modified: Improved code format.

File:

• trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php (modified) (6 diffs)

trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php

@@ -12 +12 @@
         '(SELECT `LocalIP` FROM `NetworkInterface` WHERE `NetworkInterface`.`Device` = `NetworkDevice`.`Id` LIMIT 1) AS `LocalIP` '.
         'FROM `NetworkDevice` WHERE (`API` = 1) AND (`Used` = 1)');
-    while($Device = $DbResult3->fetch_assoc())
+    while ($Device = $DbResult3->fetch_assoc())
     {
       echo($Device['LocalIP']."\n");
@@ -19 +19 @@
       //$Routerboard->Port = 8729;
       $Routerboard->Connect($Device['LocalIP'], $this->System->Config['API']['UserName'], $this->System->Config['API']['Password']);
-      if(!$Routerboard->Connected) continue;
+      if (!$Routerboard->Connected) continue;
       $Routerboard->Write('/interface/wireless/registration-table/getall', false);
       $Routerboard->Write('=.proplist=signal-strength,mac-address,rx-rate,tx-rate', false);
@@ -25 +25 @@
       $Read = $Routerboard->Read(false);
       $Array = $Routerboard->ParseResponse($Read);
-      foreach($Array as $Properties)
+      foreach ($Array as $Properties)
       {
         $DbResult = $this->Database->select('NetworkInterface', 'Id', 'MAC="'.$Properties['mac-address'].'"');
-        if($DbResult->num_rows > 0)
+        if ($DbResult->num_rows > 0)
         {
           $DbRow = $DbResult->fetch_assoc();
@@ -34 +34 @@
         } else $Interface = 'NULL';
 
-        if(strpos($Properties['signal-strength'], '@') === false)
+        if (strpos($Properties['signal-strength'], '@') === false)
         {
           $Strength = $Properties['signal-strength'];
         } else {
           $Parts = explode('@', $Properties['signal-strength']);
-          if(substr($Parts[0], -3) == 'dBm')
+          if (substr($Parts[0], -3) == 'dBm')
             $Strength = substr($Parts[0], 0, -3); // without dBm
             else $Strength = $Parts[0];
@@ -50 +50 @@
         /*
          $DbResult = $this->Database->select('Measure', 'Id', '`Name` = "'.$Properties['mac-address'].'"');
-         if($DbResult->num_rows > 0)
+         if ($DbResult->num_rows > 0)
          {
          $this->Database->insert('Measure', array('Name' => $Properties['mac-address']));
@@ -74 +74 @@
     if (substr($Value, -3, 3) == "Mbp") $Value = substr($Value, 0, -3); // without Mbp unit    
     if (substr($Value, -1, 1) == "M") $Value = substr($Value, 0, -1); // without M unit
-    return($Value);
+    return ($Value);
   }