Completed
Branch BUG-9518-remove-recommend-wp-v... (799da8)
by
unknown
480:10 queued 465:05
created
core/interfaces/EEI_Repository.interface.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
3
-	exit( 'No direct script access allowed' );
2
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
3
+	exit('No direct script access allowed');
4 4
 }
5 5
 
6 6
 /**
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 	 * @return bool | int
31 31
 	 * @throws \EE_Error
32 32
 	 */
33
-	public function persist( $persistence_callback = '', $persistence_arguments = array() );
33
+	public function persist($persistence_callback = '', $persistence_arguments = array());
34 34
 
35 35
 
36 36
 
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 	 * @param string $persistence_callback name of method found on object that can be used for persisting it
44 44
 	 * @return bool | int
45 45
 	 */
46
-	public function persist_all( $persistence_callback = '' );
46
+	public function persist_all($persistence_callback = '');
47 47
 
48 48
 	}
49 49
 // End of file EEI_Repository.interface.php
Please login to merge, or discard this patch.
core/interfaces/line_items/EEI_Line_Item.interface.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -3,13 +3,13 @@
 block discarded – undo
3 3
 	exit( 'No direct script access allowed' );
4 4
 }
5 5
 /**
6
- * Class EEI_Line_Item
7
- *
8
- * @package 			Event Espresso
9
- * @subpackage 	core
10
- * @author 				Mike Nelson / Brent Christensen
11
- *
12
- */
6
+	 * Class EEI_Line_Item
7
+	 *
8
+	 * @package 			Event Espresso
9
+	 * @subpackage 	core
10
+	 * @author 				Mike Nelson / Brent Christensen
11
+	 *
12
+	 */
13 13
 interface EEI_Line_Item {
14 14
 
15 15
 	/**
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
3
-	exit( 'No direct script access allowed' );
2
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
3
+	exit('No direct script access allowed');
4 4
 }
5 5
 /**
6 6
  * Class EEI_Line_Item
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 	 * @param    mixed  $field_value
19 19
 	 * @param bool      $use_default
20 20
 	 */
21
-	public function set( $field_name, $field_value, $use_default = false );
21
+	public function set($field_name, $field_value, $use_default = false);
22 22
 
23 23
 
24 24
 
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 	 * Sets quantity
57 57
 	 * @param int $quantity
58 58
 	 */
59
-	function set_quantity( $quantity );
59
+	function set_quantity($quantity);
60 60
 
61 61
 
62 62
 
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 	 * @param int $txn_id if none is provided, assumes $this->TXN_ID()
116 116
 	 * @return int count of items saved
117 117
 	 */
118
-	function save_this_and_descendants_to_txn( $txn_id = null );
118
+	function save_this_and_descendants_to_txn($txn_id = null);
119 119
 
120 120
 
121 121
 
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 	 * @param bool         $set_order
143 143
 	 * @return bool true for success, false for fail
144 144
 	 */
145
-	function add_child_line_item( EEI_Line_Item $line_item, $set_order = true );
145
+	function add_child_line_item(EEI_Line_Item $line_item, $set_order = true);
146 146
 
147 147
 
148 148
 
@@ -197,14 +197,14 @@  discard block
 block discarded – undo
197 197
 	 * @param float $total
198 198
 	 * @return boolean
199 199
 	 */
200
-	function set_total( $total );
200
+	function set_total($total);
201 201
 
202 202
 	/**
203 203
 	 * Sets unit_price
204 204
 	 * @param float $unit_price
205 205
 	 * @return boolean
206 206
 	 */
207
-	function set_unit_price( $unit_price );
207
+	function set_unit_price($unit_price);
208 208
 
209 209
 	/**
210 210
 	 * If this line item has been saved to the DB, deletes its child with LIN_code == $code. If this line
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 	 * @param bool $stop_search_once_found
216 216
 	 * @return int count of items deleted (or simply removed from the line item's cache, if not has not been saved to the DB yet)
217 217
 	 */
218
-	function delete_child_line_item( $code, $stop_search_once_found = true );
218
+	function delete_child_line_item($code, $stop_search_once_found = true);
219 219
 
220 220
 	/**
221 221
 	 * Forgets the cached model of the given relation Name. So the next time we request it,
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
 	 * @param boolean $allow_persist
239 239
 	 * @return boolean
240 240
 	 */
241
-	function set_allow_persist( $allow_persist );
241
+	function set_allow_persist($allow_persist);
242 242
 
243 243
 
244 244
 }
Please login to merge, or discard this patch.
core/interfaces/line_items/EEI_Line_Item_Filter.interface.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
3
-	exit( 'No direct script access allowed' );
2
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
3
+	exit('No direct script access allowed');
4 4
 }
5 5
 
6 6
 /**
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 	 * @param \EEI_Line_Item $line_item
27 27
 	 * @return \EEI_Line_Item
28 28
 	 */
29
-	public function process( EEI_Line_Item $line_item );
29
+	public function process(EEI_Line_Item $line_item);
30 30
 
31 31
 
32 32
 
Please login to merge, or discard this patch.
core/libraries/form_sections/EE_Sample_Form.form.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,20 +1,20 @@  discard block
 block discarded – undo
1 1
 <?php
2
-class EE_Sample_Form extends EE_Form_Section_Proper{
3
-	function __construct(){
2
+class EE_Sample_Form extends EE_Form_Section_Proper {
3
+	function __construct() {
4 4
 		$this->_subsections = array(
5 5
 			'h1'=>new EE_Form_Section_HTML('hello wordl'),
6
-			'name'=>new EE_Text_Input(array('required'=>true,'default'=>'your name here')),
6
+			'name'=>new EE_Text_Input(array('required'=>true, 'default'=>'your name here')),
7 7
 			'email'=>new EE_Email_Input(array('required'=>false)),
8
-			'shirt_size'=>new EE_Select_Input(array(''=>'Please select...', 's'=>  __("Small", "event_espresso"),'m'=>  __("Medium", "event_espresso"),'l'=>  __("Large", "event_espresso")),array('required'=>true,'default'=>'s')),
8
+			'shirt_size'=>new EE_Select_Input(array(''=>'Please select...', 's'=>  __("Small", "event_espresso"), 'm'=>  __("Medium", "event_espresso"), 'l'=>  __("Large", "event_espresso")), array('required'=>true, 'default'=>'s')),
9 9
 			'month_normal'=>new EE_Month_Input(),
10 10
 			'month_leading_zero'=>new EE_Month_Input(true),
11 11
 			'year_2'=>new EE_Year_Input(false, 1, 1),
12
-			'year_4'=>new EE_Year_Input(true, 0,10,array('default'=>'2017')),
12
+			'year_4'=>new EE_Year_Input(true, 0, 10, array('default'=>'2017')),
13 13
 			'yes_no'=>new EE_Yes_No_Input(array('html_label_text'=>  __("Yes or No", "event_espresso"))),
14 14
 			'credit_card'=>new EE_Credit_Card_Input(),
15 15
 			'image_1'=>new EE_Admin_File_Uploader_Input(),
16 16
 			'image_2'=>new EE_Admin_File_Uploader_Input(),
17
-			'skillz'=>new EE_Checkbox_Multi_Input(array('php'=>'PHP','mysql'=>'MYSQL'),array('default'=>array('php'))),
17
+			'skillz'=>new EE_Checkbox_Multi_Input(array('php'=>'PHP', 'mysql'=>'MYSQL'), array('default'=>array('php'))),
18 18
 			'float'=>new EE_Float_Input(),
19 19
 			'essay'=>new EE_Text_Area_Input(),
20 20
 			'amenities'=>new EE_Select_Multiple_Input(
@@ -40,16 +40,16 @@  discard block
 block discarded – undo
40 40
 	 * Extra validation for the 'name' input.
41 41
 	 * @param EE_Text_Input $form_input
42 42
 	 */
43
-	function _validate_name($form_input){
44
-		if($form_input->raw_value() != 'Mike'){
43
+	function _validate_name($form_input) {
44
+		if ($form_input->raw_value() != 'Mike') {
45 45
 			$form_input->add_validation_error(__("You are not mike. You must be brent or darren. Thats ok, I guess", 'event_espresso'), 'not-mike');
46 46
 		}
47 47
 	}
48 48
 
49
-	function _validate(){
49
+	function _validate() {
50 50
 		parent::_validate();
51
-		if($this->_subsections['shirt_size']->normalized_value() =='s'
52
-				&& $this->_subsections['year_4']->normalized_value() < 2010){
51
+		if ($this->_subsections['shirt_size']->normalized_value() == 's'
52
+				&& $this->_subsections['year_4']->normalized_value() < 2010) {
53 53
 			$this->add_validation_error(__("If you want a small shirt, you should be born after 2010. Otherwise theyre just too big", 'event_espresso'), 'too-old');
54 54
 		}
55 55
 	}
Please login to merge, or discard this patch.
core/libraries/form_sections/base/EE_Form_Section_HTML.form.php 3 patches
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -2,16 +2,16 @@
 block discarded – undo
2 2
 if (!defined('EVENT_ESPRESSO_VERSION'))
3 3
 	exit('No direct script access allowed');
4 4
 /**
5
- * EE_Form_Section_HTML
6
- * HTML to be laid out like a proper subsection
7
- *
8
- *
9
- * @package			Event Espresso
10
- * @subpackage
11
- * @author				Mike Nelson
12
- *
13
- * ------------------------------------------------------------------------
14
- */
5
+	 * EE_Form_Section_HTML
6
+	 * HTML to be laid out like a proper subsection
7
+	 *
8
+	 *
9
+	 * @package			Event Espresso
10
+	 * @subpackage
11
+	 * @author				Mike Nelson
12
+	 *
13
+	 * ------------------------------------------------------------------------
14
+	 */
15 15
 class EE_Form_Section_HTML extends EE_Form_Section_Base{
16 16
 
17 17
 	protected $_html = '';
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION'))
2
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
3 3
 	exit('No direct script access allowed');
4 4
 /**
5 5
  * EE_Form_Section_HTML
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
  *
13 13
  * ------------------------------------------------------------------------
14 14
  */
15
-class EE_Form_Section_HTML extends EE_Form_Section_Base{
15
+class EE_Form_Section_HTML extends EE_Form_Section_Base {
16 16
 
17 17
 	protected $_html = '';
18 18
 
@@ -22,9 +22,9 @@  discard block
 block discarded – undo
22 22
 	 * @param string $html
23 23
 	 * @param array $options_array
24 24
 	 */
25
-	public function __construct( $html = '', $options_array = array() ) {
25
+	public function __construct($html = '', $options_array = array()) {
26 26
 		$this->_html = $html;
27
-		parent::__construct( $options_array );
27
+		parent::__construct($options_array);
28 28
 	}
29 29
 
30 30
 
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if (!defined('EVENT_ESPRESSO_VERSION')) {
4 4
 	exit('No direct script access allowed');
5
+}
5 6
 /**
6 7
  * Event Espresso
7 8
  *
Please login to merge, or discard this patch.
libraries/form_sections/base/EE_Form_Section_HTML_From_Template.form.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 
6 6
 /**
@@ -25,10 +25,10 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EE_Form_Section_HTML_From_Template extends EE_Form_Section_HTML{
29
-	public function __construct($template_file,$args = array(), $options_array = array()) {
28
+class EE_Form_Section_HTML_From_Template extends EE_Form_Section_HTML {
29
+	public function __construct($template_file, $args = array(), $options_array = array()) {
30 30
 		EE_Registry::instance()->load_helper('Template');
31
-		$html = EEH_Template::locate_template( $template_file, $args );
31
+		$html = EEH_Template::locate_template($template_file, $args);
32 32
 
33 33
 //		echo " filepath:$template_file html $html";
34 34
 		parent::__construct($html, $options_array);
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if (!defined('EVENT_ESPRESSO_VERSION')) {
4 4
 	exit('No direct script access allowed');
5
+}
5 6
 /**
6 7
  * Event Espresso
7 8
  *
Please login to merge, or discard this patch.
core/libraries/form_sections/base/EE_Form_Section_Proper.form.php 4 patches
Braces   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
 			if(isset($default_data[$subsection_name])){
210 210
 				if($subsection instanceof EE_Form_Input_Base){
211 211
 					$subsection->set_default($default_data[$subsection_name]);
212
-				}elseif($subsection instanceof EE_Form_Section_Proper){
212
+				} elseif($subsection instanceof EE_Form_Section_Proper){
213 213
 					$subsection->populate_defaults($default_data[$subsection_name]);
214 214
 				}
215 215
 			}
@@ -440,7 +440,7 @@  discard block
 block discarded – undo
440 440
 		foreach($this->subsections() as $subsection){
441 441
 			if( $subsection instanceof EE_Form_Input_Base ){
442 442
 				$inputs[ $subsection->html_name() ] = $subsection;
443
-			}elseif($subsection instanceof EE_Form_Section_Proper ){
443
+			} elseif($subsection instanceof EE_Form_Section_Proper ){
444 444
 				$inputs += $subsection->inputs_in_subsections();
445 445
 			}
446 446
 		}
@@ -548,7 +548,7 @@  discard block
 block discarded – undo
548 548
 		foreach($this->get_validatable_subsections() as $subsection){
549 549
 			try{
550 550
 				$subsection->_normalize($req_data);
551
-			}catch( EE_Validation_Error $e ){
551
+			} catch( EE_Validation_Error $e ){
552 552
 				$subsection->add_validation_error( $e );
553 553
 			}
554 554
 		}
@@ -866,7 +866,7 @@  discard block
 block discarded – undo
866 866
 	public function html_name_prefix(){
867 867
 		if( $this->parent_section() instanceof EE_Form_Section_Proper ){
868 868
 			return $this->parent_section()->html_name_prefix() . '[' . $this->name() . ']';
869
-		}else{
869
+		} else{
870 870
 			return $this->name();
871 871
 		}
872 872
 	}
@@ -918,7 +918,7 @@  discard block
 block discarded – undo
918 918
 				if( $subsection->form_data_present_in( $req_data ) ) {
919 919
 					return TRUE;
920 920
 				}
921
-			}elseif( $subsection instanceof EE_Form_Section_Proper ) {
921
+			} elseif( $subsection instanceof EE_Form_Section_Proper ) {
922 922
 				if( $subsection->form_data_present_in( $req_data ) ) {
923 923
 					return TRUE;
924 924
 				}
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -225,7 +225,7 @@
 block discarded – undo
225 225
 	 * leave this as TRUE so that the inputs will be properly configured. However,
226 226
 	 * some client code may be ok with construction finalize being called later
227 227
 	 * (realizing that the subsections' html names might not be set yet, etc.)
228
-	 * @return EE_Form_Section_Base
228
+	 * @return EE_Form_Section_Validatable|null
229 229
 	 */
230 230
 	public function get_subsection($name, $require_construction_to_be_finalized = TRUE ){
231 231
 		if( $require_construction_to_be_finalized ){
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
2 2
 /**
3
- * For containing info about a non-field form section, which contains other form sections/fields.
4
- * Relies heavily on the script form_section_validation.js for client-side validation, mostly
5
- * the php code just provides form_section_validation.js with teh variables to use.
6
- * Important: in order for the JS to be loaded properly, you must construct a form section
7
- * before the hook wp_enqueue_scripts is called (so that the form section can enqueue its needed scripts).
8
- * However, you may output the form (usually by calling get_html_and_js) anywhere you like.
9
- */
3
+	 * For containing info about a non-field form section, which contains other form sections/fields.
4
+	 * Relies heavily on the script form_section_validation.js for client-side validation, mostly
5
+	 * the php code just provides form_section_validation.js with teh variables to use.
6
+	 * Important: in order for the JS to be loaded properly, you must construct a form section
7
+	 * before the hook wp_enqueue_scripts is called (so that the form section can enqueue its needed scripts).
8
+	 * However, you may output the form (usually by calling get_html_and_js) anywhere you like.
9
+	 */
10 10
 class EE_Form_Section_Proper extends EE_Form_Section_Validatable{
11 11
 
12 12
 	/**
Please login to merge, or discard this patch.
Spacing   +161 added lines, -161 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
  * before the hook wp_enqueue_scripts is called (so that the form section can enqueue its needed scripts).
8 8
  * However, you may output the form (usually by calling get_html_and_js) anywhere you like.
9 9
  */
10
-class EE_Form_Section_Proper extends EE_Form_Section_Validatable{
10
+class EE_Form_Section_Proper extends EE_Form_Section_Validatable {
11 11
 
12 12
 	/**
13 13
 	 * Subsections
@@ -68,38 +68,38 @@  discard block
 block discarded – undo
68 68
 	 * } @see EE_Form_Section_Validatable::__construct()
69 69
 	 *
70 70
 	 */
71
-	public function __construct( $options_array = array() ){
71
+	public function __construct($options_array = array()) {
72 72
 		EE_Registry::instance()->load_helper('Formatter');
73
-		$options_array = apply_filters( 'FHEE__EE_Form_Section_Proper___construct__options_array', $options_array, $this );
73
+		$options_array = apply_filters('FHEE__EE_Form_Section_Proper___construct__options_array', $options_array, $this);
74 74
 		//call parent first, as it may be setting the name
75 75
 		parent::__construct($options_array);
76 76
 		//if they've included subsections in the constructor, add them now
77
-		if( isset( $options_array['include'] )){
77
+		if (isset($options_array['include'])) {
78 78
 			//we are going to make sure we ONLY have those subsections to include
79 79
 			//AND we are going to make sure they're in that specified order
80 80
 			$reordered_subsections = array();
81
-			foreach($options_array['include'] as $input_name){
82
-				if(isset($this->_subsections[$input_name])){
81
+			foreach ($options_array['include'] as $input_name) {
82
+				if (isset($this->_subsections[$input_name])) {
83 83
 					$reordered_subsections[$input_name] = $this->_subsections[$input_name];
84 84
 				}
85 85
 			}
86 86
 			$this->_subsections = $reordered_subsections;
87 87
 		}
88
-		if(isset($options_array['exclude'])){
88
+		if (isset($options_array['exclude'])) {
89 89
 			$exclude = $options_array['exclude'];
90 90
 			$this->_subsections = array_diff_key($this->_subsections, array_flip($exclude));
91 91
 		}
92
-		if(isset($options_array['layout_strategy'])){
92
+		if (isset($options_array['layout_strategy'])) {
93 93
 			$this->_layout_strategy = $options_array['layout_strategy'];
94 94
 		}
95
-		if( ! $this->_layout_strategy){
95
+		if ( ! $this->_layout_strategy) {
96 96
 			$this->_layout_strategy = new EE_Two_Column_Layout();
97 97
 		}
98 98
 		$this->_layout_strategy->_construct_finalize($this);
99 99
 
100
-		add_action( 'wp_enqueue_scripts', array( 'EE_Form_Section_Proper', 'wp_enqueue_scripts' ));
101
-		add_action( 'admin_enqueue_scripts', array( 'EE_Form_Section_Proper', 'wp_enqueue_scripts' ));
102
-		add_action( 'wp_footer', array( $this, 'ensure_scripts_localized' ), 1 );
100
+		add_action('wp_enqueue_scripts', array('EE_Form_Section_Proper', 'wp_enqueue_scripts'));
101
+		add_action('admin_enqueue_scripts', array('EE_Form_Section_Proper', 'wp_enqueue_scripts'));
102
+		add_action('wp_footer', array($this, 'ensure_scripts_localized'), 1);
103 103
 	}
104 104
 
105 105
 
@@ -111,25 +111,25 @@  discard block
 block discarded – undo
111 111
 	 * @param string                 $name
112 112
 	 * @throws \EE_Error
113 113
 	 */
114
-	public function _construct_finalize( $parent_form_section, $name ) {
114
+	public function _construct_finalize($parent_form_section, $name) {
115 115
 		parent::_construct_finalize($parent_form_section, $name);
116 116
 		$this->_set_default_name_if_empty();
117 117
 		$this->_set_default_html_id_if_empty();
118
-		foreach( $this->_subsections as $subsection_name => $subsection ){
119
-			if ( $subsection instanceof EE_Form_Section_Base ) {
120
-				$subsection->_construct_finalize( $this, $subsection_name );
118
+		foreach ($this->_subsections as $subsection_name => $subsection) {
119
+			if ($subsection instanceof EE_Form_Section_Base) {
120
+				$subsection->_construct_finalize($this, $subsection_name);
121 121
 			} else {
122 122
 				throw new EE_Error(
123 123
 					sprintf(
124
-						__( 'Subsection "%s" is not an instanceof EE_Form_Section_Base on form "%s". It is a "%s"', 'event_espresso' ),
124
+						__('Subsection "%s" is not an instanceof EE_Form_Section_Base on form "%s". It is a "%s"', 'event_espresso'),
125 125
 						$subsection_name,
126 126
 						get_class($this),
127
-						$subsection ? get_class($subsection) : __( 'NULL', 'event_espresso' )
127
+						$subsection ? get_class($subsection) : __('NULL', 'event_espresso')
128 128
 					)
129 129
 				);
130 130
 			}
131 131
 		}
132
-		do_action( 'AHEE__EE_Form_Section_Proper___construct_finalize__end', $this, $parent_form_section, $name );
132
+		do_action('AHEE__EE_Form_Section_Proper___construct_finalize__end', $this, $parent_form_section, $name);
133 133
 	}
134 134
 
135 135
 
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 	 * Gets the layout strategy for this form section
139 139
 	 * @return EE_Form_Section_Layout_Base
140 140
 	 */
141
-	public function get_layout_strategy(){
141
+	public function get_layout_strategy() {
142 142
 		return $this->_layout_strategy;
143 143
 	}
144 144
 
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 	 * @param EE_Form_Input_Base $input
151 151
 	 * @return string
152 152
 	 */
153
-	public function get_html_for_input($input){
153
+	public function get_html_for_input($input) {
154 154
 		return $this->_layout_strategy->layout_input($input);
155 155
 	}
156 156
 
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 	 * @param null $form_data
164 164
 	 * @return boolean
165 165
 	 */
166
-	public function was_submitted($form_data = NULL){
166
+	public function was_submitted($form_data = NULL) {
167 167
 		return $this->form_data_present_in($form_data);
168 168
 	}
169 169
 
@@ -188,16 +188,16 @@  discard block
 block discarded – undo
188 188
 	 *                          (eg you validated the data then stored it in the DB) you may want to skip this step.
189 189
 	 * @return void
190 190
 	 */
191
-	public function receive_form_submission($req_data = NULL, $validate = TRUE){
192
-		$req_data = apply_filters( 'FHEE__EE_Form_Section_Proper__receive_form_submission__req_data', $req_data, $this, $validate );
193
-		if( $req_data === NULL){
194
-			$req_data = array_merge( $_GET, $_POST );
191
+	public function receive_form_submission($req_data = NULL, $validate = TRUE) {
192
+		$req_data = apply_filters('FHEE__EE_Form_Section_Proper__receive_form_submission__req_data', $req_data, $this, $validate);
193
+		if ($req_data === NULL) {
194
+			$req_data = array_merge($_GET, $_POST);
195 195
 		}
196 196
 		$this->_normalize($req_data);
197
-		if( $validate ){
197
+		if ($validate) {
198 198
 			$this->_validate();
199 199
 		}
200
-		do_action( 'AHEE__EE_Form_Section_Proper__receive_form_submission__end', $req_data, $this, $validate );
200
+		do_action('AHEE__EE_Form_Section_Proper__receive_form_submission__end', $req_data, $this, $validate);
201 201
 	}
202 202
 
203 203
 
@@ -210,12 +210,12 @@  discard block
 block discarded – undo
210 210
 	 * the value being an array formatted in teh same way
211 211
 	 * @param array $default_data
212 212
 	 */
213
-	public function populate_defaults($default_data){
214
-		foreach($this->subsections() as $subsection_name => $subsection){
215
-			if(isset($default_data[$subsection_name])){
216
-				if($subsection instanceof EE_Form_Input_Base){
213
+	public function populate_defaults($default_data) {
214
+		foreach ($this->subsections() as $subsection_name => $subsection) {
215
+			if (isset($default_data[$subsection_name])) {
216
+				if ($subsection instanceof EE_Form_Input_Base) {
217 217
 					$subsection->set_default($default_data[$subsection_name]);
218
-				}elseif($subsection instanceof EE_Form_Section_Proper){
218
+				}elseif ($subsection instanceof EE_Form_Section_Proper) {
219 219
 					$subsection->populate_defaults($default_data[$subsection_name]);
220 220
 				}
221 221
 			}
@@ -233,8 +233,8 @@  discard block
 block discarded – undo
233 233
 	 * (realizing that the subsections' html names might not be set yet, etc.)
234 234
 	 * @return EE_Form_Section_Base
235 235
 	 */
236
-	public function get_subsection($name, $require_construction_to_be_finalized = TRUE ){
237
-		if( $require_construction_to_be_finalized ){
236
+	public function get_subsection($name, $require_construction_to_be_finalized = TRUE) {
237
+		if ($require_construction_to_be_finalized) {
238 238
 			$this->ensure_construct_finalized_called();
239 239
 		}
240 240
 		return isset($this->_subsections[$name]) ? $this->_subsections[$name] : NULL;
@@ -246,10 +246,10 @@  discard block
 block discarded – undo
246 246
 	 * Gets all the validatable subsections of this form section
247 247
 	 * @return EE_Form_Section_Validatable[]
248 248
 	 */
249
-	public function get_validatable_subsections(){
249
+	public function get_validatable_subsections() {
250 250
 		$validatable_subsections = array();
251
-		foreach($this->subsections() as $name=>$obj){
252
-			if($obj instanceof EE_Form_Section_Validatable){
251
+		foreach ($this->subsections() as $name=>$obj) {
252
+			if ($obj instanceof EE_Form_Section_Validatable) {
253 253
 				$validatable_subsections[$name] = $obj;
254 254
 			}
255 255
 		}
@@ -269,10 +269,10 @@  discard block
 block discarded – undo
269 269
 	 * @return EE_Form_Input_Base
270 270
 	 * @throws EE_Error
271 271
 	 */
272
-	public function get_input($name, $require_construction_to_be_finalized = TRUE ){
272
+	public function get_input($name, $require_construction_to_be_finalized = TRUE) {
273 273
 		$subsection = $this->get_subsection($name, $require_construction_to_be_finalized);
274
-		if( ! $subsection instanceof EE_Form_Input_Base){
275
-			throw new EE_Error(sprintf(__("Subsection '%s' is not an instanceof EE_Form_Input_Base on form '%s'. It is a '%s'", 'event_espresso'),$name, get_class($this),$subsection ? get_class($subsection) : __("NULL", 'event_espresso')));
274
+		if ( ! $subsection instanceof EE_Form_Input_Base) {
275
+			throw new EE_Error(sprintf(__("Subsection '%s' is not an instanceof EE_Form_Input_Base on form '%s'. It is a '%s'", 'event_espresso'), $name, get_class($this), $subsection ? get_class($subsection) : __("NULL", 'event_espresso')));
276 276
 		}
277 277
 		return $subsection;
278 278
 	}
@@ -290,10 +290,10 @@  discard block
 block discarded – undo
290 290
 	 * @return EE_Form_Section_Proper
291 291
 	 * @throws EE_Error
292 292
 	 */
293
-	public function get_proper_subsection($name, $require_construction_to_be_finalized = TRUE ){
294
-		$subsection = $this->get_subsection( $name, $require_construction_to_be_finalized );
295
-		if( ! $subsection instanceof EE_Form_Section_Proper){
296
-			throw new EE_Error(sprintf(__("Subsection '%'s is not an instanceof EE_Form_Section_Proper on form '%s'", 'event_espresso'),$name, get_class($this)));
293
+	public function get_proper_subsection($name, $require_construction_to_be_finalized = TRUE) {
294
+		$subsection = $this->get_subsection($name, $require_construction_to_be_finalized);
295
+		if ( ! $subsection instanceof EE_Form_Section_Proper) {
296
+			throw new EE_Error(sprintf(__("Subsection '%'s is not an instanceof EE_Form_Section_Proper on form '%s'", 'event_espresso'), $name, get_class($this)));
297 297
 		}
298 298
 		return $subsection;
299 299
 	}
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 	 * @param string $name
307 307
 	 * @return mixed depending on the input's type and its normalization strategy
308 308
 	 */
309
-	public function get_input_value($name){
309
+	public function get_input_value($name) {
310 310
 		$input = $this->get_input($name);
311 311
 		return $input->normalized_value();
312 312
 	}
@@ -319,16 +319,16 @@  discard block
 block discarded – undo
319 319
 	 * @return boolean
320 320
 	 */
321 321
 	public function is_valid() {
322
-		if( ! $this->has_received_submission()){
322
+		if ( ! $this->has_received_submission()) {
323 323
 			throw new EE_Error(sprintf(__("You cannot check if a form is valid before receiving the form submission using receive_form_submission", "event_espresso")));
324 324
 		}
325
-		if( ! parent::is_valid()){
325
+		if ( ! parent::is_valid()) {
326 326
 			return false;
327 327
 		}
328 328
 		//ok so no errors general to this entire form section. so let's check the subsections
329
-		foreach( $this->get_validatable_subsections() as $subsection ){
330
-			if( ! $subsection->is_valid() || $subsection->get_validation_error_string() != '' ){
331
-				$this->set_submission_error_message( $subsection->get_validation_error_string() );
329
+		foreach ($this->get_validatable_subsections() as $subsection) {
330
+			if ( ! $subsection->is_valid() || $subsection->get_validation_error_string() != '') {
331
+				$this->set_submission_error_message($subsection->get_validation_error_string());
332 332
 				return false;
333 333
 			}
334 334
 		}
@@ -341,11 +341,11 @@  discard block
 block discarded – undo
341 341
 	 * gets teh default name of this form section if none is specified
342 342
 	 * @return string
343 343
 	 */
344
-	protected function _set_default_name_if_empty(){
345
-		if( ! $this->_name ){
344
+	protected function _set_default_name_if_empty() {
345
+		if ( ! $this->_name) {
346 346
 			$classname = get_class($this);
347 347
 			$default_name = str_replace("EE_", "", $classname);
348
-			$this->_name =  $default_name;
348
+			$this->_name = $default_name;
349 349
 		}
350 350
 	}
351 351
 
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
 	 * Also returns the HTML for the form, except for the form opening and closing tags
357 357
 	 * (as the form section doesn't know where you necessarily want to send the information to), and except for a submit button.
358 358
 	 */
359
-	public function get_html_and_js(){
359
+	public function get_html_and_js() {
360 360
 		$this->enqueue_js();
361 361
 		return $this->get_html();
362 362
 	}
@@ -367,7 +367,7 @@  discard block
 block discarded – undo
367 367
 	 * returns HTML for displaying this form section. recursively calls display_section() on all subsections
368 368
 	 * @return string
369 369
 	 */
370
-	public function get_html(){
370
+	public function get_html() {
371 371
 		$this->ensure_construct_finalized_called();
372 372
 		return $this->_layout_strategy->layout_form();
373 373
 	}
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
 	 * enqueues JS for the form
379 379
 	 * @return string
380 380
 	 */
381
-	public function enqueue_js(){
381
+	public function enqueue_js() {
382 382
 		$this->_enqueue_and_localize_form_js();
383 383
 	}
384 384
 
@@ -394,10 +394,10 @@  discard block
 block discarded – undo
394 394
 	 * @param boolean $init_form_validation_automatically whether or not we want the form validation to be triggered automatically or not
395 395
 	 * @return void
396 396
 	 */
397
-	public static function wp_enqueue_scripts( $init_form_validation_automatically = false ){
398
-		add_filter( 'FHEE_load_jquery_validate', '__return_true' );
399
-		wp_register_script( 'ee_form_section_validation', EE_GLOBAL_ASSETS_URL . 'scripts' . DS . 'form_section_validation.js', array( 'jquery-validate', 'jquery-ui-datepicker', 'jquery-validate-extra-methods' ), EVENT_ESPRESSO_VERSION, TRUE );
400
-		wp_localize_script( 'ee_form_section_validation', 'ee_form_section_validation_init', array( 'init' => $init_form_validation_automatically ) );
397
+	public static function wp_enqueue_scripts($init_form_validation_automatically = false) {
398
+		add_filter('FHEE_load_jquery_validate', '__return_true');
399
+		wp_register_script('ee_form_section_validation', EE_GLOBAL_ASSETS_URL.'scripts'.DS.'form_section_validation.js', array('jquery-validate', 'jquery-ui-datepicker', 'jquery-validate-extra-methods'), EVENT_ESPRESSO_VERSION, TRUE);
400
+		wp_localize_script('ee_form_section_validation', 'ee_form_section_validation_init', array('init' => $init_form_validation_automatically));
401 401
 	}
402 402
 
403 403
 
@@ -407,14 +407,14 @@  discard block
 block discarded – undo
407 407
 	 * This needs to be called AFTER we've called $this->_enqueue_jquery_validate_script,
408 408
 	 * but before the wordpress hook wp_loaded
409 409
 	 */
410
-	public function _enqueue_and_localize_form_js(){
410
+	public function _enqueue_and_localize_form_js() {
411 411
 		$this->ensure_construct_finalized_called();
412 412
 		//actually, we don't want to localize just yet. There may be other forms on the page.
413 413
 		//so we need to add our form section data to a static variable accessible by all form sections
414 414
 		//and localize it just before the footer
415 415
 		$this->localize_validation_rules();
416
-		add_action( 'wp_footer', array( 'EE_Form_Section_Proper', 'localize_script_for_all_forms' ), 2 );
417
-		add_action( 'admin_footer', array( 'EE_Form_Section_Proper', 'localize_script_for_all_forms' ) );
416
+		add_action('wp_footer', array('EE_Form_Section_Proper', 'localize_script_for_all_forms'), 2);
417
+		add_action('admin_footer', array('EE_Form_Section_Proper', 'localize_script_for_all_forms'));
418 418
 	}
419 419
 
420 420
 
@@ -424,11 +424,11 @@  discard block
 block discarded – undo
424 424
 	 * @param bool $return_for_subsection
425 425
 	 * @return void
426 426
 	 */
427
-	public function localize_validation_rules( $return_for_subsection = FALSE ){
427
+	public function localize_validation_rules($return_for_subsection = FALSE) {
428 428
 		// we only want to localize vars ONCE for the entire form, so if the form section doesn't have a parent, then it must be the top dog
429
-		if ( ! $this->parent_section() || $return_for_subsection ) {
430
-			EE_Form_Section_Proper::$_js_localization['form_data'][ $this->html_id() ] = array(
431
-				'form_section_id'=> $this->html_id( TRUE ),
429
+		if ( ! $this->parent_section() || $return_for_subsection) {
430
+			EE_Form_Section_Proper::$_js_localization['form_data'][$this->html_id()] = array(
431
+				'form_section_id'=> $this->html_id(TRUE),
432 432
 				'validation_rules'=> $this->get_jquery_validation_rules(),
433 433
 				'errors'=> $this->subsection_validation_errors_by_html_name()
434 434
 			);
@@ -443,12 +443,12 @@  discard block
 block discarded – undo
443 443
 	 * Keys are their form names, and values are the inputs themselves
444 444
 	 * @return EE_Form_Input_Base
445 445
 	 */
446
-	public function inputs_in_subsections(){
446
+	public function inputs_in_subsections() {
447 447
 		$inputs = array();
448
-		foreach($this->subsections() as $subsection){
449
-			if( $subsection instanceof EE_Form_Input_Base ){
450
-				$inputs[ $subsection->html_name() ] = $subsection;
451
-			}elseif($subsection instanceof EE_Form_Section_Proper ){
448
+		foreach ($this->subsections() as $subsection) {
449
+			if ($subsection instanceof EE_Form_Input_Base) {
450
+				$inputs[$subsection->html_name()] = $subsection;
451
+			}elseif ($subsection instanceof EE_Form_Section_Proper) {
452 452
 				$inputs += $subsection->inputs_in_subsections();
453 453
 			}
454 454
 		}
@@ -461,12 +461,12 @@  discard block
 block discarded – undo
461 461
 	 * and values are a string of all their validation errors
462 462
 	 * @return string[]
463 463
 	 */
464
-	public function subsection_validation_errors_by_html_name(){
464
+	public function subsection_validation_errors_by_html_name() {
465 465
 		$inputs = $this->inputs();
466 466
 		$errors = array();
467
-		foreach( $inputs as $form_input ){
468
-			if ( $form_input instanceof EE_Form_Input_Base && $form_input->get_validation_errors() ){
469
-				$errors[ $form_input->html_name() ] = $form_input->get_validation_error_string();
467
+		foreach ($inputs as $form_input) {
468
+			if ($form_input instanceof EE_Form_Input_Base && $form_input->get_validation_errors()) {
469
+				$errors[$form_input->html_name()] = $form_input->get_validation_error_string();
470 470
 			}
471 471
 		}
472 472
 		return $errors;
@@ -478,12 +478,12 @@  discard block
 block discarded – undo
478 478
 	 * passes all the form data required by the JS to the JS, and enqueues the few required JS files.
479 479
 	 * Should be setup by each form during the _enqueues_and_localize_form_js
480 480
 	 */
481
-	public static function localize_script_for_all_forms(){
481
+	public static function localize_script_for_all_forms() {
482 482
 		//allow inputs and stuff to hook in their JS and stuff here
483 483
 		do_action('AHEE__EE_Form_Section_Proper__localize_script_for_all_forms__begin');
484 484
 		EE_Form_Section_Proper::$_js_localization['localized_error_messages'] = EE_Form_Section_Proper::_get_localized_error_messages();
485
-		wp_enqueue_script( 'ee_form_section_validation' );
486
-		wp_localize_script( 'ee_form_section_validation', 'ee_form_section_vars', EE_Form_Section_Proper::$_js_localization );
485
+		wp_enqueue_script('ee_form_section_validation');
486
+		wp_localize_script('ee_form_section_validation', 'ee_form_section_vars', EE_Form_Section_Proper::$_js_localization);
487 487
 	}
488 488
 
489 489
 
@@ -491,8 +491,8 @@  discard block
 block discarded – undo
491 491
 	/**
492 492
 	 * ensure_scripts_localized
493 493
 	 */
494
-	public function ensure_scripts_localized(){
495
-		if ( ! EE_Form_Section_Proper::$_scripts_localized ) {
494
+	public function ensure_scripts_localized() {
495
+		if ( ! EE_Form_Section_Proper::$_scripts_localized) {
496 496
 			$this->_enqueue_and_localize_form_js();
497 497
 		}
498 498
 	}
@@ -504,10 +504,10 @@  discard block
 block discarded – undo
504 504
 	 * is that the key here should be the same as the custom validation rule put in the JS file
505 505
 	 * @return array keys are custom validation rules, and values are internationalized strings
506 506
 	 */
507
-	private static function _get_localized_error_messages(){
507
+	private static function _get_localized_error_messages() {
508 508
 		return array(
509 509
 			'validUrl'=>  __("This is not a valid absolute URL. Eg, http://domain.com/monkey.jpg", "event_espresso"),
510
-			'regex' => __( 'Please check your input', 'event_espresso' ),
510
+			'regex' => __('Please check your input', 'event_espresso'),
511 511
 		);
512 512
 	}
513 513
 
@@ -535,10 +535,10 @@  discard block
 block discarded – undo
535 535
 	 * Gets the JS to put inside the jquery validation rules for subsection of this form section. See parent function for more...
536 536
 	 * @return array
537 537
 	 */
538
-	function get_jquery_validation_rules(){
538
+	function get_jquery_validation_rules() {
539 539
 		$jquery_validation_rules = array();
540
-		foreach($this->get_validatable_subsections() as $subsection){
541
-			$jquery_validation_rules = array_merge( $jquery_validation_rules,  $subsection->get_jquery_validation_rules() );
540
+		foreach ($this->get_validatable_subsections() as $subsection) {
541
+			$jquery_validation_rules = array_merge($jquery_validation_rules, $subsection->get_jquery_validation_rules());
542 542
 		}
543 543
 		return $jquery_validation_rules;
544 544
 	}
@@ -553,11 +553,11 @@  discard block
 block discarded – undo
553 553
 	protected function _normalize($req_data) {
554 554
 		$this->_received_submission = TRUE;
555 555
 		$this->_validation_errors = array();
556
-		foreach($this->get_validatable_subsections() as $subsection){
557
-			try{
556
+		foreach ($this->get_validatable_subsections() as $subsection) {
557
+			try {
558 558
 				$subsection->_normalize($req_data);
559
-			}catch( EE_Validation_Error $e ){
560
-				$subsection->add_validation_error( $e );
559
+			} catch (EE_Validation_Error $e) {
560
+				$subsection->add_validation_error($e);
561 561
 			}
562 562
 		}
563 563
 	}
@@ -571,9 +571,9 @@  discard block
 block discarded – undo
571 571
 	 * calling parent::_validate() first.
572 572
 	 */
573 573
 	protected function _validate() {
574
-		foreach($this->get_validatable_subsections() as $subsection_name => $subsection){
575
-			if(method_exists($this,'_validate_'.$subsection_name)){
576
-				call_user_func_array(array($this,'_validate_'.$subsection_name), array($subsection));
574
+		foreach ($this->get_validatable_subsections() as $subsection_name => $subsection) {
575
+			if (method_exists($this, '_validate_'.$subsection_name)) {
576
+				call_user_func_array(array($this, '_validate_'.$subsection_name), array($subsection));
577 577
 			}
578 578
 			$subsection->_validate();
579 579
 		}
@@ -585,13 +585,13 @@  discard block
 block discarded – undo
585 585
 	 * Gets all the validated inputs for the form section
586 586
 	 * @return array
587 587
 	 */
588
-	public function valid_data(){
588
+	public function valid_data() {
589 589
 		$inputs = array();
590
-		foreach( $this->subsections() as $subsection_name =>$subsection ){
591
-			if ( $subsection instanceof EE_Form_Section_Proper ) {
592
-				$inputs[ $subsection_name ] = $subsection->valid_data();
593
-			} else if ( $subsection instanceof EE_Form_Input_Base ){
594
-				$inputs[ $subsection_name ] = $subsection->normalized_value();
590
+		foreach ($this->subsections() as $subsection_name =>$subsection) {
591
+			if ($subsection instanceof EE_Form_Section_Proper) {
592
+				$inputs[$subsection_name] = $subsection->valid_data();
593
+			} else if ($subsection instanceof EE_Form_Input_Base) {
594
+				$inputs[$subsection_name] = $subsection->normalized_value();
595 595
 			}
596 596
 		}
597 597
 		return $inputs;
@@ -603,11 +603,11 @@  discard block
 block discarded – undo
603 603
 	 * Gets all the inputs on this form section
604 604
 	 * @return EE_Form_Input_Base[]
605 605
 	 */
606
-	public function inputs(){
606
+	public function inputs() {
607 607
 		$inputs = array();
608
-		foreach( $this->subsections() as $subsection_name =>$subsection ){
609
-			if ( $subsection instanceof EE_Form_Input_Base ){
610
-				$inputs[ $subsection_name ] = $subsection;
608
+		foreach ($this->subsections() as $subsection_name =>$subsection) {
609
+			if ($subsection instanceof EE_Form_Input_Base) {
610
+				$inputs[$subsection_name] = $subsection;
611 611
 			}
612 612
 		}
613 613
 		return $inputs;
@@ -619,10 +619,10 @@  discard block
 block discarded – undo
619 619
 	 * Gets all the subsections which are a proper form
620 620
 	 * @return EE_Form_Section_Proper[]
621 621
 	 */
622
-	public function subforms(){
622
+	public function subforms() {
623 623
 		$form_sections = array();
624
-		foreach($this->subsections() as $name=>$obj){
625
-			if($obj instanceof EE_Form_Section_Proper){
624
+		foreach ($this->subsections() as $name=>$obj) {
625
+			if ($obj instanceof EE_Form_Section_Proper) {
626 626
 				$form_sections[$name] = $obj;
627 627
 			}
628 628
 		}
@@ -637,7 +637,7 @@  discard block
 block discarded – undo
637 637
 	 * if you only want form inputs or proper form sections.
638 638
 	 * @return EE_Form_Section_Proper[]
639 639
 	 */
640
-	public function subsections(){
640
+	public function subsections() {
641 641
 		$this->ensure_construct_finalized_called();
642 642
 		return $this->_subsections;
643 643
 	}
@@ -655,8 +655,8 @@  discard block
 block discarded – undo
655 655
 	 * it can be a multidimensional array where keys are always subsection names and values are either the
656 656
 	 * input's normalized value, or an array like the top-level array
657 657
 	 */
658
-	public function input_values( $include_subform_inputs = false, $flatten = false ){
659
-		return $this->_input_values( false, $include_subform_inputs, $flatten );
658
+	public function input_values($include_subform_inputs = false, $flatten = false) {
659
+		return $this->_input_values(false, $include_subform_inputs, $flatten);
660 660
 	}
661 661
 
662 662
 	/**
@@ -672,8 +672,8 @@  discard block
 block discarded – undo
672 672
 	 * it can be a multidimensional array where keys are always subsection names and values are either the
673 673
 	 * input's normalized value, or an array like the top-level array
674 674
 	 */
675
-	public function input_pretty_values(  $include_subform_inputs = false, $flatten = false ){
676
-		return $this->_input_values( true, $include_subform_inputs, $flatten );
675
+	public function input_pretty_values($include_subform_inputs = false, $flatten = false) {
676
+		return $this->_input_values(true, $include_subform_inputs, $flatten);
677 677
 	}
678 678
 
679 679
 	/**
@@ -686,17 +686,17 @@  discard block
 block discarded – undo
686 686
 	 * it can be a multidimensional array where keys are always subsection names and values are either the
687 687
 	 * input's normalized value, or an array like the top-level array
688 688
 	 */
689
-	public function _input_values( $pretty = false, $include_subform_inputs = false, $flatten = false ) {
689
+	public function _input_values($pretty = false, $include_subform_inputs = false, $flatten = false) {
690 690
 		$input_values = array();
691
-		foreach( $this->subsections() as $subsection_name => $subsection ) {
692
-			if( $subsection instanceof EE_Form_Input_Base ) {
693
-				$input_values[ $subsection_name ] = $pretty ? $subsection->pretty_value() : $subsection->normalized_value();
694
-			} else if( $subsection instanceof EE_Form_Section_Proper && $include_subform_inputs ) {
695
-				$subform_input_values = $subsection->_input_values( $pretty, $include_subform_inputs, $flatten );
696
-				if( $flatten ) {
697
-					$input_values = array_merge( $input_values, $subform_input_values );
691
+		foreach ($this->subsections() as $subsection_name => $subsection) {
692
+			if ($subsection instanceof EE_Form_Input_Base) {
693
+				$input_values[$subsection_name] = $pretty ? $subsection->pretty_value() : $subsection->normalized_value();
694
+			} else if ($subsection instanceof EE_Form_Section_Proper && $include_subform_inputs) {
695
+				$subform_input_values = $subsection->_input_values($pretty, $include_subform_inputs, $flatten);
696
+				if ($flatten) {
697
+					$input_values = array_merge($input_values, $subform_input_values);
698 698
 				} else {
699
-					$input_values[ $subsection_name ] = $subform_input_values;
699
+					$input_values[$subsection_name] = $subform_input_values;
700 700
 				}
701 701
 			}
702 702
 		}
@@ -710,7 +710,7 @@  discard block
 block discarded – undo
710 710
 	 * (ie, had receive_form_submission called on it yet)
711 711
 	 * @return boolean
712 712
 	 */
713
-	public function has_received_submission(){
713
+	public function has_received_submission() {
714 714
 		$this->ensure_construct_finalized_called();
715 715
 		return $this->_received_submission;
716 716
 	}
@@ -723,8 +723,8 @@  discard block
 block discarded – undo
723 723
 	 * @param array $inputs_to_exclude values are the input names
724 724
 	 * @return void
725 725
 	 */
726
-	public function exclude($inputs_to_exclude = array()){
727
-		foreach($inputs_to_exclude as $input_to_exclude_name){
726
+	public function exclude($inputs_to_exclude = array()) {
727
+		foreach ($inputs_to_exclude as $input_to_exclude_name) {
728 728
 			unset($this->_subsections[$input_to_exclude_name]);
729 729
 		}
730 730
 	}
@@ -734,8 +734,8 @@  discard block
 block discarded – undo
734 734
 	/**
735 735
 	 * @param array $inputs_to_hide
736 736
 	 */
737
-	public function hide($inputs_to_hide= array()){
738
-		foreach($inputs_to_hide as $input_to_hide){
737
+	public function hide($inputs_to_hide = array()) {
738
+		foreach ($inputs_to_hide as $input_to_hide) {
739 739
 			$input = $this->get_input($input_to_hide);
740 740
 
741 741
 			$input->set_display_strategy(new EE_Hidden_Display_Strategy());
@@ -760,13 +760,13 @@  discard block
 block discarded – undo
760 760
 	 * 																								or if $subsection_name_to_target is null, before or after entire subsections array
761 761
 	 * @return void
762 762
 	 */
763
-	public function add_subsections( $new_subsections, $subsection_name_to_target = NULL, $add_before = true ){
764
-		foreach($new_subsections as $subsection_name => $subsection){
765
-			if( ! $subsection instanceof EE_Form_Section_Base){
763
+	public function add_subsections($new_subsections, $subsection_name_to_target = NULL, $add_before = true) {
764
+		foreach ($new_subsections as $subsection_name => $subsection) {
765
+			if ( ! $subsection instanceof EE_Form_Section_Base) {
766 766
 				EE_Error::add_error(
767 767
 					sprintf(
768 768
 						__("Trying to add a %s as a subsection (it was named '%s') to the form section '%s'. It was removed.", "event_espresso"),
769
-						get_class( $subsection ),
769
+						get_class($subsection),
770 770
 						$subsection_name,
771 771
 						$this->name()
772 772
 					)
@@ -775,8 +775,8 @@  discard block
 block discarded – undo
775 775
 			}
776 776
 		}
777 777
 
778
-		EE_Registry::instance()->load_helper( 'Array' );
779
-		$this->_subsections = EEH_Array::insert_into_array( $this->_subsections, $new_subsections, $subsection_name_to_target, $add_before );
778
+		EE_Registry::instance()->load_helper('Array');
779
+		$this->_subsections = EEH_Array::insert_into_array($this->_subsections, $new_subsections, $subsection_name_to_target, $add_before);
780 780
 
781 781
 		/*$subsections_before = array();
782 782
 		if( $subsection_name_to_target ){
@@ -807,8 +807,8 @@  discard block
 block discarded – undo
807 807
 				$this->_subsections = $new_subsections;
808 808
 			}
809 809
 		}*/
810
-		if( $this->_construction_finalized ){
811
-			foreach($this->_subsections as $name => $subsection){
810
+		if ($this->_construction_finalized) {
811
+			foreach ($this->_subsections as $name => $subsection) {
812 812
 				$subsection->_construct_finalize($this, $name);
813 813
 			}
814 814
 		}
@@ -819,8 +819,8 @@  discard block
 block discarded – undo
819 819
 	/**
820 820
 	 * Just gets all validatable subsections to clean their sensitive data
821 821
 	 */
822
-	public function clean_sensitive_data(){
823
-		foreach($this->get_validatable_subsections() as $subsection){
822
+	public function clean_sensitive_data() {
823
+		foreach ($this->get_validatable_subsections() as $subsection) {
824 824
 			$subsection->clean_sensitive_data();
825 825
 		}
826 826
 	}
@@ -830,8 +830,8 @@  discard block
 block discarded – undo
830 830
 	/**
831 831
 	 * @param string $form_submission_error_message
832 832
 	 */
833
-	public function set_submission_error_message( $form_submission_error_message = '' ) {
834
-		$this->_form_submission_error_message .= ! empty( $form_submission_error_message ) ? $form_submission_error_message : __( 'Form submission failed due to errors', 'event_espresso' );
833
+	public function set_submission_error_message($form_submission_error_message = '') {
834
+		$this->_form_submission_error_message .= ! empty($form_submission_error_message) ? $form_submission_error_message : __('Form submission failed due to errors', 'event_espresso');
835 835
 	}
836 836
 
837 837
 
@@ -848,8 +848,8 @@  discard block
 block discarded – undo
848 848
 	/**
849 849
 	 * @param string $form_submission_success_message
850 850
 	 */
851
-	public function set_submission_success_message( $form_submission_success_message ) {
852
-		$this->_form_submission_success_message .= ! empty( $form_submission_success_message ) ? $form_submission_success_message : __( 'Form submitted successfully', 'event_espresso' );
851
+	public function set_submission_success_message($form_submission_success_message) {
852
+		$this->_form_submission_success_message .= ! empty($form_submission_success_message) ? $form_submission_success_message : __('Form submitted successfully', 'event_espresso');
853 853
 	}
854 854
 
855 855
 
@@ -871,10 +871,10 @@  discard block
 block discarded – undo
871 871
 	 * EE_Form_Input_Base::_set_default_html_name_if_empty
872 872
 	 * @return string
873 873
 	 */
874
-	public function html_name_prefix(){
875
-		if( $this->parent_section() instanceof EE_Form_Section_Proper ){
876
-			return $this->parent_section()->html_name_prefix() . '[' . $this->name() . ']';
877
-		}else{
874
+	public function html_name_prefix() {
875
+		if ($this->parent_section() instanceof EE_Form_Section_Proper) {
876
+			return $this->parent_section()->html_name_prefix().'['.$this->name().']';
877
+		} else {
878 878
 			return $this->name();
879 879
 		}
880 880
 	}
@@ -885,7 +885,7 @@  discard block
 block discarded – undo
885 885
 	 * was set, which is probably nothing, or the classname)
886 886
 	 * @return string
887 887
 	 */
888
-	public function name(){
888
+	public function name() {
889 889
 		$this->ensure_construct_finalized_called();
890 890
 		return parent::name();
891 891
 	}
@@ -894,7 +894,7 @@  discard block
 block discarded – undo
894 894
 	 *
895 895
 	 * @return EE_Form_Section_Proper
896 896
 	 */
897
-	public function parent_section(){
897
+	public function parent_section() {
898 898
 		$this->ensure_construct_finalized_called();
899 899
 		return parent::parent_section();
900 900
 	}
@@ -903,9 +903,9 @@  discard block
 block discarded – undo
903 903
 	 * make sure construction finalized was called, otherwise children might not be ready
904 904
 	 * @return void
905 905
 	 */
906
-	public function ensure_construct_finalized_called(){
907
-		if( ! $this->_construction_finalized ){
908
-			$this->_construct_finalize($this->_parent_section, $this->_name );
906
+	public function ensure_construct_finalized_called() {
907
+		if ( ! $this->_construction_finalized) {
908
+			$this->_construct_finalize($this->_parent_section, $this->_name);
909 909
 		}
910 910
 	}
911 911
 
@@ -917,17 +917,17 @@  discard block
 block discarded – undo
917 917
 	 * @param array $req_data
918 918
 	 * @return boolean
919 919
 	 */
920
-	public function form_data_present_in( $req_data = NULL ) {
921
-		if( $req_data === NULL){
920
+	public function form_data_present_in($req_data = NULL) {
921
+		if ($req_data === NULL) {
922 922
 			$req_data = $_POST;
923 923
 		}
924
-		foreach( $this->subsections() as $subsection ) {
925
-			if($subsection instanceof EE_Form_Input_Base ) {
926
-				if( $subsection->form_data_present_in( $req_data ) ) {
924
+		foreach ($this->subsections() as $subsection) {
925
+			if ($subsection instanceof EE_Form_Input_Base) {
926
+				if ($subsection->form_data_present_in($req_data)) {
927 927
 					return TRUE;
928 928
 				}
929
-			}elseif( $subsection instanceof EE_Form_Section_Proper ) {
930
-				if( $subsection->form_data_present_in( $req_data ) ) {
929
+			}elseif ($subsection instanceof EE_Form_Section_Proper) {
930
+				if ($subsection->form_data_present_in($req_data)) {
931 931
 					return TRUE;
932 932
 				}
933 933
 			}
@@ -944,14 +944,14 @@  discard block
 block discarded – undo
944 944
 	 */
945 945
 	public function get_validation_errors_accumulated() {
946 946
 		$validation_errors = $this->get_validation_errors();
947
-		foreach($this->get_validatable_subsections() as $subsection ) {
948
-			if( $subsection instanceof EE_Form_Section_Proper ) {
947
+		foreach ($this->get_validatable_subsections() as $subsection) {
948
+			if ($subsection instanceof EE_Form_Section_Proper) {
949 949
 				$validation_errors_on_this_subsection = $subsection->get_validation_errors_accumulated();
950 950
 			} else {
951
-				$validation_errors_on_this_subsection =  $subsection->get_validation_errors();
951
+				$validation_errors_on_this_subsection = $subsection->get_validation_errors();
952 952
 			}
953
-			if( $validation_errors_on_this_subsection ){
954
-				$validation_errors = array_merge( $validation_errors, $validation_errors_on_this_subsection );
953
+			if ($validation_errors_on_this_subsection) {
954
+				$validation_errors = array_merge($validation_errors, $validation_errors_on_this_subsection);
955 955
 			}
956 956
 		}
957 957
 		return $validation_errors;
Please login to merge, or discard this patch.
core/libraries/form_sections/base/EE_Form_Section_Validatable.form.php 2 patches
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION'))
2
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
3 3
 	exit('No direct script access allowed');
4 4
 
5 5
 /**
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
  *
35 35
  * ------------------------------------------------------------------------
36 36
  */
37
-abstract class EE_Form_Section_Validatable extends EE_Form_Section_Base{
37
+abstract class EE_Form_Section_Validatable extends EE_Form_Section_Base {
38 38
 
39 39
 	/**
40 40
 	 * Array of validation errors in this section. Does not contain validation errors in subsections, however.
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 	 * called get_validation_errors_accumulated
50 50
 	 * @return EE_Validation_Error[]
51 51
 	 */
52
-	public function get_validation_errors(){
52
+	public function get_validation_errors() {
53 53
 		return $this->_validation_errors;
54 54
 	}
55 55
 	/**
@@ -57,16 +57,16 @@  discard block
 block discarded – undo
57 57
 	 * If we want this to be customizable, we may decide to create a strategy for displaying it.
58 58
 	 * @return string
59 59
 	 */
60
-	public function get_validation_error_string(){
60
+	public function get_validation_error_string() {
61 61
 		$validation_error_messages = array();
62
-		if($this->get_validation_errors()){
63
-			foreach($this->get_validation_errors() as $validation_error){
64
-				if ( $validation_error instanceof EE_Validation_Error ) {
65
-					$validation_error_messages[] =$validation_error->getMessage();
62
+		if ($this->get_validation_errors()) {
63
+			foreach ($this->get_validation_errors() as $validation_error) {
64
+				if ($validation_error instanceof EE_Validation_Error) {
65
+					$validation_error_messages[] = $validation_error->getMessage();
66 66
 				}
67 67
 			}
68 68
 		}
69
-		return implode(", ",$validation_error_messages);
69
+		return implode(", ", $validation_error_messages);
70 70
 	}
71 71
 
72 72
 
@@ -82,9 +82,9 @@  discard block
 block discarded – undo
82 82
 	 * @return boolean
83 83
 	 */
84 84
 	public function is_valid() {
85
-		if(count($this->_validation_errors)){
85
+		if (count($this->_validation_errors)) {
86 86
 			return false;
87
-		}else{
87
+		} else {
88 88
 			return true;
89 89
 		}
90 90
 	}
@@ -109,11 +109,11 @@  discard block
 block discarded – undo
109 109
 	 * @param Exception $previous_exception if there was an exception that caused the error, that exception
110 110
 	 * @return void
111 111
 	 */
112
-	function add_validation_error( $message_or_object, $error_code = NULL, $previous_exception = NULL ){
113
-		if($message_or_object instanceof EE_Validation_Error){
114
-			$validation_error= $message_or_object;
112
+	function add_validation_error($message_or_object, $error_code = NULL, $previous_exception = NULL) {
113
+		if ($message_or_object instanceof EE_Validation_Error) {
114
+			$validation_error = $message_or_object;
115 115
 			$validation_error->set_form_section($this);
116
-		}else{
116
+		} else {
117 117
 			$validation_error = new EE_Validation_Error($message_or_object, $error_code, $this, $previous_exception);
118 118
 		}
119 119
 		$this->_validation_errors[] = $validation_error;
Please login to merge, or discard this patch.
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION'))
2
+if (!defined('EVENT_ESPRESSO_VERSION')) {
3 3
 	exit('No direct script access allowed');
4
+}
4 5
 
5 6
 /**
6 7
  * Event Espresso
@@ -84,7 +85,7 @@  discard block
 block discarded – undo
84 85
 	public function is_valid() {
85 86
 		if(count($this->_validation_errors)){
86 87
 			return false;
87
-		}else{
88
+		} else{
88 89
 			return true;
89 90
 		}
90 91
 	}
@@ -113,7 +114,7 @@  discard block
 block discarded – undo
113 114
 		if($message_or_object instanceof EE_Validation_Error){
114 115
 			$validation_error= $message_or_object;
115 116
 			$validation_error->set_form_section($this);
116
-		}else{
117
+		} else{
117 118
 			$validation_error = new EE_Validation_Error($message_or_object, $error_code, $this, $previous_exception);
118 119
 		}
119 120
 		$this->_validation_errors[] = $validation_error;
Please login to merge, or discard this patch.
core/libraries/form_sections/helpers/EE_Validation_Error.error.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-class EE_Validation_Error extends Exception{
3
+class EE_Validation_Error extends Exception {
4 4
 	/**
5 5
 	 * Form Section from which this error originated.
6 6
 	 * @var EE_Form_Section
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 	 * @param EE_Form_Section_Validatable $form_section
21 21
 	 * @param Exception $previous if there was an exception that caused this exception
22 22
 	 */
23
-	function __construct( $message = null, $string_code = null,$form_section = null, $previous = null){
23
+	function __construct($message = null, $string_code = null, $form_section = null, $previous = null) {
24 24
 		$this->_form_section = $form_section;
25 25
 		$this->_string_code = $string_code;
26 26
 		parent::__construct($message, 500, $previous);
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 	 * returns teh form section which caused the error.
31 31
 	 * @return EE_Form_Section_Validatable
32 32
 	 */
33
-	public function get_form_section(){
33
+	public function get_form_section() {
34 34
 		return $this->_form_section;
35 35
 	}
36 36
 	/**
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 	 * @param EE_Form_Section_Validatable $form_section
39 39
 	 * @return void
40 40
 	 */
41
-	public function set_form_section($form_section){
41
+	public function set_form_section($form_section) {
42 42
 		$this->_form_section = $form_section;
43 43
 	}
44 44
 
Please login to merge, or discard this patch.