Changeset 5700 for trunk/bp-members/bp-members-template.php

Timestamp:

02/11/2012 02:29:55 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Remove unneeded globals and clean up some code in Members component. Remove signup file and move its code into screens and functions. See #3989.

File:

• trunk/bp-members/bp-members-template.php (modified) (17 diffs)

trunk/bp-members/bp-members-template.php

@@ -1 +1 @@
 <?php
+
 /**
  * BuddyPress Member Template Tags
@@ -169 +170 @@
     var $total_member_count;
 
-    function bp_core_members_template( $type, $page_number, $per_page, $max, $user_id, $search_terms, $include, $populate_extras, $exclude, $meta_key, $meta_value ) {
-        $this->__construct( $type, $page_number, $per_page, $max, $user_id, $search_terms, $include, $populate_extras, $exclude, $meta_key, $meta_value );
-    }
-
     function __construct( $type, $page_number, $per_page, $max, $user_id, $search_terms, $include, $populate_extras, $exclude, $meta_key, $meta_value ) {
-        global $bp;
-
-        $this->pag_page  = !empty( $_REQUEST['upage'] ) ? intval( $_REQUEST['upage'] ) : (int)$page_number;
-        $this->pag_num   = !empty( $_REQUEST['num'] )   ? intval( $_REQUEST['num'] )   : (int)$per_page;
-        $this->type      = $type;
+
+        $this->pag_page = !empty( $_REQUEST['upage'] ) ? intval( $_REQUEST['upage'] ) : (int)$page_number;
+        $this->pag_num  = !empty( $_REQUEST['num'] )   ? intval( $_REQUEST['num'] )   : (int)$per_page;
+        $this->type     = $type;
 
         if ( isset( $_REQUEST['letter'] ) && '' != $_REQUEST['letter'] )
@@ -250 +246 @@
 
     function the_member() {
-        global $member, $bp;
 
         $this->in_the_loop = true;
-        $this->member = $this->next_member();
-
-        if ( 0 == $this->current_member ) // loop has just started
-            do_action('member_loop_start');
+        $this->member      = $this->next_member();
+
+        // loop has just started
+        if ( 0 == $this->current_member )
+            do_action( 'member_loop_start' );
     }
 }
@@ -267 +263 @@
 
 function bp_has_members( $args = '' ) {
-    global $bp, $members_template;
+    global $members_template;
 
     /***
@@ -339 +335 @@
 }
     function bp_get_members_pagination_count() {
-        global $bp, $members_template;
+        global $members_template;
 
         if ( empty( $members_template->type ) )
@@ -464 +460 @@
 
 function bp_member_is_loggedin_user() {
-    global $bp, $members_template;
+    global $members_template;
     return apply_filters( 'bp_member_is_loggedin_user', bp_loggedin_user_id() == $members_template->member->id ? true : false );
 }
@@ -472 +468 @@
 }
     function bp_get_member_avatar( $args = '' ) {
-        global $bp, $members_template;
+        global $members_template;
 
         $fullname = !empty( $members_template->member->fullname ) ? $members_template->member->fullname : $members_template->member->display_name;
 
         $defaults = array(
-            'type' => 'thumb',
-            'width' => false,
+            'type'   => 'thumb',
+            'width'  => false,
             'height' => false,
-            'class' => 'avatar',
-            'id' => false,
-            'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), $fullname )
+            'class'  => 'avatar',
+            'id'     => false,
+            'alt'    => sprintf( __( 'Profile picture of %s', 'buddypress' ), $fullname )
         );
 
@@ -568 +564 @@
 }
     function bp_get_member_latest_update( $args = '' ) {
-        global $bp, $members_template;
+        global $members_template;
 
         $defaults = array(
@@ -598 +594 @@
 }
     function bp_get_member_profile_data( $args = '' ) {
-        global $bp, $members_template;
+        global $members_template;
 
         if ( !bp_is_active( 'xprofile' ) )
@@ -665 +661 @@
 
 function bp_directory_members_search_form() {
-    global $bp;
 
     $default_search_value = bp_get_search_default_text( 'members' );
@@ -707 +702 @@
     // Loop through each navigation item
     foreach( (array) $bp->bp_nav as $nav_item ) {
+
+        $selected = '';
+
         // If the current component matches the nav item id, then add a highlight CSS class.
-        if ( !bp_is_directory() && $bp->active_components[$bp->current_component] == $nav_item['css_id'] )
+        if ( !bp_is_directory() && $bp->active_components[$bp->current_component] == $nav_item['css_id'] ) {
             $selected = ' class="current selected"';
-        else
-            $selected = '';
-
-        /* If we are viewing another person (current_userid does not equal loggedin_user->id)
-           then check to see if the two users are friends. if they are, add a highlight CSS class
-           to the friends nav item if it exists. */
+        }
+
+        // If we are viewing another person (current_userid does not equal
+        // loggedin_user->id then check to see if the two users are friends.
+        // if they are, add a highlight CSS class to the friends nav item
+        // if it exists.
         if ( !bp_is_my_profile() && bp_displayed_user_id() ) {
             $selected = '';
@@ -721 +719 @@
             if ( bp_is_active( 'friends' ) ) {
                 if ( $nav_item['css_id'] == $bp->friends->id ) {
-                    if ( friends_check_friendship( bp_loggedin_user_id(), bp_displayed_user_id() ) )
+                    if ( friends_check_friendship( bp_loggedin_user_id(), bp_displayed_user_id() ) ) {
                         $selected = ' class="current selected"';
+                    }
                 }
             }
@@ -751 +750 @@
             continue;
 
-        if ( $bp->current_component == $user_nav_item['slug'] )
+        $selected = '';
+        if ( $bp->current_component == $user_nav_item['slug'] ) {
             $selected = ' class="current selected"';
-        else
-            $selected = '';
-
-        if ( $bp->loggedin_user->domain )
+        }
+
+        if ( $bp->loggedin_user->domain ) {
             $link = str_replace( $bp->loggedin_user->domain, $bp->displayed_user->domain, $user_nav_item['link'] );
-        else
+        } else {
             $link = trailingslashit( $bp->displayed_user->domain . $user_nav_item['link'] );
+        }
 
         echo apply_filters_ref_array( 'bp_get_displayed_user_nav_' . $user_nav_item['css_id'], array( '<li id="' . $user_nav_item['css_id'] . '-personal-li" ' . $selected . '><a id="user-' . $user_nav_item['css_id'] . '" href="' . $link . '">' . $user_nav_item['name'] . '</a></li>', &$user_nav_item ) );
@@ -771 +771 @@
 }
     function bp_get_loggedin_user_avatar( $args = '' ) {
-        global $bp;
 
         $defaults = array(
@@ -791 +790 @@
 }
     function bp_get_displayed_user_avatar( $args = '' ) {
-        global $bp;
 
         $defaults = array(
@@ -826 +824 @@
 }
     function bp_get_last_activity( $user_id = 0 ) {
-        global $bp;
 
         if ( empty( $user_id ) )
@@ -967 +964 @@
 }
     function bp_get_signup_page() {
-        global $bp;
 
         if ( bp_has_custom_signup_page() ) {