Changes in trunk/wp-admin/import/textpattern.php [4349:3424]

File:

• trunk/wp-admin/import/textpattern.php (modified) (43 diffs)

trunk/wp-admin/import/textpattern.php

@@ -8 +8 @@
     {
     global $wpdb;
-
+    
     $cat_id -= 0;   // force numeric
     $name = $wpdb->get_var('SELECT cat_ID FROM '.$wpdb->categories.' WHERE category_nicename="'.$category_nicename.'"');
-
+    
     return $name;
     }
@@ -50 +50 @@
         echo '</div>';
     }
-
-    function greet() {
-        echo '<div class="narrow">';
+    
+    function greet() 
+    {
         echo '<p>'.__('Howdy! This importer allows you to extract posts from any Textpattern 4.0.2+ into your blog. This has not been tested on previous versions of Textpattern.  Mileage may vary.').'</p>';
         echo '<p>'.__('Your Textpattern Configuration settings are as follows:').'</p>';
         echo '<form action="admin.php?import=textpattern&amp;step=1" method="post">';
         $this->db_form();
-        echo '<p class="submit"><input type="submit" name="submit" value="'.__('Import Categories').' &raquo;" /></p>';
+        echo '<input type="submit" name="submit" value="'.__('Import Categories').'" />';
         echo '</form>';
-        echo '</div>';
     }
 
@@ -69 +68 @@
         set_magic_quotes_runtime(0);
         $prefix = get_option('tpre');
-
+        
         // Get Categories
         return $txpdb->get_results('SELECT 
@@ -79 +78 @@
                                      ARRAY_A);
     }
-
+    
     function get_txp_users()
     {
@@ -87 +86 @@
         set_magic_quotes_runtime(0);
         $prefix = get_option('tpre');
-
+        
         // Get Users
-
+        
         return $txpdb->get_results('SELECT
                                         user_id,
@@ -98 +97 @@
                                     FROM '.$prefix.'txp_users', ARRAY_A);
     }
-
+    
     function get_txp_posts()
     {
@@ -105 +104 @@
         set_magic_quotes_runtime(0);
         $prefix = get_option('tpre');
-
+        
         // Get Posts
         return $txpdb->get_results('SELECT 
@@ -124 +123 @@
                                     ', ARRAY_A);
     }
-
+    
     function get_txp_comments()
     {
@@ -132 +131 @@
         set_magic_quotes_runtime(0);
         $prefix = get_option('tpre');
-
+        
         // Get Comments
         return $txpdb->get_results('SELECT * FROM '.$prefix.'txp_discuss', ARRAY_A);
     }
-
+    
         function get_txp_links()
     {
@@ -143 +142 @@
         set_magic_quotes_runtime(0);
         $prefix = get_option('tpre');
-
+        
         return $txpdb->get_results('SELECT 
                                         id,
@@ -154 +153 @@
                                       ARRAY_A);                       
     }
-
+    
     function cat2wp($categories='') 
     {
@@ -169 +168 @@
                 $count++;
                 extract($category);
-
-
+                
+                
                 // Make Nice Variables
                 $name = $wpdb->escape($name);
                 $title = $wpdb->escape($title);
-
+                
                 if($cinfo = category_exists($name))
                 {
@@ -185 +184 @@
                 $txpcat2wpcat[$id] = $ret_id;
             }
-
+            
             // Store category translation for future use
             add_option('txpcat2wpcat',$txpcat2wpcat);
@@ -194 +193 @@
         return false;
     }
-
+    
     function users2wp($users='')
     {
@@ -201 +200 @@
         $count = 0;
         $txpid2wpid = array();
-
+        
         // Midnight Mojo
         if(is_array($users))
@@ -210 +209 @@
                 $count++;
                 extract($user);
-
+                
                 // Make Nice Variables
                 $name = $wpdb->escape($name);
                 $RealName = $wpdb->escape($RealName);
-
+                
                 if($uinfo = get_userdatabylogin($name))
                 {
-
+                    
                     $ret_id = wp_insert_user(array(
                                 'ID'            => $uinfo->ID,
@@ -238 +237 @@
                 }
                 $txpid2wpid[$user_id] = $ret_id;
-
+                
                 // Set Textpattern-to-WordPress permissions translation
                 $transperms = array(1 => '10', 2 => '9', 3 => '5', 4 => '4', 5 => '3', 6 => '2', 7 => '0');
-
+                
                 // Update Usermeta Data
                 $user = new WP_User($ret_id);
@@ -251 +250 @@
                 if('2'  == $transperms[$privs]) { $user->set_role('contributor'); }
                 if('0'  == $transperms[$privs]) { $user->set_role('subscriber'); }
-
+                
                 update_usermeta( $ret_id, 'wp_user_level', $transperms[$privs] );
                 update_usermeta( $ret_id, 'rich_editing', 'false');
             }// End foreach($users as $user)
-
+            
             // Store id translation array for future use
             add_option('txpid2wpid',$txpid2wpid);
-
-
+            
+            
             echo '<p>'.sprintf(__('Done! <strong>%1$s</strong> users imported.'), $count).'<br /><br /></p>';
             return true;
         }// End if(is_array($users)
-
+        
         echo __('No Users to Import!');
         return false;
-
+        
     }// End function user2wp()
-
+    
     function posts2wp($posts='')
     {
@@ -285 +284 @@
                 $count++;
                 extract($post);
-
+                
                 // Set Textpattern-to-WordPress status translation
                 $stattrans = array(1 => 'draft', 2 => 'private', 3 => 'draft', 4 => 'publish', 5 => 'publish');
-
+                
                 //Can we do this more efficiently?
                 $uinfo = ( get_userdatabylogin( $AuthorID ) ) ? get_userdatabylogin( $AuthorID ) : 1;
@@ -297 +296 @@
                 $Excerpt = $wpdb->escape($Excerpt);
                 $post_status = $stattrans[$Status];
-
+                
                 // Import Post data into WordPress
-
+                
                 if($pinfo = post_exists($Title,$Body))
                 {
@@ -334 +333 @@
                 }
                 $txpposts2wpposts[$ID] = $ret_id;
-
+                
                 // Make Post-to-Category associations
                 $cats = array();
@@ -340 +339 @@
                 if($cat2 = get_catbynicename($Category2)) { $cats[2] = $cat2; }
 
-                if(!empty($cats)) { wp_set_post_categories($ret_id, $cats); }
+                if(!empty($cats)) { wp_set_post_cats('', $ret_id, $cats); }
             }
         }
         // Store ID translation for later use
         add_option('txpposts2wpposts',$txpposts2wpposts);
-
+        
         echo '<p>'.sprintf(__('Done! <strong>%1$s</strong> posts imported.'), $count).'<br /><br /></p>';
-        return true;
-    }
-
+        return true;    
+    }
+    
     function comments2wp($comments='')
     {
@@ -357 +356 @@
         $txpcm2wpcm = array();
         $postarr = get_option('txpposts2wpposts');
-
+        
         // Magic Mojo
         if(is_array($comments))
@@ -366 +365 @@
                 $count++;
                 extract($comment);
-
+                
                 // WordPressify Data
                 $comment_ID = ltrim($discussid, '0');
@@ -375 +374 @@
                 $web = $wpdb->escape($web);
                 $message = $wpdb->escape($message);
-
+                
                 if($cinfo = comment_exists($name, $posted))
                 {
@@ -407 +406 @@
             }
             // Store Comment ID translation for future use
-            add_option('txpcm2wpcm', $txpcm2wpcm);
-
+            add_option('txpcm2wpcm', $txpcm2wpcm);          
+            
             // Associate newly formed categories with posts
             get_comment_count($ret_id);
-
-
+            
+            
             echo '<p>'.sprintf(__('Done! <strong>%1$s</strong> comments imported.'), $count).'<br /><br /></p>';
             return true;
@@ -419 +418 @@
         return false;
     }
-
+    
     function links2wp($links='')
     {
@@ -425 +424 @@
         global $wpdb;
         $count = 0;
-
+        
         // Deal with the links
         if(is_array($links))
@@ -434 +433 @@
                 $count++;
                 extract($link);
-
+                
                 // Make nice vars
                 $category = $wpdb->escape($category);
                 $linkname = $wpdb->escape($linkname);
                 $description = $wpdb->escape($description);
-
+                
                 if($linfo = link_exists($linkname))
                 {
@@ -472 +471 @@
         return false;
     }
-
+        
     function import_categories() 
-    {
-        // Category Import
+    {   
+        // Category Import  
         $cats = $this->get_txp_cats();
         $this->cat2wp($cats);
         add_option('txp_cats', $cats);
-
-
-
+        
+        
+            
         echo '<form action="admin.php?import=textpattern&amp;step=2" method="post">';
         printf('<input type="submit" name="submit" value="%s" />', __('Import Users'));
@@ -487 +486 @@
 
     }
-
+    
     function import_users()
     {
@@ -493 +492 @@
         $users = $this->get_txp_users(); 
         $this->users2wp($users);
-
+        
         echo '<form action="admin.php?import=textpattern&amp;step=3" method="post">';
         printf('<input type="submit" name="submit" value="%s" />', __('Import Posts'));
         echo '</form>';
     }
-
+    
     function import_posts()
     {
@@ -504 +503 @@
         $posts = $this->get_txp_posts();
         $this->posts2wp($posts);
-
+        
         echo '<form action="admin.php?import=textpattern&amp;step=4" method="post">';
         printf('<input type="submit" name="submit" value="%s" />', __('Import Comments'));
         echo '</form>';
     }
-
+    
     function import_comments()
     {
@@ -515 +514 @@
         $comments = $this->get_txp_comments();
         $this->comments2wp($comments);
-
+        
         echo '<form action="admin.php?import=textpattern&amp;step=5" method="post">';
         printf('<input type="submit" name="submit" value="%s" />', __('Import Links'));
         echo '</form>';
     }
-
+    
     function import_links()
     {
@@ -527 +526 @@
         $this->links2wp($links);
         add_option('txp_links', $links);
-
+        
         echo '<form action="admin.php?import=textpattern&amp;step=6" method="post">';
         printf('<input type="submit" name="submit" value="%s" />', __('Finish'));
         echo '</form>';
     }
-
+    
     function cleanup_txpimport()
     {
@@ -548 +547 @@
         $this->tips();
     }
-
+    
     function tips()
     {
@@ -557 +556 @@
         echo '<p>'.__('Secondly, we have attempted to preserve post authors.  If you are the only author or contributor to your blog, then you are safe.  In most cases, we are successful in this preservation endeavor.  However, if we cannot ascertain the name of the writer due to discrepancies between database tables, we assign it to you, the administrative user.').'</p>';
         echo '<h3>'.__('Textile').'</h3>';
-        echo '<p>'.__('Also, since you\'re coming from Textpattern, you probably have been using Textile to format your comments and posts.  If this is the case, we recommend downloading and installing <a href="http://www.huddledmasses.org/category/development/wordpress/textile/">Textile for WordPress</a>.  Trust me... You\'ll want it.').'</p>';
+        echo '<p>'.__('Also, since you\'re coming from Textpattern, you probably have been using Textile to format your comments and posts.  If this is the case, we recommend downloading and installing <a href="http://www.huddledmasses.org/2004/04/19/wordpress-plugin-textile-20/">Textile for WordPress</a>.  Trust me... You\'ll want it.').'</p>';
         echo '<h3>'.__('WordPress Resources').'</h3>';
         echo '<p>'.__('Finally, there are numerous WordPress resources around the internet.  Some of them are:').'</p>';
         echo '<ul>';
         echo '<li>'.__('<a href="http://www.wordpress.org">The official WordPress site</a>').'</li>';
-        echo '<li>'.__('<a href="http://wordpress.org/support/">The WordPress support forums</a>').'</li>';
+        echo '<li>'.__('<a href="http://wordpress.org/support/">The WordPress support forums').'</li>';
         echo '<li>'.__('<a href="http://codex.wordpress.org">The Codex (In other words, the WordPress Bible)</a>').'</li>';
         echo '</ul>';
         echo '<p>'.sprintf(__('That\'s it! What are you waiting for? Go <a href="%1$s">login</a>!'), '/wp-login.php').'</p>';
     }
-
+    
     function db_form()
     {
-        echo '<table class="editform">';
-        printf('<tr><th scope="row"><label for="dbuser">%s</label></th><td><input type="text" name="dbuser" id="dbuser" /></td></tr>', __('Textpattern Database User:'));
-        printf('<tr><th scope="row"><label for="dbpass">%s</label></th><td><input type="password" name="dbpass" id="dbpass" /></td></tr>', __('Textpattern Database Password:'));
-        printf('<tr><th scope="row"><label for="dbname">%s</label></th><td><input type="text" id="dbname" name="dbname" /></td></tr>', __('Textpattern Database Name:'));
-        printf('<tr><th scope="row"><label for="dbhost">%s</label></th><td><input type="text" id="dbhost" name="dbhost" value="localhost" /></td></tr>', __('Textpattern Database Host:'));
-        printf('<tr><th scope="row"><label for="dbprefix">%s</label></th><td><input type="text" name="dbprefix" id="dbprefix"  /></td></tr>', __('Textpattern Table prefix (if any):'));
-        echo '</table>';
-    }
-
+        echo '<ul>';
+        printf('<li><label for="dbuser">%s</label> <input type="text" name="dbuser" /></li>', __('Textpattern Database User:'));
+        printf('<li><label for="dbpass">%s</label> <input type="password" name="dbpass" /></li>', __('Textpattern Database Password:'));
+        printf('<li><label for="dbname">%s</label> <input type="text" name="dbname" /></li>', __('Textpattern Database Name:'));
+        printf('<li><label for="dbhost">%s</label> <input type="text" name="dbhost" value="localhost" /></li>', __('Textpattern Database Host:'));
+        printf('<li><label for="dbprefix">%s</label> <input type="text" name="dbprefix" /></li>', __('Textpattern Table prefix (if any):'));
+        echo '</ul>';
+    }
+    
     function dispatch() 
     {
@@ -587 +586 @@
             $step = (int) $_GET['step'];
         $this->header();
-
+        
         if ( $step > 0 ) 
         {
@@ -593 +592 @@
             {
                 if(get_option('txpuser'))
-                    delete_option('txpuser');
+                    delete_option('txpuser');   
                 add_option('txpuser',$_POST['dbuser']);
             }
@@ -599 +598 @@
             {
                 if(get_option('txppass'))
-                    delete_option('txppass');
+                    delete_option('txppass');   
                 add_option('txppass',$_POST['dbpass']);
             }
-
+            
             if($_POST['dbname'])
             {
                 if(get_option('txpname'))
-                    delete_option('txpname');
+                    delete_option('txpname');   
                 add_option('txpname',$_POST['dbname']);
             }
@@ -620 +619 @@
                     delete_option('tpre');
                 add_option('tpre',$_POST['dbprefix']); 
-            }
+            }           
 
 
@@ -650 +649 @@
                 break;
         }
-
+        
         $this->footer();
     }
@@ -656 +655 @@
     function Textpattern_Import() 
     {
-        // Nothing.
+        // Nothing. 
     }
 }
 
 $txp_import = new Textpattern_Import();
-register_importer('textpattern', __('Textpattern'), __('Import posts from a Textpattern Blog'), array ($txp_import, 'dispatch'));
+register_importer('textpattern', 'Textpattern', __('Import posts from a Textpattern Blog'), array ($txp_import, 'dispatch'));
 ?>