Changeset 874 for trunk/Modules/TimeMeasure

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

Files:

• Graph.php (modified) (1 diff)
• Main.php (modified) (5 diffs)
• Measure.php (modified) (9 diffs)
• Measurement/System.php (modified) (11 diffs)
• Measurement/WoW.php (modified) (7 diffs)

trunk/Modules/TimeMeasure/Graph.php

@@ -20 +20 @@
   {
     $this->ClearPage = true;
-    return ($this->Render());
+    return $this->Render();
   }
 

trunk/Modules/TimeMeasure/Main.php

@@ -111 +111 @@
     $Output .= '</form>';
 
-    return ($Output);
+    return $Output;
   }
 
@@ -179 +179 @@
 
     $Output .= '<br/>'.$this->MeasureTable();
-    return ($Output);
+    return $Output;
   }
 
@@ -191 +191 @@
     $Output .= '<a href="?Measure='.$_SESSION['Measure'].'&amp;TimeStart='.
       $_SESSION['TimeStart'].'&amp;TimeEnd='.$_SESSION['TimeEnd'].'&amp;TimeSpecify=1&amp;Differential='.$_SESSION['Differential'].'">Odkaz na vybraný graf</a><br>';
-    return ($Output);
+    return $Output;
   }
 
@@ -260 +260 @@
     //echo($PrefixMultiplier->Add('-0.000000071112345', 'B'));
     $Output .= '</div>';
-    return ($Output);
+    return $Output;
   }
 }
@@ -271 +271 @@
 
     $Output = '';
-    if (!array_key_exists('MeasureId', $_GET)) return ('Nebylo zadáno Id měření.');
-    if (!array_key_exists('Value', $_GET)) return ('Nebyla zadána hodnota.');
+    if (!array_key_exists('MeasureId', $_GET)) return 'Nebylo zadáno Id měření.';
+    if (!array_key_exists('Value', $_GET)) return 'Nebyla zadána hodnota.';
     $Measure = new Measure($this->System);
     $Measure->Load($_GET['MeasureId']);
-    if (!isset($Measure->Data['Id'])) return ('Měření s Id '.$_GET['MeasureId'].' nenalezeno.');
+    if (!isset($Measure->Data['Id'])) return 'Měření s Id '.$_GET['MeasureId'].' nenalezeno.';
     $Measure->AddValue(array('Min' => $_GET['Value'], 'Avg' => $_GET['Value'], 'Max' => $_GET['Value']));
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/TimeMeasure/Measure.php

@@ -25 +25 @@
   function TimeSegment($Base, $Level)
   {
-    return (pow($this->LevelReducing, $Level) * $Base);
+    return pow($this->LevelReducing, $Level) * $Base;
   }
 
   function StatTableName($Level)
   {
-    if ($Level == 0) return ('Data');
-      else return ('DataCache');
+    if ($Level == 0) return 'Data';
+      else return 'DataCache';
   }
 
   function AlignTime($Time, $TimeSegment)
   {
-    return (round(($Time - $this->ReferenceTime) / $TimeSegment) * $TimeSegment + $this->ReferenceTime);
+    return round(($Time - $this->ReferenceTime) / $TimeSegment) * $TimeSegment + $this->ReferenceTime;
   }
 
@@ -124 +124 @@
   {
     $Y = ($Y2 - $Y1) / ($X2 - $X1) * ($X - $X1) + $Y1;
-    return ($Y);
+    return $Y;
   }
 
@@ -203 +203 @@
       $NewValue['Avg'] = $NewValue['Avg'] / ($RightTime - $LeftTime);
     }
-    return ($NewValue);
+    return $NewValue;
   }
 
@@ -228 +228 @@
       echo('AbsoluteRightTime: '.$AbsoluteRightTime.'('.TimeToMysqlDateTime($AbsoluteRightTime).')<br>');
     }
-    return (array('Left' => $AbsoluteLeftTime, 'Right' => $AbsoluteRightTime));
+    return array('Left' => $AbsoluteLeftTime, 'Right' => $AbsoluteRightTime);
   }
 
@@ -239 +239 @@
       $Row = $DbResult->fetch_assoc();
       $Row['Time'] = MysqlDateTimeToTime($Row['Time']);
-      return (array($Row));
+      return array($Row);
     } else
     {
@@ -253 +253 @@
       }
      // if ($Debug) print_r($Result);
-      return ($Result);
+      return $Result;
     }
   }
@@ -266 +266 @@
       $Row = $DbResult->fetch_assoc();
       $Row['Time'] = MysqlDateTimeToTime($Row['Time']);
-      return (array($Row));
+      return array($Row);
     } else
     {
@@ -280 +280 @@
         array_push($Result, array('Time' => (MysqlDateTimeToTime($Row['Time']) - 10), 'Min' => 0, 'Avg' => 0, 'Max' => 0, 'Continuity' => 0));
       }
-      return ($Result);
+      return $Result;
     }
   }
@@ -338 +338 @@
       if ($this->Debug) print_r($Points);
     } else $Points[] = array('Min' => 0, 'Avg' => 0, 'Max' => 0);
-    return ($Points);
+    return $Points;
   }
 

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;
   }
 }