Wordpress 2.8-scripts

[autoinstalls/wordpress.git] / wp-app.php

diff --git a/wp-app.php b/wp-app.php
index 8244dab30d4843948bd21e4336500d09f825b4e2..0ada250e3aa73de4d81e303ea007474035aa811e 100644 (file)
--- a/wp-app.php
+++ b/wp-app.php
@@ -26,6 +26,9 @@ require_once(ABSPATH . WPINC . '/atomlib.php');
 /** Feed Handling API */
 require_once(ABSPATH . WPINC . '/feed.php');
 
 /** Feed Handling API */
 require_once(ABSPATH . WPINC . '/feed.php');
 

+/** Admin Image API for metadata updating */
+require_once(ABSPATH . '/wp-admin/includes/image.php');
+

 $_SERVER['PATH_INFO'] = preg_replace( '/.*\/wp-app\.php/', '', $_SERVER['REQUEST_URI'] );
 
 /**
 $_SERVER['PATH_INFO'] = preg_replace( '/.*\/wp-app\.php/', '', $_SERVER['REQUEST_URI'] );
 
 /**


@@ -46,8 +49,9 @@ $app_logging = 0;
 $always_authenticate = 1;
 
 /**
 $always_authenticate = 1;
 
 /**

- * log_app() - Writes logging info to a file.
+ * Writes logging info to a file.

  *
  *

+ * @since 2.2.0

  * @uses $app_logging
  * @package WordPress
  * @subpackage Logging
  * @uses $app_logging
  * @package WordPress
  * @subpackage Logging


@@ -67,16 +71,7 @@ function log_app($label,$msg) {
 
 if ( !function_exists('wp_set_current_user') ) :
 /**
 
 if ( !function_exists('wp_set_current_user') ) :
 /**

- * wp_set_current_user() - Sets the current WordPress User
- *
- * Pluggable function which is also found in pluggable.php.
- *
- * @see wp-includes/pluggable.php Documentation for this function.
- * @uses $current_user Global of current user to test whether $id is the same.
- *
- * @param int $id The user's ID
- * @param string $name Optional. The username of the user.
- * @return WP_User Current user's User object
+ * @ignore

  */
 function wp_set_current_user($id, $name = '') {
        global $current_user;
  */
 function wp_set_current_user($id, $name = '') {
        global $current_user;


@@ -91,10 +86,12 @@ function wp_set_current_user($id, $name = '') {
 endif;
 
 /**
 endif;
 
 /**

- * wa_posts_where_include_drafts_filter() - Filter to add more post statuses
+ * Filter to add more post statuses.
+ *
+ * @since 2.2.0

  *
  *

- * @param string $where SQL statement to filter
- * @return string Filtered SQL statement with added post_status for where clause
+ * @param string $where SQL statement to filter.
+ * @return string Filtered SQL statement with added post_status for where clause.

  */
 function wa_posts_where_include_drafts_filter($where) {
        $where = str_replace("post_status = 'publish'","post_status = 'publish' OR post_status = 'future' OR post_status = 'draft' OR post_status = 'inherit'", $where);
  */
 function wa_posts_where_include_drafts_filter($where) {
        $where = str_replace("post_status = 'publish'","post_status = 'publish' OR post_status = 'future' OR post_status = 'draft' OR post_status = 'inherit'", $where);


@@ -104,37 +101,150 @@ function wa_posts_where_include_drafts_filter($where) {
 add_filter('posts_where', 'wa_posts_where_include_drafts_filter');
 
 /**
 add_filter('posts_where', 'wa_posts_where_include_drafts_filter');
 
 /**

- * @internal
- * Left undocumented to work on later. If you want to finish, then please do so.
+ * WordPress AtomPub API implementation.

  *
  * @package WordPress
  * @subpackage Publishing
  *
  * @package WordPress
  * @subpackage Publishing

+ * @since 2.2.0

  */
 class AtomServer {
 
  */
 class AtomServer {
 

+       /**
+        * ATOM content type.
+        *
+        * @since 2.2.0
+        * @var string
+        */

        var $ATOM_CONTENT_TYPE = 'application/atom+xml';
        var $ATOM_CONTENT_TYPE = 'application/atom+xml';

+
+       /**
+        * Categories ATOM content type.
+        *
+        * @since 2.2.0
+        * @var string
+        */

        var $CATEGORIES_CONTENT_TYPE = 'application/atomcat+xml';
        var $CATEGORIES_CONTENT_TYPE = 'application/atomcat+xml';

+
+       /**
+        * Service ATOM content type.
+        *
+        * @since 2.3.0
+        * @var string
+        */

        var $SERVICE_CONTENT_TYPE = 'application/atomsvc+xml';
 
        var $SERVICE_CONTENT_TYPE = 'application/atomsvc+xml';
 

+       /**
+        * ATOM XML namespace.
+        *
+        * @since 2.3.0
+        * @var string
+        */

        var $ATOM_NS = 'http://www.w3.org/2005/Atom';
        var $ATOM_NS = 'http://www.w3.org/2005/Atom';

+
+       /**
+        * ATOMPUB XML namespace.
+        *
+        * @since 2.3.0
+        * @var string
+        */

        var $ATOMPUB_NS = 'http://www.w3.org/2007/app';
 
        var $ATOMPUB_NS = 'http://www.w3.org/2007/app';
 

+       /**
+        * Entries path.
+        *
+        * @since 2.2.0
+        * @var string
+        */

        var $ENTRIES_PATH = "posts";
        var $ENTRIES_PATH = "posts";

+
+       /**
+        * Categories path.
+        *
+        * @since 2.2.0
+        * @var string
+        */

        var $CATEGORIES_PATH = "categories";
        var $CATEGORIES_PATH = "categories";

+
+       /**
+        * Media path.
+        *
+        * @since 2.2.0
+        * @var string
+        */

        var $MEDIA_PATH = "attachments";
        var $MEDIA_PATH = "attachments";

+
+       /**
+        * Entry path.
+        *
+        * @since 2.2.0
+        * @var string
+        */

        var $ENTRY_PATH = "post";
        var $ENTRY_PATH = "post";

+
+       /**
+        * Service path.
+        *
+        * @since 2.2.0
+        * @var string
+        */

        var $SERVICE_PATH = "service";
        var $SERVICE_PATH = "service";

+
+       /**
+        * Media single path.
+        *
+        * @since 2.2.0
+        * @var string
+        */

        var $MEDIA_SINGLE_PATH = "attachment";
 
        var $MEDIA_SINGLE_PATH = "attachment";
 

+       /**
+        * ATOMPUB parameters.
+        *
+        * @since 2.2.0
+        * @var array
+        */

        var $params = array();
        var $params = array();

+
+       /**
+        * Supported ATOMPUB media types.
+        *
+        * @since 2.3.0
+        * @var array
+        */

        var $media_content_types = array('image/*','audio/*','video/*');
        var $media_content_types = array('image/*','audio/*','video/*');

+
+       /**
+        * ATOMPUB content type(s).
+        *
+        * @since 2.2.0
+        * @var array
+        */

        var $atom_content_types = array('application/atom+xml');
 
        var $atom_content_types = array('application/atom+xml');
 

+       /**
+        * ATOMPUB methods.
+        *
+        * @since 2.2.0
+        * @var unknown_type
+        */

        var $selectors = array();
 
        var $selectors = array();
 

-       // support for head
+       /**
+        * Whether to do output.
+        *
+        * Support for head.
+        *
+        * @since 2.2.0
+        * @var bool
+        */

        var $do_output = true;
 
        var $do_output = true;
 

+       /**
+        * PHP4 constructor - Sets up object properties.
+        *
+        * @since 2.2.0
+        * @return AtomServer
+        */

        function AtomServer() {
 
                $this->script_name = array_pop(explode('/',$_SERVER['SCRIPT_NAME']));
        function AtomServer() {
 
                $this->script_name = array_pop(explode('/',$_SERVER['SCRIPT_NAME']));


@@ -169,13 +279,18 @@ class AtomServer {
                );
        }
 
                );
        }
 

+       /**
+        * Handle ATOMPUB request.
+        *
+        * @since 2.2.0
+        */

        function handle_request() {
                global $always_authenticate;
 
                if( !empty( $_SERVER['ORIG_PATH_INFO'] ) )
                        $path = $_SERVER['ORIG_PATH_INFO'];
                else
        function handle_request() {
                global $always_authenticate;
 
                if( !empty( $_SERVER['ORIG_PATH_INFO'] ) )
                        $path = $_SERVER['ORIG_PATH_INFO'];
                else

-                       $path = $_SERVER['PATH_INFO']; 
+                       $path = $_SERVER['PATH_INFO'];

 
                $method = $_SERVER['REQUEST_METHOD'];
 
 
                $method = $_SERVER['REQUEST_METHOD'];
 


@@ -226,15 +341,20 @@ class AtomServer {
                $this->not_found();
        }
 
                $this->not_found();
        }
 

+       /**
+        * Retrieve XML for ATOMPUB service.
+        *
+        * @since 2.2.0
+        */

        function get_service() {
                log_app('function','get_service()');
 
                if( !current_user_can( 'edit_posts' ) )
                        $this->auth_required( __( 'Sorry, you do not have the right to access this blog.' ) );
 
        function get_service() {
                log_app('function','get_service()');
 
                if( !current_user_can( 'edit_posts' ) )
                        $this->auth_required( __( 'Sorry, you do not have the right to access this blog.' ) );
 

-               $entries_url = attribute_escape($this->get_entries_url());
-               $categories_url = attribute_escape($this->get_categories_url());
-               $media_url = attribute_escape($this->get_attachments_url());
+               $entries_url = esc_attr($this->get_entries_url());
+               $categories_url = esc_attr($this->get_categories_url());
+               $media_url = esc_attr($this->get_attachments_url());

                foreach ($this->media_content_types as $med) {
                        $accepted_media_types = $accepted_media_types . "<accept>" . $med . "</accept>";
                }
                foreach ($this->media_content_types as $med) {
                        $accepted_media_types = $accepted_media_types . "<accept>" . $med . "</accept>";
                }


@@ -261,18 +381,23 @@ EOD;
                $this->output($service_doc, $this->SERVICE_CONTENT_TYPE);
        }
 
                $this->output($service_doc, $this->SERVICE_CONTENT_TYPE);
        }
 

+       /**
+        * Retrieve categories list in XML format.
+        *
+        * @since 2.2.0
+        */

        function get_categories_xml() {
                log_app('function','get_categories_xml()');
 
                if( !current_user_can( 'edit_posts' ) )
                        $this->auth_required( __( 'Sorry, you do not have the right to access this blog.' ) );
 
        function get_categories_xml() {
                log_app('function','get_categories_xml()');
 
                if( !current_user_can( 'edit_posts' ) )
                        $this->auth_required( __( 'Sorry, you do not have the right to access this blog.' ) );
 

-               $home = attribute_escape(get_bloginfo_rss('home'));
+               $home = esc_attr(get_bloginfo_rss('home'));

 
                $categories = "";
                $cats = get_categories("hierarchical=0&hide_empty=0");
                foreach ((array) $cats as $cat) {
 
                $categories = "";
                $cats = get_categories("hierarchical=0&hide_empty=0");
                foreach ((array) $cats as $cat) {

-                       $categories .= "    <category term=\"" . attribute_escape($cat->name) .  "\" />\n";
+                       $categories .= "    <category term=\"" . esc_attr($cat->name) .  "\" />\n";

 }
                $output = <<<EOD
 <app:categories xmlns:app="$this->ATOMPUB_NS"
 }
                $output = <<<EOD
 <app:categories xmlns:app="$this->ATOMPUB_NS"


@@ -284,8 +409,10 @@ EOD;
        $this->output($output, $this->CATEGORIES_CONTENT_TYPE);
 }
 
        $this->output($output, $this->CATEGORIES_CONTENT_TYPE);
 }
 

-       /*
-        * Create Post (No arguments)
+       /**
+        * Create new post.
+        *
+        * @since 2.2.0

         */
        function create_post() {
                global $blog_id, $user_ID;
         */
        function create_post() {
                global $blog_id, $user_ID;


@@ -351,12 +478,21 @@ EOD;
                // this could affect our ability to send back the right headers
                @wp_set_post_categories($postID, $post_category);
 
                // this could affect our ability to send back the right headers
                @wp_set_post_categories($postID, $post_category);
 

+               do_action( 'atompub_create_post', $postID, $entry );
+

                $output = $this->get_entry($postID);
 
                log_app('function',"create_post($postID)");
                $this->created($postID, $output);
        }
 
                $output = $this->get_entry($postID);
 
                log_app('function',"create_post($postID)");
                $this->created($postID, $output);
        }
 

+       /**
+        * Retrieve post.
+        *
+        * @since 2.2.0
+        *
+        * @param int $postID Post ID.
+        */

        function get_post($postID) {
                global $entry;
 
        function get_post($postID) {
                global $entry;
 


@@ -370,6 +506,13 @@ EOD;
 
        }
 
 
        }
 

+       /**
+        * Update post.
+        *
+        * @since 2.2.0
+        *
+        * @param int $postID Post ID.
+        */

        function put_post($postID) {
                // checked for valid content-types (atom+xml)
                // quick check and exit
        function put_post($postID) {
                // checked for valid content-types (atom+xml)
                // quick check and exit


@@ -415,10 +558,19 @@ EOD;
                        $this->internal_error(__('For some strange yet very annoying reason, this post could not be edited.'));
                }
 
                        $this->internal_error(__('For some strange yet very annoying reason, this post could not be edited.'));
                }
 

+               do_action( 'atompub_put_post', $ID, $parsed );
+

                log_app('function',"put_post($postID)");
                $this->ok();
        }
 
                log_app('function',"put_post($postID)");
                $this->ok();
        }
 

+       /**
+        * Remove post.
+        *
+        * @since 2.2.0
+        *
+        * @param int $postID Post ID.
+        */

        function delete_post($postID) {
 
                // check for not found
        function delete_post($postID) {
 
                // check for not found


@@ -444,7 +596,14 @@ EOD;
 
        }
 
 
        }
 

-       function get_attachment($postID = NULL) {
+       /**
+        * Retrieve attachment.
+        *
+        * @since 2.2.0
+        *
+        * @param int $postID Optional. Post ID.
+        */
+       function get_attachment($postID = null) {

                if( !current_user_can( 'upload_files' ) )
                        $this->auth_required( __( 'Sorry, you do not have permission to upload files.' ) );
 
                if( !current_user_can( 'upload_files' ) )
                        $this->auth_required( __( 'Sorry, you do not have permission to upload files.' ) );
 


@@ -458,6 +617,11 @@ EOD;
                }
        }
 
                }
        }
 

+       /**
+        * Create new attachment.
+        *
+        * @since 2.2.0
+        */

        function create_attachment() {
 
                $type = $this->get_accepted_content_type();
        function create_attachment() {
 
                $type = $this->get_accepted_content_type();


@@ -466,7 +630,7 @@ EOD;
                        $this->auth_required(__('You do not have permission to upload files.'));
 
                $fp = fopen("php://input", "rb");
                        $this->auth_required(__('You do not have permission to upload files.'));
 
                $fp = fopen("php://input", "rb");

-               $bits = NULL;
+               $bits = null;

                while(!feof($fp)) {
                        $bits .= fread($fp, 4096);
                }
                while(!feof($fp)) {
                        $bits .= fread($fp, 4096);
                }


@@ -512,6 +676,13 @@ EOD;
                log_app('function',"create_attachment($postID)");
        }
 
                log_app('function',"create_attachment($postID)");
        }
 

+       /**
+        * Update attachment.
+        *
+        * @since 2.2.0
+        *
+        * @param int $postID Post ID.
+        */

        function put_attachment($postID) {
                // checked for valid content-types (atom+xml)
                // quick check and exit
        function put_attachment($postID) {
                // checked for valid content-types (atom+xml)
                // quick check and exit


@@ -534,7 +705,7 @@ EOD;
                extract($entry);
 
                $post_title = $parsed->title[1];
                extract($entry);
 
                $post_title = $parsed->title[1];

-               $post_content = $parsed->content[1];
+               $post_content = $parsed->summary[1];

                $pubtimes = $this->get_publish_time($parsed->updated);
                $post_modified = $pubtimes[0];
                $post_modified_gmt = $pubtimes[1];
                $pubtimes = $this->get_publish_time($parsed->updated);
                $post_modified = $pubtimes[0];
                $post_modified_gmt = $pubtimes[1];


@@ -552,6 +723,13 @@ EOD;
                $this->ok();
        }
 
                $this->ok();
        }
 

+       /**
+        * Remove attachment.
+        *
+        * @since 2.2.0
+        *
+        * @param int $postID Post ID.
+        */

        function delete_attachment($postID) {
                log_app('function',"delete_attachment($postID). File '$location' deleted.");
 
        function delete_attachment($postID) {
                log_app('function',"delete_attachment($postID). File '$location' deleted.");
 


@@ -583,6 +761,13 @@ EOD;
                $this->ok();
        }
 
                $this->ok();
        }
 

+       /**
+        * Retrieve attachment from post.
+        *
+        * @since 2.2.0
+        *
+        * @param int $postID Post ID.
+        */

        function get_file($postID) {
 
                // check for not found
        function get_file($postID) {
 
                // check for not found


@@ -614,6 +799,13 @@ EOD;
                exit;
        }
 
                exit;
        }
 

+       /**
+        * Upload file to blog and add attachment to post.
+        *
+        * @since 2.2.0
+        *
+        * @param int $postID Post ID.
+        */

        function put_file($postID) {
 
                // first check if user can upload
        function put_file($postID) {
 
                // first check if user can upload


@@ -629,9 +821,12 @@ EOD;
                        $this->auth_required(__('Sorry, you do not have the right to edit this post.'));
                }
 
                        $this->auth_required(__('Sorry, you do not have the right to edit this post.'));
                }
 

+               $upload_dir = wp_upload_dir( );

                $location = get_post_meta($entry['ID'], '_wp_attached_file', true);
                $filetype = wp_check_filetype($location);
 
                $location = get_post_meta($entry['ID'], '_wp_attached_file', true);
                $filetype = wp_check_filetype($location);
 

+               $location = "{$upload_dir['basedir']}/{$location}";
+

                if(!isset($location) || 'attachment' != $entry['post_type'] || empty($filetype['ext']))
                        $this->internal_error(__('Error ocurred while accessing post metadata for file location.'));
 
                if(!isset($location) || 'attachment' != $entry['post_type'] || empty($filetype['ext']))
                        $this->internal_error(__('Error ocurred while accessing post metadata for file location.'));
 


@@ -658,11 +853,21 @@ EOD;
                        $this->internal_error(__('Sorry, your entry could not be posted. Something wrong happened.'));
                }
 
                        $this->internal_error(__('Sorry, your entry could not be posted. Something wrong happened.'));
                }
 

+               wp_update_attachment_metadata( $postID, wp_generate_attachment_metadata( $postID, $location ) );
+

                log_app('function',"put_file($postID)");
                $this->ok();
        }
 
                log_app('function',"put_file($postID)");
                $this->ok();
        }
 

-       function get_entries_url($page = NULL) {
+       /**
+        * Retrieve entries URL.
+        *
+        * @since 2.2.0
+        *
+        * @param int $page Page ID.
+        * @return string
+        */
+       function get_entries_url($page = null) {

                if($GLOBALS['post_type'] == 'attachment') {
                        $path = $this->MEDIA_PATH;
                } else {
                if($GLOBALS['post_type'] == 'attachment') {
                        $path = $this->MEDIA_PATH;
                } else {


@@ -675,19 +880,47 @@ EOD;
                return $url;
        }
 
                return $url;
        }
 

-       function the_entries_url($page = NULL) {
+       /**
+        * Display entries URL.
+        *
+        * @since 2.2.0
+        *
+        * @param int $page Page ID.
+        */
+       function the_entries_url($page = null) {

                echo $this->get_entries_url($page);
        }
 
                echo $this->get_entries_url($page);
        }
 

+       /**
+        * Retrieve categories URL.
+        *
+        * @since 2.2.0
+        *
+        * @param mixed $deprecated Optional, not used.
+        * @return string
+        */

        function get_categories_url($deprecated = '') {
                return $this->app_base . $this->CATEGORIES_PATH;
        }
 
        function get_categories_url($deprecated = '') {
                return $this->app_base . $this->CATEGORIES_PATH;
        }
 

+       /**
+        * Display category URL.
+        *
+        * @since 2.2.0
+        */

        function the_categories_url() {
                echo $this->get_categories_url();
        }
 
        function the_categories_url() {
                echo $this->get_categories_url();
        }
 

-       function get_attachments_url($page = NULL) {
+       /**
+        * Retrieve attachment URL.
+        *
+        * @since 2.2.0
+        *
+        * @param int $page Page ID.
+        * @return string
+        */
+       function get_attachments_url($page = null) {

                $url = $this->app_base . $this->MEDIA_PATH;
                if(isset($page) && is_int($page)) {
                        $url .= "/$page";
                $url = $this->app_base . $this->MEDIA_PATH;
                if(isset($page) && is_int($page)) {
                        $url .= "/$page";


@@ -695,15 +928,37 @@ EOD;
                return $url;
        }
 
                return $url;
        }
 

-       function the_attachments_url($page = NULL) {
+       /**
+        * Display attachment URL.
+        *
+        * @since 2.2.0
+        *
+        * @param int $page Page ID.
+        */
+       function the_attachments_url($page = null) {

                echo $this->get_attachments_url($page);
        }
 
                echo $this->get_attachments_url($page);
        }
 

+       /**
+        * Retrieve service URL.
+        *
+        * @since 2.3.0
+        *
+        * @return string
+        */

        function get_service_url() {
                return $this->app_base . $this->SERVICE_PATH;
        }
 
        function get_service_url() {
                return $this->app_base . $this->SERVICE_PATH;
        }
 

-       function get_entry_url($postID = NULL) {
+       /**
+        * Retrieve entry URL.
+        *
+        * @since 2.7.0
+        *
+        * @param int $postID Post ID.
+        * @return string
+        */
+       function get_entry_url($postID = null) {

                if(!isset($postID)) {
                        global $post;
                        $postID = (int) $post->ID;
                if(!isset($postID)) {
                        global $post;
                        $postID = (int) $post->ID;


@@ -715,11 +970,26 @@ EOD;
                return $url;
        }
 
                return $url;
        }
 

-       function the_entry_url($postID = NULL) {
+       /**
+        * Display entry URL.
+        *
+        * @since 2.7.0
+        *
+        * @param int $postID Post ID.
+        */
+       function the_entry_url($postID = null) {

                echo $this->get_entry_url($postID);
        }
 
                echo $this->get_entry_url($postID);
        }
 

-       function get_media_url($postID = NULL) {
+       /**
+        * Retrieve media URL.
+        *
+        * @since 2.2.0
+        *
+        * @param int $postID Post ID.
+        * @return string
+        */
+       function get_media_url($postID = null) {

                if(!isset($postID)) {
                        global $post;
                        $postID = (int) $post->ID;
                if(!isset($postID)) {
                        global $post;
                        $postID = (int) $post->ID;


@@ -731,10 +1001,24 @@ EOD;
                return $url;
        }
 
                return $url;
        }
 

-       function the_media_url($postID = NULL) {
+       /**
+        * Display the media URL.
+        *
+        * @since 2.2.0
+        *
+        * @param int $postID Post ID.
+        */
+       function the_media_url($postID = null) {

                echo $this->get_media_url($postID);
        }
 
                echo $this->get_media_url($postID);
        }
 

+       /**
+        * Set the current entry to post ID.
+        *
+        * @since 2.2.0
+        *
+        * @param int $postID Post ID.
+        */

        function set_current_entry($postID) {
                global $entry;
                log_app('function',"set_current_entry($postID)");
        function set_current_entry($postID) {
                global $entry;
                log_app('function',"set_current_entry($postID)");


@@ -752,24 +1036,51 @@ EOD;
                return;
        }
 
                return;
        }
 

+       /**
+        * Display posts XML.
+        *
+        * @since 2.2.0
+        *
+        * @param int $page Optional. Page ID.
+        * @param string $post_type Optional, default is 'post'. Post Type.
+        */

        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_posts($page = 1, $post_type = 'post') {
                        log_app('function',"get_posts($page, '$post_type')");
                        $feed = $this->get_feed($page, $post_type);
                        $this->output($feed);
        }
 

+       /**
+        * Display attachment XML.
+        *
+        * @since 2.2.0
+        *
+        * @param int $page Page ID.
+        * @param string $post_type Optional, default is 'attachment'. Post type.
+        */

        function get_attachments($page = 1, $post_type = 'attachment') {
        function get_attachments($page = 1, $post_type = 'attachment') {

-           log_app('function',"get_attachments($page, '$post_type')");
-           $GLOBALS['post_type'] = $post_type;
-           $feed = $this->get_feed($page, $post_type);
-           $this->output($feed);
+               log_app('function',"get_attachments($page, '$post_type')");
+               $GLOBALS['post_type'] = $post_type;
+               $feed = $this->get_feed($page, $post_type);
+               $this->output($feed);

        }
 
        }
 

+       /**
+        * Retrieve feed XML.
+        *
+        * @since 2.2.0
+        *
+        * @param int $page Page ID.
+        * @param string $post_type Optional, default is post. Post type.
+        * @return string
+        */

        function get_feed($page = 1, $post_type = 'post') {
                global $post, $wp, $wp_query, $posts, $wpdb, $blog_id;
                log_app('function',"get_feed($page, '$post_type')");
                ob_start();
 
        function get_feed($page = 1, $post_type = 'post') {
                global $post, $wp, $wp_query, $posts, $wpdb, $blog_id;
                log_app('function',"get_feed($page, '$post_type')");
                ob_start();
 

+               $this->ENTRY_PATH = $post_type;
+

                if(!isset($page)) {
                        $page = 1;
                }
                if(!isset($page)) {
                        $page = 1;
                }


@@ -777,7 +1088,7 @@ EOD;
 
                $count = get_option('posts_per_rss');
 
 
                $count = get_option('posts_per_rss');
 

-               wp('what_to_show=posts&posts_per_page=' . $count . '&offset=' . ($count * ($page-1) . '&orderby=modified'));
+               wp('posts_per_page=' . $count . '&offset=' . ($count * ($page-1) . '&orderby=modified'));

 
                $post = $GLOBALS['post'];
                $posts = $GLOBALS['posts'];
 
                $post = $GLOBALS['post'];
                $posts = $GLOBALS['posts'];


@@ -795,7 +1106,7 @@ EOD;
                $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'); ?>">
 <id><?php $this->the_entries_url() ?></id>
                $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'); ?>">
 <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'), false); ?></updated>

 <title type="text"><?php bloginfo_rss('name') ?></title>
 <subtitle type="text"><?php bloginfo_rss("description") ?></subtitle>
 <link rel="first" type="<?php echo $this->ATOM_CONTENT_TYPE ?>" href="<?php $this->the_entries_url() ?>" />
 <title type="text"><?php bloginfo_rss('name') ?></title>
 <subtitle type="text"><?php bloginfo_rss("description") ?></subtitle>
 <link rel="first" type="<?php echo $this->ATOM_CONTENT_TYPE ?>" href="<?php $this->the_entries_url() ?>" />


@@ -807,7 +1118,7 @@ EOD;
 <?php endif; ?>
 <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($self_page) ?>" />
 <?php endif; ?>
 <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($self_page) ?>" />

-<rights type="text">Copyright <?php echo mysql2date('Y', get_lastpostdate('blog')); ?></rights>
+<rights type="text">Copyright <?php echo date('Y'); ?></rights>

 <?php the_generator( 'atom' ); ?>
 <?php if ( have_posts() ) {
                        while ( have_posts() ) {
 <?php the_generator( 'atom' ); ?>
 <?php if ( have_posts() ) {
                        while ( have_posts() ) {


@@ -822,6 +1133,15 @@ EOD;
                return $feed;
        }
 
                return $feed;
        }
 

+       /**
+        * Display entry XML.
+        *
+        * @since 2.2.0
+        *
+        * @param int $postID Post ID.
+        * @param string $post_type Optional, default is post. Post type.
+        * @return string.
+        */

        function get_entry($postID, $post_type = 'post') {
                log_app('function',"get_entry($postID, '$post_type')");
                ob_start();
        function get_entry($postID, $post_type = 'post') {
                log_app('function',"get_entry($postID, '$post_type')");
                ob_start();


@@ -830,6 +1150,7 @@ EOD;
                                $varname = 'p';
                                break;
                        case 'attachment':
                                $varname = 'p';
                                break;
                        case 'attachment':

+                               $this->ENTRY_PATH = 'attachment';

                                $varname = 'attachment_id';
                                break;
                }
                                $varname = 'attachment_id';
                                break;
                }


@@ -849,6 +1170,11 @@ EOD;
                return $entry;
        }
 
                return $entry;
        }
 

+       /**
+        * Display post content XML.
+        *
+        * @since 2.3.0
+        */

        function echo_entry() { ?>
 <entry xmlns="<?php echo $this->ATOM_NS ?>"
        xmlns:app="<?php echo $this->ATOMPUB_NS ?>" xml:lang="<?php echo get_option('rss_language'); ?>">
        function echo_entry() { ?>
 <entry xmlns="<?php echo $this->ATOM_NS ?>"
        xmlns:app="<?php echo $this->ATOMPUB_NS ?>" xml:lang="<?php echo get_option('rss_language'); ?>">


@@ -863,8 +1189,8 @@ EOD;
        </app:control>
        <author>
                <name><?php the_author()?></name>
        </app:control>
        <author>
                <name><?php the_author()?></name>

-<?php if (get_the_author_url() && get_the_author_url() != 'http://') { ?>
-               <uri><?php the_author_url()?></uri>
+<?php if ( get_the_author_meta('url') && get_the_author_meta('url') != 'http://' ) { ?>
+               <uri><?php the_author_meta('url') ?></uri>

 <?php } ?>
        </author>
 <?php if($GLOBALS['post']->post_type == 'attachment') { ?>
 <?php } ?>
        </author>
 <?php if($GLOBALS['post']->post_type == 'attachment') { ?>


@@ -878,14 +1204,17 @@ list($content_type, $content) = prep_atom_text_construct(get_the_content()); ?>
 <?php endif; ?>
 <?php } ?>
        <link rel="edit" href="<?php $this->the_entry_url() ?>" />
 <?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->name?>" />
-<?php } ?>
+       <?php the_category_rss( 'atom' ); ?>

 <?php list($content_type, $content) = prep_atom_text_construct(get_the_excerpt()); ?>
        <summary type="<?php echo $content_type ?>"><?php echo $content ?></summary>
 </entry>
 <?php }
 
 <?php list($content_type, $content) = prep_atom_text_construct(get_the_excerpt()); ?>
        <summary type="<?php echo $content_type ?>"><?php echo $content ?></summary>
 </entry>
 <?php }
 

+       /**
+        * Set 'OK' (200) status header.
+        *
+        * @since 2.2.0
+        */

        function ok() {
                log_app('Status','200: OK');
                header('Content-Type: text/plain');
        function ok() {
                log_app('Status','200: OK');
                header('Content-Type: text/plain');


@@ -893,6 +1222,11 @@ list($content_type, $content) = prep_atom_text_construct(get_the_content()); ?>
                exit;
        }
 
                exit;
        }
 

+       /**
+        * Set 'No Content' (204) status header.
+        *
+        * @since 2.2.0
+        */

        function no_content() {
                log_app('Status','204: No Content');
                header('Content-Type: text/plain');
        function no_content() {
                log_app('Status','204: No Content');
                header('Content-Type: text/plain');


@@ -901,6 +1235,13 @@ list($content_type, $content) = prep_atom_text_construct(get_the_content()); ?>
                exit;
        }
 
                exit;
        }
 

+       /**
+        * Display 'Internal Server Error' (500) status header.
+        *
+        * @since 2.2.0
+        *
+        * @param string $msg Optional. Status string.
+        */

        function internal_error($msg = 'Internal Server Error') {
                log_app('Status','500: Server Error');
                header('Content-Type: text/plain');
        function internal_error($msg = 'Internal Server Error') {
                log_app('Status','500: Server Error');
                header('Content-Type: text/plain');


@@ -909,6 +1250,11 @@ list($content_type, $content) = prep_atom_text_construct(get_the_content()); ?>
                exit;
        }
 
                exit;
        }
 

+       /**
+        * Set 'Bad Request' (400) status header.
+        *
+        * @since 2.2.0
+        */

        function bad_request() {
                log_app('Status','400: Bad Request');
                header('Content-Type: text/plain');
        function bad_request() {
                log_app('Status','400: Bad Request');
                header('Content-Type: text/plain');


@@ -916,6 +1262,11 @@ list($content_type, $content) = prep_atom_text_construct(get_the_content()); ?>
                exit;
        }
 
                exit;
        }
 

+       /**
+        * Set 'Length Required' (411) status header.
+        *
+        * @since 2.2.0
+        */

        function length_required() {
                log_app('Status','411: Length Required');
                header("HTTP/1.1 411 Length Required");
        function length_required() {
                log_app('Status','411: Length Required');
                header("HTTP/1.1 411 Length Required");


@@ -924,6 +1275,11 @@ list($content_type, $content) = prep_atom_text_construct(get_the_content()); ?>
                exit;
        }
 
                exit;
        }
 

+       /**
+        * Set 'Unsupported Media Type' (415) status header.
+        *
+        * @since 2.2.0
+        */

        function invalid_media() {
                log_app('Status','415: Unsupported Media Type');
                header("HTTP/1.1 415 Unsupported Media Type");
        function invalid_media() {
                log_app('Status','415: Unsupported Media Type');
                header("HTTP/1.1 415 Unsupported Media Type");


@@ -931,6 +1287,11 @@ list($content_type, $content) = prep_atom_text_construct(get_the_content()); ?>
                exit;
        }
 
                exit;
        }
 

+       /**
+        * Set 'Forbidden' (403) status header.
+        *
+        * @since 2.6.0
+        */

        function forbidden($reason='') {
                log_app('Status','403: Forbidden');
                header('Content-Type: text/plain');
        function forbidden($reason='') {
                log_app('Status','403: Forbidden');
                header('Content-Type: text/plain');


@@ -939,6 +1300,11 @@ list($content_type, $content) = prep_atom_text_construct(get_the_content()); ?>
                exit;
        }
 
                exit;
        }
 

+       /**
+        * Set 'Not Found' (404) status header.
+        *
+        * @since 2.2.0
+        */

        function not_found() {
                log_app('Status','404: Not Found');
                header('Content-Type: text/plain');
        function not_found() {
                log_app('Status','404: Not Found');
                header('Content-Type: text/plain');


@@ -946,6 +1312,11 @@ list($content_type, $content) = prep_atom_text_construct(get_the_content()); ?>
                exit;
        }
 
                exit;
        }
 

+       /**
+        * Set 'Not Allowed' (405) status header.
+        *
+        * @since 2.2.0
+        */

        function not_allowed($allow) {
                log_app('Status','405: Not Allowed');
                header('Allow: ' . join(',', $allow));
        function not_allowed($allow) {
                log_app('Status','405: Not Allowed');
                header('Allow: ' . join(',', $allow));


@@ -953,10 +1324,15 @@ list($content_type, $content) = prep_atom_text_construct(get_the_content()); ?>
                exit;
        }
 
                exit;
        }
 

+       /**
+        * Display Redirect (302) content and set status headers.
+        *
+        * @since 2.3.0
+        */

        function redirect($url) {
 
                log_app('Status','302: Redirect');
        function redirect($url) {
 
                log_app('Status','302: Redirect');

-               $escaped_url = attribute_escape($url);
+               $escaped_url = esc_attr($url);

                $content = <<<EOD
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
 <html>
                $content = <<<EOD
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
 <html>


@@ -978,7 +1354,11 @@ EOD;
 
        }
 
 
        }
 

-
+       /**
+        * Set 'Client Error' (400) status header.
+        *
+        * @since 2.2.0
+        */

        function client_error($msg = 'Client Error') {
                log_app('Status','400: Client Error');
                header('Content-Type: text/plain');
        function client_error($msg = 'Client Error') {
                log_app('Status','400: Client Error');
                header('Content-Type: text/plain');


@@ -986,6 +1366,13 @@ EOD;
                exit;
        }
 
                exit;
        }
 

+       /**
+        * Set created status headers (201).
+        *
+        * Sets the 'content-type', 'content-location', and 'location'.
+        *
+        * @since 2.2.0
+        */

        function created($post_ID, $content, $post_type = 'post') {
                log_app('created()::$post_ID',"$post_ID, $post_type");
                $edit = $this->get_entry_url($post_ID);
        function created($post_ID, $content, $post_type = 'post') {
                log_app('created()::$post_ID',"$post_ID, $post_type");
                $edit = $this->get_entry_url($post_ID);


@@ -1006,12 +1393,19 @@ EOD;
                exit;
        }
 
                exit;
        }
 

+       /**
+        * Set 'Auth Required' (401) headers.
+        *
+        * @since 2.2.0
+        *
+        * @param string $msg Status header content and HTML content.
+        */

        function auth_required($msg) {
                log_app('Status','401: Auth Required');
                nocache_headers();
                header('WWW-Authenticate: Basic realm="WordPress Atom Protocol"');
                header("HTTP/1.1 401 $msg");
        function auth_required($msg) {
                log_app('Status','401: Auth Required');
                nocache_headers();
                header('WWW-Authenticate: Basic realm="WordPress Atom Protocol"');
                header("HTTP/1.1 401 $msg");

-               header('Status: ' . $msg);
+               header('Status: 401 ' . $msg);

                header('Content-Type: text/html');
                $content = <<<EOD
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
                header('Content-Type: text/html');
                $content = <<<EOD
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">


@@ -1030,6 +1424,14 @@ EOD;
                exit;
        }
 
                exit;
        }
 

+       /**
+        * Display XML and set headers with content type.
+        *
+        * @since 2.2.0
+        *
+        * @param string $xml Display feed content.
+        * @param string $ctype Optional, default is 'atom+xml'. Feed content type.
+        */

        function output($xml, $ctype = 'application/atom+xml') {
                        status_header('200');
                        $xml = '<?xml version="1.0" encoding="' . strtolower(get_option('blog_charset')) . '"?>'."\n".$xml;
        function output($xml, $ctype = 'application/atom+xml') {
                        status_header('200');
                        $xml = '<?xml version="1.0" encoding="' . strtolower(get_option('blog_charset')) . '"?>'."\n".$xml;


@@ -1044,6 +1446,13 @@ EOD;
                        exit;
        }
 
                        exit;
        }
 

+       /**
+        * Sanitize content for database usage.
+        *
+        * @since 2.2.0
+        *
+        * @param array $array Sanitize array and multi-dimension array.
+        */

        function escape(&$array) {
                global $wpdb;
 
        function escape(&$array) {
                global $wpdb;
 


@@ -1058,8 +1467,12 @@ EOD;
                }
        }
 
                }
        }
 

-       /*
-        * Access credential through various methods and perform login
+       /**
+        * Access credential through various methods and perform login.
+        *
+        * @since 2.2.0
+        *
+        * @return bool

         */
        function authenticate() {
                log_app("authenticate()",print_r($_ENV, true));
         */
        function authenticate() {
                log_app("authenticate()",print_r($_ENV, true));


@@ -1069,23 +1482,37 @@ EOD;
                if(isset($_SERVER['HTTP_AUTHORIZATION'])) {
                        list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) =
                                explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
                if(isset($_SERVER['HTTP_AUTHORIZATION'])) {
                        list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) =
                                explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));

+               } else if (isset($_SERVER['REDIRECT_REMOTE_USER'])) {
+                       // Workaround for setups that do not forward HTTP_AUTHORIZATION
+                       // See http://trac.wordpress.org/ticket/7361
+                       list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) =
+                               explode(':', base64_decode(substr($_SERVER['REDIRECT_REMOTE_USER'], 6)));

                }
 
                // If Basic Auth is working...
                if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
                        log_app("Basic Auth",$_SERVER['PHP_AUTH_USER']);
                }
 
                // If Basic Auth is working...
                if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
                        log_app("Basic Auth",$_SERVER['PHP_AUTH_USER']);

-                       $user = wp_authenticate($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
-                       if ( $user && !is_wp_error($user) ) {
-                               wp_set_current_user($user->ID);
-                               log_app("authenticate()", $_SERVER['PHP_AUTH_USER']);
-                               return true;
-                       }
+               }
+
+               $user = wp_authenticate($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
+               if ( $user && !is_wp_error($user) ) {
+                       wp_set_current_user($user->ID);
+                       log_app("authenticate()", $user->user_login);
+                       return true;

                }
 
                return false;
        }
 
                }
 
                return false;
        }
 

-       function get_accepted_content_type($types = NULL) {
+       /**
+        * Retrieve accepted content types.
+        *
+        * @since 2.2.0
+        *
+        * @param array $types Optional. Content Types.
+        * @return string
+        */
+       function get_accepted_content_type($types = null) {

 
                if(!isset($types)) {
                        $types = $this->media_content_types;
 
                if(!isset($types)) {
                        $types = $this->media_content_types;


@@ -1111,6 +1538,11 @@ EOD;
                $this->invalid_media();
        }
 
                $this->invalid_media();
        }
 

+       /**
+        * Process conditionals for posts.
+        *
+        * @since 2.2.0
+        */

        function process_conditionals() {
 
                if(empty($this->params)) return;
        function process_conditionals() {
 
                if(empty($this->params)) return;


@@ -1154,31 +1586,52 @@ EOD;
                }
        }
 
                }
        }
 

+       /**
+        * Convert RFC3339 time string to timestamp.
+        *
+        * @since 2.3.0
+        *
+        * @param string $str String to time.
+        * @return bool|int false if format is incorrect.
+        */

        function rfc3339_str2time($str) {
 
        function rfc3339_str2time($str) {
 

-           $match = false;
-           if(!preg_match("/(\d{4}-\d{2}-\d{2})T(\d{2}\:\d{2}\:\d{2})\.?\d{0,3}(Z|[+-]+\d{2}\:\d{2})/", $str, $match))
+               $match = false;
+               if(!preg_match("/(\d{4}-\d{2}-\d{2})T(\d{2}\:\d{2}\:\d{2})\.?\d{0,3}(Z|[+-]+\d{2}\:\d{2})/", $str, $match))

                        return false;
 
                        return false;
 

-           if($match[3] == 'Z')
+               if($match[3] == 'Z')

                        $match[3] == '+0000';
 
                        $match[3] == '+0000';
 

-           return strtotime($match[1] . " " . $match[2] . " " . $match[3]);
+               return strtotime($match[1] . " " . $match[2] . " " . $match[3]);

        }
 
        }
 

+       /**
+        * Retrieve published time to display in XML.
+        *
+        * @since 2.3.0
+        *
+        * @param string $published Time string.
+        * @return string
+        */

        function get_publish_time($published) {
 
        function get_publish_time($published) {
 

-           $pubtime = $this->rfc3339_str2time($published);
+               $pubtime = $this->rfc3339_str2time($published);

 
 

-           if(!$pubtime) {
+               if(!$pubtime) {

                        return array(current_time('mysql'),current_time('mysql',1));
                        return array(current_time('mysql'),current_time('mysql',1));

-           } else {
+               } else {

                        return array(date("Y-m-d H:i:s", $pubtime), gmdate("Y-m-d H:i:s", $pubtime));
                        return array(date("Y-m-d H:i:s", $pubtime), gmdate("Y-m-d H:i:s", $pubtime));

-           }
+               }

        }
 
 }
 
        }
 
 }
 

+/**
+ * AtomServer
+ * @var AtomServer
+ * @global object $server
+ */

 $server = new AtomServer();
 $server->handle_request();
 
 $server = new AtomServer();
 $server->handle_request();