Changeset 1760

Timestamp:

09/02/2009 07:54:19 PM (15 years ago)

Author:

apeatling

Message:

Added avatar delete to user and group screens. Fixes #411

Location:

trunk

Files:

• bp-core/bp-core-avatars.php (modified) (2 diffs)
• bp-groups.php (modified) (2 diffs)
• bp-groups/bp-groups-templatetags.php (modified) (2 diffs)
• bp-xprofile.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-templatetags.php (modified) (1 diff)

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

@@ -140 +140 @@
         'item_id' => false,
         'object' => 'user', // user OR group OR blog OR custom type (if you use filters)
-        'avatar_path' => false
+        'avatar_dir' => false
     );
 
-    $r = wp_parse_args( $args, $defaults );
-    extract( $r, EXTR_SKIP );   
-    
-    if ( !$avatar_path )
-        return false;
+    $args = wp_parse_args( $args, $defaults );
+    extract( $args, EXTR_SKIP );    
+    
+    if ( !$item_id ) {
+        if ( 'user' == $object )
+            $item_id = $bp->displayed_user->id;
+        else if ( 'group' == $object )
+            $item_id = $bp->groups->current_group->id;
+        else if ( 'blog' == $object )
+            $item_id = $current_blog->id;
+            
+        $item_id = apply_filters( 'bp_core_avatar_item_id', $item_id, $object );
+    
+        if ( !$item_id ) return false;
+    }
+        
+    if ( !$avatar_dir ) {
+        if ( 'user' == $object )
+            $avatar_dir = 'avatars';
+        else if ( 'group' == $object )
+            $avatar_dir = 'group-avatars';
+        else if ( 'blog' == $object )
+            $avatar_dir = 'blog-avatars';
+            
+        $avatar_dir = apply_filters( 'bp_core_avatar_dir', $avatar_dir, $object );
+        
+        if ( !$avatar_dir ) return false;       
+    }
 
     if ( 'user' == $object ) {
@@ -157 +180 @@
     }
 
-    if ( $av_dir = opendir( $avatar_path ) ) {
+    $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', WP_CONTENT_DIR . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );    
+
+    if ( !file_exists( $avatar_folder_dir ) )
+        return false;
+
+    if ( $av_dir = opendir( $avatar_folder_dir ) ) {
         while ( false !== ( $avatar_file = readdir($av_dir) ) ) {
             if ( ( preg_match( "/-bpfull/", $avatar_file ) || preg_match( "/-bpthumb/", $avatar_file ) ) && '.' != $avatar_file && '..' != $avatar_file )
-                @unlink( $avatar_path . '/' . $avatar_file );
+                @unlink( $avatar_folder_dir . '/' . $avatar_file );             
         }
     }
     closedir($av_dir);
+
+    @rmdir( $avatar_folder_dir );
+
+    do_action( 'bp_core_delete_existing_avatar', $args );
+
+    return true;
 }
 

trunk/bp-groups.php

@@ -1018 +1018 @@
         if ( !$bp->is_item_admin )
             return false;
+            
+        /* If the group admin has deleted the admin avatar */
+        if ( 'delete' == $bp->action_variables[1] ) {
+            
+            /* Check the nonce */
+            check_admin_referer( 'bp_group_avatar_delete' );
+            
+            if ( bp_core_delete_existing_avatar( array( 'item_id' => $bp->groups->current_group->id, 'object' => 'group' ) ) )
+                bp_core_add_message( __( 'Your avatar was deleted successfully!', 'buddypress' ) );
+            else
+                bp_core_add_message( __( 'There was a problem deleting that avatar, please try again.', 'buddypress' ), 'error' );
+        
+        }   
         
         $bp->avatar_admin->step = 'upload-image';
 
         if ( !empty( $_FILES ) ) {
-    
+
             /* Check the nonce */
             check_admin_referer( 'bp_avatar_upload' );
@@ -1033 +1046 @@
                 add_action( 'wp', 'bp_core_add_jquery_cropper' );
             }
-    
+
         }
 
         /* If the image cropping is done, crop the image and save a full/thumb version */
         if ( isset( $_POST['avatar-crop-submit'] ) ) {
-    
+
             /* Check the nonce */
             check_admin_referer( 'bp_avatar_cropstore' );

trunk/bp-groups/bp-groups-templatetags.php

@@ -63 +63 @@
     <?php }
 }
+
+
+function bp_get_group_has_avatar() {
+    global $bp;
+
+    if ( !empty( $_FILES ) || !bp_core_fetch_avatar( array( 'item_id' => $bp->groups->current_group->id, 'object' => 'group', 'no_grav' => true ) ) )
+        return false;
+    
+    return true;
+}
+
+function bp_group_avatar_delete_link() {
+    echo bp_get_group_avatar_delete_link();
+}
+    function bp_get_group_avatar_delete_link() {
+        global $bp;
+        
+        return apply_filters( 'bp_get_group_avatar_delete_link', wp_nonce_url( bp_get_group_permalink( $bp->groups->current_group ) . '/admin/group-avatar/delete', 'bp_group_avatar_delete' ) );
+    }
 
 function bp_group_avatar_edit_form() {
@@ -399 +418 @@
             'height' => false,
             'class' => 'avatar',
-            'id' => 'avatar-crop-preview',
+            'id' => false,
             'alt' => __( 'Group avatar', 'buddypress' ) 
         );

trunk/bp-xprofile.php

@@ -445 +445 @@
     global $bp;
 
-    if ( 'delete-avatar' != $bp->current_action )
-        return false;
-
-    if ( !check_admin_referer( 'bp_delete_avatar_link' ) )
-        return false;
-    
-    if ( !bp_is_home() )
-        return false;
-
-    bp_core_delete_avatar();
-    add_action( 'wp_head', 'bp_core_add_cropper_js' );
-    bp_core_load_template( apply_filters( 'xprofile_template_delete_avatar', 'profile/change-avatar' ) );
+    if ( $bp->profile->slug != $bp->current_component || 'change-avatar' != $bp->current_action || 'delete-avatar' != $bp->action_variables[0] )
+        return false;
+    
+    /* Check the nonce */
+    check_admin_referer( 'bp_delete_avatar_link' );
+    
+    if ( !bp_is_home() && !is_site_admin() )
+        return false;
+    
+    if ( bp_core_delete_existing_avatar( array( 'item_id' => $bp->displayed_user->id ) ) )
+        bp_core_add_message( __( 'Your avatar was deleted successfully!', 'buddypress' ) );
+    else
+        bp_core_add_message( __( 'There was a problem deleting that avatar, please try again.', 'buddypress' ), 'error' );
+
+    bp_core_redirect( $_SERVER['HTTP_REFERER'] ); 
 }
 add_action( 'wp', 'xprofile_action_delete_avatar', 3 );

trunk/bp-xprofile/bp-xprofile-templatetags.php

@@ -640 +640 @@
         return apply_filters( 'bp_get_current_profile_group_id', $profile_group_id ); // admin/profile/edit/[group-id]
     }
-    
+
+function bp_avatar_delete_link() {
+    echo bp_get_avatar_delete_link();
+}
+    function bp_get_avatar_delete_link() {
+        global $bp;
+        
+        return apply_filters( 'bp_get_avatar_delete_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->profile->slug . '/change-avatar/delete-avatar/', 'bp_delete_avatar_link' ) );
+    }
+
+function bp_get_user_has_avatar() {
+    if ( !bp_core_fetch_avatar( array( 'item_id' => $bp->displayed_user->id, 'no_grav' => true ) ) )
+        return false;
+    
+    return true;
+}
 
 function bp_edit_profile_button() {