Changeset 2077 for trunk/bp-forums/bp-forums-templatetags.php

Timestamp:

11/02/2009 07:54:21 PM (16 years ago)

Author:

apeatling

Message:

Merging 1.1 branch changes and syncing.

File:

• trunk/bp-forums/bp-forums-templatetags.php (modified) (61 diffs)

trunk/bp-forums/bp-forums-templatetags.php

@@ -6 +6 @@
     var $topics;
     var $topic;
-    
+
     var $in_the_loop;
-    
+
     var $pag_page;
     var $pag_num;
     var $pag_links;
     var $total_topic_count;
-    
+
     var $single_topic = false;
-    
+
     var $sort_by;
     var $order;
-    
+
     function BP_Forums_Template_Forum( $type, $forum_id, $per_page, $max, $no_stickies, $filter ) {
         global $bp;
@@ -24 +24 @@
         $this->pag_page = isset( $_REQUEST['p'] ) ? intval( $_REQUEST['p'] ) : 1;
         $this->pag_num = isset( $_REQUEST['n'] ) ? intval( $_REQUEST['n'] ) : $per_page;
-        
+
         /* Only show stickies if we are viewing a single group forum, otherwise we could end up with hundreds globally */
         if ( $no_stickies )
@@ -33 +33 @@
                 $this->topics = bp_forums_get_forum_topics( array( 'forum_id' => $forum_id, 'filter' => $filter, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'show_stickies' => $show_stickies ) );
                 break;
-            
+
             case 'popular':
                 $this->topics = bp_forums_get_forum_topics( array( 'type' => 'popular', 'filter' => $filter, 'forum_id' => $forum_id, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'show_stickies' => $show_stickies ) );
                 break;
-            
+
             case 'unreplied':
                 $this->topics = bp_forums_get_forum_topics( array( 'type' => 'unreplied', 'filter' => $filter, 'forum_id' => $forum_id, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'show_stickies' => $show_stickies ) );
                 break;
-                
+
             case 'personal':
                 $this->topics = bp_forums_get_forum_topics( array( 'type' => 'personal', 'filter' => $filter, 'forum_id' => $forum_id, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'show_stickies' => $show_stickies ) );
                 break;
-                
+
             case 'tag':
                 $this->topics = bp_forums_get_forum_topics( array( 'type' => 'tag', 'filter' => $filter, 'forum_id' => $forum_id, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'show_stickies' => $show_stickies ) );
-                break; 
+                break;
         }
 
         $this->topics = apply_filters( 'bp_forums_template_topics', $this->topics, $type, $forum_id, $per_page, $max, $no_stickies );
-        
+
         if ( !(int)$this->topics ) {
             $this->topic_count = 0;
@@ -63 +63 @@
                 $topic_count = (int)groups_total_public_forum_topic_count( $type );
             } else {
-                $topic_count = count( $this->topics );              
+                $topic_count = count( $this->topics );
             }
-            
+
             if ( !$max || $max >= $topic_count )
                 $this->total_topic_count = $topic_count;
@@ -78 +78 @@
             } else {
                 $this->topic_count = count( $this->topics );
-            }       
+            }
         }
 
@@ -90 +90 @@
                     $stickies[] = $topic;
                 else
-                    $standard[] = $topic; 
+                    $standard[] = $topic;
             }
             $this->topics = array_merge( (array)$stickies, (array)$standard );
@@ -105 +105 @@
         ));
     }
-    
+
     function has_topics() {
         if ( $this->topic_count )
             return true;
-        
+
         return false;
     }
-    
+
     function next_topic() {
         $this->current_topic++;
         $this->topic = $this->topics[$this->current_topic];
-            
+
         return $this->topic;
     }
-    
+
     function rewind_topics() {
         $this->current_topic = -1;
@@ -126 +126 @@
         }
     }
-    
-    function user_topics() { 
+
+    function user_topics() {
         if ( $this->current_topic + 1 < $this->topic_count ) {
             return true;
@@ -139 +139 @@
         return false;
     }
-    
+
     function the_topic() {
         global $topic;
@@ -146 +146 @@
         $this->topic = $this->next_topic();
         $this->topic = (object)$this->topic;
-        
+
         if ( $this->current_topic == 0 ) // loop has just started
             do_action('loop_start');
@@ -154 +154 @@
 function bp_has_forum_topics( $args = '' ) {
     global $forum_template, $bp;
-    
+
     $defaults = array(
         'type' => 'newest',
@@ -175 +175 @@
             return false;
     }
-    
+
     /* If we're viewing a tag in the directory, let's auto set the filter to the tag name */
     if ( $bp->is_directory && 'tag' == $type && !empty( $bp->action_variables[0] ) )
@@ -183 +183 @@
     if ( $bp->is_directory && !empty( $_GET['fs'] ) )
         $filter = $_GET['fs'];
-        
+
     $forum_template = new BP_Forums_Template_Forum( $type, $forum_id, $per_page, $max, $no_stickies, $filter );
 
-    return apply_filters( 'bp_has_topics', $forum_template->has_topics(), &$forum_template );   
+    return apply_filters( 'bp_has_topics', $forum_template->has_topics(), &$forum_template );
 }
     /* DEPRECATED use bp_has_forum_topics() */
@@ -213 +213 @@
         return apply_filters( 'bp_get_the_topic_id', $forum_template->topic->topic_id );
     }
-    
+
 function bp_the_topic_title() {
     echo bp_get_the_topic_title();
@@ -256 +256 @@
     function bp_get_the_topic_poster_avatar( $args = '' ) {
         global $forum_template;
-    
+
         $defaults = array(
             'type' => 'thumb',
@@ -266 +266 @@
         extract( $r, EXTR_SKIP );
 
-        return apply_filters( 'bp_get_the_topic_poster_avatar', bp_core_fetch_avatar( array( 'item_id' => $forum_template->topic->topic_poster, 'type' => $type, 'width' => $width, 'height' => $height ) ) ); 
+        return apply_filters( 'bp_get_the_topic_poster_avatar', bp_core_fetch_avatar( array( 'item_id' => $forum_template->topic->topic_poster, 'type' => $type, 'width' => $width, 'height' => $height ) ) );
     }
 
@@ -277 +277 @@
         return apply_filters( 'bp_get_the_topic_poster_name', bp_core_get_userlink( $forum_template->topic->topic_poster ) );
     }
-    
+
 function bp_the_topic_object_id() {
     echo bp_get_the_topic_object_id();
@@ -286 +286 @@
         return apply_filters( 'bp_get_the_topic_object_id', $forum_template->topic->object_id );
     }
-    
+
 function bp_the_topic_object_name() {
     echo bp_get_the_topic_object_name();
@@ -295 +295 @@
         return apply_filters( 'bp_get_the_topic_object_name', $forum_template->topic->object_name );
     }
-    
+
 function bp_the_topic_object_slug() {
     echo bp_get_the_topic_object_slug();
@@ -304 +304 @@
         return apply_filters( 'bp_get_the_topic_object_slug', $forum_template->topic->object_slug );
     }
-    
+
 function bp_the_topic_object_permalink() {
     echo bp_get_the_topic_object_permalink();
@@ -310 +310 @@
     function bp_get_the_topic_object_permalink() {
         global $bp, $forum_template;
-        
+
         /* Currently this will only work with group forums, extended support in the future */
         return apply_filters( 'bp_get_the_topic_object_permalink', $bp->root_domain . '/' . BP_GROUPS_SLUG . '/' . $forum_template->topic->object_slug . '/forum/' );
     }
-    
+
 function bp_the_topic_last_poster_name() {
     echo bp_get_the_topic_last_poster_name();
@@ -323 +323 @@
         return apply_filters( 'bp_get_the_topic_last_poster_name', bp_core_get_userlink( $forum_template->topic->topic_last_poster ) );
     }
-    
+
 function bp_the_topic_object_avatar( $args = '' ) {
     echo bp_get_the_topic_object_avatar( $args );
@@ -339 +339 @@
         extract( $r, EXTR_SKIP );
 
-        return apply_filters( 'bp_get_the_topic_object_avatar', bp_core_fetch_avatar( array( 'item_id' => $forum_template->topic->object_id, 'type' => $type, 'object' => 'group', 'width' => $width, 'height' => $height ) ) );        
-    }
-    
+        return apply_filters( 'bp_get_the_topic_object_avatar', bp_core_fetch_avatar( array( 'item_id' => $forum_template->topic->object_id, 'type' => $type, 'object' => 'group', 'width' => $width, 'height' => $height ) ) );
+    }
+
 function bp_the_topic_last_poster_avatar( $args = '' ) {
     echo bp_get_the_topic_last_poster_avatar( $args );
@@ -357 +357 @@
         extract( $r, EXTR_SKIP );
 
-        return apply_filters( 'bp_get_the_topic_last_poster_avatar', bp_core_fetch_avatar( array( 'item_id' => $forum_template->topic->topic_last_poster, 'type' => $type, 'width' => $width, 'height' => $height ) ) ); 
+        return apply_filters( 'bp_get_the_topic_last_poster_avatar', bp_core_fetch_avatar( array( 'item_id' => $forum_template->topic->topic_last_poster, 'type' => $type, 'width' => $width, 'height' => $height ) ) );
     }
 
@@ -368 +368 @@
         return apply_filters( 'bp_get_the_topic_start_time', $forum_template->topic->topic_start_time );
     }
-    
+
 function bp_the_topic_time() {
     echo bp_get_the_topic_time();
@@ -432 +432 @@
             return apply_filters( 'bp_get_the_topic_total_post_count', sprintf( __( '%d post', 'buddypress' ), $forum_template->topic->topic_posts ) );
         else
-            return apply_filters( 'bp_get_the_topic_total_post_count', sprintf( __( '%d posts', 'buddypress' ), $forum_template->topic->topic_posts ) );        
-    }
-    
+            return apply_filters( 'bp_get_the_topic_total_post_count', sprintf( __( '%d posts', 'buddypress' ), $forum_template->topic->topic_posts ) );
+    }
+
 function bp_the_topic_total_posts() {
     echo bp_get_the_topic_total_posts();
@@ -440 +440 @@
     function bp_get_the_topic_total_posts() {
         global $forum_template;
-        
+
         return $forum_template->topic->topic_posts;
     }
-    
+
 function bp_the_topic_tag_count() {
     echo bp_get_the_topic_tag_count();
@@ -458 +458 @@
     function bp_get_the_topic_permalink() {
         global $forum_template, $bp;
-        
+
         if ( $forum_template->topic->object_slug )
             $permalink = $bp->root_domain . '/' . BP_GROUPS_SLUG . '/' . $forum_template->topic->object_slug . '/';
@@ -465 +465 @@
         else
             $permalink = $bp->root_domain . '/' . $bp->current_component . '/' . $bp->current_action . '/';
-            
+
         return apply_filters( 'bp_get_the_topic_permalink', $permalink . 'forum/topic/' . $forum_template->topic->topic_slug . '/' );
     }
@@ -477 +477 @@
         return apply_filters( 'bp_get_the_topic_time_since_created', bp_core_time_since( strtotime( $forum_template->topic->topic_start_time ) ) );
     }
-    
+
 function bp_the_topic_latest_post_excerpt( $args = '' ) {
     echo bp_get_the_topic_latest_post_excerpt( $args );
@@ -498 +498 @@
 function bp_the_topic_time_since_last_post( $deprecated = true ) {
     global $forum_template;
-    
+
     if ( !$deprecated )
         return bp_get_the_topic_time_since_last_post();
@@ -515 +515 @@
     function bp_get_the_topic_is_mine() {
         global $bp, $forum_template;
-    
+
         return $bp->loggedin_user->id == $forum_template->topic->topic_poster;
     }
@@ -523 +523 @@
 }
     function bp_get_the_topic_admin_links( $args = '' ) {
-        global $bp, $forum_template;    
-        
+        global $bp, $forum_template;
+
         $defaults = array(
             'seperator' => '|'
@@ -533 +533 @@
 
         $links[] = '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'edit', 'bp_forums_edit_topic' ) . '">' . __( 'Edit', 'buddypress' ) . '</a>';
-        
+
         if ( $bp->is_item_admin || $bp->is_item_mod || is_site_admin() ) {
             if ( 0 == (int)$forum_template->topic->topic_sticky )
@@ -547 +547 @@
             $links[] = '<a class="confirm" id="topic-delete-link" href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'delete', 'bp_forums_delete_topic' ) . '">' . __( 'Delete', 'buddypress' ) . '</a>';
         }
-        
+
         return implode( ' ' . $seperator . ' ', (array) $links );
     }
@@ -557 +557 @@
     function bp_get_the_topic_css_class() {
         global $forum_template;
-    
+
         $class = false;
-    
+
         if ( $forum_template->current_topic % 2 == 1 )
             $class .= 'alt';
-        
+
         if ( 1 == (int)$forum_template->topic->topic_sticky )
             $class .= ' sticky';
-    
+
         if ( 0 == (int)$forum_template->topic->topic_open )
             $class .= ' closed';
-    
+
         return trim( $class );
     }
@@ -577 +577 @@
     function bp_get_my_forum_topics_link() {
         global $bp;
-        
+
         return apply_filters( 'bp_get_my_forum_topics_link', $bp->root_domain . '/' . $bp->forums->slug . '/personal/' );
     }
@@ -586 +586 @@
     function bp_get_unreplied_forum_topics_link() {
         global $bp;
-        
+
         return apply_filters( 'bp_get_unreplied_forum_topics_link', $bp->root_domain . '/' . $bp->forums->slug . '/unreplied/' );
     }
@@ -596 +596 @@
     function bp_get_popular_forum_topics_link() {
         global $bp;
-        
+
         return apply_filters( 'bp_get_popular_forum_topics_link', $bp->root_domain . '/' . $bp->forums->slug . '/popular/' );
     }
@@ -605 +605 @@
     function bp_get_newest_forum_topics_link() {
         global $bp;
-        
+
         return apply_filters( 'bp_get_newest_forum_topics_link', $bp->root_domain . '/' . $bp->forums->slug . '/' );
     }
@@ -614 +614 @@
     function bp_get_forum_topic_type() {
         global $bp;
-        
+
         if ( !$bp->is_directory || !$bp->current_action )
             return 'newest';
-        
+
 
         return apply_filters( 'bp_get_forum_topic_type', $bp->current_action );
     }
-    
+
 function bp_forums_tag_name() {
     echo bp_get_forums_tag_name();
@@ -627 +627 @@
     function bp_get_forums_tag_name() {
         global $bp;
-        
+
         if ( $bp->is_directory && $bp->forums->slug == $bp->current_component )
-            return apply_filters( 'bp_get_forums_tag_name', $bp->action_variables[0] ); 
+            return apply_filters( 'bp_get_forums_tag_name', $bp->action_variables[0] );
     }
 
@@ -643 +643 @@
 function bp_forum_pagination_count() {
     global $bp, $forum_template;
-    
+
     $from_num = intval( ( $forum_template->pag_page - 1 ) * $forum_template->pag_num ) + 1;
-    $to_num = ( $from_num + ( $forum_template->pag_num - 1  ) > $forum_template->total_topic_count ) ? $forum_template->total_topic_count : $from_num + ( $forum_template->pag_num - 1 ); 
-    
+    $to_num = ( $from_num + ( $forum_template->pag_num - 1  ) > $forum_template->total_topic_count ) ? $forum_template->total_topic_count : $from_num + ( $forum_template->pag_num - 1 );
+
     echo apply_filters( 'bp_forum_pagination_count', sprintf( __( 'Viewing topic %d to %d (%d total topics)', 'buddypress' ), $from_num, $to_num, $forum_template->total_topic_count ) );
 ?>
@@ -655 +655 @@
 function bp_is_edit_topic() {
     global $bp;
-    
+
     if ( in_array( 'post', (array)$bp->action_variables ) && in_array( 'edit', (array)$bp->action_variables ) )
         return false;
-    
+
     return true;
 }
@@ -668 +668 @@
     var $posts;
     var $post;
-    
+
     var $topic_id;
     var $topic;
-    
+
     var $in_the_loop;
-    
+
     var $pag_page;
     var $pag_num;
     var $pag_links;
     var $total_post_count;
-    
+
     var $single_post = false;
-    
+
     var $sort_by;
     var $order;
-    
+
     function BP_Forums_Template_Topic( $topic_id, $per_page, $max ) {
         global $bp, $current_user, $forum_template;
-        
+
         $this->pag_page = isset( $_REQUEST['topic_page'] ) ? intval( $_REQUEST['topic_page'] ) : 1;
         $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
-    
+
         $this->topic_id = $topic_id;
         $forum_template->topic = (object) bp_forums_get_topic_details( $this->topic_id );
 
         $this->posts = bp_forums_get_topic_posts( array( 'topic_id' => $this->topic_id, 'page' => $this->pag_page, 'per_page' => $this->pag_num ) );
-        
+
         if ( !$this->posts ) {
             $this->post_count = 0;
@@ -724 +724 @@
         ));
     }
-    
+
     function has_posts() {
         if ( $this->post_count )
             return true;
-        
+
         return false;
     }
-    
+
     function next_post() {
         $this->current_post++;
         $this->post = $this->posts[$this->current_post];
-            
+
         return $this->post;
     }
-    
+
     function rewind_posts() {
         $this->current_post = -1;
@@ -745 +745 @@
         }
     }
-    
-    function user_posts() { 
+
+    function user_posts() {
         if ( $this->current_post + 1 < $this->post_count ) {
             return true;
@@ -758 +758 @@
         return false;
     }
-    
+
     function the_post() {
         global $post;
@@ -765 +765 @@
         $this->post = $this->next_post();
         $this->post = (object)$this->post;
-        
+
         if ( $this->current_post == 0 ) // loop has just started
             do_action('loop_start');
@@ -773 +773 @@
 function bp_has_forum_topic_posts( $args = '' ) {
     global $topic_template, $bp;
-    
+
     $defaults = array(
         'topic_id' => false,
@@ -815 +815 @@
     function bp_get_the_topic_post_id() {
         global $topic_template;
-        
+
         return apply_filters( 'bp_get_the_topic_post_id', $topic_template->post->post_id );
     }
@@ -843 +843 @@
         extract( $r, EXTR_SKIP );
 
-        return apply_filters( 'bp_get_the_topic_post_poster_avatar', bp_core_fetch_avatar( array( 'item_id' => $topic_template->post->poster_id, 'type' => $type, 'width' => $width, 'height' => $height ) ) ); 
+        return apply_filters( 'bp_get_the_topic_post_poster_avatar', bp_core_fetch_avatar( array( 'item_id' => $topic_template->post->poster_id, 'type' => $type, 'width' => $width, 'height' => $height ) ) );
     }
 
@@ -855 +855 @@
         global $topic_template;
 
-        return apply_filters( 'bp_get_the_topic_post_poster_name', bp_core_get_userlink( $topic_template->post->poster_id ) );      
+        return apply_filters( 'bp_get_the_topic_post_poster_name', bp_core_get_userlink( $topic_template->post->poster_id ) );
     }
 
@@ -875 +875 @@
     function bp_get_the_topic_post_is_mine() {
         global $bp, $topic_template;
-        
+
         return $bp->loggedin_user->id == $topic_template->post->poster_id;
     }
@@ -883 +883 @@
 }
     function bp_get_the_topic_post_admin_links( $args = '' ) {
-        global $topic_template; 
-        
+        global $topic_template;
+
         /* Never show for the first post in a topic. */
         if ( 0 == $topic_template->current_post )
             return;
-        
+
         $defaults = array(
             'seperator' => '|'
@@ -907 +907 @@
     function bp_get_the_topic_post_edit_text() {
         global $bp;
-        
+
         $post = bp_forums_get_post( $bp->action_variables[4] );
         return attribute_escape( $post->post_text );
@@ -923 +923 @@
 function bp_the_topic_pagination_count() {
     global $bp, $topic_template;
-    
+
     $from_num = intval( ( $topic_template->pag_page - 1 ) * $topic_template->pag_num ) + 1;
-    $to_num = ( $from_num + ( $topic_template->pag_num - 1  ) > $topic_template->total_post_count ) ? $topic_template->total_post_count : $from_num + ( $topic_template->pag_num - 1 ); 
-    
+    $to_num = ( $from_num + ( $topic_template->pag_num - 1  ) > $topic_template->total_post_count ) ? $topic_template->total_post_count : $from_num + ( $topic_template->pag_num - 1 );
+
     echo apply_filters( 'bp_the_topic_pagination_count', sprintf( __( 'Viewing post %d to %d (%d total posts)', 'buddypress' ), $from_num, $to_num, $topic_template->total_post_count ) );
 ?>
@@ -947 +947 @@
     function bp_get_forum_permalink() {
         global $bp;
-        
+
         if ( $bp->is_single_item )
             $permalink = $bp->root_domain . '/' . $bp->current_component . '/' . $bp->current_item . '/';
@@ -961 +961 @@
     function bp_get_forum_directory_permalink() {
         global $bp;
-        
+
         return apply_filters( 'bp_get_forum_directory_permalink', $bp->root_domain . '/' . $bp->forums->slug );
     }
 
-function bp_forums_tag_heat_map( $args = '' ) { 
+function bp_forums_tag_heat_map( $args = '' ) {
     $defaults = array(
         'smallest' => '10',
@@ -985 +985 @@
         global $topic_template;
 
-        return apply_filters( 'bp_get_forum_action', $bp->root_domain . attribute_escape( $_SERVER['REQUEST_URI'] ) );  
+        return apply_filters( 'bp_get_forum_action', $bp->root_domain . attribute_escape( $_SERVER['REQUEST_URI'] ) );
     }
 
@@ -993 +993 @@
     function bp_get_forum_topic_action() {
         global $bp;
-        
-        return apply_filters( 'bp_get_forum_topic_action', $bp->root_domain . attribute_escape( $_SERVER['REQUEST_URI'] ) );    
+
+        return apply_filters( 'bp_get_forum_topic_action', $bp->root_domain . attribute_escape( $_SERVER['REQUEST_URI'] ) );
     }