Wordpress 2.3.2

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

diff --git a/wp-admin/link-import.php b/wp-admin/link-import.php
index c6119e6fda3cd4d2ecb5b0a7c177b8e27a658173..927531731596f9460a3688ef67b7624b385cccc2 100644 (file)
--- a/wp-admin/link-import.php
+++ b/wp-admin/link-import.php
@@ -12,16 +12,16 @@ if (!$step) $step = 0;
 ?>
 <?php
 switch ($step) {
 ?>
 <?php
 switch ($step) {

-    case 0:
-    {
-        include_once('admin-header.php');
-        if ( !current_user_can('manage_links') )
-            die (__("Cheatin&#8217; uh?"));
+       case 0: {
+               include_once('admin-header.php');
+               if ( !current_user_can('manage_links') )
+                       wp_die(__('Cheatin&#8217; uh?'));

 
 

-        $opmltype = 'blogrolling'; // default.
+               $opmltype = 'blogrolling'; // default.

 ?>
 
 <div class="wrap">
 ?>
 
 <div class="wrap">

+

 <h2><?php _e('Import your blogroll from another system') ?> </h2>
 <form enctype="multipart/form-data" action="link-import.php" method="post" name="blogroll">
 <?php wp_nonce_field('import-bookmarks') ?>
 <h2><?php _e('Import your blogroll from another system') ?> </h2>
 <form enctype="multipart/form-data" action="link-import.php" method="post" name="blogroll">
 <?php wp_nonce_field('import-bookmarks') ?>


@@ -40,95 +40,98 @@ switch ($step) {
 <input id="userfile" name="userfile" type="file" size="30" />
 </div>
 
 <input id="userfile" name="userfile" type="file" size="30" />
 </div>
 

-

 </div>
 
 <p style="clear: both; margin-top: 1em;"><?php _e('Now select a category you want to put these links in.') ?><br />
 <?php _e('Category:') ?> <select name="cat_id">
 <?php
 </div>
 
 <p style="clear: both; margin-top: 1em;"><?php _e('Now select a category you want to put these links in.') ?><br />
 <?php _e('Category:') ?> <select name="cat_id">
 <?php

-$categories = $wpdb->get_results("SELECT cat_id, cat_name, auto_toggle FROM $wpdb->linkcategories ORDER BY cat_id");
+$categories = get_terms('link_category', 'get=all');

 foreach ($categories as $category) {
 ?>
 foreach ($categories as $category) {
 ?>

-<option value="<?php echo $category->cat_id; ?>"><?php echo $category->cat_id.': '.$category->cat_name; ?></option>
+<option value="<?php echo $category->term_id; ?>"><?php echo wp_specialchars(apply_filters('link_category', $category->name)); ?></option>

 <?php
 } // end foreach
 ?>
 </select></p>
 
 <?php
 } // end foreach
 ?>
 </select></p>
 

-<p class="submit"><input type="submit" name="submit" value="<?php _e('Import OPML File') ?> &raquo;" /></p>
+<p class="submit"><input type="submit" name="submit" value="<?php _e('Import OPML File &raquo;') ?>" /></p>

 </form>
 
 </div>
 <?php
 </form>
 
 </div>
 <?php

-                break;
-            } // end case 0
+               break;
+       } // end case 0

 
 

-    case 1: {
+       case 1: {

                check_admin_referer('import-bookmarks');
 
                check_admin_referer('import-bookmarks');
 

-                include_once('admin-header.php');
-                if ( !current_user_can('manage_links') )
-                    die (__("Cheatin' uh ?"));
+               include_once('admin-header.php');
+               if ( !current_user_can('manage_links') )
+                       wp_die(__('Cheatin&#8217; uh?'));

 ?>
 <div class="wrap">
 
 ?>
 <div class="wrap">
 

-     <h2><?php _e('Importing...') ?></h2>
+<h2><?php _e('Importing...') ?></h2>

 <?php
 <?php

-                               $cat_id = abs( (int) $_POST['cat_id'] );
-                               if ( $cat_id < 1 )
-                                       $cat_id  = 1;
-
-                $opml_url = $_POST['opml_url'];
-                if (isset($opml_url) && $opml_url != '' && $opml_url != 'http://') {
-                                       $blogrolling = true;
-                }
-                else // try to get the upload file.
-                               {
-                                       $overrides = array('test_form' => false, 'test_type' => false);
-                                       $file = wp_handle_upload($_FILES['userfile'], $overrides);
-
-                                       if ( isset($file['error']) )
-                                               die($file['error']);
-
-                                       $url = $file['url'];
-                                       $opml_url = $file['file'];
-                                       $blogrolling = false;
-                               }
-
-                if (isset($opml_url) && $opml_url != '') {
-                    $opml = wp_remote_fopen($opml_url);
-                    include_once('link-parse-opml.php');
-
-                    $link_count = count($names);
-                    for ($i = 0; $i < $link_count; $i++) {
-                        if ('Last' == substr($titles[$i], 0, 4))
-                            $titles[$i] = '';
-                        if ('http' == substr($titles[$i], 0, 4))
-                            $titles[$i] = '';
-                        // FIXME:  Use wp_insert_link().
-                        $query = "INSERT INTO $wpdb->links (link_url, link_name, link_target, link_category, link_description, link_owner, link_rss)
-                                VALUES('{$urls[$i]}', '".$wpdb->escape($names[$i])."', '', $cat_id, '".$wpdb->escape($descriptions[$i])."', $user_ID, '{$feeds[$i]}')\n";
-                        $result = $wpdb->query($query);
-                                               echo sprintf('<p>'.__('Inserted <strong>%s</strong>').'</p>', $names[$i]);
-                    }
+               $cat_id = abs( (int) $_POST['cat_id'] );
+               if ( $cat_id < 1 )
+                       $cat_id  = 1;
+
+               $opml_url = $_POST['opml_url'];
+               if ( isset($opml_url) && $opml_url != '' && $opml_url != 'http://' ) {
+                       $blogrolling = true;
+               } else { // try to get the upload file.
+                       $overrides = array('test_form' => false, 'test_type' => false);
+                       $file = wp_handle_upload($_FILES['userfile'], $overrides);
+
+                       if ( isset($file['error']) )
+                               wp_die($file['error']);
+
+                       $url = $file['url'];
+                       $opml_url = $file['file'];
+                       $blogrolling = false;
+               }
+
+               if ( isset($opml_url) && $opml_url != '' ) {
+                       if ( $blogrolling === true ) {
+                               $opml = wp_remote_fopen($opml_url);
+                       } else {
+                               $opml = file_get_contents($opml_url);
+                       }
+
+                       include_once('link-parse-opml.php');
+
+                       $link_count = count($names);
+                       for ( $i = 0; $i < $link_count; $i++ ) {
+                               if ('Last' == substr($titles[$i], 0, 4))
+                                       $titles[$i] = '';
+                               if ( 'http' == substr($titles[$i], 0, 4) )
+                                       $titles[$i] = '';
+                               $link = array( 'link_url' => $urls[$i], 'link_name' => $wpdb->escape($names[$i]), 'link_category' => array($cat_id), 'link_description' => $wpdb->escape($descriptions[$i]), 'link_owner' => $user_ID, 'link_rss' => $feeds[$i]);
+                               wp_insert_link($link);
+                               echo sprintf('<p>'.__('Inserted <strong>%s</strong>').'</p>', $names[$i]);
+                       }

 ?>
 ?>

-     <p><?php printf(__('Inserted %1$d links into category %2$s. All done! Go <a href="%3$s">manage those links</a>.'), $link_count, $cat_id, 'link-manager.php') ?></p>
+
+<p><?php printf(__('Inserted %1$d links into category %2$s. All done! Go <a href="%3$s">manage those links</a>.'), $link_count, $cat_id, 'link-manager.php') ?></p>
+

 <?php
 <?php

-                } // end if got url
-                else
-                {
-                    echo "<p>" . __("You need to supply your OPML url. Press back on your browser and try again") . "</p>\n";
-                } // end else
-
-                               if ( ! $blogrolling )
-                                       @unlink($opml_url);
+} // end if got url
+else
+{
+       echo "<p>" . __("You need to supply your OPML url. Press back on your browser and try again") . "</p>\n";
+} // end else
+
+if ( ! $blogrolling )
+       apply_filters( 'wp_delete_file', $opml_url);
+       @unlink($opml_url);

 ?>
 </div>
 <?php
 ?>
 </div>
 <?php

-                break;
-            } // end case 1
+               break;
+       } // end case 1

 } // end switch
 
 include('admin-footer.php');
 
 } // end switch
 
 include('admin-footer.php');
 

-?>
+?>
\ No newline at end of file