Changeset 62 for trunk

Timestamp:

Apr 28, 2021, 6:20:44 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Also do not show old items.

Location:

trunk/Modules

Files:

• Event/EventPage.php (modified) (1 diff)
• Meet/MeetPage.php (modified) (1 diff)

trunk/Modules/Event/EventPage.php

@@ -150 +150 @@
     $Output .= '<div class="title">Události</div>';
     $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', 'Id='.$id);
+      '(SELECT EventSource.URL FROM EventSource WHERE EventSource.Id = Event.Source) AS SourceURL, '.GetDefaultEventFilter().' AS Filter', 'Id='.$id);
     if ($DbResult->num_rows > 0)
     {
       $Event = $DbResult->fetch_assoc();
-      if (($Event['Hidden'] == '1') and !$this->System->IsAdmin())
+      if (($Event['Filter'] == '0') and !$this->System->IsAdmin())
         return 'Položka nenalezena';
       if ($Event['Link'] != '') $Link = '<a href="'.$Event['Link'].'">Odkaz</a>';

trunk/Modules/Meet/MeetPage.php

@@ -161 +161 @@
     $Gender = array('', 'Muž', 'Žena');
     $DbResult = $this->Database->select('MeetItem', '*, (SELECT MeetSource.Name FROM MeetSource WHERE MeetSource.Id = MeetItem.Source) AS SourceName, '.
-      '(SELECT MeetSource.URL FROM MeetSource WHERE MeetSource.Id = MeetItem.Source) AS SourceURL', 'Id='.$id);
+      '(SELECT MeetSource.URL FROM MeetSource WHERE MeetSource.Id = MeetItem.Source) AS SourceURL, '.GetDefaultMeetFilter().' AS Filter', 'Id='.$id);
     if ($DbResult->num_rows > 0)
     {
       $MeetItem = $DbResult->fetch_assoc();
-      if (($MeetItem['Hidden'] == '1') and !$this->System->IsAdmin())
+      if (($MeetItem['Filter'] == '0') and !$this->System->IsAdmin())
         return 'Položka nenalezena';
       if ($MeetItem['Link'] != '') $Link = '<a href="'.$MeetItem['Link'].'">Odkaz</a>';