Changeset 873 for trunk/Common/VCL/General.php

Timestamp:

Apr 6, 2020, 11:17:40 PM (5 years ago)

Author:

chronos

Message:

• Modified: Improved code format.

File:

• trunk/Common/VCL/General.php (modified) (16 diffs)

trunk/Common/VCL/General.php

@@ -8 +8 @@
   //echo($Name.',');
   $Result = '';
-  if($Persistent)
-    if(array_key_exists($Name, $_SESSION)) $Result = $_SESSION[$Name];
-  if(array_key_exists($Name, $_GET))
+  if ($Persistent)
+    if (array_key_exists($Name, $_SESSION)) $Result = $_SESSION[$Name];
+  if (array_key_exists($Name, $_GET))
   {
     $Result = $_GET[$Name];
-    if($Persistent) $_SESSION[$Name] = $Result;
-  }
-  return($Result);
+    if ($Persistent) $_SESSION[$Name] = $Result;
+  }
+  return ($Result);
 }
 
@@ -34 +34 @@
     $Output = '';
     //$Output .= '#'.$this->Id;
-    return($Output);
+    return ($Output);
   }
 
@@ -48 +48 @@
   function Show()
   {
-    if($this->Visible)
+    if ($this->Visible)
     {
       $Output = parent::Show();
-      foreach($this->Items as $Item)
+      foreach ($this->Items as $Item)
         $Output .= $Item->Show();
-      return($Output);
-    }
-  }
-
-  function Prepare()
-  {
-    foreach($this->Items as $Item)
+      return ($Output);
+    }
+  }
+
+  function Prepare()
+  {
+    foreach ($this->Items as $Item)
       $Item->Prepare();
   }
@@ -70 +70 @@
   function Show()
   {
-    if($this->Visible)
-    {
-      return(parent::Show().'<button>'.$this->Caption.'</button>');
+    if ($this->Visible)
+    {
+      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.'"/>');
   }
 
@@ -108 +108 @@
   function Show()
   {
-    if(array_key_exists($this->Id.'_Page', $_GET))
+    if (array_key_exists($this->Id.'_Page', $_GET))
       $this->Position = $_GET[$this->Id.'_Page'];
-    if($this->Position >= $this->Count) $this->Position = $this->Count / $this->PageSize - 1;
+    if ($this->Position >= $this->Count) $this->Position = $this->Count / $this->PageSize - 1;
     $Output = '';
-    for($I = 0; $I < $this->Count / $this->PageSize; $I++)
+    for ($I = 0; $I < $this->Count / $this->PageSize; $I++)
     {
       $Text = '<a href="?'.$this->Id.'_Page='.$I.'">'.$I.'</a> ';
-      if($I == $this->Position) $Text = '<strong>'.$Text.'</strong>';
+      if ($I == $this->Position) $Text = '<strong>'.$Text.'</strong>';
       $Output .= $Text;
     }
     $Output .= '<br/>';
-    return($Output);
+    return ($Output);
   }
 
@@ -134 +134 @@
   function Show()
   {
-    return($this->Name);
+    return ($this->Name);
   }
 }
@@ -155 +155 @@
   {
     $Output = '<table class="WideTable" style="font-size: small;><tr>';
-    foreach($this->Columns as $Column)
-    {
-      if($this->OnColumnDraw != '') $Text = call_user_func($this->OnColumnDraw, $Column);
+    foreach ($this->Columns as $Column)
+    {
+      if ($this->OnColumnDraw != '') $Text = call_user_func($this->OnColumnDraw, $Column);
         else $Text = $Column->Show();
       $Output .= '<th>'.$Text.'</th>';
     }
     $Output .= '</tr>';
-    foreach($this->Rows as $Row)
+    foreach ($this->Rows as $Row)
     {
       $Output .= '<tr>';
-      foreach($Row as $Value)
+      foreach ($Row as $Value)
         $Output .= '<td>'.$Value.'</td>';
       $Output .= '</tr>';
     }
     $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));
   }
 
@@ -201 +201 @@
     $Output = $Column->Show();
 
-    if($Column->Name == $this->SortColumn)
+    if ($Column->Name == $this->SortColumn)
     {
       $Output .= '<img style="vertical-align: middle; border: 0px;" src="'.
         $System->Link('/images/'.$this->OrderArrowImage[$this->SortOrder]).'" alt="order arrow">';
     }
-    if($this->OnColumnClick != '')
+    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);
   }
 
@@ -239 +239 @@
   {
     $Output .= '<table>';
-    foreach($this->Rows as $RowNum => $Row)
+    foreach ($this->Rows as $RowNum => $Row)
     {
       $Output .= '<tr>';
-      foreach($Row as $ColNum => $Value)
+      foreach ($Row as $ColNum => $Value)
       {
-        if($this->Span[$RowNum][$ColNum] != 1) $Span = ' colspan="'.$this->Span[$RowNum][$ColNum].'"';
+        if ($this->Span[$RowNum][$ColNum] != 1) $Span = ' colspan="'.$this->Span[$RowNum][$ColNum].'"';
           else $Span = '';
         $Output .= '<td'.$Span.'>'.$Value->Show().'</td>';
@@ -251 +251 @@
     }
     $Output .= '</table>';
-    return($Output);
-  }
-
-  function Prepare()
-  {
-    foreach($this->Rows as $RowNum => $Row)
-    {
-      foreach($Row as $ColNum => $Value)
+    return ($Output);
+  }
+
+  function Prepare()
+  {
+    foreach ($this->Rows as $RowNum => $Row)
+    {
+      foreach ($Row as $ColNum => $Value)
       {
         $Value->Prepare();
@@ -274 +274 @@
   {
     $Output = $this->Caption;
-    if(method_exists($this->OnExecute[0], $this->OnExecute[1]))
+    if (method_exists($this->OnExecute[0], $this->OnExecute[1]))
     {
       $Link = 'O='.$this->Id.'&amp;M=Execute';
       $Output = '<a href="?'.$Link.'">'.$Output.'</a>';
     };
-    return($Output);
+    return ($Output);
   }
 
@@ -286 +286 @@
     $Object = ReadSessionVar('O', false);
     $Method = ReadSessionVar('M', false);
-    if(($Object == $this->Id) and ($Method == 'Execute'))
+    if (($Object == $this->Id) and ($Method == 'Execute'))
       call_user_func($this->OnExecute, $this);
   }
@@ -298 +298 @@
   {
     $Output = '<!DOCTYPE html><html><head></head><body>';
-    foreach($this->Items as $Item)
+    foreach ($this->Items as $Item)
       $Output .= $Item->Show();
     $Output .= '</body></html>';
-    return($Output);
-  }
-
-  function Prepare()
-  {
-    foreach($this->Items as $Item)
+    return ($Output);
+  }
+
+  function Prepare()
+  {
+    foreach ($this->Items as $Item)
       $Item->Prepare();
   }