Changeset 1691

Timestamp:

08/25/2009 12:44:29 AM (17 years ago)

Author:

apeatling

Message:

Added support for deleting activity stream items.

Location:

trunk

Files:

• bp-activity.php (modified) (1 diff)
• bp-activity/bp-activity-classes.php (modified) (3 diffs)
• bp-activity/bp-activity-filters.php (modified) (1 diff)
• bp-activity/bp-activity-templatetags.php (modified) (4 diffs)
• bp-forums/bp-forums-cssjs.php (deleted)
• bp-themes/bp-default/_inc/css/screen.css (modified) (6 diffs)
• bp-themes/bp-sn-framework/_inc/js/custom (deleted)
• bp-themes/bp-sn-framework/activity/my-friends.php (modified) (1 diff)
• bp-wire/bp-wire-templatetags.php (modified) (1 diff)

trunk/bp-activity.php

@@ -120 +120 @@
  * back to the default screen after execution.
  */
+
+function bp_activity_action_delete_activity() {
+    global $bp;
+
+    if ( $bp->current_component != $bp->activity->slug || $bp->current_action != 'delete' )
+        return false;
+
+    if ( empty( $bp->action_variables[0] ) || !is_numeric( $bp->action_variables[0] ) )
+        return false;
+
+    /* Check the nonce */
+    check_admin_referer( 'bp_activity_delete_link' );
+    
+    $activity_id = $bp->action_variables[0];
+    
+    /* Check access */
+    if ( !is_site_admin() ) {
+        $activity = new BP_Activity_Activity( $activity_id );
+        
+        if ( $activity->user_id != $bp->loggedin_user->id )
+            return false;
+    }
+    
+    /* Now delete the activity item */
+    if ( bp_activity_delete_by_activity_id( $activity_id ) )
+        bp_core_add_message( __( 'Activity deleted', 'buddypress' ) );
+    else
+        bp_core_add_message( __( 'There was an error when deleting that activity', 'buddypress' ), 'error' );
+    
+    bp_core_redirect( $_SERVER['HTTP_REFERER'] );
+}
+add_action( 'wp', 'bp_activity_action_delete_activity', 3 );
+
 
 function bp_activity_action_sitewide_feed() {

trunk/bp-activity/bp-activity-classes.php

@@ -12 +12 @@
     var $hide_sitewide = false;
     
-    function bp_activity_activity( $args = false, $populate = false ) {
+    function bp_activity_activity( $id = false ) {
         global $bp;
         
-        if ( $args && is_array($args) ) {
-            extract( $args );
-            
-            $this->user_id = $user_id;
-            $this->component_name = $component_name;
-            $this->component_action = $component_action;
-            $this->item_id = $item_id;
-            $this->secondary_item_id = $secondary_item_id;
-            
-            if ( $populate )
-                $this->populate();
+        if ( $id ) {
+            $this->id = $id;
+            $this->populate();
         }
     }
@@ -171 +163 @@
 
         for ( $i = 0; $i < count( $activities ); $i++ ) {
+            $activities_formatted[$i]['id'] = $activities[$i]->id;
             $activities_formatted[$i]['user_id'] = $activities[$i]->user_id;
             $activities_formatted[$i]['content'] = $activities[$i]->content;
@@ -238 +231 @@
 
         for ( $i = 0; $i < count( $activities ); $i++ ) {
+            $activities_formatted[$i]['id'] = $activities[$i]->id;
             $activities_formatted[$i]['user_id'] = $activities[$i]->user_id;
             $activities_formatted[$i]['content'] = $activities[$i]->content;

trunk/bp-activity/bp-activity-filters.php

@@ -14 +14 @@
     $allowedtags['span'] = array();
     $allowedtags['span']['class'] = array();
+    $allowedtags['a']['class'] = array();
+    $allowedtags['img'] = array();
     return $allowedtags;
 }

trunk/bp-activity/bp-activity-templatetags.php

@@ -249 +249 @@
 }
     function bp_get_activity_content() {
-        global $activities_template, $allowed_tags;
-
-        if ( bp_is_home() && $activities_template->activity_type == 'personal' ) {
+        global $activities_template, $allowed_tags, $bp;
+
+        if ( bp_is_home() && $activities_template->activity_type == 'personal' )
             $content = bp_activity_content_filter( $activities_template->activity->content, $activities_template->activity->date_recorded, $activities_template->full_name );                       
-        } else {
-            $activities_template->activity->content = bp_activity_insert_time_since( $activities_template->activity->content, $activities_template->activity->date_recorded );
-            $content = $activities_template->activity->content;
-        }
-        
+        else
+            $content = bp_activity_content_filter( $activities_template->activity->content, $activities_template->activity->date_recorded, $activities_template->full_name, true, false, false );
+
         return apply_filters( 'bp_get_activity_content', $content );
     }
 
 function bp_activity_content_filter( $content, $date_recorded, $full_name, $insert_time = true, $filter_words = true, $filter_you = true ) {
+    global $activities_template, $bp;
+    
     if ( !$content )
         return false;
@@ -274 +274 @@
     if ( $insert_time )
         $content[0] = bp_activity_insert_time_since( $content[0], $date_recorded );
-
+    
     // The "You" and "Your" conversion is only done in english, if a translation file is present
     // then do not translate as it causes problems in other languages.
@@ -288 +288 @@
         }
     }
+
+    /* Add the delete link if the user has permission on this item */
+    if ( ( $activities_template->activity->user_id == $bp->loggedin_user->id ) || $bp->is_item_admin || is_site_admin() )
+        $content[1] = '</span> <span class="activity-delete-link">' . bp_get_activity_delete_link() . '</span>' . $content[1];  
     
     $content_new = '';
@@ -314 +318 @@
         
         return apply_filters( 'bp_get_activity_css_class', $activities_template->activity->component_name );
+    }
+
+function bp_activity_delete_link() {
+    echo bp_get_activity_delete_link();
+}
+    function bp_get_activity_delete_link() {
+        global $activities_template, $bp;
+
+        return apply_filters( 'bp_get_activity_delete_link', '<a href="' . wp_nonce_url( $bp->root_domain . '/' . $bp->activity->slug . '/delete/' . $activities_template->activity->id, 'bp_activity_delete_link' ) . '" class="item-button delete confirm">' . __( 'Delete', 'buddypress' ) . '</a>' );
     }
 

trunk/bp-themes/bp-default/_inc/css/screen.css

@@ -675 +675 @@
         }
 
+a.item-button {
+    border: 1px solid #eee;
+    background: #f5f5f5;
+    color: #999;
+    padding: 0 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    font-size: 0.8em;
+    text-decoration: none;
+}
+    a.item-button:hover {
+        border-color: #ccc;
+        color: #777;
+    }
+
+    .activity-list li a.item-button {
+        display: none;
+        position: absolute;
+        right: 0 !important;
+        top: 0 !important;
+    }
+        .item-list li a.item-button {
+            display: none;
+            position: absolute;
+            top: 10px;
+            right: 10px;
+        }
+
+    .activity-list li:hover a.item-button, .item-list li:hover a.item-button {
+        display: inline;
+    }
 
 /*** Standard Form Styles ***************************************************/
@@ -1212 +1244 @@
 
 .activity-list li {
+    position: relative;
     margin: 5px 15px;
-    padding: 0 0 0 34px !important;
+    padding: 0 50px 0 34px !important;
     background: none !important;
 }
@@ -1258 +1291 @@
     padding: 7px 15px 7px 40px;
     background: url(../images/quotes_background.gif) 10px 9px no-repeat #eee;
-    margin: -10px 0 15px 0;
+    margin: -10px -50px 15px 0;
     border-radius: 5px;
     -moz-border-radius: 5px;
@@ -1320 +1353 @@
     overflow: hidden;
 }
+
+
 /**** BLOGS *****************/
         
@@ -1767 +1802 @@
 }
 
-a.delete {
+table#message-threads a.delete {
     overflow: hidden;
     text-indent: -999px;
@@ -1778 +1813 @@
 }
 
-span.unread-count {
+table#message-threads span.unread-count {
     background: #c2582b;
     border: 2px solid #c2582b;

trunk/bp-themes/bp-sn-framework/activity/my-friends.php

@@ -48 +48 @@
                             
                             <?php bp_activity_content() ?>
-                            
+
                             <?php do_action( 'bp_friends_activity_item' ) ?>
                         </li>

trunk/bp-wire/bp-wire-templatetags.php

@@ -364 +364 @@
         if ( ( $wire_posts_template->wire_post->user_id == $bp->loggedin_user->id ) || $bp->is_item_admin || is_site_admin() ) {
             if ( $bp->wire->slug == $bp->current_component || $bp->profile->slug == $bp->current_component ) {
-                return apply_filters( 'bp_get_wire_delete_link', '<a class="confirm" href="' . wp_nonce_url( $bp->displayed_user->domain . $bp->wire->slug . '/delete/' . $wire_posts_template->wire_post->id, 'bp_wire_delete_link' ) . '">[' . __('Delete', 'buddypress') . ']</a>' );
+                return apply_filters( 'bp_get_wire_delete_link', '<a class="item-button delete confirm" href="' . wp_nonce_url( $bp->displayed_user->domain . $bp->wire->slug . '/delete/' . $wire_posts_template->wire_post->id, 'bp_wire_delete_link' ) . '">' . __('Delete', 'buddypress') . '</a>' );
             } else {
-                return apply_filters( 'bp_get_wire_delete_link', '<a class="confirm" href="' . wp_nonce_url( site_url( $bp->{$bp->current_component}->slug . '/' . $uri . '/wire/delete/' . $wire_posts_template->wire_post->id ), 'bp_wire_delete_link' ) . '">[' . __('Delete', 'buddypress') . ']</a>' );
+                return apply_filters( 'bp_get_wire_delete_link', '<a class="item-button delete confirm" href="' . wp_nonce_url( site_url( $bp->{$bp->current_component}->slug . '/' . $uri . '/wire/delete/' . $wire_posts_template->wire_post->id ), 'bp_wire_delete_link' ) . '">' . __('Delete', 'buddypress') . '</a>' );
             }
         }