Changeset 63 for trunk/Modules/Event

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)
• Modules/Event/Event.php (modified) (7 diffs)
• Modules/Event/EventPage.php (modified) (10 diffs)
• Modules/Event/Import/JoeClub.php (modified) (1 diff)

trunk

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

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

trunk/Modules/Event/Event.php

@@ -3 +3 @@
 include_once(dirname(__FILE__).'/Import/JoeClub.php');
 
-function GetDefaultEventFilter($Table = '')
+function GetDefaultEventFilter(string $Table = ''): string
 {
   global $Config;
@@ -9 +9 @@
   if ($Table != '') $Table = $Table.'.';
 
-  return '('.$Table.'Hidden=0) AND ('.$Table.'TimeFrom > "'.TimeToMysqlDateTime(time() - $Config['EventInterval']).'")';
+  return '('.$Table.'Hidden=0) AND ('.$Table.'TimeFrom > "'.TimeToMysqlDateTime(time() - (int)$Config['EventInterval']).'")';
 }
 
-function ReduceSpaces($Content)
+function ReduceSpaces(string $Content): string
 {
   while (strpos($Content, '  ') !== false) $Content = str_replace('  ', ' ', $Content);
@@ -18 +18 @@
 }
 
-function RemoveLines($Content)
+function RemoveLines(string $Content): string
 {
   while (strpos($Content, "\n") !== false) $Content = str_replace("\n", ' ', $Content);
@@ -24 +24 @@
 }
 
-function RemoveTabs($Content)
+function RemoveTabs(string $Content): string
 {
   while (strpos($Content, "\t") !== false) $Content = str_replace("\t", '', $Content);
@@ -34 +34 @@
   public $Database;
 
-  function Parse($Id = null)
+  function Parse(int $Id = null): string
   {
     $Output = '';
@@ -73 +73 @@
   }
 
-  function Import()
+  function Import(): string
   {
     $this->AddedCount = 0;
@@ -99 +99 @@
   var $Price = 0;
 
-  function AddIfNotExist($TimeInterval = 0, $CompareTime = true, $CompareRemoteId = false)
+  function AddIfNotExist(int $TimeInterval = 0, bool $CompareTime = true, bool $CompareRemoteId = false): int
   {
     $Where = '(`Description` = "'.$this->Database->real_escape_string($this->Description).'") AND '.

trunk/Modules/Event/EventPage.php

@@ -1 +1 @@
 <?php
 
-class ModuleEvent extends AppModule
+class ModuleEvent extends Module
 {
   function __construct($System)
@@ -15 +15 @@
   }
 
-  function Start()
-  {
-    $this->System->RegisterPage('udalosti', 'PageEventList');
-    $this->System->RegisterPage(array('udalosti', 'udalost'), 'PageEventItem');
-    $this->System->RegisterPage(array('udalosti', 'aktualizace'), 'PageEventUpdate');
-    $this->System->RegisterPage(array('udalosti', 'rss'), 'PageEventRss');
-    $this->System->RegisterMenuItem('/udalosti', 'Události');
+  function Start(): void
+  {
+    $this->System->RegisterPage(['udalosti'], 'PageEventList');
+    $this->System->RegisterPage(['udalosti', 'udalost'], 'PageEventItem');
+    $this->System->RegisterPage(['udalosti', 'aktualizace'], 'PageEventUpdate');
+    $this->System->RegisterPage(['udalosti', 'rss'], 'PageEventRss');
+    Core::Cast($this->System)->RegisterMenuItem('/udalosti', 'Události');
   }
 }
@@ -30 +30 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Taneční události';
-    $this->ShortTitle = 'Události';
-  }
-
-  function Show()
+    $this->Title = 'Události';
+    $this->Description = 'Taneční události';
+  }
+
+  function Show(): string
   {
     $Filter = new Filter();
@@ -47 +47 @@
 
     $Output = '';
-    $this->Title = 'Události - '.$this->Title;
     if (array_key_exists('lvm', $_GET) and ($_GET['lvm'] == 'seznam'))
       $this->RawPage = true;
@@ -111 +110 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Aktualizace tanečních událostí';
-    $this->ShortTitle = 'Aktualizace událostí';
-  }
-
-  function Show()
+    $this->Title = 'Aktualizace událostí';
+    $this->Description = 'Aktualizace tanečních událostí';
+  }
+
+  function Show(): string
   {
     $EventSources = new EventSources();
@@ -130 +129 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Taneční událost';
-    $this->ShortTitle = 'Událost';
-  }
-
-  function Show()
-  {
-    $this->Title = 'Událost - Události - '.$this->Title;
+    $this->Title = 'Událost';
+    $this->Description = 'Taneční událost';
+  }
+
+  function Show(): string
+  {
     $Output = '';
     if (count($this->System->PathItems) > 2)
@@ -142 +140 @@
       $id = $this->System->PathItems[2] * 1;
     } else return 'Položka nenalezena';
-    if ($this->System->IsAdmin())
+    if (Core::Cast($this->System)->IsAdmin())
     {
       if (array_key_exists('hide', $_GET)) $this->Database->update('Event', 'Id='.$id, array('Hidden' => 1));
@@ -154 +152 @@
     {
       $Event = $DbResult->fetch_assoc();
-      if (($Event['Filter'] == '0') and !$this->System->IsAdmin())
+      if (($Event['Filter'] == '0') and !Core::Cast($this->System)->IsAdmin())
         return 'Položka nenalezena';
       if ($Event['Link'] != '') $Link = '<a href="'.$Event['Link'].'">Odkaz</a>';
@@ -168 +166 @@
         '<tr><th>Zdroj importu</th><td><a href="'.$Event['SourceURL'].'">'.$Event['SourceName'].'</a></td></tr>';
       $Output .= '</table>';
-      if ($this->System->IsAdmin()) {
+      if (Core::Cast($this->System)->IsAdmin()) {
         if ($Event['Hidden'] == '1')
           $Output .= '<div>Skrytá položka <a href="?unhide">Zviditelnit</a></div>';
@@ -183 +181 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'RSS kanál tanečních událostí';
-    $this->ShortTitle = 'RSS taneční událostí';
-  }
-
-  function Show()
+    $this->Title = 'RSS tanečních událostí';
+    $this->Description = 'RSS kanál tanečních událostí';
+  }
+
+  function Show(): string
   {
     global $Config;

trunk/Modules/Event/Import/JoeClub.php

@@ -3 +3 @@
 class EventSourceJoeClub extends EventSource
 {
-  function ImportInternal()
+  function ImportInternal(): string
   {
     $Output = '';

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