Changeset 874 for trunk/Common/Global.php

Timestamp:

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

Author:

chronos

Message:

• Modified: Do not use parenthesis around returned value.

File:

• trunk/Common/Global.php (modified) (15 diffs)

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