Completed
Branch BUG-10375-migrations-not-repor... (316a48)
by
unknown
157:38 queued 144:46
created
libraries/form_sections/inputs/EE_Form_Input_With_Options_Base.input.php 2 patches
Spacing   +75 added lines, -75 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_Form_Input_With_Options_Base extends EE_Form_Input_Base{
10
+class EE_Form_Input_With_Options_Base extends EE_Form_Input_Base {
11 11
 
12 12
 	/**
13 13
 	 * array of available options to choose as an answer
@@ -53,18 +53,18 @@  discard block
 block discarded – undo
53 53
 	 * @param array $answer_options
54 54
 	 * @param array $input_settings
55 55
 	 */
56
-	public function __construct( $answer_options = array(), $input_settings = array() ) {
57
-		if ( isset( $input_settings['label_size'] )) {
58
-			$this->_set_label_size( $input_settings['label_size'] );
59
-			if ( isset( $input_settings['enforce_label_size'] ) && $input_settings['enforce_label_size'] ) {
56
+	public function __construct($answer_options = array(), $input_settings = array()) {
57
+		if (isset($input_settings['label_size'])) {
58
+			$this->_set_label_size($input_settings['label_size']);
59
+			if (isset($input_settings['enforce_label_size']) && $input_settings['enforce_label_size']) {
60 60
 				$this->_enforce_label_size = TRUE;
61 61
 			}
62 62
 		}
63
-		if ( isset( $input_settings['display_html_label_text'] )) {
64
-			$this->set_display_html_label_text( $input_settings['display_html_label_text'] );
63
+		if (isset($input_settings['display_html_label_text'])) {
64
+			$this->set_display_html_label_text($input_settings['display_html_label_text']);
65 65
 		}
66
-		$this->set_select_options( $answer_options );
67
-		parent::__construct( $input_settings );
66
+		$this->set_select_options($answer_options);
67
+		parent::__construct($input_settings);
68 68
 	}
69 69
 
70 70
 
@@ -75,47 +75,47 @@  discard block
 block discarded – undo
75 75
 	 * @param array $answer_options
76 76
 	 * @return void  just has the side-effect of setting the options for this input
77 77
 	 */
78
-	public function set_select_options( $answer_options = array() ){
79
-		$answer_options = is_array( $answer_options ) ? $answer_options : array( $answer_options );
78
+	public function set_select_options($answer_options = array()) {
79
+		$answer_options = is_array($answer_options) ? $answer_options : array($answer_options);
80 80
 		//get the first item in the select options and check it's type
81
-		if ( reset( $answer_options ) instanceof EE_Question_Option ) {
82
-			$this->_options = $this->_process_question_options( $answer_options );
81
+		if (reset($answer_options) instanceof EE_Question_Option) {
82
+			$this->_options = $this->_process_question_options($answer_options);
83 83
 		} else {
84 84
 			$this->_options = $answer_options;
85 85
 		}
86 86
 		//d( $this->_options );
87
-		$select_option_keys = array_keys( $this->_options );
87
+		$select_option_keys = array_keys($this->_options);
88 88
 		// attempt to determine data type for values in order to set normalization type
89 89
 		if (
90
-			count( $this->_options ) == 2
90
+			count($this->_options) == 2
91 91
 			&&
92 92
 			(
93
-				( in_array( TRUE, $select_option_keys, true ) && in_array( FALSE, $select_option_keys, true ))
94
-				|| ( in_array( 1, $select_option_keys, true ) && in_array( 0, $select_option_keys, true ))
93
+				(in_array(TRUE, $select_option_keys, true) && in_array(FALSE, $select_option_keys, true))
94
+				|| (in_array(1, $select_option_keys, true) && in_array(0, $select_option_keys, true))
95 95
 			)
96
-		){
96
+		) {
97 97
 			// values appear to be boolean, like TRUE, FALSE, 1, 0
98 98
 			$normalization = new EE_Boolean_Normalization();
99
-		} else{
99
+		} else {
100 100
 			//are ALL the options ints? If so use int validation
101 101
 			$all_ints = true;
102
-			foreach($select_option_keys as $value ){
103
-				if( ! is_int( $value ) ){
102
+			foreach ($select_option_keys as $value) {
103
+				if ( ! is_int($value)) {
104 104
 					$all_ints = false;
105 105
 					break;
106 106
 				}
107 107
 			}
108
-			if( $all_ints ){
108
+			if ($all_ints) {
109 109
 				$normalization = new EE_Int_Normalization();
110
-			}else{
110
+			} else {
111 111
 				$normalization = new EE_Text_Normalization();
112 112
 			}
113 113
 		}
114 114
 		// does input type have multiple options ?
115
-		if ( $this->_multiple_selections ) {
116
-			$this->_set_normalization_strategy( new EE_Many_Valued_Normalization( $normalization ));
115
+		if ($this->_multiple_selections) {
116
+			$this->_set_normalization_strategy(new EE_Many_Valued_Normalization($normalization));
117 117
 		} else {
118
-			$this->_set_normalization_strategy( $normalization );
118
+			$this->_set_normalization_strategy($normalization);
119 119
 		}
120 120
 	}
121 121
 
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 	/**
125 125
 	 * @return array
126 126
 	 */
127
-	public function options(){
127
+	public function options() {
128 128
 		return $this->_options;
129 129
 	}
130 130
 
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 	 * Returns an array which is guaranteed to not be multidimensional
135 135
 	 * @return array
136 136
 	 */
137
-	public function flat_options(){
137
+	public function flat_options() {
138 138
 		return $this->_flatten_select_options($this->options());
139 139
 	}
140 140
 
@@ -145,20 +145,20 @@  discard block
 block discarded – undo
145 145
 	 * @param array $arr
146 146
 	 * @return array
147 147
 	 */
148
-	protected function _flatten_select_options( $arr ){
148
+	protected function _flatten_select_options($arr) {
149 149
 		$flat_array = array();
150 150
 		EE_Registry::instance()->load_helper('Array');
151
-		if ( EEH_Array::is_multi_dimensional_array( $arr )) {
152
-			foreach( $arr as $sub_array ){
153
-				foreach( $sub_array as $key => $value ) {
154
-					$flat_array[ $key ] = $value;
155
-					$this->_set_label_size( $value );
151
+		if (EEH_Array::is_multi_dimensional_array($arr)) {
152
+			foreach ($arr as $sub_array) {
153
+				foreach ($sub_array as $key => $value) {
154
+					$flat_array[$key] = $value;
155
+					$this->_set_label_size($value);
156 156
 				}
157 157
 			}
158 158
 		} else {
159
-			foreach( $arr as $key => $value ) {
160
-				$flat_array[ $key ] = $value;
161
-				$this->_set_label_size( $value );
159
+			foreach ($arr as $key => $value) {
160
+				$flat_array[$key] = $value;
161
+				$this->_set_label_size($value);
162 162
 			}
163 163
 		}
164 164
 		return $flat_array;
@@ -170,18 +170,18 @@  discard block
 block discarded – undo
170 170
 	 * @param EE_Question_Option[] $question_options_array
171 171
 	 * @return array
172 172
 	 */
173
-	protected function _process_question_options( $question_options_array = array() ) {
173
+	protected function _process_question_options($question_options_array = array()) {
174 174
 		$flat_array = array();
175
-		foreach( $question_options_array as $question_option ) {
176
-			if ( $question_option instanceof EE_Question_Option ) {
175
+		foreach ($question_options_array as $question_option) {
176
+			if ($question_option instanceof EE_Question_Option) {
177 177
 				$desc = '';
178
-				if ( $this->_use_desc_in_label ) {
178
+				if ($this->_use_desc_in_label) {
179 179
 					$desc = $question_option->desc();
180
-					$desc = ! empty( $desc ) ? '<span class="ee-question-option-desc"> - ' . $desc . '</span>' : '';
180
+					$desc = ! empty($desc) ? '<span class="ee-question-option-desc"> - '.$desc.'</span>' : '';
181 181
 				}
182
-				$flat_array[ $question_option->value() ] = $question_option->value() . $desc;
183
-			} elseif ( is_array( $question_option )) {
184
-				$non_question_option = $this->_flatten_select_options( $question_option );
182
+				$flat_array[$question_option->value()] = $question_option->value().$desc;
183
+			} elseif (is_array($question_option)) {
184
+				$non_question_option = $this->_flatten_select_options($question_option);
185 185
 				$flat_array = $flat_array + $non_question_option;
186 186
 			}
187 187
 		}
@@ -194,12 +194,12 @@  discard block
 block discarded – undo
194 194
 	 *    set_label_sizes
195 195
 	 * @return void
196 196
 	 */
197
-	public function set_label_sizes(){
197
+	public function set_label_sizes() {
198 198
 		// did the input settings specifically say to NOT set the label size dynamically ?
199
-		if ( ! $this->_enforce_label_size ) {
200
-			foreach( $this->_options as $option ) {
199
+		if ( ! $this->_enforce_label_size) {
200
+			foreach ($this->_options as $option) {
201 201
 				// calculate the strlen of the label
202
-				$this->_set_label_size( $option );
202
+				$this->_set_label_size($option);
203 203
 			}
204 204
 		}
205 205
 	}
@@ -211,9 +211,9 @@  discard block
 block discarded – undo
211 211
 	 * @param int|string $value
212 212
 	 * @return void
213 213
 	 */
214
-	private function _set_label_size( $value = '' ){
214
+	private function _set_label_size($value = '') {
215 215
 		// determine length of option value
216
-		$val_size = is_int( $value ) ? $value : strlen( $value );
216
+		$val_size = is_int($value) ? $value : strlen($value);
217 217
 		// use new value if bigger than existing
218 218
 		$this->_label_size = $val_size > $this->_label_size ? $val_size : $this->_label_size;
219 219
 	}
@@ -224,22 +224,22 @@  discard block
 block discarded – undo
224 224
 	 * 	get_label_size_class
225 225
 	 * @return string
226 226
 	 */
227
-	function get_label_size_class(){
227
+	function get_label_size_class() {
228 228
 		// use maximum option value length to determine label size
229
-		if( $this->_label_size < 3 ) {
229
+		if ($this->_label_size < 3) {
230 230
 			$size = ' nano-lbl';
231
-		} else if ( $this->_label_size < 6 ) {
232
-			$size =  ' micro-lbl';
233
-		} else if ( $this->_label_size < 12 ) {
234
-			$size =  ' tiny-lbl';
235
-		} else if ( $this->_label_size < 25 ) {
236
-			$size =  ' small-lbl';
237
-		} else if ( $this->_label_size < 50 ) {
238
-			$size =  ' medium-lbl';
239
-		} else if ( $this->_label_size >= 100 ) {
240
-			$size =  ' big-lbl';
231
+		} else if ($this->_label_size < 6) {
232
+			$size = ' micro-lbl';
233
+		} else if ($this->_label_size < 12) {
234
+			$size = ' tiny-lbl';
235
+		} else if ($this->_label_size < 25) {
236
+			$size = ' small-lbl';
237
+		} else if ($this->_label_size < 50) {
238
+			$size = ' medium-lbl';
239
+		} else if ($this->_label_size >= 100) {
240
+			$size = ' big-lbl';
241 241
 		} else {
242
-			$size =  ' medium-lbl';
242
+			$size = ' medium-lbl';
243 243
 		}
244 244
 		return $size;
245 245
 	}
@@ -248,21 +248,21 @@  discard block
 block discarded – undo
248 248
 	 * Returns the pretty value for the normalized value
249 249
 	 * @return string
250 250
 	 */
251
-	function pretty_value(){
251
+	function pretty_value() {
252 252
 		$options = $this->flat_options();
253
-		$unnormalized_value_choices = $this->get_normalization_strategy()->unnormalize( $this->_normalized_value );
254
-		if( ! $this->_multiple_selections ){
255
-			$unnormalized_value_choices = array( $unnormalized_value_choices );
253
+		$unnormalized_value_choices = $this->get_normalization_strategy()->unnormalize($this->_normalized_value);
254
+		if ( ! $this->_multiple_selections) {
255
+			$unnormalized_value_choices = array($unnormalized_value_choices);
256 256
 		}
257 257
 		$pretty_strings = array();
258
-		foreach( $unnormalized_value_choices as $unnormalized_value_choice ){
259
-			if( isset( $options[ $unnormalized_value_choice ] ) ){
260
-				$pretty_strings[] =  $options[ $unnormalized_value_choice ];
261
-			}else{
258
+		foreach ($unnormalized_value_choices as $unnormalized_value_choice) {
259
+			if (isset($options[$unnormalized_value_choice])) {
260
+				$pretty_strings[] = $options[$unnormalized_value_choice];
261
+			} else {
262 262
 				$pretty_strings[] = $this->normalized_value();
263 263
 			}
264 264
 		}
265
-		return implode(", ", $pretty_strings );
265
+		return implode(", ", $pretty_strings);
266 266
 	}
267 267
 
268 268
 
@@ -279,8 +279,8 @@  discard block
 block discarded – undo
279 279
 	/**
280 280
 	 * @param boolean $display_html_label_text
281 281
 	 */
282
-	public function set_display_html_label_text( $display_html_label_text ) {
283
-		$this->_display_html_label_text = filter_var( $display_html_label_text, FILTER_VALIDATE_BOOLEAN );
282
+	public function set_display_html_label_text($display_html_label_text) {
283
+		$this->_display_html_label_text = filter_var($display_html_label_text, FILTER_VALIDATE_BOOLEAN);
284 284
 	}
285 285
 
286 286
 
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 		foreach( $answer_options as $model_obj ){
53 53
 			if( $this->_naming_method ){
54 54
 				$display_value = call_user_func( array( $model_obj, $this->_naming_method ));
55
-			}else{
55
+			} else{
56 56
 				$display_value = $model_obj->name();
57 57
 			}
58 58
 			$select_options[ $model_obj->ID() ] = $display_value;
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 		foreach($values as $key => $value){
73 73
 			if($value instanceof EE_Base_Class){
74 74
 				$defaults_as_simple_ids[] = $value->ID();
75
-			}else{
75
+			} else{
76 76
 				$defaults_as_simple_ids[] = $value;
77 77
 			}
78 78
 		}
Please login to merge, or discard this patch.
core/libraries/form_sections/inputs/EE_Password_Input.input.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -6,17 +6,17 @@
 block discarded – undo
6 6
  * @subpackage
7 7
  * @author				Mike Nelson
8 8
  */
9
-class EE_Password_Input extends EE_Form_Input_Base{
9
+class EE_Password_Input extends EE_Form_Input_Base {
10 10
 
11 11
 
12 12
 	/**
13 13
 	 * @param array $input_settings
14 14
 	 */
15
-	function __construct($input_settings = array()){
15
+	function __construct($input_settings = array()) {
16 16
 		$this->_set_display_strategy(new EE_Text_Input_Display_Strategy('password'));
17 17
 		$this->_set_normalization_strategy(new EE_Text_Normalization());
18 18
 		parent::__construct($input_settings);
19
-		$this->set_html_class( $this->html_class() . 'password' );
19
+		$this->set_html_class($this->html_class().'password');
20 20
 	}
21 21
 
22 22
 
Please login to merge, or discard this patch.
core/libraries/form_sections/inputs/EE_Radio_Button_Input.input.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@  discard block
 block discarded – undo
1
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
2 2
 /**
3 3
  *
4 4
  * Class EE_Radio_Button_Input
@@ -11,17 +11,17 @@  discard block
 block discarded – undo
11 11
  * @since 				$VID:$
12 12
  *
13 13
  */
14
-class EE_Radio_Button_Input extends EE_Form_Input_With_Options_Base{
14
+class EE_Radio_Button_Input extends EE_Form_Input_With_Options_Base {
15 15
 
16 16
 	/**
17 17
 	 * @param array $answer_options
18 18
 	 * @param array $input_settings
19 19
 	 */
20
-	function __construct( $answer_options, $input_settings = array() ){
21
-		$this->_set_display_strategy( new EE_Radio_Button_Display_Strategy() );
22
-		$this->_add_validation_strategy( new EE_Enum_Validation_Strategy( isset( $input_settings[ 'validation_error_message' ] ) ? $input_settings[ 'validation_error_message' ] : NULL ) );
20
+	function __construct($answer_options, $input_settings = array()) {
21
+		$this->_set_display_strategy(new EE_Radio_Button_Display_Strategy());
22
+		$this->_add_validation_strategy(new EE_Enum_Validation_Strategy(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : NULL));
23 23
 		$this->_multiple_selections = FALSE;
24
-		parent::__construct( $answer_options, $input_settings );
24
+		parent::__construct($answer_options, $input_settings);
25 25
 	}
26 26
 
27 27
 }
28 28
\ No newline at end of file
Please login to merge, or discard this patch.
core/libraries/form_sections/inputs/EE_Select_Multi_Model_Input.input.php 2 patches
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
  * @subpackage
9 9
  * @author				Mike Nelson
10 10
  */
11
-class EE_Select_Multi_Model_Input extends EE_Select_Multiple_Input{
11
+class EE_Select_Multi_Model_Input extends EE_Select_Multiple_Input {
12 12
 
13 13
 
14 14
 	protected $_naming_method;
@@ -24,18 +24,18 @@  discard block
 block discarded – undo
24 24
 	 *     example: 	if the class were an EE_Event, this could be slug(), description(), name() (default)
25 25
 	 * }
26 26
 	 */
27
-	public function __construct( $answer_options = array(), $input_settings = array() ) {
28
-		if( isset( $input_settings['naming_method'] )){
29
-			$this->set_option_naming_method( $input_settings['naming_method'] );
27
+	public function __construct($answer_options = array(), $input_settings = array()) {
28
+		if (isset($input_settings['naming_method'])) {
29
+			$this->set_option_naming_method($input_settings['naming_method']);
30 30
 		}
31
-		parent::__construct( $answer_options, $input_settings );
31
+		parent::__construct($answer_options, $input_settings);
32 32
 	}
33 33
 
34 34
 	/**
35 35
 	 * Sets the method name which will be called when outputting the options list
36 36
 	 * @param string $method
37 37
 	 */
38
-	public function set_option_naming_method($method){
38
+	public function set_option_naming_method($method) {
39 39
 		$this->_naming_method = $method;
40 40
 	}
41 41
 
@@ -46,16 +46,16 @@  discard block
 block discarded – undo
46 46
 	 * @param EE_Base_Class[] $answer_options
47 47
 	 * @return null|void
48 48
 	 */
49
-	public function set_select_options( $answer_options = array() ) {
49
+	public function set_select_options($answer_options = array()) {
50 50
 		//convert the model objects to select from into normal select options
51 51
 		$select_options = array();
52
-		foreach( $answer_options as $model_obj ){
53
-			if( $this->_naming_method ){
54
-				$display_value = call_user_func( array( $model_obj, $this->_naming_method ));
55
-			}else{
52
+		foreach ($answer_options as $model_obj) {
53
+			if ($this->_naming_method) {
54
+				$display_value = call_user_func(array($model_obj, $this->_naming_method));
55
+			} else {
56 56
 				$display_value = $model_obj->name();
57 57
 			}
58
-			$select_options[ $model_obj->ID() ] = $display_value;
58
+			$select_options[$model_obj->ID()] = $display_value;
59 59
 		}
60 60
 		parent::set_select_options($select_options);
61 61
 	}
@@ -67,12 +67,12 @@  discard block
 block discarded – undo
67 67
 	 * into the format EE_Select_Multiple expects
68 68
 	 * @param EE_Base_Class[]|array $values
69 69
 	 */
70
-	public function set_default($values){
70
+	public function set_default($values) {
71 71
 		$defaults_as_simple_ids = array();
72
-		foreach($values as $key => $value){
73
-			if($value instanceof EE_Base_Class){
72
+		foreach ($values as $key => $value) {
73
+			if ($value instanceof EE_Base_Class) {
74 74
 				$defaults_as_simple_ids[] = $value->ID();
75
-			}else{
75
+			} else {
76 76
 				$defaults_as_simple_ids[] = $value;
77 77
 			}
78 78
 		}
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 		foreach( $answer_options as $model_obj ){
53 53
 			if( $this->_naming_method ){
54 54
 				$display_value = call_user_func( array( $model_obj, $this->_naming_method ));
55
-			}else{
55
+			} else{
56 56
 				$display_value = $model_obj->name();
57 57
 			}
58 58
 			$select_options[ $model_obj->ID() ] = $display_value;
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 		foreach($values as $key => $value){
73 73
 			if($value instanceof EE_Base_Class){
74 74
 				$defaults_as_simple_ids[] = $value->ID();
75
-			}else{
75
+			} else{
76 76
 				$defaults_as_simple_ids[] = $value;
77 77
 			}
78 78
 		}
Please login to merge, or discard this patch.
core/libraries/form_sections/inputs/EE_Select_Multiple_Input.input.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -6,17 +6,17 @@
 block discarded – undo
6 6
  * @subpackage
7 7
  * @author				Mike Nelson
8 8
  */
9
-class EE_Select_Multiple_Input extends EE_Form_Input_With_Options_Base{
9
+class EE_Select_Multiple_Input extends EE_Form_Input_With_Options_Base {
10 10
 
11 11
 	/**
12 12
 	 * @param array | EE_Question_Option[] $answer_options
13 13
 	 * @param array $input_settings
14 14
 	 */
15
-	public function __construct( $answer_options, $input_settings = array() ) {
16
-		$this->_set_display_strategy( new EE_Select_Multiple_Display_Strategy() );
17
-		$this->_add_validation_strategy( new EE_Many_Valued_Validation_Strategy( array( new EE_Enum_Validation_Strategy( isset( $input_settings[ 'validation_error_message' ] ) ? $input_settings[ 'validation_error_message' ] : NULL ) )));
15
+	public function __construct($answer_options, $input_settings = array()) {
16
+		$this->_set_display_strategy(new EE_Select_Multiple_Display_Strategy());
17
+		$this->_add_validation_strategy(new EE_Many_Valued_Validation_Strategy(array(new EE_Enum_Validation_Strategy(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : NULL))));
18 18
 		$this->_multiple_selections = TRUE;
19
-		parent::__construct( $answer_options, $input_settings );
19
+		parent::__construct($answer_options, $input_settings);
20 20
 	}
21 21
 
22 22
 }
Please login to merge, or discard this patch.
core/libraries/form_sections/inputs/EE_Yes_No_Input.input.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -6,14 +6,14 @@
 block discarded – undo
6 6
  * @subpackage
7 7
  * @author				Mike Nelson
8 8
  */
9
-class EE_Yes_No_Input extends EE_Select_Input{
9
+class EE_Yes_No_Input extends EE_Select_Input {
10 10
 
11 11
 	/**
12 12
 	 * @param array $options
13 13
 	 */
14
-	function __construct( $options = array()){
15
-		$select_options = array(true=>  __("Yes", "event_espresso"),false=>  __("No", "event_espresso"));
14
+	function __construct($options = array()) {
15
+		$select_options = array(true=>  __("Yes", "event_espresso"), false=>  __("No", "event_espresso"));
16 16
 
17
-		parent::__construct($select_options,$options);
17
+		parent::__construct($select_options, $options);
18 18
 	}
19 19
 }
Please login to merge, or discard this patch.
form_sections/strategies/display/EE_Hidden_Display_Strategy.strategy.php 2 patches
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 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,12 +25,12 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EE_Hidden_Display_Strategy extends EE_Display_Strategy_Base{
28
+class EE_Hidden_Display_Strategy extends EE_Display_Strategy_Base {
29 29
 	/**
30 30
 	 * 
31 31
 	 * @return string of html to display the HIDDEN field
32 32
 	 */
33
-	function display(){
33
+	function display() {
34 34
 		$input = $this->_input;		
35 35
 		return "<input type='hidden' id='{$input->html_id()}' name='{$input->html_name()}' class='{$input->html_class()}' style='{$input->html_style()}' value='{$input->raw_value_in_form()}'/>";
36 36
 	}
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.
strategies/display/EE_Select_Multiple_Display_Strategy.strategy.php 2 patches
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@  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 7
 /**
7 8
  * Event Espresso
@@ -53,7 +54,7 @@  discard block
 block discarded – undo
53 54
 		EEH_HTML::indent( 1, 'select' );
54 55
 		if( EEH_Array::is_multi_dimensional_array( $this->_input->options() )){
55 56
 			throw new EE_Error(sprintf(__("Select multiple display strategy does not allow for nested arrays of options.", "event_espresso")));
56
-		}else{
57
+		} else{
57 58
 			$html.=$this->_display_options( $this->_input->options() );
58 59
 		}
59 60
 
Please login to merge, or discard this patch.
Spacing   +18 added lines, -18 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,7 +25,7 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EE_Select_Multiple_Display_Strategy extends EE_Select_Display_Strategy{
28
+class EE_Select_Multiple_Display_Strategy extends EE_Select_Display_Strategy {
29 29
 
30 30
 	/**
31 31
 	 *
@@ -34,31 +34,31 @@  discard block
 block discarded – undo
34 34
 	 */
35 35
 	public function display() {
36 36
 
37
-		if( ! $this->_input instanceof EE_Form_Input_With_Options_Base){
37
+		if ( ! $this->_input instanceof EE_Form_Input_With_Options_Base) {
38 38
 			throw new EE_Error(sprintf(__('Cannot use Select Multiple Display Strategy with an input that doesn\'t have options', "event_espresso")));
39 39
 		}
40 40
 
41
-		$html = EEH_HTML::nl( 0, 'select' );
41
+		$html = EEH_HTML::nl(0, 'select');
42 42
 		$html .= '<select multiple';
43
-		$html .= ' id="' . $this->_input->html_id() . '"';
44
-		$html .= ' name="' . $this->_input->html_name() . '[]"';
45
-		$class = $this->_input->required() ? $this->_input->required_css_class() . ' ' . $this->_input->html_class() : $this->_input->html_class();
46
-		$html .= ' class="' . $class . '"';
43
+		$html .= ' id="'.$this->_input->html_id().'"';
44
+		$html .= ' name="'.$this->_input->html_name().'[]"';
45
+		$class = $this->_input->required() ? $this->_input->required_css_class().' '.$this->_input->html_class() : $this->_input->html_class();
46
+		$html .= ' class="'.$class.'"';
47 47
 		// add html5 required
48 48
 		$html .= $this->_input->required() ? ' required' : '';
49
-		$html .= ' style="' . $this->_input->html_style() . '"';
50
-		$html .= ' ' . $this->_input->other_html_attributes();
49
+		$html .= ' style="'.$this->_input->html_style().'"';
50
+		$html .= ' '.$this->_input->other_html_attributes();
51 51
 		$html .= '>';
52 52
 
53 53
 		EE_Registry::instance()->load_helper('Array');
54
-		EEH_HTML::indent( 1, 'select' );
55
-		if( EEH_Array::is_multi_dimensional_array( $this->_input->options() )){
54
+		EEH_HTML::indent(1, 'select');
55
+		if (EEH_Array::is_multi_dimensional_array($this->_input->options())) {
56 56
 			throw new EE_Error(sprintf(__("Select multiple display strategy does not allow for nested arrays of options.", "event_espresso")));
57
-		}else{
58
-			$html.=$this->_display_options( $this->_input->options() );
57
+		} else {
58
+			$html .= $this->_display_options($this->_input->options());
59 59
 		}
60 60
 
61
-		$html.= EEH_HTML::nl( -1, 'select' ) . "</select>";
61
+		$html .= EEH_HTML::nl( -1, 'select' )."</select>";
62 62
 		return $html;
63 63
 	}
64 64
 
@@ -69,12 +69,12 @@  discard block
 block discarded – undo
69 69
 	 * @param string|int $value unnormalized value option (string)
70 70
 	 * @return boolean
71 71
 	 */
72
-	protected function _check_if_option_selected( $value ){
72
+	protected function _check_if_option_selected($value) {
73 73
 		$selected_options = $this->_input->raw_value();
74
-		if ( empty( $selected_options )){
74
+		if (empty($selected_options)) {
75 75
 			return FALSE;
76 76
 		}
77
-		return in_array( $value, $selected_options ) ? TRUE : FALSE;
77
+		return in_array($value, $selected_options) ? TRUE : FALSE;
78 78
 	}
79 79
 
80 80
 
Please login to merge, or discard this patch.
form_sections/strategies/layout/EE_Fieldset_Section_Layout.strategy.php 2 patches
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_Fieldset_Section_Layout
5
- *
6
- * Description
7
- *
8
- * @package         Event Espresso
9
- * @subpackage    core
10
- * @author				Brent Christensen
11
- * @since		 	   $VID:$
12
- *
13
- */
3
+  *
4
+  * Class EE_Fieldset_Section_Layout
5
+  *
6
+  * Description
7
+  *
8
+  * @package         Event Espresso
9
+  * @subpackage    core
10
+  * @author				Brent Christensen
11
+  * @since		 	   $VID:$
12
+  *
13
+  */
14 14
 class EE_Fieldset_Section_Layout extends EE_Div_Per_Section_Layout{
15 15
 
16 16
 	/**
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
  * @since		 	   $VID:$
12 12
  *
13 13
  */
14
-class EE_Fieldset_Section_Layout extends EE_Div_Per_Section_Layout{
14
+class EE_Fieldset_Section_Layout extends EE_Div_Per_Section_Layout {
15 15
 
16 16
 	/**
17 17
 	 * legend_class
@@ -32,10 +32,10 @@  discard block
 block discarded – undo
32 32
 	 *
33 33
 	 * @param array $options
34 34
 	 */
35
-	function __construct( $options = array() ){
36
-		foreach( $options as $key => $value ) {
37
-			$key = '_' . $key;
38
-			if ( property_exists( $this, $key )) {
35
+	function __construct($options = array()) {
36
+		foreach ($options as $key => $value) {
37
+			$key = '_'.$key;
38
+			if (property_exists($this, $key)) {
39 39
 				$this->$key = $value;
40 40
 			}
41 41
 		}
@@ -47,8 +47,8 @@  discard block
 block discarded – undo
47 47
 	 * @return string
48 48
 	 */
49 49
 	public function layout_form_begin() {
50
-		$html = EEH_HTML::nl(1) . '<fieldset id="' . $this->_form_section->html_id() . '" class="' . $this->_form_section->html_class() . '" style="' . $this->_form_section->html_style() . '">';
51
-		$html .= '<legend class="' . $this->legend_class() . '">' . $this->legend_text() . '</legend>';
50
+		$html = EEH_HTML::nl(1).'<fieldset id="'.$this->_form_section->html_id().'" class="'.$this->_form_section->html_class().'" style="'.$this->_form_section->html_style().'">';
51
+		$html .= '<legend class="'.$this->legend_class().'">'.$this->legend_text().'</legend>';
52 52
 		return $html;
53 53
 	}
54 54
 
@@ -58,8 +58,8 @@  discard block
 block discarded – undo
58 58
 	 * closing div tag for a form
59 59
 	 * @return string
60 60
 	 */
61
-	public function layout_form_end(){
62
-		return EEH_HTML::nl(-1) . '</fieldset>';
61
+	public function layout_form_end() {
62
+		return EEH_HTML::nl(-1).'</fieldset>';
63 63
 	}
64 64
 
65 65
 
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 	/**
68 68
 	 * @param string $legend_class
69 69
 	 */
70
-	public function set_legend_class( $legend_class ) {
70
+	public function set_legend_class($legend_class) {
71 71
 		$this->_legend_class = $legend_class;
72 72
 	}
73 73
 
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 	/**
86 86
 	 * @param string $legend_text
87 87
 	 */
88
-	public function set_legend_text( $legend_text ) {
88
+	public function set_legend_text($legend_text) {
89 89
 		$this->_legend_text = $legend_text;
90 90
 	}
91 91
 
Please login to merge, or discard this patch.