Wordpress 3.1.3

[autoinstalls/wordpress.git] / wp-admin / includes / comment.php

diff --git a/wp-admin/includes/comment.php b/wp-admin/includes/comment.php
index ae0d1d963107ee734d7a5a5206b81f1214310d9f..d731130a53836edb66d57e71fc37c5513685157c 100644 (file)
--- a/wp-admin/includes/comment.php
+++ b/wp-admin/includes/comment.php
@@ -1,20 +1,40 @@
 <?php
 <?php

+/**
+ * WordPress Comment Administration API.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */

 
 

+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.0.0
+ * @uses $wpdb
+ *
+ * @param string $comment_author Author of the comment
+ * @param string $comment_date Date of the comment
+ * @return mixed Comment ID on success.
+ */

 function comment_exists($comment_author, $comment_date) {
        global $wpdb;
 
 function comment_exists($comment_author, $comment_date) {
        global $wpdb;
 

-       return $wpdb->get_var("SELECT comment_post_ID FROM $wpdb->comments
-                       WHERE comment_author = '$comment_author' AND comment_date = '$comment_date'");
+       $comment_author = stripslashes($comment_author);
+       $comment_date = stripslashes($comment_date);
+
+       return $wpdb->get_var( $wpdb->prepare("SELECT comment_post_ID FROM $wpdb->comments
+                       WHERE comment_author = %s AND comment_date = %s", $comment_author, $comment_date) );

 }
 
 }
 

+/**
+ * Update a comment with values provided in $_POST.
+ *
+ * @since 2.0.0
+ */

 function edit_comment() {
 function edit_comment() {

-       global $user_ID;
-
-       $comment_ID = (int) $_POST['comment_ID'];
-       $comment_post_ID = (int) $_POST['comment_post_ID'];

 
 

-       if (!current_user_can( 'edit_post', $comment_post_ID ))
-               wp_die( __('You are not allowed to edit comments on this post, so you cannot edit this comment.' ));
+       if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) )
+               wp_die ( __( 'You are not allowed to edit comments on this post.' ) );

 
        $_POST['comment_author'] = $_POST['newcomment_author'];
        $_POST['comment_author_email'] = $_POST['newcomment_author_email'];
 
        $_POST['comment_author'] = $_POST['newcomment_author'];
        $_POST['comment_author_email'] = $_POST['newcomment_author_email'];


@@ -23,7 +43,14 @@ function edit_comment() {
        $_POST['comment_content'] = $_POST['content'];
        $_POST['comment_ID'] = (int) $_POST['comment_ID'];
 
        $_POST['comment_content'] = $_POST['content'];
        $_POST['comment_ID'] = (int) $_POST['comment_ID'];
 

-       if (!empty ( $_POST['edit_date'] ) ) {
+       foreach ( array ('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
+               if ( !empty( $_POST['hidden_' . $timeunit] ) && $_POST['hidden_' . $timeunit] != $_POST[$timeunit] ) {
+                       $_POST['edit_date'] = '1';
+                       break;
+               }
+       }
+
+       if ( !empty ( $_POST['edit_date'] ) ) {

                $aa = $_POST['aa'];
                $mm = $_POST['mm'];
                $jj = $_POST['jj'];
                $aa = $_POST['aa'];
                $mm = $_POST['mm'];
                $jj = $_POST['jj'];


@@ -37,9 +64,17 @@ function edit_comment() {
                $_POST['comment_date'] = "$aa-$mm-$jj $hh:$mn:$ss";
        }
 
                $_POST['comment_date'] = "$aa-$mm-$jj $hh:$mn:$ss";
        }
 

-       wp_update_comment( $_POST);
+       wp_update_comment( $_POST );

 }
 
 }
 

+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.0.0
+ *
+ * @param int $id ID of comment to retrieve
+ * @return bool|object Comment if found. False on failure.
+ */

 function get_comment_to_edit( $id ) {
        if ( !$comment = get_comment($id) )
                return false;
 function get_comment_to_edit( $id ) {
        if ( !$comment = get_comment($id) )
                return false;


@@ -52,17 +87,73 @@ function get_comment_to_edit( $id ) {
 
        $comment->comment_author = format_to_edit( $comment->comment_author );
        $comment->comment_author_email = format_to_edit( $comment->comment_author_email );
 
        $comment->comment_author = format_to_edit( $comment->comment_author );
        $comment->comment_author_email = format_to_edit( $comment->comment_author_email );

-       $comment->comment_author_url = clean_url($comment->comment_author_url);

        $comment->comment_author_url = format_to_edit( $comment->comment_author_url );
        $comment->comment_author_url = format_to_edit( $comment->comment_author_url );

+       $comment->comment_author_url = esc_url($comment->comment_author_url);

 
        return $comment;
 }
 
 
        return $comment;
 }
 

+/**
+ * Get the number of pending comments on a post or posts
+ *
+ * @since 2.3.0
+ * @uses $wpdb
+ *
+ * @param int|array $post_id Either a single Post ID or an array of Post IDs
+ * @return int|array Either a single Posts pending comments as an int or an array of ints keyed on the Post IDs
+ */

 function get_pending_comments_num( $post_id ) {
        global $wpdb;
 function get_pending_comments_num( $post_id ) {
        global $wpdb;

-       $post_id = (int) $post_id;
-       $pending = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = $post_id AND comment_approved = '0'" );
-       return $pending;
+
+       $single = false;
+       if ( !is_array($post_id) ) {
+               $post_id_array = (array) $post_id;
+               $single = true;
+       } else {
+               $post_id_array = $post_id;
+       }
+       $post_id_array = array_map('intval', $post_id_array);
+       $post_id_in = "'" . implode("', '", $post_id_array) . "'";
+
+       $pending = $wpdb->get_results( "SELECT comment_post_ID, COUNT(comment_ID) as num_comments FROM $wpdb->comments WHERE comment_post_ID IN ( $post_id_in ) AND comment_approved = '0' GROUP BY comment_post_ID", ARRAY_A );
+
+       if ( $single ) {
+               if ( empty($pending) )
+                       return 0;
+               else
+                       return absint($pending[0]['num_comments']);
+       }
+
+       $pending_keyed = array();
+
+       // Default to zero pending for all posts in request
+       foreach ( $post_id_array as $id )
+               $pending_keyed[$id] = 0;
+
+       if ( !empty($pending) )
+               foreach ( $pending as $pend )
+                       $pending_keyed[$pend['comment_post_ID']] = absint($pend['num_comments']);
+
+       return $pending_keyed;
+}
+
+/**
+ * Add avatars to relevant places in admin, or try to.
+ *
+ * @since 2.5.0
+ * @uses $comment
+ *
+ * @param string $name User name.
+ * @return string Avatar with Admin name.
+ */
+function floated_admin_avatar( $name ) {
+       global $comment;
+       $avatar = get_avatar( $comment, 32 );
+       return "$avatar $name";

 }
 
 }
 

-?>
\ No newline at end of file
+function enqueue_comment_hotkeys_js() {
+       if ( 'true' == get_user_option( 'comment_shortcuts' ) )
+               wp_enqueue_script( 'jquery-table-hotkeys' );
+}
+?>