Completed
Branch 973/fix-visible-recaptcha (0580c7)
by
unknown
03:03 queued 30s
created
core/db_models/fields/EE_Foreign_Key_String_Field.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -3,17 +3,17 @@
 block discarded – undo
3 3
 class EE_Foreign_Key_String_Field extends EE_Foreign_Key_Field_Base
4 4
 {
5 5
 
6
-    /**
7
-     * removes all tags when setting
8
-     *
9
-     * @param string $value_inputted_for_field_on_model_object
10
-     * @return string
11
-     */
12
-    public function prepare_for_set($value_inputted_for_field_on_model_object)
13
-    {
14
-        if ($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)) {
15
-            $value_inputted_for_field_on_model_object = $value_inputted_for_field_on_model_object->ID();
16
-        }
17
-        return strtoupper(wp_strip_all_tags($value_inputted_for_field_on_model_object));
18
-    }
6
+	/**
7
+	 * removes all tags when setting
8
+	 *
9
+	 * @param string $value_inputted_for_field_on_model_object
10
+	 * @return string
11
+	 */
12
+	public function prepare_for_set($value_inputted_for_field_on_model_object)
13
+	{
14
+		if ($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)) {
15
+			$value_inputted_for_field_on_model_object = $value_inputted_for_field_on_model_object->ID();
16
+		}
17
+		return strtoupper(wp_strip_all_tags($value_inputted_for_field_on_model_object));
18
+	}
19 19
 }
Please login to merge, or discard this patch.
core/db_models/fields/EE_Primary_Key_String_Field.php 1 patch
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -3,22 +3,22 @@
 block discarded – undo
3 3
 class EE_Primary_Key_String_Field extends EE_Primary_Key_Field_Base
4 4
 {
5 5
 
6
-    public function __construct($table_column, $nicename)
7
-    {
8
-        parent::__construct($table_column, $nicename, null);
9
-    }
6
+	public function __construct($table_column, $nicename)
7
+	{
8
+		parent::__construct($table_column, $nicename, null);
9
+	}
10 10
 
11
-    /**
12
-     * removes all tags when setting
13
-     *
14
-     * @param string $value_inputted_for_field_on_model_object
15
-     * @return string
16
-     */
17
-    public function prepare_for_set($value_inputted_for_field_on_model_object)
18
-    {
19
-        if ($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)) {
20
-            $value_inputted_for_field_on_model_object = $value_inputted_for_field_on_model_object->ID();
21
-        }
22
-        return wp_strip_all_tags($value_inputted_for_field_on_model_object);
23
-    }
11
+	/**
12
+	 * removes all tags when setting
13
+	 *
14
+	 * @param string $value_inputted_for_field_on_model_object
15
+	 * @return string
16
+	 */
17
+	public function prepare_for_set($value_inputted_for_field_on_model_object)
18
+	{
19
+		if ($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)) {
20
+			$value_inputted_for_field_on_model_object = $value_inputted_for_field_on_model_object->ID();
21
+		}
22
+		return wp_strip_all_tags($value_inputted_for_field_on_model_object);
23
+	}
24 24
 }
Please login to merge, or discard this patch.
core/db_models/strategies/EE_Restriction_Generator_Global.strategy.php 2 patches
Indentation   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -20,47 +20,47 @@
 block discarded – undo
20 20
 class EE_Restriction_Generator_Global extends EE_Restriction_Generator_Base
21 21
 {
22 22
 
23
-    /**
24
-     * name of the model field that indicates whether or not a model object is "global"
25
-     * @var string
26
-     */
27
-    protected $_global_field_name;
28
-    /**
29
-     *
30
-     * @param string $global_field_name name of the model field that indicates whether or not
31
-     * a model object is "global"
32
-     */
33
-    public function __construct($global_field_name)
34
-    {
35
-        $this->_global_field_name = $global_field_name;
36
-    }
23
+	/**
24
+	 * name of the model field that indicates whether or not a model object is "global"
25
+	 * @var string
26
+	 */
27
+	protected $_global_field_name;
28
+	/**
29
+	 *
30
+	 * @param string $global_field_name name of the model field that indicates whether or not
31
+	 * a model object is "global"
32
+	 */
33
+	public function __construct($global_field_name)
34
+	{
35
+		$this->_global_field_name = $global_field_name;
36
+	}
37 37
 
38
-    /**
39
-     * @return \EE_Default_Where_Conditions
40
-     */
41
-    protected function _generate_restrictions()
42
-    {
38
+	/**
39
+	 * @return \EE_Default_Where_Conditions
40
+	 */
41
+	protected function _generate_restrictions()
42
+	{
43 43
 
44
-        // if there are no standard caps for this model, then for now all we know is
45
-        // if they need the default cap to access this
46
-        if (! $this->model()->cap_slug()) {
47
-            return array(
48
-                EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
49
-            );
50
-        }
51
-        return array(
52
-            EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) => new EE_Return_None_Where_Conditions(),
53
-            EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') => new EE_Default_Where_Conditions(array(
54
-                // I need to be the owner, or it must be a global item
55
-                'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') => array(
56
-                    EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
57
-                    $this->_global_field_name                                => true
58
-                )
59
-            )),
60
-            EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_global') => new EE_Default_Where_Conditions(array(
61
-                    // it mustn't be global
62
-                    $this->_global_field_name => false
63
-                ))
64
-        );
65
-    }
44
+		// if there are no standard caps for this model, then for now all we know is
45
+		// if they need the default cap to access this
46
+		if (! $this->model()->cap_slug()) {
47
+			return array(
48
+				EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
49
+			);
50
+		}
51
+		return array(
52
+			EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) => new EE_Return_None_Where_Conditions(),
53
+			EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') => new EE_Default_Where_Conditions(array(
54
+				// I need to be the owner, or it must be a global item
55
+				'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') => array(
56
+					EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
57
+					$this->_global_field_name                                => true
58
+				)
59
+			)),
60
+			EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_global') => new EE_Default_Where_Conditions(array(
61
+					// it mustn't be global
62
+					$this->_global_field_name => false
63
+				))
64
+		);
65
+	}
66 66
 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -43,21 +43,21 @@
 block discarded – undo
43 43
 
44 44
         // if there are no standard caps for this model, then for now all we know is
45 45
         // if they need the default cap to access this
46
-        if (! $this->model()->cap_slug()) {
46
+        if ( ! $this->model()->cap_slug()) {
47 47
             return array(
48 48
                 EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
49 49
             );
50 50
         }
51 51
         return array(
52 52
             EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) => new EE_Return_None_Where_Conditions(),
53
-            EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') => new EE_Default_Where_Conditions(array(
53
+            EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others') => new EE_Default_Where_Conditions(array(
54 54
                 // I need to be the owner, or it must be a global item
55
-                'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') => array(
55
+                'OR*no_'.EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others') => array(
56 56
                     EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
57 57
                     $this->_global_field_name                                => true
58 58
                 )
59 59
             )),
60
-            EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_global') => new EE_Default_Where_Conditions(array(
60
+            EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_global') => new EE_Default_Where_Conditions(array(
61 61
                     // it mustn't be global
62 62
                     $this->_global_field_name => false
63 63
                 ))
Please login to merge, or discard this patch.
core/db_models/strategies/EE_Restriction_Generator_Protected.strategy.php 2 patches
Indentation   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -25,48 +25,48 @@
 block discarded – undo
25 25
 class EE_Restriction_Generator_Protected extends EE_Restriction_Generator_Base
26 26
 {
27 27
 
28
-    /**
29
-     * @return \EE_Default_Where_Conditions
30
-     */
31
-    protected function _generate_restrictions()
32
-    {
28
+	/**
29
+	 * @return \EE_Default_Where_Conditions
30
+	 */
31
+	protected function _generate_restrictions()
32
+	{
33 33
 
34
-        // if there are no standard caps for this model, then for now all we know
35
-        // if they need the default cap to access this
36
-        if (! $this->model()->cap_slug()) {
37
-            return array(
38
-                EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
39
-            );
40
-        }
34
+		// if there are no standard caps for this model, then for now all we know
35
+		// if they need the default cap to access this
36
+		if (! $this->model()->cap_slug()) {
37
+			return array(
38
+				EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
39
+			);
40
+		}
41 41
 
42
-        $restrictions = array();
43
-        // does the basic cap exist? (eg 'ee_read_registrations')
44
-        if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action())) {
45
-            $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) ] = new EE_Return_None_Where_Conditions();
46
-            // does the others cap exist? (eg 'ee_read_others_registrations')
47
-            if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action() . '_others')) {// both caps exist
48
-                $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') ] = new EE_Default_Where_Conditions(
49
-                    array(
50
-                        EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder
51
-                    )
52
-                );
53
-                // does the private cap exist (eg 'ee_read_others_private_events')
54
-                if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action() . '_private') && $this->model() instanceof EEM_CPT_Base) {
55
-                    // if they have basic and others, but not private, restrict them to see theirs and others' that aren't private
56
-                    $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_private') ] = new EE_Default_Where_Conditions(
57
-                        array(
58
-                            'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_private') => array(
59
-                                EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
60
-                                'status' => array( '!=', 'private' )
61
-                            )
62
-                        )
63
-                    );
64
-                }
65
-            }
66
-        } else {
67
-            // there is no basic cap. So they can only access this if they have the default admin cap
68
-            $restrictions[ EE_Restriction_Generator_Base::get_default_restrictions_cap() ] = new EE_Return_None_Where_Conditions();
69
-        }
70
-        return $restrictions;
71
-    }
42
+		$restrictions = array();
43
+		// does the basic cap exist? (eg 'ee_read_registrations')
44
+		if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action())) {
45
+			$restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) ] = new EE_Return_None_Where_Conditions();
46
+			// does the others cap exist? (eg 'ee_read_others_registrations')
47
+			if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action() . '_others')) {// both caps exist
48
+				$restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') ] = new EE_Default_Where_Conditions(
49
+					array(
50
+						EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder
51
+					)
52
+				);
53
+				// does the private cap exist (eg 'ee_read_others_private_events')
54
+				if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action() . '_private') && $this->model() instanceof EEM_CPT_Base) {
55
+					// if they have basic and others, but not private, restrict them to see theirs and others' that aren't private
56
+					$restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_private') ] = new EE_Default_Where_Conditions(
57
+						array(
58
+							'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_private') => array(
59
+								EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
60
+								'status' => array( '!=', 'private' )
61
+							)
62
+						)
63
+					);
64
+				}
65
+			}
66
+		} else {
67
+			// there is no basic cap. So they can only access this if they have the default admin cap
68
+			$restrictions[ EE_Restriction_Generator_Base::get_default_restrictions_cap() ] = new EE_Return_None_Where_Conditions();
69
+		}
70
+		return $restrictions;
71
+	}
72 72
 }
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 
34 34
         // if there are no standard caps for this model, then for now all we know
35 35
         // if they need the default cap to access this
36
-        if (! $this->model()->cap_slug()) {
36
+        if ( ! $this->model()->cap_slug()) {
37 37
             return array(
38 38
                 EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
39 39
             );
@@ -42,22 +42,22 @@  discard block
 block discarded – undo
42 42
         $restrictions = array();
43 43
         // does the basic cap exist? (eg 'ee_read_registrations')
44 44
         if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action())) {
45
-            $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) ] = new EE_Return_None_Where_Conditions();
45
+            $restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action())] = new EE_Return_None_Where_Conditions();
46 46
             // does the others cap exist? (eg 'ee_read_others_registrations')
47
-            if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action() . '_others')) {// both caps exist
48
-                $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') ] = new EE_Default_Where_Conditions(
47
+            if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action().'_others')) {// both caps exist
48
+                $restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others')] = new EE_Default_Where_Conditions(
49 49
                     array(
50 50
                         EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder
51 51
                     )
52 52
                 );
53 53
                 // does the private cap exist (eg 'ee_read_others_private_events')
54
-                if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action() . '_private') && $this->model() instanceof EEM_CPT_Base) {
54
+                if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action().'_private') && $this->model() instanceof EEM_CPT_Base) {
55 55
                     // if they have basic and others, but not private, restrict them to see theirs and others' that aren't private
56
-                    $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_private') ] = new EE_Default_Where_Conditions(
56
+                    $restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_private')] = new EE_Default_Where_Conditions(
57 57
                         array(
58
-                            'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_private') => array(
58
+                            'OR*no_'.EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_private') => array(
59 59
                                 EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
60
-                                'status' => array( '!=', 'private' )
60
+                                'status' => array('!=', 'private')
61 61
                             )
62 62
                         )
63 63
                     );
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
             }
66 66
         } else {
67 67
             // there is no basic cap. So they can only access this if they have the default admin cap
68
-            $restrictions[ EE_Restriction_Generator_Base::get_default_restrictions_cap() ] = new EE_Return_None_Where_Conditions();
68
+            $restrictions[EE_Restriction_Generator_Base::get_default_restrictions_cap()] = new EE_Return_None_Where_Conditions();
69 69
         }
70 70
         return $restrictions;
71 71
     }
Please login to merge, or discard this patch.
core/db_models/strategies/EE_Restriction_Generator_Meta.strategy.php 2 patches
Indentation   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -14,60 +14,60 @@
 block discarded – undo
14 14
 class EE_Restriction_Generator_Meta extends EE_Restriction_Generator_Base
15 15
 {
16 16
 
17
-    /**
18
-     *
19
-     * @var string the name of the field containing the meta key
20
-     */
21
-    protected $_key_field_name = null;
17
+	/**
18
+	 *
19
+	 * @var string the name of the field containing the meta key
20
+	 */
21
+	protected $_key_field_name = null;
22 22
     
23
-    /**
24
-     *
25
-     * @var string the name of the field containing the meta value
26
-     */
27
-    protected $_value_field_name = null;
23
+	/**
24
+	 *
25
+	 * @var string the name of the field containing the meta value
26
+	 */
27
+	protected $_value_field_name = null;
28 28
 
29
-    /**
30
-     * Accepts the name of the field that indicates whether or not an object is a "system" one or not
31
-     * @param string $key_field_name
32
-     * @param string $value_field_name
33
-     */
34
-    public function __construct($key_field_name, $value_field_name)
35
-    {
36
-        $this->_key_field_name = $key_field_name;
37
-        $this->_value_field_name = $value_field_name;
38
-    }
29
+	/**
30
+	 * Accepts the name of the field that indicates whether or not an object is a "system" one or not
31
+	 * @param string $key_field_name
32
+	 * @param string $value_field_name
33
+	 */
34
+	public function __construct($key_field_name, $value_field_name)
35
+	{
36
+		$this->_key_field_name = $key_field_name;
37
+		$this->_value_field_name = $value_field_name;
38
+	}
39 39
 
40 40
 
41
-    /**
42
-     *
43
-     * @return \EE_Default_Where_Conditions
44
-     * @throws EE_Error
45
-     */
46
-    protected function _generate_restrictions()
47
-    {
48
-        $whitelisted_meta_keys = apply_filters('FHEE__EE_Restriction_Generator_Meta___generate_restrictions__whitelisted_meta_keys', array());
49
-        $blacklisted_meta_keys = apply_filters('FHEE__EE_Restriction_Generator_Meta___generate_restrictions__blacklisted_meta_keys', array());
50
-        $conditions = array(
51
-            $this->_key_field_name => array( 'NOT_LIKE', "\\\\_%" ),// each slash is escaped because we are using double quotes, and
52
-            // stripslashes will be called on this because the models assume this is from user input
53
-            $this->_value_field_name => array( 'NOT_REGEXP', '^[aOs]:[\d]:.*$')
54
-        );
55
-        if (! empty($blacklisted_meta_keys)) {
56
-            $conditions[ $this->_key_field_name . '*blacklisted' ] = array( 'NOT_IN', $blacklisted_meta_keys );
57
-        }
58
-        if (! empty($whitelisted_meta_keys)) {
59
-            $conditions = array(
60
-                'OR*whitelisted-or-normal' => array(
61
-                    'AND' => $conditions,
62
-                    $this->_key_field_name . '*whitelisted' => array( 'IN', $whitelisted_meta_keys )
63
-                )
64
-            );
65
-        }
66
-        return array(
67
-            // only allow access to non-protected metas if they're an admin
68
-            EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions(),
69
-            // don't allow access to protected metas to anyone. If they want that, don't apply caps to the query
70
-            'apply-to-all-queries-using-caps' => new EE_Default_Where_Conditions($conditions),
71
-        );
72
-    }
41
+	/**
42
+	 *
43
+	 * @return \EE_Default_Where_Conditions
44
+	 * @throws EE_Error
45
+	 */
46
+	protected function _generate_restrictions()
47
+	{
48
+		$whitelisted_meta_keys = apply_filters('FHEE__EE_Restriction_Generator_Meta___generate_restrictions__whitelisted_meta_keys', array());
49
+		$blacklisted_meta_keys = apply_filters('FHEE__EE_Restriction_Generator_Meta___generate_restrictions__blacklisted_meta_keys', array());
50
+		$conditions = array(
51
+			$this->_key_field_name => array( 'NOT_LIKE', "\\\\_%" ),// each slash is escaped because we are using double quotes, and
52
+			// stripslashes will be called on this because the models assume this is from user input
53
+			$this->_value_field_name => array( 'NOT_REGEXP', '^[aOs]:[\d]:.*$')
54
+		);
55
+		if (! empty($blacklisted_meta_keys)) {
56
+			$conditions[ $this->_key_field_name . '*blacklisted' ] = array( 'NOT_IN', $blacklisted_meta_keys );
57
+		}
58
+		if (! empty($whitelisted_meta_keys)) {
59
+			$conditions = array(
60
+				'OR*whitelisted-or-normal' => array(
61
+					'AND' => $conditions,
62
+					$this->_key_field_name . '*whitelisted' => array( 'IN', $whitelisted_meta_keys )
63
+				)
64
+			);
65
+		}
66
+		return array(
67
+			// only allow access to non-protected metas if they're an admin
68
+			EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions(),
69
+			// don't allow access to protected metas to anyone. If they want that, don't apply caps to the query
70
+			'apply-to-all-queries-using-caps' => new EE_Default_Where_Conditions($conditions),
71
+		);
72
+	}
73 73
 }
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -48,18 +48,18 @@
 block discarded – undo
48 48
         $whitelisted_meta_keys = apply_filters('FHEE__EE_Restriction_Generator_Meta___generate_restrictions__whitelisted_meta_keys', array());
49 49
         $blacklisted_meta_keys = apply_filters('FHEE__EE_Restriction_Generator_Meta___generate_restrictions__blacklisted_meta_keys', array());
50 50
         $conditions = array(
51
-            $this->_key_field_name => array( 'NOT_LIKE', "\\\\_%" ),// each slash is escaped because we are using double quotes, and
51
+            $this->_key_field_name => array('NOT_LIKE', "\\\\_%"), // each slash is escaped because we are using double quotes, and
52 52
             // stripslashes will be called on this because the models assume this is from user input
53
-            $this->_value_field_name => array( 'NOT_REGEXP', '^[aOs]:[\d]:.*$')
53
+            $this->_value_field_name => array('NOT_REGEXP', '^[aOs]:[\d]:.*$')
54 54
         );
55
-        if (! empty($blacklisted_meta_keys)) {
56
-            $conditions[ $this->_key_field_name . '*blacklisted' ] = array( 'NOT_IN', $blacklisted_meta_keys );
55
+        if ( ! empty($blacklisted_meta_keys)) {
56
+            $conditions[$this->_key_field_name.'*blacklisted'] = array('NOT_IN', $blacklisted_meta_keys);
57 57
         }
58
-        if (! empty($whitelisted_meta_keys)) {
58
+        if ( ! empty($whitelisted_meta_keys)) {
59 59
             $conditions = array(
60 60
                 'OR*whitelisted-or-normal' => array(
61 61
                     'AND' => $conditions,
62
-                    $this->_key_field_name . '*whitelisted' => array( 'IN', $whitelisted_meta_keys )
62
+                    $this->_key_field_name.'*whitelisted' => array('IN', $whitelisted_meta_keys)
63 63
                 )
64 64
             );
65 65
         }
Please login to merge, or discard this patch.
core/db_models/strategies/EE_Restriction_Generator_Reg_Form.strategy.php 2 patches
Indentation   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -15,51 +15,51 @@
 block discarded – undo
15 15
 class EE_Restriction_Generator_Reg_Form extends EE_Restriction_Generator_Base
16 16
 {
17 17
 
18
-    /**
19
-     *
20
-     * @var string the name of the field that indicates whether or not this is a system thing
21
-     */
22
-    protected $_system_field_name = null;
18
+	/**
19
+	 *
20
+	 * @var string the name of the field that indicates whether or not this is a system thing
21
+	 */
22
+	protected $_system_field_name = null;
23 23
 
24
-    /**
25
-     * Accepts the name of the field that indicates whether or not an object is a "system" one or not
26
-     * @param string $system_field_name
27
-     */
28
-    public function __construct($system_field_name)
29
-    {
30
-        $this->_system_field_name = $system_field_name;
31
-    }
24
+	/**
25
+	 * Accepts the name of the field that indicates whether or not an object is a "system" one or not
26
+	 * @param string $system_field_name
27
+	 */
28
+	public function __construct($system_field_name)
29
+	{
30
+		$this->_system_field_name = $system_field_name;
31
+	}
32 32
 
33 33
 
34
-    /**
35
-     *
36
-     * @return \EE_Default_Where_Conditions[]
37
-     * @throws EE_Error
38
-     */
39
-    protected function _generate_restrictions()
40
-    {
41
-        // if there are no standard caps for this model, then for now all we know
42
-        // if they need the default cap to access this
43
-        if (! $this->model()->cap_slug()) {
44
-            return array(
45
-                EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
46
-            );
47
-        }
48
-        $restrictions = array(
49
-            EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) => new EE_Return_None_Where_Conditions(),
50
-        );
51
-        // there is no "ee_read_system_questions" cap; in order to read reg form items you only need "ee_read_{model_name}".
52
-        // there is also no "ee_delete_system_questions" cap. But folks shouldn't be deleting system questions anyway
53
-        if ($this->action() !== EEM_Base::caps_read) {
54
-            $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_system') ] = new EE_Default_Where_Conditions(
55
-                array(
56
-                    'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_system') => array(
57
-                        $this->_system_field_name       => array('IN', array('', 0)),
58
-                        $this->_system_field_name . '*' => array('IS_NULL')
59
-                    )
60
-                )
61
-            );
62
-        }
63
-        return $restrictions;
64
-    }
34
+	/**
35
+	 *
36
+	 * @return \EE_Default_Where_Conditions[]
37
+	 * @throws EE_Error
38
+	 */
39
+	protected function _generate_restrictions()
40
+	{
41
+		// if there are no standard caps for this model, then for now all we know
42
+		// if they need the default cap to access this
43
+		if (! $this->model()->cap_slug()) {
44
+			return array(
45
+				EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
46
+			);
47
+		}
48
+		$restrictions = array(
49
+			EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) => new EE_Return_None_Where_Conditions(),
50
+		);
51
+		// there is no "ee_read_system_questions" cap; in order to read reg form items you only need "ee_read_{model_name}".
52
+		// there is also no "ee_delete_system_questions" cap. But folks shouldn't be deleting system questions anyway
53
+		if ($this->action() !== EEM_Base::caps_read) {
54
+			$restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_system') ] = new EE_Default_Where_Conditions(
55
+				array(
56
+					'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_system') => array(
57
+						$this->_system_field_name       => array('IN', array('', 0)),
58
+						$this->_system_field_name . '*' => array('IS_NULL')
59
+					)
60
+				)
61
+			);
62
+		}
63
+		return $restrictions;
64
+	}
65 65
 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
     {
41 41
         // if there are no standard caps for this model, then for now all we know
42 42
         // if they need the default cap to access this
43
-        if (! $this->model()->cap_slug()) {
43
+        if ( ! $this->model()->cap_slug()) {
44 44
             return array(
45 45
                 EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
46 46
             );
@@ -51,11 +51,11 @@  discard block
 block discarded – undo
51 51
         // there is no "ee_read_system_questions" cap; in order to read reg form items you only need "ee_read_{model_name}".
52 52
         // there is also no "ee_delete_system_questions" cap. But folks shouldn't be deleting system questions anyway
53 53
         if ($this->action() !== EEM_Base::caps_read) {
54
-            $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_system') ] = new EE_Default_Where_Conditions(
54
+            $restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_system')] = new EE_Default_Where_Conditions(
55 55
                 array(
56
-                    'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_system') => array(
56
+                    'OR*no_'.EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_system') => array(
57 57
                         $this->_system_field_name       => array('IN', array('', 0)),
58
-                        $this->_system_field_name . '*' => array('IS_NULL')
58
+                        $this->_system_field_name.'*' => array('IS_NULL')
59 59
                     )
60 60
                 )
61 61
             );
Please login to merge, or discard this patch.
core/db_models/strategies/EE_CPT_Where_Conditions.strategy.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
         return array_merge(
26 26
             parent::_get_default_where_conditions(),
27 27
             array(
28
-                $status_field->get_name() => array('NOT IN',array('auto-draft','trash') )
28
+                $status_field->get_name() => array('NOT IN', array('auto-draft', 'trash'))
29 29
             )
30 30
         );
31 31
     }
Please login to merge, or discard this patch.
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
 /**
4 4
  *
5 5
  * Class EE_Default_Where_Conditions
6
-  *
6
+ *
7 7
  * Strategy specifically for adding where conditions specific to CPT models.
8 8
  *
9 9
  * @package         Event Espresso
@@ -14,19 +14,19 @@  discard block
 block discarded – undo
14 14
  */
15 15
 class EE_CPT_Where_Conditions extends EE_CPT_Minimum_Where_Conditions
16 16
 {
17
-    /**
18
-     * Gets the where default where conditions for a custom post type model
19
-     * @param string $model_relation_path. Eg, from Event to Payment, this should be "Registration.Transaction.Payment"
20
-     * @return array @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md#0-where-conditions
21
-     */
22
-    protected function _get_default_where_conditions()
23
-    {
24
-        $status_field = $this->_get_field_on_column('post_status');
25
-        return array_merge(
26
-            parent::_get_default_where_conditions(),
27
-            array(
28
-                $status_field->get_name() => array('NOT IN',array('auto-draft','trash') )
29
-            )
30
-        );
31
-    }
17
+	/**
18
+	 * Gets the where default where conditions for a custom post type model
19
+	 * @param string $model_relation_path. Eg, from Event to Payment, this should be "Registration.Transaction.Payment"
20
+	 * @return array @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md#0-where-conditions
21
+	 */
22
+	protected function _get_default_where_conditions()
23
+	{
24
+		$status_field = $this->_get_field_on_column('post_status');
25
+		return array_merge(
26
+			parent::_get_default_where_conditions(),
27
+			array(
28
+				$status_field->get_name() => array('NOT IN',array('auto-draft','trash') )
29
+			)
30
+		);
31
+	}
32 32
 }
Please login to merge, or discard this patch.
strategies/EE_Restriction_Generator_Taxonomy_Protected.strategy.php 2 patches
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -13,40 +13,40 @@
 block discarded – undo
13 13
 class EE_Restriction_Generator_Taxonomy_Protected extends EE_Restriction_Generator_Base
14 14
 {
15 15
 
16
-    /**
17
-     * Model chain/path to taxonomy model, including the term_taxonomy model itself
18
-     * @var string
19
-     */
20
-    protected $_path_to_taxonomy_model;
21
-    /**
22
-     *
23
-     * @param string $path_to_taxonomy_model Model chain/path to taxonomy model, including the term_taxonomy model itself
24
-     */
25
-    public function __construct($path_to_taxonomy_model)
26
-    {
27
-        if ($path_to_taxonomy_model !== '' && substr($path_to_taxonomy_model, -1, 1) != '.') {
28
-            $path_to_taxonomy_model .= '.';
29
-        }
30
-        $this->_path_to_taxonomy_model = $path_to_taxonomy_model;
31
-    }
32
-    protected function _generate_restrictions()
33
-    {
34
-        // if there are no standard caps for this model, then for allow full access
35
-        if (! $this->model()->cap_slug()) {
36
-            return array(
37
-            );
38
-        }
16
+	/**
17
+	 * Model chain/path to taxonomy model, including the term_taxonomy model itself
18
+	 * @var string
19
+	 */
20
+	protected $_path_to_taxonomy_model;
21
+	/**
22
+	 *
23
+	 * @param string $path_to_taxonomy_model Model chain/path to taxonomy model, including the term_taxonomy model itself
24
+	 */
25
+	public function __construct($path_to_taxonomy_model)
26
+	{
27
+		if ($path_to_taxonomy_model !== '' && substr($path_to_taxonomy_model, -1, 1) != '.') {
28
+			$path_to_taxonomy_model .= '.';
29
+		}
30
+		$this->_path_to_taxonomy_model = $path_to_taxonomy_model;
31
+	}
32
+	protected function _generate_restrictions()
33
+	{
34
+		// if there are no standard caps for this model, then for allow full access
35
+		if (! $this->model()->cap_slug()) {
36
+			return array(
37
+			);
38
+		}
39 39
 
40
-        return array(
41
-            'ee_manage_event_categories' => new EE_Default_Where_Conditions(array(
42
-                $this->_path_to_taxonomy_model . 'taxonomy*no_ee_manage_event_categories' => array( '!=', 'espresso_event_categories' )
43
-            )),
44
-            'ee_manage_venue_categories' => new EE_Default_Where_Conditions(array(
45
-                $this->_path_to_taxonomy_model . 'taxonomy*no_ee_manage_venue_categories' => array( '!=', 'espresso_venue_categories' )
46
-            )),
47
-            'ee_manage_event_types' => new EE_Default_Where_Conditions(array(
48
-                $this->_path_to_taxonomy_model . 'taxonomy*ee_manage_event_types' => array( '!=', 'espresso_event_types' )
49
-            )),
50
-        );
51
-    }
40
+		return array(
41
+			'ee_manage_event_categories' => new EE_Default_Where_Conditions(array(
42
+				$this->_path_to_taxonomy_model . 'taxonomy*no_ee_manage_event_categories' => array( '!=', 'espresso_event_categories' )
43
+			)),
44
+			'ee_manage_venue_categories' => new EE_Default_Where_Conditions(array(
45
+				$this->_path_to_taxonomy_model . 'taxonomy*no_ee_manage_venue_categories' => array( '!=', 'espresso_venue_categories' )
46
+			)),
47
+			'ee_manage_event_types' => new EE_Default_Where_Conditions(array(
48
+				$this->_path_to_taxonomy_model . 'taxonomy*ee_manage_event_types' => array( '!=', 'espresso_event_types' )
49
+			)),
50
+		);
51
+	}
52 52
 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -32,20 +32,20 @@
 block discarded – undo
32 32
     protected function _generate_restrictions()
33 33
     {
34 34
         // if there are no standard caps for this model, then for allow full access
35
-        if (! $this->model()->cap_slug()) {
35
+        if ( ! $this->model()->cap_slug()) {
36 36
             return array(
37 37
             );
38 38
         }
39 39
 
40 40
         return array(
41 41
             'ee_manage_event_categories' => new EE_Default_Where_Conditions(array(
42
-                $this->_path_to_taxonomy_model . 'taxonomy*no_ee_manage_event_categories' => array( '!=', 'espresso_event_categories' )
42
+                $this->_path_to_taxonomy_model.'taxonomy*no_ee_manage_event_categories' => array('!=', 'espresso_event_categories')
43 43
             )),
44 44
             'ee_manage_venue_categories' => new EE_Default_Where_Conditions(array(
45
-                $this->_path_to_taxonomy_model . 'taxonomy*no_ee_manage_venue_categories' => array( '!=', 'espresso_venue_categories' )
45
+                $this->_path_to_taxonomy_model.'taxonomy*no_ee_manage_venue_categories' => array('!=', 'espresso_venue_categories')
46 46
             )),
47 47
             'ee_manage_event_types' => new EE_Default_Where_Conditions(array(
48
-                $this->_path_to_taxonomy_model . 'taxonomy*ee_manage_event_types' => array( '!=', 'espresso_event_types' )
48
+                $this->_path_to_taxonomy_model.'taxonomy*ee_manage_event_types' => array('!=', 'espresso_event_types')
49 49
             )),
50 50
         );
51 51
     }
Please login to merge, or discard this patch.
core/db_models/strategies/EE_Return_None_Where_Conditions.strategy.php 2 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -12,13 +12,13 @@
 block discarded – undo
12 12
  */
13 13
 class EE_Return_None_Where_Conditions extends EE_Default_Where_Conditions
14 14
 {
15
-    protected function _get_default_where_conditions()
16
-    {
17
-        if ($this->_model->has_primary_key_field()) {
18
-            return array( $this->_model->primary_key_name() => array('<', 0 ) );
19
-        } else {
20
-            $fk_field = $this->_model->get_a_field_of_type('EE_Foreign_Key_Field_Base');
21
-            return array( 'AND*impossible' => array( $fk_field->get_name() => array('IS_NULL'), $fk_field->get_name() => 'IS_NOT_NULL' ) );
22
-        }
23
-    }
15
+	protected function _get_default_where_conditions()
16
+	{
17
+		if ($this->_model->has_primary_key_field()) {
18
+			return array( $this->_model->primary_key_name() => array('<', 0 ) );
19
+		} else {
20
+			$fk_field = $this->_model->get_a_field_of_type('EE_Foreign_Key_Field_Base');
21
+			return array( 'AND*impossible' => array( $fk_field->get_name() => array('IS_NULL'), $fk_field->get_name() => 'IS_NOT_NULL' ) );
22
+		}
23
+	}
24 24
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,10 +15,10 @@
 block discarded – undo
15 15
     protected function _get_default_where_conditions()
16 16
     {
17 17
         if ($this->_model->has_primary_key_field()) {
18
-            return array( $this->_model->primary_key_name() => array('<', 0 ) );
18
+            return array($this->_model->primary_key_name() => array('<', 0));
19 19
         } else {
20 20
             $fk_field = $this->_model->get_a_field_of_type('EE_Foreign_Key_Field_Base');
21
-            return array( 'AND*impossible' => array( $fk_field->get_name() => array('IS_NULL'), $fk_field->get_name() => 'IS_NOT_NULL' ) );
21
+            return array('AND*impossible' => array($fk_field->get_name() => array('IS_NULL'), $fk_field->get_name() => 'IS_NOT_NULL'));
22 22
         }
23 23
     }
24 24
 }
Please login to merge, or discard this patch.