Changeset 8439

Timestamp:

05/21/2014 03:21:05 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Whitespace, code formatting, and inline doc clean-up in BP_Members_Component.

File:

• trunk/src/bp-members/bp-members-loader.php (modified) (11 diffs)

trunk/src/bp-members/bp-members-loader.php

@@ -1 +1 @@
 <?php
+
 /**
  * BuddyPress Member Loader
@@ -36 +37 @@
      */
     public function includes( $includes = array() ) {
+
+        // Always include these files
         $includes = array(
             'actions',
@@ -48 +51 @@
         );
 
+        // Include these only if in admin
         if ( is_admin() ) {
             $includes[] = 'admin';
@@ -70 +74 @@
         $bp = buddypress();
 
-        // Define a slug, if necessary
-        if ( !defined( 'BP_MEMBERS_SLUG' ) )
+        /** Component Globals *************************************************/
+
+        // Define a slug, as a fallback for backpat
+        if ( !defined( 'BP_MEMBERS_SLUG' ) ) {
             define( 'BP_MEMBERS_SLUG', $this->id );
-
-        $members_globals = array(
-            'slug'          => BP_MEMBERS_SLUG,
-            'root_slug'     => isset( $bp->pages->members->slug ) ? $bp->pages->members->slug : BP_MEMBERS_SLUG,
-            'has_directory' => true,
+        }
+
+        // Override any passed args
+        $args = array(
+            'slug'            => BP_MEMBERS_SLUG,
+            'root_slug'       => isset( $bp->pages->members->slug ) ? $bp->pages->members->slug : BP_MEMBERS_SLUG,
+            'has_directory'   => true,
             'directory_title' => _x( 'Members', 'component directory title', 'buddypress' ),
-            'global_tables' => array(
+            'search_string'   => __( 'Search Members...', 'buddypress' ),
+            'global_tables'   => array(
                 'table_name_last_activity' => bp_core_get_table_prefix() . 'bp_activity',
                 'table_name_signups'       => bp_core_get_table_prefix() . 'signups',
-            ),
-            'search_string' => __( 'Search Members...', 'buddypress' ),
-        );
-
-        parent::setup_globals( $members_globals );
+            )
+        );
+
+        parent::setup_globals( $args );
 
         /** Logged in user ****************************************************/
@@ -113 +121 @@
         $bp->displayed_user->fullname = bp_core_get_user_displayname( bp_displayed_user_id() );
 
-        /** Signup ***************************************************/
+        /** Signup ************************************************************/
+
         $bp->signup = new stdClass;
 
@@ -126 +135 @@
         /** Default Profile Component *****************************************/
 
-        if ( !defined( 'BP_DEFAULT_COMPONENT' ) ) {
+        if ( defined( 'BP_DEFAULT_COMPONENT' ) && BP_DEFAULT_COMPONENT ) {
+            $bp->default_component = BP_DEFAULT_COMPONENT;
+        } else {
             if ( bp_is_active( 'activity' ) && isset( $bp->pages->activity ) ) {
                 $bp->default_component = bp_get_activity_slug();
@@ -132 +143 @@
                 $bp->default_component = ( 'xprofile' === $bp->profile->id ) ? 'profile' : $bp->profile->id;
             }
-
-        } else {
-            $bp->default_component = BP_DEFAULT_COMPONENT;
-        }
+        }
+
+        /** Canonical Component Stack *****************************************/
 
         if ( bp_displayed_user_id() ) {
@@ -152 +162 @@
             }
 
-            if ( !bp_current_component() ) {
+            // Looking at the single member root/home, so assume the default
+            if ( ! bp_current_component() ) {
                 $bp->current_component = $bp->default_component;
-            } else if ( bp_is_current_component( $bp->default_component ) && !bp_current_action() ) {
-                // The canonical URL will not contain the default component
+
+            // The canonical URL will not contain the default component
+            } elseif ( bp_is_current_component( $bp->default_component ) && ! bp_current_action() ) {
                 unset( $bp->canonical_stack['component'] );
             }
@@ -172 +184 @@
 
     /**
-     * Set up component navigation.
+     * Set up fall-back component navigation if XProfile is inactive.
      *
      * @since BuddyPress (1.5.0)
@@ -184 +196 @@
      */
     public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
+
+        // Bail if XProfile component is active
+        if ( bp_is_active( 'xprofile' ) ) {
+            return;
+        }
+
+        // Don't set up navigation if there's no member
+        if ( ! is_user_logged_in() && ! bp_is_user() ) {
+            return;
+        }
+
         $bp = buddypress();
 
-        // Add 'Profile' to the main navigation
-        if ( !bp_is_active( 'xprofile' ) ) {
-
-            // Don't set up navigation if there's no user
-            if ( !is_user_logged_in() && !bp_is_user() ) {
-                return;
-            }
-
-            $main_nav = array(
-                'name'                => __( 'Profile', 'buddypress' ),
-                'slug'                => $bp->profile->slug,
-                'position'            => 20,
-                'screen_function'     => 'bp_members_screen_display_profile',
-                'default_subnav_slug' => 'public',
-                'item_css_id'         => $bp->profile->id
-            );
-
-            // User links
-            $user_domain  = bp_displayed_user_domain() ? bp_displayed_user_domain() : bp_loggedin_user_domain();
-            $profile_link = trailingslashit( $user_domain . $bp->profile->slug );
-
-            // Add the subnav items to the profile
-            $sub_nav[] = array(
-                'name'            => __( 'View', 'buddypress' ),
-                'slug'            => 'public',
-                'parent_url'      => $profile_link,
-                'parent_slug'     => $bp->profile->slug,
-                'screen_function' => 'bp_members_screen_display_profile',
-                'position'        => 10
-            );
-
-            parent::setup_nav( $main_nav, $sub_nav );
-        }
+        // Setup the main navigation
+        $main_nav = array(
+            'name'                => __( 'Profile', 'buddypress' ),
+            'slug'                => $bp->profile->slug,
+            'position'            => 20,
+            'screen_function'     => 'bp_members_screen_display_profile',
+            'default_subnav_slug' => 'public',
+            'item_css_id'         => $bp->profile->id
+        );
+
+        // User links
+        $user_domain  = bp_displayed_user_domain() ? bp_displayed_user_domain() : bp_loggedin_user_domain();
+        $profile_link = trailingslashit( $user_domain . $bp->profile->slug );
+
+        // Setup the subnav items for the member profile
+        $sub_nav[] = array(
+            'name'            => __( 'View', 'buddypress' ),
+            'slug'            => 'public',
+            'parent_url'      => $profile_link,
+            'parent_slug'     => $bp->profile->slug,
+            'screen_function' => 'bp_members_screen_display_profile',
+            'position'        => 10
+        );
+
+        parent::setup_nav( $main_nav, $sub_nav );
     }
 
@@ -229 +244 @@
         if ( bp_is_my_profile() ) {
             $bp->bp_options_title = __( 'You', 'buddypress' );
-        } elseif( bp_is_user() ) {
+        } elseif ( bp_is_user() ) {
+            $bp->bp_options_title  = bp_get_displayed_user_fullname();
             $bp->bp_options_avatar = bp_core_fetch_avatar( array(
                 'item_id' => bp_displayed_user_id(),
                 'type'    => 'thumb',
-                'alt'     => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_displayed_user_fullname() )
+                'alt'     => sprintf( __( 'Profile picture of %s', 'buddypress' ), $bp->bp_options_title )
             ) );
-            $bp->bp_options_title = bp_get_displayed_user_fullname();
         }