Changeset 751

Timestamp:

Oct 5, 2015, 11:11:38 PM (9 years ago)

Author:

chronos

Message:

• Fixed: More robust decoding of wireless signal strenght which varies across RouterOS versions.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/Generators/Signal.php (modified) (1 diff)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 748; // Subversion revision
+$Revision = 751; // Subversion revision
 $DatabaseRevision = 748; // SQL structure revision
-$ReleaseTime = strtotime('2015-09-19');
+$ReleaseTime = strtotime('2015-10-04');

trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php

@@ -39 +39 @@
       } else $Interface = null;
 
-      $Parts = explode('@', $Properties['signal-strength']);
-      $Strength = substr($Parts[0], 0, -3); // without dBm
+      if(strpos($Properties['signal-strength'], '@') === false)
+      {
+        $Strength = $Properties['signal-strength'];
+      } else {
+        $Parts = explode('@', $Properties['signal-strength']);
+        if(substr($Parts[0], -3) == 'dBm')
+          $Strength = substr($Parts[0], 0, -3); // without dBm
+          else $Strength = $Parts[0];
+      }
+      echo($Properties['signal-strength'].' '.$Strength."\n");
       $RateRx = substr($Properties['rx-rate'], 0, -3); // without MHz
       $RateTx = substr($Properties['tx-rate'], 0, -3); // without MHz