Changeset 888 for trunk/Application

Timestamp:

Dec 27, 2022, 7:50:23 PM (2 years ago)

Author:

chronos

Message:

• Modified: Updated Common package to latest version.
• Modified: Fixes related to PHP 8.x.

Location:

trunk/Application

Files:

• Core.php (modified) (6 diffs)
• UpdateTrace.php (modified) (2 diffs)
• Version.php (modified) (1 diff)
• View.php (modified) (2 diffs)

trunk/Application/Core.php

@@ -1 +1 @@
 <?php
 
-class Core extends Application
+class Core extends System
 {
-  var $Config;
-  var $PathItems;
-  var $Menu;
-  var $DoNotShowPage;
-  var $OnPageNotFound;
-  var $Pages;
-  /* @var LocaleManager */
-  var $LocaleManager;
-  var $Bars;
-  var $PageHeaders;
-  var $BaseURL;
+  public array $Config;
+  public array $PathItems;
+  public array $Menu;
+  public bool $DoNotShowPage;
+  public array $OnPageNotFound;
+  public LocaleManager $LocaleManager;
+  public array $Bars;
+  public array $PageHeaders;
+  public string $BaseURL;
 
   function __construct()
@@ -103 +101 @@
   }
 
-  function Run()
+  static function Cast(System $System): Core
+  {
+    if ($System instanceof Core)
+    {
+      return $System;
+    }
+    throw new Exception('Expected Core type but '.gettype($System));
+  }
+
+  function Run(): void
   {
     global $ScriptStartTime, $StopAfterUpdateManager,
@@ -126 +133 @@
     $this->Init();
 
-    // Register and start existing modules
-    $this->Setup = new Setup($this);
-    $this->Setup->Start();
-    $this->Setup->UpdateManager->VersionTable = 'DbVersion';
-    if ($this->Setup->CheckState())
-    {
-      $this->ModuleManager->Start();
-    }
+    $this->StartModules();
 
     $this->BaseView = new BaseView($this);
@@ -142 +142 @@
   }
 
+  function StartModules(): void
+  {
+    $ModuleSetup = $this->ModuleManager->LoadModule(dirname(__FILE__).'/../Packages/Common/Modules/Setup.php');
+    ModuleSetup::Cast($ModuleSetup)->UpdateManager->VersionTable = 'DbVersion';
+    $ModuleSetup->Install();
+    $ModuleSetup->Start();
+    $this->ModuleManager->LoadModules();
+    $this->ModuleManager->LoadModule(dirname(__FILE__).'/../Packages/Common/Modules/ModuleManager.php');
+    if (file_exists($this->ModuleManager->FileName)) $this->ModuleManager->LoadState();
+    if (ModuleSetup::Cast($ModuleSetup)->CheckState())
+    {
+      $this->ModuleManager->StartAll(array(ModuleCondition::Enabled));
+    }
+  }
+
   function GetMicrotime()
   {
@@ -148 +163 @@
   }
 
-  function Link($Target)
+  function Link(string $Target): string
   {
     if (substr($Target, 0, strlen($this->BaseURL)) == $this->BaseURL)
@@ -235 +250 @@
       return $this->BaseURL.$Target;
     return $this->BaseURL.'/'.$Locale.$Target;
-  }
-
-  function RegisterPage($Path, $Handler)
-  {
-    if (is_array($Path))
-    {
-      $Page = &$this->Pages;
-      $LastKey = array_pop($Path);
-      foreach ($Path as $PathItem)
-      {
-        $Page = &$Page[$PathItem];
-      }
-      if (!is_array($Page)) $Page = array('' => $Page);
-      $Page[$LastKey] = $Handler;
-    } else $this->Pages[$Path] = $Handler;
   }
 

trunk/Application/UpdateTrace.php

@@ -2967 +2967 @@
 }
 
+function UpdateTo887($Manager)
+{
+  $Manager->Execute('ALTER TABLE `Referrer` CHANGE `LastIP` `LastIP` VARCHAR(46) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL;');
+}
+
 class Updates
 {
@@ -3006 +3011 @@
       867 => array('Revision' => 872, 'Function' => 'UpdateTo872'),
       872 => array('Revision' => 873, 'Function' => 'UpdateTo873'),
+      873 => array('Revision' => 887, 'Function' => 'UpdateTo887'),
     );
   }

trunk/Application/Version.php

@@ -7 +7 @@
 
 $Version = '1.0';
-$Revision = 884; // Subversion revision
-$DatabaseRevision = 873; // Database structure revision
-$ReleaseDate = strtotime('2020-04-08');
+$Revision = 887; // Subversion revision
+$DatabaseRevision = 887; // Database structure revision
+$ReleaseDate = strtotime('2022-12-27');

trunk/Application/View.php

@@ -16 +16 @@
       if ($Locale['Code'] == $this->System->LocaleManager->CurrentLocale->Texts->Code) $Selected = ' selected="selected"';
         else $Selected = '';
-      $Remaining = $this->System->TranslateReverseURL($Remaining, $this->System->LocaleManager->LangCode);
+      $Remaining = Core::Cast($this->System)->TranslateReverseURL($Remaining, $this->System->LocaleManager->LangCode);
 
-      $URL = $this->System->LinkLocale($Remaining, $Locale['Code']);
+      $URL = Core::Cast($this->System)->LinkLocale($Remaining, $Locale['Code']);
       $Output .= '<option title="" value="'.$URL.'"'.$Selected.' onchange="this.form.submit()">'.$Locale['Title'].'</option>';
     }
@@ -126 +126 @@
     $Output .= '</td>';
     $Output .= '</tr><tr>'.
-      '<td colspan="4" class="page-bottom">'.T('Version').': '.$Version.' '.T('Revision').': '.$Revision.' ('.$this->System->HumanDate($ReleaseDate).')'.
+      '<td colspan="4" class="page-bottom">'.T('Version').': '.$Version.' '.T('Revision').': '.$Revision.' ('.Core::Cast($this->System)->HumanDate($ReleaseDate).')'.
       ' &nbsp; <a href="https://app.zdechov.net/wowpreklad/browser/trunk">'.T('Source code').'</a> &nbsp; '.
       '<a href="https://app.zdechov.net/wowpreklad/log/trunk?verbose=on">'.T('Changelog').'</a> &nbsp; '.