Do not generate RSS feeds of protected archives/calendars (#2699)

contao · Feb 24, 2011 · 65d6fff · 65d6fff
1 parent 576a999
commit 65d6fff
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -10,6 +10,7 @@ Version 2.9.4 (2011-XX-XX)
 - Fixed: textual publication dates in RSS feeds were not translated (#2760)
 - Fixed: the description of the newsletter offset was wrong (#2824)
 - Fixed: remove insert tags in page names from title attributes (#2853)
+- Fixed: do not generate RSS feeds of protected archives/calendars (#2699)
 - Fixed some minor issues
 
 Version 2.9.3 (2011-01-06)

diff --git a/system/modules/calendar/Calendar.php b/system/modules/calendar/Calendar.php
@@ -65,7 +65,7 @@ public function generateFeed($intId)
 		$objCalendar->feedName = strlen($objCalendar->alias) ? $objCalendar->alias : 'calendar' . $objCalendar->id;
 
 		// Delete XML file
-		if ($this->Input->get('act') == 'delete')
+		if ($this->Input->get('act') == 'delete' || $objCalendar->protected)
 		{
 			$this->import('Files');
 			$this->Files->delete($objCalendar->feedName . '.xml');
@@ -86,7 +86,7 @@ public function generateFeed($intId)
 	public function generateFeeds()
 	{
 		$this->removeOldFeeds();
-		$objCalendar = $this->Database->execute("SELECT * FROM tl_calendar WHERE makeFeed=1");
+		$objCalendar = $this->Database->execute("SELECT * FROM tl_calendar WHERE makeFeed=1 AND protected!=1");
 
 		while ($objCalendar->next())
 		{

diff --git a/system/modules/news/News.php b/system/modules/news/News.php
@@ -58,7 +58,7 @@ public function generateFeed($intId)
 		$objArchive->feedName = strlen($objArchive->alias) ? $objArchive->alias : 'news' . $objArchive->id;
 
 		// Delete XML file
-		if ($this->Input->get('act') == 'delete')
+		if ($this->Input->get('act') == 'delete' || $objArchive->protected)
 		{
 			$this->import('Files');
 			$this->Files->delete($objArchive->feedName . '.xml');
@@ -79,7 +79,7 @@ public function generateFeed($intId)
 	public function generateFeeds()
 	{
 		$this->removeOldFeeds();
-		$objArchive = $this->Database->execute("SELECT * FROM tl_news_archive WHERE makeFeed=1");
+		$objArchive = $this->Database->execute("SELECT * FROM tl_news_archive WHERE makeFeed=1 AND protected!=1");
 
 		while ($objArchive->next())
 		{