Changeset 11875

Timestamp:

03/02/2018 07:37:55 PM (8 years ago)

Author:

boonebgorges

Message:

Centralize the generation of the cover image upload directory.

By using bp_attachments_cover_image_upload_dir() wherever the cover image
directory is needed, we ensure that it's possible to filter consistently, for
installations (such as multi-network installations) that may want a custom
location for these files.

Props rekmla, imath.
Fixes #7265.

Location:

trunk/src/bp-core

Files:

• bp-core-attachments.php (modified) (4 diffs)
• classes/class-bp-attachment-cover-image.php (modified) (1 diff)

trunk/src/bp-core/bp-core-attachments.php

@@ -82 +82 @@
          */
         return apply_filters( 'bp_attachments_uploads_dir_get', $retval, $data );
+}
+
+/**
+ * Gets the upload dir array for cover images.
+ *
+ * @since 3.0.0
+ *
+ * @return array See wp_upload_dir().
+ */
+function bp_attachments_cover_image_upload_dir( $args = array() ) {
+        // Default values are for profiles.
+        $object_id = bp_displayed_user_id();
+
+        if ( empty( $object_id ) ) {
+                $object_id = bp_loggedin_user_id();
+        }
+
+        $object_directory = 'members';
+
+        // We're in a group, edit default values.
+        if ( bp_is_group() || bp_is_group_create() ) {
+                $object_id        = bp_get_current_group_id();
+                $object_directory = 'groups';
+        }
+
+        $r = bp_parse_args( $args, array(
+                'object_id' => $object_id,
+                'object_directory' => $object_directory,
+        ), 'cover_image_upload_dir' );
+
+
+        // Set the subdir.
+        $subdir  = '/' . $r['object_directory'] . '/' . $r['object_id'] . '/cover-image';
+
+        $upload_dir = bp_attachments_uploads_dir_get();
+
+        /**
+         * Filters the cover image upload directory.
+         *
+         * @since 2.4.0
+         *
+         * @param array $value      Array containing the path, URL, and other helpful settings.
+         * @param array $upload_dir The original Uploads dir.
+         */
+        return apply_filters( 'bp_attachments_cover_image_upload_dir', array(
+                'path'    => $upload_dir['basedir'] . $subdir,
+                'url'     => set_url_scheme( $upload_dir['baseurl'] ) . $subdir,
+                'subdir'  => $subdir,
+                'basedir' => $upload_dir['basedir'],
+                'baseurl' => set_url_scheme( $upload_dir['baseurl'] ),
+                'error'   => false,
+        ), $upload_dir );
 }
 
@@ -313 +365 @@
                 }
         } elseif ( 'cover_image' === $type ) {
-                $attachment_data = bp_attachments_uploads_dir_get();
+                $attachment_data = bp_attachments_cover_image_upload_dir();
 
                 // The BP Attachments Uploads Dir is not set, stop.
@@ -1131 +1183 @@
         }
 
+        $upload_dir = bp_attachments_cover_image_upload_dir();
+
         // Make sure the file is inside the Cover Image Upload path.
-        if ( false === strpos( $args['file'], $cover_image_class->upload_path ) ) {
+        if ( false === strpos( $args['file'], $upload_dir['basedir'] ) ) {
                 return false;
         }
@@ -1291 +1345 @@
         $error_message = __( 'There was a problem uploading the cover image.', 'buddypress' );
 
-        $bp_attachments_uploads_dir = bp_attachments_uploads_dir_get();
+        $bp_attachments_uploads_dir = bp_attachments_cover_image_upload_dir();
 
         // The BP Attachments Uploads Dir is not set, stop.

trunk/src/bp-core/classes/class-bp-attachment-cover-image.php

@@ -97 +97 @@
          */
         public function upload_dir_filter( $upload_dir = array() ) {
-                // Default values are for profiles.
-                $object_id = bp_displayed_user_id();
-
-                if ( empty( $object_id ) ) {
-                        $object_id = bp_loggedin_user_id();
-                }
-
-                $object_directory = 'members';
-
-                // We're in a group, edit default values.
-                if ( bp_is_group() || bp_is_group_create() ) {
-                        $object_id        = bp_get_current_group_id();
-                        $object_directory = 'groups';
-                }
-
-                // Set the subdir.
-                $subdir  = '/' . $object_directory . '/' . $object_id . '/cover-image';
-
-                /**
-                 * Filters the cover image upload directory.
-                 *
-                 * @since 2.4.0
-                 *
-                 * @param array $value      Array containing the path, URL, and other helpful settings.
-                 * @param array $upload_dir The original Uploads dir.
-                 */
-                return apply_filters( 'bp_attachments_cover_image_upload_dir', array(
-                        'path'    => $this->upload_path . $subdir,
-                        'url'     => $this->url . $subdir,
-                        'subdir'  => $subdir,
-                        'basedir' => $this->upload_path,
-                        'baseurl' => $this->url,
-                        'error'   => false
-                ), $upload_dir );
+                return bp_attachments_cover_image_upload_dir();
         }