Changeset 92 for trunk/Application

Timestamp:

Apr 7, 2020, 11:53:58 AM (4 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) (4 diffs)
• Version.php (modified) (1 diff)
• View.php (modified) (1 diff)

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');
   }
 }

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'),
@@ -53 +53 @@
         array('Name' => 'MainRouter/ConnectTimeout', 'Type' => 'Integer', 'Default' => '5', 'Title' => 'Vypršení času'),
         array('Name' => 'MainRouter/MangleRuleSubgroupMinPrefix', 'Type' => 'Integer', 'Default' => '28', 'Title' => 'Nejmenší prefix podsítě pro mangle pravidla'),
-    ));
+    );
   }
 }

trunk/Application/UpdateTrace.php

@@ -44 +44 @@
   'REFERENCES `Measure`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
   $DbResult = $Manager->Execute('SELECT `Id`, `PermissionAdd` FROM `Measure`');
-  while($DbRow = $DbResult->fetch_assoc())
+  while ($DbRow = $DbResult->fetch_assoc())
   {
     $Manager->Execute('INSERT INTO `Permission` (`Measure`, `Operation`) VALUES ('.
@@ -50 +50 @@
         }
   $DbResult = $Manager->Execute('SELECT `Id`, `PermissionView` FROM `Measure`');
-  while($DbRow = $DbResult->fetch_assoc())
+  while ($DbRow = $DbResult->fetch_assoc())
   {
           $Manager->Execute('INSERT INTO `Permission` (`Measure`, `Operation`) VALUES ('.
@@ -61 +61 @@
 {
   $DbResult = $Manager->Execute('SELECT `DataTable`,`DataType` FROM `Measure`;');
-  while($Measure = $DbResult->fetch_assoc())
+  while ($Measure = $DbResult->fetch_assoc())
   {
     $Table = $Measure['DataTable'];
@@ -80 +80 @@
   function Get()
   {
-    return(array(
+    return array(
       65 => array('Revision' => 67, 'Function' => 'UpdateTo67'),
       67 => array('Revision' => 79, 'Function' => 'UpdateTo79'),
-    ));
+    );
   }
 }

trunk/Application/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 88;
+$Revision = 92;
 $DatabaseRevision = 79;
-$ReleaseTime = strtotime('2019-10-04');
+$ReleaseTime = strtotime('2020-04-07');

trunk/Application/View.php

@@ -28 +28 @@
   {
     $Output = $this->ShowPage($Page->Show());
-    return($Output);
+    return $Output;
   }
 }