Changes in trunk/wp-admin/link-import.php [4006:3480]

File:

• trunk/wp-admin/link-import.php (modified) (7 diffs)

trunk/wp-admin/link-import.php

@@ -17 +17 @@
         include_once('admin-header.php');
         if ( !current_user_can('manage_links') )
-            wp_die(__('Cheatin’ uh?'));
+            die (__("Cheatin’ uh?"));
 
         $opmltype = 'blogrolling'; // default.
@@ -25 +25 @@
 <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') ?>
 
-<p><?php _e('If a program or website you use allows you to export your bookmarks or subscriptions as OPML you may import them here.'); ?>
+<p><?php _e('If a program or website you use allows you to export your links or subscriptions as OPML you may import them here.'); ?>
 <div style="width: 70%; margin: auto; height: 8em;">
 <input type="hidden" name="step" value="1" />
@@ -44 +43 @@
 </div>
 
-<p style="clear: both; margin-top: 1em;"><?php _e('Now select a category you want to put these bookmarks in.') ?><br />
+<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 = get_categories('hide_empty=0');
+$categories = $wpdb->get_results("SELECT cat_id, cat_name, auto_toggle FROM $wpdb->linkcategories ORDER BY cat_id");
 foreach ($categories as $category) {
 ?>
-<option value="<?php echo $category->cat_ID; ?>"><?php echo wp_specialchars($category->cat_name); ?></option>
+<option value="<?php echo $category->cat_id; ?>"><?php echo $category->cat_id.': '.$category->cat_name; ?></option>
 <?php
 } // end foreach
@@ -56 +55 @@
 </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>
 
@@ -65 +64 @@
 
     case 1: {
-        check_admin_referer('import-bookmarks');
-
                 include_once('admin-header.php');
                 if ( !current_user_can('manage_links') )
-                    wp_die(__('Cheatin&#8217; uh?'));
+                    die (__("Cheatin' uh ?"));
 ?>
 <div class="wrap">
@@ -90 +87 @@
 
                     if ( isset($file['error']) )
-                        wp_die($file['error']);
+                        die($file['error']);
 
                     $url = $file['url'];
@@ -107 +104 @@
                         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);
+                        // 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]);
                     }
 ?>
-     <p><?php printf(__('Inserted %1$d bookmarks into category %2$s. All done! Go <a href="%3$s">manage those bookmarks</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
                 } // end if got url