Changeset 2267

Timestamp:

01/06/2010 12:35:41 PM (16 years ago)

Author:

apeatling

Message:

Making sure private and hidden groups remain that way to non members, and displaying message to non members.

Location:

trunk

Files:

• bp-groups.php (modified) (3 diffs)
• bp-groups/bp-groups-classes.php (modified) (1 diff)
• bp-groups/bp-groups-templatetags.php (modified) (1 diff)
• bp-themes/bp-default/groups/single/home.php (modified) (1 diff)

trunk/bp-groups.php

@@ -211 +211 @@
             // If this is a private or hidden group, does the user have access?
             if ( 'private' == $bp->groups->current_group->status || 'hidden' == $bp->groups->current_group->status ) {
-                if ( $bp->groups->current_group->is_user_member && is_user_logged_in() )
+                if ( $bp->groups->current_group->is_user_member && is_user_logged_in() || is_site_admin() )
                     $bp->groups->current_group->user_has_access = true;
                 else
@@ -233 +233 @@
 
             // If this is a private group, and the user is not a member, show a "Request Membership" nav item.
-            if ( 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 ( !is_site_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_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 ) );
 
@@ -1972 +1972 @@
     $bp->groups->current_group = new BP_Groups_Group( $group_id );
 
+    /* Be sure the user is a member of the group before posting. */
+    if ( !groups_is_user_member( $user_id, $group_id ) )
+        return false;
+
     /* Record this in activity streams */
     $activity_content = sprintf( __( '%s posted an update in the group %s:', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );

trunk/bp-groups/bp-groups-classes.php

@@ -900 +900 @@
         global $wpdb, $bp;
 
+        if ( is_site_admin() )
+            return true;
+
         if ( !$user_id )
             return false;

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

@@ -1040 +1040 @@
     global $bp, $groups_template;
 
+    if ( is_site_admin() )
+        return true;
+
     if ( !$group )
         $group =& $groups_template->group;

trunk/bp-themes/bp-default/groups/single/home.php

@@ -43 +43 @@
 
                 <?php else : ?>
-                    <p>This group is not visible.</p>
+                    <?php /* The group is not visible, show the status message */ ?>
+
+                    <?php do_action( 'bp_before_group_status_message' ) ?>
+
+                    <div id="message" class="info">
+                        <p><?php bp_group_status_message() ?></p>
+                    </div>
+
+                    <?php do_action( 'bp_after_group_status_message' ) ?>
                 <?php endif; ?>
 
                 <?php do_action( 'bp_directory_members_content' ) ?>
-
             </div>