Ticket #2955: buddypress-jeff.patch

buddypress/bp-activity/bp-activity-templatetags.php

@@ -155 +155 @@
                 $object = $bp->groups->id;
                 $primary_id = $bp->groups->current_group->id;
 
-                if ( 'public' != $bp->groups->current_group->status && ( groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) || $bp->loggedin_user->is_super_admin ) )
+                if ( 'public' != $bp->groups->current_group->status && 'modmems' != $bp->groups->current_group->status && ( groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) || $bp->loggedin_user->is_super_admin ) )
                         $show_hidden = true;
         }
 
@@ -1000 +1000 @@
                 else if ( 'mentions' == $bp->current_action )
                         $link = $bp->displayed_user->domain . $bp->activity->slug . '/mentions/feed/';
 
-                return apply_filters( 'bp_get_activities_member_rss_link', $link );
+                return apply_filters( 'bp_get_activities_member_feed_link', $link );
         }
         function bp_get_activities_member_rss_link() { return bp_get_member_activity_feed_link(); }
 
+function bp_get_member_current_activity_feed_title() {
+        global $bp;
+
+        if ( $bp->current_component == $bp->profile->slug || 'just-me' == $bp->current_action )
+                $name = 'Personal';
+        else if ( 'friends' == $bp->current_action )
+                $name = 'Friends';
+        else if ( 'groups' == $bp->current_action )
+                $name = 'Groups';
+        else if ( 'favorites' == $bp->current_action )
+                $name = 'Favorites';
+        else if ( 'mentions' == $bp->current_action )
+                $name = 'Mentions';
+        else if ( 'blogs' == $bp->current_action )
+                $name = 'Blogs';
+
+        return apply_filters( 'bp_get_activity_current_feed_title', $name );
+}
+        function bp_member_current_activity_feed_title() { return bp_get_member_current_activity_feed_title(); }
+        function bp_member_current_activity_rss_title() { return bp_get_member_current_activity_feed_title(); }
+        
+
 
 /* Template tags for RSS feed output */
 
@@ -1071 +1093 @@
                 return apply_filters( 'bp_get_activity_feed_item_description', html_entity_decode( str_replace( '%s', '', $content ) ) );
         }
 
-?>
- No newline at end of file
+?>

buddypress/bp-activity.php

@@ -1212 +1212 @@
 add_action( 'bp_loaded', 'bp_register_activity_actions', 8 );
 
 
-?>
- No newline at end of file
+?>

buddypress/bp-core/bp-core-avatars.php

@@ -476 +476 @@
  * @param string $alt Alternate text to use in image tag. Defaults to blank
  * @return <type>
  */
-function bp_core_fetch_avatar_filter( $avatar, $user, $size, $default, $alt ) {
+function bp_core_fetch_avatar_filter( $avatar, $user, $size, $default, $alt = '' ) {
         global $pagenow;
         
         // Do not filter if inside WordPress options page
@@ -572 +572 @@
         return apply_filters( 'bp_core_avatar_url', $upload_dir['baseurl'] );
 }
 
-?>
- No newline at end of file
+?>

buddypress/bp-groups/bp-groups-classes.php

@@ -467 +467 @@
 
                 // Limit results to public status
                 if ( $only_public )
-                        $where_conditions[] = $wpdb->prepare( "g.status = 'public'" );
+                        $where_conditions[] = $wpdb->prepare( "(g.status = 'public' OR g.status = 'modmems')" );
 
                 if ( !is_super_admin() )
                         $where_conditions[] = $wpdb->prepare( "g.status != 'hidden'");
@@ -618 +618 @@
 
                 $extra_sql = apply_filters( 'groups_total_public_forum_topic_count', $bp->groups->filter_sql, $type );
 
-                return $wpdb->get_var( "SELECT COUNT(t.topic_id) FROM {$bbdb->topics} AS t, {$bp->groups->table_name} AS g LEFT JOIN {$bp->groups->table_name_groupmeta} AS gm ON g.id = gm.group_id WHERE (gm.meta_key = 'forum_id' AND gm.meta_value = t.forum_id) AND g.status = 'public' AND t.topic_status = '0' AND t.topic_sticky != '2' {$extra_sql} " );
+                return $wpdb->get_var( "SELECT COUNT(t.topic_id) FROM {$bbdb->topics} AS t, {$bp->groups->table_name} AS g LEFT JOIN {$bp->groups->table_name_groupmeta} AS gm ON g.id = gm.group_id WHERE (gm.meta_key = 'forum_id' AND gm.meta_value = t.forum_id) AND (g.status = 'public' OR g.status = 'modmems') AND t.topic_status = '0' AND t.topic_sticky != '2' {$extra_sql} " );
         }
 
         function get_total_member_count( $group_id ) {
@@ -821 +821 @@
                 if ( $limit && $page )
                         $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 
-                // If the user is logged in and viewing their own groups, we can show hidden and private groups
+                // If the user is logged in and viewing their own groups, we can show hidden,  private and moderated-membership groups
                 if ( $user_id != $bp->loggedin_user->id ) {
                         $group_sql = $wpdb->prepare( "SELECT DISTINCT m.group_id FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.status != 'hidden' AND m.user_id = %d AND m.is_confirmed = 1 AND m.is_banned = 0{$pag_sql}", $user_id );
                         $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.status != 'hidden' AND m.user_id = %d AND m.is_confirmed = 1 AND m.is_banned = 0", $user_id ) );
@@ -1013 +1013 @@
         function get_random_groups( $user_id, $total_groups = 5 ) {
                 global $wpdb, $bp;
 
-                // If the user is logged in and viewing their random groups, we can show hidden and private groups
+                // If the user is logged in and viewing their random groups, we can show hidden, private and moderated-membership groups
                 if ( bp_is_my_profile() ) {
                         return $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT group_id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND is_confirmed = 1 AND is_banned = 0 ORDER BY rand() LIMIT $total_groups", $user_id ) );
                 } else {

buddypress/bp-groups/bp-groups-filters.php

@@ -65 +65 @@
         global $bp;
 
         /* Only filter the forum SQL on group pages or on the forums directory */
-        if ( ( $bp->groups->current_group && 'public' == $bp->groups->current_group->status ) || !$bp->groups->current_group ) {
+        if ( ( $bp->groups->current_group && ( 'public' == $bp->groups->current_group->status || 'modmems' == $bp->groups->current_group->status ) ) || !$bp->groups->current_group ) {
                 add_filter( 'get_topics_fields', 'groups_add_forum_fields_sql' );
                 add_filter( 'get_topics_index_hint', 'groups_add_forum_tables_sql' );
                 add_filter( 'get_topics_where', 'groups_add_forum_where_sql' );
@@ -86 +86 @@
         global $bp;
 
         $bp->groups->filter_sql = ' AND ' . $sql;
-        return "(gm.meta_key = 'forum_id' AND gm.meta_value = t.forum_id) AND g.status = 'public' AND " . $sql;
+        return "(gm.meta_key = 'forum_id' AND gm.meta_value = t.forum_id) AND (g.status = 'public' OR g.status = 'modmems') AND " . $sql;
 }
 
 function groups_filter_bbpress_caps( $value, $cap, $args ) {
@@ -105 +105 @@
 }
 add_filter( 'bb_current_user_can', 'groups_filter_bbpress_caps', 10, 3 );
 
-?>
- No newline at end of file
+?>

buddypress/bp-groups/bp-groups-templatetags.php

@@ -204 +204 @@
         if ( !$group )
                 $group =& $groups_template->group;
 
-        if ( 'public' == $group->status ) {
+        if ( 'public' == $group->status || 'modmems' == $group->status ) {
                 return true;
         } else {
                 if ( groups_is_user_member( $bp->loggedin_user->id, $group->id ) ) {
@@ -250 +250 @@
 
                 if ( 'public' == $group->status ) {
                         $type = __( "Public Group", "buddypress" );
+                } else if ( 'modmems' == $group->status ) {
+                        $type = __( "Moderated-Membership Group", "buddypress" );
                 } else if ( 'hidden' == $group->status ) {
                         $type = __( "Hidden Group", "buddypress" );
                 } else if ( 'private' == $group->status ) {
@@ -415 +417 @@
                 if ( !$group )
                         $group =& $groups_template->group;
 
-                if ( $group->is_public ) {
+                if ( $group->status == 'public' ) {
                         return __( 'Public', 'buddypress' );
+                } elseif ( $group->status == 'modmems' ) {
+                        return __( 'Moderated-Membership', 'buddypress' );
                 } else {
                         return __( 'Private', 'buddypress' );
                 }
@@ -930 +934 @@
         <li<?php if ( 'group-avatar' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $group->slug ?>/admin/group-avatar"><?php _e('Group Avatar', 'buddypress') ?></a></li>
         <li<?php if ( 'manage-members' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $group->slug ?>/admin/manage-members"><?php _e('Manage Members', 'buddypress') ?></a></li>
 
-        <?php if ( $groups_template->group->status == 'private' ) : ?>
+        <?php if ( $groups_template->group->status == 'private' || $group_template->group->status == 'modmems' ) : ?>
                 <li<?php if ( 'membership-requests' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $group->slug ?>/admin/membership-requests"><?php _e('Membership Requests', 'buddypress') ?></a></li>
         <?php endif; ?>
 
@@ -1095 +1099 @@
         return true;
 }
 
+function bp_group_can_post_new_topic( $group = false ) {
+        global $groups_template;
+
+        if ( !bp_is_group_forum() || !is_user_logged_in() || bp_is_group_forum_topic() )
+                return false;
+        
+        if ( !$group )
+                $group =& $groups_template->group;
+
+        if ( $group->status == 'modmems' && !$group->is_member )
+                return false;
+}
+
 function bp_group_new_topic_button() {
-        if ( bp_is_group_forum() && is_user_logged_in() && !bp_is_group_forum_topic() ) {
+        if ( bp_group_can_post_new_topic() ) {
                 bp_button( array (
                         'id'                => 'new_topic',
                         'component'         => 'groups',
@@ -1173 +1190 @@
                                         break;
 
                                 case 'private' :
+                                case 'modmems' :
 
                                         // Member has not requested membership yet
                                         if ( !bp_group_has_requested_membership( $group ) ) {
@@ -1219 +1237 @@
         if ( !$group )
                 $group =& $groups_template->group;
 
-        if ( 'private' == $group->status ) {
+        $privstatus = null;
+
+        if ( 'private' == $group->status )
+                $privstatus = 'private';
+        if ( 'modmems' == $group->status )
+                $privstatus = 'moderated-membership';
+
+        if ( $privstatus ) {
                 if ( !bp_group_has_requested_membership() )
                         if ( is_user_logged_in() )
-                                _e( 'This is a private group and you must request group membership in order to join.', 'buddypress' );
+                                _e( 'This is a ' . $privstatus . ' group and you must request group membership in order to join.', 'buddypress' );
                         else
-                                _e( 'This is a private group. To join you must be a registered site member and request group membership.', 'buddypress' );
+                                _e( 'This is a ' . $privstatus . ' group. To join you must be a registered site member and request group membership.', 'buddypress' );
                 else
-                        _e( 'This is a private group. Your membership request is awaiting approval from the group administrator.', 'buddypress' );
+                        _e( 'This is a ' . $privstatus . ' group. Your membership request is awaiting approval from the group administrator.', 'buddypress' );
         } else {
                 _e( 'This is a hidden group and only invited members can join.', 'buddypress' );
         }
@@ -2271 +2296 @@
                 $name = apply_filters( 'bp_get_group_name', $bp->groups->current_group->name );
                 return apply_filters( 'bp_get_current_group_name', $name );
         }
-?>
- No newline at end of file
+?>

buddypress/bp-groups.php

@@ -96 +96 @@
         if ( bp_is_active( 'friends' ) )
                 $bp->groups->group_creation_steps['group-invites'] = array( 'name' => __( 'Invites', 'buddypress' ), 'position' => 30 );
 
-        $bp->groups->valid_status = apply_filters( 'groups_valid_status', array( 'public', 'private', 'hidden' ) );
+        $bp->groups->valid_status = apply_filters( 'groups_valid_status', array( 'public', 'private', 'hidden', 'modmems' ) );
 
         // Auto join group when non group member performs group activity
         $bp->groups->auto_join = defined( 'BP_DISABLE_AUTO_GROUP_JOIN' ) ? false : true;
@@ -141 +141 @@
                 $bp->groups->current_group->is_user_member = ( is_user_logged_in() && groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) ? true : false;
 
                 /* Should this group be visible to the logged in user? */
-                $bp->groups->current_group->is_group_visible_to_member = ( 'public' == $bp->groups->current_group->status || $is_member ) ? true : false;
+                $bp->groups->current_group->is_group_visible_to_member = ( 'public' == $bp->groups->current_group->status || 'modmems' == $bp->groups->current_group_status || $is_member ) ? true : false;
         }
 
         /* Add 'Groups' to the main navigation */
@@ -204 +204 @@
                         if ( $bp->is_item_mod || $bp->is_item_admin )
                                 bp_core_new_subnav_item( array( 'name' => __( 'Admin', 'buddypress' ), 'slug' => 'admin', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_admin', 'position' => 20, 'user_has_access' => ( $bp->is_item_admin + (int)$bp->is_item_mod ), 'item_css_id' => 'admin' ) );
 
-                        // If this is a private group, and the user is not a member, show a "Request Membership" nav item.
-                        if ( !is_super_admin() && is_user_logged_in() && !$bp->groups->current_group->is_user_member && !groups_check_for_membership_request( $bp->loggedin_user->id, $bp->groups->current_group->id ) && $bp->groups->current_group->status == 'private' )
+                        // If this is a private or moderated-membership group, and the user is not a member, show a "Request Membership" nav item.
+                        if ( !is_super_admin() && is_user_logged_in() && !$bp->groups->current_group->is_user_member && !groups_check_for_membership_request( $bp->loggedin_user->id, $bp->groups->current_group->id ) && ( $bp->groups->current_group->status == 'private' || $bp->groups->current_group->status == 'modmems' ) )
                                 bp_core_new_subnav_item( array( 'name' => __( 'Request Membership', 'buddypress' ), 'slug' => 'request-membership', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_request_membership', 'position' => 30 ) );
 
                         if ( $bp->groups->current_group->enable_forum && function_exists('bp_forums_setup') )
@@ -607 +607 @@
         if ( !is_user_logged_in() )
                 return false;
 
-        if ( 'private' == $bp->groups->current_group->status ) {
+        if ( 'private' == $bp->groups->current_group->status || 'modmems' == $bp->groups->current_group->status ) {
                 // If the user has submitted a request, send it.
                 if ( isset( $_POST['group-request-send']) ) {
                         /* Check the nonce first. */
@@ -696 +696 @@
                 if ( isset( $_POST['save'] ) ) {
                         $enable_forum = ( isset($_POST['group-show-forum'] ) ) ? 1 : 0;
 
-                        $allowed_status = apply_filters( 'groups_allowed_status', array( 'public', 'private', 'hidden' ) );
+                        $allowed_status = apply_filters( 'groups_allowed_status', array( 'public', 'private', 'hidden', 'modmems' ) );
                         $status = ( in_array( $_POST['group-status'], (array)$allowed_status ) ) ? $_POST['group-status'] : 'public';
 
                         /* Check the nonce first. */
@@ -1010 +1010 @@
                         </tr>
                         <tr>
                                 <td></td>
-                                <td><?php _e( 'A member requests to join a private group for which you are an admin', 'buddypress' ) ?></td>
+                                <td><?php _e( 'A member requests to join a private or moderated-membership group for which you are an admin', 'buddypress' ) ?></td>
                                 <td class="yes"><input type="radio" name="notifications[notification_groups_membership_request]" value="yes" <?php if ( !get_user_meta( $current_user->id, 'notification_groups_membership_request', true ) || 'yes' == get_user_meta( $current_user->id, 'notification_groups_membership_request', true ) ) { ?>checked="checked" <?php } ?>/></td>
                                 <td class="no"><input type="radio" name="notifications[notification_groups_membership_request]" value="no" <?php if ( 'no' == get_user_meta( $current_user->id, 'notification_groups_membership_request', true ) ) { ?>checked="checked" <?php } ?>/></td>
                         </tr>
@@ -1109 +1109 @@
 
                         if ( 'private' == $_POST['group-status'] )
                                 $group_status = 'private';
+                        else if ( 'modmems' == $_POST['group-status'] )
+                                $group_status = 'modmems';
                         else if ( 'hidden' == $_POST['group-status'] )
                                 $group_status = 'hidden';
 
@@ -1306 +1308 @@
         $wp_query->is_404 = false;
         status_header( 200 );
 
-        if ( 'public' != $bp->groups->current_group->status ) {
+        if ( 'public' != $bp->groups->current_group->status && 'modmems' != $bp->groups->current_group->status ) {
                 if ( !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
                         return false;
         }
@@ -1346 +1348 @@
                 return false;
 
         /* If the group is not public, hide the activity sitewide. */
-        if ( 'public' == $bp->groups->current_group->status )
+        if ( 'public' == $bp->groups->current_group->status || 'modmems' == $bp->groups->current_group->status )
                 $hide_sitewide = false;
         else
                 $hide_sitewide = true;
@@ -1602 +1604 @@
          * Before we potentially switch the group status, if it has been changed to public
          * from private and there are outstanding membership requests, auto-accept those requests.
          */
-        if ( 'private' == $group->status && 'public' == $status )
+        if ( ( 'private' == $group->status || 'modmems' == $group->status ) && 'public' == $status )
                 groups_accept_all_pending_membership_requests( $group->id );
 
         /* Now update the status */

buddypress/bp-themes/bp-default/forums/index.php

@@ -42 +42 @@
 
                                                         <?php while ( bp_groups() ) : bp_the_group(); ?>
 
-                                                                <?php if ( bp_group_is_forum_enabled() && 'public' == bp_get_group_status() ) : ?>
+                                                                <?php if ( bp_group_is_forum_enabled() && ( 'public' == bp_get_group_status() || bp_group_is_member() ) ) : ?>
 
                                                                         <option value="<?php bp_group_id() ?>"><?php bp_group_name() ?></option>
 
@@ -117 +117 @@
 
         <?php locate_template( array( 'sidebar.php' ), true ) ?>
 
-<?php get_footer() ?>
- No newline at end of file
+<?php get_footer() ?>

buddypress/bp-themes/bp-default/groups/create.php

@@ -74 +74 @@
                                                         </ul>
                                                 </label>
 
+                                                <label><input type="radio" name="group-status" value="modmems"<?php if ( 'modmems' == bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> />
+                                                        <strong><?php _e( 'This is a moderated-membership group', 'buddypress' ) ?></strong>
+                                                        <ul>
+                                                                <li><?php _e( 'Only users who request membership and are accepted can join the group.', 'buddypress' ) ?></li>
+                                                                <li><?php _e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ) ?></li>
+                                                                <li><?php _e( 'Group content and activity will be visible to any site member.', 'buddypress' ) ?></li>
+                                                        </ul>
+                                                </label>
+
                                                 <label><input type="radio" name="group-status" value="private"<?php if ( 'private' == bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> />
                                                         <strong><?php _e( 'This is a private group', 'buddypress' ) ?></strong>
                                                         <ul>

buddypress/bp-themes/bp-default/groups/single/admin.php

@@ -75 +75 @@
                 </label>
 
                 <label>
+                        <input type="radio" name="group-status" value="modmems"<?php bp_group_show_status_setting('modmems') ?> />
+                        <strong><?php _e( 'This is a moderated-membership group', 'buddypress' ) ?></strong>
+                        <ul>
+                                <li><?php _e( 'Only users who request membership and are accepted can join the group.', 'buddypress' ) ?></li>
+                                <li><?php _e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ) ?></li>
+                                <li><?php _e( 'Group content and activity will be visible to any site member.', 'buddypress' ) ?></li>
+                        </ul>
+                </label>
+
+                <label>
                         <input type="radio" name="group-status" value="private"<?php bp_group_show_status_setting('private') ?> />
                         <strong><?php _e( 'This is a private group', 'buddypress' ) ?></strong>
                         <ul>

buddypress/bp-themes/bp-default/header.php

@@ -18 +18 @@
                         <link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> | <?php _e('Site Wide Activity RSS Feed', 'buddypress' ) ?>" href="<?php bp_sitewide_activity_feed_link() ?>" />
                 <?php endif; ?>
 
-                <?php if ( function_exists( 'bp_member_activity_feed_link' ) && bp_is_member() ) : ?>
-                        <link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> | <?php bp_displayed_user_fullname() ?> | <?php _e( 'Activity RSS Feed', 'buddypress' ) ?>" href="<?php bp_member_activity_feed_link() ?>" />
+                <?php if ( function_exists( 'bp_member_activity_feed_link' ) && bp_is_member() && bp_is_activity_component() ) : ?>
+                        <link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> | <?php bp_displayed_user_fullname() ?> | <?php _e( bp_member_current_activity_rss_title() . ' Activity RSS Feed', 'buddypress' ) ?>" href="<?php bp_member_activity_feed_link() ?>" />
                 <?php endif; ?>
 
                 <?php if ( function_exists( 'bp_group_activity_feed_link' ) && bp_is_group() ) : ?>