From 30dc04e55685e03eea7f652fb95f84caddb6391f Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sat, 16 Sep 2006 05:08:09 +0000
Subject: [PATCH] r1143: Remove the whole second-type syndication stuff; we're
 Atom-only and RSS2 sounds like a hassle

---
 syndicate.php | 41 +++++++++--------------------------------
 1 file changed, 9 insertions(+), 32 deletions(-)

diff --git a/syndicate.php b/syndicate.php
index 4c4b3d3..41de1e9 100644
--- a/syndicate.php
+++ b/syndicate.php
@@ -23,16 +23,6 @@ define('NO_TEMPLATES', 1);
 
 require_once('./global.php');
 
-if (in_array($bugsys->in['type'], array('rss', 'atom')))
-{
-	define('SYND_TYPE', $bugsys->in['type']);
-}
-
-if (!defined('SYND_TYPE'))
-{
-	define('SYND_TYPE', 'atom');
-}
-
 if (!can_perform('canviewbugs'))
 {
 	$message->error_permission();
@@ -92,13 +82,11 @@ while ($bug = $db->fetch_array($bugs_fetch))
 }
 
 // ###################################################################
-// ATOM
+// generate the actual feed
 
-if (SYND_TYPE == 'atom')
-{
-	header('Content-type: application/xml');
-	
-	echo '<?xml version="1.0" encoding="utf-8"?>
+header('Content-type: application/xml');
+
+echo '<?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
 
 	<title>' . sprintf(_('%1$s Syndication Feed'), $bugsys->options['trackertitle']) . '</title>
@@ -108,9 +96,9 @@ if (SYND_TYPE == 'atom')
 	<!-- entries -->
 	';
 	
-	foreach ($buglist AS $bug)
-	{
-		echo '
+foreach ($buglist AS $bug)
+{
+	echo '
 	<entry>
 		<id>' . $bugsys->options['trackertitle'] . '/showreport.php?bugid=' . $bug['bugid'] . '</id>
 		<title>' . $bug['summary'] . '</title>
@@ -122,24 +110,13 @@ if (SYND_TYPE == 'atom')
 		<summary type="text">' . htmlspecialchars($bug['comment_parsed']) . '</summary>
 		<link rel="alternate" href="' . $bugsys->options['trackerurl'] . '/showreport.php?bugid=' . $bug['bugid'] . '"/>
 	</entry>';
-	}
+}
 	
-	echo '
+echo '
 	<!-- / entries -->
 
 </feed>';
 
-	exit;
-}
-
-// ###################################################################
-// RSS
-
-else if (SYND_TYPE == 'rss')
-{
-	// not going to be implemented in 1.1 because I don't want to clutter the templates with multiple feed icons and such...
-}
-
 /*=====================================================================*\
 || ###################################################################
 || # $HeadURL$
-- 
2.22.5