Changeset 2919 for trunk/bp-groups/bp-groups-templatetags.php

Timestamp:

04/13/2010 04:01:07 PM (14 years ago)

Author:

apeatling

Message:

Replacing function_exists() checks with bp_is_active() checks.

File:

• trunk/bp-groups/bp-groups-templatetags.php (modified) (9 diffs)

trunk/bp-groups/bp-groups-templatetags.php

@@ -23 +23 @@
     var $order;
 
-    function bp_groups_template( $user_id, $type, $page, $per_page, $max, $slug, $search_terms, $populate_extras ) {
+    function bp_groups_template( $user_id, $type, $page, $per_page, $max, $slug, $search_terms, $include, $populate_extras ) {
         global $bp;
 
@@ -36 +36 @@
             $this->groups = array( $group );
         } else
-            $this->groups = groups_get_groups( array( 'type' => $type, 'per_page' => $this->pag_num, 'page' =>$this->pag_page, 'user_id' => $user_id, 'search_terms' => $search_terms, 'populate_extras' => $populate_extras ) );
+            $this->groups = groups_get_groups( array( 'type' => $type, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'user_id' => $user_id, 'search_terms' => $search_terms, 'include' => $include, 'populate_extras' => $populate_extras ) );
 
         if ( 'invites' == $type ) {
@@ -169 +169 @@
         'slug' => $slug, // Pass a group slug to only return that group
         'search_terms' => $search_terms, // Pass search terms to return only matching groups
+        'include' => false, // Pass comma separated list of group ID's to return only these groups
 
         'populate_extras' => true // Get extra meta - is_member, is_banned
@@ -176 +177 @@
     extract( $r );
 
-    $groups_template = new BP_Groups_Template( (int)$user_id, $type, (int)$page, (int)$per_page, (int)$max, $slug, $search_terms, (bool)$populate_extras );
+    $groups_template = new BP_Groups_Template( (int)$user_id, $type, (int)$page, (int)$per_page, (int)$max, $slug, $search_terms, $include, (bool)$populate_extras );
     return apply_filters( 'bp_has_groups', $groups_template->has_groups(), &$groups_template );
 }
@@ -726 +727 @@
                 <span class="activity"><?php echo bp_core_get_last_activity( strtotime( $admin->date_modified ), __( 'joined %s ago', 'buddypress') ); ?></span>
 
-                <?php if ( function_exists( 'friends_install' ) ) : ?>
+                <?php if ( bp_is_active( 'friends' ) ) : ?>
                     <div class="action">
                         <?php bp_add_friend_button( $admin->user_id ) ?>
@@ -764 +765 @@
                     <span class="activity"><?php echo bp_core_get_last_activity( strtotime( $mod->date_modified ), __( 'joined %s ago', 'buddypress') ); ?></span>
 
-                    <?php if ( function_exists( 'friends_install' ) ) : ?>
+                    <?php if ( bp_is_active( 'friends' ) ) : ?>
                         <div class="action">
                             <?php bp_add_friend_button( $mod->user_id ) ?>
@@ -1034 +1035 @@
     global $groups_template, $bp;
 
-    if ( !function_exists('friends_install') )
+    if ( !bp_is_active( 'friends' ) )
         return false;
 
@@ -1047 +1048 @@
 
 function bp_group_join_button( $group = false ) {
-    global $bp, $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    // If they're not logged in or are banned from the group, no join button.
-    if ( !is_user_logged_in() || $group->is_banned )
-        return false;
-
-    if ( !$group->status )
-        return false;
-
-    if ( 'hidden' == $group->status && !$group->is_member )
-        return false;
-
-    echo '<div class="generic-button group-button ' . $group->status . '" id="groupbutton-' . $group->id . '">';
-
-    switch ( $group->status ) {
-        case 'public':
-            if ( $group->is_member )
-                echo '<a class="leave-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
-            else
-                echo '<a class="join-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'join', 'groups_join_group' ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';
-        break;
-
-        case 'private':
-            if ( $group->is_member ) {
-                echo '<a class="leave-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
-            } else {
-                if ( !bp_group_has_requested_membership( $group ) )
-                    echo '<a class="request-membership" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'request-membership', 'groups_request_membership' ) . '">' . __('Request Membership', 'buddypress') . '</a>';
+    echo bp_get_group_join_button( $group );
+}
+    function bp_get_group_join_button( $group = false ) {
+        global $bp, $groups_template;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        // If they're not logged in or are banned from the group, no join button.
+        if ( !is_user_logged_in() || $group->is_banned )
+            return false;
+
+        if ( !$group->status )
+            return false;
+
+        if ( 'hidden' == $group->status && !$group->is_member )
+            return false;
+
+        $button = '<div class="generic-button group-button ' . $group->status . '" id="groupbutton-' . $group->id . '">';
+
+        switch ( $group->status ) {
+            case 'public':
+                if ( $group->is_member )
+                    $button .= '<a class="leave-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
                 else
-                    echo '<a class="membership-requested" href="' . bp_get_group_permalink( $group ) . '">' . __( 'Request Sent', 'buddypress' ) . '</a>';
-            }
-        break;
-
-        case 'hidden':
-            if ( $group->is_member )
-                echo '<a class="leave-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
-        break;
-    }
-
-    echo '</div>';
-}
+                    $button .= '<a class="join-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'join', 'groups_join_group' ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';
+            break;
+
+            case 'private':
+                if ( $group->is_member ) {
+                    $button .= '<a class="leave-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
+                } else {
+                    if ( !bp_group_has_requested_membership( $group ) )
+                        $button .= '<a class="request-membership" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'request-membership', 'groups_request_membership' ) . '">' . __('Request Membership', 'buddypress') . '</a>';
+                    else
+                        $button .= '<a class="membership-requested" href="' . bp_get_group_permalink( $group ) . '">' . __( 'Request Sent', 'buddypress' ) . '</a>';
+                }
+            break;
+
+            case 'hidden':
+                if ( $group->is_member )
+                    $button .= '<a class="leave-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
+            break;
+        }
+
+        $button .= '</div>';
+
+        return apply_filters( 'bp_get_group_join_button', $button );
+    }
 
 function bp_group_status_message( $group = false ) {
@@ -1640 +1646 @@
         global $bp;
 
-        if ( !function_exists('friends_install') )
+        if ( !bp_is_active( 'friends' ) )
             return false;