Changeset 61 for trunk/Modules/Event

Timestamp:

Apr 28, 2021, 6:11:27 PM (4 years ago)

Author:

chronos

Message:

• Modified: Limit display of meet and event to defined time interval.

Location:

trunk/Modules/Event

Files:

• Event.php (modified) (1 diff)
• EventPage.php (modified) (3 diffs)

trunk/Modules/Event/Event.php

@@ -2 +2 @@
 
 include_once(dirname(__FILE__).'/Import/JoeClub.php');
+
+function GetDefaultEventFilter($Table = '')
+{
+  global $Config;
+
+  if ($Table != '') $Table = $Table.'.';
+
+  return '('.$Table.'Hidden=0) AND ('.$Table.'TimeFrom > "'.TimeToMysqlDateTime(time() - $Config['EventInterval']).'")';
+}
 
 function ReduceSpaces($Content)

trunk/Modules/Event/EventPage.php

@@ -57 +57 @@
 
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM (SELECT *, '.
-      '(SELECT EventSource.Name FROM EventSource WHERE EventSource.Id = Event.Source) AS SourceName FROM `Event`) AS T WHERE (T.Hidden=0) AND '.$Where);
+      '(SELECT EventSource.Name FROM EventSource WHERE EventSource.Id = Event.Source) AS SourceName FROM `Event`) AS T WHERE '.GetDefaultEventFilter('T').' AND '.$Where);
     $DbRow = $DbResult->fetch_row();
     $PageList = GetPageList($DbRow[0]);
@@ -77 +77 @@
     $Output .= $Order['Output'];
     $DbResult = $this->Database->query('SELECT * FROM (SELECT *, (SELECT EventSource.Name FROM EventSource WHERE EventSource.Id = Event.Source) AS SourceName, '.
-      '(SELECT EventSource.URL FROM EventSource WHERE EventSource.Id = Event.Source) AS SourceURL FROM Event) AS T WHERE (T.Hidden=0) AND '.
+      '(SELECT EventSource.URL FROM EventSource WHERE EventSource.Id = Event.Source) AS SourceURL FROM Event) AS T WHERE '.GetDefaultEventFilter('T').' AND '.
       $Where.$Order['SQL'].$PageList['SQLLimit']);
     while ($Event = $DbResult->fetch_assoc())
@@ -198 +198 @@
 
     $DbResult = $this->Database->select('Event', '*, (SELECT EventSource.Name FROM EventSource WHERE EventSource.Id = Event.Source) AS SourceName, '.
-      '(SELECT EventSource.URL FROM EventSource WHERE EventSource.Id = Event.Source) AS SourceURL', '`Hidden`=0 ORDER BY `TimeFrom` DESC LIMIT 30');
+      '(SELECT EventSource.URL FROM EventSource WHERE EventSource.Id = Event.Source) AS SourceURL', GetDefaultEventFilter().' ORDER BY `TimeFrom` DESC LIMIT 30');
     while ($Event = $DbResult->fetch_assoc())
     {