Changeset 92 for trunk

Timestamp:

Apr 7, 2020, 11:53:58 AM (5 years ago)

Author:

chronos

Message:

• Modified: Improved code formatting.

Location:

trunk

Files:

• Application/Core.php (modified) (10 diffs)
• Application/DefaultConfig.php (modified) (2 diffs)
• Application/UpdateTrace.php (modified) (4 diffs)
• Application/Version.php (modified) (1 diff)
• Application/View.php (modified) (1 diff)
• Global.php (modified) (7 diffs)
• Graph.php (modified) (8 diffs)
• Modules/Admin/Admin.php (modified) (5 diffs)
• Modules/Measure/Measure.php (modified) (38 diffs)
• Modules/Measure/Page.php (modified) (22 diffs)
• Packages/Common/AppModule.php (modified) (18 diffs)
• Packages/Common/Application.php (modified) (1 diff)
• Packages/Common/Common.php (modified) (6 diffs)
• Packages/Common/Config.php (modified) (3 diffs)
• Packages/Common/Database.php (modified) (13 diffs)
• Packages/Common/Error.php (modified) (4 diffs)
• Packages/Common/Image.php (modified) (4 diffs)
• Packages/Common/Locale.php (modified) (14 diffs)
• Packages/Common/Mail.php (modified) (9 diffs)
• Packages/Common/NetworkAddress.php (modified) (7 diffs)
• Packages/Common/Page.php (modified) (2 diffs)
• Packages/Common/PrefixMultiplier.php (modified) (4 diffs)
• Packages/Common/RSS.php (modified) (2 diffs)
• Packages/Common/Setup.php (modified) (30 diffs)
• Packages/Common/Table.php (modified) (14 diffs)
• Packages/Common/UTF8.php (modified) (3 diffs)
• Packages/Common/Update.php (modified) (5 diffs)
• Packages/Common/VarDumper.php (modified) (6 diffs)
• Point.php (modified) (2 diffs)
• add.php (modified) (2 diffs)

trunk/Application/Core.php

@@ -2 +2 @@
 
 $ConfigFileName = dirname(__FILE__).'/../Config/Config.php';
-if(file_exists($ConfigFileName)) include_once($ConfigFileName);
+if (file_exists($ConfigFileName)) include_once($ConfigFileName);
 
 include_once(dirname(__FILE__).'/../Global.php');
@@ -24 +24 @@
     $this->ShowPage = true;
     $this->BaseURL = $_SERVER['SCRIPT_NAME'];
-    if(substr($this->BaseURL, -10, 10) == '/index.php')
+    if (substr($this->BaseURL, -10, 10) == '/index.php')
       $this->BaseURL = substr($this->BaseURL, 0, -10);
   }
@@ -32 +32 @@
     global $Config, $DatabaseRevision, $WithoutSessionStart;
 
-    if($this->UseSession) session_start();
+    if ($this->UseSession) session_start();
 
     $ErrorHandler = new ErrorHandler();
@@ -50 +50 @@
 
     // SQL injection hack protection
-    foreach($_POST as $Index => $Item) $_POST[$Index] = addslashes($Item);
-    foreach($_GET as $Index => $Item) $_GET[$Index] = addslashes($Item);
+    foreach ($_POST as $Index => $Item) $_POST[$Index] = addslashes($Item);
+    foreach ($_GET as $Index => $Item) $_GET[$Index] = addslashes($Item);
 
     $this->Config = &$Config;
@@ -58 +58 @@
     $this->Setup = new Setup($this);
     $this->Setup->Start();
-    if($this->Setup->CheckState())
+    if ($this->Setup->CheckState())
     {
       $this->ModuleManager->Start();
@@ -67 +67 @@
   {
     $this->RunCommon();
-    if($this->ShowPage)
+    if ($this->ShowPage)
     {
       $this->PathItems = ProcessURL();
@@ -80 +80 @@
     /* @var $Page Page */
     $ClassName = $this->SearchPage($this->PathItems, $this->Pages);
-    if($ClassName != '')
+    if ($ClassName != '')
     {
       $Page = new $ClassName($this);
@@ -91 +91 @@
   function RegisterPage($Path, $Handler)
   {
-    if(is_array($Path))
+    if (is_array($Path))
     {
       $Page = &$this->Pages;
       $LastKey = array_pop($Path);
-      foreach($Path as $PathItem)
+      foreach ($Path as $PathItem)
       {
         $Page = &$Page[$PathItem];
       }
-      if(!is_array($Page)) $Page = array('' => $Page);
+      if (!is_array($Page)) $Page = array('' => $Page);
       $Page[$LastKey] = $Handler;
     } else $this->Pages[$Path] = $Handler;
@@ -111 +111 @@
   function SearchPage($PathItems, $Pages)
   {
-    if(count($PathItems) > 0) $PathItem = $PathItems[0];
+    if (count($PathItems) > 0) $PathItem = $PathItems[0];
       else $PathItem = '';
-    if(array_key_exists($PathItem, $Pages))
+    if (array_key_exists($PathItem, $Pages))
     {
-      if(is_array($Pages[$PathItem]))
+      if (is_array($Pages[$PathItem]))
       {
         array_shift($PathItems);
-        return($this->SearchPage($PathItems, $Pages[$PathItem]));
-      } else return($Pages[$PathItem]);
-    } else return('');
+        return $this->SearchPage($PathItems, $Pages[$PathItem]);
+      } else return $Pages[$PathItem];
+    } else return '';
   }
 
   function Link($Target)
   {
-    return($this->BaseURL.$Target);
+    return $this->BaseURL.$Target;
   }
 }
@@ -141 +141 @@
   {
     Header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found');
-    return('<h3 align="center">'.T('Required page not found'));
+    return '<h3 align="center">'.T('Required page not found');
   }
 }

trunk/Application/DefaultConfig.php

@@ -6 +6 @@
   {
     $IsDeveloper = in_array($_SERVER['REMOTE_ADDR'], array('127.0.0.1'));
-    return(array
+    return array
     (
         array('Name' => 'SystemPassword', 'Type' => 'PasswordEncoded', 'Default' => '', 'Title' => 'Systémové heslo'),
@@ -53 +53 @@
         array('Name' => 'MainRouter/ConnectTimeout', 'Type' => 'Integer', 'Default' => '5', 'Title' => 'Vypršení času'),
         array('Name' => 'MainRouter/MangleRuleSubgroupMinPrefix', 'Type' => 'Integer', 'Default' => '28', 'Title' => 'Nejmenší prefix podsítě pro mangle pravidla'),
-    ));
+    );
   }
 }

trunk/Application/UpdateTrace.php

@@ -44 +44 @@
   'REFERENCES `Measure`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
   $DbResult = $Manager->Execute('SELECT `Id`, `PermissionAdd` FROM `Measure`');
-  while($DbRow = $DbResult->fetch_assoc())
+  while ($DbRow = $DbResult->fetch_assoc())
   {
     $Manager->Execute('INSERT INTO `Permission` (`Measure`, `Operation`) VALUES ('.
@@ -50 +50 @@
         }
   $DbResult = $Manager->Execute('SELECT `Id`, `PermissionView` FROM `Measure`');
-  while($DbRow = $DbResult->fetch_assoc())
+  while ($DbRow = $DbResult->fetch_assoc())
   {
           $Manager->Execute('INSERT INTO `Permission` (`Measure`, `Operation`) VALUES ('.
@@ -61 +61 @@
 {
   $DbResult = $Manager->Execute('SELECT `DataTable`,`DataType` FROM `Measure`;');
-  while($Measure = $DbResult->fetch_assoc())
+  while ($Measure = $DbResult->fetch_assoc())
   {
     $Table = $Measure['DataTable'];
@@ -80 +80 @@
   function Get()
   {
-    return(array(
+    return array(
       65 => array('Revision' => 67, 'Function' => 'UpdateTo67'),
       67 => array('Revision' => 79, 'Function' => 'UpdateTo79'),
-    ));
+    );
   }
 }

trunk/Application/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 88;
+$Revision = 92;
 $DatabaseRevision = 79;
-$ReleaseTime = strtotime('2019-10-04');
+$ReleaseTime = strtotime('2020-04-07');

trunk/Application/View.php

@@ -28 +28 @@
   {
     $Output = $this->ShowPage($Page->Show());
-    return($Output);
+    return $Output;
   }
 }

trunk/Global.php

@@ -7 +7 @@
 function HumanDate($Time)
 {
-  return(date('j.n.Y', $Time));
+  return date('j.n.Y', $Time);
 }
 
@@ -13 +13 @@
 {
   list($Usec, $Sec) = explode(" ", microtime());
-  return ((float)$Usec + (float)$Sec);
+  return (float)$Usec + (float)$Sec;
 }
 
 function MakeLink($Target, $Title)
 {
-  return('<a href="'.$Target.'">'.$Title.'</a>');
+  return '<a href="'.$Target.'">'.$Title.'</a>';
 }
 
@@ -25 +25 @@
   $Result = '<table cellspacing="0" class="BasicTable">';
   $Result .= '<tr>';
-  foreach($Table['Header'] as $Item)
+  foreach ($Table['Header'] as $Item)
     $Result .= '<th>'.$Item.'</th>';
   $Result .= '</tr>';
-  foreach($Table['Rows'] as $Row)
+  foreach ($Table['Rows'] as $Row)
   {
     $Result .= '<tr>';
-    foreach($Row as $Item)
+    foreach ($Row as $Item)
       $Result .= '<td>'.$Item.'</td>';
     $Result .= '</tr>';
   }
   $Result .= '</table>';
-  return($Result);
+  return $Result;
 }
 
@@ -48 +48 @@
   );
 
-  foreach($Class as $Index => $Item)
+  foreach ($Class as $Index => $Item)
   {
-    if(!array_key_exists($Index, $Values)) $Values[$Index] = $Item['Default'];
-    switch($Item['Type'])
+    if (!array_key_exists($Index, $Values)) $Values[$Index] = $Item['Default'];
+    switch ($Item['Type'])
     {
       case 'Boolean':
-        if($Values[$Index] == 0) $Checked = ''; else $Checked = ' checked="yes"';
+        if ($Values[$Index] == 0) $Checked = ''; else $Checked = ' checked="yes"';
         $Edit = '<input type="checkbox" name="'.$Index.'"'.$Checked.'>';
         break;
@@ -69 +69 @@
   }
   $Output = '<h3>Tabulka '.$ClassName.'</h3>'.Table($Table).MakeLink('?Operation=Add2', 'Přidat');
-  return($Output);
+  return $Output;
 }
 
 function ProcessURL()
 {
-  if(array_key_exists('REDIRECT_QUERY_STRING', $_SERVER))
+  if (array_key_exists('REDIRECT_QUERY_STRING', $_SERVER))
     $PathString = $_SERVER['REDIRECT_QUERY_STRING'];
     else $PathString = '';
-  if(substr($PathString, -1, 1) == '/') $PathString = substr($PathString, 0, -1);
+  if (substr($PathString, -1, 1) == '/') $PathString = substr($PathString, 0, -1);
   $PathItems = explode('/', $PathString);
-  if(array_key_exists('REQUEST_URI', $_SERVER) and (strpos($_SERVER['REQUEST_URI'], '?') !== false))
+  if (array_key_exists('REQUEST_URI', $_SERVER) and (strpos($_SERVER['REQUEST_URI'], '?') !== false))
     $_SERVER['QUERY_STRING'] = substr($_SERVER['REQUEST_URI'], strpos($_SERVER['REQUEST_URI'], '?') + 1);
     else $_SERVER['QUERY_STRING'] = '';
   parse_str($_SERVER['QUERY_STRING'], $_GET);
-  return($PathItems);
+  return $PathItems;
 }
 
@@ -90 +90 @@
   $Result = array();
   $Parts = explode('&', $QueryString);
-  foreach($Parts as $Part)
+  foreach ($Parts as $Part)
   {
-    if($Part != '')
+    if ($Part != '')
     {
-      if(!strpos($Part, '=')) $Part .= '=';
+      if (!strpos($Part, '=')) $Part .= '=';
       $Item = explode('=', $Part);
       $Result[$Item[0]] = $Item[1];
     }
   }
-  return($Result);
+  return $Result;
 }
 
@@ -105 +105 @@
 {
   $Parts = array();
-  foreach($QueryStringArray as $Index => $Item)
+  foreach ($QueryStringArray as $Index => $Item)
   {
     $Parts[] = $Index.'='.$Item;
   }
-  return(implode('&amp;', $Parts));
+  return implode('&amp;', $Parts);
 }

trunk/Graph.php

@@ -26 +26 @@
     global $Config;
 
-    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 = $Config['DefaultVariables']['Differential'];
+    if (!array_key_exists('Differential', $_GET)) $Differential = $Config['DefaultVariables']['Differential'];
     else $Differential = addslashes($_GET['Differential']);
     $VerticalLinesCount = round($Height / ($this->FontSize + 4));
@@ -54 +54 @@
 
     $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;
 
     $Points = $Measure->GetValues($StartTime, $EndTime, $Level);
@@ -63 +63 @@
     $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'];
     }
@@ -82 +82 @@
     $PointsAvg = array(0, $Height - 1);
     $PointsMax = array(0, $Height - 1);
-    if(($MaxValue - $MinValue) == 0) $MaxValue = $MinValue + 1;
-    {
-      foreach($Points as $Index => $Item)
+    if (($MaxValue - $MinValue) == 0) $MaxValue = $MinValue + 1;
+    {
+      foreach ($Points as $Index => $Item)
       {
         $PointsMin[] = $Index * $Width / $Measure->DivisionCount;
@@ -138 +138 @@
     $TimeRange = $EndTime - $StartTime;
     $TimeMarksIndex = 0;
-    while((($TimeRange / $TimeMarks[$TimeMarksIndex]) > 1) and ($TimeMarksIndex < (count($TimeMarks) - 1))) 
+    while ((($TimeRange / $TimeMarks[$TimeMarksIndex]) > 1) and ($TimeMarksIndex < (count($TimeMarks) - 1))) 
       $TimeMarksIndex += 1;
-    if($TimeMarksIndex < 2) $TimeMarksIndex = 2;
+    if ($TimeMarksIndex < 2) $TimeMarksIndex = 2;
     $MajorTimeMarks = $TimeMarks[$TimeMarksIndex - 1];
     $MinorTimeMarks = $TimeMarks[$TimeMarksIndex - 2];
@@ -149 +149 @@
     // 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);
     }
@@ -160 +160 @@
     // 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($this->FontSize, 0, $this->FontFileName, $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, $this->FontSize, 0, $X - ($BoundBox[2] - $BoundBox[0]) / 2,  $Height - 2, $Black, $this->FontFileName, $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);
@@ -185 +185 @@
           $Measure->Data['Unit'], 3);
       $BoundBox = imagettfbbox($this->FontSize, 0, $this->FontFileName, $Text);
-      if(($Y - ($BoundBox[5] - $BoundBox[1]) / 2) > 10)
+      if (($Y - ($BoundBox[5] - $BoundBox[1]) / 2) > 10)
         imagettftext($Image, $this->FontSize, 0, 2,  $Y - ($BoundBox[5] - $BoundBox[1]) / 2, $Black, $this->FontFileName, $Text);
     }

trunk/Modules/Admin/Admin.php

@@ -41 +41 @@
   function Show()
   {
-    if(array_key_exists('Operation', $_GET)) $Operation = $_GET['Operation']; else $Operation = '';
-    switch($Operation)
+    if (array_key_exists('Operation', $_GET)) $Operation = $_GET['Operation']; else $Operation = '';
+    switch ($Operation)
     {
       case 'Add':
@@ -59 +59 @@
         $Output = $this->ShowNone();
     }
-    return($Output);
+    return $Output;
   }
 
@@ -70 +70 @@
 
     $Result = $this->Database->select('Measure', '*', '1 ORDER BY Description');
-    while($Measure = $Result->fetch_array())
+    while ($Measure = $Result->fetch_array())
     {
       array_push($Table['Rows'], array($Measure['Description'], MakeLink('?Operation=Edit&MeasureId='.$Measure['Id'], 'Editovat').' '.MakeLink('?Operation=Delete&MeasureId='.$Measure['Id'], 'Odstranit').' '.MakeLink('?Operation=RebuildCache&MeasureId='.$Measure['Id'], 'Přestavět cache')));
     }
     $Output = '<h3>Seznam měření</h3>'.Table($Table).MakeLink('?Operation=Add', 'Přidat');
-    return($Output);
+    return $Output;
   }
 
@@ -83 +83 @@
     $Values = array();
     $Values = $DbResult->fetch_array();
-    return(ShowEditTable('Measure', $Values));
+    return ShowEditTable('Measure', $Values);
   }
 
@@ -89 +89 @@
   {
     $Values = array();
-    return(ShowEditTable('Measure', $Values));
+    return ShowEditTable('Measure', $Values);
   }
 

trunk/Modules/Measure/Measure.php

@@ -83 +83 @@
   function TimeSegment($Level)
   {
-    return(pow($this->LevelReducing, $Level) * 60);
+    return pow($this->LevelReducing, $Level) * 60;
   }
 
   function GetDataTable()
   {
-    return('data_'.$this->Data['Name']);
+    return 'data_'.$this->Data['Name'];
   }
 
   function AlignTime($Time, $TimeSegment)
   {
-    return(round(($Time - $this->ReferenceTime) / $TimeSegment) * $TimeSegment +
-      $this->ReferenceTime);
+    return round(($Time - $this->ReferenceTime) / $TimeSegment) * $TimeSegment +
+      $this->ReferenceTime;
   }
 
@@ -100 +100 @@
   {
     $Result = $this->Database->select('Measure', '*', '`Id`='.$Id);
-    if($Result->num_rows > 0)
+    if ($Result->num_rows > 0)
     {
       $this->Data = $Result->fetch_array();
-      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 die('Měřená veličina '.$Id.' nenalezena.');
@@ -112 +112 @@
     $Result = $this->Database->select($this->Data['DataTable'], '*', '(`Measure`='.$this->Data['Id'].') AND '.
       '(`Level`=0) ORDER BY `Time` DESC LIMIT 2');
-    if($Result->num_rows == 0) {
+    if ($Result->num_rows == 0) {
       // No measure value found. Simply insert new first value.
       $this->Database->insert($this->Data['DataTable'],
@@ -118 +118 @@
         'Measure' => $this->Data['Id'], 'Time' => TimeToMysqlDateTime($Time),
         'Continuity' => 0));
-    } else if($Result->num_rows == 1) {
+    } else if ($Result->num_rows == 1) {
       // One value exists. Add second value.
       $this->Database->insert($this->Data['DataTable'],
@@ -128 +128 @@
       $LastValue = $Result->fetch_array();
       $NextToLastValue = $Result->fetch_array();
-      if(($Time - MysqlDateTimeToTime($LastValue['Time'])) < (1 - $this->PeriodTolerance) * $this->Data['Period'])
+      if (($Time - MysqlDateTimeToTime($LastValue['Time'])) < (1 - $this->PeriodTolerance) * $this->Data['Period'])
       {
         // New value added too quickly. Need to wait for next measure period.
@@ -135 +135 @@
       {
         // We are near defined period and can add new value.
-        if(($Time - MysqlDateTimeToTime($LastValue['Time'])) < (1 + $this->PeriodTolerance) * $this->Data['Period']) {
+        if (($Time - MysqlDateTimeToTime($LastValue['Time'])) < (1 + $this->PeriodTolerance) * $this->Data['Period']) {
           // New value added near defined measure period inside tolerance. Keep continuity.
           $Continuity = 1;
@@ -143 +143 @@
           $Continuity = 0;
         }
-        if(($LastValue['Avg'] == $NextToLastValue['Avg']) and ($LastValue['Avg'] == $Value) and
+        if (($LastValue['Avg'] == $NextToLastValue['Avg']) and ($LastValue['Avg'] == $Value) and
           ($LastValue['Continuity'] == 1) and ($Continuity == 1))
         {
@@ -165 +165 @@
   function UpdateHigherLevels($Time)
   {
-    for($Level = 1; $Level <= $this->MaxLevel; $Level++)
+    for ($Level = 1; $Level <= $this->MaxLevel; $Level++)
     {
       $TimeSegment = $this->TimeSegment($Level);
       $EndTime = $this->AlignTime($Time, $TimeSegment);
-      //if($EndTime < $Time) $EndTime = $EndTime + $TimeSegment;
+      //if ($EndTime < $Time) $EndTime = $EndTime + $TimeSegment;
       $StartTime = $EndTime - $TimeSegment;
 
@@ -178 +178 @@
         '(`Time` < "'.TimeToMysqlDateTime($EndTime).'") AND '.
         '(`Measure`='.$this->Data['Id'].') AND (`Level`='.($Level - 1).') ORDER BY `Time`');
-      while($Row = $Result->fetch_array())
+      while ($Row = $Result->fetch_array())
       {
         $Row['Time'] = MysqlDateTimeToTime($Row['Time']);
@@ -211 +211 @@
 
     // Trim outside parts
-    foreach($this->ValueTypes as $ValueType)
+    foreach ($this->ValueTypes as $ValueType)
     {
       $Values[0][$ValueType] = Interpolation(
@@ -218 +218 @@
     }
     $Values[0]['Time'] = $LeftTime;
-    foreach($this->ValueTypes as $ValueType)
+    foreach ($this->ValueTypes as $ValueType)
     {
       $Values[count($Values) - 1][$ValueType] = Interpolation(
@@ -228 +228 @@
 
     // 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')
+      for ($I = 0; $I < (count($Values) - 1); $I++)
+      {
+        if ($ValueType == 'Avg')
         {
           if ($this->Data['Cumulative'])
@@ -240 +240 @@
           } else
           {
-            if($Values[$I + 1]['Continuity'] == $this->Data['ContinuityEnabled']);
-            else if($this->Differential == 0)
+            if ($Values[$I + 1]['Continuity'] == $this->Data['ContinuityEnabled']);
+            else if ($this->Differential == 0)
             {
               $NewValue[$ValueType] = $NewValue[$ValueType] + ($Values[$I + 1]['Time'] - $Values[$I]['Time']) *
@@ -251 +251 @@
           }
         }
-        else if($ValueType == 'Max')
-        {
-          if($Values[$I + 1]['Continuity'] == $this->Data['ContinuityEnabled'])
+        else if ($ValueType == 'Max')
+        {
+          if ($Values[$I + 1]['Continuity'] == $this->Data['ContinuityEnabled'])
           {
-            if(0 > $NewValue[$ValueType]) $NewValue[$ValueType] = 0;
+            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'])
+        else if ($ValueType == 'Min')
+        {
+          if ($Values[$I + 1]['Continuity'] == $this->Data['ContinuityEnabled'])
           {
-            if(0 < $NewValue[$ValueType]) $NewValue[$ValueType] = 0;
+            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;
             }
           }
@@ -286 +286 @@
       $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;
   }
 
@@ -299 +299 @@
     $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_array();
@@ -307 +307 @@
     $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_array();
@@ -313 +313 @@
     } else $AbsoluteRightTime = 0;
 
-    return(array('Left' => $AbsoluteLeftTime, 'Right' => $AbsoluteRightTime));
+    return array('Left' => $AbsoluteLeftTime, 'Right' => $AbsoluteRightTime);
   }
 
@@ -323 +323 @@
       '(`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)
     {
       // Found one value, simply return it
       $Row = $DbResult->fetch_array();
       $Row['Time'] = MysqlDateTimeToTime($Row['Time']);
-      return(array($Row));
+      return array($Row);
     } else
     {
@@ -339 +339 @@
         '(`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_array();
@@ -345 +345 @@
           'Min' => 0, 'Avg' => 0, 'Max' => 0, 'Continuity' => 0));
       }
-      return($Result);
+      return $Result;
     }
   }
@@ -356 +356 @@
       '(`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)
     {
       // Found one value, simply return it
       $Row = $DbResult->fetch_array();
       $Row['Time'] = MysqlDateTimeToTime($Row['Time']);
-      return(array($Row));
+      return array($Row);
     } else {
       // Not found any value. Calculate it
@@ -372 +372 @@
         '(`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_array();
@@ -378 +378 @@
           'Min' => 0, 'Avg' => 0, 'Max' => 0, 'Continuity' => 0));
       }
-      return($Result);
+      return $Result;
     }
   }
@@ -386 +386 @@
   //$AbsoluteTime = GetTimeRange($this->DataId);
 
-//  if(($TimeFrom > $AbsoluteLeftTime) and ($TimeStart < $AbsoluteRightTime) and
+//  if (($TimeFrom > $AbsoluteLeftTime) and ($TimeStart < $AbsoluteRightTime) and
 //    ($TimeTo > $AbsoluteLeftTime) and ($TimeTo < $AbsoluteRightTime))
 //  {
@@ -397 +397 @@
       '(`Measure`='.$this->Data['Id'].') AND (`Level`='.$Level.') ORDER BY `Time`');
     $Values = array();
-    while($Row = $Result->fetch_array())
+    while ($Row = $Result->fetch_array())
     {
       $Values[] = array('Time' => MysqlDateTimeToTime($Row['Time']),
@@ -406 +406 @@
 
     $Points = array();
-    if(count($Values) > 0)
+    if (count($Values) > 0)
     {
       $Values = array_merge(
@@ -415 +415 @@
       $StartIndex = 0;
       $Points = array();
-      for($I = 0; $I < $this->DivisionCount; $I++)
+      for ($I = 0; $I < $this->DivisionCount; $I++)
       {
         $TimeStart = $TimeFrom + (($TimeTo - $TimeFrom) / $this->DivisionCount) * $I;
@@ -421 +421 @@
 
         $EndIndex = $StartIndex;
-        while($Values[$EndIndex]['Time'] < $TimeEnd) $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);
@@ -427 +427 @@
       }
     } else $Points[] = array('Min' => 0, 'Avg' => 0, 'Max' => 0);
-    return($Points);
+    return $Points;
   }
 
@@ -433 +433 @@
   {
     echo('Velicina '.$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
 
@@ -443 +443 @@
     echo("<br>\n");
 
-    for($Level = 1; $Level <= $this->MaxLevel; $Level++)
+    for ($Level = 1; $Level <= $this->MaxLevel; $Level++)
     {
       echo('Uroven '.$Level."<br>\n");
@@ -453 +453 @@
       $Count = round(($EndTime - $StartTime) / $TimeSegment / $BurstCount);
       echo('For 0 to '.$Count."<br>\n");
-      for($I = 0; $I <= $Count; $I++)
+      for ($I = 0; $I <= $Count; $I++)
       {
         echo($I.' ');
@@ -463 +463 @@
           TimeToMysqlDateTime($EndTime2).'") AND (`Measure`='.$this->Data['Id'].
           ') AND (`Level`='.($Level - 1).') ORDER BY `Time`');
-        while($Row = $DbResult->fetch_array())
+        while ($Row = $DbResult->fetch_array())
         {
           $Row['Time'] = MysqlDateTimeToTime($Row['Time']);
@@ -469 +469 @@
         }
 
-        if(count($Values) > 0)
+        if (count($Values) > 0)
         {
           $Values = array_merge(
@@ -477 +477 @@
 
           $StartIndex = 0;
-          for($B = 0; $B < $BurstCount; $B++)
+          for ($B = 0; $B < $BurstCount; $B++)
           {
             echo('.');
@@ -484 +484 @@
 
             $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);
@@ -511 +511 @@
   {
     $Result = $this->Database->select('Measure', 'Id');
-    while($Row = $Result->fetch_array())
+    while ($Row = $Result->fetch_array())
     {
       $Measure = new Measure();

trunk/Modules/Measure/Page.php

@@ -68 +68 @@
     // 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>';
     }
@@ -77 +77 @@
     // Month selection
     $Output .= '<select name="Month">';
-    foreach($this->Months as $Index => $Month)
-    {
-      if($Index == $TimeParts['mon']) $Selected = ' selected="1"'; else $Selected = '';
-      if($Index > 0) $Output .= '<option value="'.$Index.'"'.$Selected.'>'.$Month.'</option>';
+    foreach ($this->Months as $Index => $Month)
+    {
+      if ($Index == $TimeParts['mon']) $Selected = ' selected="1"'; else $Selected = '';
+      if ($Index > 0) $Output .= '<option value="'.$Index.'"'.$Selected.'>'.$Month.'</option>';
     }
     $Output .= '</select>. ';
@@ -86 +86 @@
     // Year selection
     $Output .= '<select name="Year">';
-    for($I = 2000; $I <= date("Y"); $I++)
-    {
-      if($I == $TimeParts['year']) $Selected = ' selected="1"'; else $Selected = '';
+    for ($I = 2000; $I <= date("Y"); $I++)
+    {
+      if ($I == $TimeParts['year']) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
     }
@@ -95 +95 @@
     // 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>';
     }
@@ -104 +104 @@
     // 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>';
     }
@@ -117 +117 @@
     $Output .= '</form>';
 
-    return($Output);
+    return $Output;
   }
   
@@ -123 +123 @@
   {
     $Result2 = $this->Database->select($Measure['DataTable'], '`Time`, `Avg`', '(`Measure`='.$Measure['Id'].') AND (`Level`=0) ORDER BY `Time` ASC LIMIT 1');
-    if($Result2->num_rows > 0)
+    if ($Result2->num_rows > 0)
     {
       $Row = $Result2->fetch_array();
@@ -132 +132 @@
       $LastMeasureValue = 0;
     }
-    return(array('Time' => $LastMeasureTime, 'Value' => $LastMeasureValue));
+    return array('Time' => $LastMeasureTime, 'Value' => $LastMeasureValue);
   }
 
@@ -138 +138 @@
   {
     $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();
@@ -147 +147 @@
       $LastMeasureValue = 0;
     }
-    return(array('Time' => $LastMeasureTime, 'Value' => $LastMeasureValue));
+    return array('Time' => $LastMeasureTime, 'Value' => $LastMeasureValue);
   }
   
@@ -164 +164 @@
     $Output = '<table border="1" cellspacing="0" cellpadding="2" style="font-size: small; margin: 0px auto;">';
     $Output .= '<tr><th>Měřená veličina</th><th>Poslední hodnota</th><th>Čas posledního měření</th><th>Interpolace</th><th>Poznámky</th>';
-    if(array_key_exists('Debug', $_GET)) $Output .= '<th>Počet položek</th><th>Čas vykonání</th>';
+    if (array_key_exists('Debug', $_GET)) $Output .= '<th>Počet položek</th><th>Čas vykonání</th>';
     $Output .= '</tr>';
     $Result = $this->Database->select('Measure', '*', '( `Enabled`=1) AND ((`PermissionView`="all") OR (`PermissionView`="'.
       gethostbyaddr($_SERVER['REMOTE_ADDR']).'")) ORDER BY `Description`');
-    while($Measure = $Result->fetch_array())
+    while ($Measure = $Result->fetch_array())
     {
       $StopWatchStart = GetMicrotime();
-      if(array_key_exists('Debug', $_GET))
+      if (array_key_exists('Debug', $_GET))
       {
         $DbResult = $this->Database->select($Measure['DataTable'], 'COUNT(*)', '`Measure`='.$Measure['Id']);
@@ -179 +179 @@
       $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();
@@ -188 +188 @@
         $LastMeasureValue = '&nbsp;';
       }
-      if($Measure['Continuity'] == 1) $Interpolate = 'Ano'; else $Interpolate = 'Ne';
-      if($Measure['Info'] == '') $Measure['Info'] = '&nbsp;';
+      if ($Measure['Continuity'] == 1) $Interpolate = 'Ano'; else $Interpolate = 'Ne';
+      if ($Measure['Info'] == '') $Measure['Info'] = '&nbsp;';
       $GenerationTime = floor((GetMicrotime() - $StopWatchStart) * 1000  ) / 1000;
       $Output .= '<tr><td style="text-align: left"><a href="?Measure='.$Measure['Id'].
@@ -195 +195 @@
         $LastMeasureValue.'</td><td align="center">'.$LastMeasureTime.'</td><td align="center">'.
         $Interpolate.'</td><td>'.$Measure['Info'].'</td>';
-      if(array_key_exists('Debug', $_GET)) 
+      if (array_key_exists('Debug', $_GET)) 
         $Output .= '<td>'.$RowCount.'</td><td>'.$GenerationTime.'</td>';
       $Output .= '</tr>';
     }
     $Output .= '</table>';
-    return($Output);
+    return $Output;
   }
 
@@ -214 +214 @@
       '&amp;TimeSpecify=1&amp;Differential='.$_SESSION['Differential'].
       '">Odkaz na vybraný graf</a><br/>';
-    return($Output);
+    return $Output;
   }
 
@@ -221 +221 @@
     $Output = '';
 
-    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'],
@@ -236 +236 @@
         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']] = $this->Time;
@@ -249 +249 @@
 
     // Show graph 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>';
@@ -266 +266 @@
       '<a href="?Move=Right">&gt;</a> <a href="?Move=RightEnd">&gt;|</a> <a href="?Move=Now">Nyní</a><br>';
     $Output .= '<br/>';
-    return($Output);
+    return $Output;
 
   }
@@ -277 +277 @@
     {
       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];
+      //if (array_key_exists($Index, $_GET)) $_SESSION[$Index] = $_GET[$Index];
+      //if (array_key_exists($Index, $_POST)) $_SESSION[$Index] = $_POST[$Index];
       //$$Index = $_SESSION[$Index];
     }
@@ -370 +370 @@
       '((`PermissionView`="all") OR (`PermissionView`="'.gethostbyaddr($_SERVER['REMOTE_ADDR']).'")) '.
       'AND (`Id`='.($_SESSION['Measure'] * 1).')');
-    if($Result->num_rows == 0)
+    if ($Result->num_rows == 0)
       $_SESSION['Measure'] = $Config['DefaultVariables']['Measure'];
 
@@ -378 +378 @@
     $Output .= $this->ShowMeasureTable();
     $Output .= '</div>';
-    return($Output);
+    return $Output;
   }
 }

trunk/Packages/Common/AppModule.php

@@ -77 +77 @@
   function Install()
   {
-    if($this->Installed) return;
+    if ($this->Installed) return;
     $List = array();
     $this->Manager->EnumDependenciesCascade($this, $List, array(ModuleCondition::NotInstalled));
@@ -89 +89 @@
   function Uninstall()
   {
-    if(!$this->Installed) return;
+    if (!$this->Installed) return;
     $this->Stop();
     $this->Installed = false;
@@ -100 +100 @@
   function Upgrade()
   {
-    if(!$this->Installed) return;
-    if($this->InstalledVersion == $this->Version) return;
+    if (!$this->Installed) return;
+    if ($this->InstalledVersion == $this->Version) return;
     $List = array();
     $this->Manager->EnumSuperiorDependenciesCascade($this, $List, array(ModuleCondition::Installed));
@@ -117 +117 @@
   function Start()
   {
-    if($this->Running) return;
-    if(!$this->Installed) return;
+    if ($this->Running) return;
+    if (!$this->Installed) return;
     $List = array();
     $this->Manager->EnumDependenciesCascade($this, $List, array(ModuleCondition::NotRunning));
@@ -128 +128 @@
   function Stop()
   {
-    if(!$this->Running) return;
+    if (!$this->Running) return;
     $this->Running = false;
     $List = array();
@@ -144 +144 @@
   function Enable()
   {
-    if($this->Enabled) return;
-    if(!$this->Installed) return;
+    if ($this->Enabled) return;
+    if (!$this->Installed) return;
     $List = array();
     $this->Manager->EnumDependenciesCascade($this, $List, array(ModuleCondition::NotEnabled));
@@ -154 +154 @@
   function Disable()
   {
-    if(!$this->Enabled) return;
+    if (!$this->Enabled) return;
     $this->Stop();
     $this->Enabled = false;
@@ -203 +203 @@
   function Perform($List, $Actions, $Conditions = array(ModuleCondition::All))
   {
-    foreach($List as $Index => $Module)
-    {
-      if(in_array(ModuleCondition::All, $Conditions) or
+    foreach ($List as $Index => $Module)
+    {
+      if (in_array(ModuleCondition::All, $Conditions) or
         ($Module->Running and in_array(ModuleCondition::Running, $Conditions)) or
         (!$Module->Running and in_array(ModuleCondition::NotRunning, $Conditions)) or
@@ -213 +213 @@
         (!$Module->Enabled and in_array(ModuleCondition::NotEnabled, $Conditions)))
       {
-        foreach($Actions as $Action)
+        foreach ($Actions as $Action)
         {
-          if($Action == ModuleAction::Start) $Module->Start();
-          if($Action == ModuleAction::Stop) $Module->Stop();
-          if($Action == ModuleAction::Install) $Module->Install();
-          if($Action == ModuleAction::Uninstall) $Module->Uninstall();
-          if($Action == ModuleAction::Enable) $Module->Enable();
-          if($Action == ModuleAction::Disable) $Module->Disable();
-          if($Action == ModuleAction::Upgrade) $Module->Upgrade();
+          if ($Action == ModuleAction::Start) $Module->Start();
+          if ($Action == ModuleAction::Stop) $Module->Stop();
+          if ($Action == ModuleAction::Install) $Module->Install();
+          if ($Action == ModuleAction::Uninstall) $Module->Uninstall();
+          if ($Action == ModuleAction::Enable) $Module->Enable();
+          if ($Action == ModuleAction::Disable) $Module->Disable();
+          if ($Action == ModuleAction::Upgrade) $Module->Upgrade();
         }
       }
@@ -229 +229 @@
   function EnumDependenciesCascade($Module, &$List, $Conditions = array(ModuleCondition::All))
   {
-    foreach($Module->Dependencies as $Dependency)
-    {
-      if(!array_key_exists($Dependency, $this->Modules))
+    foreach ($Module->Dependencies as $Dependency)
+    {
+      if (!array_key_exists($Dependency, $this->Modules))
         throw new Exception(sprintf(T('Module "%s" dependency "%s" not found'), $Module->Name, $Dependency));
       $DepModule = $this->Modules[$Dependency];
-      if(in_array(ModuleCondition::All, $Conditions) or
+      if (in_array(ModuleCondition::All, $Conditions) or
         ($Module->Running and in_array(ModuleCondition::Running, $Conditions)) or
         (!$Module->Running and in_array(ModuleCondition::NotRunning, $Conditions)) or
@@ -250 +250 @@
   function EnumSuperiorDependenciesCascade($Module, &$List, $Conditions = array(ModuleCondition::All))
   {
-    foreach($this->Modules as $RefModule)
-    {
-      if(in_array($Module->Name, $RefModule->Dependencies) and
+    foreach ($this->Modules as $RefModule)
+    {
+      if (in_array($Module->Name, $RefModule->Dependencies) and
           (in_array(ModuleCondition::All, $Conditions) or
           ($Module->Running and in_array(ModuleCondition::Running, $Conditions)) or
@@ -270 +270 @@
   {
     $this->LoadModules();
-    if(file_exists($this->FileName)) $this->LoadState();
+    if (file_exists($this->FileName)) $this->LoadState();
     $this->StartEnabled();
   }
@@ -315 +315 @@
   function ModulePresent($Name)
   {
-    return(array_key_exists($Name, $this->Modules));
+    return array_key_exists($Name, $this->Modules);
   }
 
   function ModuleEnabled($Name)
   {
-    return(array_key_exists($Name, $this->Modules) and $this->Modules[$Name]->Enabled);
+    return array_key_exists($Name, $this->Modules) and $this->Modules[$Name]->Enabled;
   }
 
   function ModuleRunning($Name)
   {
-    return(array_key_exists($Name, $this->Modules) and $this->Modules[$Name]->Running);
+    return array_key_exists($Name, $this->Modules) and $this->Modules[$Name]->Running;
   }
 
@@ -331 +331 @@
   function SearchModuleById($Id)
   {
-    foreach($this->Modules as $Module)
+    foreach ($this->Modules as $Module)
     {
       //DebugLog($Module->Name.' '.$Module->Id);
-      if($Module->Id == $Id) return($Module->Name);
-    }
-    return('');
+      if ($Module->Id == $Id) return $Module->Name;
+    }
+    return '';
   }
 
@@ -343 +343 @@
     $ConfigModules = array();
     include($this->FileName);
-    foreach($ConfigModules as $Mod)
-    {
-      if(array_key_exists($Mod['Name'], $this->Modules))
+    foreach ($ConfigModules as $Mod)
+    {
+      if (array_key_exists($Mod['Name'], $this->Modules))
       {
         $this->Modules[$Mod['Name']] = $this->Modules[$Mod['Name']];
@@ -358 +358 @@
   {
     $Data = array();
-    foreach($this->Modules as $Module)
+    foreach ($this->Modules as $Module)
     {
       $Data[] = array('Name' => $Module->Name, 'Enabled' => $Module->Enabled,
@@ -381 +381 @@
   {
     $List = scandir($Directory);
-    foreach($List as $Item)
-    {
-      if(is_dir($Directory.'/'.$Item) and ($Item != '.') and ($Item != '..') and ($Item != '.svn'))
+    foreach ($List as $Item)
+    {
+      if (is_dir($Directory.'/'.$Item) and ($Item != '.') and ($Item != '..') and ($Item != '.svn'))
       {
         include_once($Directory.'/'.$Item.'/'.$Item.'.php');
@@ -394 +394 @@
   function LoadModules()
   {
-    if(method_exists($this->OnLoadModules[0], $this->OnLoadModules[1]))
+    if (method_exists($this->OnLoadModules[0], $this->OnLoadModules[1]))
       $this->OnLoadModules();
     else $this->LoadModulesFromDir($this->ModulesDir);

trunk/Packages/Common/Application.php

@@ -12 +12 @@
   function DoOnChange()
   {
-    foreach($this->OnChange as $Callback)
+    foreach ($this->OnChange as $Callback)
     {
       call_user_func($Callback);

trunk/Packages/Common/Common.php

@@ -62 +62 @@
 
     $Result = '';
-    if(array_key_exists('all', $QueryItems))
+    if (array_key_exists('all', $QueryItems))
     {
       $PageCount = 1;
@@ -73 +73 @@
     }
 
-    if(!array_key_exists('Page', $_SESSION)) $_SESSION['Page'] = 0;
-    if(array_key_exists('page', $_GET)) $_SESSION['Page'] = $_GET['page'] * 1;
-    if($_SESSION['Page'] < 0) $_SESSION['Page'] = 0;
-    if($_SESSION['Page'] >= $PageCount) $_SESSION['Page'] = $PageCount - 1;
+    if (!array_key_exists('Page', $_SESSION)) $_SESSION['Page'] = 0;
+    if (array_key_exists('page', $_GET)) $_SESSION['Page'] = $_GET['page'] * 1;
+    if ($_SESSION['Page'] < 0) $_SESSION['Page'] = 0;
+    if ($_SESSION['Page'] >= $PageCount) $_SESSION['Page'] = $PageCount - 1;
     $CurrentPage = $_SESSION['Page'];
 
@@ -82 +82 @@
 
     $Result = '';
-    if($PageCount > 1)
+    if ($PageCount > 1)
     {
-      if($CurrentPage > 0)
+      if ($CurrentPage > 0)
       {
         $QueryItems['page'] = 0;
@@ -93 +93 @@
       $PagesMax = $PageCount - 1;
       $PagesMin = 0;
-      if($PagesMax > ($CurrentPage + $Around)) $PagesMax = $CurrentPage + $Around;
-      if($PagesMin < ($CurrentPage - $Around))
+      if ($PagesMax > ($CurrentPage + $Around)) $PagesMax = $CurrentPage + $Around;
+      if ($PagesMin < ($CurrentPage - $Around))
       {
         $Result.= ' ... ';
         $PagesMin = $CurrentPage - $Around;
       }
-      for($i = $PagesMin; $i <= $PagesMax; $i++)
+      for ($i = $PagesMin; $i <= $PagesMax; $i++)
       {
-        if($i == $CurrentPage) $Result.= '<strong>'.($i + 1).'</strong> ';
+        if ($i == $CurrentPage) $Result.= '<strong>'.($i + 1).'</strong> ';
         else {
          $QueryItems['page'] = $i;
@@ -107 +107 @@
         }
       }
-      if($PagesMax < ($PageCount - 1)) $Result .= ' ... ';
-      if($CurrentPage < ($PageCount - 1))
+      if ($PagesMax < ($PageCount - 1)) $Result .= ' ... ';
+      if ($CurrentPage < ($PageCount - 1))
       {
         $QueryItems['page'] = ($CurrentPage + 1);
@@ -117 +117 @@
     }
     $QueryItems['all'] = '1';
-    if($PageCount > 1) $Result.= ' <a href="?'.SetQueryStringArray($QueryItems).'">Vše</a>';
+    if ($PageCount > 1) $Result.= ' <a href="?'.SetQueryStringArray($QueryItems).'">Vše</a>';
 
     $Result = '<div style="text-align: center">'.$Result.'</div>';
     $this->SQLLimit = ' LIMIT '.$CurrentPage * $ItemPerPage.', '.$ItemPerPage;
     $this->Page = $CurrentPage;
-    return($Result);
+    return $Result;
   }
 }

trunk/Packages/Common/Config.php

@@ -12 +12 @@
   function ReadValue($Name)
   {
-    if(!is_array($Name)) $Name = explode('/', $Name);
+    if (!is_array($Name)) $Name = explode('/', $Name);
     $Last = array_pop($Name);
     $Data = &$this->Data;
-    foreach($Name as $Item)
+    foreach ($Name as $Item)
     {
       $Data = &$Data[$Item];
     }
-    return($Data[$Last]);
+    return $Data[$Last];
   }
 
   function WriteValue($Name, $Value)
   {
-    if(!is_array($Name)) $Name = explode('/', $Name);
+    if (!is_array($Name)) $Name = explode('/', $Name);
     $Last = array_pop($Name);
     $Data = &$this->Data;
-    foreach($Name as $Item)
+    foreach ($Name as $Item)
     {
       $Data = &$Data[$Item];
@@ -38 +38 @@
     $ConfigData = array();
     include $FileName;
-    foreach($this->Data as $Index => $Item)
+    foreach ($this->Data as $Index => $Item)
     {
-      if(array_key_exits($Index, $ConfigData))
+      if (array_key_exits($Index, $ConfigData))
         $this->Data[$Index] = $ConfigData[$Index];
     }
@@ -52 +52 @@
   function GetAsArray()
   {
-    return($this->Data);
+    return $this->Data;
   }
 }

trunk/Packages/Common/Database.php

@@ -7 +7 @@
 {
   list($usec, $sec) = explode(" ", microtime());
-  return ((float)$usec + (float)$sec);
+  return (float)$usec + (float)$sec;
 }
 
@@ -17 +17 @@
   function fetch_assoc()
   {
-    return($this->PDOStatement->fetch(PDO::FETCH_ASSOC));
+    return $this->PDOStatement->fetch(PDO::FETCH_ASSOC);
   }
 
   function fetch_array()
   {
-    return($this->PDOStatement->fetch(PDO::FETCH_BOTH));
+    return $this->PDOStatement->fetch(PDO::FETCH_BOTH);
   }
 
   function fetch_row()
   {
-    return($this->PDOStatement->fetch(PDO::FETCH_NUM));
+    return $this->PDOStatement->fetch(PDO::FETCH_NUM);
   }
 }
@@ -61 +61 @@
   function Connect($Host, $User, $Password, $Database)
   {
-    if($this->Type == 'mysql') $ConnectionString = 'mysql:host='.$Host.';dbname='.$Database;
-      else if($this->Type == 'pgsql') $ConnectionString = 'pgsql:dbname='.$Database.';host='.$Host;
+    if ($this->Type == 'mysql') $ConnectionString = 'mysql:host='.$Host.';dbname='.$Database;
+      else if ($this->Type == 'pgsql') $ConnectionString = 'pgsql:dbname='.$Database.';host='.$Host;
       else $ConnectionString = '';
     try {
@@ -81 +81 @@
   function Connected()
   {
-    return(isset($this->PDO));
+    return isset($this->PDO);
   }
 
@@ -91 +91 @@
   function query($Query)
   {
-    if(!$this->Connected()) throw new Exception(T('Not connected to database'));
-    if(($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true)) $QueryStartTime = microtime_float();
+    if (!$this->Connected()) throw new Exception(T('Not connected to database'));
+    if (($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true)) $QueryStartTime = microtime_float();
     $this->LastQuery = $Query;
     //echo('a'.$this->ShowSQLQuery.'<'.$QueryStartTime.', '.microtime_float());
-    if(($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true))
+    if (($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true))
       $Duration = ' ; '.round(microtime_float() - $QueryStartTime, 4). ' s';
-    if($this->LogSQLQuery == true)
+    if ($this->LogSQLQuery == true)
       file_put_contents($this->LogFile, $Query.$Duration."\n", FILE_APPEND);
-    if($this->ShowSQLQuery == true)
+    if ($this->ShowSQLQuery == true)
       echo('<div style="border-bottom-width: 1px; border-bottom-style: solid; '.
       'padding-bottom: 3px; padding-top: 3px; font-size: 12px; font-family: Arial;">'.$Query.$Duration.'</div>'."\n");
     $Result = new DatabaseResult();
     $Result->PDOStatement = $this->PDO->query($Query);
-    if($Result->PDOStatement)
+    if ($Result->PDOStatement)
     {
       $Result->num_rows = $Result->PDOStatement->rowCount();
@@ -112 +112 @@
       $this->Error = $this->PDO->errorInfo();
       $this->Error = $this->Error[2];
-      if(($this->Error != '') and ($this->ShowSQLError == true))
+      if (($this->Error != '') and ($this->ShowSQLError == true))
         echo('<div><strong>SQL Error: </strong>'.$this->Error.'<br />'.$Query.'</div>');
         throw new Exception('SQL Error: '.$this->Error.', Query: '.$Query);
     }
-    return($Result);
+    return $Result;
   }
 
   function select($Table, $What = '*', $Condition = 1)
   {
-    return($this->query('SELECT '.$What.' FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition));
+    return $this->query('SELECT '.$What.' FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition);
   }
 
@@ -139 +139 @@
     $Name = '';
     $Values = '';
-    foreach($Data as $Key => $Value)
+    foreach ($Data as $Key => $Value)
     {
       $Name .= ',`'.$Key.'`';
-      if(!in_array($Value, $this->Functions))
-      {
-        if(is_null($Value)) $Value = 'NULL';
+      if (!in_array($Value, $this->Functions))
+      {
+        if (is_null($Value)) $Value = 'NULL';
         else $Value = $this->PDO->quote($Value);
       }
@@ -151 +151 @@
     $Name = substr($Name, 1);
     $Values = substr($Values, 1);
-    return('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
+    return 'INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')';
   }
 
@@ -162 +162 @@
   {
     $Values = '';
-    foreach($Data as $Key => $Value)
-    {
-      if(!in_array($Value, $this->Functions))
-      {
-        if(is_null($Value)) $Value = 'NULL';
+    foreach ($Data as $Key => $Value)
+    {
+      if (!in_array($Value, $this->Functions))
+      {
+        if (is_null($Value)) $Value = 'NULL';
         else $Value = $this->PDO->quote($Value);
       }
@@ -172 +172 @@
     }
     $Values = substr($Values, 2);
-    return('UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')');
+    return 'UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')';
   }
 
@@ -179 +179 @@
     $Name = '';
     $Values = '';
-    foreach($Data as $Key => $Value)
-    {
-      if(!in_array($Value, $this->Functions))
-      {
-        if(is_null($Value)) $Value = 'NULL';
+    foreach ($Data as $Key => $Value)
+    {
+      if (!in_array($Value, $this->Functions))
+      {
+        if (is_null($Value)) $Value = 'NULL';
         else $Value = $this->PDO->quote($Value);
       }
@@ -203 +203 @@
   function real_escape_string($Text)
   {
-    return(addslashes($Text));
+    return addslashes($Text);
   }
 
   function quote($Text)
   {
-    return($this->PDO->quote($Text));
+    return $this->PDO->quote($Text);
   }
 
@@ -234 +234 @@
 function TimeToMysqlDateTime($Time)
 {
-  if($Time == NULL) return(NULL);
-    else return(date('Y-m-d H:i:s', $Time));
+  if ($Time == NULL) return NULL;
+    else return date('Y-m-d H:i:s', $Time);
 }
 
 function TimeToMysqlDate($Time)
 {
-  if($Time == NULL) return(NULL);
-    else return(date('Y-m-d', $Time));
+  if ($Time == NULL) return NULL;
+    else return date('Y-m-d', $Time);
 }
 
 function TimeToMysqlTime($Time)
 {
-  if($Time == NULL) return(NULL);
-    else return(date('H:i:s', $Time));
+  if ($Time == NULL) return NULL;
+    else return date('H:i:s', $Time);
 }
 
 function MysqlDateTimeToTime($DateTime)
 {
-  if($DateTime == '') return(NULL);
+  if ($DateTime == '') return NULL;
   $Parts = explode(' ', $DateTime);
   $DateParts = explode('-', $Parts[0]);
   $TimeParts = explode(':', $Parts[1]);
   $Result = mktime($TimeParts[0], $TimeParts[1], $TimeParts[2], $DateParts[1], $DateParts[2], $DateParts[0]);
-  return($Result);
+  return $Result;
 }
 
 function MysqlDateToTime($Date)
 {
-  if($Date == '') return(NULL);
-  return(MysqlDateTimeToTime($Date.' 0:0:0'));
+  if ($Date == '') return NULL;
+  return MysqlDateTimeToTime($Date.' 0:0:0');
 }
 
 function MysqlTimeToTime($Time)
 {
-  if($Time == '') return(NULL);
-  return(MysqlDateTimeToTime('0000-00-00 '.$Time));
-}
+  if ($Time == '') return NULL;
+  return MysqlDateTimeToTime('0000-00-00 '.$Time);
+}

trunk/Packages/Common/Error.php

@@ -45 +45 @@
     );
 
-    if(($this->UserErrors & $Number))
+    if (($this->UserErrors & $Number))
     {
       // Error was suppressed with the @-operator
-      if(0 === error_reporting())
+      if (0 === error_reporting())
       {
         return false;
@@ -58 +58 @@
       $Backtrace[0]['line'] = $LineNumber;
       $this->Report($Backtrace);
-      //if((E_ERROR | E_PARSE) & $Number)
+      //if ((E_ERROR | E_PARSE) & $Number)
       die();
     }
@@ -82 +82 @@
       'An internal error occurred!<br/>'.
       'Administrator will be notified and the problem will be investigated and fixed soon.'.'<br/><br/>';
-    if($this->ShowError == true)
+    if ($this->ShowError == true)
       $Output .= '<pre>'.$Message.'</pre><br/>';
     $Output .= '</body></html>';
@@ -93 +93 @@
     $Date = date('Y-m-d H:i:s');
     $Error = '# '.$Date."\n";
-    foreach($Backtrace as $Item)
+    foreach ($Backtrace as $Item)
     {
-      if(!array_key_exists('line', $Item)) $Item['line'] = '';
-      if(!array_key_exists('file', $Item)) $Item['file'] = '';
+      if (!array_key_exists('line', $Item)) $Item['line'] = '';
+      if (!array_key_exists('file', $Item)) $Item['file'] = '';
 
       $Error .= ' '.$Item['file'].'('.$Item['line'].")\t".$Item['function'];
       $Arguments = '';
-      if(array_key_exists('args', $Item) and is_array($Item['args']))
-        foreach($Item['args'] as $Item)
+      if (array_key_exists('args', $Item) and is_array($Item['args']))
+        foreach ($Item['args'] as $Item)
         {
-          if(is_object($Item)) ;
-          else if(is_array($Item)) $Arguments .= "'".serialize($Item)."',";
+          if (is_object($Item)) ;
+          else if (is_array($Item)) $Arguments .= "'".serialize($Item)."',";
           else $Arguments .= "'".$Item."',";
         }
-        if(strlen($Arguments) > 0) $Error .= '('.substr($Arguments, 0, -1).')';
+        if (strlen($Arguments) > 0) $Error .= '('.substr($Arguments, 0, -1).')';
         $Error .= "\n";
     }
     $Error .= "\n";
 
-    foreach($this->OnError as $OnError)
+    foreach ($this->OnError as $OnError)
       call_user_func($OnError, $Error);
   }

trunk/Packages/Common/Image.php

@@ -65 +65 @@
   function SaveToFile($FileName)
   {
-    if($this->Type == IMAGETYPE_JPEG)
+    if ($this->Type == IMAGETYPE_JPEG)
     {
       imagejpeg($this->Image, $FileName);
     } else
-    if($this->Type == IMAGETYPE_GIF)
+    if ($this->Type == IMAGETYPE_GIF)
     {
-      imagegif($this->Image, $FileName);
+      imagegif ($this->Image, $FileName);
     } else
-    if($this->Type == IMAGETYPE_PNG)
+    if ($this->Type == IMAGETYPE_PNG)
     {
       imagepng($this->Image, $FileName);
@@ -83 +83 @@
     $ImageInfo = getimagesize($FileName);
     $this->Type = $ImageInfo[2];
-    if($this->Type == IMAGETYPE_JPEG)
+    if ($this->Type == IMAGETYPE_JPEG)
     {
       $this->Image = imagecreatefromjpeg($FileName);
     } else
-    if($this->Type == IMAGETYPE_GIF)
+    if ($this->Type == IMAGETYPE_GIF)
     {
       $this->Image = imagecreatefromgif($FileName);
     } else
-    if( $this->Type == IMAGETYPE_PNG)
+    if ( $this->Type == IMAGETYPE_PNG)
     {
       $this->Image = imagecreatefrompng($FileName);
@@ -112 +112 @@
   function GetWidth()
   {
-    return(imagesx($this->Image));
+    return imagesx($this->Image);
   }
 
   function GetHeight()
   {
-    return(imagesy($this->Image));
+    return imagesy($this->Image);
   }
 
@@ -127 +127 @@
   function ConvertColor($Color)
   {
-    return(imagecolorallocate($this->Image, ($Color >> 16) & 0xff, ($Color >> 8) & 0xff, $Color & 0xff));
+    return imagecolorallocate($this->Image, ($Color >> 16) & 0xff, ($Color >> 8) & 0xff, $Color & 0xff);
   }
 

trunk/Packages/Common/Locale.php

@@ -20 +20 @@
   function Translate($Text, $Group = '')
   {
-    if(array_key_exists($Text, $this->Data[$Group]) and ($this->Data[$Group][$Text] != ''))
-      return($this->Data[$Group][$Text]);
-      else return($Text);
+    if (array_key_exists($Text, $this->Data[$Group]) and ($this->Data[$Group][$Text] != ''))
+      return $this->Data[$Group][$Text];
+      else return $Text;
   }
 
@@ -28 +28 @@
   {
     $Key = array_search($Text, $this->Data[$Group]);
-    if(($Key === FALSE) or ($this->Data[$Group][$Key] == '')) return($Text);
-      else return($Key);
+    if (($Key === FALSE) or ($this->Data[$Group][$Key] == '')) return $Text;
+      else return $Key;
   }
 }
@@ -47 +47 @@
   {
     $FileName = $this->Dir.'/'.$Language.'.php';
-    if(file_exists($FileName)) {
+    if (file_exists($FileName)) {
       include_once($FileName);
       $ClassName = 'LocaleText'.$Language;
@@ -59 +59 @@
     // Search for php files
     $FileList = scandir($Path);
-    foreach($FileList as $FileName)
+    foreach ($FileList as $FileName)
     {
       $FullName = $Path.'/'.$FileName;
-      if(($FileName == '.') or ($FileName == '..')) ; // Skip virtual items
-      else if(substr($FileName, 0, 1) == '.') ; // Skip Linux hidden files
-      else if(is_dir($FullName)) $this->AnalyzeCode($FullName);
-      else if(file_exists($FullName))
-      {
-        if(substr($FullName, -4) == '.php')
+      if (($FileName == '.') or ($FileName == '..')) ; // Skip virtual items
+      else if (substr($FileName, 0, 1) == '.') ; // Skip Linux hidden files
+      else if (is_dir($FullName)) $this->AnalyzeCode($FullName);
+      else if (file_exists($FullName))
+      {
+        if (substr($FullName, -4) == '.php')
         {
           $Content = file_get_contents($FullName);
           // Search occurence of T() function
-          while(strpos($Content, 'T(') !== false)
+          while (strpos($Content, 'T(') !== false)
           {
             $Previous = strtolower(substr($Content, strpos($Content, 'T(') - 1, 1));
@@ -77 +77 @@
             $Ord = ord($Previous);
             //echo($Ord.',');
-            if(!(($Ord >= ord('a')) and ($Ord <= ord('z'))))
+            if (!(($Ord >= ord('a')) and ($Ord <= ord('z'))))
             {
               // Do for non-alpha previous character
               $Original = substr($Content, 0, strpos($Content, ')'));
               $Original2 = '';
-              if((substr($Original, 0, 1) == "'") and (substr($Original, -1, 1) == "'"))
+              if ((substr($Original, 0, 1) == "'") and (substr($Original, -1, 1) == "'"))
                 $Original2 = substr($Original, 1, -1);
-              if((substr($Original, 0, 1) == '"') and (substr($Original, -1, 1) == '"'))
+              if ((substr($Original, 0, 1) == '"') and (substr($Original, -1, 1) == '"'))
                 $Original2 = substr($Original, 1, -1);
-              if($Original2 != '')
+              if ($Original2 != '')
               {
-                if(!array_key_exists($Original2, $this->Texts->Data))
+                if (!array_key_exists($Original2, $this->Texts->Data))
                   $this->Texts->Data[$Original2] = '';
               }
@@ -109 +109 @@
     '    $this->Title = \''.$this->Texts->Title.'\';'."\n".
     '    $this->Data = array('."\n";
-    foreach($this->Texts->Data as $Index => $Item)
+    foreach ($this->Texts->Data as $Index => $Item)
     {
       $Content .= "      '".$Index."' => '".$Item."',\n";
@@ -122 +122 @@
   {
     $DbResult = $Database->select('Language', '*', 'Code='.$Database->quote($LangCode));
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $Language = $DbResult->fetch_assoc();
       $this->Texts->Data = array();
       $DbResult = $Database->select('Locale', '`Original`, `Translated`', '`Language`='.$Language['Id']);
-      while($DbRow = $DbResult->fetch_assoc())
+      while ($DbRow = $DbResult->fetch_assoc())
         $this->Texts->Data[$DbRow['Original']] = $DbRow['Translated'];
     }
@@ -135 +135 @@
   {
     $DbResult = $Database->select('Language', '*', 'Code='.$Database->quote($LangCode));
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $Language = $DbResult->fetch_assoc();
       $Database->delete('Locale', '`Language`='.$Language['Id']);
-      foreach($this->Texts->Data as $Index => $Item)
+      foreach ($this->Texts->Data as $Index => $Item)
         $Database->query('INSERT INTO `Locale` (`Language`,`Original`,`Translated`) '.
         'VALUES('.$Language['Id'].','.$Database->quote($Index).','.$Database->quote($Item).')');
@@ -148 +148 @@
   {
     $DbResult = $Database->select('Language', '*', '`Code`='.$Database->quote($LangCode));
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $Language = $DbResult->fetch_assoc();
-      foreach($this->Texts->Data as $Index => $Item)
+      foreach ($this->Texts->Data as $Index => $Item)
       {
         $DbResult = $Database->select('Locale', '*', '(`Original` ='.$Database->quote($Index).
           ') AND (`Language`='.($Language['Id']).')');
-        if($DbResult->num_rows > 0)
+        if ($DbResult->num_rows > 0)
         $Database->update('Locale', '(`Language`='.($Language['Id']).') AND '.
           '(`Original` ='.$Database->quote($Index).')', array('Translated' => $Item));
@@ -188 +188 @@
     $this->Available = array();
     $FileList = scandir($this->Dir);
-    foreach($FileList as $FileName)
-    {
-      if(substr($FileName, -4) == '.php')
+    foreach ($FileList as $FileName)
+    {
+      if (substr($FileName, -4) == '.php')
       {
         $Code = substr($FileName, 0, -4);
@@ -206 +206 @@
     $Locale->AnalyzeCode($Directory);
     $FileList = scandir($this->Dir);
-    foreach($FileList as $FileName)
-    {
-      if(substr($FileName, -4) == '.php')
+    foreach ($FileList as $FileName)
+    {
+      if (substr($FileName, -4) == '.php')
       {
         $FileLocale = new LocaleFile($this->System);
@@ -215 +215 @@
 
         // Add new
-        foreach($Locale->Texts->Data as $Index => $Item)
-          if(!array_key_exists($Index, $FileLocale->Texts->Data))
+        foreach ($Locale->Texts->Data as $Index => $Item)
+          if (!array_key_exists($Index, $FileLocale->Texts->Data))
             $FileLocale->Texts->Data[$Index] = $Item;
         // Remove old
-        foreach($FileLocale->Texts->Data as $Index => $Item)
-          if(!array_key_exists($Index, $Locale->Texts->Data))
+        foreach ($FileLocale->Texts->Data as $Index => $Item)
+          if (!array_key_exists($Index, $Locale->Texts->Data))
             unset($FileLocale->Texts->Data[$Index]);
         $FileLocale->UpdateToDatabase($this->System->Database, $FileLocale->Texts->Code);
@@ -232 +232 @@
   function LoadLocale($Code)
   {
-    if(array_key_exists($Code, $this->Available))
+    if (array_key_exists($Code, $this->Available))
     {
       $this->CurrentLocale->Dir = $this->Dir;
@@ -245 +245 @@
   global $GlobalLocaleManager;
 
-  if(isset($GlobalLocaleManager)) return($GlobalLocaleManager->CurrentLocale->Texts->Translate($Text, $Group));
-    else return($Text);
-}
+  if (isset($GlobalLocaleManager)) return $GlobalLocaleManager->CurrentLocale->Texts->Translate($Text, $Group);
+    else return $Text;
+}

trunk/Packages/Common/Mail.php

@@ -69 +69 @@
   function Organization($org)
   {
-    if(trim($org != '')) $this->xheaders['Organization'] = $org;
+    if (trim($org != '')) $this->xheaders['Organization'] = $org;
   }
 
   function Priority($Priority)
   {
-    if(!intval($Priority)) return(false);
-
-    if(!isset($this->priorities[$Priority - 1])) return(false);
+    if (!intval($Priority)) return false;
+
+    if (!isset($this->priorities[$Priority - 1])) return false;
 
     $this->xheaders['X-Priority'] = $this->priorities[$Priority - 1];
-    return(true);
+    return true;
   }
 
@@ -96 +96 @@
   function Send()
   {
-    if(count($this->Bodies) == 0) throw new Exception(T('Mail message need at least one text body'));
+    if (count($this->Bodies) == 0) throw new Exception(T('Mail message need at least one text body'));
 
     $Body = $this->BuildAttachment($this->BuildBody());
@@ -103 +103 @@
     $this->Headers['CC'] = '';
     $this->Headers['BCC'] = '';
-    foreach($this->Recipients as $Index => $Recipient)
-    {
-      if($Recipient['Type'] == 'SendCombined')
-      {
-        if($Index > 0) $To .= ', ';
+    foreach ($this->Recipients as $Index => $Recipient)
+    {
+      if ($Recipient['Type'] == 'SendCombined')
+      {
+        if ($Index > 0) $To .= ', ';
         $To .= $Recipient['Address'];
       } else
-      if($Recipient['Type'] == 'Send')
-      {
-        if($Index > 0) $To .= ', ';
+      if ($Recipient['Type'] == 'Send')
+      {
+        if ($Index > 0) $To .= ', ';
         $To .= $Recipient['Name'].' <'.$Recipient['Address'].'>';
       } else
-      if($Recipient['Type'] == 'Copy')
-      {
-        if($Index > 0) $this->Headers['CC'] .= ', ';
+      if ($Recipient['Type'] == 'Copy')
+      {
+        if ($Index > 0) $this->Headers['CC'] .= ', ';
         $this->Headers['CC'] .= $Recipient['Name'].' <'.$To['Address'].'>';
       } else
-      if($Recipient['Type'] == 'HiddenCopy')
-      {
-        if($Index > 0) $this->Headers['BCC'] .= ', ';
+      if ($Recipient['Type'] == 'HiddenCopy')
+      {
+        if ($Index > 0) $this->Headers['BCC'] .= ', ';
         $this->Headers['BCC'] .= $Recipient['Name'].' <'.$To['Address'].'>';
       }
     }
-    if($To == '') throw new Exception(T('Mail message need at least one recipient address'));
+    if ($To == '') throw new Exception(T('Mail message need at least one recipient address'));
 
     $this->Headers['Mime-Version'] = '1.0';
 
-    if($this->AgentIdent != '') $this->Headers['X-Mailer'] = $this->AgentIdent;
-    if($this->ReplyTo != '') $this->Headers['Reply-To'] = $this->ReplyTo;
-    if($this->From != '') $this->Headers['From'] = $this->From;
+    if ($this->AgentIdent != '') $this->Headers['X-Mailer'] = $this->AgentIdent;
+    if ($this->ReplyTo != '') $this->Headers['Reply-To'] = $this->ReplyTo;
+    if ($this->From != '') $this->Headers['From'] = $this->From;
 
     $Headers = '';
-    foreach($this->Headers as $Header => $Value)
-    {
-      if(($Header != 'Subject') and ($Value != '')) $Headers .= $Header.': '.$Value."\n";
+    foreach ($this->Headers as $Header => $Value)
+    {
+      if (($Header != 'Subject') and ($Value != '')) $Headers .= $Header.': '.$Value."\n";
     }
 
     $this->Subject = strtr($this->Subject, "\r\n", '  ');
 
-    if($this->Subject == '') throw new Exception(T('Mail message missing Subject'));
+    if ($this->Subject == '') throw new Exception(T('Mail message missing Subject'));
 
 
     $res = mail($To, $this->Subject, $Body, $Headers);
-    return($res);
+    return $res;
   }
 
   function ValidEmail($Address)
   {
-    if(ereg(".*<(.+)>", $Address, $regs)) $Address = $regs[1];
-    if(ereg("^[^@  ]+@([a-zA-Z0-9\-]+\.)+([a-zA-Z0-9\-]{2}|net|com|gov|mil|org|edu|int)\$", $Address))
-      return(true);
-      else return(false);
+    if (ereg(".*<(.+)>", $Address, $regs)) $Address = $regs[1];
+    if (ereg("^[^@  ]+@([a-zA-Z0-9\-]+\.)+([a-zA-Z0-9\-]{2}|net|com|gov|mil|org|edu|int)\$", $Address))
+      return true;
+      else return false;
   }
 
   function CheckAdresses($Addresses)
   {
-    foreach($Addresses as $Address)
-    {
-      if(!$this->ValidEmail($Address))
+    foreach ($Addresses as $Address)
+    {
+      if (!$this->ValidEmail($Address))
   throw new Exception(sprintf(T('Mail message invalid address %s'), $Address));
     }
@@ -168 +168 @@
   private function ContentEncoding($Charset)
   {
-    if($Charset != CHARSET_ASCII) return('8bit');
-      else return('7bit');
+    if ($Charset != CHARSET_ASCII) return '8bit';
+      else return '7bit';
   }
 
   private function BuildAttachment($Body)
   {
-    if(count($this->Attachments) > 0)
+    if (count($this->Attachments) > 0)
     {
       $this->Headers['Content-Type'] = "multipart/mixed;\n boundary=\"PHP-mixed-".$this->Boundary."\"";
@@ -181 +181 @@
       $Result .= $Body;
 
-      foreach($this->Attachments as $Attachment)
+      foreach ($this->Attachments as $Attachment)
       {
         $FileName = $Attachment['FileName'];
@@ -187 +187 @@
         $ContentType = $Attachment['FileType'];
         $Disposition = $Attachment['Disposition'];
-        if($Attachment['Type'] == 'File')
+        if ($Attachment['Type'] == 'File')
         {
-          if(!file_exists($FileName))
+          if (!file_exists($FileName))
             throw new Exception(sprintf(T('Mail message attached file %s can\'t be found'), $FileName));
           $Data = file_get_contents($FileName);
         } else
-        if($Attachment['Type'] == 'Data') $Data = $Attachment['Data'];
+        if ($Attachment['Type'] == 'Data') $Data = $Attachment['Data'];
           else $Data = '';
 
@@ -203 +203 @@
       }
     } else $Result = $Body;
-    return($Result);
+    return $Result;
   }
 
@@ -209 +209 @@
   {
     $Result = '';
-    if(count($this->Bodies) > 1)
+    if (count($this->Bodies) > 1)
     {
       $this->Headers['Content-Type'] = 'multipart/alternative; boundary="PHP-alt-'.$this->Boundary.'"';
@@ -221 +221 @@
 
 
-    foreach($this->Bodies as $Body)
-    {
-      if(count($this->Bodies) > 1) $Result .= "\n\n".'--PHP-alt-'.$this->Boundary."\n";
+    foreach ($this->Bodies as $Body)
+    {
+      if (count($this->Bodies) > 1) $Result .= "\n\n".'--PHP-alt-'.$this->Boundary."\n";
       $Result .= 'Content-Type: '.$Body['Type'].'; charset='.$Body['Charset'].
         "\nContent-Transfer-Encoding: ".$this->ContentEncoding($Body['Charset'])."\n\n".$Body['Content']."\n";
     }
-    return($Result);
+    return $Result;
   }
 }

trunk/Packages/Common/NetworkAddress.php

@@ -14 +14 @@
   function GetNetMask()
   {
-    return(0xffffffff ^ ((1 << (32 - $this->Prefix)) - 1));
+    return 0xffffffff ^ ((1 << (32 - $this->Prefix)) - 1);
   }
 
   function AddressToString()
   {
-    return(implode('.', array(($this->Address >> 24) & 255, ($this->Address >> 16) & 255, ($this->Address >> 8) & 255, ($this->Address & 255))));
+    return implode('.', array(($this->Address >> 24) & 255, ($this->Address >> 16) & 255, ($this->Address >> 8) & 255, ($this->Address & 255)));
   }
 
@@ -37 +37 @@
     $To->Address = $From->Address + $HostMask;
     $To->Prefix = 32;
-    return(array('From' => $From, 'To' => $To));
+    return array('From' => $From, 'To' => $To);
   }
 
@@ -43 +43 @@
   {
     $this->Prefix = $NewPrefix;
-    if($this->Prefix > 32) $this->Prefix = 32;
-    if($this->Prefix < 0) $this->Prefix = 0;
+    if ($this->Prefix > 32) $this->Prefix = 32;
+    if ($this->Prefix < 0) $this->Prefix = 0;
     $this->Address = $this->Address & $this->GetNetMask();
   }
@@ -51 +51 @@
   {
     $UpperNetmask = $this->GetNetMask();
-    if(($this->Prefix < $Address->Prefix) and (($Address->Address & $UpperNetmask) == ($this->Address & $UpperNetmask))) $Result = true;
+    if (($this->Prefix < $Address->Prefix) and (($Address->Address & $UpperNetmask) == ($this->Address & $UpperNetmask))) $Result = true;
       else $Result = false;
     //echo($Address->AddressToString().'/'.$Address->Prefix.' in '.$this->AddressToString().'/'.$this->Prefix.' '.$Result."\n");
-    return($Result);
+    return $Result;
   }
 }
@@ -71 +71 @@
   function AddressToString()
   {
-    return(inet_ntop($this->Address));
+    return inet_ntop($this->Address);
   }
 
@@ -83 +83 @@
     $Result = array();
     $Data = array_reverse(unpack('C*', $this->Address));
-    foreach($Data as $Item)
+    foreach ($Data as $Item)
     {
 
@@ -89 +89 @@
       $Result[] = dechex(($Item >> 4) & 15);
     }
-    return($Result);
+    return $Result;
   }
 

trunk/Packages/Common/Page.php

@@ -17 +17 @@
   function Show()
   {
-    return('');
+    return '';
   }
 
@@ -23 +23 @@
   {
     $Output = $this->Show();
-    return($Output);
+    return $Output;
   }
 
   function SystemMessage($Title, $Text)
   {
-    return(call_user_func_array($this->OnSystemMessage, array($Title, $Text)));
+    return call_user_func_array($this->OnSystemMessage, array($Title, $Text));
   }
 }

trunk/Packages/Common/PrefixMultiplier.php

@@ -74 +74 @@
   function TruncateDigits($Value, $Digits = 4)
   {
-    for($II = 2; $II > -6; $II--)
+    for ($II = 2; $II > -6; $II--)
     {
-      if($Value >= pow(10, $II))
+      if ($Value >= pow(10, $II))
       {
-        if($Digits < ($II + 1)) $RealDigits = $II + 1;
+        if ($Digits < ($II + 1)) $RealDigits = $II + 1;
           else $RealDigits = $Digits;
         $Value = round($Value / pow(10, $II - $RealDigits + 1)) * pow(10, $II - $RealDigits + 1);
@@ -84 +84 @@
       }
     }
-    return($Value);
+    return $Value;
   }
 
@@ -93 +93 @@
     $Negative = ($Value < 0);
     $Value = abs($Value);
-    if(($Unit == '') and ($PrefixType != 'Time'))
-      return($this->TruncateDigits($Value, $Digits));
+    if (($Unit == '') and ($PrefixType != 'Time'))
+      return $this->TruncateDigits($Value, $Digits);
 
     $I = $PrefixMultipliers[$PrefixType]['BaseIndex'];
-    if($Value == 0) return($Value.' '.$PrefixMultipliers[$PrefixType]['Definition'][$I][0].$Unit);
+    if ($Value == 0) return $Value.' '.$PrefixMultipliers[$PrefixType]['Definition'][$I][0].$Unit;
 
-    if($Value > 1)
+    if ($Value > 1)
     {
-      while((($I + 1) <= count($PrefixMultipliers[$PrefixType]['Definition'])) and (($Value / $PrefixMultipliers[$PrefixType]['Definition'][$I + 1][2]) > 1))
+      while ((($I + 1) <= count($PrefixMultipliers[$PrefixType]['Definition'])) and (($Value / $PrefixMultipliers[$PrefixType]['Definition'][$I + 1][2]) > 1))
         $I = $I + 1;
     } else
-    if($Value < 1)
+    if ($Value < 1)
     {
-      while((($I - 1) >= 0) and (($Value / $PrefixMultipliers[$PrefixType]['Definition'][$I][2]) < 1))
+      while ((($I - 1) >= 0) and (($Value / $PrefixMultipliers[$PrefixType]['Definition'][$I][2]) < 1))
         $I = $I - 1;
     }
@@ -113 +113 @@
     // Truncate digits count
     $Value = $this->TruncateDigits($Value, $Digits);
-    if($Negative) $Value = -$Value;
-    return($Value.' '.$PrefixMultipliers[$PrefixType]['Definition'][$I][0].$Unit);
+    if ($Negative) $Value = -$Value;
+    return $Value.' '.$PrefixMultipliers[$PrefixType]['Definition'][$I][0].$Unit;
   }
 }

trunk/Packages/Common/RSS.php

@@ -28 +28 @@
   "    <pubDate>".date('r')."</pubDate>\n".
   "    <ttl>20</ttl>\n";
-    foreach($this->Items as $Item)
+    foreach ($this->Items as $Item)
     {
       $Result .= "    <item>\n".
@@ -39 +39 @@
     $Result .= "  </channel>\n".
     "</rss>";
-    return($Result);
+    return $Result;
   }
 }

trunk/Packages/Common/Setup.php

@@ -29 +29 @@
       '<input type="submit" name="login" value="'.T('Login').'"/>'.
       '</form>';
-    return($Output);
+    return $Output;
   }
 
@@ -37 +37 @@
 
     $Output .= 'Je připojení k databázi: '.$this->YesNo[$this->UpdateManager->Database->Connected()].'<br/>';
-    if($this->UpdateManager->Database->Connected())
+    if ($this->UpdateManager->Database->Connected())
     {
       $Output .= 'Je instalováno: '.$this->YesNo[$this->UpdateManager->IsInstalled()].'<br/>';
-      if($this->UpdateManager->IsInstalled())
+      if ($this->UpdateManager->IsInstalled())
         $Output .= 'Je aktuální: '.$this->YesNo[$this->UpdateManager->IsUpToDate()].'<br/>'.
         'Verze databáze: '.$this->UpdateManager->GetDbVersion().'<br/>';
       $Output .= 'Verze databáze kódu: '.$this->UpdateManager->Revision.'<br/>';
-      if($this->UpdateManager->IsInstalled())
-      {
-        if(!$this->UpdateManager->IsUpToDate())
+      if ($this->UpdateManager->IsInstalled())
+      {
+        if (!$this->UpdateManager->IsUpToDate())
           $Output .= '<a href="?action=upgrade">'.T('Upgrade').'</a> ';
         $Output .= '<a href="?action=insert_sample_data">Vložit vzorová data</a> ';
@@ -59 +59 @@
     $Output .= '<a href="'.$this->System->Link('/').'">'.T('Go to main page').'</a> ';
     $Output .= '';
-    return($Output);
+    return $Output;
   }
 
@@ -73 +73 @@
 
     $Output = '';
-    if(isset($this->Config))
-    {
-      if(!array_key_exists('SystemPassword', $_SESSION)) $_SESSION['SystemPassword'] = '';
-      if(array_key_exists('login', $_POST)) $_SESSION['SystemPassword'] = $_POST['SystemPassword'];
-      if(sha1($_SESSION['SystemPassword']) != $this->Config['SystemPassword'])
+    if (isset($this->Config))
+    {
+      if (!array_key_exists('SystemPassword', $_SESSION)) $_SESSION['SystemPassword'] = '';
+      if (array_key_exists('login', $_POST)) $_SESSION['SystemPassword'] = $_POST['SystemPassword'];
+      if (sha1($_SESSION['SystemPassword']) != $this->Config['SystemPassword'])
       {
         $Output .= $this->LoginPanel();
       } else
       {
-        if(array_key_exists('action', $_GET)) $Action = $_GET['action'];
+        if (array_key_exists('action', $_GET)) $Action = $_GET['action'];
           else $Action = '';
-        if($Action == 'logout')
+        if ($Action == 'logout')
         {
           $_SESSION['SystemPassword'] = '';
@@ -90 +90 @@
           $Output .= $this->LoginPanel();
         } else
-        if($Action == 'models')
+        if ($Action == 'models')
         {
           $this->System->FormManager->UpdateSQLMeta();
         } else
-        if($Action == 'upgrade')
+        if ($Action == 'upgrade')
         {
           $Output .= '<h3>Povýšení</h3>';
@@ -105 +105 @@
           $Output .= $this->ControlPanel();
         } else
-        if($Action == 'install')
+        if ($Action == 'install')
         {
           $Output .= '<h3>Instalace</h3>';
@@ -114 +114 @@
           $Output .= $this->ControlPanel();
         } else
-        if($Action == 'uninstall')
+        if ($Action == 'uninstall')
         {
           $Output .= '<h3>Odinstalace</h3>';
@@ -120 +120 @@
           $Output .= $this->ControlPanel();
         } else
-        if($Action == 'reload_modules')
+        if ($Action == 'reload_modules')
         {
           $Output .= '<h3>Znovunačtení seznamu modulů</h3>';
@@ -127 +127 @@
           $Output .= $this->ControlPanel();
         } else
-        if($Action == 'insert_sample_data')
+        if ($Action == 'insert_sample_data')
         {
           $Output .= '<h3>Vložení vzorových dat</h3>';
@@ -133 +133 @@
           $Output .= $this->ControlPanel();
         } else
-        if($Action == 'modules')
+        if ($Action == 'modules')
         {
           $Output .= $this->ShowModules();
         } else
-        if($Action == 'configure_save')
+        if ($Action == 'configure_save')
         {
            $Output .= $this->ConfigSave($this->Config);
            $Output .= $this->ControlPanel();
         } else
-        if($Action == 'configure')
+        if ($Action == 'configure')
         {
           $Output .= $this->PrepareConfig($this->Config);
@@ -152 +152 @@
     } else
     {
-      if(array_key_exists('configure_save', $_POST))
+      if (array_key_exists('configure_save', $_POST))
       {
         $Output .= $this->ConfigSave(array());
@@ -160 +160 @@
       }
     }
-    return($Output);
+    return $Output;
   }
 
@@ -166 +166 @@
   {
     $Output = '';
-    if(array_key_exists('op', $_GET)) $Operation = $_GET['op'];
+    if (array_key_exists('op', $_GET)) $Operation = $_GET['op'];
       else $Operation = '';
-    if($Operation == 'install')
+    if ($Operation == 'install')
     {
       $this->System->ModuleManager->Modules[$_GET['name']]->Install();
@@ -174 +174 @@
       $Output .= 'Modul '.$_GET['name'].' instalován<br/>';
     } else
-    if($Operation == 'uninstall')
+    if ($Operation == 'uninstall')
     {
       $this->System->ModuleManager->Modules[$_GET['name']]->Uninstall();
@@ -180 +180 @@
       $Output .= 'Modul '.$_GET['name'].' odinstalován<br/>';
     } else
-    if($Operation == 'enable')
+    if ($Operation == 'enable')
     {
       $this->System->ModuleManager->Modules[$_GET['name']]->Enable();
@@ -186 +186 @@
       $Output .= 'Modul '.$_GET['name'].' povolen<br/>';
     } else
-    if($Operation == 'disable')
+    if ($Operation == 'disable')
     {
       $this->System->ModuleManager->Modules[$_GET['name']]->Disable();
@@ -192 +192 @@
       $Output .= 'Modul '.$_GET['name'].' zakázán<br/>';
     } else
-    if($Operation == 'upgrade')
+    if ($Operation == 'upgrade')
     {
       $this->System->ModuleManager->Modules[$_GET['name']]->Upgrade();
@@ -200 +200 @@
     $Output .= '<h3>Správa modulů</h3>';
     $Output .= $this->ShowList();
-    return($Output);
+    return $Output;
   }
 
@@ -221 +221 @@
       array('Name' => '', 'Title' => 'Akce'),
     ));
-    foreach($this->System->ModuleManager->Modules as $Module)
-    {
-      if(($Module->Dependencies) > 0) $Dependencies = implode(',', $Module->Dependencies);
+    foreach ($this->System->ModuleManager->Modules as $Module)
+    {
+      if (($Module->Dependencies) > 0) $Dependencies = implode(',', $Module->Dependencies);
        else $Dependencies = '&nbsp;';
       $Actions = '';
-      if($Module->Installed == true)
+      if ($Module->Installed == true)
       {
         $Actions .= ' <a href="?action=modules&amp;op=uninstall&amp;name='.$Module->Name.'">Odinstalovat</a>';
-        if($Module->Enabled == true) $Actions .= ' <a href="?action=modules&amp;op=disable&amp;name='.$Module->Name.'">Zakázat</a>';
+        if ($Module->Enabled == true) $Actions .= ' <a href="?action=modules&amp;op=disable&amp;name='.$Module->Name.'">Zakázat</a>';
         else $Actions .= ' <a href="?action=modules&amp;op=enable&amp;name='.$Module->Name.'">Povolit</a>';
-        if($Module->InstalledVersion != $Module->Version) $Actions .= ' <a href="?action=modules&amp;op=upgrade&amp;name='.$Module->Name.'">Povýšit</a>';
+        if ($Module->InstalledVersion != $Module->Version) $Actions .= ' <a href="?action=modules&amp;op=upgrade&amp;name='.$Module->Name.'">Povýšit</a>';
       } else $Actions .= ' <a href="?action=modules&amp;op=install&amp;name='.$Module->Name.'">Instalovat</a>';
 
@@ -244 +244 @@
     $Output .= $Pageing->Show();
     //$Output .= '<p><a href="?A=SaveToDb">Uložit do databáze</a></p>';
-    return($Output);
+    return $Output;
   }
 
@@ -250 +250 @@
   {
     $Output = '';
-    if(!file_exists($this->ConfigDir.'/Config.php') and !is_writable($this->ConfigDir))
+    if (!file_exists($this->ConfigDir.'/Config.php') and !is_writable($this->ConfigDir))
       $Output .= 'Varování: Konfigurační soubor nebude možné zapsat, protože složka "'.$this->ConfigDir.'" není povolená pro zápis!';
-    if(file_exists($this->ConfigDir.'/Config.php') and !is_writable($this->ConfigDir.'/Config.php'))
+    if (file_exists($this->ConfigDir.'/Config.php') and !is_writable($this->ConfigDir.'/Config.php'))
       $Output .= 'Varování: Konfigurační soubor nebude možné zapsat, protože soubor "'.$this->ConfigDir.'/Config.php" není povolen pro zápis!';
     $Output .= '<h3>Nastavení systému</h3>'.
         '<form action="?action=configure_save" method="post">'.
         '<table>';
-    foreach($this->ConfigDefinition as $Def)
+    foreach ($this->ConfigDefinition as $Def)
     {
       $PathParts = explode('/', $Def['Name']);
       $TempConfig = &$Config;
-      foreach($PathParts as $Part)
-        if(array_key_exists($Part, $TempConfig))
+      foreach ($PathParts as $Part)
+        if (array_key_exists($Part, $TempConfig))
         {
           $TempConfig = &$TempConfig[$Part];
         }
-      if(!is_array($TempConfig)) $Value = $TempConfig;
+      if (!is_array($TempConfig)) $Value = $TempConfig;
         else $Value = $Def['Default'];
       $Output .= '<tr><td>'.$Def['Title'].'</td><td>';
-      if($Def['Type'] == 'String') $Output .= '<input type="text" name="'.$Def['Name'].'" value="'.$Value.'"/>';
-      if($Def['Type'] == 'Password') $Output .= '<input type="password" name="'.$Def['Name'].'"/>';
-      if($Def['Type'] == 'PasswordEncoded') $Output .= '<input type="password" name="'.$Def['Name'].'"/>';
-      if($Def['Type'] == 'Integer') $Output .= '<input type="text" name="'.$Def['Name'].'" value="'.$Value.'"/>';
-      if($Def['Type'] == 'Float') $Output .= '<input type="text" name="'.$Def['Name'].'" value="'.$Value.'"/>';
-      if($Def['Type'] == 'Boolean') $Output .= '<input type="text" name="'.$Def['Name'].'" value="'.$Value.'"/>';
-      if($Def['Type'] == 'Array') $Output .= '<input type="text" name="'.$Def['Name'].'" value="'.implode(',', $Value).'"/>';
+      if ($Def['Type'] == 'String') $Output .= '<input type="text" name="'.$Def['Name'].'" value="'.$Value.'"/>';
+      if ($Def['Type'] == 'Password') $Output .= '<input type="password" name="'.$Def['Name'].'"/>';
+      if ($Def['Type'] == 'PasswordEncoded') $Output .= '<input type="password" name="'.$Def['Name'].'"/>';
+      if ($Def['Type'] == 'Integer') $Output .= '<input type="text" name="'.$Def['Name'].'" value="'.$Value.'"/>';
+      if ($Def['Type'] == 'Float') $Output .= '<input type="text" name="'.$Def['Name'].'" value="'.$Value.'"/>';
+      if ($Def['Type'] == 'Boolean') $Output .= '<input type="text" name="'.$Def['Name'].'" value="'.$Value.'"/>';
+      if ($Def['Type'] == 'Array') $Output .= '<input type="text" name="'.$Def['Name'].'" value="'.implode(',', $Value).'"/>';
     }
     $Output .= '</td></tr>'.
@@ -281 +281 @@
         '</table>'.
         '</form>';
-    return($Output);
+    return $Output;
   }
 
@@ -287 +287 @@
   {
     $Config = $DefaultConfig;
-    foreach($this->ConfigDefinition as $Def)
+    foreach ($this->ConfigDefinition as $Def)
     {
       $Value = null;
-      if($Def['Type'] == 'String') if(array_key_exists($Def['Name'], $_POST))
+      if ($Def['Type'] == 'String') if (array_key_exists($Def['Name'], $_POST))
         $Value = $_POST[$Def['Name']];
-      if($Def['Type'] == 'Password') if(array_key_exists($Def['Name'], $_POST) and ($_POST[$Def['Name']] != ''))
+      if ($Def['Type'] == 'Password') if (array_key_exists($Def['Name'], $_POST) and ($_POST[$Def['Name']] != ''))
         $Value = $_POST[$Def['Name']];
-      if($Def['Type'] == 'PasswordEncoded') if(array_key_exists($Def['Name'], $_POST) and ($_POST[$Def['Name']] != ''))
+      if ($Def['Type'] == 'PasswordEncoded') if (array_key_exists($Def['Name'], $_POST) and ($_POST[$Def['Name']] != ''))
         $Value = sha1($_POST[$Def['Name']]);
-      if($Def['Type'] == 'Integer') if(array_key_exists($Def['Name'], $_POST))
+      if ($Def['Type'] == 'Integer') if (array_key_exists($Def['Name'], $_POST))
         $Value = $_POST[$Def['Name']];
-      if($Def['Type'] == 'Float') if(array_key_exists($Def['Name'], $_POST))
+      if ($Def['Type'] == 'Float') if (array_key_exists($Def['Name'], $_POST))
         $Value = $_POST[$Def['Name']];
-      if($Def['Type'] == 'Boolean') if(array_key_exists($Def['Name'], $_POST))
+      if ($Def['Type'] == 'Boolean') if (array_key_exists($Def['Name'], $_POST))
         $Value = $_POST[$Def['Name']];
-      if($Def['Type'] == 'Array') if(array_key_exists($Def['Name'], $_POST))
+      if ($Def['Type'] == 'Array') if (array_key_exists($Def['Name'], $_POST))
         $Value = explode(',', $_POST[$Def['Name']]);
-      if(!is_null($Value))
+      if (!is_null($Value))
       {
         $PathParts = explode('/', $Def['Name']);
         $TempConfig = &$Config;
-        foreach($PathParts as $Part)
+        foreach ($PathParts as $Part)
         {
           $TempConfig = &$TempConfig[$Part];
         }
-        if(!is_array($TempConfig)) $TempConfig = $Value;
+        if (!is_array($TempConfig)) $TempConfig = $Value;
         else $Value = $Def['Default'];
       }
@@ -319 +319 @@
     file_put_contents($this->ConfigDir.'/Config.php', $ConfigText);
     $Output = 'Konfigurace nastavena<br/>';
-    return($Output);
+    return $Output;
   }
 
@@ -327 +327 @@
       "\$IsDeveloper = array_key_exists('REMOTE_ADDR', \$_SERVER) and  in_array(\$_SERVER['REMOTE_ADDR'], array('127.0.0.1'));\n\n";
 
-    foreach($this->ConfigDefinition as $Def)
+    foreach ($this->ConfigDefinition as $Def)
     {
       $PathParts = explode('/', $Def['Name']);
       $Output .= "\$Config";
-      foreach($PathParts as $Part)
+      foreach ($PathParts as $Part)
         $Output .= "['".$Part."']";
       $TempConfig = &$Config;
       $Output .= ' = ';
-      foreach($PathParts as $Part)
-        if(array_key_exists($Part, $TempConfig))
+      foreach ($PathParts as $Part)
+        if (array_key_exists($Part, $TempConfig))
         {
           $TempConfig = &$TempConfig[$Part];
         }
-      if(!is_array($TempConfig)) $Value = $TempConfig;
+      if (!is_array($TempConfig)) $Value = $TempConfig;
         else $Value = $Def['Default'];
-      if($Def['Type'] == 'Array')
+      if ($Def['Type'] == 'Array')
       {
         $Output .= ' array(';
-        foreach($Value as $Index => $Item)
+        foreach ($Value as $Index => $Item)
           $Output .= '\''.$Item.'\', ';
         $Output .= ')';
@@ -353 +353 @@
     }
     $Output .= "\n\n";
-    return($Output);
+    return $Output;
   }
 }
@@ -362 +362 @@
   {
     $Output = '';
-    if(!$this->Database->Connected()) $Output .= T('Can\'t connect to database').'<br>';
+    if (!$this->Database->Connected()) $Output .= T('Can\'t connect to database').'<br>';
     else {
-      if(!$this->System->Setup->UpdateManager->IsInstalled())
+      if (!$this->System->Setup->UpdateManager->IsInstalled())
         $Output .= T('System requires database initialization').'<br>';
       else
-      if(!$this->System->Setup->UpdateManager->IsUpToDate())
+      if (!$this->System->Setup->UpdateManager->IsUpToDate())
         $Output .= T('System requires database upgrade').'<br>';
     }
     $Output .= sprintf(T('Front page was not configured. Continue to %s'), '<a href="'.$this->System->Link('/setup/').'">'.T('setup').'</a>');
-    return($Output);
+    return $Output;
   }
 }
@@ -402 +402 @@
   function CheckState()
   {
-    return($this->Database->Connected() and $this->UpdateManager->IsInstalled() and
-      $this->UpdateManager->IsUpToDate());
+    $this->Database->Connected() and $this->UpdateManager->IsInstalled() and
+      $this->UpdateManager->IsUpToDate();
   }
 
@@ -435 +435 @@
   {
     $DbResult = $this->Database->query('SHOW TABLES LIKE "'.$this->UpdateManager->VersionTable.'"');
-    return($DbResult->num_rows > 0);
+    return $DbResult->num_rows > 0;
   }
 
@@ -443 +443 @@
     $this->UpdateManager->Trace = $Updates->Get();
     $Output = $this->UpdateManager->Upgrade();
-    return($Output);
+    return $Output;
   }
 }

trunk/Packages/Common/Table.php

@@ -7 +7 @@
   function Show()
   {
-    return('');
+    return '';
   }
 }
@@ -15 +15 @@
   function GetCell($Y, $X)
   {
-    return('');
+    return '';
   }
 
@@ -28 +28 @@
   function RowsCount()
   {
-    return(0);
+    return 0;
   }
 }
@@ -38 +38 @@
   function GetCell($Y, $X)
   {
-    return($this->Cells[$Y][$X]);
+    return $this->Cells[$Y][$X];
   }
 
   function RowsCount()
   {
-    return(count($this->Cells));
+    return count($this->Cells);
   }
 }
@@ -55 +55 @@
   function GetCell($Y, $X)
   {
-    return($this->Cells[$Y][$X]);
+    return $this->Cells[$Y][$X];
   }
 
@@ -62 +62 @@
     $this->Cells = array();
     $DbResult = $this->Database->query($this->Query);
-    while($DbRow = $DbResult->fetch_row())
+    while ($DbRow = $DbResult->fetch_row())
     {
       $this->Cells[] = $DbRow;
@@ -75 +75 @@
   function RowsCount()
   {
-    return(count($this->Cells));
+    return count($this->Cells);
   }
 }
@@ -114 +114 @@
   {
     $this->Columns = array();
-    foreach($Columns as $Column)
+    foreach ($Columns as $Column)
     {
       $NewCol = new TableColumn();
@@ -121 +121 @@
       $this->Columns[] = $NewCol;
     }
-    if(count($this->Columns) > 0)
+    if (count($this->Columns) > 0)
       $this->DefaultColumn = $this->Columns[0]->Name;
       else $this->DefaultColumn = '';
@@ -131 +131 @@
     $Output .= $this->GetOrderHeader();
     $this->Table->BeginRead();
-    for($Y = 0; $Y < $this->Table->RowsCount(); $Y++)
+    for ($Y = 0; $Y < $this->Table->RowsCount(); $Y++)
     {
       $Output .= '<tr>';
 
-      for($X = 0; $X < count($this->Columns); $X++)
+      for ($X = 0; $X < count($this->Columns); $X++)
       {
         $Cell = $this->Table->GetCell($Y, $X);
-        if($Cell == '') $Output .= '<td>&nbsp;</td>';
+        if ($Cell == '') $Output .= '<td>&nbsp;</td>';
           else $Output .= '<td>'.$Cell.'</td>';
       }
@@ -145 +145 @@
     $this->Table->EndRead();
     $Output .= '</table>';
-    return($Output);
+    return $Output;
   }
 
   function GetOrderHeader()
   {
-    if(array_key_exists('OrderCol', $_GET)) $_SESSION['OrderCol'] = $_GET['OrderCol'];
-    if(array_key_exists('OrderDir', $_GET)) $_SESSION['OrderDir'] = $_GET['OrderDir'];
-    if(!array_key_exists('OrderCol', $_SESSION)) $_SESSION['OrderCol'] = $this->DefaultColumn;
-    if(!array_key_exists('OrderDir', $_SESSION)) $_SESSION['OrderDir'] = $this->DefaultOrder;
+    if (array_key_exists('OrderCol', $_GET)) $_SESSION['OrderCol'] = $_GET['OrderCol'];
+    if (array_key_exists('OrderDir', $_GET)) $_SESSION['OrderDir'] = $_GET['OrderDir'];
+    if (!array_key_exists('OrderCol', $_SESSION)) $_SESSION['OrderCol'] = $this->DefaultColumn;
+    if (!array_key_exists('OrderDir', $_SESSION)) $_SESSION['OrderDir'] = $this->DefaultOrder;
 
     // Check OrderCol
     $Found = false;
-    foreach($this->Columns as $Column)
+    foreach ($this->Columns as $Column)
     {
-      if($Column->Name == $_SESSION['OrderCol'])
+      if ($Column->Name == $_SESSION['OrderCol'])
       {
         $Found = true;
@@ -165 +165 @@
       }
     }
-    if($Found == false)
+    if ($Found == false)
     {
       $_SESSION['OrderCol'] = $this->DefaultColumn;
@@ -171 +171 @@
     }
     // Check OrderDir
-    if(($_SESSION['OrderDir'] != 0) and ($_SESSION['OrderDir'] != 1))
+    if (($_SESSION['OrderDir'] != 0) and ($_SESSION['OrderDir'] != 1))
       $_SESSION['OrderDir'] = 0;
 
     $Result = '';
     $QueryItems = GetQueryStringArray($_SERVER['QUERY_STRING']);
-    foreach($this->Columns as $Index => $Column)
+    foreach ($this->Columns as $Index => $Column)
     {
       $QueryItems['OrderCol'] = $Column->Name;
       $QueryItems['OrderDir'] = 1 - $_SESSION['OrderDir'];
-      if($Column->Name == $_SESSION['OrderCol'])
+      if ($Column->Name == $_SESSION['OrderCol'])
         $ArrowImage = '<img style="vertical-align: middle; border: 0px;" src="'.$this->OrderArrowImage[$_SESSION['OrderDir']].'" alt="order arrow">';
         else $ArrowImage = '';
-      if($Column->Name == '') $Result .= '<th>'.$Column->Title.'</th>';
+      if ($Column->Name == '') $Result .= '<th>'.$Column->Title.'</th>';
         else $Result .= '<th><a href="?'.SetQueryStringArray($QueryItems).'">'.$Column->Title.$ArrowImage.'</a></th>';
     }
@@ -190 +190 @@
     $this->OrderDirection = $_SESSION['OrderDir'];
 
-    return('<tr>'.$Result.'</tr>');
+    return '<tr>'.$Result.'</tr>';
   }
 }

trunk/Packages/Common/UTF8.php

@@ -529 +529 @@
   {
     $Result = '';
-    for($I = 0; $I < strlen($String); $I++)
+    for ($I = 0; $I < strlen($String); $I++)
     {
-       if(ord($String[$I]) < 128) $Result .= $String[$I];
-       else if(ord($String[$I]) > 127)
+       if (ord($String[$I]) < 128) $Result .= $String[$I];
+       else if (ord($String[$I]) > 127)
        {
          $Result .= $this->CharTable[$Charset][ord($String[$I])];
        }
     }
-    return($Result);
+    return $Result;
   }
 
@@ -544 +544 @@
     $Result = '';
     $UTFPrefix = '';
-    for($I = 0; $I < strlen($String); $I++)
+    for ($I = 0; $I < strlen($String); $I++)
     {
-      if(ord($String{$I}) & 0x80) // UTF control character
+      if (ord($String{$I}) & 0x80) // UTF control character
       {
-        if(ord($String{$I}) & 0x40) // First
+        if (ord($String{$I}) & 0x40) // First
         {
-          if($UTFPrefix != '') $Result .= chr(array_search($UTFPrefix, $this->CharTable[$Charset]));
+          if ($UTFPrefix != '') $Result .= chr(array_search($UTFPrefix, $this->CharTable[$Charset]));
           $UTFPrefix = $String{$I};
         }
@@ -556 +556 @@
       } else
       {
-        if($UTFPrefix != '') $Result .= chr(array_search($UTFPrefix, $this->CharTable[$Charset]));
+        if ($UTFPrefix != '') $Result .= chr(array_search($UTFPrefix, $this->CharTable[$Charset]));
         $UTFPrefix = '';
         $Result .= $String{$I};
       }
     }
-    return($Result);
+    return $Result;
   }
 }

trunk/Packages/Common/Update.php

@@ -23 +23 @@
     $DbResult = $this->Database->select($this->VersionTable, '*', 'Id=1');
     $Version = $DbResult->fetch_assoc();
-    return($Version['Revision']);
+    return $Version['Revision'];
   }
 
@@ -29 +29 @@
   {
     $DbResult = $this->Database->query('SHOW TABLES LIKE "'.$this->VersionTable.'"');
-    return($DbResult->num_rows > 0);
+    return $DbResult->num_rows > 0;
   }
 
   function IsUpToDate()
   {
-    return($this->Revision <= $this->GetDbVersion());
+    return $this->Revision <= $this->GetDbVersion();
   }
 
@@ -41 +41 @@
     $DbRevision = $this->GetDbVersion();
     $Output = 'Počáteční revize databáze: '.$DbRevision.'<br/>';
-    while($this->Revision > $DbRevision)
+    while ($this->Revision > $DbRevision)
     {
-      if(!array_key_exists($DbRevision, $this->Trace))
+      if (!array_key_exists($DbRevision, $this->Trace))
         die('Missing upgrade trace for revision '.$DbRevision);
       $TraceItem = $this->Trace[$DbRevision];
@@ -56 +56 @@
         $TraceItem['Revision'].' WHERE `Id`=1');
     }
-    return($Output);
+    return $Output;
   }
 
@@ -81 +81 @@
     echo($Query.';<br/>');
     flush();
-    return($this->Database->query($Query));
+    return $this->Database->query($Query);
   }
 }

trunk/Packages/Common/VarDumper.php

@@ -49 +49 @@
                 self::$_depth=$depth;
                 self::dumpInternal($var,0);
-                if($highlight)
+                if ($highlight)
                 {
                         $result=highlight_string("<?php\n".self::$_output,true);
@@ -60 +60 @@
         private static function dumpInternal($var,$level)
         {
-                switch(gettype($var))
+                switch (gettype($var))
                 {
                         case 'boolean':
@@ -84 +84 @@
                                 break;
                         case 'array':
-                                if(self::$_depth<=$level)
+                                if (self::$_depth<=$level)
                                         self::$_output.='array(...)';
-                                else if(empty($var))
+                                else if (empty($var))
                                         self::$_output.='array()';
                                 else
@@ -93 +93 @@
                                         $spaces=str_repeat(' ',$level*4);
                                         self::$_output.="array\n".$spaces.'(';
-                                        foreach($keys as $key)
+                                        foreach ($keys as $key)
                                         {
                                                 self::$_output.="\n".$spaces."    [$key] => ";
@@ -102 +102 @@
                                 break;
                         case 'object':
-                                if(($id=array_search($var,self::$_objects,true))!==false)
+                                if (($id=array_search($var,self::$_objects,true))!==false)
                                         self::$_output.=get_class($var).'#'.($id+1).'(...)';
-                                else if(self::$_depth<=$level)
+                                else if (self::$_depth<=$level)
                                         self::$_output.=get_class($var).'(...)';
                                 else
@@ -114 +114 @@
                                         $spaces=str_repeat(' ',$level*4);
                                         self::$_output.="$className#$id\n".$spaces.'(';
-                                        foreach($keys as $key)
+                                        foreach ($keys as $key)
                                         {
                                                 $keyDisplay=strtr(trim($key),array("\0"=>':'));

trunk/Point.php

@@ -16 +16 @@
 {
   $Point = new Point($X, $Y);
-  return($Point);
+  return $Point;
 }
 
@@ -23 +23 @@
 {
   $Y = ($P2->Y - $P1->Y) / ($P2->X - $P1->X) * ($X - $P1->X) + $P1->Y;
-  return($Y);
+  return $Y;
 }

trunk/add.php

@@ -12 +12 @@
 // Try to load single value
 $Time = time();
-if(array_key_exists('MeasureId', $_GET) and array_key_exists('Value', $_GET))
+if (array_key_exists('MeasureId', $_GET) and array_key_exists('Value', $_GET))
 {
   if (array_key_exists('Time', $_GET)) $Time = $_GET['Time'] * 1;
@@ -39 +39 @@
   $Measure->Load($MeasureId);
   $HostName = gethostbyaddr($_SERVER['REMOTE_ADDR']);
-  if(($HostName == $Measure->Data['PermissionAdd']) or ($_SERVER['REMOTE_ADDR'] == gethostbyname($Measure->Data['PermissionAdd'])))
+  if (($HostName == $Measure->Data['PermissionAdd']) or ($_SERVER['REMOTE_ADDR'] == gethostbyname($Measure->Data['PermissionAdd'])))
   {
     $Measure->AddValue($Value, $Time);