Changeset 7 for trunk/Packages/Common/Table.php

Timestamp:

Apr 14, 2020, 11:13:32 PM (5 years ago)

Author:

chronos

Message:

• Modified: Improved code formatting.

File:

• trunk/Packages/Common/Table.php (modified) (14 diffs)

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);
   }
 }
@@ -112 +112 @@
   {
     $this->Columns = array();
-    foreach($Columns as $Column)
+    foreach ($Columns as $Column)
     {
       $NewCol = new TableColumn();
@@ -119 +119 @@
       $this->Columns[] = $NewCol;
     }
-    if(count($this->Columns) > 0)
+    if (count($this->Columns) > 0)
       $this->DefaultColumn = $this->Columns[0]->Name;
       else $this->DefaultColumn = '';
@@ -129 +129 @@
     $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>';
       }
@@ -143 +143 @@
     $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;
@@ -163 +163 @@
       }
     }
-    if($Found == false)
+    if ($Found == false)
     {
       $_SESSION['OrderCol'] = $this->DefaultColumn;
@@ -169 +169 @@
     }
     // 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>';
     }
@@ -188 +188 @@
     $this->OrderDirection = $_SESSION['OrderDir'];
 
-    return('<tr>'.$Result.'</tr>');
+    return '<tr>'.$Result.'</tr>';
   }
 }