Changeset 873 for trunk/Modules/TimeMeasure/Measurement/System.php

Timestamp:

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

Author:

chronos

Message:

• Modified: Improved code format.

File:

• trunk/Modules/TimeMeasure/Measurement/System.php (modified) (12 diffs)

trunk/Modules/TimeMeasure/Measurement/System.php

@@ -11 +11 @@
     set_error_handler('ErrorHandler');
     //error_reporting(0);
-    if($Fp1 = fsockopen($Ip, $Port, $ERROR_NO, $ERROR_STR, (float)$Timeout))
+    if ($Fp1 = fsockopen($Ip, $Port, $ERROR_NO, $ERROR_STR, (float)$Timeout))
     {
       fclose($Fp1);
-      return(TRUE);
+      return (TRUE);
     } else
     {
       //echo($ERROR_NO.','.$ERROR_STR);
-      return(FALSE);
+      return (FALSE);
     }
     restore_error_handler();
@@ -30 +30 @@
     // c - ping count
     $Parts = explode(' ', $Row[0]);
-    if(count($Parts) > 6)
+    if (count($Parts) > 6)
     {
       $Time = $Parts[7];
       $TimeParts = explode('=', $Time);
-      return($TimeParts[1]);
-    } else return(0);
+      return ($TimeParts[1]);
+    } else return (0);
   }
 
@@ -43 +43 @@
     exec('free -b', $Output);
     $Row = $Output[2];
-    while(strpos($Row, '  ') !== false) $Row = str_replace('  ', ' ', $Row);
+    while (strpos($Row, '  ') !== false) $Row = str_replace('  ', ' ', $Row);
     $RowParts = explode(' ', $Row);
     $Row = $Output[3];
-    while(strpos($Row, '  ') !== false) $Row = str_replace('  ', ' ', $Row);
+    while (strpos($Row, '  ') !== false) $Row = str_replace('  ', ' ', $Row);
     $RowParts2 = explode(' ', $Row);
-    return($RowParts[2] + $RowParts2[2]);
+    return ($RowParts[2] + $RowParts2[2]);
   }
 
@@ -81 +81 @@
     }
     file_put_contents($CpuStateFileName, serialize($CpuUsage));
-    return(100 - round($CpuUsagePercent['Idle'], 2));
+    return (100 - round($CpuUsagePercent['Idle'], 2));
   }
 
@@ -93 +93 @@
     array_shift($Output); // Skip header
     array_shift($Output); // Skip header
-    foreach($Output as $Item)
+    foreach ($Output as $Item)
     {
-      while(strpos($Item, '  ') !== false) $Item = str_replace('  ', ' ', $Item);  // Rrmove multiple spaces
+      while (strpos($Item, '  ') !== false) $Item = str_replace('  ', ' ', $Item);  // Rrmove multiple spaces
       $Item = explode(':', $Item);
       $Interface = trim($Item[0]);
       $Item = explode(' ', trim($Item[1]));
       $NetworkState[$Interface] = array('Down' => $Item[0], 'Up' => $Item[8]);
-      if(array_key_exists($Interface, $LastNetworkState))
+      if (array_key_exists($Interface, $LastNetworkState))
       {
         $Period = time() - $LastNetworkState['Time'];
@@ -110 +110 @@
         $NetworkState[$Interface]['UpAverage'] = 0;
       }
-      if($NetworkState[$Interface]['DownAverage'] < 0) $NetworkState[$Interface]['DownAverage'] = 0;
-      if($NetworkState[$Interface]['UpAverage'] < 0) $NetworkState[$Interface]['UpAverage'] = 0;
+      if ($NetworkState[$Interface]['DownAverage'] < 0) $NetworkState[$Interface]['DownAverage'] = 0;
+      if ($NetworkState[$Interface]['UpAverage'] < 0) $NetworkState[$Interface]['UpAverage'] = 0;
     }
     file_put_contents($NetworkStateFile, serialize($NetworkState));
-    return($NetworkState);
+    return ($NetworkState);
   }
 
@@ -120 +120 @@
   {
     $NetworkState = $this->GetNetworkState();
-    return($NetworkState['Interface']['DownAverage']);
+    return ($NetworkState['Interface']['DownAverage']);
   }
 
@@ -126 +126 @@
   {
     $NetworkState = $this->GetNetworkState();
-    return($NetworkState['Interface']['UpAverage']);
+    return ($NetworkState['Interface']['UpAverage']);
   }
 
@@ -134 +134 @@
     $Output = array();
     exec('cat /proc/net/nf_conntrack|grep "dst='.$HostIP.' "|grep "dport='.$Port.' "|grep "ASSURED"', $Output);
-    return(count($Output));
+    return (count($Output));
   }
 
@@ -142 +142 @@
     exec('iostat -d '.$Device.' -x -m 2 2', $Output);   // 2 second measure delay
     $Row = $Output[6];
-    while(strpos($Row, '  ') !== false) $Row = str_replace('  ', ' ', $Row);
+    while (strpos($Row, '  ') !== false) $Row = str_replace('  ', ' ', $Row);
     $Parts = explode(' ', $Row);
     $Value = str_replace(',', '.', $Parts[11]);
-    return($Value);
+    return ($Value);
   }
 
   function DiskFree($Path)
   {
-    return(disk_free_space($Path));
+    return (disk_free_space($Path));
   }
 
@@ -157 +157 @@
     $Output = array();
     exec('/usr/bin/sensors', $Output);
-    foreach($Output as $Line)
+    foreach ($Output as $Line)
     {
-      if(substr($Line, 0, strlen($Sensor)) == $Sensor)
+      if (substr($Line, 0, strlen($Sensor)) == $Sensor)
       {
         $Line = substr($Line, strpos($Line, '+') + 1);
         $Line = substr($Line, 0, strpos($Line, '°'));
-        return($Line);
+        return ($Line);
       }
     }
-    return(0);
+    return (0);
   }
 
@@ -175 +175 @@
     fclose($File);
     $UptimeParts = explode(' ', $Uptime);
-    return($UptimeParts[0]);
+    return ($UptimeParts[0]);
   }
 }