Changeset 2793155

Timestamp:

10/02/2022 10:41:20 PM (3 years ago)

Author:

denisco

Message:

New version 2.4.0 ​https://github.com/yadenis/DCO-Comment-Attachment/releases/tag/v2.4.0

Location:

dco-comment-attachment

Files:

• tags/2.4.0 (added)
• tags/2.4.0/assets (added)
• tags/2.4.0/assets/dco-comment-attachment-admin.css (added)
• tags/2.4.0/assets/dco-comment-attachment-admin.js (added)
• tags/2.4.0/assets/dco-comment-attachment.css (added)
• tags/2.4.0/assets/dco-comment-attachment.js (added)
• tags/2.4.0/dco-comment-attachment.php (added)
• tags/2.4.0/includes (added)
• tags/2.4.0/includes/back-compat.php (added)
• tags/2.4.0/includes/class-dco-ca-admin.php (added)
• tags/2.4.0/includes/class-dco-ca-base.php (added)
• tags/2.4.0/includes/class-dco-ca-settings.php (added)
• tags/2.4.0/includes/class-dco-ca.php (added)
• tags/2.4.0/includes/functions.php (added)
• tags/2.4.0/readme.txt (added)
• trunk/assets/dco-comment-attachment-admin.js (modified) (1 diff)
• trunk/dco-comment-attachment.php (modified) (2 diffs)
• trunk/includes/class-dco-ca-admin.php (modified) (4 diffs)
• trunk/includes/class-dco-ca-base.php (modified) (2 diffs)
• trunk/includes/class-dco-ca.php (modified) (6 diffs)
• trunk/readme.txt (modified) (3 diffs)

dco-comment-attachment/trunk/assets/dco-comment-attachment-admin.js

@@ -54 +54 @@
             }
         );
+
+        // Only for DCO_CA_Admin::show_bulk_action_message()
+        if ( $( '#the-comment-list' ).length ) {
+            const $referer = $( '[name="_wp_http_referer"]' );
+            const params = new URLSearchParams( $referer.val() );
+            params.delete( 'deletedattachment' );
+            $referer.val( decodeURIComponent( params.toString() ) );
+        }
 
         $( '#dco-comment-attachment' ).on(

dco-comment-attachment/trunk/dco-comment-attachment.php

@@ -13 +13 @@
  * Plugin URI: https://denisco.pro/dco-comment-attachment/
  * Description: Allows your visitors to attach files with their comments
- * Version: 2.3.1
+ * Version: 2.4.0
  * Author: Denis Yanchevskiy
  * Author URI: https://denisco.pro
@@ -25 +25 @@
 define( 'DCO_CA_PATH', plugin_dir_path( __FILE__ ) );
 define( 'DCO_CA_BASENAME', plugin_basename( __FILE__ ) );
-define( 'DCO_CA_VERSION', '2.3.1' );
+define( 'DCO_CA_VERSION', '2.4.0' );
 
 require_once DCO_CA_PATH . 'includes/functions.php';

dco-comment-attachment/trunk/includes/class-dco-ca-admin.php

@@ -40 +40 @@
 
         add_filter( 'comment_row_actions', array( $this, 'add_comment_action_links' ), 10, 2 );
-        add_action( 'admin_action_deleteattachment', array( $this, 'delete_attachment_action' ) );
+        add_action( 'admin_action_deletecommentattachment', array( $this, 'delete_attachment_action' ) );
+        add_filter( 'bulk_actions-edit-comments', array( $this, 'add_comments_bulk_actions' ) );
+        add_action( 'admin_action_deleteattachment', array( $this, 'delete_attachment_bulk_action' ) );
+        add_filter( 'ngettext', array( $this, 'show_bulk_action_message' ), 10, 5 );
+        add_filter( 'removable_query_args', array( $this, 'add_removable_query_args' ) );
         add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
         add_action( 'wp_ajax_delete_attachment', array( $this, 'delete_attachment_ajax' ) );
@@ -71 +75 @@
 
             $del_attach_nonce = esc_html( '_wpnonce=' . $nonce );
-            $url              = esc_url( "comment.php?c=$comment_id&action=deleteattachment&$del_attach_nonce" );
-
-            $title                       = esc_html__( 'Delete Attachment', 'dco-comment-attachment' );
-            $actions['deleteattachment'] = "<a href='$url' class='dco-del-attachment' data-id='$comment_id' data-nonce='$nonce'>$title</a>";
+            $url              = esc_url( "comment.php?c=$comment_id&action=deletecommentattachment&$del_attach_nonce" );
+
+            $title                              = esc_html__( 'Delete Attachment', 'dco-comment-attachment' );
+            $actions['deletecommentattachment'] = "<a href='$url' class='dco-del-attachment' data-id='$comment_id' data-nonce='$nonce'>$title</a>";
         }
 
@@ -119 +123 @@
         wp_safe_redirect( $redir );
         exit();
+    }
+
+    /**
+     * Adds additional bulk actions.
+     *
+     * @since 2.4.0
+     *
+     * @param array $actions An array of the available bulk actions.
+     * @return array An array with standard bulk actions
+     *               and attachment bulk actions.
+     */
+    public function add_comments_bulk_actions( $actions ) {
+        $actions['deleteattachment'] = __( 'Delete Attachment', 'dco-comment-attachment' );
+
+        return $actions;
+    }
+
+    /**
+     * Handles a bulk action to delete comment attachments on the comments page.
+     *
+     * @since 2.4.0
+     */
+    public function delete_attachment_bulk_action() {
+        check_admin_referer( 'bulk-comments' );
+
+        if ( isset( $_REQUEST['delete_comments'] ) && is_array( $_REQUEST['delete_comments'] ) ) {
+            $comment_ids = array_map( 'absint', $_REQUEST['delete_comments'] );
+        } else {
+            return;
+        }
+
+        $redirect_to = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'spammed', 'unspammed', 'approved', 'unapproved', 'ids', 'deletedattachment' ), wp_get_referer() );
+
+        wp_defer_comment_counting( true );
+
+        $count = 0;
+        foreach ( $comment_ids as $comment_id ) {
+            if ( ! current_user_can( 'edit_comment', $comment_id ) ) {
+                continue;
+            }
+
+            $comment = get_comment( $comment_id );
+            if ( ! $comment ) {
+                continue;
+            }
+
+            $delete = $this->get_option( 'delete_attachment_action' );
+            if ( $this->delete_attachment( $comment_id, $delete ) ) {
+                $count ++;
+            }
+        }
+
+        wp_defer_comment_counting( false );
+
+        $redirect_to = add_query_arg( 'deletedattachment', $count, $redirect_to );
+
+        // @see DCO_CA_Admin::show_bulk_action_message() for details.
+        $redirect_to = add_query_arg( 'approved', $count, $redirect_to );
+
+        wp_safe_redirect( $redirect_to );
+        exit;
+    }
+
+    /**
+     * Shows bulk action updated message.
+     *
+     * @since 2.4.0
+     *
+     * @param string $translation Translated text.
+     * @param string $single      The text to be used if the number is singular.
+     * @param string $plural      The text to be used if the number is plural.
+     * @param string $number      The number to compare against to use either the singular or plural form.
+     * @param string $domain      Text domain. Unique identifier for retrieving translated strings.
+     *
+     * @return string Filtered translated text.
+     */
+    public function show_bulk_action_message( $translation, $single, $plural, $number, $domain ) {
+        /**
+         * There is no hook in WordPress to add updated message for custom comments bulk action.
+         * So we override the approval message if attachment deletion was triggered.
+         */
+        // phpcs:disable WordPress.Security.NonceVerification.Recommended, WordPress.Security.ValidatedSanitizedInput.MissingUnslash, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
+        if ( ! isset( $_REQUEST['deletedattachment'] ) || ! $_REQUEST['deletedattachment'] ) {
+            return $translation;
+        }
+        // phpcs:enable
+
+        if ( '%s comment approved.' === $single && '%s comments approved.' === $plural && 'default' === $domain ) {
+            /* translators: %s: Number of comments. */
+            $translation = sprintf( _n( 'Attachments deleted from %s comment.', 'Attachments deleted from %s comments.', $number, 'dco-comment-attachment' ), $number );
+        }
+
+        return $translation;
+    }
+
+    /**
+     * Adds single-use URL parameters.
+     *
+     * @since 2.4.0
+     *
+     * @param array $removable_query_args An array of query variable names to remove from the URL.
+     * @return array An array of query variable names to remove from the URL.
+     */
+    public function add_removable_query_args( $removable_query_args ) {
+        $removable_query_args[] = 'deletedattachment';
+
+        return $removable_query_args;
     }
 
@@ -272 +383 @@
 
         $attachment_id = isset( $_POST['dco_attachment_id'] ) ? array_map( 'intval', $_POST['dco_attachment_id'] ) : array();
+
+        // We need to delete the last empty element, because it's used
+        // as a placeholder in the attachments edit form.
+        // @see DCO_CA_Admin::render_attachment_metabox.
+        array_pop( $attachment_id );
+
         if ( $attachment_id ) {
-            // We need to delete the last empty element, because it's used
-            // as a placeholder in the attachments edit form.
-            // @see DCO_CA_Admin::render_attachment_metabox.
-            array_pop( $attachment_id );
-
             $this->assign_attachment( $comment_id, $attachment_id );
         } else {

dco-comment-attachment/trunk/includes/class-dco-ca-base.php

@@ -68 +68 @@
      *
      * @param int $comment_id Optional. The comment ID.
-     * @return int|string The assigned attachment ID on success,
-     *                    empty string on failure.
+     * @return int|array|string The assigned attachment ID(s) on success,
+     *                          empty string on failure.
      */
     public function get_attachment_id( $comment_id = 0 ) {
@@ -114 +114 @@
      * @since 1.0.0
      *
-     * @param int $comment_id The comment ID.
-     * @param int $attachment_id The attachment ID.
+     * @param int       $comment_id The comment ID.
+     * @param int|array $attachment_id The attachment ID(s).
      * @return int|bool Meta ID on success, false on failure.
      */

dco-comment-attachment/trunk/includes/class-dco-ca.php

@@ -72 +72 @@
             add_filter( 'comment_text', array( $this, 'autoembed_links' ), 5 );
         }
+
+        add_shortcode( 'dco_ca', array( $this, 'dco_ca_shortcode' ) );
     }
 
@@ -530 +532 @@
         }
 
-        $this->assign_attachment( $comment_id, $ids );
+        if ( $ids ) {
+            $this->assign_attachment( $comment_id, $ids );
+        }
 
         $_FILES[ $field_name ] = $attachments;
@@ -570 +574 @@
         }
 
-        $attachment_id = (array) $this->get_attachment_id( $comment->comment_ID );
+        $attachment_id      = $this->get_attachment_id( $comment->comment_ID );
+        $attachment_content = $this->generate_attachment_markup( $attachment_id );
+
+        return $comment_text . $attachment_content;
+    }
+
+    /**
+     * Generates an attachment markup.
+     *
+     * @since 2.4.0
+     *
+     * @param int|array $attachment_id The attachment ID(s).
+     * @return string The attachment HTML markup.
+     */
+    public function generate_attachment_markup( $attachment_id ) {
+        if ( ! is_array( $attachment_id ) ) {
+            $attachment_id = (array) $attachment_id;
+        }
+
         if ( count( $attachment_id ) > 1 ) {
             $this->enable_gallery_image_size();
             $attachments_content = array();
             foreach ( $attachment_id as $attach_id ) {
+                // Check that the attachment exists.
+                if ( ! wp_get_attachment_url( $attach_id ) ) {
+                    continue;
+                }
+
                 $type = $this->get_embed_type( $attach_id );
                 $key  = "{$type}_{$attach_id}";
@@ -582 +609 @@
 
             if ( $this->get_option( 'combine_images' ) || is_admin() ) {
-                // combine only images.
+                // Combine only images.
                 $not_images = array();
                 foreach ( $attachments_content as $key => $content ) {
@@ -603 +630 @@
         }
 
-        return $comment_text . $attachment_content;
+        return $attachment_content;
     }
 
@@ -634 +661 @@
 
         return $response;
+    }
+
+    /**
+     * The dco_ca shortcode handler.
+     *
+     * @since 2.4.0
+     *
+     * @param array $atts {
+     *     An array of shortcode attributes.
+     *
+     *     @type int $post_id Optional. The post ID. Default current post ID.
+     *     @type string $type Optional. Attachment types separated by comma.
+     *                                  Accepts: all, image, video, audio, misc.
+     *                                  Default: all.
+     * }
+     */
+    public function dco_ca_shortcode( $atts ) {
+        $atts = shortcode_atts(
+            array(
+                'post_id' => get_the_ID(),
+                'type'    => 'all',
+            ),
+            $atts,
+            'dco_ca'
+        );
+
+        $comments = get_comments(
+            array(
+                'post_id'  => $atts['post_id'],
+                'meta_key' => 'attachment_id',
+                'status'   => 'approve',
+            )
+        );
+
+        $ids = array();
+        foreach ( $comments as $comment ) {
+            $attachment_id = (array) $this->get_attachment_id( $comment->comment_ID );
+            if ( 'all' === $atts['type'] ) {
+                $ids = array_merge( $ids, $attachment_id );
+            } else {
+                $types = array_map( 'trim', explode( ',', $atts['type'] ) );
+                foreach ( $attachment_id as $attach_id ) {
+                    $type = $this->get_embed_type( $attach_id );
+                    if ( in_array( $type, $types, true ) ) {
+                        $ids[] = $attach_id;
+                    }
+                }
+            }
+        }
+
+        return '<div class="dco-attachments-list">' . $this->generate_attachment_markup( $ids ) . '</div>';
     }
 

dco-comment-attachment/trunk/readme.txt

@@ -3 +3 @@
 Tags: comment, comment attachment, attachment, image, video
 Requires at least: 4.6
-Tested up to: 5.8
+Tested up to: 6.0
 Requires PHP: 5.6
-Stable tag: 2.3.1
+Stable tag: 2.4.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -33 +33 @@
 You can also:
 
-* Add, replace or delete an attachment from a comment on Edit Comment screen.
+* Add, replace or delete an attachment from a comment on the Edit Comment screen.
 * Attach an unlimited number of attachments to the comment in the admin panel.
-* Delete an attachment on Comments screen.
+* Delete an attachment from a specific comment or bulk delete attachments from comments on the Comments screen.
+* Display attachments attached to comments to the current post (or a specific post) with the `[dco_ca]` shortcode. You can also filter by type. See [FAQ](#faq) for details.
 
 Attachments are uploaded to the WordPress Media Library and deleted along with the comment (if this is set in the settings).
@@ -60 +61 @@
 Feel free to create [a new topic](https://wordpress.org/support/plugin/dco-comment-attachment/) on support forum if you need integration with another plugin.
 
+= How to use the [dco_ca] shortcode? =
+
+Without attributes specified, the `[dco_ca]` shortcode will display all attachments attached to current post.
+
+You can filter attachments using the `type` attribute. By default it is `all`. Also supported: `image`, `video`, `audio` and `misc`.
+You can specify one value `[dco_ca type="image"]` or multiple values, separated by commas `[dco_ca type="video,audio"]`.
+
+You can also display attachments from the comments of another post using the `post_id` attribute.
+For example, `[dco_ca post_id="45"]`, where `45` is the ID of the specific post.
+
+You can also combine these attributes. For example, `[dco_ca post_id="45" type="image"]` will display all images attached to comments to the post with ID 45.
+
 == Changelog ==
+
+= 2.4.0 =
+* Added bulk delete attachments action on the Comments screen.
+* Added the `[dco_ca]` shortcode for display attachments attached to comments (see FAQ for details).
+* Fixed bug: now if there is no attachment, the empty array is not saved to the database.
 
 = 2.3.1 =