Changeset 55 for trunk/Global.php

Timestamp:

Apr 7, 2020, 12:55:39 AM (4 years ago)

Author:

chronos

Message:

• Modified: Improved code formatting.

File:

• trunk/Global.php (modified) (17 diffs)

trunk/Global.php

@@ -3 +3 @@
 function HumanDate($Time)
 {
-  return(date('j.n.Y', $Time));
+  return date('j.n.Y', $Time);
 }
 
 function HumanTime($Time)
 {
-  return(date('H:i:s', $Time));
+  return date('H:i:s', $Time);
 }
 
@@ -16 +16 @@
   $Time = HumanTime($Time);
   if ($Time != '00:00:00') $Output .= ' '.$Time;
-  return($Output);
+  return $Output;
 }
 
@@ -28 +28 @@
 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;
 }
 
@@ -44 +44 @@
   $Result = array();
   $Parts = explode('&', $QueryString);
-  foreach($Parts as $Part)
-  {
-    if($Part != '')
-    {
-      if(!strpos($Part, '=')) $Part .= '=';
+  foreach ($Parts as $Part)
+  {
+    if ($Part != '')
+    {
+      if (!strpos($Part, '=')) $Part .= '=';
       $Item = explode('=', $Part);
       $Result[$Item[0]] = $Item[1];
     }
   }
-  return($Result);
+  return $Result;
 }
 
@@ -59 +59 @@
 {
   $Parts = array();
-  foreach($QueryStringArray as $Index => $Item)
+  foreach ($QueryStringArray as $Index => $Item)
   {
     if ($Index != 'lvm') $Parts[] = $Index.'='.$Item;
   }
-  return(implode('&', $Parts));
+  return implode('&', $Parts);
 }
 
@@ -77 +77 @@
   $PageCount = floor($TotalCount / $ItemPerPage) + 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;
+  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'];
 
@@ -87 +87 @@
 
   $Result = '';
-  if($PageCount > 1)
-  {
-    if($CurrentPage > 0)
+  if ($PageCount > 1)
+  {
+    if ($CurrentPage > 0)
     {
       $QueryItems['page'] = 0;
@@ -98 +98 @@
     $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++)
-    {
-      if($i == $CurrentPage) $Result.= '<strong>'.($i + 1).'</strong> ';
+    for ($i = $PagesMin; $i <= $PagesMax; $i++)
+    {
+      if ($i == $CurrentPage) $Result.= '<strong>'.($i + 1).'</strong> ';
       else {
        $QueryItems['page'] = $i;
@@ -112 +112 @@
       }
     }
-    if($PagesMax < ($PageCount - 1)) $Result .= ' ... ';
-    if($CurrentPage < ($PageCount - 1))
+    if ($PagesMax < ($PageCount - 1)) $Result .= ' ... ';
+    if ($CurrentPage < ($PageCount - 1))
     {
       $QueryItems['page'] = ($CurrentPage + 1);
@@ -122 +122 @@
   }
   $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,
-  ));
+  );
 }
 
@@ -135 +135 @@
   global $OrderDirSQL, $OrderArrowImage, $Config;
 
-  if(array_key_exists('OrderCol', $_GET)) $_SESSION['OrderCol'] = $_GET['OrderCol'];
-  if(array_key_exists('OrderDir', $_GET) and (array_key_exists($_GET['OrderDir'], $OrderArrowImage)))
+  if (array_key_exists('OrderCol', $_GET)) $_SESSION['OrderCol'] = $_GET['OrderCol'];
+  if (array_key_exists('OrderDir', $_GET) and (array_key_exists($_GET['OrderDir'], $OrderArrowImage)))
     $_SESSION['OrderDir'] = $_GET['OrderDir'];
-  if(!array_key_exists('OrderCol', $_SESSION)) $_SESSION['OrderCol'] = $DefaultColumn;
-  if(!array_key_exists('OrderDir', $_SESSION)) $_SESSION['OrderDir'] = $DefaultOrder;
+  if (!array_key_exists('OrderCol', $_SESSION)) $_SESSION['OrderCol'] = $DefaultColumn;
+  if (!array_key_exists('OrderDir', $_SESSION)) $_SESSION['OrderDir'] = $DefaultOrder;
 
   // Check OrderCol
   $Found = false;
-  foreach($Columns as $Column)
-  {
-    if($Column['Name'] == $_SESSION['OrderCol'])
+  foreach ($Columns as $Column)
+  {
+    if ($Column['Name'] == $_SESSION['OrderCol'])
     {
       $Found = true;
@@ -151 +151 @@
     }
   }
-  if($Found == false)
+  if ($Found == false)
   {
     $_SESSION['OrderCol'] = $DefaultColumn;
@@ -157 +157 @@
   }
   // Check OrderDir
-  if(($_SESSION['OrderDir'] != 0) and ($_SESSION['OrderDir'] != 1)) $_SESSION['OrderDir'] = 0;
+  if (($_SESSION['OrderDir'] != 0) and ($_SESSION['OrderDir'] != 1)) $_SESSION['OrderDir'] = 0;
 
   $Result = '';
   $QueryItems = GetQueryStringArray($_SERVER['QUERY_STRING']);
-  foreach($Columns as $Index => $Column)
+  foreach ($Columns as $Index => $Column)
   {
     $QueryItems['OrderCol'] = $Column['Name'];
     $QueryItems['OrderDir'] = 1 - $_SESSION['OrderDir'];
-    if($Column['Name'] == $_SESSION['OrderCol']) $ArrowImage = '<img style="vertical-align: middle; border: 0px;" src="'.
+    if ($Column['Name'] == $_SESSION['OrderCol']) $ArrowImage = '<img style="vertical-align: middle; border: 0px;" src="'.
       Link2('/images/'.$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>';
   }
-  return(array(
+  return array(
     'SQL' => ' ORDER BY `'.$_SESSION['OrderCol'].'` '.$OrderDirSQL[$_SESSION['OrderDir']],
     'Output' => '<tr>'.$Result.'</tr>',
     'Column' => $_SESSION['OrderCol'],
     'Direction' => $_SESSION['OrderDir'],
-  ));
+  );
 }
 
@@ -182 +182 @@
 {
   list($Usec, $Sec) = explode(' ', microtime());
-  return ((float)$Usec + (float)$Sec);
+  return (float)$Usec + (float)$Sec;
 }
 
@@ -322 +322 @@
           $Output .= '<div class="filter-num-box">'.
             '<div class="label-box">'.$Item['Title'].'</div>'.
-            '<input value="'.$_SESSION[$Item['Name']].'" onkeyup="if(event.keyCode!=9) upf(\''.$Item['Name'].'\',$(this).val(),(event.keyCode==13?0:1)); '.
+            '<input value="'.$_SESSION[$Item['Name']].'" onkeyup="if (event.keyCode!=9) upf(\''.$Item['Name'].'\',$(this).val(),(event.keyCode==13?0:1)); '.
             '" id="'.$Item['Name'].'" autocomplete="off" type="text"/>'.
             '</div> ';
@@ -350 +350 @@
           $Output .= '<div class="filter-num-box">'.
             '<div class="label-box">'.$Item['Title'].'</div>'.
-            '<input value="'.$_SESSION[$Item['Name'].'od'].'" onkeyup="if(event.keyCode!=9) upf(\''.$Item['Name'].'od\',$(this).val(),(event.keyCode==13?0:1)); '.
+            '<input value="'.$_SESSION[$Item['Name'].'od'].'" onkeyup="if (event.keyCode!=9) upf(\''.$Item['Name'].'od\',$(this).val(),(event.keyCode==13?0:1)); '.
             '" id="'.$Item['Name'].'od" autocomplete="off" type="text"/>'.
             '<div class="label-box">-</div>'.
             '<input value="'.$_SESSION[$Item['Name'].'do'].'" onkeyup="'.
-            'if(event.keyCode!=9) upf(\''.$Item['Name'].'do\',$(this).val(),(event.keyCode==13?0:1));" '.
+            'if (event.keyCode!=9) upf(\''.$Item['Name'].'do\',$(this).val(),(event.keyCode==13?0:1));" '.
             'id="'.$Item['Name'].'do" autocomplete="off" type="text"/>'.
             '<div class="label-box">'.$Item['Units'].'</div>'.
@@ -368 +368 @@
   {
     $Where = '';
-    foreach($this->Items as $Item)
+    foreach ($this->Items as $Item)
     {
       if ($Item['DbName'] != '')