Completed
Branch BETA-4.9-messages-queue-fixed (c79dab)
by
unknown
28:50 queued 13s
created
core/db_models/strategies/EE_Restriction_Generator_Public.strategy.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
3
-	exit( 'No direct script access allowed' );
2
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
3
+	exit('No direct script access allowed');
4 4
 }
5 5
 
6 6
 /**
@@ -13,44 +13,44 @@  discard block
 block discarded – undo
13 13
  * @author				Mike Nelson
14 14
  *
15 15
  */
16
-class EE_Restriction_Generator_Public extends EE_Restriction_Generator_Base{
16
+class EE_Restriction_Generator_Public extends EE_Restriction_Generator_Base {
17 17
 	protected function _generate_restrictions() {
18 18
 		//if there are no standard caps for this model, then for allow full access
19
-		if( ! $this->model()->cap_slug() ) {
19
+		if ( ! $this->model()->cap_slug()) {
20 20
 			return array(
21 21
 			);
22 22
 		}
23 23
 
24 24
 		$restrictions = array();
25 25
 		//does the basic cap exist? (eg 'ee_read_registrations')
26
-		if ( EE_Restriction_Generator_Base::is_cap( $this->model(), $this->action() ) ) {
27
-			if ( $this->model() instanceof EEM_CPT_Base ) {
28
-				$restrictions[ EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() ) ] = new EE_Default_Where_Conditions(
29
-					array( 'status' => 'publish' )
26
+		if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action())) {
27
+			if ($this->model() instanceof EEM_CPT_Base) {
28
+				$restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action())] = new EE_Default_Where_Conditions(
29
+					array('status' => 'publish')
30 30
 				);
31
-			} elseif ( $this->model() instanceof EEM_Soft_Delete_Base ) {
32
-				$restrictions[ EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() ) ] = new EE_Default_Where_Conditions(
33
-					array( $this->model()->deleted_field_name() => false )
31
+			} elseif ($this->model() instanceof EEM_Soft_Delete_Base) {
32
+				$restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action())] = new EE_Default_Where_Conditions(
33
+					array($this->model()->deleted_field_name() => false)
34 34
 				);
35 35
 			} else {
36 36
 				//don't impose any restrictions if they don't have the basic reading cap
37 37
 			}
38 38
 			//does the others cap exist? (eg 'ee_read_others_registrations')
39
-			if ( EE_Restriction_Generator_Base::is_cap( $this->model(), $this->action() . '_others' ) ) {//both caps exist
40
-				if ( $this->model() instanceof EEM_CPT_Base ) {
39
+			if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action().'_others')) {//both caps exist
40
+				if ($this->model() instanceof EEM_CPT_Base) {
41 41
 					//then if they don't have the others cap, AT MOST show them their own and other published ones
42
-					$restrictions[ EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_others' ) ] = new EE_Default_Where_Conditions(
42
+					$restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others')] = new EE_Default_Where_Conditions(
43 43
 						array(
44
-							'OR*' . EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_others' ) => array(
44
+							'OR*'.EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others') => array(
45 45
 								EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
46 46
 								'status' => 'publish'
47 47
 							)
48 48
 						) );
49
-				} elseif ( $this->model() instanceof EEM_Soft_Delete_Base ) {
49
+				} elseif ($this->model() instanceof EEM_Soft_Delete_Base) {
50 50
 					//then if they don't have the other cap, AT MOST show them their own or non deleted ones
51
-					$restrictions[ EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_others' ) ] = new EE_Default_Where_Conditions(
51
+					$restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others')] = new EE_Default_Where_Conditions(
52 52
 						array(
53
-							'OR*' . EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_others' ) => array(
53
+							'OR*'.EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others') => array(
54 54
 								EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
55 55
 								$this->model()->deleted_field_name() => false
56 56
 							)
@@ -59,13 +59,13 @@  discard block
 block discarded – undo
59 59
 					//again, if they don't have the others cap, continue showing all because there are no inherently hidden ones
60 60
 				}
61 61
 				//does the private cap exist (eg 'ee_read_others_private_events')
62
-				if ( EE_Restriction_Generator_Base::is_cap( $this->model(), $this->action() . '_private' ) && $this->model() instanceof EEM_CPT_Base ) {
62
+				if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action().'_private') && $this->model() instanceof EEM_CPT_Base) {
63 63
 					//if they have basic and others, but not private, restrict them to see theirs and others' that aren't private
64
-					$restrictions[ EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_private' ) ] = new EE_Default_Where_Conditions(
64
+					$restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_private')] = new EE_Default_Where_Conditions(
65 65
 						array(
66
-							'OR*' . EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_private' ) => array(
66
+							'OR*'.EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_private') => array(
67 67
 								EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
68
-								'status' => array( '!=', 'private' )
68
+								'status' => array('!=', 'private')
69 69
 							)
70 70
 						)
71 71
 					);
Please login to merge, or discard this patch.
core/db_models/strategies/EE_Restriction_Generator_Reg_Form.strategy.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
3
-	exit( 'No direct script access allowed' );
2
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
3
+	exit('No direct script access allowed');
4 4
 }
5 5
 
6 6
 /**
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
  * @author				Mike Nelson
16 16
  *
17 17
  */
18
-class EE_Restriction_Generator_Reg_Form extends EE_Restriction_Generator_Base{
18
+class EE_Restriction_Generator_Reg_Form extends EE_Restriction_Generator_Base {
19 19
 
20 20
 	/**
21 21
 	 *
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 	 * Accepts the name of the field that indicates whether or not an object is a "system" one or not
28 28
 	 * @param string $system_field_name
29 29
 	 */
30
-	public function __construct( $system_field_name ) {
30
+	public function __construct($system_field_name) {
31 31
 		$this->_system_field_name = $system_field_name;
32 32
 	}
33 33
 
@@ -40,18 +40,18 @@  discard block
 block discarded – undo
40 40
 	protected function _generate_restrictions() {
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
 			);
47 47
 		}
48 48
 		return array(
49
-			EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() ) => new EE_Return_None_Where_Conditions(),
50
-			EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_system' ) => new EE_Default_Where_Conditions(
49
+			EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) => new EE_Return_None_Where_Conditions(),
50
+			EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_system') => new EE_Default_Where_Conditions(
51 51
 				array(
52
-					'OR*no_' . EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_system' ) => array(
53
-						$this->_system_field_name       => array( 'IN', array( '', 0 ) ),
54
-						$this->_system_field_name . '*' => array( 'IS_NULL' )
52
+					'OR*no_'.EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_system') => array(
53
+						$this->_system_field_name       => array('IN', array('', 0)),
54
+						$this->_system_field_name.'*' => array('IS_NULL')
55 55
 					)
56 56
 				)
57 57
 			)
Please login to merge, or discard this patch.
strategies/EE_Restriction_Generator_Taxonomy_Protected.strategy.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
3
-	exit( 'No direct script access allowed' );
2
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
3
+	exit('No direct script access allowed');
4 4
 }
5 5
 
6 6
 /**
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
  * @author				Mike Nelson
14 14
  *
15 15
  */
16
-class EE_Restriction_Generator_Taxonomy_Protected extends EE_Restriction_Generator_Base{
16
+class EE_Restriction_Generator_Taxonomy_Protected extends EE_Restriction_Generator_Base {
17 17
 
18 18
 	/**
19 19
 	 * Model chain/path to taxonomy model, including the term_taxonomy model itself
@@ -24,28 +24,28 @@  discard block
 block discarded – undo
24 24
 	 *
25 25
 	 * @param string $path_to_taxonomy_model Model chain/path to taxonomy model, including the term_taxonomy model itself
26 26
 	 */
27
-	public function __construct( $path_to_taxonomy_model ){
28
-		if( $path_to_taxonomy_model !== '' && substr( $path_to_taxonomy_model, -1, 1 ) != '.' ) {
27
+	public function __construct($path_to_taxonomy_model) {
28
+		if ($path_to_taxonomy_model !== '' && substr($path_to_taxonomy_model, -1, 1) != '.') {
29 29
 			$path_to_taxonomy_model .= '.';
30 30
 		}
31 31
 		$this->_path_to_taxonomy_model = $path_to_taxonomy_model;
32 32
 	}
33 33
 	protected function _generate_restrictions() {
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
-			'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' )
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 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' )
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 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' )
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 49
 			)),
50 50
 		);
51 51
 	}
Please login to merge, or discard this patch.
core/db_models/strategies/EE_Restriction_Generator_WP_User.strategy.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
3
-	exit( 'No direct script access allowed' );
2
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
3
+	exit('No direct script access allowed');
4 4
 }
5 5
 
6 6
 /**
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
  * @author				Mike Nelson
16 16
  *
17 17
  */
18
-class EE_Restriction_Generator_WP_User extends EE_Restriction_Generator_Base{
18
+class EE_Restriction_Generator_WP_User extends EE_Restriction_Generator_Base {
19 19
 
20 20
 	/**
21 21
 	 * @return \EE_Default_Where_Conditions
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 
25 25
 		return array(
26 26
 			//if they can't access users, they can still access themselves
27
-			EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() ) => new EE_Default_Where_Conditions( array(
27
+			EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) => new EE_Default_Where_Conditions(array(
28 28
 				EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder
29 29
 			)),
30 30
 
Please login to merge, or discard this patch.
core/db_models/strategies/EE_Return_None_Where_Conditions.strategy.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
3
-	exit( 'No direct script access allowed' );
2
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
3
+	exit('No direct script access allowed');
4 4
 }
5 5
 
6 6
 /**
@@ -14,12 +14,12 @@  discard block
 block discarded – undo
14 14
  *
15 15
  */
16 16
 class EE_Return_None_Where_Conditions extends EE_Default_Where_Conditions {
17
-	protected function _get_default_where_conditions(){
18
-		if( $this->_model->has_primary_key_field() ) {
19
-			return array( $this->_model->primary_key_name() => array('<', 0 ) );
20
-		}else{
21
-			$fk_field = $this->_model->get_a_field_of_type( 'EE_Foreign_Key_Field_Base' );
22
-			return array( 'AND*impossible' => array( $fk_field->get_name() => array('IS_NULL'), $fk_field->get_name() => 'IS_NOT_NULL' ) );
17
+	protected function _get_default_where_conditions() {
18
+		if ($this->_model->has_primary_key_field()) {
19
+			return array($this->_model->primary_key_name() => array('<', 0));
20
+		} else {
21
+			$fk_field = $this->_model->get_a_field_of_type('EE_Foreign_Key_Field_Base');
22
+			return array('AND*impossible' => array($fk_field->get_name() => array('IS_NULL'), $fk_field->get_name() => 'IS_NOT_NULL'));
23 23
 		}
24 24
 	}
25 25
 }
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@
 block discarded – undo
90 90
 		//so in case teh IPN is arriving later, let's try to process an IPN!
91 91
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
92 92
 			return $this->handle_ipn($_POST, $transaction );
93
-		}else{
93
+		} else{
94 94
 			return parent::finalize_payment_for( $transaction );
95 95
 		}
96 96
 	}
Please login to merge, or discard this patch.
core/helpers/EEH_Array.helper.php 2 patches
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -61,10 +61,10 @@
 block discarded – undo
61 61
 			$first_item = reset($arr);
62 62
 			if(is_array($first_item)){
63 63
 				return true;//yep, there's at least 2 levels to this array
64
-			}else{
64
+			} else{
65 65
 				return false;//nope, only 1 level
66 66
 			}
67
-		}else{
67
+		} else{
68 68
 			return false;//its not an array at all!
69 69
 		}
70 70
 	}
Please login to merge, or discard this patch.
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('NO direct script access allowed'); }
3 3
 
4
-require_once( EE_HELPERS . 'EEH_Base.helper.php' );
4
+require_once(EE_HELPERS.'EEH_Base.helper.php');
5 5
 
6 6
 /**
7 7
  * EE_Array
@@ -26,8 +26,8 @@  discard block
 block discarded – undo
26 26
 	 * @param  array $array2 an array of objects
27 27
 	 * @return array         an array of objects found in array 1 that aren't found in array 2.
28 28
 	 */
29
-	public static function object_array_diff( $array1, $array2 ) {
30
-		return array_udiff( $array1, $array2, array('self', '_compare_objects' ));
29
+	public static function object_array_diff($array1, $array2) {
30
+		return array_udiff($array1, $array2, array('self', '_compare_objects'));
31 31
 	}
32 32
 
33 33
 	/**
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 	 * @param array $arr
36 36
 	 * @return boolean
37 37
 	 */
38
-	public static function is_associative_array($arr){
38
+	public static function is_associative_array($arr) {
39 39
 		return  array_keys($arr) !== range(0, count($arr) - 1);
40 40
 	}
41 41
 
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 	 * @param array $arr
46 46
 	 * @return mixed what ever is in the array
47 47
 	 */
48
-	public static function get_one_item_from_array($arr){
48
+	public static function get_one_item_from_array($arr) {
49 49
 		$item = end($arr);
50 50
 		reset($arr);
51 51
 		return $item;
@@ -56,16 +56,16 @@  discard block
 block discarded – undo
56 56
 	 * @param mixed $arr
57 57
 	 * @return boolean
58 58
 	 */
59
-	public static function is_multi_dimensional_array($arr){
60
-		if(is_array($arr)){
59
+	public static function is_multi_dimensional_array($arr) {
60
+		if (is_array($arr)) {
61 61
 			$first_item = reset($arr);
62
-			if(is_array($first_item)){
63
-				return true;//yep, there's at least 2 levels to this array
64
-			}else{
65
-				return false;//nope, only 1 level
62
+			if (is_array($first_item)) {
63
+				return true; //yep, there's at least 2 levels to this array
64
+			} else {
65
+				return false; //nope, only 1 level
66 66
 			}
67
-		}else{
68
-			return false;//its not an array at all!
67
+		} else {
68
+			return false; //its not an array at all!
69 69
 		}
70 70
 	}
71 71
 
@@ -76,8 +76,8 @@  discard block
 block discarded – undo
76 76
 	 * @param mixed $default
77 77
 	 * @return mixed
78 78
 	 */
79
-	public static function is_set( $arr, $index, $default ) {
80
-		return isset( $arr[ $index ] ) ? $arr[ $index ] : $default;
79
+	public static function is_set($arr, $index, $default) {
80
+		return isset($arr[$index]) ? $arr[$index] : $default;
81 81
 	}
82 82
 
83 83
 	/**
@@ -85,12 +85,12 @@  discard block
 block discarded – undo
85 85
 	 * @param mixed $value usually a string, but could be an array or object
86 86
 	 * @return mixed the UNserialized data
87 87
 	 */
88
-	public static function maybe_unserialize( $value ) {
88
+	public static function maybe_unserialize($value) {
89 89
 		$data = maybe_unserialize($value);
90 90
 		//it's possible that this still has serialized data if its the session.  WP has a bug, http://core.trac.wordpress.org/ticket/26118 that doesnt' unserialize this automatically.
91 91
 		$token = 'C';
92 92
 		$data = is_string($data) ? trim($data) : $data;
93
-		if ( is_string($data) && strlen($data) > 1 && $data[0] == $token  && preg_match( "/^{$token}:[0-9]+:/s", $data ) ) {
93
+		if (is_string($data) && strlen($data) > 1 && $data[0] == $token && preg_match("/^{$token}:[0-9]+:/s", $data)) {
94 94
 			return unserialize($data);
95 95
 		} else {
96 96
 			return $data;
@@ -109,30 +109,30 @@  discard block
 block discarded – undo
109 109
 	 * @param bool $preserve_keys 		whether or not to reset numerically indexed arrays
110 110
 	 * @return array
111 111
 	 */
112
-	public static function insert_into_array( $target_array = array(), $array_to_insert = array(), $offset = null, $add_before = true, $preserve_keys = true ) {
112
+	public static function insert_into_array($target_array = array(), $array_to_insert = array(), $offset = null, $add_before = true, $preserve_keys = true) {
113 113
 		// ensure incoming arrays are actually arrays
114
-		$target_array 		= (array)$target_array;
115
-		$array_to_insert	= (array)$array_to_insert;
114
+		$target_array = (array) $target_array;
115
+		$array_to_insert = (array) $array_to_insert;
116 116
 		// if no offset key was supplied
117
-		if ( empty( $offset )) {
117
+		if (empty($offset)) {
118 118
 			// use start or end of $target_array based on whether we are adding before or not
119
-			$offset = $add_before ? 0 : count( $target_array );
119
+			$offset = $add_before ? 0 : count($target_array);
120 120
 		}
121 121
 		// if offset key is a string, then find the corresponding numeric location for that element
122
-		$offset = is_int( $offset ) ? $offset : array_search( $offset, array_keys( $target_array ) );
122
+		$offset = is_int($offset) ? $offset : array_search($offset, array_keys($target_array));
123 123
 		// add one to the offset if adding after
124 124
 		$offset = $add_before ? $offset : $offset + 1;
125 125
 		// but ensure offset does not exceed the length of the array
126
-		$offset = $offset > count( $target_array ) ? count( $target_array ) : $offset;
126
+		$offset = $offset > count($target_array) ? count($target_array) : $offset;
127 127
 		// reindex array ???
128
-		if ( $preserve_keys ) {
128
+		if ($preserve_keys) {
129 129
 			// take a slice of the target array from the beginning till the offset,
130 130
 			// then add the new data
131 131
 			// then add another slice that starts at the offset and goes till the end
132
-			return array_slice( $target_array, 0, $offset, true ) + $array_to_insert + array_slice( $target_array, $offset, null, true );
132
+			return array_slice($target_array, 0, $offset, true) + $array_to_insert + array_slice($target_array, $offset, null, true);
133 133
 		} else {
134 134
 			// since we don't want to preserve keys, we can use array_splice
135
-			array_splice( $target_array, $offset, 0, $array_to_insert );
135
+			array_splice($target_array, $offset, 0, $array_to_insert);
136 136
 			return $target_array;
137 137
 		}
138 138
 	}
Please login to merge, or discard this patch.
core/helpers/EEH_Autoloader.helper.php 3 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -23,10 +23,10 @@
 block discarded – undo
23 23
 	private static $_instance = NULL;
24 24
 
25 25
 	/**
26
-	* 	$_autoloaders
27
-	* 	@var array $_autoloaders
28
-	* 	@access 	private
29
-	*/
26
+	 * 	$_autoloaders
27
+	 * 	@var array $_autoloaders
28
+	 * 	@access 	private
29
+	 */
30 30
 	private static $_autoloaders;
31 31
 
32 32
 
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,8 +6,9 @@
 block discarded – undo
6 6
  * @package Event Espresso
7 7
  * @subpackage messages
8 8
  */
9
-if (!defined('EVENT_ESPRESSO_VERSION') )
9
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
10 10
 	exit('NO direct script access allowed');
11
+}
11 12
 
12 13
 /**
13 14
  *
Please login to merge, or discard this patch.
Spacing   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
3 3
 	exit('NO direct script access allowed');
4 4
 
5 5
 /**
@@ -40,10 +40,10 @@  discard block
 block discarded – undo
40 40
 	 * @return \EEH_Autoloader
41 41
 	 */
42 42
 	private function __construct() {
43
-		if ( self::$_autoloaders === null ) {
43
+		if (self::$_autoloaders === null) {
44 44
 			self::$_autoloaders = array();
45 45
 			$this->_register_custom_autoloaders();
46
-			spl_autoload_register( array( $this, 'espresso_autoloader' ) );
46
+			spl_autoload_register(array($this, 'espresso_autoloader'));
47 47
 		}
48 48
 	}
49 49
 
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 	 */
56 56
 	public static function instance() {
57 57
 		// check if class object is instantiated
58
-		if ( ! self::$_instance instanceof EEH_Autoloader ) {
58
+		if ( ! self::$_instance instanceof EEH_Autoloader) {
59 59
 			self::$_instance = new self();
60 60
 		}
61 61
 		return self::$_instance;
@@ -72,9 +72,9 @@  discard block
 block discarded – undo
72 72
 	 * @internal  param string $class_name - simple class name ie: session
73 73
 	 * @return 	void
74 74
 	 */
75
-	public static function espresso_autoloader( $class_name ) {
76
-		if ( isset( self::$_autoloaders[ $class_name ] ) ) {
77
-			require_once( self::$_autoloaders[ $class_name ] );
75
+	public static function espresso_autoloader($class_name) {
76
+		if (isset(self::$_autoloaders[$class_name])) {
77
+			require_once(self::$_autoloaders[$class_name]);
78 78
 		}
79 79
 	}
80 80
 
@@ -90,26 +90,26 @@  discard block
 block discarded – undo
90 90
 	 * @return void
91 91
 	 * @throws \EE_Error
92 92
 	 */
93
-	public static function register_autoloader( $class_paths, $read_check = true, $debug = false ) {
94
-		$class_paths = is_array( $class_paths ) ? $class_paths : array( $class_paths );
95
-		foreach ( $class_paths as $class => $path ) {
93
+	public static function register_autoloader($class_paths, $read_check = true, $debug = false) {
94
+		$class_paths = is_array($class_paths) ? $class_paths : array($class_paths);
95
+		foreach ($class_paths as $class => $path) {
96 96
 			// don't give up! you gotta...
97 97
 			// get some class
98
-			if ( empty( $class )) {
99
-				throw new EE_Error ( sprintf( __( 'No Class name was specified while registering an autoloader for the following path: %s.','event_espresso' ), $path ));
98
+			if (empty($class)) {
99
+				throw new EE_Error(sprintf(__('No Class name was specified while registering an autoloader for the following path: %s.', 'event_espresso'), $path));
100 100
 			}
101 101
 			// one day you will find the path young grasshopper
102
-			if ( empty( $path )) {
103
-				throw new EE_Error ( sprintf( __( 'No path was specified while registering an autoloader for the %s class.','event_espresso' ), $class ));
102
+			if (empty($path)) {
103
+				throw new EE_Error(sprintf(__('No path was specified while registering an autoloader for the %s class.', 'event_espresso'), $class));
104 104
 			}
105 105
 			// is file readable ?
106
-			if ( $read_check && ! is_readable( $path )) {
107
-				throw new EE_Error ( sprintf( __( 'The file for the %s class could not be found or is not readable due to file permissions. Please ensure the following path is correct: %s','event_espresso' ), $class, $path ));
106
+			if ($read_check && ! is_readable($path)) {
107
+				throw new EE_Error(sprintf(__('The file for the %s class could not be found or is not readable due to file permissions. Please ensure the following path is correct: %s', 'event_espresso'), $class, $path));
108 108
 			}
109
-			if ( ! isset( self::$_autoloaders[ $class ] )) {
110
-				self::$_autoloaders[ $class ] = str_replace( array( '/', '\\' ), DS, $path );
111
-				if ( WP_DEBUG && $debug ) {
112
-					EEH_Debug_Tools::printr( self::$_autoloaders[ $class ], $class, __FILE__, __LINE__ );
109
+			if ( ! isset(self::$_autoloaders[$class])) {
110
+				self::$_autoloaders[$class] = str_replace(array('/', '\\'), DS, $path);
111
+				if (WP_DEBUG && $debug) {
112
+					EEH_Debug_Tools::printr(self::$_autoloaders[$class], $class, __FILE__, __LINE__);
113 113
 				}
114 114
 			}
115 115
 		}
@@ -138,12 +138,12 @@  discard block
 block discarded – undo
138 138
 	 * 	@return void
139 139
 	 */
140 140
 	private function _register_custom_autoloaders() {
141
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_CORE . 'interfaces' );
142
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_CORE );
143
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_INTERFACES, true );
144
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_MODELS, true );
145
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_CLASSES );
146
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_FORM_SECTIONS, true );
141
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE.'interfaces');
142
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE);
143
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_INTERFACES, true);
144
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_MODELS, true);
145
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CLASSES);
146
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_FORM_SECTIONS, true);
147 147
 	}
148 148
 
149 149
 
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 	 * 	@return void
170 170
 	 */
171 171
 	public static function register_line_item_display_autoloaders() {
172
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(  EE_LIBRARIES . 'line_item_display' , true );
172
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'line_item_display', true);
173 173
 	}
174 174
 
175 175
 
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 	 * 	@return void
183 183
 	 */
184 184
 	public static function register_line_item_filter_autoloaders() {
185
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(  EE_LIBRARIES . 'line_item_filters' , true );
185
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'line_item_filters', true);
186 186
 	}
187 187
 
188 188
 
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
 	 * 	@return void
196 196
 	 */
197 197
 	public static function register_template_part_autoloaders() {
198
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_LIBRARIES . 'template_parts', true );
198
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'template_parts', true);
199 199
 	}
200 200
 
201 201
 
@@ -213,30 +213,30 @@  discard block
 block discarded – undo
213 213
 	 * @return void
214 214
 	 * @throws \EE_Error
215 215
 	 */
216
-	public static function register_autoloaders_for_each_file_in_folder( $folder, $recursive = false, $debug = false ){
216
+	public static function register_autoloaders_for_each_file_in_folder($folder, $recursive = false, $debug = false) {
217 217
 		// make sure last char is a /
218
-		$folder .= $folder[strlen($folder)-1] != DS ? DS : '';
218
+		$folder .= $folder[strlen($folder) - 1] != DS ? DS : '';
219 219
 		$class_to_filepath_map = array();
220
-		$exclude = array( 'index' );
220
+		$exclude = array('index');
221 221
 		//get all the files in that folder that end in php
222
-		$filepaths = glob( $folder.'*');
222
+		$filepaths = glob($folder.'*');
223 223
 
224
-		if ( empty( $filepaths ) ) {
224
+		if (empty($filepaths)) {
225 225
 			return;
226 226
 		}
227 227
 
228
-		foreach( $filepaths as $filepath ) {
229
-			if ( substr( $filepath, -4, 4 ) == '.php' ) {
230
-				$class_name = EEH_File::get_classname_from_filepath_with_standard_filename( $filepath );
231
-				if ( ! in_array( $class_name, $exclude )) {
232
-					$class_to_filepath_map [ $class_name ] = $filepath;
228
+		foreach ($filepaths as $filepath) {
229
+			if (substr($filepath, -4, 4) == '.php') {
230
+				$class_name = EEH_File::get_classname_from_filepath_with_standard_filename($filepath);
231
+				if ( ! in_array($class_name, $exclude)) {
232
+					$class_to_filepath_map [$class_name] = $filepath;
233 233
 				}
234
-			} else if ( $recursive ) {
235
-				EEH_Autoloader::register_autoloaders_for_each_file_in_folder( $filepath, $recursive );
234
+			} else if ($recursive) {
235
+				EEH_Autoloader::register_autoloaders_for_each_file_in_folder($filepath, $recursive);
236 236
 			}
237 237
 		}
238 238
 		// we remove the necessity to do a is_readable() check via the $read_check flag because glob by nature will not return non_readable files/directories.
239
-		self::register_autoloader( $class_to_filepath_map, false, $debug );
239
+		self::register_autoloader($class_to_filepath_map, false, $debug);
240 240
 	}
241 241
 
242 242
 
Please login to merge, or discard this patch.
core/helpers/EEH_Base.helper.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
 	 *		@ override magic methods
34 34
 	 *		@ return void
35 35
 	 */	
36
-	public function __set($a,$b) { return FALSE; }
36
+	public function __set($a, $b) { return FALSE; }
37 37
 	public function __get($a) { return FALSE; }
38 38
 	public function __isset($a) { return FALSE; }
39 39
 	public function __unset($a) { return FALSE; }
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 block discarded – undo
1
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 /**
3 5
  * Event Espresso
4 6
  *
Please login to merge, or discard this patch.
core/helpers/EEH_Class_Tools.helper.php 2 patches
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -35,35 +35,35 @@  discard block
 block discarded – undo
35 35
 	 */
36 36
 	public static function get_called_class() {
37 37
 		$backtrace = debug_backtrace();
38
-		if ( isset( $backtrace[2] ) && is_array( $backtrace[2] ) && isset( $backtrace[2]['class'] ) && ! isset( $backtrace[2]['file'] )) {
38
+		if (isset($backtrace[2]) && is_array($backtrace[2]) && isset($backtrace[2]['class']) && ! isset($backtrace[2]['file'])) {
39 39
 			return $backtrace[2]['class'];
40
-		} else if ( isset( $backtrace[3] ) && is_array( $backtrace[3] ) && isset( $backtrace[3]['class'] ) && ! isset( $backtrace[3]['file'] )) {
40
+		} else if (isset($backtrace[3]) && is_array($backtrace[3]) && isset($backtrace[3]['class']) && ! isset($backtrace[3]['file'])) {
41 41
 			return $backtrace[3]['class'];
42
-		} else if ( isset( $backtrace[2] ) && is_array( $backtrace[2] ) && isset( $backtrace[2]['file'] ) && isset( $backtrace[2]['line'] )) {
43
-			if ( self::$file_line == $backtrace[2]['file'] . $backtrace[2]['line'] ) {
42
+		} else if (isset($backtrace[2]) && is_array($backtrace[2]) && isset($backtrace[2]['file']) && isset($backtrace[2]['line'])) {
43
+			if (self::$file_line == $backtrace[2]['file'].$backtrace[2]['line']) {
44 44
 				self::$i++;
45 45
 			} else {
46 46
 				self::$i = 0;
47
-				self::$file_line = $backtrace[2]['file'] . $backtrace[2]['line'];
47
+				self::$file_line = $backtrace[2]['file'].$backtrace[2]['line'];
48 48
 			}
49 49
 			// was  class method called via call_user_func ?
50
-			if ( $backtrace[2]['function'] == 'call_user_func' && isset( $backtrace[2]['args'] ) && is_array( $backtrace[2]['args'] )){
51
-				if ( isset( $backtrace[2]['args'][0] ) && isset( $backtrace[2]['args'][0][0] )) {
50
+			if ($backtrace[2]['function'] == 'call_user_func' && isset($backtrace[2]['args']) && is_array($backtrace[2]['args'])) {
51
+				if (isset($backtrace[2]['args'][0]) && isset($backtrace[2]['args'][0][0])) {
52 52
 					$called_class = $backtrace[2]['args'][0][0];
53 53
 					// is it an EE function ?
54
-					if ( strpos( $called_class, 'EE' ) === 0 ) {
55
-						$prefix_chars = strpos( $called_class, '_' ) + 1;
56
-						$prefix = substr( $called_class, 0, $prefix_chars );
57
-						$classname = substr( $called_class, $prefix_chars, strlen( $called_class ));
58
-						$classname = $prefix . str_replace( ' ', '_', ucwords( strtolower( str_replace( '_', ' ', $classname  ))));
54
+					if (strpos($called_class, 'EE') === 0) {
55
+						$prefix_chars = strpos($called_class, '_') + 1;
56
+						$prefix = substr($called_class, 0, $prefix_chars);
57
+						$classname = substr($called_class, $prefix_chars, strlen($called_class));
58
+						$classname = $prefix.str_replace(' ', '_', ucwords(strtolower(str_replace('_', ' ', $classname))));
59 59
 						return $classname;
60 60
 					}
61 61
 				}
62 62
 			} else {
63
-				$lines = file( $backtrace[2]['file'] );
64
-				preg_match_all( '/([a-zA-Z0-9\_]+)::' . $backtrace[2]['function'] . '/', $lines[$backtrace[2]['line']-1], $matches );
65
-				if ( isset( $matches[1] ) && isset( $matches[1][ self::$i ] )) {
66
-					return $matches[1][ self::$i ];
63
+				$lines = file($backtrace[2]['file']);
64
+				preg_match_all('/([a-zA-Z0-9\_]+)::'.$backtrace[2]['function'].'/', $lines[$backtrace[2]['line'] - 1], $matches);
65
+				if (isset($matches[1]) && isset($matches[1][self::$i])) {
66
+					return $matches[1][self::$i];
67 67
 				}
68 68
 			}
69 69
 		}
@@ -80,22 +80,22 @@  discard block
 block discarded – undo
80 80
 	 * 	@param 	string 	$hook
81 81
 	 * 	@return 	array
82 82
 	 */
83
-	public static function get_class_names_for_all_callbacks_on_hook( $hook = NULL ) {
83
+	public static function get_class_names_for_all_callbacks_on_hook($hook = NULL) {
84 84
 		global $wp_filter;
85 85
 		$class_names = array();
86 86
 		// are any callbacks registered for this hook ?
87
-		if ( isset( $wp_filter[ $hook ] )) {
87
+		if (isset($wp_filter[$hook])) {
88 88
 			// loop thru all of the callbacks attached to the deprecated hookpoint
89
-			foreach( $wp_filter[ $hook ] as $priority ) {
90
-				foreach( $priority as $callback ) {
89
+			foreach ($wp_filter[$hook] as $priority) {
90
+				foreach ($priority as $callback) {
91 91
 					// is the callback a non-static class method ?
92
-					if ( isset( $callback['function'] ) && is_array( $callback['function'] )) {
93
-						if ( isset( $callback['function'][0] ) && is_object( $callback['function'][0] )) {
94
-							$class_names[] = get_class( $callback['function'][0] );
92
+					if (isset($callback['function']) && is_array($callback['function'])) {
93
+						if (isset($callback['function'][0]) && is_object($callback['function'][0])) {
94
+							$class_names[] = get_class($callback['function'][0]);
95 95
 						}
96 96
 					// test for static method
97
-					} else if ( strpos( $callback['function'], '::' ) !== FALSE ) {
98
-						$class = explode( '::', $callback['function'] );
97
+					} else if (strpos($callback['function'], '::') !== FALSE) {
98
+						$class = explode('::', $callback['function']);
99 99
 						$class_names[] = $class[0];
100 100
 					} else {
101 101
 						// just a function
@@ -116,24 +116,24 @@  discard block
 block discarded – undo
116 116
 	 * 	@param		string 	$property
117 117
 	 * 	@return 		boolean
118 118
 	 */
119
-	public static function has_property( $class = NULL, $property = NULL ) {
119
+	public static function has_property($class = NULL, $property = NULL) {
120 120
 		// if $class or $property don't exist, then get out, cuz that would be like... fatal dude
121
-		if ( empty( $class ) || empty( $property )) {
121
+		if (empty($class) || empty($property)) {
122 122
 			return FALSE;
123 123
 		}
124 124
 		// if your hosting company doesn't cut the mustard
125
-		if ( version_compare( PHP_VERSION, '5.3.0' ) < 0 ) {
125
+		if (version_compare(PHP_VERSION, '5.3.0') < 0) {
126 126
 			// just in case $class is an actual instantiated object
127
-			if ( is_object( $class )) {
128
-				return isset( $class->$property ) ? TRUE : FALSE;
127
+			if (is_object($class)) {
128
+				return isset($class->$property) ? TRUE : FALSE;
129 129
 			} else {
130 130
 				// use reflection for < PHP 5.3 to get details using just the class name
131
-				$reflector = new ReflectionClass( $class );
132
-				return $reflector->hasProperty( $property );
131
+				$reflector = new ReflectionClass($class);
132
+				return $reflector->hasProperty($property);
133 133
 			}
134 134
 		} else {
135 135
 			// or try regular property exists method which works as expected in PHP 5.3+
136
-			return property_exists( $class, $property );
136
+			return property_exists($class, $property);
137 137
 		}
138 138
 	}
139 139
 
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 
144 144
 
145 145
 // if PHP version < 5.3
146
-if ( ! function_exists( 'get_called_class' )) {
146
+if ( ! function_exists('get_called_class')) {
147 147
 	/**
148 148
 	 * @return bool|string
149 149
 	 */
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 block discarded – undo
1
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 /**
3 5
  * Event Espresso
4 6
  *
Please login to merge, or discard this patch.