Changeset 10151 for trunk/src/bp-core/bp-core-avatars.php

Timestamp:

09/29/2015 09:43:13 PM (10 years ago)

Author:

imath

Message:

Introduce new functions to the BuddyPress Attachments API

The first benefit of the BuddyPress Cover Images feature is the improvement of the BuddyPress Attachments API. We are introducing new functions to deal with file management. Some of these functions come from functions previously restricted to avatars.

• is there to get the new attachments features Uploads directory. New Attachments features will now store their files within the directory. Inside this directory we will have subdirectories to organize files according to the object they belong to (eg: members, groups), to the item ID they are attached to and eventually to the BuddyPress attachment type. For the cover image of a user it is looking like
• , , , are inspired by functions restricted to avatars so far. They will help us to control max upload size, allowed types and mimes for any attachments. The last function will help us to check the uploaded file match the allowed types. Corresponding Avatar functions are now using these new functions.
• and are there to respectively get the path or the url of any attachment using the new Uploads directory organization (avatars and group-avatars are not concerned so far) and to delete an attachment.

See #6570

File:

• trunk/src/bp-core/bp-core-avatars.php (modified) (4 diffs)

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

@@ -33 +33 @@
 
     if ( !defined( 'BP_AVATAR_ORIGINAL_MAX_FILESIZE' ) ) {
-
-        $fileupload_maxk = bp_core_get_root_option( 'fileupload_maxk' );
-        if ( '' === $fileupload_maxk ) {
-            define( 'BP_AVATAR_ORIGINAL_MAX_FILESIZE', 5120000 ); // 5mb
-        } else {
-            define( 'BP_AVATAR_ORIGINAL_MAX_FILESIZE', $fileupload_maxk * 1024 );
-        }
+        define( 'BP_AVATAR_ORIGINAL_MAX_FILESIZE', bp_attachments_get_max_upload_file_size( 'avatar' ) );
     }
 
@@ -1371 +1365 @@
  */
 function bp_core_get_allowed_avatar_types() {
-    $allowed_types = array( 'jpeg', 'gif', 'png' );
+    $allowed_types = bp_attachments_get_allowed_types( 'avatar' );
 
     /**
@@ -1398 +1392 @@
 function bp_core_get_allowed_avatar_mimes() {
     $allowed_types  = bp_core_get_allowed_avatar_types();
-    $validate_mimes = wp_match_mime_types( join( ',', $allowed_types ), wp_get_mime_types() );
-    $allowed_mimes  = array_map( 'implode', $validate_mimes );
-
-    /**
-     * Include jpg type if needed so that bp_core_check_avatar_type()
-     * will check for jpeg and jpg extensions.
-     */
-    if ( isset( $allowed_mimes['jpeg'] ) ) {
-        $allowed_mimes['jpg'] = $allowed_mimes['jpeg'];
-    }
-
-    return $allowed_mimes;
+
+    return bp_attachments_get_allowed_mimes( 'avatar', $allowed_types );
 }
 
@@ -1422 +1406 @@
  */
 function bp_core_check_avatar_type( $file ) {
-    $avatar_filetype = wp_check_filetype_and_ext( $file['file']['tmp_name'], $file['file']['name'], bp_core_get_allowed_avatar_mimes() );
-
-    if ( ! empty( $avatar_filetype['ext'] ) && ! empty( $avatar_filetype['type'] ) ) {
-        return true;
-    }
-
-    return false;
+    return bp_attachments_check_filetype( $file['file']['tmp_name'], $file['file']['name'], bp_core_get_allowed_avatar_mimes() );
 }