Changeset 873 for trunk/Application/System.php

Timestamp:

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

Author:

chronos

Message:

• Modified: Improved code format.

File:

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

trunk/Application/System.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__).'/Version.php');
@@ -40 +40 @@
     $this->ConfigManager = new Config();
     $this->RootURLFolder = $_SERVER['SCRIPT_NAME'];
-    if(substr($this->RootURLFolder, -10, 10) == '/index.php')
+    if (substr($this->RootURLFolder, -10, 10) == '/index.php')
       $this->RootURLFolder = substr($this->RootURLFolder, 0, -10);
     $this->CommandLine = array();
@@ -48 +48 @@
   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;
@@ -68 +68 @@
   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(is_array($Pages[$PathItem]))
+    if (array_key_exists($PathItem, $Pages))
+    {
+      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 PageNotFound()
   {
-    return('Page '.implode('/', $this->PathItems).' not found.');
+    return ('Page '.implode('/', $this->PathItems).' not found.');
   }
 
@@ -91 +91 @@
     /* @var $Page Page */
     $ClassName = $this->SearchPage($this->PathItems, $this->Pages);
-    if($ClassName != '')
+    if ($ClassName != '')
     {
       $Page = new $ClassName($this);
@@ -102 +102 @@
   function ModulePresent($Name)
   {
-    return(array_key_exists($Name, $this->Modules));
+    return (array_key_exists($Name, $this->Modules));
   }
 
@@ -112 +112 @@
   function HumanDate($Time)
   {
-    return(date('j.n.Y', $Time));
+    return (date('j.n.Y', $Time));
   }
 
   function Link($Target)
   {
-    return($this->RootURLFolder.$Target);
+    return ($this->RootURLFolder.$Target);
   }
 
@@ -126 +126 @@
       'LEFT JOIN `ActionIcon` ON `ActionIcon`.`Id` = `Action`.`Icon` '.
       'WHERE (`Action`.`Id`='.$Id.')');
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $Action = $DbResult->fetch_assoc();
-      if($Action['Icon'] == '') $Action['Icon'] = 'clear.png';
-      if(substr($Action['URL'], 0, 4) != 'http') $Action['URL'] = $this->Link($Action['URL']);
-      if(!defined('NEW_PERMISSION') or $this->User->CheckPermission('System', 'Read', 'Item', $Id))
+      if ($Action['Icon'] == '') $Action['Icon'] = 'clear.png';
+      if (substr($Action['URL'], 0, 4) != 'http') $Action['URL'] = $this->Link($Action['URL']);
+      if (!defined('NEW_PERMISSION') or $this->User->CheckPermission('System', 'Read', 'Item', $Id))
         $Output .= '<img alt="'.$Action['Title'].'" src="'.$this->Link('/images/favicons/'.$Action['Icon']).
         '" width="16" height="16" /> <a href="'.$Action['URL'].'">'.$Action['Title'].'</a>';
     }
-    return($Output);
+    return ($Output);
   }
 
@@ -148 +148 @@
 
     // SQL injection hack protection
-    foreach($_POST as $Index => $Item) $_POST[$Index] = addslashes($Item);
-    foreach($_GET as $Index => $Item) $_GET[$Index] = addslashes($Item);
-
-    if(isset($_SERVER['REMOTE_ADDR'])) session_start();
+    foreach ($_POST as $Index => $Item) $_POST[$Index] = addslashes($Item);
+    foreach ($_GET as $Index => $Item) $_GET[$Index] = addslashes($Item);
+
+    if (isset($_SERVER['REMOTE_ADDR'])) session_start();
 
     $ConfigFileName = dirname(dirname(__FILE__)).'/config.php';
-    if(file_exists($ConfigFileName))
+    if (file_exists($ConfigFileName))
       $this->ConfigManager->LoadFromFile($ConfigFileName);
     //$this->Config = $this->ConfigManager->GetAsArray();
@@ -166 +166 @@
       $this->Database->ShowSQLError = $this->Config['Web']['ShowSQLError'];
       $this->Database->ShowSQLQuery = $this->Config['Web']['ShowSQLQuery'];
-      if(isset($this->Config['Web']['LogSQLQuery']))
+      if (isset($this->Config['Web']['LogSQLQuery']))
         $this->Database->LogSQLQuery = $this->Config['Web']['LogSQLQuery'];
     } catch (Exception $E) {
@@ -181 +181 @@
     $this->LinkLocaleExceptions = array('images', 'style', 'files');
 
-    if(isset($this->Config['Web']['RootFolder']))
+    if (isset($this->Config['Web']['RootFolder']))
       $this->RootURLFolder = $this->Config['Web']['RootFolder'];
     $this->FormManager->Root = $this->RootURLFolder;
@@ -193 +193 @@
     $this->Setup = new Setup($this);
     $this->Setup->Start();
-    if($this->Setup->CheckState())
+    if ($this->Setup->CheckState())
     {
       $this->ModuleManager->Start();
@@ -202 +202 @@
   {
     $this->RunCommon();
-    if($this->ShowPage)
+    if ($this->ShowPage)
     {
       $this->PathItems = ProcessURL();
 
       // Detect interface locale
-      if(isset($this->Config['Web']['Locale']))
+      if (isset($this->Config['Web']['Locale']))
         $this->LocaleManager->DefaultLangCode = $this->Config['Web']['Locale'];
       $this->LocaleManager->LangCode = $this->LocaleManager->DefaultLangCode;
-      if(count($this->PathItems) > 0)
+      if (count($this->PathItems) > 0)
       {
          $NewLangCode = $this->PathItems[0];
-         if(array_key_exists($NewLangCode, $this->LocaleManager->Available)) 
+         if (array_key_exists($NewLangCode, $this->LocaleManager->Available)) 
          {
            array_shift($this->PathItems);
@@ -219 +219 @@
          }
       }
-      if(array_key_exists($this->LocaleManager->LangCode, $this->LocaleManager->Available))
+      if (array_key_exists($this->LocaleManager->LangCode, $this->LocaleManager->Available))
         $this->LocaleManager->LoadLocale($this->LocaleManager->LangCode);
 
@@ -231 +231 @@
 
     $this->RunCommon();
-    if(count($argv) > 1)
-    {
-      if(array_key_exists($argv[1], $this->CommandLine))
+    if (count($argv) > 1)
+    {
+      if (array_key_exists($argv[1], $this->CommandLine))
       {
         $Command = $this->CommandLine[$argv[1]];
@@ -282 +282 @@
   {
     Header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found');
-    return('<h3 align="center">Požadovaná stránka neexistuje.</h3>');
+    return ('<h3 align="center">Požadovaná stránka neexistuje.</h3>');
   }
 }