Changeset 8 for trunk/Application

Timestamp:

Jun 1, 2023, 12:18:18 AM (19 months ago)

Author:

chronos

Message:

• Modified: Updated Common package.
• Modified: Form types made as separate FormManager package.
• Fixed: PHP 8.1 support.

Location:

trunk/Application

Files:

• BaseView.php (moved) (moved from trunk/Application/View.php ) (1 diff)
• Core.php (modified) (4 diffs)
• PageMissing.php (added)
• Version.php (modified) (1 diff)

trunk/Application/BaseView.php

@@ -26 +26 @@
     $Output .= $Content;
     $Output .= '<br/><div style="text-align: center; font-size: small;">Verze: '.$Revision.' ('.HumanDate($ReleaseTime).')'.
-      ' &nbsp; <a href="http://svn.zdechov.net/trac/open2ride/browser/trunk">Zdrojový kód</a> &nbsp; '.
-      '<a href="http://svn.zdechov.net/trac/open2ride/log/trunk?verbose=on">Historie změn</a></div>';
+      ' &nbsp; <a href="https://svn.zdechov.net/trac/open2ride/browser/trunk">Zdrojový kód</a> &nbsp; '.
+      '<a href="https://svn.zdechov.net/trac/open2ride/log/trunk?verbose=on">Historie změn</a></div>';
     $Output .= '</body></html>';
     echo($Output);

trunk/Application/Core.php

@@ -4 +4 @@
 if (file_exists($ConfigFileName)) include_once($ConfigFileName);
 
-include_once(dirname(__FILE__).'/../Packages/Common/Common.php');
+include_once(dirname(__FILE__).'/../Packages/Common/PackageCommon.php');
+include_once(dirname(__FILE__).'/../Packages/FormManager/PackageFormManager.php');
 include_once(dirname(__FILE__).'/Version.php');
-include_once(dirname(__FILE__).'/View.php');
+include_once(dirname(__FILE__).'/BaseView.php');
+include_once(dirname(__FILE__).'/PageMissing.php');
 include_once(dirname(__FILE__).'/UpdateTrace.php');
 include_once(dirname(__FILE__).'/DefaultConfig.php');
 include_once(dirname(__FILE__).'/../Global.php');
 
-class Core extends Application
+class Core extends System
 {
-  var $Pages;
-  var $ShowPage;
-  var $BaseURL;
-  var $Config;
-  var $HeadItems;
-  var $Bars;
-  /** @var FormManager */
-  var $FormManager;
+  public bool $ShowPage;
+  public string $BaseURL;
+  public array $Config;
+  public array $HeadItems;
+  public array $Bars;
+  public array $PathItems;
+  public FormManager $FormManager;
+  public BaseView $BaseView;
 
   function __construct()
@@ -65 +67 @@
     $this->RegisterPageBar('TopLeft');
 
-    // Register and start existing modules
-    $this->Setup = new Setup($this);
-    $this->Setup->Start();
-    if ($this->Setup->CheckState())
+    $this->StartModules();
+  }
+
+  function StartModules(): void
+  {
+    $ModuleSetup = $this->ModuleManager->LoadModule(dirname(__FILE__).'/../Packages/Common/Modules/ModuleSetup.php');
+    $ModuleSetup->Install();
+    $ModuleSetup->Start();
+    $this->ModuleManager->LoadModules();
+    $this->ModuleManager->LoadModule(dirname(__FILE__).'/../Packages/Common/Modules/ModuleAdmin.php');
+    if (file_exists($this->ModuleManager->FileName)) $this->ModuleManager->LoadState();
+    if (ModuleSetup::Cast($ModuleSetup)->CheckState())
     {
-      $this->ModuleManager->Start();
+      $this->ModuleManager->StartAll(array(ModuleCondition::Enabled));
     }
   }
 
-  function Run()
+  function Run(): void
   {
     $this->RunCommon();
@@ -98 +108 @@
     echo($this->BaseView->GetOutput($Page));
   }
-
-  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;
-  }
-
-  function UnregisterPage($Path)
-  {
-    unset($this->Pages[$Path]);
-  }
-
+  
   function RegisterPageBar($Name)
   {
@@ -148 +138 @@
   }
 
-  function Link($Target)
+  function Link($Target): string
   {
     return $this->BaseURL.$Target;
   }
-}
 
-class PageMissing extends Page
-{
-  function __construct($System)
+  static function Cast(System $System): Core
   {
-    parent::__construct($System);
-    $this->ParentClass = '';
-    $this->Title = T('Page not found');
-  }
-
-  function Show()
-  {
-    Header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found');
-    return '<h3 align="center">'.T('Required page not found').'</h3>';
+    if ($System instanceof Core)
+    {
+      return $System;
+    }
+    throw new Exception('Expected Core type but '.gettype($System));
   }
 }

trunk/Application/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 6;
-$DatabaseRevision = 6;
-$ReleaseTime = strtotime('2020-04-14');
+$Revision = 8;
+$DatabaseRevision = 8;
+$ReleaseTime = strtotime('2023-06-01');