Changeset 7 for trunk/Application

Timestamp:

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

Author:

chronos

Message:

• Modified: Improved code formatting.

Location:

trunk/Application

Files:

• Core.php (modified) (10 diffs)
• DefaultConfig.php (modified) (2 diffs)
• UpdateTrace.php (modified) (1 diff)
• View.php (modified) (3 diffs)

trunk/Application/Core.php

@@ -2 +2 @@
 
 $ConfigFileName = dirname(__FILE__).'/../Config/Config.php';
-if(file_exists($ConfigFileName)) include_once($ConfigFileName);
+if (file_exists($ConfigFileName)) include_once($ConfigFileName);
 
 include_once(dirname(__FILE__).'/../Packages/Common/Common.php');
@@ -31 +31 @@
     $this->BaseURL = $_SERVER['SCRIPT_NAME'];
     $BaseScriptName = '/index.php';
-    if(substr($this->BaseURL, -strlen($BaseScriptName), strlen($BaseScriptName)) == $BaseScriptName)
+    if (substr($this->BaseURL, -strlen($BaseScriptName), strlen($BaseScriptName)) == $BaseScriptName)
       $this->BaseURL = substr($this->BaseURL, 0, -strlen($BaseScriptName));
     $this->FormManager = new FormManager($this->Database);
@@ -48 +48 @@
     $this->Config = &$Config;
 
-    if(isset($this->Config['Database']))
+    if (isset($this->Config['Database']))
     {
       $this->Database->Connect($Config['Database']['Host'], $Config['Database']['User'],
@@ -59 +59 @@
 
     // SQL injection hack protection
-    foreach($_POST as $Index => $Item) $_POST[$Index] = addslashes($Item);
-    foreach($_GET as $Index => $Item) $_GET[$Index] = addslashes($Item);
+    foreach ($_POST as $Index => $Item) $_POST[$Index] = addslashes($Item);
+    foreach ($_GET as $Index => $Item) $_GET[$Index] = addslashes($Item);
 
     $this->RegisterPageBar('Top');
@@ -68 +68 @@
     $this->Setup = new Setup($this);
     $this->Setup->Start();
-    if($this->Setup->CheckState())
+    if ($this->Setup->CheckState())
     {
       $this->ModuleManager->Start();
@@ -77 +77 @@
   {
     $this->RunCommon();
-    if($this->ShowPage)
+    if ($this->ShowPage)
     {
       $this->PathItems = ProcessURL();
@@ -90 +90 @@
     /* @var $Page Page */
     $ClassName = $this->SearchPage($this->PathItems, $this->Pages);
-    if($ClassName != '')
+    if ($ClassName != '')
     {
       $Page = new $ClassName($this);
@@ -101 +101 @@
   function RegisterPage($Path, $Handler)
   {
-    if(is_array($Path))
+    if (is_array($Path))
     {
       $Page = &$this->Pages;
       $LastKey = array_pop($Path);
-      foreach($Path as $PathItem)
+      foreach ($Path as $PathItem)
       {
         $Page = &$Page[$PathItem];
       }
-      if(!is_array($Page)) $Page = array('' => $Page);
+      if (!is_array($Page)) $Page = array('' => $Page);
       $Page[$LastKey] = $Handler;
     } else $this->Pages[$Path] = $Handler;
@@ -136 +136 @@
   function SearchPage($PathItems, $Pages)
   {
-    if(count($PathItems) > 0) $PathItem = $PathItems[0];
+    if (count($PathItems) > 0) $PathItem = $PathItems[0];
       else $PathItem = '';
-    if(array_key_exists($PathItem, $Pages))
+    if (array_key_exists($PathItem, $Pages))
     {
-      if(is_array($Pages[$PathItem]))
+      if (is_array($Pages[$PathItem]))
       {
         array_shift($PathItems);
-        return($this->SearchPage($PathItems, $Pages[$PathItem]));
-      } else return($Pages[$PathItem]);
-    } else return('');
+        return $this->SearchPage($PathItems, $Pages[$PathItem]);
+      } else return $Pages[$PathItem];
+    } else return '';
   }
 
   function Link($Target)
   {
-    return($this->BaseURL.$Target);
+    return $this->BaseURL.$Target;
   }
 }
@@ -166 +166 @@
   {
     Header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found');
-    return('<h3 align="center">'.T('Required page not found').'</h3>');
+    return '<h3 align="center">'.T('Required page not found').'</h3>';
   }
 }

trunk/Application/DefaultConfig.php

@@ -6 +6 @@
   {
     $IsDeveloper = in_array($_SERVER['REMOTE_ADDR'], array('127.0.0.1'));
-    return(array
+    return array
     (
         array('Name' => 'SystemPassword', 'Type' => 'PasswordEncoded', 'Default' => '', 'Title' => 'Systémové heslo'),
@@ -36 +36 @@
         array('Name' => 'Web/ShowPHPError', 'Type' => 'Boolean', 'Default' => '0', 'Title' => 'Ukazovat PHP chyby'),
         array('Name' => 'Web/ShowRuntimeInfo', 'Type' => 'Boolean', 'Default' => '0', 'Title' => 'Ukazovat běhové informace'),
-    ));
+    );
   }
 }

trunk/Application/UpdateTrace.php

@@ -9 +9 @@
   function Get()
   {
-    return(array(
-    ));
+    return array(
+    );
   }
 }

trunk/Application/View.php

@@ -5 +5 @@
   function SystemMessage($Title, $Text)
   {
-    return('<table align="center"><tr><td><div class="SystemMessage"><h3>'.$Title.'</h3><div>'.$Text.'</div></div></td></tr></table>');
+    return '<table align="center"><tr><td><div class="SystemMessage"><h3>'.$Title.'</h3><div>'.$Text.'</div></div></td></tr></table>';
   }
 
@@ -37 +37 @@
     $Output .= '<div class="MenuItem">';
     $Bar = '';
-    foreach($this->System->Bars['TopLeft'] as $BarItem)
+    foreach ($this->System->Bars['TopLeft'] as $BarItem)
       $Bar .= call_user_func($BarItem);
-      if(trim($Bar) != '') $Output .= $Bar;
+      if (trim($Bar) != '') $Output .= $Bar;
       else $Output .= '&nbsp;';
     $Output .= '</div><div class="MenuItem2">';
     $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;';
     $Output .= '</div></div>';
-    return($Output);
+    return $Output;
   }
 
@@ -55 +55 @@
     $Page->OnSystemMessage = array($this->System->BaseView, 'SystemMessage');
     $Output = $this->ShowPage($Page->Show());
-    return($Output);
+    return $Output;
   }
 }