Changeset 3648

Timestamp:

01/03/2011 10:49:11 PM (15 years ago)

Author:

djpaul

Message:

Add show_hidden argument for bp_has_groups(). Fixes #2377. Props boonebgorges and sorich87

Location:

trunk

Files:

• bp-groups.php (modified) (3 diffs)
• bp-groups/bp-groups-classes.php (modified) (3 diffs)
• bp-groups/bp-groups-templatetags.php (modified) (6 diffs)

trunk/bp-groups.php

@@ -48 +48 @@
 
     // The default text for the groups directory search box
-        $bp->default_search_strings[$bp->groups->slug] = __( 'Search Groups...', 'buddypress' ); 
+        $bp->default_search_strings[$bp->groups->slug] = __( 'Search Groups...', 'buddypress' );
 
     do_action( 'groups_setup_globals' );
@@ -1820 +1820 @@
         'exclude' => false, // Do not include these specific groups (group_ids)
         'search_terms' => false, // Limit to groups that match these search terms
+        'show_hidden' => false, // Show hidden groups to non-admins
 
         'per_page' => 20, // The number of results to return per page
@@ -1829 +1830 @@
     extract( $params, EXTR_SKIP );
 
-    $groups = BP_Groups_Group::get( $type, $per_page, $page, $user_id, $search_terms, $include, $populate_extras, $exclude );
+    $groups = BP_Groups_Group::get( $type, $per_page, $page, $user_id, $search_terms, $include, $populate_extras, $exclude, $show_hidden );
 
     return apply_filters( 'groups_get_groups', $groups, &$params );

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

@@ -256 +256 @@
     }
 
-    function get( $type = 'newest', $per_page = null, $page = null, $user_id = false, $search_terms = false, $include = false, $populate_extras = true, $exclude = false ) {
+    function get( $type = 'newest', $per_page = null, $page = null, $user_id = false, $search_terms = false, $include = false, $populate_extras = true, $exclude = false, $show_hidden = false ) {
         global $wpdb, $bp;
 
@@ -274 +274 @@
         $sql['where'] = " g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count'";
 
-        if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
+        if ( !$show_hidden )
             $sql['hidden'] = " AND g.status != 'hidden'";
 
@@ -1154 +1154 @@
             if ( $bp->current_component == $bp->groups->slug && 'admin' == $bp->current_action && !empty( $bp->action_variables[0] ) && $this->slug == $bp->action_variables[0] ) {
                 // Check whether the user is saving changes
-                $this->edit_screen_save();      
-                
+                $this->edit_screen_save();
+
                 add_action( 'groups_custom_edit_steps', array( &$this, 'edit_screen' ) );
 

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

@@ -23 +23 @@
     var $order;
 
-    function bp_groups_template( $user_id, $type, $page, $per_page, $max, $slug, $search_terms, $include, $populate_extras, $exclude ) {
+    function bp_groups_template( $user_id, $type, $page, $per_page, $max, $slug, $search_terms, $include, $populate_extras, $exclude, $show_hidden ) {
         global $bp;
 
         $this->pag_page = isset( $_REQUEST['grpage'] ) ? intval( $_REQUEST['grpage'] ) : $page;
         $this->pag_num  = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
+
+        if ( $bp->loggedin_user->is_super_admin || ( is_user_logged_in() && $user_id == $bp->loggedin_user->id ) )
+            $show_hidden = true;
 
         if ( 'invites' == $type ) {
@@ -36 +39 @@
             $this->groups    = array( $group );
         } else {
-            $this->groups = groups_get_groups( array( 'type' => $type, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'user_id' => $user_id, 'search_terms' => $search_terms, 'include' => $include, 'exclude' => $exclude, 'populate_extras' => $populate_extras ) );
+            $this->groups = groups_get_groups( array( 'type' => $type, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'user_id' => $user_id, 'search_terms' => $search_terms, 'include' => $include, 'exclude' => $exclude, 'populate_extras' => $populate_extras, 'show_hidden' => $show_hidden ) );
         }
 
@@ -137 +140 @@
      * pass their parameters directly to the loop.
      */
+    $slug = false;
     $type = 'active';
-    $user_id = false;
-    $search_terms = null;
-    $slug = false;
+    $user_id = 0;
 
     /* User filtering */
@@ -165 +167 @@
         'per_page' => 20,
         'max' => false,
+        'show_hidden' => false,
 
         'user_id' => $user_id, // Pass a user ID to limit to groups this user has joined
         'slug' => $slug, // Pass a group slug to only return that group
-        'search_terms' => $search_terms, // Pass search terms to return only matching groups
+        'search_terms' => '', // Pass search terms to return only matching groups
         'include' => false, // Pass comma separated list of group ID's to return only these groups
         'exclude' => false, // Pass comma separated list of group ID's to exclude these groups
@@ -187 +190 @@
     }
 
-    $groups_template = new BP_Groups_Template( (int)$user_id, $type, (int)$page, (int)$per_page, (int)$max, $slug, $search_terms, $include, (bool)$populate_extras, $exclude );
+    $groups_template = new BP_Groups_Template( (int)$user_id, $type, (int)$page, (int)$per_page, (int)$max, $slug, $search_terms, $include, (bool)$populate_extras, $exclude, $show_hidden );
     return apply_filters( 'bp_has_groups', $groups_template->has_groups(), $groups_template );
 }
@@ -1872 +1875 @@
     global $bp;
 
-    $default_search_value = bp_get_search_default_text(); 
-    $search_value = !empty( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : $default_search_value; 
+    $default_search_value = bp_get_search_default_text();
+    $search_value = !empty( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : $default_search_value;
 
 ?>