Changeset 3728 for trunk/bp-groups.php

Timestamp:

01/18/2011 12:53:31 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Code normalization and whitespace clean-up. Introduce bp-core-deprecated.php. Introduce root_slug globals into components with directories, to help with WP page slugs. Fixes #2600. Optimus Props boonebgorges

File:

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

trunk/bp-groups.php

@@ -1 +1 @@
 <?php
+
+// Required Files
 require ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-classes.php' );
 require ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-templatetags.php' );
@@ -14 +16 @@
     global $bp;
 
+    // Define a slug, if necessary
     if ( !defined( 'BP_GROUPS_SLUG' ) )
-        define ( 'BP_GROUPS_SLUG', $bp->pages->groups->slug );
-
-    /* For internal identification */
-    $bp->groups->id = 'groups';
-    $bp->groups->name = $bp->pages->groups->name;
-    $bp->groups->slug = BP_GROUPS_SLUG;
-
+        define ( 'BP_GROUPS_SLUG', bp_core_component_slug_from_root_slug( $bp->pages->groups->slug ) );
+
+    // For internal identification
+    $bp->groups->id        = 'groups';
+    $bp->groups->name      = $bp->pages->groups->name;
+
+    // Slugs
+    $bp->groups->slug      = BP_GROUPS_SLUG;
+    $bp->groups->root_slug = $bp->pages->groups->slug;
+
+    // Tables
     $bp->groups->table_name           = $bp->table_prefix . 'bp_groups';
     $bp->groups->table_name_members   = $bp->table_prefix . 'bp_groups_members';
     $bp->groups->table_name_groupmeta = $bp->table_prefix . 'bp_groups_groupmeta';
 
+    // Notifications
     $bp->groups->format_notification_function = 'groups_format_notifications';
 
-    /* Register this in the active components array */
+    // Register this in the active components array
     $bp->active_components[$bp->groups->slug] = $bp->groups->id;
 
@@ -34 +42 @@
 
     $bp->groups->group_creation_steps = apply_filters( 'groups_create_group_steps', array(
-        'group-details' => array( 'name' => __( 'Details', 'buddypress' ), 'position' => 0 ),
+        'group-details'  => array( 'name' => __( 'Details', 'buddypress' ), 'position' => 0 ),
         'group-settings' => array( 'name' => __( 'Settings', 'buddypress' ), 'position' => 10 ),
-        'group-avatar' => array( 'name' => __( 'Avatar', 'buddypress' ), 'position' => 20 ),
+        'group-avatar'   => array( 'name' => __( 'Avatar', 'buddypress' ), 'position' => 20 ),
     ) );
 
@@ -48 +56 @@
 
     // The default text for the groups directory search box
-        $bp->default_search_strings[$bp->groups->slug] = __( 'Search Groups...', 'buddypress' );
+    $bp->default_search_strings[$bp->groups->slug] = __( 'Search Groups...', 'buddypress' );
 
     do_action( 'groups_setup_globals' );
@@ -57 +65 @@
     global $bp;
 
-    if ( $bp->current_component == $bp->groups->slug && $group_id = BP_Groups_Group::group_exists($bp->current_action) ) {
-
-        /* This is a single group page. */
+    if ( bp_is_current_component( $bp->groups->slug ) && $group_id = BP_Groups_Group::group_exists($bp->current_action) ) {
+
+        // This is a single group page.
         $bp->is_single_item = true;
         $bp->groups->current_group = new BP_Groups_Group( $group_id );
 
-        /* Using "item" not "group" for generic support in other components. */
+        // Using "item" not "group" for generic support in other components.
         if ( is_super_admin() )
             $bp->is_item_admin = 1;
@@ -69 +77 @@
             $bp->is_item_admin = groups_is_user_admin( $bp->loggedin_user->id, $bp->groups->current_group->id );
 
-        /* If the user is not an admin, check if they are a moderator */
+        // If the user is not an admin, check if they are a moderator
         if ( !$bp->is_item_admin )
             $bp->is_item_mod = groups_is_user_mod( $bp->loggedin_user->id, $bp->groups->current_group->id );
 
-        /* Is the logged in user a member of the group? */
+        // Is the logged in user a member of the group?
         $bp->groups->current_group->is_user_member = ( is_user_logged_in() && groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) ? true : false;
 
-        /* Should this group be visible to the logged in user? */
+        // Should this group be visible to the logged in user?
         $bp->groups->current_group->is_group_visible_to_member = ( 'public' == $bp->groups->current_group->status || $bp->groups->current_group->is_user_member ) ? true : false;
     }
 
-    /* Add 'Groups' to the main navigation */
-    bp_core_new_nav_item( array( 'name' => sprintf( __( 'Groups <span>(%d)</span>', 'buddypress' ), groups_total_groups_for_user() ), 'slug' => $bp->groups->name, 'position' => 70, 'screen_function' => 'groups_screen_my_groups', 'default_subnav_slug' => 'my-groups', 'item_css_id' => $bp->groups->id ) );
-
-    $groups_link = $bp->loggedin_user->domain . $bp->groups->name . '/';
-
-    /* Add the subnav items to the groups nav item */
-    bp_core_new_subnav_item( array( 'name' => __( 'My Groups', 'buddypress' ), 'slug' => 'my-groups', 'parent_url' => $groups_link, 'parent_slug' => $bp->groups->name, 'screen_function' => 'groups_screen_my_groups', 'position' => 10, 'item_css_id' => 'groups-my-groups' ) );
-    bp_core_new_subnav_item( array( 'name' => __( 'Invites', 'buddypress' ), 'slug' => 'invites', 'parent_url' => $groups_link, 'parent_slug' => $bp->groups->name, 'screen_function' => 'groups_screen_group_invites', 'position' => 30, 'user_has_access' => bp_is_my_profile() ) );
-
-    if ( $bp->current_component == $bp->groups->slug ) {
+    // Add 'Groups' to the main navigation
+    bp_core_new_nav_item( array( 'name' => sprintf( __( 'Groups <span>(%d)</span>', 'buddypress' ), groups_total_groups_for_user() ), 'slug' => $bp->groups->slug, 'position' => 70, 'screen_function' => 'groups_screen_my_groups', 'default_subnav_slug' => 'my-groups', 'item_css_id' => $bp->groups->id ) );
+
+    $groups_link = $bp->loggedin_user->domain . $bp->groups->slug . '/';
+
+    // Add the subnav items to the groups nav item
+    bp_core_new_subnav_item( array( 'name' => __( 'My Groups', 'buddypress' ), 'slug' => 'my-groups', 'parent_url' => $groups_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_my_groups',     'position' => 10, 'item_css_id'     => 'groups-my-groups' ) );
+    bp_core_new_subnav_item( array( 'name' => __( 'Invites',   'buddypress' ), 'slug' => 'invites',   'parent_url' => $groups_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_invites', 'position' => 30, 'user_has_access' => bp_is_my_profile() ) );
+
+    if ( bp_is_current_component( $bp->groups->slug ) ) {
 
         if ( bp_is_my_profile() && !$bp->is_single_item ) {
@@ -104 +112 @@
             // group navigation menu using the $bp->groups->current_group global.
 
-            /* When in a single group, the first action is bumped down one because of the
-               group name, so we need to adjust this and set the group name to current_item. */
-            $bp->current_item = isset( $bp->current_action ) ? $bp->current_action : false;
+            // When in a single group, the first action is bumped down one because of the
+            // group name, so we need to adjust this and set the group name to current_item.
+            $bp->current_item   = isset( $bp->current_action )      ? $bp->current_action      : false;
             $bp->current_action = isset( $bp->action_variables[0] ) ? $bp->action_variables[0] : false;
-            array_shift($bp->action_variables);
+            array_shift( $bp->action_variables );
 
             $bp->bp_options_title = $bp->groups->current_group->name;
@@ -115 +123 @@
                 $bp->bp_options_avatar = '<img src="' . esc_attr( $group->avatar_full ) . '" class="avatar" alt="' . esc_attr( $group->name ) . '" />';
 
-            $group_link = $bp->root_domain . '/' . $bp->groups->slug . '/' . $bp->groups->current_group->slug . '/';
+            $group_link = $bp->root_domain . '/' . $bp->groups->root_slug . '/' . $bp->groups->current_group->slug . '/';
 
             // If this is a private or hidden group, does the user have access?
@@ -127 +135 @@
             }
 
-            /* Reset the existing subnav items */
-            bp_core_reset_subnav_items($bp->groups->slug);
-
-            /* Add a new default subnav item for when the groups nav is selected. */
-            bp_core_new_nav_default( array( 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_home', 'subnav_slug' => 'home' ) );
-
-            /* Add the "Home" subnav item, as this will always be present */
-            bp_core_new_subnav_item( array( 'name' => __( 'Home', 'buddypress' ), 'slug' => 'home', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_home', 'position' => 10, 'item_css_id' => 'home' ) );
-
-            /* If the user is a group mod or more, then show the group admin nav item */
+            // Reset the existing subnav items
+            bp_core_reset_subnav_items( $bp->groups->root_slug );
+
+            // Add a new default subnav item for when the groups nav is selected.
+            bp_core_new_nav_default( array( 'parent_slug' => $bp->groups->root_slug, 'screen_function' => 'groups_screen_group_home', 'subnav_slug' => 'home' ) );
+
+            // Add the "Home" subnav item, as this will always be present
+            bp_core_new_subnav_item( array( 'name' => __( 'Home', 'buddypress' ), 'slug' => 'home', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->root_slug, 'screen_function' => 'groups_screen_group_home', 'position' => 10, 'item_css_id' => 'home' ) );
+
+            // If the user is a group mod or more, then show the group admin nav item
             if ( $bp->is_item_mod || $bp->is_item_admin )
-                bp_core_new_subnav_item( array( 'name' => __( 'Admin', 'buddypress' ), 'slug' => 'admin', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_admin', 'position' => 20, 'user_has_access' => ( $bp->is_item_admin + (int)$bp->is_item_mod ), 'item_css_id' => 'admin' ) );
+                bp_core_new_subnav_item( array( 'name' => __( 'Admin', 'buddypress' ), 'slug' => 'admin', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->root_slug, 'screen_function' => 'groups_screen_group_admin', 'position' => 20, 'user_has_access' => ( $bp->is_item_admin + (int)$bp->is_item_mod ), 'item_css_id' => 'admin' ) );
 
             // If this is a private group, and the user is not a member, show a "Request Membership" nav item.
             if ( !is_super_admin() && is_user_logged_in() && !$bp->groups->current_group->is_user_member && !groups_check_for_membership_request( $bp->loggedin_user->id, $bp->groups->current_group->id ) && $bp->groups->current_group->status == 'private' )
-                bp_core_new_subnav_item( array( 'name' => __( 'Request Membership', 'buddypress' ), 'slug' => 'request-membership', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_request_membership', 'position' => 30 ) );
-
-            if ( $bp->groups->current_group->enable_forum && function_exists('bp_forums_setup') )
-                bp_core_new_subnav_item( array( 'name' => __( 'Forum', 'buddypress' ), 'slug' => 'forum', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_forum', 'position' => 40, 'user_has_access' => $bp->groups->current_group->user_has_access, 'item_css_id' => 'forums' ) );
-
-            bp_core_new_subnav_item( array( 'name' => sprintf( __( 'Members (%s)', 'buddypress' ), number_format( $bp->groups->current_group->total_member_count ) ), 'slug' => 'members', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_members', 'position' => 60, 'user_has_access' => $bp->groups->current_group->user_has_access, 'item_css_id' => 'members'  ) );
+                bp_core_new_subnav_item( array( 'name' => __( 'Request Membership', 'buddypress' ), 'slug' => 'request-membership', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->root_slug, 'screen_function' => 'groups_screen_group_request_membership', 'position' => 30 ) );
+
+            // Forums are enabled and turned on
+            if ( $bp->groups->current_group->enable_forum && function_exists( 'bp_forums_setup' ) )
+                bp_core_new_subnav_item( array( 'name' => __( 'Forum', 'buddypress' ), 'slug' => 'forum', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->root_slug, 'screen_function' => 'groups_screen_group_forum', 'position' => 40, 'user_has_access' => $bp->groups->current_group->user_has_access, 'item_css_id' => 'forums' ) );
+
+            bp_core_new_subnav_item( array( 'name' => sprintf( __( 'Members (%s)', 'buddypress' ), number_format( $bp->groups->current_group->total_member_count ) ), 'slug' => 'members', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->root_slug, 'screen_function' => 'groups_screen_group_members', 'position' => 60, 'user_has_access' => $bp->groups->current_group->user_has_access, 'item_css_id' => 'members'  ) );
 
             if ( is_user_logged_in() && groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
                 if ( bp_is_active('friends') )
-                    bp_core_new_subnav_item( array( 'name' => __( 'Send Invites', 'buddypress' ), 'slug' => 'send-invites', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_invite', 'item_css_id' => 'invite', 'position' => 70, 'user_has_access' => $bp->groups->current_group->user_has_access ) );
+                    bp_core_new_subnav_item( array( 'name' => __( 'Send Invites', 'buddypress' ), 'slug' => 'send-invites', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->root_slug, 'screen_function' => 'groups_screen_group_invite', 'item_css_id' => 'invite', 'position' => 70, 'user_has_access' => $bp->groups->current_group->user_has_access ) );
             }
         }
@@ -165 +174 @@
 function groups_directory_groups_setup() {
     global $bp;
-
-    if ( $bp->current_component == $bp->groups->slug && empty( $bp->current_action ) && empty( $bp->current_item ) ) {
+    
+    if ( bp_is_current_component( $bp->groups->slug ) && empty( $bp->current_action ) && empty( $bp->current_item ) ) {
         $bp->is_directory = true;
 
@@ -181 +190 @@
         return false;
 
-    /* Don't show this menu to non site admins or if you're viewing your own profile */
+    // Don't show this menu to non site admins or if you're viewing your own profile
     if ( !is_super_admin() )
-        return false;
-    ?>
+        return false; ?>
+
     <li id="bp-adminbar-adminoptions-menu">
         <a href=""><?php _e( 'Admin Options', 'buddypress' ) ?></a>
@@ -192 +201 @@
 
             <?php do_action( 'groups_adminbar_menu_items' ) ?>
+
         </ul>
     </li>
+
     <?php
 }
 add_action( 'bp_adminbar_menus', 'groups_setup_adminbar_menu', 20 );
-
 
 /********************************************************************************
@@ -210 +220 @@
     global $bp;
 
-    if ( isset($_GET['n']) ) {
-        // Delete group request notifications for the user
+    // Delete group request notifications for the user
+    if ( isset( $_GET['n'] ) ) {
         bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->id, 'membership_request_accepted' );
         bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->id, 'membership_request_rejected' );
-        bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->id, 'member_promoted_to_mod' );
-        bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->id, 'member_promoted_to_admin' );
+        bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->id, 'member_promoted_to_mod'      );
+        bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->id, 'member_promoted_to_admin'    );
     }
 
@@ -231 +241 @@
 
     if ( isset( $bp->action_variables ) && in_array( 'accept', (array)$bp->action_variables ) && is_numeric( $group_id ) ) {
-        /* Check the nonce */
+        // Check the nonce
         if ( !check_admin_referer( 'groups_accept_invite' ) )
             return false;
@@ -240 +250 @@
             bp_core_add_message( __('Group invite accepted', 'buddypress') );
 
-            /* Record this in activity streams */
+            // Record this in activity streams
             $group = new BP_Groups_Group( $group_id );
 
             groups_record_activity( array(
-                'action' => apply_filters( 'groups_activity_accepted_invite_action', sprintf( __( '%1$s joined the group %2$s', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . esc_attr( $group->name ) . '</a>' ), $bp->loggedin_user->id, &$group ),
-                'type' => 'joined_group',
+                'action'  => apply_filters( 'groups_activity_accepted_invite_action', sprintf( __( '%1$s joined the group %2$s', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . esc_attr( $group->name ) . '</a>' ), $bp->loggedin_user->id, &$group ),
+                'type'    => 'joined_group',
                 'item_id' => $group->id
             ) );
@@ -253 +263 @@
 
     } elseif ( isset( $bp->action_variables ) && in_array( 'reject', (array)$bp->action_variables ) && is_numeric( $group_id ) ) {
-        /* Check the nonce */
+        // Check the nonce
         if ( !check_admin_referer( 'groups_reject_invite' ) )
             return false;
@@ -277 +287 @@
 
     if ( $bp->is_single_item ) {
-        if ( isset($_GET['n']) ) {
-            // Delete group request notifications for the user
+        if ( isset( $_GET['n'] ) ) {
             bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->id, 'membership_request_accepted' );
             bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->id, 'membership_request_rejected' );
-            bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->id, 'member_promoted_to_mod' );
-            bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->id, 'member_promoted_to_admin' );
+            bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->id, 'member_promoted_to_mod'      );
+            bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->id, 'member_promoted_to_admin'    );
         }
 
@@ -296 +305 @@
     if ( $bp->is_single_item && $bp->groups->current_group->user_has_access ) {
 
-        /* Fetch the details we need */
-        $topic_slug = isset( $bp->action_variables[1] ) ? $bp->action_variables[1] : false;
-        $topic_id = bp_forums_get_topic_id_from_slug( $topic_slug );
-        $forum_id = groups_get_groupmeta( $bp->groups->current_group->id, 'forum_id' );
-
+        // Fetch the details we need 
+        $topic_slug     = isset( $bp->action_variables[1] ) ? $bp->action_variables[1] : false;
+        $topic_id       = bp_forums_get_topic_id_from_slug( $topic_slug );
+        $forum_id       = groups_get_groupmeta( $bp->groups->current_group->id, 'forum_id' );
         $user_is_banned = false;
+
         if ( !is_super_admin() && groups_is_user_banned( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
             $user_is_banned = true;
@@ -307 +316 @@
         if ( $topic_slug && $topic_id ) {
 
-            /* Posting a reply */
+            // Posting a reply
             if ( !$user_is_banned && !isset( $bp->action_variables[2] ) && isset( $_POST['submit_reply'] ) ) {
-                /* Check the nonce */
+                // Check the nonce
                 check_admin_referer( 'bp_forums_new_reply' );
 
-                /* Auto join this user if they are not yet a member of this group */
+                // Auto join this user if they are not yet a member of this group
                 if ( $bp->groups->auto_join && !is_super_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
                     groups_join_group( $bp->groups->current_group->id, $bp->loggedin_user->id );
 
-                                $topic_page = isset( $_GET['topic_page'] ) ? $_GET['topic_page'] : false;
+                $topic_page = isset( $_GET['topic_page'] ) ? $_GET['topic_page'] : false;
 
                 if ( !$post_id = groups_new_group_forum_post( $_POST['reply_text'], $topic_id, $topic_page ) )
@@ -329 +338 @@
             }
 
-            /* Sticky a topic */
+            // Sticky a topic
             else if ( isset( $bp->action_variables[2] ) && 'stick' == $bp->action_variables[2] && ( isset( $bp->is_item_admin ) || isset( $bp->is_item_mod ) ) ) {
-                /* Check the nonce */
+                // Check the nonce
                 check_admin_referer( 'bp_forums_stick_topic' );
 
@@ -343 +352 @@
             }
 
-            /* Un-Sticky a topic */
+            // Un-Sticky a topic
             else if ( isset( $bp->action_variables[2] ) && 'unstick' == $bp->action_variables[2] && ( isset( $bp->is_item_admin ) || isset( $bp->is_item_mod ) ) ) {
-                /* Check the nonce */
+                // Check the nonce
                 check_admin_referer( 'bp_forums_unstick_topic' );
 
@@ -357 +366 @@
             }
 
-            /* Close a topic */
+            // Close a topic
             else if ( isset( $bp->action_variables[2] ) && 'close' == $bp->action_variables[2] && ( isset( $bp->is_item_admin ) || isset( $bp->is_item_mod ) ) ) {
-                /* Check the nonce */
+                // Check the nonce
                 check_admin_referer( 'bp_forums_close_topic' );
 
@@ -371 +380 @@
             }
 
-            /* Open a topic */
+            // Open a topic
             else if ( isset( $bp->action_variables[2] ) && 'open' == $bp->action_variables[2] && ( isset( $bp->is_item_admin ) || isset( $bp->is_item_mod ) ) ) {
-                /* Check the nonce */
+                // Check the nonce
                 check_admin_referer( 'bp_forums_open_topic' );
 
@@ -385 +394 @@
             }
 
-            /* Delete a topic */
+            // Delete a topic
             else if ( !$user_is_banned && isset( $bp->action_variables[2] ) && 'delete' == $bp->action_variables[2] && empty( $bp->action_variables[3] ) ) {
-                /* Fetch the topic */
+                // Fetch the topic
                 $topic = bp_forums_get_topic_details( $topic_id );
 
@@ -394 +403 @@
                     bp_core_redirect( wp_get_referer() );
 
-                /* Check the nonce */
+                // Check the nonce
                 check_admin_referer( 'bp_forums_delete_topic' );
 
@@ -407 +416 @@
             }
 
-            /* Editing a topic */
+            // Editing a topic
             else if ( !$user_is_banned && isset( $bp->action_variables[2] ) && 'edit' == $bp->action_variables[2] && empty( $bp->action_variables[3] ) ) {
-                /* Fetch the topic */
+                // Fetch the topic
                 $topic = bp_forums_get_topic_details( $topic_id );
 
-                /* Check the logged in user can edit this topic */
+                // Check the logged in user can edit this topic
                 if ( !$bp->is_item_admin && !$bp->is_item_mod && (int)$bp->loggedin_user->id != (int)$topic->topic_poster )
                     bp_core_redirect( wp_get_referer() );
 
                 if ( isset( $_POST['save_changes'] ) ) {
-                    /* Check the nonce */
+                    // Check the nonce
                     check_admin_referer( 'bp_forums_edit_topic' );
 
@@ -432 +441 @@
             }
 
-            /* Delete a post */
+            // Delete a post
             else if ( !$user_is_banned && isset( $bp->action_variables[2] ) && 'delete' == $bp->action_variables[2] && isset( $bp->action_variables[4] ) && $post_id = $bp->action_variables[4] ) {
-                /* Fetch the post */
+                // Fetch the post
                 $post = bp_forums_get_post( $post_id );
 
-                /* Check the logged in user can edit this topic */
+                // Check the logged in user can edit this topic
                 if ( !$bp->is_item_admin && !$bp->is_item_mod && (int)$bp->loggedin_user->id != (int)$post->poster_id )
                     bp_core_redirect( wp_get_referer() );
 
-                /* Check the nonce */
+                // Check the nonce
                 check_admin_referer( 'bp_forums_delete_post' );
 
@@ -455 +464 @@
             }
 
-            /* Editing a post */
+            // Editing a post
             else if ( !$user_is_banned && isset( $bp->action_variables[2] ) && 'edit' == $bp->action_variables[2] && isset( $bp->action_variables[4] ) && $post_id = $bp->action_variables[4] ) {
-                /* Fetch the post */
+                // Fetch the post
                 $post = bp_forums_get_post( $bp->action_variables[4] );
 
-                /* Check the logged in user can edit this topic */
+                // Check the logged in user can edit this topic
                 if ( !$bp->is_item_admin && !$bp->is_item_mod && (int)$bp->loggedin_user->id != (int)$post->poster_id )
                     bp_core_redirect( wp_get_referer() );
 
                 if ( isset( $_POST['save_changes'] ) ) {
-                    /* Check the nonce */
+                    // Check the nonce
                     check_admin_referer( 'bp_forums_edit_post' );
 
@@ -483 +492 @@
             }
 
-            /* Standard topic display */
+            // Standard topic display
             else {
                 if ( $user_is_banned )
@@ -492 +501 @@
 
         } else {
-            /* Posting a topic */
+            // Posting a topic
             if ( isset( $_POST['submit_topic'] ) && function_exists( 'bp_forums_new_topic') ) {
-                /* Check the nonce */
+                // Check the nonce
                 check_admin_referer( 'bp_forums_new_topic' );
 
@@ -578 +587 @@
         // If the user has submitted a request, send it.
         if ( isset( $_POST['group-request-send']) ) {
-            /* Check the nonce first. */
+            // Check the nonce
             if ( !check_admin_referer( 'groups_request_membership' ) )
                 return false;
@@ -599 +608 @@
     global $bp;
 
-    if ( $bp->current_component != $bp->groups->slug || $bp->current_action != $bp->activity->slug || empty( $bp->action_variables[0] ) )
+    if ( !bp_is_current_component( $bp->groups->slug ) || $bp->current_action != $bp->activity->slug || empty( $bp->action_variables[0] ) )
         return false;
 
@@ -611 +620 @@
     global $bp;
 
-    if ( $bp->current_component != BP_GROUPS_SLUG || 'admin' != $bp->current_action )
+    if ( !bp_is_current_component( BP_GROUPS_SLUG ) || 'admin' != $bp->current_action )
         return false;
 
@@ -623 +632 @@
     global $bp;
 
-    if ( $bp->current_component == $bp->groups->slug && 'edit-details' == $bp->action_variables[0] ) {
+    if ( bp_is_current_component( $bp->groups->slug ) && 'edit-details' == $bp->action_variables[0] ) {
 
         if ( $bp->is_item_admin || $bp->is_item_mod  ) {
@@ -629 +638 @@
             // If the edit form has been submitted, save the edited details
             if ( isset( $_POST['save'] ) ) {
-                /* Check the nonce first. */
+                // Check the nonce
                 if ( !check_admin_referer( 'groups_edit_group_details' ) )
                     return false;
@@ -655 +664 @@
     global $bp;
 
-    if ( $bp->current_component == $bp->groups->slug && 'group-settings' == $bp->action_variables[0] ) {
+    if ( bp_is_current_component( $bp->groups->slug ) && 'group-settings' == $bp->action_variables[0] ) {
 
         if ( !$bp->is_item_admin )
@@ -667 +676 @@
             $status = ( in_array( $_POST['group-status'], (array)$allowed_status ) ) ? $_POST['group-status'] : 'public';
 
-            /* Check the nonce first. */
+            // Check the nonce
             if ( !check_admin_referer( 'groups_edit_group_settings' ) )
                 return false;
@@ -692 +701 @@
     global $bp;
 
-    if ( $bp->current_component == $bp->groups->slug && 'group-avatar' == $bp->action_variables[0] ) {
+    if ( bp_is_current_component( $bp->groups->slug ) && 'group-avatar' == $bp->action_variables[0] ) {
 
         if ( !$bp->is_item_admin )
             return false;
 
-        /* If the group admin has deleted the admin avatar */
+        // If the group admin has deleted the admin avatar
         if ( 'delete' == $bp->action_variables[1] ) {
 
-            /* Check the nonce */
+            // Check the nonce
             check_admin_referer( 'bp_group_avatar_delete' );
 
@@ -714 +723 @@
         if ( !empty( $_FILES ) ) {
 
-            /* Check the nonce */
+            // Check the nonce
             check_admin_referer( 'bp_avatar_upload' );
 
-            /* Pass the file to the avatar upload handler */
+            // Pass the file to the avatar upload handler
             if ( bp_core_avatar_handle_upload( $_FILES, 'groups_avatar_upload_dir' ) ) {
                 $bp->avatar_admin->step = 'crop-image';
 
-                /* Make sure we include the jQuery jCrop file for image cropping */
+                // Make sure we include the jQuery jCrop file for image cropping
                 add_action( 'wp_print_scripts', 'bp_core_add_jquery_cropper' );
             }
@@ -727 +736 @@
         }
 
-        /* If the image cropping is done, crop the image and save a full/thumb version */
+        // If the image cropping is done, crop the image and save a full/thumb version
         if ( isset( $_POST['avatar-crop-submit'] ) ) {
 
-            /* Check the nonce */
+            // Check the nonce
             check_admin_referer( 'bp_avatar_cropstore' );
 
@@ -750 +759 @@
     global $bp;
 
-    if ( $bp->current_component == $bp->groups->slug && 'manage-members' == $bp->action_variables[0] ) {
+    if ( bp_is_current_component( $bp->groups->slug ) && 'manage-members' == $bp->action_variables[0] ) {
 
         if ( !$bp->is_item_admin )
@@ -856 +865 @@
     global $bp;
 
-    if ( $bp->current_component == $bp->groups->slug && 'membership-requests' == $bp->action_variables[0] ) {
-
-        /* Ask for a login if the user is coming here via an email notification */
+    if ( bp_is_current_component( $bp->groups->slug ) && 'membership-requests' == $bp->action_variables[0] ) {
+
+        // Ask for a login if the user is coming here via an email notification
         if ( !is_user_logged_in() )
             bp_core_redirect( site_url( 'wp-login.php?redirect_to=' . $bp->root_domain . '/' . $bp->current_component . '/' . $bp->current_item . '/admin/membership-requests/' ) );
@@ -874 +883 @@
             if ( 'accept' == $request_action && is_numeric($membership_id) ) {
 
-                /* Check the nonce first. */
+                // Check the nonce first.
                 if ( !check_admin_referer( 'groups_accept_membership_request' ) )
                     return false;
@@ -914 +923 @@
     global $bp;
 
-    if ( $bp->current_component == $bp->groups->slug && 'delete-group' == $bp->action_variables[0] ) {
+    if ( bp_is_current_component( $bp->groups->slug ) && 'delete-group' == $bp->action_variables[0] ) {
 
         if ( !$bp->is_item_admin && !is_super_admin() )
@@ -920 +929 @@
 
         if ( isset( $_REQUEST['delete-group-button'] ) && isset( $_REQUEST['delete-group-understand'] ) ) {
-            /* Check the nonce first. */
+            // Check the nonce first.
             if ( !check_admin_referer( 'groups_delete_group' ) )
                 return false;
@@ -950 +959 @@
     global $bp;
 
-    $group_invite = get_user_meta( $bp->displayed_user->id, 'notification_groups_invite', true );
-    if ( !$group_invite )
-        $group_invite = 'yes';
-
-    $group_update = get_user_meta( $bp->displayed_user->id, 'notification_groups_group_updated', true );
-    if ( !$group_update )
-        $group_update = 'yes';
-
-    $group_promo = get_user_meta( $bp->displayed_user->id, 'notification_groups_admin_promotion', true );
-    if ( !$group_promo )
-        $group_promo = 'yes';
-
-    $group_request = get_user_meta( $bp->displayed_user->id, 'notification_groups_membership_request', true );
-    if ( !$group_request )
+    if ( !$group_invite = get_user_meta( $bp->displayed_user->id, 'notification_groups_invite', true ) )
+        $group_invite  = 'yes';
+
+    if ( !$group_update = get_user_meta( $bp->displayed_user->id, 'notification_groups_group_updated', true ) )
+        $group_update  = 'yes';
+
+    if ( !$group_promo = get_user_meta( $bp->displayed_user->id, 'notification_groups_admin_promotion', true ) )
+        $group_promo   = 'yes';
+
+    if ( !$group_request = get_user_meta( $bp->displayed_user->id, 'notification_groups_membership_request', true ) )
         $group_request = 'yes';
 ?>
+
     <table class="notification-settings zebra" id="groups-notification-settings">
         <thead>
@@ -1003 +1009 @@
 
             <?php do_action( 'groups_screen_notification_settings' ); ?>
+
         </tbody>
     </table>
+
 <?php
 }
@@ -1021 +1029 @@
     global $bp;
 
-    /* If we're not at domain.org/groups/create/ then return false */
-    if ( $bp->current_component != $bp->groups->slug || 'create' != $bp->current_action )
+    // If we're not at domain.org/groups/create/ then return false
+    if ( !bp_is_current_component( $bp->groups->slug ) || 'create' != $bp->current_action )
         return false;
 
@@ -1028 +1036 @@
         return false;
 
-    /* Make sure creation steps are in the right order */
+    // Make sure creation steps are in the right order
     groups_action_sort_creation_steps();
 
-    /* If no current step is set, reset everything so we can start a fresh group creation */
+    // If no current step is set, reset everything so we can start a fresh group creation
     if ( !isset( $bp->action_variables[1] ) || !$bp->groups->current_create_step = $bp->action_variables[1] ) {
 
@@ -1041 +1049 @@
 
         $reset_steps = true;
-        bp_core_redirect( $bp->root_domain . '/' . $bp->groups->slug . '/create/step/' . array_shift( array_keys( $bp->groups->group_creation_steps ) ) . '/' );
-    }
-
-    /* If this is a creation step that is not recognized, just redirect them back to the first screen */
+        bp_core_redirect( $bp->root_domain . '/' . $bp->groups->root_slug . '/create/step/' . array_shift( array_keys( $bp->groups->group_creation_steps ) ) . '/' );
+    }
+
+    // If this is a creation step that is not recognized, just redirect them back to the first screen
     if ( $bp->action_variables[1] && !$bp->groups->group_creation_steps[$bp->action_variables[1]] ) {
         bp_core_add_message( __('There was an error saving group details. Please try again.', 'buddypress'), 'error' );
-        bp_core_redirect( $bp->root_domain . '/' . $bp->groups->slug . '/create/' );
-    }
-
-    /* Fetch the currently completed steps variable */
+        bp_core_redirect( $bp->root_domain . '/' . $bp->groups->root_slug . '/create/' );
+    }
+
+    // Fetch the currently completed steps variable
     if ( isset( $_COOKIE['bp_completed_create_steps'] ) && !isset( $reset_steps ) )
         $bp->groups->completed_create_steps = unserialize( stripslashes( $_COOKIE['bp_completed_create_steps'] ) );
 
-    /* Set the ID of the new group, if it has already been created in a previous step */
+    // Set the ID of the new group, if it has already been created in a previous step
     if ( isset( $_COOKIE['bp_new_group_id'] ) ) {
         $bp->groups->new_group_id = $_COOKIE['bp_new_group_id'];
@@ -1060 +1068 @@
     }
 
-    /* If the save, upload or skip button is hit, lets calculate what we need to save */
+    // If the save, upload or skip button is hit, lets calculate what we need to save
     if ( isset( $_POST['save'] ) ) {
 
-        /* Check the nonce */
+        // Check the nonce
         check_admin_referer( 'groups_create_save_' . $bp->groups->current_create_step );
 
@@ -1069 +1077 @@
             if ( empty( $_POST['group-name'] ) || empty( $_POST['group-desc'] ) || !strlen( trim( $_POST['group-name'] ) ) || !strlen( trim( $_POST['group-desc'] ) ) ) {
                 bp_core_add_message( __( 'Please fill in all of the required fields', 'buddypress' ), 'error' );
-                bp_core_redirect( $bp->root_domain . '/' . $bp->groups->slug . '/create/step/' . $bp->groups->current_create_step . '/' );
+                bp_core_redirect( $bp->root_domain . '/' . $bp->groups->root_slug . '/create/step/' . $bp->groups->current_create_step . '/' );
             }
 
@@ -1076 +1084 @@
             if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $new_group_id, 'name' => $_POST['group-name'], 'description' => $_POST['group-desc'], 'slug' => groups_check_slug( sanitize_title( esc_attr( $_POST['group-name'] ) ) ), 'date_created' => bp_core_current_time(), 'status' => 'public' ) ) ) {
                 bp_core_add_message( __( 'There was an error saving group details, please try again.', 'buddypress' ), 'error' );
-                bp_core_redirect( $bp->root_domain . '/' . $bp->groups->slug . '/create/step/' . $bp->groups->current_create_step . '/' );
+                bp_core_redirect( $bp->root_domain . '/' . $bp->groups->root_slug . '/create/step/' . $bp->groups->current_create_step . '/' );
             }
 
@@ -1090 +1098 @@
                 $group_enable_forum = 0;
             } else {
-                /* Create the forum if enable_forum = 1 */
+                // Create the forum if enable_forum = 1
                 if ( function_exists( 'bp_forums_setup' ) && '' == groups_get_groupmeta( $bp->groups->new_group_id, 'forum_id' ) ) {
                     groups_new_group_forum();
@@ -1103 +1111 @@
             if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $bp->groups->new_group_id, 'status' => $group_status, 'enable_forum' => $group_enable_forum ) ) ) {
                 bp_core_add_message( __( 'There was an error saving group details, please try again.', 'buddypress' ), 'error' );
-                bp_core_redirect( $bp->root_domain . '/' . $bp->groups->slug . '/create/step/' . $bp->groups->current_create_step . '/' );
+                bp_core_redirect( $bp->root_domain . '/' . $bp->groups->root_slug . '/create/step/' . $bp->groups->current_create_step . '/' );
             }
         }
 
-        if ( 'group-invites' == $bp->groups->current_create_step ) {
+        if ( 'group-invites' == $bp->groups->current_create_step )
             groups_send_invites( $bp->loggedin_user->id, $bp->groups->new_group_id );
-        }
 
         do_action( 'groups_create_group_step_save_' . $bp->groups->current_create_step );
@@ -1123 +1130 @@
             $bp->groups->completed_create_steps[] = $bp->groups->current_create_step;
 
-        /* Reset cookie info */
+        // Reset cookie info
         setcookie( 'bp_new_group_id', $bp->groups->new_group_id, time()+60*60*24, COOKIEPATH );
         setcookie( 'bp_completed_create_steps', serialize( $bp->groups->completed_create_steps ), time()+60*60*24, COOKIEPATH );
 
-        /* If we have completed all steps and hit done on the final step we can redirect to the completed group */
+        // If we have completed all steps and hit done on the final step we
+        // can redirect to the completed group
         if ( count( $bp->groups->completed_create_steps ) == count( $bp->groups->group_creation_steps ) && $bp->groups->current_create_step == array_pop( array_keys( $bp->groups->group_creation_steps ) ) ) {
             unset( $bp->groups->current_create_step );
             unset( $bp->groups->completed_create_steps );
 
-            /* Once we compelete all steps, record the group creation in the activity stream. */
+            // Once we compelete all steps, record the group creation in the activity stream.
             groups_record_activity( array(
                 'action' => apply_filters( 'groups_activity_created_group_action', sprintf( __( '%1$s created the group %2$s', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . esc_attr( $bp->groups->current_group->name ) . '</a>' ) ),
@@ -1159 +1167 @@
             }
 
-            bp_core_redirect( $bp->root_domain . '/' . $bp->groups->slug . '/create/step/' . $next_step . '/' );
-        }
-    }
-
-    /* Group avatar is handled separately */
+            bp_core_redirect( $bp->root_domain . '/' . $bp->groups->root_slug . '/create/step/' . $next_step . '/' );
+        }
+    }
+
+    // Group avatar is handled separately
     if ( 'group-avatar' == $bp->groups->current_create_step && isset( $_POST['upload'] ) ) {
         if ( !empty( $_FILES ) && isset( $_POST['upload'] ) ) {
-            /* Normally we would check a nonce here, but the group save nonce is used instead */
-
-            /* Pass the file to the avatar upload handler */
+            // Normally we would check a nonce here, but the group save nonce is used instead
+
+            // Pass the file to the avatar upload handler
             if ( bp_core_avatar_handle_upload( $_FILES, 'groups_avatar_upload_dir' ) ) {
                 $bp->avatar_admin->step = 'crop-image';
 
-                /* Make sure we include the jQuery jCrop file for image cropping */
+                // Make sure we include the jQuery jCrop file for image cropping
                 add_action( 'wp_print_scripts', 'bp_core_add_jquery_cropper' );
             }
         }
 
-        /* If the image cropping is done, crop the image and save a full/thumb version */
+        // If the image cropping is done, crop the image and save a full/thumb version
         if ( isset( $_POST['avatar-crop-submit'] ) && isset( $_POST['upload'] ) ) {
-            /* Normally we would check a nonce here, but the group save nonce is used instead */
+            // Normally we would check a nonce here, but the group save nonce is used instead
 
             if ( !bp_core_avatar_handle_crop( array( 'object' => 'group', 'avatar_dir' => 'group-avatars', 'item_id' => $bp->groups->current_group->id, 'original_file' => $_POST['image_src'], 'crop_x' => $_POST['x'], 'crop_y' => $_POST['y'], 'crop_w' => $_POST['w'], 'crop_h' => $_POST['h'] ) ) )
@@ -1195 +1203 @@
     global $bp;
 
-    if ( !$bp->is_single_item || $bp->current_component != $bp->groups->slug || $bp->current_action != 'join' )
+    if ( !$bp->is_single_item || !bp_is_current_component( $bp->groups->slug ) || $bp->current_action != 'join' )
         return false;
 
@@ -1230 +1238 @@
     global $bp;
 
-    if ( !$bp->is_single_item || $bp->current_component != $bp->groups->slug || $bp->current_action != 'leave-group' )
+    if ( !$bp->is_single_item || !bp_is_current_component( $bp->groups->slug ) || $bp->current_action != 'leave-group' )
         return false;
 
@@ -1255 +1263 @@
     global $bp;
 
-    if ( $bp->current_component != BP_GROUPS_SLUG && $bp->current_action != 'create' )
+    if ( !bp_is_current_component( BP_GROUPS_SLUG ) && $bp->current_action != 'create' )
         return false;
 
@@ -1268 +1276 @@
     }
 
-    /* Sort the steps by their position key */
+    // Sort the steps by their position key
     ksort($temp);
     unset($bp->groups->group_creation_steps);
@@ -1279 +1287 @@
     global $bp, $wpdb;
 
-    if ( $bp->current_component == $bp->groups->slug && isset( $_GET['random-group'] ) ) {
+    if ( bp_is_current_component( $bp->groups->slug ) && isset( $_GET['random-group'] ) ) {
         $group = groups_get_groups( array( 'type' => 'random', 'per_page' => 1 ) );
 
@@ -1290 +1298 @@
     global $bp, $wp_query;
 
-    if ( !bp_is_active( 'activity' ) || $bp->current_component != $bp->groups->slug || !isset( $bp->groups->current_group ) || $bp->current_action != 'feed' )
+    if ( !bp_is_active( 'activity' ) || !bp_is_current_component( $bp->groups->slug ) || !isset( $bp->groups->current_group ) || $bp->current_action != 'feed' )
         return false;
 
@@ -1320 +1328 @@
         return false;
 
-    bp_activity_set_action( $bp->groups->id, 'created_group', __( 'Created a group', 'buddypress' ) );
-    bp_activity_set_action( $bp->groups->id, 'joined_group', __( 'Joined a group', 'buddypress' ) );
+    bp_activity_set_action( $bp->groups->id, 'created_group',   __( 'Created a group',       'buddypress' ) );
+    bp_activity_set_action( $bp->groups->id, 'joined_group',    __( 'Joined a group',        'buddypress' ) );
     bp_activity_set_action( $bp->groups->id, 'new_forum_topic', __( 'New group forum topic', 'buddypress' ) );
-    bp_activity_set_action( $bp->groups->id, 'new_forum_post', __( 'New group forum post', 'buddypress' ) );
+    bp_activity_set_action( $bp->groups->id, 'new_forum_post',  __( 'New group forum post',  'buddypress' ) );
 
     do_action( 'groups_register_activity_actions' );
@@ -1335 +1343 @@
         return false;
 
-    /* If the group is not public, hide the activity sitewide. */
+    // If the group is not public, hide the activity sitewide.
     if ( 'public' == $bp->groups->current_group->status )
         $hide_sitewide = false;
@@ -1341 +1349 @@
         $hide_sitewide = true;
 
-    $defaults = array(
-        'id' => false,
-        'user_id' => $bp->loggedin_user->id,
-        'action' => '',
-        'content' => '',
-        'primary_link' => '',
-        'component' => $bp->groups->id,
-        'type' => false,
-        'item_id' => false,
+    $defaults = array (
+        'id'                => false,
+        'user_id'           => $bp->loggedin_user->id,
+        'action'            => '',
+        'content'           => '',
+        'primary_link'      => '',
+        'component'         => $bp->groups->id,
+        'type'              => false,
+        'item_id'           => false,
         'secondary_item_id' => false,
-        'recorded_time' => bp_core_current_time(),
-        'hide_sitewide' => $hide_sitewide
+        'recorded_time'     => bp_core_current_time(),
+        'hide_sitewide'     => $hide_sitewide
     );
 
@@ -1361 +1369 @@
 }
 
-function groups_update_last_activity( $group_id = false ) {
+function groups_update_last_activity( $group_id = 0 ) {
     global $bp;
 
@@ -1395 +1403 @@
                 return apply_filters( 'bp_groups_single_new_membership_request_notification', '<a href="' . $group_link . 'admin/membership-requests/?n=1" title="' . sprintf( __( '%s requests group membership', 'buddypress' ), $user_fullname ) . '">' . sprintf( __( '%1$s requests membership for the group "%2$s"', 'buddypress' ), $user_fullname, $group->name ) . '</a>', $group_link, $user_fullname, $group->name );
             }
-        break;
+            break;
 
         case 'membership_request_accepted':
@@ -1408 +1416 @@
                 return apply_filters( 'bp_groups_single_membership_request_accepted_notification', '<a href="' . $group_link . '?n=1">' . sprintf( __( 'Membership for group "%s" accepted', 'buddypress' ), $group->name ) . '</a>', $group_link, $group->name );
 
-        break;
+            break;
 
         case 'membership_request_rejected':
@@ -1421 +1429 @@
                 return apply_filters( 'bp_groups_single_membership_request_rejected_notification', '<a href="' . $group_link . '?n=1">' . sprintf( __( 'Membership for group "%s" rejected', 'buddypress' ), $group->name ) . '</a>', $group_link, $group->name );
 
-        break;
+            break;
 
         case 'member_promoted_to_admin':
@@ -1434 +1442 @@
                 return apply_filters( 'bp_groups_single_member_promoted_to_admin_notification', '<a href="' . $group_link . '?n=1">' . sprintf( __( 'You were promoted to an admin in the group %s', 'buddypress' ), $group->name ) . '</a>', $group_link, $group->name );
 
-        break;
+            break;
 
         case 'member_promoted_to_mod':
@@ -1447 +1455 @@
                 return apply_filters( 'bp_groups_single_member_promoted_to_mod_notification', '<a href="' . $group_link . '?n=1">' . sprintf( __( 'You were promoted to a mod in the group %s', 'buddypress' ), $group->name ) . '</a>', $group_link, $group->name );
 
-        break;
+            break;
 
         case 'group_invite':
@@ -1460 +1468 @@
                 return apply_filters( 'bp_groups_single_group_invite_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/invites/?n=1" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __( 'You have an invitation to the group: %s', 'buddypress' ), $group->name ) . '</a>', $group->name );
 
-        break;
+            break;
     }
 
@@ -1480 +1488 @@
 function groups_get_group( $args = '' ) {
     $defaults = array(
-        'group_id' => false,
+        'group_id'   => false,
         'load_users' => false
     );
@@ -1544 +1552 @@
         return false;
 
+    // If this is a new group, set up the creator as the first member and admin
     if ( !$group_id ) {
-        // If this is a new group, set up the creator as the first member and admin
-        $member = new BP_Groups_Member;
-        $member->group_id = $group->id;
-        $member->user_id = $group->creator_id;
-        $member->is_admin = 1;
-        $member->user_title = __( 'Group Admin', 'buddypress' );
-        $member->is_confirmed = 1;
+        $member                = new BP_Groups_Member;
+        $member->group_id      = $group->id;
+        $member->user_id       = $group->creator_id;
+        $member->is_admin      = 1;
+        $member->user_title    = __( 'Group Admin', 'buddypress' );
+        $member->is_confirmed  = 1;
         $member->date_modified = bp_core_current_time();
 
@@ -1572 +1580 @@
         return false;
 
-    $group = new BP_Groups_Group( $group_id );
-    $group->name = $group_name;
+    $group              = new BP_Groups_Group( $group_id );
+    $group->name        = $group_name;
     $group->description = $group_desc;
 
@@ -1602 +1610 @@
         groups_accept_all_pending_membership_requests( $group->id );
 
-    /* Now update the status */
+    // Now update the status
     $group->status = $status;
 
@@ -1608 +1616 @@
         return false;
 
-    /* If forums have been enabled, and a forum does not yet exist, we need to create one. */
+    // If forums have been enabled, and a forum does not yet exist, we need to create one.
     if ( $group->enable_forum ) {
         if ( function_exists( 'bp_forums_setup' ) && '' == groups_get_groupmeta( $group->id, 'forum_id' ) ) {
@@ -1675 +1683 @@
         $slug = substr( $slug, 2, strlen( $slug ) - 2 );
 
-    if ( in_array( $slug, (array)$bp->groups->forbidden_names ) ) {
+    if ( in_array( $slug, (array)$bp->groups->forbidden_names ) )
         $slug = $slug . '-' . rand();
-    }
 
     if ( BP_Groups_Group::check_slug( $slug ) ) {
@@ -1696 +1703 @@
 /*** User Actions ***************************************************************/
 
-function groups_leave_group( $group_id, $user_id = false ) {
+function groups_leave_group( $group_id, $user_id = 0 ) {
     global $bp;
 
@@ -1702 +1709 @@
         $user_id = $bp->loggedin_user->id;
 
-    /* Don't let single admins leave the group. */
+    // Don't let single admins leave the group.
     if ( count( groups_get_group_admins( $group_id ) ) < 2 ) {
         if ( groups_is_user_admin( $user_id, $group_id ) ) {
@@ -1716 +1723 @@
         return false;
 
-    /* Modify group member count */
+    // Modify group member count
     groups_update_groupmeta( $group_id, 'total_member_count', (int) groups_get_groupmeta( $group_id, 'total_member_count') - 1 );
 
-    /* Modify user's group memberhip count */
+    // Modify user's group memberhip count
     update_user_meta( $user_id, 'total_group_count', (int) get_user_meta( $user_id, 'total_group_count', true ) - 1 );
 
-    /* If the user joined this group less than five minutes ago, remove the joined_group activity so
-     * users cannot flood the activity stream by joining/leaving the group in quick succession.
+    /**
+     * If the user joined this group less than five minutes ago, remove the
+     * joined_group activity so users cannot flood the activity stream by
+     * joining/leaving the group in quick succession.
      */
     if ( function_exists( 'bp_activity_delete' ) && gmmktime() <= strtotime( '+5 minutes', (int)strtotime( $membership->date_modified ) ) )
@@ -1735 +1744 @@
 }
 
-function groups_join_group( $group_id, $user_id = false ) {
+function groups_join_group( $group_id, $user_id = 0 ) {
     global $bp;
 
@@ -1753 +1762 @@
         return true;
 
-    $new_member = new BP_Groups_Member;
-    $new_member->group_id = $group_id;
-    $new_member->user_id = $user_id;
-    $new_member->inviter_id = 0;
-    $new_member->is_admin = 0;
-    $new_member->user_title = '';
+    $new_member                = new BP_Groups_Member;
+    $new_member->group_id      = $group_id;
+    $new_member->user_id       = $user_id;
+    $new_member->inviter_id    = 0;
+    $new_member->is_admin      = 0;
+    $new_member->user_title    = '';
     $new_member->date_modified = bp_core_current_time();
-    $new_member->is_confirmed = 1;
+    $new_member->is_confirmed  = 1;
 
     if ( !$new_member->save() )
@@ -1772 +1781 @@
     // Record this in activity streams
     groups_record_activity( array(
-        'action' => apply_filters( 'groups_activity_joined_group', sprintf( __( '%1$s joined the group %2$s', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . esc_attr( bp_get_group_name( $group ) ) . '</a>' ) ),
-        'type' => 'joined_group',
+        'action'  => apply_filters( 'groups_activity_joined_group', sprintf( __( '%1$s joined the group %2$s', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . esc_attr( bp_get_group_name( $group ) ) . '</a>' ) ),
+        'type'    => 'joined_group',
         'item_id' => $group_id,
         'user_id' => $user_id
@@ -1815 +1824 @@
 
     $defaults = array(
-        'type' => 'active', // active, newest, alphabetical, random, popular, most-forum-topics or most-forum-posts
-        'user_id' => false, // Pass a user_id to limit to only groups that this user is a member of
-        'include' => false, // Only include these specific groups (group_ids)
-        'exclude' => false, // Do not include these specific groups (group_ids)
-        'search_terms' => false, // Limit to groups that match these search terms
-        'show_hidden' => false, // Show hidden groups to non-admins
-
-        'per_page' => 20, // The number of results to return per page
-        'page' => 1, // The page to return if limiting per page
-        'populate_extras' => true, // Fetch meta such as is_banned and is_member
+        'type'            => 'active', // active, newest, alphabetical, random, popular, most-forum-topics or most-forum-posts
+        'user_id'         => false,    // Pass a user_id to limit to only groups that this user is a member of
+        'include'         => false,    // Only include these specific groups (group_ids)
+        'exclude'         => false,    // Do not include these specific groups (group_ids)
+        'search_terms'    => false,    // Limit to groups that match these search terms
+        'show_hidden'     => false,    // Show hidden groups to non-admins
+
+        'per_page'        => 20,       // The number of results to return per page
+        'page'            => 1,        // The page to return if limiting per page
+        'populate_extras' => true,     // Fetch meta such as is_banned and is_member
     );
 
@@ -1844 +1853 @@
 }
 
-function groups_get_user_groups( $user_id = false, $pag_num = false, $pag_page = false ) {
+function groups_get_user_groups( $user_id = 0, $pag_num = 0, $pag_page = 0 ) {
     global $bp;
 
@@ -1853 +1862 @@
 }
 
-function groups_total_groups_for_user( $user_id = false ) {
+function groups_total_groups_for_user( $user_id = 0 ) {
     global $bp;
 
@@ -1869 +1878 @@
 /*** Group Avatars *************************************************************/
 
-function groups_avatar_upload_dir( $group_id = false ) {
+function groups_avatar_upload_dir( $group_id = 0 ) {
     global $bp;
 
@@ -1875 +1884 @@
         $group_id = $bp->groups->current_group->id;
 
-    $path = BP_AVATAR_UPLOAD_PATH . '/group-avatars/' . $group_id;
+    $path    = BP_AVATAR_UPLOAD_PATH . '/group-avatars/' . $group_id;
     $newbdir = $path;
 
@@ -1881 +1890 @@
         @wp_mkdir_p( $path );
 
-    $newurl = BP_AVATAR_URL . '/group-avatars/' . $group_id;
-    $newburl = $newurl;
+    $newurl    = BP_AVATAR_URL . '/group-avatars/' . $group_id;
+    $newburl   = $newurl;
     $newsubdir = '/group-avatars/' . $group_id;
 
@@ -1924 +1933 @@
 
     $defaults = array(
-        'content' => false,
-        'user_id' => $bp->loggedin_user->id,
+        'content'  => false,
+        'user_id'  => $bp->loggedin_user->id,
         'group_id' => $bp->groups->current_group->id
     );
@@ -1932 +1941 @@
     extract( $r, EXTR_SKIP );
 
-    if ( empty($content) || !strlen( trim( $content ) ) || empty($user_id) || empty($group_id) )
+    if ( empty( $content ) || !strlen( trim( $content ) ) || empty( $user_id ) || empty( $group_id ) )
         return false;
 
     $bp->groups->current_group = new BP_Groups_Group( $group_id );
 
-    /* Be sure the user is a member of the group before posting. */
+    // Be sure the user is a member of the group before posting.
     if ( !is_super_admin() && !groups_is_user_member( $user_id, $group_id ) )
         return false;
 
-    /* Record this in activity streams */
-    $activity_action = sprintf( __( '%1$s posted an update in the group %2$s:', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . esc_attr( $bp->groups->current_group->name ) . '</a>' );
+    // Record this in activity streams
+    $activity_action  = sprintf( __( '%1$s posted an update in the group %2$s:', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . esc_attr( $bp->groups->current_group->name ) . '</a>' );
     $activity_content = $content;
 
     $activity_id = groups_record_activity( array(
         'user_id' => $user_id,
-        'action' => apply_filters( 'groups_activity_new_update_action', $activity_action ),
+        'action'  => apply_filters( 'groups_activity_new_update_action',  $activity_action  ),
         'content' => apply_filters( 'groups_activity_new_update_content', $activity_content ),
-        'type' => 'activity_update',
+        'type'    => 'activity_update',
         'item_id' => $group_id
     ) );
 
-    /* Require the notifications code so email notifications can be set on the 'bp_activity_posted_update' action. */
+    // Require the notifications code so email notifications can be set on
+    // the 'bp_activity_posted_update' action.
     require_once( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );
 
@@ -1964 +1974 @@
 /*** Group Forums **************************************************************/
 
-function groups_new_group_forum( $group_id = false, $group_name = false, $group_desc = false ) {
+function groups_new_group_forum( $group_id = 0, $group_name = '', $group_desc = '' ) {
     global $bp;
 
@@ -2008 +2018 @@
 
     $post_text = apply_filters( 'group_forum_post_text_before_save', $post_text );
-    $topic_id = apply_filters( 'group_forum_post_topic_id_before_save', $topic_id );
+    $topic_id  = apply_filters( 'group_forum_post_topic_id_before_save', $topic_id );
 
     if ( $post_id = bp_forums_insert_post( array( 'post_text' => $post_text, 'topic_id' => $topic_id ) ) ) {
@@ -2020 +2030 @@
             $primary_link .= "?topic_page=" . $page;
 
-        /* Record this in activity streams */
+        // Record this in activity streams
         groups_record_activity( array(
-            'action' => apply_filters( 'groups_activity_new_forum_post_action', $activity_action, $post_id, $post_text, &$topic ),
-            'content' => apply_filters( 'groups_activity_new_forum_post_content', $activity_content, $post_id, $post_text, &$topic ),
-            'primary_link' => apply_filters( 'groups_activity_new_forum_post_primary_link', "{$primary_link}#post-{$post_id}" ),
-            'type' => 'new_forum_post',
-            'item_id' => $bp->groups->current_group->id,
+            'action'            => apply_filters( 'groups_activity_new_forum_post_action', $activity_action, $post_id, $post_text, &$topic ),
+            'content'           => apply_filters( 'groups_activity_new_forum_post_content', $activity_content, $post_id, $post_text, &$topic ),
+            'primary_link'      => apply_filters( 'groups_activity_new_forum_post_primary_link', "{$primary_link}#post-{$post_id}" ),
+            'type'              => 'new_forum_post',
+            'item_id'           => $bp->groups->current_group->id,
             'secondary_item_id' => $post_id
         ) );
@@ -2045 +2055 @@
 
     $topic_title = apply_filters( 'group_forum_topic_title_before_save', $topic_title );
-    $topic_text = apply_filters( 'group_forum_topic_text_before_save', $topic_text );
-    $topic_tags = apply_filters( 'group_forum_topic_tags_before_save', $topic_tags );
-    $forum_id = apply_filters( 'group_forum_topic_forum_id_before_save', $forum_id );
+    $topic_text  = apply_filters( 'group_forum_topic_text_before_save', $topic_text );
+    $topic_tags  = apply_filters( 'group_forum_topic_tags_before_save', $topic_tags );
+    $forum_id    = apply_filters( 'group_forum_topic_forum_id_before_save', $forum_id );
 
     if ( $topic_id = bp_forums_new_topic( array( 'topic_title' => $topic_title, 'topic_text' => $topic_text, 'topic_tags' => $topic_tags, 'forum_id' => $forum_id ) ) ) {
@@ -2055 +2065 @@
         $activity_content = bp_create_excerpt( $topic_text );
 
-        /* Record this in activity streams */
+        // Record this in activity streams
         groups_record_activity( array(
-            'action' => apply_filters( 'groups_activity_new_forum_topic_action', $activity_action, $topic_text, &$topic ),
-            'content' => apply_filters( 'groups_activity_new_forum_topic_content', $activity_content, $topic_text, &$topic ),
-            'primary_link' => apply_filters( 'groups_activity_new_forum_topic_primary_link', bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug . '/' ),
-            'type' => 'new_forum_topic',
-            'item_id' => $bp->groups->current_group->id,
+            'action'            => apply_filters( 'groups_activity_new_forum_topic_action', $activity_action, $topic_text, &$topic ),
+            'content'           => apply_filters( 'groups_activity_new_forum_topic_content', $activity_content, $topic_text, &$topic ),
+            'primary_link'      => apply_filters( 'groups_activity_new_forum_topic_primary_link', bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug . '/' ),
+            'type'              => 'new_forum_topic',
+            'item_id'           => $bp->groups->current_group->id,
             'secondary_item_id' => $topic->topic_id
         ) );
@@ -2077 +2087 @@
 
     $topic_title = apply_filters( 'group_forum_topic_title_before_save', $topic_title );
-    $topic_text = apply_filters( 'group_forum_topic_text_before_save', $topic_text );
+    $topic_text  = apply_filters( 'group_forum_topic_text_before_save',  $topic_text  );
 
     if ( $topic = bp_forums_update_topic( array( 'topic_title' => $topic_title, 'topic_text' => $topic_text, 'topic_id' => $topic_id ) ) ) {
-        /* Update the activity stream item */
+        // Update the activity stream item
         if ( function_exists( 'bp_activity_delete_by_item_id' ) )
             bp_activity_delete_by_item_id( array( 'item_id' => $bp->groups->current_group->id, 'secondary_item_id' => $topic_id, 'component' => $bp->groups->id, 'type' => 'new_forum_topic' ) );
@@ -2087 +2097 @@
         $activity_content = bp_create_excerpt( $topic_text );
 
-        /* Record this in activity streams */
+        // Record this in activity streams
         groups_record_activity( array(
-            'action' => apply_filters( 'groups_activity_new_forum_topic_action', $activity_action, $topic_text, &$topic ),
-            'content' => apply_filters( 'groups_activity_new_forum_topic_content', $activity_content, $topic_text, &$topic ),
-            'primary_link' => apply_filters( 'groups_activity_new_forum_topic_primary_link', bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug . '/' ),
-            'type' => 'new_forum_topic',
-            'item_id' => (int)$bp->groups->current_group->id,
-            'user_id' => (int)$topic->topic_poster,
+            'action'            => apply_filters( 'groups_activity_new_forum_topic_action', $activity_action, $topic_text, &$topic ),
+            'content'           => apply_filters( 'groups_activity_new_forum_topic_content', $activity_content, $topic_text, &$topic ),
+            'primary_link'      => apply_filters( 'groups_activity_new_forum_topic_primary_link', bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug . '/' ),
+            'type'              => 'new_forum_topic',
+            'item_id'           => (int)$bp->groups->current_group->id,
+            'user_id'           => (int)$topic->topic_poster,
             'secondary_item_id' => $topic->topic_id,
-            'recorded_time' => $topic->topic_time
+            'recorded_time '    => $topic->topic_time
         ) );
 
@@ -2111 +2121 @@
 
     $post_text = apply_filters( 'group_forum_post_text_before_save', $post_text );
-    $topic_id = apply_filters( 'group_forum_post_topic_id_before_save', $topic_id );
-
-    $post = bp_forums_get_post( $post_id );
+    $topic_id  = apply_filters( 'group_forum_post_topic_id_before_save', $topic_id );
+    $post      = bp_forums_get_post( $post_id );
 
     if ( $post_id = bp_forums_insert_post( array( 'post_id' => $post_id, 'post_text' => $post_text, 'post_time' => $post->post_time, 'topic_id' => $topic_id, 'poster_id' => $post->poster_id ) ) ) {
@@ -2125 +2134 @@
             $primary_link .= "?topic_page=" . $page;
 
-        /* Fetch an existing entry and update if one exists. */
+        // Fetch an existing entry and update if one exists.
         if ( function_exists( 'bp_activity_get_activity_id' ) )
             $id = bp_activity_get_activity_id( array( 'user_id' => $post->poster_id, 'component' => $bp->groups->id, 'type' => 'new_forum_post', 'item_id' => $bp->groups->current_group->id, 'secondary_item_id' => $post_id ) );
 
-        /* Update the entry in activity streams */
+        // Update the entry in activity streams
         groups_record_activity( array(
-            'id' => $id,
-            'action' => apply_filters( 'groups_activity_new_forum_post_action', $activity_action, $post_text, &$topic, &$forum_post ),
-            'content' => apply_filters( 'groups_activity_new_forum_post_content', $activity_content, $post_text, &$topic, &$forum_post ),
-            'primary_link' => apply_filters( 'groups_activity_new_forum_post_primary_link', $primary_link . "#post-" . $post_id ),
-            'type' => 'new_forum_post',
-            'item_id' => (int)$bp->groups->current_group->id,
-            'user_id' => (int)$post->poster_id,
+            'id'                => $id,
+            'action'            => apply_filters( 'groups_activity_new_forum_post_action', $activity_action, $post_text, &$topic, &$forum_post ),
+            'content'           => apply_filters( 'groups_activity_new_forum_post_content', $activity_content, $post_text, &$topic, &$forum_post ),
+            'primary_link'      => apply_filters( 'groups_activity_new_forum_post_primary_link', $primary_link . "#post-" . $post_id ),
+            'type'              => 'new_forum_post',
+            'item_id'           => (int)$bp->groups->current_group->id,
+            'user_id'           => (int)$post->poster_id,
             'secondary_item_id' => $post_id,
-            'recorded_time' => $post->post_time
+            'recorded_time'     => $post->post_time
         ) );
 
@@ -2156 +2165 @@
         do_action( 'groups_before_delete_group_forum_topic', $topic_id );
 
-        /* Delete the activity stream item */
-        if ( function_exists( 'bp_activity_delete' ) ) {
+        // Delete the activity stream item
+        if ( function_exists( 'bp_activity_delete' ) )
             bp_activity_delete( array( 'item_id' => $bp->groups->current_group->id, 'secondary_item_id' => $topic_id, 'component' => $bp->groups->id, 'type' => 'new_forum_topic' ) );
-        }
 
         do_action( 'groups_delete_group_forum_topic', $topic_id );
@@ -2175 +2183 @@
         do_action( 'groups_before_delete_group_forum_post', $post_id, $topic_id );
 
-        /* Delete the activity stream item */
-        if ( function_exists( 'bp_activity_delete' ) ) {
+        // Delete the activity stream item
+        if ( function_exists( 'bp_activity_delete' ) )
             bp_activity_delete( array( 'item_id' => $bp->groups->current_group->id, 'secondary_item_id' => $post_id, 'component' => $bp->groups->id, 'type' => 'new_forum_post' ) );
-        }
 
         do_action( 'groups_delete_group_forum_post', $post_id, $topic_id );
@@ -2208 +2215 @@
 
     $defaults = array(
-        'user_id' => false,
-        'group_id' => false,
-        'inviter_id' => $bp->loggedin_user->id,
+        'user_id'       => false,
+        'group_id'      => false,
+        'inviter_id'    => $bp->loggedin_user->id,
         'date_modified' => bp_core_current_time(),
-        'is_confirmed' => 0
+        'is_confirmed'  => 0
     );
 
@@ -2222 +2229 @@
 
     if ( !groups_is_user_member( $user_id, $group_id ) && !groups_check_user_has_invite( $user_id, $group_id ) ) {
-        $invite = new BP_Groups_Member;
-        $invite->group_id = $group_id;
-        $invite->user_id = $user_id;
+        $invite                = new BP_Groups_Member;
+        $invite->group_id      = $group_id;
+        $invite->user_id       = $user_id;
         $invite->date_modified = $date_modified;
-        $invite->inviter_id = $inviter_id;
-        $invite->is_confirmed = $is_confirmed;
+        $invite->inviter_id    = $inviter_id;
+        $invite->is_confirmed  = $is_confirmed;
 
         if ( !$invite->save() )
@@ -2261 +2268 @@
         return false;
 
-    /* Remove request to join */
+    // Remove request to join
     if ( $member->check_for_membership_request( $user_id, $group_id ) )
         $member->delete_request( $user_id, $group_id );
 
-    /* Modify group meta */
+    // Modify group meta
     groups_update_groupmeta( $group_id, 'total_member_count', (int) groups_get_groupmeta( $group_id, 'total_member_count') + 1 );
     groups_update_groupmeta( $group_id, 'last_activity', bp_core_current_time() );
@@ -2403 +2410 @@
     global $bp;
 
-    /* Prevent duplicate requests */
+    // Prevent duplicate requests
     if ( groups_check_for_membership_request( $requesting_user_id, $group_id ) )
         return false;
 
-    /* Check if the user is already a member or is banned */
+    // Check if the user is already a member or is banned
     if ( groups_is_user_member( $requesting_user_id, $group_id ) || groups_is_user_banned( $requesting_user_id, $group_id ) )
         return false;
 
-    $requesting_user = new BP_Groups_Member;
-    $requesting_user->group_id = $group_id;
-    $requesting_user->user_id = $requesting_user_id;
-    $requesting_user->inviter_id = 0;
-    $requesting_user->is_admin = 0;
-    $requesting_user->user_title = '';
+    $requesting_user                = new BP_Groups_Member;
+    $requesting_user->group_id      = $group_id;
+    $requesting_user->user_id       = $requesting_user_id;
+    $requesting_user->inviter_id    = 0;
+    $requesting_user->is_admin      = 0;
+    $requesting_user->user_title    = '';
     $requesting_user->date_modified = bp_core_current_time();
-    $requesting_user->is_confirmed = 0;
-    $requesting_user->comments = $_POST['group-request-membership-comments'];
+    $requesting_user->is_confirmed  = 0;
+    $requesting_user->comments      = $_POST['group-request-membership-comments'];
 
     if ( $requesting_user->save() ) {
@@ -2426 +2433 @@
         require_once ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );
 
-        for ( $i = 0; $i < count( $admins ); $i++ ) {
-            // Saved okay, now send the email notification
+        // Saved okay, now send the email notification
+        for ( $i = 0; $i < count( $admins ); $i++ )
             groups_notification_new_membership_request( $requesting_user_id, $admins[$i]->user_id, $group_id, $requesting_user->id );
-        }
 
         do_action( 'groups_membership_requested', $requesting_user_id, $admins, $group_id, $requesting_user->id );
@@ -2452 +2458 @@
         return false;
 
-    /* Check if the user has an outstanding invite, if so delete it. */
+    // Check if the user has an outstanding invite, if so delete it.
     if ( groups_check_user_has_invite( $membership->user_id, $membership->group_id ) )
         groups_delete_invite( $membership->user_id, $membership->group_id );
 
-    /* Modify group member count */
+    // Modify group member count
     groups_update_groupmeta( $membership->group_id, 'total_member_count', (int) groups_get_groupmeta( $membership->group_id, 'total_member_count') + 1 );
 
-    /* Record this in activity streams */
+    // Record this in activity streams
     $group = new BP_Groups_Group( $membership->group_id );
 
     groups_record_activity( array(
-        'action'    => apply_filters( 'groups_activity_membership_accepted_action', sprintf( __( '%1$s joined the group %2$s', 'buddypress'), bp_core_get_userlink( $membership->user_id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . esc_attr( $group->name ) . '</a>' ), $membership->user_id, &$group ),
-        'type'      => 'joined_group',
-        'item_id'   => $membership->group_id,
-        'user_id'   => $membership->user_id
+        'action'  => apply_filters( 'groups_activity_membership_accepted_action', sprintf( __( '%1$s joined the group %2$s', 'buddypress'), bp_core_get_userlink( $membership->user_id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . esc_attr( $group->name ) . '</a>' ), $membership->user_id, &$group ),
+        'type'    => 'joined_group',
+        'item_id' => $membership->group_id,
+        'user_id' => $membership->user_id
     ) );
 
-    /* Send a notification to the user. */
+    // Send a notification to the user.
     require_once ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );
     groups_notification_membership_request_completed( $membership->user_id, $membership->group_id, true );
@@ -2513 +2519 @@
         return false;
 
-    foreach ( (array) $user_ids as $user_id ) {
+    foreach ( (array) $user_ids as $user_id )
         groups_accept_membership_request( false, $user_id, $group_id );
-    }
 
     do_action( 'groups_accept_all_pending_membership_requests', $group_id );
@@ -2530 +2535 @@
         return false;
 
-    $meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
-
-    if ( is_array($meta_value) || is_object($meta_value) )
+    $meta_key = preg_replace( '|[^a-z0-9_]|i', '', $meta_key );
+
+    if ( is_array( $meta_value ) || is_object( $meta_value ) )
         $meta_value = serialize($meta_value);
 
     $meta_value = trim( $meta_value );
 
-    if ( !$meta_key ) {
+    if ( !$meta_key )
         $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp->groups->table_name_groupmeta . " WHERE group_id = %d", $group_id ) );
-    } else if ( $meta_value ) {
+    else if ( $meta_value )
         $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp->groups->table_name_groupmeta . " WHERE group_id = %d AND meta_key = %s AND meta_value = %s", $group_id, $meta_key, $meta_value ) );
-    } else {
+    else
         $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp->groups->table_name_groupmeta . " WHERE group_id = %d AND meta_key = %s", $group_id, $meta_key ) );
-    }
-
-    /* Delete the cached object */
+
+    // Delete the cached object
     wp_cache_delete( 'bp_groups_groupmeta_' . $group_id . '_' . $meta_key, 'bp' );
 
@@ -2560 +2564 @@
 
     if ( !empty($meta_key) ) {
-        $meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
+        $meta_key = preg_replace( '|[^a-z0-9_]|i', '', $meta_key );
 
         if ( !$metas = wp_cache_get( 'bp_groups_groupmeta_' . $group_id . '_' . $meta_key, 'bp' ) ) {
@@ -2570 +2574 @@
     }
 
-    if ( empty($metas) ) {
-        if ( empty($meta_key) )
+    if ( empty( $metas ) ) {
+        if ( empty( $meta_key ) )
             return array();
         else
@@ -2577 +2581 @@
     }
 
-    $metas = array_map('maybe_unserialize', (array)$metas);
-
-    if ( 1 == count($metas) )
+    $metas = array_map( 'maybe_unserialize', (array)$metas );
+
+    if ( 1 == count( $metas ) )
         return $metas[0];
     else
@@ -2593 +2597 @@
     $meta_key = preg_replace( '|[^a-z0-9_]|i', '', $meta_key );
 
-    if ( is_string($meta_value) )
-        $meta_value = stripslashes($wpdb->escape($meta_value));
-
-    $meta_value = maybe_serialize($meta_value);
-
-    if (empty($meta_value)) {
+    if ( is_string( $meta_value ) )
+        $meta_value = stripslashes( $wpdb->escape( $meta_value ) );
+
+    $meta_value = maybe_serialize( $meta_value );
+
+    if ( empty( $meta_value ) )
         return groups_delete_groupmeta( $group_id, $meta_key );
-    }
 
     $cur = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM " . $bp->groups->table_name_groupmeta . " WHERE group_id = %d AND meta_key = %s", $group_id, $meta_key ) );
 
-    if ( !$cur ) {
+    if ( !$cur )
         $wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp->groups->table_name_groupmeta . " ( group_id, meta_key, meta_value ) VALUES ( %d, %s, %s )", $group_id, $meta_key, $meta_value ) );
-    } else if ( $cur->meta_value != $meta_value ) {
+    else if ( $cur->meta_value != $meta_value )
         $wpdb->query( $wpdb->prepare( "UPDATE " . $bp->groups->table_name_groupmeta . " SET meta_value = %s WHERE group_id = %d AND meta_key = %s", $meta_value, $group_id, $meta_key ) );
-    } else {
-        return false;
-    }
-
-    /* Update the cached object and recache */
+    else
+        return false;
+
+    // Update the cached object and recache
     wp_cache_set( 'bp_groups_groupmeta_' . $group_id . '_' . $meta_key, $meta_value, 'bp' );
 
@@ -2621 +2623 @@
 
 function groups_remove_data_for_user( $user_id ) {
-    BP_Groups_Member::delete_all_for_user($user_id);
+    BP_Groups_Member::delete_all_for_user( $user_id );
 
     do_action( 'groups_remove_data_for_user', $user_id );
 }
-add_action( 'wpmu_delete_user', 'groups_remove_data_for_user' );
-add_action( 'delete_user', 'groups_remove_data_for_user' );
+add_action( 'wpmu_delete_user',  'groups_remove_data_for_user' );
+add_action( 'delete_user',       'groups_remove_data_for_user' );
 add_action( 'bp_make_spam_user', 'groups_remove_data_for_user' );
 
@@ -2640 +2642 @@
     wp_cache_delete( 'bp_total_group_count', 'bp' );
 }
-add_action( 'groups_group_deleted', 'groups_clear_group_object_cache' );
-add_action( 'groups_settings_updated', 'groups_clear_group_object_cache' );
-add_action( 'groups_details_updated', 'groups_clear_group_object_cache' );
-add_action( 'groups_group_avatar_updated', 'groups_clear_group_object_cache' );
+add_action( 'groups_group_deleted',              'groups_clear_group_object_cache' );
+add_action( 'groups_settings_updated',           'groups_clear_group_object_cache' );
+add_action( 'groups_details_updated',            'groups_clear_group_object_cache' );
+add_action( 'groups_group_avatar_updated',       'groups_clear_group_object_cache' );
 add_action( 'groups_create_group_step_complete', 'groups_clear_group_object_cache' );
 
@@ -2649 +2651 @@
     wp_cache_delete( 'bp_total_groups_for_user_' . $user_id );
 }
-add_action( 'groups_join_group', 'groups_clear_group_user_object_cache', 10, 2 );
-add_action( 'groups_leave_group', 'groups_clear_group_user_object_cache', 10, 2 );
-add_action( 'groups_ban_member', 'groups_clear_group_user_object_cache', 10, 2 );
+add_action( 'groups_join_group',   'groups_clear_group_user_object_cache', 10, 2 );
+add_action( 'groups_leave_group',  'groups_clear_group_user_object_cache', 10, 2 );
+add_action( 'groups_ban_member',   'groups_clear_group_user_object_cache', 10, 2 );
 add_action( 'groups_unban_member', 'groups_clear_group_user_object_cache', 10, 2 );
 
 /* List actions to clear super cached pages on, if super cache is installed */
-add_action( 'groups_join_group', 'bp_core_clear_cache' );
-add_action( 'groups_leave_group', 'bp_core_clear_cache' );
-add_action( 'groups_accept_invite', 'bp_core_clear_cache' );
-add_action( 'groups_reject_invite', 'bp_core_clear_cache' );
-add_action( 'groups_invite_user', 'bp_core_clear_cache' );
-add_action( 'groups_uninvite_user', 'bp_core_clear_cache' );
-add_action( 'groups_details_updated', 'bp_core_clear_cache' );
-add_action( 'groups_settings_updated', 'bp_core_clear_cache' );
-add_action( 'groups_unban_member', 'bp_core_clear_cache' );
-add_action( 'groups_ban_member', 'bp_core_clear_cache' );
-add_action( 'groups_demote_member', 'bp_core_clear_cache' );
-add_action( 'groups_premote_member', 'bp_core_clear_cache' );
-add_action( 'groups_membership_rejected', 'bp_core_clear_cache' );
-add_action( 'groups_membership_accepted', 'bp_core_clear_cache' );
-add_action( 'groups_membership_requested', 'bp_core_clear_cache' );
+add_action( 'groups_join_group',                 'bp_core_clear_cache' );
+add_action( 'groups_leave_group',                'bp_core_clear_cache' );
+add_action( 'groups_accept_invite',              'bp_core_clear_cache' );
+add_action( 'groups_reject_invite',              'bp_core_clear_cache' );
+add_action( 'groups_invite_user',                'bp_core_clear_cache' );
+add_action( 'groups_uninvite_user',              'bp_core_clear_cache' );
+add_action( 'groups_details_updated',            'bp_core_clear_cache' );
+add_action( 'groups_settings_updated',           'bp_core_clear_cache' );
+add_action( 'groups_unban_member',               'bp_core_clear_cache' );
+add_action( 'groups_ban_member',                 'bp_core_clear_cache' );
+add_action( 'groups_demote_member',              'bp_core_clear_cache' );
+add_action( 'groups_premote_member',             'bp_core_clear_cache' );
+add_action( 'groups_membership_rejected',        'bp_core_clear_cache' );
+add_action( 'groups_membership_accepted',        'bp_core_clear_cache' );
+add_action( 'groups_membership_requested',       'bp_core_clear_cache' );
 add_action( 'groups_create_group_step_complete', 'bp_core_clear_cache' );
-add_action( 'groups_created_group', 'bp_core_clear_cache' );
-add_action( 'groups_group_avatar_updated', 'bp_core_clear_cache' );
+add_action( 'groups_created_group',              'bp_core_clear_cache' );
+add_action( 'groups_group_avatar_updated',       'bp_core_clear_cache' );
 
 ?>