Changeset 874 for trunk/Common/Form

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/Form

Files:

• Form.php (modified) (6 diffs)
• Types/Base.php (modified) (3 diffs)
• Types/Boolean.php (modified) (2 diffs)
• Types/Color.php (modified) (2 diffs)
• Types/Date.php (modified) (2 diffs)
• Types/Enumeration.php (modified) (2 diffs)
• Types/File.php (modified) (8 diffs)
• Types/Float.php (modified) (2 diffs)
• Types/GPS.php (modified) (4 diffs)
• Types/Hidden.php (modified) (2 diffs)
• Types/Hyperlink.php (modified) (2 diffs)
• Types/IPv4Address.php (modified) (2 diffs)
• Types/IPv6Address.php (modified) (2 diffs)
• Types/Image.php (modified) (1 diff)
• Types/Integer.php (modified) (2 diffs)
• Types/MacAddress.php (modified) (3 diffs)
• Types/OneToMany.php (modified) (3 diffs)
• Types/OneToMany2.php (modified) (2 diffs)
• Types/Password.php (modified) (4 diffs)
• Types/RandomHash.php (modified) (2 diffs)
• Types/String.php (modified) (3 diffs)
• Types/Text.php (modified) (2 diffs)
• Types/Time.php (modified) (2 diffs)
• Types/TimeDiff.php (modified) (1 diff)
• Types/Type.php (modified) (3 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];
   }
 }