Changeset 874 for trunk/Modules/TimeMeasure/Measurement

Timestamp:

Apr 6, 2020, 11:56:19 PM (5 years ago)

Author:

chronos

Message:

• Modified: Do not use parenthesis around returned value.

Location:

trunk/Modules/TimeMeasure/Measurement

Files:

• System.php (modified) (11 diffs)
• WoW.php (modified) (7 diffs)

trunk/Modules/TimeMeasure/Measurement/System.php

@@ -14 +14 @@
     {
       fclose($Fp1);
-      return (TRUE);
+      return TRUE;
     } else
     {
       //echo($ERROR_NO.','.$ERROR_STR);
-      return (FALSE);
+      return FALSE;
     }
     restore_error_handler();
@@ -34 +34 @@
       $Time = $Parts[7];
       $TimeParts = explode('=', $Time);
-      return ($TimeParts[1]);
-    } else return (0);
+      return $TimeParts[1];
+    } else return 0;
   }
 
@@ -48 +48 @@
     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);
   }
 
@@ -114 +114 @@
     }
     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);
   }
 
@@ -145 +145 @@
     $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);
   }
 
@@ -163 +163 @@
         $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];
   }
 }

trunk/Modules/TimeMeasure/Measurement/WoW.php

@@ -12 +12 @@
     $DbResult = $Database->query('SELECT COUNT(*) FROM account WHERE online=1');
     $Row = $DbResult->fetch_array();
-    return ($Row[0]);
+    return $Row[0];
   }
 
@@ -20 +20 @@
     $DbResult = $Database->query('SELECT COUNT(*) FROM account WHERE online=1 AND gmlevel > 0');
     $Row = $DbResult->fetch_array();
-    return ($Row[0]);
+    return $Row[0];
   }
 
@@ -28 +28 @@
     $DbResult = $Database->query('SELECT COUNT(*) FROM account');
     $Row = $DbResult->fetch_array();
-    return ($Row[0]);
+    return $Row[0];
   }
 
@@ -36 +36 @@
     $DbResult = $Database->query('SELECT COUNT(*) FROM guild');
     $Row = $DbResult->fetch_array();
-    return ($Row[0]);
+    return $Row[0];
   }
 
@@ -44 +44 @@
     $DbResult = $Database->query('SELECT COUNT(*) FROM `characters`');
     $Row = $DbResult->fetch_array();
-    return ($Row[0]);
+    return $Row[0];
   }
 
@@ -52 +52 @@
     $DbResult = $Database->query('SELECT COUNT(*) FROM uptime');
     $Row = $DbResult->fetch_array();
-    return ($Row[0]);
+    return $Row[0];
   }
 
   function WoWEmulatorAvailability()
   {
-    if (CheckPortStatus('localhost', 8085)) return (100); else return (0);
+    if (CheckPortStatus('localhost', 8085)) return 100;
+      else return 0;
   }
 
@@ -69 +70 @@
     $Row = $DbResult->fetch_array();
     $Value = $Row[0];
-    return ($Value);
+    return $Value;
   }
 }