Changeset 63 for trunk/index.php

Timestamp:

Aug 3, 2021, 11:20:41 AM (3 years ago)

Author:

chronos

Message:

• Modified: Used explicit types where possible for better error reporting.
• Modified: Updated Common packaged to newer version.
• Modified: Simplified pages title.
• Added: Simple keyword based spam filter for meet items.

Location:

trunk

Files:

• . (modified) (1 prop)
• index.php (modified) (15 diffs)

trunk

@@ -1 @@
-nbproject
-Config.php
 .settings
 .project
 .buildpath
+.htaccess

@@ -1 @@
-nbproject
-Config.php
 .settings
 .project
 .buildpath
+.htaccess

trunk/index.php

@@ -5 +5 @@
 require_once('Packages/Common/Common.php');
 require_once('View.php');
-
 
 require_once('Modules/Meet/Meet.php');
@@ -18 +17 @@
 if (isset($_SERVER['REMOTE_ADDR'])) session_start();
 
-class ApplicationTanec extends Application
-{
-  var $Config;
-  var $Title;
-  var $Pages;
-  var $PathItems;
-  var $ShowPage;
-  var $MainMenu;
-  var $PageHeaders;
-  var $Bars;
+class Core extends System
+{
+  public array $Config;
+  public array $PathItems;
+  public bool $ShowPage;
+  public array $MainMenu;
+  public array $PageHeaders;
+  public array $Bars;
 
   function __construct()
@@ -38 +35 @@
   }
 
-  function IsAdmin()
+  function IsAdmin(): bool
   {
     return array_key_exists('IsAdmin', $_SESSION) and ($_SESSION['IsAdmin'] == 1);
   }
 
-  function Link($URL)
+  function Link(string $URL): string
   {
     return $this->Config['BaseURL'].$URL;
   }
 
-  function AbsoluteLink($URL)
+  function AbsoluteLink(string $URL): string
   {
     return $this->Config['HostName'].$this->Config['BaseURL'].$URL;
   }
 
-  function ShowMenu()
+  function ShowMenu(): string
   {
     $Output = '<div>';
@@ -64 +61 @@
   }
 
-  function ProcessURL()
+  function ProcessURL(): array
   {
     if (array_key_exists('REDIRECT_QUERY_STRING', $_SERVER))
@@ -78 +75 @@
   }
 
-  function RegisterPage($Path, $Handler)
+  function RegisterPage($Path, $Handler): void
   {
     if (is_array($Path))
@@ -93 +90 @@
   }
 
-  function RegisterMenuItem($Link, $Title)
+  function RegisterMenuItem(string $Link, string $Title): void
   {
      $this->MainMenu[] = array('Link' => $Link, 'Title' => $Title);
   }
 
-  function RegisterPageHeader($Name, $Callback)
+  function RegisterPageHeader(string $Name, array $Callback): void
   {
     $this->PageHeaders[$Name] = $Callback;
   }
 
-  function RegisterPageBar($Name)
+  function RegisterPageBar(string $Name): void
   {
     $this->Bars[$Name] = array();
   }
 
-  function UnregisterPageBar($Name)
+  function UnregisterPageBar(string $Name): void
   {
     unset($this->Bars[$Name]);
   }
 
-  function SearchPage($PathItems, $Pages)
+  function SearchPage(array $PathItems, array $Pages): ?string
   {
     if (count($PathItems) > 0) $PathItem = $PathItems[0];
@@ -127 +124 @@
   }
 
-  function PageNotFound()
+  function PageNotFound(): string
   {
     return 'Page '.implode('/', $this->PathItems).' not found.';
   }
 
-  function ShowPage()
+  function ShowPage(): void
   {
     $this->BaseView = new BaseView($this);
 
-    /* @var $Page Page */
     $ClassName = $this->SearchPage($this->PathItems, $this->Pages);
     if ($ClassName != '')
     {
       $Page = new $ClassName($this);
-    } else {
+    } else
+    {
       $Page = new PageMissing($this);
     }
@@ -147 +144 @@
   }
 
-  function Run()
+  function Run(): void
   {
     $this->RunCommon();
@@ -157 +154 @@
   }
 
-  function RunCommon()
+  function RunCommon(): void
   {
     global $Config;
@@ -172 +169 @@
 
     $this->RegisterPageBar('Top');
-    $this->Title = 'Tanec';
-    $Output = '';
+    $this->Name = 'Tanec';
+  }
+
+  static function Cast(System $System): Core
+  {
+    if ($System instanceof Core)
+    {
+      return $System;
+    }
+    throw new Exception('Expected Core type but '.gettype($System));
   }
 }
@@ -179 +184 @@
 class PageMissing extends Page
 {
-  var $FullTitle = 'Stránka nenalezena';
-  var $ShortTitle = 'Stránka nenalezena';
-
   function __construct($System)
   {
     parent::__construct($System);
+    $this->Title = 'Stránka nenalezena';
     $this->ParentClass = 'PagePortal';
   }
 
-  function Show()
+  function Show(): string
   {
     Header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found');
@@ -202 +205 @@
   }
 
-  function Show()
+  function Show(): string
   {
     $this->RawPage = true;
@@ -214 +217 @@
 class PageSiteMap extends Page
 {
-  function Show()
+  function Show(): string
   {
     $this->RawPage = true;
@@ -265 +268 @@
 class PageLogin extends Page
 {
-  function Show()
+  function __construct($System)
+  {
+    parent::__construct($System);
+    $this->Title = 'Přihlášení';
+    $this->ParentClass = 'PagePortal';
+  }
+
+  function Show(): string
   {
     global $Config;
@@ -296 +306 @@
       $Output .= $this->ShowLoginForm();
     }
-    if ($this->System->IsAdmin()) $Output .= '<div>Jsi přihlášen jako správce. <a href="?logoff">Odhlásit</a></div>';
+    if(Core::Cast($this->System)->IsAdmin()) $Output .= '<div>Jsi přihlášen jako správce. <a href="?logoff">Odhlásit</a></div>';
     return $Output;
   }
 
-  function ShowLoginForm()
+  function ShowLoginForm(): string
   {
     return '<form method="post" action="?login">'.
-        'Heslo: <input type="password" name="password" value=""/><br/>'.
-        '<input type="submit" value="Přihlásit"/>'.
-        '</form>';
-  }
-}
-
-$Revision = 51; // Subversion revision
+      'Heslo: <input type="password" name="password" value=""/><br/>'.
+      '<input type="submit" value="Přihlásit"/>'.
+      '</form>';
+  }
+}
+
+$Revision = 63; // Subversion revision
 $DatabaseRevision = 51; // SQL structure revision
-$ReleaseTime = strtotime('2020-01-01');
-
-$Application = new ApplicationTanec();
+$ReleaseTime = strtotime('2021-08-03');
+
+$Application = new Core();
 $Application->ModuleManager->LoadModulesFromDir(dirname(__FILE__).'/Modules');
 $Application->Modules = $Application->ModuleManager->Modules;
 $Application->ModuleManager->InstallAll();
 $Application->ModuleManager->StartAll();
-$Application->RegisterPage('', 'PageDanceList');
-$Application->RegisterPage('robots.txt', 'PageRobots');
-$Application->RegisterPage('sitemap.xml', 'PageSiteMap');
-$Application->RegisterPage('admin', 'PageLogin');
+$Application->RegisterPage([''], 'PageDanceList');
+$Application->RegisterPage(['robots.txt'], 'PageRobots');
+$Application->RegisterPage(['sitemap.xml'], 'PageSiteMap');
+$Application->RegisterPage(['admin'], 'PageLogin');
 $Application->Run();

@@ -1 @@
-nbproject
-Config.php
 .settings
 .project
 .buildpath
+.htaccess