Changeset 874 for trunk/Common

Timestamp:

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

Author:

chronos

Message:

• Modified: Do not use parenthesis around returned value.

Location:

trunk/Common

Files:

• Form/Form.php (modified) (6 diffs)
• Form/Types/Base.php (modified) (3 diffs)
• Form/Types/Boolean.php (modified) (2 diffs)
• Form/Types/Color.php (modified) (2 diffs)
• Form/Types/Date.php (modified) (2 diffs)
• Form/Types/Enumeration.php (modified) (2 diffs)
• Form/Types/File.php (modified) (8 diffs)
• Form/Types/Float.php (modified) (2 diffs)
• Form/Types/GPS.php (modified) (4 diffs)
• Form/Types/Hidden.php (modified) (2 diffs)
• Form/Types/Hyperlink.php (modified) (2 diffs)
• Form/Types/IPv4Address.php (modified) (2 diffs)
• Form/Types/IPv6Address.php (modified) (2 diffs)
• Form/Types/Image.php (modified) (1 diff)
• Form/Types/Integer.php (modified) (2 diffs)
• Form/Types/MacAddress.php (modified) (3 diffs)
• Form/Types/OneToMany.php (modified) (3 diffs)
• Form/Types/OneToMany2.php (modified) (2 diffs)
• Form/Types/Password.php (modified) (4 diffs)
• Form/Types/RandomHash.php (modified) (2 diffs)
• Form/Types/String.php (modified) (3 diffs)
• Form/Types/Text.php (modified) (2 diffs)
• Form/Types/Time.php (modified) (2 diffs)
• Form/Types/TimeDiff.php (modified) (1 diff)
• Form/Types/Type.php (modified) (3 diffs)
• Global.php (modified) (15 diffs)
• VCL/Database.php (modified) (1 diff)
• VCL/General.php (modified) (14 diffs)

trunk/Common/Form/Form.php

@@ -113 +113 @@
     $Output = '<fieldset><legend>'.$this->Definition['Title'].'</legend>'.Table($Table).
     '</fieldset>';
-    return ($Output);
+    return $Output;
   }
 
@@ -122 +122 @@
       '<div><input name="submit" type="submit" value="'.$this->Definition['SubmitText'].'" /> '.
       '<input type="button" value="Zrušit" onclick="location.href=\'?\'"/></div></form>';
-    return ($Output);
+    return $Output;
   }
 
@@ -316 +316 @@
       }
     }
-    return ($Values);
+    return $Values;
   }
 
@@ -353 +353 @@
     }
     if ($Valid == false) throw new Exception('not validated');
-    return ($Valid);
+    return $Valid;
   }
 }
@@ -360 +360 @@
 function MakeLink($Target, $Title)
 {
-  return ('<a href="'.$Target.'">'.$Title.'</a>');
+  return '<a href="'.$Target.'">'.$Title.'</a>';
 }
 
@@ -384 +384 @@
   }
   $Result .= '</table>';
-  return ($Result);
+  return $Result;
 }
 

trunk/Common/Form/Types/Base.php

@@ -17 +17 @@
   function OnView($Item)
   {
-    return ('');
+    return '';
   }
 
   function OnEdit($Item)
   {
-    return ('');
+    return '';
   }
 
   function OnLoad($Item)
   {
-    return ('');
+    return '';
   }
 
   function OnLoadDb($Item)
   {
-    return ($Item['Value']);
+    return $Item['Value'];
   }
 
   function OnSaveDb($Item)
   {
-    return ($Item['Value']);
+    return $Item['Value'];
   }
 
   function DatabaseEscape($Value)
   {
-    return (addslashes($Value));
+    return addslashes($Value);
   }
 
@@ -50 +50 @@
       $SQL = '('.$Item['SQL'].') AS ';
       else $SQL = '';
-    return ($SQL.'`'.$Item['Name'].'`');
+    return $SQL.'`'.$Item['Name'].'`';
   }
 
@@ -58 +58 @@
       $Output = '('.$Item['SQL'].') AS `'.$Item['Name'].'`, ('.$Item['SQL'].') AS `'.$Item['Name'].'_Filter`';
       else $Output = '`'.$Item['Name'].'`, `'.$Item['Name'].'` AS `'.$Item['Name'].'_Filter`';
-    return ($Output);
+    return $Output;
   }
 
   function Validate($Item)
   {
-    return (true);
+    return true;
   }
 
   function GetValidationFormat()
   {
-    return ('');
+    return '';
   }
 }

trunk/Common/Form/Types/Boolean.php

@@ -10 +10 @@
   {
     if ($Item['Value'] == 1) $Checked = ' checked="1"'; else $Checked = '';
-    return ('<input type="checkbox" name="'.$Item['Name'].'" disabled="1"'.$Checked.'/>');
+    return '<input type="checkbox" name="'.$Item['Name'].'" disabled="1"'.$Checked.'/>';
   }
 
@@ -16 +16 @@
   {
     if ($Item['Value'] == 1) $Checked = ' checked="1"'; else $Checked = '';
-    return ('<input type="checkbox" name="'.$Item['Name'].'"'.$Checked.'/>');
+    return '<input type="checkbox" name="'.$Item['Name'].'"'.$Checked.'/>';
   }
 
   function OnLoad($Item)
   {
-    if (array_key_exists($Item['Name'], $_POST)) return (1);
-      else return (0);
+    if (array_key_exists($Item['Name'], $_POST)) return 1;
+      else return 0;
   }
 }

trunk/Common/Form/Types/Color.php

@@ -10 +10 @@
   {
     $Output = '<span style="background-color: #'.$Item['Value'].'">&nbsp;&nbsp;&nbsp;&nbsp;</span>';
-    return ($Output);
+    return $Output;
   }
 
@@ -16 +16 @@
   {
     $Output = '<input type="text" name="'.$Item['Name'].'" value="'.$Item['Value'].'"/>';
-    return ($Output);
+    return $Output;
   }
 
   function OnLoad($Item)
   {
-    return ($_POST[$Item['Name']]);
+    return $_POST[$Item['Name']];
   }
 }

trunk/Common/Form/Types/Date.php

@@ -11 +11 @@
     global $MonthNames;
 
-    if ($Item['Value'] == null) return ('');
+    if ($Item['Value'] == null) return '';
     if ((strtolower($Item['Value']) == 'now') or (strtolower($Item['Value']) == '')) $Item['Value'] = time();
     $Parts = getdate($Item['Value']);
 
     $Output = $Parts['mday'].'.'.$Parts['mon'].'.'.$Parts['year'];
-    return ($Output);
+    return $Output;
   }
 
@@ -71 +71 @@
     }
     $Output .= '</select>';
-    return ($Output);
+    return $Output;
   }
 
   function OnLoad($Item)
   {
-    if (!array_key_exists($Item['Name'].'-null', $_POST) and array_key_exists('Null', $Item) and ($Item['Null'] == true)) return (null);
-      else return (mktime(0, 0, 0, $_POST[$Item['Name'].'-month'], $_POST[$Item['Name'].'-day'], $_POST[$Item['Name'].'-year']));
+    if (!array_key_exists($Item['Name'].'-null', $_POST) and array_key_exists('Null', $Item) and ($Item['Null'] == true)) return null;
+      else return mktime(0, 0, 0, $_POST[$Item['Name'].'-month'], $_POST[$Item['Name'].'-day'], $_POST[$Item['Name'].'-year']);
   }
 
   function OnLoadDb($Item)
   {
-    return (MysqlDateToTime($Item['Value']));
+    return MysqlDateToTime($Item['Value']);
   }
 
   function OnSaveDb($Item)
   {
-    if ($Item['Value'] == null) return (null);
-      else return (date('Y-m-d', $Item['Value']));
+    if ($Item['Value'] == null) return null;
+      else return date('Y-m-d', $Item['Value']);
   }
 
   function DatabaseEscape($Value)
   {
-    return ('"'.addslashes($Value).'"');
+    return '"'.addslashes($Value).'"';
   }
 }

trunk/Common/Form/Types/Enumeration.php

@@ -11 +11 @@
       $Output = $Type['Parameters']['States'][$Item['Value']];
       else $Output = $Item['Value'];
-    return ($Output);
+    return $Output;
   }
 
@@ -29 +29 @@
     }
     $Output .= '</select>';
-    return ($Output);
+    return $Output;
   }
 
   function OnLoad($Item)
   {
-    if ($_POST[$Item['Name']] == '') return (NULL);
-    return ($_POST[$Item['Name']]);
+    if ($_POST[$Item['Name']] == '') return NULL;
+    return $_POST[$Item['Name']];
   }
 
   function OnLoadDb($Item)
   {
-    if ($Item['Value'] == '') return (NULL);
-    else return ($Item['Value']);
+    if ($Item['Value'] == '') return NULL;
+    else return $Item['Value'];
   }
 }

trunk/Common/Form/Types/File.php

@@ -16 +16 @@
     $Result = $FileInfo->file($this->FileName);
     //$FileInfo->close();
-    return ($Result);
+    return $Result;
   }
 
@@ -24 +24 @@
     if (file_exists($FileName)) $Result = filesize($FileName);
       else $Result = 0;
-    return ($Result);
+    return $Result;
   }
 
@@ -38 +38 @@
     }
     $Result = $this->UploadFileFolder.'/'.$Path.$File->Name;
-    return ($Result);
+    return $Result;
   }
 
   function GetExt()
   {
-    return (substr($this->Name, 0, strpos($this->Name, '.') - 1));
+    return substr($this->Name, 0, strpos($this->Name, '.') - 1);
   }
 
@@ -55 +55 @@
     if ($this->TempName != '') $Content = file_get_contents($this->TempName);
       else $Content = file_get_contents($this->GetFullName());
-    return ($Content);
+    return $Content;
   }
 }
@@ -75 +75 @@
   {
     $File = &$Item['Value'];
-    return ('<a href="'.$this->FileDownloadURL.'?id='.$File->Id.'">'.
-      $File.'</a> ('.HumanSize($File->Size).')');
+    return '<a href="'.$this->FileDownloadURL.'?id='.$File->Id.'">'.
+      $File.'</a> ('.HumanSize($File->Size).')';
   }
 
@@ -86 +86 @@
     $File = &$Item['Value'];
     $Output = '<input type="file" name="'.$Item['Name'].'" value="'.$File->Name.'">';
-    return ($Output);
+    return $Output;
   }
 
@@ -103 +103 @@
       }
     }
-    return ($File);
+    return $File;
   }
 
@@ -118 +118 @@
       $File->Directory = $DbRow['Directory'];
     }
-    return ($File);
+    return $File;
   }
 

trunk/Common/Form/Types/Float.php

@@ -10 +10 @@
   {
     $Output = $Item['Value'];
-    return ($Output);
+    return $Output;
   }
 
@@ -16 +16 @@
   {
     $Output = '<input type="text" name="'.$Item['Name'].'" value="'.$Item['Value'].'"/>';
-    return ($Output);
+    return $Output;
   }
 
   function OnLoad($Item)
   {
-    return ($_POST[$Item['Name']]);
+    return $_POST[$Item['Name']];
   }
 }

trunk/Common/Form/Types/GPS.php

@@ -17 +17 @@
       $Output = '<a href="http://www.mapy.cz/?st=search&fr=loc:'.$DbRow['Latitude'].' '.$DbRow['Longitude'].'">'.$Latitude[0].'°'.$Latitude[1]."'".$Latitude[2].'" '.$Longitude[0].'°'.$Longitude[1]."'".$Longitude[2].'"</a>';
     }
-    return ($Output);
+    return $Output;
   }
 
@@ -40 +40 @@
     $Output .= '<input type="text" size="3" name="'.$Item['Name'].'-lon-min" value="'.$Value[1].'"/>\'';
     $Output .= '<input type="text" size="3" name="'.$Item['Name'].'-lon-sec" value="'.$Value[2].'"/>"';
-    return ($Output);
+    return $Output;
   }
 
@@ -50 +50 @@
     $Longitude = $this->Implode($_POST[$Item['Name'].'-lon-deg'], $_POST[$Item['Name'].'-lon-min'], $_POST[$Item['Name'].'-lon-sec']);
     $Database->query('INSERT INTO SystemGPS (`Latitude`, `Longitude`) VALUES ("'.$Latitude.'", "'.$Longitude.'")');
-    return ($Database->insert_id);
+    return $Database->insert_id;
   }
 
@@ -61 +61 @@
     $Float = ($Float - intval($Float)) * 60;
     $Seconds = round($Float, 3);
-    return (array($Degrees, $Minutes, $Seconds));
+    return array($Degrees, $Minutes, $Seconds);
   }
 
   function Implode($Degrees, $Minutes, $Seconds)
   {
-    if ($Degrees < 0) return (-(abs($Degrees) + ($Minutes + $Seconds / 60) / 60));
-    else return ($Degrees + ($Minutes + $Seconds / 60) / 60);
+    if ($Degrees < 0) return -(abs($Degrees) + ($Minutes + $Seconds / 60) / 60);
+    else return $Degrees + ($Minutes + $Seconds / 60) / 60;
   }
 }

trunk/Common/Form/Types/Hidden.php

@@ -14 +14 @@
   {
     $Output = $Item['Value'];
-    return ($Output);
+    return $Output;
   }
 
@@ -20 +20 @@
   {
     $Output = '<input type="hidden" name="'.$Item['Name'].'" value="'.$Item['Value'].'" />';
-    return ($Output);
+    return $Output;
   }
 
   function OnLoad($Item)
   {
-    return ($_POST[$Item['Name']]);
+    return $_POST[$Item['Name']];
   }
 }

trunk/Common/Form/Types/Hyperlink.php

@@ -8 +8 @@
   {
     $Output = '<a href="'.$Item['Value'].'">'.$Item['Value'].'</a>';
-    return ($Output);
+    return $Output;
   }
 
@@ -14 +14 @@
   {
     $Output = '<input type="text" name="'.$Item['Name'].'" value="'.$Item['Value'].'"/>';
-    return ($Output);
+    return $Output;
   }
 
   function OnLoad($Item)
   {
-    return ($_POST[$Item['Name']]);
+    return $_POST[$Item['Name']];
   }
 }

trunk/Common/Form/Types/IPv4Address.php

@@ -8 +8 @@
   {
     $Output = $Item['Value'];
-    return ($Output);
+    return $Output;
   }
 
@@ -14 +14 @@
   {
     $Output = '<input type="text" name="'.$Item['Name'].'" value="'.$Item['Value'].'"/>';
-    return ($Output);
+    return $Output;
   }
 
   function OnLoad($Item)
   {
-    return ($_POST[$Item['Name']]);
+    return $_POST[$Item['Name']];
   }
 
   function Validate($Item)
   {
-    if ($Item['Null'] and ($Item['Value'] == '')) return (true);
-    return (filter_var($Item['Value'], FILTER_VALIDATE_IP, array('flags' => FILTER_FLAG_IPV4)));
+    if ($Item['Null'] and ($Item['Value'] == '')) return true;
+    return filter_var($Item['Value'], FILTER_VALIDATE_IP, array('flags' => FILTER_FLAG_IPV4));
   }
 
   function GetValidationFormat()
   {
-    return ('x.x.x.x kde x je hodnota 0..255');
+    return 'x.x.x.x kde x je hodnota 0..255';
   }
 }

trunk/Common/Form/Types/IPv6Address.php

@@ -8 +8 @@
   {
     $Output = $Item['Value'];
-    return ($Output);
+    return $Output;
   }
 
@@ -14 +14 @@
   {
     $Output = '<input type="text" name="'.$Item['Name'].'" value="'.$Item['Value'].'"/>';
-    return ($Output);
+    return $Output;
   }
 
   function OnLoad($Item)
   {
-    return ($_POST[$Item['Name']]);
+    return $_POST[$Item['Name']];
   }
 
   function Validate($Item)
   {
-    if ($Item['Null'] and ($Item['Value'] == '')) return (true);
-    return (filter_var($Item['Value'], FILTER_VALIDATE_IP, array('flags' => FILTER_FLAG_IPV6)));
+    if ($Item['Null'] and ($Item['Value'] == '')) return true;
+    return filter_var($Item['Value'], FILTER_VALIDATE_IP, array('flags' => FILTER_FLAG_IPV6));
   }
 
   function GetValidationFormat()
   {
-    return ('xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx kde x je hexa hodnota 0..f');
+    return 'xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx kde x je hexa hodnota 0..f';
   }
 }

trunk/Common/Form/Types/Image.php

@@ -7 +7 @@
     global $System;
 
-    return ('<img src="'.$System->Link('/images/favicons/'.$Item['Value']).'"/> '.$Item['Value']);
+    return '<img src="'.$System->Link('/images/favicons/'.$Item['Value']).'"/> '.$Item['Value'];
   }
 }

trunk/Common/Form/Types/Integer.php

@@ -10 +10 @@
   {
     $Output = $Item['Value'];
-    return ($Output);
+    return $Output;
   }
 
@@ -16 +16 @@
   {
     $Output = '<input type="text" name="'.$Item['Name'].'" value="'.$Item['Value'].'"/>';
-    return ($Output);
+    return $Output;
   }
 
   function OnLoad($Item)
   {
-    return ($_POST[$Item['Name']]);
+    return $_POST[$Item['Name']];
   }
 
   function Validate($Item)
   {
-    if ($Item['Null'] and ($Item['Value'] == '')) return (true);
-    return (preg_match('/^\-*[0-9\.]+$/', $Item['Value']));
+    if ($Item['Null'] and ($Item['Value'] == '')) return true;
+    return preg_match('/^\-*[0-9\.]+$/', $Item['Value']);
   }
 
   function GetValidationFormat()
   {
-    return ('číselná hodnota');
+    return 'číselná hodnota';
   }
 }

trunk/Common/Form/Types/MacAddress.php

@@ -10 +10 @@
   {
     $Output = $Item['Value'];
-    return ($Output);
+    return $Output;
   }
 
@@ -16 +16 @@
   {
     $Output = '<input type="text" name="'.$Item['Name'].'" id="'.$Item['Name'].'" value="'.$Item['Value'].'"/>';
-    return ($Output);
+    return $Output;
   }
 
@@ -22 +22 @@
   {
     //echo($Item['Name'].'='.$_POST[$Item['Name']].','.is_null(NULL).'<br>');
-    return (strtoupper($_POST[$Item['Name']]));
+    return strtoupper($_POST[$Item['Name']]);
   }
 
   function DatabaseEscape($Value)
   {
-    return ('"'.addslashes($Value).'"');
+    return '"'.addslashes($Value).'"';
   }
 
   function Validate($Item)
   {
-    if ($Item['Null'] and ($Item['Value'] == '')) return (true);
-    return (preg_match('/^([0-9A-F]{2}[:]){5}([0-9A-F]{2})$/', $Item['Value']));
+    if ($Item['Null'] and ($Item['Value'] == '')) return true;
+    return preg_match('/^([0-9A-F]{2}[:]){5}([0-9A-F]{2})$/', $Item['Value']);
   }
 
   function GetValidationFormat()
   {
-    return ('XX:XX:XX:XX:XX:XX kde X je hexa hodnota 0..F');
+    return 'XX:XX:XX:XX:XX:XX kde X je hexa hodnota 0..F';
   }
 }

trunk/Common/Form/Types/OneToMany.php

@@ -15 +15 @@
         'view'.'&amp;i='.$Item['Value'].'">'.$Item['Filter'].'</a>';
     } else $Output = '';
-    return ($Output);
+    return $Output;
   }
 
@@ -51 +51 @@
         'onclick="return popupwindow(&quot;'.$this->FormManager->Root.'/is/?a=select&amp;t='.$Table.'&amp;r='.$Item['Name'].'&quot;,&quot;test&quot;);" style="cursor:hand;cursor:pointer"/>';
     }
-    return ($Output);
+    return $Output;
   }
 
   function OnLoad($Item)
   {
-    if ($_POST[$Item['Name']] == '') return (NULL);
-      else return ($_POST[$Item['Name']]);
+    if ($_POST[$Item['Name']] == '') return NULL;
+      else return $_POST[$Item['Name']];
   }
 
   function OnLoadDb($Item)
   {
-    if ($Item['Value'] == '') return (NULL);
-      else return ($Item['Value']);
+    if ($Item['Value'] == '') return NULL;
+      else return $Item['Value'];
   }
 
   function OnFilterName($Item)
   {
-    return ('`'.$Item['Name'].'_Filter`');
+    return '`'.$Item['Name'].'_Filter`';
   }
 
@@ -82 +82 @@
         $Type['Parameters']['Id'].'`=`TX`.`'.$Item['Name'].'`) AS `'.$Item['Name'].'_Filter`';
     //} else $Output = '`'.$Item['Name'].'`, `'.$Item['Name'].'` AS `'.$Item['Name'].'_Filter`';
-    return ($Output);
+    return $Output;
   }
 }

trunk/Common/Form/Types/OneToMany2.php

@@ -8 +8 @@
   {
     $Output = '<a href="?Action=ShowList&amp;TableId='.$Item['TypeDefinition'].'&amp;ParentTable='.$Item['SourceTable'].'&amp;ParentColumn='.$Item['SourceItemId'].'">Seznam</a>';
-    return ($Output);
+    return $Output;
   }
 
@@ -14 +14 @@
   {
     $Output = '<a href="?Action=ShowList&amp;TableId='.$Item['TypeDefinition'].'&amp;ParentTable='.$Item['SourceTable'].'&amp;ParentColumn='.$Item['SourceItemId'].'">Seznam</a>';
-    return ($Output);
+    return $Output;
   }
 
   function OnLoad($Item)
   {
-    return ($_POST[$Item['Name']]);
+    return $_POST[$Item['Name']];
   }
 }

trunk/Common/Form/Types/Password.php

@@ -12 +12 @@
     for ($I = 0; $I < 6; $I++)
       $Output .= '*';
-    return ($Output);
+    return $Output;
   }
 
@@ -18 +18 @@
   {
     $Output = '<input type="password" name="'.$Item['Name'].'" value=""/>';
-    return ($Output);
+    return $Output;
   }
 
@@ -39 +39 @@
     }
     */
-    return ($Result);
+    return $Result;
   }
 
   function OnSaveDb($Item)
   {
-    if ($Item['Value'] == '') return ('');
+    if ($Item['Value'] == '') return '';
     else {
       $PasswordHash = new PasswordHash();
-      return ($PasswordHash->Hash($Item['Value'], $Item['Values']['Salt']));
+      return $PasswordHash->Hash($Item['Value'], $Item['Values']['Salt']);
     }
   }
@@ -53 +53 @@
   function OnLoadDb($Item)
   {
-    return ('');
+    return '';
   }
 }

trunk/Common/Form/Types/RandomHash.php

@@ -14 +14 @@
   {
     $Output = $Item['Value'];
-    return ($Output);
+    return $Output;
   }
 
@@ -26 +26 @@
     }
     $Output = '<input type="hidden" name="'.$Item['Name'].'" value="'.$Item['Value'].'" />';
-    return ($Output);
+    return $Output;
   }
 
   function OnLoad($Item)
   {
-    return ($_POST[$Item['Name']]);
+    return $_POST[$Item['Name']];
   }
 }

trunk/Common/Form/Types/String.php

@@ -10 +10 @@
   {
     $Output = $Item['Value'];
-    return ($Output);
+    return $Output;
   }
 
@@ -16 +16 @@
   {
     $Output = '<input type="text" name="'.$Item['Name'].'" id="'.$Item['Name'].'" value="'.$Item['Value'].'"/>';
-    return ($Output);
+    return $Output;
   }
 
@@ -22 +22 @@
   {
     //echo($Item['Name'].'='.$_POST[$Item['Name']].','.is_null(NULL).'<br>');
-    return ($_POST[$Item['Name']]);
+    return $_POST[$Item['Name']];
   }
 
   function DatabaseEscape($Value)
   {
-    return ('"'.addslashes($Value).'"');
+    return '"'.addslashes($Value).'"';
   }
 }

trunk/Common/Form/Types/Text.php

@@ -10 +10 @@
   {
     $Output = str_replace("\n", '<br/>', strip_tags($Item['Value']));
-    return ($Output);
+    return $Output;
   }
 
@@ -16 +16 @@
   {
     $Output = '<textarea name="'.$Item['Name'].'">'.$Item['Value'].'</textarea>';
-    return ($Output);
+    return $Output;
   }
 
   function OnLoad($Item)
   {
-    return ($_POST[$Item['Name']]);
+    return $_POST[$Item['Name']];
   }
 
   function DatabaseEscape($Value)
   {
-    return ('"'.addslashes($Value).'"');
+    return '"'.addslashes($Value).'"';
   }
 }

trunk/Common/Form/Types/Time.php

@@ -9 +9 @@
   function OnView($Item)
   {
-    if ($Item['Value'] == 0) return ('');
+    if ($Item['Value'] == 0) return '';
     if ((strtolower($Item['Value']) == 'now') or (strtolower($Item['Value']) == '')) $Item['Value'] = time();
     $TimeParts = getdate($Item['Value']);
 
     $Output = sprintf('%02d', $TimeParts['hours']).':'.sprintf('%02d', $TimeParts['minutes']).':'.sprintf('%02d', $TimeParts['seconds']);
-    return ($Output);
+    return $Output;
   }
 
@@ -67 +67 @@
     }
     $Output .= '</select>';
-    return ($Output);
+    return $Output;
   }
 
   function OnLoad($Item)
   {
-    if (!array_key_exists($Item['Name'].'-null', $_POST) and array_key_exists('Null', $Item) and ($Item['Null'] == true)) return (null);
-      return (mktime($_POST[$Item['Name'].'-hour'], $_POST[$Item['Name'].'-minute'], $_POST[$Item['Name'].'-second']));
+    if (!array_key_exists($Item['Name'].'-null', $_POST) and array_key_exists('Null', $Item) and ($Item['Null'] == true)) return null;
+      return mktime($_POST[$Item['Name'].'-hour'], $_POST[$Item['Name'].'-minute'], $_POST[$Item['Name'].'-second']);
   }
 
   function OnLoadDb($Item)
   {
-    return (MysqlTimeToTime($Item['Value']));
+    return MysqlTimeToTime($Item['Value']);
   }
 
   function OnSaveDb($Item)
   {
-    if ($Item['Value'] == null) return (null);
-      else return (date('H:i:s', $Item['Value']));
+    if ($Item['Value'] == null) return null;
+      else return date('H:i:s', $Item['Value']);
   }
 
   function DatabaseEscape($Value)
   {
-    return ('"'.addslashes($Value).'"');
+    return '"'.addslashes($Value).'"';
   }
 }

trunk/Common/Form/Types/TimeDiff.php

@@ -15 +15 @@
       if ($Days > 0) $Output = $Days.' dnů '.$Output;
     }
-    return ($Output);
+    return $Output;
   }
 }

trunk/Common/Form/Types/Type.php

@@ -72 +72 @@
       $TypeClass = 'Type'.$Type['Class'];
       $TypeObject = new $TypeClass($this->FormManager);
-      if (is_callable(array($TypeObject, $Event))) return ($TypeObject->$Event($Parameters));
-        else return ($TypeName.'->'.$Event.'('.serialize($Parameters).')');
-    } else return ($TypeName);
+      if (is_callable(array($TypeObject, $Event))) return $TypeObject->$Event($Parameters);
+        else return $TypeName.'->'.$Event.'('.serialize($Parameters).')';
+    } else return $TypeName;
   }
 
@@ -84 +84 @@
       $TypeClass = 'Type'.$Type['Class'];
       $TypeObject = new $TypeClass($this->FormManager);
-      return ($TypeObject->Hidden);
-    } else return (false);
+      return $TypeObject->Hidden;
+    } else return false;
   }
 
@@ -111 +111 @@
   function GetTypeDefinition($TypeName)
   {
-    return ($this->TypeDefinitionList[$TypeName]);
+    return $this->TypeDefinitionList[$TypeName];
   }
 }

trunk/Common/Global.php

@@ -30 +30 @@
     $UnitIndex++;
   }
-  return ($Value.' '.$UnitNames[$UnitIndex]);
+  return $Value.' '.$UnitNames[$UnitIndex];
 }
 
@@ -36 +36 @@
 {
   list($Usec, $Sec) = explode(' ', microtime());
-  return ((float)$Usec + (float)$Sec);
+  return (float)$Usec + (float)$Sec;
 }
 
@@ -48 +48 @@
 function HumanDate($Time)
 {
-  if ($Time != '') {
+  if ($Time != '')
+  {
     $Date = explode(' ', $Time);
     $Parts = explode('-', $Date[0]);
-    if ($Date != '0000-00-00') return (($Parts[2]*1).'.'.($Parts[1]*1).'.'.$Parts[0]);
-    else return (' ');
-  } else return (' ');
+    if ($Date != '0000-00-00') return ($Parts[2] * 1).'.'.($Parts[1] * 1).'.'.$Parts[0];
+    else return ' ';
+  } else return ' ';
 }
 
@@ -62 +63 @@
   $Around = 10;
   $Result = '';
-  if ($Count>1)
-  {
-    if ($Page>0)
+  if ($Count > 1)
+  {
+    if ($Page > 0)
     {
       $Result.= '<a href="'.$URL.'0">&lt;&lt;</a> ';
-      $Result.= '<a href="'.$URL.($Page-1).'">&lt;</a> ';
-    }
-    $PagesMax = $Count-1;
+      $Result.= '<a href="'.$URL.($Page - 1).'">&lt;</a> ';
+    }
+    $PagesMax = $Count - 1;
     $PagesMin = 0;
-    if ($PagesMax>($Page+$Around)) $PagesMax = $Page+$Around;
-    if ($PagesMin<($Page-$Around))
+    if ($PagesMax > ($Page + $Around)) $PagesMax = $Page + $Around;
+    if ($PagesMin < ($Page - $Around))
     {
       $Result.= ' .. ';
-      $PagesMin = $Page-$Around;
-    }
-    for ($i=$PagesMin;$i<=$PagesMax;$i++)
-    {
-      if ($i==$Page) $Result.= '<strong>';
-      $Result.= '<a href="'.$URL.$i.'">'.($i+1).'</a> ';
-      if ($i==$Page) $Result.= '</strong>';
-    }
-    if ($PagesMax<($Count-1)) $Result .= ' .. ';
-    if ($Page<($Count-1))
-    {
-      $Result.= '<a href="'.$URL.($Page+1).'">&gt;</a> ';
-      $Result.= '<a href="'.$URL.($Count-1).'">&gt;&gt;</a>';
-    }
-  }
-  return ($Result);
+      $PagesMin = $Page - $Around;
+    }
+    for ($i = $PagesMin; $i <= $PagesMax; $i++)
+    {
+      if ($i == $Page) $Result.= '<strong>';
+      $Result .= '<a href="'.$URL.$i.'">'.($i + 1).'</a> ';
+      if ($i == $Page) $Result.= '</strong>';
+    }
+    if ($PagesMax < ($Count - 1)) $Result .= ' .. ';
+    if ($Page < ($Count - 1))
+    {
+      $Result .= '<a href="'.$URL.($Page + 1).'">&gt;</a> ';
+      $Result .= '<a href="'.$URL.($Count - 1).'">&gt;&gt;</a>';
+    }
+  }
+  return $Result;
 }
 
 function ExtractTime($Time)
 {
-  return (array(
+  return array(
     'Year' => date('Y', $Time),
     'Month' => date('n', $Time),
@@ -102 +103 @@
     'Minute' => date('i', $Time),
     'Second' => date('s', $Time)
-  ));
+  );
 }
 
@@ -118 +119 @@
     }
   }
-  return ($Result);
+  return $Result;
 }
 
@@ -128 +129 @@
     $Parts[] = $Index.'='.$Item;
   }
-  return (implode('&amp;', $Parts));
+  return implode('&amp;', $Parts);
 }
 
@@ -199 +200 @@
 
   $Result = '<div style="text-align: center">'.$Result.'</div>';
-  return (array('SQLLimit' => ' LIMIT '.$CurrentPage * $ItemPerPage.', '.$ItemPerPage,
+  return array('SQLLimit' => ' LIMIT '.$CurrentPage * $ItemPerPage.', '.$ItemPerPage,
     'Page' => $CurrentPage,
     'Output' => $Result,
-  ));
+  );
 }
 
@@ -253 +254 @@
       else $Result .= '<th><a href="?'.SetQueryStringArray($QueryItems).'">'.$Column['Title'].$ArrowImage.'</a></th>';
   }
-  return (array(
+  return array(
     'SQL' => ' ORDER BY `'.$_SESSION[$ObjectName.'OrderCol'].'` '.$OrderDirSQL[$_SESSION[$ObjectName.'OrderDir']],
     'Output' => '<tr>'.$Result.'</tr>',
     'Column' => $_SESSION[$ObjectName.'OrderCol'],
     'Direction' => $_SESSION[$ObjectName.'OrderDir'],
-  ));
+  );
 }
 
@@ -265 +266 @@
   if (array_key_exists('REMOTE_ADDR', $_SERVER)) $IP = $_SERVER['REMOTE_ADDR'];
   else $IP = '0.0.0.0';
-  return ($IP);
+  return $IP;
 }
 
@@ -282 +283 @@
     }
   }
-  return ($Result);
+  return $Result;
 }
 
@@ -295 +296 @@
   {
     $DbRow = $DbResult->fetch_assoc();
-    return ($DbRow['Id']);
-  } else return ('');
+    return $DbRow['Id'];
+  } else return '';
 }
 
@@ -302 +303 @@
 {
   $Result = shell_exec('which '.$Command);
-  return (!empty($Result));
+  return !empty($Result);
 }
 
 function RemoveDiacritic($Text)
 {
-  return (str_replace(
+  return str_replace(
     array('á', 'č', 'ď', 'é', 'ě', 'í', 'ľ', 'ň', 'ó', 'ř', 'š', 'ť', 'ú', 'ů',
       'ý', 'ž', 'Á', 'Č', 'Ď', 'É', 'Ě', 'Í', 'Ľ', 'Ň', 'Ó', 'Ř', 'Š', 'Ť', 'Ú', 'Ů', 'Ý', 'Ž'),
     array('a', 'c', 'd', 'e', 'e', 'i', 'l', 'n', 'o', 'r', 's', 't', 'u', 'u',
       'y', 'z', 'A', 'C', 'D', 'E', 'E', 'I', 'L', 'N', 'O', 'R', 'S', 'T', 'U', 'U', 'Y', 'Z'),
-    $Text));
+    $Text);
 }
 
 function RouterOSIdent($Name)
 {
-  return (strtr(strtolower(trim($Name)), array(' ' => '-', '.' => '', '(' => '-', ')' => '-', ',' => '-',
+  return strtr(strtolower(trim($Name)), array(' ' => '-', '.' => '', '(' => '-', ')' => '-', ',' => '-',
   'č' => 'c', 'š' => 's', 'ě' => 'e', 'ř' => 'r', 'ž' => 'z', 'ý' => 'y',
   'á' => 'a', 'í' => 'i', 'é' => 'e', 'ů' => 'u', 'ú' => 'u', 'ď' => 'd',
@@ -324 +325 @@
   'Á' => 'a', 'Í' => 'i', 'É' => 'e', 'Ů' => 'u', 'Ú' => 'u', 'Ď' => 'd',
   'Ť' => 't', 'Ň' => 'n', 'Ó' => 'o',
-)));
+  ));
 }
 
 function NotBlank($Text)
 {
-  if ($Text == '') return ('&nbsp');
-    else return ($Text);
+  if ($Text == '') return '&nbsp';
+    else return $Text;
 }
 
@@ -361 +362 @@
     else $_SERVER['QUERY_STRING'] = '';
   parse_str($_SERVER['QUERY_STRING'], $_GET);
-  return ($PathItems);
+  return $PathItems;
 }
 

trunk/Common/VCL/Database.php

@@ -66 +66 @@
     $ListView->Rows[] = $Row;
     $Output = parent::Show();
-    return ($Output);
+    return $Output;
   }
 }

trunk/Common/VCL/General.php

@@ -15 +15 @@
     if ($Persistent) $_SESSION[$Name] = $Result;
   }
-  return ($Result);
+  return $Result;
 }
 
@@ -34 +34 @@
     $Output = '';
     //$Output .= '#'.$this->Id;
-    return ($Output);
+    return $Output;
   }
 
@@ -53 +53 @@
       foreach ($this->Items as $Item)
         $Output .= $Item->Show();
-      return ($Output);
+      return $Output;
     }
   }
@@ -72 +72 @@
     if ($this->Visible)
     {
-      return (parent::Show().'<button>'.$this->Caption.'</button>');
+      return parent::Show().'<button>'.$this->Caption.'</button>';
     }
   }
@@ -83 +83 @@
   function Show()
   {
-    return (parent::Show().'<input type="text" name="'.$this->Id.'" value="'.$this->Text.'"/>');
+    return parent::Show().'<input type="text" name="'.$this->Id.'" value="'.$this->Text.'"/>';
   }
 
@@ -119 +119 @@
     }
     $Output .= '<br/>';
-    return ($Output);
+    return $Output;
   }
 
@@ -134 +134 @@
   function Show()
   {
-    return ($this->Name);
+    return $this->Name;
   }
 }
@@ -170 +170 @@
     }
     $Output .= '</table>';
-    return ($Output);
+    return $Output;
   }
 }
@@ -192 +192 @@
   function ColumnClick($Column)
   {
-    return ('?'.$this->Id.'_SortColumn='.$Column->Id.'&amp;'.$this->Id.'_SortOrder='.(1 - $this->SortOrder));
+    return '?'.$this->Id.'_SortColumn='.$Column->Id.'&amp;'.$this->Id.'_SortOrder='.(1 - $this->SortOrder);
   }
 
@@ -208 +208 @@
     if ($this->OnColumnClick != '')
       $Output = '<a href="'.call_user_func($this->OnColumnClick, $Column).'">'.$Output.'</a>';
-    return ($Output);
+    return $Output;
   }
 
@@ -219 +219 @@
     $Output .= parent::Show();
     $Output .= $this->PageSelect->Show();
-    return ($Output);
+    return $Output;
   }
 
@@ -251 +251 @@
     }
     $Output .= '</table>';
-    return ($Output);
+    return $Output;
   }
 
@@ -279 +279 @@
       $Output = '<a href="?'.$Link.'">'.$Output.'</a>';
     };
-    return ($Output);
+    return $Output;
   }
 
@@ -301 +301 @@
       $Output .= $Item->Show();
     $Output .= '</body></html>';
-    return ($Output);
+    return $Output;
   }