diff options
-rw-r--r-- | app.php | 1197 | ||||
-rw-r--r-- | wp-admin/admin-functions.php | 7 | ||||
-rw-r--r-- | wp-admin/edit-form-advanced.php | 4 | ||||
-rw-r--r-- | wp-admin/edit-page-form.php | 2 | ||||
-rw-r--r-- | wp-admin/users.php | 2 | ||||
-rw-r--r-- | wp-admin/wp-admin.css | 91 | ||||
-rw-r--r-- | wp-includes/category-template.php | 15 | ||||
-rw-r--r-- | wp-includes/deprecated.php | 30 | ||||
-rw-r--r-- | wp-includes/version.php | 2 | ||||
-rw-r--r-- | xmlrpc.php | 459 |
10 files changed, 1731 insertions, 78 deletions
@@ -0,0 +1,1197 @@ +<?php +/* + * app.php - Atom Publishing Protocol support for WordPress + * Original code by: Elias Torres, http://torrez.us/archives/2006/08/31/491/ + * Modified by: Dougal Campbell, http://dougal.gunters.org/ + * + * Version: 1.0.0-dc + */ + +define('APP_REQUEST', true); + +require_once('wp-config.php'); + +$use_querystring = 1; + +// If using querystring, we need to put the path together manually: +if ($use_querystring) { + $_GLOBALS['use_querystring'] = $use_querystring; + $action = $_GET['action']; + $eid = (int) $_GET['eid']; + + $_SERVER['PATH_INFO'] = $action; + + if ($eid) { + $_SERVER['PATH_INFO'] .= "/$eid"; + } +} else { + $_SERVER['PATH_INFO'] = str_replace( '/app.php', '', $_SERVER['REQUEST_URI'] ); +} + +$app_logging = 1; + +function log_app($label,$msg) { + global $app_logging; + if ($app_logging) { + $fp = fopen( 'app.log', 'a+'); + $date = gmdate( 'Y-m-d H:i:s' ); + fwrite($fp, "\n\n$date - $label\n$msg\n"); + fclose($fp); + } +} + +if ( !function_exists('wp_set_current_user') ) : +function wp_set_current_user($id, $name = '') { + global $current_user; + + if ( isset($current_user) && ($id == $current_user->ID) ) + return $current_user; + + $current_user = new WP_User($id, $name); + + return $current_user; +} +endif; + +function wa_posts_where_include_drafts_filter($where) { + $where = ereg_replace("post_author = ([0-9]+) AND post_status != 'draft'","post_author = \\1 AND post_status = 'draft'", $where); + return $where; +} +add_filter('posts_where', 'wa_posts_where_include_drafts_filter'); + +class AtomEntry { + var $links = array(); + var $categories = array(); +} + +class AtomParser { + + var $ATOM_CONTENT_ELEMENTS = array('content','summary','title','subtitle','rights'); + var $ATOM_SIMPLE_ELEMENTS = array('id','updated','published','draft'); + + var $depth = 0; + var $indent = 2; + var $in_content; + var $ns_contexts = array(); + var $ns_decls = array(); + var $is_xhtml = false; + var $skipped_div = false; + + var $entry; + + function AtomParser() { + + $this->entry = new AtomEntry(); + $this->map_attrs_func = create_function('$k,$v', 'return "$k=\"$v\"";'); + $this->map_xmlns_func = create_function('$p,$n', '$xd = "xmlns"; if(strlen($n[0])>0) $xd .= ":{$n[0]}"; return "{$xd}=\"{$n[1]}\"";'); + } + + function parse() { + + global $app_logging; + array_unshift($this->ns_contexts, array()); + + $parser = xml_parser_create_ns(); + xml_set_object($parser, $this); + xml_set_element_handler($parser, "start_element", "end_element"); + xml_parser_set_option($parser,XML_OPTION_CASE_FOLDING,0); + xml_parser_set_option($parser,XML_OPTION_SKIP_WHITE,0); + xml_set_character_data_handler($parser, "cdata"); + xml_set_default_handler($parser, "_default"); + xml_set_start_namespace_decl_handler($parser, "start_ns"); + xml_set_end_namespace_decl_handler($parser, "end_ns"); + + $contents = ""; + + $fp = fopen("php://input", "r"); + while(!feof($fp)) { + $line = fgets($fp, 4096); + + if($app_logging) $contents .= $line; + + if(!xml_parse($parser, $line)) { + log_app("xml_parse_error", "line: $line"); + $this->error = sprintf("XML error: %s at line %d\n", + xml_error_string(xml_get_error_code($xml_parser)), + xml_get_current_line_number($xml_parser)); + log_app("xml_parse_error", $this->error); + return false; + } + } + fclose($fp); + + xml_parser_free($parser); + + log_app("AtomParser->parse()",trim($contents)); + + return true; + } + + function start_element($parser, $name, $attrs) { + + $tag = array_pop(split(":", $name)); + + array_unshift($this->ns_contexts, $this->ns_decls); + + $this->depth++; + + #print str_repeat(" ", $this->depth * $this->indent) . "start_element('$name')" ."\n"; + #print str_repeat(" ", $this->depth+1 * $this->indent) . print_r($this->ns_contexts,true) ."\n"; + + if(!empty($this->in_content)) { + $attrs_prefix = array(); + + // resolve prefixes for attributes + foreach($attrs as $key => $value) { + $attrs_prefix[$this->ns_to_prefix($key)] = $this->xml_escape($value); + } + $attrs_str = join(' ', array_map($this->map_attrs_func, array_keys($attrs_prefix), array_values($attrs_prefix))); + if(strlen($attrs_str) > 0) { + $attrs_str = " " . $attrs_str; + } + + $xmlns_str = join(' ', array_map($this->map_xmlns_func, array_keys($this->ns_contexts[0]), array_values($this->ns_contexts[0]))); + if(strlen($xmlns_str) > 0) { + $xmlns_str = " " . $xmlns_str; + } + + // handle self-closing tags (case: a new child found right-away, no text node) + if(count($this->in_content) == 2) { + array_push($this->in_content, ">"); + } + + array_push($this->in_content, "<". $this->ns_to_prefix($name) ."{$xmlns_str}{$attrs_str}"); + } else if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS) || in_array($tag, $this->ATOM_SIMPLE_ELEMENTS)) { + $this->in_content = array(); + $this->is_xhtml = $attrs['type'] == 'xhtml'; + array_push($this->in_content, array($tag,$this->depth)); + } else if($tag == 'link') { + array_push($this->entry->links, $attrs); + } else if($tag == 'category') { + array_push($this->entry->categories, $attrs); + } + + $this->ns_decls = array(); + } + + function end_element($parser, $name) { + + $tag = array_pop(split(":", $name)); + + if(!empty($this->in_content)) { + if($this->in_content[0][0] == $tag && + $this->in_content[0][1] == $this->depth) { + array_shift($this->in_content); + if($this->is_xhtml) { + $this->in_content = array_slice($this->in_content, 2, count($this->in_content)-3); + } + $this->entry->$tag = join('',$this->in_content); + $this->in_content = array(); + } else { + $endtag = $this->ns_to_prefix($name); + if(strstr($this->in_content[count($this->in_content)-1], "<$endtag")) { + array_push($this->in_content, "/>"); + } else { + array_push($this->in_content, "</$endtag>"); + } + } + } + + array_shift($this->ns_contexts); + + #print str_repeat(" ", $this->depth * $this->indent) . "end_element('$name')" ."\n"; + + $this->depth--; + } + + function start_ns($parser, $prefix, $uri) { + #print str_repeat(" ", $this->depth * $this->indent) . "starting: " . $prefix . ":" . $uri . "\n"; + array_push($this->ns_decls, array($prefix,$uri)); + } + + function end_ns($parser, $prefix) { + #print str_repeat(" ", $this->depth * $this->indent) . "ending: #" . $prefix . "#\n"; + } + + function cdata($parser, $data) { + #print str_repeat(" ", $this->depth * $this->indent) . "data: #" . $data . "#\n"; + if(!empty($this->in_content)) { + // handle self-closing tags (case: text node found, need to close element started) + if(strstr($this->in_content[count($this->in_content)-1], "<")) { + array_push($this->in_content, ">"); + } + array_push($this->in_content, $this->xml_escape($data)); + } + } + + function _default($parser, $data) { + # when does this gets called? + } + + + function ns_to_prefix($qname) { + $components = split(":", $qname); + $name = array_pop($components); + + if(!empty($components)) { + $ns = join(":",$components); + foreach($this->ns_contexts as $context) { + foreach($context as $mapping) { + if($mapping[1] == $ns && strlen($mapping[0]) > 0) { + return "$mapping[0]:$name"; + } + } + } + } + return $name; + } + + function xml_escape($string) + { + return str_replace(array('&','"',"'",'<','>'), + array('&','"',''','<','>'), + $string ); + } +} + +class AtomServer { + + var $ATOM_CONTENT_TYPE = 'application/atom+xml'; + + var $INTROSPECTION_CONTENT_TYPE = 'application/atomserv+xml'; + + var $ENTRIES_PATH = "posts"; + var $MEDIA_PATH = "attachments"; + var $ENTRY_PATH = "post"; + var $MEDIA_SINGLE_PATH = "attachment"; + + var $params = array(); + var $script_name = "app.php"; + var $media_content_types = array('image/*','audio/*','video/*'); + var $atom_content_types = array('application/atom+xml'); + + var $selectors = array(); + + // support for head + var $do_output = true; + + function AtomServer() { + + $this->script_name = array_pop(explode('/',$_SERVER['SCRIPT_NAME'])); + + $this->selectors = array( + '@/service@' => + array('GET' => 'get_service'), + '@/post/(\d+)@' => + array('GET' => 'get_post', + 'PUT' => 'put_post', + 'DELETE' => 'delete_post'), + '@/posts/?([^/]+)?@' => + array('GET' => 'get_posts', + 'POST' => 'create_post'), + '@/attachments/?(\d+)?@' => + array('GET' => 'get_attachment', + 'POST' => 'create_attachment'), + '@/attachment/file/(\d+)@' => + array('GET' => 'get_file', + 'PUT' => 'put_file', + 'DELETE' => 'delete_file'), + '@/attachment/(\d+)@' => + array('GET' => 'get_attachment', + 'PUT' => 'put_attachment', + 'DELETE' => 'delete_attachment'), + ); + } + + function handle_request() { + + $path = $_SERVER['PATH_INFO']; + $method = $_SERVER['REQUEST_METHOD']; + + log_app('REQUEST',"$method $path\n================"); + + //$this->process_conditionals(); + + // exception case for HEAD (treat exactly as GET, but don't output) + if($method == 'HEAD') { + $this->do_output = false; + $method = 'GET'; + } + + // lame. + if(strlen($path) == 0 || $path == '/') { + $path = '/service'; + } + + // authenticate regardless of the operation and set the current + // user. each handler will decide if auth is required or not. + $this->authenticate(); + + // dispatch + foreach($this->selectors as $regex => $funcs) { + if(preg_match($regex, $path, $matches)) { + if(isset($funcs[$method])) { + array_shift($matches); + call_user_func_array(array(&$this,$funcs[$method]), $matches); + exit(); + } else { + // only allow what we have handlers for... + $this->not_allowed(array_keys($funcs)); + } + } + } + + // oops, nothing found + $this->not_found(); + } + + function get_service() { + log_app('function','get_service()'); + $entries_url = $this->get_entries_url(); + $media_url = $this->get_attachments_url(); + $accepted_content_types = join(',',$this->media_content_types); + $introspection = <<<EOD +<service xmlns="http://purl.org/atom/app#" xmlns:atom="http://www.w3.org/2005/Atom"> + <workspace title="WordPress Experimental Workspace"> + <collection href="$entries_url" title="WordPress Posts"> + <accept>entry</accept> + <atom:title>WordPress Posts</atom:title> + </collection> + <collection href="$media_url" title="WordPress Media"> + <accept>$accepted_content_types</accept> + <atom:title>WordPress Media</atom:title> + </collection> + </workspace> +</service> + +EOD; + $this->output($introspection, $this->INTROSPECTION_CONTENT_TYPE); + } + + /* + * Create Post (No arguments) + */ + function create_post() { + + $this->get_accepted_content_type($this->atom_content_types); + + $parser = new AtomParser(); + if(!$parser->parse()) { + $this->client_error(); + } + + $entry = $parser->entry; + + $publish = (isset($entry->draft) && trim($entry->draft) == 'yes') ? false : true; + + $cap = ($publish) ? 'publish_posts' : 'edit_posts'; + + if(!current_user_can($cap)) + $this->auth_required('Sorry, you do not have the right to edit/publish new posts.'); + + $blog_ID = 1; + $post_status = ($publish) ? 'publish' : 'draft'; + $post_author = $user->ID; + $post_title = $entry->title; + $post_content = $entry->content; + $post_excerpt = $entry->summary; + $post_date = current_time('mysql'); + $post_date_gmt = current_time('mysql', 1); + + $post_data = compact('blog_ID', 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt'); + + $postID = wp_insert_post($post_data); + + if (!$postID) { + $this->internal_error('Sorry, your entry could not be posted. Something wrong happened.'); + } + + $output = $this->get_entry($postID); + + log_app('function',"create_post($postID)"); + $this->created($postID, $output); + } + + function get_post($postID) { + + global $entry; + $this->set_current_entry($postID); + $output = $this->get_entry($postID); + log_app('function',"get_post($postID)"); + $this->output($output); + + } + + function put_post($postID) { + + // checked for valid content-types (atom+xml) + // quick check and exit + $this->get_accepted_content_type($this->atom_content_types); + + $parser = new AtomParser(); + if(!$parser->parse()) { + $this->bad_request(); + } + + $parsed = $parser->entry; + + // check for not found + global $entry; + $this->set_current_entry($postID); + $this->escape($entry); + + if(!current_user_can('edit_post', $entry['ID'])) + $this->auth_required('Sorry, you do not have the right to edit this post.'); + + $publish = (isset($parsed->draft) && trim($parsed->draft) == 'yes') ? false : true; + + extract($entry); + + $post_title = $parsed->title; + $post_content = $parsed->content; + $post_excerpt = $parsed->summary; + + // let's not go backwards and make something draft again. + if(!$publish && $post_status == 'draft') { + $post_status = ($publish) ? 'publish' : 'draft'; + } + + $postdata = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt'); + + $result = wp_update_post($postdata); + + if (!$result) { + $this->internal_error('For some strange yet very annoying reason, this post could not be edited.'); + } + + log_app('function',"put_post($postID)"); + $this->ok(); + } + + function delete_post($postID) { + + // check for not found + global $entry; + $this->set_current_entry($postID); + + if(!current_user_can('edit_post', $postID)) { + $this->auth_required('Sorry, you do not have the right to delete this post.'); + } + + if ($entry['post_type'] == 'attachment') { + $this->delete_attachment($postID); + } else { + $result = wp_delete_post($postID); + + if (!$result) { + $this->internal_error('For some strange yet very annoying reason, this post could not be deleted.'); + } + + log_app('function',"delete_post($postID)"); + $this->ok(); + } + + } + + function get_attachment($postID = NULL) { + + global $entry; + if (!isset($postID)) { + $this->get_attachments(); + } else { + $this->set_current_entry($postID); + $output = $this->get_entry($postID, 'attachment'); + log_app('function',"get_attachment($postID)"); + $this->output($output); + } + } + + function create_attachment() { + + $type = $this->get_accepted_content_type(); + + if(!current_user_can('upload_files')) + $this->auth_required('You do not have permission to upload files.'); + + $fp = fopen("php://input", "rb"); + $bits = NULL; + while(!feof($fp)) { + $bits .= fread($fp, 4096); + } + fclose($fp); + + $slug = ''; + if ( isset( $_SERVER['HTTP_SLUG'] ) ) + $slug = sanitize_file_name( $_SERVER['HTTP_SLUG'] ); + elseif ( isset( $_SERVER['HTTP_TITLE'] ) ) + $slug = sanitize_file_name( $_SERVER['HTTP_TITLE'] ); + elseif ( empty( $slug ) ) // just make a random name + $slug = substr( md5( uniqid( microtime() ) ), 0, 7);; + $ext = preg_replace( '|.*/([a-z]+)|', '$1', $_SERVER['CONTENT_TYPE'] ); + $slug = "$slug.$ext"; + $file = wp_upload_bits( $slug, NULL, $bits); + + $url = $file['url']; + $file = $file['file']; + $filename = basename($file); + + $header = apply_filters('wp_create_file_in_uploads', $file); // replicate + + // Construct the attachment array + $attachment = array( + 'post_title' => $slug, + 'post_content' => $slug, + 'post_status' => 'attachment', + 'post_parent' => 0, + 'post_mime_type' => $type, + 'guid' => $url + ); + + // Save the data + $postID = wp_insert_attachment($attachment, $file, $post); + + if (!$postID) { + $this->internal_error('Sorry, your entry could not be posted. Something wrong happened.'); + } + + $output = $this->get_entry($postID, 'attachment'); + + $this->created($postID, $output, 'attachment'); + log_app('function',"create_attachment($postID)"); + } + + function put_attachment($postID) { + + // checked for valid content-types (atom+xml) + // quick check and exit + $this->get_accepted_content_type($this->atom_content_types); + + $parser = new AtomParser(); + if(!$parser->parse()) { + $this->bad_request(); + } + + $parsed = $parser->entry; + + // check for not found + global $entry; + $this->set_current_entry($postID); + $this->escape($entry); + + if(!current_user_can('edit_post', $entry['ID'])) + $this->auth_required('Sorry, you do not have the right to edit this post.'); + + $publish = (isset($parsed->draft) && trim($parsed->draft) == 'yes') ? false : true; + + extract($entry); + + $post_title = $parsed->title; + $post_content = $parsed->content; + + $postdata = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt'); + + $result = wp_update_post($postdata); + + if (!$result) { + $this->internal_error('For some strange yet very annoying reason, this post could not be edited.'); + } + + log_app('function',"put_attachment($postID)"); + $this->ok(); + } + + function delete_attachment($postID) { + log_app('function',"delete_attachment($postID). File '$location' deleted."); + + // check for not found + global $entry; + $this->set_current_entry($postID); + + if(!current_user_can('edit_post', $postID)) { + $this->auth_required('Sorry, you do not have the right to delete this post.'); + } + + $location = get_post_meta($entry['ID'], '_wp_attached_file', true); + + // delete file + @unlink($location); + + // delete attachment + $result = wp_delete_post($postID); + + if (!$result) { + $this->internal_error('For some strange yet very annoying reason, this post could not be deleted.'); + } + + log_app('function',"delete_attachment($postID). File '$location' deleted."); + $this->ok(); + } + + function get_file($postID) { + + // check for not found + global $entry; + $this->set_current_entry($postID); + + // then whether user can edit the specific post + if(!current_user_can('edit_post', $postID)) { + $this->auth_required('Sorry, you do not have the right to edit this post.'); + } + + $location = get_post_meta($entry['ID'], '_wp_attached_file', true); + + if(!isset($location)) + $this->internal_error('Error ocurred while accessing post metadata for file location.'); + + header('Content-Type: ' . $entry['post_mime_type']); + + $fp = fopen($location, "rb"); + while(!feof($fp)) { + echo fread($fp, 4096); + } + fclose($fp); + + log_app('function',"get_file($postID)"); + $this->ok(); + } + + function put_file($postID) { + + $type = $this->get_accepted_content_type(); + + // first check if user can upload + if(!current_user_can('upload_files')) + $this->auth_required('You do not have permission to upload files.'); + + // check for not found + global $entry; + $this->set_current_entry($postID); + + // then whether user can edit the specific post + if(!current_user_can('edit_post', $postID)) { + $this->auth_required('Sorry, you do not have the right to edit this post.'); + } + + $location = get_post_meta($entry['ID'], '_wp_attached_file', true); + + if(!isset($location)) + $this->internal_error('Error ocurred while accessing post metadata for file location.'); + + $fp = fopen("php://input", "rb"); + $localfp = fopen($location, "w+"); + while(!feof($fp)) { + fwrite($localfp,fread($fp, 4096)); + } + fclose($fp); + fclose($localfp); + + log_app('function',"put_file($postID)"); + $this->ok(); + } + + function get_entries_url($page = NULL) { + global $use_querystring; + $url = get_bloginfo('url') . '/' . $this->script_name; + if ($use_querystring) { + $url .= '?action=/' . $this->ENTRIES_PATH; + if(isset($page) && is_int($page)) { + $url .= "&eid=$page"; + } + } else { + $url .= '/' . $this->ENTRIES_PATH; + if(isset($page) && is_int($page)) { + $url .= "/$page"; + } + } + return $url; + } + + function the_entries_url($page = NULL) { + $url = $this->get_entries_url($page); + echo $url; + } + + function get_attachments_url($page = NULL) { + global $use_querystring; + $url = get_bloginfo('url') . '/' . $this->script_name; + if ($use_querystring) { + $url .= '?action=/' . $this->MEDIA_PATH; + if(isset($page) && is_int($page)) { + $url .= "&eid=$page"; + } + } else { + $url .= '/' . $this->MEDIA_PATH; + if(isset($page) && is_int($page)) { + $url .= "/$page"; + } + } + return $url; + } + + function the_attachments_url($page = NULL) { + $url = $this->get_attachments_url($page); + echo $url; + } + + + function get_entry_url($postID = NULL) { + global $use_querystring; + if(!isset($postID)) { + global $post; + $postID = $post->ID; + } + + if ($use_querystring) { + $url = get_bloginfo('url') . '/' . $this->script_name . '?action=/' . $this->ENTRY_PATH . "&eid=$postID"; + } else { + $url = get_bloginfo('url') . '/' . $this->script_name . '/' . $this->ENTRY_PATH . "/$postID"; + } + + log_app('function',"get_entry_url() = $url"); + return $url; + } + + function the_entry_url($postID = NULL) { + $url = $this->get_entry_url($postID); + echo $url; + } + + function get_media_url($postID = NULL) { + global $use_querystring; + if(!isset($postID)) { + global $post; + $postID = $post->ID; + } + + if ($use_querystring) { + $url = get_bloginfo('url') . '/' . $this->script_name . '?action=/' . $this->MEDIA_SINGLE_PATH ."&eid=$postID"; + } else { + $url = get_bloginfo('url') . '/' . $this->script_name . '/' . $this->MEDIA_SINGLE_PATH ."/$postID"; + } + + log_app('function',"get_media_url() = $url"); + return $url; + } + + function the_media_url($postID = NULL) { + $url = $this->get_media_url($postID); + echo $url; + } + + function set_current_entry($postID) { + global $entry; + log_app('function',"set_current_entry($postID)"); + + if(!isset($postID)) { + // $this->bad_request(); + $this->not_found(); + } + + $entry = wp_get_single_post($postID,ARRAY_A); + + if(!isset($entry) || !isset($entry['ID'])) + $this->not_found(); + + return; + } + + function get_posts_count() { + global $wpdb; + log_app('function',"get_posts_count()"); + return $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_date_gmt < '" . gmdate("Y-m-d H:i:s",time()) . "'"); + } + + + function get_posts($page = 1, $post_type = 'post') { + log_app('function',"get_posts($page, '$post_type')"); + $feed = $this->get_feed($page, $post_type); + $this->output($feed); + } + + function get_attachments($page = 1, $post_type = 'attachment') { + log_app('function',"get_attachments($page, '$post_type')"); + $feed = $this->get_feed($page, $post_type); + $this->output($feed); + } + + function get_feed($page = 1, $post_type = 'post') { + log_app('function',"get_feed($page, '$post_type')"); + ob_start(); + + if(!isset($page)) { + $page = 1; + } + $page = (int) $page; + + $count = get_settings('posts_per_rss'); + $query = "paged=$page&posts_per_page=$count&order=DESC"; + if($post_type == 'attachment') { + $query .= "&post_type=$post_type"; + } + query_posts($query); + global $post; + + $total_count = $this->get_posts_count(); + $last_page = (int) ceil($total_count / $count); + $next_page = (($page + 1) > $last_page) ? NULL : $page + 1; + $prev_page = ($page - 1) < 1 ? NULL : $page - 1; + $last_page = ((int)$last_page == 1 || (int)$last_page == 0) ? NULL : (int) $last_page; +?><feed xmlns="http://www.w3.org/2005/Atom" xmlns:app="http://purl.org/atom/app#" xml:lang="<?php echo get_option('rss_language'); ?>"> +<id><?php $this->the_entries_url() ?></id> +<updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT')); ?></updated> +<title type="text"><?php bloginfo_rss('name') ?></title> +<subtitle type="text"><?php bloginfo_rss("description") ?></subtitle> +<link rel="first" type="application/atom+xml" href="<?php $this->the_entries_url() ?>" /> +<?php if(isset($prev_page)): ?> +<link rel="previous" type="application/atom+xml" href="<?php $this->the_entries_url($prev_page) ?>" /> +<?php endif; ?> +<?php if(isset($next_page)): ?> +<link rel="next" type="application/atom+xml" href="<?php $this->the_entries_url($next_page) ?>" /> +<?php endif; ?> +<link rel="last" type="application/atom+xml" href="<?php $this->the_entries_url($last_page) ?>" /> +<link rel="self" type="application/atom+xml" href="<?php $this->the_entries_url() ?>" /> +<rights type="text">Copyright <?php echo mysql2date('Y', get_lastpostdate('blog')); ?></rights> +<generator uri="http://wordpress.com/" version="1.0.0-dc">WordPress.com Atom API</generator> +<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?> +<entry> + <id><?php the_guid(); ?></id> + <title type="html"><![CDATA[<?php the_title() ?>]]></title> + <updated><?php echo get_post_modified_time('Y-m-d\TH:i:s\Z', true); ?></updated> + <published><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></published> + <app:control> + <app:draft><?php echo ($post->post_status == 'draft' ? 'yes' : 'no') ?></app:draft> + </app:control> + <author> + <name><?php the_author()?></name> + <email><?php the_author_email()?></email> + <?php if (get_the_author_url() && get_the_author_url() != 'http://') { ?> + <uri><?php the_author_url()?></uri> + <?php } ?> + </author> + <?php if($post->post_status == 'attachment') { ?> + <link rel="edit" href="<?php $this->the_entry_url() ?>" /> + <link rel="edit-media" href="<?php $this->the_media_url() ?>" /> + <?php } else { ?> + <link href="<?php permalink_single_rss() ?>" /> + <link rel="edit" href="<?php $this->the_entry_url() ?>" /> + <?php } ?> + <?php foreach(get_the_category() as $category) { ?> + <category scheme="<?php bloginfo_rss('home') ?>" term="<?php echo $category->cat_name?>" /> + <?php } ?> <summary type="html"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary> + <?php if ( strlen( $post->post_content ) ) : ?> + <content type="html"><?php echo get_the_content('', 0, '') ?></content> +<?php endif; ?> + </entry> +<?php + endwhile; + endif; +?></feed> +<?php + $feed = ob_get_contents(); + ob_end_clean(); + return $feed; + } + + function get_entry($postID, $post_type = 'post') { + log_app('function',"get_entry($postID, '$post_type')"); + ob_start(); + global $posts, $post, $wp_query; + switch($post_type) { + case 'post': + $varname = 'p'; + break; + case 'attachment': + $varname = 'attachment_id'; + break; + } + query_posts($varname . '=' . $postID); + if ( have_posts() ) : while ( have_posts() ) : the_post();?> +<entry xmlns="http://www.w3.org/2005/Atom" xmlns:app="http://purl.org/atom/app#" xml:lang="<?php echo get_option('rss_language'); ?>"> + <id><?php the_guid(); ?></id> + <title type="html"><![CDATA[<?php the_title_rss() ?>]]></title> + + <updated><?php echo get_post_modified_time('Y-m-d\TH:i:s\Z', true); ?></updated> + <published><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></published> + <app:control> + <app:draft><?php echo ($post->post_status == 'draft' ? 'yes' : 'no') ?></app:draft> + </app:control> + <author> + <name><?php the_author()?></name> + <email><?php the_author_email()?></email> + <uri><?php the_author_url()?></uri> + </author> +<?php if($post->post_type == 'attachment') { ?> + <link rel="edit" href="<?php $this->the_entry_url() ?>" /> + <link rel="edit-media" href="<?php $this->the_media_url() ?>" /> + <content type="<?php echo $post->post_mime_type ?>" src="<?php the_guid(); ?>"/> +<?php } else { ?> + <link href="<?php permalink_single_rss() ?>" /> + <link rel="edit" href="<?php $this->the_entry_url() ?>" /> +<?php } ?> +<?php foreach(get_the_category() as $category) { ?> + <category scheme="<?php bloginfo_rss('home') ?>" term="<?php echo $category->cat_name?>" /> + <summary type="html"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary> +<?php } + if ( strlen( $post->post_content ) ) : ?> + <content type="html"><?php echo get_the_content('', 0, '') ?></content> +<?php endif; ?> +</entry> +<?php + $entry = ob_get_contents(); + break; + endwhile; + else: + $this->auth_required("Access Denied."); + endif; + ob_end_clean(); + + log_app('get_entry returning:',$entry); + return $entry; + } + + function ok() { + log_app('Status','200: OK'); + header('Content-Type: text/plain'); + status_header('200'); + exit; + } + + function no_content() { + log_app('Status','204: No Content'); + header('Content-Type: text/plain'); + status_header('204'); + echo "Deleted."; + exit; + } + + function internal_error($msg = 'Internal Server Error') { + log_app('Status','500: Server Error'); + header('Content-Type: text/plain'); + status_header('500'); + echo $msg; + exit; + } + + function bad_request() { + log_app('Status','400: Bad Request'); + header('Content-Type: text/plain'); + status_header('400'); + exit; + } + + function length_required() { + log_app('Status','411: Length Required'); + header("HTTP/1.1 411 Length Required"); + header('Content-Type: text/plain'); + status_header('411'); + exit; + } + + function invalid_media() { + log_app('Status','415: Unsupported Media Type'); + header("HTTP/1.1 415 Unsupported Media Type"); + header('Content-Type: text/plain'); + exit; + } + + function not_found() { + log_app('Status','404: Not Found'); + header('Content-Type: text/plain'); + status_header('404'); + exit; + } + + function not_allowed($allow) { + log_app('Status','405: Not Allowed'); + header('Allow: ' . join(',', $allow)); + status_header('405'); + exit; + } + + function client_error($msg = 'Client Error') { + log_app('Status','400: Client Errir'); + header('Content-Type: text/plain'); + status_header('400'); + exit; + } + + function created($post_ID, $content, $post_type = 'post') { + global $use_querystring; + log_app('created()::$post_ID',"$post_ID, $post_type"); + $edit = $this->get_entry_url($post_ID); + switch($post_type) { + case 'post': + $ctloc = $this->get_entry_url($post_ID); + break; + case 'attachment': + if ($use_querystring) { + $edit = get_bloginfo('url') . '/' . $this->script_name . "?action=/attachments&eid=$post_ID"; + } else { + $edit = get_bloginfo('url') . '/' . $this->script_name . "/attachments/$post_ID"; + } + break; + } + header('Content-Type: application/atom+xml'); + if(isset($ctloc)) + header('Content-Location: ' . $ctloc); + header('Location: ' . $edit); + status_header('201'); + echo $content; + exit; + } + + function auth_required($msg) { + log_app('Status','401: Auth Required'); + nocache_headers(); + header('WWW-Authenticate: Basic realm="WordPress Atom Protocol"'); + header('WWW-Authenticate: Form action="' . get_settings('siteurl') . '/wp-login.php"', false); + header("HTTP/1.1 401 $msg"); + header('Status: ' . $msg); + header('Content-Type: plain/text'); + echo $msg; + exit; + } + + function output($xml, $ctype = "application/atom+xml") { + status_header('200'); + $xml = '<?xml version="1.0" encoding="' . get_settings('blog_charset') . '"?>'."\n".$xml; + header('Connection: close'); + header('Content-Length: '. strlen($xml)); + header('Content-Type: ' . $ctype); + header('Content-Disposition: attachment; filename=atom.xml'); + header('Date: '. date('r')); + if($this->do_output) + echo $xml; + log_app('function', "output:\n$xml"); + exit; + } + + 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); + } + } + } + + + + /* + * Access credential through various methods and perform login + */ + function authenticate() { + $login_data = array(); + $already_md5 = false; + + log_app("authenticate()",print_r($_ENV, true)); + + // if using mod_rewrite/ENV hack + // http://www.besthostratings.com/articles/http-auth-php-cgi.html + if(isset($_SERVER['HTTP_AUTHORIZATION'])) { + list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = + explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6))); + } + + // If Basic Auth is working... + if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) { + $login_data = array('login' => $_SERVER['PHP_AUTH_USER'], 'password' => $_SERVER['PHP_AUTH_PW']); + } else { + // else, do cookie-based authentication + if (function_exists('wp_get_cookie_login')) { + $login_data = wp_get_cookie_login(); + $already_md5 = true; + } + } + + // call wp_login and set current user + if (!empty($login_data) && wp_login($login_data['login'], $login_data['password'], $already_md5)) { + $current_user = new WP_User(0, $login_data['login']); + wp_set_current_user($current_user->ID); + log_app("authenticate()",$login_data['login']); + } + } + + function get_accepted_content_type($types = NULL) { + + if(!isset($types)) { + $types = $this->media_content_types; + } + + if(!isset($_SERVER['CONTENT_LENGTH']) || !isset($_SERVER['CONTENT_TYPE'])) { + $this->length_required(); + } + + $type = $_SERVER['CONTENT_TYPE']; + list($type,$subtype) = explode('/',$type); + list($subtype) = explode(";",$subtype); // strip MIME parameters + log_app("get_accepted_content_type", "type=$type, subtype=$subtype"); + + foreach($types as $t) { + list($acceptedType,$acceptedSubtype) = explode('/',$t); + if($acceptedType == '*' || $acceptedType == $type) { + if($acceptedSubtype == '*' || $acceptedSubtype == $subtype) + return $type; + } + } + + $this->invalid_media(); + } + + + + function process_conditionals() { + + if(empty($this->params)) return; + if($_SERVER['REQUEST_METHOD'] == 'DELETE') return; + + switch($this->params[0]) { + case $this->ENTRY_PATH: + global $post; + $post = wp_get_single_post($this->params[1]); + $wp_last_modified = get_post_modified_time('D, d M Y H:i:s', true); + $post = NULL; + break; + case $this->ENTRIES_PATH: + $wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastpostmodified('GMT'), 0).' GMT'; + break; + default: + return; + } + $wp_etag = md5($wp_last_modified); + @header("Last-Modified: $wp_last_modified"); + @header("ETag: $wp_etag"); + + // Support for Conditional GET + if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) + $client_etag = stripslashes($_SERVER['HTTP_IF_NONE_MATCH']); + else + $client_etag = false; + + $client_last_modified = trim( $_SERVER['HTTP_IF_MODIFIED_SINCE']); + // If string is empty, return 0. If not, attempt to parse into a timestamp + $client_modified_timestamp = $client_last_modified ? strtotime($client_last_modified) : 0; + + // Make a timestamp for our most recent modification... + $wp_modified_timestamp = strtotime($wp_last_modified); + + if ( ($client_last_modified && $client_etag) ? + (($client_modified_timestamp >= $wp_modified_timestamp) && ($client_etag == $wp_etag)) : + (($client_modified_timestamp >= $wp_modified_timestamp) || ($client_etag == $wp_etag)) ) { + status_header( 304 ); + exit; + } + } + + +} + +$server = new AtomServer(); +$server->handle_request(); + +?> diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index 03a6887..b274e67 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -1282,7 +1282,7 @@ function parent_dropdown( $default = 0, $parent = 0, $level = 0 ) { if ( $items ) { foreach ( $items as $item ) { - // A page cannot be it's own parent. + // A page cannot be its own parent. if (!empty ( $post_ID ) ) { if ( $item->ID == $post_ID ) { continue; @@ -2203,7 +2203,7 @@ function wp_create_thumbnail( $file, $max_side, $effect = '' ) { $thumbpath = str_replace( basename( $file ), $thumb, $file ); - // move the thumbnail to it's final destination + // move the thumbnail to its final destination if ( $type[2] == 1 ) { if (!imagegif( $thumbnail, $thumbpath ) ) { $error = __( "Thumbnail path invalid" ); @@ -2228,8 +2228,7 @@ function wp_create_thumbnail( $file, $max_side, $effect = '' ) { if (!empty ( $error ) ) { return $error; } else { - apply_filters( 'wp_create_thumbnail', $thumbpath ); - return $thumbpath; + return apply_filters( 'wp_create_thumbnail', $thumbpath ); } } diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index c07ae4c..1426ece 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -107,7 +107,7 @@ addLoadEvent(focusit); <?php if ( current_user_can('edit_posts') ) : ?> <fieldset id="posttimestampdiv" class="dbx-box"> -<h3 class="dbx-handle"><?php _e('Post Timestamp'); ?>:</h3> +<h3 class="dbx-handle"><?php _e('Post Timestamp'); ?></h3> <div class="dbx-content"><?php touch_time(($action == 'edit')); ?></div> </fieldset> <?php endif; ?> @@ -117,7 +117,7 @@ $authors = get_editable_authors( $current_user->id ); // TODO: ROLE SYSTEM if ( $authors && count( $authors ) > 1 ) : ?> <fieldset id="authordiv" class="dbx-box"> -<h3 class="dbx-handle"><?php _e('Post Author'); ?>:</h3> +<h3 class="dbx-handle"><?php _e('Post Author'); ?></h3> <div class="dbx-content"> <select name="post_author_override" id="post_author_override"> <?php diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php index 6f2cbd1..78e9588 100644 --- a/wp-admin/edit-page-form.php +++ b/wp-admin/edit-page-form.php @@ -98,7 +98,7 @@ addLoadEvent(focusit); <?php if ( $authors = get_editable_authors( $current_user->id ) ) : // TODO: ROLE SYSTEM ?> <fieldset id="authordiv" class="dbx-box"> -<h3 class="dbx-handle"><?php _e('Page Author'); ?>:</h3> +<h3 class="dbx-handle"><?php _e('Page Author'); ?></h3> <div class="dbx-content"> <select name="post_author_override" id="post_author_override"> <?php diff --git a/wp-admin/users.php b/wp-admin/users.php index 0b0ca9b..9ebe224 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -468,7 +468,7 @@ default: <?php endif; ?> <form action="" method="get" name="search" id="search"> - <p><input type="text" name="usersearch" id="usersearch" value="<?php echo attribute_escape($wp_user_search->search_term); ?>" /> <input type="submit" value="<?php _e('Search users »'); ?>" class="button" /></p> + <p><input type="text" name="usersearch" id="usersearch" value="<?php echo attribute_escape($wp_user_search->search_term); ?>" /> <input type="submit" value="<?php _e('Search Users »'); ?>" class="button" /></p> </form> <?php if ( is_wp_error( $wp_user_search->search_errors ) ) : ?> diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index 8d65520..8f396ab 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -201,14 +201,14 @@ textarea, input, select { background: #f4f4f4; border: 1px solid #b2b2b2; color: #000; - font: 13px Verdana, Arial, Helvetica, sans-serif; + font: 13px Verdana, Arial, Helvetica, sans-serif; margin: 1px; padding: 3px; } #uploading { border-style: none; - padding: 0px; + padding: 0; margin-bottom: 16px; height: 18em; width: 100%; @@ -459,7 +459,6 @@ input.disabled, textarea.disabled { padding: .2em .2em .3em 2em; } - #adminmenu .current, #submenu .current { font-weight: bold; text-decoration: none; @@ -529,23 +528,22 @@ input.disabled, textarea.disabled { height: 25px; } - #categorydiv input, #poststatusdiv input, #commentstatusdiv input, #pingstatusdiv input { border: none; } #postdiv, #titlediv, #guiddiv { margin: 0 8px 0 0; - padding: 0px; + padding: 0; } #postdivrich { - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; } #content { - margin: 0 0 0 0; + margin: 0; width: 100%; } @@ -555,7 +553,7 @@ input.disabled, textarea.disabled { } #titlediv input, #guiddiv input { - margin: 0px; + margin: 0; width: 100%; } @@ -579,7 +577,7 @@ input.delete:hover { #postdivrich #quicktags { background: #f0f0ee; - padding: 0px; + padding: 0; border: 1px solid #ccc; border-bottom: none; } @@ -593,11 +591,11 @@ input.delete:hover { } #quicktags #ed_toolbar { - padding: 0px 2px; + padding: 0 2px; } #ed_toolbar input { - background: #fff url( images/fade-butt.png ) repeat-x 0px -2px; + background: #fff url( images/fade-butt.png ) repeat-x 0 -2px; margin: 3px 2px 2px; } @@ -643,7 +641,7 @@ input.delete:hover { } #excerpt, .attachmentlinks { - margin: 0px; + margin: 0; height: 4em; width: 100%; } @@ -814,7 +812,7 @@ input.delete:hover { #postcustom table { border: 1px solid #ccc; - margin: 0px; + margin: 0; width: 100%; } @@ -835,7 +833,7 @@ input.delete:hover { } * html #template div { - margin-right: 0px; + margin-right: 0; } #template, #template div, #editcat, #addcat { @@ -967,32 +965,32 @@ input.delete:hover { Some browsers will disable them when you set display:none; */ .zerosize { - height: 0px; - width: 0px; - margin: 0px; - border: 0px; - padding: 0px; + height: 0; + width: 0; + margin: 0; + border: 0; + padding: 0; overflow: hidden; position: absolute; } /* Box stuff */ .dbx-clone { - position:absolute; - visibility:hidden; + position: absolute; + visibility: hidden; } .dbx-clone, .dbx-clone .dbx-handle-cursor { - cursor:move !important; + cursor: move !important; } .dbx-dummy { - display:block; - width:0; - height:0; - overflow:hidden; + display: block; + width: 0; + height: 0; + overflow: hidden; } .dbx-group, .dbx-box, .dbx-handle { - position:relative; - display:block; + position: relative; + display: block; } #grabit { @@ -1000,7 +998,7 @@ set display:none; */ } * html #themeselect { - padding: 0px 3px; + padding: 0 3px; height: 22px; } @@ -1010,9 +1008,9 @@ to reduce visual discrepancies between it and the clone. overall, dbx-box is best left as visually unstyled as possible *****************************************************************/ .dbx-box { - margin:0; - padding:0; - border:none; + margin: 0; + padding: 0; + border: none; } /* Can change this */ @@ -1020,7 +1018,7 @@ overall, dbx-box is best left as visually unstyled as possible margin-bottom: 1em; } #moremeta fieldset div { - margin: 2px 0 0 0px; + margin: 2px 0 0 0; padding: 7px; } #moremeta { @@ -1083,7 +1081,7 @@ overall, dbx-box is best left as visually unstyled as possible margin: 1em 1em 1em 0; } -#your-profile fieldset input { +#your-profile fieldset input { width: 100%; font-size: 20px; padding: 2px; @@ -1122,7 +1120,7 @@ overall, dbx-box is best left as visually unstyled as possible /* handles */ -.dbx-handle { +.dbx-handle { background: #2685af; padding: 6px 1em 2px; font-size: 12px; @@ -1157,7 +1155,7 @@ overall, dbx-box is best left as visually unstyled as possible #advancedstuff div.dbx-content { margin-left: 8px; background: url(images/box-bg-right.gif) repeat-y right; - padding: 10px 10px 15px 0px; + padding: 10px 10px 15px 0; } #postexcerpt div.dbx-content { @@ -1190,7 +1188,6 @@ overall, dbx-box is best left as visually unstyled as possible background: url(images/box-butt-right.gif) no-repeat bottom right; } - /* handle cursors */ .dbx-handle-cursor { cursor: move; @@ -1198,22 +1195,22 @@ overall, dbx-box is best left as visually unstyled as possible /* toggle images */ a.dbx-toggle, a.dbx-toggle:visited { - display:block; + display: block; overflow: hidden; background-image: url( images/toggle.gif ); position: absolute; - top: 0px; - right: 0px; + top: 0; + right: 0; background-repeat: no-repeat; - border: 0px; - margin: 0px; - padding: 0px; + border: 0; + margin: 0; + padding: 0; } #moremeta a.dbx-toggle, #moremeta a.dbx-toggle-open:visited { height: 25px; width: 27px; - background-position: 0 0px; + background-position: 0 0; } #moremeta a.dbx-toggle-open, #moremeta a.dbx-toggle-open:visited { @@ -1296,7 +1293,7 @@ input #catadd { } #edButtons input, #edButtons input:active { - margin: 0px 2px -1px; + margin: 0 2px -1px; } #edButtons input.edButtonFore, #edButtons input.edButtonFore:active { @@ -1305,7 +1302,7 @@ input #catadd { } #edButtons input.edButtonBack, #edButtons input.edButtonBack:active { - background: #fff url( images/fade-butt.png ) repeat-x 0px 15px; + background: #fff url( images/fade-butt.png ) repeat-x 0 15px; border-bottom: 1px solid #ccc; } diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php index e7eef22..1ca0743 100644 --- a/wp-includes/category-template.php +++ b/wp-includes/category-template.php @@ -88,10 +88,13 @@ function get_the_category_by_ID($cat_ID) { } function get_the_category_list($separator = '', $parents='') { + global $wp_rewrite; $categories = get_the_category(); if (empty($categories)) return apply_filters('the_category', __('Uncategorized'), $separator, $parents); + $rel = ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() ) ? 'rel="category tag"' : 'rel="category"'; + $thelist = ''; if ( '' == $separator ) { $thelist .= '<ul class="post-categories">'; @@ -101,17 +104,17 @@ function get_the_category_list($separator = '', $parents='') { case 'multiple': if ($category->category_parent) $thelist .= get_category_parents($category->category_parent, TRUE); - $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" rel="category tag">'.$category->cat_name.'</a></li>'; + $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" ' . $rel . '>' . $category->cat_name.'</a></li>'; break; case 'single': - $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . ' rel="category tag">'; + $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" ' . $rel . '>'; if ($category->category_parent) $thelist .= get_category_parents($category->category_parent, FALSE); $thelist .= $category->cat_name.'</a></li>'; break; case '': default: - $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" rel="category tag">'.$category->cat_name.'</a></li>'; + $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" ' . $rel . '>' . $category->cat_name.'</a></li>'; } } $thelist .= '</ul>'; @@ -124,17 +127,17 @@ function get_the_category_list($separator = '', $parents='') { case 'multiple': if ( $category->category_parent ) $thelist .= get_category_parents($category->category_parent, TRUE); - $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" rel="category tag">'.$category->cat_name.'</a>'; + $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" ' . $rel . '>' . $category->cat_name.'</a>'; break; case 'single': - $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" rel="category tag">'; + $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" ' . $rel . '>'; if ( $category->category_parent ) $thelist .= get_category_parents($category->category_parent, FALSE); $thelist .= "$category->cat_name</a>"; break; case '': default: - $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" rel="category tag">'.$category->cat_name.'</a>'; + $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" ' . $rel . '>' . $category->cat_name.'</a>'; } ++$i; } diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php index d0027a5..b72c07f 100644 --- a/wp-includes/deprecated.php +++ b/wp-includes/deprecated.php @@ -1,9 +1,9 @@ <?php
/*
- * Deprecated global variables.
+ * Deprecated global variables.
*/
-
+
$tableposts = $wpdb->posts;
$tableusers = $wpdb->users;
$tablecategories = $wpdb->categories;
@@ -15,10 +15,10 @@ $tableoptions = $wpdb->options; $tablepostmeta = $wpdb->postmeta;
/*
- * Deprecated functios come here to die.
+ * Deprecated functions come here to die.
*/
-// Deprecated. Use get_post().
+// Use get_post().
function get_postdata($postid) {
$post = &get_post($postid);
@@ -43,7 +43,7 @@ function get_postdata($postid) { return $postdata;
}
-// Deprecated. Use the new post loop.
+// Use the new post loop.
function start_wp() {
global $wp_query, $post;
@@ -53,7 +53,6 @@ function start_wp() { setup_postdata($post);
}
-// Deprecated.
function the_category_ID($echo = true) {
// Grab the first cat in the list.
$categories = get_the_category();
@@ -65,7 +64,6 @@ function the_category_ID($echo = true) { return $cat;
}
-// Deprecated.
function the_category_head($before='', $after='') {
global $currentcat, $previouscat;
// Grab the first cat in the list.
@@ -79,7 +77,7 @@ function the_category_head($before='', $after='') { }
}
-// Deprecated. Use previous_post_link().
+// Use previous_post_link().
function previous_post($format='%', $previous='previous post: ', $title='yes', $in_same_cat='no', $limitprev=1, $excluded_categories='') {
if ( empty($in_same_cat) || 'no' == $in_same_cat )
@@ -100,7 +98,7 @@ function previous_post($format='%', $previous='previous post: ', $title='yes', $ echo $format;
}
-// Deprecated. Use next_post_link().
+// Use next_post_link().
function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat='no', $limitnext=1, $excluded_categories='') {
if ( empty($in_same_cat) || 'no' == $in_same_cat )
@@ -122,7 +120,7 @@ function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat= }
//
-// These are deprecated. Use current_user_can().
+// Use current_user_can() for these.
//
/* returns true if $user_id can create a new post */
@@ -244,7 +242,7 @@ function wp_get_linksbyname($category, $args = '') { $args = add_query_arg('category', $cat_id, $args);
wp_get_links($args);
-} // end wp_get_linksbyname
+}
/** function get_linkobjectsbyname()
** Gets an array of link objects associated with category 'cat_name'.
@@ -421,6 +419,7 @@ function get_autotoggle($id = 0) { return 0;
}
+// Use wp_list_cats().
function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_order = 'asc', $file = '', $list = true, $optiondates = 0, $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children=FALSE, $child_of=0, $categories=0, $recurse=0, $feed = '', $feed_image = '', $exclude = '', $hierarchical=FALSE) {
$query = compact('optionall', 'all', 'sort_column', 'sort_order', 'file', 'list', 'optiondates', 'optioncount', 'hide_empty', 'use_desc_for_title', 'children',
'child_of', 'categories', 'recurse', 'feed', 'feed_image', 'exclude', 'hierarchical');
@@ -469,9 +468,9 @@ function dropdown_cats($optionall = 1, $all = 'All', $orderby = 'ID', $order = ' return wp_dropdown_categories($query);
}
-// Deprecated. Use wp_print_scripts() or WP_Scripts instead.
+// Use wp_print_scripts() or WP_Scripts.
function tinymce_include() {
- wp_print_script( 'wp_tiny_mce' );
+ wp_print_script('wp_tiny_mce');
}
function list_authors($optioncount = false, $exclude_admin = true, $show_fullname = false, $hide_empty = true, $feed = '', $feed_image = '') {
@@ -487,12 +486,13 @@ function wp_set_post_cats($blogid = '1', $post_ID = 0, $post_categories = array( return wp_set_post_categories($post_ID, $post_categories);
}
+// Use wp_get_archives().
function get_archives($type='', $limit='', $format='html', $before = '', $after = '', $show_post_count = false) {
$args = compact('type', 'limit', 'format', 'before', 'after', 'show_post_count');
return wp_get_archives($args);
}
-// Deprecated. Use get_author_posts_url().
+// Use get_author_posts_url().
function get_author_link($echo = false, $author_id, $author_nicename = '') {
$link = get_author_posts_url($author_id, $author_nicename);
@@ -501,11 +501,13 @@ function get_author_link($echo = false, $author_id, $author_nicename = '') { return $link;
}
+// Use wp_link_pages().
function link_pages($before='<br />', $after='<br />', $next_or_number='number', $nextpagelink='next page', $previouspagelink='previous page', $pagelink='%', $more_file='') {
$args = compact('before', 'after', 'next_or_number', 'nextpagelink', 'previouspagelink', 'pagelink', 'more_file');
return wp_link_pages($args);
}
+// Use get_option().
function get_settings($option) {
return get_option($option);
}
diff --git a/wp-includes/version.php b/wp-includes/version.php index 4813b0c..f6ba1d5 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -2,7 +2,7 @@ // This holds the version number in a separate file so we can bump it without cluttering the SVN -$wp_version = 'wordpress-mu-1.0'; // Let's just avoid confusion +$wp_version = 'wordpress-mu-1.2'; // Let's just avoid confusion $wp_db_version = 4772; ?> @@ -67,6 +67,18 @@ class wp_xmlrpc_server extends IXR_Server { function wp_xmlrpc_server() { $this->methods = array( + // WordPress API + 'wp.getPage' => 'this:wp_getPage', + 'wp.getPages' => 'this:wp_getPages', + 'wp.newPage' => 'this:wp_newPage', + 'wp.deletePage' => 'this:wp_deletePage', + 'wp.editPage' => 'this:wp_editPage', + 'wp.getPageList' => 'this:wp_getPageList', + 'wp.getAuthors' => 'this:wp_getAuthors', + 'wp.getCategories' => 'this:mw_getCategories', // Alias + 'wp.newCategory' => 'this:wp_newCategory', + 'wp.suggestCategories' => 'this:wp_suggestCategories', + // Blogger API 'blogger.getUsersBlogs' => 'this:blogger_getUsersBlogs', 'blogger.getUserInfo' => 'this:blogger_getUserInfo', @@ -146,6 +158,388 @@ class wp_xmlrpc_server extends IXR_Server { } } + /** + * WordPress XML-RPC API + * wp_getPage + */ + function wp_getPage($args) { + $this->escape($args); + + $blog_id = $args[0]; + $page_id = $args[1]; + $username = $args[2]; + $password = $args[3]; + + if(!$this->login_pass_ok($username, $password)) { + return($this->error); + } + + // Lookup page info. + $page = get_page($page_id); + + // If we found the page then format the data. + if($page->ID && ($page->post_type == "page")) { + // Get all of the page content and link. + $full_page = get_extended($page->post_content); + $link = post_permalink($page->ID); + + // Determine comment and ping settings. + $allow_comments = ("open" == $page->comment_status) ? 1 : 0; + $allow_pings = ("open" == $page->ping_status) ? 1 : 0; + + // Format page date. + $page_date = mysql2date("Ymd\TH:i:s", $page->post_date); + + // Pull the categories info together. + $categories = array(); + foreach(wp_get_post_categories($page->ID) as $cat_id) { + $categories[] = get_cat_name($cat_id); + } + + // Get the users nicename. + $nicename = get_profile("user_nicename", $username); + + $page_struct = array( + "dateCreated" => new IXR_Date($page_date), + "userid" => $page->post_author, + "page_id" => $page->ID, + "description" => $full_page["main"], + "title" => $page->post_title, + "link" => $link, + "permaLink" => $link, + "categories" => $categories, + "excerpt" => $page->post_excerpt, + "text_more" => $full_page["extended"], + "mt_allow_comments" => $allow_comments, + "mt_allow_pings" => $allow_pings, + "wp_slug" => $page->post_name, + "wp_password" => $page->post_password, + "wp_author" => $nicename, + "wp_page_parent_id" => $page->post_parent, + "wp_page_order" => $page->menu_order + ); + + return($page_struct); + } + // If the page doesn't exist indicate that. + else { + return(new IXR_Error(404, "Sorry, no such page.")); + } + } + + /** + * WordPress XML-RPC API + * wp_getPages + */ + function wp_getPages($args) { + $this->escape($args); + + $blog_id = $args[0]; + $username = $args[1]; + $password = $args[2]; + + if(!$this->login_pass_ok($username, $password)) { + return($this->error); + } + + // Lookup info on pages. + $pages = array(); + $pages = get_pages(); + $num_pages = count($pages); + + // If we have pages, put together their info. + if($num_pages >= 1) { + $pages_struct = array(); + + for($i = 0; $i < $num_pages; $i++) { + $page = wp_xmlrpc_server::wp_getPage(array( + $blog_id, $pages[$i]->ID, $username, $password + )); + $pages_struct[] = $page; + } + + return($pages_struct); + } + // If no pages were found return an error. + else { + return(new IXR_Error(404, "Sorry, no pages were found.")); + } + } + + /** + * WordPress XML-RPC API + * wp_newPage + */ + function wp_newPage($args) { + $this->escape($args); + + $blog_id = $args[0]; + $username = $args[1]; + $password = $args[2]; + $page = $args[3]; + $publish = $args[4]; + + if(!$this->login_pass_ok($username, $password)) { + return($this->error); + } + + // Set the user context and check if they are allowed + // to add new pages. + $user = set_current_user(0, $username); + if(!current_user_can("publish_pages")) { + return(new IXR_Error(401, "Sorry, you can not add new pages.")); + } + + // Mark this as content for a page. + $args[3]["post_type"] = "page"; + + // Let mw_newPost do all of the heavy lifting. + return($this->mw_newPost($args)); + } + + /** + * WordPress XML-RPC API + * wp_deletePage + */ + function wp_deletePage($args) { + $this->escape($args); + + $blog_id = $args[0]; + $username = $args[1]; + $password = $args[2]; + $page_id = $args[3]; + + if(!$this->login_pass_ok($username, $password)) { + return($this->error); + } + + // Get the current page based on the page_id and + // make sure it is a page and not a post. + $actual_page = wp_get_single_post($page_id, ARRAY_A); + if( + !$actual_page + || ($actual_page["post_type"] != "page") + ) { + return(new IXR_Error(404, "Sorry, no such page.")); + } + + // Set the user context and make sure they can delete pages. + set_current_user(0, $username); + if(!current_user_can("delete_page", $page_id)) { + return(new IXR_Error(401, "Sorry, you do not have the right to delete this page.")); + } + + // Attempt to delete the page. + $result = wp_delete_post($page_id); + if(!$result) { + return(new IXR_Error(500, "Failed to delete the page.")); + } + + return(true); + } + + /** + * WordPress XML-RPC API + * wp_editPage + */ + function wp_editPage($args) { + $this->escape($args); + + $blog_id = $args[0]; + $page_id = $args[1]; + $username = $args[2]; + $password = $args[3]; + $content = $args[4]; + $publish = $args[5]; + + if(!$this->login_pass_ok($username, $password)) { + return($this->error); + } + + // Get the page data and make sure it is a page. + $actual_page = wp_get_single_post($page_id, ARRAY_A); + if( + !$actual_page + || ($actual_page["post_type"] != "page") + ) { + return(new IXR_Error(404, "Sorry, no such page.")); + } + + // Set the user context and make sure they are allowed to edit pages. + set_current_user(0, $username); + if(!current_user_can("edit_page", $page_id)) { + return(new IXR_Error(401, "Sorry, you do not have the right to edit this page.")); + } + + // Mark this as content for a page. + $content["post_type"] = "page"; + + // Arrange args in the way mw_editPost understands. + $args = array( + $page_id, + $username, + $password, + $content, + $publish + ); + + // Let mw_editPost do all of the heavy lifting. + return($this->mw_editPost($args)); + } + + /** + * WordPress XML-RPC API + * wp_getPageList + */ + function wp_getPageList($args) { + global $wpdb; + + $this->escape($args); + + $blog_id = $args[0]; + $username = $args[1]; + $password = $args[2]; + + if(!$this->login_pass_ok($username, $password)) { + return($this->error); + } + + // Get list of pages ids and titles + $page_list = $wpdb->get_results(" + SELECT ID page_id, + post_title page_title + FROM {$wpdb->posts} + WHERE post_type = 'page' + ORDER BY ID + "); + + return($page_list); + } + + /** + * WordPress XML-RPC API + * wp_getAuthors + */ + function wp_getAuthors($args) { + global $wpdb; + + $this->escape($args); + + $blog_id = $args[0]; + $username = $args[1]; + $password = $args[2]; + + if(!$this->login_pass_ok($username, $password)) { + return($this->error); + } + + // Get basic info on all users. + $all_users = $wpdb->get_results(" + SELECT u.ID id, + u.user_login username + FROM {$wpdb->users} u + ORDER BY u.user_login + "); + + return($all_users); + } + + /** + * WordPress XML-RPC API + * wp_newCategory + */ + function wp_newCategory($args) { + $this->escape($args); + + $blog_id = $args[0]; + $username = $args[1]; + $password = $args[2]; + $category = $args[3]; + + if(!$this->login_pass_ok($username, $password)) { + return($this->error); + } + + // Set the user context and make sure they are + // allowed to add a category. + set_current_user(0, $username); + if(!current_user_can("manage_categories", $page_id)) { + return(new IXR_Error(401, "Sorry, you do not have the right to add a category.")); + } + + // We need this to make use of the wp_insert_category() + // funciton. + require_once(ABSPATH . "wp-admin/admin-db.php"); + + // If no slug was provided make it empty so that + // WordPress will generate one. + if(empty($category["slug"])) { + $category["slug"] = ""; + } + + // If no parent_id was provided make it empty + // so that it will be a top level page (no parent). + if(empty($category["parent_id"])) { + $category["parent_id"] = ""; + } + + // If no description was provided make it empty. + if(empty($category["description"])) { + $category["description"] = ""; + } + + $new_category = array( + "cat_name" => $category["name"], + "category_nicename" => $category["slug"], + "category_parent" => $category["parent_id"], + "category_description" => $category["description"] + ); + + $cat_id = wp_insert_category($new_category); + if(!$cat_id) { + return(new IXR_Error(500, "Sorry, the new category failed.")); + } + + return($cat_id); + } + + /** + * WordPress XML-RPC API + * wp_suggestCategories + */ + function wp_suggestCategories($args) { + global $wpdb; + + $this->escape($args); + + $blog_id = $args[0]; + $username = $args[1]; + $password = $args[2]; + $category = $args[3]; + $max_results = $args[4]; + + if(!$this->login_pass_ok($username, $password)) { + return($this->error); + } + + // Only set a limit if one was provided. + $limit = ""; + if(!empty($max_results)) { + $limit = "LIMIT {$max_results}"; + } + + $category_suggestions = $wpdb->get_results(" + SELECT cat_ID category_id, + cat_name category_name + FROM {$wpdb->categories} + WHERE cat_name LIKE '{$category}%' + {$limit} + "); + + return($category_suggestions); + } + + /* Blogger API functions * specs on http://plant.blogger.com/api and http://groups.yahoo.com/group/bloggerDev/ */ @@ -524,6 +918,37 @@ class wp_xmlrpc_server extends IXR_Server { if ( !current_user_can('publish_posts') ) return new IXR_Error(401, 'Sorry, you can not post on this weblog or category.'); + // The post_type defaults to post, but could also be page. + $post_type = "post"; + if( + !empty($content_struct["post_type"]) + && ($content_struct["post_type"] == "page") + ) { + $post_type = "page"; + } + + // Let WordPress generate the post_name (slug) unless + // one has been provided. + $post_name = ""; + if(!empty($content_struct["wp_slug"])) { + $post_name = $content_struct["wp_slug"]; + } + + // Only use a password if one was given. + if(!empty($content_struct["wp_password"])) { + $post_password = $content_struct["wp_password"]; + } + + // Only set a post parent if one was provided. + if(!empty($content_struct["wp_page_parent_id"])) { + $post_parent = $content_struct["wp_page_parent_id"]; + } + + // Only set the menu_order if it was provided. + if(!empty($content_struct["wp_page_order"])) { + $menu_order = $content_struct["wp_page_order"]; + } + $post_author = $user->ID; $post_title = $content_struct['title']; @@ -569,7 +994,7 @@ class wp_xmlrpc_server extends IXR_Server { } // 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', 'to_ping'); + $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_type', 'post_name', 'post_password', 'post_parent', 'menu_order'); $post_ID = wp_insert_post($postdata); @@ -623,6 +1048,36 @@ class wp_xmlrpc_server extends IXR_Server { extract($postdata); $this->escape($postdata); + // The post_type defaults to post, but could also be page. + $post_type = "post"; + if( + !empty($content_struct["post_type"]) + && ($content_struct["post_type"] == "page") + ) { + $post_type = "page"; + } + + // Let WordPress manage slug if none was provided. + $post_name = ""; + if(!empty($content_struct["wp_slug"])) { + $post_name = $content_struct["wp_slug"]; + } + + // Only use a password if one was given. + if(!empty($content_struct["wp_password"])) { + $post_password = $content_struct["wp_password"]; + } + + // Only set a post parent if one was given. + if(!empty($content_struct["wp_page_parent_id"])) { + $post_parent = $content_struct["wp_page_parent_id"]; + } + + // Only ste the menu_order if it was given. + if(!empty($content_struct["wp_page_order"])) { + $menu_order = $content_struct["wp_page_order"]; + } + $post_title = $content_struct['title']; $post_content = apply_filters( 'content_save_pre', $content_struct['description'] ); $catnames = $content_struct['categories']; @@ -665,7 +1120,7 @@ class wp_xmlrpc_server extends IXR_Server { } // 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', 'to_ping'); + $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_name', 'post_password', 'post_parent', 'menu_order'); $result = wp_update_post($newpost); if (!$result) { |