Changeset 11030

Timestamp:

08/22/2016 10:38:28 PM (10 years ago)

Author:

r-a-y

Message:

XProfile: Cast properties as integers where appropriate.

See #6977.

Location:

trunk/src/bp-xprofile/classes

Files:

• class-bp-xprofile-field.php (modified) (3 diffs)
• class-bp-xprofile-group.php (modified) (2 diffs)
• class-bp-xprofile-profiledata.php (modified) (5 diffs)

trunk/src/bp-xprofile/classes/class-bp-xprofile-field.php

@@ -258 +258 @@
                 }
 
+                $int_fields = array(
+                        'id', 'is_required', 'group_id', 'parent_id', 'is_default_option',
+                        'field_order', 'option_order', 'can_delete'
+                );
+
                 foreach ( $args as $k => $v ) {
                         if ( 'name' === $k || 'description' === $k ) {
                                 $v = stripslashes( $v );
                         }
+
+                        // Cast numeric strings as integers.
+                        if ( true === in_array( $k, $int_fields ) ) {
+                                $v = (int) $v;
+                        }
+
                         $this->{$k} = $v;
                 }
@@ -890 +901 @@
          *
          * @param string $field_name Name of the field to query the ID for.
-         * @return boolean
+         * @return int|null Field ID on success; null on failure.
          */
         public static function get_id_from_name( $field_name = '' ) {
@@ -903 +914 @@
                 $sql = $wpdb->prepare( "SELECT id FROM {$bp->profile->table_name_fields} WHERE name = %s AND parent_id = 0", $field_name );
 
-                return $wpdb->get_var( $sql );
+                $query = $wpdb->get_var( $sql );
+
+                return is_numeric( $query ) ? (int) $query : $query;
         }
 

trunk/src/bp-xprofile/classes/class-bp-xprofile-group.php

@@ -474 +474 @@
                 // Merge the field array back in with the group array.
                 foreach( (array) $groups as $group ) {
-
                         // Indexes may have been shifted after previous deletions, so we get a
                         // fresh one each time through the loop.
@@ -561 +560 @@
                                 }
                         }
+                }
+
+                // Integer casting.
+                foreach ( (array) $groups as $key => $data ) {
+                        $groups[ $key ]->id          = (int) $groups[ $key ]->id;
+                        $groups[ $key ]->group_order = (int) $groups[ $key ]->group_order;
+                        $groups[ $key ]->can_delete  = (int) $groups[ $key ]->can_delete;
                 }
 

trunk/src/bp-xprofile/classes/class-bp-xprofile-profiledata.php

@@ -98 +98 @@
 
                 if ( $profiledata ) {
-                        $this->id           = $profiledata->id;
-                        $this->user_id      = $profiledata->user_id;
-                        $this->field_id     = $profiledata->field_id;
+                        $this->id           = (int) $profiledata->id;
+                        $this->user_id      = (int) $profiledata->user_id;
+                        $this->field_id     = (int) $profiledata->field_id;
                         $this->value        = stripslashes( $profiledata->value );
                         $this->last_updated = $profiledata->last_updated;
@@ -106 +106 @@
                 } else {
                         // When no row is found, we'll need to set these properties manually.
-                        $this->field_id     = $field_id;
-                        $this->user_id      = $user_id;
+                        $this->field_id     = (int) $field_id;
+                        $this->user_id      = (int) $user_id;
                 }
         }
@@ -340 +340 @@
                 }
 
+                // Integer casting.
+                foreach ( (array) $data as $key => $d ) {
+                        if ( isset( $data[ $key ]->id ) ) {
+                                $data[ $key ]->id = (int) $data[ $key ]->id;
+                        }
+                        if ( isset( $data[ $key ]->user_id ) ) {
+                                $data[ $key ]->user_id  = (int) $data[ $key ]->user_id;
+                        }
+
+                        $data[ $key ]->field_id = (int) $data[ $key ]->field_id;
+                }
+
                 return $data;
         }
@@ -417 +429 @@
                 }
 
-                return $fielddata_id;
+                return (int) $fielddata_id;
         }
 
@@ -495 +507 @@
                 }
 
+                // Integer casting.
+                foreach ( (array) $data as $key => $d ) {
+                        if ( isset( $data[ $key ]->id ) ) {
+                                $data[ $key ]->id = (int) $data[ $key ]->id;
+                        }
+                        if ( isset( $data[ $key ]->user_id ) ) {
+                                $data[ $key ]->user_id  = (int) $data[ $key ]->user_id;
+                        }
+
+                        $data[ $key ]->field_id = (int) $data[ $key ]->field_id;
+                }
+
                 // If a single ID was passed, just return the value.
                 if ( $return_single_result ) {