@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | |
186 | 186 | /** |
187 | 187 | * _prep_name_for_html_id |
188 | - * @param $name |
|
188 | + * @param string $name |
|
189 | 189 | * @return string |
190 | 190 | */ |
191 | 191 | private function _prep_name_for_html_id( $name ) { |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | |
232 | 232 | |
233 | 233 | /** |
234 | - * @param mixed $html_class |
|
234 | + * @param string $html_class |
|
235 | 235 | */ |
236 | 236 | public function set_html_class( $html_class ) { |
237 | 237 | $this->_html_class = $html_class; |
@@ -1,7 +1,8 @@ discard block |
||
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 |
@@ -69,7 +70,7 @@ discard block |
||
69 | 70 | $default_address .= $state ? $state->name() . '<br />' : ''; |
70 | 71 | $default_address .= $country ? $country->name(). '<br />' : ''; |
71 | 72 | $default_address .= $organization->zip != '' ? $organization->get_pretty( 'zip' ) : ''; |
72 | - }else{ |
|
73 | + } else{ |
|
73 | 74 | $default_address = 'unknown'; |
74 | 75 | $organization_name = 'unknown'; |
75 | 76 | } |
@@ -1,6 +1,6 @@ discard block |
||
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 | /** |
@@ -95,13 +95,13 @@ discard block |
||
95 | 95 | * @type $name string the name for this form section, if you want to explicitly define it |
96 | 96 | * } |
97 | 97 | */ |
98 | - function __construct( $options_array = array() ) { |
|
98 | + function __construct($options_array = array()) { |
|
99 | 99 | // used by display strategies |
100 | 100 | EE_Registry::instance()->load_helper('HTML'); |
101 | 101 | // assign incoming values to properties |
102 | - foreach( $options_array as $key => $value ) { |
|
103 | - $key = '_' . $key; |
|
104 | - if ( property_exists( $this, $key ) && empty( $this->{$key} )) { |
|
102 | + foreach ($options_array as $key => $value) { |
|
103 | + $key = '_'.$key; |
|
104 | + if (property_exists($this, $key) && empty($this->{$key} )) { |
|
105 | 105 | $this->{$key} = $value; |
106 | 106 | } |
107 | 107 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | * @param $parent_form_section |
114 | 114 | * @param $name |
115 | 115 | */ |
116 | - protected function _construct_finalize( $parent_form_section, $name ){ |
|
116 | + protected function _construct_finalize($parent_form_section, $name) { |
|
117 | 117 | $this->_construction_finalized = TRUE; |
118 | 118 | $this->_parent_section = $parent_form_section; |
119 | 119 | $this->_name = $name; |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | /** |
135 | 135 | * @param string $action |
136 | 136 | */ |
137 | - public function set_action( $action ) { |
|
137 | + public function set_action($action) { |
|
138 | 138 | $this->_action = $action; |
139 | 139 | } |
140 | 140 | |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | * @return string |
145 | 145 | */ |
146 | 146 | public function method() { |
147 | - return ! empty( $this->_method ) ? $this->_method : 'POST'; |
|
147 | + return ! empty($this->_method) ? $this->_method : 'POST'; |
|
148 | 148 | } |
149 | 149 | |
150 | 150 | |
@@ -152,8 +152,8 @@ discard block |
||
152 | 152 | /** |
153 | 153 | * @param string $method |
154 | 154 | */ |
155 | - public function set_method( $method ) { |
|
156 | - switch ( $method ) { |
|
155 | + public function set_method($method) { |
|
156 | + switch ($method) { |
|
157 | 157 | case 'get' : |
158 | 158 | case 'GET' : |
159 | 159 | $this->_method = 'GET'; |
@@ -171,12 +171,12 @@ discard block |
||
171 | 171 | * Calculation involves using the name and the parent's html id |
172 | 172 | * return void |
173 | 173 | */ |
174 | - protected function _set_default_html_id_if_empty(){ |
|
175 | - if( ! $this->_html_id ){ |
|
176 | - if( $this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper ){ |
|
177 | - $this->_html_id = $this->_parent_section->html_id() . '-' . $this->_prep_name_for_html_id( $this->name() ); |
|
178 | - }else{ |
|
179 | - $this->_html_id = $this->_prep_name_for_html_id( $this->name() ); |
|
174 | + protected function _set_default_html_id_if_empty() { |
|
175 | + if ( ! $this->_html_id) { |
|
176 | + if ($this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper) { |
|
177 | + $this->_html_id = $this->_parent_section->html_id().'-'.$this->_prep_name_for_html_id($this->name()); |
|
178 | + } else { |
|
179 | + $this->_html_id = $this->_prep_name_for_html_id($this->name()); |
|
180 | 180 | } |
181 | 181 | } |
182 | 182 | } |
@@ -188,8 +188,8 @@ discard block |
||
188 | 188 | * @param $name |
189 | 189 | * @return string |
190 | 190 | */ |
191 | - private function _prep_name_for_html_id( $name ) { |
|
192 | - return sanitize_key( str_replace( array( ' ', ' ', '_' ), '-', $name )); |
|
191 | + private function _prep_name_for_html_id($name) { |
|
192 | + return sanitize_key(str_replace(array(' ', ' ', '_'), '-', $name)); |
|
193 | 193 | } |
194 | 194 | |
195 | 195 | |
@@ -206,8 +206,8 @@ discard block |
||
206 | 206 | * @param bool $add_pound_sign |
207 | 207 | * @return string |
208 | 208 | */ |
209 | - public function html_id( $add_pound_sign = FALSE ){ |
|
210 | - return $add_pound_sign ? '#' . $this->_html_id : $this->_html_id; |
|
209 | + public function html_id($add_pound_sign = FALSE) { |
|
210 | + return $add_pound_sign ? '#'.$this->_html_id : $this->_html_id; |
|
211 | 211 | } |
212 | 212 | |
213 | 213 | |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | /** |
216 | 216 | * @return string |
217 | 217 | */ |
218 | - public function html_class(){ |
|
218 | + public function html_class() { |
|
219 | 219 | return $this->_html_class; |
220 | 220 | } |
221 | 221 | |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | /** |
225 | 225 | * @return string |
226 | 226 | */ |
227 | - public function html_style(){ |
|
227 | + public function html_style() { |
|
228 | 228 | return $this->_html_style; |
229 | 229 | } |
230 | 230 | |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | /** |
234 | 234 | * @param mixed $html_class |
235 | 235 | */ |
236 | - public function set_html_class( $html_class ) { |
|
236 | + public function set_html_class($html_class) { |
|
237 | 237 | $this->_html_class = $html_class; |
238 | 238 | } |
239 | 239 | |
@@ -242,7 +242,7 @@ discard block |
||
242 | 242 | /** |
243 | 243 | * @param mixed $html_id |
244 | 244 | */ |
245 | - public function set_html_id( $html_id ) { |
|
245 | + public function set_html_id($html_id) { |
|
246 | 246 | $this->_html_id = $html_id; |
247 | 247 | } |
248 | 248 | |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | /** |
252 | 252 | * @param mixed $html_style |
253 | 253 | */ |
254 | - public function set_html_style( $html_style ) { |
|
254 | + public function set_html_style($html_style) { |
|
255 | 255 | $this->_html_style = $html_style; |
256 | 256 | } |
257 | 257 | |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | /** |
261 | 261 | * @param string $other_html_attributes |
262 | 262 | */ |
263 | - public function set_other_html_attributes( $other_html_attributes ) { |
|
263 | + public function set_other_html_attributes($other_html_attributes) { |
|
264 | 264 | $this->_other_html_attributes = $other_html_attributes; |
265 | 265 | } |
266 | 266 | |
@@ -280,9 +280,9 @@ discard block |
||
280 | 280 | * @throws EE_Error |
281 | 281 | * @return string |
282 | 282 | */ |
283 | - function name(){ |
|
284 | - if( ! $this->_construction_finalized ){ |
|
285 | - throw new EE_Error(sprintf( __( 'You cannot use the form section\s name until _construct_finalize has been called on it (when we set the name). It was called on a form section of type \'s\'', 'event_espresso' ), get_class($this) ) ); |
|
283 | + function name() { |
|
284 | + if ( ! $this->_construction_finalized) { |
|
285 | + throw new EE_Error(sprintf(__('You cannot use the form section\s name until _construct_finalize has been called on it (when we set the name). It was called on a form section of type \'s\'', 'event_espresso'), get_class($this))); |
|
286 | 286 | } |
287 | 287 | return $this->_name; |
288 | 288 | } |
@@ -293,7 +293,7 @@ discard block |
||
293 | 293 | * Gets the parent section |
294 | 294 | * @return EE_Form_Section_Proper |
295 | 295 | */ |
296 | - function parent_section(){ |
|
296 | + function parent_section() { |
|
297 | 297 | return $this->_parent_section; |
298 | 298 | } |
299 | 299 | |
@@ -306,18 +306,18 @@ discard block |
||
306 | 306 | * @param string $other_attributes anything else added to the form open tag, MUST BE VALID HTML |
307 | 307 | * @return string |
308 | 308 | */ |
309 | - public function form_open( $action = '', $method = '', $other_attributes = '' ) { |
|
310 | - if ( ! empty( $action )) { |
|
311 | - $this->set_action( $action ); |
|
309 | + public function form_open($action = '', $method = '', $other_attributes = '') { |
|
310 | + if ( ! empty($action)) { |
|
311 | + $this->set_action($action); |
|
312 | 312 | } |
313 | - if ( ! empty( $method )) { |
|
314 | - $this->set_method( $method ); |
|
313 | + if ( ! empty($method)) { |
|
314 | + $this->set_method($method); |
|
315 | 315 | } |
316 | - $html = EEH_HTML::nl( 1, 'form' ) . '<form'; |
|
317 | - $html .= $this->html_id() !== '' ? ' id="' . $this->html_id() . '"' : ''; |
|
318 | - $html .= ' action="' . $this->action() . '"'; |
|
319 | - $html .= ' method="' . $this->method() . '"'; |
|
320 | - $html .= $other_attributes . '>'; |
|
316 | + $html = EEH_HTML::nl(1, 'form').'<form'; |
|
317 | + $html .= $this->html_id() !== '' ? ' id="'.$this->html_id().'"' : ''; |
|
318 | + $html .= ' action="'.$this->action().'"'; |
|
319 | + $html .= ' method="'.$this->method().'"'; |
|
320 | + $html .= $other_attributes.'>'; |
|
321 | 321 | return $html; |
322 | 322 | } |
323 | 323 | |
@@ -328,7 +328,7 @@ discard block |
||
328 | 328 | * @return string |
329 | 329 | */ |
330 | 330 | public function form_close() { |
331 | - return EEH_HTML::nl( -1, 'form' ) . '</form>' . EEH_HTML::nl() . '<!-- end of ee-' . $this->html_id() . '-form -->' . EEH_HTML::nl(); |
|
331 | + return EEH_HTML::nl( -1, 'form' ).'</form>'.EEH_HTML::nl().'<!-- end of ee-'.$this->html_id().'-form -->'.EEH_HTML::nl(); |
|
332 | 332 | } |
333 | 333 | |
334 | 334 |
@@ -348,6 +348,7 @@ |
||
348 | 348 | * Automatically finds the related model info from the form, if present, and |
349 | 349 | * save the relations indicated |
350 | 350 | * @type string $relation_name |
351 | + * @param integer $relation_name |
|
351 | 352 | * @return bool |
352 | 353 | * @throws EE_Error |
353 | 354 | */ |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | * @since 4.5.0 |
12 | 12 | * |
13 | 13 | */ |
14 | -class EE_Model_Form_Section extends EE_Form_Section_Proper{ |
|
14 | +class EE_Model_Form_Section extends EE_Form_Section_Proper { |
|
15 | 15 | |
16 | 16 | /** |
17 | 17 | * |
@@ -36,36 +36,36 @@ discard block |
||
36 | 36 | * } |
37 | 37 | * @throws EE_Error |
38 | 38 | */ |
39 | - public function __construct($options_array = array()){ |
|
40 | - if(isset($options_array['model']) && $options_array['model'] instanceof EEM_Base){ |
|
39 | + public function __construct($options_array = array()) { |
|
40 | + if (isset($options_array['model']) && $options_array['model'] instanceof EEM_Base) { |
|
41 | 41 | $this->_model = $options_array['model']; |
42 | 42 | } |
43 | - if( ! $this->_model || ! $this->_model instanceof EEM_Base ){ |
|
43 | + if ( ! $this->_model || ! $this->_model instanceof EEM_Base) { |
|
44 | 44 | throw new EE_Error(sprintf(__("Model Form Sections must first specify the _model property to be a subclass of EEM_Base", "event_espresso"))); |
45 | 45 | } |
46 | 46 | |
47 | - if(isset($options_array['subsection_args'])){ |
|
47 | + if (isset($options_array['subsection_args'])) { |
|
48 | 48 | $subsection_args = $options_array['subsection_args']; |
49 | - }else{ |
|
49 | + } else { |
|
50 | 50 | $subsection_args = array(); |
51 | 51 | } |
52 | 52 | |
53 | 53 | //gather fields and relations to convert to inputs |
54 | 54 | //but if they're just going to exclude a field anyways, don't bother converting it to an input |
55 | 55 | $exclude = $this->_subsections; |
56 | - if(isset($options_array['exclude'])){ |
|
57 | - $exclude = array_merge($exclude,array_flip($options_array['exclude'])); |
|
56 | + if (isset($options_array['exclude'])) { |
|
57 | + $exclude = array_merge($exclude, array_flip($options_array['exclude'])); |
|
58 | 58 | } |
59 | 59 | $model_fields = array_diff_key($this->_model->field_settings(), $exclude); |
60 | 60 | $model_relations = array_diff_key($this->_model->relation_settings(), $exclude); |
61 | 61 | //convert fields and relations to inputs |
62 | 62 | $this->_subsections = array_merge( |
63 | 63 | $this->_convert_model_fields_to_inputs($model_fields), |
64 | - $this->_convert_model_relations_to_inputs($model_relations,$subsection_args), |
|
64 | + $this->_convert_model_relations_to_inputs($model_relations, $subsection_args), |
|
65 | 65 | $this->_subsections |
66 | 66 | ); |
67 | 67 | parent::__construct($options_array); |
68 | - if(isset($options_array['model_object']) && $options_array['model_object'] instanceof EE_Base_Class){ |
|
68 | + if (isset($options_array['model_object']) && $options_array['model_object'] instanceof EE_Base_Class) { |
|
69 | 69 | $this->populate_model_obj($options_array['model_object']); |
70 | 70 | } |
71 | 71 | |
@@ -83,9 +83,9 @@ discard block |
||
83 | 83 | * } |
84 | 84 | * @return array |
85 | 85 | */ |
86 | - protected function _convert_model_relations_to_inputs($relations,$subsection_args = array()){ |
|
86 | + protected function _convert_model_relations_to_inputs($relations, $subsection_args = array()) { |
|
87 | 87 | $inputs = array(); |
88 | - foreach( $relations as $relation_name => $relation_obj ) { |
|
88 | + foreach ($relations as $relation_name => $relation_obj) { |
|
89 | 89 | $input_constructor_args = array( |
90 | 90 | array_merge( |
91 | 91 | array( |
@@ -96,19 +96,19 @@ discard block |
||
96 | 96 | ) |
97 | 97 | ); |
98 | 98 | $input = NULL; |
99 | - switch(get_class($relation_obj)){ |
|
99 | + switch (get_class($relation_obj)) { |
|
100 | 100 | case 'EE_HABTM_Relation': |
101 | - if(isset($subsection_args[$relation_name]) && |
|
102 | - isset($subsection_args[$relation_name]['model_objects'])){ |
|
101 | + if (isset($subsection_args[$relation_name]) && |
|
102 | + isset($subsection_args[$relation_name]['model_objects'])) { |
|
103 | 103 | $model_objects = $subsection_args[$relation_name]['model_objects']; |
104 | - }else{ |
|
104 | + } else { |
|
105 | 105 | $model_objects = $relation_obj->get_other_model()->get_all(); |
106 | 106 | } |
107 | - $input = new EE_Select_Multi_Model_Input($model_objects,$input_constructor_args); |
|
107 | + $input = new EE_Select_Multi_Model_Input($model_objects, $input_constructor_args); |
|
108 | 108 | break; |
109 | 109 | default: |
110 | 110 | } |
111 | - if($input){ |
|
111 | + if ($input) { |
|
112 | 112 | $inputs[$relation_name] = $input; |
113 | 113 | } |
114 | 114 | } |
@@ -123,10 +123,10 @@ discard block |
||
123 | 123 | * @throws EE_Error |
124 | 124 | * @return EE_Form_Input_Base[] |
125 | 125 | */ |
126 | - protected function _convert_model_fields_to_inputs( $model_fields = array() ){ |
|
126 | + protected function _convert_model_fields_to_inputs($model_fields = array()) { |
|
127 | 127 | $inputs = array(); |
128 | - foreach( $model_fields as $field_name=>$model_field ){ |
|
129 | - if ( $model_field instanceof EE_Model_Field_Base ) { |
|
128 | + foreach ($model_fields as $field_name=>$model_field) { |
|
129 | + if ($model_field instanceof EE_Model_Field_Base) { |
|
130 | 130 | $input_constructor_args = array( |
131 | 131 | array( |
132 | 132 | 'required'=> ! $model_field->is_nullable() && $model_field->get_default_value() === NULL, |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | 'default'=>$model_field->get_default_value(), |
135 | 135 | ) |
136 | 136 | ); |
137 | - switch(get_class($model_field)){ |
|
137 | + switch (get_class($model_field)) { |
|
138 | 138 | case 'EE_All_Caps_Text_Field': |
139 | 139 | case 'EE_Any_Foreign_Model_Name_Field': |
140 | 140 | $input_class = 'EE_Text_Input'; |
@@ -143,16 +143,16 @@ discard block |
||
143 | 143 | $input_class = 'EE_Yes_No_Input'; |
144 | 144 | break; |
145 | 145 | case 'EE_Datetime_Field': |
146 | - throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field))); |
|
146 | + throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field))); |
|
147 | 147 | break; |
148 | 148 | case 'EE_Email_Field': |
149 | 149 | $input_class = 'EE_Email_Input'; |
150 | 150 | break; |
151 | 151 | case 'EE_Enum_Integer_Field': |
152 | - throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field))); |
|
152 | + throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field))); |
|
153 | 153 | break; |
154 | 154 | case 'EE_Enum_Text_Field': |
155 | - throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field))); |
|
155 | + throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field))); |
|
156 | 156 | break; |
157 | 157 | case 'EE_Float_Field': |
158 | 158 | $input_class = 'EE_Float_Input'; |
@@ -161,15 +161,15 @@ discard block |
||
161 | 161 | case 'EE_Foreign_Key_String_Field': |
162 | 162 | case 'EE_WP_User_Field': |
163 | 163 | $models_pointed_to = $model_field instanceof EE_Field_With_Model_Name ? $model_field->get_model_class_names_pointed_to() : array(); |
164 | - if(true || is_array($models_pointed_to) && count($models_pointed_to) > 1){ |
|
164 | + if (true || is_array($models_pointed_to) && count($models_pointed_to) > 1) { |
|
165 | 165 | $input_class = 'EE_Text_Input'; |
166 | - }else{ |
|
166 | + } else { |
|
167 | 167 | //so its just one model |
168 | 168 | $model_name = is_array($models_pointed_to) ? reset($models_pointed_to) : $models_pointed_to; |
169 | 169 | $model = EE_Registry::instance()->load_model($model_name); |
170 | 170 | $model_names = $model->get_all_names(array('limit'=>10)); |
171 | - if($model_field->is_nullable()){ |
|
172 | - array_unshift( $model_names, __( "Please Select", 'event_espresso' )); |
|
171 | + if ($model_field->is_nullable()) { |
|
172 | + array_unshift($model_names, __("Please Select", 'event_espresso')); |
|
173 | 173 | } |
174 | 174 | $input_constructor_args[1] = $input_constructor_args[0]; |
175 | 175 | $input_constructor_args[0] = $model_names; |
@@ -178,10 +178,10 @@ discard block |
||
178 | 178 | break; |
179 | 179 | case 'EE_Full_HTML_Field': |
180 | 180 | $input_class = 'EE_Text_Area_Input'; |
181 | - $input_constructor_args[ 0 ]['validation_strategies'] = array( new EE_Full_HTML_Validation_Strategy() ); |
|
181 | + $input_constructor_args[0]['validation_strategies'] = array(new EE_Full_HTML_Validation_Strategy()); |
|
182 | 182 | break; |
183 | 183 | case 'EE_Infinite_Integer': |
184 | - throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field))); |
|
184 | + throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field))); |
|
185 | 185 | break; |
186 | 186 | case 'EE_Integer_Field': |
187 | 187 | $input_class = 'EE_Text_Input'; |
@@ -190,11 +190,11 @@ discard block |
||
190 | 190 | $input_class = 'EE_Text_Area_Input'; |
191 | 191 | break; |
192 | 192 | case 'EE_Money_Field': |
193 | - throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field))); |
|
193 | + throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field))); |
|
194 | 194 | break; |
195 | 195 | case 'EE_Post_Content_Field': |
196 | 196 | $input_class = 'EE_Text_Area_Input'; |
197 | - $input_constructor_args[ 0 ][ 'validation_strategies' ] = array( new EE_Full_HTML_Validation_Strategy() ); |
|
197 | + $input_constructor_args[0]['validation_strategies'] = array(new EE_Full_HTML_Validation_Strategy()); |
|
198 | 198 | break; |
199 | 199 | case 'EE_Plain_Text_Field': |
200 | 200 | $input_class = 'EE_Text_Input'; |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | break; |
212 | 212 | case 'EE_Simple_HTML_Field': |
213 | 213 | $input_class = 'EE_Text_Area_Input'; |
214 | - $input_constructor_args[ 0 ][ 'validation_strategies' ] = array( new EE_Simple_HTML_Validation_Strategy() ); |
|
214 | + $input_constructor_args[0]['validation_strategies'] = array(new EE_Simple_HTML_Validation_Strategy()); |
|
215 | 215 | break; |
216 | 216 | case 'EE_Slug_Field': |
217 | 217 | $input_class = 'EE_Text_Input'; |
@@ -220,13 +220,13 @@ discard block |
||
220 | 220 | $input_class = 'EE_Yes_No_Input'; |
221 | 221 | break; |
222 | 222 | case 'EE_WP_Post_Status_Field': |
223 | - throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field))); |
|
223 | + throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field))); |
|
224 | 224 | break; |
225 | 225 | case 'EE_WP_Post_Type_Field': |
226 | - throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field))); |
|
226 | + throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field))); |
|
227 | 227 | break; |
228 | 228 | default: |
229 | - throw new EE_Error(sprintf(__("Model field of type '%s' does not convert to any known Form Input. Please add a case to EE_Model_Form_section's _convert_model_fields_to_inputs switch statement", "event_espresso"),get_class($model_field))); |
|
229 | + throw new EE_Error(sprintf(__("Model field of type '%s' does not convert to any known Form Input. Please add a case to EE_Model_Form_section's _convert_model_fields_to_inputs switch statement", "event_espresso"), get_class($model_field))); |
|
230 | 230 | } |
231 | 231 | $reflection = new ReflectionClass($input_class); |
232 | 232 | $input = $reflection->newInstanceArgs($input_constructor_args); |
@@ -244,21 +244,21 @@ discard block |
||
244 | 244 | * @param EE_Base_Class $model_obj |
245 | 245 | * @return void |
246 | 246 | */ |
247 | - public function populate_model_obj($model_obj){ |
|
247 | + public function populate_model_obj($model_obj) { |
|
248 | 248 | $model_obj = $this->_model->ensure_is_obj($model_obj); |
249 | 249 | $this->_model_object = $model_obj; |
250 | 250 | $defaults = $model_obj->model_field_array(); |
251 | - foreach($this->_model->relation_settings() as $relation_name => $relation_obj){ |
|
251 | + foreach ($this->_model->relation_settings() as $relation_name => $relation_obj) { |
|
252 | 252 | $form_inputs = $this->inputs(); |
253 | - if(isset($form_inputs[$relation_name])){ |
|
254 | - if($relation_obj instanceof EE_Belongs_To_Relation){ |
|
253 | + if (isset($form_inputs[$relation_name])) { |
|
254 | + if ($relation_obj instanceof EE_Belongs_To_Relation) { |
|
255 | 255 | //then we only expect there to be one |
256 | 256 | $related_item = $this->_model_object->get_first_related($relation_name); |
257 | 257 | $defaults[$relation_name] = $related_item->ID(); |
258 | - }else{ |
|
258 | + } else { |
|
259 | 259 | $related_items = $this->_model_object->get_many_related($relation_name); |
260 | 260 | $ids = array(); |
261 | - foreach($related_items as $related_item){ |
|
261 | + foreach ($related_items as $related_item) { |
|
262 | 262 | $ids[] = $related_item->ID(); |
263 | 263 | } |
264 | 264 | $defaults[$relation_name] = $ids; |
@@ -275,8 +275,8 @@ discard block |
||
275 | 275 | * values are their normalized values |
276 | 276 | * @return array |
277 | 277 | */ |
278 | - public function inputs_values_corresponding_to_model_fields(){ |
|
279 | - return array_intersect_key($this->input_values(),$this->_model->field_settings()); |
|
278 | + public function inputs_values_corresponding_to_model_fields() { |
|
279 | + return array_intersect_key($this->input_values(), $this->_model->field_settings()); |
|
280 | 280 | } |
281 | 281 | |
282 | 282 | |
@@ -299,21 +299,21 @@ discard block |
||
299 | 299 | public function receive_form_submission($req_data = NULL, $validate = TRUE) { |
300 | 300 | parent::receive_form_submission($req_data, $validate); |
301 | 301 | //create or set the model object, if it isn't already |
302 | - if( ! $this->_model_object ){ |
|
302 | + if ( ! $this->_model_object) { |
|
303 | 303 | //check to see if the form indicates a PK, in which case we want to only retrieve it and update it |
304 | 304 | $pk_name = $this->_model->primary_key_name(); |
305 | 305 | $model_obj = $this->_model->get_one_by_ID($this->get_input_value($pk_name)); |
306 | - if($model_obj){ |
|
306 | + if ($model_obj) { |
|
307 | 307 | $this->_model_object = $model_obj; |
308 | - }else{ |
|
309 | - $this->_model_object = EE_Registry::instance()->load_class($this->_model->get_this_model_name() ); |
|
308 | + } else { |
|
309 | + $this->_model_object = EE_Registry::instance()->load_class($this->_model->get_this_model_name()); |
|
310 | 310 | } |
311 | 311 | } |
312 | 312 | //ok so the model object is set. Just set it with the submitted form data (don't save yet though) |
313 | - foreach($this->inputs_values_corresponding_to_model_fields() as $field_name=>$field_value){ |
|
313 | + foreach ($this->inputs_values_corresponding_to_model_fields() as $field_name=>$field_value) { |
|
314 | 314 | //only set the non-primary key |
315 | - if($field_name != $this->_model->primary_key_name()){ |
|
316 | - $this->_model_object->set($field_name,$field_value); |
|
315 | + if ($field_name != $this->_model->primary_key_name()) { |
|
316 | + $this->_model_object->set($field_name, $field_value); |
|
317 | 317 | } |
318 | 318 | } |
319 | 319 | |
@@ -329,13 +329,13 @@ discard block |
||
329 | 329 | * @return int, 1 on a successful update, the ID of |
330 | 330 | * the new entry on insert; 0 on failure |
331 | 331 | */ |
332 | - public function save(){ |
|
333 | - if( ! $this->_model_object){ |
|
334 | - throw new EE_Error(sprintf(__("Cannot save the model form's model object (model is '%s') because there is no model object set. You must either set it, or call receive_form_submission where it is set automatically", "event_espresso"),get_class($this->_model))); |
|
332 | + public function save() { |
|
333 | + if ( ! $this->_model_object) { |
|
334 | + throw new EE_Error(sprintf(__("Cannot save the model form's model object (model is '%s') because there is no model object set. You must either set it, or call receive_form_submission where it is set automatically", "event_espresso"), get_class($this->_model))); |
|
335 | 335 | } |
336 | - $success = $this->_model_object->save(); |
|
337 | - foreach($this->_model->relation_settings() as $relation_name => $relation_obj){ |
|
338 | - if(isset($this->_subsections[$relation_name])){ |
|
336 | + $success = $this->_model_object->save(); |
|
337 | + foreach ($this->_model->relation_settings() as $relation_name => $relation_obj) { |
|
338 | + if (isset($this->_subsections[$relation_name])) { |
|
339 | 339 | $success = $this->_save_related_info($relation_name); |
340 | 340 | } |
341 | 341 | } |
@@ -351,29 +351,29 @@ discard block |
||
351 | 351 | * @return bool |
352 | 352 | * @throws EE_Error |
353 | 353 | */ |
354 | - protected function _save_related_info($relation_name){ |
|
354 | + protected function _save_related_info($relation_name) { |
|
355 | 355 | $relation_obj = $this->_model->related_settings_for($relation_name); |
356 | - if($relation_obj instanceof EE_Belongs_To_Relation){ |
|
356 | + if ($relation_obj instanceof EE_Belongs_To_Relation) { |
|
357 | 357 | //there is just a foreign key on this model pointing to that one |
358 | 358 | $this->_model_object->_add_relation_to($this->get_input_value($relation_name), $relation_name); |
359 | - }elseif($relation_obj instanceof EE_Has_Many_Relation){ |
|
359 | + }elseif ($relation_obj instanceof EE_Has_Many_Relation) { |
|
360 | 360 | //then we want to consider all of its currently-related things. |
361 | 361 | //if they're in this list, keep them |
362 | 362 | //if they're not in this list, remove them |
363 | 363 | //and lastly add all the new items |
364 | 364 | throw new EE_Error(sprintf(__('Automatic saving of related info across a "has many" relation is not yet supported', "event_espresso"))); |
365 | - }elseif($relation_obj instanceof EE_HABTM_Relation){ |
|
365 | + }elseif ($relation_obj instanceof EE_HABTM_Relation) { |
|
366 | 366 | //delete everything NOT in this list |
367 | 367 | $normalized_input_value = $this->get_input_value($relation_name); |
368 | - if($normalized_input_value && is_array($normalized_input_value)){ |
|
368 | + if ($normalized_input_value && is_array($normalized_input_value)) { |
|
369 | 369 | $where_query_params = array( |
370 | - $relation_obj->get_other_model()->primary_key_name() => array('NOT_IN',$normalized_input_value)); |
|
371 | - }else{ |
|
370 | + $relation_obj->get_other_model()->primary_key_name() => array('NOT_IN', $normalized_input_value)); |
|
371 | + } else { |
|
372 | 372 | $where_query_params = array(); |
373 | 373 | } |
374 | - $this->_model_object->_remove_relations( $relation_name, $where_query_params ); |
|
375 | - foreach($normalized_input_value as $id){ |
|
376 | - $this->_model_object->_add_relation_to( $id, $relation_name ); |
|
374 | + $this->_model_object->_remove_relations($relation_name, $where_query_params); |
|
375 | + foreach ($normalized_input_value as $id) { |
|
376 | + $this->_model_object->_add_relation_to($id, $relation_name); |
|
377 | 377 | } |
378 | 378 | } |
379 | 379 | return TRUE; |
@@ -385,7 +385,7 @@ discard block |
||
385 | 385 | * Gets the model of this model form |
386 | 386 | * @return EEM_Base |
387 | 387 | */ |
388 | - public function get_model(){ |
|
388 | + public function get_model() { |
|
389 | 389 | return $this->_model; |
390 | 390 | } |
391 | 391 | |
@@ -398,7 +398,7 @@ discard block |
||
398 | 398 | * when receive_form_submission($req_data) was called. |
399 | 399 | * @return EE_Base_Class |
400 | 400 | */ |
401 | - public function get_model_object(){ |
|
401 | + public function get_model_object() { |
|
402 | 402 | return $this->_model_object; |
403 | 403 | } |
404 | 404 | |
@@ -408,10 +408,10 @@ discard block |
||
408 | 408 | * gets teh default name of this form section if none is specified |
409 | 409 | * @return string |
410 | 410 | */ |
411 | - protected function _set_default_name_if_empty(){ |
|
412 | - if( ! $this->_name ){ |
|
413 | - $default_name = str_replace("EEM_", "", get_class($this->_model)) . "_Model_Form"; |
|
414 | - $this->_name = $default_name; |
|
411 | + protected function _set_default_name_if_empty() { |
|
412 | + if ( ! $this->_name) { |
|
413 | + $default_name = str_replace("EEM_", "", get_class($this->_model))."_Model_Form"; |
|
414 | + $this->_name = $default_name; |
|
415 | 415 | } |
416 | 416 | } |
417 | 417 |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | |
47 | 47 | if(isset($options_array['subsection_args'])){ |
48 | 48 | $subsection_args = $options_array['subsection_args']; |
49 | - }else{ |
|
49 | + } else{ |
|
50 | 50 | $subsection_args = array(); |
51 | 51 | } |
52 | 52 | |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | if(isset($subsection_args[$relation_name]) && |
102 | 102 | isset($subsection_args[$relation_name]['model_objects'])){ |
103 | 103 | $model_objects = $subsection_args[$relation_name]['model_objects']; |
104 | - }else{ |
|
104 | + } else{ |
|
105 | 105 | $model_objects = $relation_obj->get_other_model()->get_all(); |
106 | 106 | } |
107 | 107 | $input = new EE_Select_Multi_Model_Input($model_objects,$input_constructor_args); |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | $models_pointed_to = $model_field instanceof EE_Field_With_Model_Name ? $model_field->get_model_class_names_pointed_to() : array(); |
164 | 164 | if(true || is_array($models_pointed_to) && count($models_pointed_to) > 1){ |
165 | 165 | $input_class = 'EE_Text_Input'; |
166 | - }else{ |
|
166 | + } else{ |
|
167 | 167 | //so its just one model |
168 | 168 | $model_name = is_array($models_pointed_to) ? reset($models_pointed_to) : $models_pointed_to; |
169 | 169 | $model = EE_Registry::instance()->load_model($model_name); |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | //then we only expect there to be one |
256 | 256 | $related_item = $this->_model_object->get_first_related($relation_name); |
257 | 257 | $defaults[$relation_name] = $related_item->ID(); |
258 | - }else{ |
|
258 | + } else{ |
|
259 | 259 | $related_items = $this->_model_object->get_many_related($relation_name); |
260 | 260 | $ids = array(); |
261 | 261 | foreach($related_items as $related_item){ |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | $model_obj = $this->_model->get_one_by_ID($this->get_input_value($pk_name)); |
306 | 306 | if($model_obj){ |
307 | 307 | $this->_model_object = $model_obj; |
308 | - }else{ |
|
308 | + } else{ |
|
309 | 309 | $this->_model_object = EE_Registry::instance()->load_class($this->_model->get_this_model_name() ); |
310 | 310 | } |
311 | 311 | } |
@@ -356,19 +356,19 @@ discard block |
||
356 | 356 | if($relation_obj instanceof EE_Belongs_To_Relation){ |
357 | 357 | //there is just a foreign key on this model pointing to that one |
358 | 358 | $this->_model_object->_add_relation_to($this->get_input_value($relation_name), $relation_name); |
359 | - }elseif($relation_obj instanceof EE_Has_Many_Relation){ |
|
359 | + } elseif($relation_obj instanceof EE_Has_Many_Relation){ |
|
360 | 360 | //then we want to consider all of its currently-related things. |
361 | 361 | //if they're in this list, keep them |
362 | 362 | //if they're not in this list, remove them |
363 | 363 | //and lastly add all the new items |
364 | 364 | throw new EE_Error(sprintf(__('Automatic saving of related info across a "has many" relation is not yet supported', "event_espresso"))); |
365 | - }elseif($relation_obj instanceof EE_HABTM_Relation){ |
|
365 | + } elseif($relation_obj instanceof EE_HABTM_Relation){ |
|
366 | 366 | //delete everything NOT in this list |
367 | 367 | $normalized_input_value = $this->get_input_value($relation_name); |
368 | 368 | if($normalized_input_value && is_array($normalized_input_value)){ |
369 | 369 | $where_query_params = array( |
370 | 370 | $relation_obj->get_other_model()->primary_key_name() => array('NOT_IN',$normalized_input_value)); |
371 | - }else{ |
|
371 | + } else{ |
|
372 | 372 | $where_query_params = array(); |
373 | 373 | } |
374 | 374 | $this->_model_object->_remove_relations( $relation_name, $where_query_params ); |
@@ -101,7 +101,7 @@ |
||
101 | 101 | |
102 | 102 | |
103 | 103 | /** |
104 | - * @param $payment_method_type |
|
104 | + * @param EE_PMT_Base $payment_method_type |
|
105 | 105 | * @throws EE_Error |
106 | 106 | */ |
107 | 107 | public function set_payment_method_type( $payment_method_type ){ |
@@ -4,7 +4,7 @@ discard block |
||
4 | 4 | * Specialized form for payment methods, allowing for easy setting and retrieving of meta fields. |
5 | 5 | * Uses EEM_Payment_Method as the model |
6 | 6 | */ |
7 | -class EE_Payment_Method_Form extends EE_Model_Form_Section{ |
|
7 | +class EE_Payment_Method_Form extends EE_Model_Form_Section { |
|
8 | 8 | |
9 | 9 | /** |
10 | 10 | * All the subsection inputs that correspond ot extra meta rows |
@@ -39,37 +39,37 @@ discard block |
||
39 | 39 | * @see EE_Model_Form_Section::__construct() for more |
40 | 40 | * } |
41 | 41 | */ |
42 | - public function __construct($options_array = array()){ |
|
42 | + public function __construct($options_array = array()) { |
|
43 | 43 | $this->_model = EEM_Payment_Method::instance(); |
44 | 44 | $this->_options_array = $options_array; |
45 | - if(isset($options_array['payment_method_type'])){ |
|
45 | + if (isset($options_array['payment_method_type'])) { |
|
46 | 46 | $this->_payment_method_type = $options_array['payment_method_type']; |
47 | 47 | } |
48 | 48 | $options_array = $this->_options_array; |
49 | - if(isset($options_array['extra_meta_inputs'])){ |
|
50 | - $this->_extra_meta_inputs = array_merge($this->_extra_meta_inputs,$options_array['extra_meta_inputs']); |
|
49 | + if (isset($options_array['extra_meta_inputs'])) { |
|
50 | + $this->_extra_meta_inputs = array_merge($this->_extra_meta_inputs, $options_array['extra_meta_inputs']); |
|
51 | 51 | } |
52 | - if($this->_extra_meta_inputs){ |
|
53 | - $this->_subsections = array_merge($this->_subsections,$this->_extra_meta_inputs); |
|
52 | + if ($this->_extra_meta_inputs) { |
|
53 | + $this->_subsections = array_merge($this->_subsections, $this->_extra_meta_inputs); |
|
54 | 54 | } |
55 | 55 | $this->_subsections['PMD_button_url'] = new EE_Admin_File_Uploader_Input( |
56 | - array( 'html_label_text'=> __( 'Button URL', 'event_espresso' )) |
|
56 | + array('html_label_text'=> __('Button URL', 'event_espresso')) |
|
57 | 57 | ); |
58 | 58 | $this->_subsections['PMD_scope'] = new EE_Checkbox_Multi_Input( |
59 | 59 | EEM_Payment_Method::instance()->scopes(), |
60 | - array( 'html_label_text' => $this->_model->field_settings_for('PMD_scope')->get_nicename() . EEH_Template::get_help_tab_link( 'payment_methods_overview' )) |
|
60 | + array('html_label_text' => $this->_model->field_settings_for('PMD_scope')->get_nicename().EEH_Template::get_help_tab_link('payment_methods_overview')) |
|
61 | 61 | ); |
62 | 62 | //setup the currency options |
63 | 63 | $this->_subsections['Currency'] = new EE_Select_Multi_Model_Input( |
64 | - EEM_Currency::instance()->get_all_currencies_usable_by( $this->_payment_method_type ), |
|
64 | + EEM_Currency::instance()->get_all_currencies_usable_by($this->_payment_method_type), |
|
65 | 65 | array( |
66 | - 'html_label_text'=> __( 'Currencies Supported', 'event_espresso' ), |
|
66 | + 'html_label_text'=> __('Currencies Supported', 'event_espresso'), |
|
67 | 67 | 'required'=>TRUE |
68 | 68 | ) |
69 | 69 | ); |
70 | - $this->_subsections['PMD_order'] = new EE_Text_Input( array( |
|
71 | - 'html_label_text' => __( 'Order', 'event_espresso' ), |
|
72 | - 'html_help_text' => __( 'Lowest numbers will be shown first', 'event_espresso' ), |
|
70 | + $this->_subsections['PMD_order'] = new EE_Text_Input(array( |
|
71 | + 'html_label_text' => __('Order', 'event_espresso'), |
|
72 | + 'html_help_text' => __('Lowest numbers will be shown first', 'event_espresso'), |
|
73 | 73 | 'normalization_strategy' => new EE_Int_Normalization(), |
74 | 74 | 'validation_strategies' => array( |
75 | 75 | new EE_Int_Validation_Strategy() |
@@ -88,15 +88,15 @@ discard block |
||
88 | 88 | * @param string $name |
89 | 89 | * @throws EE_Error |
90 | 90 | */ |
91 | - public function _construct_finalize( $parent_form_section, $name ) { |
|
92 | - if( ! $this->_payment_method_type instanceof EE_PMT_Base ){ |
|
93 | - throw new EE_Error( sprintf( __( 'Payment Method forms must have set their payment method type BEFORE calling _construct_finalize', 'event_espresso' ))); |
|
91 | + public function _construct_finalize($parent_form_section, $name) { |
|
92 | + if ( ! $this->_payment_method_type instanceof EE_PMT_Base) { |
|
93 | + throw new EE_Error(sprintf(__('Payment Method forms must have set their payment method type BEFORE calling _construct_finalize', 'event_espresso'))); |
|
94 | 94 | } |
95 | 95 | //set the name of this form based on the payment method type |
96 | - if( ! $this->_name && ! $name ){ |
|
97 | - $name = str_replace(" ","_",ucwords(str_replace("_"," ",($this->_payment_method_type->system_name()))))."_Settings_Form"; |
|
96 | + if ( ! $this->_name && ! $name) { |
|
97 | + $name = str_replace(" ", "_", ucwords(str_replace("_", " ", ($this->_payment_method_type->system_name()))))."_Settings_Form"; |
|
98 | 98 | } |
99 | - parent::_construct_finalize( $parent_form_section, $name ); |
|
99 | + parent::_construct_finalize($parent_form_section, $name); |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | |
@@ -105,8 +105,8 @@ discard block |
||
105 | 105 | * @param $payment_method_type |
106 | 106 | * @throws EE_Error |
107 | 107 | */ |
108 | - public function set_payment_method_type( $payment_method_type ){ |
|
109 | - if( ! $payment_method_type instanceof EE_PMT_Base){ |
|
108 | + public function set_payment_method_type($payment_method_type) { |
|
109 | + if ( ! $payment_method_type instanceof EE_PMT_Base) { |
|
110 | 110 | throw new EE_Error(sprintf(__("Payment Method forms MUST set a payment method type by using _set_payment_method_type", "event_espresso"))); |
111 | 111 | } |
112 | 112 | $this->_payment_method_type = $payment_method_type; |
@@ -118,10 +118,10 @@ discard block |
||
118 | 118 | * extends the model form section's save method to also save the extra meta field values |
119 | 119 | * @return int ID of the payment method inserted, or true on update |
120 | 120 | */ |
121 | - public function save(){ |
|
121 | + public function save() { |
|
122 | 122 | $parent_save_val = parent::save(); |
123 | - if( $this->_model_object && $this->_model_object->ID()){ |
|
124 | - foreach($this->_extra_meta_inputs as $input_name => $input){ |
|
123 | + if ($this->_model_object && $this->_model_object->ID()) { |
|
124 | + foreach ($this->_extra_meta_inputs as $input_name => $input) { |
|
125 | 125 | $this->_model_object->update_extra_meta($input_name, $input->normalized_value()); |
126 | 126 | } |
127 | 127 | } |
@@ -138,8 +138,8 @@ discard block |
||
138 | 138 | $model_obj = $this->_model->ensure_is_obj($model_obj); |
139 | 139 | parent::populate_model_obj($model_obj); |
140 | 140 | $extra_meta = $model_obj->all_extra_meta_array(); |
141 | - foreach($this->_extra_meta_inputs as $input_name => $extra_meta_input){ |
|
142 | - if(isset($extra_meta[$input_name])){ |
|
141 | + foreach ($this->_extra_meta_inputs as $input_name => $extra_meta_input) { |
|
142 | + if (isset($extra_meta[$input_name])) { |
|
143 | 143 | $extra_meta_input->set_default($extra_meta[$input_name]); |
144 | 144 | } |
145 | 145 | } |
@@ -151,10 +151,10 @@ discard block |
||
151 | 151 | * gets the default name of this form section if none is specified |
152 | 152 | * @return string |
153 | 153 | */ |
154 | - protected function _set_default_name_if_empty(){ |
|
155 | - if( ! $this->_name ){ |
|
156 | - $default_name = str_replace("EEM_", "", get_class($this->_model)) . "_Model_Form"; |
|
157 | - $this->_name = $default_name; |
|
154 | + protected function _set_default_name_if_empty() { |
|
155 | + if ( ! $this->_name) { |
|
156 | + $default_name = str_replace("EEM_", "", get_class($this->_model))."_Model_Form"; |
|
157 | + $this->_name = $default_name; |
|
158 | 158 | } |
159 | 159 | } |
160 | 160 | |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | * Gets all the extra meta inputs in this form |
165 | 165 | * @return EE_Form_Input_Base[] |
166 | 166 | */ |
167 | - public function extra_meta_inputs(){ |
|
167 | + public function extra_meta_inputs() { |
|
168 | 168 | return $this->_extra_meta_inputs; |
169 | 169 | } |
170 | 170 | } |
@@ -80,7 +80,7 @@ |
||
80 | 80 | /** |
81 | 81 | * Checks if that value is the one selected |
82 | 82 | * @param string|int $value unnormalized value option (string) |
83 | - * @return string |
|
83 | + * @return boolean |
|
84 | 84 | */ |
85 | 85 | protected function _check_if_option_selected( $value ){ |
86 | 86 | return $this->_input->raw_value() == $value ? TRUE : FALSE; |
@@ -11,47 +11,47 @@ discard block |
||
11 | 11 | * @since $VID:$ |
12 | 12 | * |
13 | 13 | */ |
14 | -class EE_Select_Display_Strategy extends EE_Display_Strategy_Base{ |
|
14 | +class EE_Select_Display_Strategy extends EE_Display_Strategy_Base { |
|
15 | 15 | |
16 | 16 | /** |
17 | 17 | * |
18 | 18 | * @throws EE_Error |
19 | 19 | * @return string of html to display the field |
20 | 20 | */ |
21 | - function display(){ |
|
22 | - if( ! $this->_input instanceof EE_Form_Input_With_Options_Base){ |
|
23 | - throw new EE_Error( sprintf( __( 'Cannot use Select Display Strategy with an input that doesn\'t have options', 'event_espresso' ))); |
|
21 | + function display() { |
|
22 | + if ( ! $this->_input instanceof EE_Form_Input_With_Options_Base) { |
|
23 | + throw new EE_Error(sprintf(__('Cannot use Select Display Strategy with an input that doesn\'t have options', 'event_espresso'))); |
|
24 | 24 | } |
25 | 25 | EE_Registry::instance()->load_helper('Array'); |
26 | 26 | |
27 | - $html = EEH_HTML::nl( 0, 'select' ); |
|
27 | + $html = EEH_HTML::nl(0, 'select'); |
|
28 | 28 | $html .= '<select'; |
29 | - $html .= ' id="' . $this->_input->html_id() . '"'; |
|
30 | - $html .= ' name="' . $this->_input->html_name() . '"'; |
|
31 | - $class = $this->_input->required() ? $this->_input->required_css_class() . ' ' . $this->_input->html_class() : $this->_input->html_class(); |
|
32 | - $html .= ' class="' . $class . '"'; |
|
29 | + $html .= ' id="'.$this->_input->html_id().'"'; |
|
30 | + $html .= ' name="'.$this->_input->html_name().'"'; |
|
31 | + $class = $this->_input->required() ? $this->_input->required_css_class().' '.$this->_input->html_class() : $this->_input->html_class(); |
|
32 | + $html .= ' class="'.$class.'"'; |
|
33 | 33 | // add html5 required |
34 | 34 | |
35 | 35 | $html .= $this->_input->required() ? ' required' : ''; |
36 | - $html .= ' style="' . $this->_input->html_style() . '"'; |
|
36 | + $html .= ' style="'.$this->_input->html_style().'"'; |
|
37 | 37 | $html .= '>'; |
38 | 38 | |
39 | 39 | // EEH_HTML::indent( 1, 'select' ); |
40 | - if ( EEH_Array::is_multi_dimensional_array( $this->_input->options() )) { |
|
41 | - EEH_HTML::indent( 1, 'optgroup' ); |
|
42 | - foreach( $this->_input->options() as $opt_group_label => $opt_group ){ |
|
43 | - $html .= EEH_HTML::nl( 0, 'optgroup' ) . '<optgroup label="' . esc_attr( $opt_group_label ) . '">'; |
|
44 | - EEH_HTML::indent( 1, 'option' ); |
|
45 | - $html .= $this->_display_options( $opt_group ); |
|
40 | + if (EEH_Array::is_multi_dimensional_array($this->_input->options())) { |
|
41 | + EEH_HTML::indent(1, 'optgroup'); |
|
42 | + foreach ($this->_input->options() as $opt_group_label => $opt_group) { |
|
43 | + $html .= EEH_HTML::nl(0, 'optgroup').'<optgroup label="'.esc_attr($opt_group_label).'">'; |
|
44 | + EEH_HTML::indent(1, 'option'); |
|
45 | + $html .= $this->_display_options($opt_group); |
|
46 | 46 | $html .= EEH_HTML::indent( -1, 'option' ); |
47 | - $html .= EEH_HTML::nl( 0, 'optgroup' ) . '</optgroup>'; |
|
47 | + $html .= EEH_HTML::nl(0, 'optgroup').'</optgroup>'; |
|
48 | 48 | } |
49 | 49 | EEH_HTML::indent( -1, 'optgroup' ); |
50 | 50 | } else { |
51 | - $html.=$this->_display_options( $this->_input->options() ); |
|
51 | + $html .= $this->_display_options($this->_input->options()); |
|
52 | 52 | } |
53 | 53 | |
54 | - $html.= EEH_HTML::nl( 0, 'select' ) . '</select>'; |
|
54 | + $html .= EEH_HTML::nl(0, 'select').'</select>'; |
|
55 | 55 | // $html.= EEH_HTML::nl( -1, 'select' ) . '</select>'; |
56 | 56 | return $html; |
57 | 57 | } |
@@ -63,13 +63,13 @@ discard block |
||
63 | 63 | * @param array $options |
64 | 64 | * @return string |
65 | 65 | */ |
66 | - protected function _display_options($options){ |
|
66 | + protected function _display_options($options) { |
|
67 | 67 | $html = ''; |
68 | - EEH_HTML::indent( 1, 'option' ); |
|
69 | - foreach( $options as $value => $display_text ){ |
|
70 | - $unnormalized_value = $this->_input->get_normalization_strategy()->unnormalize_one( $value ); |
|
71 | - $selected = $this->_check_if_option_selected( $unnormalized_value ) ? ' selected="selected"' : ''; |
|
72 | - $html.= EEH_HTML::nl( 0, 'option' ) . '<option value="' . esc_attr( $unnormalized_value ) . '"' . $selected . '>' . $display_text . '</option>'; |
|
68 | + EEH_HTML::indent(1, 'option'); |
|
69 | + foreach ($options as $value => $display_text) { |
|
70 | + $unnormalized_value = $this->_input->get_normalization_strategy()->unnormalize_one($value); |
|
71 | + $selected = $this->_check_if_option_selected($unnormalized_value) ? ' selected="selected"' : ''; |
|
72 | + $html .= EEH_HTML::nl(0, 'option').'<option value="'.esc_attr($unnormalized_value).'"'.$selected.'>'.$display_text.'</option>'; |
|
73 | 73 | } |
74 | 74 | EEH_HTML::indent( -1, 'option' ); |
75 | 75 | return $html; |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | * @param string|int $value unnormalized value option (string) |
83 | 83 | * @return string |
84 | 84 | */ |
85 | - protected function _check_if_option_selected( $value ){ |
|
85 | + protected function _check_if_option_selected($value) { |
|
86 | 86 | return $this->_input->raw_value() == $value ? TRUE : FALSE; |
87 | 87 | } |
88 | 88 |
@@ -11,7 +11,7 @@ |
||
11 | 11 | |
12 | 12 | /** |
13 | 13 | * @param string $value_to_normalize |
14 | - * @return int|mixed|string |
|
14 | + * @return integer |
|
15 | 15 | * @throws \EE_Validation_Error |
16 | 16 | */ |
17 | 17 | public function normalize($value_to_normalize) { |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | * @subpackage |
8 | 8 | * @author Mike Nelson |
9 | 9 | */ |
10 | -class EE_Int_Normalization extends EE_Normalization_Strategy_Base{ |
|
10 | +class EE_Int_Normalization extends EE_Normalization_Strategy_Base { |
|
11 | 11 | |
12 | 12 | /** |
13 | 13 | * @param string $value_to_normalize |
@@ -15,33 +15,33 @@ discard block |
||
15 | 15 | * @throws \EE_Validation_Error |
16 | 16 | */ |
17 | 17 | public function normalize($value_to_normalize) { |
18 | - if( is_int( $value_to_normalize ) ){ |
|
18 | + if (is_int($value_to_normalize)) { |
|
19 | 19 | return $value_to_normalize; |
20 | 20 | } |
21 | - if( ! is_string( $value_to_normalize )){ |
|
22 | - throw new EE_Validation_Error( sprintf( __( 'The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso' ), print_r( $value_to_normalize, TRUE), gettype( $value_to_normalize ) ) ); |
|
21 | + if ( ! is_string($value_to_normalize)) { |
|
22 | + throw new EE_Validation_Error(sprintf(__('The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso'), print_r($value_to_normalize, TRUE), gettype($value_to_normalize))); |
|
23 | 23 | } |
24 | 24 | $thousands_separator = EE_Config::instance()->currency->thsnds; |
25 | - $value_to_normalize = str_replace( $thousands_separator, "", $value_to_normalize ); |
|
26 | - $value_to_normalize = str_replace( array(" ","\t"), '', $value_to_normalize ); |
|
27 | - if ( preg_match( '/^\d+$/', $value_to_normalize )) { |
|
28 | - return intval( $value_to_normalize ); |
|
25 | + $value_to_normalize = str_replace($thousands_separator, "", $value_to_normalize); |
|
26 | + $value_to_normalize = str_replace(array(" ", "\t"), '', $value_to_normalize); |
|
27 | + if (preg_match('/^\d+$/', $value_to_normalize)) { |
|
28 | + return intval($value_to_normalize); |
|
29 | 29 | } else { |
30 | 30 | //find if this input has a int validation strategy |
31 | 31 | //in which case, use its message |
32 | 32 | $validation_error_message = NULL; |
33 | - foreach( $this->_input->get_validation_strategies() as $validation_strategy ){ |
|
34 | - if( $validation_strategy instanceof EE_Int_Validation_Strategy ){ |
|
33 | + foreach ($this->_input->get_validation_strategies() as $validation_strategy) { |
|
34 | + if ($validation_strategy instanceof EE_Int_Validation_Strategy) { |
|
35 | 35 | $validation_error_message = $validation_strategy->get_validation_error_message(); |
36 | 36 | } |
37 | 37 | } |
38 | 38 | //this really shouldn't ever happen because fields with a int normalization strategy |
39 | 39 | //should also have a int validation strategy, but in case it doesnt use the default |
40 | - if( ! $validation_error_message ){ |
|
40 | + if ( ! $validation_error_message) { |
|
41 | 41 | $default_validation_strategy = new EE_Int_Validation_Strategy(); |
42 | 42 | $validation_error_message = $default_validation_strategy->get_validation_error_message(); |
43 | 43 | } |
44 | - throw new EE_Validation_Error( $validation_error_message, 'numeric_only' ); |
|
44 | + throw new EE_Validation_Error($validation_error_message, 'numeric_only'); |
|
45 | 45 | } |
46 | 46 | } |
47 | 47 | |
@@ -50,10 +50,10 @@ discard block |
||
50 | 50 | * @param int $normalized_value |
51 | 51 | * @return string |
52 | 52 | */ |
53 | - public function unnormalize( $normalized_value ) { |
|
54 | - if( empty( $normalized_value ) ){ |
|
53 | + public function unnormalize($normalized_value) { |
|
54 | + if (empty($normalized_value)) { |
|
55 | 55 | return '0'; |
56 | - }else{ |
|
56 | + } else { |
|
57 | 57 | return "$normalized_value"; |
58 | 58 | } |
59 | 59 | } |
@@ -90,7 +90,7 @@ |
||
90 | 90 | //so in case teh IPN is arriving later, let's try to process an IPN! |
91 | 91 | if($_SERVER['REQUEST_METHOD'] == 'POST'){ |
92 | 92 | return $this->handle_ipn($_POST, $transaction ); |
93 | - }else{ |
|
93 | + } else{ |
|
94 | 94 | return parent::finalize_payment_for( $transaction ); |
95 | 95 | } |
96 | 96 | } |
@@ -27,7 +27,7 @@ |
||
27 | 27 | /** |
28 | 28 | * Applies all teh individual item validation strategies on each item in the array |
29 | 29 | * @param array $normalized_value |
30 | - * @return boolean |
|
30 | + * @return boolean|null |
|
31 | 31 | */ |
32 | 32 | function validate($normalized_value) { |
33 | 33 | if( is_array($normalized_value)){ |
@@ -11,14 +11,14 @@ discard block |
||
11 | 11 | * @since 4.6 |
12 | 12 | * |
13 | 13 | */ |
14 | -class EE_Many_Valued_Validation_Strategy extends EE_Validation_Strategy_Base{ |
|
14 | +class EE_Many_Valued_Validation_Strategy extends EE_Validation_Strategy_Base { |
|
15 | 15 | protected $_individual_item_validation_strategies = array(); |
16 | 16 | /** |
17 | 17 | * |
18 | 18 | * @param EE_Validation_Strategy_Base[] $individual_item_validation_strategies (or a single EE_Validation_Strategy_Base) |
19 | 19 | */ |
20 | 20 | public function __construct($individual_item_validation_strategies) { |
21 | - if( ! is_array($individual_item_validation_strategies)){ |
|
21 | + if ( ! is_array($individual_item_validation_strategies)) { |
|
22 | 22 | $individual_item_validation_strategies = array($individual_item_validation_strategies); |
23 | 23 | } |
24 | 24 | $this->_individual_item_validation_strategies = $individual_item_validation_strategies; |
@@ -30,14 +30,14 @@ discard block |
||
30 | 30 | * @return boolean |
31 | 31 | */ |
32 | 32 | function validate($normalized_value) { |
33 | - if( is_array($normalized_value)){ |
|
33 | + if (is_array($normalized_value)) { |
|
34 | 34 | $items_to_validate = $normalized_value; |
35 | - }else{ |
|
35 | + } else { |
|
36 | 36 | $items_to_validate = array($normalized_value); |
37 | 37 | } |
38 | - foreach($items_to_validate as $individual_item){ |
|
39 | - foreach($this->_individual_item_validation_strategies as $validation_strategy){ |
|
40 | - if ( $validation_strategy instanceof EE_Validation_Strategy_Base ) { |
|
38 | + foreach ($items_to_validate as $individual_item) { |
|
39 | + foreach ($this->_individual_item_validation_strategies as $validation_strategy) { |
|
40 | + if ($validation_strategy instanceof EE_Validation_Strategy_Base) { |
|
41 | 41 | $validation_strategy->validate($individual_item); |
42 | 42 | } |
43 | 43 | } |
@@ -50,8 +50,8 @@ discard block |
||
50 | 50 | */ |
51 | 51 | function _construct_finalize(\EE_Form_Input_Base $form_input) { |
52 | 52 | parent::_construct_finalize($form_input); |
53 | - foreach($this->_individual_item_validation_strategies as $item_validation_strategy){ |
|
54 | - if ( $item_validation_strategy instanceof EE_Validation_Strategy_Base ) { |
|
53 | + foreach ($this->_individual_item_validation_strategies as $item_validation_strategy) { |
|
54 | + if ($item_validation_strategy instanceof EE_Validation_Strategy_Base) { |
|
55 | 55 | $item_validation_strategy->_construct_finalize($form_input); |
56 | 56 | } |
57 | 57 | } |
@@ -90,7 +90,7 @@ |
||
90 | 90 | //so in case teh IPN is arriving later, let's try to process an IPN! |
91 | 91 | if($_SERVER['REQUEST_METHOD'] == 'POST'){ |
92 | 92 | return $this->handle_ipn($_POST, $transaction ); |
93 | - }else{ |
|
93 | + } else{ |
|
94 | 94 | return parent::finalize_payment_for( $transaction ); |
95 | 95 | } |
96 | 96 | } |
@@ -1,16 +1,16 @@ |
||
1 | 1 | <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); } |
2 | 2 | /** |
3 | - * Class EE_Many_Valued_Validation_Strategy |
|
4 | - * |
|
5 | - * For validation on an input which has an ARRAY of values, instead of a single value. The |
|
6 | - * individual item validation strategies will be applied to EACH item in the array |
|
7 | - * |
|
8 | - * @package Event Espresso |
|
9 | - * @subpackage core |
|
10 | - * @author Mike Nelson |
|
11 | - * @since 4.6 |
|
12 | - * |
|
13 | - */ |
|
3 | + * Class EE_Many_Valued_Validation_Strategy |
|
4 | + * |
|
5 | + * For validation on an input which has an ARRAY of values, instead of a single value. The |
|
6 | + * individual item validation strategies will be applied to EACH item in the array |
|
7 | + * |
|
8 | + * @package Event Espresso |
|
9 | + * @subpackage core |
|
10 | + * @author Mike Nelson |
|
11 | + * @since 4.6 |
|
12 | + * |
|
13 | + */ |
|
14 | 14 | class EE_Many_Valued_Validation_Strategy extends EE_Validation_Strategy_Base{ |
15 | 15 | protected $_individual_item_validation_strategies = array(); |
16 | 16 | /** |
@@ -10,6 +10,10 @@ |
||
10 | 10 | class EE_Text_Validation_Strategy extends EE_Validation_Strategy_Base{ |
11 | 11 | |
12 | 12 | protected $_regex = null; |
13 | + |
|
14 | + /** |
|
15 | + * @param string $regex |
|
16 | + */ |
|
13 | 17 | public function __construct( $validation_error_message = NULL, $regex = null ) { |
14 | 18 | $this->_regex = $regex; |
15 | 19 | parent::__construct( $validation_error_message ); |
@@ -7,21 +7,21 @@ discard block |
||
7 | 7 | * @subpackage Expression package is undefined on line 19, column 19 in Templates/Scripting/PHPClass.php. |
8 | 8 | * @author Mike Nelson |
9 | 9 | */ |
10 | -class EE_Text_Validation_Strategy extends EE_Validation_Strategy_Base{ |
|
10 | +class EE_Text_Validation_Strategy extends EE_Validation_Strategy_Base { |
|
11 | 11 | |
12 | 12 | protected $_regex = null; |
13 | - public function __construct( $validation_error_message = NULL, $regex = null ) { |
|
13 | + public function __construct($validation_error_message = NULL, $regex = null) { |
|
14 | 14 | $this->_regex = $regex; |
15 | - parent::__construct( $validation_error_message ); |
|
15 | + parent::__construct($validation_error_message); |
|
16 | 16 | } |
17 | 17 | |
18 | 18 | /** |
19 | 19 | * @param $normalized_value |
20 | 20 | */ |
21 | 21 | public function validate($normalized_value) { |
22 | - if( $this->_regex && $normalized_value) { |
|
23 | - if( ! preg_match( $this->_regex, $normalized_value ) ) { |
|
24 | - throw new EE_Validation_Error( $this->get_validation_error_message(), 'regex' ); |
|
22 | + if ($this->_regex && $normalized_value) { |
|
23 | + if ( ! preg_match($this->_regex, $normalized_value)) { |
|
24 | + throw new EE_Validation_Error($this->get_validation_error_message(), 'regex'); |
|
25 | 25 | } |
26 | 26 | } |
27 | 27 | } |
@@ -29,10 +29,10 @@ discard block |
||
29 | 29 | /** |
30 | 30 | * @return array |
31 | 31 | */ |
32 | - function get_jquery_validation_rule_array(){ |
|
33 | - if( $this->_regex !== null ){ |
|
34 | - return array( 'regex'=> $this->regex_js(), 'messages' => array( 'regex' => $this->get_validation_error_message() ) ); |
|
35 | - }else{ |
|
32 | + function get_jquery_validation_rule_array() { |
|
33 | + if ($this->_regex !== null) { |
|
34 | + return array('regex'=> $this->regex_js(), 'messages' => array('regex' => $this->get_validation_error_message())); |
|
35 | + } else { |
|
36 | 36 | return array(); |
37 | 37 | } |
38 | 38 | |
@@ -46,8 +46,8 @@ discard block |
||
46 | 46 | function regex_js() { |
47 | 47 | //first character must be the delimiter |
48 | 48 | $delimeter = $this->_regex[0]; |
49 | - $last_occurence_of_delimieter = strrpos($this->_regex, $delimeter ); |
|
50 | - return substr( $this->_regex, 1, $last_occurence_of_delimieter - 1 ); |
|
49 | + $last_occurence_of_delimieter = strrpos($this->_regex, $delimeter); |
|
50 | + return substr($this->_regex, 1, $last_occurence_of_delimieter - 1); |
|
51 | 51 | } |
52 | 52 | } |
53 | 53 |
@@ -90,7 +90,7 @@ |
||
90 | 90 | //so in case teh IPN is arriving later, let's try to process an IPN! |
91 | 91 | if($_SERVER['REQUEST_METHOD'] == 'POST'){ |
92 | 92 | return $this->handle_ipn($_POST, $transaction ); |
93 | - }else{ |
|
93 | + } else{ |
|
94 | 94 | return parent::finalize_payment_for( $transaction ); |
95 | 95 | } |
96 | 96 | } |
@@ -26,7 +26,7 @@ |
||
26 | 26 | * just checks the field isn't blank |
27 | 27 | * |
28 | 28 | * @param $normalized_value |
29 | - * @return bool |
|
29 | + * @return boolean|null |
|
30 | 30 | * @throws \EE_Validation_Error |
31 | 31 | */ |
32 | 32 | function validate($normalized_value) { |
@@ -8,16 +8,16 @@ discard block |
||
8 | 8 | * @since 4.6 |
9 | 9 | * |
10 | 10 | */ |
11 | -class EE_URL_Validation_Strategy extends EE_Validation_Strategy_Base{ |
|
11 | +class EE_URL_Validation_Strategy extends EE_Validation_Strategy_Base { |
|
12 | 12 | |
13 | 13 | /** |
14 | 14 | * @param null $validation_error_message |
15 | 15 | */ |
16 | - public function __construct( $validation_error_message = NULL ) { |
|
17 | - if( ! $validation_error_message ){ |
|
16 | + public function __construct($validation_error_message = NULL) { |
|
17 | + if ( ! $validation_error_message) { |
|
18 | 18 | $validation_error_message = __("Please enter a valid URL", "event_espresso"); |
19 | 19 | } |
20 | - parent::__construct( $validation_error_message ); |
|
20 | + parent::__construct($validation_error_message); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | |
@@ -30,17 +30,17 @@ discard block |
||
30 | 30 | * @throws \EE_Validation_Error |
31 | 31 | */ |
32 | 32 | function validate($normalized_value) { |
33 | - if( $normalized_value ){ |
|
34 | - if (filter_var($normalized_value, FILTER_VALIDATE_URL) === false){ |
|
35 | - throw new EE_Validation_Error( $this->get_validation_error_message(), 'invalid_url'); |
|
36 | - }else{ |
|
33 | + if ($normalized_value) { |
|
34 | + if (filter_var($normalized_value, FILTER_VALIDATE_URL) === false) { |
|
35 | + throw new EE_Validation_Error($this->get_validation_error_message(), 'invalid_url'); |
|
36 | + } else { |
|
37 | 37 | EE_Registry::instance()->load_helper('URL'); |
38 | - if( ! EEH_URL::remote_file_exists( |
|
38 | + if ( ! EEH_URL::remote_file_exists( |
|
39 | 39 | $normalized_value, |
40 | 40 | array( |
41 | 41 | 'sslverify' => false, |
42 | - 'limit_response_size' => 4095,//we don't really care for a full response, but we do want headers at least. Lets just ask for a one block |
|
43 | - ))){ |
|
42 | + 'limit_response_size' => 4095, //we don't really care for a full response, but we do want headers at least. Lets just ask for a one block |
|
43 | + ))) { |
|
44 | 44 | throw new EE_Validation_Error(sprintf(__("That URL seems to be broken. Please enter a valid URL", "event_espresso"))); |
45 | 45 | } |
46 | 46 | } |
@@ -52,8 +52,8 @@ discard block |
||
52 | 52 | /** |
53 | 53 | * @return array |
54 | 54 | */ |
55 | - function get_jquery_validation_rule_array(){ |
|
56 | - return array( 'validUrl'=>true, 'messages' => array( 'validUrl' => $this->get_validation_error_message() ) ); |
|
55 | + function get_jquery_validation_rule_array() { |
|
56 | + return array('validUrl'=>true, 'messages' => array('validUrl' => $this->get_validation_error_message())); |
|
57 | 57 | } |
58 | 58 | } |
59 | 59 |
@@ -33,7 +33,7 @@ |
||
33 | 33 | if( $normalized_value ){ |
34 | 34 | if (filter_var($normalized_value, FILTER_VALIDATE_URL) === false){ |
35 | 35 | throw new EE_Validation_Error( $this->get_validation_error_message(), 'invalid_url'); |
36 | - }else{ |
|
36 | + } else{ |
|
37 | 37 | EE_Registry::instance()->load_helper('URL'); |
38 | 38 | if( ! EEH_URL::remote_file_exists( |
39 | 39 | $normalized_value, |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | /** |
56 | 56 | * @param EE_Line_Item $line_item |
57 | 57 | * @param array $options |
58 | - * @return mixed |
|
58 | + * @return string |
|
59 | 59 | */ |
60 | 60 | public function display_line_item( EE_Line_Item $line_item, $options = array() ) { |
61 | 61 | |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | * |
136 | 136 | * @param EE_Line_Item $line_item |
137 | 137 | * @param array $options |
138 | - * @return mixed |
|
138 | + * @return string |
|
139 | 139 | */ |
140 | 140 | private function _item_row( EE_Line_Item $line_item, $options = array() ) { |
141 | 141 | // start of row |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | * |
179 | 179 | * @param EE_Line_Item $line_item |
180 | 180 | * @param array $options |
181 | - * @return mixed |
|
181 | + * @return string |
|
182 | 182 | */ |
183 | 183 | private function _sub_item_row( EE_Line_Item $line_item, $options = array() ) { |
184 | 184 | // start of row |
@@ -1,16 +1,16 @@ |
||
1 | 1 | <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); } |
2 | 2 | /** |
3 | - * |
|
4 | - * Class EE_Default_Line_Item_Display_Strategy |
|
5 | - * |
|
6 | - * Description |
|
7 | - * |
|
8 | - * @package Event Espresso |
|
9 | - * @subpackage core |
|
10 | - * @author Brent Christensen |
|
11 | - * @since $VID:$ |
|
12 | - * |
|
13 | - */ |
|
3 | + * |
|
4 | + * Class EE_Default_Line_Item_Display_Strategy |
|
5 | + * |
|
6 | + * Description |
|
7 | + * |
|
8 | + * @package Event Espresso |
|
9 | + * @subpackage core |
|
10 | + * @author Brent Christensen |
|
11 | + * @since $VID:$ |
|
12 | + * |
|
13 | + */ |
|
14 | 14 | |
15 | 15 | class EE_Default_Line_Item_Display_Strategy implements EEI_Line_Item_Display { |
16 | 16 |
@@ -57,32 +57,32 @@ discard block |
||
57 | 57 | * @param array $options |
58 | 58 | * @return mixed |
59 | 59 | */ |
60 | - public function display_line_item( EE_Line_Item $line_item, $options = array() ) { |
|
60 | + public function display_line_item(EE_Line_Item $line_item, $options = array()) { |
|
61 | 61 | |
62 | - EE_Registry::instance()->load_helper( 'Template' ); |
|
63 | - EE_Registry::instance()->load_helper( 'HTML' ); |
|
62 | + EE_Registry::instance()->load_helper('Template'); |
|
63 | + EE_Registry::instance()->load_helper('HTML'); |
|
64 | 64 | |
65 | 65 | $html = ''; |
66 | 66 | // set some default options and merge with incoming |
67 | 67 | $default_options = array( |
68 | - 'show_desc' => TRUE, // TRUE FALSE |
|
68 | + 'show_desc' => TRUE, // TRUE FALSE |
|
69 | 69 | 'odd' => FALSE |
70 | 70 | ); |
71 | - $options = array_merge( $default_options, (array)$options ); |
|
71 | + $options = array_merge($default_options, (array) $options); |
|
72 | 72 | |
73 | - switch( $line_item->type() ) { |
|
73 | + switch ($line_item->type()) { |
|
74 | 74 | |
75 | 75 | case EEM_Line_Item::type_line_item: |
76 | 76 | // item row |
77 | - $html .= $this->_item_row( $line_item, $options ); |
|
77 | + $html .= $this->_item_row($line_item, $options); |
|
78 | 78 | // got any kids? |
79 | - foreach ( $line_item->children() as $child_line_item ) { |
|
80 | - $this->display_line_item( $child_line_item, $options ); |
|
79 | + foreach ($line_item->children() as $child_line_item) { |
|
80 | + $this->display_line_item($child_line_item, $options); |
|
81 | 81 | } |
82 | 82 | break; |
83 | 83 | |
84 | 84 | case EEM_Line_Item::type_sub_line_item: |
85 | - $html .= $this->_sub_item_row( $line_item, $options ); |
|
85 | + $html .= $this->_sub_item_row($line_item, $options); |
|
86 | 86 | break; |
87 | 87 | |
88 | 88 | case EEM_Line_Item::type_sub_total: |
@@ -93,10 +93,10 @@ discard block |
||
93 | 93 | break; |
94 | 94 | |
95 | 95 | case EEM_Line_Item::type_tax_sub_total: |
96 | - foreach ( $line_item->children() as $child_line_item ) { |
|
97 | - if ( $child_line_item->type() == EEM_Line_Item::type_tax ) { |
|
96 | + foreach ($line_item->children() as $child_line_item) { |
|
97 | + if ($child_line_item->type() == EEM_Line_Item::type_tax) { |
|
98 | 98 | // recursively feed children back into this method |
99 | - $this->display_line_item( $child_line_item, $options ); |
|
99 | + $this->display_line_item($child_line_item, $options); |
|
100 | 100 | } |
101 | 101 | } |
102 | 102 | break; |
@@ -104,20 +104,20 @@ discard block |
||
104 | 104 | case EEM_Line_Item::type_total: |
105 | 105 | // get all child line items |
106 | 106 | $children = $line_item->children(); |
107 | - if ( $options[ 'set_tax_rate' ] === true ) { |
|
107 | + if ($options['set_tax_rate'] === true) { |
|
108 | 108 | // loop thru tax child line items just to determine tax rate |
109 | - foreach ( $children as $child_line_item ) { |
|
110 | - if ( $child_line_item->type() == EEM_Line_Item::type_tax_sub_total ) { |
|
109 | + foreach ($children as $child_line_item) { |
|
110 | + if ($child_line_item->type() == EEM_Line_Item::type_tax_sub_total) { |
|
111 | 111 | // recursively feed children back into this method |
112 | - $this->display_line_item( $child_line_item, $options ); |
|
112 | + $this->display_line_item($child_line_item, $options); |
|
113 | 113 | } |
114 | 114 | } |
115 | 115 | } else { |
116 | 116 | // now loop thru all non-tax child line items |
117 | - foreach ( $children as $child_line_item ) { |
|
118 | - if ( $child_line_item->type() != EEM_Line_Item::type_tax_sub_total ) { |
|
117 | + foreach ($children as $child_line_item) { |
|
118 | + if ($child_line_item->type() != EEM_Line_Item::type_tax_sub_total) { |
|
119 | 119 | // recursively feed children back into this method |
120 | - $html .= $this->display_line_item( $child_line_item, $options ); |
|
120 | + $html .= $this->display_line_item($child_line_item, $options); |
|
121 | 121 | } |
122 | 122 | } |
123 | 123 | } |
@@ -137,10 +137,10 @@ discard block |
||
137 | 137 | * @param array $options |
138 | 138 | * @return mixed |
139 | 139 | */ |
140 | - private function _item_row( EE_Line_Item $line_item, $options = array() ) { |
|
140 | + private function _item_row(EE_Line_Item $line_item, $options = array()) { |
|
141 | 141 | // start of row |
142 | 142 | $row_class = $options['odd'] ? 'item odd' : 'item'; |
143 | - $html = EEH_HTML::tr( '', '', $row_class ); |
|
143 | + $html = EEH_HTML::tr('', '', $row_class); |
|
144 | 144 | // name && desc |
145 | 145 | $name_and_desc = apply_filters( |
146 | 146 | 'FHEE__EE_Default_Line_Item_Display_Strategy__item_row__name', |
@@ -149,22 +149,22 @@ discard block |
||
149 | 149 | ); |
150 | 150 | $name_and_desc .= apply_filters( |
151 | 151 | 'FHEE__EE_Default_Line_Item_Display_Strategy__item_row__desc', |
152 | - ( $options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: ' . $line_item->desc() . '</span>' : '' ), |
|
152 | + ($options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: '.$line_item->desc().'</span>' : ''), |
|
153 | 153 | $line_item, |
154 | 154 | $options |
155 | 155 | ); |
156 | - $name_and_desc .= $line_item->is_taxable() ? '<span class="smaller-text lt-grey-text" style="margin:0 0 0 2em;">' . __( ' * taxable item', 'event_espresso' ) . '</span>' : ''; |
|
156 | + $name_and_desc .= $line_item->is_taxable() ? '<span class="smaller-text lt-grey-text" style="margin:0 0 0 2em;">'.__(' * taxable item', 'event_espresso').'</span>' : ''; |
|
157 | 157 | // name td |
158 | - $html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l' ); |
|
158 | + $html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l' ); |
|
159 | 159 | // quantity td |
160 | - $html .= EEH_HTML::td( $line_item->quantity(), '', 'item_l jst-rght' ); |
|
161 | - $tax_rate = $line_item->is_taxable() ? 1 + ( $this->_tax_rate / 100 ) : 1; |
|
160 | + $html .= EEH_HTML::td($line_item->quantity(), '', 'item_l jst-rght'); |
|
161 | + $tax_rate = $line_item->is_taxable() ? 1 + ($this->_tax_rate / 100) : 1; |
|
162 | 162 | // price td |
163 | - $unit_price = EEH_Template::format_currency( $line_item->unit_price() * $tax_rate, false, false ); |
|
164 | - $html .= EEH_HTML::td( $unit_price, '', 'item_c jst-rght' ); |
|
163 | + $unit_price = EEH_Template::format_currency($line_item->unit_price() * $tax_rate, false, false); |
|
164 | + $html .= EEH_HTML::td($unit_price, '', 'item_c jst-rght'); |
|
165 | 165 | // total td |
166 | - $total = EEH_Template::format_currency( $line_item->unit_price() * $line_item->quantity() * $tax_rate, false, false ); |
|
167 | - $html .= EEH_HTML::td( $total, '', 'item_r jst-rght' ); |
|
166 | + $total = EEH_Template::format_currency($line_item->unit_price() * $line_item->quantity() * $tax_rate, false, false); |
|
167 | + $html .= EEH_HTML::td($total, '', 'item_r jst-rght'); |
|
168 | 168 | // end of row |
169 | 169 | $html .= EEH_HTML::trx(); |
170 | 170 | |
@@ -180,22 +180,22 @@ discard block |
||
180 | 180 | * @param array $options |
181 | 181 | * @return mixed |
182 | 182 | */ |
183 | - private function _sub_item_row( EE_Line_Item $line_item, $options = array() ) { |
|
183 | + private function _sub_item_row(EE_Line_Item $line_item, $options = array()) { |
|
184 | 184 | // start of row |
185 | - $html = EEH_HTML::tr( '', 'item sub-item-row' ); |
|
185 | + $html = EEH_HTML::tr('', 'item sub-item-row'); |
|
186 | 186 | // name && desc |
187 | 187 | $name_and_desc = $line_item->name(); |
188 | - $name_and_desc .= $options['show_desc'] ? '<span class="line-sub-item-desc-spn smaller-text">: ' . $line_item->desc() . '</span>' : ''; |
|
188 | + $name_and_desc .= $options['show_desc'] ? '<span class="line-sub-item-desc-spn smaller-text">: '.$line_item->desc().'</span>' : ''; |
|
189 | 189 | // name td |
190 | - $html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l sub-item' ); |
|
190 | + $html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l sub-item' ); |
|
191 | 191 | // discount/surcharge td |
192 | - if ( $line_item->is_percent() ) { |
|
193 | - $html .= EEH_HTML::td( $line_item->percent() . '%', '', 'item_c' ); |
|
192 | + if ($line_item->is_percent()) { |
|
193 | + $html .= EEH_HTML::td($line_item->percent().'%', '', 'item_c'); |
|
194 | 194 | } else { |
195 | - $html .= EEH_HTML::td( $line_item->unit_price_no_code(), '', 'item_c jst-rght' ); |
|
195 | + $html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'item_c jst-rght'); |
|
196 | 196 | } |
197 | 197 | // total td |
198 | - $html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'item_r jst-rght' ); |
|
198 | + $html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'item_r jst-rght'); |
|
199 | 199 | // end of row |
200 | 200 | $html .= EEH_HTML::trx(); |
201 | 201 | return $html; |