Index: wp-admin/import/blogger.php =================================================================== --- wp-admin/import/blogger.php (revision 3978) +++ wp-admin/import/blogger.php (working copy) @@ -517,7 +517,7 @@ $did_one = true; } $output.= "

$archivename $status

\n"; - } + } if ( ! $did_one ) $this->set_next_step(7); die( $this->refresher(1000) . $output ); Index: wp-admin/import/blogware.php =================================================================== --- wp-admin/import/blogware.php (revision 3978) +++ wp-admin/import/blogware.php (working copy) @@ -20,7 +20,7 @@ $trans_tbl = array_flip($trans_tbl); return strtr($string, $trans_tbl); } - + function greet() { echo '

'.__('Howdy! This importer allows you to extract posts from Blogware XML export file into your blog. Pick a Blogware file to upload and click Import.').'

'; wp_import_upload_form("admin.php?import=blogware&step=1"); @@ -28,7 +28,7 @@ function import_posts() { global $wpdb, $current_user; - + set_magic_quotes_runtime(0); $importdata = file($this->file); // Read the file into an array $importdata = implode('', $importdata); // squish it @@ -37,7 +37,7 @@ preg_match_all('|(]+>(.*?))|is', $importdata, $posts); $posts = $posts[1]; unset($importdata); - echo '
    '; + echo '
      '; foreach ($posts as $post) { flush(); preg_match('||is', $post, $post_type); @@ -100,7 +100,7 @@ preg_match_all('|(.*?)|is', $post, $comments); $comments = $comments[1]; - + if ( $comments ) { $comment_post_ID = $post_id; $num_comments = 0; @@ -155,7 +155,7 @@ $this->file = $file['file']; $this->import_posts(); wp_import_cleanup($file['id']); - + echo '

      '; printf(__('All done. Have fun!'), get_option('home')); echo '

      '; @@ -168,7 +168,7 @@ $step = (int) $_GET['step']; $this->header(); - + switch ($step) { case 0 : $this->greet(); @@ -177,12 +177,12 @@ $this->import(); break; } - + $this->footer(); } function BW_Import() { - // Nothing. + // Nothing. } } Index: wp-admin/import/dotclear.php =================================================================== --- wp-admin/import/dotclear.php (revision 3978) +++ wp-admin/import/dotclear.php (working copy) @@ -9,7 +9,7 @@ **/ if(!function_exists('get_catbynicename')) { - function get_catbynicename($category_nicename) + function get_catbynicename($category_nicename) { global $wpdb; @@ -60,58 +60,59 @@ // // This cries out for a C-implementation to be included in PHP core // - function valid_1byte($char) { - if(!is_int($char)) return false; - return ($char & 0x80) == 0x00; - } - - function valid_2byte($char) { - if(!is_int($char)) return false; - return ($char & 0xE0) == 0xC0; - } - function valid_3byte($char) { - if(!is_int($char)) return false; - return ($char & 0xF0) == 0xE0; - } +function valid_1byte($char) { + if(!is_int($char)) return false; + return ($char & 0x80) == 0x00; +} - function valid_4byte($char) { - if(!is_int($char)) return false; - return ($char & 0xF8) == 0xF0; - } - - function valid_nextbyte($char) { - if(!is_int($char)) return false; - return ($char & 0xC0) == 0x80; - } - - function valid_utf8($string) { - $len = strlen($string); - $i = 0; - while( $i < $len ) { - $char = ord(substr($string, $i++, 1)); - if(valid_1byte($char)) { // continue - continue; - } else if(valid_2byte($char)) { // check 1 byte - if(!valid_nextbyte(ord(substr($string, $i++, 1)))) - return false; - } else if(valid_3byte($char)) { // check 2 bytes - if(!valid_nextbyte(ord(substr($string, $i++, 1)))) - return false; - if(!valid_nextbyte(ord(substr($string, $i++, 1)))) - return false; - } else if(valid_4byte($char)) { // check 3 bytes - if(!valid_nextbyte(ord(substr($string, $i++, 1)))) - return false; - if(!valid_nextbyte(ord(substr($string, $i++, 1)))) - return false; - if(!valid_nextbyte(ord(substr($string, $i++, 1)))) - return false; - } // goto next char - } - return true; // done - } +function valid_2byte($char) { + if(!is_int($char)) return false; + return ($char & 0xE0) == 0xC0; +} +function valid_3byte($char) { + if(!is_int($char)) return false; + return ($char & 0xF0) == 0xE0; +} + +function valid_4byte($char) { + if(!is_int($char)) return false; + return ($char & 0xF8) == 0xF0; +} + +function valid_nextbyte($char) { + if(!is_int($char)) return false; + return ($char & 0xC0) == 0x80; +} + +function valid_utf8($string) { + $len = strlen($string); + $i = 0; + while( $i < $len ) { + $char = ord(substr($string, $i++, 1)); + if(valid_1byte($char)) { // continue + continue; + } else if(valid_2byte($char)) { // check 1 byte + if(!valid_nextbyte(ord(substr($string, $i++, 1)))) + return false; + } else if(valid_3byte($char)) { // check 2 bytes + if(!valid_nextbyte(ord(substr($string, $i++, 1)))) + return false; + if(!valid_nextbyte(ord(substr($string, $i++, 1)))) + return false; + } else if(valid_4byte($char)) { // check 3 bytes + if(!valid_nextbyte(ord(substr($string, $i++, 1)))) + return false; + if(!valid_nextbyte(ord(substr($string, $i++, 1)))) + return false; + if(!valid_nextbyte(ord(substr($string, $i++, 1)))) + return false; + } // goto next char + } + return true; // done +} + function csc ($s) { if (valid_utf8 ($s)) { return $s; @@ -129,19 +130,19 @@ **/ class Dotclear_Import { - function header() + function header() { echo '
      '; echo '

      '.__('Import Dotclear').'

      '; echo '

      '.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'

      '; } - function footer() + function footer() { echo '
      '; } - function greet() + function greet() { echo '

      '.__('Howdy! This importer allows you to extract posts from a Dotclear database into your blog. Mileage may vary.').'

      '; echo '

      '.__('Your Dotclear Configuration settings are as follows:').'

      '; @@ -151,7 +152,7 @@ echo ''; } - function get_dc_cats() + function get_dc_cats() { global $wpdb; // General Housekeeping @@ -186,7 +187,7 @@ // Get Posts return $dcdb->get_results('SELECT '.$dbprefix.'post.*, '.$dbprefix.'categorie.cat_libelle_url AS post_cat_name FROM '.$dbprefix.'post INNER JOIN '.$dbprefix.'categorie - ON '.$dbprefix.'post.cat_id = '.$dbprefix.'categorie.cat_id', ARRAY_A); + ON '.$dbprefix.'post.cat_id = '.$dbprefix.'categorie.cat_id', ARRAY_A); } function get_dc_comments() @@ -211,7 +212,7 @@ return $dcdb->get_results('SELECT * FROM '.$dbprefix.'link ORDER BY position', ARRAY_A); } - function cat2wp($categories='') + function cat2wp($categories='') { // General Housekeeping global $wpdb; @@ -221,7 +222,7 @@ if(is_array($categories)) { echo '

      '.__('Importing Categories...').'

      '; - foreach ($categories as $category) + foreach ($categories as $category) { $count++; extract($category); @@ -283,7 +284,7 @@ 'display_name' => $Realname) ); } - else + else { $ret_id = wp_insert_user(array( 'user_login' => $user_id, @@ -384,7 +385,7 @@ 'comment_count' => $post_nb_comment + $post_nb_trackback) ); } - else + else { $ret_id = wp_insert_post(array( 'post_author' => $authorid, @@ -460,7 +461,7 @@ 'comment_approved' => $comment_approved) ); } - else + else { // Insert comments $ret_id = wp_insert_comment(array( @@ -547,7 +548,7 @@ return false; } - function import_categories() + function import_categories() { // Category Import $cats = $this->get_dc_cats(); @@ -565,7 +566,7 @@ function import_users() { // User Import - $users = $this->get_dc_users(); + $users = $this->get_dc_users(); $this->users2wp($users); echo '
      '; @@ -655,7 +656,7 @@ echo ''; } - function dispatch() + function dispatch() { if (empty ($_GET['step'])) @@ -664,7 +665,7 @@ $step = (int) $_GET['step']; $this->header(); - if ( $step > 0 ) + if ( $step > 0 ) { if($_POST['dbuser']) { @@ -689,25 +690,25 @@ { if(get_option('dchost')) delete_option('dchost'); - add_option('dchost',$_POST['dbhost']); + add_option('dchost',$_POST['dbhost']); } if($_POST['dccharset']) { if(get_option('dccharset')) delete_option('dccharset'); - add_option('dccharset',$_POST['dccharset']); + add_option('dccharset',$_POST['dccharset']); } if($_POST['dbprefix']) { if(get_option('dcdbprefix')) delete_option('dcdbprefix'); - add_option('dcdbprefix',$_POST['dbprefix']); + add_option('dcdbprefix',$_POST['dbprefix']); } } - switch ($step) + switch ($step) { default: case 0 : @@ -736,7 +737,7 @@ $this->footer(); } - function Dotclear_Import() + function Dotclear_Import() { // Nothing. } Index: wp-admin/import/greymatter.php =================================================================== --- wp-admin/import/greymatter.php (revision 3978) +++ wp-admin/import/greymatter.php (working copy) @@ -66,10 +66,10 @@ $string = str_replace("|*|","
      \n",$string); return($string); } - + function import() { global $wpdb; - + $wpvarstoreset = array('gmpath', 'archivespath', 'lastentry'); for ($i=0; $iheader(); ?>

      The importer is running...

      @@ -128,7 +128,7 @@ $user_info = array("user_login"=>"$user_login", "user_pass"=>"$pass1", "user_nickname"=>"$user_nickname", "user_email"=>"$user_email", "user_url"=>"$user_url", "user_ip"=>"$user_ip", "user_domain"=>"$user_domain", "user_browser"=>"$user_browser", "dateYMDhour"=>"$user_joindate", "user_level"=>"1", "user_idmode"=>"nickname"); $user_id = wp_insert_user($user_info); $this->gmnames[$userdata[0]] = $user_id; - + echo "
    1. user $user_login... Done
      2. "; } @@ -137,11 +137,11 @@
    2. importing posts, comments, and karma...
        escape("user@deleted.com"); $user_url=$wpdb->escape(""); $user_joindate=$wpdb->escape($user_joindate); - + $user_info = array("user_login"=>$user_login, "user_pass"=>$pass1, "user_nickname"=>$user_nickname, "user_email"=>$user_email, "user_url"=>$user_url, "user_ip"=>$user_ip, "user_domain"=>$user_domain, "user_browser"=>$user_browser, "dateYMDhour"=>$user_joindate, "user_level"=>0, "user_idmode"=>"nickname"); $user_id = wp_insert_user($user_info); $this->gmnames[$postinfo[1]] = $user_id; - + echo ": registered deleted user $user_login at level 0 "; } - + if (array_key_exists($postinfo[1], $this->gmnames)) { $post_author = $this->gmnames[$postinfo[1]]; } else { $post_author = $user_id; } - + $postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_excerpt', 'post_status', 'comment_status', 'ping_status', 'post_modified', 'post_modified_gmt'); $post_ID = wp_insert_post($postdata); } @@ -302,7 +302,7 @@ } function GM_Import() { - // Nothing. + // Nothing. } } Index: wp-admin/import/mt.php =================================================================== --- wp-admin/import/mt.php (revision 3978) +++ wp-admin/import/mt.php (working copy) @@ -53,9 +53,9 @@ $pass = 'changeme'; if (!(in_array($author, $this->mtnames))) { //a new mt author name is found ++ $this->j; - $this->mtnames[$this->j] = $author; //add that new mt author name to an array + $this->mtnames[$this->j] = $author; //add that new mt author name to an array $user_id = username_exists($this->newauthornames[$this->j]); //check if the new author name defined by the user is a pre-existing wp user - if (!$user_id) { //banging my head against the desk now. + if (!$user_id) { //banging my head against the desk now. if ($newauthornames[$this->j] == 'left_blank') { //check if the user does not want to change the authorname $user_id = wp_create_user($author, $pass); $this->newauthornames[$this->j] = $author; //now we have a name, in the place of left_blank. @@ -397,7 +397,7 @@ function import() { $this->id = (int) $_GET['id']; - + $this->file = get_attached_file($this->id); $this->get_authors_from_post(); $this->get_entries(); Index: wp-admin/import/textpattern.php =================================================================== --- wp-admin/import/textpattern.php (revision 3978) +++ wp-admin/import/textpattern.php (working copy) @@ -4,7 +4,7 @@ **/ if(!function_exists('get_catbynicename')) { - function get_catbynicename($category_nicename) + function get_catbynicename($category_nicename) { global $wpdb; @@ -38,19 +38,19 @@ **/ class Textpattern_Import { - function header() + function header() { echo '
        '; echo '

        '.__('Import Textpattern').'

        '; echo '

        '.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'

        '; } - function footer() + function footer() { echo '
        '; } - function greet() + function greet() { echo '

        '.__('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.').'

        '; echo '

        '.__('Your Textpattern Configuration settings are as follows:').'

        '; @@ -69,13 +69,13 @@ $prefix = get_option('tpre'); // Get Categories - return $txpdb->get_results('SELECT - id, - name, - title - FROM '.$prefix.'txp_category - WHERE type = "article"', - ARRAY_A); + return $txpdb->get_results('SELECT + id, + name, + title + FROM '.$prefix.'txp_category + WHERE type = "article"', + ARRAY_A); } function get_txp_users() @@ -89,12 +89,12 @@ // Get Users return $txpdb->get_results('SELECT - user_id, - name, - RealName, - email, - privs - FROM '.$prefix.'txp_users', ARRAY_A); + user_id, + name, + RealName, + email, + privs + FROM '.$prefix.'txp_users', ARRAY_A); } function get_txp_posts() @@ -105,22 +105,22 @@ $prefix = get_option('tpre'); // Get Posts - return $txpdb->get_results('SELECT - ID, - Posted, - AuthorID, - LastMod, - Title, - Body, - Excerpt, - Category1, - Category2, - Status, - Keywords, - url_title, - comments_count - FROM '.$prefix.'textpattern - ', ARRAY_A); + return $txpdb->get_results('SELECT + ID, + Posted, + AuthorID, + LastMod, + Title, + Body, + Excerpt, + Category1, + Category2, + Status, + Keywords, + url_title, + comments_count + FROM '.$prefix.'textpattern + ', ARRAY_A); } function get_txp_comments() @@ -142,18 +142,18 @@ set_magic_quotes_runtime(0); $prefix = get_option('tpre'); - return $txpdb->get_results('SELECT - id, - date, - category, - url, - linkname, - description - FROM '.$prefix.'txp_link', - ARRAY_A); + return $txpdb->get_results('SELECT + id, + date, + category, + url, + linkname, + description + FROM '.$prefix.'txp_link', + ARRAY_A); } - function cat2wp($categories='') + function cat2wp($categories='') { // General Housekeeping global $wpdb; @@ -163,7 +163,7 @@ if(is_array($categories)) { echo '

        '.__('Importing Categories...').'

        '; - foreach ($categories as $category) + foreach ($categories as $category) { $count++; extract($category); @@ -225,7 +225,7 @@ 'display_name' => $name) ); } - else + else { $ret_id = wp_insert_user(array( 'user_login' => $name, @@ -301,35 +301,35 @@ if($pinfo = post_exists($Title,$Body)) { $ret_id = wp_insert_post(array( - 'ID' => $pinfo, - 'post_date' => $Posted, - 'post_date_gmt' => $post_date_gmt, - 'post_author' => $authorid, - 'post_modified' => $LastMod, - 'post_modified_gmt' => $post_modified_gmt, - 'post_title' => $Title, - 'post_content' => $Body, - 'post_excerpt' => $Excerpt, - 'post_status' => $post_status, - 'post_name' => $url_title, - 'comment_count' => $comments_count) - ); + 'ID' => $pinfo, + 'post_date' => $Posted, + 'post_date_gmt' => $post_date_gmt, + 'post_author' => $authorid, + 'post_modified' => $LastMod, + 'post_modified_gmt' => $post_modified_gmt, + 'post_title' => $Title, + 'post_content' => $Body, + 'post_excerpt' => $Excerpt, + 'post_status' => $post_status, + 'post_name' => $url_title, + 'comment_count' => $comments_count) + ); } - else + else { $ret_id = wp_insert_post(array( - 'post_date' => $Posted, - 'post_date_gmt' => $post_date_gmt, - 'post_author' => $authorid, - 'post_modified' => $LastMod, - 'post_modified_gmt' => $post_modified_gmt, - 'post_title' => $Title, - 'post_content' => $Body, - 'post_excerpt' => $Excerpt, - 'post_status' => $post_status, - 'post_name' => $url_title, - 'comment_count' => $comments_count) - ); + 'post_date' => $Posted, + 'post_date_gmt' => $post_date_gmt, + 'post_author' => $authorid, + 'post_modified' => $LastMod, + 'post_modified_gmt' => $post_modified_gmt, + 'post_title' => $Title, + 'post_content' => $Body, + 'post_excerpt' => $Excerpt, + 'post_status' => $post_status, + 'post_name' => $url_title, + 'comment_count' => $comments_count) + ); } $txpposts2wpposts[$ID] = $ret_id; @@ -378,29 +378,29 @@ { // Update comments $ret_id = wp_update_comment(array( - 'comment_ID' => $cinfo, - 'comment_post_ID' => $comment_post_ID, - 'comment_author' => $name, - 'comment_author_email' => $email, - 'comment_author_url' => $web, - 'comment_date' => $posted, - 'comment_content' => $message, - 'comment_approved' => $comment_approved) - ); + 'comment_ID' => $cinfo, + 'comment_post_ID' => $comment_post_ID, + 'comment_author' => $name, + 'comment_author_email' => $email, + 'comment_author_url' => $web, + 'comment_date' => $posted, + 'comment_content' => $message, + 'comment_approved' => $comment_approved) + ); } - else + else { // Insert comments $ret_id = wp_insert_comment(array( - 'comment_post_ID' => $comment_post_ID, - 'comment_author' => $name, - 'comment_author_email' => $email, - 'comment_author_url' => $web, - 'comment_author_IP' => $ip, - 'comment_date' => $posted, - 'comment_content' => $message, - 'comment_approved' => $comment_approved) - ); + 'comment_post_ID' => $comment_post_ID, + 'comment_author' => $name, + 'comment_author_email' => $email, + 'comment_author_url' => $web, + 'comment_author_IP' => $ip, + 'comment_date' => $posted, + 'comment_content' => $message, + 'comment_approved' => $comment_approved) + ); } $txpcm2wpcm[$comment_ID] = $ret_id; } @@ -449,7 +449,7 @@ 'link_updated' => $date) ); } - else + else { $ret_id = wp_insert_link(array( 'link_url' => $url, @@ -471,7 +471,7 @@ return false; } - function import_categories() + function import_categories() { // Category Import $cats = $this->get_txp_cats(); @@ -489,7 +489,7 @@ function import_users() { // User Import - $users = $this->get_txp_users(); + $users = $this->get_txp_users(); $this->users2wp($users); echo ''; @@ -577,7 +577,7 @@ echo '
      '; } - function dispatch() + function dispatch() { if (empty ($_GET['step'])) @@ -586,7 +586,7 @@ $step = (int) $_GET['step']; $this->header(); - if ( $step > 0 ) + if ( $step > 0 ) { if($_POST['dbuser']) { @@ -611,19 +611,19 @@ { if(get_option('txphost')) delete_option('txphost'); - add_option('txphost',$_POST['dbhost']); + add_option('txphost',$_POST['dbhost']); } if($_POST['dbprefix']) { if(get_option('tpre')) delete_option('tpre'); - add_option('tpre',$_POST['dbprefix']); + add_option('tpre',$_POST['dbprefix']); } } - switch ($step) + switch ($step) { default: case 0 : @@ -652,7 +652,7 @@ $this->footer(); } - function Textpattern_Import() + function Textpattern_Import() { // Nothing. } Index: wp-admin/import/wordpress.php =================================================================== --- wp-admin/import/wordpress.php (revision 3978) +++ wp-admin/import/wordpress.php (working copy) @@ -56,9 +56,9 @@ $pass = 'changeme'; if (!(in_array($author, $this->mtnames))) { //a new mt author name is found ++ $this->j; - $this->mtnames[$this->j] = $author; //add that new mt author name to an array + $this->mtnames[$this->j] = $author; //add that new mt author name to an array $user_id = username_exists($this->newauthornames[$this->j]); //check if the new author name defined by the user is a pre-existing wp user - if (!$user_id) { //banging my head against the desk now. + if (!$user_id) { //banging my head against the desk now. if ($newauthornames[$this->j] == 'left_blank') { //check if the user does not want to change the authorname $user_id = wp_create_user($author, $pass); $this->newauthornames[$this->j] = $author; //now we have a name, in the place of left_blank. @@ -271,7 +271,7 @@ function import() { $this->id = (int) $_GET['id']; - + $this->file = get_attached_file($this->id); $this->get_authors_from_post(); $this->get_entries();