sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

AtomPub fixes from Pete Lacey. fixes #4887 

git-svn-id: https://develop.svn.wordpress.org/trunk@6004 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren 2007-09-01 19:32:54 +00:00
parent d166d37c3a
commit 9fb2ddc65f
1 changed files with 85 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

240
wp-app.php
View File

@ -13,24 +13,7 @@ require_once('./wp-config.php');
require_once(ABSPATH . WPINC . '/post-template.php'); require_once(ABSPATH . WPINC . '/post-template.php');
require_once(ABSPATH . WPINC . '/atomlib.php'); require_once(ABSPATH . WPINC . '/atomlib.php');
// Attempt to automatically detect whether to use querystring $_SERVER['PATH_INFO'] = preg_replace( '/.*\/wp-app\.php/', '', $_SERVER['REQUEST_URI'] );
// or PATH_INFO, based on our environment:
$use_querystring = $wp_version == 'MU' ? 1 : 0;
// 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( '.*/wp-app.php', '', $_SERVER['REQUEST_URI'] );
}
$app_logging = 0; $app_logging = 0;
@ -142,7 +125,7 @@ class AtomServer {
// redirect to /service in case no path is found. // redirect to /service in case no path is found.
if(strlen($path) == 0 || $path == '/') { if(strlen($path) == 0 || $path == '/') {
$this->redirect($this->get_service_url()); $this->redirect($this->get_service_url());
} }
// dispatch // dispatch
@ -150,22 +133,22 @@ class AtomServer {
if(preg_match($regex, $path, $matches)) { if(preg_match($regex, $path, $matches)) {
if(isset($funcs[$method])) { if(isset($funcs[$method])) {
// authenticate regardless of the operation and set the current // authenticate regardless of the operation and set the current
// user. each handler will decide if auth is required or not. // user. each handler will decide if auth is required or not.
$this->authenticate(); $this->authenticate();
$u = wp_get_current_user(); $u = wp_get_current_user();
if(!isset($u) || $u->ID == 0) { if(!isset($u) || $u->ID == 0) {
if ($always_authenticate) { if ($always_authenticate) {
$this->auth_required('Credentials required.'); $this->auth_required('Credentials required.');
} }
} }
array_shift($matches); array_shift($matches);
call_user_func_array(array(&$this,$funcs[$method]), $matches); call_user_func_array(array(&$this,$funcs[$method]), $matches);
exit(); exit();
} else { } else {
// only allow what we have handlers for... // only allow what we have handlers for...
$this->not_allowed(array_keys($funcs)); $this->not_allowed(array_keys($funcs));
} }
} }
} }
@ -245,7 +228,6 @@ EOD;
array_push($catnames, $cat["term"]); array_push($catnames, $cat["term"]);
$wp_cats = get_categories(array('hide_empty' => false)); $wp_cats = get_categories(array('hide_empty' => false));
log_app('CATEGORIES :', print_r($wp_cats,true));
$post_category = array(); $post_category = array();
@ -352,8 +334,6 @@ EOD;
$postdata = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'post_date', 'post_date_gmt'); $postdata = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'post_date', 'post_date_gmt');
$this->escape($postdata); $this->escape($postdata);
log_app('UPDATING ENTRY WITH:', print_r($postdata,true));
$result = wp_update_post($postdata); $result = wp_update_post($postdata);
if (!$result) { if (!$result) {
@ -606,23 +586,14 @@ EOD;
} }
function get_entries_url($page = NULL) { function get_entries_url($page = NULL) {
global $use_querystring;
if($GLOBALS['post_type'] == 'attachment') { if($GLOBALS['post_type'] == 'attachment') {
$path = $this->MEDIA_PATH; $path = $this->MEDIA_PATH;
} else { } else {
$path = $this->ENTRIES_PATH; $path = $this->ENTRIES_PATH;
} }
$url = get_bloginfo('url') . '/' . $this->script_name; $url = get_bloginfo('url') . '/' . $this->script_name . '/' . $path;
if ($use_querystring) { if(isset($page) && is_int($page)) {
$url .= '?action=/' . $path; $url .= "/$page";
if(isset($page) && is_int($page)) {
$url .= "&eid=$page";
}
} else {
$url .= '/' . $path;
if(isset($page) && is_int($page)) {
$url .= "/$page";
}
} }
return $url; return $url;
} }
@ -633,14 +604,7 @@ EOD;
} }
function get_categories_url($page = NULL) { function get_categories_url($page = NULL) {
global $use_querystring; return get_bloginfo('url') . '/' . $this->script_name . '/' . $this->CATEGORIES_PATH;
$url = get_bloginfo('url') . '/' . $this->script_name;
if ($use_querystring) {
$url .= '?action=/' . $this->CATEGORIES_PATH;
} else {
$url .= '/' . $this->CATEGORIES_PATH;
}
return $url;
} }
function the_categories_url() { function the_categories_url() {
@ -649,18 +613,9 @@ EOD;
} }
function get_attachments_url($page = NULL) { function get_attachments_url($page = NULL) {
global $use_querystring; $url = get_bloginfo('url') . '/' . $this->script_name . '/' . $this->MEDIA_PATH;
$url = get_bloginfo('url') . '/' . $this->script_name; if(isset($page) && is_int($page)) {
if ($use_querystring) { $url .= "/$page";
$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; return $url;
} }
@ -671,28 +626,16 @@ EOD;
} }
function get_service_url() { function get_service_url() {
global $use_querystring; return get_bloginfo('url') . '/' . $this->script_name . '/' . $this->SERVICE_PATH;
$url = get_bloginfo('url') . '/' . $this->script_name;
if ($use_querystring) {
$url .= '?action=/' . $this->SERVICE_PATH;
} else {
$url .= '/' . $this->SERVICE_PATH;
}
return $url;
} }
function get_entry_url($postID = NULL) { function get_entry_url($postID = NULL) {
global $use_querystring;
if(!isset($postID)) { if(!isset($postID)) {
global $post; global $post;
$postID = (int) $GLOBALS['post']->ID; $postID = (int) $GLOBALS['post']->ID;
} }
if ($use_querystring) { $url = get_bloginfo('url') . '/' . $this->script_name . '/' . $this->ENTRY_PATH . "/$postID";
$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"); log_app('function',"get_entry_url() = $url");
return $url; return $url;
@ -704,17 +647,12 @@ EOD;
} }
function get_media_url($postID = NULL) { function get_media_url($postID = NULL) {
global $use_querystring;
if(!isset($postID)) { if(!isset($postID)) {
global $post; global $post;
$postID = (int) $GLOBALS['post']->ID; $postID = (int) $GLOBALS['post']->ID;
} }
if ($use_querystring) { $url = get_bloginfo('url') . '/' . $this->script_name . '/' . $this->MEDIA_SINGLE_PATH ."/file/$postID";
$url = get_bloginfo('url') . '/' . $this->script_name . '?action=/' . $this->MEDIA_SINGLE_PATH ."/file&eid=$postID";
} else {
$url = get_bloginfo('url') . '/' . $this->script_name . '/' . $this->MEDIA_SINGLE_PATH ."/file/$postID";
}
log_app('function',"get_media_url() = $url"); log_app('function',"get_media_url() = $url");
return $url; return $url;
@ -767,7 +705,7 @@ EOD;
$count = get_option('posts_per_rss'); $count = get_option('posts_per_rss');
wp('what_to_show=posts&posts_per_page=' . $count . '&offset=' . ($page-1)); wp('what_to_show=posts&posts_per_page=' . $count . '&offset=' . ($count * ($page-1) ));
$post = $GLOBALS['post']; $post = $GLOBALS['post'];
$posts = $GLOBALS['posts']; $posts = $GLOBALS['posts'];
@ -783,6 +721,7 @@ EOD;
$next_page = (($page + 1) > $last_page) ? NULL : $page + 1; $next_page = (($page + 1) > $last_page) ? NULL : $page + 1;
$prev_page = ($page - 1) < 1 ? 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; $last_page = ((int)$last_page == 1 || (int)$last_page == 0) ? NULL : (int) $last_page;
$self_page = $page > 1 ? $page : NULL;
?><feed xmlns="<?php echo $this->ATOM_NS ?>" xmlns:app="<?php echo $this->ATOMPUB_NS ?>" xml:lang="<?php echo get_option('rss_language'); ?>"> ?><feed xmlns="<?php echo $this->ATOM_NS ?>" xmlns:app="<?php echo $this->ATOMPUB_NS ?>" xml:lang="<?php echo get_option('rss_language'); ?>">
<id><?php $this->the_entries_url() ?></id> <id><?php $this->the_entries_url() ?></id>
<updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT')); ?></updated> <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT')); ?></updated>
@ -796,46 +735,15 @@ EOD;
<link rel="next" type="<?php echo $this->ATOM_CONTENT_TYPE ?>" href="<?php $this->the_entries_url($next_page) ?>" /> <link rel="next" type="<?php echo $this->ATOM_CONTENT_TYPE ?>" href="<?php $this->the_entries_url($next_page) ?>" />
<?php endif; ?> <?php endif; ?>
<link rel="last" type="<?php echo $this->ATOM_CONTENT_TYPE ?>" href="<?php $this->the_entries_url($last_page) ?>" /> <link rel="last" type="<?php echo $this->ATOM_CONTENT_TYPE ?>" href="<?php $this->the_entries_url($last_page) ?>" />
<link rel="self" type="<?php echo $this->ATOM_CONTENT_TYPE ?>" href="<?php $this->the_entries_url() ?>" /> <link rel="self" type="<?php echo $this->ATOM_CONTENT_TYPE ?>" href="<?php $this->the_entries_url($self_page) ?>" />
<rights type="text">Copyright <?php echo mysql2date('Y', get_lastpostdate('blog')); ?></rights> <rights type="text">Copyright <?php echo mysql2date('Y', get_lastpostdate('blog')); ?></rights>
<generator uri="http://wordpress.com/" version="1.0.5-dc">WordPress.com Atom API</generator> <generator uri="http://wordpress.com/" version="1.0.5-dc">WordPress.com Atom API</generator>
<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); <?php if ( have_posts() ) {
$post = $GLOBALS['post']; while ( have_posts() ) {
?> the_post();
<entry> $this->echo_entry();
<id><?php the_guid($post->ID); ?></id> }
<title type="text"><![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:edited><?php echo get_post_modified_time('Y-m-d\TH:i:s\Z', true); ?></app:edited>
<app:control>
<app:draft><?php echo ($GLOBALS['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($GLOBALS['post']->post_type == 'attachment') { ?>
<link rel="edit-media" href="<?php $this->the_media_url() ?>" />
<content type="<?php echo $GLOBALS['post']->post_mime_type ?>" src="<?php the_guid(); ?>"/>
<?php } else { ?>
<link href="<?php the_permalink_rss() ?>" />
<?php if ( strlen( $GLOBALS['post']->post_content ) ) : ?>
<content type="html"><![CDATA[<?php echo get_the_content('', 0, '') ?>]]></content>
<?php endif; ?>
<?php } ?>
<link rel="edit" href="<?php $this->the_entry_url() ?>" />
<?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>
</entry>
<?php
endwhile;
endif;
?></feed> ?></feed>
<?php <?php
$feed = ob_get_contents(); $feed = ob_get_contents();
@ -856,15 +764,27 @@ $post = $GLOBALS['post'];
break; break;
} }
query_posts($varname . '=' . $postID); query_posts($varname . '=' . $postID);
if ( have_posts() ) : while ( have_posts() ) : the_post(); if ( have_posts() ) {
$post = $GLOBALS['post']; while ( have_posts() ) {
?> the_post();
<?php log_app('$post',print_r($GLOBALS['post'],true)); ?> $this->echo_entry();
log_app('$post',print_r($GLOBALS['post'],true));
$entry = ob_get_contents();
break;
}
}
ob_end_clean();
log_app('get_entry returning:',$entry);
return $entry;
}
function echo_entry() { ?>
<entry xmlns="<?php echo $this->ATOM_NS ?>" <entry xmlns="<?php echo $this->ATOM_NS ?>"
xmlns:app="<?php echo $this->ATOMPUB_NS ?>" xml:lang="<?php echo get_option('rss_language'); ?>"> xmlns:app="<?php echo $this->ATOMPUB_NS ?>" xml:lang="<?php echo get_option('rss_language'); ?>">
<id><?php the_guid($post->ID); ?></id> <id><?php the_guid($GLOBALS['post']->ID); ?></id>
<title type="text"><![CDATA[<?php the_title_rss() ?>]]></title> <?php list($content_type, $content) = $this->prep_content(get_the_title()); ?>
<title type="<?php echo $content_type ?>"><?php echo $content ?></title>
<updated><?php echo get_post_modified_time('Y-m-d\TH:i:s\Z', true); ?></updated> <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> <published><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></published>
<app:edited><?php echo get_post_modified_time('Y-m-d\TH:i:s\Z', true); ?></app:edited> <app:edited><?php echo get_post_modified_time('Y-m-d\TH:i:s\Z', true); ?></app:edited>
@ -874,34 +794,49 @@ $post = $GLOBALS['post'];
<author> <author>
<name><?php the_author()?></name> <name><?php the_author()?></name>
<email><?php the_author_email()?></email> <email><?php the_author_email()?></email>
<?php if (get_the_author_url() && get_the_author_url() != 'http://') { ?> <?php if (get_the_author_url() && get_the_author_url() != 'http://') { ?>
<uri><?php the_author_url()?></uri> <uri><?php the_author_url()?></uri>
<?php } ?> <?php } ?>
</author> </author>
<?php if($GLOBALS['post']->post_type == 'attachment') { ?> <?php if($GLOBALS['post']->post_type == 'attachment') { ?>
<link rel="edit-media" href="<?php $this->the_media_url() ?>" /> <link rel="edit-media" href="<?php $this->the_media_url() ?>" />
<content type="<?php echo $GLOBALS['post']->post_mime_type ?>" src="<?php the_guid(); ?>"/> <content type="<?php echo $GLOBALS['post']->post_mime_type ?>" src="<?php the_guid(); ?>"/>
<?php } else { ?> <?php } else { ?>
<link href="<?php the_permalink_rss() ?>" /> <link href="<?php the_permalink_rss() ?>" />
<?php if ( strlen( $GLOBALS['post']->post_content ) ) : ?> <?php if ( strlen( $GLOBALS['post']->post_content ) ) :
<content type="<?php echo $GLOBALS['post']->post_mime_tpye ?>"><![CDATA[<?php echo get_the_content('', 0, '') ?>]]></content> list($content_type, $content) = $this->prep_content(get_the_content()); ?>
<?php endif; ?> <content type="<?php echo $content_type ?>"><?php echo $content ?></content>
<?php endif; ?>
<?php } ?> <?php } ?>
<link rel="edit" href="<?php $this->the_entry_url() ?>" /> <link rel="edit" href="<?php $this->the_entry_url() ?>" />
<?php foreach(get_the_category() as $category) { ?> <?php foreach(get_the_category() as $category) { ?>
<category scheme="<?php bloginfo_rss('home') ?>" term="<?php echo $category->cat_name?>" /> <category scheme="<?php bloginfo_rss('home') ?>" term="<?php echo $category->cat_name?>" />
<?php } ?> <?php } ?>
<summary type="html"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary> <?php list($content_type, $content) = $this->prep_content(get_the_excerpt()); ?>
</entry> <summary type="<?php echo $content_type ?>"><?php echo $content ?></summary>
<?php </entry>
$entry = ob_get_contents(); <?php }
break;
endwhile;
endif;
ob_end_clean();
log_app('get_entry returning:',$entry); function prep_content($data) {
return $entry; if (strpos($data, '<') === false && strpos($data, '&') === false) {
return array('text', $data);
}
$parser = xml_parser_create();
xml_parse($parser, '<div>' . $data . '</div>', true);
$code = xml_get_error_code($parser);
xml_parser_free($parser);
if (!$code) {
$data = "<div xmlns='http://www.w3.org/1999/xhtml'>$data</div>";
return array('xhtml', $data);
}
if (strpos($data, ']]>') == false) {
return array('html', "<![CDATA[$data]]>");
} else {
return array('html', htmlspecialchars($data));
}
} }
function ok() { function ok() {
@ -997,7 +932,6 @@ EOD;
} }
function created($post_ID, $content, $post_type = 'post') { function created($post_ID, $content, $post_type = 'post') {
global $use_querystring;
log_app('created()::$post_ID',"$post_ID, $post_type"); log_app('created()::$post_ID',"$post_ID, $post_type");
$edit = $this->get_entry_url($post_ID); $edit = $this->get_entry_url($post_ID);
switch($post_type) { switch($post_type) {
@ -1005,11 +939,7 @@ EOD;
$ctloc = $this->get_entry_url($post_ID); $ctloc = $this->get_entry_url($post_ID);
break; break;
case 'attachment': case 'attachment':
if ($use_querystring) { $edit = get_bloginfo('url') . '/' . $this->script_name . "/attachments/$post_ID";
$edit = get_bloginfo('url') . '/' . $this->script_name . "?action=/attachments&amp;eid=$post_ID";
} else {
$edit = get_bloginfo('url') . '/' . $this->script_name . "/attachments/$post_ID";
}
break; break;
} }
header("Content-Type: $this->ATOM_CONTENT_TYPE"); header("Content-Type: $this->ATOM_CONTENT_TYPE");