Ticket #1526: wp-atom-3406.patch

wp-includes/template-functions-general.php

@@ -82 +82 @@
-                case 'wpurl' :
-                        $output = get_settings('siteurl');
-                        break;
+                case 'atom_alternate_url':
+                        $output = get_self_link(-1);
+                        break;
+                case 'atom_self_url':
+                case 'self' :
+                        $output = get_self_link();
+                        break;
-                case 'description':
-                        $output = get_settings('blogdescription');
-                        break;

wp-includes/template-functions-links.php

@@ -175 +175 @@
-        }
-}
-
+function get_self_link($omit_feed = 0) {
+        // This function produce the "prettiest" link that returns this resource
+        // Set $omit_feed to:
+        //   -1 to force the link to not contain a feed
+        //    0 to leave the feed parameter alone
+        //    1 to force the link to contain a feed
+
+        global $wp_rewrite;
+        // NOTE: This could be refactored into 'get_self_link' and 'get_params_link'
+        //  the latter could take an array of arbitrary paramaters (like the one below)
+        $params = array(
+                's' => get_query_var('s'),
+                'pagename' => get_query_var('pagename'),
+                'author_name' => get_query_var('author_name'),
+                'author' => get_query_var('author'),
+                'category_name' => get_query_var('category_name'),
+                'cat' => get_query_var('cat'),
+                'year' => get_query_var('year'),
+                'monthnum' => get_query_var('monthnum'),
+                'day' => get_query_var('day'),
+                'hour' => get_query_var('hour'),
+                'minute' => get_query_var('minute'),
+                'second' => get_query_var('second'),
+                'name' => get_query_var('name'),
+                'p' => get_query_var('p') );
+        foreach ( $params as $key => $value ) {
+                if ( empty($value) )
+                         unset($params[$key]);
+                else
+                         $params[$key] = rawurlencode($value);
+        }
+        // feed is a special case because it can be safely combined with 
+        // various permalink types
+        $feed = rawurlencode(get_query_var('feed'));
+        switch ( $omit_feed ) {
+        case 1:
+                if ( empty($feed) )
+                        $feed = 'feed';
+                break;
+        case -1:
+                $feed = '';
+                break;
+        case 0:
+        default:
+                // do nothing
+                break;
+        }
+
+        $link = '';
+        // search, date, category, author
+        if ( $wp_rewrite->using_permalinks() ) {
+                if ( ( 1 == count($params) ) && ! empty($params['s']) ) {
+                        $link = str_replace('%search%', $params['s'], $wp_rewrite->get_search_permastruct());
+                } else if ( 2 == count($params) ) {
+                        if ( ! empty($params['cat']) && ( $params['category_name'] == get_catname($params['cat']) ) ) {
+                                $link = str_replace('%category%', $params['category_name'], $wp_rewrite->get_category_permastruct());
+                        } else if ( ! empty($params['author']) ) {
+                                $authordata = get_userdata($params['author']);
+                                $author_login = $authordata->user_login;
+                                if ( $params['author_name'] == $author_login ) {
+                                        $link = str_replace('%author%', $params['author_name'], $wp_rewrite->get_author_permastruct());
+                                }
+                        } else if ( ! empty($params['pagename']) && ( $params['pagename'] == $params['name'] ) ) {
+                                $link = str_replace('%pagename%', $params['pagename'], $wp_rewrite->get_page_permastruct());
+                        }
+                }
+                if ( '' == $link ){
+                        $is_date = false;
+                        $struct = $wp_rewrite->get_date_permastruct();
+
+                        // Note: there are only three possiblities, per WP_Reewrite
+                        $endian = array();
+                        $year_pos = strpos($struct, '%year%');
+                        $monthnum_pos = strpos($struct, '%monthnum%');
+                        $day_pos = strpos($struct, '%day%');
+                        if ( $year_pos < $monthnum_pos ) {
+                                if ( $monthnum_pos < $day_pos ) {
+                                        $endian = array('year', 'monthnum', 'day');
+                                }
+                        } else {
+                                if ( $monthnum_pos < $day_pos ) {
+                                        $endian = array('monthnum', 'day', 'year');
+                                } else {
+                                        $endian = array('day', 'monthnum', 'year');
+                                }
+                        }
+
+                        $off = 0;
+                        if ( false !== strpos($struct, '%postid%') ) {
+                                $off = 1;
+                                $is_date = empty($params['p']);
+                        } else {
+                                $is_date = true;
+                        }
+
+                        $max = count($params) - $off - 1;
+                        if ( $is_date && ( $max < 3 ) ) {
+                                $is_date = true;
+                                for ( $i = 0; $i < count($params); $i++ ) {
+                                        if ( empty($params[$endian[$i]]) ) {
+                                                $is_date = false;
+                                                break;
+                                        }
+                                }
+                        }
+
+                        if ( $is_date ) {
+                                if( ! empty($params['monthnum']) )
+                                        $params['monthnum'] = zeroise($params['monthnum'], 2);
+
+                                if( ! empty($params['day']) )
+                                        $params['day'] = zeroise($params['day'], 2);
+
+                                $link = $struct;
+                                $link = str_replace('%post_id%', $params['p'], $struct);
+                                $link = str_replace('%year%', $params['year'], $link);
+                                $link = str_replace('%monthnum%', $params['monthnum'], $link);
+                                $link = str_replace('%day%', $params['day'], $link);
+                                $link = preg_replace('#/+#', '/', $link);
+                        } else {
+                                $struct = get_settings('permalink_structure');
+
+                                // replacements for consistency
+                                $struct = str_replace('%post_id%', '%p%', $struct);
+                                $struct = str_replace('%postname%', '%name%', $struct);
+                                $struct = str_replace('%category%', '%category_name%', $struct);
+                                $struct = str_replace('%author%', '%author_name%', $struct);
+
+                                // Note: array assignment always copies
+                                $params_copy = $params;
+                                foreach ( $params_copy as $key => $value ) {
+                                        if ( false === strpos($struct, "%{$key}%") ) {
+                                                $struct = str_replace("%{$key}%", $value, $struct);
+                                                unset($params_copy[$key]);
+                                        }
+                                }
+                                // were all the parameters used?
+                                if ( empty($params_copy) ) {
+                                        $link = $struct;
+                                        $tags = array(
+                                                'p',
+                                                'title',
+                                                'category_name',
+                                                'author_name',
+                                                'year',
+                                                'monthnum',
+                                                'day',
+                                                'hour',
+                                                'minute',
+                                                'second' );
+                                        // were all tags substituted for?
+                                        foreach ( $tags as $value ) {
+                                                if ( false !== strpos($struct, "%{$value}%") ) {
+                                                        $link = '';
+                                                        break;
+                                                }
+                                        }
+                                }
+                        }
+                }
+
+                // handle feed
+                if ( ! empty($feed) ) {
+                        if ( 0 == count($params) ) {
+                                if ( ( 1 === $feed ) || ( 'feed' == $feed ) )
+                                        $feed = '';
+                                $link = str_replace('%feed%', $feed, $wp_rewrite->get_feed_permastruct());
+                        } else if ( '' != $link ) {
+                                $link = trailingslashit($link);
+                                if ( 1 === $feed )
+                                        $link .= 'feed/';
+                                else
+                                        $link = trailingslashit($link) . "feed/{$feed}/";
+                        }
+                }
+        }
+
+        $home = trailingslashit(get_settings('home'));
+        if ( '' == $link ) {
+                foreach ( $params as $key => $value ) {
+                        if ( ! empty($value) ) {
+                                $link .= "&{$key}={$value}";
+                        }
+                }
+                if ( ! empty($feed) )
+                        $link .= "&feed={$feed}";
+
+                if ( empty($link) ) {
+                        $link = $home;
+                } else {
+                        $link = "{$home}?" . substr($link, 1);
+                }
+        } else {
+                $link = trailingslashit($link);
+                $link = preg_replace('#/+#', '/', $link);
+                if ( $link{0} == '/' )
+                        $link = substr($link, 1);
+                
+                $link = $home . $link;
+        }
+        return $link;
+}
+
-function get_feed_link($feed='rss2') {
-        global $wp_rewrite;
-        $do_perma = 0;
@@ -193 +396 @@
-
-                $permalink = str_replace('%feed%', $feed, $permalink);
-                $permalink = preg_replace('#/+#', '/', "/$permalink/");
- 
+
-        } else {
-                if ( false !== strpos($feed, 'comments_') )
-                        $feed = str_replace('comments_', 'comments-', $feed);
@@ -318 +521 @@
-
-        $format = str_replace('%link', $link, $format);
-
-      
+
-}
-
-function next_post_link($format='%link &raquo;', $link='%title', $in_same_cat = false, $excluded_categories = '') {
@@ -333 +536 @@
-        $link = $string . $link . '</a>';
-        $format = str_replace('%link', $link, $format);
-
-      
+
-}
-
-

wp-includes/feed-functions.php

@@ -105 +105 @@
-                                 $link = get_author_link(0, $author_id, $author_nicename);
-                                 $link = $link . "feed/";
-       }
-
+
-                         $link = apply_filters('author_feed_link', $link);
-
-       if ($echo) echo $link;
@@ -148 +148 @@
-
-        $custom_fields = get_post_custom();
-        if( is_array( $custom_fields ) ) {
- 
+
-                        if( $key == 'enclosure' ) {
-                                if (is_array($val)) {
-                                        foreach($val as $enc) {
@@ -161 +161 @@
-        }
-}
-
+
+function atom_enclosure() {
+        global $id, $post;
+        if (!empty($post->post_password) && ($_COOKIE['wp-postpass_'.COOKIEHASH] != $post->post_password)) return;
+
+        $custom_fields = get_post_custom();
+        if( is_array( $custom_fields ) ) {
+        while( list( $key, $val ) = each( $custom_fields ) ) {
+                        if( $key == 'enclosure' ) {
+                                if (is_array($val)) {
+                                        foreach($val as $enc) {
+                                                $enclosure = split( "\n", $enc );
+                                                print "<link rel=\"enclosure\" href=\"".trim( htmlspecialchars($enclosure[ 0 ]) )."\" length=\"".trim( $enclosure[ 1 ] )."\" type=\"".trim( $enclosure[ 2 ] )."\"/>\n";
+                                        }
+                                }
+                        }
+                }
+        }
+}
-?>

wp-content/themes/classic/header.php

@@ -14 +14 @@
-
-        <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="<?php bloginfo('rss2_url'); ?>" />
-        <link rel="alternate" type="text/xml" title="RSS .92" href="<?php bloginfo('rss_url'); ?>" />
-0.3
+1.0
-        
-        <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
-    <?php wp_get_archives('type=monthly&format=link'); ?>

wp-content/themes/default/header.php

@@ -9 +9 @@
-<meta name="generator" content="WordPress <?php bloginfo('version'); ?>" /> <!-- leave this for stats -->
-
-<link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>" type="text/css" media="screen" />
+<link rel="alternate" type="application/atom+xml" title="<?php bloginfo('name'); ?> Atom Feed" href="<?php bloginfo('atom_url'); ?>" />
-<link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> RSS Feed" href="<?php bloginfo('rss2_url'); ?>" />
-<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
-

wp-atom.php

@@ -1 +1 @@
-<?php
+// Atom 1.0 feed generator for WordPress
+// Distributed under the terms of the GNU General Public License v2
-
-
-
-
+
+
+
+
+
-}
-
-header('Content-type: application/atom+xml; charset=' . get_settings('blog_charset'), true);
-$more = 1;
-
-?>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        <?php do_action('atom_head'); ?>
-        <?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?>
-        <entry>
-                <author>
-
+;
-                </author>
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-<?php if ( !get_settings('rss_use_excerpt') ) : ?>
-
+
+
+
+
+
-<?php endif; ?>
-<?php rss_enclosure(); ?>
-<?php do_action('atom_entry'); ?>
-        </entry>
-        <?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } } ?>
-
+