Completed
Branch FET-5580-registration-cancella... (d3ffee)
by
unknown
498:10 queued 484:24
created
core/interfaces/EEI_Interfaces.php 2 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -229,15 +229,15 @@
 block discarded – undo
229 229
  */
230 230
 interface EEHI_Money{
231 231
 		/**
232
-	 * For comparing floats. Default operator is '=', but see the $operator below for all options.
233
-	 * This should be used to compare floats instead of normal '==' because floats
234
-	 * are inherently inprecise, and so you can sometimes have two floats that appear to be identical
235
-	 * but actually differ by 0.00000001.
236
-	 * @param float $float1
237
-	 * @param float $float2
238
-	 * $param string $operator  The operator. Valid options are =, <=, <, >=, >, <>, eq, lt, lte, gt, gte, ne
239
-	 * @return boolean whether the equation is true or false
240
-	 */
232
+		 * For comparing floats. Default operator is '=', but see the $operator below for all options.
233
+		 * This should be used to compare floats instead of normal '==' because floats
234
+		 * are inherently inprecise, and so you can sometimes have two floats that appear to be identical
235
+		 * but actually differ by 0.00000001.
236
+		 * @param float $float1
237
+		 * @param float $float2
238
+		 * $param string $operator  The operator. Valid options are =, <=, <, >=, >, <>, eq, lt, lte, gt, gte, ne
239
+		 * @return boolean whether the equation is true or false
240
+		 */
241 241
 	function compare_floats( $float1, $float2, $operator='=' );
242 242
 }
243 243
 
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
 /**
6 6
  * Interface EEI_Base
7 7
  */
8
-interface EEI_Base{
8
+interface EEI_Base {
9 9
 	/**
10 10
 	 * gets the unique ID of the model object. If it hasn't been saved yet
11 11
 	 * to the database, this should be 0 or NULL
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 	 * @param 	EE_Response $response
49 49
 	 * @return 	EE_Response
50 50
 	 */
51
-	public function handle_request( EE_Request $request, EE_Response $response );
51
+	public function handle_request(EE_Request $request, EE_Response $response);
52 52
 }
53 53
 
54 54
 
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 	 * @param EE_Request $request
65 65
 	 * @param EE_Response $response
66 66
 	 */
67
-	public function handle_response( EE_Request $request, EE_Response $response );
67
+	public function handle_response(EE_Request $request, EE_Response $response);
68 68
 }
69 69
 
70 70
 
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 	 * @param string $country
223 223
 	 * @param string $CNT_ISO
224 224
 	 */
225
-	public function format( $address, $address2, $city, $state, $zip, $country, $CNT_ISO );
225
+	public function format($address, $address2, $city, $state, $zip, $country, $CNT_ISO);
226 226
 }
227 227
 
228 228
 
@@ -232,13 +232,13 @@  discard block
 block discarded – undo
232 232
 /**
233 233
  * Interface EEHI_Line_Item
234 234
  */
235
-interface EEHI_Line_Item{
235
+interface EEHI_Line_Item {
236 236
 	/**
237 237
 	 * Adds an item to the purchase in the right spot
238 238
 	 * @param EE_Line_Item $total_line_item
239 239
 	 * @param EE_Line_Item $line_item
240 240
 	 */
241
-	public function add_item( EE_line_Item $total_line_item, EE_Line_Item $line_item );
241
+	public function add_item(EE_line_Item $total_line_item, EE_Line_Item $line_item);
242 242
 	/**
243 243
 	 * Overwrites the previous tax by clearing out the old taxes, and creates a new
244 244
 	 * tax and updates the total line item accordingly
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
 	 * @param string $description
249 249
 	 * @return EE_Line_Item the new tax created
250 250
 	 */
251
-	public function set_total_tax_to( EE_Line_Item $total_line_item, $amount, $name  = NULL, $description = NULL );
251
+	public function set_total_tax_to(EE_Line_Item $total_line_item, $amount, $name = NULL, $description = NULL);
252 252
 
253 253
 	/**
254 254
 	 * Adds a simple item ( unrelated to any other model object) to the total line item,
@@ -261,14 +261,14 @@  discard block
 block discarded – undo
261 261
 	 * @param boolean $taxable
262 262
 	 * @return boolean success
263 263
 	 */
264
-	public function add_unrelated_item( EE_Line_Item $total_line_item, $name, $unit_price, $description = '', $quantity = 1, $taxable = FALSE );
264
+	public function add_unrelated_item(EE_Line_Item $total_line_item, $name, $unit_price, $description = '', $quantity = 1, $taxable = FALSE);
265 265
 }
266 266
 
267 267
 
268 268
 /**
269 269
  * Money-related helper
270 270
  */
271
-interface EEHI_Money{
271
+interface EEHI_Money {
272 272
 		/**
273 273
 	 * For comparing floats. Default operator is '=', but see the $operator below for all options.
274 274
 	 * This should be used to compare floats instead of normal '==' because floats
@@ -279,13 +279,13 @@  discard block
 block discarded – undo
279 279
 	 * $param string $operator  The operator. Valid options are =, <=, <, >=, >, <>, eq, lt, lte, gt, gte, ne
280 280
 	 * @return boolean whether the equation is true or false
281 281
 	 */
282
-	function compare_floats( $float1, $float2, $operator='=' );
282
+	function compare_floats($float1, $float2, $operator = '=');
283 283
 }
284 284
 
285 285
 /**
286 286
  * Interface EEHI_Template
287 287
  */
288
-interface EEHI_Template{
288
+interface EEHI_Template {
289 289
 
290 290
 	/**
291 291
 	 * EEH_Template::format_currency
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
 	 * @param string   $cur_code_span_class
299 299
 	 * @return string the html output for the formatted money value
300 300
 	 */
301
-	public static function format_currency( $amount = NULL, $return_raw = FALSE, $display_code = TRUE, $CNT_ISO = '', $cur_code_span_class = 'currency-code' );
301
+	public static function format_currency($amount = NULL, $return_raw = FALSE, $display_code = TRUE, $CNT_ISO = '', $cur_code_span_class = 'currency-code');
302 302
 }
303 303
 
304 304
 
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
 	 * @param array $options
314 314
 	 * @return mixed
315 315
 	 */
316
-	public function display_line_item( EE_Line_Item $line_item, $options = array() );
316
+	public function display_line_item(EE_Line_Item $line_item, $options = array());
317 317
 
318 318
 }
319 319
 
Please login to merge, or discard this patch.
core/libraries/form_sections/inputs/EE_CVV_Input.input.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
  * @subpackage
9 9
  * @author				Mike Nelson
10 10
  */
11
-class EE_CVV_Input extends EE_Text_Input{
11
+class EE_CVV_Input extends EE_Text_Input {
12 12
 
13 13
 	/**
14 14
 	 * @param array $input_settings {
@@ -17,12 +17,12 @@  discard block
 block discarded – undo
17 17
 	 */
18 18
 	public function __construct($input_settings = array()) {
19 19
 		$this->set_sensitive_data_removal_strategy(new EE_CCV_Sensitive_Data_Removal());
20
-		$this->_add_validation_strategy( new EE_Int_Validation_Strategy(isset( $input_settings[ 'validation_error_message' ] ) ? $input_settings[ 'validation_error_message' ] : NULL ) );
20
+		$this->_add_validation_strategy(new EE_Int_Validation_Strategy(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : NULL));
21 21
 		parent::__construct($input_settings);
22
-		if( 
23
-				! isset( $input_settings[ 'include_whats_this_link' ] ) ||
24
-				( isset( $input_settings[ 'include_whats_this_link' ] ) &&
25
-				 $input_settings[ 'include_whats_this_link' ] == true ) ) {
22
+		if ( 
23
+				! isset($input_settings['include_whats_this_link']) ||
24
+				(isset($input_settings['include_whats_this_link']) &&
25
+				 $input_settings['include_whats_this_link'] == true) ) {
26 26
 				$this->_html_label_text = sprintf( 
27 27
 						_x( 
28 28
 								'%1$s %2$s(What\'s this?)%3$s', 
Please login to merge, or discard this patch.
core/libraries/template_parts/EE_Template_Part.class.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 //namespace EventEspresso\core\libraries\templates;
3 3
 
4
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
5
-	exit( 'No direct script access allowed' );
4
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
5
+	exit('No direct script access allowed');
6 6
 }
7 7
 /**
8 8
  * Class EE_Template_Part
@@ -47,11 +47,11 @@  discard block
 block discarded – undo
47 47
 	 * @param string $template
48 48
 	 * @param int    $priority
49 49
 	 */
50
-	public function __construct( $name, $label, $template, $priority = 100 ) {
51
-		$this->set_name( $name );
52
-		$this->set_label( $label );
53
-		$this->set_template( $template );
54
-		$this->set_priority( $priority );
50
+	public function __construct($name, $label, $template, $priority = 100) {
51
+		$this->set_name($name);
52
+		$this->set_label($label);
53
+		$this->set_template($template);
54
+		$this->set_priority($priority);
55 55
 	}
56 56
 
57 57
 
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 	/**
69 69
 	 * @param mixed $name
70 70
 	 */
71
-	public function set_name( $name ) {
71
+	public function set_name($name) {
72 72
 		$this->name = $name;
73 73
 	}
74 74
 
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 	/**
87 87
 	 * @param string $label
88 88
 	 */
89
-	public function set_label( $label ) {
89
+	public function set_label($label) {
90 90
 		$this->label = $label;
91 91
 	}
92 92
 
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 	/**
105 105
 	 * @param string $template
106 106
 	 */
107
-	public function set_template( $template ) {
107
+	public function set_template($template) {
108 108
 		$this->template = $template;
109 109
 	}
110 110
 
@@ -122,8 +122,8 @@  discard block
 block discarded – undo
122 122
 	/**
123 123
 	 * @param int $priority
124 124
 	 */
125
-	public function set_priority( $priority ) {
126
-		$this->priority = intval( $priority );
125
+	public function set_priority($priority) {
126
+		$this->priority = intval($priority);
127 127
 	}
128 128
 
129 129
 
Please login to merge, or discard this patch.
core/libraries/template_parts/EE_Template_Part_Manager.class.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 //namespace EventEspresso\core\libraries\templates;
3
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
4
-	exit( 'No direct script access allowed' );
3
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
4
+	exit('No direct script access allowed');
5 5
 }
6 6
 
7 7
 
@@ -70,23 +70,23 @@  discard block
 block discarded – undo
70 70
 	 * @param string $template - name or path of template to be used by EEH_Template::locate_template()
71 71
 	 * @param int $priority    - order in which template parts should be applied
72 72
 	 */
73
-	public function add_template_part( $name, $label, $template, $priority ) {
73
+	public function add_template_part($name, $label, $template, $priority) {
74 74
 		// SplPriorityQueue doesn't play nice with multiple items having the same priority
75 75
 		// so if the incoming priority is already occupied, then let's increment it by one,
76 76
 		// and then pass everything back into this method and try again with the new priority
77
-		if ( isset( $this->priorities[ $priority ] ) ) {
77
+		if (isset($this->priorities[$priority])) {
78 78
 			$priority++;
79
-			$this->add_template_part( $name, $label, $template, $priority );
79
+			$this->add_template_part($name, $label, $template, $priority);
80 80
 			return;
81 81
 		}
82 82
 		// kk now we can mark this priority as being occupied
83
-		$this->priorities[ $priority ] = true;
83
+		$this->priorities[$priority] = true;
84 84
 		// create the template part and add to the queue
85 85
 		$this->template_parts->insert(
86
-			new EE_Template_Part( $name, $label, $template, $priority ),
86
+			new EE_Template_Part($name, $label, $template, $priority),
87 87
 			$priority
88 88
 		);
89
-		if ( $name == 'event' ) {
89
+		if ($name == 'event') {
90 90
 			$this->event_desc_priority = $priority;
91 91
 		}
92 92
 	}
@@ -103,10 +103,10 @@  discard block
 block discarded – undo
103 103
 	 * @param string $content
104 104
 	 * @return string
105 105
 	 */
106
-	public function apply_template_part_filters( $content = '' ) {
106
+	public function apply_template_part_filters($content = '') {
107 107
 		$this->template_parts->rewind();
108 108
 		// loop through template parts and position content
109
-		while ( $this->template_parts->valid() ) {
109
+		while ($this->template_parts->valid()) {
110 110
 			$this->_position_template_part(
111 111
 				$content,
112 112
 				$this->template_parts->current()->template(),
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 			$this->template_parts->next();
116 116
 		}
117 117
 		// now simply add our three strings of content together
118
-		return $this->before_event_content . $this->event_content . $this->after_event_content;
118
+		return $this->before_event_content.$this->event_content.$this->after_event_content;
119 119
 	}
120 120
 
121 121
 
@@ -136,16 +136,16 @@  discard block
 block discarded – undo
136 136
 	 * @param int $priority
137 137
 	 * @return string
138 138
 	 */
139
-	protected function _position_template_part( $content, $template, $priority ) {
139
+	protected function _position_template_part($content, $template, $priority) {
140 140
 		// Event Description content is the actual incoming content itself
141
-		if ( $priority === $this->event_desc_priority ) {
141
+		if ($priority === $this->event_desc_priority) {
142 142
 			$this->event_content = $content;
143
-		} else if ( $priority < $this->event_desc_priority ) {
143
+		} else if ($priority < $this->event_desc_priority) {
144 144
 			// everything BEFORE the Event Description
145
-			$this->before_event_content .= EEH_Template::locate_template( $template );
146
-		} else if ( $priority > $this->event_desc_priority ) {
145
+			$this->before_event_content .= EEH_Template::locate_template($template);
146
+		} else if ($priority > $this->event_desc_priority) {
147 147
 			// everything AFTER the Event Description
148
-			$this->after_event_content .= EEH_Template::locate_template( $template );
148
+			$this->after_event_content .= EEH_Template::locate_template($template);
149 149
 		}
150 150
 	}
151 151
 
@@ -170,16 +170,16 @@  discard block
 block discarded – undo
170 170
 		$list_item_css_class = '',
171 171
 		$list_item_css_id_prefix = ''
172 172
 	) {
173
-		EE_Registry::instance()->load_helper( 'HTML' );
174
-		$event_archive_display_order = EEH_HTML::ul( $list_css_id, $list_css_class );
173
+		EE_Registry::instance()->load_helper('HTML');
174
+		$event_archive_display_order = EEH_HTML::ul($list_css_id, $list_css_class);
175 175
 		$this->template_parts->rewind();
176 176
 		// loop through template parts and add template content
177
-		while ( $this->template_parts->valid() ) {
177
+		while ($this->template_parts->valid()) {
178 178
 			$event_archive_display_order .= EEH_HTML::li(
179
-				EEH_HTML::span( '', '', 'dashicons dashicons-arrow-up-alt2' ) .
180
-				EEH_HTML::span( '', '', 'dashicons dashicons-arrow-down-alt2' ) .
179
+				EEH_HTML::span('', '', 'dashicons dashicons-arrow-up-alt2').
180
+				EEH_HTML::span('', '', 'dashicons dashicons-arrow-down-alt2').
181 181
 				$this->template_parts->current()->label(),
182
-				$list_item_css_id_prefix . $this->template_parts->current()->name(),
182
+				$list_item_css_id_prefix.$this->template_parts->current()->name(),
183 183
 				$list_item_css_class
184 184
 			);
185 185
 			$this->template_parts->next();
@@ -199,10 +199,10 @@  discard block
 block discarded – undo
199 199
 	 * @return string
200 200
 	 */
201 201
 	public function display_template_parts() {
202
-		if ( WP_DEBUG ) {
202
+		if (WP_DEBUG) {
203 203
 			$this->template_parts->rewind();
204
-			while ( $this->template_parts->valid() ) {
205
-				EEH_Debug_Tools::printr( $this->template_parts->current(), 'template_part', __FILE__, __LINE__ );
204
+			while ($this->template_parts->valid()) {
205
+				EEH_Debug_Tools::printr($this->template_parts->current(), 'template_part', __FILE__, __LINE__);
206 206
 				$this->template_parts->next();
207 207
 			}
208 208
 		}
Please login to merge, or discard this patch.
core/libraries/template_parts/EE_Template_Part_PriorityQueue.class.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 //namespace EventEspresso\core\libraries\templates;
3 3
 
4
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
5
-	exit( 'No direct script access allowed' );
4
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
5
+	exit('No direct script access allowed');
6 6
 }
7 7
 /**
8 8
  * Class EE_Template_Part_PriorityQueue
@@ -31,9 +31,9 @@  discard block
 block discarded – undo
31 31
 	 * @param int $priority
32 32
 	 * @return bool
33 33
 	 */
34
-	public function insert( $object, $priority = 100 ) {
35
-		if ( $object instanceof EE_Template_Part ) {
36
-			parent::insert( $object, $priority );
34
+	public function insert($object, $priority = 100) {
35
+		if ($object instanceof EE_Template_Part) {
36
+			parent::insert($object, $priority);
37 37
 			return true;
38 38
 		} else {
39 39
 			return false;
@@ -52,8 +52,8 @@  discard block
 block discarded – undo
52 52
 	 * @param int $priority2
53 53
 	 * @return bool
54 54
 	 */
55
-	public function compare( $priority1, $priority2 ) {
56
-		if ( $priority1 === $priority2 ) {
55
+	public function compare($priority1, $priority2) {
56
+		if ($priority1 === $priority2) {
57 57
 			return 0;
58 58
 		}
59 59
 		return $priority1 > $priority2 ? -1 : 1;
Please login to merge, or discard this patch.
core/middleware/EE_Alpha_Banner_Warning.core.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -21,11 +21,11 @@  discard block
 block discarded – undo
21 21
 	 * @param 	EE_Response $response
22 22
 	 * @return 	EE_Response
23 23
 	 */
24
-	public function handle_request( EE_Request $request, EE_Response $response ) {
24
+	public function handle_request(EE_Request $request, EE_Response $response) {
25 25
 		$this->_request = $request;
26 26
 		$this->_response = $response;
27 27
 		$this->display_alpha_banner_warning();
28
-		$this->_response = $this->process_request_stack( $this->_request, $this->_response );
28
+		$this->_response = $this->process_request_stack($this->_request, $this->_response);
29 29
 		return $this->_response;
30 30
 	}
31 31
 
@@ -41,22 +41,22 @@  discard block
 block discarded – undo
41 41
 	 */
42 42
 	public function display_alpha_banner_warning() {
43 43
 		// skip AJAX requests
44
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
44
+		if (defined('DOING_AJAX') && DOING_AJAX) {
45 45
 			return;
46 46
 		}
47 47
 		// skip stable releases
48
-		if ( strpos( EVENT_ESPRESSO_VERSION, '.alpha' ) === false ) {
48
+		if (strpos(EVENT_ESPRESSO_VERSION, '.alpha') === false) {
49 49
 			return;
50 50
 		}
51 51
 		// post release candidate warning
52
-		if ( is_admin() ) {
53
-			add_action( 'admin_notices', array( $this, 'alpha_banner_admin_notice' ), -999 );
52
+		if (is_admin()) {
53
+			add_action('admin_notices', array($this, 'alpha_banner_admin_notice'), -999);
54 54
 		} else {
55 55
 			// site admin has authorized use of non-stable release candidate for production
56
-			if ( defined( 'ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE' ) && ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE ) {
56
+			if (defined('ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE') && ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE) {
57 57
 				return;
58 58
 			}
59
-			add_action( 'shutdown', array( $this, 'alpha_banner_warning_notice' ), 10 );
59
+			add_action('shutdown', array($this, 'alpha_banner_warning_notice'), 10);
60 60
 		}
61 61
 	}
62 62
 
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	public function alpha_banner_admin_notice() {
73 73
 		EE_Error::add_attention(
74 74
 			sprintf(
75
-				__( 'This version of Event Espresso is for testing and/or evaluation purposes only. It is %1$snot%2$s considered a stable release and should therefore %1$snot%2$s be activated on a live or production website.', 'event_espresso' ),
75
+				__('This version of Event Espresso is for testing and/or evaluation purposes only. It is %1$snot%2$s considered a stable release and should therefore %1$snot%2$s be activated on a live or production website.', 'event_espresso'),
76 76
 				'<strong>',
77 77
 				'</strong>'
78 78
 			),
@@ -91,11 +91,11 @@  discard block
 block discarded – undo
91 91
 	 */
92 92
 	public function alpha_banner_warning_notice() {
93 93
 		global $pagenow;
94
-		if ( in_array( $pagenow, array( 'wp-login.php', 'wp-register.php' ) ) ) {
94
+		if (in_array($pagenow, array('wp-login.php', 'wp-register.php'))) {
95 95
 			return;
96 96
 		}
97 97
 		printf(
98
-			__( '%1$sThis version of Event Espresso is for testing and/or evaluation purposes only. It is %2$snot%3$s considered a stable release and should therefore %2$snot%3$s be activated on a live or production website.%4$s', 'event_espresso' ),
98
+			__('%1$sThis version of Event Espresso is for testing and/or evaluation purposes only. It is %2$snot%3$s considered a stable release and should therefore %2$snot%3$s be activated on a live or production website.%4$s', 'event_espresso'),
99 99
 			'<div id="ee-release-candidate-notice-dv" class="ee-really-important-notice-dv"><p>',
100 100
 			'<strong>',
101 101
 			'</strong>',
Please login to merge, or discard this patch.
core/middleware/EE_Middleware.core.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 	 * @access 	public
44 44
 	 * @param 	\EEI_Request_Decorator $request_stack
45 45
 	 */
46
-	public function __construct( EEI_Request_Decorator $request_stack ) {
46
+	public function __construct(EEI_Request_Decorator $request_stack) {
47 47
 		$this->request_stack = $request_stack;
48 48
 	}
49 49
 
@@ -57,13 +57,13 @@  discard block
 block discarded – undo
57 57
 	 * @param 	EE_Response $response
58 58
 	 * @return 	EE_Response
59 59
 	 */
60
-	protected function process_request_stack( EE_Request $request, EE_Response $response ) {
60
+	protected function process_request_stack(EE_Request $request, EE_Response $response) {
61 61
 		$this->_request = $request;
62 62
 		$this->_response = $response;
63
-		if ( ! $this->_response->request_terminated() ) {
64
-			$this->_response = $this->request_stack->handle_request( $this->_request, $this->_response );
63
+		if ( ! $this->_response->request_terminated()) {
64
+			$this->_response = $this->request_stack->handle_request($this->_request, $this->_response);
65 65
 		} else {
66
-			espresso_deactivate_plugin( EE_PLUGIN_BASENAME );
66
+			espresso_deactivate_plugin(EE_PLUGIN_BASENAME);
67 67
 		}
68 68
 		return $this->_response;
69 69
 	}
Please login to merge, or discard this patch.
core/middleware/EE_Recommended_Versions.core.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -22,34 +22,34 @@  discard block
 block discarded – undo
22 22
 	 * @param 	EE_Response $response
23 23
 	 * @return 	EE_Response
24 24
 	 */
25
-	public function handle_request( EE_Request $request, EE_Response $response ) {
25
+	public function handle_request(EE_Request $request, EE_Response $response) {
26 26
 		$this->_request = $request;
27 27
 		$this->_response = $response;
28 28
 		//$this->_response->add_output( "\n\t IN >>  " . __CLASS__ );
29 29
 		//$this->_response->set_notice( 1, 'hey look at this' );
30 30
 		// check required WP version
31
-		if ( ! $this->_minimum_wp_version_required() ) {
32
-			$this->_request->un_set( 'activate', true );
33
-			add_action( 'admin_notices', array( $this, 'minimum_wp_version_error' ), 1 );
31
+		if ( ! $this->_minimum_wp_version_required()) {
32
+			$this->_request->un_set('activate', true);
33
+			add_action('admin_notices', array($this, 'minimum_wp_version_error'), 1);
34 34
 			//$this->_response->add_output( "\n<br />" . 'minimum_wp_version_error' );
35 35
 			$this->_response->terminate_request();
36 36
 		}
37 37
 		// check required PHP version
38
-		if ( ! $this->_minimum_php_version_required() ) {
39
-			$this->_request->un_set( 'activate', true );
40
-			add_action( 'admin_notices', array( $this, 'minimum_php_version_error' ), 1 );
38
+		if ( ! $this->_minimum_php_version_required()) {
39
+			$this->_request->un_set('activate', true);
40
+			add_action('admin_notices', array($this, 'minimum_php_version_error'), 1);
41 41
 			//$this->_response->add_output( "\n<br />" . 'minimum_php_version_error' );
42 42
 			$this->_response->terminate_request();
43 43
 		}
44 44
 		// check recommended WP version
45
-		if ( ! $this->_minimum_wp_version_recommended() ) {
45
+		if ( ! $this->_minimum_wp_version_recommended()) {
46 46
 			$this->_display_minimum_recommended_wp_version_notice();
47 47
 		}
48 48
 		// check recommended PHP version
49
-		if ( ! $this->_minimum_php_version_recommended() ) {
49
+		if ( ! $this->_minimum_php_version_recommended()) {
50 50
 			$this->_display_minimum_recommended_php_version_notice();
51 51
 		}
52
-		$this->_response = $this->process_request_stack( $this->_request, $this->_response );
52
+		$this->_response = $this->process_request_stack($this->_request, $this->_response);
53 53
 		//$this->_response->add_output( "\n\t OUT << " . __CLASS__ );
54 54
 		return $this->_response;
55 55
 	}
@@ -63,9 +63,9 @@  discard block
 block discarded – undo
63 63
 	 * @param string $min_version
64 64
 	 * @return boolean
65 65
 	 */
66
-	private function _check_wp_version( $min_version = EE_MIN_WP_VER_REQUIRED ) {
66
+	private function _check_wp_version($min_version = EE_MIN_WP_VER_REQUIRED) {
67 67
 		global $wp_version;
68
-		return version_compare( $wp_version, $min_version, '>=' ) ? true : false;
68
+		return version_compare($wp_version, $min_version, '>=') ? true : false;
69 69
 	}
70 70
 
71 71
 
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 	 * @return boolean
78 78
 	 */
79 79
 	private function _minimum_wp_version_required() {
80
-		return $this->_check_wp_version( EE_MIN_WP_VER_REQUIRED );
80
+		return $this->_check_wp_version(EE_MIN_WP_VER_REQUIRED);
81 81
 	}
82 82
 
83 83
 
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 	 * @return boolean
90 90
 	 */
91 91
 	private function _minimum_wp_version_recommended() {
92
-		return $this->_check_wp_version( EE_MIN_WP_VER_RECOMMENDED );
92
+		return $this->_check_wp_version(EE_MIN_WP_VER_RECOMMENDED);
93 93
 	}
94 94
 
95 95
 
@@ -101,8 +101,8 @@  discard block
 block discarded – undo
101 101
 	 * @param string $min_version
102 102
 	 * @return boolean
103 103
 	 */
104
-	private function _check_php_version( $min_version = EE_MIN_PHP_VER_RECOMMENDED ) {
105
-		return version_compare( PHP_VERSION, $min_version, '>=' ) ? true : false;
104
+	private function _check_php_version($min_version = EE_MIN_PHP_VER_RECOMMENDED) {
105
+		return version_compare(PHP_VERSION, $min_version, '>=') ? true : false;
106 106
 	}
107 107
 
108 108
 
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 	 * @return boolean
115 115
 	 */
116 116
 	private function _minimum_php_version_required() {
117
-		return $this->_check_php_version( EE_MIN_PHP_VER_REQUIRED );
117
+		return $this->_check_php_version(EE_MIN_PHP_VER_REQUIRED);
118 118
 	}
119 119
 
120 120
 
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 	 * @return boolean
127 127
 	 */
128 128
 	private function _minimum_php_version_recommended() {
129
-		return $this->_check_php_version( EE_MIN_PHP_VER_RECOMMENDED );
129
+		return $this->_check_php_version(EE_MIN_PHP_VER_RECOMMENDED);
130 130
 	}
131 131
 
132 132
 
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 			<p>
144 144
 				<?php
145 145
 				printf(
146
-					__( 'We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso' ),
146
+					__('We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso'),
147 147
 					EE_MIN_WP_VER_REQUIRED,
148 148
 					$wp_version,
149 149
 					'<br/>',
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
 			<p>
169 169
 				<?php
170 170
 				printf(
171
-					__( 'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso' ),
171
+					__('We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso'),
172 172
 					EE_MIN_PHP_VER_REQUIRED,
173 173
 					PHP_VERSION,
174 174
 					'<br/>',
@@ -191,9 +191,9 @@  discard block
 block discarded – undo
191 191
 	private function _display_minimum_recommended_wp_version_notice() {
192 192
 		global $wp_version;
193 193
 		EE_Error::add_persistent_admin_notice(
194
-			'wp_version_' . str_replace( '.', '-', EE_MIN_WP_VER_RECOMMENDED ) . '_recommended',
194
+			'wp_version_'.str_replace('.', '-', EE_MIN_WP_VER_RECOMMENDED).'_recommended',
195 195
 			sprintf(
196
-				__( 'Event Espresso recommends WordPress version %1$s or greater in order for everything to operate properly. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso' ),
196
+				__('Event Espresso recommends WordPress version %1$s or greater in order for everything to operate properly. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso'),
197 197
 				EE_MIN_WP_VER_RECOMMENDED,
198 198
 				$wp_version,
199 199
 				'<br/>',
@@ -212,9 +212,9 @@  discard block
 block discarded – undo
212 212
 	 */
213 213
 	private function _display_minimum_recommended_php_version_notice() {
214 214
 		EE_Error::add_persistent_admin_notice(
215
-			'php_version_' . str_replace( '.', '-', EE_MIN_PHP_VER_RECOMMENDED ) . '_recommended',
215
+			'php_version_'.str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED).'_recommended',
216 216
 			sprintf(
217
-				__( 'Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso' ),
217
+				__('Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso'),
218 218
 				EE_MIN_PHP_VER_RECOMMENDED,
219 219
 				PHP_VERSION,
220 220
 				'<br/>',
Please login to merge, or discard this patch.
core/request_stack/EE_Request.core.php 2 patches
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -38,12 +38,12 @@  discard block
 block discarded – undo
38 38
 	 * @access    public
39 39
 	 * @param array $request
40 40
 	 */
41
-	public function __construct( $request ) {
41
+	public function __construct($request) {
42 42
 		// grab request vars
43 43
 		$this->_params = $request;
44 44
 		// AJAX ???
45
-		$this->ajax = defined( 'DOING_AJAX' ) ? TRUE : FALSE;
46
-		$this->front_ajax = $this->is_set( 'ee_front_ajax' ) && $this->get( 'ee_front_ajax' ) == 1 ? TRUE : FALSE;
45
+		$this->ajax = defined('DOING_AJAX') ? TRUE : FALSE;
46
+		$this->front_ajax = $this->is_set('ee_front_ajax') && $this->get('ee_front_ajax') == 1 ? TRUE : FALSE;
47 47
 	}
48 48
 
49 49
 
@@ -67,10 +67,10 @@  discard block
 block discarded – undo
67 67
 	 * @param bool $override_ee
68 68
 	 * @return    void
69 69
 	 */
70
-	public function set( $key, $value, $override_ee = FALSE ) {
70
+	public function set($key, $value, $override_ee = FALSE) {
71 71
 		// don't allow "ee" to be overwritten unless explicitly instructed to do so
72
-		if ( $key != 'ee' || ( $key == 'ee' && empty( $this->_params['ee'] )) || ( $key == 'ee' && ! empty( $this->_params['ee'] ) && $override_ee )) {
73
-			$this->_params[ $key ] = $value;
72
+		if ($key != 'ee' || ($key == 'ee' && empty($this->_params['ee'])) || ($key == 'ee' && ! empty($this->_params['ee']) && $override_ee)) {
73
+			$this->_params[$key] = $value;
74 74
 		}
75 75
 	}
76 76
 
@@ -84,8 +84,8 @@  discard block
 block discarded – undo
84 84
 	 * @param null $default
85 85
 	 * @return    mixed
86 86
 	 */
87
-	public function get( $key, $default = NULL ) {
88
-		return isset( $this->_params[ $key ] ) ? $this->_params[ $key ] : $default;
87
+	public function get($key, $default = NULL) {
88
+		return isset($this->_params[$key]) ? $this->_params[$key] : $default;
89 89
 	}
90 90
 
91 91
 
@@ -97,8 +97,8 @@  discard block
 block discarded – undo
97 97
 	 * @param $key
98 98
 	 * @return    boolean
99 99
 	 */
100
-	public function is_set( $key ) {
101
-		return isset( $this->_params[ $key ] ) ? TRUE : FALSE;
100
+	public function is_set($key) {
101
+		return isset($this->_params[$key]) ? TRUE : FALSE;
102 102
 	}
103 103
 
104 104
 
@@ -110,10 +110,10 @@  discard block
 block discarded – undo
110 110
 	 * @param $key
111 111
 	 * @param bool $unset_from_global_too
112 112
 	 */
113
-	public function un_set( $key, $unset_from_global_too = false ) {
114
-		unset( $this->_params[ $key ] );
115
-		if ( $unset_from_global_too ) {
116
-			unset( $_REQUEST[ $key ] );
113
+	public function un_set($key, $unset_from_global_too = false) {
114
+		unset($this->_params[$key]);
115
+		if ($unset_from_global_too) {
116
+			unset($_REQUEST[$key]);
117 117
 		}
118 118
 	}
119 119
 
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.