Skip to:
Content

BuddyPress.org

Changeset 1924


Ignore:
Timestamp:
09/22/2009 10:56:48 PM (15 years ago)
Author:
apeatling
Message:

Showing hidden groups to logged in site admins. Fixes #951

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-forums/bp-forums-templatetags.php

    r1905 r1924  
    2626       
    2727        /* Only show stickies if we are viewing a single group forum, otherwise we could end up with hundreds globally */
    28         if ( !$forum_id )
     28        if ( $no_stickies )
    2929            $show_stickies = 'no'; // bbPress needs str 'no'
    3030
  • trunk/bp-groups/bp-groups-classes.php

    r1922 r1924  
    280280        }
    281281       
    282         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT id as group_id FROM {$bp->groups->table_name} WHERE status != 'hidden' AND ( name LIKE '%%$filter%%' OR description LIKE '%%$filter%%' ) {$order_sql} {$pag_sql}" ) );
    283         $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->groups->table_name} WHERE status != 'hidden' AND ( name LIKE '%%$filter%%' OR description LIKE '%%$filter%%' )" ) );
     282        if ( !is_site_admin() )
     283            $hidden_sql = "AND status != 'hidden'";
     284
     285        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT id as group_id FROM {$bp->groups->table_name} WHERE ( name LIKE '%%$filter%%' OR description LIKE '%%$filter%%' ) {$hidden_sql} {$order_sql} {$pag_sql}" ) );
     286        $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->groups->table_name} WHERE ( name LIKE '%%$filter%%' OR description LIKE '%%$filter%%' ) {$hidden_sq}" ) );
    284287       
    285288        return array( 'groups' => $paged_groups, 'total' => $total_groups );
     
    331334        global $wpdb, $bp;
    332335               
     336        if ( $limit && $page )
     337            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
     338       
     339        if ( !is_site_admin() )
     340            $hidden_sql = "WHERE status != 'hidden'";
     341       
     342        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT id as group_id FROM {$bp->groups->table_name} {$hidden_sql} ORDER BY date_created DESC {$pag_sql}" ) );
     343        $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->groups->table_name} {$hidden_sql} ORDER BY date_created DESC", $limit ) );
     344
     345        return array( 'groups' => $paged_groups, 'total' => $total_groups );
     346    }
     347   
     348    function get_active( $limit = null, $page = null ) {
     349        global $wpdb, $bp;
     350       
     351        if ( $limit && $page )
     352            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
     353
     354        if ( !is_site_admin() )
     355            $hidden_sql = "AND g.status != 'hidden'";
     356       
     357        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT group_id FROM {$bp->groups->table_name_groupmeta} gm, {$bp->groups->table_name} g WHERE g.id = gm.group_id {$hidden_sql} AND gm.meta_key = 'last_activity' ORDER BY CONVERT(gm.meta_value, SIGNED) DESC {$pag_sql}" ) );
     358        $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(group_id) FROM {$bp->groups->table_name_groupmeta} gm, {$bp->groups->table_name} g WHERE g.id = gm.group_id {$hidden_sql} AND gm.meta_key = 'last_activity' ORDER BY CONVERT(gm.meta_value, SIGNED) DESC" ) );
     359
     360        return array( 'groups' => $paged_groups, 'total' => $total_groups );
     361    }
     362   
     363    function get_popular( $limit = null, $page = null ) {
     364        global $wpdb, $bp;
     365       
    333366        if ( $limit && $page ) {
    334367            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
    335368        }
    336        
    337         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT id as group_id FROM {$bp->groups->table_name} WHERE status != 'hidden' ORDER BY date_created DESC {$pag_sql}" ) );
    338         $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->groups->table_name} WHERE status != 'hidden' ORDER BY date_created DESC", $limit ) );
    339 
    340         return array( 'groups' => $paged_groups, 'total' => $total_groups );
    341     }
    342    
    343     function get_active( $limit = null, $page = null ) {
    344         global $wpdb, $bp;
    345        
    346         if ( $limit && $page ) {
    347             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
    348         }
    349        
    350         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT group_id FROM {$bp->groups->table_name_groupmeta} gm, {$bp->groups->table_name} g WHERE g.id = gm.group_id AND g.status != 'hidden' AND gm.meta_key = 'last_activity' ORDER BY CONVERT(gm.meta_value, SIGNED) DESC {$pag_sql}" ) );
    351         $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(group_id) FROM {$bp->groups->table_name_groupmeta} gm, {$bp->groups->table_name} g WHERE g.id = gm.group_id AND g.status != 'hidden' AND gm.meta_key = 'last_activity' ORDER BY CONVERT(gm.meta_value, SIGNED) DESC" ) );
    352 
    353         return array( 'groups' => $paged_groups, 'total' => $total_groups );
    354     }
    355    
    356     function get_popular( $limit = null, $page = null ) {
    357         global $wpdb, $bp;
    358        
    359         if ( $limit && $page ) {
    360             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
    361         }
    362            
    363         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT gm.group_id FROM {$bp->groups->table_name_groupmeta} gm, {$bp->groups->table_name} g WHERE g.id = gm.group_id AND g.status != 'hidden' AND gm.meta_key = 'total_member_count' ORDER BY CONVERT(gm.meta_value, SIGNED) DESC {$pag_sql}" ) );
    364         $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(gm.group_id) FROM {$bp->groups->table_name_groupmeta} gm, {$bp->groups->table_name} g WHERE g.id = gm.group_id AND g.status != 'hidden' AND gm.meta_key = 'total_member_count' ORDER BY CONVERT(gm.meta_value, SIGNED) DESC" ) );
     369
     370        if ( !is_site_admin() )
     371            $hidden_sql = "AND g.status != 'hidden'";
     372           
     373        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT gm.group_id FROM {$bp->groups->table_name_groupmeta} gm, {$bp->groups->table_name} g WHERE g.id = gm.group_id {$hidden_sql} AND gm.meta_key = 'total_member_count' ORDER BY CONVERT(gm.meta_value, SIGNED) DESC {$pag_sql}" ) );
     374        $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(gm.group_id) FROM {$bp->groups->table_name_groupmeta} gm, {$bp->groups->table_name} g WHERE g.id = gm.group_id {$hidden_sql} AND gm.meta_key = 'total_member_count' ORDER BY CONVERT(gm.meta_value, SIGNED) DESC" ) );
    365375
    366376        return array( 'groups' => $paged_groups, 'total' => $total_groups );
     
    373383            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
    374384        }
    375            
     385
    376386        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT gm.group_id FROM {$bbdb->forums} AS f, {$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 = f.forum_id) AND g.status = 'public' ORDER BY f.topics DESC {$pag_sql}" ) );
    377387        $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT COUNT(gm.group_id) FROM {$bbdb->forums} AS f, {$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 = f.forum_id) AND g.status = 'public' ORDER BY f.topics DESC" ) );
  • trunk/bp-themes/bp-default/_inc/css/screen.css

    r1921 r1924  
    831831    display: inline-block;
    832832    font: normal 0.9em "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif !important;
     833    max-width: 60%;
    833834}
    834835
     
    16441645            min-width: 130px;
    16451646        }
     1647       
     1648        table#global-forum-topic-list img.avatar { float:left; }
     1649       
     1650        table#global-forum-topic-list div.poster-name, table#global-forum-topic-list div.object-name {
     1651            margin-left: 35px;
     1652        }
    16461653
    16471654    table#global-forum-topic-list th#th-title {
  • trunk/bp-themes/bp-sn-parent/directories/forums/forums-loop.php

    r1905 r1924  
    3737                    <?php bp_the_topic_last_poster_avatar( 'type=thumb&width=20&height=20' ) ?>
    3838                </a>
    39                 <?php bp_the_topic_last_poster_name() ?>
     39                <div class="poster-name"><?php bp_the_topic_last_poster_name() ?></div>
    4040            </td>
    4141            <td class="td-group">
    4242                <a href="<?php bp_the_topic_object_permalink() ?>"><?php bp_the_topic_object_avatar( 'type=thumb&width=20&height=20' ) ?></a>
    43                 <a href="<?php bp_the_topic_object_permalink() ?>" title="<?php bp_the_topic_object_name() ?>"><?php bp_the_topic_object_name() ?></a>
     43                <div class="object-name"><a href="<?php bp_the_topic_object_permalink() ?>" title="<?php bp_the_topic_object_name() ?>"><?php bp_the_topic_object_name() ?></a></div>
    4444            </td>
    4545            <td class="td-postcount">
Note: See TracChangeset for help on using the changeset viewer.