$title

$welcome

"; + echo "

" . __('Please note that this importer does not work with Blogger (using your Google account).') . "

"; if ( function_exists('curl_init') ) echo "

"; else @@ -135,13 +136,13 @@ class Blogger_Import { curl_setopt($ch, CURLOPT_RETURNTRANSFER,1); if ($header) curl_setopt($ch, CURLOPT_HTTPHEADER, $header); $response = curl_exec ($ch); - + if ($parse) { $response = $this->parse_response($response); $response['url'] = $url; return $response; } - + return $response; } @@ -210,7 +211,7 @@ class Blogger_Import { $this->import['blogs'][$_GET['blog']]['nextstep'] = $step; update_option('import-blogger', $this->import); } - + // Redirects to next step function do_next_step() { wp_redirect("admin.php?import=blogger&noheader=true&blog={$_GET['blog']}"); @@ -224,13 +225,13 @@ class Blogger_Import { if ( ! ( $_POST['user'] && $_POST['pass'] ) ) { $this->login_form(__('The script will log into your Blogger account, change some settings so it can read your blog, and restore the original settings when it\'s done. Here\'s what you do:').'

'.__('Back up your Blogger template.').'
'.__('Back up any other Blogger settings you might need later.').'
'.__('Log out of Blogger').'
'.__('Log in here with your Blogger username and password.').'
'.__('On the next screen, click one of your Blogger blogs.').'
'.__('Do not close this window or navigate away until the process is complete.').'

'); } - - // Try logging in. If we get an array of cookies back, we at least connected. + + // Try logging in. If we get an array of cookies back, we at least connected. $this->import['cookies'] = $this->login_blogger($_POST['user'], $_POST['pass']); if ( !is_array( $this->import['cookies'] ) ) { $this->login_form(__('Login failed. Please enter your credentials again.')); } - + // Save the password so we can log the browser in when it's time to publish. $this->import['pass'] = $_POST['pass']; $this->import['user'] = $_POST['user']; @@ -341,7 +342,7 @@ class Blogger_Import { $form = "

"; $form.= $body; $form.= "

"; - $output.= '

'.sprintf('%s in progress, please wait...', $blog_opt)."

\n"; + $output.= '

'.sprintf(__('%s in progress, please wait...'), $blog_opt)."

\n"; } else { $output.= "

$blog_opt

\n"; } @@ -395,7 +396,7 @@ class Blogger_Import { update_option('import-blogger', $import); $archive = $this->get_blogger($url); if ( $archive['code'] > 200 ) - continue; + continue; $posts = explode('', $archive['body']); for ($i = 1; $i < count($posts); $i = $i + 1) { $postparts = explode('', $posts[$i]); @@ -409,7 +410,7 @@ class Blogger_Import { $post_title = ( $postinfo[4] != '' ) ? $postinfo[4] : $postinfo[3]; $post_author_name = $wpdb->escape(trim($postinfo[1])); $post_author_email = $postinfo[5] ? $postinfo[5] : 'user@wordpress.org'; - + if ( $this->lump_authors ) { // Ignore Blogger authors. Use the current user_ID for all posts imported. $post_author = $GLOBALS['user_ID']; @@ -420,7 +421,7 @@ class Blogger_Import { $user_email = $wpdb->escape($post_author_email); $user_password = substr(md5(uniqid(microtime())), 0, 6); $result = wp_create_user( $user_login, $user_password, $user_email ); - $status.= sprintf('Registered user %s.', $user_login); + $status.= sprintf(__('Registered user %s.'), $user_login); $this->import['blogs'][$_GET['blog']]['newusers'][] = $user_login; } $userdata = get_userdatabylogin( $post_author_name ); @@ -435,21 +436,21 @@ class Blogger_Import { $posthour = zeroise($post_date_His[0], 2); $postminute = zeroise($post_date_His[1], 2); $postsecond = zeroise($post_date_His[2], 2); - + if (($post_date[2] == 'PM') && ($posthour != '12')) $posthour = $posthour + 12; else if (($post_date[2] == 'AM') && ($posthour == '12')) $posthour = '00'; - + $post_date = "$postyear-$postmonth-$postday $posthour:$postminute:$postsecond"; - + $post_content = addslashes($post_content); $post_content = str_replace(array('
','
','
','
','
','
'), "\n", $post_content); // the XHTML touch... ;) - + $post_title = addslashes($post_title); - + $post_status = 'publish'; - + if ( $ID = post_exists($post_title, '', $post_date) ) { $post_array[$i]['ID'] = $ID; $skippedpostcount++; @@ -509,7 +510,7 @@ class Blogger_Import { } } $status = sprintf(__('%s post(s) parsed, %s skipped...'), $postcount, $skippedpostcount).' '. - sprintf(__('%s comment(s) parsed, %s skipped...'), $commentcoun, $skippedcommentcount).' '. + sprintf(__('%s comment(s) parsed, %s skipped...'), $commentcount, $skippedcommentcount).' '. ' '.__('Done').''; $import = $this->import; $import['blogs'][$_GET['blog']]['archives']["$url"] = $status; @@ -546,7 +547,7 @@ class Blogger_Import { $response = $this->get_blogger("http://www.blogger.com/blog-publishing.g?blogID={$_GET['blog']}&publishMode={$optary['backup']['publishMode']}", $headers); sleep(2); if ( $response['code'] >= 400 ) - die('

Error restoring publishMode.

Please tell the devs.

' . addslashes(print_r($response, 1)) ); + die('

'.__('Error restoring publishMode').'

'.__('Please tell the devs.').'

' . addslashes(print_r($response, 1)) ); } } if ( $optary['backup'] != $optary['modify'] ) { @@ -597,11 +598,11 @@ class Blogger_Import { if ( $_GET['restart'] == 'true' ) { $this->restart(); } - + if ( isset($_GET['noheader']) ) { header('Content-Type: text/html; charset=utf-8'); - $this->import = get_settings('import-blogger'); + $this->import = get_option('import-blogger'); if ( false === $this->import ) { $step = 0; @@ -649,7 +650,7 @@ class Blogger_Import { break; } die; - + } else { $this->greet(); } @@ -662,6 +663,6 @@ class Blogger_Import { $blogger_import = new Blogger_Import(); -register_importer('blogger', 'Blogger', __('Import posts and comments from a Blogger account'), array ($blogger_import, 'start')); +register_importer('blogger', __('Old Blogger'), __('Import posts and comments from your Old Blogger account'), array ($blogger_import, 'start')); ?> diff --git a/wp-admin/import/dotclear.php b/wp-admin/import/dotclear.php index b4f2cd34..fd4f2d65 100644 --- a/wp-admin/import/dotclear.php +++ b/wp-admin/import/dotclear.php @@ -1,16 +1,21 @@ get_var('SELECT cat_ID FROM '.$wpdb->categories.' WHERE category_nicename="'.$category_nicename.'"'); - + return $name; } } @@ -55,57 +60,58 @@ if(!function_exists('link_exists')) // // 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_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_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_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)) { @@ -127,7 +133,7 @@ class Dotclear_Import { function header() { echo '

'; - echo '

'.__('Import Dotclear').'

'; + echo '

'.__('Import DotClear').'

'; echo '

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

'; } @@ -135,78 +141,79 @@ class Dotclear_Import { { echo '

'; } - + 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:').'

'; + 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:').'

'; echo ''; + echo '

'; + echo '

'; } - function get_dc_cats() + function get_dc_cats() { global $wpdb; // General Housekeeping $dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost')); set_magic_quotes_runtime(0); - $prefix = get_option('tpre'); - + $dbprefix = get_option('dcdbprefix'); + // Get Categories - return $dcdb->get_results('SELECT * FROM dc_categorie', ARRAY_A); + return $dcdb->get_results('SELECT * FROM '.$dbprefix.'categorie', ARRAY_A); } - + function get_dc_users() { global $wpdb; // General Housekeeping $dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost')); set_magic_quotes_runtime(0); - $prefix = get_option('tpre'); - + $dbprefix = get_option('dcdbprefix'); + // Get Users - - return $dcdb->get_results('SELECT * FROM dc_user', ARRAY_A); + + return $dcdb->get_results('SELECT * FROM '.$dbprefix.'user', ARRAY_A); } - + function get_dc_posts() { // General Housekeeping $dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost')); set_magic_quotes_runtime(0); - $prefix = get_option('tpre'); - + $dbprefix = get_option('dcdbprefix'); + // Get Posts - return $dcdb->get_results('SELECT dc_post.*, dc_categorie.cat_libelle_url AS post_cat_name - FROM dc_post INNER JOIN dc_categorie - ON dc_post.cat_id = dc_categorie.cat_id', ARRAY_A); + 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); } - + function get_dc_comments() { global $wpdb; // General Housekeeping $dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost')); set_magic_quotes_runtime(0); - $prefix = get_option('tpre'); - + $dbprefix = get_option('dcdbprefix'); + // Get Comments - return $dcdb->get_results('SELECT * FROM dc_comment', ARRAY_A); + return $dcdb->get_results('SELECT * FROM '.$dbprefix.'comment', ARRAY_A); } - + function get_dc_links() { //General Housekeeping $dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost')); set_magic_quotes_runtime(0); - $prefix = get_option('tpre'); + $dbprefix = get_option('dcdbprefix'); - return $dcdb->get_results('SELECT * FROM dc_link ORDER BY position', ARRAY_A); + return $dcdb->get_results('SELECT * FROM '.$dbprefix.'link ORDER BY position', ARRAY_A); } - - function cat2wp($categories='') + + function cat2wp($categories='') { // General Housekeeping global $wpdb; @@ -216,11 +223,11 @@ class Dotclear_Import { if(is_array($categories)) { echo '

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

'; - foreach ($categories as $category) + foreach ($categories as $category) { $count++; extract($category); - + // Make Nice Variables $name = $wpdb->escape($cat_libelle_url); $title = $wpdb->escape(csc ($cat_libelle)); @@ -236,7 +243,7 @@ class Dotclear_Import { } $dccat2wpcat[$id] = $ret_id; } - + // Store category translation for future use add_option('dccat2wpcat',$dccat2wpcat); echo '

'.sprintf(__('Done! %1$s categories imported.'), $count).'

'; @@ -245,14 +252,14 @@ class Dotclear_Import { echo __('No Categories to Import!'); return false; } - + function users2wp($users='') { // General Housekeeping global $wpdb; $count = 0; $dcid2wpid = array(); - + // Midnight Mojo if(is_array($users)) { @@ -261,14 +268,14 @@ class Dotclear_Import { { $count++; extract($user); - + // Make Nice Variables $name = $wpdb->escape(csc ($name)); $RealName = $wpdb->escape(csc ($user_pseudo)); - + if($uinfo = get_userdatabylogin($name)) { - + $ret_id = wp_insert_user(array( 'ID' => $uinfo->ID, 'user_login' => $user_id, @@ -278,7 +285,7 @@ class Dotclear_Import { 'display_name' => $Realname) ); } - else + else { $ret_id = wp_insert_user(array( 'user_login' => $user_id, @@ -289,9 +296,9 @@ class Dotclear_Import { ); } $dcid2wpid[$user_id] = $ret_id; - - // Set Dotclear-to-WordPress permissions translation - + + // Set DotClear-to-WordPress permissions translation + // Update Usermeta Data $user = new WP_User($ret_id); $wp_perms = $user_level + 1; @@ -302,26 +309,26 @@ class Dotclear_Import { else if(3 <= $wp_perms) { $user->set_role('contributor'); } else if(2 <= $wp_perms) { $user->set_role('contributor'); } else { $user->set_role('subscriber'); } - + update_usermeta( $ret_id, 'wp_user_level', $wp_perms); update_usermeta( $ret_id, 'rich_editing', 'false'); update_usermeta( $ret_id, 'first_name', csc ($user_prenom)); update_usermeta( $ret_id, 'last_name', csc ($user_nom)); }// End foreach($users as $user) - + // Store id translation array for future use add_option('dcid2wpid',$dcid2wpid); - - + + echo '

'.sprintf(__('Done! %1$s users imported.'), $count).'

'; return true; }// End if(is_array($users) - + echo __('No Users to Import!'); return false; - + }// End function user2wp() - + function posts2wp($posts='') { // General Housekeeping @@ -338,17 +345,18 @@ class Dotclear_Import { { $count++; extract($post); - - // Set Dotclear-to-WordPress status translation + + // Set DotClear-to-WordPress status translation $stattrans = array(0 => 'draft', 1 => 'publish'); $comment_status_map = array (0 => 'closed', 1 => 'open'); - + //Can we do this more efficiently? $uinfo = ( get_userdatabylogin( $user_id ) ) ? get_userdatabylogin( $user_id ) : 1; $authorid = ( is_object( $uinfo ) ) ? $uinfo->ID : $uinfo ; $Title = $wpdb->escape(csc ($post_titre)); $post_content = textconv ($post_content); + $post_excerpt = ""; if ($post_chapo != "") { $post_excerpt = textconv ($post_chapo); $post_content = $post_excerpt ."\n\n".$post_content; @@ -356,9 +364,9 @@ class Dotclear_Import { $post_excerpt = $wpdb->escape ($post_excerpt); $post_content = $wpdb->escape ($post_content); $post_status = $stattrans[$post_pub]; - + // Import Post data into WordPress - + if($pinfo = post_exists($Title,$post_content)) { $ret_id = wp_insert_post(array( @@ -378,7 +386,7 @@ class Dotclear_Import { 'comment_count' => $post_nb_comment + $post_nb_trackback) ); } - else + else { $ret_id = wp_insert_post(array( 'post_author' => $authorid, @@ -397,7 +405,7 @@ class Dotclear_Import { ); } $dcposts2wpposts[$post_id] = $ret_id; - + // Make Post-to-Category associations $cats = array(); if($cat1 = get_catbynicename($post_cat_name)) { $cats[1] = $cat1; } @@ -407,11 +415,11 @@ class Dotclear_Import { } // Store ID translation for later use add_option('dcposts2wpposts',$dcposts2wpposts); - + echo '

'.sprintf(__('Done! %1$s posts imported.'), $count).'

'; - return true; + return true; } - + function comments2wp($comments='') { // General Housekeeping @@ -419,7 +427,7 @@ class Dotclear_Import { $count = 0; $dccm2wpcm = array(); $postarr = get_option('dcposts2wpposts'); - + // Magic Mojo if(is_array($comments)) { @@ -428,16 +436,16 @@ class Dotclear_Import { { $count++; extract($comment); - + // WordPressify Data - $comment_ID = ltrim($comment_id, '0'); - $comment_post_ID = $postarr[$post_id]; + $comment_ID = (int) ltrim($comment_id, '0'); + $comment_post_ID = (int) $postarr[$post_id]; $comment_approved = "$comment_pub"; $name = $wpdb->escape(csc ($comment_auteur)); $email = $wpdb->escape($comment_email); $web = "http://".$wpdb->escape($comment_site); $message = $wpdb->escape(textconv ($comment_content)); - + if($cinfo = comment_exists($name, $comment_dt)) { // Update comments @@ -454,7 +462,7 @@ class Dotclear_Import { 'comment_approved' => $comment_approved) ); } - else + else { // Insert comments $ret_id = wp_insert_comment(array( @@ -472,25 +480,25 @@ class Dotclear_Import { $dccm2wpcm[$comment_ID] = $ret_id; } // Store Comment ID translation for future use - add_option('dccm2wpcm', $dccm2wpcm); - + add_option('dccm2wpcm', $dccm2wpcm); + // Associate newly formed categories with posts get_comment_count($ret_id); - - + + echo '

'.sprintf(__('Done! %1$s comments imported.'), $count).'

'; return true; } echo __('No Comments to Import!'); return false; } - + function links2wp($links='') { // General Housekeeping global $wpdb; $count = 0; - + // Deal with the links if(is_array($links)) { @@ -499,7 +507,7 @@ class Dotclear_Import { { $count++; extract($link); - + if ($title != "") { if ($cinfo = link_cat_exists (csc ($title))) { $category = $cinfo; @@ -511,7 +519,7 @@ class Dotclear_Import { } else { $linkname = $wpdb->escape(csc ($label)); $description = $wpdb->escape(csc ($title)); - + if($linfo = link_exists($linkname)) { $ret_id = wp_insert_link(array( 'link_id' => $linfo, @@ -540,70 +548,75 @@ class Dotclear_Import { echo __('No Links to Import!'); return false; } - - function import_categories() - { - // Category Import + + function import_categories() + { + // Category Import $cats = $this->get_dc_cats(); $this->cat2wp($cats); add_option('dc_cats', $cats); - - - + + + echo ''; } - + function import_users() { // User Import - $users = $this->get_dc_users(); + $users = $this->get_dc_users(); $this->users2wp($users); - + echo ''; } - + function import_posts() { // Post Import $posts = $this->get_dc_posts(); $this->posts2wp($posts); - + echo ''; } - + function import_comments() { // Comment Import $comments = $this->get_dc_comments(); $this->comments2wp($comments); - + echo ''; } - + function import_links() { //Link Import $links = $this->get_dc_links(); $this->links2wp($links); add_option('dc_links', $links); - + echo ''; } - + function cleanup_dcimport() { - delete_option('tpre'); + delete_option('dcdbprefix'); delete_option('dc_cats'); delete_option('dcid2wpid'); delete_option('dccat2wpcat'); @@ -617,39 +630,39 @@ class Dotclear_Import { delete_option('dccharset'); $this->tips(); } - + function tips() { - echo '

'.__('Welcome to WordPress. We hope (and expect!) that you will find this platform incredibly rewarding! As a new WordPress user coming from Dotclear, there are some things that we would like to point out. Hopefully, they will help your transition go as smoothly as possible.').'

'; + echo '

'.__('Welcome to WordPress. We hope (and expect!) that you will find this platform incredibly rewarding! As a new WordPress user coming from DotClear, there are some things that we would like to point out. Hopefully, they will help your transition go as smoothly as possible.').'

'; echo '

'.__('Users').'

'; - echo '

'.sprintf(__('You have already setup WordPress and have been assigned an administrative login and password. Forget it. You didn\'t have that login in Dotclear, why should you have it here? Instead we have taken care to import all of your users into our system. Unfortunately there is one downside. Because both WordPress and Dotclear uses a strong encryption hash with passwords, it is impossible to decrypt it and we are forced to assign temporary passwords to all your users. Every user has the same username, but their passwords are reset to password123. So Login and change it.'), '/wp-login.php').'

'; + echo '

'.sprintf(__('You have already setup WordPress and have been assigned an administrative login and password. Forget it. You didn\'t have that login in DotClear, why should you have it here? Instead we have taken care to import all of your users into our system. Unfortunately there is one downside. Because both WordPress and DotClear uses a strong encryption hash with passwords, it is impossible to decrypt it and we are forced to assign temporary passwords to all your users. Every user has the same username, but their passwords are reset to password123. So Login and change it.'), '/wp-login.php').'

'; echo '

'.__('Preserving Authors').'

'; echo '

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

'; echo '

'.__('Textile').'

'; - echo '

'.__('Also, since you\'re coming from Dotclear, you probably have been using Textile to format your comments and posts. If this is the case, we recommend downloading and installing Textile for WordPress. Trust me... You\'ll want it.').'

'; + echo '

'.__('Also, since you\'re coming from DotClear, you probably have been using Textile to format your comments and posts. If this is the case, we recommend downloading and installing Textile for WordPress. Trust me... You\'ll want it.').'

'; echo '

'.__('WordPress Resources').'

'; echo '

'.__('Finally, there are numerous WordPress resources around the internet. Some of them are:').'

'; echo '

'.__('The official WordPress site').'
'.__('The WordPress support forums').'

'; + echo '

'.__('The WordPress support forums').'
'.__('The Codex (In other words, the WordPress Bible)').'

'; - echo '

'.sprintf(__('That\'s it! What are you waiting for? Go login!'), '/wp-login.php').'

'; + echo '

'.sprintf(__('That\'s it! What are you waiting for? Go login!'), '../wp-login.php').'

'; } - + function db_form() { - echo '

'; + echo ''; + printf('', __('DotClear Database User:')); + printf('', __('DotClear Database Password:')); + printf('', __('DotClear Database Name:')); + printf('', __('DotClear Database Host:')); + printf('', __('DotClear Table prefix:')); + printf('', __('Originating character set:')); + echo '

%s
%s
%s
%s
%s
%s

'; } - - function dispatch() + + function dispatch() { if (empty ($_GET['step'])) @@ -657,51 +670,53 @@ class Dotclear_Import { else $step = (int) $_GET['step']; $this->header(); - - if ( $step > 0 ) + + if ( $step > 0 ) { + check_admin_referer('import-dotclear'); + if($_POST['dbuser']) { if(get_option('dcuser')) - delete_option('dcuser'); - add_option('dcuser',$_POST['dbuser']); + delete_option('dcuser'); + add_option('dcuser', sanitize_user($_POST['dbuser'], true)); } if($_POST['dbpass']) { if(get_option('dcpass')) - delete_option('dcpass'); - add_option('dcpass',$_POST['dbpass']); + delete_option('dcpass'); + add_option('dcpass', sanitize_user($_POST['dbpass'], true)); } - + if($_POST['dbname']) { if(get_option('dcname')) - delete_option('dcname'); - add_option('dcname',$_POST['dbname']); + delete_option('dcname'); + add_option('dcname', sanitize_user($_POST['dbname'], true)); } if($_POST['dbhost']) { if(get_option('dchost')) delete_option('dchost'); - add_option('dchost',$_POST['dbhost']); + add_option('dchost', sanitize_user($_POST['dbhost'], true)); } if($_POST['dccharset']) { if(get_option('dccharset')) delete_option('dccharset'); - add_option('dccharset',$_POST['dccharset']); - } + add_option('dccharset', sanitize_user($_POST['dccharset'], true)); + } if($_POST['dbprefix']) { - if(get_option('tpre')) - delete_option('tpre'); - add_option('tpre',$_POST['dbprefix']); - } + if(get_option('dcdbprefix')) + delete_option('dcdbprefix'); + add_option('dcdbprefix', sanitize_user($_POST['dbprefix'], true)); + } } - switch ($step) + switch ($step) { default: case 0 : @@ -726,16 +741,16 @@ class Dotclear_Import { $this->cleanup_dcimport(); break; } - + $this->footer(); } - function Dotclear_Import() + function Dotclear_Import() { - // Nothing. + // Nothing. } } $dc_import = new Dotclear_Import(); -register_importer('dotclear', 'Dotclear', __('Import posts from a Dotclear Blog'), array ($dc_import, 'dispatch')); +register_importer('dotclear', __('DotClear'), __('Import categories, users, posts, comments, and links from a DotClear blog'), array ($dc_import, 'dispatch')); ?> diff --git a/wp-admin/import/greymatter.php b/wp-admin/import/greymatter.php index e69de29b..4305cd18 100644 --- a/wp-admin/import/greymatter.php +++ b/wp-admin/import/greymatter.php @@ -0,0 +1,317 @@ +'; + echo '

'.__('Import GreyMatter').'

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

	Documentation on date formatting. Save option to update sample output.') ?>	Documentation on date formatting. Click "Update options" to update sample output.') ?>

:	+	wp-content/uploads'); ?>

$option->option_name		"; + + if (strpos($value, "\n") !== false) echo "" . wp_specialchars($value) . ""; + else echo ""; + + echo "	$option->option_description

diff --git a/wp-includes/cache.php b/wp-includes/cache.php index 79a0566b..334a9610 100644 --- a/wp-includes/cache.php +++ b/wp-includes/cache.php @@ -8,6 +8,8 @@ function wp_cache_add($key, $data, $flag = '', $expire = 0) { function wp_cache_close() { global $wp_object_cache; + if ( ! isset($wp_object_cache) ) + return; return $wp_object_cache->save(); } @@ -30,9 +32,7 @@ function wp_cache_get($id, $flag = '') { } function wp_cache_init() { - global $wp_object_cache; - - $wp_object_cache = new WP_Object_Cache(); + $GLOBALS['wp_object_cache'] =& new WP_Object_Cache(); } function wp_cache_replace($key, $data, $flag = '', $expire = 0) { @@ -404,8 +404,14 @@ class WP_Object_Cache { } function WP_Object_Cache() { + return $this->__construct(); + } + + function __construct() { global $blog_id; + register_shutdown_function(array(&$this, "__destruct")); + if (defined('DISABLE_CACHE')) return; @@ -440,5 +446,10 @@ class WP_Object_Cache { $this->blog_id = $this->hash($blog_id); } + + function __destruct() { + $this->save(); + return true; + } } ?> diff --git a/wp-includes/class-snoopy.php b/wp-includes/class-snoopy.php index 08baa19e..e1a9c23d 100644 --- a/wp-includes/class-snoopy.php +++ b/wp-includes/class-snoopy.php @@ -1239,7 +1239,7 @@ class Snoopy $fp = fopen($file_name, "r"); while (!feof($fp)) { - $file_content = fread($fp, filesize($file_name)); + $file_content .= fread($fp, filesize($file_name)); } fclose($fp); $base_name = basename($file_name); diff --git a/wp-includes/classes.php b/wp-includes/classes.php index 292e1c8c..2af152fc 100644 --- a/wp-includes/classes.php +++ b/wp-includes/classes.php @@ -109,7 +109,7 @@ class WP_Query { // If year, month, day, hour, minute, and second are set, a single // post is being queried. $this->is_single = true; - } elseif ('' != $qv['static'] || '' != $qv['pagename'] || '' != $qv['page_id']) { + } elseif ('' != $qv['static'] || '' != $qv['pagename'] || (int) $qv['page_id']) { $this->is_page = true; $this->is_single = false; } elseif (!empty($qv['s'])) { @@ -246,8 +246,12 @@ class WP_Query { } function set_404() { + $is_feed = $this->is_feed; + $this->init_query_flags(); - $this->is_404 = true; + $this->is_404 = true; + + $this->is_feed = $is_feed; } function get($query_var) { @@ -594,13 +598,13 @@ class WP_Query { } if ( $this->is_attachment ) { - $where .= ' AND (post_status = "attachment")'; + $where .= " AND (post_status = 'attachment')"; } elseif ($this->is_page) { - $where .= ' AND (post_status = "static")'; + $where .= " AND (post_status = 'static')"; } elseif ($this->is_single) { - $where .= ' AND (post_status != "static")'; + $where .= " AND (post_status != 'static')"; } else { - $where .= ' AND (post_status = "publish"'; + $where .= " AND (post_status = 'publish'"; if (isset($user_ID) && ('' != intval($user_ID))) $where .= " OR post_author = $user_ID AND post_status != 'draft' AND post_status != 'static')"; @@ -609,7 +613,7 @@ class WP_Query { } if (! $this->is_attachment ) - $where .= ' AND post_status != "attachment"'; + $where .= " AND post_status != 'attachment'"; // Apply filters on where and join prior to paging so that any // manipulations to them are reflected in the paging by day queries. @@ -805,7 +809,7 @@ class retrospam_mgr { $list = array_unique( $list ); $this->spam_words = $list; - $this->comment_list = $wpdb->get_results("SELECT comment_ID AS ID, comment_content AS text, comment_approved AS approved, comment_author_url AS url, comment_author_ip AS ip, comment_author_email AS email FROM $wpdb->comments ORDER BY comment_ID ASC"); + $this->comment_list = (array) $wpdb->get_results("SELECT comment_ID AS ID, comment_content AS text, comment_approved AS approved, comment_author_url AS url, comment_author_ip AS ip, comment_author_email AS email FROM $wpdb->comments ORDER BY comment_ID ASC"); } // End of class constructor function move_spam( $id_list ) { @@ -818,9 +822,9 @@ class retrospam_mgr { $cnt++; } } - echo "

$cnt comment"; - if ($cnt != 1 ) echo "s"; - echo " moved to the moderation queue.

\n"; + echo "

"; + printf(__('%d comment(s) moved to the moderation queue.'), $cnt); + echo "

\n"; } // End function move_spam function find_spam() { @@ -849,7 +853,7 @@ class retrospam_mgr { $numfound = count($counters[found]); $numqueue = $counters[in_queue]; - $body = '

' . sprintf(__('Suspected spam comments: %s'), $numfound) . '

'; + $body = '

' . sprintf(__('Suspected spam comments: %s'), "$numfound") . '

'; if ( count($counters[found]) > 0 ) { $id_list = implode( ',', $counters[found] ); @@ -1032,6 +1036,7 @@ class WP_Rewrite { $front = $front . 'date/'; break; } + $tok_index++; } $this->date_structure = $front . $date_endian; @@ -1314,6 +1319,14 @@ class WP_Rewrite { if (empty($this->permalink_structure)) { return $rewrite; } + //Default Feed rules - These are require to allow for the direct access files to work with permalink structure starting with %category% + $default_feeds = array( 'wp-atom.php$' => $this->index .'?feed=atom', + 'wp-rdf.php$' => $this->index .'?feed=rdf', + 'wp-rss.php$' => $this->index .'?feed=rss', + 'wp-rss2.php$' => $this->index .'?feed=rss2', + 'wp-feed.php$' => $this->index .'?feed=feed', + 'wp-commentsrss2.php$' => $this->index . '?feed=rss2&withcomments=1'); + // Post $post_rewrite = $this->generate_rewrite_rules($this->permalink_structure); @@ -1349,7 +1362,7 @@ class WP_Rewrite { $page_rewrite = apply_filters('page_rewrite_rules', $page_rewrite); // Put them together. - $this->rules = array_merge($page_rewrite, $root_rewrite, $comments_rewrite, $search_rewrite, $category_rewrite, $author_rewrite, $date_rewrite, $post_rewrite); + $this->rules = array_merge($default_feeds, $page_rewrite, $root_rewrite, $comments_rewrite, $search_rewrite, $category_rewrite, $author_rewrite, $date_rewrite, $post_rewrite); do_action('generate_rewrite_rules', array(&$this)); $this->rules = apply_filters('rewrite_rules_array', $this->rules); @@ -1499,7 +1512,7 @@ class WP { $pathinfo = $_SERVER['PATH_INFO']; $pathinfo_array = explode('?', $pathinfo); - $pathinfo = $pathinfo_array[0]; + $pathinfo = str_replace("%", "%25", $pathinfo_array[0]); $req_uri = $_SERVER['REQUEST_URI']; $req_uri_array = explode('?', $req_uri); $req_uri = $req_uri_array[0]; @@ -1604,6 +1617,9 @@ class WP { $this->query_vars[$wpvar] = $query_vars[$wpvar]; else $this->query_vars[$wpvar] = ''; + + if ( !empty( $this->query_vars[$wpvar] ) ) + $this->query_vars[$wpvar] = (string) $this->query_vars[$wpvar]; } if ( isset($error) ) @@ -1616,6 +1632,8 @@ class WP { nocache_headers(); if ( !empty($this->query_vars['error']) && '404' == $this->query_vars['error'] ) { status_header( 404 ); + if ( !is_user_logged_in() ) + nocache_headers(); @header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); } else if ( empty($this->query_vars['feed']) ) { @header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); @@ -1630,7 +1648,8 @@ class WP { @header("ETag: $wp_etag"); // Support for Conditional GET - if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) $client_etag = stripslashes($_SERVER['HTTP_IF_NONE_MATCH']); + if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) + $client_etag = stripslashes(stripslashes($_SERVER['HTTP_IF_NONE_MATCH'])); else $client_etag = false; $client_last_modified = trim( $_SERVER['HTTP_IF_MODIFIED_SINCE']); @@ -1655,6 +1674,8 @@ class WP { foreach ($this->public_query_vars as $wpvar) { if (isset($this->query_vars[$wpvar]) && '' != $this->query_vars[$wpvar]) { $this->query_string .= (strlen($this->query_string) < 1) ? '' : '&'; + if ( !is_scalar($this->query_vars[$wpvar]) ) // Discard non-scalars. + continue; $this->query_string .= $wpvar . '=' . rawurlencode($this->query_vars[$wpvar]); } } @@ -1705,6 +1726,7 @@ class WP { if ( (0 == count($wp_query->posts)) && !is_404() && !is_search() && ( $this->did_permalink || (!empty($_SERVER['QUERY_STRING']) && (false === strpos($_SERVER['REQUEST_URI'], '?'))) ) ) { $wp_query->set_404(); status_header( 404 ); + nocache_headers(); } elseif( is_404() != true ) { status_header( 200 ); } diff --git a/wp-includes/comment-functions.php b/wp-includes/comment-functions.php index 53adcf20..3f2ab8df 100644 --- a/wp-includes/comment-functions.php +++ b/wp-includes/comment-functions.php @@ -2,6 +2,12 @@ // Template functions +function wp_comment_form_unfiltered_html_nonce() { + global $post; + if ( current_user_can('unfiltered_html') ) + wp_nonce_field('unfiltered-html-comment_' . $post->ID, '_wp_unfiltered_html_comment', false); +} + function comments_template( $file = '/comments.php' ) { global $wp_query, $withcomments, $post, $wpdb, $id, $comment, $user_login, $user_ID, $user_identity; @@ -84,7 +90,7 @@ function wp_insert_comment($commentdata) { ('$comment_post_ID', '$comment_author', '$comment_author_email', '$comment_author_url', '$comment_author_IP', '$comment_date', '$comment_date_gmt', '$comment_content', '$comment_approved', '$comment_agent', '$comment_type', '$comment_parent', '$user_id') "); - $id = $wpdb->insert_id; + $id = (int) $wpdb->insert_id; if ( $comment_approved == 1) { $count = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = '$comment_post_ID' AND comment_approved = '1'"); @@ -109,8 +115,6 @@ function wp_allow_comment($commentdata) { global $wpdb; extract($commentdata); - $comment_user_domain = apply_filters('pre_comment_user_domain', gethostbyaddr($comment_author_IP) ); - // Simple duplicate check $dupe = "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = '$comment_post_ID' AND ( comment_author = '$comment_author' "; if ( $comment_author_email ) @@ -215,21 +219,12 @@ function wp_delete_comment($comment_id) { return true; } -function clean_url( $url ) { - if ('' == $url) return $url; - $url = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $url); - $url = str_replace(';//', '://', $url); - $url = (!strstr($url, '://')) ? 'http://'.$url : $url; - $url = preg_replace('/&([^#])(?![a-z]{2,8};)/', '&$1', $url); - return $url; -} - function get_comments_number( $post_id = 0 ) { global $wpdb, $comment_count_cache, $id; $post_id = (int) $post_id; if ( !$post_id ) - $post_id = $id; + $post_id = (int) $id; if ( !isset($comment_count_cache[$post_id]) ) $comment_count_cache[$id] = $wpdb->get_var("SELECT comment_count FROM $wpdb->posts WHERE ID = '$post_id'"); @@ -315,7 +310,7 @@ function comments_popup_link($zero='No Comments', $one='1 Comment', $more='% Com if (!empty($CSSclass)) { echo ' class="'.$CSSclass.'"'; } - $title = wp_specialchars(apply_filters('the_title', get_the_title()), true); + $title = attribute_escape(apply_filters('the_title', get_the_title())); echo ' title="' . sprintf( __('Comment on %s'), $title ) .'">'; comments_number($zero, $one, $more, $number); echo ''; @@ -833,7 +828,7 @@ function check_comment($author, $email, $url, $comment, $user_ip, $user_agent, $ if (1 == get_settings('comment_moderation')) return false; // If moderation is set to manual - if ( (count(explode('http:', $comment)) - 1) >= get_settings('comment_max_links') ) + if ( preg_match_all("|(href\t*?=\t*?['\"]?)?(https?:)?//|i", $comment, $out) >= get_option('comment_max_links') ) return false; // Check # of external links $mod_keys = trim( get_settings('moderation_keys') ); @@ -897,21 +892,21 @@ function sanitize_comment_cookies() { if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) ) { $comment_author = apply_filters('pre_comment_author_name', $_COOKIE['comment_author_'.COOKIEHASH]); $comment_author = stripslashes($comment_author); - $comment_author = wp_specialchars($comment_author, true); + $comment_author = attribute_escape($comment_author); $_COOKIE['comment_author_'.COOKIEHASH] = $comment_author; } if ( isset($_COOKIE['comment_author_email_'.COOKIEHASH]) ) { $comment_author_email = apply_filters('pre_comment_author_email', $_COOKIE['comment_author_email_'.COOKIEHASH]); $comment_author_email = stripslashes($comment_author_email); - $comment_author_email = wp_specialchars($comment_author_email, true); + $comment_author_email = attribute_escape($comment_author_email); $_COOKIE['comment_author_email_'.COOKIEHASH] = $comment_author_email; } if ( isset($_COOKIE['comment_author_url_'.COOKIEHASH]) ) { $comment_author_url = apply_filters('pre_comment_author_url', $_COOKIE['comment_author_url_'.COOKIEHASH]); $comment_author_url = stripslashes($comment_author_url); - $comment_author_url = wp_specialchars($comment_author_url, true); + $comment_author_url = attribute_escape($comment_author_url); $_COOKIE['comment_author_url_'.COOKIEHASH] = $comment_author_url; } } diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php index 22cf7167..e6982a98 100644 --- a/wp-includes/default-filters.php +++ b/wp-includes/default-filters.php @@ -33,6 +33,8 @@ add_filter('pre_comment_author_name', 'wp_filter_kses'); add_filter('pre_comment_author_email', 'wp_filter_kses'); add_filter('pre_comment_author_url', 'wp_filter_kses'); +add_action('comment_form', 'wp_comment_form_unfiltered_html_nonce'); + // Default filters for these functions add_filter('comment_author', 'wptexturize'); add_filter('comment_author', 'convert_chars'); @@ -57,6 +59,31 @@ add_filter('pre_category_name', 'wp_filter_kses'); add_filter('pre_category_name', 'wp_specialchars', 30); add_filter('pre_category_description', 'wp_filter_kses'); +//Links +add_filter('pre_link_name', 'strip_tags'); +add_filter('pre_link_name', 'trim'); +add_filter('pre_link_name', 'wp_filter_kses'); +add_filter('pre_link_name', 'wp_specialchars', 30); +add_filter('pre_link_description', 'wp_filter_kses'); +add_filter('pre_link_notes', 'wp_filter_kses'); +add_filter('pre_link_url', 'strip_tags'); +add_filter('pre_link_url', 'trim'); +add_filter('pre_link_url', 'clean_url'); +add_filter('pre_link_image', 'strip_tags'); +add_filter('pre_link_image', 'trim'); +add_filter('pre_link_image', 'clean_url'); +add_filter('pre_link_rss', 'strip_tags'); +add_filter('pre_link_rss', 'trim'); +add_filter('pre_link_rss', 'clean_url'); +add_filter('pre_link_target', 'strip_tags'); +add_filter('pre_link_target', 'trim'); +add_filter('pre_link_target', 'wp_filter_kses'); +add_filter('pre_link_target', 'wp_specialchars', 30); +add_filter('pre_link_rel', 'strip_tags'); +add_filter('pre_link_rel', 'trim'); +add_filter('pre_link_rel', 'wp_filter_kses'); +add_filter('pre_link_rel', 'wp_specialchars', 30); + // Users add_filter('pre_user_display_name', 'strip_tags'); add_filter('pre_user_display_name', 'trim'); @@ -115,6 +142,9 @@ add_filter('comment_text_rss', 'ent2ncr', 8); add_filter('bloginfo_rss', 'ent2ncr', 8); add_filter('the_author', 'ent2ncr', 8); +// Misc filters +add_filter('option_blog_charset', 'wp_specialchars'); + // Actions add_action('publish_post', 'generic_ping'); add_action('wp_head', 'rsd_link'); diff --git a/wp-includes/feed-functions.php b/wp-includes/feed-functions.php index 0b377bc3..6a476698 100644 --- a/wp-includes/feed-functions.php +++ b/wp-includes/feed-functions.php @@ -134,9 +134,9 @@ function the_category_rss($type = 'rss') { foreach ($categories as $category) { $category->cat_name = convert_chars($category->cat_name); if ('rdf' == $type) { - $the_list .= "\n\t$category->cat_name"; + $the_list .= "\n\t\t$category->cat_name\n"; } else { - $the_list .= "\n\t$category->cat_name"; + $the_list .= "\n\t\t$category->cat_name\n"; } } echo apply_filters('the_category_rss', $the_list, $type); diff --git a/wp-includes/functions-formatting.php b/wp-includes/functions-formatting.php index 7db8ea02..217e953e 100644 --- a/wp-includes/functions-formatting.php +++ b/wp-includes/functions-formatting.php @@ -1,6 +1,7 @@ )/Us", $text, -1, PREG_SPLIT_DELIM_CAPTURE); @@ -16,9 +17,15 @@ function wptexturize($text) { $curl = str_replace('...', '…', $curl); $curl = str_replace('``', '“', $curl); - // This is a hack, look at this more later. It works pretty well though. - $cockney = array("'tain't","'twere","'twas","'tis","'twill","'til","'bout","'nuff","'round","'cause"); - $cockneyreplace = array("’tain’t","’twere","’twas","’tis","’twill","’til","’bout","’nuff","’round","’cause"); + // if a plugin has provided an autocorrect array, use it + if ( isset($wp_cockneyreplace) ) { + $cockney = array_keys($wp_cockneyreplace); + $cockney_replace = array_values($wp_cockneyreplace); + } else { + $cockney = array("'tain't","'twere","'twas","'tis","'twill","'til","'bout","'nuff","'round","'cause"); + $cockneyreplace = array("’tain’t","’twere","’twas","’tis","’twill","’til","’bout","’nuff","’round","’cause"); + } + $curl = str_replace($cockney, $cockneyreplace, $curl); $curl = preg_replace("/'s/", '’s', $curl); @@ -72,7 +79,7 @@ function wpautop($pee, $br = 1) { $pee = preg_replace('!(]*>)\s*

\n\t\t

" . wp_explain_nonce($action) . "

\n\t\t

" . __('No') . "

\n\t\t

\n\t\n"; + $html .= "\t\t

\n\t\t

" . wp_specialchars(wp_explain_nonce($action)) . "

\n\t\t

" . __('No') . "

\n\t\t

\n\t\n"; } else { - $html .= "\t

\n\t

" . wp_explain_nonce($action) . "

\n\t

" . __('No') . " " . __('Yes') . "

\n\t

\n"; + $html .= "\t

\n\t

" . wp_specialchars(wp_explain_nonce($action)) . "

\n\t

" . __('No') . " " . __('Yes') . "

\n\t

\n"; } $html .= "\n"; wp_die($html, $title); @@ -2503,4 +2565,4 @@ function wp_die($message, $title = '') { die(); } -?> \ No newline at end of file +?> diff --git a/wp-includes/gettext.php b/wp-includes/gettext.php index cd080444..ed94ca9e 100644 --- a/wp-includes/gettext.php +++ b/wp-includes/gettext.php @@ -63,10 +63,12 @@ class gettext_reader { function readint() { if ($this->BYTEORDER == 0) { // low endian - return array_shift(unpack('V', $this->STREAM->read(4))); + $low_end = unpack('V', $this->STREAM->read(4)); + return array_shift($low_end); } else { // big endian - return array_shift(unpack('N', $this->STREAM->read(4))); + $big_end = unpack('N', $this->STREAM->read(4)); + return array_shift($big_end); } } diff --git a/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js b/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js deleted file mode 100644 index e69de29b..00000000 diff --git a/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin_src.js b/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin_src.js deleted file mode 100644 index e69de29b..00000000 diff --git a/wp-includes/js/tinymce/plugins/inlinepopups/readme.txt b/wp-includes/js/tinymce/plugins/inlinepopups/readme.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/wp-includes/js/tinymce/tiny_mce_gzip.php b/wp-includes/js/tinymce/tiny_mce_gzip.php index c3af23dd..2c66bc38 100644 --- a/wp-includes/js/tinymce/tiny_mce_gzip.php +++ b/wp-includes/js/tinymce/tiny_mce_gzip.php @@ -59,7 +59,7 @@ gzip_compression(); // Output rest of headers - header("Content-type: text/javascript; charset: UTF-8"); + header("Content-Type: text/javascript; charset=".get_bloginfo('charset')); header("Vary: Accept-Encoding"); // Handle proxies header("Expires: " . gmdate("D, d M Y H:i:s", time() + $expiresOffset) . " GMT"); diff --git a/wp-includes/js/tinymce/wp-mce-help.php b/wp-includes/js/tinymce/wp-mce-help.php index f347c927..b53a8ced 100644 --- a/wp-includes/js/tinymce/wp-mce-help.php +++ b/wp-includes/js/tinymce/wp-mce-help.php @@ -1,6 +1,7 @@ diff --git a/wp-includes/kses.php b/wp-includes/kses.php index 03702ad8..072a96a7 100644 --- a/wp-includes/kses.php +++ b/wp-includes/kses.php @@ -524,21 +524,34 @@ function wp_filter_post_kses($data) { } function kses_init_filters() { - add_filter('pre_comment_author', 'wp_filter_kses'); - add_filter('pre_comment_content', 'wp_filter_kses'); - add_filter('content_save_pre', 'wp_filter_post_kses'); - add_filter('title_save_pre', 'wp_filter_kses'); + // Normal filtering. + add_filter('pre_comment_content', 'wp_filter_kses'); + add_filter('title_save_pre', 'wp_filter_kses'); + + // Post filtering + add_filter('content_save_pre', 'wp_filter_post_kses'); + add_filter('excerpt_save_pre', 'wp_filter_post_kses'); + add_filter('content_filtered_save_pre', 'wp_filter_post_kses'); } -function kses_init() { - remove_filter('pre_comment_author', 'wp_filter_kses'); +function kses_remove_filters() { + // Normal filtering. remove_filter('pre_comment_content', 'wp_filter_kses'); - remove_filter('content_save_pre', 'wp_filter_post_kses'); remove_filter('title_save_pre', 'wp_filter_kses'); + // Post filtering + remove_filter('content_save_pre', 'wp_filter_post_kses'); + remove_filter('excerpt_save_pre', 'wp_filter_post_kses'); + remove_filter('content_filtered_save_pre', 'wp_filter_post_kses'); +} + +function kses_init() { + kses_remove_filters(); + if (current_user_can('unfiltered_html') == false) kses_init_filters(); } + add_action('init', 'kses_init'); add_action('set_current_user', 'kses_init'); ?> diff --git a/wp-includes/links.php b/wp-includes/links.php index 71e2159c..d907933f 100644 --- a/wp-includes/links.php +++ b/wp-includes/links.php @@ -212,15 +212,15 @@ function get_links($category = -1, $the_link = '#'; if (!empty($row->link_url)) - $the_link = wp_specialchars($row->link_url); + $the_link = clean_url($row->link_url); $rel = $row->link_rel; if ($rel != '') { $rel = ' rel="' . $rel . '"'; } - $desc = wp_specialchars($row->link_description, ENT_QUOTES); - $name = wp_specialchars($row->link_name, ENT_QUOTES); + $desc = attribute_escape($row->link_description); + $name = attribute_escape($row->link_name); $title = $desc; if ($show_updated) { diff --git a/wp-includes/pluggable-functions.php b/wp-includes/pluggable-functions.php index 2c9dbc0c..be457f0f 100644 --- a/wp-includes/pluggable-functions.php +++ b/wp-includes/pluggable-functions.php @@ -78,9 +78,7 @@ function get_userdata( $user_id ) { if ($metavalues) { foreach ( $metavalues as $meta ) { - @ $value = unserialize($meta->meta_value); - if ($value === FALSE) - $value = $meta->meta_value; + $value = maybe_unserialize($meta->meta_value); $user->{$meta->meta_key} = $value; // We need to set user_level from meta, not row @@ -122,6 +120,8 @@ function get_userdatabylogin($user_login) { if ( $userdata ) return $userdata; + $user_login = $wpdb->escape($user_login); + if ( !$user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE user_login = '$user_login'") ) return false; @@ -131,9 +131,7 @@ function get_userdatabylogin($user_login) { if ($metavalues) { foreach ( $metavalues as $meta ) { - @ $value = unserialize($meta->meta_value); - if ($value === FALSE) - $value = $meta->meta_value; + $value = maybe_unserialize($meta->meta_value); $user->{$meta->meta_key} = $value; // We need to set user_level from meta, not row @@ -258,7 +256,7 @@ endif; // Cookie safe redirect. Works around IIS Set-Cookie bug. // http://support.microsoft.com/kb/q176113/ if ( !function_exists('wp_redirect') ) : -function wp_redirect($location) { +function wp_redirect($location, $status = 302) { global $is_IIS; $location = preg_replace('|[^a-z0-9-~+_.?#=&;,/:%]|i', '', $location); @@ -266,10 +264,13 @@ function wp_redirect($location) { $strip = array('%0d', '%0a'); $location = str_replace($strip, '', $location); - if ($is_IIS) + if ( $is_IIS ) { header("Refresh: 0;url=$location"); - else + } else { + if ( php_sapi_name() != 'cgi-fcgi' ) + status_header($status); // This causes problems on IIS and some FastCGI setups header("Location: $location"); + } } endif; @@ -335,7 +336,7 @@ function wp_notify_postauthor($comment_id, $comment_type='') { if ('' == $user->user_email) return false; // If there's no email to send the comment to - $comment_author_domain = gethostbyaddr($comment->comment_author_IP); + $comment_author_domain = @gethostbyaddr($comment->comment_author_IP); $blogname = get_settings('blogname'); @@ -412,7 +413,7 @@ function wp_notify_moderator($comment_id) { $comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID='$comment_id' LIMIT 1"); $post = $wpdb->get_row("SELECT * FROM $wpdb->posts WHERE ID='$comment->comment_post_ID' LIMIT 1"); - $comment_author_domain = gethostbyaddr($comment->comment_author_IP); + $comment_author_domain = @gethostbyaddr($comment->comment_author_IP); $comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'"); $notify_message = sprintf( __('A new comment on the post #%1$s "%2$s" is waiting for your approval'), $post->ID, $post->post_title ) . "\r\n"; @@ -467,7 +468,7 @@ endif; if ( !function_exists('wp_verify_nonce') ) : function wp_verify_nonce($nonce, $action = -1) { $user = wp_get_current_user(); - $uid = $user->id; + $uid = (int) $user->id; $i = ceil(time() / 43200); @@ -481,7 +482,7 @@ endif; if ( !function_exists('wp_create_nonce') ) : function wp_create_nonce($action = -1) { $user = wp_get_current_user(); - $uid = $user->id; + $uid = (int) $user->id; $i = ceil(time() / 43200); @@ -511,4 +512,4 @@ function wp_hash($data) { } endif; -?> +?> \ No newline at end of file diff --git a/wp-includes/registration-functions.php b/wp-includes/registration-functions.php index dcf81f50..56a433fd 100644 --- a/wp-includes/registration-functions.php +++ b/wp-includes/registration-functions.php @@ -77,7 +77,7 @@ function wp_insert_user($userdata) { $query = "UPDATE $wpdb->users SET user_pass='$user_pass', user_email='$user_email', user_url='$user_url', user_nicename = '$user_nicename', display_name = '$display_name' WHERE ID = '$ID'"; $query = apply_filters('update_user_query', $query); $wpdb->query( $query ); - $user_id = $ID; + $user_id = (int) $ID; } else { $query = "INSERT INTO $wpdb->users (user_login, user_pass, user_email, user_url, user_registered, user_nicename, display_name) @@ -85,7 +85,7 @@ function wp_insert_user($userdata) { ('$user_login', '$user_pass', '$user_email', '$user_url', '$user_registered', '$user_nicename', '$display_name')"; $query = apply_filters('create_user_query', $query); $wpdb->query( $query ); - $user_id = $wpdb->insert_id; + $user_id = (int) $wpdb->insert_id; } update_usermeta( $user_id, 'first_name', $first_name); diff --git a/wp-includes/rss-functions.php b/wp-includes/rss-functions.php index df2526ec..6750cdd3 100644 --- a/wp-includes/rss-functions.php +++ b/wp-includes/rss-functions.php @@ -816,9 +816,8 @@ function parse_w3cdtf ( $date_str ) { return -1; } } -function wp_rss ($url, $num) { +function wp_rss ($url, $num_items) { //ini_set("display_errors", false); uncomment to suppress php errors thrown if the feed is not returned. - $num_items = $num; $rss = fetch_rss($url); if ( $rss ) { echo "

' . the_author($idmode, false) . '

' . get_the_author() . '

display_name)) . '">' . $name . '

category_description) ) - $link .= 'title="'. sprintf(__("View all posts filed under %s"), wp_specialchars($category->cat_name)) . '"'; + $link .= 'title="'. sprintf(__("View all posts filed under %s"), attribute_escape($category->cat_name)) . '"'; else - $link .= 'title="' . wp_specialchars(apply_filters('category_description',$category->category_description,$category)) . '"'; + $link .= 'title="' . attribute_escape(apply_filters('category_description',$category->category_description,$category)) . '"'; $link .= '>'; $link .= apply_filters('list_cats', $category->cat_name, $category).'

'; else - echo '

'; + echo '

'; } echo $j; if ( ($i != $page) || ((!$more) && ($page==1)) ) @@ -170,14 +173,14 @@ function link_pages($before='
', $after='
', $next_or_number='number', if ( '' == get_settings('permalink_structure') ) echo '

'.$previouspagelink.'

' . $previouspagelink . '

'.$nextpagelink.'

' . $nextpagelink . '

'.$nextpagelink.'

' . $nextpagelink . '

$key: $value
' . $title . ''; + $output .= $indent . '
' . $title . ''; if ( isset($cur_page['ts']) ) { $format = get_settings('date_format'); diff --git a/wp-includes/version.php b/wp-includes/version.php index cab8bbed..985bf536 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -2,7 +2,7 @@ // This just holds the version number, in a separate file so we can bump it without cluttering the SVN -$wp_version = '2.0.4'; -$wp_db_version = 3440; +$wp_version = '2.0.11'; +$wp_db_version = 3441; ?> diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php index 8a4ebaa6..790ddcfd 100644 --- a/wp-includes/wp-db.php +++ b/wp-includes/wp-db.php @@ -40,6 +40,12 @@ class wpdb { // DB Constructor - connects to the server and selects a database function wpdb($dbuser, $dbpassword, $dbname, $dbhost) { + return $this->__construct($dbuser, $dbpassword, $dbname, $dbhost); + } + + function __construct($dbuser, $dbpassword, $dbname, $dbhost) { + register_shutdown_function(array(&$this, "__destruct")); + $this->dbh = @mysql_connect($dbhost, $dbuser, $dbpassword); if (!$this->dbh) { $this->bail(" @@ -57,6 +63,10 @@ class wpdb { $this->select($dbname); } + function __destruct() { + return true; + } + // ================================================================== // Select a DB (if another one needs to be selected) @@ -122,7 +132,7 @@ class wpdb { // Kill cached query results function flush() { - $this->last_result = null; + $this->last_result = array(); $this->col_info = null; $this->last_query = null; } @@ -131,6 +141,11 @@ class wpdb { // Basic Query - see docs for more detail function query($query) { + // filter the query, if filters are available + // NOTE: some queries are made before the plugins have been loaded, and thus cannot be filtered with this method + if ( function_exists('apply_filters') ) + $query = apply_filters('query', $query); + // initialise return $return_val = 0; $this->flush(); diff --git a/wp-links-opml.php b/wp-links-opml.php index 848a9986..3c2cbf55 100644 --- a/wp-links-opml.php +++ b/wp-links-opml.php @@ -28,7 +28,7 @@ if ((empty($link_cat)) || ($link_cat == 'all') || ($link_cat == '0')) { links.link_url, link_rss, $wpdb->links.link_name, $wpdb->links.link_category, $wpdb->linkcategories.cat_name, link_updated FROM $wpdb->links - JOIN $wpdb->linkcategories on $wpdb->links.link_category = $wpdb->linkcategories.cat_id + INNER JOIN $wpdb->linkcategories on $wpdb->links.link_category = $wpdb->linkcategories.cat_id AND $wpdb->links.link_visible = 'Y' $sql_cat ORDER BY $wpdb->linkcategories.cat_name, $wpdb->links.link_name \n"; @@ -44,12 +44,12 @@ FROM $wpdb->links -
+
link_category; } // end if new category ?> -
+
diff --git a/wp-login.php b/wp-login.php index 3a45bc9e..4e2a129f 100644 --- a/wp-login.php +++ b/wp-login.php @@ -127,7 +127,7 @@ break; case 'resetpass' : // Generate something random for a password... md5'ing current time with a rand salt - $key = preg_replace('/a-z0-9/i', '', $_GET['key']); + $key = preg_replace('/[^a-z0-9]/i', '', $_GET['key']); if ( empty($key) ) die( __('Sorry, that key does not appear to be valid.') ); $user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE user_activation_key = '$key'"); @@ -166,7 +166,7 @@ default: $user_login = ''; $user_pass = ''; $using_cookie = false; - if ( !isset( $_REQUEST['redirect_to'] ) ) + if ( !isset( $_REQUEST['redirect_to'] ) || is_user_logged_in() ) $redirect_to = 'wp-admin/'; else $redirect_to = $_REQUEST['redirect_to']; @@ -231,14 +231,14 @@ if ( $error ) ?>
-

+

- +

diff --git a/wp-mail.php b/wp-mail.php index 6c62fbad..5fb178fa 100644 --- a/wp-mail.php +++ b/wp-mail.php @@ -58,7 +58,7 @@ for ($i=1; $i <= $count; $i++) : // Set the author using the email address (To or Reply-To, the last used) // otherwise use the site admin - if (preg_match('/From: /', $line) | preg_match('Reply-To: /', $line)) { + if (preg_match('/From: /', $line) | preg_match('/Reply-To: /', $line)) { $author=trim($line); if ( ereg("([a-zA-Z0-9\_\-\.]+@[\a-zA-z0-9\_\-\.]+)", $author , $regs) ) { $author = $regs[1]; diff --git a/wp-register.php b/wp-register.php index 49798c33..ebf8e0c6 100644 --- a/wp-register.php +++ b/wp-register.php @@ -113,8 +113,8 @@ default:

-

-

+

+

diff --git a/wp-rss2.php b/wp-rss2.php index 8f42acaa..afb4804a 100644 --- a/wp-rss2.php +++ b/wp-rss2.php @@ -47,7 +47,7 @@ $more = 1; ]]> - + diff --git a/wp-settings.php b/wp-settings.php index f01ccb7e..a76988c3 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -12,8 +12,10 @@ function unregister_GLOBALS() { $input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array()); foreach ( $input as $k => $v ) - if ( !in_array($k, $noUnset) && isset($GLOBALS[$k]) ) + if ( !in_array($k, $noUnset) && isset($GLOBALS[$k]) ) { + $GLOBALS[$k] = NULL; unset($GLOBALS[$k]); + } } unregister_GLOBALS(); @@ -199,9 +201,10 @@ $_SERVER = add_magic_quotes($_SERVER); do_action('sanitize_comment_cookies'); -$wp_query = new WP_Query(); -$wp_rewrite = new WP_Rewrite(); -$wp = new WP(); +$wp_the_query =& new WP_Query(); +$wp_query =& $wp_the_query; +$wp_rewrite =& new WP_Rewrite(); +$wp =& new WP(); define('TEMPLATEPATH', get_template_directory()); @@ -224,4 +227,4 @@ register_shutdown_function('shutdown_action_hook'); // Everything is loaded and initialized. do_action('init'); -?> \ No newline at end of file +?> diff --git a/wp-trackback.php b/wp-trackback.php index 1779c17a..ae6ed411 100644 --- a/wp-trackback.php +++ b/wp-trackback.php @@ -30,11 +30,13 @@ if ( !$_GET['tb_id'] ) { $tb_id = intval( $tb_id[ count($tb_id) - 1 ] ); } -$tb_url = $_POST['url']; -$title = $_POST['title']; -$excerpt = $_POST['excerpt']; -$blog_name = $_POST['blog_name']; -$charset = $_POST['charset']; +$tb_url = $_POST['url']; +$charset = $_POST['charset']; + +// These three are stripslashed here so that they can be properly escaped after mb_convert_encoding() +$title = stripslashes($_POST['title']); +$excerpt = stripslashes($_POST['excerpt']); +$blog_name = stripslashes($_POST['blog_name']); if ($charset) $charset = strtoupper( trim($charset) ); @@ -42,11 +44,16 @@ else $charset = 'ASCII, UTF-8, ISO-8859-1, JIS, EUC-JP, SJIS'; if ( function_exists('mb_convert_encoding') ) { // For international trackbacks - $title = mb_convert_encoding($title, get_settings('blog_charset'), $charset); - $excerpt = mb_convert_encoding($excerpt, get_settings('blog_charset'), $charset); - $blog_name = mb_convert_encoding($blog_name, get_settings('blog_charset'), $charset); + $title = mb_convert_encoding($title, get_option('blog_charset'), $charset); + $excerpt = mb_convert_encoding($excerpt, get_option('blog_charset'), $charset); + $blog_name = mb_convert_encoding($blog_name, get_option('blog_charset'), $charset); } +// Now that mb_convert_encoding() has been given a swing, we need to escape these three +$title = $wpdb->escape($title); +$excerpt = $wpdb->escape($excerpt); +$blog_name = $wpdb->escape($blog_name); + if ( is_single() || is_page() ) $tb_id = $posts[0]->ID; @@ -77,7 +84,7 @@ if ( !empty($tb_url) && !empty($title) && !empty($tb_url) ) { $title = (strlen($title) > 250) ? substr($title, 0, 250) . '...' : $title; } - $comment_post_ID = $tb_id; + $comment_post_ID = (int) $tb_id; $comment_author = $blog_name; $comment_author_email = ''; $comment_author_url = $tb_url; diff --git a/xmlrpc.php b/xmlrpc.php index c5b36177..2664138b 100644 --- a/xmlrpc.php +++ b/xmlrpc.php @@ -58,31 +58,8 @@ function starify($string) { return str_repeat('*', $i); } -logIO("I", $HTTP_RAW_POST_DATA); - - -function mkdir_p($target) { - // from php.net/mkdir user contributed notes - if (file_exists($target)) { - if (!is_dir($target)) { - return false; - } else { - return true; - } - } - - // Attempting to create the directory may clutter up our display. - if (@mkdir($target)) { - return true; - } - - // If the above failed, attempt to create the parent node, then try again. - if (mkdir_p(dirname($target))) { - return mkdir_p($target); - } - - return false; -} +if ( isset($HTTP_RAW_POST_DATA) ) + logIO("I", $HTTP_RAW_POST_DATA); class wp_xmlrpc_server extends IXR_Server { @@ -157,7 +134,7 @@ class wp_xmlrpc_server extends IXR_Server { function escape(&$array) { global $wpdb; - foreach ($array as $k => $v) { + foreach ( (array) $array as $k => $v ) { if (is_array($v)) { $this->escape($array[$k]); } else if (is_object($v)) { @@ -231,9 +208,9 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $post_ID = $args[1]; - $user_login = $args[2]; - $user_pass = $args[3]; + $post_ID = (int) $args[1]; + $user_login = $args[2]; + $user_pass = $args[3]; if (!$this->login_pass_ok($user_login, $user_pass)) { return $this->error; @@ -266,10 +243,10 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $blog_ID = $args[1]; /* though we don't use it yet */ - $user_login = $args[2]; - $user_pass = $args[3]; - $num_posts = $args[4]; + $blog_ID = (int) $args[1]; /* though we don't use it yet */ + $user_login = $args[2]; + $user_pass = $args[3]; + $num_posts = $args[4]; if (!$this->login_pass_ok($user_login, $user_pass)) { return $this->error; @@ -314,7 +291,7 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $blog_ID = $args[1]; + $blog_ID = (int) $args[1]; $user_login = $args[2]; $user_pass = $args[3]; $template = $args[4]; /* could be 'main' or 'archiveIndex', but we don't use it */ @@ -348,7 +325,7 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $blog_ID = $args[1]; + $blog_ID = (int) $args[1]; $user_login = $args[2]; $user_pass = $args[3]; $content = $args[4]; @@ -385,7 +362,7 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $blog_ID = $args[1]; /* though we don't use it yet */ + $blog_ID = (int) $args[1]; /* though we don't use it yet */ $user_login = $args[2]; $user_pass = $args[3]; $content = $args[4]; @@ -432,7 +409,7 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $post_ID = $args[1]; + $post_ID = (int) $args[1]; $user_login = $args[2]; $user_pass = $args[3]; $content = $args[4]; @@ -454,7 +431,10 @@ class wp_xmlrpc_server extends IXR_Server { if ( !current_user_can('edit_post', $post_ID) ) return new IXR_Error(401, 'Sorry, you do not have the right to edit this post.'); - extract($actual_post); + extract($actual_post, EXTR_SKIP); + + if ( ('publish' == $post_status) && !current_user_can('publish_posts') ) + return new IXR_Error(401, 'Sorry, you do not have the right to publish this post.'); $post_title = xmlrpc_getposttitle($content); $post_category = xmlrpc_getpostcategory($content); @@ -479,7 +459,7 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $post_ID = $args[1]; + $post_ID = (int) $args[1]; $user_login = $args[2]; $user_pass = $args[3]; $publish = $args[4]; @@ -520,7 +500,7 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $blog_ID = $args[0]; // we will support this in the near future + $blog_ID = (int) $args[0]; // we will support this in the near future $user_login = $args[1]; $user_pass = $args[2]; $content_struct = $args[3]; @@ -555,7 +535,9 @@ class wp_xmlrpc_server extends IXR_Server { $post_content = $post_content . "\n\n" . $post_more; } - $to_ping = $content_struct['mt_tb_ping_urls']; + $to_ping = $content_struct['mt_tb_ping_urls']; + if ( is_array($to_ping) ) + $to_ping = implode(' ', $to_ping); // Do some timestamp voodoo $dateCreatedd = $content_struct['dateCreated']; @@ -600,7 +582,7 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $post_ID = $args[0]; + $post_ID = (int) $args[0]; $user_login = $args[1]; $user_pass = $args[2]; $content_struct = $args[3]; @@ -615,8 +597,8 @@ class wp_xmlrpc_server extends IXR_Server { return new IXR_Error(401, 'Sorry, you can not edit this post.'); $postdata = wp_get_single_post($post_ID, ARRAY_A); - extract($postdata); $this->escape($postdata); + extract($postdata, EXTR_SKIP); $post_title = $content_struct['title']; $post_content = apply_filters( 'content_save_pre', $content_struct['description'] ); @@ -634,12 +616,18 @@ class wp_xmlrpc_server extends IXR_Server { $post_more = $content_struct['mt_text_more']; $post_status = $publish ? 'publish' : 'draft'; + + if ( ('publish' == $post_status) && !current_user_can('publish_posts') ) + return new IXR_Error(401, 'Sorry, you do not have the right to publish this post.'); + if ($post_more) { $post_content = $post_content . "\n\n" . $post_more; } - $to_ping = $content_struct['mt_tb_ping_urls']; - + $to_ping = $content_struct['mt_tb_ping_urls']; + if ( is_array($to_ping) ) + $to_ping = implode(' ', $to_ping); + $comment_status = (empty($content_struct['mt_allow_comments'])) ? get_settings('default_comment_status') : $content_struct['mt_allow_comments']; @@ -680,7 +668,7 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $post_ID = $args[0]; + $post_ID = (int) $args[0]; $user_login = $args[1]; $user_pass = $args[2]; @@ -735,10 +723,10 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $blog_ID = $args[0]; - $user_login = $args[1]; - $user_pass = $args[2]; - $num_posts = $args[3]; + $blog_ID = (int) $args[0]; + $user_login = $args[1]; + $user_pass = $args[2]; + $num_posts = (int) $args[3]; if (!$this->login_pass_ok($user_login, $user_pass)) { return $this->error; @@ -801,9 +789,9 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $blog_ID = $args[0]; - $user_login = $args[1]; - $user_pass = $args[2]; + $blog_ID = (int) $args[0]; + $user_login = $args[1]; + $user_pass = $args[2]; if (!$this->login_pass_ok($user_login, $user_pass)) { return $this->error; @@ -835,7 +823,7 @@ class wp_xmlrpc_server extends IXR_Server { global $wpdb; - $blog_ID = $wpdb->escape($args[0]); + $blog_ID = (int) $args[0]; $user_login = $wpdb->escape($args[1]); $user_pass = $wpdb->escape($args[2]); $data = $args[3]; @@ -875,10 +863,10 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $blog_ID = $args[0]; - $user_login = $args[1]; - $user_pass = $args[2]; - $num_posts = $args[3]; + $blog_ID = (int) $args[0]; + $user_login = $args[1]; + $user_pass = $args[2]; + $num_posts = (int) $args[3]; if (!$this->login_pass_ok($user_login, $user_pass)) { return $this->error; @@ -920,9 +908,9 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $blog_ID = $args[0]; - $user_login = $args[1]; - $user_pass = $args[2]; + $blog_ID = (int) $args[0]; + $user_login = $args[1]; + $user_pass = $args[2]; if (!$this->login_pass_ok($user_login, $user_pass)) { return $this->error; @@ -949,9 +937,9 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $post_ID = $args[0]; - $user_login = $args[1]; - $user_pass = $args[2]; + $post_ID = (int) $args[0]; + $user_login = $args[1]; + $user_pass = $args[2]; if (!$this->login_pass_ok($user_login, $user_pass)) { return $this->error; @@ -979,10 +967,10 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $post_ID = $args[0]; - $user_login = $args[1]; - $user_pass = $args[2]; - $categories = $args[3]; + $post_ID = (int) $args[0]; + $user_login = $args[1]; + $user_pass = $args[2]; + $categories = $args[3]; if (!$this->login_pass_ok($user_login, $user_pass)) { return $this->error; @@ -1062,9 +1050,9 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $post_ID = $args[0]; - $user_login = $args[1]; - $user_pass = $args[2]; + $post_ID = (int) $args[0]; + $user_login = $args[1]; + $user_pass = $args[2]; if (!$this->login_pass_ok($user_login, $user_pass)) { return $this->error; @@ -1124,18 +1112,18 @@ class wp_xmlrpc_server extends IXR_Server { } elseif (preg_match('#p/[0-9]{1,}#', $urltest['path'], $match)) { // the path defines the post_ID (archives/p/XXXX) $blah = explode('/', $match[0]); - $post_ID = $blah[1]; + $post_ID = (int) $blah[1]; $way = 'from the path'; } elseif (preg_match('#p=[0-9]{1,}#', $urltest['query'], $match)) { // the querystring defines the post_ID (?p=XXXX) $blah = explode('=', $match[0]); - $post_ID = $blah[1]; + $post_ID = (int) $blah[1]; $way = 'from the querystring'; } elseif (isset($urltest['fragment'])) { // an #anchor is there, it's either... if (intval($urltest['fragment'])) { // ...an integer #XXXX (simpliest case) - $post_ID = $urltest['fragment']; + $post_ID = (int) $urltest['fragment']; $way = 'from the fragment (numeric)'; } elseif (preg_match('/post-[0-9]+/',$urltest['fragment'])) { // ...a post id in the form 'post-###'


	text_after_all)?>	list_limit ?>	cat_id?>&action=Delete", 'delete-link-category_' . $row->cat_id) ?>" onclick="return deleteSomething( 'link category', cat_id . ", '" . sprintf(__("You are about to delete the "%s" link category.\\n"Cancel" to stop, "OK" to delete."), js_escape($row->cat_name)); ?>' );" class="delete">
+ cat_id ) { + _e('Default'); + } else { ?> + cat_id?>&action=Delete", 'delete-link-category_' . $row->cat_id) ?>" onclick="return deleteSomething( 'link category', cat_id . ", '" . sprintf(__("You are about to delete the "%s" link category.\\n"Cancel" to stop, "OK" to delete."), js_escape($row->cat_name)); ?>' );" class="delete"> + +

System Recommendations

$title

Error restoring publishMode.

'.__('Error restoring publishMode').'

'.__('Import Dotclear').'

'.__('Import DotClear').'

'.__('Users').'

'.__('Preserving Authors').'

'.__('Textile').'

'.__('WordPress Resources').'

'.__('Import GreyMatter').'

'.__('Import Movable Type').'

'.__('Import Movable Type and Typepad').'

'.sprintf(__('All done. Have fun!'), get_option('home')).'

'.sprintf(__('All done. Have fun!'), get_option('home')).'

'.__('Preserving Authors').'

'.__('Textile').'

'.__('WordPress Resources').'

Header Image and Color


	+

	<?php echo wp_specialchars($category->category_description, 1); ?>	<?php echo wp_specialchars($category->category_description); ?>



so you need to enter the number of the last GM post here. (if you don't know that number, just log into your FTP and look it out in the entries' folder)") ?>