Changeset 964 for trunk/Modules/News/NewsPage.php

Timestamp:

Feb 3, 2024, 11:35:58 PM (11 months ago)

Author:

chronos

Message:

• Fixed: Correct filtering of RSS news.

File:

• trunk/Modules/News/NewsPage.php (modified) (8 diffs)

trunk/Modules/News/NewsPage.php

@@ -11 +11 @@
   }
 
-  function GetIntranetCondition(): string
-  {
-    if (IsInternetAddr()) return ' AND (`Intranet`=0)';
-      else return '';
-  }
-
   function ShowView(): string
   {
@@ -27 +21 @@
         else return $Output .= 'Položka nenalezena.';
       $DbResult = $this->Database->query('SELECT `News`.*, `User`.`Name` FROM `News` '.
-        'LEFT JOIN `User` ON `User`.`Id`=`News`.`User` WHERE (`News`.`Id`='.$Id.')'.$this->GetIntranetCondition());
+        'LEFT JOIN `User` ON `User`.`Id`=`News`.`User` WHERE (`News`.`Id`='.$Id.')'.
+        ModuleNews::Cast($this->System->GetModule('News'))->GetIntranetCondition());
       if ($DbResult->num_rows > 0)
       {
@@ -164 +159 @@
     if ($User->CheckPermission('News', 'Insert', 'Group', $Category['Id']))
     {
-      $DbResult = $this->Database->query('SELECT * FROM `News` WHERE (`Id`='.$_GET['id'].')'.$this->GetIntranetCondition());
+      $DbResult = $this->Database->query('SELECT * FROM `News` WHERE (`Id`='.$_GET['id'].')'.
+        ModuleNews::Cast($this->System->GetModule('News'))->GetIntranetCondition());
       $Row = $DbResult->fetch_assoc();
       if (($User->User['Id'] == $Row['User']))
@@ -195 +191 @@
     {
       $_POST['id'] = $_POST['id'] * 1;
-      $DbResult = $this->Database->select('News', '*', '(`Id`='.$_POST['id'].')'.$this->GetIntranetCondition());
+      $DbResult = $this->Database->select('News', '*', '(`Id`='.$_POST['id'].')'.
+        ModuleNews::Cast($this->System->GetModule('News'))->GetIntranetCondition());
       if ($DbResult->num_rows > 0)
       {
@@ -221 +218 @@
     if ($User->CheckPermission('News', 'Insert', 'Group', $Category['Id']))
     {
-      $DbResult = $this->Database->query('SELECT * FROM `News` WHERE (`Id`='.$_GET['id'].')'.$this->GetIntranetCondition());
+      $DbResult = $this->Database->query('SELECT * FROM `News` WHERE (`Id`='.$_GET['id'].')'.
+        ModuleNews::Cast($this->System->GetModule('News'))->GetIntranetCondition());
       $Row = $DbResult->fetch_assoc();
       if ($User->User['Id'] == $Row['User'])
@@ -250 +248 @@
     {
       $PerPage = 20;
-      $DbResult = $this->Database->select('News', 'COUNT(*)', '(`Category`='.$Category['Id'].')'.$this->GetIntranetCondition());
+      $DbResult = $this->Database->select('News', 'COUNT(*)', '(`Category`='.$Category['Id'].')'.
+        ModuleNews::Cast($this->System->GetModule('News'))->GetIntranetCondition());
       $RowTotal = $DbResult->fetch_array();
       $PageMax = $RowTotal[0];
@@ -259 +258 @@
 
       $DbResult = $this->Database->query('SELECT `News`.*, `User`.`Name` FROM `News` '.
-        'LEFT JOIN `User` ON `User`.`Id`=`News`.`User` WHERE (`Category`='.$Category['Id'].')'.$this->GetIntranetCondition().
+        'LEFT JOIN `User` ON `User`.`Id`=`News`.`User` WHERE (`Category`='.$Category['Id'].')'.
+        ModuleNews::Cast($this->System->GetModule('News'))->GetIntranetCondition().
         ' ORDER BY `News`.`Id` DESC LIMIT '.($Page * $PerPage).','.$PerPage);
       while ($Row = $DbResult->fetch_assoc())
@@ -466 +466 @@
 
     // Get news from database by selected categories
-    $DbResult = $this->Database->query('SELECT *, UNIX_TIMESTAMP(`Date`) AS `UnixTime` FROM `News` LEFT JOIN `User` ON `User`.`Id`=`News`.`User` WHERE '.$Where.' ORDER BY News.Date DESC LIMIT 0,'.$NewsCount);
+    $DbResult = $this->Database->query('SELECT *, UNIX_TIMESTAMP(`Date`) AS `UnixTime` FROM `News`'.
+      ' LEFT JOIN `User` ON `User`.`Id`=`News`.`User`'.
+      ' WHERE '.$Where.ModuleNews::Cast($this->System->GetModule('News'))->GetIntranetCondition().
+      ' ORDER BY News.Date DESC LIMIT 0,'.$NewsCount);
     while ($Row = $DbResult->fetch_assoc())
     {