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

Timestamp:

10/09/2008 04:37:49 AM (17 years ago)

Author:

apeatling

Message:

• Moved all group pages to the root, rather than using a member URL
• Introduced groupmeta support - groups_update_groupmeta / groups_delete_groupmeta / groups_get_groupmeta
• Added widgets for site wide activity and who's online
• Updated home theme to support display of new BuddyPress widgets
• Added site wide activity feed support
• Fixed bug where ajax functions would only work when logged in
• Various other bug fixes

File:

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

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

@@ -147 +147 @@
     global $groups_template;
     
-    ?><img src="<?php echo $groups_template->group->avatar_full ?>" class="avatar" alt="Group Avatar" /><?php
+    ?><img src="<?php echo $groups_template->group->avatar_full ?>" class="avatar" alt="<?php echo $groups_template->group->name ?> Avatar" /><?php
 }
 
@@ -153 +153 @@
     global $groups_template;
     
-    ?><img src="<?php echo $groups_template->group->avatar_thumb ?>" class="avatar" alt="Group Avatar" /><?php
-}
-
-
-function bp_group_permalink() {
-    global $groups_template, $bp;
-    echo $bp['current_domain'] . $bp['groups']['slug'] . '/' . $groups_template->group->slug;
+    ?><img src="<?php echo $groups_template->group->avatar_thumb ?>" class="avatar" alt="<?php echo $groups_template->group->name ?> Avatar" /><?php
+}
+
+
+function bp_group_permalink( $group_obj = false, $echo = true ) {
+    global $groups_template, $bp, $current_blog;
+
+    if ( !$group_obj )
+        $group_obj = $groups_template->group;
+    
+    switch_to_blog(1);
+    
+    if ( $echo )
+        echo site_url() . '/' . $bp['groups']['slug'] . '/' . $group_obj->slug;
+    else
+        return site_url() . '/' . $bp['groups']['slug'] . '/' . $group_obj->slug;
+        
+    switch_to_blog($current_blog->blog_id);
 }
 
@@ -244 +255 @@
 function bp_group_all_members_permalink() {
     global $groups_template, $bp;
-    echo $bp['current_domain'] . $bp['groups']['slug'] . '/' . $groups_template->group->slug . '/members';
+    echo bp_group_permalink( false, true ) . '/members';
 }
 
@@ -268 +279 @@
 
     if ( $bp['current_action'] == 'my-groups' || !$bp['current_action'] ) {
-        $action = $bp['current_domain'] . $bp['groups']['slug'] . '/my-groups/search/';
+        $action = $bp['loggedin_domain'] . $bp['groups']['slug'] . '/my-groups/search/';
         $label = __('Filter Groups');
         $type = 'group';
     } else {
-        $action = $bp['current_domain'] . $bp['groups']['slug'] . '/group-finder/search/';
+        $action = $bp['loggedin_domain'] . $bp['groups']['slug'] . '/group-finder/search/';
         $label = __('Find a Group');
         $type = 'groupfinder';
@@ -505 +516 @@
     global $groups_template, $bp;
     
-    echo $bp['loggedin_domain'] . $bp['groups']['slug'] . '/' . $groups_template->group->slug . '/leave-group/yes'; 
+    echo bp_group_permalink( false, true ) . '/leave-group/yes';    
 }
 
@@ -511 +522 @@
     global $groups_template, $bp;
     
-    echo $bp['loggedin_domain'] . $bp['groups']['slug'] . '/' . $groups_template->group->slug . '/leave-group/no';
+    echo bp_group_permalink( false, true );
 }
 
@@ -559 +570 @@
     global $groups_template, $bp;
     
-    echo $bp['loggedin_domain'] . $bp['groups']['slug'] . '/' . $groups_template->group->slug . '/send-invites/send';
+    echo bp_group_permalink( false, true ) . '/send-invites/send';
 }
 
@@ -566 +577 @@
     
     if ( is_user_logged_in() && !BP_Groups_Member::check_is_member( $bp['loggedin_userid'], $groups_template->group->id ) ) {
-        echo '<a class="join-group" href="' . $bp['loggedin_domain'] . $bp['groups']['slug'] . '/' . $groups_template->group->slug . '/join">' . __('Join Group') . '</a>';
+        echo '<a class="join-group" href="' . bp_group_permalink( false, false ) . '/join">' . __('Join Group') . '</a>';
     }
 }
@@ -582 +593 @@
                 <?php $group = new BP_Groups_Group( $group_ids[$i], false, false ); ?>
                 <li>
-                    <a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] . '/' . $group->slug ?>"><img src="<?php echo $group->avatar_thumb; ?>" class="avatar" alt="Group Avatar" /></a>
-                    <h5><a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] . '/' . $group->slug ?>"><?php echo $group->name ?></a></h5>
+                    <a href="<?php echo bp_group_permalink( $group, false ) ?>"><img src="<?php echo $group->avatar_thumb; ?>" class="avatar" alt="Group Avatar" /></a>
+                    <h5><a href="<?php echo bp_group_permalink( $group, false ) ?>"><?php echo $group->name ?></a></h5>
                 </li>
             <?php } ?>