Skip to:
Content

BuddyPress.org


Ignore:
Timestamp:
01/20/2011 03:56:04 AM (14 years ago)
Author:
johnjamesjacoby
Message:

First pass at BP_Component class. Refactor Activity component to use BP_Component. Introduce page templates for root directories. Rename bp-activity-templatetags to bp-activity-template per WP coding standards. Split bp-activity up into smaller parts. Introduce get_slug functions for activity component. More refactoring to do on other components. This will temporarily break trunk while refactoring happens, so be sure to pin to the previous revision if needed.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/bp-core/bp-core-templatetags.php

    r3749 r3751  
    390390
    391391        if ( !empty( $update['id'] ) )
    392             $update_content .= ' &middot; <a href="' . $bp->root_domain . '/' . BP_ACTIVITY_SLUG . '/p/' . $update['id'] . '">' . __( 'View', 'buddypress' ) . '</a>';
     392            $update_content .= ' &middot; <a href="' . $bp->root_domain . '/' . $bp->activity->root_slug . '/p/' . $update['id'] . '">' . __( 'View', 'buddypress' ) . '</a>';
    393393
    394394        return apply_filters( 'bp_get_member_latest_update', $update_content );
    … …  
    17741774}
    17751775
    1776 function bp_is_page($page) {
     1776function bp_is_page( $page ) {
    17771777    global $bp;
    17781778
    … …  
    17961796
    17971797function bp_is_profile_component() {
    1798     if ( bp_is_current_component( BP_XPROFILE_SLUG ) )
     1798    if ( bp_is_current_component( 'xprofile' ) )
    17991799        return true;
    18001800
    … …  
    18031803
    18041804function bp_is_activity_component() {
    1805     if ( defined( 'BP_ACTIVITY_SLUG' ) && bp_is_current_component( BP_ACTIVITY_SLUG ) )
     1805    if ( bp_is_current_component( 'activity' ) )
    18061806        return true;
    18071807
    … …  
    18101810
    18111811function bp_is_blogs_component() {
    1812     if ( is_multisite() && defined( 'BP_BLOGS_SLUG' ) && bp_is_current_component( BP_BLOGS_SLUG ) )
     1812    if ( is_multisite() && bp_is_current_component( 'blogs' ) )
    18131813        return true;
    18141814
    … …  
    18171817
    18181818function bp_is_messages_component() {
    1819     if ( defined( 'BP_MESSAGES_SLUG' ) && bp_is_current_component( BP_MESSAGES_SLUG ) )
     1819    if ( bp_is_current_component( 'messages' ) )
    18201820        return true;
    18211821
    … …  
    18241824
    18251825function bp_is_friends_component() {
    1826     if ( defined( 'BP_FRIENDS_SLUG' ) && bp_is_current_component( BP_FRIENDS_SLUG ) )
     1826
     1827    if ( bp_is_current_component( 'friends' ) )
    18271828        return true;
    18281829
    … …  
    18311832
    18321833function bp_is_groups_component() {
    1833     if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) )
     1834    if ( bp_is_current_component( 'groups' ) )
    18341835        return true;
    18351836
    … …  
    18381839
    18391840function bp_is_settings_component() {
    1840     if ( bp_is_current_component( BP_SETTINGS_SLUG ) )
     1841    if ( bp_is_current_component( 'settings' ) )
    18411842        return true;
    18421843
    … …  
    18561857    global $bp;
    18571858
    1858     if ( !empty( $bp->activity->slug ) && bp_is_current_component( $bp->activity->slug ) )
     1859    if ( bp_is_current_component( 'activity' ) )
    18591860        return true;
    18601861
    … …  
    18651866    global $bp;
    18661867
    1867     if ( !empty( $bp->activity->slug ) && bp_is_current_component( $bp->activity->slug ) && 'my-friends' == $bp->current_action )
     1868    if ( bp_is_current_component( 'activity' ) && 'my-friends' == $bp->current_action )
    18681869        return true;
    18691870
    … …  
    18741875    global $bp;
    18751876
    1876     if ( defined( 'BP_ACTIVITY_SLUG' ) && bp_is_current_component( BP_ACTIVITY_SLUG ) && is_numeric( $bp->current_action ) )
     1877    if ( bp_is_current_component( 'activity' ) && is_numeric( $bp->current_action ) )
    18771878        return true;
    18781879
    … …  
    18831884    global $bp;
    18841885
    1885     if ( defined( 'BP_XPROFILE_SLUG' ) && bp_is_current_component( BP_XPROFILE_SLUG ) || isset( $bp->core->profile->slug ) && bp_is_current_component( $bp->core->profile->slug ) )
     1886    if ( bp_is_current_component( 'xprofile' ) )
    18861887        return true;
    18871888
    … …  
    18921893    global $bp;
    18931894
    1894     if ( defined( 'BP_XPROFILE_SLUG' ) && bp_is_current_component( BP_XPROFILE_SLUG ) && 'edit' == $bp->current_action )
     1895    if ( bp_is_current_component( 'xprofile' ) && 'edit' == $bp->current_action )
    18951896        return true;
    18961897
    … …  
    19011902    global $bp;
    19021903
    1903     if ( defined( 'BP_XPROFILE_SLUG' ) && bp_is_current_component( BP_XPROFILE_SLUG ) && 'change-avatar' == $bp->current_action )
     1904    if ( bp_is_current_component( 'xprofile' ) && 'change-avatar' == $bp->current_action )
    19041905        return true;
    19051906
    … …  
    19101911    global $bp;
    19111912
    1912     if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) )
     1913    if ( bp_is_current_component( 'groups' ) )
    19131914        return true;
    19141915
    … …  
    19191920    global $bp;
    19201921
    1921     if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && isset( $bp->groups->current_group ) && $bp->groups->current_group )
     1922    if ( bp_is_current_component( 'groups' ) && isset( $bp->groups->current_group ) && $bp->groups->current_group )
    19221923        return true;
    19231924
    … …  
    19281929    global $bp;
    19291930
    1930     if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item && ( !$bp->current_action || 'home' == $bp->current_action ) )
     1931    if ( bp_is_current_component( 'groups' ) && $bp->is_single_item && ( !$bp->current_action || 'home' == $bp->current_action ) )
    19311932        return true;
    19321933
    … …  
    19371938    global $bp;
    19381939
    1939     if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && 'create' == $bp->current_action )
     1940    if ( bp_is_current_component( 'groups' ) && 'create' == $bp->current_action )
    19401941        return true;
    19411942
    … …  
    19471948    global $bp;
    19481949
    1949     if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item && 'admin' == $bp->current_action )
     1950    if ( bp_is_current_component( 'groups' ) && $bp->is_single_item && 'admin' == $bp->current_action )
    19501951        return true;
    19511952
    … …  
    19561957    global $bp;
    19571958
    1958     if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item && 'forum' == $bp->current_action )
     1959    if ( bp_is_current_component( 'groups' ) && $bp->is_single_item && 'forum' == $bp->current_action )
    19591960        return true;
    19601961
    … …  
    19651966    global $bp;
    19661967
    1967     if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item && 'activity' == $bp->current_action )
     1968    if ( bp_is_current_component( 'groups' ) && $bp->is_single_item && 'activity' == $bp->current_action )
    19681969        return true;
    19691970
    … …  
    19741975    global $bp;
    19751976
    1976     if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item && 'forum' == $bp->current_action && isset( $bp->action_variables[0] ) && 'topic' == $bp->action_variables[0] )
     1977    if ( bp_is_current_component( 'groups' ) && $bp->is_single_item && 'forum' == $bp->current_action && isset( $bp->action_variables[0] ) && 'topic' == $bp->action_variables[0] )
    19771978        return true;
    19781979
    … …  
    19831984    global $bp;
    19841985
    1985     if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item && 'forum' == $bp->current_action && isset( $bp->action_variables[0] ) && 'topic' == $bp->action_variables[0] && isset( $bp->action_variables[2] ) && 'edit' == $bp->action_variables[2] )
     1986    if ( bp_is_current_component( 'groups' ) && $bp->is_single_item && 'forum' == $bp->current_action && isset( $bp->action_variables[0] ) && 'topic' == $bp->action_variables[0] && isset( $bp->action_variables[2] ) && 'edit' == $bp->action_variables[2] )
    19861987        return true;
    19871988
    … …  
    19921993    global $bp;
    19931994
    1994     if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item && 'members' == $bp->current_action )
     1995    if ( bp_is_current_component( 'groups' ) && $bp->is_single_item && 'members' == $bp->current_action )
    19951996        return true;
    19961997
    … …  
    20012002    global $bp;
    20022003
    2003     if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && 'send-invites' == $bp->current_action )
     2004    if ( bp_is_current_component( 'groups' ) && 'send-invites' == $bp->current_action )
    20042005        return true;
    20052006
    … …  
    20102011    global $bp;
    20112012
    2012     if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && 'request-membership' == $bp->current_action )
     2013    if ( bp_is_current_component( 'groups' ) && 'request-membership' == $bp->current_action )
    20132014        return true;
    20142015
    … …  
    20192020    global $bp;
    20202021
    2021     if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item && 'leave-group' == $bp->current_action )
     2022    if ( bp_is_current_component( 'groups' ) && $bp->is_single_item && 'leave-group' == $bp->current_action )
    20222023        return true;
    20232024
    … …  
    20282029    global $bp;
    20292030
    2030     if ( defined( 'BP_GROUPS_SLUG' ) && bp_is_current_component( BP_GROUPS_SLUG ) && $bp->is_single_item )
     2031    if ( bp_is_current_component( 'groups' ) && $bp->is_single_item )
    20312032        return true;
    20322033
    … …  
    20372038    global $bp;
    20382039
    2039     if ( is_multisite() && defined( 'BP_BLOGS_SLUG' ) && bp_is_current_component( BP_BLOGS_SLUG ) )
     2040    if ( is_multisite() && bp_is_current_component( 'blogs' ) )
    20402041        return true;
    20412042
    … …  
    20462047    global $bp;
    20472048
    2048     if ( is_multisite() && defined( 'BP_BLOGS_SLUG' ) && bp_is_current_component( BP_BLOGS_SLUG ) && 'recent-posts' == $bp->current_action )
     2049    if ( is_multisite() && bp_is_current_component( 'blogs' ) && 'recent-posts' == $bp->current_action )
    20492050        return true;
    20502051
    … …  
    20552056    global $bp;
    20562057
    2057     if ( is_multisite() && defined( 'BP_BLOGS_SLUG' ) && bp_is_current_component( BP_BLOGS_SLUG ) && 'recent-comments' == $bp->current_action )
     2058    if ( is_multisite() && bp_is_current_component( 'blogs' ) && 'recent-comments' == $bp->current_action )
    20582059        return true;
    20592060
    … …  
    20642065    global $bp;
    20652066
    2066     if ( is_multisite() && defined( 'BP_BLOGS_SLUG' ) && bp_is_current_component( BP_BLOGS_SLUG ) && 'create' == $bp->current_action )
     2067    if ( is_multisite() && bp_is_current_component( 'blogs' ) && 'create' == $bp->current_action )
    20672068        return true;
    20682069
    … …  
    20712072
    20722073function bp_is_user_friends() {
    2073     if ( defined( 'BP_FRIENDS_SLUG' ) && bp_is_current_component( BP_FRIENDS_SLUG ) )
     2074
     2075    if ( bp_is_current_component( 'friends' ) )
    20742076        return true;
    20752077
    … …  
    20802082    global $bp;
    20812083
    2082     if ( defined( 'BP_FRIENDS_SLUG' ) && bp_is_current_component( BP_FRIENDS_SLUG ) && 'requests' == $bp->current_action )
     2084    if ( bp_is_current_component( 'friends' ) && 'requests' == $bp->current_action )
    20832085        return true;
    20842086
    … …  
    20872089
    20882090function bp_is_user_messages() {
    2089     if ( defined( 'BP_MESSAGES_SLUG' ) && bp_is_current_component( BP_MESSAGES_SLUG ) )
     2091
     2092    if ( bp_is_current_component( 'messages' ) )
    20902093        return true;
    20912094
    … …  
    20962099    global $bp;
    20972100
    2098     if ( defined( 'BP_MESSAGES_SLUG' ) && bp_is_current_component( BP_MESSAGES_SLUG ) && ( !$bp->current_action || 'inbox' == $bp->current_action ) )
     2101    if ( bp_is_current_component( 'messages' ) && ( !$bp->current_action || 'inbox' == $bp->current_action ) )
    20992102        return true;
    21002103
    … …  
    21052108    global $bp;
    21062109
    2107     if ( defined( 'BP_MESSAGES_SLUG' ) && bp_is_current_component( BP_MESSAGES_SLUG ) && 'sentbox' == $bp->current_action )
     2110    if ( bp_is_current_component( 'messages' ) && 'sentbox' == $bp->current_action )
    21082111        return true;
    21092112
    … …  
    21152118    global $bp;
    21162119
    2117     if ( defined( 'BP_MESSAGES_SLUG' ) && bp_is_current_component( BP_MESSAGES_SLUG ) && 'notices' == $bp->current_action )
     2120    if ( bp_is_current_component( 'messages' ) && 'notices' == $bp->current_action )
    21182121        return true;
    21192122
    … …  
    21252128    global $bp;
    21262129
    2127     if ( defined( 'BP_MESSAGES_SLUG' ) && bp_is_current_component( BP_MESSAGES_SLUG ) && 'compose' == $bp->current_action )
     2130    if ( bp_is_current_component( 'messages' ) && 'compose' == $bp->current_action )
    21282131        return true;
    21292132
    … …  
    21412144
    21422145function bp_is_activation_page() {
    2143     if ( bp_is_current_component( BP_ACTIVATION_SLUG ) )
     2146    if ( bp_is_current_component( 'activation' ) )
    21442147        return true;
    21452148
    … …  
    21482151
    21492152function bp_is_register_page() {
    2150     if ( bp_is_current_component( BP_REGISTER_SLUG ) )
     2153    if ( bp_is_current_component( 'register' ) )
    21512154        return true;
    21522155
Note: See TracChangeset for help on using the changeset viewer.