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

Timestamp:

11/26/2008 10:49:51 PM (17 years ago)

Author:

apeatling

Message:

• Added group directory to browse newest groups, groups by letter and search all groups. Also shows featured groups in the sidebar.
• Changed buttons from images to background images and text to provide better translation options
• Modified member theme to re-use get_header() and get_footer() - custom themes will need to be updated
• Fixed bug with wp_redirect() and bp_core_do_catch_uri() clashing

File:

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

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

@@ -14 +14 @@
     var $total_group_count;
     
+    var $single_group = false;
+    
     var $sort_by;
     var $order;
@@ -29 +31 @@
             
             $this->groups = groups_get_user_groups( $this->pag_num, $this->pag_page );
-            $this->total_group_count = (int)$this->groups['count'];
+            $this->total_group_count = (int)$this->groups['total'];
             $this->groups = $this->groups['groups'];
             $this->group_count = count($this->groups);
@@ -36 +38 @@
 
             $this->groups = groups_filter_user_groups( $_REQUEST['group-filter-box'], $this->pag_num, $this->pag_page );
-            $this->total_group_count = (int)$this->groups['count'];
+            $this->total_group_count = (int)$this->groups['total'];
             $this->groups = $this->groups['groups'];
             $this->group_count = count($this->groups);
@@ -43 +45 @@
 
             $this->groups = groups_search_groups( $_REQUEST['groupfinder-search-box'], $this->pag_num, $this->pag_page );
-            $this->total_group_count = (int)$this->groups['count'];
+            $this->total_group_count = (int)$this->groups['total'];
             $this->groups = $this->groups['groups'];
             $this->group_count = count($this->groups);
@@ -60 +62 @@
             if ( isset( $_REQUEST['s'] ) && $_REQUEST['s'] != '' ) {
                 $this->groups = groups_search_groups( $_REQUEST['s'], $this->pag_num, $this->pag_page, $this->sort_by, $this->order );
-                $this->total_group_count = (int)$this->groups['count'];
+                $this->total_group_count = (int)$this->groups['total'];
                 $this->groups = $this->groups['groups'];
                 $this->group_count = count($this->groups);
             } else {
-                $this->groups = BP_Groups_Group::get_all( false, $this->pag_num, $this->pag_page, $this->sort_by, $this->order, true );
+                $this->groups = BP_Groups_Group::get_all( $this->pag_num, $this->pag_page, false, $this->sort_by, $this->order, true );
                 $this->total_group_count = count(BP_Groups_Group::get_all( false )); // TODO: not ideal
                 $this->group_count = count($this->groups);
@@ -70 +72 @@
             
         } else if ( $group_slug ) {
-        
-            $this->groups = array( new BP_Groups_Group( BP_Groups_Group::get_id_from_slug($group_slug), true ) );
+            $this->single_group = true;
+            
+            $group = new stdClass();
+            $group->group_id = BP_Groups_Group::get_id_from_slug($group_slug);
+            
+            $this->groups = array( $group );
             $this->total_group_count = 1;
             $this->group_count = 1;
@@ -100 +106 @@
         $this->group = $this->groups[$this->current_group];
         
+        // If this is a single group then instantiate group meta when creating the object.
+        if ( $this->single_group )
+            $this->group = new BP_Groups_Group( $this->group->group_id, true );
+        else
+            $this->group = new BP_Groups_Group( $this->group->group_id, false );
+            
         return $this->group;
     }
@@ -212 +224 @@
 }
 
-function bp_group_last_active() {
+function bp_group_last_active( $echo = true ) {
     global $groups_template;
     
@@ -220 +232 @@
         _e( 'not yet active', 'buddypress' );
     else
-        echo bp_core_time_since( groups_get_groupmeta( $groups_template->group->id, 'last_activity' ) );
+        echo bp_core_time_since( $last_active );
 }
 
@@ -530 +542 @@
     <?php } else { ?>
         <div id="message" class="info">
-            <?php _e( 'This group has no administrators', 'buddypress' ); ?>
+            <p><?php _e( 'This group has no administrators', 'buddypress' ); ?></p>
         </div>
     <?php }
@@ -643 +655 @@
 }
 
-function bp_group_has_requested_membership() {
+function bp_group_has_requested_membership( $group = false ) {
     global $bp, $groups_template;
     
-    if ( groups_check_for_membership_request( $bp['loggedin_userid'], $groups_template->group->id ) )
+    if ( !$group )
+        $group = $groups_template->group;
+    
+    if ( groups_check_for_membership_request( $bp['loggedin_userid'], $group->id ) )
         return true;
     
@@ -889 +904 @@
 ?>
     <div class="left-menu">
-        <h4>Select Friends <img id="ajax-loader" src="<?php echo $bp['groups']['image_base'] ?>/ajax-loader.gif" height="7" alt="Loading" style="display: none;" /></h4>
+        <h4><?php _e( 'Select Friends', 'buddypress' ) ?> <img id="ajax-loader" src="<?php echo $bp['groups']['image_base'] ?>/ajax-loader.gif" height="7" alt="Loading" style="display: none;" /></h4>
         <?php bp_group_list_invite_friends() ?>
         <?php if ( function_exists('wp_nonce_field') )
@@ -930 +945 @@
 }
 
-function bp_group_join_button() {
+function bp_group_join_button( $group = false ) {
     global $bp, $groups_template;
     
-    if ( !is_user_logged_in() || BP_Groups_Member::check_is_member( $bp['loggedin_userid'], $groups_template->group->id ) || groups_is_user_banned( $bp['loggedin_userid'], $groups_template->group->id ) )
+    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() || groups_is_user_banned( $bp['loggedin_userid'], $group->id ) )
         return false;
-        
-    switch ( $groups_template->group->status ) {
+    
+    echo '<div class="group-button ' . $group->status . '" id="groupbutton-' . $group->id . '">';
+    
+    switch ( $group->status ) {
         case 'public':
-            echo '<a class="join-group" href="' . bp_group_permalink( false, false ) . '/join">' . __('Join Group', 'buddypress') . '</a>';                 
+            if ( BP_Groups_Member::check_is_member( $bp['loggedin_userid'], $group->id ) )
+                echo '<a class="leave-group" href="' . bp_group_permalink( $group, false ) . '/leave-group">' . __('Leave Group', 'buddypress') . '</a>';                                   
+            else
+                echo '<a class="join-group" href="' . bp_group_permalink( $group, false ) . '/join">' . __('Join Group', 'buddypress') . '</a>';                    
         break;
         
         case 'private':
-            if ( !bp_group_has_requested_membership() )
-                echo '<a class="request-membership" href="' . bp_group_permalink( false, false ) . '/request-membership">' . __('Request Membership', 'buddypress') . '</a>';       
-            else
-                echo 'Membership Requested';
+            if ( BP_Groups_Member::check_is_member( $bp['loggedin_userid'], $group->id ) ) {
+                echo '<a class="leave-group" href="' . bp_group_permalink( $group, false ) . '/leave-group">' . __('Leave Group', 'buddypress') . '</a>';                                       
+            } else {
+                if ( !bp_group_has_requested_membership( $group ) )
+                    echo '<a class="request-membership" href="' . bp_group_permalink( $group, false ) . '/request-membership">' . __('Request Membership', 'buddypress') . '</a>';      
+                else
+                    echo '<a class="membership-requested" href="' . bp_group_permalink( $group, false ) . '">' . __('Membership Requested', 'buddypress') . '</a>';             
+            }
         break;
     }
+    
+    echo '</div>';
 }