Completed
Branch BUG-9715-shortcode-resources (aae731)
by
unknown
93:10 queued 83:21
created
core/libraries/form_sections/inputs/EE_Datepicker_Input.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -6,21 +6,21 @@  discard block
 block discarded – undo
6 6
  * @subpackage
7 7
  * @author				Mike Nelson
8 8
  */
9
-class EE_Datepicker_Input extends EE_Form_Input_Base{
9
+class EE_Datepicker_Input extends EE_Form_Input_Base {
10 10
 
11 11
 	/**
12 12
 	 * @param array $input_settings
13 13
 	 */
14
-	function __construct( $input_settings = array() ){
15
-		$this->_set_display_strategy( new EE_Text_Input_Display_Strategy( 'datepicker' ) );
16
-		$this->_set_normalization_strategy( new EE_Text_Normalization() );
14
+	function __construct($input_settings = array()) {
15
+		$this->_set_display_strategy(new EE_Text_Input_Display_Strategy('datepicker'));
16
+		$this->_set_normalization_strategy(new EE_Text_Normalization());
17 17
 		//we could do better for validation, but at least verify its plaintext
18
-		$this->_add_validation_strategy( new EE_Plaintext_Validation_Strategy( isset( $input_settings[ 'validation_error_message' ] ) ? $input_settings[ 'validation_error_message' ] : NULL ) );
19
-		parent::__construct( $input_settings );
20
-		$this->set_html_class( $this->html_class() . ' datepicker' );
18
+		$this->_add_validation_strategy(new EE_Plaintext_Validation_Strategy(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : NULL));
19
+		parent::__construct($input_settings);
20
+		$this->set_html_class($this->html_class().' datepicker');
21 21
 		// add some style and make it dance
22
-		add_action( 'wp_enqueue_scripts', array( 'EE_Datepicker_Input', 'enqueue_styles_and_scripts' ));
23
-		add_action( 'admin_enqueue_scripts', array( 'EE_Datepicker_Input', 'enqueue_styles_and_scripts' ));
22
+		add_action('wp_enqueue_scripts', array('EE_Datepicker_Input', 'enqueue_styles_and_scripts'));
23
+		add_action('admin_enqueue_scripts', array('EE_Datepicker_Input', 'enqueue_styles_and_scripts'));
24 24
 	}
25 25
 
26 26
 
@@ -33,8 +33,8 @@  discard block
 block discarded – undo
33 33
 	 */
34 34
 	public static function enqueue_styles_and_scripts() {
35 35
 		// load css
36
-		wp_register_style( 'espresso-ui-theme', EE_GLOBAL_ASSETS_URL . 'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css', array(), EVENT_ESPRESSO_VERSION, TRUE );
37
-		wp_enqueue_style( 'espresso-ui-theme');
36
+		wp_register_style('espresso-ui-theme', EE_GLOBAL_ASSETS_URL.'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css', array(), EVENT_ESPRESSO_VERSION, TRUE);
37
+		wp_enqueue_style('espresso-ui-theme');
38 38
 	}
39 39
 
40 40
 
Please login to merge, or discard this patch.
core/libraries/form_sections/inputs/EE_Fixed_Hidden_Input.input.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
  * @subpackage
7 7
  * @author				Brent Christensen
8 8
  */
9
-class EE_Fixed_Hidden_Input extends EE_Hidden_Input{
9
+class EE_Fixed_Hidden_Input extends EE_Hidden_Input {
10 10
 
11 11
 
12 12
 	/**
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 	 * @param array $req_data like $_POST
18 18
 	 * @return boolean whether or not there was an error
19 19
 	 */
20
-	protected function _normalize( $req_data ) {
20
+	protected function _normalize($req_data) {
21 21
 	}
22 22
 
23 23
 
Please login to merge, or discard this patch.
core/libraries/form_sections/inputs/EE_Float_Input.input.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -6,15 +6,15 @@
 block discarded – undo
6 6
  * @subpackage
7 7
  * @author				Mike Nelson
8 8
  */
9
-class EE_Float_Input extends EE_Form_Input_Base{
9
+class EE_Float_Input extends EE_Form_Input_Base {
10 10
 
11 11
 	/**
12 12
 	 * @param array $input_settings
13 13
 	 */
14
-	function __construct($input_settings = array()){
14
+	function __construct($input_settings = array()) {
15 15
 		$this->_set_display_strategy(new EE_Text_Input_Display_Strategy());
16
-		$this->_set_normalization_strategy(new EE_Float_Normalization( isset( $input_settings[ 'validation_error_message' ] ) ? $input_settings[ 'validation_error_message' ] : NULL ) );
17
-		$this->_add_validation_strategy( new EE_Float_Validation_Strategy( isset( $input_settings[ 'validation_error_message' ] ) ? $input_settings[ 'validation_error_message' ] : NULL ) );
16
+		$this->_set_normalization_strategy(new EE_Float_Normalization(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : NULL));
17
+		$this->_add_validation_strategy(new EE_Float_Validation_Strategy(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : NULL));
18 18
 		parent::__construct($input_settings);
19 19
 	}
20 20
 }
21 21
\ No newline at end of file
Please login to merge, or discard this patch.
libraries/form_sections/inputs/EE_Form_Input_With_Options_Base.input.php 2 patches
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 			}
108 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
 		}
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
 		foreach( $unnormalized_value_choices as $unnormalized_value_choice ){
259 259
 			if( isset( $options[ $unnormalized_value_choice ] ) ){
260 260
 				$pretty_strings[] =  $options[ $unnormalized_value_choice ];
261
-			}else{
261
+			} else{
262 262
 				$pretty_strings[] = $this->normalized_value();
263 263
 			}
264 264
 		}
Please login to merge, or discard this patch.
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,19 +145,19 @@  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
-		if ( EEH_Array::is_multi_dimensional_array( $arr )) {
151
-			foreach( $arr as $sub_array ){
152
-				foreach( $sub_array as $key => $value ) {
153
-					$flat_array[ $key ] = $value;
154
-					$this->_set_label_size( $value );
150
+		if (EEH_Array::is_multi_dimensional_array($arr)) {
151
+			foreach ($arr as $sub_array) {
152
+				foreach ($sub_array as $key => $value) {
153
+					$flat_array[$key] = $value;
154
+					$this->_set_label_size($value);
155 155
 				}
156 156
 			}
157 157
 		} else {
158
-			foreach( $arr as $key => $value ) {
159
-				$flat_array[ $key ] = $value;
160
-				$this->_set_label_size( $value );
158
+			foreach ($arr as $key => $value) {
159
+				$flat_array[$key] = $value;
160
+				$this->_set_label_size($value);
161 161
 			}
162 162
 		}
163 163
 		return $flat_array;
@@ -169,18 +169,18 @@  discard block
 block discarded – undo
169 169
 	 * @param EE_Question_Option[] $question_options_array
170 170
 	 * @return array
171 171
 	 */
172
-	protected function _process_question_options( $question_options_array = array() ) {
172
+	protected function _process_question_options($question_options_array = array()) {
173 173
 		$flat_array = array();
174
-		foreach( $question_options_array as $question_option ) {
175
-			if ( $question_option instanceof EE_Question_Option ) {
174
+		foreach ($question_options_array as $question_option) {
175
+			if ($question_option instanceof EE_Question_Option) {
176 176
 				$desc = '';
177
-				if ( $this->_use_desc_in_label ) {
177
+				if ($this->_use_desc_in_label) {
178 178
 					$desc = $question_option->desc();
179
-					$desc = ! empty( $desc ) ? '<span class="ee-question-option-desc"> - ' . $desc . '</span>' : '';
179
+					$desc = ! empty($desc) ? '<span class="ee-question-option-desc"> - '.$desc.'</span>' : '';
180 180
 				}
181
-				$flat_array[ $question_option->value() ] = $question_option->value() . $desc;
182
-			} elseif ( is_array( $question_option )) {
183
-				$non_question_option = $this->_flatten_select_options( $question_option );
181
+				$flat_array[$question_option->value()] = $question_option->value().$desc;
182
+			} elseif (is_array($question_option)) {
183
+				$non_question_option = $this->_flatten_select_options($question_option);
184 184
 				$flat_array = $flat_array + $non_question_option;
185 185
 			}
186 186
 		}
@@ -193,12 +193,12 @@  discard block
 block discarded – undo
193 193
 	 *    set_label_sizes
194 194
 	 * @return void
195 195
 	 */
196
-	public function set_label_sizes(){
196
+	public function set_label_sizes() {
197 197
 		// did the input settings specifically say to NOT set the label size dynamically ?
198
-		if ( ! $this->_enforce_label_size ) {
199
-			foreach( $this->_options as $option ) {
198
+		if ( ! $this->_enforce_label_size) {
199
+			foreach ($this->_options as $option) {
200 200
 				// calculate the strlen of the label
201
-				$this->_set_label_size( $option );
201
+				$this->_set_label_size($option);
202 202
 			}
203 203
 		}
204 204
 	}
@@ -210,9 +210,9 @@  discard block
 block discarded – undo
210 210
 	 * @param int|string $value
211 211
 	 * @return void
212 212
 	 */
213
-	private function _set_label_size( $value = '' ){
213
+	private function _set_label_size($value = '') {
214 214
 		// determine length of option value
215
-		$val_size = is_int( $value ) ? $value : strlen( $value );
215
+		$val_size = is_int($value) ? $value : strlen($value);
216 216
 		// use new value if bigger than existing
217 217
 		$this->_label_size = $val_size > $this->_label_size ? $val_size : $this->_label_size;
218 218
 	}
@@ -223,22 +223,22 @@  discard block
 block discarded – undo
223 223
 	 * 	get_label_size_class
224 224
 	 * @return string
225 225
 	 */
226
-	function get_label_size_class(){
226
+	function get_label_size_class() {
227 227
 		// use maximum option value length to determine label size
228
-		if( $this->_label_size < 3 ) {
228
+		if ($this->_label_size < 3) {
229 229
 			$size = ' nano-lbl';
230
-		} else if ( $this->_label_size < 6 ) {
231
-			$size =  ' micro-lbl';
232
-		} else if ( $this->_label_size < 12 ) {
233
-			$size =  ' tiny-lbl';
234
-		} else if ( $this->_label_size < 25 ) {
235
-			$size =  ' small-lbl';
236
-		} else if ( $this->_label_size < 50 ) {
237
-			$size =  ' medium-lbl';
238
-		} else if ( $this->_label_size >= 100 ) {
239
-			$size =  ' big-lbl';
230
+		} else if ($this->_label_size < 6) {
231
+			$size = ' micro-lbl';
232
+		} else if ($this->_label_size < 12) {
233
+			$size = ' tiny-lbl';
234
+		} else if ($this->_label_size < 25) {
235
+			$size = ' small-lbl';
236
+		} else if ($this->_label_size < 50) {
237
+			$size = ' medium-lbl';
238
+		} else if ($this->_label_size >= 100) {
239
+			$size = ' big-lbl';
240 240
 		} else {
241
-			$size =  ' medium-lbl';
241
+			$size = ' medium-lbl';
242 242
 		}
243 243
 		return $size;
244 244
 	}
@@ -247,21 +247,21 @@  discard block
 block discarded – undo
247 247
 	 * Returns the pretty value for the normalized value
248 248
 	 * @return string
249 249
 	 */
250
-	function pretty_value(){
250
+	function pretty_value() {
251 251
 		$options = $this->flat_options();
252
-		$unnormalized_value_choices = $this->get_normalization_strategy()->unnormalize( $this->_normalized_value );
253
-		if( ! $this->_multiple_selections ){
254
-			$unnormalized_value_choices = array( $unnormalized_value_choices );
252
+		$unnormalized_value_choices = $this->get_normalization_strategy()->unnormalize($this->_normalized_value);
253
+		if ( ! $this->_multiple_selections) {
254
+			$unnormalized_value_choices = array($unnormalized_value_choices);
255 255
 		}
256 256
 		$pretty_strings = array();
257
-		foreach( $unnormalized_value_choices as $unnormalized_value_choice ){
258
-			if( isset( $options[ $unnormalized_value_choice ] ) ){
259
-				$pretty_strings[] =  $options[ $unnormalized_value_choice ];
260
-			}else{
257
+		foreach ($unnormalized_value_choices as $unnormalized_value_choice) {
258
+			if (isset($options[$unnormalized_value_choice])) {
259
+				$pretty_strings[] = $options[$unnormalized_value_choice];
260
+			} else {
261 261
 				$pretty_strings[] = $this->normalized_value();
262 262
 			}
263 263
 		}
264
-		return implode(", ", $pretty_strings );
264
+		return implode(", ", $pretty_strings);
265 265
 	}
266 266
 
267 267
 
@@ -278,8 +278,8 @@  discard block
 block discarded – undo
278 278
 	/**
279 279
 	 * @param boolean $display_html_label_text
280 280
 	 */
281
-	public function set_display_html_label_text( $display_html_label_text ) {
282
-		$this->_display_html_label_text = filter_var( $display_html_label_text, FILTER_VALIDATE_BOOLEAN );
281
+	public function set_display_html_label_text($display_html_label_text) {
282
+		$this->_display_html_label_text = filter_var($display_html_label_text, FILTER_VALIDATE_BOOLEAN);
283 283
 	}
284 284
 
285 285
 
Please login to merge, or discard this patch.
core/libraries/form_sections/inputs/EE_Hidden_Input.input.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -6,20 +6,20 @@
 block discarded – undo
6 6
  * @subpackage
7 7
  * @author				Mike Nelson
8 8
  */
9
-class EE_Hidden_Input extends EE_Form_Input_Base{
9
+class EE_Hidden_Input extends EE_Form_Input_Base {
10 10
 
11 11
 	/**
12 12
 	 * @param array $input_settings
13 13
 	 */
14
-	function __construct($input_settings = array()){
14
+	function __construct($input_settings = array()) {
15 15
 		//require_once('strategies/display_strategies/EE_Text_Input_Display_Strategy.strategy.php');
16 16
 		$this->_set_display_strategy(new EE_Hidden_Display_Strategy());
17
-		if ( isset( $input_settings['normalization_strategy'] ) && $input_settings['normalization_strategy'] instanceof EE_Normalization_Strategy_Base ) {
18
-			$this->_set_normalization_strategy( $input_settings['normalization_strategy'] );
17
+		if (isset($input_settings['normalization_strategy']) && $input_settings['normalization_strategy'] instanceof EE_Normalization_Strategy_Base) {
18
+			$this->_set_normalization_strategy($input_settings['normalization_strategy']);
19 19
 		} else {
20
-			$this->_set_normalization_strategy( new EE_Text_Normalization() );
20
+			$this->_set_normalization_strategy(new EE_Text_Normalization());
21 21
 		}
22
-		parent::__construct( $input_settings );
22
+		parent::__construct($input_settings);
23 23
 	}
24 24
 
25 25
 
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.