From d0915e2322006ec13585c802e6033bba9b481a23 Mon Sep 17 00:00:00 2001
From: mikelittle <mikelittle@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 10 Nov 2003 23:32:02 +0000
Subject: [PATCH] b2rss/rdf -> wp-rss/rdf Plus old files do permanent redirect
 to the new ones.

git-svn-id: http://svn.automattic.com/wordpress/trunk@535 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 b2rdf.php  | 100 ++++-------------------------------------------------
 b2rss.php  |  86 ++++-----------------------------------------
 b2rss2.php |  97 ++++-----------------------------------------------
 wp-rdf.php |  94 +++++++++++++++++++++++++++++++++++++++++++++++++
 wp-rss.php |  80 ++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 195 insertions(+), 262 deletions(-)
 create mode 100644 wp-rdf.php
 create mode 100644 wp-rss.php

diff --git a/b2rdf.php b/b2rdf.php
index 964b6f9265..d10b52fd0a 100644
--- a/b2rdf.php
+++ b/b2rdf.php
@@ -1,94 +1,8 @@
-<?php /* RDF 1.0 generator, original version by garym@teledyn.com */
-$blog = 1; // enter your blog's ID
-$doing_rss=1;
-header('Content-type: text/xml');
-
-include('blog.header.php');
-
-// Handle Conditional GET
-
-// Get the time of the most recent article
-$sql = "SELECT max(post_date) FROM $tableposts";
-
-$maxdate = $wpdb->get_var($sql);
-
-$unixtime = strtotime($maxdate);
-
-// format timestamp for Last-Modified header
-$clast = gmdate("D, d M Y H:i:s \G\M\T",$unixtime);
-$cetag = md5($last);
-
-$slast = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
-$setag = $_SERVER['HTTP_IF_NONE_MATCH'];
-
-// send it in a Last-Modified header
-header("Last-Modified: " . $clast, true);
-header("Etag: " . $cetag, true);
-
-// compare it to aggregator's If-Modified-Since and If-None-Match headers
-// if they match, send a 304 and die
-
-// This logic says that if only one header is provided, just use that one,
-// but if both headers exist, they *both* must match up with the locally
-// generated values.
-//if (($slast?($slast == $clast):true) && ($setag?($setag == $cetag):true)){
-if (($slast && $setag)?(($slast == $clast) && ($setag == $cetag)):(($slast == $clast) || ($setag == $cetag))) { 
-	header("HTTP/1.1 304 Not Modified");
-	echo "\r\n\r\n";
-	exit;
-}
-
-add_filter('the_content', 'trim');
-if (!isset($rss_language)) { $rss_language = 'en'; }
-?>
-<?php echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?".">"; ?>
-<!-- generator="wordpress/<?php echo $b2_version ?>" -->
-<rdf:RDF
-	xmlns="http://purl.org/rss/1.0/"
-	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-	xmlns:dc="http://purl.org/dc/elements/1.1/"
-	xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
-	xmlns:admin="http://webns.net/mvcb/"
-	xmlns:content="http://purl.org/rss/1.0/modules/content/"
->
-<channel rdf:about="<?php bloginfo_rss("url") ?>">
-	<title><?php bloginfo_rss('name') ?></title>
-	<link><?php bloginfo_rss('url') ?></link>
-	<description><?php bloginfo_rss('description') ?></description>
-	<dc:language><?php echo $rss_language ?></dc:language>
-	<dc:date><?php echo gmdate('Y-m-d\TH:i:s'); ?></dc:date>
-	<dc:creator><?php echo antispambot($admin_email) ?></dc:creator>
-	<admin:generatorAgent rdf:resource="http://wordpress.org/?v=<?php echo $b2_version ?>"/>
-	<admin:errorReportsTo rdf:resource="mailto:<?php echo antispambot($admin_email) ?>"/>
-	<sy:updatePeriod>hourly</sy:updatePeriod>
-	<sy:updateFrequency>1</sy:updateFrequency>
-	<sy:updateBase>2000-01-01T12:00+00:00</sy:updateBase>
-	<items>
-		<rdf:Seq>
-		<?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_b2(); ?>
-			<rdf:li rdf:resource="<?php permalink_single_rss() ?>"/>
-		<?php $b2_items[] = $row; $items_count++; if (($items_count == $posts_per_rss) && empty($m)) { break; } } } ?>
-		</rdf:Seq>
-	</items>
-</channel>
-<?php if ($posts) { foreach ($posts as $post) { start_b2(); ?>
-<item rdf:about="<?php permalink_single_rss() ?>">
-	<title><?php the_title_rss() ?></title>
-	<link><?php permalink_single_rss() ?></link>
-	<dc:date><?php the_time('Y-m-d\TH:i:s'); ?></dc:date>
-	<dc:creator><?php the_author() ?> (mailto:<?php the_author_email() ?>)</dc:creator>
-	<dc:subject><?php the_category_rss() ?></dc:subject>
-<?php $more = 1; if ($rss_use_excerpt) {
-?>
-	<description><?php the_excerpt_rss($rss_excerpt_length, 2) ?></description>
 <?php
-} else { // use content
-?>
-	<description><?php the_content_rss('', 0, '', $rss_excerpt_length, 2) ?></description>
-<?php
-} // end else use content
-?>
-	<content:encoded><![CDATA[<?php the_content('', 0, '') ?>]]></content:encoded>
-</item>
-<?php } }  ?>
-</rdf:RDF>
\ No newline at end of file
+$curpath = dirname(__FILE__).'/';
+require_once ($curpath.'wp-config.php');
+require_once ($curpath.$b2inc.'/b2template.functions.php');
+header('HTTP/1.0 301 Moved Permanently');
+header('Location: ' . get_bloginfo('rdf_url') . "\n");
+exit;
+?>
\ No newline at end of file
diff --git a/b2rss.php b/b2rss.php
index 3f884c3303..6baee181dd 100644
--- a/b2rss.php
+++ b/b2rss.php
@@ -1,80 +1,8 @@
-<?php /* These first lines are the first part of a CaféLog template.
-         In every template you do, you got to copy them before the CaféLog 'loop' */
-$blog = 1; // enter your blog's ID
-$doing_rss=1;
-header('Content-type: text/xml',true);
-include('blog.header.php');
-
-// Handle Conditional GET
-
-// Get the time of the most recent article
-$sql = "SELECT max(post_date) FROM $tableposts";
-
-$maxdate = $wpdb->get_var($sql);
-
-$unixtime = strtotime($maxdate);
-
-// format timestamp for Last-Modified header
-$clast = gmdate("D, d M Y H:i:s \G\M\T",$unixtime);
-$cetag = md5($last);
-
-$slast = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
-$setag = $_SERVER['HTTP_IF_NONE_MATCH'];
-
-// send it in a Last-Modified header
-header("Last-Modified: " . $clast, true);
-header("Etag: " . $cetag, true);
-
-// compare it to aggregator's If-Modified-Since and If-None-Match headers
-// if they match, send a 304 and die
-
-// This logic says that if only one header is provided, just use that one,
-// but if both headers exist, they *both* must match up with the locally
-// generated values.
-//if (($slast?($slast == $clast):true) && ($setag?($setag == $cetag):true)){
-if (($slast && $setag)?(($slast == $clast) && ($setag == $cetag)):(($slast == $clast) || ($setag == $cetag))) { 
-	header("HTTP/1.1 304 Not Modified");
-	echo "\r\n\r\n";
-	exit;
-}
-
-if (!isset($rss_language)) { $rss_language = 'en'; }
-if (!isset($rss_encoded_html)) { $rss_encoded_html = 0; }
-if (!isset($rss_excerpt_length) || ($rss_encoded_html == 1)) { $rss_excerpt_length = 0; }
-?>
-<?php echo "<?xml version=\"1.0\"?".">"; ?>
-<!-- generator="wordpress/<?php echo $b2_version ?>" -->
-<rss version="0.92">
-    <channel>
-        <title><?php bloginfo_rss("name") ?></title>
-        <link><?php bloginfo_rss("url") ?></link>
-        <description><?php bloginfo_rss("description") ?></description>
-        <lastBuildDate><?php echo gmdate("D, d M Y H:i:s"); ?> GMT</lastBuildDate>
-        <docs>http://backend.userland.com/rss092</docs>
-        <managingEditor><?php echo antispambot($admin_email) ?></managingEditor>
-        <webMaster><?php echo antispambot($admin_email) ?></webMaster>
-        <language><?php echo $rss_language ?></language>
-
-<?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_b2(); ?>
-        <item>
-            <title><?php the_title_rss() ?></title>
 <?php
-// we might use this in the future, but not now, that's why it's commented in PHP
-// so that it doesn't appear at all in the RSS
-//          echo "<category>"; the_category_unicode(); echo "</category>";
-$more = 1; 
-if ($rss_use_excerpt) {
-?>
-            <description><?php the_excerpt_rss($rss_excerpt_length, $rss_encoded_html) ?></description>
-<?php
-} else { // use content
-?>
-            <description><?php the_content_rss('', 0, '', $rss_excerpt_length, $rss_encoded_html) ?></description>
-<?php
-} // end else use content
-?>
-            <link><?php permalink_single_rss() ?></link>
-        </item>
-<?php $items_count++; if (($items_count == $posts_per_rss) && empty($m)) { break; } } } ?>
-    </channel>
-</rss>
\ No newline at end of file
+$curpath = dirname(__FILE__).'/';
+require_once ($curpath.'wp-config.php');
+require_once ($curpath.$b2inc.'/b2template.functions.php');
+header('HTTP/1.0 301 Moved Permanently');
+header('Location: ' . get_bloginfo('rss_url') . "\n");
+exit;
+?>
\ No newline at end of file
diff --git a/b2rss2.php b/b2rss2.php
index f4b0a5155c..b10f1f0de3 100644
--- a/b2rss2.php
+++ b/b2rss2.php
@@ -1,91 +1,8 @@
-<?php /* These first lines are the first part of a WordPress template.
-		   In every template you do, you got to copy them before the CafeLog 'loop' */
-$blog=1; // enter your blog's ID
-$doing_rss=1;
-header('Content-type: text/xml');
-
-include('blog.header.php');
-
-// Handle Conditional GET
-
-// Get the time of the most recent article
-$sql = "SELECT max(post_date) FROM $tableposts";
-
-$maxdate = $wpdb->get_var($sql);
-
-$unixtime = strtotime($maxdate);
-
-// format timestamp for Last-Modified header
-$clast = gmdate("D, d M Y H:i:s \G\M\T",$unixtime);
-$cetag = md5($last);
-
-$slast = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
-$setag = $_SERVER['HTTP_IF_NONE_MATCH'];
-
-// send it in a Last-Modified header
-header("Last-Modified: " . $clast, true);
-header("Etag: " . $cetag, true);
-
-// compare it to aggregator's If-Modified-Since and If-None-Match headers
-// if they match, send a 304 and die
-
-// This logic says that if only one header is provided, just use that one,
-// but if both headers exist, they *both* must match up with the locally
-// generated values.
-//if (($slast?($slast == $clast):true) && ($setag?($setag == $cetag):true)){
-if (($slast && $setag)?(($slast == $clast) && ($setag == $cetag)):(($slast == $clast) || ($setag == $cetag))) { 
-	header("HTTP/1.1 304 Not Modified");
-	echo "\r\n\r\n";
-	exit;
-}
-
-if (!isset($rss_language)) { $rss_language = 'en'; }
-if (!isset($rss_encoded_html)) { $rss_encoded_html = 0; }
-if (!isset($rss_excerpt_length) || ($rss_encoded_html == 1)) { $rss_excerpt_length = 0; }
-?>
-<?php echo "<?xml version=\"1.0\"?".">"; ?>
-<!-- generator="wordpress/<?php echo $b2_version ?>" -->
-<rss version="2.0" 
-	xmlns:dc="http://purl.org/dc/elements/1.1/"
-	xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
-	xmlns:admin="http://webns.net/mvcb/"
-	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-	xmlns:content="http://purl.org/rss/1.0/modules/content/">
-
-<channel>
-	<title><?php bloginfo_rss("name") ?></title>
-	<link><?php bloginfo_rss("url") ?></link>
-	<description><?php bloginfo_rss("description") ?></description>
-	<dc:language><?php echo $rss_language ?></dc:language>
-	<dc:creator><?php echo antispambot($admin_email) ?></dc:creator>
-	<dc:rights>Copyright <?php echo mysql2date('Y', get_lastpostdate()); ?></dc:rights>
-	<dc:date><?php echo gmdate('Y-m-d\TH:i:s'); ?></dc:date>
-	<admin:generatorAgent rdf:resource="http://wordpress.org/?v=<?php echo $b2_version ?>"/>
-	<admin:errorReportsTo rdf:resource="mailto:<?php echo antispambot($admin_email) ?>"/>
-	<sy:updatePeriod>hourly</sy:updatePeriod>
-	<sy:updateFrequency>1</sy:updateFrequency>
-	<sy:updateBase>2000-01-01T12:00+00:00</sy:updateBase>
-
-	<?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_b2(); ?>
-	<item rdf:about="<?php permalink_single_rss() ?>">
-		<title><?php the_title_rss() ?></title>
-		<link><?php permalink_single_rss() ?></link>
-		<dc:date><?php the_time('Y-m-d\TH:i:s'); ?></dc:date>
-		<dc:creator><?php the_author() ?> (mailto:<?php the_author_email() ?>)</dc:creator>
-		<dc:subject><?php the_category_rss() ?></dc:subject>
-		<guid isPermaLink="false"><?php echo $id; ?>@<?php bloginfo_rss("url") ?></guid>
-<?php $more = 1; if ($rss_use_excerpt) {
-?>
-		<description><?php the_excerpt_rss($rss_excerpt_length, 2) ?></description>
 <?php
-} else { // use content
-?>
-		<description><?php the_content_rss('', 0, '', $rss_excerpt_length, 2) ?></description>
-<?php
-} // end else use content
-?>
-		<content:encoded><![CDATA[<?php the_content('', 0, '') ?>]]></content:encoded>
-	</item>
-	<?php $items_count++; if (($items_count == $posts_per_rss) && empty($m)) { break; } } } ?>
-</channel>
-</rss>
\ No newline at end of file
+$curpath = dirname(__FILE__).'/';
+require_once ($curpath.'wp-config.php');
+require_once ($curpath.$b2inc.'/b2template.functions.php');
+header('HTTP/1.0 301 Moved Permanently');
+header('Location: ' . get_bloginfo('rss2_url') . "\n");
+exit;
+?>
\ No newline at end of file
diff --git a/wp-rdf.php b/wp-rdf.php
new file mode 100644
index 0000000000..964b6f9265
--- /dev/null
+++ b/wp-rdf.php
@@ -0,0 +1,94 @@
+<?php /* RDF 1.0 generator, original version by garym@teledyn.com */
+$blog = 1; // enter your blog's ID
+$doing_rss=1;
+header('Content-type: text/xml');
+
+include('blog.header.php');
+
+// Handle Conditional GET
+
+// Get the time of the most recent article
+$sql = "SELECT max(post_date) FROM $tableposts";
+
+$maxdate = $wpdb->get_var($sql);
+
+$unixtime = strtotime($maxdate);
+
+// format timestamp for Last-Modified header
+$clast = gmdate("D, d M Y H:i:s \G\M\T",$unixtime);
+$cetag = md5($last);
+
+$slast = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
+$setag = $_SERVER['HTTP_IF_NONE_MATCH'];
+
+// send it in a Last-Modified header
+header("Last-Modified: " . $clast, true);
+header("Etag: " . $cetag, true);
+
+// compare it to aggregator's If-Modified-Since and If-None-Match headers
+// if they match, send a 304 and die
+
+// This logic says that if only one header is provided, just use that one,
+// but if both headers exist, they *both* must match up with the locally
+// generated values.
+//if (($slast?($slast == $clast):true) && ($setag?($setag == $cetag):true)){
+if (($slast && $setag)?(($slast == $clast) && ($setag == $cetag)):(($slast == $clast) || ($setag == $cetag))) { 
+	header("HTTP/1.1 304 Not Modified");
+	echo "\r\n\r\n";
+	exit;
+}
+
+add_filter('the_content', 'trim');
+if (!isset($rss_language)) { $rss_language = 'en'; }
+?>
+<?php echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?".">"; ?>
+<!-- generator="wordpress/<?php echo $b2_version ?>" -->
+<rdf:RDF
+	xmlns="http://purl.org/rss/1.0/"
+	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
+	xmlns:admin="http://webns.net/mvcb/"
+	xmlns:content="http://purl.org/rss/1.0/modules/content/"
+>
+<channel rdf:about="<?php bloginfo_rss("url") ?>">
+	<title><?php bloginfo_rss('name') ?></title>
+	<link><?php bloginfo_rss('url') ?></link>
+	<description><?php bloginfo_rss('description') ?></description>
+	<dc:language><?php echo $rss_language ?></dc:language>
+	<dc:date><?php echo gmdate('Y-m-d\TH:i:s'); ?></dc:date>
+	<dc:creator><?php echo antispambot($admin_email) ?></dc:creator>
+	<admin:generatorAgent rdf:resource="http://wordpress.org/?v=<?php echo $b2_version ?>"/>
+	<admin:errorReportsTo rdf:resource="mailto:<?php echo antispambot($admin_email) ?>"/>
+	<sy:updatePeriod>hourly</sy:updatePeriod>
+	<sy:updateFrequency>1</sy:updateFrequency>
+	<sy:updateBase>2000-01-01T12:00+00:00</sy:updateBase>
+	<items>
+		<rdf:Seq>
+		<?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_b2(); ?>
+			<rdf:li rdf:resource="<?php permalink_single_rss() ?>"/>
+		<?php $b2_items[] = $row; $items_count++; if (($items_count == $posts_per_rss) && empty($m)) { break; } } } ?>
+		</rdf:Seq>
+	</items>
+</channel>
+<?php if ($posts) { foreach ($posts as $post) { start_b2(); ?>
+<item rdf:about="<?php permalink_single_rss() ?>">
+	<title><?php the_title_rss() ?></title>
+	<link><?php permalink_single_rss() ?></link>
+	<dc:date><?php the_time('Y-m-d\TH:i:s'); ?></dc:date>
+	<dc:creator><?php the_author() ?> (mailto:<?php the_author_email() ?>)</dc:creator>
+	<dc:subject><?php the_category_rss() ?></dc:subject>
+<?php $more = 1; if ($rss_use_excerpt) {
+?>
+	<description><?php the_excerpt_rss($rss_excerpt_length, 2) ?></description>
+<?php
+} else { // use content
+?>
+	<description><?php the_content_rss('', 0, '', $rss_excerpt_length, 2) ?></description>
+<?php
+} // end else use content
+?>
+	<content:encoded><![CDATA[<?php the_content('', 0, '') ?>]]></content:encoded>
+</item>
+<?php } }  ?>
+</rdf:RDF>
\ No newline at end of file
diff --git a/wp-rss.php b/wp-rss.php
new file mode 100644
index 0000000000..7e87e46aa2
--- /dev/null
+++ b/wp-rss.php
@@ -0,0 +1,80 @@
+<?php /* These first lines are the first part of a CafeLog template.
+         In every template you do, you got to copy them before the CafeLog 'loop' */
+$blog = 1; // enter your blog's ID
+$doing_rss=1;
+header('Content-type: text/xml',true);
+include('blog.header.php');
+
+// Handle Conditional GET
+
+// Get the time of the most recent article
+$sql = "SELECT max(post_date) FROM $tableposts";
+
+$maxdate = $wpdb->get_var($sql);
+
+$unixtime = strtotime($maxdate);
+
+// format timestamp for Last-Modified header
+$clast = gmdate("D, d M Y H:i:s \G\M\T",$unixtime);
+$cetag = md5($last);
+
+$slast = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
+$setag = $_SERVER['HTTP_IF_NONE_MATCH'];
+
+// send it in a Last-Modified header
+header("Last-Modified: " . $clast, true);
+header("Etag: " . $cetag, true);
+
+// compare it to aggregator's If-Modified-Since and If-None-Match headers
+// if they match, send a 304 and die
+
+// This logic says that if only one header is provided, just use that one,
+// but if both headers exist, they *both* must match up with the locally
+// generated values.
+//if (($slast?($slast == $clast):true) && ($setag?($setag == $cetag):true)){
+if (($slast && $setag)?(($slast == $clast) && ($setag == $cetag)):(($slast == $clast) || ($setag == $cetag))) { 
+	header("HTTP/1.1 304 Not Modified");
+	echo "\r\n\r\n";
+	exit;
+}
+
+if (!isset($rss_language)) { $rss_language = 'en'; }
+if (!isset($rss_encoded_html)) { $rss_encoded_html = 0; }
+if (!isset($rss_excerpt_length) || ($rss_encoded_html == 1)) { $rss_excerpt_length = 0; }
+?>
+<?php echo "<?xml version=\"1.0\"?".">"; ?>
+<!-- generator="wordpress/<?php echo $b2_version ?>" -->
+<rss version="0.92">
+    <channel>
+        <title><?php bloginfo_rss("name") ?></title>
+        <link><?php bloginfo_rss("url") ?></link>
+        <description><?php bloginfo_rss("description") ?></description>
+        <lastBuildDate><?php echo gmdate("D, d M Y H:i:s"); ?> GMT</lastBuildDate>
+        <docs>http://backend.userland.com/rss092</docs>
+        <managingEditor><?php echo antispambot($admin_email) ?></managingEditor>
+        <webMaster><?php echo antispambot($admin_email) ?></webMaster>
+        <language><?php echo $rss_language ?></language>
+
+<?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_b2(); ?>
+        <item>
+            <title><?php the_title_rss() ?></title>
+<?php
+// we might use this in the future, but not now, that's why it's commented in PHP
+// so that it doesn't appear at all in the RSS
+//          echo "<category>"; the_category_unicode(); echo "</category>";
+$more = 1; 
+if ($rss_use_excerpt) {
+?>
+            <description><?php the_excerpt_rss($rss_excerpt_length, $rss_encoded_html) ?></description>
+<?php
+} else { // use content
+?>
+            <description><?php the_content_rss('', 0, '', $rss_excerpt_length, $rss_encoded_html) ?></description>
+<?php
+} // end else use content
+?>
+            <link><?php permalink_single_rss() ?></link>
+        </item>
+<?php $items_count++; if (($items_count == $posts_per_rss) && empty($m)) { break; } } } ?>
+    </channel>
+</rss>
\ No newline at end of file