Wordpress 2.9

[autoinstalls/wordpress.git] / wp-admin / import / rss.php

diff --git a/wp-admin/import/rss.php b/wp-admin/import/rss.php
index e4a81673df676a6b6a54dc331efb9e32a597b19f..0e0928cc49fc1e8326d4df39f1e4ec72e9c28eab 100644 (file)
--- a/wp-admin/import/rss.php
+++ b/wp-admin/import/rss.php
@@ -1,5 +1,20 @@
 <?php
 <?php

-
+/**
+ * RSS Importer
+ *
+ * @package WordPress
+ * @subpackage Importer
+ */
+
+/**
+ * RSS Importer
+ *
+ * Will process a RSS feed for importing posts into WordPress. This is a very
+ * limited importer and should only be used as the last resort, when no other
+ * importer is available.
+ *
+ * @since unknown
+ */

 class RSS_Import {
 
        var $posts = array ();
 class RSS_Import {
 
        var $posts = array ();


@@ -7,6 +22,7 @@ class RSS_Import {
 
        function header() {
                echo '<div class="wrap">';
 
        function header() {
                echo '<div class="wrap">';

+               screen_icon();

                echo '<h2>'.__('Import RSS').'</h2>';
        }
 
                echo '<h2>'.__('Import RSS').'</h2>';
        }
 


@@ -19,15 +35,21 @@ class RSS_Import {
                $trans_tbl = array_flip($trans_tbl);
                return strtr($string, $trans_tbl);
        }
                $trans_tbl = array_flip($trans_tbl);
                return strtr($string, $trans_tbl);
        }

-       
+

        function greet() {
        function greet() {

-               echo '<p>'.__('Howdy! This importer allows you to extract posts from any RSS 2.0 file into your blog. This is useful if you want to import your posts from a system that is not handled by a custom import tool. Pick an RSS file to upload and click Import.').'</p>';
+               echo '<div class="narrow">';
+               echo '<p>'.__('Howdy! This importer allows you to extract posts from an RSS 2.0 file into your blog. This is useful if you want to import your posts from a system that is not handled by a custom import tool. Pick an RSS file to upload and click Import.').'</p>';

                wp_import_upload_form("admin.php?import=rss&amp;step=1");
                wp_import_upload_form("admin.php?import=rss&amp;step=1");

+               echo '</div>';
+       }
+
+       function _normalize_tag( $matches ) {
+               return '<' . strtolower( $matches[1] );

        }
 
        function get_posts() {
                global $wpdb;
        }
 
        function get_posts() {
                global $wpdb;

-               
+

                set_magic_quotes_runtime(0);
                $datalines = file($this->file); // Read the file into an array
                $importdata = implode('', $datalines); // squish it
                set_magic_quotes_runtime(0);
                $datalines = file($this->file); // Read the file into an array
                $importdata = implode('', $datalines); // squish it


@@ -38,21 +60,22 @@ class RSS_Import {
                $index = 0;
                foreach ($this->posts as $post) {
                        preg_match('|<title>(.*?)</title>|is', $post, $post_title);
                $index = 0;
                foreach ($this->posts as $post) {
                        preg_match('|<title>(.*?)</title>|is', $post, $post_title);

-                       $post_title = $wpdb->escape(trim($post_title[1]));
+                       $post_title = str_replace(array('<![CDATA[', ']]>'), '', $wpdb->escape( trim($post_title[1]) ));

 
 

-                       preg_match('|<pubdate>(.*?)</pubdate>|is', $post, $post_date);
+                       preg_match('|<pubdate>(.*?)</pubdate>|is', $post, $post_date_gmt);

 
 

-                       if ($post_date) {
-                               $post_date = strtotime($post_date[1]);
+                       if ($post_date_gmt) {
+                               $post_date_gmt = strtotime($post_date_gmt[1]);

                        } else {
                                // if we don't already have something from pubDate
                        } else {
                                // if we don't already have something from pubDate

-                               preg_match('|<dc:date>(.*?)</dc:date>|is', $post, $post_date);
-                               $post_date = preg_replace('|([-+])([0-9]+):([0-9]+)$|', '\1\2\3', $post_date[1]);
-                               $post_date = str_replace('T', ' ', $post_date);
-                               $post_date = strtotime($post_date);
+                               preg_match('|<dc:date>(.*?)</dc:date>|is', $post, $post_date_gmt);
+                               $post_date_gmt = preg_replace('|([-+])([0-9]+):([0-9]+)$|', '\1\2\3', $post_date_gmt[1]);
+                               $post_date_gmt = str_replace('T', ' ', $post_date_gmt);
+                               $post_date_gmt = strtotime($post_date_gmt);

                        }
 
                        }
 

-                       $post_date = gmdate('Y-m-d H:i:s', $post_date);
+                       $post_date_gmt = gmdate('Y-m-d H:i:s', $post_date_gmt);
+                       $post_date = get_date_from_gmt( $post_date_gmt );

 
                        preg_match_all('|<category>(.*?)</category>|is', $post, $categories);
                        $categories = $categories[1];
 
                        preg_match_all('|<category>(.*?)</category>|is', $post, $categories);
                        $categories = $categories[1];


@@ -68,7 +91,7 @@ class RSS_Import {
                                $cat_index++;
                        }
 
                                $cat_index++;
                        }
 

-                       preg_match('|<guid.+?>(.*?)</guid>|is', $post, $guid);
+                       preg_match('|<guid.*?>(.*?)</guid>|is', $post, $guid);

                        if ($guid)
                                $guid = $wpdb->escape(trim($guid[1]));
                        else
                        if ($guid)
                                $guid = $wpdb->escape(trim($guid[1]));
                        else


@@ -84,13 +107,13 @@ class RSS_Import {
                        }
 
                        // Clean up content
                        }
 
                        // Clean up content

-                       $post_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_content);
+                       $post_content = preg_replace_callback('|<(/?[A-Z]+)|', array( &$this, '_normalize_tag' ), $post_content);

                        $post_content = str_replace('<br>', '<br />', $post_content);
                        $post_content = str_replace('<hr>', '<hr />', $post_content);
 
                        $post_author = 1;
                        $post_status = 'publish';
                        $post_content = str_replace('<br>', '<br />', $post_content);
                        $post_content = str_replace('<hr>', '<hr />', $post_content);
 
                        $post_author = 1;
                        $post_status = 'publish';

-                       $this->posts[$index] = compact('post_author', 'post_date', 'post_content', 'post_title', 'post_status', 'guid', 'categories');
+                       $this->posts[$index] = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_status', 'guid', 'categories');

                        $index++;
                }
        }
                        $index++;
                }
        }


@@ -107,8 +130,10 @@ class RSS_Import {
                                _e('Post already imported');
                        } else {
                                $post_id = wp_insert_post($post);
                                _e('Post already imported');
                        } else {
                                $post_id = wp_insert_post($post);

+                               if ( is_wp_error( $post_id ) )
+                                       return $post_id;

                                if (!$post_id) {
                                if (!$post_id) {

-                                       _e("Couldn't get post ID");
+                                       _e('Couldn&#8217;t get post ID');

                                        return;
                                }
 
                                        return;
                                }
 


@@ -132,9 +157,12 @@ class RSS_Import {
 
                $this->file = $file['file'];
                $this->get_posts();
 
                $this->file = $file['file'];
                $this->get_posts();

-               $this->import_posts();
+               $result = $this->import_posts();
+               if ( is_wp_error( $result ) )
+                       return $result;

                wp_import_cleanup($file['id']);
                wp_import_cleanup($file['id']);

-               
+               do_action('import_done', 'rss');
+

                echo '<h3>';
                printf(__('All done. <a href="%s">Have fun!</a>'), get_option('home'));
                echo '</h3>';
                echo '<h3>';
                printf(__('All done. <a href="%s">Have fun!</a>'), get_option('home'));
                echo '</h3>';


@@ -147,25 +175,28 @@ class RSS_Import {
                        $step = (int) $_GET['step'];
 
                $this->header();
                        $step = (int) $_GET['step'];
 
                $this->header();

-               
+

                switch ($step) {
                        case 0 :
                                $this->greet();
                                break;
                        case 1 :
                switch ($step) {
                        case 0 :
                                $this->greet();
                                break;
                        case 1 :

-                               $this->import();
+                               check_admin_referer('import-upload');
+                               $result = $this->import();
+                               if ( is_wp_error( $result ) )
+                                       echo $result->get_error_message();

                                break;
                }
                                break;
                }

-               
+

                $this->footer();
        }
 
        function RSS_Import() {
                $this->footer();
        }
 
        function RSS_Import() {

-               // Nothing.     
+               // Nothing.

        }
 }
 
 $rss_import = new RSS_Import();
 
        }
 }
 
 $rss_import = new RSS_Import();
 

-register_importer('rss', 'RSS', __('Import posts from an RSS feed'), array ($rss_import, 'dispatch'));
+register_importer('rss', __('RSS'), __('Import posts from an RSS feed.'), array ($rss_import, 'dispatch'));

 ?>
 ?>