Changeset 10592

Timestamp:

02/14/2016 01:48:59 PM (11 years ago)

Author:

dcavins

Message:

Profile: Improve validation in is_valid().

When checking a submitted array of values,
ensure that the foreach breaks when an
invalid value is encountered. Previously,
the foreach returned the validity of the
last element in the array.

Also update unit tests so that invalid values
appear in various positions in the array of
values to check.

Fixes #6884.

Location:

trunk

Files:

• src/bp-xprofile/classes/class-bp-xprofile-field-type.php (modified) (1 diff)
• tests/phpunit/testcases/xprofile/class-bp-xprofile-field-type.php (modified) (4 diffs)

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

@@ -207 +207 @@
                 }
 
-                // If there's a whitelist set, also check the $value.
+                // If there's a whitelist set, make sure that each value is a whitelisted value.
                 if ( ( true === $validated ) && ! empty( $values ) && ! empty( $this->validation_whitelist ) ) {
                         foreach ( (array) $values as $value ) {
-                                $validated = in_array( $value, $this->validation_whitelist, true );
+                                if ( ! in_array( $value, $this->validation_whitelist, true ) ) {
+                                        $validated = false;
+                                        break;
+                                }
                         }
                 }

trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-field-type.php

@@ -39 +39 @@
                 $this->assertTrue( $field->is_valid( array( 'cheese', 'pepporoni' ) ) );
                 $this->assertTrue( $field->is_valid( array( 'cheese' ) ) );
-                $this->assertFalse( $field->is_valid( array( 'cheese', 'pepporoni', 'pinapple' ) ) );
+                $this->assertFalse( $field->is_valid( array( 'cheese', 'pinapple', 'pepporoni' ) ) );
                 $this->assertFalse( $field->is_valid( array( 'pinapple' ) ) );
         }
@@ -105 +105 @@
                 $this->assertTrue( $field->is_valid( array( 123 ) ) );
                 $this->assertTrue( $field->is_valid( array( 456 ) ) );
-                $this->assertFalse( $field->is_valid( array( 123, 456, 789 ) ) );
+                $this->assertFalse( $field->is_valid( array( 789, 456, 123 ) ) );
                 $this->assertFalse( $field->is_valid( array( 789 ) ) );
         }
@@ -115 +115 @@
                 $this->assertTrue( $field->is_valid( array( 'cheese', 'pepporoni' ) ) );
                 $this->assertTrue( $field->is_valid( array( 'cheese' ) ) );
-                $this->assertFalse( $field->is_valid( array( 'cheese', 'pepporoni', 'pinapple' ) ) );
+                $this->assertFalse( $field->is_valid( array(  'pinapple', 'cheese', 'pepporoni' ) ) );
                 $this->assertFalse( $field->is_valid( array( 'pinapple' ) ) );
                 $this->assertFalse( $field->is_valid( '' ) );
@@ -133 +133 @@
                 $this->assertTrue( $field->is_valid( array( 'cheese', 'pepporoni' ) ) );
                 $this->assertTrue( $field->is_valid( array( 'cheese' ) ) );
-                $this->assertFalse( $field->is_valid( array( 'cheese', 'pepporoni', 'pinapple' ) ) );
+                $this->assertFalse( $field->is_valid( array( 'pepporoni', 'cheese', 'pinapple' ) ) );
                 $this->assertFalse( $field->is_valid( array( 'pinapple' ) ) );
                 $this->assertFalse( $field->is_valid( '' ) );