Changeset 915 for trunk/Application

Timestamp:

Dec 7, 2021, 9:56:09 PM (3 years ago)

Author:

chronos

Message:

• Fixed: Various PHP 8.0 related fixes.

Location:

trunk/Application

Files:

• BaseView.php (modified) (3 diffs)
• Core.php (modified) (3 diffs)
• Version.php (modified) (1 diff)

trunk/Application/BaseView.php

@@ -5 +5 @@
 class BaseView extends View
 {
-  var $TimeStart;
   public bool $FormatHTML = false;
   public bool $ShowRuntimeInfo = false;
@@ -24 +23 @@
     $this->Encoding = 'utf-8';
     $this->Style = 'new';
-
-    // TODO: Move to external code
-    if (isset($this->System->Config['Web']['FormatHTML']))
-      $this->FormatHTML = $this->System->Config['Web']['FormatHTML'];
-    if (isset($this->System->Config['Web']['ShowRuntimeInfo']))
-      $this->ShowRuntimeInfo = $this->System->Config['Web']['ShowRuntimeInfo'];
-    if (isset($this->System->Config['Web']['Charset']))
-      $this->Encoding = $this->System->Config['Web']['Charset'];
-    if (isset($this->System->Config['Web']['Style']))
-      $this->Style = $this->System->Config['Web']['Style'];
   }
 
@@ -110 +99 @@
   function ShowFooter(): string
   {
-    global $ScriptTimeStart, $Revision, $ReleaseTime;
+    global $Revision, $ReleaseTime;
 
-    $Time = round(GetMicrotime() - $ScriptTimeStart, 2);
+    $Time = round(GetMicrotime() - $this->System->ScriptTimeStart, 2);
     $Output = '';
     if ($this->BasicHTML == false)

trunk/Application/Core.php

@@ -26 +26 @@
   public LocaleManager $LocaleManager;
   public array $LinkLocaleExceptions;
+  public float $ScriptTimeStart;
 
   function __construct()
@@ -59 +60 @@
   {
     $this->BaseView = new BaseView($this);
+    if (isset($this->Config['Web']['FormatHTML']))
+      $this->BaseView->FormatHTML = $this->Config['Web']['FormatHTML'];
+    if (isset($this->Config['Web']['ShowRuntimeInfo']))
+      $this->BaseView->ShowRuntimeInfo = $this->Config['Web']['ShowRuntimeInfo'];
+    if (isset($this->Config['Web']['Charset']))
+      $this->BaseView->Encoding = $this->Config['Web']['Charset'];
+    if (isset($this->Config['Web']['Style']))
+      $this->BaseView->Style = $this->Config['Web']['Style'];
 
     /* @var $Page Page */
@@ -89 +98 @@
   function RunCommon(): void
   {
-    global $Database, $ScriptTimeStart, $ConfigFileName, $Config, $GlobalLocaleManager;
+    global $Database, $ConfigFileName, $Config, $GlobalLocaleManager;
 
     date_default_timezone_set('Europe/Prague');
     mb_internal_encoding("UTF-8");
-    $ScriptTimeStart = GetMicrotime();
+    $this->ScriptTimeStart = GetMicrotime();
 
     // SQL injection hack protection

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 914; // Subversion revision
+$Revision = 915; // Subversion revision
 $DatabaseRevision = 911; // SQL structure revision
-$ReleaseTime = strtotime('2021-09-22');
+$ReleaseTime = strtotime('2021-12-07');