@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | * stating where the proper subsections should be placed (but usually leaving them to layout |
9 | 9 | * their own headers and footers etc). |
10 | 10 | */ |
11 | -abstract class EE_Form_Section_Layout_Base{ |
|
11 | +abstract class EE_Form_Section_Layout_Base { |
|
12 | 12 | |
13 | 13 | /** |
14 | 14 | * Form form section to lay out |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | /** |
22 | 22 | * __construct |
23 | 23 | */ |
24 | - function __construct(){ |
|
24 | + function __construct() { |
|
25 | 25 | EE_Registry::instance()->load_helper('HTML'); |
26 | 26 | } |
27 | 27 | |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | * The form section on which this strategy is to perform |
32 | 32 | * @param EE_Form_Section_Proper $form |
33 | 33 | */ |
34 | - function _construct_finalize(EE_Form_Section_Proper $form){ |
|
34 | + function _construct_finalize(EE_Form_Section_Proper $form) { |
|
35 | 35 | $this->_form_section = $form; |
36 | 36 | } |
37 | 37 | |
@@ -54,28 +54,28 @@ discard block |
||
54 | 54 | * Returns the HTML |
55 | 55 | * @return string HTML for displaying |
56 | 56 | */ |
57 | - function layout_form(){ |
|
57 | + function layout_form() { |
|
58 | 58 | $html = ''; |
59 | 59 | // layout_form_begin |
60 | 60 | $html .= apply_filters( |
61 | - 'FHEE__EE_Form_Section_Layout_Base__layout_form__start__for_' . $this->_form_section->name(), |
|
61 | + 'FHEE__EE_Form_Section_Layout_Base__layout_form__start__for_'.$this->_form_section->name(), |
|
62 | 62 | $this->layout_form_begin(), |
63 | 63 | $this->_form_section |
64 | 64 | ); |
65 | 65 | // layout_form_loop |
66 | 66 | $html .= apply_filters( |
67 | - 'FHEE__EE_Form_Section_Layout_Base__layout_form__loop__for_' . $this->_form_section->name(), |
|
67 | + 'FHEE__EE_Form_Section_Layout_Base__layout_form__loop__for_'.$this->_form_section->name(), |
|
68 | 68 | $this->layout_form_loop(), |
69 | 69 | $this->_form_section |
70 | 70 | ); |
71 | 71 | // layout_form_end |
72 | 72 | $html .= apply_filters( |
73 | - 'FHEE__EE_Form_Section_Layout_Base__layout_form__end__for_' . $this->_form_section->name(), |
|
73 | + 'FHEE__EE_Form_Section_Layout_Base__layout_form__end__for_'.$this->_form_section->name(), |
|
74 | 74 | $this->layout_form_end(), |
75 | 75 | $this->_form_section |
76 | 76 | ); |
77 | 77 | |
78 | - $html = $this->add_form_section_hooks_and_filters( $html ); |
|
78 | + $html = $this->add_form_section_hooks_and_filters($html); |
|
79 | 79 | return $html; |
80 | 80 | } |
81 | 81 | |
@@ -84,20 +84,20 @@ discard block |
||
84 | 84 | /** |
85 | 85 | * @return string |
86 | 86 | */ |
87 | - function layout_form_loop(){ |
|
87 | + function layout_form_loop() { |
|
88 | 88 | $html = ''; |
89 | - foreach( $this->_form_section->subsections() as $name => $subsection ){ |
|
90 | - if ( $subsection instanceof EE_Form_Input_Base ){ |
|
89 | + foreach ($this->_form_section->subsections() as $name => $subsection) { |
|
90 | + if ($subsection instanceof EE_Form_Input_Base) { |
|
91 | 91 | $html .= apply_filters( |
92 | - 'FHEE__EE_Form_Section_Layout_Base__layout_form__loop_for_input_' . $name . '__in_' . $this->_form_section->name(), |
|
93 | - $this->layout_input( $subsection ), |
|
92 | + 'FHEE__EE_Form_Section_Layout_Base__layout_form__loop_for_input_'.$name.'__in_'.$this->_form_section->name(), |
|
93 | + $this->layout_input($subsection), |
|
94 | 94 | $this->_form_section, |
95 | 95 | $subsection |
96 | 96 | ); |
97 | - } elseif ( $subsection instanceof EE_Form_Section_Base ){ |
|
97 | + } elseif ($subsection instanceof EE_Form_Section_Base) { |
|
98 | 98 | $html .= apply_filters( |
99 | - 'FHEE__EE_Form_Section_Layout_Base__layout_form__loop_for_non_input_' . $name . '__in_' . $this->_form_section->name(), |
|
100 | - $this->layout_subsection( $subsection ), |
|
99 | + 'FHEE__EE_Form_Section_Layout_Base__layout_form__loop_for_non_input_'.$name.'__in_'.$this->_form_section->name(), |
|
100 | + $this->layout_subsection($subsection), |
|
101 | 101 | $this->_form_section, |
102 | 102 | $subsection |
103 | 103 | ); |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | * @param EE_Form_Section_Base $subsection |
146 | 146 | * @return string html |
147 | 147 | */ |
148 | - abstract function layout_subsection( $subsection ); |
|
148 | + abstract function layout_subsection($subsection); |
|
149 | 149 | |
150 | 150 | |
151 | 151 | |
@@ -154,10 +154,10 @@ discard block |
||
154 | 154 | * @param EE_Form_Input_Base $input |
155 | 155 | * @return string |
156 | 156 | */ |
157 | - public function display_label($input){ |
|
158 | - $class = $input->required() ? 'ee-required-label ' . $input->html_label_class() : $input->html_label_class(); |
|
159 | - $label_text = $input->required() ? $input->html_label_text() . '<span class="ee-asterisk">*</span>' : $input->html_label_text(); |
|
160 | - return '<label id="' . $input->html_label_id() . '" class="' . $class . '" style="' . $input->html_label_style() . '" for="' . $input->html_name() . '">' . $label_text . '</label>'; |
|
157 | + public function display_label($input) { |
|
158 | + $class = $input->required() ? 'ee-required-label '.$input->html_label_class() : $input->html_label_class(); |
|
159 | + $label_text = $input->required() ? $input->html_label_text().'<span class="ee-asterisk">*</span>' : $input->html_label_text(); |
|
160 | + return '<label id="'.$input->html_label_id().'" class="'.$class.'" style="'.$input->html_label_style().'" for="'.$input->html_name().'">'.$label_text.'</label>'; |
|
161 | 161 | } |
162 | 162 | |
163 | 163 | |
@@ -170,10 +170,10 @@ discard block |
||
170 | 170 | * @param EE_Form_Input_Base $input |
171 | 171 | * @return string |
172 | 172 | */ |
173 | - public function display_errors($input){ |
|
174 | - if( $input->get_validation_errors() ){ |
|
175 | - return "<span id='" . $input->html_id() . "-error' class='ee-error-label red ee-red' for='{$input->html_name()}'>" . $input->get_validation_error_string() . "</span>"; |
|
176 | - }else{ |
|
173 | + public function display_errors($input) { |
|
174 | + if ($input->get_validation_errors()) { |
|
175 | + return "<span id='".$input->html_id()."-error' class='ee-error-label red ee-red' for='{$input->html_name()}'>".$input->get_validation_error_string()."</span>"; |
|
176 | + } else { |
|
177 | 177 | return ''; |
178 | 178 | } |
179 | 179 | } |
@@ -183,10 +183,10 @@ discard block |
||
183 | 183 | * @param EE_Form_Input_Base $input |
184 | 184 | * @return string |
185 | 185 | */ |
186 | - public function display_help_text( $input ){ |
|
187 | - if ( $input->html_help_text() != '' ) { |
|
186 | + public function display_help_text($input) { |
|
187 | + if ($input->html_help_text() != '') { |
|
188 | 188 | $tag = is_admin() ? 'p' : 'span'; |
189 | - return '<' . $tag . ' id="' . $input->html_id() . '-help" class="' . $input->html_help_class() . '" style="' . $input->html_help_style() . '">' . $input->html_help_text() . '</' . $tag . '>'; |
|
189 | + return '<'.$tag.' id="'.$input->html_id().'-help" class="'.$input->html_help_class().'" style="'.$input->html_help_style().'">'.$input->html_help_text().'</'.$tag.'>'; |
|
190 | 190 | } |
191 | 191 | return ''; |
192 | 192 | } |
@@ -198,13 +198,13 @@ discard block |
||
198 | 198 | * @param string $html |
199 | 199 | * @return string |
200 | 200 | */ |
201 | - public function add_form_section_hooks_and_filters( $html ){ |
|
201 | + public function add_form_section_hooks_and_filters($html) { |
|
202 | 202 | // replace dashes and spaces with underscores |
203 | - $hook_name = str_replace( array( '-', ' ' ), '_', $this->_form_section->html_id() ); |
|
204 | - do_action( 'AHEE__Form_Section_Layout__' . $hook_name, $this->_form_section ); |
|
205 | - $html = apply_filters( 'AFEE__Form_Section_Layout__' . $hook_name . '__html', $html, $this->_form_section ); |
|
206 | - $html .= EEH_HTML::nl() . '<!-- AHEE__Form_Section_Layout__' . $hook_name . '__html -->'; |
|
207 | - $html .= EEH_HTML::nl() . '<!-- AFEE__Form_Section_Layout__' . $hook_name . ' -->'; |
|
203 | + $hook_name = str_replace(array('-', ' '), '_', $this->_form_section->html_id()); |
|
204 | + do_action('AHEE__Form_Section_Layout__'.$hook_name, $this->_form_section); |
|
205 | + $html = apply_filters('AFEE__Form_Section_Layout__'.$hook_name.'__html', $html, $this->_form_section); |
|
206 | + $html .= EEH_HTML::nl().'<!-- AHEE__Form_Section_Layout__'.$hook_name.'__html -->'; |
|
207 | + $html .= EEH_HTML::nl().'<!-- AFEE__Form_Section_Layout__'.$hook_name.' -->'; |
|
208 | 208 | return $html; |
209 | 209 | } |
210 | 210 |
@@ -173,7 +173,7 @@ |
||
173 | 173 | public function display_errors($input){ |
174 | 174 | if( $input->get_validation_errors() ){ |
175 | 175 | return "<span id='" . $input->html_id() . "-error' class='ee-error-label red ee-red' for='{$input->html_name()}'>" . $input->get_validation_error_string() . "</span>"; |
176 | - }else{ |
|
176 | + } else{ |
|
177 | 177 | return ''; |
178 | 178 | } |
179 | 179 | } |
@@ -26,31 +26,31 @@ discard block |
||
26 | 26 | * @param EE_Form_Input_Base $input |
27 | 27 | * @return string |
28 | 28 | */ |
29 | - public function layout_input( $input ) { |
|
29 | + public function layout_input($input) { |
|
30 | 30 | $html = ''; |
31 | - if ( $input instanceof EE_Hidden_Input ) { |
|
32 | - $html .= EEH_HTML::nl() . $input->get_html_for_input(); |
|
33 | - } else if ( $input instanceof EE_Submit_Input ) { |
|
31 | + if ($input instanceof EE_Hidden_Input) { |
|
32 | + $html .= EEH_HTML::nl().$input->get_html_for_input(); |
|
33 | + } else if ($input instanceof EE_Submit_Input) { |
|
34 | 34 | $html .= EEH_HTML::br(); |
35 | 35 | $html .= $input->get_html_for_input(); |
36 | - } else if ( $input instanceof EE_Select_Input ) { |
|
36 | + } else if ($input instanceof EE_Select_Input) { |
|
37 | 37 | $html .= EEH_HTML::br(); |
38 | - $html .= EEH_HTML::nl(1) . $input->get_html_for_label(); |
|
39 | - $html .= EEH_HTML::nl() . $input->get_html_for_errors(); |
|
40 | - $html .= EEH_HTML::nl() . $input->get_html_for_input(); |
|
41 | - $html .= EEH_HTML::nl() . $input->get_html_for_help(); |
|
38 | + $html .= EEH_HTML::nl(1).$input->get_html_for_label(); |
|
39 | + $html .= EEH_HTML::nl().$input->get_html_for_errors(); |
|
40 | + $html .= EEH_HTML::nl().$input->get_html_for_input(); |
|
41 | + $html .= EEH_HTML::nl().$input->get_html_for_help(); |
|
42 | 42 | $html .= EEH_HTML::br(); |
43 | - } else if ( $input instanceof EE_Form_Input_With_Options_Base ) { |
|
43 | + } else if ($input instanceof EE_Form_Input_With_Options_Base) { |
|
44 | 44 | $html .= EEH_HTML::br(); |
45 | - $html .= EEH_HTML::nl() . $input->get_html_for_errors(); |
|
46 | - $html .= EEH_HTML::nl() . $input->get_html_for_input(); |
|
47 | - $html .= EEH_HTML::nl() . $input->get_html_for_help(); |
|
45 | + $html .= EEH_HTML::nl().$input->get_html_for_errors(); |
|
46 | + $html .= EEH_HTML::nl().$input->get_html_for_input(); |
|
47 | + $html .= EEH_HTML::nl().$input->get_html_for_help(); |
|
48 | 48 | } else { |
49 | 49 | $html .= EEH_HTML::br(); |
50 | - $html .= EEH_HTML::nl(1) . $input->get_html_for_label(); |
|
51 | - $html .= EEH_HTML::nl() . $input->get_html_for_errors(); |
|
52 | - $html .= EEH_HTML::nl() . $input->get_html_for_input(); |
|
53 | - $html .= EEH_HTML::nl() . $input->get_html_for_help(); |
|
50 | + $html .= EEH_HTML::nl(1).$input->get_html_for_label(); |
|
51 | + $html .= EEH_HTML::nl().$input->get_html_for_errors(); |
|
52 | + $html .= EEH_HTML::nl().$input->get_html_for_input(); |
|
53 | + $html .= EEH_HTML::nl().$input->get_html_for_help(); |
|
54 | 54 | } |
55 | 55 | $html .= EEH_HTML::nl(-1); |
56 | 56 | return $html; |
@@ -63,9 +63,9 @@ discard block |
||
63 | 63 | * @param EE_Form_Section_Proper $form_section |
64 | 64 | * @return string |
65 | 65 | */ |
66 | - public function layout_subsection( $form_section ){ |
|
66 | + public function layout_subsection($form_section) { |
|
67 | 67 | // d( $form_section ); |
68 | - return EEH_HTML::nl(1) . $form_section->get_html_and_js() . EEH_HTML::nl(-1); |
|
68 | + return EEH_HTML::nl(1).$form_section->get_html_and_js().EEH_HTML::nl(-1); |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | * closing div tag for a form |
74 | 74 | * @return string |
75 | 75 | */ |
76 | - public function layout_form_end(){ |
|
76 | + public function layout_form_end() { |
|
77 | 77 | return EEH_HTML::nl(-1); |
78 | 78 | } |
79 | 79 | } |
80 | 80 | \ No newline at end of file |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | if($this->_layout_begin_template_file){ |
84 | 84 | EE_Registry::instance()->load_helper('Template'); |
85 | 85 | return EEH_Template::locate_template( $this->_layout_begin_template_file, $this->template_args(), TRUE, TRUE ); |
86 | - }else{ |
|
86 | + } else{ |
|
87 | 87 | return parent::layout_form_begin(); |
88 | 88 | } |
89 | 89 | } |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | if($this->_layout_end_template_file){ |
131 | 131 | EE_Registry::instance()->load_helper('Template'); |
132 | 132 | return EEH_Template::locate_template( $this->_layout_end_template_file, $this->template_args(), TRUE, TRUE); |
133 | - }else{ |
|
133 | + } else{ |
|
134 | 134 | return parent::layout_form_end(); |
135 | 135 | } |
136 | 136 | } |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | * |
22 | 22 | * ------------------------------------------------------------------------ |
23 | 23 | */ |
24 | -class EE_Template_Layout extends EE_Div_Per_Section_Layout{ |
|
24 | +class EE_Template_Layout extends EE_Div_Per_Section_Layout { |
|
25 | 25 | |
26 | 26 | protected $_layout_template_file = NULL; |
27 | 27 | protected $_layout_begin_template_file = NULL; |
@@ -42,12 +42,12 @@ discard block |
||
42 | 42 | * @type array $_template_args |
43 | 43 | * } |
44 | 44 | */ |
45 | - public function __construct( $template_options = array() ) { |
|
45 | + public function __construct($template_options = array()) { |
|
46 | 46 | // loop thru incoming options |
47 | - foreach( $template_options as $key => $value ) { |
|
47 | + foreach ($template_options as $key => $value) { |
|
48 | 48 | // add underscore to $key to match property names |
49 | - $_key = '_' . $key; |
|
50 | - if ( property_exists( $this, $_key )) { |
|
49 | + $_key = '_'.$key; |
|
50 | + if (property_exists($this, $_key)) { |
|
51 | 51 | $this->{$_key} = $value; |
52 | 52 | } |
53 | 53 | } |
@@ -65,9 +65,9 @@ discard block |
||
65 | 65 | * @return string |
66 | 66 | */ |
67 | 67 | public function layout_form() { |
68 | - if ( $this->_layout_template_file ) { |
|
69 | - EE_Registry::instance()->load_helper( 'Template' ); |
|
70 | - return EEH_Template::locate_template( $this->_layout_template_file, $this->template_args(), TRUE, TRUE ); |
|
68 | + if ($this->_layout_template_file) { |
|
69 | + EE_Registry::instance()->load_helper('Template'); |
|
70 | + return EEH_Template::locate_template($this->_layout_template_file, $this->template_args(), TRUE, TRUE); |
|
71 | 71 | } else { |
72 | 72 | return parent::layout_form(); |
73 | 73 | } |
@@ -80,10 +80,10 @@ discard block |
||
80 | 80 | * @return string |
81 | 81 | */ |
82 | 82 | public function layout_form_begin() { |
83 | - if($this->_layout_begin_template_file){ |
|
83 | + if ($this->_layout_begin_template_file) { |
|
84 | 84 | EE_Registry::instance()->load_helper('Template'); |
85 | - return EEH_Template::locate_template( $this->_layout_begin_template_file, $this->template_args(), TRUE, TRUE ); |
|
86 | - }else{ |
|
85 | + return EEH_Template::locate_template($this->_layout_begin_template_file, $this->template_args(), TRUE, TRUE); |
|
86 | + } else { |
|
87 | 87 | return parent::layout_form_begin(); |
88 | 88 | } |
89 | 89 | } |
@@ -96,10 +96,10 @@ discard block |
||
96 | 96 | * @param EE_Form_Input_Base $input |
97 | 97 | * @return string |
98 | 98 | */ |
99 | - public function layout_input( $input ) { |
|
100 | - if($this->_input_template_file){ |
|
99 | + public function layout_input($input) { |
|
100 | + if ($this->_input_template_file) { |
|
101 | 101 | EE_Registry::instance()->load_helper('Template'); |
102 | - return EEH_Template::locate_template( $this->_input_template_file, array( 'input' => $input ), TRUE, TRUE ); |
|
102 | + return EEH_Template::locate_template($this->_input_template_file, array('input' => $input), TRUE, TRUE); |
|
103 | 103 | } |
104 | 104 | return parent::layout_input($input); |
105 | 105 | } |
@@ -112,12 +112,12 @@ discard block |
||
112 | 112 | * @param EE_Form_Section_Proper $form_section |
113 | 113 | * @return string |
114 | 114 | */ |
115 | - public function layout_subsection( $form_section ) { |
|
116 | - if($this->_subsection_template_file){ |
|
115 | + public function layout_subsection($form_section) { |
|
116 | + if ($this->_subsection_template_file) { |
|
117 | 117 | EE_Registry::instance()->load_helper('Template'); |
118 | - return EEH_Template::locate_template( $this->_subsection_template_file, $this->template_args(), TRUE, TRUE ); |
|
118 | + return EEH_Template::locate_template($this->_subsection_template_file, $this->template_args(), TRUE, TRUE); |
|
119 | 119 | } |
120 | - return parent::layout_subsection( $form_section ); |
|
120 | + return parent::layout_subsection($form_section); |
|
121 | 121 | } |
122 | 122 | |
123 | 123 | |
@@ -127,10 +127,10 @@ discard block |
||
127 | 127 | * @return string |
128 | 128 | */ |
129 | 129 | public function layout_form_end() { |
130 | - if($this->_layout_end_template_file){ |
|
130 | + if ($this->_layout_end_template_file) { |
|
131 | 131 | EE_Registry::instance()->load_helper('Template'); |
132 | - return EEH_Template::locate_template( $this->_layout_end_template_file, $this->template_args(), TRUE, TRUE); |
|
133 | - }else{ |
|
132 | + return EEH_Template::locate_template($this->_layout_end_template_file, $this->template_args(), TRUE, TRUE); |
|
133 | + } else { |
|
134 | 134 | return parent::layout_form_end(); |
135 | 135 | } |
136 | 136 | } |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | /** |
141 | 141 | * @param array $template_args |
142 | 142 | */ |
143 | - public function set_template_args( $template_args = array() ) { |
|
143 | + public function set_template_args($template_args = array()) { |
|
144 | 144 | $this->_template_args = $template_args; |
145 | 145 | } |
146 | 146 | |
@@ -149,8 +149,8 @@ discard block |
||
149 | 149 | /** |
150 | 150 | * @param array $template_args |
151 | 151 | */ |
152 | - public function add_template_args( $template_args = array() ) { |
|
153 | - $this->_template_args = array_merge_recursive( $this->_template_args, $template_args ); |
|
152 | + public function add_template_args($template_args = array()) { |
|
153 | + $this->_template_args = array_merge_recursive($this->_template_args, $template_args); |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | |
@@ -159,13 +159,13 @@ discard block |
||
159 | 159 | * @return array |
160 | 160 | */ |
161 | 161 | public function template_args() { |
162 | - foreach ( $this->form_section()->subsections() as $subsection_name => $subsection ) { |
|
163 | - $subsection_name = self::prep_form_subsection_key_name( $subsection_name ); |
|
164 | - if ( strpos( $subsection_name, '[' ) !== FALSE ) { |
|
165 | - $sub_name = explode( '[', $subsection_name ); |
|
166 | - $this->_template_args[ $sub_name[0] ][ rtrim( $sub_name[1], ']' ) ] = $this->layout_subsection( $subsection ); |
|
162 | + foreach ($this->form_section()->subsections() as $subsection_name => $subsection) { |
|
163 | + $subsection_name = self::prep_form_subsection_key_name($subsection_name); |
|
164 | + if (strpos($subsection_name, '[') !== FALSE) { |
|
165 | + $sub_name = explode('[', $subsection_name); |
|
166 | + $this->_template_args[$sub_name[0]][rtrim($sub_name[1], ']')] = $this->layout_subsection($subsection); |
|
167 | 167 | } else { |
168 | - $this->_template_args[ $subsection_name ] = $this->layout_subsection( $subsection ); |
|
168 | + $this->_template_args[$subsection_name] = $this->layout_subsection($subsection); |
|
169 | 169 | } |
170 | 170 | } |
171 | 171 | // d( $this->_template_args ); |
@@ -181,9 +181,9 @@ discard block |
||
181 | 181 | * @param string $subsection_name |
182 | 182 | * @return string |
183 | 183 | */ |
184 | - public static function prep_form_subsection_key_name( $subsection_name = '' ) { |
|
185 | - $subsection_name = str_replace( array( '-', ' ' ), array( '', '_' ), $subsection_name ); |
|
186 | - return is_numeric( substr( $subsection_name, 0, 1 )) ? 'form_' . $subsection_name : $subsection_name; |
|
184 | + public static function prep_form_subsection_key_name($subsection_name = '') { |
|
185 | + $subsection_name = str_replace(array('-', ' '), array('', '_'), $subsection_name); |
|
186 | + return is_numeric(substr($subsection_name, 0, 1)) ? 'form_'.$subsection_name : $subsection_name; |
|
187 | 187 | } |
188 | 188 | |
189 | 189 | |
@@ -195,8 +195,8 @@ discard block |
||
195 | 195 | * @param string $subsection_name |
196 | 196 | * @return string |
197 | 197 | */ |
198 | - public static function get_subform_name( $subsection_name = '' ) { |
|
199 | - return EE_Template_Layout::prep_form_subsection_key_name( $subsection_name ); |
|
198 | + public static function get_subform_name($subsection_name = '') { |
|
199 | + return EE_Template_Layout::prep_form_subsection_key_name($subsection_name); |
|
200 | 200 | } |
201 | 201 | |
202 | 202 |
@@ -1,14 +1,14 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -class EE_Two_Column_Layout extends EE_Form_Section_Layout_Base{ |
|
3 | +class EE_Two_Column_Layout extends EE_Form_Section_Layout_Base { |
|
4 | 4 | |
5 | 5 | /** |
6 | 6 | * Should be used to start teh form section (Eg a table tag, or a div tag, etc.) |
7 | 7 | * @param array $additional_args |
8 | 8 | * @return string |
9 | 9 | */ |
10 | - public function layout_form_begin( $additional_args = array() ) { |
|
11 | - return EEH_HTML::table( '', $this->_form_section->html_id(), $this->_form_section->html_class(), $this->_form_section->html_style() ) . EEH_HTML::tbody(); |
|
10 | + public function layout_form_begin($additional_args = array()) { |
|
11 | + return EEH_HTML::table('', $this->_form_section->html_id(), $this->_form_section->html_class(), $this->_form_section->html_style()).EEH_HTML::tbody(); |
|
12 | 12 | } |
13 | 13 | |
14 | 14 | |
@@ -18,8 +18,8 @@ discard block |
||
18 | 18 | * @param array $additional_args |
19 | 19 | * @return string |
20 | 20 | */ |
21 | - public function layout_form_end( $additional_args = array() ) { |
|
22 | - return EEH_HTML::tbodyx() . EEH_HTML::tablex( $this->_form_section->html_id() ); |
|
21 | + public function layout_form_end($additional_args = array()) { |
|
22 | + return EEH_HTML::tbodyx().EEH_HTML::tablex($this->_form_section->html_id()); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | |
@@ -29,17 +29,17 @@ discard block |
||
29 | 29 | * @param EE_Form_Input_Base $input |
30 | 30 | * @return string |
31 | 31 | */ |
32 | - public function layout_input( $input ) { |
|
32 | + public function layout_input($input) { |
|
33 | 33 | $html = ''; |
34 | - if ( $input instanceof EE_Hidden_Input ) { |
|
34 | + if ($input instanceof EE_Hidden_Input) { |
|
35 | 35 | $html .= $input->get_html_for_input(); |
36 | 36 | } else { |
37 | 37 | $html_for_input = $input->get_html_for_input(); |
38 | - $html_for_input .= $input->get_html_for_errors() != '' ? EEH_HTML::nl() . $input->get_html_for_errors() : ''; |
|
39 | - $html_for_input .= $input->get_html_for_help() != '' ? EEH_HTML::nl() . $input->get_html_for_help() : ''; |
|
38 | + $html_for_input .= $input->get_html_for_errors() != '' ? EEH_HTML::nl().$input->get_html_for_errors() : ''; |
|
39 | + $html_for_input .= $input->get_html_for_help() != '' ? EEH_HTML::nl().$input->get_html_for_help() : ''; |
|
40 | 40 | $html .= EEH_HTML::tr( |
41 | - EEH_HTML::th( $input->get_html_for_label() ) . |
|
42 | - EEH_HTML::td( $html_for_input ) |
|
41 | + EEH_HTML::th($input->get_html_for_label()). |
|
42 | + EEH_HTML::td($html_for_input) |
|
43 | 43 | ); |
44 | 44 | } |
45 | 45 | return $html; |
@@ -52,13 +52,13 @@ discard block |
||
52 | 52 | * @param EE_Form_Section_Proper $form_section |
53 | 53 | * @return string |
54 | 54 | */ |
55 | - public function layout_subsection( $form_section ){ |
|
55 | + public function layout_subsection($form_section) { |
|
56 | 56 | $html = ''; |
57 | - if ( $form_section instanceof EE_Form_Section_HTML ) { |
|
57 | + if ($form_section instanceof EE_Form_Section_HTML) { |
|
58 | 58 | $html .= $form_section->get_html_and_js(); |
59 | 59 | } else { |
60 | 60 | $html .= EEH_HTML::tr( |
61 | - EEH_HTML::td( $form_section->get_html_and_js(), '', '', '', 'colspan="2"' ) |
|
61 | + EEH_HTML::td($form_section->get_html_and_js(), '', '', '', 'colspan="2"') |
|
62 | 62 | ); |
63 | 63 | } |
64 | 64 | return $html; |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | * @subpackage |
9 | 9 | * @author Mike Nelson |
10 | 10 | */ |
11 | -class EE_All_Caps_Normalization extends EE_Normalization_Strategy_Base{ |
|
11 | +class EE_All_Caps_Normalization extends EE_Normalization_Strategy_Base { |
|
12 | 12 | |
13 | 13 | /** |
14 | 14 | * @param string $value_to_normalize |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | * @param string $normalized_value |
25 | 25 | * @return string |
26 | 26 | */ |
27 | - public function unnormalize( $normalized_value ) { |
|
27 | + public function unnormalize($normalized_value) { |
|
28 | 28 | return $normalized_value; |
29 | 29 | } |
30 | 30 |
@@ -10,14 +10,14 @@ discard block |
||
10 | 10 | * @subpackage |
11 | 11 | * @author Mike Nelson |
12 | 12 | */ |
13 | -class EE_Boolean_Normalization extends EE_Normalization_Strategy_Base{ |
|
13 | +class EE_Boolean_Normalization extends EE_Normalization_Strategy_Base { |
|
14 | 14 | |
15 | 15 | /** |
16 | 16 | * @param string | int | bool $value_to_normalize |
17 | 17 | * @return boolean |
18 | 18 | */ |
19 | - public function normalize( $value_to_normalize ) { |
|
20 | - return filter_var( $value_to_normalize, FILTER_VALIDATE_BOOLEAN ); |
|
19 | + public function normalize($value_to_normalize) { |
|
20 | + return filter_var($value_to_normalize, FILTER_VALIDATE_BOOLEAN); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | |
@@ -27,10 +27,10 @@ discard block |
||
27 | 27 | * @param boolean $normalized_value |
28 | 28 | * @return string |
29 | 29 | */ |
30 | - public function unnormalize( $normalized_value ) { |
|
31 | - if( $normalized_value ){ |
|
30 | + public function unnormalize($normalized_value) { |
|
31 | + if ($normalized_value) { |
|
32 | 32 | return '1'; |
33 | - }else{ |
|
33 | + } else { |
|
34 | 34 | return '0'; |
35 | 35 | } |
36 | 36 | } |
@@ -30,7 +30,7 @@ |
||
30 | 30 | public function unnormalize( $normalized_value ) { |
31 | 31 | if( $normalized_value ){ |
32 | 32 | return '1'; |
33 | - }else{ |
|
33 | + } else{ |
|
34 | 34 | return '0'; |
35 | 35 | } |
36 | 36 | } |
@@ -6,7 +6,7 @@ |
||
6 | 6 | * @subpackage |
7 | 7 | * @author Mike Nelson |
8 | 8 | */ |
9 | -class EE_Credit_Card_Normalization extends EE_Text_Normalization{ |
|
9 | +class EE_Credit_Card_Normalization extends EE_Text_Normalization { |
|
10 | 10 | |
11 | 11 | /** |
12 | 12 | * @param string $value_to_normalize |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | * @subpackage |
8 | 8 | * @author Mike Nelson |
9 | 9 | */ |
10 | -class EE_Float_Normalization extends EE_Normalization_Strategy_Base{ |
|
10 | +class EE_Float_Normalization extends EE_Normalization_Strategy_Base { |
|
11 | 11 | |
12 | 12 | /** |
13 | 13 | * @param string $value_to_normalize |
@@ -15,34 +15,34 @@ discard block |
||
15 | 15 | * @throws \EE_Validation_Error |
16 | 16 | */ |
17 | 17 | public function normalize($value_to_normalize) { |
18 | - if($value_to_normalize === NULL){ |
|
18 | + if ($value_to_normalize === NULL) { |
|
19 | 19 | return 0.00; |
20 | 20 | } |
21 | 21 | $normalized_value = ''; |
22 | - if(is_string($value_to_normalize)){ |
|
23 | - $normalized_value = str_replace(array(" ",EE_Config::instance()->currency->thsnds),"",$value_to_normalize); |
|
22 | + if (is_string($value_to_normalize)) { |
|
23 | + $normalized_value = str_replace(array(" ", EE_Config::instance()->currency->thsnds), "", $value_to_normalize); |
|
24 | 24 | //normalize it so periods are decimal marks (we don't care where you're from: we're talking PHP now) |
25 | - $normalized_value = str_replace( EE_Config::instance()->currency->dec_mrk, ".", $normalized_value) ; |
|
25 | + $normalized_value = str_replace(EE_Config::instance()->currency->dec_mrk, ".", $normalized_value); |
|
26 | 26 | //double-check there's absolutely nothing left on this string besides numbers |
27 | - $normalized_value = preg_replace( "/[^0-9,. ]/", "", $normalized_value); |
|
27 | + $normalized_value = preg_replace("/[^0-9,. ]/", "", $normalized_value); |
|
28 | 28 | } |
29 | - if(strlen($value_to_normalize) > strlen($normalized_value)){ |
|
29 | + if (strlen($value_to_normalize) > strlen($normalized_value)) { |
|
30 | 30 | //find if this input has a float 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_Float_Validation_Strategy ){ |
|
33 | + foreach ($this->_input->get_validation_strategies() as $validation_strategy) { |
|
34 | + if ($validation_strategy instanceof EE_Float_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 float normalization strategy |
39 | 39 | //should also have a float 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_Float_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, 'float_only' ); |
|
45 | - }else{ |
|
44 | + throw new EE_Validation_Error($validation_error_message, 'float_only'); |
|
45 | + } else { |
|
46 | 46 | return floatval($normalized_value); |
47 | 47 | } |
48 | 48 | } |
@@ -53,9 +53,9 @@ discard block |
||
53 | 53 | * @return string |
54 | 54 | */ |
55 | 55 | public function unnormalize($normalized_value) { |
56 | - if( empty( $normalized_value ) ){ |
|
56 | + if (empty($normalized_value)) { |
|
57 | 57 | return '0.00'; |
58 | - }else{ |
|
58 | + } else { |
|
59 | 59 | return "$normalized_value"; |
60 | 60 | } |
61 | 61 | } |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | $validation_error_message = $default_validation_strategy->get_validation_error_message(); |
43 | 43 | } |
44 | 44 | throw new EE_Validation_Error( $validation_error_message, 'float_only' ); |
45 | - }else{ |
|
45 | + } else{ |
|
46 | 46 | return floatval($normalized_value); |
47 | 47 | } |
48 | 48 | } |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | public function unnormalize($normalized_value) { |
56 | 56 | if( empty( $normalized_value ) ){ |
57 | 57 | return '0.00'; |
58 | - }else{ |
|
58 | + } else{ |
|
59 | 59 | return "$normalized_value"; |
60 | 60 | } |
61 | 61 | } |
@@ -6,7 +6,7 @@ discard block |
||
6 | 6 | * @subpackage |
7 | 7 | * @author Mike Nelson |
8 | 8 | */ |
9 | -class EE_Many_Valued_Normalization extends EE_Normalization_Strategy_Base{ |
|
9 | +class EE_Many_Valued_Normalization extends EE_Normalization_Strategy_Base { |
|
10 | 10 | protected $_individual_item_normalization_strategy = array(); |
11 | 11 | /** |
12 | 12 | * |
@@ -23,16 +23,16 @@ discard block |
||
23 | 23 | * @return array |
24 | 24 | */ |
25 | 25 | public function normalize($value_to_normalize) { |
26 | - if ( is_array( $value_to_normalize )){ |
|
26 | + if (is_array($value_to_normalize)) { |
|
27 | 27 | $items_to_normalize = $value_to_normalize; |
28 | - } else if( $value_to_normalize !== NULL ){ |
|
29 | - $items_to_normalize = array( $value_to_normalize ); |
|
28 | + } else if ($value_to_normalize !== NULL) { |
|
29 | + $items_to_normalize = array($value_to_normalize); |
|
30 | 30 | } else { |
31 | 31 | $items_to_normalize = array(); |
32 | 32 | } |
33 | 33 | $normalized_array_value = array(); |
34 | - foreach( $items_to_normalize as $key => $individual_item ){ |
|
35 | - $normalized_array_value[ $key ] = $this->normalize_one( $individual_item ); |
|
34 | + foreach ($items_to_normalize as $key => $individual_item) { |
|
35 | + $normalized_array_value[$key] = $this->normalize_one($individual_item); |
|
36 | 36 | } |
37 | 37 | return $normalized_array_value; |
38 | 38 | } |
@@ -42,8 +42,8 @@ discard block |
||
42 | 42 | * @param string $individual_value_to_normalize but definitely NOT an array |
43 | 43 | * @return mixed |
44 | 44 | */ |
45 | - public function normalize_one( $individual_value_to_normalize ) { |
|
46 | - return $this->_individual_item_normalization_strategy->normalize( $individual_value_to_normalize ); |
|
45 | + public function normalize_one($individual_value_to_normalize) { |
|
46 | + return $this->_individual_item_normalization_strategy->normalize($individual_value_to_normalize); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | /** |
@@ -51,13 +51,13 @@ discard block |
||
51 | 51 | * @param array $normalized_values |
52 | 52 | * @return string[] |
53 | 53 | */ |
54 | - public function unnormalize( $normalized_values ) { |
|
55 | - if( ! is_array( $normalized_values ) ){ |
|
56 | - $normalized_values = array( $normalized_values ); |
|
54 | + public function unnormalize($normalized_values) { |
|
55 | + if ( ! is_array($normalized_values)) { |
|
56 | + $normalized_values = array($normalized_values); |
|
57 | 57 | } |
58 | 58 | $non_normal_values = array(); |
59 | - foreach( $normalized_values as $key => $value ) { |
|
60 | - $non_normal_values[ $key ] = $this->unnormalize_one( $value ); |
|
59 | + foreach ($normalized_values as $key => $value) { |
|
60 | + $non_normal_values[$key] = $this->unnormalize_one($value); |
|
61 | 61 | } |
62 | 62 | return $non_normal_values; |
63 | 63 | } |
@@ -67,8 +67,8 @@ discard block |
||
67 | 67 | * @param mixed $individual_value_to_unnormalize but certainly NOT an array |
68 | 68 | * @return string |
69 | 69 | */ |
70 | - public function unnormalize_one( $individual_value_to_unnormalize ) { |
|
71 | - return $this->_individual_item_normalization_strategy->unnormalize( $individual_value_to_unnormalize ); |
|
70 | + public function unnormalize_one($individual_value_to_unnormalize) { |
|
71 | + return $this->_individual_item_normalization_strategy->unnormalize($individual_value_to_unnormalize); |
|
72 | 72 | } |
73 | 73 | } |
74 | 74 |