Changeset 11027 for trunk/src/bp-groups/classes/class-bp-groups-member.php

Timestamp:

08/22/2016 10:11:20 PM (9 years ago)

Author:

r-a-y

Message:

Groups: Cast properties as integers where appropriate.

See #6977.

File:

• trunk/src/bp-groups/classes/class-bp-groups-member.php (modified) (13 diffs)

trunk/src/bp-groups/classes/class-bp-groups-member.php

@@ -186 +186 @@
 
         if ( !empty( $member ) ) {
-            $this->id            = $member->id;
-            $this->group_id      = $member->group_id;
-            $this->user_id       = $member->user_id;
-            $this->inviter_id    = $member->inviter_id;
-            $this->is_admin      = $member->is_admin;
-            $this->is_mod        = $member->is_mod;
-            $this->is_banned     = $member->is_banned;
+            $this->id            = (int) $member->id;
+            $this->group_id      = (int) $member->group_id;
+            $this->user_id       = (int) $member->user_id;
+            $this->inviter_id    = (int) $member->inviter_id;
+            $this->is_admin      = (int) $member->is_admin;
+            $this->is_mod        = (int) $member->is_mod;
+            $this->is_banned     = (int) $member->is_banned;
             $this->user_title    = $member->user_title;
             $this->date_modified = $member->date_modified;
-            $this->is_confirmed  = $member->is_confirmed;
+            $this->is_confirmed  = (int) $member->is_confirmed;
             $this->comments      = $member->comments;
-            $this->invite_sent   = $member->invite_sent;
+            $this->invite_sent   = (int) $member->invite_sent;
 
             $this->user = new BP_Core_User( $this->user_id );
@@ -787 +787 @@
      * @param string $type     If 'sent', results are limited to those invitations
      *                         that have actually been sent (non-draft). Default: 'sent'.
-     * @return int|null The ID of the invitation if found, otherwise null.
+     * @return int|null The ID of the invitation if found; null if not found.
      */
     public static function check_has_invite( $user_id, $group_id, $type = 'sent' ) {
@@ -801 +801 @@
             $sql .= " AND invite_sent = 1";
 
-        return $wpdb->get_var( $wpdb->prepare( $sql, $user_id, $group_id ) );
+        $query = $wpdb->get_var( $wpdb->prepare( $sql, $user_id, $group_id ) );
+
+        return is_numeric( $query ) ? (int) $query : $query;
     }
 
@@ -932 +934 @@
      * @param int $user_id  ID of the user.
      * @param int $group_id ID of the group.
-     * @return mixed
+     * @return int|null int 1 if user is banned; int 0 if user is not banned;
+     *                  null if user is not part of the group or if group doesn't exist.
      */
     public static function check_is_banned( $user_id, $group_id ) {
@@ -942 +945 @@
         $bp = buddypress();
 
-        return $wpdb->get_var( $wpdb->prepare( "SELECT is_banned FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d", $user_id, $group_id ) );
+        $query = $wpdb->get_var( $wpdb->prepare( "SELECT is_banned FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d", $user_id, $group_id ) );
+
+        return is_numeric( $query ) ? (int) $query : $query;
     }
 
@@ -952 +957 @@
      * @param int $user_id  ID of the user.
      * @param int $group_id ID of the group.
-     * @return int|null ID of the group if the user is the creator,
-     *                  otherwise false.
+     * @return int|null int of group ID if user is the creator; null on failure.
      */
     public static function check_is_creator( $user_id, $group_id ) {
@@ -963 +967 @@
         $bp = buddypress();
 
-        return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->groups->table_name} WHERE creator_id = %d AND id = %d", $user_id, $group_id ) );
+        $query = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->groups->table_name} WHERE creator_id = %d AND id = %d", $user_id, $group_id ) );
+
+        return is_numeric( $query ) ? (int) $query : $query;
     }
 
@@ -973 +979 @@
      * @param int $user_id  ID of the user.
      * @param int $group_id ID of the group.
-     * @return int|null ID of the membership if found, otherwise false.
+     * @return int Database ID of the membership if found; int 0 on failure.
      */
     public static function check_for_membership_request( $user_id, $group_id ) {
@@ -1002 +1008 @@
         // If the user is logged in and viewing their random groups, we can show hidden and private groups.
         if ( bp_is_my_profile() ) {
-            return $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT group_id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND is_confirmed = 1 AND is_banned = 0 ORDER BY rand() LIMIT %d", $user_id, $total_groups ) );
+            return array_map( 'intval', $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT group_id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND is_confirmed = 1 AND is_banned = 0 ORDER BY rand() LIMIT %d", $user_id, $total_groups ) ) );
         } else {
-            return $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT m.group_id FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id AND g.status != 'hidden' AND m.user_id = %d AND m.is_confirmed = 1 AND m.is_banned = 0 ORDER BY rand() LIMIT %d", $user_id, $total_groups ) );
+            return array_map( 'intval', $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT m.group_id FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id AND g.status != 'hidden' AND m.user_id = %d AND m.is_confirmed = 1 AND m.is_banned = 0 ORDER BY rand() LIMIT %d", $user_id, $total_groups ) ) );
         }
     }
@@ -1021 +1027 @@
         $bp = buddypress();
 
-        return $wpdb->get_col( $wpdb->prepare( "SELECT user_id FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 1 AND is_banned = 0", $group_id ) );
+        return array_map( 'intval', $wpdb->get_col( $wpdb->prepare( "SELECT user_id FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 1 AND is_banned = 0", $group_id ) ) );
     }
 
@@ -1044 +1050 @@
         }
 
+        // Integer casting.
+        foreach ( (array) $group_admins as $key => $data ) {
+            $group_admins[ $key ]->user_id = (int) $group_admins[ $key ]->user_id;
+        }
+
         return $group_admins;
     }
@@ -1060 +1071 @@
         $bp = buddypress();
 
-        return $wpdb->get_results( $wpdb->prepare( "SELECT user_id, date_modified FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_mod = 1 AND is_banned = 0", $group_id ) );
+        $group_mods = $wpdb->get_results( $wpdb->prepare( "SELECT user_id, date_modified FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_mod = 1 AND is_banned = 0", $group_id ) );
+
+        // Integer casting.
+        foreach ( (array) $group_mods as $key => $data ) {
+            $group_mods[ $key ]->user_id = (int) $group_mods[ $key ]->user_id;
+        }
+
+        return $group_mods;
     }
 
@@ -1093 +1111 @@
         $bp = buddypress();
 
-        return $wpdb->get_col( $wpdb->prepare( "SELECT user_id FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 0 AND inviter_id = 0", $group_id ) );
+        return array_map( 'intval', $wpdb->get_col( $wpdb->prepare( "SELECT user_id FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 0 AND inviter_id = 0", $group_id ) ) );
     }