Changeset 5689 for trunk/bp-groups/bp-groups-functions.php

Timestamp:

02/10/2012 01:17:51 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Remove unneeded globals and clean up some code in Groups component. See #3989.

File:

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

trunk/bp-groups/bp-groups-functions.php

@@ -56 +56 @@
 
 function groups_create_group( $args = '' ) {
-    global $bp;
 
     extract( $args );
@@ -72 +71 @@
      */
 
-    if ( isset( $group_id ) && $group_id )
+    if ( !empty( $group_id ) )
         $group = groups_get_group( array( 'group_id' => $group_id ) );
     else
         $group = new BP_Groups_Group;
 
-    if ( isset( $creator_id ) && $creator_id )
+    if ( !empty( $creator_id ) )
         $group->creator_id = $creator_id;
     else
@@ -92 +91 @@
 
     if ( isset( $status ) ) {
-        if ( groups_is_valid_status( $status ) )
+        if ( groups_is_valid_status( $status ) ) {
             $group->status = $status;
+        }
     }
 
     if ( isset( $enable_forum ) )
         $group->enable_forum = $enable_forum;
-    else if ( !$group_id && !isset( $enable_forum ) )
+    else if ( empty( $group_id ) && !isset( $enable_forum ) )
         $group->enable_forum = 1;
 
@@ -116 +116 @@
         $member->is_confirmed  = 1;
         $member->date_modified = bp_core_current_time();
-
         $member->save();
+
         do_action( 'groups_create_group', $group->id, $member, $group );
 
@@ -130 +130 @@
 
 function groups_edit_base_group_details( $group_id, $group_name, $group_desc, $notify_members ) {
-    global $bp;
 
     if ( empty( $group_name ) || empty( $group_desc ) )
@@ -152 +151 @@
 
 function groups_edit_group_settings( $group_id, $enable_forum, $status, $invite_status = false ) {
-    global $bp;
 
     $group = groups_get_group( array( 'group_id' => $group_id ) );
@@ -264 +262 @@
     global $bp;
 
-    if ( !$user_id )
+    if ( empty( $user_id ) )
         $user_id = bp_loggedin_user_id();
 
@@ -305 +303 @@
     global $bp;
 
-    if ( !$user_id )
+    if ( empty( $user_id ) )
         $user_id = bp_loggedin_user_id();
 
@@ -379 +377 @@
 
 function groups_get_groups( $args = '' ) {
-    global $bp;
 
     $defaults = array(
@@ -388 +385 @@
         '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
@@ -412 +408 @@
 
 function groups_get_user_groups( $user_id = 0, $pag_num = 0, $pag_page = 0 ) {
-    global $bp;
-
-    if ( !$user_id )
+
+    if ( empty( $user_id ) )
         $user_id = bp_displayed_user_id();
 
@@ -421 +416 @@
 
 function groups_total_groups_for_user( $user_id = 0 ) {
-    global $bp;
-
-    if ( !$user_id )
+
+    if ( empty( $user_id ) )
         $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : bp_loggedin_user_id();
 
@@ -548 +542 @@
 
 function groups_get_invites_for_user( $user_id = 0, $limit = false, $page = false, $exclude = false ) {
-    global $bp;
-
-    if ( !$user_id )
+
+    if ( empty( $user_id ) )
         $user_id = bp_loggedin_user_id();
 
@@ -557 +550 @@
 
 function groups_invite_user( $args = '' ) {
-    global $bp;
 
     $defaults = array(
@@ -570 +562 @@
     extract( $args, EXTR_SKIP );
 
-    if ( !$user_id || !$group_id )
+    if ( empty( $user_id ) || empty( $group_id ) )
         return false;
 
@@ -591 +583 @@
 
 function groups_uninvite_user( $user_id, $group_id ) {
-    global $bp;
 
     if ( !BP_Groups_Member::delete( $user_id, $group_id ) )
@@ -648 +639 @@
 
 function groups_send_invites( $user_id, $group_id ) {
-    global $bp;
-
-    if ( !$user_id )
+
+    if ( empty( $user_id ) )
         $user_id = bp_loggedin_user_id();
 
@@ -711 +701 @@
 
 function groups_demote_member( $user_id, $group_id ) {
-    global $bp;
+
+    if ( ! bp_is_item_admin() || ! bp_is_item_mod() )
+        return false;
 
     $member = new BP_Groups_Member( $user_id, $group_id );
@@ -761 +753 @@
 
 function groups_send_membership_request( $requesting_user_id, $group_id ) {
-    global $bp;
 
     // Prevent duplicate requests
@@ -797 +788 @@
 
 function groups_accept_membership_request( $membership_id, $user_id = 0, $group_id = 0 ) {
-    global $bp;
-
-    if ( $user_id && $group_id )
+
+    if ( !empty( $user_id ) && !empty( $group_id ) )
         $membership = new BP_Groups_Member( $user_id, $group_id );
     else
@@ -847 +837 @@
 
 function groups_delete_membership_request( $membership_id, $user_id = 0, $group_id = 0 ) {
-    if ( $user_id && $group_id )
+    if ( !empty( $user_id ) && !empty( $group_id ) )
         $membership = new BP_Groups_Member( $user_id, $group_id );
     else