- Version 1.5.1
Semantic Personal Publishing Platform
Welcome. WordPress is a very special project to me. Every developer and contributor adds something unique to the mix, and together we create something beautiful that I'm proud to be a part of. Thousands of hours have gone into WordPress, and we're dedicated to making it better every day. Thank you for making it part of your world.
diff -ur wordpress-1.5.1.2/wp-admin/post.php wordpress-1.5.1.3/wp-admin/post.php --- wordpress-1.5.1.2/wp-admin/post.php Sat May 14 03:15:51 2005 +++ wordpress-1.5.1.3/wp-admin/post.php Tue Jun 28 10:59:25 2005 @@ -273,7 +273,7 @@ if (!isset($blog_ID)) { $blog_ID = 1; } - $post_ID = $_POST['post_ID']; + $post_ID = (int) $_POST['post_ID']; if (!user_can_edit_post($user_ID, $post_ID, $blog_ID)) die( __('You are not allowed to edit this post.') ); @@ -308,7 +308,7 @@ $post_parent = 0; if (isset($_POST['parent_id'])) { - $post_parent = $_POST['parent_id']; + $post_parent = (int) $_POST['parent_id']; } $trackback = $_POST['trackback_url']; @@ -478,7 +478,7 @@ get_currentuserinfo(); - $comment = $_GET['comment']; + $comment = (int) $_GET['comment']; $commentdata = get_commentdata($comment, 1, true) or die(sprintf(__('Oops, no comment with this ID. Go back!'), 'javascript:history.go(-1)')); if (!user_can_edit_post_comments($user_ID, $commentdata['comment_post_ID'])) { @@ -499,7 +499,7 @@ require_once('./admin-header.php'); - $comment = $_GET['comment']; + $comment = (int) $_GET['comment']; $p = (int) $_GET['p']; $commentdata = get_commentdata($comment, 1, true) or die(sprintf(__('Oops, no comment with this ID. Go back!'), 'edit.php')); @@ -534,8 +534,8 @@ check_admin_referer(); - $comment = $_GET['comment']; - $p = $_GET['p']; + $comment = (int) $_GET['comment']; + $p = (int) $_GET['p']; if (isset($_GET['noredir'])) { $noredir = true; } else { @@ -566,8 +566,8 @@ check_admin_referer(); - $comment = $_GET['comment']; - $p = $_GET['p']; + $comment = (int) $_GET['comment']; + $p = (int) $_GET['p']; if (isset($_GET['noredir'])) { $noredir = true; } else { @@ -612,8 +612,8 @@ case 'approvecomment': - $comment = $_GET['comment']; - $p = $_GET['p']; + $comment = (int) $_GET['comment']; + $p = (int) $_GET['p']; if (isset($_GET['noredir'])) { $noredir = true; } else { @@ -641,8 +641,8 @@ case 'editedcomment': - $comment_ID = $_POST['comment_ID']; - $comment_post_ID = $_POST['comment_post_ID']; + $comment_ID = (int) $_POST['comment_ID']; + $comment_post_ID = (int) $_POST['comment_post_ID']; $newcomment_author = $_POST['newcomment_author']; $newcomment_author_email = $_POST['newcomment_author_email']; $newcomment_author_url = $_POST['newcomment_author_url']; diff -ur wordpress-1.5.1.2/wp-includes/functions-post.php wordpress-1.5.1.3/wp-includes/functions-post.php --- wordpress-1.5.1.2/wp-includes/functions-post.php Wed May 18 08:47:55 2005 +++ wordpress-1.5.1.3/wp-includes/functions-post.php Sun Jul 3 06:33:13 2005 @@ -6,21 +6,17 @@ * generic function for inserting data into the posts table. */ function wp_insert_post($postarr = array()) { - global $wpdb, $post_default_category, $allowedtags; + global $wpdb, $allowedtags; // export array as variables extract($postarr); - // Do some escapes for safety - $post_title = $wpdb->escape($post_title); $post_name = sanitize_title($post_title); - $post_excerpt = $wpdb->escape($post_excerpt); - $post_content = $wpdb->escape($post_content); $post_author = (int) $post_author; // Make sure we set a valid category if (0 == count($post_category) || !is_array($post_category)) { - $post_category = array($post_default_category); + $post_category = array(get_option('default_category')); } $post_cat = $post_category[0]; @@ -107,19 +103,19 @@ global $wpdb; // First get all of the original fields - extract(wp_get_single_post($postarr['ID'], ARRAY_A)); + $post = wp_get_single_post($postarr['ID'], ARRAY_A); - // Now overwrite any changed values being passed in + // Escape data pulled from DB. + $post = add_magic_quotes($post); + extract($post); + + // Now overwrite any changed values being passed in. These are + // already escaped. extract($postarr); - // Make sure we set a valid category + // If no categories were passed along, use the current cats. if ( 0 == count($post_category) || !is_array($post_category) ) - $post_category = array($post_default_category); - - // Do some escapes for safety - $post_title = $wpdb->escape($post_title); - $post_excerpt = $wpdb->escape($post_excerpt); - $post_content = $wpdb->escape($post_content); + $post_category = $post['post_category']; $post_modified = current_time('mysql'); $post_modified_gmt = current_time('mysql', 1); @@ -158,18 +154,17 @@ $result = $wpdb->get_col($sql); + if ( !$result ) + $result = array(); + return array_unique($result); } function wp_set_post_cats($blogid = '1', $post_ID = 0, $post_categories = array()) { global $wpdb; // If $post_categories isn't already an array, make it one: - if (!is_array($post_categories)) { - if (!$post_categories) { - $post_categories = 1; - } - $post_categories = array($post_categories); - } + if (!is_array($post_categories) || 0 == count($post_categories)) + $post_categories = array(get_option('default_category')); $post_categories = array_unique($post_categories); diff -ur wordpress-1.5.1.2/wp-includes/version.php wordpress-1.5.1.3/wp-includes/version.php --- wordpress-1.5.1.2/wp-includes/version.php Fri May 27 11:44:25 2005 +++ wordpress-1.5.1.3/wp-includes/version.php Wed Jun 29 11:53:24 2005 @@ -2,6 +2,6 @@ // This just holds the version number, in a separate file so we can bump it without cluttering the SVN -$wp_version = '1.5.1.2'; +$wp_version = '1.5.1.3'; -?> \ No newline at end of file +?> diff -ur wordpress-1.5.1.2/wp-login.php wordpress-1.5.1.3/wp-login.php --- wordpress-1.5.1.2/wp-login.php Tue Apr 19 22:54:05 2005 +++ wordpress-1.5.1.3/wp-login.php Sun Jun 26 21:57:37 2005 @@ -103,7 +103,7 @@ $key = substr( md5( uniqid( microtime() ) ), 0, 50); // now insert the new pass md5'd into the db $wpdb->query("UPDATE $wpdb->users SET user_activation_key = '$key' WHERE user_login = '$user_login'"); - $message .= __('Someone has asked to reset the password for the following site and username.') . "\r\n\r\n"; + $message = __('Someone has asked to reset the password for the following site and username.') . "\r\n\r\n"; $message .= get_option('siteurl') . "\r\n\r\n"; $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n"; $message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n"; diff -ur wordpress-1.5.1.2/xmlrpc.php wordpress-1.5.1.3/xmlrpc.php --- wordpress-1.5.1.2/xmlrpc.php Sat May 14 03:23:18 2005 +++ wordpress-1.5.1.3/xmlrpc.php Sun Jul 3 06:33:13 2005 @@ -10,7 +10,6 @@ // error_reporting(0); $post_default_title = ""; // posts submitted via the xmlrpc interface get that title -$post_default_category = 1; // posts submitted via the xmlrpc interface go into that category $xmlrpc_logging = 0; @@ -127,8 +126,19 @@ return true; } + function escape(&$array) { + global $wpdb; - + foreach ($array as $k => $v) { + if (is_array($v)) { + $this->escape($array[$k]); + } else if (is_object($v)) { + //skip + } else { + $array[$k] = $wpdb->escape($v); + } + } + } /* Blogger API functions * specs on http://plant.blogger.com/api and http://groups.yahoo.com/group/bloggerDev/ @@ -138,6 +148,8 @@ /* blogger.getUsersBlogs will make more sense once we support multiple blogs */ function blogger_getUsersBlogs($args) { + $this->escape($args); + $user_login = $args[1]; $user_pass = $args[2]; @@ -162,6 +174,8 @@ /* blogger.getUsersInfo gives your client some info about you, so you don't have to */ function blogger_getUserInfo($args) { + $this->escape($args); + $user_login = $args[1]; $user_pass = $args[2]; @@ -187,6 +201,8 @@ /* blogger.getPost ...gets a post */ function blogger_getPost($args) { + $this->escape($args); + $post_ID = $args[1]; $user_login = $args[2]; $user_pass = $args[3]; @@ -220,6 +236,8 @@ global $wpdb; + $this->escape($args); + $blog_ID = $args[1]; /* though we don't use it yet */ $user_login = $args[2]; $user_pass = $args[3]; @@ -266,6 +284,8 @@ /* blogger.getTemplate returns your blog_filename */ function blogger_getTemplate($args) { + $this->escape($args); + $blog_ID = $args[1]; $user_login = $args[2]; $user_pass = $args[3]; @@ -299,6 +319,8 @@ /* blogger.setTemplate updates the content of blog_filename */ function blogger_setTemplate($args) { + $this->escape($args); + $blog_ID = $args[1]; $user_login = $args[2]; $user_pass = $args[3]; @@ -335,6 +357,8 @@ global $wpdb; + $this->escape($args); + $blog_ID = $args[1]; /* though we don't use it yet */ $user_login = $args[2]; $user_pass = $args[3]; @@ -382,6 +406,8 @@ global $wpdb; + $this->escape($args); + $post_ID = $args[1]; $user_login = $args[2]; $user_pass = $args[3]; @@ -398,6 +424,8 @@ return new IXR_Error(404, 'Sorry, no such post.'); } + $this->escape($actual_post); + $post_author_data = get_userdata($actual_post['post_author']); $user_data = get_userdatabylogin($user_login); @@ -406,6 +434,7 @@ } extract($actual_post); + $content = $newcontent; $post_title = xmlrpc_getposttitle($content); @@ -431,6 +460,8 @@ global $wpdb; + $this->escape($args); + $post_ID = $args[1]; $user_login = $args[2]; $user_pass = $args[3]; @@ -470,7 +501,9 @@ /* metaweblog.newPost creates a post */ function mw_newPost($args) { - global $wpdb; + global $wpdb, $post_default_category; + + $this->escape($args); $blog_ID = $args[0]; // we will support this in the near future $user_login = $args[1]; @@ -507,7 +540,9 @@ if ($post_more) { $post_content = $post_content . "\n\n" . $post_more; } - + + $to_ping = $content_struct['mt_tb_ping_urls']; + // Do some timestamp voodoo $dateCreatedd = $content_struct['dateCreated']; if (!empty($dateCreatedd)) { @@ -527,12 +562,10 @@ foreach ($catnames as $cat) { $post_category[] = get_cat_ID($cat); } - } else { - $post_category[] = 1; } // We've got all the data -- post it: - $postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status'); + $postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'to_ping'); $post_ID = wp_insert_post($postdata); @@ -552,7 +585,9 @@ /* metaweblog.editPost ...edits a post */ function mw_editPost($args) { - global $wpdb; + global $wpdb, $post_default_category; + + $this->escape($args); $post_ID = $args[0]; $user_login = $args[1]; @@ -571,17 +606,18 @@ $postdata = wp_get_single_post($post_ID, ARRAY_A); extract($postdata); + $this->escape($postdata); $post_title = $content_struct['title']; $post_content = apply_filters( 'content_save_pre', $content_struct['description'] ); $catnames = $content_struct['categories']; + + $post_category = array(); if (is_array($catnames)) { foreach ($catnames as $cat) { $post_category[] = get_cat_ID($cat); } - } else { - $post_category[] = 1; } $post_excerpt = $content_struct['mt_excerpt']; @@ -592,6 +628,8 @@ $post_content = $post_content . "\n\n" . $post_more; } + $to_ping = $content_struct['mt_tb_ping_urls']; + $comment_status = (empty($content_struct['mt_allow_comments'])) ? get_settings('default_comment_status') : $content_struct['mt_allow_comments']; @@ -612,10 +650,10 @@ } // We've got all the data -- post it: - $newpost = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'post_date', 'post_date_gmt'); + $newpost = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'post_date', 'post_date_gmt', 'to_ping'); - $post_ID = wp_update_post($newpost); - if (!$post_ID) { + $result = wp_update_post($newpost); + if (!$result) { return new IXR_Error(500, 'Sorry, your entry could not be edited. Something wrong happened.'); } @@ -633,6 +671,8 @@ global $wpdb; + $this->escape($args); + $post_ID = $args[0]; $user_login = $args[1]; $user_pass = $args[2]; @@ -686,6 +726,8 @@ /* metaweblog.getRecentPosts ...returns recent posts */ function mw_getRecentPosts($args) { + $this->escape($args); + $blog_ID = $args[0]; $user_login = $args[1]; $user_pass = $args[2]; @@ -750,6 +792,8 @@ global $wpdb; + $this->escape($args); + $blog_ID = $args[0]; $user_login = $args[1]; $user_pass = $args[2]; @@ -782,9 +826,11 @@ // adapted from a patch by Johann Richard // http://mycvs.org/archives/2004/06/30/file-upload-to-wordpress-in-ecto/ - $blog_ID = $args[0]; - $user_login = $args[1]; - $user_pass = $args[2]; + global $wpdb; + + $blog_ID = $wpdb->escape($args[0]); + $user_login = $wpdb->escape($args[1]); + $user_pass = $wpdb->escape($args[2]); $data = $args[3]; $name = $data['name']; @@ -861,6 +907,8 @@ /* mt.getRecentPostTitles ...returns recent posts' titles */ function mt_getRecentPostTitles($args) { + $this->escape($args); + $blog_ID = $args[0]; $user_login = $args[1]; $user_pass = $args[2]; @@ -904,6 +952,8 @@ global $wpdb; + $this->escape($args); + $blog_ID = $args[0]; $user_login = $args[1]; $user_pass = $args[2]; @@ -931,6 +981,8 @@ /* mt.getPostCategories ...returns a post's categories */ function mt_getPostCategories($args) { + $this->escape($args); + $post_ID = $args[0]; $user_login = $args[1]; $user_pass = $args[2]; @@ -959,6 +1011,8 @@ /* mt.setPostCategories ...sets a post's categories */ function mt_setPostCategories($args) { + $this->escape($args); + $post_ID = $args[0]; $user_login = $args[1]; $user_pass = $args[2]; @@ -1041,6 +1095,8 @@ /* mt.publishPost ...sets a post's publish status to 'publish' */ function mt_publishPost($args) { + $this->escape($args); + $post_ID = $args[0]; $user_login = $args[1]; $user_pass = $args[2]; @@ -1061,6 +1117,7 @@ // retain old cats $cats = wp_get_post_cats('',$post_ID); $postdata['post_category'] = $cats; + $this->escape($postdata); $result = wp_update_post($postdata); @@ -1075,10 +1132,10 @@ /* pingback.ping gets a pingback and registers it */ function pingback_ping($args) { - // original code by Mort (http://mort.mine.nu:8080 -- site seems dead) - // refactored to return error codes and avoid deep ifififif headaches global $wpdb, $wp_version; + $this->escape($args); + $pagelinkedfrom = $args[0]; $pagelinkedto = $args[1]; @@ -1091,10 +1148,8 @@ // Check if the page linked to is in our site $pos1 = strpos($pagelinkedto, str_replace('http://', '', str_replace('www.', '', get_settings('home')))); - if(!$pos1) { - return new IXR_Error(0, ''); - } - + if( !$pos1 ) + return new IXR_Error(0, 'Is there no link to us?'); // let's find which post is linked to // FIXME: does url_to_postid() cover all these cases already? @@ -1124,7 +1179,7 @@ $way = 'from the fragment (post-###)'; } elseif (is_string($urltest['fragment'])) { // ...or a string #title, a little more complicated - $title = preg_replace('/[^a-zA-Z0-9]/', '.', $urltest['fragment']); + $title = preg_replace('/[^a-z0-9]/i', '.', $urltest['fragment']); $sql = "SELECT ID FROM $wpdb->posts WHERE post_title RLIKE '$title'"; if (! ($post_ID = $wpdb->get_var($sql)) ) { // returning unknown error '0' is better than die()ing @@ -1136,27 +1191,25 @@ // TODO: Attempt to extract a post ID from the given URL return new IXR_Error(33, 'The specified target URI cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.'); } + $post_ID = (int) $post_ID; logIO("O","(PB) URI='$pagelinkedto' ID='$post_ID' Found='$way'"); - $sql = 'SELECT post_author FROM '.$wpdb->posts.' WHERE ID = '.$post_ID; - $result = $wpdb->get_results($sql); + $post = get_post($post_ID); - if (!$wpdb->num_rows) { - // Post_ID not found + if ( !$post ) // Post_ID not found return new IXR_Error(33, 'The specified target URI cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.'); - } + // Check if pings are on + if ( 'closed' == $post->ping_status ) + return new IXR_Error(33, 'The specified target URI cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.'); // Let's check that the remote site didn't already pingback this entry $result = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$post_ID' AND comment_author_url = '$pagelinkedfrom'"); - if ($wpdb->num_rows) { - // We already have a Pingback from this URL + if ( $wpdb->num_rows ) // We already have a Pingback from this URL return new IXR_Error(48, 'The pingback has already been registered.'); - } - // very stupid, but gives time to the 'from' server to publish ! sleep(1); @@ -1167,46 +1220,42 @@ return new IXR_Error(16, 'The source URI does not exist.'); // Work around bug in strip_tags(): - $linea = str_replace(''); - $linea = strip_all_but_one_link($linea, $pagelinkedto); - // I don't think we need this? -- emc3 - //$linea = preg_replace('#&([^amp\;])#is', '&$1', $linea); - if ( empty($matchtitle) ) { - preg_match('|