Changeset 92 for trunk/Application/Core.php

Timestamp:

Apr 7, 2020, 11:53:58 AM (5 years ago)

Author:

chronos

Message:

• Modified: Improved code formatting.

File:

• trunk/Application/Core.php (modified) (10 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__).'/../Global.php');
@@ -24 +24 @@
     $this->ShowPage = true;
     $this->BaseURL = $_SERVER['SCRIPT_NAME'];
-    if(substr($this->BaseURL, -10, 10) == '/index.php')
+    if (substr($this->BaseURL, -10, 10) == '/index.php')
       $this->BaseURL = substr($this->BaseURL, 0, -10);
   }
@@ -32 +32 @@
     global $Config, $DatabaseRevision, $WithoutSessionStart;
 
-    if($this->UseSession) session_start();
+    if ($this->UseSession) session_start();
 
     $ErrorHandler = new ErrorHandler();
@@ -50 +50 @@
 
     // 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->Config = &$Config;
@@ -58 +58 @@
     $this->Setup = new Setup($this);
     $this->Setup->Start();
-    if($this->Setup->CheckState())
+    if ($this->Setup->CheckState())
     {
       $this->ModuleManager->Start();
@@ -67 +67 @@
   {
     $this->RunCommon();
-    if($this->ShowPage)
+    if ($this->ShowPage)
     {
       $this->PathItems = ProcessURL();
@@ -80 +80 @@
     /* @var $Page Page */
     $ClassName = $this->SearchPage($this->PathItems, $this->Pages);
-    if($ClassName != '')
+    if ($ClassName != '')
     {
       $Page = new $ClassName($this);
@@ -91 +91 @@
   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;
@@ -111 +111 @@
   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;
   }
 }
@@ -141 +141 @@
   {
     Header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found');
-    return('<h3 align="center">'.T('Required page not found'));
+    return '<h3 align="center">'.T('Required page not found');
   }
 }