Changeset 880 for trunk/Application/View.php

Timestamp:

Apr 7, 2020, 10:15:48 PM (4 years ago)

Author:

chronos

Message:

• Modified: Improved code formatting.

File:

• trunk/Application/View.php (modified) (16 diffs)

trunk/Application/View.php

@@ -9 +9 @@
     //$Output .= ' <form action="?setlocale" method="get">';
     $Output = ' <select onchange="window.location=this.value">';
-    foreach($this->System->LocaleManager->Available as $Locale)
+    foreach ($this->System->LocaleManager->Available as $Locale)
     {
       $Remaining = substr($_SERVER["REQUEST_URI"], strlen($this->System->BaseURL));
-      if(substr($Remaining, 1, strlen($Locale['Code'].'/')) == $this->System->LocaleManager->LangCode.'/')
+      if (substr($Remaining, 1, strlen($Locale['Code'].'/')) == $this->System->LocaleManager->LangCode.'/')
         $Remaining = substr($Remaining, strlen('/'.$Locale['Code']));
-      if($Locale['Code'] == $this->System->LocaleManager->CurrentLocale->Texts->Code) $Selected = ' selected="selected"';
+      if ($Locale['Code'] == $this->System->LocaleManager->CurrentLocale->Texts->Code) $Selected = ' selected="selected"';
         else $Selected = '';
       $Remaining = $this->System->TranslateReverseURL($Remaining, $this->System->LocaleManager->LangCode);
@@ -23 +23 @@
     $Output .= '</select><noscript><span><input type="submit" value="Submit"/></span></noscript>';
 
-    return($Output);
+    return $Output;
   }
 
@@ -29 +29 @@
   {
     $Output = '<div class="Menu">';
-    if(isset($this->System->User))
+    if (isset($this->System->User))
     {
-      if(!$this->System->User->Licence(LICENCE_USER))
+      if (!$this->System->User->Licence(LICENCE_USER))
         $Output .= '<div class="advert">'.$this->System->Config['Web']['Advertisement'].'</div>';
     }
@@ -38 +38 @@
     // Show bars items
     $Bar = '';
-    foreach($this->System->Bars['Top'] as $BarItem)
+    foreach ($this->System->Bars['Top'] as $BarItem)
       $Bar .= call_user_func($BarItem);
-      if(trim($Bar) != '') $Output .= $Bar;
+      if (trim($Bar) != '') $Output .= $Bar;
       else $Output .= '&nbsp;';
 
@@ -46 +46 @@
     //$Output .= '</form>';
     $Output .= '</span></div>';
-    return($Output);
+    return $Output;
   }
 
@@ -53 +53 @@
     $Output = '<strong>'.T('Menu').':</strong>'.
       '<div class="verticalmenu"><ul>';
-    foreach($this->System->Menu as $MenuItem)
-      if(!isset($this->System->User) or $this->System->User->Licence($MenuItem['Permission']))
+    foreach ($this->System->Menu as $MenuItem)
+      if (!isset($this->System->User) or $this->System->User->Licence($MenuItem['Permission']))
       {
-        if(isset($MenuItem['Click'])) $OnClick = ' onclick="'.$MenuItem['Click'].'"';
+        if (isset($MenuItem['Click'])) $OnClick = ' onclick="'.$MenuItem['Click'].'"';
         else $OnClick = '';
-        if($MenuItem['Icon'] != '') $Icon = '<img src="'.$this->System->Link('/images/menu/'.$MenuItem['Icon']).'"/>';
+        if ($MenuItem['Icon'] != '') $Icon = '<img src="'.$this->System->Link('/images/menu/'.$MenuItem['Icon']).'"/>';
         else $Icon = '';
         $Output .= '<li>'.$Icon.'<a class="verticalmenua" title="'.$MenuItem['Hint'].'" href="'.
@@ -64 +64 @@
       }
       $Output .= '</ul></div>';
-      return($Output);
+      return $Output;
   }
 
@@ -83 +83 @@
     // Show page headers
     $Bar = '';
-    foreach($this->System->PageHeaders as $Item)
+    foreach ($this->System->PageHeaders as $Item)
       $Output .= call_user_func($Item);
 
     $Title = $this->System->Config['Web']['Title'];
-    if($this->Title != '') $Title = $this->Title.' - '.$Title;
+    if ($this->Title != '') $Title = $this->Title.' - '.$Title;
     $Output .= '<title>'.$Title.'</title>'.
     '<script src="'.$this->System->Link('/style/respond.js').'"></script>'.
@@ -98 +98 @@
     // Show bars items
     $Bar = '';
-    foreach($this->System->Bars['Left'] as $BarItem)
+    foreach ($this->System->Bars['Left'] as $BarItem)
       $Bar .= call_user_func($BarItem);
-      if(trim($Bar) != '') $Output .= $Bar;
+      if (trim($Bar) != '') $Output .= $Bar;
       else $Output .= '&nbsp;';
 
     $Output .= '</td><td id="border-left"></td><td class="content">';
-    return($Output);
+    return $Output;
   }
 
@@ -117 +117 @@
     // Show bars items
     $Bar = '';
-    foreach($this->System->Bars['Right'] as $BarItem)
+    foreach ($this->System->Bars['Right'] as $BarItem)
       $Bar .= call_user_func($BarItem);
-      if(trim($Bar) != '') $Output .= $Bar;
+      if (trim($Bar) != '') $Output .= $Bar;
       else $Output .= '&nbsp;';
     $Output .= '</td>';
@@ -129 +129 @@
 
     $Output .= '</td></tr>';
-    if($this->System->Config['Web']['ShowRuntimeInfo'] == true)
+    if ($this->System->Config['Web']['ShowRuntimeInfo'] == true)
       $Output .= '<tr><td colspan="3" style="text-align: center;">'.T('Generating duration').': '.
     $ScriptGenerateDuration.' s / '.ini_get('max_execution_time').' s &nbsp;&nbsp; '.T('Used memory').': '.
@@ -137 +137 @@
       '</body>'.
       '</html>';
-    return($Output);
+    return $Output;
   }
 
@@ -143 +143 @@
   {
     $Output = $this->ShowHeader().$Content.$this->ShowFooter();
-    if($this->System->Config['Web']['FormatOutput'])
+    if ($this->System->Config['Web']['FormatOutput'])
       $Output = $this->FormatOutput($Output);
-    return($Output);
+    return $Output;
   }
 
@@ -153 +153 @@
     $nn = 0;
     $n = 0;
-    while($s != '')
+    while ($s != '')
     {
       $start = strpos($s, '<');
       $end = strpos($s, '>');
-      if($start != 0)
+      if ($start != 0)
       {
         $end = $start - 1;
@@ -163 +163 @@
       }
       $line = trim(substr($s, $start, $end + 1));
-      if(strlen($line) > 0)
-        if($line[0] == '<')
+      if (strlen($line) > 0)
+        if ($line[0] == '<')
         {
-          if($s[$start + 1] == '/')
+          if ($s[$start + 1] == '/')
           {
             $n = $n - 2;
@@ -172 +172 @@
           } else
           {
-            if(strpos($line, ' ')) $cmd = substr($line, 1, strpos($line, ' ') - 1);
+            if (strpos($line, ' ')) $cmd = substr($line, 1, strpos($line, ' ') - 1);
             else $cmd = substr($line, 1, strlen($line) - 2);
             //echo('['.$cmd.']');
-            if(strpos($s, '</'.$cmd.'>')) $n = $n + 2;
+            if (strpos($s, '</'.$cmd.'>')) $n = $n + 2;
           }
         }// else $line = '['.$line.']';
-        //if($line != '') echo(htmlspecialchars(str_repeat(' ',$nn).$line."\n"));
-        if($nn < 0) $nn = 0;
-        if($line != '') $out .= (str_repeat(' ', $nn).$line."\n");
+        //if ($line != '') echo(htmlspecialchars(str_repeat(' ',$nn).$line."\n"));
+        if ($nn < 0) $nn = 0;
+        if ($line != '') $out .= (str_repeat(' ', $nn).$line."\n");
         $s = substr($s, $end + 1, strlen($s));
         $nn = $n;
     }
-    return($out);
+    return $out;
   }
 }