Completed
Branch FET-9046-messages-queue (08ecff)
by
unknown
1402:50 queued 1382:56
created
core/libraries/form_sections/inputs/EE_Form_Input_Base.input.php 4 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
 	/**
262 262
 	 * Sets sensitive_data_removal_strategy
263 263
 	 * @param EE_Sensitive_Data_Removal_Base $sensitive_data_removal_strategy
264
-	 * @return boolean
264
+	 * @return boolean|null
265 265
 	 */
266 266
 	public function set_sensitive_data_removal_strategy($sensitive_data_removal_strategy) {
267 267
 		$this->_sensitive_data_removal_strategy = $sensitive_data_removal_strategy;
@@ -445,7 +445,7 @@  discard block
 block discarded – undo
445 445
 	 * Returns whether or not any validation errors occurred
446 446
 	 *
447 447
 	 * @param array $req_data like $_POST
448
-	 * @return boolean whether or not there was an error
448
+	 * @return boolean|null whether or not there was an error
449 449
 	 */
450 450
 	protected function _normalize( $req_data ) {
451 451
 		//any existing validation errors don't apply so clear them
Please login to merge, or discard this patch.
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@
 block discarded – undo
1 1
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
2 2
 /**
3
- * EE_Form_Input_Base
4
- * For representing a single form input. Extends EE_Form_Section_Base because
5
- * it is a part of a form and shares a surprisingly large amount of functionality
6
- *
7
- * @package			Event Espresso
8
- * @subpackage
9
- * @author				Mike Nelson
10
- */
3
+	 * EE_Form_Input_Base
4
+	 * For representing a single form input. Extends EE_Form_Section_Base because
5
+	 * it is a part of a form and shares a surprisingly large amount of functionality
6
+	 *
7
+	 * @package			Event Espresso
8
+	 * @subpackage
9
+	 * @author				Mike Nelson
10
+	 */
11 11
 abstract class EE_Form_Input_Base extends EE_Form_Section_Validatable{
12 12
 
13 13
 	/**
Please login to merge, or discard this patch.
Braces   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
 		if( ! $this->_html_name){
201 201
 			if( $this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper){
202 202
 				$this->_html_name = $this->_parent_section->html_name_prefix() . "[{$this->name()}]";
203
-			}else{
203
+			} else{
204 204
 				$this->_html_name = $this->name();
205 205
 			}
206 206
 		}
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
 	protected function _get_display_strategy(){
231 231
 		if( ! $this->_display_strategy || ! $this->_display_strategy instanceof EE_Display_Strategy_Base){
232 232
 			throw new EE_Error(sprintf(__("Cannot get display strategy for form input with name %s and id %s, because it has not been set in the constructor", "event_espresso"),$this->html_name(),$this->html_id()));
233
-		}else{
233
+		} else{
234 234
 			return $this->_display_strategy;
235 235
 		}
236 236
 	}
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 	public function get_validation_strategies(){
307 307
 		if(is_array($this->_validation_strategies)){
308 308
 			return $this->_validation_strategies;
309
-		}else{
309
+		} else{
310 310
 			return array();
311 311
 		}
312 312
 
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
413 413
 				if ( $validation_strategy instanceof EE_Validation_Strategy_Base ) {
414 414
 					try{
415 415
 						$validation_strategy->validate($this->normalized_value());
416
-					}catch(EE_Validation_Error $e){
416
+					} catch(EE_Validation_Error $e){
417 417
 						$this->add_validation_error($e);
418 418
 					}
419 419
 				}
@@ -421,7 +421,7 @@  discard block
 block discarded – undo
421 421
 		}
422 422
 		if( $this->get_validation_errors()){
423 423
 			return false;
424
-		}else{
424
+		} else{
425 425
 			return true;
426 426
 		}
427 427
 	}
@@ -602,7 +602,7 @@  discard block
 block discarded – undo
602 602
 
603 603
 		if(! empty($jquery_validation_rules)){
604 604
 			$jquery_validation_js[ $this->html_id( TRUE ) ] = $jquery_validation_rules;
605
-		}else{
605
+		} else{
606 606
 			return array();
607 607
 		}
608 608
 		return $jquery_validation_js;
@@ -769,7 +769,7 @@  discard block
 block discarded – undo
769 769
 		if( isset( $matches[ 1 ] ) && is_array( $matches[ 1 ] ) ){
770 770
 			$name_parts = $matches[ 1 ];
771 771
 			array_unshift($name_parts, $before_any_brackets);
772
-		}else{
772
+		} else{
773 773
 			$name_parts = array( $before_any_brackets );
774 774
 		}
775 775
 		// now get the value for the input
@@ -796,10 +796,10 @@  discard block
 block discarded – undo
796 796
 		if( isset( $req_data[ $first_part_to_consider ] ) ){
797 797
 			if( empty($html_name_parts ) ){
798 798
 				return $req_data[ $first_part_to_consider ];
799
-			}else{
799
+			} else{
800 800
 				return $this->_find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data[ $first_part_to_consider ] );
801 801
 			}
802
-		}else{
802
+		} else{
803 803
 			return NULL;
804 804
 		}
805 805
 	}
@@ -818,7 +818,7 @@  discard block
 block discarded – undo
818 818
 		$checked_value = $this->find_form_data_for_this_section( $req_data );
819 819
 		if( $checked_value !== null ){
820 820
 			return TRUE;
821
-		}else{
821
+		} else{
822 822
 			return FALSE;
823 823
 		}
824 824
 	}
Please login to merge, or discard this patch.
Spacing   +135 added lines, -135 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
-abstract class EE_Form_Input_Base extends EE_Form_Section_Validatable{
11
+abstract class EE_Form_Input_Base extends EE_Form_Section_Validatable {
12 12
 
13 13
 	/**
14 14
 	 * the input's name attribute
@@ -141,67 +141,67 @@  discard block
 block discarded – undo
141 141
 	 *		@type EE_Validation_Strategy_Base[] $validation_strategies
142 142
 	 * }
143 143
 	 */
144
-	public function __construct( $input_args = array() ){
145
-		$input_args = apply_filters( 'FHEE__EE_Form_Input_Base___construct__input_args', $input_args, $this );
144
+	public function __construct($input_args = array()) {
145
+		$input_args = apply_filters('FHEE__EE_Form_Input_Base___construct__input_args', $input_args, $this);
146 146
 		// the following properties must be cast as arrays
147 147
 		$set_as_array = array(
148 148
 			'validation_strategies'
149 149
 		);
150 150
 		// loop thru incoming options
151
-		foreach( $input_args as $key => $value ) {
151
+		foreach ($input_args as $key => $value) {
152 152
 			// add underscore to $key to match property names
153
-			$_key = '_' . $key;
154
-			if ( property_exists( $this, $_key )) {
153
+			$_key = '_'.$key;
154
+			if (property_exists($this, $_key)) {
155 155
 				// first check if this property needs to be set as an array
156
-				if ( isset( $set_as_array[ $key ] )) {
156
+				if (isset($set_as_array[$key])) {
157 157
 					// ensure value is an array
158
-					$value = is_array( $value ) ? $value : array( $value );
158
+					$value = is_array($value) ? $value : array($value);
159 159
 					// and merge with existing values
160
-					$this->$_key = array_merge( $this->$_key, $value );
160
+					$this->$_key = array_merge($this->$_key, $value);
161 161
 				} else {
162 162
 					$this->$_key = $value;
163 163
 				}
164 164
 			}
165 165
 		}
166 166
 		// ensure that "required" is set correctly
167
-		$this->set_required( $this->_required, isset( $input_args[ 'required_validation_error_message' ] ) ? $input_args[ 'required_validation_error_message' ] : NULL );
167
+		$this->set_required($this->_required, isset($input_args['required_validation_error_message']) ? $input_args['required_validation_error_message'] : NULL);
168 168
 
169
-		$this->_html_name_specified = isset( $input_args['html_name'] ) ? TRUE : FALSE;
169
+		$this->_html_name_specified = isset($input_args['html_name']) ? TRUE : FALSE;
170 170
 
171 171
 		$this->_display_strategy->_construct_finalize($this);
172 172
 
173
-		if ( $this->_validation_strategies ){
174
-			foreach( $this->_validation_strategies as $validation_strategy ){
173
+		if ($this->_validation_strategies) {
174
+			foreach ($this->_validation_strategies as $validation_strategy) {
175 175
 				$validation_strategy->_construct_finalize($this);
176 176
 			}
177 177
 		}
178 178
 
179
-		if( ! $this->_normalization_strategy){
179
+		if ( ! $this->_normalization_strategy) {
180 180
 			$this->_normalization_strategy = new EE_Text_Normalization();
181 181
 		}
182 182
 		$this->_normalization_strategy->_construct_finalize($this);
183 183
 
184 184
 		//at least we can use the normalization strategy to populate the default
185
-		if( isset( $input_args[ 'default' ] ) ) {
186
-			$this->set_default( $input_args[ 'default' ] );
185
+		if (isset($input_args['default'])) {
186
+			$this->set_default($input_args['default']);
187 187
 		}
188 188
 
189
-		if( ! $this->_sensitive_data_removal_strategy){
189
+		if ( ! $this->_sensitive_data_removal_strategy) {
190 190
 			$this->_sensitive_data_removal_strategy = new EE_No_Sensitive_Data_Removal();
191 191
 		}
192 192
 		$this->_sensitive_data_removal_strategy->_construct_finalize($this);
193
-		parent::__construct( $input_args );
193
+		parent::__construct($input_args);
194 194
 	}
195 195
 
196 196
 	/**
197 197
 	 * Sets the html_name to its default value, if none was specified in teh constructor.
198 198
 	 * Calculation involves using the name and the parent's html_name
199 199
 	 */
200
-	protected function _set_default_html_name_if_empty(){
201
-		if( ! $this->_html_name){
202
-			if( $this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper){
203
-				$this->_html_name = $this->_parent_section->html_name_prefix() . "[{$this->name()}]";
204
-			}else{
200
+	protected function _set_default_html_name_if_empty() {
201
+		if ( ! $this->_html_name) {
202
+			if ($this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper) {
203
+				$this->_html_name = $this->_parent_section->html_name_prefix()."[{$this->name()}]";
204
+			} else {
205 205
 				$this->_html_name = $this->name();
206 206
 			}
207 207
 		}
@@ -216,12 +216,12 @@  discard block
 block discarded – undo
216 216
 	function _construct_finalize($parent_form_section, $name) {
217 217
 		parent::_construct_finalize($parent_form_section, $name);
218 218
 		$this->_set_default_html_name_if_empty();
219
-		if( ! $this->_html_label ){
220
-			if( ! $this->_html_label_text){
221
-				$this->_html_label_text = ucwords( str_replace("_"," ",$name));
219
+		if ( ! $this->_html_label) {
220
+			if ( ! $this->_html_label_text) {
221
+				$this->_html_label_text = ucwords(str_replace("_", " ", $name));
222 222
 			}
223 223
 		}
224
-		do_action( 'AHEE__EE_Form_Input_Base___construct_finalize__end', $this, $parent_form_section, $name );
224
+		do_action('AHEE__EE_Form_Input_Base___construct_finalize__end', $this, $parent_form_section, $name);
225 225
 	}
226 226
 
227 227
 	 /**
@@ -229,10 +229,10 @@  discard block
 block discarded – undo
229 229
 	  * @return EE_Display_Strategy_Base
230 230
 	  * @throws EE_Error
231 231
 	  */
232
-	protected function _get_display_strategy(){
233
-		if( ! $this->_display_strategy || ! $this->_display_strategy instanceof EE_Display_Strategy_Base){
234
-			throw new EE_Error(sprintf(__("Cannot get display strategy for form input with name %s and id %s, because it has not been set in the constructor", "event_espresso"),$this->html_name(),$this->html_id()));
235
-		}else{
232
+	protected function _get_display_strategy() {
233
+		if ( ! $this->_display_strategy || ! $this->_display_strategy instanceof EE_Display_Strategy_Base) {
234
+			throw new EE_Error(sprintf(__("Cannot get display strategy for form input with name %s and id %s, because it has not been set in the constructor", "event_espresso"), $this->html_name(), $this->html_id()));
235
+		} else {
236 236
 			return $this->_display_strategy;
237 237
 		}
238 238
 	}
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 	 * Sets the display strategy.
241 241
 	 * @param EE_Display_Strategy_Base $strategy
242 242
 	 */
243
-	protected function _set_display_strategy(EE_Display_Strategy_Base $strategy){
243
+	protected function _set_display_strategy(EE_Display_Strategy_Base $strategy) {
244 244
 		$this->_display_strategy = $strategy;
245 245
 	}
246 246
 
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
 	 * Sets the sanitization strategy
249 249
 	 * @param EE_Normalization_Strategy_Base $strategy
250 250
 	 */
251
-	protected function _set_normalization_strategy(EE_Normalization_Strategy_Base $strategy){
251
+	protected function _set_normalization_strategy(EE_Normalization_Strategy_Base $strategy) {
252 252
 		$this->_normalization_strategy = $strategy;
253 253
 	}
254 254
 
@@ -274,14 +274,14 @@  discard block
 block discarded – undo
274 274
 	 * Gets the display strategy for this input
275 275
 	 * @return EE_Display_Strategy_Base
276 276
 	 */
277
-	public function get_display_strategy(){
277
+	public function get_display_strategy() {
278 278
 		return $this->_display_strategy;
279 279
 	}
280 280
 	/**
281 281
 	 * Overwrites the display strategy
282 282
 	 * @param EE_Display_Strategy_Base $display_strategy
283 283
 	 */
284
-	public function set_display_strategy($display_strategy){
284
+	public function set_display_strategy($display_strategy) {
285 285
 		$this->_display_strategy = $display_strategy;
286 286
 		$this->_display_strategy->_construct_finalize($this);
287 287
 	}
@@ -289,14 +289,14 @@  discard block
 block discarded – undo
289 289
 	 * Gets the normalization strategy set on this input
290 290
 	 * @return EE_Normalization_Strategy_Base
291 291
 	 */
292
-	public function get_normalization_strategy(){
292
+	public function get_normalization_strategy() {
293 293
 		return $this->_normalization_strategy;
294 294
 	}
295 295
 	/**
296 296
 	 * Overwrites the normalization strategy
297 297
 	 * @param EE_Normalization_Strategy_Base $normalization_strategy
298 298
 	 */
299
-	public function set_normalization_strategy($normalization_strategy){
299
+	public function set_normalization_strategy($normalization_strategy) {
300 300
 		$this->_normalization_strategy = $normalization_strategy;
301 301
 		$this->_normalization_strategy->_construct_finalize($this);
302 302
 	}
@@ -305,10 +305,10 @@  discard block
 block discarded – undo
305 305
 	 * Returns all teh validation strategies which apply to this field, numerically indexed
306 306
 	 * @return EE_Validation_Strategy_Base[]
307 307
 	 */
308
-	public function get_validation_strategies(){
309
-		if(is_array($this->_validation_strategies)){
308
+	public function get_validation_strategies() {
309
+		if (is_array($this->_validation_strategies)) {
310 310
 			return $this->_validation_strategies;
311
-		}else{
311
+		} else {
312 312
 			return array();
313 313
 		}
314 314
 
@@ -318,9 +318,9 @@  discard block
 block discarded – undo
318 318
 	 * @param EE_Validation_Strategy_Base $validation_strategy
319 319
 	 * @return void
320 320
 	 */
321
-	protected function _add_validation_strategy( EE_Validation_Strategy_Base $validation_strategy ){
322
-		$validation_strategy->_construct_finalize( $this );
323
-		$this->_validation_strategies[ get_class($validation_strategy) ] = $validation_strategy;
321
+	protected function _add_validation_strategy(EE_Validation_Strategy_Base $validation_strategy) {
322
+		$validation_strategy->_construct_finalize($this);
323
+		$this->_validation_strategies[get_class($validation_strategy)] = $validation_strategy;
324 324
 
325 325
 	}
326 326
 
@@ -329,18 +329,18 @@  discard block
 block discarded – undo
329 329
 	 * @param EE_Validation_Strategy_Base $validation_strategy
330 330
 	 * @return void
331 331
 	 */
332
-	public function add_validation_strategy( EE_Validation_Strategy_Base $validation_strategy ) {
333
-		$this->_add_validation_strategy( $validation_strategy );
332
+	public function add_validation_strategy(EE_Validation_Strategy_Base $validation_strategy) {
333
+		$this->_add_validation_strategy($validation_strategy);
334 334
 	}
335 335
 
336 336
 	/**
337 337
 	 * The classname of the validation strategy to remove
338 338
 	 * @param string $validation_strategy_classname
339 339
 	 */
340
-	public function remove_validation_strategy( $validation_strategy_classname ) {
341
-		foreach( $this->_validation_strategies as $key => $validation_strategy ){
342
-			if( is_subclass_of( $validation_strategy, $validation_strategy_classname ) ){
343
-				unset( $this->_validation_strategies[ $key ] );
340
+	public function remove_validation_strategy($validation_strategy_classname) {
341
+		foreach ($this->_validation_strategies as $key => $validation_strategy) {
342
+			if (is_subclass_of($validation_strategy, $validation_strategy_classname)) {
343
+				unset($this->_validation_strategies[$key]);
344 344
 			}
345 345
 		}
346 346
 	}
@@ -349,7 +349,7 @@  discard block
 block discarded – undo
349 349
 	 * to the parent form's layout strategy
350 350
 	 * @return string
351 351
 	 */
352
-	public function get_html_and_js(){
352
+	public function get_html_and_js() {
353 353
 		return $this->_parent_section->get_html_for_input($this);
354 354
 	}
355 355
 	/**
@@ -358,7 +358,7 @@  discard block
 block discarded – undo
358 358
 	 * Makes sure the JS and CSS are enqueued for it
359 359
 	 * @return string
360 360
 	 */
361
-	public function get_html_for_input(){
361
+	public function get_html_for_input() {
362 362
 		return  $this->_get_display_strategy()->display();
363 363
 	}
364 364
 
@@ -368,7 +368,7 @@  discard block
 block discarded – undo
368 368
 	 * @return string
369 369
 	 */
370 370
 	public function html_other_attributes() {
371
-		return ! empty( $this->_html_other_attributes ) ? ' ' . $this->_html_other_attributes : '';
371
+		return ! empty($this->_html_other_attributes) ? ' '.$this->_html_other_attributes : '';
372 372
 	}
373 373
 
374 374
 
@@ -376,7 +376,7 @@  discard block
 block discarded – undo
376 376
 	/**
377 377
 	 * @param string $html_other_attributes
378 378
 	 */
379
-	public function set_html_other_attributes( $html_other_attributes ) {
379
+	public function set_html_other_attributes($html_other_attributes) {
380 380
 		$this->_html_other_attributes = $html_other_attributes;
381 381
 	}
382 382
 
@@ -385,7 +385,7 @@  discard block
 block discarded – undo
385 385
 	 * according to the form section's layout strategy
386 386
 	 * @return string
387 387
 	 */
388
-	public function get_html_for_label(){
388
+	public function get_html_for_label() {
389 389
 		return $this->_parent_section->get_layout_strategy()->display_label($this);
390 390
 	}
391 391
 	/**
@@ -393,7 +393,7 @@  discard block
 block discarded – undo
393 393
 	 * according to the form section's layout strategy
394 394
 	 * @return string
395 395
 	 */
396
-	public function get_html_for_errors(){
396
+	public function get_html_for_errors() {
397 397
 		return $this->_parent_section->get_layout_strategy()->display_errors($this);
398 398
 	}
399 399
 	/**
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
401 401
 	 * according to the form section's layout strategy
402 402
 	 * @return string
403 403
 	 */
404
-	public function get_html_for_help(){
404
+	public function get_html_for_help() {
405 405
 		return $this->_parent_section->get_layout_strategy()->display_help_text($this);
406 406
 	}
407 407
 	/**
@@ -410,20 +410,20 @@  discard block
 block discarded – undo
410 410
 	 * @return boolean
411 411
 	 */
412 412
 	protected function _validate() {
413
-		if(is_array($this->_validation_strategies)){
414
-			foreach($this->_validation_strategies as $validation_strategy){
415
-				if ( $validation_strategy instanceof EE_Validation_Strategy_Base ) {
416
-					try{
413
+		if (is_array($this->_validation_strategies)) {
414
+			foreach ($this->_validation_strategies as $validation_strategy) {
415
+				if ($validation_strategy instanceof EE_Validation_Strategy_Base) {
416
+					try {
417 417
 						$validation_strategy->validate($this->normalized_value());
418
-					}catch(EE_Validation_Error $e){
418
+					} catch (EE_Validation_Error $e) {
419 419
 						$this->add_validation_error($e);
420 420
 					}
421 421
 				}
422 422
 			}
423 423
 		}
424
-		if( $this->get_validation_errors()){
424
+		if ($this->get_validation_errors()) {
425 425
 			return false;
426
-		}else{
426
+		} else {
427 427
 			return true;
428 428
 		}
429 429
 	}
@@ -436,8 +436,8 @@  discard block
 block discarded – undo
436 436
 	 * @param string $value
437 437
 	 * @return null|string
438 438
 	 */
439
-	private function _sanitize($value){
440
-		return $value !== NULL ?stripslashes(html_entity_decode($value)) : NULL;//don't sanitize_text_field
439
+	private function _sanitize($value) {
440
+		return $value !== NULL ? stripslashes(html_entity_decode($value)) : NULL; //don't sanitize_text_field
441 441
 	}
442 442
 
443 443
 
@@ -449,24 +449,24 @@  discard block
 block discarded – undo
449 449
 	 * @param array $req_data like $_POST
450 450
 	 * @return boolean whether or not there was an error
451 451
 	 */
452
-	protected function _normalize( $req_data ) {
452
+	protected function _normalize($req_data) {
453 453
 		//any existing validation errors don't apply so clear them
454 454
 		$this->_validation_errors = array();
455 455
 		try {
456
-			$raw_input = $this->find_form_data_for_this_section( $req_data );
456
+			$raw_input = $this->find_form_data_for_this_section($req_data);
457 457
 			//super simple sanitization for now
458
-			if ( is_array( $raw_input )) {
458
+			if (is_array($raw_input)) {
459 459
 				$this->_raw_value = array();
460
-				foreach( $raw_input as $key => $value ) {
461
-					$this->_raw_value[ $key ] = $this->_sanitize( $value );
460
+				foreach ($raw_input as $key => $value) {
461
+					$this->_raw_value[$key] = $this->_sanitize($value);
462 462
 				}
463 463
 			} else {
464
-				$this->_raw_value = $this->_sanitize( $raw_input );
464
+				$this->_raw_value = $this->_sanitize($raw_input);
465 465
 			}
466 466
 			//we want ot mostly leave the input alone in case we need to re-display it to the user
467
-			$this->_normalized_value = $this->_normalization_strategy->normalize( $this->raw_value() );
468
-		} catch ( EE_Validation_Error $e ) {
469
-			$this->add_validation_error( $e );
467
+			$this->_normalized_value = $this->_normalization_strategy->normalize($this->raw_value());
468
+		} catch (EE_Validation_Error $e) {
469
+			$this->add_validation_error($e);
470 470
 		}
471 471
 	}
472 472
 
@@ -475,7 +475,7 @@  discard block
 block discarded – undo
475 475
 	/**
476 476
 	 * @return string
477 477
 	 */
478
-	public function html_name(){
478
+	public function html_name() {
479 479
 		return $this->_html_name;
480 480
 	}
481 481
 
@@ -484,8 +484,8 @@  discard block
 block discarded – undo
484 484
 	/**
485 485
 	 * @return string
486 486
 	 */
487
-	function html_label_id(){
488
-		return ! empty( $this->_html_label_id ) ? $this->_html_label_id : $this->_html_id . '-lbl';
487
+	function html_label_id() {
488
+		return ! empty($this->_html_label_id) ? $this->_html_label_id : $this->_html_id.'-lbl';
489 489
 	}
490 490
 
491 491
 
@@ -493,7 +493,7 @@  discard block
 block discarded – undo
493 493
 	/**
494 494
 	 * @return string
495 495
 	 */
496
-	function html_label_class(){
496
+	function html_label_class() {
497 497
 		return $this->_html_label_class;
498 498
 	}
499 499
 
@@ -502,7 +502,7 @@  discard block
 block discarded – undo
502 502
 	/**
503 503
 	 * @return string
504 504
 	 */
505
-	function html_label_style(){
505
+	function html_label_style() {
506 506
 		return $this->_html_label_style;
507 507
 	}
508 508
 
@@ -511,7 +511,7 @@  discard block
 block discarded – undo
511 511
 	/**
512 512
 	 * @return string
513 513
 	 */
514
-	function html_label_text(){
514
+	function html_label_text() {
515 515
 		return $this->_html_label_text;
516 516
 	}
517 517
 
@@ -520,7 +520,7 @@  discard block
 block discarded – undo
520 520
 	/**
521 521
 	 * @return string
522 522
 	 */
523
-	function html_help_text(){
523
+	function html_help_text() {
524 524
 		return $this->_html_help_text;
525 525
 	}
526 526
 
@@ -529,7 +529,7 @@  discard block
 block discarded – undo
529 529
 	/**
530 530
 	 * @return string
531 531
 	 */
532
-	function html_help_class(){
532
+	function html_help_class() {
533 533
 		return $this->_html_help_class;
534 534
 	}
535 535
 
@@ -538,7 +538,7 @@  discard block
 block discarded – undo
538 538
 	/**
539 539
 	 * @return string
540 540
 	 */
541
-	function html_help_style(){
541
+	function html_help_style() {
542 542
 		return $this->_html_style;
543 543
 	}
544 544
 	/**
@@ -551,7 +551,7 @@  discard block
 block discarded – undo
551 551
 	 * in which case, we would have stored the malicious content to our database.
552 552
 	 * @return string
553 553
 	 */
554
-	function raw_value(){
554
+	function raw_value() {
555 555
 		return $this->_raw_value;
556 556
 	}
557 557
 	/**
@@ -559,15 +559,15 @@  discard block
 block discarded – undo
559 559
 	 * it escapes all html entities
560 560
 	 * @return string
561 561
 	 */
562
-	function raw_value_in_form(){
563
-		return htmlentities($this->raw_value(),ENT_QUOTES, 'UTF-8');
562
+	function raw_value_in_form() {
563
+		return htmlentities($this->raw_value(), ENT_QUOTES, 'UTF-8');
564 564
 	}
565 565
 	/**
566 566
 	 * returns the value after it's been sanitized, and then converted into it's proper type
567 567
 	 * in PHP. Eg, a string, an int, an array,
568 568
 	 * @return mixed
569 569
 	 */
570
-	function normalized_value(){
570
+	function normalized_value() {
571 571
 		return $this->_normalized_value;
572 572
 	}
573 573
 
@@ -577,7 +577,7 @@  discard block
 block discarded – undo
577 577
 	 * the best thing to display
578 578
 	 * @return string
579 579
 	 */
580
-	function pretty_value(){
580
+	function pretty_value() {
581 581
 		return $this->_normalized_value;
582 582
 	}
583 583
 	/**
@@ -596,15 +596,15 @@  discard block
 block discarded – undo
596 596
 		  }</code>
597 597
 	 * @return array
598 598
 	 */
599
-	function get_jquery_validation_rules(){
599
+	function get_jquery_validation_rules() {
600 600
 		$jquery_validation_rules = array();
601
-		foreach($this->get_validation_strategies() as $validation_strategy){
602
-			$jquery_validation_rules = array_replace_recursive( $jquery_validation_rules, $validation_strategy->get_jquery_validation_rule_array());
601
+		foreach ($this->get_validation_strategies() as $validation_strategy) {
602
+			$jquery_validation_rules = array_replace_recursive($jquery_validation_rules, $validation_strategy->get_jquery_validation_rule_array());
603 603
 		}
604 604
 
605
-		if(! empty($jquery_validation_rules)){
606
-			$jquery_validation_js[ $this->html_id( TRUE ) ] = $jquery_validation_rules;
607
-		}else{
605
+		if ( ! empty($jquery_validation_rules)) {
606
+			$jquery_validation_js[$this->html_id(TRUE)] = $jquery_validation_rules;
607
+		} else {
608 608
 			return array();
609 609
 		}
610 610
 		return $jquery_validation_js;
@@ -616,9 +616,9 @@  discard block
 block discarded – undo
616 616
 	 * @param mixed $value
617 617
 	 * @return void
618 618
 	 */
619
-	function set_default($value){
619
+	function set_default($value) {
620 620
 		$this->_normalized_value = $value;
621
-		$this->_raw_value = $this->_normalization_strategy->unnormalize( $value );
621
+		$this->_raw_value = $this->_normalization_strategy->unnormalize($value);
622 622
 	}
623 623
 
624 624
 	/**
@@ -626,7 +626,7 @@  discard block
 block discarded – undo
626 626
 	 * @param string $label
627 627
 	 * @return void
628 628
 	 */
629
-	function set_html_label_text($label){
629
+	function set_html_label_text($label) {
630 630
 		$this->_html_label_text = $label;
631 631
 	}
632 632
 
@@ -638,12 +638,12 @@  discard block
 block discarded – undo
638 638
 	 * @param boolean $required
639 639
 	 * @param null    $required_text
640 640
 	 */
641
-	function set_required($required = true, $required_text = NULL ){
642
-		$required = filter_var( $required, FILTER_VALIDATE_BOOLEAN );
643
-		if ( $required ) {
644
-			$this->_add_validation_strategy( new EE_Required_Validation_Strategy( $required_text ) );
641
+	function set_required($required = true, $required_text = NULL) {
642
+		$required = filter_var($required, FILTER_VALIDATE_BOOLEAN);
643
+		if ($required) {
644
+			$this->_add_validation_strategy(new EE_Required_Validation_Strategy($required_text));
645 645
 		} else {
646
-			unset( $this->_validation_strategies[ get_class( new EE_Required_Validation_Strategy() ) ] );
646
+			unset($this->_validation_strategies[get_class(new EE_Required_Validation_Strategy())]);
647 647
 		}
648 648
 		$this->_required = $required;
649 649
 	}
@@ -651,7 +651,7 @@  discard block
 block discarded – undo
651 651
 	 * Returns whether or not this field is required
652 652
 	 * @return boolean
653 653
 	 */
654
-	public function required(){
654
+	public function required() {
655 655
 		return $this->_required;
656 656
 	}
657 657
 
@@ -660,7 +660,7 @@  discard block
 block discarded – undo
660 660
 	/**
661 661
 	 * @param string $required_css_class
662 662
 	 */
663
-	public function set_required_css_class( $required_css_class ) {
663
+	public function set_required_css_class($required_css_class) {
664 664
 		$this->_required_css_class = $required_css_class;
665 665
 	}
666 666
 
@@ -679,7 +679,7 @@  discard block
 block discarded – undo
679 679
 	 * Sets the help text, in case
680 680
 	 * @param string $text
681 681
 	 */
682
-	public function set_html_help_text($text){
682
+	public function set_html_help_text($text) {
683 683
 		$this->_html_help_text = $text;
684 684
 	}
685 685
 	/**
@@ -691,8 +691,8 @@  discard block
 block discarded – undo
691 691
 	public function clean_sensitive_data() {
692 692
 		//if we do ANY kind of sensitive data removal on this, then just clear out the raw value
693 693
 		//if we need more logic than this we'll make a strategy for it
694
-		if( $this->_sensitive_data_removal_strategy &&
695
-				! $this->_sensitive_data_removal_strategy instanceof EE_No_Sensitive_Data_Removal ){
694
+		if ($this->_sensitive_data_removal_strategy &&
695
+				! $this->_sensitive_data_removal_strategy instanceof EE_No_Sensitive_Data_Removal) {
696 696
 			$this->_raw_value = NULL;
697 697
 		}
698 698
 		//and clean the normalized value according to the appropriate strategy
@@ -706,10 +706,10 @@  discard block
 block discarded – undo
706 706
 	 * @param string $button_size
707 707
 	 * @param string $other_attributes
708 708
 	 */
709
-	public function set_button_css_attributes( $primary = TRUE, $button_size = '', $other_attributes = '' ) {
709
+	public function set_button_css_attributes($primary = TRUE, $button_size = '', $other_attributes = '') {
710 710
 		$button_css_attributes = 'button';
711 711
 		$button_css_attributes .= $primary === TRUE ? ' button-primary' : ' button-secondary';
712
-		switch ( $button_size ) {
712
+		switch ($button_size) {
713 713
 			case 'xs' :
714 714
 			case 'extra-small' :
715 715
 				$button_css_attributes .= ' button-xs';
@@ -730,7 +730,7 @@  discard block
 block discarded – undo
730 730
 			default :
731 731
 				$button_css_attributes .= '';
732 732
 		}
733
-		$this->_button_css_attributes .= ! empty( $other_attributes ) ? $button_css_attributes . ' ' . $other_attributes : $button_css_attributes;
733
+		$this->_button_css_attributes .= ! empty($other_attributes) ? $button_css_attributes.' '.$other_attributes : $button_css_attributes;
734 734
 	}
735 735
 
736 736
 
@@ -739,7 +739,7 @@  discard block
 block discarded – undo
739 739
 	 * @return string
740 740
 	 */
741 741
 	public function button_css_attributes() {
742
-		if ( empty( $this->_button_css_attributes )) {
742
+		if (empty($this->_button_css_attributes)) {
743 743
 			$this->set_button_css_attributes();
744 744
 		}
745 745
 		return $this->_button_css_attributes;
@@ -759,27 +759,27 @@  discard block
 block discarded – undo
759 759
 	 * @param array $req_data
760 760
 	 * @return mixed whatever the raw value of this form section is in the request data
761 761
 	 */
762
-	public function find_form_data_for_this_section( $req_data ){
762
+	public function find_form_data_for_this_section($req_data) {
763 763
 		// break up the html name by "[]"
764
-		if ( strpos( $this->html_name(), '[' ) !== FALSE ) {
765
-			$before_any_brackets = substr( $this->html_name(), 0, strpos($this->html_name(), '[') );
764
+		if (strpos($this->html_name(), '[') !== FALSE) {
765
+			$before_any_brackets = substr($this->html_name(), 0, strpos($this->html_name(), '['));
766 766
 		} else {
767 767
 			$before_any_brackets = $this->html_name();
768 768
 		}
769 769
 		// grab all of the segments
770
-		preg_match_all('~\[([^]]*)\]~',$this->html_name(), $matches);
771
-		if( isset( $matches[ 1 ] ) && is_array( $matches[ 1 ] ) ){
772
-			$name_parts = $matches[ 1 ];
770
+		preg_match_all('~\[([^]]*)\]~', $this->html_name(), $matches);
771
+		if (isset($matches[1]) && is_array($matches[1])) {
772
+			$name_parts = $matches[1];
773 773
 			array_unshift($name_parts, $before_any_brackets);
774
-		}else{
775
-			$name_parts = array( $before_any_brackets );
774
+		} else {
775
+			$name_parts = array($before_any_brackets);
776 776
 		}
777 777
 		// now get the value for the input
778 778
 		$value = $this->_find_form_data_for_this_section_using_name_parts($name_parts, $req_data);
779
-		if( $value === NULL ){
779
+		if ($value === NULL) {
780 780
 			//check if this thing's name is at the TOP level of the request data
781
-			if( isset( $req_data[ $this->name() ] ) ){
782
-				$value = $req_data[ $this->name() ];
781
+			if (isset($req_data[$this->name()])) {
782
+				$value = $req_data[$this->name()];
783 783
 			}
784 784
 		}
785 785
 		return $value;
@@ -793,15 +793,15 @@  discard block
 block discarded – undo
793 793
 	 * @param array $req_data
794 794
 	 * @return array | NULL
795 795
 	 */
796
-	public function _find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data){
797
-		$first_part_to_consider = array_shift( $html_name_parts );
798
-		if( isset( $req_data[ $first_part_to_consider ] ) ){
799
-			if( empty($html_name_parts ) ){
800
-				return $req_data[ $first_part_to_consider ];
801
-			}else{
802
-				return $this->_find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data[ $first_part_to_consider ] );
796
+	public function _find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data) {
797
+		$first_part_to_consider = array_shift($html_name_parts);
798
+		if (isset($req_data[$first_part_to_consider])) {
799
+			if (empty($html_name_parts)) {
800
+				return $req_data[$first_part_to_consider];
801
+			} else {
802
+				return $this->_find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data[$first_part_to_consider]);
803 803
 			}
804
-		}else{
804
+		} else {
805 805
 			return NULL;
806 806
 		}
807 807
 	}
@@ -813,14 +813,14 @@  discard block
 block discarded – undo
813 813
 	 * @param array $req_data like $_POST
814 814
 	 * @return boolean
815 815
 	 */
816
-	public function form_data_present_in($req_data = NULL){
817
-		if( $req_data === NULL ){
816
+	public function form_data_present_in($req_data = NULL) {
817
+		if ($req_data === NULL) {
818 818
 			$req_data = $_POST;
819 819
 		}
820
-		$checked_value = $this->find_form_data_for_this_section( $req_data );
821
-		if( $checked_value !== null ){
820
+		$checked_value = $this->find_form_data_for_this_section($req_data);
821
+		if ($checked_value !== null) {
822 822
 			return TRUE;
823
-		}else{
823
+		} else {
824 824
 			return FALSE;
825 825
 		}
826 826
 	}
Please login to merge, or discard this patch.
libraries/form_sections/payment_methods/EE_Payment_Method_Form.form.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@
 block discarded – undo
101 101
 
102 102
 
103 103
 	/**
104
-	 * @param $payment_method_type
104
+	 * @param EE_PMT_Base $payment_method_type
105 105
 	 * @throws EE_Error
106 106
 	 */
107 107
 	public function set_payment_method_type( $payment_method_type ){
Please login to merge, or discard this patch.
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
  * Specialized form for payment methods, allowing for easy setting and retrieving of meta fields.
5 5
  * Uses EEM_Payment_Method as the model
6 6
  */
7
-class EE_Payment_Method_Form extends EE_Model_Form_Section{
7
+class EE_Payment_Method_Form extends EE_Model_Form_Section {
8 8
 
9 9
 	/**
10 10
 	 * All the subsection inputs that correspond ot extra meta rows
@@ -39,37 +39,37 @@  discard block
 block discarded – undo
39 39
 	 *	@see EE_Model_Form_Section::__construct() for more
40 40
 	 * }
41 41
 	 */
42
-	public function __construct($options_array = array()){
42
+	public function __construct($options_array = array()) {
43 43
 		$this->_model = EEM_Payment_Method::instance();
44 44
 		$this->_options_array = $options_array;
45
-		if(isset($options_array['payment_method_type'])){
45
+		if (isset($options_array['payment_method_type'])) {
46 46
 			$this->_payment_method_type = $options_array['payment_method_type'];
47 47
 		}
48 48
 		$options_array = $this->_options_array;
49
-		if(isset($options_array['extra_meta_inputs'])){
50
-			$this->_extra_meta_inputs = array_merge($this->_extra_meta_inputs,$options_array['extra_meta_inputs']);
49
+		if (isset($options_array['extra_meta_inputs'])) {
50
+			$this->_extra_meta_inputs = array_merge($this->_extra_meta_inputs, $options_array['extra_meta_inputs']);
51 51
 		}
52
-		if($this->_extra_meta_inputs){
53
-			$this->_subsections = array_merge($this->_subsections,$this->_extra_meta_inputs);
52
+		if ($this->_extra_meta_inputs) {
53
+			$this->_subsections = array_merge($this->_subsections, $this->_extra_meta_inputs);
54 54
 		}
55 55
 		$this->_subsections['PMD_button_url'] = new EE_Admin_File_Uploader_Input(
56
-			array( 'html_label_text'=>  __( 'Button URL', 'event_espresso' ))
56
+			array('html_label_text'=>  __('Button URL', 'event_espresso'))
57 57
 		);
58 58
 		$this->_subsections['PMD_scope'] = new EE_Checkbox_Multi_Input(
59 59
 			EEM_Payment_Method::instance()->scopes(),
60
-			array( 'html_label_text' => $this->_model->field_settings_for('PMD_scope')->get_nicename() . EEH_Template::get_help_tab_link( 'payment_methods_overview' ))
60
+			array('html_label_text' => $this->_model->field_settings_for('PMD_scope')->get_nicename().EEH_Template::get_help_tab_link('payment_methods_overview'))
61 61
 		);
62 62
 		//setup the currency options
63 63
 		$this->_subsections['Currency'] = new EE_Select_Multi_Model_Input(
64
-			EEM_Currency::instance()->get_all_currencies_usable_by( $this->_payment_method_type ),
64
+			EEM_Currency::instance()->get_all_currencies_usable_by($this->_payment_method_type),
65 65
 			array(
66
-				'html_label_text'=>  __( 'Currencies Supported', 'event_espresso' ),
66
+				'html_label_text'=>  __('Currencies Supported', 'event_espresso'),
67 67
 				'required'=>TRUE
68 68
 			)
69 69
 		);
70
-		$this->_subsections['PMD_order'] = new EE_Text_Input( array(
71
-			'html_label_text' => __( 'Order', 'event_espresso' ),
72
-			'html_help_text' => __( 'Lowest numbers will be shown first', 'event_espresso' ),
70
+		$this->_subsections['PMD_order'] = new EE_Text_Input(array(
71
+			'html_label_text' => __('Order', 'event_espresso'),
72
+			'html_help_text' => __('Lowest numbers will be shown first', 'event_espresso'),
73 73
 			'normalization_strategy' => new EE_Int_Normalization(),
74 74
 			'validation_strategies' => array(
75 75
 				new EE_Int_Validation_Strategy()
@@ -88,15 +88,15 @@  discard block
 block discarded – undo
88 88
 	 * @param string 	$name
89 89
 	 * @throws EE_Error
90 90
 	 */
91
-	public function _construct_finalize( $parent_form_section, $name ) {
92
-		if( ! $this->_payment_method_type instanceof EE_PMT_Base ){
93
-			throw new EE_Error( sprintf( __( 'Payment Method forms must have set their payment method type BEFORE calling _construct_finalize', 'event_espresso' )));
91
+	public function _construct_finalize($parent_form_section, $name) {
92
+		if ( ! $this->_payment_method_type instanceof EE_PMT_Base) {
93
+			throw new EE_Error(sprintf(__('Payment Method forms must have set their payment method type BEFORE calling _construct_finalize', 'event_espresso')));
94 94
 		}
95 95
 		//set the name of this form based on the payment method type
96
-		if( ! $this->_name && ! $name ){
97
-			$name = str_replace(" ","_",ucwords(str_replace("_"," ",($this->_payment_method_type->system_name()))))."_Settings_Form";
96
+		if ( ! $this->_name && ! $name) {
97
+			$name = str_replace(" ", "_", ucwords(str_replace("_", " ", ($this->_payment_method_type->system_name()))))."_Settings_Form";
98 98
 		}
99
-		parent::_construct_finalize( $parent_form_section, $name );
99
+		parent::_construct_finalize($parent_form_section, $name);
100 100
 	}
101 101
 
102 102
 
@@ -105,8 +105,8 @@  discard block
 block discarded – undo
105 105
 	 * @param $payment_method_type
106 106
 	 * @throws EE_Error
107 107
 	 */
108
-	public function set_payment_method_type( $payment_method_type ){
109
-		if( ! $payment_method_type instanceof EE_PMT_Base){
108
+	public function set_payment_method_type($payment_method_type) {
109
+		if ( ! $payment_method_type instanceof EE_PMT_Base) {
110 110
 			throw new EE_Error(sprintf(__("Payment Method forms MUST set a payment method type by using _set_payment_method_type", "event_espresso")));
111 111
 		}
112 112
 		$this->_payment_method_type = $payment_method_type;
@@ -118,10 +118,10 @@  discard block
 block discarded – undo
118 118
 	 * extends the model form section's save method to also save the extra meta field values
119 119
 	 * @return int ID of the payment method inserted, or true on update
120 120
 	 */
121
-	public function save(){
121
+	public function save() {
122 122
 		$parent_save_val = parent::save();
123
-		if( $this->_model_object && $this->_model_object->ID()){
124
-			foreach($this->_extra_meta_inputs as $input_name => $input){
123
+		if ($this->_model_object && $this->_model_object->ID()) {
124
+			foreach ($this->_extra_meta_inputs as $input_name => $input) {
125 125
 				$this->_model_object->update_extra_meta($input_name, $input->normalized_value());
126 126
 			}
127 127
 		}
@@ -138,8 +138,8 @@  discard block
 block discarded – undo
138 138
 		$model_obj = $this->_model->ensure_is_obj($model_obj);
139 139
 		parent::populate_model_obj($model_obj);
140 140
 		$extra_meta = $model_obj->all_extra_meta_array();
141
-		foreach($this->_extra_meta_inputs as $input_name => $extra_meta_input){
142
-			if(isset($extra_meta[$input_name])){
141
+		foreach ($this->_extra_meta_inputs as $input_name => $extra_meta_input) {
142
+			if (isset($extra_meta[$input_name])) {
143 143
 				$extra_meta_input->set_default($extra_meta[$input_name]);
144 144
 			}
145 145
 		}
@@ -151,10 +151,10 @@  discard block
 block discarded – undo
151 151
 	 * gets the default name of this form section if none is specified
152 152
 	 * @return string
153 153
 	 */
154
-	protected function _set_default_name_if_empty(){
155
-		if( ! $this->_name ){
156
-			$default_name = str_replace("EEM_", "", get_class($this->_model)) . "_Model_Form";
157
-			$this->_name =  $default_name;
154
+	protected function _set_default_name_if_empty() {
155
+		if ( ! $this->_name) {
156
+			$default_name = str_replace("EEM_", "", get_class($this->_model))."_Model_Form";
157
+			$this->_name = $default_name;
158 158
 		}
159 159
 	}
160 160
 
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 	 * Gets all the extra meta inputs in this form
165 165
 	 * @return EE_Form_Input_Base[]
166 166
 	 */
167
-	public function extra_meta_inputs(){
167
+	public function extra_meta_inputs() {
168 168
 		return $this->_extra_meta_inputs;
169 169
 	}
170 170
 }
Please login to merge, or discard this patch.
form_sections/strategies/display/EE_Select_Display_Strategy.strategy.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@
 block discarded – undo
80 80
 	/**
81 81
 	 * Checks if that value is the one selected
82 82
 	 * @param string|int $value unnormalized value option (string)
83
-	 * @return string
83
+	 * @return boolean
84 84
 	 */
85 85
 	protected function _check_if_option_selected( $value ){
86 86
 		return $this->_input->raw_value() == $value ? TRUE : FALSE;
Please login to merge, or discard this patch.
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -11,47 +11,47 @@  discard block
 block discarded – undo
11 11
  * @since 				$VID:$
12 12
  *
13 13
  */
14
-class EE_Select_Display_Strategy extends EE_Display_Strategy_Base{
14
+class EE_Select_Display_Strategy extends EE_Display_Strategy_Base {
15 15
 
16 16
 	/**
17 17
 	 *
18 18
 	 * @throws EE_Error
19 19
 	 * @return string of html to display the field
20 20
 	 */
21
-	function display(){
22
-		if( ! $this->_input instanceof EE_Form_Input_With_Options_Base){
23
-			throw new EE_Error( sprintf( __( 'Cannot use Select Display Strategy with an input that doesn\'t have options', 'event_espresso' )));
21
+	function display() {
22
+		if ( ! $this->_input instanceof EE_Form_Input_With_Options_Base) {
23
+			throw new EE_Error(sprintf(__('Cannot use Select Display Strategy with an input that doesn\'t have options', 'event_espresso')));
24 24
 		}
25 25
 		EE_Registry::instance()->load_helper('Array');
26 26
 
27
-		$html = EEH_HTML::nl( 0, 'select' );
27
+		$html = EEH_HTML::nl(0, 'select');
28 28
 		$html .= '<select';
29
-		$html .= ' id="' . $this->_input->html_id() . '"';
30
-		$html .= ' name="' . $this->_input->html_name() . '"';
31
-		$class = $this->_input->required() ? $this->_input->required_css_class() . ' ' . $this->_input->html_class() : $this->_input->html_class();
32
-		$html .= ' class="' . $class . '"';
29
+		$html .= ' id="'.$this->_input->html_id().'"';
30
+		$html .= ' name="'.$this->_input->html_name().'"';
31
+		$class = $this->_input->required() ? $this->_input->required_css_class().' '.$this->_input->html_class() : $this->_input->html_class();
32
+		$html .= ' class="'.$class.'"';
33 33
 		// add html5 required
34 34
 
35 35
 		$html .= $this->_input->required() ? ' required' : '';
36
-		$html .= ' style="' . $this->_input->html_style() . '"';
36
+		$html .= ' style="'.$this->_input->html_style().'"';
37 37
 		$html .= '>';
38 38
 
39 39
 //		EEH_HTML::indent( 1, 'select' );
40
-		if ( EEH_Array::is_multi_dimensional_array( $this->_input->options() )) {
41
-			EEH_HTML::indent( 1, 'optgroup' );
42
-			foreach( $this->_input->options() as $opt_group_label => $opt_group ){
43
-				$html .= EEH_HTML::nl( 0, 'optgroup' ) . '<optgroup label="' . esc_attr( $opt_group_label ) . '">';
44
-				EEH_HTML::indent( 1, 'option' );
45
-				$html .= $this->_display_options( $opt_group );
40
+		if (EEH_Array::is_multi_dimensional_array($this->_input->options())) {
41
+			EEH_HTML::indent(1, 'optgroup');
42
+			foreach ($this->_input->options() as $opt_group_label => $opt_group) {
43
+				$html .= EEH_HTML::nl(0, 'optgroup').'<optgroup label="'.esc_attr($opt_group_label).'">';
44
+				EEH_HTML::indent(1, 'option');
45
+				$html .= $this->_display_options($opt_group);
46 46
 				$html .= EEH_HTML::indent( -1, 'option' );
47
-				$html .= EEH_HTML::nl( 0, 'optgroup' ) . '</optgroup>';
47
+				$html .= EEH_HTML::nl(0, 'optgroup').'</optgroup>';
48 48
 			}
49 49
 			EEH_HTML::indent( -1, 'optgroup' );
50 50
 		} else {
51
-			$html.=$this->_display_options( $this->_input->options() );
51
+			$html .= $this->_display_options($this->_input->options());
52 52
 		}
53 53
 
54
-		$html.= EEH_HTML::nl( 0, 'select' ) . '</select>';
54
+		$html .= EEH_HTML::nl(0, 'select').'</select>';
55 55
 //		$html.= EEH_HTML::nl( -1, 'select' ) . '</select>';
56 56
 		return $html;
57 57
 	}
@@ -63,13 +63,13 @@  discard block
 block discarded – undo
63 63
 	 * @param array $options
64 64
 	 * @return string
65 65
 	 */
66
-	protected function _display_options($options){
66
+	protected function _display_options($options) {
67 67
 		$html = '';
68
-		EEH_HTML::indent( 1, 'option' );
69
-		foreach( $options as $value => $display_text ){
70
-			$unnormalized_value = $this->_input->get_normalization_strategy()->unnormalize_one( $value );
71
-			$selected = $this->_check_if_option_selected( $unnormalized_value ) ? ' selected="selected"' : '';
72
-			$html.= EEH_HTML::nl( 0, 'option' ) . '<option value="' . esc_attr( $unnormalized_value ) . '"' . $selected . '>' . $display_text . '</option>';
68
+		EEH_HTML::indent(1, 'option');
69
+		foreach ($options as $value => $display_text) {
70
+			$unnormalized_value = $this->_input->get_normalization_strategy()->unnormalize_one($value);
71
+			$selected = $this->_check_if_option_selected($unnormalized_value) ? ' selected="selected"' : '';
72
+			$html .= EEH_HTML::nl(0, 'option').'<option value="'.esc_attr($unnormalized_value).'"'.$selected.'>'.$display_text.'</option>';
73 73
 		}
74 74
 		EEH_HTML::indent( -1, 'option' );
75 75
 		return $html;
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 	 * @param string|int $value unnormalized value option (string)
83 83
 	 * @return string
84 84
 	 */
85
-	protected function _check_if_option_selected( $value ){
85
+	protected function _check_if_option_selected($value) {
86 86
 		return $this->_input->raw_value() == $value ? TRUE : FALSE;
87 87
 	}
88 88
 
Please login to merge, or discard this patch.
form_sections/strategies/normalization/EE_Int_Normalization.strategy.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
 
12 12
 	/**
13 13
 	 * @param string $value_to_normalize
14
-	 * @return int|mixed|string
14
+	 * @return integer
15 15
 	 * @throws \EE_Validation_Error
16 16
 	 */
17 17
 	public function normalize($value_to_normalize) {
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
  * @subpackage
8 8
  * @author				Mike Nelson
9 9
  */
10
-class EE_Int_Normalization extends EE_Normalization_Strategy_Base{
10
+class EE_Int_Normalization extends EE_Normalization_Strategy_Base {
11 11
 
12 12
 	/**
13 13
 	 * @param string $value_to_normalize
@@ -15,33 +15,33 @@  discard block
 block discarded – undo
15 15
 	 * @throws \EE_Validation_Error
16 16
 	 */
17 17
 	public function normalize($value_to_normalize) {
18
-		if( is_int( $value_to_normalize ) ){
18
+		if (is_int($value_to_normalize)) {
19 19
 			return $value_to_normalize;
20 20
 		}
21
-		if( ! is_string( $value_to_normalize )){
22
-			throw new EE_Validation_Error( sprintf( __( 'The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso' ), print_r( $value_to_normalize, TRUE), gettype( $value_to_normalize ) ) );
21
+		if ( ! is_string($value_to_normalize)) {
22
+			throw new EE_Validation_Error(sprintf(__('The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso'), print_r($value_to_normalize, TRUE), gettype($value_to_normalize)));
23 23
 		}
24 24
 		$thousands_separator = EE_Config::instance()->currency->thsnds;
25
-		$value_to_normalize = str_replace( $thousands_separator, "", $value_to_normalize );
26
-		$value_to_normalize = str_replace( array(" ","\t"), '', $value_to_normalize );
27
-		if ( preg_match( '/^\d+$/', $value_to_normalize )) {
28
-			return intval( $value_to_normalize );
25
+		$value_to_normalize = str_replace($thousands_separator, "", $value_to_normalize);
26
+		$value_to_normalize = str_replace(array(" ", "\t"), '', $value_to_normalize);
27
+		if (preg_match('/^\d+$/', $value_to_normalize)) {
28
+			return intval($value_to_normalize);
29 29
 		} else {
30 30
 			//find if this input has a int validation strategy
31 31
 			//in which case, use its message
32 32
 			$validation_error_message = NULL;
33
-			foreach( $this->_input->get_validation_strategies() as $validation_strategy ){
34
-				if( $validation_strategy instanceof EE_Int_Validation_Strategy ){
33
+			foreach ($this->_input->get_validation_strategies() as $validation_strategy) {
34
+				if ($validation_strategy instanceof EE_Int_Validation_Strategy) {
35 35
 					$validation_error_message = $validation_strategy->get_validation_error_message();
36 36
 				}
37 37
 			}
38 38
 			//this really shouldn't ever happen because fields with a int normalization strategy
39 39
 			//should also have a int validation strategy, but in case it doesnt use the default
40
-			if( ! $validation_error_message ){
40
+			if ( ! $validation_error_message) {
41 41
 				$default_validation_strategy = new EE_Int_Validation_Strategy();
42 42
 				$validation_error_message = $default_validation_strategy->get_validation_error_message();
43 43
 			}
44
-			throw new EE_Validation_Error( $validation_error_message, 'numeric_only' );
44
+			throw new EE_Validation_Error($validation_error_message, 'numeric_only');
45 45
 		}
46 46
 	}
47 47
 
@@ -50,10 +50,10 @@  discard block
 block discarded – undo
50 50
 	 * @param int $normalized_value
51 51
 	 * @return string
52 52
 	 */
53
-	public function unnormalize( $normalized_value ) {
54
-		if( empty( $normalized_value ) ){
53
+	public function unnormalize($normalized_value) {
54
+		if (empty($normalized_value)) {
55 55
 			return '0';
56
-		}else{
56
+		} else {
57 57
 			return "$normalized_value";
58 58
 		}
59 59
 	}
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.
strategies/validation/EE_Email_Validation_Strategy.strategy.php 4 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
     * just checks the field isn't blank
27 27
     *
28 28
     * @param $normalized_value
29
-    * @return bool
29
+    * @return boolean|null
30 30
     * @throws \EE_Validation_Error
31 31
     */
32 32
 	function validate($normalized_value) {
Please login to merge, or discard this patch.
Indentation   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -11,8 +11,8 @@  discard block
 block discarded – undo
11 11
 class EE_Email_Validation_Strategy extends EE_Text_Validation_Strategy{
12 12
 
13 13
 	/**
14
-     * @param null $validation_error_message
15
-     */
14
+	 * @param null $validation_error_message
15
+	 */
16 16
    public function __construct( $validation_error_message = NULL ) {
17 17
 		if( ! $validation_error_message ){
18 18
 			$validation_error_message = __("Please enter a valid email address.", "event_espresso");
@@ -38,8 +38,8 @@  discard block
 block discarded – undo
38 38
 
39 39
 
40 40
 	/**
41
-     * @return array
42
-     */
41
+	 * @return array
42
+	 */
43 43
    function get_jquery_validation_rule_array(){
44 44
 		return array( 'email'=>true, 'messages' => array( 'email' => $this->get_validation_error_message() ) );
45 45
 	}
@@ -59,56 +59,56 @@  discard block
 block discarded – undo
59 59
    $atIndex = strrpos($email, "@");
60 60
    if (is_bool($atIndex) && !$atIndex)
61 61
    {
62
-      $isValid = false;
62
+	  $isValid = false;
63 63
    }
64 64
    else
65 65
    {
66
-      $domain = substr($email, $atIndex+1);
67
-      $local = substr($email, 0, $atIndex);
68
-      $localLen = strlen($local);
69
-      $domainLen = strlen($domain);
70
-      if ($localLen < 1 || $localLen > 64)
71
-      {
72
-         // local part length exceeded
73
-         $isValid = false;
74
-      }
75
-      else if ($domainLen < 1 || $domainLen > 255)
76
-      {
77
-         // domain part length exceeded
78
-         $isValid = false;
79
-      }
80
-      else if ($local[0] == '.' || $local[$localLen-1] == '.')
81
-      {
82
-         // local part starts or ends with '.'
83
-         $isValid = false;
84
-      }
85
-      else if (preg_match('/\\.\\./', $local))
86
-      {
87
-         // local part has two consecutive dots
88
-         $isValid = false;
89
-      }
90
-      else if (!preg_match('/^[A-Za-z0-9\\-\\.]+$/', $domain))
91
-      {
92
-         // character not valid in domain part
93
-         $isValid = false;
94
-      }
95
-      else if (preg_match('/\\.\\./', $domain))
96
-      {
97
-         // domain part has two consecutive dots
98
-         $isValid = false;
99
-      }
100
-      else if
66
+	  $domain = substr($email, $atIndex+1);
67
+	  $local = substr($email, 0, $atIndex);
68
+	  $localLen = strlen($local);
69
+	  $domainLen = strlen($domain);
70
+	  if ($localLen < 1 || $localLen > 64)
71
+	  {
72
+		 // local part length exceeded
73
+		 $isValid = false;
74
+	  }
75
+	  else if ($domainLen < 1 || $domainLen > 255)
76
+	  {
77
+		 // domain part length exceeded
78
+		 $isValid = false;
79
+	  }
80
+	  else if ($local[0] == '.' || $local[$localLen-1] == '.')
81
+	  {
82
+		 // local part starts or ends with '.'
83
+		 $isValid = false;
84
+	  }
85
+	  else if (preg_match('/\\.\\./', $local))
86
+	  {
87
+		 // local part has two consecutive dots
88
+		 $isValid = false;
89
+	  }
90
+	  else if (!preg_match('/^[A-Za-z0-9\\-\\.]+$/', $domain))
91
+	  {
92
+		 // character not valid in domain part
93
+		 $isValid = false;
94
+	  }
95
+	  else if (preg_match('/\\.\\./', $domain))
96
+	  {
97
+		 // domain part has two consecutive dots
98
+		 $isValid = false;
99
+	  }
100
+	  else if
101 101
 (!preg_match('/^(\\\\.|[A-Za-z0-9!#%&`_=\\/$\'*+?^{}|~.-])+$/',
102
-                 str_replace("\\\\","",$local)))
103
-      {
104
-         // character not valid in local part unless
105
-         // local part is quoted
106
-         if (!preg_match('/^"(\\\\"|[^"])+"$/',
107
-             str_replace("\\\\","",$local)))
108
-         {
109
-            $isValid = false;
110
-         }
111
-      }
102
+				 str_replace("\\\\","",$local)))
103
+	  {
104
+		 // character not valid in local part unless
105
+		 // local part is quoted
106
+		 if (!preg_match('/^"(\\\\"|[^"])+"$/',
107
+			 str_replace("\\\\","",$local)))
108
+		 {
109
+			$isValid = false;
110
+		 }
111
+	  }
112 112
 	  //don't check the DNS records... just personal preference
113 113
 //      if ($isValid && !(checkdnsrr($domain,"MX") || checkdnsrr($domain,"A")))
114 114
 //      {
Please login to merge, or discard this patch.
Spacing   +16 added lines, -17 removed lines patch added patch discarded remove patch
@@ -8,16 +8,16 @@  discard block
 block discarded – undo
8 8
  * @since 				4.6
9 9
  *
10 10
  */
11
-class EE_Email_Validation_Strategy extends EE_Text_Validation_Strategy{
11
+class EE_Email_Validation_Strategy extends EE_Text_Validation_Strategy {
12 12
 
13 13
 	/**
14 14
      * @param null $validation_error_message
15 15
      */
16
-   public function __construct( $validation_error_message = NULL ) {
17
-		if( ! $validation_error_message ){
16
+   public function __construct($validation_error_message = NULL) {
17
+		if ( ! $validation_error_message) {
18 18
 			$validation_error_message = __("Please enter a valid email address.", "event_espresso");
19 19
 		}
20
-		parent::__construct( $validation_error_message );
20
+		parent::__construct($validation_error_message);
21 21
 	}
22 22
 
23 23
 
@@ -30,8 +30,8 @@  discard block
 block discarded – undo
30 30
     * @throws \EE_Validation_Error
31 31
     */
32 32
 	function validate($normalized_value) {
33
-		if( $normalized_value && ! $this->_validate_email($normalized_value) ){
34
-			throw new EE_Validation_Error( $this->get_validation_error_message(), 'required');
33
+		if ($normalized_value && ! $this->_validate_email($normalized_value)) {
34
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'required');
35 35
 		}
36 36
 	}
37 37
 
@@ -40,8 +40,8 @@  discard block
 block discarded – undo
40 40
 	/**
41 41
      * @return array
42 42
      */
43
-   function get_jquery_validation_rule_array(){
44
-		return array( 'email'=>true, 'messages' => array( 'email' => $this->get_validation_error_message() ) );
43
+   function get_jquery_validation_rule_array() {
44
+		return array('email'=>true, 'messages' => array('email' => $this->get_validation_error_message()));
45 45
 	}
46 46
 
47 47
 
@@ -57,13 +57,13 @@  discard block
 block discarded – undo
57 57
 {
58 58
    $isValid = true;
59 59
    $atIndex = strrpos($email, "@");
60
-   if (is_bool($atIndex) && !$atIndex)
60
+   if (is_bool($atIndex) && ! $atIndex)
61 61
    {
62 62
       $isValid = false;
63 63
    }
64 64
    else
65 65
    {
66
-      $domain = substr($email, $atIndex+1);
66
+      $domain = substr($email, $atIndex + 1);
67 67
       $local = substr($email, 0, $atIndex);
68 68
       $localLen = strlen($local);
69 69
       $domainLen = strlen($domain);
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
          // domain part length exceeded
78 78
          $isValid = false;
79 79
       }
80
-      else if ($local[0] == '.' || $local[$localLen-1] == '.')
80
+      else if ($local[0] == '.' || $local[$localLen - 1] == '.')
81 81
       {
82 82
          // local part starts or ends with '.'
83 83
          $isValid = false;
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
          // local part has two consecutive dots
88 88
          $isValid = false;
89 89
       }
90
-      else if (!preg_match('/^[A-Za-z0-9\\-\\.]+$/', $domain))
90
+      else if ( ! preg_match('/^[A-Za-z0-9\\-\\.]+$/', $domain))
91 91
       {
92 92
          // character not valid in domain part
93 93
          $isValid = false;
@@ -97,14 +97,13 @@  discard block
 block discarded – undo
97 97
          // domain part has two consecutive dots
98 98
          $isValid = false;
99 99
       }
100
-      else if
101
-(!preg_match('/^(\\\\.|[A-Za-z0-9!#%&`_=\\/$\'*+?^{}|~.-])+$/',
102
-                 str_replace("\\\\","",$local)))
100
+      else if ( ! preg_match('/^(\\\\.|[A-Za-z0-9!#%&`_=\\/$\'*+?^{}|~.-])+$/',
101
+                 str_replace("\\\\", "", $local)))
103 102
       {
104 103
          // character not valid in local part unless
105 104
          // local part is quoted
106
-         if (!preg_match('/^"(\\\\"|[^"])+"$/',
107
-             str_replace("\\\\","",$local)))
105
+         if ( ! preg_match('/^"(\\\\"|[^"])+"$/',
106
+             str_replace("\\\\", "", $local)))
108 107
          {
109 108
             $isValid = false;
110 109
          }
Please login to merge, or discard this patch.
Braces   +7 added lines, -14 removed lines patch added patch discarded remove patch
@@ -60,8 +60,7 @@  discard block
 block discarded – undo
60 60
    if (is_bool($atIndex) && !$atIndex)
61 61
    {
62 62
       $isValid = false;
63
-   }
64
-   else
63
+   } else
65 64
    {
66 65
       $domain = substr($email, $atIndex+1);
67 66
       $local = substr($email, 0, $atIndex);
@@ -71,33 +70,27 @@  discard block
 block discarded – undo
71 70
       {
72 71
          // local part length exceeded
73 72
          $isValid = false;
74
-      }
75
-      else if ($domainLen < 1 || $domainLen > 255)
73
+      } else if ($domainLen < 1 || $domainLen > 255)
76 74
       {
77 75
          // domain part length exceeded
78 76
          $isValid = false;
79
-      }
80
-      else if ($local[0] == '.' || $local[$localLen-1] == '.')
77
+      } else if ($local[0] == '.' || $local[$localLen-1] == '.')
81 78
       {
82 79
          // local part starts or ends with '.'
83 80
          $isValid = false;
84
-      }
85
-      else if (preg_match('/\\.\\./', $local))
81
+      } else if (preg_match('/\\.\\./', $local))
86 82
       {
87 83
          // local part has two consecutive dots
88 84
          $isValid = false;
89
-      }
90
-      else if (!preg_match('/^[A-Za-z0-9\\-\\.]+$/', $domain))
85
+      } else if (!preg_match('/^[A-Za-z0-9\\-\\.]+$/', $domain))
91 86
       {
92 87
          // character not valid in domain part
93 88
          $isValid = false;
94
-      }
95
-      else if (preg_match('/\\.\\./', $domain))
89
+      } else if (preg_match('/\\.\\./', $domain))
96 90
       {
97 91
          // domain part has two consecutive dots
98 92
          $isValid = false;
99
-      }
100
-      else if
93
+      } else if
101 94
 (!preg_match('/^(\\\\.|[A-Za-z0-9!#%&`_=\\/$\'*+?^{}|~.-])+$/',
102 95
                  str_replace("\\\\","",$local)))
103 96
       {
Please login to merge, or discard this patch.
strategies/validation/EE_Many_Valued_Validation_Strategy.strategy.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 	/**
28 28
 	 * Applies all teh individual item validation strategies on each item in the array
29 29
 	 * @param array $normalized_value
30
-	 * @return boolean
30
+	 * @return boolean|null
31 31
 	 */
32 32
 	function validate($normalized_value) {
33 33
 		if( is_array($normalized_value)){
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -11,14 +11,14 @@  discard block
 block discarded – undo
11 11
  * @since 				4.6
12 12
  *
13 13
  */
14
-class EE_Many_Valued_Validation_Strategy extends EE_Validation_Strategy_Base{
14
+class EE_Many_Valued_Validation_Strategy extends EE_Validation_Strategy_Base {
15 15
 	protected $_individual_item_validation_strategies = array();
16 16
 	/**
17 17
 	 *
18 18
 	 * @param EE_Validation_Strategy_Base[] $individual_item_validation_strategies (or a single EE_Validation_Strategy_Base)
19 19
 	 */
20 20
 	public function __construct($individual_item_validation_strategies) {
21
-		if( ! is_array($individual_item_validation_strategies)){
21
+		if ( ! is_array($individual_item_validation_strategies)) {
22 22
 			$individual_item_validation_strategies = array($individual_item_validation_strategies);
23 23
 		}
24 24
 		$this->_individual_item_validation_strategies = $individual_item_validation_strategies;
@@ -30,14 +30,14 @@  discard block
 block discarded – undo
30 30
 	 * @return boolean
31 31
 	 */
32 32
 	function validate($normalized_value) {
33
-		if( is_array($normalized_value)){
33
+		if (is_array($normalized_value)) {
34 34
 			$items_to_validate = $normalized_value;
35
-		}else{
35
+		} else {
36 36
 			$items_to_validate = array($normalized_value);
37 37
 		}
38
-		foreach($items_to_validate as $individual_item){
39
-			foreach($this->_individual_item_validation_strategies as $validation_strategy){
40
-				if ( $validation_strategy instanceof EE_Validation_Strategy_Base ) {
38
+		foreach ($items_to_validate as $individual_item) {
39
+			foreach ($this->_individual_item_validation_strategies as $validation_strategy) {
40
+				if ($validation_strategy instanceof EE_Validation_Strategy_Base) {
41 41
 					$validation_strategy->validate($individual_item);
42 42
 				}
43 43
 			}
@@ -50,8 +50,8 @@  discard block
 block discarded – undo
50 50
 	 */
51 51
 	function _construct_finalize(\EE_Form_Input_Base $form_input) {
52 52
 		parent::_construct_finalize($form_input);
53
-		foreach($this->_individual_item_validation_strategies as $item_validation_strategy){
54
-			if ( $item_validation_strategy instanceof EE_Validation_Strategy_Base ) {
53
+		foreach ($this->_individual_item_validation_strategies as $item_validation_strategy) {
54
+			if ($item_validation_strategy instanceof EE_Validation_Strategy_Base) {
55 55
 				$item_validation_strategy->_construct_finalize($form_input);
56 56
 			}
57 57
 		}
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.
strategies/validation/EE_Text_Validation_Strategy.strategy.php 4 patches
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -10,6 +10,10 @@
 block discarded – undo
10 10
 class EE_Text_Validation_Strategy extends EE_Validation_Strategy_Base{
11 11
 
12 12
 	protected $_regex = null;
13
+
14
+	/**
15
+	 * @param string $regex
16
+	 */
13 17
 	public function __construct( $validation_error_message = NULL, $regex = null ) {
14 18
 		$this->_regex = $regex;
15 19
 		parent::__construct( $validation_error_message );
Please login to merge, or discard this patch.
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
2 2
 /**
3
- * EE_Text_Validation_Strategy
4
- * Optionally, a regular expression can be provided that will be used for validation.
5
- *
6
- * @package			Event Espresso
7
- * @subpackage	Expression package is undefined on line 19, column 19 in Templates/Scripting/PHPClass.php.
8
- * @author				Mike Nelson
9
- */
3
+	 * EE_Text_Validation_Strategy
4
+	 * Optionally, a regular expression can be provided that will be used for validation.
5
+	 *
6
+	 * @package			Event Espresso
7
+	 * @subpackage	Expression package is undefined on line 19, column 19 in Templates/Scripting/PHPClass.php.
8
+	 * @author				Mike Nelson
9
+	 */
10 10
 class EE_Text_Validation_Strategy extends EE_Validation_Strategy_Base{
11 11
 
12 12
 	protected $_regex = null;
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -7,21 +7,21 @@  discard block
 block discarded – undo
7 7
  * @subpackage	Expression package is undefined on line 19, column 19 in Templates/Scripting/PHPClass.php.
8 8
  * @author				Mike Nelson
9 9
  */
10
-class EE_Text_Validation_Strategy extends EE_Validation_Strategy_Base{
10
+class EE_Text_Validation_Strategy extends EE_Validation_Strategy_Base {
11 11
 
12 12
 	protected $_regex = null;
13
-	public function __construct( $validation_error_message = NULL, $regex = null ) {
13
+	public function __construct($validation_error_message = NULL, $regex = null) {
14 14
 		$this->_regex = $regex;
15
-		parent::__construct( $validation_error_message );
15
+		parent::__construct($validation_error_message);
16 16
 	}
17 17
 
18 18
 	/**
19 19
 	 * @param $normalized_value
20 20
 	 */
21 21
 	public function validate($normalized_value) {
22
-		if( $this->_regex && $normalized_value) {
23
-			if( ! preg_match( $this->_regex, $normalized_value ) ) {
24
-				throw new EE_Validation_Error( $this->get_validation_error_message(), 'regex' );
22
+		if ($this->_regex && $normalized_value) {
23
+			if ( ! preg_match($this->_regex, $normalized_value)) {
24
+				throw new EE_Validation_Error($this->get_validation_error_message(), 'regex');
25 25
 			}
26 26
 		}
27 27
 	}
@@ -29,10 +29,10 @@  discard block
 block discarded – undo
29 29
 	/**
30 30
 	 * @return array
31 31
 	 */
32
-	function get_jquery_validation_rule_array(){
33
-		if( $this->_regex !== null ){
34
-			return array( 'regex'=> $this->regex_js(), 'messages' => array( 'regex' => $this->get_validation_error_message() ) );
35
-		}else{
32
+	function get_jquery_validation_rule_array() {
33
+		if ($this->_regex !== null) {
34
+			return array('regex'=> $this->regex_js(), 'messages' => array('regex' => $this->get_validation_error_message()));
35
+		} else {
36 36
 			return array();
37 37
 		}
38 38
 
@@ -46,8 +46,8 @@  discard block
 block discarded – undo
46 46
 	function regex_js() {
47 47
 		//first character must be the delimiter
48 48
 		$delimeter = $this->_regex[0];
49
-		$last_occurence_of_delimieter = strrpos($this->_regex, $delimeter );
50
-		return substr( $this->_regex, 1, $last_occurence_of_delimieter - 1 );
49
+		$last_occurence_of_delimieter = strrpos($this->_regex, $delimeter);
50
+		return substr($this->_regex, 1, $last_occurence_of_delimieter - 1);
51 51
 	}
52 52
 }
53 53
 
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.
form_sections/strategies/validation/EE_URL_Validation_Strategy.strategy.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
 	 * just checks the field isn't blank
27 27
 	 *
28 28
 	 * @param $normalized_value
29
-	 * @return bool
29
+	 * @return boolean|null
30 30
 	 * @throws \EE_Validation_Error
31 31
 	 */
32 32
 	function validate($normalized_value) {
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -8,16 +8,16 @@  discard block
 block discarded – undo
8 8
  * @since 				4.6
9 9
  *
10 10
  */
11
-class EE_URL_Validation_Strategy extends EE_Validation_Strategy_Base{
11
+class EE_URL_Validation_Strategy extends EE_Validation_Strategy_Base {
12 12
 
13 13
 	/**
14 14
 	 * @param null $validation_error_message
15 15
 	 */
16
-	public function __construct( $validation_error_message = NULL ) {
17
-		if( ! $validation_error_message ){
16
+	public function __construct($validation_error_message = NULL) {
17
+		if ( ! $validation_error_message) {
18 18
 			$validation_error_message = __("Please enter a valid URL", "event_espresso");
19 19
 		}
20
-		parent::__construct( $validation_error_message );
20
+		parent::__construct($validation_error_message);
21 21
 	}
22 22
 
23 23
 
@@ -30,17 +30,17 @@  discard block
 block discarded – undo
30 30
 	 * @throws \EE_Validation_Error
31 31
 	 */
32 32
 	function validate($normalized_value) {
33
-		if( $normalized_value ){
34
-			if (filter_var($normalized_value, FILTER_VALIDATE_URL) === false){
35
-				throw new EE_Validation_Error( $this->get_validation_error_message(), 'invalid_url');
36
-			}else{
33
+		if ($normalized_value) {
34
+			if (filter_var($normalized_value, FILTER_VALIDATE_URL) === false) {
35
+				throw new EE_Validation_Error($this->get_validation_error_message(), 'invalid_url');
36
+			} else {
37 37
 				EE_Registry::instance()->load_helper('URL');
38
-				if( ! EEH_URL::remote_file_exists(
38
+				if ( ! EEH_URL::remote_file_exists(
39 39
 						$normalized_value,
40 40
 						array(
41 41
 							'sslverify' => false, 
42
-							'limit_response_size' => 4095,//we don't really care for a full response, but we do want headers at least. Lets just ask for a one block
43
-						))){
42
+							'limit_response_size' => 4095, //we don't really care for a full response, but we do want headers at least. Lets just ask for a one block
43
+						))) {
44 44
 					throw new EE_Validation_Error(sprintf(__("That URL seems to be broken. Please enter a valid URL", "event_espresso")));
45 45
 				}
46 46
 			}
@@ -52,8 +52,8 @@  discard block
 block discarded – undo
52 52
 	/**
53 53
 	 * @return array
54 54
 	 */
55
-	function get_jquery_validation_rule_array(){
56
-		return array( 'validUrl'=>true, 'messages' => array( 'validUrl' => $this->get_validation_error_message() ) );
55
+	function get_jquery_validation_rule_array() {
56
+		return array('validUrl'=>true, 'messages' => array('validUrl' => $this->get_validation_error_message()));
57 57
 	}
58 58
 }
59 59
 
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
 		if( $normalized_value ){
34 34
 			if (filter_var($normalized_value, FILTER_VALIDATE_URL) === false){
35 35
 				throw new EE_Validation_Error( $this->get_validation_error_message(), 'invalid_url');
36
-			}else{
36
+			} else{
37 37
 				EE_Registry::instance()->load_helper('URL');
38 38
 				if( ! EEH_URL::remote_file_exists(
39 39
 						$normalized_value,
Please login to merge, or discard this patch.
line_item_display/EE_Default_Line_Item_Display_Strategy.strategy.php 3 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 	/**
56 56
 	 * @param EE_Line_Item $line_item
57 57
 	 * @param array        $options
58
-	 * @return mixed
58
+	 * @return string
59 59
 	 */
60 60
 	public function display_line_item( EE_Line_Item $line_item, $options = array() ) {
61 61
 
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 	 *
136 136
 	 * @param EE_Line_Item $line_item
137 137
 	 * @param array        $options
138
-	 * @return mixed
138
+	 * @return string
139 139
 	 */
140 140
 	private function _item_row( EE_Line_Item $line_item, $options = array() ) {
141 141
 		// start of row
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 	 *
179 179
 	 * @param EE_Line_Item $line_item
180 180
 	 * @param array        $options
181
-	 * @return mixed
181
+	 * @return string
182 182
 	 */
183 183
 	private function _sub_item_row( EE_Line_Item $line_item, $options = array() ) {
184 184
 		// start of row
Please login to merge, or discard this patch.
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@
 block discarded – undo
1 1
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
2 2
  /**
3
- *
4
- * Class EE_Default_Line_Item_Display_Strategy
5
- *
6
- * Description
7
- *
8
- * @package         Event Espresso
9
- * @subpackage    core
10
- * @author				Brent Christensen
11
- * @since		 	   $VID:$
12
- *
13
- */
3
+  *
4
+  * Class EE_Default_Line_Item_Display_Strategy
5
+  *
6
+  * Description
7
+  *
8
+  * @package         Event Espresso
9
+  * @subpackage    core
10
+  * @author				Brent Christensen
11
+  * @since		 	   $VID:$
12
+  *
13
+  */
14 14
 
15 15
 class EE_Default_Line_Item_Display_Strategy implements EEI_Line_Item_Display {
16 16
 
Please login to merge, or discard this patch.
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -57,32 +57,32 @@  discard block
 block discarded – undo
57 57
 	 * @param array        $options
58 58
 	 * @return mixed
59 59
 	 */
60
-	public function display_line_item( EE_Line_Item $line_item, $options = array() ) {
60
+	public function display_line_item(EE_Line_Item $line_item, $options = array()) {
61 61
 
62
-		EE_Registry::instance()->load_helper( 'Template' );
63
-		EE_Registry::instance()->load_helper( 'HTML' );
62
+		EE_Registry::instance()->load_helper('Template');
63
+		EE_Registry::instance()->load_helper('HTML');
64 64
 
65 65
 		$html = '';
66 66
 		// set some default options and merge with incoming
67 67
 		$default_options = array(
68
-			'show_desc' => TRUE,  // 	TRUE 		FALSE
68
+			'show_desc' => TRUE, // 	TRUE 		FALSE
69 69
 			'odd' => FALSE
70 70
 		);
71
-		$options = array_merge( $default_options, (array)$options );
71
+		$options = array_merge($default_options, (array) $options);
72 72
 
73
-		switch( $line_item->type() ) {
73
+		switch ($line_item->type()) {
74 74
 
75 75
 			case EEM_Line_Item::type_line_item:
76 76
 				// item row
77
-				$html .= $this->_item_row( $line_item, $options );
77
+				$html .= $this->_item_row($line_item, $options);
78 78
 				// got any kids?
79
-				foreach ( $line_item->children() as $child_line_item ) {
80
-					$this->display_line_item( $child_line_item, $options );
79
+				foreach ($line_item->children() as $child_line_item) {
80
+					$this->display_line_item($child_line_item, $options);
81 81
 				}
82 82
 				break;
83 83
 
84 84
 			case EEM_Line_Item::type_sub_line_item:
85
-				$html .= $this->_sub_item_row( $line_item, $options );
85
+				$html .= $this->_sub_item_row($line_item, $options);
86 86
 				break;
87 87
 
88 88
 			case EEM_Line_Item::type_sub_total:
@@ -93,10 +93,10 @@  discard block
 block discarded – undo
93 93
 				break;
94 94
 
95 95
 			case EEM_Line_Item::type_tax_sub_total:
96
-				foreach ( $line_item->children() as $child_line_item ) {
97
-					if ( $child_line_item->type() == EEM_Line_Item::type_tax ) {
96
+				foreach ($line_item->children() as $child_line_item) {
97
+					if ($child_line_item->type() == EEM_Line_Item::type_tax) {
98 98
 						// recursively feed children back into this method
99
-						$this->display_line_item( $child_line_item, $options );
99
+						$this->display_line_item($child_line_item, $options);
100 100
 					}
101 101
 				}
102 102
 				break;
@@ -104,20 +104,20 @@  discard block
 block discarded – undo
104 104
 			case EEM_Line_Item::type_total:
105 105
 				// get all child line items
106 106
 				$children = $line_item->children();
107
-				if ( $options[ 'set_tax_rate' ] === true  ) {
107
+				if ($options['set_tax_rate'] === true) {
108 108
 					// loop thru tax child line items just to determine tax rate
109
-					foreach ( $children as $child_line_item ) {
110
-						if ( $child_line_item->type() == EEM_Line_Item::type_tax_sub_total ) {
109
+					foreach ($children as $child_line_item) {
110
+						if ($child_line_item->type() == EEM_Line_Item::type_tax_sub_total) {
111 111
 							// recursively feed children back into this method
112
-							$this->display_line_item( $child_line_item, $options );
112
+							$this->display_line_item($child_line_item, $options);
113 113
 						}
114 114
 					}
115 115
 				} else {
116 116
 					// now loop thru all non-tax child line items
117
-					foreach ( $children as $child_line_item ) {
118
-						if ( $child_line_item->type() != EEM_Line_Item::type_tax_sub_total ) {
117
+					foreach ($children as $child_line_item) {
118
+						if ($child_line_item->type() != EEM_Line_Item::type_tax_sub_total) {
119 119
 							// recursively feed children back into this method
120
-							$html .= $this->display_line_item( $child_line_item, $options );
120
+							$html .= $this->display_line_item($child_line_item, $options);
121 121
 						}
122 122
 					}
123 123
 				}
@@ -137,10 +137,10 @@  discard block
 block discarded – undo
137 137
 	 * @param array        $options
138 138
 	 * @return mixed
139 139
 	 */
140
-	private function _item_row( EE_Line_Item $line_item, $options = array() ) {
140
+	private function _item_row(EE_Line_Item $line_item, $options = array()) {
141 141
 		// start of row
142 142
 		$row_class = $options['odd'] ? 'item odd' : 'item';
143
-		$html = EEH_HTML::tr( '', '', $row_class );
143
+		$html = EEH_HTML::tr('', '', $row_class);
144 144
 		// name && desc
145 145
 		$name_and_desc = apply_filters(
146 146
 			'FHEE__EE_Default_Line_Item_Display_Strategy__item_row__name',
@@ -149,22 +149,22 @@  discard block
 block discarded – undo
149 149
 		);
150 150
 		$name_and_desc .= apply_filters(
151 151
 			'FHEE__EE_Default_Line_Item_Display_Strategy__item_row__desc',
152
-			( $options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: ' . $line_item->desc() . '</span>' : '' ),
152
+			($options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: '.$line_item->desc().'</span>' : ''),
153 153
 			$line_item,
154 154
 			$options
155 155
 		);
156
-		$name_and_desc .= $line_item->is_taxable() ? '<span class="smaller-text lt-grey-text" style="margin:0 0 0 2em;">' . __( ' * taxable item', 'event_espresso' ) . '</span>' : '';
156
+		$name_and_desc .= $line_item->is_taxable() ? '<span class="smaller-text lt-grey-text" style="margin:0 0 0 2em;">'.__(' * taxable item', 'event_espresso').'</span>' : '';
157 157
 		// name td
158
-		$html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '',  'item_l' );
158
+		$html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l' );
159 159
 		// quantity td
160
-		$html .= EEH_HTML::td( $line_item->quantity(), '',  'item_l jst-rght' );
161
-		$tax_rate = $line_item->is_taxable() ? 1 + ( $this->_tax_rate / 100 ) : 1;
160
+		$html .= EEH_HTML::td($line_item->quantity(), '', 'item_l jst-rght');
161
+		$tax_rate = $line_item->is_taxable() ? 1 + ($this->_tax_rate / 100) : 1;
162 162
 		// price td
163
-		$unit_price = EEH_Template::format_currency( $line_item->unit_price() * $tax_rate, false, false );
164
-		$html .= EEH_HTML::td( $unit_price, '',  'item_c jst-rght' );
163
+		$unit_price = EEH_Template::format_currency($line_item->unit_price() * $tax_rate, false, false);
164
+		$html .= EEH_HTML::td($unit_price, '', 'item_c jst-rght');
165 165
 		// total td
166
-		$total = EEH_Template::format_currency( $line_item->unit_price() * $line_item->quantity() * $tax_rate, false, false );
167
-		$html .= EEH_HTML::td( $total, '',  'item_r jst-rght' );
166
+		$total = EEH_Template::format_currency($line_item->unit_price() * $line_item->quantity() * $tax_rate, false, false);
167
+		$html .= EEH_HTML::td($total, '', 'item_r jst-rght');
168 168
 		// end of row
169 169
 		$html .= EEH_HTML::trx();
170 170
 
@@ -180,22 +180,22 @@  discard block
 block discarded – undo
180 180
 	 * @param array        $options
181 181
 	 * @return mixed
182 182
 	 */
183
-	private function _sub_item_row( EE_Line_Item $line_item, $options = array() ) {
183
+	private function _sub_item_row(EE_Line_Item $line_item, $options = array()) {
184 184
 		// start of row
185
-		$html = EEH_HTML::tr( '', 'item sub-item-row' );
185
+		$html = EEH_HTML::tr('', 'item sub-item-row');
186 186
 		// name && desc
187 187
 		$name_and_desc = $line_item->name();
188
-		$name_and_desc .= $options['show_desc'] ? '<span class="line-sub-item-desc-spn smaller-text">: ' . $line_item->desc() . '</span>' : '';
188
+		$name_and_desc .= $options['show_desc'] ? '<span class="line-sub-item-desc-spn smaller-text">: '.$line_item->desc().'</span>' : '';
189 189
 		// name td
190
-		$html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '',  'item_l sub-item' );
190
+		$html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l sub-item' );
191 191
 		// discount/surcharge td
192
-		if ( $line_item->is_percent() ) {
193
-			$html .= EEH_HTML::td( $line_item->percent() . '%', '',  'item_c' );
192
+		if ($line_item->is_percent()) {
193
+			$html .= EEH_HTML::td($line_item->percent().'%', '', 'item_c');
194 194
 		} else {
195
-			$html .= EEH_HTML::td( $line_item->unit_price_no_code(), '',  'item_c jst-rght' );
195
+			$html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'item_c jst-rght');
196 196
 		}
197 197
 		// total td
198
-		$html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '',  'item_r jst-rght' );
198
+		$html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'item_r jst-rght');
199 199
 		// end of row
200 200
 		$html .= EEH_HTML::trx();
201 201
 		return $html;
Please login to merge, or discard this patch.