Ticket #7446: 7446.2.diff

wp-includes/comment.php

@@ -206 +206 @@
 }
 
 /**
+ * Retrieve all of the WordPress supported comment statuses.
+ *
+ * Comments have a limited set of valid status values, this provides the
+ * comment status values and descriptions.
+ *
+ * @package WordPress
+ * @subpackage Post
+ * @since 2.7
+ *
+ * @return array List of comment statuses.
+ */
+function get_comment_statuses( ) {
+        $status = array(
+                'hold'                  => __('Unapproved'),
+                'approve'               => __('Approved'),
+                'spam'          => __('Spam'),
+        );
+
+        return $status;
+}
+
+
+/**
  * The date the last comment was modified.
  *
  * {@internal Missing Long Description}}

wp-includes/comment-template.php

@@ -320 +320 @@
  * @since 1.5
  * @uses $comment
  *
+ * @param object|string|int $comment Comment to retrieve.
  * @return string The permalink to the current comment
  */
-function get_comment_link() {
-        global $comment;
+function get_comment_link($comment = null) {
+        $comment = get_comment($comment);
         return get_permalink( $comment->comment_post_ID ) . '#comment-' . $comment->comment_ID;
 }
 

xmlrpc.php

@@ -829 +829 @@
                 return($category_suggestions);
         }
 
+        function wp_getComment($args) {
+                $this->escape($args);
+
+                $blog_id        = (int) $args[0];
+                $username       = $args[1];
+                $password       = $args[2];
+                $comment_id     = (int) $args[3];
+
+                if ( !$this->login_pass_ok( $username, $password ) )
+                        return $this->error;
+
+                set_current_user( 0, $username );
+                if ( !current_user_can( 'moderate_comments' ) )
+                        return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this blog.' ) );
+
+                if ( ! $comment = get_comment($comment_id) )
+                        return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
+
+                // Format page date.
+                $comment_date = mysql2date("Ymd\TH:i:s", $comment->comment_date);
+                $comment_date_gmt = mysql2date("Ymd\TH:i:s", $comment->comment_date_gmt);
+
+                if ( 0 == $comment->comment_approved )
+                        $comment_status = 'hold';
+                else if ( 'spam' == $comment->comment_approved )
+                        $comment_status = 'spam';
+                else
+                        $comment_status = 'approve';
+
+                $link = get_comment_link($comment);
+
+                $comment_struct = array(
+                        "dateCreated"                   => new IXR_Date($comment_date),
+                        "date_created_gmt"              => new IXR_Date($comment_date_gmt),
+                        "userid"                                => $comment->user_id,
+                        "comment_id"                    => $comment->comment_ID,
+                        "parent"                                => $comment->comment_parent,
+                        "status"                                => $comment_status,
+                        "description"                   => $comment->content,
+                        "link"                                  => $link,
+                        "post_id"                               => $comment->comment_post_ID,
+                        "post_title"                    => get_the_title($comment->comment_post_ID),
+                        "author"                                => $author->comment_author,
+                        "author_url"                    => $comment->comment_author_url,
+                        "author_email"                  => $comment->comment_author_email,
+                        "author_ip"                             => $comment->comment_author_IP,
+                );
+
+                return $comment_struct;
+        }
+
+        function wp_getComments($args) {
+                $this->escape($args);
+
+                $blog_id        = (int) $args[0];
+                $username       = $args[1];
+                $password       = $args[2];
+
+                if ( !$this->login_pass_ok($username, $password) )
+                        return($this->error);
+
+                set_current_user( 0, $username );
+                if ( !current_user_can( 'moderate_comment' ) )
+                        return new IXR_Error( 401, __( 'Sorry, you can not edit comments.' ) );
+
+                do_action('xmlrpc_call', 'wp.getComments');
+
+                //  TODO: Need to write get_comments()
+                // $comments = get_comments();
+                $num_comments = count($comments);
+
+                if ( ! $num_comments )
+                        return array();
+
+                $comments_struct = array();
+
+                for ( $i = 0; $i < $num_comments; $i++ ) {
+                        $comment = wp_xmlrpc_server::wp_getComment(array(
+                                $blog_id, $username, $password, $comments[$i]->comment_ID,
+                        ));
+                        $comments_struct[] = $comment;
+                }
+
+                return($comments_struct);
+        }
+
+        function wp_deleteComment($args) {
+                $this->escape($args);
+
+                $blog_id        = (int) $args[0];
+                $username       = $args[1];
+                $password       = $args[2];
+                $comment_ID     = (int) $args[3];
+
+                if ( !$this->login_pass_ok( $username, $password ) )
+                        return $this->error;
+
+                set_current_user( 0, $username );
+                if ( !current_user_can( 'moderate_comments' ) )
+                        return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this blog.' ) );
+
+                if ( ! get_comment($comment_ID) )
+                        return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
+
+                return wp_delete_comment($comment_ID);
+        }
+
+        function wp_editComment($args) {
+                $this->escape($args);
+
+                $blog_id        = (int) $args[0];
+                $username       = $args[1];
+                $password       = $args[2];
+                $comment_ID     = (int) $args[3];
+                $content_struct = $args[4];
+
+                if ( !$this->login_pass_ok( $username, $password ) )
+                        return $this->error;
+
+                set_current_user( 0, $username );
+                if ( !current_user_can( 'moderate_comments' ) )
+                        return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this blog.' ) );
+
+                if ( ! get_comment($comment_ID) )
+                        return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
+
+                if ( isset($content_struct['status']) ) {
+                        $statuses = get_comment_status();
+                        $statuses = array_keys($statuses);
+
+                        if ( ! in_array($statuses, $status) )
+                                return new IXR_Error( 401, __( 'Invalid comment status.' ) );
+                        $comment_approved = $content_struct['status'];
+                }
+
+                // Do some timestamp voodoo
+                if ( !empty( $content_struct['date_created_gmt'] ) )
+                        $dateCreated = str_replace( 'Z', '', $content_struct['date_created_gmt']->getIso() ) . 'Z'; // We know this is supposed to be GMT, so we're going to slap that Z on there by force
+                elseif ( !empty( $content_struct['dateCreated']) )
+                        $dateCreated = $content_struct['dateCreated']->getIso();
+
+                if ( !empty( $dateCreated ) ) {
+                        $comment_date = get_date_from_gmt(iso8601_to_datetime($dateCreated));
+                        $comment_date_gmt = iso8601_to_datetime($dateCreated, GMT);
+                }
+
+                if ( isset($content_struct['description']) )
+                        $comment_content = $content_struct['description'];
+
+                if ( isset($content_struct['author']) )
+                        $comment_author = $content_struct['author'];
+
+                if ( isset($content_struct['author_url']) )
+                        $comment_author_url = $content_struct['author_url'];
+
+                if ( isset($content_struct['author_email']) )
+                        $comment_author_email = $content_struct['author_email'];
+
+                // We've got all the data -- post it:
+                $comment = compact('comment_ID', 'comment_content', 'comment_approved', 'comment_date', 'comment_date_gmt', 'comment_author', 'comment_author_email', 'comment_author_url');
+                
+                $result = wp_update_comment($comment);
+                if ( is_wp_error( $result ) )
+                        return new IXR_Error(500, $result->get_error_message());
+
+                if ( !$result )
+                        return new IXR_Error(500, __('Sorry, the comment could not be edited. Something wrong happened.'));
+
+                return true;
+        }
+
+        function wp_newComment($args) {
+                $this->escape($args);
+
+                $blog_id        = (int) $args[0];
+                $username       = $args[1];
+                $password       = $args[2];
+                $content_struct = $args[3];
+
+                if ( !$this->login_pass_ok( $username, $password ) )
+                        return $this->error;
+
+                set_current_user( 0, $username );
+                if ( !current_user_can( 'moderate_comments' ) )
+                        return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this blog.' ) );
+
+                return wp_new_comment($content_struct);
+        }
+
+        function wp_getCommentStatusList($args) {
+                $this->escape( $args );
+
+                $blog_id        = (int) $args[0];
+                $username       = $args[1];
+                $password       = $args[2];
+
+                if ( !$this->login_pass_ok( $username, $password ) )
+                        return $this->error;
+
+                set_current_user( 0, $username );
+                if ( !current_user_can( 'moderate_comments' ) )
+                        return new IXR_Error( 403, __( 'You are not allowed access to details about this blog.' ) );
+
+                do_action('xmlrpc_call', 'wp.getCommentStatusList');
+
+                return get_comment_statuses( );
+        }
+
         function wp_getCommentCount( $args ) {
                 $this->escape($args);
 
@@ -857 +1065 @@
                 );
         }
 
-
         function wp_getPostStatusList( $args ) {
                 $this->escape( $args );