eventespresso / event-espresso-core

core/db_models/fields/EE_Maybe_Serialized_Simple_HTML_Field.php

Indentation +51 added lines, -51 removed lines

@@ -11,59 +11,59 @@
  */
 class EE_Maybe_Serialized_Simple_HTML_Field extends EE_Maybe_Serialized_Text_Field
 {
-    /**
-     * removes all non-basic tags when setting
-     *
-     * @param string $value_inputted_for_field_on_model_object
-     * @return string
-     */
-    public function prepare_for_set($value_inputted_for_field_on_model_object)
-    {
-        return parent::prepare_for_set($this->_remove_tags($value_inputted_for_field_on_model_object));
-    }
+	/**
+	 * removes all non-basic tags when setting
+	 *
+	 * @param string $value_inputted_for_field_on_model_object
+	 * @return string
+	 */
+	public function prepare_for_set($value_inputted_for_field_on_model_object)
+	{
+		return parent::prepare_for_set($this->_remove_tags($value_inputted_for_field_on_model_object));
+	}
 
-    /**
-     * Remove any non-"simple" html tags. @see EE_Simple_HTML_Field
-     *
-     * @param array|string $value
-     * @return array|string
-     */
-    protected function _remove_tags($value)
-    {
-        if (is_array($value)) {
-            foreach ($value as $key => $v) {
-                $value[ $key ] = $this->_remove_tags($v);
-            }
-        } elseif (is_string($value)) {
-            $value = wp_kses("$value", $this->_get_allowed_tags());
-        }
-        return $value;
-    }
+	/**
+	 * Remove any non-"simple" html tags. @see EE_Simple_HTML_Field
+	 *
+	 * @param array|string $value
+	 * @return array|string
+	 */
+	protected function _remove_tags($value)
+	{
+		if (is_array($value)) {
+			foreach ($value as $key => $v) {
+				$value[ $key ] = $this->_remove_tags($v);
+			}
+		} elseif (is_string($value)) {
+			$value = wp_kses("$value", $this->_get_allowed_tags());
+		}
+		return $value;
+	}
 
-    /**
-     * In case unsafe data somehow got inserted into the database, we want to remove tags again
-     *
-     * @param array|string $value_found_in_db_for_model_object
-     * @return array|string
-     */
-    public function prepare_for_set_from_db($value_found_in_db_for_model_object)
-    {
-        return $this->_remove_tags(parent::prepare_for_set_from_db($value_found_in_db_for_model_object));
-    }
+	/**
+	 * In case unsafe data somehow got inserted into the database, we want to remove tags again
+	 *
+	 * @param array|string $value_found_in_db_for_model_object
+	 * @return array|string
+	 */
+	public function prepare_for_set_from_db($value_found_in_db_for_model_object)
+	{
+		return $this->_remove_tags(parent::prepare_for_set_from_db($value_found_in_db_for_model_object));
+	}
 
 
-    /**
-     * Determines what tags to allow in this model field
-     *
-     * @global array $allowedtags
-     * @return array
-     */
-    public function _get_allowed_tags()
-    {
-        return apply_filters(
-            'FHEE__EE_Maybe_Serialized_Simple_HTML_Field___get_allowed_tags',
-            EEH_HTML::get_simple_tags(),
-            $this
-        );
-    }
+	/**
+	 * Determines what tags to allow in this model field
+	 *
+	 * @global array $allowedtags
+	 * @return array
+	 */
+	public function _get_allowed_tags()
+	{
+		return apply_filters(
+			'FHEE__EE_Maybe_Serialized_Simple_HTML_Field___get_allowed_tags',
+			EEH_HTML::get_simple_tags(),
+			$this
+		);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     {
         if (is_array($value)) {
             foreach ($value as $key => $v) {
-                $value[ $key ] = $this->_remove_tags($v);
+                $value[$key] = $this->_remove_tags($v);
             }
         } elseif (is_string($value)) {
             $value = wp_kses("$value", $this->_get_allowed_tags());

core/db_models/fields/EE_DB_Only_Field_Base.php

Indentation +22 added lines, -22 removed lines

@@ -10,28 +10,28 @@
 abstract class EE_DB_Only_Field_Base extends EE_Model_Field_Base
 {
 
-    /**
-     * @param string $table_column
-     * @param string $nicename
-     * @param bool   $nullable
-     * @param null   $default_value
-     */
-    public function __construct($table_column, $nicename, $nullable, $default_value = null)
-    {
-        parent::__construct($table_column, $nicename, $nullable, $default_value);
-        $this->setSchemaReadOnly(true);
-    }
+	/**
+	 * @param string $table_column
+	 * @param string $nicename
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 */
+	public function __construct($table_column, $nicename, $nullable, $default_value = null)
+	{
+		parent::__construct($table_column, $nicename, $nullable, $default_value);
+		$this->setSchemaReadOnly(true);
+	}
 
 
-    /**
-     * All these children classes are for the db-only (meaning, we should select them
-     * on get_all queries, update, delete, and will still want to set their default value
-     * on inserts, but the model object won't have reference to these fields)
-     *
-     * @return boolean
-     */
-    public function is_db_only_field()
-    {
-        return true;
-    }
+	/**
+	 * All these children classes are for the db-only (meaning, we should select them
+	 * on get_all queries, update, delete, and will still want to set their default value
+	 * on inserts, but the model object won't have reference to these fields)
+	 *
+	 * @return boolean
+	 */
+	public function is_db_only_field()
+	{
+		return true;
+	}
 }

core/db_models/fields/EE_Foreign_Key_String_Field.php

Indentation +13 added lines, -13 removed lines

@@ -3,17 +3,17 @@
 class EE_Foreign_Key_String_Field extends EE_Foreign_Key_Field_Base
 {
 
-    /**
-     * removes all tags when setting
-     *
-     * @param string $value_inputted_for_field_on_model_object
-     * @return string
-     */
-    public function prepare_for_set($value_inputted_for_field_on_model_object)
-    {
-        if ($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)) {
-            $value_inputted_for_field_on_model_object = $value_inputted_for_field_on_model_object->ID();
-        }
-        return strtoupper(wp_strip_all_tags($value_inputted_for_field_on_model_object));
-    }
+	/**
+	 * removes all tags when setting
+	 *
+	 * @param string $value_inputted_for_field_on_model_object
+	 * @return string
+	 */
+	public function prepare_for_set($value_inputted_for_field_on_model_object)
+	{
+		if ($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)) {
+			$value_inputted_for_field_on_model_object = $value_inputted_for_field_on_model_object->ID();
+		}
+		return strtoupper(wp_strip_all_tags($value_inputted_for_field_on_model_object));
+	}
 }

core/db_models/fields/EE_Enum_Text_Field.php

Indentation +126 added lines, -126 removed lines

@@ -11,130 +11,130 @@
 class EE_Enum_Text_Field extends EE_Text_Field_Base
 {
 
-    /**
-     * @var array $_allowed_enum_values
-     */
-    public $_allowed_enum_values;
-
-    /**
-     * @param string  $table_column
-     * @param string  $nice_name
-     * @param boolean $nullable
-     * @param mixed   $default_value
-     * @param array   $allowed_enum_values keys are values to be used in the DB, values are how they should be displayed
-     */
-    public function __construct($table_column, $nice_name, $nullable, $default_value, $allowed_enum_values)
-    {
-        $this->_allowed_enum_values = $allowed_enum_values;
-        parent::__construct($table_column, $nice_name, $nullable, $default_value);
-        $this->setSchemaType('object');
-    }
-
-
-
-    /**
-     * Returns the list of allowed enum options, but filterable.
-     * This is used internally
-     *
-     * @return array
-     */
-    protected function _allowed_enum_values()
-    {
-        return apply_filters(
-            'FHEE__EE_Enum_Text_Field___allowed_enum_options',
-            $this->_allowed_enum_values,
-            $this
-        );
-    }
-
-
-
-    /**
-     * When setting, just verify that the value being used matches what we've defined as allowable enum values.
-     * If not, throw an error (but if WP_DEBUG is false, just set the value to default).
-     *
-     * @param string $value_inputted_for_field_on_model_object
-     * @return string
-     * @throws EE_Error
-     */
-    public function prepare_for_set($value_inputted_for_field_on_model_object)
-    {
-        if ($value_inputted_for_field_on_model_object !== null
-            && ! array_key_exists($value_inputted_for_field_on_model_object, $this->_allowed_enum_values())
-        ) {
-            if (defined('WP_DEBUG') && WP_DEBUG) {
-                $msg = sprintf(
-                    __('System is assigning incompatible value "%1$s" to field "%2$s"', 'event_espresso'),
-                    $value_inputted_for_field_on_model_object,
-                    $this->_name
-                );
-                $msg2 = sprintf(
-                    __('Allowed values for "%1$s" are "%2$s". You provided: "%3$s"', 'event_espresso'),
-                    $this->_name,
-                    implode(', ', array_keys($this->_allowed_enum_values())),
-                    $value_inputted_for_field_on_model_object
-                );
-                EE_Error::add_error("{$msg}||{$msg2}", __FILE__, __FUNCTION__, __LINE__);
-            }
-            return $this->get_default_value();
-        }
-        return $value_inputted_for_field_on_model_object;
-    }
-
-
-    /**
-     * Gets the pretty version of the enum's value.
-     *
-     * @param     int |string $value_on_field_to_be_outputted
-     * @param    null         $schema
-     * @return    string
-     */
-    public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
-    {
-        $options = $this->_allowed_enum_values();
-        if (isset($options[ $value_on_field_to_be_outputted ])) {
-            return $options[ $value_on_field_to_be_outputted ];
-        } else {
-            return $value_on_field_to_be_outputted;
-        }
-    }
-
-
-
-    /**
-     * When retrieving something from the DB, don't enforce the enum's options. If it's in the DB, we just have to live
-     * with that. Note also: when we're saving to the DB again, we also don't enforce the enum options. It's ONLY
-     * when we're receiving USER input from prepare_for_set() that we enforce the enum options.
-     *
-     * @param mixed $value_in_db
-     * @return mixed
-     */
-    public function prepare_for_set_from_db($value_in_db)
-    {
-        return $value_in_db;
-    }
-
-
-    public function getSchemaProperties()
-    {
-        return array(
-            'raw' => array(
-                'description' =>  sprintf(
-                    __('%s - the value in the database.', 'event_espresso'),
-                    $this->get_nicename()
-                ),
-                'type' => 'string',
-                'enum' => array_keys($this->_allowed_enum_values)
-            ),
-            'pretty' => array(
-                'description' =>  sprintf(
-                    __('%s - the value for display.', 'event_espresso'),
-                    $this->get_nicename()
-                ),
-                'type' => 'string',
-                'enum' => array_values($this->_allowed_enum_values),
-                'read_only' => true
-            )
-        );
-    }
+	/**
+	 * @var array $_allowed_enum_values
+	 */
+	public $_allowed_enum_values;
+
+	/**
+	 * @param string  $table_column
+	 * @param string  $nice_name
+	 * @param boolean $nullable
+	 * @param mixed   $default_value
+	 * @param array   $allowed_enum_values keys are values to be used in the DB, values are how they should be displayed
+	 */
+	public function __construct($table_column, $nice_name, $nullable, $default_value, $allowed_enum_values)
+	{
+		$this->_allowed_enum_values = $allowed_enum_values;
+		parent::__construct($table_column, $nice_name, $nullable, $default_value);
+		$this->setSchemaType('object');
+	}
+
+
+
+	/**
+	 * Returns the list of allowed enum options, but filterable.
+	 * This is used internally
+	 *
+	 * @return array
+	 */
+	protected function _allowed_enum_values()
+	{
+		return apply_filters(
+			'FHEE__EE_Enum_Text_Field___allowed_enum_options',
+			$this->_allowed_enum_values,
+			$this
+		);
+	}
+
+
+
+	/**
+	 * When setting, just verify that the value being used matches what we've defined as allowable enum values.
+	 * If not, throw an error (but if WP_DEBUG is false, just set the value to default).
+	 *
+	 * @param string $value_inputted_for_field_on_model_object
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function prepare_for_set($value_inputted_for_field_on_model_object)
+	{
+		if ($value_inputted_for_field_on_model_object !== null
+			&& ! array_key_exists($value_inputted_for_field_on_model_object, $this->_allowed_enum_values())
+		) {
+			if (defined('WP_DEBUG') && WP_DEBUG) {
+				$msg = sprintf(
+					__('System is assigning incompatible value "%1$s" to field "%2$s"', 'event_espresso'),
+					$value_inputted_for_field_on_model_object,
+					$this->_name
+				);
+				$msg2 = sprintf(
+					__('Allowed values for "%1$s" are "%2$s". You provided: "%3$s"', 'event_espresso'),
+					$this->_name,
+					implode(', ', array_keys($this->_allowed_enum_values())),
+					$value_inputted_for_field_on_model_object
+				);
+				EE_Error::add_error("{$msg}||{$msg2}", __FILE__, __FUNCTION__, __LINE__);
+			}
+			return $this->get_default_value();
+		}
+		return $value_inputted_for_field_on_model_object;
+	}
+
+
+	/**
+	 * Gets the pretty version of the enum's value.
+	 *
+	 * @param     int |string $value_on_field_to_be_outputted
+	 * @param    null         $schema
+	 * @return    string
+	 */
+	public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
+	{
+		$options = $this->_allowed_enum_values();
+		if (isset($options[ $value_on_field_to_be_outputted ])) {
+			return $options[ $value_on_field_to_be_outputted ];
+		} else {
+			return $value_on_field_to_be_outputted;
+		}
+	}
+
+
+
+	/**
+	 * When retrieving something from the DB, don't enforce the enum's options. If it's in the DB, we just have to live
+	 * with that. Note also: when we're saving to the DB again, we also don't enforce the enum options. It's ONLY
+	 * when we're receiving USER input from prepare_for_set() that we enforce the enum options.
+	 *
+	 * @param mixed $value_in_db
+	 * @return mixed
+	 */
+	public function prepare_for_set_from_db($value_in_db)
+	{
+		return $value_in_db;
+	}
+
+
+	public function getSchemaProperties()
+	{
+		return array(
+			'raw' => array(
+				'description' =>  sprintf(
+					__('%s - the value in the database.', 'event_espresso'),
+					$this->get_nicename()
+				),
+				'type' => 'string',
+				'enum' => array_keys($this->_allowed_enum_values)
+			),
+			'pretty' => array(
+				'description' =>  sprintf(
+					__('%s - the value for display.', 'event_espresso'),
+					$this->get_nicename()
+				),
+				'type' => 'string',
+				'enum' => array_values($this->_allowed_enum_values),
+				'read_only' => true
+			)
+		);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -89,8 +89,8 @@
     public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
     {
         $options = $this->_allowed_enum_values();
-        if (isset($options[ $value_on_field_to_be_outputted ])) {
-            return $options[ $value_on_field_to_be_outputted ];
+        if (isset($options[$value_on_field_to_be_outputted])) {
+            return $options[$value_on_field_to_be_outputted];
         } else {
             return $value_on_field_to_be_outputted;
         }

core/db_models/fields/EE_Foreign_Key_Int_Field.php

Indentation +29 added lines, -29 removed lines

@@ -3,36 +3,36 @@
 class EE_Foreign_Key_Int_Field extends EE_Foreign_Key_Field_Base
 {
 
-    /**
-     * @param string  $table_column  name fo column for field
-     * @param string  $nicename      should eb internationalized with __('blah','event_espresso')
-     * @param boolean $nullable
-     * @param mixed   $default_value if this is a integer field, it shoudl be an int. if it's a string field, it shoul
-     *                               dbe a string
-     * @param string  $model_name    eg 'Event','Answer','Term', etc. Basically its the model class's name without the
-     *                               "EEM_"
-     */
-    public function __construct($table_column, $nicename, $nullable, $default_value, $model_name)
-    {
-        parent::__construct($table_column, $nicename, $nullable, $default_value, $model_name);
-        $this->setSchemaType('integer');
-    }
+	/**
+	 * @param string  $table_column  name fo column for field
+	 * @param string  $nicename      should eb internationalized with __('blah','event_espresso')
+	 * @param boolean $nullable
+	 * @param mixed   $default_value if this is a integer field, it shoudl be an int. if it's a string field, it shoul
+	 *                               dbe a string
+	 * @param string  $model_name    eg 'Event','Answer','Term', etc. Basically its the model class's name without the
+	 *                               "EEM_"
+	 */
+	public function __construct($table_column, $nicename, $nullable, $default_value, $model_name)
+	{
+		parent::__construct($table_column, $nicename, $nullable, $default_value, $model_name);
+		$this->setSchemaType('integer');
+	}
 
 
-    /**
-     * @param int|EE_Base_Class $value_inputted_for_field_on_model_object
-     * @return int
-     */
-    public function prepare_for_set($value_inputted_for_field_on_model_object)
-    {
-        if ($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)) {
-            $value_inputted_for_field_on_model_object = $value_inputted_for_field_on_model_object->ID();
-        }
-        return absint($value_inputted_for_field_on_model_object);
-    }
+	/**
+	 * @param int|EE_Base_Class $value_inputted_for_field_on_model_object
+	 * @return int
+	 */
+	public function prepare_for_set($value_inputted_for_field_on_model_object)
+	{
+		if ($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)) {
+			$value_inputted_for_field_on_model_object = $value_inputted_for_field_on_model_object->ID();
+		}
+		return absint($value_inputted_for_field_on_model_object);
+	}
 
-    public function prepare_for_set_from_db($value_found_in_db_for_model_object)
-    {
-        return intval($value_found_in_db_for_model_object);
-    }
+	public function prepare_for_set_from_db($value_found_in_db_for_model_object)
+	{
+		return intval($value_found_in_db_for_model_object);
+	}
 }

core/db_models/strategies/EE_Default_Where_Conditions.strategy.php

Spacing +7 added lines, -7 removed lines

@@ -112,24 +112,24 @@ 
     public function prepare_where_conditions_for_querying($where_conditions, $model_relation_chain)
     {
         $where_conditions_with_model_relation_chain_prefixes = array();
-        if (! is_array($where_conditions)) {
+        if ( ! is_array($where_conditions)) {
             $where_conditions = array();
         }
         foreach ($where_conditions as $key => $value) {
-            if (in_array($key, array( 'OR', 'AND', 'NOT' ))
+            if (in_array($key, array('OR', 'AND', 'NOT'))
                 || strpos($key, 'OR*') !== false
                 || strpos($key, 'AND*') !== false
                 || strpos($key, 'NOT*') !== false
             ) {
-                $where_conditions_with_model_relation_chain_prefixes[ $key ] = $this->prepare_where_conditions_for_querying(
+                $where_conditions_with_model_relation_chain_prefixes[$key] = $this->prepare_where_conditions_for_querying(
                     $value,
                     $model_relation_chain
                 );
             } else {
                 if ($model_relation_chain != ''
-                    && $model_relation_chain[ strlen($model_relation_chain) - 1 ] != '.'
+                    && $model_relation_chain[strlen($model_relation_chain) - 1] != '.'
                 ) {
-                    $model_relation_chain = $model_relation_chain . ".";
+                    $model_relation_chain = $model_relation_chain.".";
                 }
                 // check for the current user id place holder, and if present change it
                 if ($value === self::current_user_placeholder) {
@@ -137,7 +137,7 @@ 
                 }
                 // check for user field placeholder
                 if ($key == self::user_field_name_placeholder) {
-                    if (! $this->_model->wp_user_field_name()) {
+                    if ( ! $this->_model->wp_user_field_name()) {
                         throw new EE_Error(
                             sprintf(
                                 __(
@@ -150,7 +150,7 @@ 
                     }
                     $key = $this->_model->wp_user_field_name();
                 }
-                $where_conditions_with_model_relation_chain_prefixes[ $model_relation_chain . $key ] = $value;
+                $where_conditions_with_model_relation_chain_prefixes[$model_relation_chain.$key] = $value;
             }
         }
         return $where_conditions_with_model_relation_chain_prefixes;

Indentation +140 added lines, -140 removed lines

@@ -3,7 +3,7 @@ 
 /**
  *
  * Class EE_Default_Where_Conditions
-  *
+ *
  * Strategy to be used for getting default where conditions for EEM_Base children.
  * Should be initialized and set on construction of model
  *
@@ -16,143 +16,143 @@ 
 class EE_Default_Where_Conditions
 {
 
-    /**
-     * This const can be used in EE_Default_Where_Conditions values, and at the time of querying it will be
-     * replaced with the current user's ID (because we don't want to use the current user's ID at time of
-     * initializing the models because it's too early)
-     */
-    const current_user_placeholder = '%$current_user_placeholder_should_be_replaced_automatically$%';
-
-    /**
-     * This const can be used in EE_Default_Where_Conditions where parameters as the name
-     * of the user field. When we are actually generating the where conditions it will be
-     * replaced with the model's wp user fieldname
-     */
-    const user_field_name_placeholder = '%$user_field_name_placeholder$%';
-
-    /**
-     * Model for which this strategy find default where conditions
-     * @var EEM_Base
-     */
-    protected $_model;
-
-    /**
-     * Where conditions specified on construction
-     * @var array
-     */
-    protected $_where_conditions_provided = array();
-
-    /**
-     * Custom where conditions. Model relation chains will be automatically added
-     * onto any field names
-     * @param array $custom_where_conditions
-     */
-    public function __construct($custom_where_conditions = array())
-    {
-        $this->_where_conditions_provided = $custom_where_conditions;
-    }
-
-
-
-    /**
-     * finalizes construction of the strategy for use in getting default where conditions
-     * for querying of the model.
-     * @param EEM_Base $model
-     */
-    public function _finalize_construct(EEM_Base $model)
-    {
-        $this->_model = $model;
-    }
-
-
-
-    /**
-     * Returns the where conditions explicitly passed in the constructor
-     * @return array
-     */
-    public function get_where_conditions_provided()
-    {
-        return $this->_where_conditions_provided;
-    }
-
-
-
-    /**
-     * Gets the where conditions to be added onto the query
-     * @param string $model_relation_chain
-     * @return array @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md#0-where-conditions
-     */
-    public function get_default_where_conditions($model_relation_chain = '')
-    {
-        return $this->prepare_where_conditions_for_querying(array_merge($this->_get_default_where_conditions(), $this->get_where_conditions_provided()), $model_relation_chain);
-    }
-
-
-
-    /**
-     * Gets the default where conditions that are specific to this child of EE_Default_Where_Conditions.
-     * Adding model relation chains is handled by the public method get_default_where_conditions
-     * @return array
-     */
-    protected function _get_default_where_conditions()
-    {
-        return array();
-    }
-
-
-
-    /**
-     * Takes the default query parameters, and traverses them, adding the model relation chain
-     * onto them (intelligently doesn't do that to logic query params like NOT, OR, and AND)
-     * @param array $where_conditions
-     * @param string $model_relation_chain
-     * @return array
-     * @throws \EE_Error
-     */
-    public function prepare_where_conditions_for_querying($where_conditions, $model_relation_chain)
-    {
-        $where_conditions_with_model_relation_chain_prefixes = array();
-        if (! is_array($where_conditions)) {
-            $where_conditions = array();
-        }
-        foreach ($where_conditions as $key => $value) {
-            if (in_array($key, array( 'OR', 'AND', 'NOT' ))
-                || strpos($key, 'OR*') !== false
-                || strpos($key, 'AND*') !== false
-                || strpos($key, 'NOT*') !== false
-            ) {
-                $where_conditions_with_model_relation_chain_prefixes[ $key ] = $this->prepare_where_conditions_for_querying(
-                    $value,
-                    $model_relation_chain
-                );
-            } else {
-                if ($model_relation_chain != ''
-                    && $model_relation_chain[ strlen($model_relation_chain) - 1 ] != '.'
-                ) {
-                    $model_relation_chain = $model_relation_chain . ".";
-                }
-                // check for the current user id place holder, and if present change it
-                if ($value === self::current_user_placeholder) {
-                    $value = get_current_user_id();
-                }
-                // check for user field placeholder
-                if ($key == self::user_field_name_placeholder) {
-                    if (! $this->_model->wp_user_field_name()) {
-                        throw new EE_Error(
-                            sprintf(
-                                __(
-                                    'There is no foreign key to the WP_User model on model %s. Please either modify your default where conditions, add a _model_chain_to_wp_user onto the model, or a proper EE_WP_User_Field onto the model',
-                                    'event_espresso'
-                                ),
-                                $this->_model->get_this_model_name()
-                            )
-                        );
-                    }
-                    $key = $this->_model->wp_user_field_name();
-                }
-                $where_conditions_with_model_relation_chain_prefixes[ $model_relation_chain . $key ] = $value;
-            }
-        }
-        return $where_conditions_with_model_relation_chain_prefixes;
-    }
+	/**
+	 * This const can be used in EE_Default_Where_Conditions values, and at the time of querying it will be
+	 * replaced with the current user's ID (because we don't want to use the current user's ID at time of
+	 * initializing the models because it's too early)
+	 */
+	const current_user_placeholder = '%$current_user_placeholder_should_be_replaced_automatically$%';
+
+	/**
+	 * This const can be used in EE_Default_Where_Conditions where parameters as the name
+	 * of the user field. When we are actually generating the where conditions it will be
+	 * replaced with the model's wp user fieldname
+	 */
+	const user_field_name_placeholder = '%$user_field_name_placeholder$%';
+
+	/**
+	 * Model for which this strategy find default where conditions
+	 * @var EEM_Base
+	 */
+	protected $_model;
+
+	/**
+	 * Where conditions specified on construction
+	 * @var array
+	 */
+	protected $_where_conditions_provided = array();
+
+	/**
+	 * Custom where conditions. Model relation chains will be automatically added
+	 * onto any field names
+	 * @param array $custom_where_conditions
+	 */
+	public function __construct($custom_where_conditions = array())
+	{
+		$this->_where_conditions_provided = $custom_where_conditions;
+	}
+
+
+
+	/**
+	 * finalizes construction of the strategy for use in getting default where conditions
+	 * for querying of the model.
+	 * @param EEM_Base $model
+	 */
+	public function _finalize_construct(EEM_Base $model)
+	{
+		$this->_model = $model;
+	}
+
+
+
+	/**
+	 * Returns the where conditions explicitly passed in the constructor
+	 * @return array
+	 */
+	public function get_where_conditions_provided()
+	{
+		return $this->_where_conditions_provided;
+	}
+
+
+
+	/**
+	 * Gets the where conditions to be added onto the query
+	 * @param string $model_relation_chain
+	 * @return array @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md#0-where-conditions
+	 */
+	public function get_default_where_conditions($model_relation_chain = '')
+	{
+		return $this->prepare_where_conditions_for_querying(array_merge($this->_get_default_where_conditions(), $this->get_where_conditions_provided()), $model_relation_chain);
+	}
+
+
+
+	/**
+	 * Gets the default where conditions that are specific to this child of EE_Default_Where_Conditions.
+	 * Adding model relation chains is handled by the public method get_default_where_conditions
+	 * @return array
+	 */
+	protected function _get_default_where_conditions()
+	{
+		return array();
+	}
+
+
+
+	/**
+	 * Takes the default query parameters, and traverses them, adding the model relation chain
+	 * onto them (intelligently doesn't do that to logic query params like NOT, OR, and AND)
+	 * @param array $where_conditions
+	 * @param string $model_relation_chain
+	 * @return array
+	 * @throws \EE_Error
+	 */
+	public function prepare_where_conditions_for_querying($where_conditions, $model_relation_chain)
+	{
+		$where_conditions_with_model_relation_chain_prefixes = array();
+		if (! is_array($where_conditions)) {
+			$where_conditions = array();
+		}
+		foreach ($where_conditions as $key => $value) {
+			if (in_array($key, array( 'OR', 'AND', 'NOT' ))
+				|| strpos($key, 'OR*') !== false
+				|| strpos($key, 'AND*') !== false
+				|| strpos($key, 'NOT*') !== false
+			) {
+				$where_conditions_with_model_relation_chain_prefixes[ $key ] = $this->prepare_where_conditions_for_querying(
+					$value,
+					$model_relation_chain
+				);
+			} else {
+				if ($model_relation_chain != ''
+					&& $model_relation_chain[ strlen($model_relation_chain) - 1 ] != '.'
+				) {
+					$model_relation_chain = $model_relation_chain . ".";
+				}
+				// check for the current user id place holder, and if present change it
+				if ($value === self::current_user_placeholder) {
+					$value = get_current_user_id();
+				}
+				// check for user field placeholder
+				if ($key == self::user_field_name_placeholder) {
+					if (! $this->_model->wp_user_field_name()) {
+						throw new EE_Error(
+							sprintf(
+								__(
+									'There is no foreign key to the WP_User model on model %s. Please either modify your default where conditions, add a _model_chain_to_wp_user onto the model, or a proper EE_WP_User_Field onto the model',
+									'event_espresso'
+								),
+								$this->_model->get_this_model_name()
+							)
+						);
+					}
+					$key = $this->_model->wp_user_field_name();
+				}
+				$where_conditions_with_model_relation_chain_prefixes[ $model_relation_chain . $key ] = $value;
+			}
+		}
+		return $where_conditions_with_model_relation_chain_prefixes;
+	}
 }

core/db_models/strategies/EE_Restriction_Generator_Global.strategy.php

Indentation +41 added lines, -41 removed lines

@@ -20,47 +20,47 @@
 class EE_Restriction_Generator_Global extends EE_Restriction_Generator_Base
 {
 
-    /**
-     * name of the model field that indicates whether or not a model object is "global"
-     * @var string
-     */
-    protected $_global_field_name;
-    /**
-     *
-     * @param string $global_field_name name of the model field that indicates whether or not
-     * a model object is "global"
-     */
-    public function __construct($global_field_name)
-    {
-        $this->_global_field_name = $global_field_name;
-    }
+	/**
+	 * name of the model field that indicates whether or not a model object is "global"
+	 * @var string
+	 */
+	protected $_global_field_name;
+	/**
+	 *
+	 * @param string $global_field_name name of the model field that indicates whether or not
+	 * a model object is "global"
+	 */
+	public function __construct($global_field_name)
+	{
+		$this->_global_field_name = $global_field_name;
+	}
 
-    /**
-     * @return \EE_Default_Where_Conditions
-     */
-    protected function _generate_restrictions()
-    {
+	/**
+	 * @return \EE_Default_Where_Conditions
+	 */
+	protected function _generate_restrictions()
+	{
 
-        // if there are no standard caps for this model, then for now all we know is
-        // if they need the default cap to access this
-        if (! $this->model()->cap_slug()) {
-            return array(
-                EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
-            );
-        }
-        return array(
-            EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) => new EE_Return_None_Where_Conditions(),
-            EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') => new EE_Default_Where_Conditions(array(
-                // I need to be the owner, or it must be a global item
-                'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') => array(
-                    EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
-                    $this->_global_field_name                                => true
-                )
-            )),
-            EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_global') => new EE_Default_Where_Conditions(array(
-                    // it mustn't be global
-                    $this->_global_field_name => false
-                ))
-        );
-    }
+		// if there are no standard caps for this model, then for now all we know is
+		// if they need the default cap to access this
+		if (! $this->model()->cap_slug()) {
+			return array(
+				EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
+			);
+		}
+		return array(
+			EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) => new EE_Return_None_Where_Conditions(),
+			EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') => new EE_Default_Where_Conditions(array(
+				// I need to be the owner, or it must be a global item
+				'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') => array(
+					EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
+					$this->_global_field_name                                => true
+				)
+			)),
+			EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_global') => new EE_Default_Where_Conditions(array(
+					// it mustn't be global
+					$this->_global_field_name => false
+				))
+		);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -43,21 +43,21 @@
 
         // if there are no standard caps for this model, then for now all we know is
         // if they need the default cap to access this
-        if (! $this->model()->cap_slug()) {
+        if ( ! $this->model()->cap_slug()) {
             return array(
                 EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
             );
         }
         return array(
             EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) => new EE_Return_None_Where_Conditions(),
-            EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') => new EE_Default_Where_Conditions(array(
+            EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others') => new EE_Default_Where_Conditions(array(
                 // I need to be the owner, or it must be a global item
-                'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') => array(
+                'OR*no_'.EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others') => array(
                     EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
                     $this->_global_field_name                                => true
                 )
             )),
-            EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_global') => new EE_Default_Where_Conditions(array(
+            EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_global') => new EE_Default_Where_Conditions(array(
                     // it mustn't be global
                     $this->_global_field_name => false
                 ))

core/db_models/strategies/EE_Restriction_Generator_Protected.strategy.php

Indentation +42 added lines, -42 removed lines

@@ -25,48 +25,48 @@
 class EE_Restriction_Generator_Protected extends EE_Restriction_Generator_Base
 {
 
-    /**
-     * @return \EE_Default_Where_Conditions
-     */
-    protected function _generate_restrictions()
-    {
+	/**
+	 * @return \EE_Default_Where_Conditions
+	 */
+	protected function _generate_restrictions()
+	{
 
-        // if there are no standard caps for this model, then for now all we know
-        // if they need the default cap to access this
-        if (! $this->model()->cap_slug()) {
-            return array(
-                EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
-            );
-        }
+		// if there are no standard caps for this model, then for now all we know
+		// if they need the default cap to access this
+		if (! $this->model()->cap_slug()) {
+			return array(
+				EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
+			);
+		}
 
-        $restrictions = array();
-        // does the basic cap exist? (eg 'ee_read_registrations')
-        if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action())) {
-            $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) ] = new EE_Return_None_Where_Conditions();
-            // does the others cap exist? (eg 'ee_read_others_registrations')
-            if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action() . '_others')) {// both caps exist
-                $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') ] = new EE_Default_Where_Conditions(
-                    array(
-                        EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder
-                    )
-                );
-                // does the private cap exist (eg 'ee_read_others_private_events')
-                if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action() . '_private') && $this->model() instanceof EEM_CPT_Base) {
-                    // if they have basic and others, but not private, restrict them to see theirs and others' that aren't private
-                    $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_private') ] = new EE_Default_Where_Conditions(
-                        array(
-                            'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_private') => array(
-                                EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
-                                'status' => array( '!=', 'private' )
-                            )
-                        )
-                    );
-                }
-            }
-        } else {
-            // there is no basic cap. So they can only access this if they have the default admin cap
-            $restrictions[ EE_Restriction_Generator_Base::get_default_restrictions_cap() ] = new EE_Return_None_Where_Conditions();
-        }
-        return $restrictions;
-    }
+		$restrictions = array();
+		// does the basic cap exist? (eg 'ee_read_registrations')
+		if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action())) {
+			$restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) ] = new EE_Return_None_Where_Conditions();
+			// does the others cap exist? (eg 'ee_read_others_registrations')
+			if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action() . '_others')) {// both caps exist
+				$restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') ] = new EE_Default_Where_Conditions(
+					array(
+						EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder
+					)
+				);
+				// does the private cap exist (eg 'ee_read_others_private_events')
+				if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action() . '_private') && $this->model() instanceof EEM_CPT_Base) {
+					// if they have basic and others, but not private, restrict them to see theirs and others' that aren't private
+					$restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_private') ] = new EE_Default_Where_Conditions(
+						array(
+							'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_private') => array(
+								EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
+								'status' => array( '!=', 'private' )
+							)
+						)
+					);
+				}
+			}
+		} else {
+			// there is no basic cap. So they can only access this if they have the default admin cap
+			$restrictions[ EE_Restriction_Generator_Base::get_default_restrictions_cap() ] = new EE_Return_None_Where_Conditions();
+		}
+		return $restrictions;
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -33,7 +33,7 @@ 
 
         // if there are no standard caps for this model, then for now all we know
         // if they need the default cap to access this
-        if (! $this->model()->cap_slug()) {
+        if ( ! $this->model()->cap_slug()) {
             return array(
                 EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
             );
@@ -42,22 +42,22 @@ 
         $restrictions = array();
         // does the basic cap exist? (eg 'ee_read_registrations')
         if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action())) {
-            $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) ] = new EE_Return_None_Where_Conditions();
+            $restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action())] = new EE_Return_None_Where_Conditions();
             // does the others cap exist? (eg 'ee_read_others_registrations')
-            if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action() . '_others')) {// both caps exist
-                $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') ] = new EE_Default_Where_Conditions(
+            if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action().'_others')) {// both caps exist
+                $restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others')] = new EE_Default_Where_Conditions(
                     array(
                         EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder
                     )
                 );
                 // does the private cap exist (eg 'ee_read_others_private_events')
-                if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action() . '_private') && $this->model() instanceof EEM_CPT_Base) {
+                if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action().'_private') && $this->model() instanceof EEM_CPT_Base) {
                     // if they have basic and others, but not private, restrict them to see theirs and others' that aren't private
-                    $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_private') ] = new EE_Default_Where_Conditions(
+                    $restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_private')] = new EE_Default_Where_Conditions(
                         array(
-                            'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_private') => array(
+                            'OR*no_'.EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_private') => array(
                                 EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
-                                'status' => array( '!=', 'private' )
+                                'status' => array('!=', 'private')
                             )
                         )
                     );
@@ -65,7 +65,7 @@ 
             }
         } else {
             // there is no basic cap. So they can only access this if they have the default admin cap
-            $restrictions[ EE_Restriction_Generator_Base::get_default_restrictions_cap() ] = new EE_Return_None_Where_Conditions();
+            $restrictions[EE_Restriction_Generator_Base::get_default_restrictions_cap()] = new EE_Return_None_Where_Conditions();
         }
         return $restrictions;
     }

core/db_models/strategies/EE_Restriction_Generator_Meta.strategy.php

Indentation +52 added lines, -52 removed lines

@@ -14,60 +14,60 @@
 class EE_Restriction_Generator_Meta extends EE_Restriction_Generator_Base
 {
 
-    /**
-     *
-     * @var string the name of the field containing the meta key
-     */
-    protected $_key_field_name = null;
+	/**
+	 *
+	 * @var string the name of the field containing the meta key
+	 */
+	protected $_key_field_name = null;
     
-    /**
-     *
-     * @var string the name of the field containing the meta value
-     */
-    protected $_value_field_name = null;
+	/**
+	 *
+	 * @var string the name of the field containing the meta value
+	 */
+	protected $_value_field_name = null;
 
-    /**
-     * Accepts the name of the field that indicates whether or not an object is a "system" one or not
-     * @param string $key_field_name
-     * @param string $value_field_name
-     */
-    public function __construct($key_field_name, $value_field_name)
-    {
-        $this->_key_field_name = $key_field_name;
-        $this->_value_field_name = $value_field_name;
-    }
+	/**
+	 * Accepts the name of the field that indicates whether or not an object is a "system" one or not
+	 * @param string $key_field_name
+	 * @param string $value_field_name
+	 */
+	public function __construct($key_field_name, $value_field_name)
+	{
+		$this->_key_field_name = $key_field_name;
+		$this->_value_field_name = $value_field_name;
+	}
 
 
-    /**
-     *
-     * @return \EE_Default_Where_Conditions
-     * @throws EE_Error
-     */
-    protected function _generate_restrictions()
-    {
-        $whitelisted_meta_keys = apply_filters('FHEE__EE_Restriction_Generator_Meta___generate_restrictions__whitelisted_meta_keys', array());
-        $blacklisted_meta_keys = apply_filters('FHEE__EE_Restriction_Generator_Meta___generate_restrictions__blacklisted_meta_keys', array());
-        $conditions = array(
-            $this->_key_field_name => array( 'NOT_LIKE', "\\\\_%" ),// each slash is escaped because we are using double quotes, and
-            // stripslashes will be called on this because the models assume this is from user input
-            $this->_value_field_name => array( 'NOT_REGEXP', '^[aOs]:[\d]:.*$')
-        );
-        if (! empty($blacklisted_meta_keys)) {
-            $conditions[ $this->_key_field_name . '*blacklisted' ] = array( 'NOT_IN', $blacklisted_meta_keys );
-        }
-        if (! empty($whitelisted_meta_keys)) {
-            $conditions = array(
-                'OR*whitelisted-or-normal' => array(
-                    'AND' => $conditions,
-                    $this->_key_field_name . '*whitelisted' => array( 'IN', $whitelisted_meta_keys )
-                )
-            );
-        }
-        return array(
-            // only allow access to non-protected metas if they're an admin
-            EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions(),
-            // don't allow access to protected metas to anyone. If they want that, don't apply caps to the query
-            'apply-to-all-queries-using-caps' => new EE_Default_Where_Conditions($conditions),
-        );
-    }
+	/**
+	 *
+	 * @return \EE_Default_Where_Conditions
+	 * @throws EE_Error
+	 */
+	protected function _generate_restrictions()
+	{
+		$whitelisted_meta_keys = apply_filters('FHEE__EE_Restriction_Generator_Meta___generate_restrictions__whitelisted_meta_keys', array());
+		$blacklisted_meta_keys = apply_filters('FHEE__EE_Restriction_Generator_Meta___generate_restrictions__blacklisted_meta_keys', array());
+		$conditions = array(
+			$this->_key_field_name => array( 'NOT_LIKE', "\\\\_%" ),// each slash is escaped because we are using double quotes, and
+			// stripslashes will be called on this because the models assume this is from user input
+			$this->_value_field_name => array( 'NOT_REGEXP', '^[aOs]:[\d]:.*$')
+		);
+		if (! empty($blacklisted_meta_keys)) {
+			$conditions[ $this->_key_field_name . '*blacklisted' ] = array( 'NOT_IN', $blacklisted_meta_keys );
+		}
+		if (! empty($whitelisted_meta_keys)) {
+			$conditions = array(
+				'OR*whitelisted-or-normal' => array(
+					'AND' => $conditions,
+					$this->_key_field_name . '*whitelisted' => array( 'IN', $whitelisted_meta_keys )
+				)
+			);
+		}
+		return array(
+			// only allow access to non-protected metas if they're an admin
+			EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions(),
+			// don't allow access to protected metas to anyone. If they want that, don't apply caps to the query
+			'apply-to-all-queries-using-caps' => new EE_Default_Where_Conditions($conditions),
+		);
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -48,18 +48,18 @@
         $whitelisted_meta_keys = apply_filters('FHEE__EE_Restriction_Generator_Meta___generate_restrictions__whitelisted_meta_keys', array());
         $blacklisted_meta_keys = apply_filters('FHEE__EE_Restriction_Generator_Meta___generate_restrictions__blacklisted_meta_keys', array());
         $conditions = array(
-            $this->_key_field_name => array( 'NOT_LIKE', "\\\\_%" ),// each slash is escaped because we are using double quotes, and
+            $this->_key_field_name => array('NOT_LIKE', "\\\\_%"), // each slash is escaped because we are using double quotes, and
             // stripslashes will be called on this because the models assume this is from user input
-            $this->_value_field_name => array( 'NOT_REGEXP', '^[aOs]:[\d]:.*$')
+            $this->_value_field_name => array('NOT_REGEXP', '^[aOs]:[\d]:.*$')
         );
-        if (! empty($blacklisted_meta_keys)) {
-            $conditions[ $this->_key_field_name . '*blacklisted' ] = array( 'NOT_IN', $blacklisted_meta_keys );
+        if ( ! empty($blacklisted_meta_keys)) {
+            $conditions[$this->_key_field_name.'*blacklisted'] = array('NOT_IN', $blacklisted_meta_keys);
         }
-        if (! empty($whitelisted_meta_keys)) {
+        if ( ! empty($whitelisted_meta_keys)) {
             $conditions = array(
                 'OR*whitelisted-or-normal' => array(
                     'AND' => $conditions,
-                    $this->_key_field_name . '*whitelisted' => array( 'IN', $whitelisted_meta_keys )
+                    $this->_key_field_name.'*whitelisted' => array('IN', $whitelisted_meta_keys)
                 )
             );
         }