Changeset 873 for trunk/Modules/TimeMeasure

Timestamp:

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

Author:

chronos

Message:

• Modified: Improved code format.

Location:

trunk/Modules/TimeMeasure

Files:

• Graph.php (modified) (10 diffs)
• Main.php (modified) (18 diffs)
• Measure.php (modified) (28 diffs)
• Measurement/MeasureClient.php (modified) (2 diffs)
• Measurement/System.php (modified) (12 diffs)
• Measurement/WoW.php (modified) (7 diffs)

trunk/Modules/TimeMeasure/Graph.php

@@ -20 +20 @@
   {
     $this->ClearPage = true;
-    return($this->Render());
+    return ($this->Render());
   }
 
@@ -27 +27 @@
     $PrefixMultiplier = new PrefixMultiplier();
 
-    if(array_key_exists('Debug', $_GET)) $Debug = $_GET['Debug'];
+    if (array_key_exists('Debug', $_GET)) $Debug = $_GET['Debug'];
       else $Debug = 0;
 
-    if(!array_key_exists('From', $_GET)) die('Musíte zadat čas počátku');
+    if (!array_key_exists('From', $_GET)) die('Musíte zadat čas počátku');
     $StartTime = addslashes($_GET['From']);
-    if(!array_key_exists('To', $_GET)) die('Musíte zadat čas konce');
+    if (!array_key_exists('To', $_GET)) die('Musíte zadat čas konce');
     $EndTime = addslashes($_GET['To']);
-    if($EndTime < $StartTime) $EndTime = $StartTime + 60;
+    if ($EndTime < $StartTime) $EndTime = $StartTime + 60;
     $TimeDifference = $EndTime - $StartTime;
-    if(!array_key_exists('Measure', $_GET)) die('Musíte zadat měřenou veličinu');
+    if (!array_key_exists('Measure', $_GET)) die('Musíte zadat měřenou veličinu');
     $MeasureId = addslashes($_GET['Measure']);
-    if(!array_key_exists('Width', $_GET)) $Width = $this->DefaultWidth;
+    if (!array_key_exists('Width', $_GET)) $Width = $this->DefaultWidth;
       else $Width = addslashes($_GET['Width']);
-    if(!array_key_exists('Height', $_GET)) $Height = $this->DefaultHeight;
+    if (!array_key_exists('Height', $_GET)) $Height = $this->DefaultHeight;
       else $Height = addslashes($_GET['Height']);
-    if(!array_key_exists('Differential', $_GET)) $Differential = $this->Config['Application']['DefaultVariables']['Differential'];
+    if (!array_key_exists('Differential', $_GET)) $Differential = $this->Config['Application']['DefaultVariables']['Differential'];
       else $Differential = addslashes($_GET['Differential']);
     $VerticalLinesCount = round($Height / ($this->FontSize + 4));
@@ -63 +63 @@
 
     $Level = floor(log(($EndTime - $StartTime) / $Measure->DivisionCount / 60) / log($Measure->LevelReducing)) - 1;
-    if($Level < 0) $Level = 0;
-    if($Level > $Measure->MaxLevel) $Level = $Measure->MaxLevel;
+    if ($Level < 0) $Level = 0;
+    if ($Level > $Measure->MaxLevel) $Level = $Measure->MaxLevel;
     //$Level = 0;
 
     $Points = $Measure->GetValues($StartTime, $EndTime, $Level);
 
-    if($Debug) echo('Points count: '.count($Points).'<br/>');
-    //if($Debug) foreach($Points as $Index => $Item)
+    if ($Debug) echo('Points count: '.count($Points).'<br/>');
+    //if ($Debug) foreach ($Points as $Index => $Item)
     // echo($Index.': '.$Item['min'].'<br>');
 
@@ -77 +77 @@
     $AvgValue = 0;
     $MinValue = 1000000000000000000;
-    foreach($Points as $Index => $Item)
+    foreach ($Points as $Index => $Item)
     {
       //$Points[$Index]['min'] =  $Points[$Index]['min'] / $Measure['Divider'];
       //$Points[$Index]['avg'] =  $Points[$Index]['avg'] / $Measure['Divider'];
       //$Points[$Index]['max'] =  $Points[$Index]['max'] / $Measure['Divider'];
-      if($Points[$Index]['Avg'] > $MaxValue) $MaxValue = $Points[$Index]['Avg'];
-      if($Points[$Index]['Avg'] < $MinValue) $MinValue = $Points[$Index]['Avg'];
-      if($Points[$Index]['Max'] > $MaxValue) $MaxValue = $Points[$Index]['Max'];
-      if($Points[$Index]['Min'] < $MinValue) $MinValue = $Points[$Index]['Min'];
+      if ($Points[$Index]['Avg'] > $MaxValue) $MaxValue = $Points[$Index]['Avg'];
+      if ($Points[$Index]['Avg'] < $MinValue) $MinValue = $Points[$Index]['Avg'];
+      if ($Points[$Index]['Max'] > $MaxValue) $MaxValue = $Points[$Index]['Max'];
+      if ($Points[$Index]['Min'] < $MinValue) $MinValue = $Points[$Index]['Min'];
       $AvgValue = $AvgValue + $Points[$Index]['Avg'];
     }
@@ -96 +96 @@
     $PointsAvg = array(0, $Height - 1);
     $PointsMax = array(0, $Height - 1);
-    if(($MaxValue - $MinValue) == 0) $MaxValue = $MinValue + 1;
+    if (($MaxValue - $MinValue) == 0) $MaxValue = $MinValue + 1;
     {
-      foreach($Points as $Index => $Item)
+      foreach ($Points as $Index => $Item)
       {
         $PointsMin[] = $Index * $Width / $Measure->DivisionCount;
@@ -128 +128 @@
 
     // Generate image
-    if(!$Debug)
+    if (!$Debug)
     {
       Header('Content-type: image/png');
@@ -153 +153 @@
       $TimeRange = $EndTime - $StartTime;
       $TimeMarksIndex = 0;
-      while(($TimeRange / $TimeMarks[$TimeMarksIndex]) > 1) $TimeMarksIndex += 1;
-      if($TimeMarksIndex < 2) $TimeMarksIndex = 2;
+      while (($TimeRange / $TimeMarks[$TimeMarksIndex]) > 1) $TimeMarksIndex += 1;
+      if ($TimeMarksIndex < 2) $TimeMarksIndex = 2;
       $MajorTimeMarks = $TimeMarks[$TimeMarksIndex - 1];
       $MinorTimeMarks = $TimeMarks[$TimeMarksIndex - 2];
@@ -163 +163 @@
       // Zobraz měřítko Y
       $VerticalLinesDistance = $Height / $VerticalLinesCount;
-      for($I = 1; $I <= $VerticalLinesCount; $I++)
+      for ($I = 1; $I <= $VerticalLinesCount; $I++)
       {
         $Y = $Height - 1 - ($VerticalLinesDistance * $I);
-        for($X = 1; $X < $Width; $X = $X + 3) imagesetpixel($Image, $X, $Y, $Gray);
+        for ($X = 1; $X < $Width; $X = $X + 3) imagesetpixel($Image, $X, $Y, $Gray);
         //imageline($Image, 30, $Y, $Width-1, $Y, IMG_COLOR_STYLED);
       }
@@ -174 +174 @@
       // Zobraz měřítko X
       $LastTextEnd = 0;
-      for($Time = $StartTime; $Time < $EndTime; $Time += $MajorTimeMarks)
+      for ($Time = $StartTime; $Time < $EndTime; $Time += $MajorTimeMarks)
       {
         $X = round(($Time - $StartTime + $TimeShift) / $TimeRange * $Width) % $Width;
         //imageline($Image, 30, $Y, $Width-1, $Y, IMG_COLOR_STYLED);
-        if(($MajorTimeMarks > 60 * 60 * 24)) $Text = date('j.n.Y', $Time + $TimeShift);
+        if (($MajorTimeMarks > 60 * 60 * 24)) $Text = date('j.n.Y', $Time + $TimeShift);
           else $Text = date('j.n.Y G:i', $Time + $TimeShift);
         $BoundBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
-        if($LastTextEnd < ($X - ($BoundBox[2] - $BoundBox[0] + 20) / 2))
+        if ($LastTextEnd < ($X - ($BoundBox[2] - $BoundBox[0] + 20) / 2))
         {
-          for($Y = 0; $Y < $Height; $Y = $Y + 1) imagesetpixel($Image, $X, $Y, $Gray);
+          for ($Y = 0; $Y < $Height; $Y = $Y + 1) imagesetpixel($Image, $X, $Y, $Gray);
           imagettftext($Image, $FontSize, 0, $X - ($BoundBox[2] - $BoundBox[0]) / 2,  $Height - 2, $Black, $FontFile, $Text);
           $LastTextEnd = $X + ($BoundBox[2] - $BoundBox[0]) / 2;
         }
-        else for($Y = 0; $Y < $Height; $Y = $Y + 3) imagesetpixel($Image, $X, $Y, $Gray);
+        else for ($Y = 0; $Y < $Height; $Y = $Y + 3) imagesetpixel($Image, $X, $Y, $Gray);
       }
 
       // Popisky osy Y
-      for($I = 1; $I <= $VerticalLinesCount; $I++)
+      for ($I = 1; $I <= $VerticalLinesCount; $I++)
       {
         $Y = $Height - 1 - ($VerticalLinesDistance * $I);
@@ -199 +199 @@
           $this->ValueToImageHeigthCoefficient * ($MaxValue - $MinValue) + $MinValue)), $MeasureMethod['Unit'], 3);
         $BoundBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
-        if(($Y - ($BoundBox[5] - $BoundBox[1]) / 2) > 10)
+        if (($Y - ($BoundBox[5] - $BoundBox[1]) / 2) > 10)
           imagettftext($Image, $FontSize, 0, 2,  $Y - ($BoundBox[5] - $BoundBox[1]) / 2, $Black, $FontFile, $Text);
       }

trunk/Modules/TimeMeasure/Main.php

@@ -62 +62 @@
     // Day selection
     $Output .= '<select name="Day">';
-    for($I = 1; $I < 32; $I++)
-    {
-      if($I == $TimeParts['mday']) $Selected = ' selected="1"'; else $Selected = '';
+    for ($I = 1; $I < 32; $I++)
+    {
+      if ($I == $TimeParts['mday']) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
     }
@@ -71 +71 @@
     // Month selection
     $Output .= '<select name="Month">';
-    foreach($MonthNames as $Index => $Month)
-    {
-      if($Index == $TimeParts['mon']) $Selected = ' selected="1"'; else $Selected = '';
-      if($Index > 0) $Output .= '<option value="'.$Index.'"'.$Selected.'>'.$Month.'</option>';
+    foreach ($MonthNames as $Index => $Month)
+    {
+      if ($Index == $TimeParts['mon']) $Selected = ' selected="1"'; else $Selected = '';
+      if ($Index > 0) $Output .= '<option value="'.$Index.'"'.$Selected.'>'.$Month.'</option>';
     }
     $Output .= '</select>. ';
@@ -80 +80 @@
     // Day selection
     $Output .= '<select name="Year">';
-    for($I = 2000; $I < 2010; $I++)
-    {
-      if($I == $TimeParts['year']) $Selected = ' selected="1"'; else $Selected = '';
+    for ($I = 2000; $I < 2010; $I++)
+    {
+      if ($I == $TimeParts['year']) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
     }
@@ -89 +89 @@
     // Hour selection
     $Output .= '<select name="Hour">';
-    for($I = 0; $I < 24; $I++)
-    {
-      if($I == $TimeParts['hours']) $Selected = ' selected="1"'; else $Selected = '';
+    for ($I = 0; $I < 24; $I++)
+    {
+      if ($I == $TimeParts['hours']) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
     }
@@ -98 +98 @@
     // Minute selection
     $Output .= '<select name="Minute">';
-    for($I = 0; $I < 60; $I++)
-    {
-      if($I == $TimeParts['minutes']) $Selected = ' selected="1"'; else $Selected = '';
+    for ($I = 0; $I < 60; $I++)
+    {
+      if ($I == $TimeParts['minutes']) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
     }
@@ -111 +111 @@
     $Output .= '</form>';
 
-    return($Output);
+    return ($Output);
   }
 
@@ -118 +118 @@
     $Debug = 0;
 
-    foreach($this->DefaultVariables as $Index => $Variable)
-    {
-      if(!array_key_exists($Index, $_SESSION)) $_SESSION[$Index] = $Variable;
-      if(array_key_exists($Index, $_GET)) $_SESSION[$Index] = $_GET[$Index];
-      if(array_key_exists($Index, $_POST)) $_SESSION[$Index] = $_POST[$Index];
+    foreach ($this->DefaultVariables as $Index => $Variable)
+    {
+      if (!array_key_exists($Index, $_SESSION)) $_SESSION[$Index] = $Variable;
+      if (array_key_exists($Index, $_GET)) $_SESSION[$Index] = $_GET[$Index];
+      if (array_key_exists($Index, $_POST)) $_SESSION[$Index] = $_POST[$Index];
       //$$Index = $_SESSION[$Index];
     }
 
-    if($_SESSION['TimeSpecify'] == 0)
+    if ($_SESSION['TimeSpecify'] == 0)
     {
       $_SESSION['TimeEnd'] = time() - 60;
@@ -134 +134 @@
     $Output = '<div style="text-align: center;">';
 
-    if(!array_key_exists('Operation', $_GET)) $_GET['Operation'] = '';
-    switch($_GET['Operation'])
+    if (!array_key_exists('Operation', $_GET)) $_GET['Operation'] = '';
+    switch ($_GET['Operation'])
     {
       case 'SetTime':
-        if(array_key_exists('Time', $_GET) and array_key_exists('Month', $_POST) and array_key_exists('Day', $_POST) and
+        if (array_key_exists('Time', $_GET) and array_key_exists('Month', $_POST) and array_key_exists('Day', $_POST) and
           array_key_exists('Year', $_POST) and array_key_exists('Hour', $_POST) and array_key_exists('Minute', $_POST))
         {
-          if(($_GET['Time'] == 'TimeStart') or ($_GET['Time'] == 'TimeEnd'))
+          if (($_GET['Time'] == 'TimeStart') or ($_GET['Time'] == 'TimeEnd'))
           {
             $_SESSION[$_GET['Time']] = mktime($_POST['Hour'], $_POST['Minute'], 0, $_POST['Month'],
@@ -150 +150 @@
         break;
       case 'SetTimeNow':
-        if(array_key_exists('Time', $_GET))
+        if (array_key_exists('Time', $_GET))
         {
-          if(($_GET['Time'] == 'TimeStart') or ($_GET['Time'] == 'TimeEnd'))
+          if (($_GET['Time'] == 'TimeStart') or ($_GET['Time'] == 'TimeEnd'))
           {
             $_SESSION[$_GET['Time']] = time();
@@ -162 +162 @@
     $Output .= '<strong>Časový úsek:</strong><br>';
     // Show graf time range menu
-    if($_SESSION['TimeSpecify'] == 0)
+    if ($_SESSION['TimeSpecify'] == 0)
     {
       $Output .= 'Délka úseku: ';
-      foreach($this->GraphTimeRanges as $Index => $Item)
+      foreach ($this->GraphTimeRanges as $Index => $Item)
         $Output .= '<a href="?Period='.$Index.'">'.$Item['caption'].'</a>&nbsp;';
       $Output .= '<br/>';
@@ -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);
   }
 
@@ -212 +212 @@
       array('Name' => 'Description', 'Title' => 'Popis'),
     );
-    if(array_key_exists('Debug', $_GET))
+    if (array_key_exists('Debug', $_GET))
     {
       $TableColumns[] = array('Name' => 'ItemCount', 'Title' => 'Počet položek');
@@ -221 +221 @@
 
     $Result = $this->Database->select('Measure', '*', '`Enabled`=1 '.$Order['SQL'].$PageList['SQLLimit']);
-    while($Measure = $Result->fetch_array())
+    while ($Measure = $Result->fetch_array())
     {
       $DbResult2 = $this->Database->select('MeasureMethod', '*', '`Id`='.$Measure['Method']);
       $MeasureMethod = $DbResult2->fetch_assoc();
       $StopWatchStart = GetMicrotime();
-      if(array_key_exists('Debug', $_GET))
+      if (array_key_exists('Debug', $_GET))
       {
         $DbResult = $this->Database->select($Measure['DataTable'], 'COUNT(*)', 'Measure='.$Measure['Id']);
@@ -233 +233 @@
       }
       $Result2 = $this->Database->select($Measure['DataTable'], 'Time, Avg', 'Measure='.$Measure['Id'].' AND Level=0 ORDER BY Time DESC LIMIT 1');
-      if($Result2->num_rows > 0)
+      if ($Result2->num_rows > 0)
       {
         $Row = $Result2->fetch_array();
@@ -243 +243 @@
         $LastMeasureValue = '&nbsp;';
       }
-      if($Measure['Continuity'] == 1) $Interpolate = 'Ano';
+      if ($Measure['Continuity'] == 1) $Interpolate = 'Ano';
         else $Interpolate = 'Ne';
-      //if($Measure['Description'] == '') $Measure['Description'] = '&nbsp;';
+      //if ($Measure['Description'] == '') $Measure['Description'] = '&nbsp;';
       $GenerationTime = floor((GetMicrotime() - $StopWatchStart) * 1000  ) / 1000;
       $Output .= '<tr><td><a href="?Measure='.$Measure['Id'].'&amp;Differential=0">'.$Measure['Name'].'</a></td><td align="center">'.$LastMeasureValue.'</td><td align="center">'.$LastMeasureTime.'</td><td align="center">'.$Interpolate.'</td><td>'.$Measure['Description'].'</td>';
-      if(array_key_exists('Debug', $_GET)) $Output .= '<td>'.$RowCount.'</td><td>'.$GenerationTime.'</td>';
+      if (array_key_exists('Debug', $_GET)) $Output .= '<td>'.$RowCount.'</td><td>'.$GenerationTime.'</td>';
       $Output .= '</tr>';
     }
@@ -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

@@ -15 +15 @@
   {
     $Result = $this->Database->select('Measure', '*', 'Id='.$Id);
-    if($Result->num_rows > 0)
+    if ($Result->num_rows > 0)
     {
       $this->Data = $Result->fetch_assoc();
-      if($this->Data['Continuity'] == 0) $this->Data['ContinuityEnabled'] = 0;  // non continuous
+      if ($this->Data['Continuity'] == 0) $this->Data['ContinuityEnabled'] = 0;  // non continuous
         else $this->Data['ContinuityEnabled'] = 2;    // continuous graph
     } else throw new Exception('Measure not found');
@@ -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);
   }
 
   function AddValue($Value = array('Min' => 0, 'Avg' => 0, 'Max' => 0), $Level = 0, $Time = 0)
   {
-    if($Time == 0) $Time = time();
+    if ($Time == 0) $Time = time();
 
     $Result = $this->Database->select($this->Data['DataTable'], '*', 'Measure='.
       $this->Data['Id'].' AND Level='.$Level.' ORDER BY Time DESC LIMIT 2');
-    if($Result->num_rows == 0)
+    if ($Result->num_rows == 0)
     {
        $this->Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'],
          'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level,
          'Measure' => $this->Data['Id'], 'Time' => TimeToMysqlDateTime($Time), 'Continuity' => 0));
-    } else if($Result->num_rows == 1)
+    } else if ($Result->num_rows == 1)
     {
       $this->Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'],
@@ -59 +59 @@
       $LastValue = $Result->fetch_assoc();
       $NextToLastValue = $Result->fetch_assoc();
-      if((($Time - MysqlDateTimeToTime($LastValue['Time'])) < 0.75 * $this->Data['Period']) and ($Level == 0))
+      if ((($Time - MysqlDateTimeToTime($LastValue['Time'])) < 0.75 * $this->Data['Period']) and ($Level == 0))
       {
         echo('Too short period. Minimal period is '.(0.75 * $this->Data['Period'])." seconds\n");
       } else
       {
-        if(($Time - MysqlDateTimeToTime($LastValue['Time'])) < 1.25 * $this->Data['Period']) $Continuity = 1;
+        if (($Time - MysqlDateTimeToTime($LastValue['Time'])) < 1.25 * $this->Data['Period']) $Continuity = 1;
           else $Continuity = 0;
-        if(($LastValue['Min'] == $NextToLastValue['Min']) and ($LastValue['Min'] ==
+        if (($LastValue['Min'] == $NextToLastValue['Min']) and ($LastValue['Min'] ==
           $Value['Min']) and ($LastValue['Avg'] == $NextToLastValue['Avg']) and
           ($LastValue['Avg'] == $Value['Avg']) and ($LastValue['Max'] == $NextToLastValue['Max'])
@@ -82 +82 @@
 
       // Update next level
-      if($Level < $this->MaxLevel)
+      if ($Level < $this->MaxLevel)
       {
         $Level = $Level + 1;
         $TimeSegment = $this->TimeSegment($this->Data['Period'], 1);
         $EndTime = $this->AlignTime($Time, $TimeSegment);
-        //if($EndTime < $Time) $EndTime = $EndTime + $TimeSegment;
+        //if ($EndTime < $Time) $EndTime = $EndTime + $TimeSegment;
         $StartTime = $EndTime - $TimeSegment;
 
@@ -96 +96 @@
           TimeToMysqlDateTime($StartTime).'") AND (Time < "'.TimeToMysqlDateTime($EndTime).
             '") AND (Measure='.$this->Data['Id'].') AND (Level='.($Level - 1).') ORDER BY Time');
-        while($Row = $Result->fetch_assoc())
+        while ($Row = $Result->fetch_assoc())
         {
           $Row['Time'] = MysqlDateTimeToTime($Row['Time']);
           $Values[] = $Row;
         }
-        //if(count($Values) > 2)
+        //if (count($Values) > 2)
         {
           //array_pop($Values);
@@ -124 +124 @@
   {
     $Y = ($Y2 - $Y1) / ($X2 - $X1) * ($X - $X1) + $Y1;
-    return($Y);
+    return ($Y);
   }
 
@@ -132 +132 @@
 
     // Trim outside parts
-    foreach($this->ValueTypes as $ValueType)
+    foreach ($this->ValueTypes as $ValueType)
     {
       $Values[0][$ValueType] = $this->Interpolation($Values[0]['Time'], $Values[0][$ValueType], $Values[1]['Time'], $Values[1][$ValueType], $LeftTime);
     }
     $Values[0]['Time'] = $LeftTime;
-    foreach($this->ValueTypes as $ValueType)
+    foreach ($this->ValueTypes as $ValueType)
     {
         $Values[count($Values) - 1][$ValueType] = $this->Interpolation($Values[count($Values) - 2]['Time'], $Values[count($Values) - 2][$ValueType],
@@ -145 +145 @@
 
     // Perform computation
-    foreach($this->ValueTypes as $ValueType)
+    foreach ($this->ValueTypes as $ValueType)
     {
       // Compute new value
-      for($I = 0; $I < (count($Values) - 1); $I++)
-      {
-        if($ValueType == 'Avg')
-        {
-          if($Values[$I + 1]['Continuity'] == $this->Data['ContinuityEnabled']);
-          else if($this->Differential == 0)
+      for ($I = 0; $I < (count($Values) - 1); $I++)
+      {
+        if ($ValueType == 'Avg')
+        {
+          if ($Values[$I + 1]['Continuity'] == $this->Data['ContinuityEnabled']);
+          else if ($this->Differential == 0)
           {
             $NewValue[$ValueType] = $NewValue[$ValueType] + ($Values[$I + 1]['Time'] - $Values[$I]['Time']) *
@@ -163 +163 @@
           }
         }
-        else if($ValueType == 'Max')
-        {
-          if($Values[$I + 1]['Continuity'] == $this->Data['ContinuityEnabled'])
-          {
-            if(0 > $NewValue[$ValueType]) $NewValue[$ValueType] = 0;
+        else if ($ValueType == 'Max')
+        {
+          if ($Values[$I + 1]['Continuity'] == $this->Data['ContinuityEnabled'])
+          {
+            if (0 > $NewValue[$ValueType]) $NewValue[$ValueType] = 0;
           } else
           {
-            if($this->Differential == 0)
+            if ($this->Differential == 0)
             {
-              if($Values[$I + 1][$ValueType] > $NewValue[$ValueType]) $NewValue[$ValueType] = $Values[$I + 1][$ValueType];
+              if ($Values[$I + 1][$ValueType] > $NewValue[$ValueType]) $NewValue[$ValueType] = $Values[$I + 1][$ValueType];
             } else {
               $Difference = $Values[$I + 1][$ValueType] - $Values[$I][$ValueType];
-              if($Difference > $NewValue[$ValueType]) $NewValue[$ValueType] = $Difference;
+              if ($Difference > $NewValue[$ValueType]) $NewValue[$ValueType] = $Difference;
             }
           }
         }
-        else if($ValueType == 'Min')
-        {
-          if($Values[$I + 1]['Continuity'] == $this->Data['ContinuityEnabled'])
-          {
-            if(0 < $NewValue[$ValueType]) $NewValue[$ValueType] = 0;
+        else if ($ValueType == 'Min')
+        {
+          if ($Values[$I + 1]['Continuity'] == $this->Data['ContinuityEnabled'])
+          {
+            if (0 < $NewValue[$ValueType]) $NewValue[$ValueType] = 0;
           } else
           {
-            if($this->Differential == 0)
+            if ($this->Differential == 0)
             {
-              if($Values[$I + 1][$ValueType] < $NewValue[$ValueType]) $NewValue[$ValueType] = $Values[$I + 1][$ValueType];
+              if ($Values[$I + 1][$ValueType] < $NewValue[$ValueType]) $NewValue[$ValueType] = $Values[$I + 1][$ValueType];
             } else {
               $Difference = $Values[$I + 1][$ValueType] - $Values[$I][$ValueType];
-              if($Difference < $NewValue[$ValueType]) $NewValue[$ValueType] = $Difference;
+              if ($Difference < $NewValue[$ValueType]) $NewValue[$ValueType] = $Difference;
             }
           }
@@ -198 +198 @@
       $NewValue[$ValueType] = $NewValue[$ValueType];
     }
-    //if(($RightTime - $LeftTime) > 0)
-    if($this->Data['Cumulative'] == 0)
+    //if (($RightTime - $LeftTime) > 0)
+    if ($this->Data['Cumulative'] == 0)
     {
       $NewValue['Avg'] = $NewValue['Avg'] / ($RightTime - $LeftTime);
     }
-    return($NewValue);
+    return ($NewValue);
   }
 
@@ -210 +210 @@
     // Get first and last time
     $Result = $this->Database->select($this->Data['DataTable'], '*', 'Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time LIMIT 1');
-    if($Result->num_rows > 0)
+    if ($Result->num_rows > 0)
     {
       $Row = $Result->fetch_assoc();
@@ -217 +217 @@
 
     $Result = $this->Database->select($this->Data['DataTable'], '*', 'Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time DESC LIMIT 1');
-    if($Result->num_rows > 0)
+    if ($Result->num_rows > 0)
     {
       $Row = $Result->fetch_assoc();
@@ -223 +223 @@
     } else $AbsoluteRightTime = 0;
 
-    if($this->Debug)
+    if ($this->Debug)
     {
       echo('AbsoluteLeftTime: '.$AbsoluteLeftTime.'('.TimeToMysqlDateTime($AbsoluteLeftTime).')<br>');
       echo('AbsoluteRightTime: '.$AbsoluteRightTime.'('.TimeToMysqlDateTime($AbsoluteRightTime).')<br>');
     }
-    return(array('Left' => $AbsoluteLeftTime, 'Right' => $AbsoluteRightTime));
+    return (array('Left' => $AbsoluteLeftTime, 'Right' => $AbsoluteRightTime));
   }
 
@@ -235 +235 @@
     $Result = array();
     $DbResult = $this->Database->select($this->Data['DataTable'], '*', 'Time > "'.TimeToMysqlDateTime($Time).'" AND Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time ASC LIMIT 1');
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $Row = $DbResult->fetch_assoc();
       $Row['Time'] = MysqlDateTimeToTime($Row['Time']);
-      return(array($Row));
+      return (array($Row));
     } else
     {
@@ -247 +247 @@
       $DbResult = $this->Database->select($this->Data['DataTable'], '*', 'Time < "'.
         TimeToMysqlDateTime($Time).'" AND Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time DESC LIMIT 1');
-      if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
       {
         $Row = $DbResult->fetch_assoc();
         array_unshift($Result, array('Time' => (MysqlDateTimeToTime($Row['Time']) + 10), 'Min' => 0, 'Avg' => 0, 'Max' => 0, 'Continuity' => 0));
       }
-     // if($Debug) print_r($Result);
-      return($Result);
+     // if ($Debug) print_r($Result);
+      return ($Result);
     }
   }
@@ -262 +262 @@
     $DbResult = $this->Database->select($this->Data['DataTable'], '*', '(Time < "'.
       TimeToMysqlDateTime($Time).'") AND (Measure='.$this->Data['Id'].') AND (Level='.$Level.') ORDER BY Time DESC LIMIT 1');
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $Row = $DbResult->fetch_assoc();
       $Row['Time'] = MysqlDateTimeToTime($Row['Time']);
-      return(array($Row));
+      return (array($Row));
     } else
     {
       //$Time = $Values[0]['Time'] - 60;
       //array_unshift($Values, array('Time' => $Time, 'Min' => 0, 'Avg' => 0, 'Max' => 0, 'Continuity' => 0));
-      if($this->Debug) echo($this->TimeSegment($this->Data['Period'], $Level));
+      if ($this->Debug) echo($this->TimeSegment($this->Data['Period'], $Level));
       $Result[] = array('Time' => ($Time - $this->TimeSegment($this->Data['Period'], $Level)), 'Min' => 0, 'Avg' => 0, 'Max' => 0, 'Continuity' => 0);
 
       $DbResult = $this->Database->select($this->Data['DataTable'], '*', 'Time > "'.TimeToMysqlDateTime($Time).'" AND Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time ASC LIMIT 1');
-      if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
       {
         $Row = $DbResult->fetch_assoc();
         array_push($Result, array('Time' => (MysqlDateTimeToTime($Row['Time']) - 10), 'Min' => 0, 'Avg' => 0, 'Max' => 0, 'Continuity' => 0));
       }
-      return($Result);
+      return ($Result);
     }
   }
@@ -286 +286 @@
   function GetValues($TimeFrom, $TimeTo, $Level)
   {
-    if($this->Debug) echo('TimeFrom: '.$TimeFrom.'('.TimeToMysqlDateTime($TimeFrom).')<br>');
-    if($this->Debug) echo('TimeTo: '.$TimeTo.'('.TimeToMysqlDateTime($TimeTo).')<br>');
+    if ($this->Debug) echo('TimeFrom: '.$TimeFrom.'('.TimeToMysqlDateTime($TimeFrom).')<br>');
+    if ($this->Debug) echo('TimeTo: '.$TimeTo.'('.TimeToMysqlDateTime($TimeTo).')<br>');
 
     //$AbsoluteTime = GetTimeRange($MeasureId);
 
-    //  if(($TimeFrom > $AbsoluteLeftTime) and ($TimeStart < $AbsoluteRightTime) and
+    //  if (($TimeFrom > $AbsoluteLeftTime) and ($TimeStart < $AbsoluteRightTime) and
     //    ($TimeTo > $AbsoluteLeftTime) and ($TimeTo < $AbsoluteRightTime))
     //  {
@@ -304 +304 @@
     //  echo(DB_NumRows());
     //  $III = 0;
-    while($Row = $Result->fetch_assoc())
+    while ($Row = $Result->fetch_assoc())
     {
       //    echo($III.' '.$Row['Time'].' '.memory_get_usage().',');
@@ -314 +314 @@
     //  echo('abc');
     //  die();
-    if($this->Debug) echo('Item count: '.count($Values));
+    if ($this->Debug) echo('Item count: '.count($Values));
 
     $Points = array();
-    if(count($Values) > 0)
+    if (count($Values) > 0)
     {
       $Values = array_merge($this->LoadLeftSideValue($Level, $TimeFrom), $Values, $this->LoadRightSideValue($Level, $TimeTo));
       $StartIndex = 0;
       $Points = array();
-      if($this->Debug) print_r($Values);
-      for($I = 0; $I < $this->DivisionCount; $I++)
+      if ($this->Debug) print_r($Values);
+      for ($I = 0; $I < $this->DivisionCount; $I++)
       {
         $TimeStart = $TimeFrom + (($TimeTo - $TimeFrom) / $this->DivisionCount) * $I;
         $TimeEnd = $TimeFrom + (($TimeTo - $TimeFrom) / $this->DivisionCount) * ($I + 1);
-        if($this->Debug) echo('TimeEnd '.$I.': '.$TimeEnd.'('.TimeToMysqlDateTime($TimeEnd).')<br>');
+        if ($this->Debug) echo('TimeEnd '.$I.': '.$TimeEnd.'('.TimeToMysqlDateTime($TimeEnd).')<br>');
 
         $EndIndex = $StartIndex;
-        while(($Values[$EndIndex]['Time'] < $TimeEnd) and ($EndIndex < count($Values))) $EndIndex = $EndIndex + 1;
-        //while(($Values[$EndIndex]['Time'] < $TimeEnd)) $EndIndex = $EndIndex + 1;
+        while (($Values[$EndIndex]['Time'] < $TimeEnd) and ($EndIndex < count($Values))) $EndIndex = $EndIndex + 1;
+        //while (($Values[$EndIndex]['Time'] < $TimeEnd)) $EndIndex = $EndIndex + 1;
         $SubValues = array_slice($Values, $StartIndex, $EndIndex - $StartIndex + 1);
         $Points[] = $this->ComputeOneValue($TimeStart, $TimeEnd, $SubValues, $Level);
         $StartIndex = $EndIndex - 1;
       }
-      if($this->Debug) print_r($Points);
+      if ($this->Debug) print_r($Points);
     } else $Points[] = array('Min' => 0, 'Avg' => 0, 'Max' => 0);
-    return($Points);
+    return ($Points);
   }
 
@@ -344 +344 @@
   {
     echo('Veličina '.$this->Data['Name']."<br>\n");
-    if($this->Data['Continuity'] == 0) $this->Data['ContinuityEnabled'] = 0;  // non continuous
+    if ($this->Data['Continuity'] == 0) $this->Data['ContinuityEnabled'] = 0;  // non continuous
       else $this->Data['ContinuityEnabled'] = 2;    // continuous graph
 
@@ -354 +354 @@
     echo("<br>\n");
 
-    for($Level = 1; $Level <= $this->MaxLevel; $Level++)
+    for ($Level = 1; $Level <= $this->MaxLevel; $Level++)
     {
       echo('Uroven '.$Level."<br>\n");
@@ -363 +363 @@
       $BurstCount = 500;
       echo('For 0 to '.round(($EndTime - $StartTime) / $TimeSegment / $BurstCount)."<br>\n");
-      for($I = 0; $I <= round(($EndTime - $StartTime) / $TimeSegment / $BurstCount); $I++)
+      for ($I = 0; $I <= round(($EndTime - $StartTime) / $TimeSegment / $BurstCount); $I++)
       {
         echo($I.' ');
@@ -371 +371 @@
         $DbResult = $this->Database->select($this->Data['DataTable'], '*', 'Time > "'.
           TimeToMysqlDateTime($StartTime2).'" AND Time < "'.TimeToMysqlDateTime($EndTime2).'" AND Measure='.$this->Data['Id'].' AND Level='.($Level - 1).' ORDER BY Time');
-        while($Row = $DbResult->fetch_assoc())
+        while ($Row = $DbResult->fetch_assoc())
         {
           $Row['Time'] = MysqlDateTimeToTime($Row['Time']);
@@ -377 +377 @@
         }
 
-        if(count($Values) > 0)
+        if (count($Values) > 0)
         {
           $Values = array_merge($this->LoadLeftSideValue($Level - 1, $StartTime2),
@@ -383 +383 @@
 
           $StartIndex = 0;
-          for($B = 0; $B < $BurstCount; $B++)
+          for ($B = 0; $B < $BurstCount; $B++)
           {
             echo('.');
@@ -390 +390 @@
 
             $EndIndex = $StartIndex;
-            while($Values[$EndIndex]['Time'] < $EndTime3) $EndIndex = $EndIndex + 1;
+            while ($Values[$EndIndex]['Time'] < $EndTime3) $EndIndex = $EndIndex + 1;
             $SubValues = array_slice($Values, $StartIndex, $EndIndex - $StartIndex + 1);
-            if(count($SubValues) > 2)
+            if (count($SubValues) > 2)
             {
               $Point = $this->ComputeOneValue($StartTime3, $EndTime3, $SubValues, $Level);
@@ -420 +420 @@
     $Measures = array();
     $Result = $Database->select('Measure', '*');
-    while($Row = $Result->fetch_assoc())
+    while ($Row = $Result->fetch_assoc())
     {
       $Measures = new Measure();
@@ -426 +426 @@
     }
 
-    foreach($Measures as $Measure)
+    foreach ($Measures as $Measure)
     {
       $Measure->RebuildMeasureCache();

trunk/Modules/TimeMeasure/Measurement/MeasureClient.php

@@ -8 +8 @@
   {
     $DbResult = $this->Database->select('MeasureClient', '*');
-    while($MeasureClient = $DbResult->fetch_assoc())
+    while ($MeasureClient = $DbResult->fetch_assoc())
     {
       $DbResult2 = $this->Database->select('MeasureMethod', '*', 'Id='.$MeasureClient['Method']);
@@ -15 +15 @@
       include_once(dirname(__FILE__).'/'.$MeasureMethod['MeasureClass'].'.php');
       $MeasureMethod['MeasureClass'] .= 'Measurement';
-      if(class_exists($MeasureMethod['MeasureClass']))
+      if (class_exists($MeasureMethod['MeasureClass']))
       {
         $MeasureClass = new $MeasureMethod['MeasureClass']($this->System);
-        if(method_exists($MeasureClass, $MeasureMethod['Method']))
+        if (method_exists($MeasureClass, $MeasureMethod['Method']))
         {
-          if($MeasureClient['Parameter'] != '') $Value = $Measure->$MeasureMethod['Method']($MeasureClient['Parameter']);
+          if ($MeasureClient['Parameter'] != '') $Value = $Measure->$MeasureMethod['Method']($MeasureClient['Parameter']);
             else $Value = $MeasureClass->$MeasureMethod['Method']();
           echo(file_get_contents('http://'.$MeasureClient['Host'].$MeasureClient['Path'].'/?M=Add&MeasureId='.$MeasureClient['MeasureId'].'&Value='.addslashes($Value)));

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

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 +69 @@
     $Row = $DbResult->fetch_array();
     $Value = $Row[0];
-    return($Value);
+    return ($Value);
   }
 }