eventespresso / event-espresso-core

core/db_models/fields/EE_Maybe_Serialized_Text_Field.php

Indentation +31 added lines, -31 removed lines

@@ -2,36 +2,36 @@
 
 class EE_Maybe_Serialized_Text_Field extends EE_Serialized_Text_Field
 {
-    /**
-     * Value could be an array or a string. If its an array, serialize it. Otherwise, leave it as a string
-     *
-     * @param array|string $value_of_field_on_model_object
-     * @return string (possibly serialized)
-     */
-    public function prepare_for_use_in_db($value_of_field_on_model_object)
-    {
-        if (is_array($value_of_field_on_model_object)) {
-            return parent::prepare_for_use_in_db($value_of_field_on_model_object);
-        } else {
-            return $value_of_field_on_model_object;
-        }
-    }
+	/**
+	 * Value could be an array or a string. If its an array, serialize it. Otherwise, leave it as a string
+	 *
+	 * @param array|string $value_of_field_on_model_object
+	 * @return string (possibly serialized)
+	 */
+	public function prepare_for_use_in_db($value_of_field_on_model_object)
+	{
+		if (is_array($value_of_field_on_model_object)) {
+			return parent::prepare_for_use_in_db($value_of_field_on_model_object);
+		} else {
+			return $value_of_field_on_model_object;
+		}
+	}
 
-    /**
-     * Formats the array (or string) according to $schema. Right now, just implode with commas
-     *
-     * @param type $value_on_field_to_be_outputted
-     * @param type $schema
-     * @return strubg
-     */
-    public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
-    {
-        $pretty_value = null;
-        if (is_array($value_on_field_to_be_outputted)) {
-            $pretty_value = parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
-        } else {
-            $pretty_value = $value_on_field_to_be_outputted;
-        }
-        return $pretty_value;
-    }
+	/**
+	 * Formats the array (or string) according to $schema. Right now, just implode with commas
+	 *
+	 * @param type $value_on_field_to_be_outputted
+	 * @param type $schema
+	 * @return strubg
+	 */
+	public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
+	{
+		$pretty_value = null;
+		if (is_array($value_on_field_to_be_outputted)) {
+			$pretty_value = parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
+		} else {
+			$pretty_value = $value_on_field_to_be_outputted;
+		}
+		return $pretty_value;
+	}
 }

core/db_models/fields/EE_Post_Content_Field.php

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
      */
     public function prepare_for_set($value)
     {
-        if (! current_user_can('unfiltered_html')) {
+        if ( ! current_user_can('unfiltered_html')) {
             $value = wp_kses("$value", wp_kses_allowed_html('post'));
         }
         return parent::prepare_for_set($value);
@@ -96,8 +96,8 @@ 
      */
     protected static function _setup_the_content_wp_core_only_filters()
     {
-        add_filter('the_content_wp_core_only', array( $GLOBALS['wp_embed'], 'run_shortcode'), 8);
-        add_filter('the_content_wp_core_only', array( $GLOBALS['wp_embed'], 'autoembed'), 8);
+        add_filter('the_content_wp_core_only', array($GLOBALS['wp_embed'], 'run_shortcode'), 8);
+        add_filter('the_content_wp_core_only', array($GLOBALS['wp_embed'], 'autoembed'), 8);
         add_filter('the_content_wp_core_only', 'wptexturize', 10);
         add_filter('the_content_wp_core_only', 'wpautop', 10);
         add_filter('the_content_wp_core_only', 'shortcode_unautop', 10);

Indentation +114 added lines, -114 removed lines

@@ -6,129 +6,129 @@
  */
 class EE_Post_Content_Field extends EE_Text_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->setSchemaType('object');
-    }
+	/**
+	 * @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->setSchemaType('object');
+	}
 
 
-    /**
-     * removes all tags which a WP Post wouldn't allow in its content normally
-     *
-     * @param string $value
-     * @return string
-     */
-    public function prepare_for_set($value)
-    {
-        if (! current_user_can('unfiltered_html')) {
-            $value = wp_kses("$value", wp_kses_allowed_html('post'));
-        }
-        return parent::prepare_for_set($value);
-    }
+	/**
+	 * removes all tags which a WP Post wouldn't allow in its content normally
+	 *
+	 * @param string $value
+	 * @return string
+	 */
+	public function prepare_for_set($value)
+	{
+		if (! current_user_can('unfiltered_html')) {
+			$value = wp_kses("$value", wp_kses_allowed_html('post'));
+		}
+		return parent::prepare_for_set($value);
+	}
 
 
 
-    /**
-     * Runs the content through `the_content`, or if prepares the content for placing in a form input
-     * @param string $value_on_field_to_be_outputted
-     * @param string   $schema possible values: 'form_input' or null (if null, will run through 'the_content')
-     * @return string
-     * @throws EE_Error when WP_DEBUG is on and recursive calling is detected
-     */
-    public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
-    {
-        switch ($schema) {
-            case 'form_input':
-                return parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
-            case 'the_content':
-                if (doing_filter('the_content')) {
-                    if (defined('WP_DEBUG') && WP_DEBUG) {
-                        throw new EE_Error(
-                            sprintf(
-                                esc_html__('You have recursively called "%1$s" with %2$s set to %3$s which uses "%2$s" filter. You should use it with %2$s "%3$s" instead here.', 'event_espresso'),
-                                'EE_Post_Content_Field::prepare_for_pretty_echoing',
-                                '$schema',
-                                'the_content',
-                                'the_content_wp_core_only'
-                            )
-                        );
-                    } else {
-                        return $this->prepare_for_pretty_echoing($value_on_field_to_be_outputted, 'the_content_wp_core_only');
-                    }
-                }
-                return apply_filters(
-                    'the_content',
-                    parent::prepare_for_pretty_echoing(
-                        $value_on_field_to_be_outputted,
-                        $schema
-                    )
-                );
-            case 'the_content_wp_core_only':
-            default:
-                self::_setup_the_content_wp_core_only_filters();
-                $return_value = apply_filters(
-                    'the_content_wp_core_only',
-                    parent::prepare_for_pretty_echoing(
-                        $value_on_field_to_be_outputted,
-                        $schema
-                    )
-                );
-                // ya know what? adding these filters is super fast. Let's just
-                // avoid needing to maintain global state and set this up as-needed
-                remove_all_filters('the_content_wp_core_only');
-                do_action('AHEE__EE_Post_Content_Field__prepare_for_pretty_echoing__the_content_wp_core_only__done');
-                return $return_value;
-        }
-    }
+	/**
+	 * Runs the content through `the_content`, or if prepares the content for placing in a form input
+	 * @param string $value_on_field_to_be_outputted
+	 * @param string   $schema possible values: 'form_input' or null (if null, will run through 'the_content')
+	 * @return string
+	 * @throws EE_Error when WP_DEBUG is on and recursive calling is detected
+	 */
+	public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
+	{
+		switch ($schema) {
+			case 'form_input':
+				return parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
+			case 'the_content':
+				if (doing_filter('the_content')) {
+					if (defined('WP_DEBUG') && WP_DEBUG) {
+						throw new EE_Error(
+							sprintf(
+								esc_html__('You have recursively called "%1$s" with %2$s set to %3$s which uses "%2$s" filter. You should use it with %2$s "%3$s" instead here.', 'event_espresso'),
+								'EE_Post_Content_Field::prepare_for_pretty_echoing',
+								'$schema',
+								'the_content',
+								'the_content_wp_core_only'
+							)
+						);
+					} else {
+						return $this->prepare_for_pretty_echoing($value_on_field_to_be_outputted, 'the_content_wp_core_only');
+					}
+				}
+				return apply_filters(
+					'the_content',
+					parent::prepare_for_pretty_echoing(
+						$value_on_field_to_be_outputted,
+						$schema
+					)
+				);
+			case 'the_content_wp_core_only':
+			default:
+				self::_setup_the_content_wp_core_only_filters();
+				$return_value = apply_filters(
+					'the_content_wp_core_only',
+					parent::prepare_for_pretty_echoing(
+						$value_on_field_to_be_outputted,
+						$schema
+					)
+				);
+				// ya know what? adding these filters is super fast. Let's just
+				// avoid needing to maintain global state and set this up as-needed
+				remove_all_filters('the_content_wp_core_only');
+				do_action('AHEE__EE_Post_Content_Field__prepare_for_pretty_echoing__the_content_wp_core_only__done');
+				return $return_value;
+		}
+	}
 
 
 
-    /**
-     * Verifies we've setup the standard WP core filters on  'the_content_wp_core_only' filter
-     */
-    protected static function _setup_the_content_wp_core_only_filters()
-    {
-        add_filter('the_content_wp_core_only', array( $GLOBALS['wp_embed'], 'run_shortcode'), 8);
-        add_filter('the_content_wp_core_only', array( $GLOBALS['wp_embed'], 'autoembed'), 8);
-        add_filter('the_content_wp_core_only', 'wptexturize', 10);
-        add_filter('the_content_wp_core_only', 'wpautop', 10);
-        add_filter('the_content_wp_core_only', 'shortcode_unautop', 10);
-        add_filter('the_content_wp_core_only', 'prepend_attachment', 10);
-        if (function_exists('wp_filter_content_tags')) {
-            add_filter('the_content_wp_core_only', 'wp_filter_content_tags', 10);
-        } elseif (function_exists('wp_make_content_images_responsive')) {
-            add_filter('the_content_wp_core_only', 'wp_make_content_images_responsive', 10);
-        }
-        add_filter('the_content_wp_core_only', 'do_shortcode', 11);
-        add_filter('the_content_wp_core_only', 'convert_smilies', 20);
-    }
+	/**
+	 * Verifies we've setup the standard WP core filters on  'the_content_wp_core_only' filter
+	 */
+	protected static function _setup_the_content_wp_core_only_filters()
+	{
+		add_filter('the_content_wp_core_only', array( $GLOBALS['wp_embed'], 'run_shortcode'), 8);
+		add_filter('the_content_wp_core_only', array( $GLOBALS['wp_embed'], 'autoembed'), 8);
+		add_filter('the_content_wp_core_only', 'wptexturize', 10);
+		add_filter('the_content_wp_core_only', 'wpautop', 10);
+		add_filter('the_content_wp_core_only', 'shortcode_unautop', 10);
+		add_filter('the_content_wp_core_only', 'prepend_attachment', 10);
+		if (function_exists('wp_filter_content_tags')) {
+			add_filter('the_content_wp_core_only', 'wp_filter_content_tags', 10);
+		} elseif (function_exists('wp_make_content_images_responsive')) {
+			add_filter('the_content_wp_core_only', 'wp_make_content_images_responsive', 10);
+		}
+		add_filter('the_content_wp_core_only', 'do_shortcode', 11);
+		add_filter('the_content_wp_core_only', 'convert_smilies', 20);
+	}
 
 
 
-    public function getSchemaProperties()
-    {
-        return array(
-            'raw' => array(
-                'description' =>  sprintf(
-                    esc_html__('%s - the content as it exists in the database.', 'event_espresso'),
-                    $this->get_nicename()
-                ),
-                'type' => 'string'
-            ),
-            'rendered' => array(
-                'description' =>  sprintf(
-                    esc_html__('%s - the content rendered for display.', 'event_espresso'),
-                    $this->get_nicename()
-                ),
-                'type' => 'string'
-            )
-        );
-    }
+	public function getSchemaProperties()
+	{
+		return array(
+			'raw' => array(
+				'description' =>  sprintf(
+					esc_html__('%s - the content as it exists in the database.', 'event_espresso'),
+					$this->get_nicename()
+				),
+				'type' => 'string'
+			),
+			'rendered' => array(
+				'description' =>  sprintf(
+					esc_html__('%s - the content rendered for display.', 'event_espresso'),
+					$this->get_nicename()
+				),
+				'type' => 'string'
+			)
+		);
+	}
 }

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_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_Primary_Key_String_Field.php

Indentation +17 added lines, -17 removed lines

@@ -3,22 +3,22 @@
 class EE_Primary_Key_String_Field extends EE_Primary_Key_Field_Base
 {
 
-    public function __construct($table_column, $nicename)
-    {
-        parent::__construct($table_column, $nicename, null);
-    }
+	public function __construct($table_column, $nicename)
+	{
+		parent::__construct($table_column, $nicename, null);
+	}
 
-    /**
-     * 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 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 wp_strip_all_tags($value_inputted_for_field_on_model_object);
+	}
 }

core/db_models/strategies/EE_Restriction_Generator_Global.strategy.php

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
                 ))

Indentation +41 added lines, -41 removed lines

@@ -19,47 +19,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
+				))
+		);
+	}
 }

core/db_models/strategies/EE_Restriction_Generator_Protected.strategy.php

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;
     }

Indentation +42 added lines, -42 removed lines

@@ -24,48 +24,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;
+	}
 }

core/db_models/strategies/EE_Restriction_Generator_Meta.strategy.php

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)
                 )
             );
         }

Indentation +52 added lines, -52 removed lines

@@ -13,60 +13,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),
+		);
+	}
 }

core/db_models/strategies/EE_Restriction_Generator_Reg_Form.strategy.php

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,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()
             );
@@ -51,11 +51,11 @@ 
         // there is no "ee_read_system_questions" cap; in order to read reg form items you only need "ee_read_{model_name}".
         // there is also no "ee_delete_system_questions" cap. But folks shouldn't be deleting system questions anyway
         if ($this->action() !== EEM_Base::caps_read) {
-            $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_system') ] = new EE_Default_Where_Conditions(
+            $restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_system')] = new EE_Default_Where_Conditions(
                 array(
-                    'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_system') => array(
+                    'OR*no_'.EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_system') => array(
                         $this->_system_field_name       => array('IN', array('', 0)),
-                        $this->_system_field_name . '*' => array('IS_NULL')
+                        $this->_system_field_name.'*' => array('IS_NULL')
                     )
                 )
             );

Indentation +44 added lines, -44 removed lines

@@ -14,51 +14,51 @@
  */
 class EE_Restriction_Generator_Reg_Form extends EE_Restriction_Generator_Base
 {
-    /**
-     *
-     * @var string the name of the field that indicates whether or not this is a system thing
-     */
-    protected $_system_field_name = null;
+	/**
+	 *
+	 * @var string the name of the field that indicates whether or not this is a system thing
+	 */
+	protected $_system_field_name = null;
 
-    /**
-     * Accepts the name of the field that indicates whether or not an object is a "system" one or not
-     * @param string $system_field_name
-     */
-    public function __construct($system_field_name)
-    {
-        $this->_system_field_name = $system_field_name;
-    }
+	/**
+	 * Accepts the name of the field that indicates whether or not an object is a "system" one or not
+	 * @param string $system_field_name
+	 */
+	public function __construct($system_field_name)
+	{
+		$this->_system_field_name = $system_field_name;
+	}
 
 
-    /**
-     *
-     * @return \EE_Default_Where_Conditions[]
-     * @throws EE_Error
-     */
-    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()
-            );
-        }
-        $restrictions = array(
-            EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) => new EE_Return_None_Where_Conditions(),
-        );
-        // there is no "ee_read_system_questions" cap; in order to read reg form items you only need "ee_read_{model_name}".
-        // there is also no "ee_delete_system_questions" cap. But folks shouldn't be deleting system questions anyway
-        if ($this->action() !== EEM_Base::caps_read) {
-            $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_system') ] = new EE_Default_Where_Conditions(
-                array(
-                    'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_system') => array(
-                        $this->_system_field_name       => array('IN', array('', 0)),
-                        $this->_system_field_name . '*' => array('IS_NULL')
-                    )
-                )
-            );
-        }
-        return $restrictions;
-    }
+	/**
+	 *
+	 * @return \EE_Default_Where_Conditions[]
+	 * @throws EE_Error
+	 */
+	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()
+			);
+		}
+		$restrictions = array(
+			EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) => new EE_Return_None_Where_Conditions(),
+		);
+		// there is no "ee_read_system_questions" cap; in order to read reg form items you only need "ee_read_{model_name}".
+		// there is also no "ee_delete_system_questions" cap. But folks shouldn't be deleting system questions anyway
+		if ($this->action() !== EEM_Base::caps_read) {
+			$restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_system') ] = new EE_Default_Where_Conditions(
+				array(
+					'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_system') => array(
+						$this->_system_field_name       => array('IN', array('', 0)),
+						$this->_system_field_name . '*' => array('IS_NULL')
+					)
+				)
+			);
+		}
+		return $restrictions;
+	}
 }