Changeset 2537
- Timestamp:
- 02/02/2010 04:53:40 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-groups.php
r2493 r2537 298 298 299 299 /* Record this in activity streams */ 300 $group = new BP_Groups_Group( $group_id , false, false);300 $group = new BP_Groups_Group( $group_id ); 301 301 302 302 groups_record_activity( array( … … 1080 1080 if ( isset( $_COOKIE['bp_new_group_id'] ) ) { 1081 1081 $bp->groups->new_group_id = $_COOKIE['bp_new_group_id']; 1082 $bp->groups->current_group = new BP_Groups_Group( $bp->groups->new_group_id , false, false);1082 $bp->groups->current_group = new BP_Groups_Group( $bp->groups->new_group_id ); 1083 1083 } 1084 1084 … … 1358 1358 $requesting_user_id = $item_id; 1359 1359 1360 $group = new BP_Groups_Group( $group_id , false, false);1360 $group = new BP_Groups_Group( $group_id ); 1361 1361 1362 1362 $group_link = bp_get_group_permalink( $group ); … … 1373 1373 $group_id = $item_id; 1374 1374 1375 $group = new BP_Groups_Group( $group_id , false, false);1375 $group = new BP_Groups_Group( $group_id ); 1376 1376 $group_link = bp_get_group_permalink( $group ); 1377 1377 … … 1386 1386 $group_id = $item_id; 1387 1387 1388 $group = new BP_Groups_Group( $group_id , false, false);1388 $group = new BP_Groups_Group( $group_id ); 1389 1389 $group_link = bp_get_group_permalink( $group ); 1390 1390 … … 1400 1400 $group_id = $item_id; 1401 1401 1402 $group = new BP_Groups_Group( $group_id , false, false);1402 $group = new BP_Groups_Group( $group_id ); 1403 1403 $group_link = bp_get_group_permalink( $group ); 1404 1404 … … 1413 1413 $group_id = $item_id; 1414 1414 1415 $group = new BP_Groups_Group( $group_id , false, false);1415 $group = new BP_Groups_Group( $group_id ); 1416 1416 $group_link = bp_get_group_permalink( $group ); 1417 1417 … … 1426 1426 $group_id = $item_id; 1427 1427 1428 $group = new BP_Groups_Group( $group_id , false, false);1428 $group = new BP_Groups_Group( $group_id ); 1429 1429 $user_url = bp_core_get_user_domain( $user_id ); 1430 1430 … … 1542 1542 return false; 1543 1543 1544 $group = new BP_Groups_Group( $group_id , false, false);1544 $group = new BP_Groups_Group( $group_id ); 1545 1545 $group->name = $group_name; 1546 1546 $group->description = $group_desc; … … 1562 1562 global $bp; 1563 1563 1564 $group = new BP_Groups_Group( $group_id , false, false);1564 $group = new BP_Groups_Group( $group_id ); 1565 1565 $group->enable_forum = $enable_forum; 1566 1566 $group->enable_photos = $enable_photos; … … 1648 1648 1649 1649 function groups_get_slug( $group_id ) { 1650 $group = new BP_Groups_Group( $group_id , false, false);1650 $group = new BP_Groups_Group( $group_id ); 1651 1651 return $group->slug; 1652 1652 } … … 1691 1691 1692 1692 if ( !$bp->groups->current_group ) 1693 $bp->groups->current_group = new BP_Groups_Group( $group_id , false, false);1693 $bp->groups->current_group = new BP_Groups_Group( $group_id ); 1694 1694 1695 1695 $new_member = new BP_Groups_Member; … … 2227 2227 // Send friend invites. 2228 2228 $invited_users = groups_get_invites_for_group( $user_id, $group_id ); 2229 $group = new BP_Groups_Group( $group_id , false, false);2229 $group = new BP_Groups_Group( $group_id ); 2230 2230 2231 2231 for ( $i = 0; $i < count( $invited_users ); $i++ ) { … … 2363 2363 2364 2364 /* Record this in activity streams */ 2365 $group = new BP_Groups_Group( $group_id , false, false);2365 $group = new BP_Groups_Group( $group_id ); 2366 2366 2367 2367 groups_record_activity( array( -
trunk/bp-groups/bp-groups-classes.php
r2534 r2537 11 11 var $date_created; 12 12 13 var $user_dataset;14 15 13 var $admins; 16 14 var $total_member_count; 17 var $random_members; 18 19 function bp_groups_group( $id = null, $single = false, $get_user_dataset = true ) { 15 16 function bp_groups_group( $id = null ) { 20 17 if ( $id ) { 21 18 $this->id = $id; 22 $this->populate( $get_user_dataset ); 23 } 24 25 if ( $single ) { 26 $this->populate_meta(); 27 } 28 } 29 30 function populate( $get_user_dataset ) { 31 global $wpdb, $bp; 32 33 $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} WHERE id = %d", $this->id ); 34 $group = $wpdb->get_row($sql); 35 36 if ( $group ) { 19 $this->populate(); 20 } 21 } 22 23 function populate() { 24 global $wpdb, $bp; 25 26 if ( $group = $wpdb->get_row( $wpdb->prepare( "SELECT g.*, gm.meta_value as last_activity, gm2.meta_value as total_member_count FROM {$bp->groups->table_name} g, {$bp->groups->table_name_groupmeta} gm, {$bp->groups->table_name_groupmeta} gm2 WHERE g.id = gm.group_id AND g.id = gm2.group_id AND gm.meta_key = 'last_activity' AND gm2.meta_key = 'total_member_count' AND g.id = %d", $this->id ) ) ) { 37 27 $this->id = $group->id; 38 28 $this->creator_id = $group->creator_id; … … 43 33 $this->enable_forum = $group->enable_forum; 44 34 $this->date_created = $group->date_created; 45 $this->total_member_count = groups_get_groupmeta( $this->id, 'total_member_count' ); 46 47 if ( $get_user_dataset ) { 48 $this->user_dataset = $this->get_user_dataset(); 49 50 $this->total_member_count = count( $this->user_dataset ); 51 groups_update_groupmeta( $this->id, 'total_member_count', $this->total_member_count ); 35 $this->last_activity = $group->last_activity; 36 $this->total_member_count = $group->total_member_count; 37 $this->is_member = BP_Groups_Member::check_is_member( $bp->loggedin_user->id, $this->id ); 38 39 /* Get group admins and mods */ 40 $admin_mods = $wpdb->get_results( $wpdb->prepare( "SELECT u.ID as user_id, u.user_login, u.user_email, u.user_nicename, m.is_admin, m.is_mod FROM {$wpdb->users} u, {$bp->groups->table_name_members} m WHERE u.ID = m.user_id AND m.group_id = %d AND ( m.is_admin = 1 OR m.is_mod = 1 )", $this->id ) ); 41 foreach( (array)$admin_mods as $user ) { 42 if ( (int)$user->is_admin ) 43 $this->admins[] = $user; 44 else 45 $this->mods[] = $user; 52 46 } 53 54 /* Get group extras */55 $this->is_member = BP_Groups_Member::check_is_member( $bp->loggedin_user->id, $this->id );56 }57 }58 59 function populate_meta() {60 if ( $this->id ) {61 $this->admins = $this->get_administrators();62 $this->random_members = $this->get_random_members();63 47 } 64 48 } … … 134 118 } 135 119 136 function get_user_dataset() {137 global $wpdb, $bp;138 139 return $wpdb->get_results( $wpdb->prepare( "SELECT user_id, is_admin, inviter_id, user_title, is_mod FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 1 AND is_banned = 0 ORDER BY rand()", $this->id ) );140 }141 142 function get_administrators() {143 for ( $i = 0; $i < count($this->user_dataset); $i++ ) {144 if ( $this->user_dataset[$i]->is_admin )145 $admins[] = new BP_Groups_Member( $this->user_dataset[$i]->user_id, $this->id );146 }147 148 return $admins;149 }150 151 function get_random_members() {152 $total_randoms = ( $this->total_member_count > 5 ) ? 5 : $this->total_member_count;153 154 for ( $i = 0; $i < $total_randoms; $i++ ) {155 if ( !(int)$this->user_dataset[$i]->is_banned )156 $users[] = new BP_Groups_Member( $this->user_dataset[$i]->user_id, $this->id );157 }158 return $users;159 }160 161 function is_member() {162 global $bp;163 164 for ( $i = 0; $i < count($this->user_dataset); $i++ ) {165 if ( $this->user_dataset[$i]->user_id == $bp->loggedin_user->id ) {166 return true;167 }168 }169 170 return false;171 }172 173 120 function delete() { 174 121 global $wpdb, $bp; -
trunk/bp-groups/bp-groups-notifications.php
r2532 r2537 4 4 global $bp; 5 5 6 $group = new BP_Groups_Group( $group_id , false, true);6 $group = new BP_Groups_Group( $group_id ); 7 7 $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . __( 'Group Details Updated', 'buddypress' ); 8 8 … … 44 44 45 45 $requesting_user_name = bp_core_get_user_displayname( $requesting_user_id ); 46 $group = new BP_Groups_Group( $group_id , false, false);46 $group = new BP_Groups_Group( $group_id ); 47 47 48 48 $ud = bp_core_get_core_userdata($admin_id); … … 88 88 return false; 89 89 90 $group = new BP_Groups_Group( $group_id , false, false);90 $group = new BP_Groups_Group( $group_id ); 91 91 92 92 $ud = bp_core_get_core_userdata($requesting_user_id); … … 142 142 return false; 143 143 144 $group = new BP_Groups_Group( $group_id , false, false);144 $group = new BP_Groups_Group( $group_id ); 145 145 $ud = bp_core_get_core_userdata($user_id); 146 146 … … 227 227 return false; 228 228 229 $group = new BP_Groups_Group( $group_id , false, false);229 $group = new BP_Groups_Group( $group_id ); 230 230 231 231 foreach( (array)$usernames as $username ) { -
trunk/bp-groups/bp-groups-templatetags.php
r2533 r2537 157 157 158 158 if ( $this->single_group ) 159 $this->group = new BP_Groups_Group( $this->group->group_id, true , true);159 $this->group = new BP_Groups_Group( $this->group->group_id, true ); 160 160 else { 161 161 if ( $this->group ) … … 532 532 } 533 533 534 function bp_group_list_admins( $ full_list= true, $group = false ) {534 function bp_group_list_admins( $deprecated = true, $group = false ) { 535 535 global $groups_template; 536 536 … … 538 538 $group =& $groups_template->group; 539 539 540 if ( !$admins = &$group->admins ) 541 $admins = $group->get_administrators(); 542 543 if ( $admins ) { 544 if ( $full_list ) { ?> 545 <ul id="group-admins"> 546 <?php for ( $i = 0; $i < count($admins); $i++ ) { ?> 540 if ( $group->admins ) { ?> 541 <ul id="group-admins"> 542 <?php foreach( (array)$group->admins as $admin ) { ?> 547 543 <li> 548 <a href="<?php echo $admins[$i]->user->user_url ?>" title="<?php echo $admins[$i]->user->fullname ?>"><?php echo $admins[$i]->user->avatar_mini ?></a> 549 <h5><?php echo $admins[$i]->user->user_link ?></h5> 550 <span class="activity"><?php echo $admins[$i]->user_title ?></span> 551 <hr /> 544 <a href="<?php echo bp_core_get_user_domain( $admin->user_id, $admin->user_nicename, $admin->user_login ) ?>"><?php echo bp_core_fetch_avatar( array( 'item_id' => $admin->user_id, 'email' => $admin->user_email ) ) ?></a> 552 545 </li> 553 546 <?php } ?> 554 </ul> 555 <?php } else { ?> 556 <?php for ( $i = 0; $i < count($admins); $i++ ) { ?> 557 <?php echo $admins[$i]->user->user_link ?> 558 <?php } ?> 559 <?php } ?> 547 </ul> 560 548 <?php } else { ?> 561 549 <span class="activity"><?php _e( 'No Admins', 'buddypress' ) ?></span> 562 550 <?php } ?> 563 564 551 <?php 565 552 } 566 553 567 function bp_group_list_mods( $ full_list= true, $group = false ) {554 function bp_group_list_mods( $deprecated = true, $group = false ) { 568 555 global $groups_template; 569 556 … … 571 558 $group =& $groups_template->group; 572 559 573 $group_mods = groups_get_group_mods( $group->id ); 574 575 if ( $group_mods ) { 576 if ( $full_list ) { ?> 577 <ul id="group-mods" class="mods-list"> 578 <?php for ( $i = 0; $i < count($group_mods); $i++ ) { ?> 560 if ( $group->mods ) { ?> 561 <ul id="group-mods"> 562 <?php foreach( (array)$group->mods as $mod ) { ?> 579 563 <li> 580 <a href="<?php echo bp_core_get_userlink( $group_mods[$i]->user_id, false, true ) ?>" title="<?php echo bp_core_get_user_displayname( $group_mods[$i]->user->user_id ) ?>"><?php echo bp_core_fetch_avatar( array( 'item_id' => $group_mods[$i]->user_id, 'type' => 'thumb', 'width' => 30, 'height' => 30 ) ) ?></a> 581 <h5><?php echo bp_core_get_userlink( $group_mods[$i]->user_id ) ?></h5> 582 <span class="activity"><?php _e( 'Group Mod', 'buddypress' ) ?></span> 583 <div class="clear"></div> 564 <a href="<?php echo bp_core_get_user_domain( $mod->user_id, $mod->user_nicename, $mod->user_login ) ?>"><?php echo bp_core_fetch_avatar( array( 'item_id' => $mod->user_id, 'email' => $mod->user_email ) ) ?></a> 584 565 </li> 585 566 <?php } ?> 586 </ul> 587 <?php } else { ?> 588 <?php for ( $i = 0; $i < count($group_mods); $i++ ) { ?> 589 <?php echo bp_core_get_userlink( $group_mods[$i]->user_id ) . ' ' ?> 590 <?php } ?> 591 <?php } ?> 567 </ul> 592 568 <?php } else { ?> 593 569 <span class="activity"><?php _e( 'No Mods', 'buddypress' ) ?></span> 594 570 <?php } ?> 595 596 571 <?php 597 572 }
Note: See TracChangeset
for help on using the changeset viewer.