@@ -1,8 +1,8 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | namespace EventEspresso\core\services\commands; |
3 | 3 | |
4 | -if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
5 | - exit( 'No direct script access allowed' ); |
|
4 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
5 | + exit('No direct script access allowed'); |
|
6 | 6 | } |
7 | 7 | |
8 | 8 | |
@@ -25,14 +25,14 @@ discard block |
||
25 | 25 | * @param int $code |
26 | 26 | * @param \Exception $previous |
27 | 27 | */ |
28 | - public function __construct( $command_name, $message = '', $code = 0, \Exception $previous = null ) { |
|
29 | - if ( empty( $message ) ) { |
|
28 | + public function __construct($command_name, $message = '', $code = 0, \Exception $previous = null) { |
|
29 | + if (empty($message)) { |
|
30 | 30 | $message = sprintf( |
31 | - __( 'The supplied Command Handler "%1$s" does not have a valid name. It should be in the following format: "{CommandName}Handler" ', 'event_espresso' ), |
|
31 | + __('The supplied Command Handler "%1$s" does not have a valid name. It should be in the following format: "{CommandName}Handler" ', 'event_espresso'), |
|
32 | 32 | $command_name |
33 | 33 | ); |
34 | 34 | } |
35 | - parent::__construct( $message, $code, $previous ); |
|
35 | + parent::__construct($message, $code, $previous); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | } |
@@ -1,8 +1,8 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | namespace EventEspresso\core\services\commands; |
3 | 3 | |
4 | -if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
5 | - exit( 'No direct script access allowed' ); |
|
4 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
5 | + exit('No direct script access allowed'); |
|
6 | 6 | } |
7 | 7 | |
8 | 8 | |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | * @param \EventEspresso\core\services\commands\CommandInterface $command |
20 | 20 | * @return mixed |
21 | 21 | */ |
22 | - public function handle( CommandInterface $command ); |
|
22 | + public function handle(CommandInterface $command); |
|
23 | 23 | |
24 | 24 | } |
25 | 25 | // End of file CommandHandlerInterface.php |
@@ -1,8 +1,8 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | namespace EventEspresso\core\services\commands; |
3 | 3 | |
4 | -if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
5 | - exit( 'No direct script access allowed' ); |
|
4 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
5 | + exit('No direct script access allowed'); |
|
6 | 6 | } |
7 | 7 | |
8 | 8 | |
@@ -19,14 +19,14 @@ discard block |
||
19 | 19 | * @param \EventEspresso\core\services\commands\CommandHandlerInterface $command_handler |
20 | 20 | * @return mixed |
21 | 21 | */ |
22 | - public function addCommandHandler( CommandHandlerInterface $command_handler ); |
|
22 | + public function addCommandHandler(CommandHandlerInterface $command_handler); |
|
23 | 23 | |
24 | 24 | |
25 | 25 | /** |
26 | 26 | * @param \EventEspresso\core\services\commands\CommandInterface $command |
27 | 27 | * @return mixed |
28 | 28 | */ |
29 | - public function getCommandHandler( CommandInterface $command ); |
|
29 | + public function getCommandHandler(CommandInterface $command); |
|
30 | 30 | |
31 | 31 | } |
32 | 32 | // End of file CommandHandlerManagerInterface.php |
@@ -1,8 +1,8 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | namespace EventEspresso\core\services\commands; |
3 | 3 | |
4 | -if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
5 | - exit( 'No direct script access allowed' ); |
|
4 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
5 | + exit('No direct script access allowed'); |
|
6 | 6 | } |
7 | 7 | |
8 | 8 | |
@@ -25,14 +25,14 @@ discard block |
||
25 | 25 | * @param int $code |
26 | 26 | * @param \Exception $previous |
27 | 27 | */ |
28 | - public function __construct( $command_handler_name, $message = '', $code = 0, \Exception $previous = null ) { |
|
29 | - if ( empty( $message ) ) { |
|
28 | + public function __construct($command_handler_name, $message = '', $code = 0, \Exception $previous = null) { |
|
29 | + if (empty($message)) { |
|
30 | 30 | $message = sprintf( |
31 | - __( 'The requested Command Handler "%1$s" could not be located or does not exist.', 'event_espresso' ), |
|
31 | + __('The requested Command Handler "%1$s" could not be located or does not exist.', 'event_espresso'), |
|
32 | 32 | $command_handler_name |
33 | 33 | ); |
34 | 34 | } |
35 | - parent::__construct( $message, $code, $previous ); |
|
35 | + parent::__construct($message, $code, $previous); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | } |
@@ -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 | } |
26 | 26 | |
27 | 27 | |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | * The form section on which this strategy is to perform |
31 | 31 | * @param EE_Form_Section_Proper $form |
32 | 32 | */ |
33 | - function _construct_finalize(EE_Form_Section_Proper $form){ |
|
33 | + function _construct_finalize(EE_Form_Section_Proper $form) { |
|
34 | 34 | $this->_form_section = $form; |
35 | 35 | } |
36 | 36 | |
@@ -53,28 +53,28 @@ discard block |
||
53 | 53 | * Returns the HTML |
54 | 54 | * @return string HTML for displaying |
55 | 55 | */ |
56 | - function layout_form(){ |
|
56 | + function layout_form() { |
|
57 | 57 | $html = ''; |
58 | 58 | // layout_form_begin |
59 | 59 | $html .= apply_filters( |
60 | - 'FHEE__EE_Form_Section_Layout_Base__layout_form__start__for_' . $this->_form_section->name(), |
|
60 | + 'FHEE__EE_Form_Section_Layout_Base__layout_form__start__for_'.$this->_form_section->name(), |
|
61 | 61 | $this->layout_form_begin(), |
62 | 62 | $this->_form_section |
63 | 63 | ); |
64 | 64 | // layout_form_loop |
65 | 65 | $html .= apply_filters( |
66 | - 'FHEE__EE_Form_Section_Layout_Base__layout_form__loop__for_' . $this->_form_section->name(), |
|
66 | + 'FHEE__EE_Form_Section_Layout_Base__layout_form__loop__for_'.$this->_form_section->name(), |
|
67 | 67 | $this->layout_form_loop(), |
68 | 68 | $this->_form_section |
69 | 69 | ); |
70 | 70 | // layout_form_end |
71 | 71 | $html .= apply_filters( |
72 | - 'FHEE__EE_Form_Section_Layout_Base__layout_form__end__for_' . $this->_form_section->name(), |
|
72 | + 'FHEE__EE_Form_Section_Layout_Base__layout_form__end__for_'.$this->_form_section->name(), |
|
73 | 73 | $this->layout_form_end(), |
74 | 74 | $this->_form_section |
75 | 75 | ); |
76 | 76 | |
77 | - $html = $this->add_form_section_hooks_and_filters( $html ); |
|
77 | + $html = $this->add_form_section_hooks_and_filters($html); |
|
78 | 78 | return $html; |
79 | 79 | } |
80 | 80 | |
@@ -83,20 +83,20 @@ discard block |
||
83 | 83 | /** |
84 | 84 | * @return string |
85 | 85 | */ |
86 | - function layout_form_loop(){ |
|
86 | + function layout_form_loop() { |
|
87 | 87 | $html = ''; |
88 | - foreach( $this->_form_section->subsections() as $name => $subsection ){ |
|
89 | - if ( $subsection instanceof EE_Form_Input_Base ){ |
|
88 | + foreach ($this->_form_section->subsections() as $name => $subsection) { |
|
89 | + if ($subsection instanceof EE_Form_Input_Base) { |
|
90 | 90 | $html .= apply_filters( |
91 | - 'FHEE__EE_Form_Section_Layout_Base__layout_form__loop_for_input_' . $name . '__in_' . $this->_form_section->name(), |
|
92 | - $this->layout_input( $subsection ), |
|
91 | + 'FHEE__EE_Form_Section_Layout_Base__layout_form__loop_for_input_'.$name.'__in_'.$this->_form_section->name(), |
|
92 | + $this->layout_input($subsection), |
|
93 | 93 | $this->_form_section, |
94 | 94 | $subsection |
95 | 95 | ); |
96 | - } elseif ( $subsection instanceof EE_Form_Section_Base ){ |
|
96 | + } elseif ($subsection instanceof EE_Form_Section_Base) { |
|
97 | 97 | $html .= apply_filters( |
98 | - 'FHEE__EE_Form_Section_Layout_Base__layout_form__loop_for_non_input_' . $name . '__in_' . $this->_form_section->name(), |
|
99 | - $this->layout_subsection( $subsection ), |
|
98 | + 'FHEE__EE_Form_Section_Layout_Base__layout_form__loop_for_non_input_'.$name.'__in_'.$this->_form_section->name(), |
|
99 | + $this->layout_subsection($subsection), |
|
100 | 100 | $this->_form_section, |
101 | 101 | $subsection |
102 | 102 | ); |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | * @param EE_Form_Section_Base $subsection |
145 | 145 | * @return string html |
146 | 146 | */ |
147 | - abstract function layout_subsection( $subsection ); |
|
147 | + abstract function layout_subsection($subsection); |
|
148 | 148 | |
149 | 149 | |
150 | 150 | |
@@ -153,10 +153,10 @@ discard block |
||
153 | 153 | * @param EE_Form_Input_Base $input |
154 | 154 | * @return string |
155 | 155 | */ |
156 | - public function display_label($input){ |
|
157 | - $class = $input->required() ? 'ee-required-label ' . $input->html_label_class() : $input->html_label_class(); |
|
158 | - $label_text = $input->required() ? $input->html_label_text() . '<span class="ee-asterisk">*</span>' : $input->html_label_text(); |
|
159 | - return '<label id="' . $input->html_label_id() . '" class="' . $class . '" style="' . $input->html_label_style() . '" for="' . $input->html_name() . '">' . $label_text . '</label>'; |
|
156 | + public function display_label($input) { |
|
157 | + $class = $input->required() ? 'ee-required-label '.$input->html_label_class() : $input->html_label_class(); |
|
158 | + $label_text = $input->required() ? $input->html_label_text().'<span class="ee-asterisk">*</span>' : $input->html_label_text(); |
|
159 | + return '<label id="'.$input->html_label_id().'" class="'.$class.'" style="'.$input->html_label_style().'" for="'.$input->html_name().'">'.$label_text.'</label>'; |
|
160 | 160 | } |
161 | 161 | |
162 | 162 | |
@@ -169,10 +169,10 @@ discard block |
||
169 | 169 | * @param EE_Form_Input_Base $input |
170 | 170 | * @return string |
171 | 171 | */ |
172 | - public function display_errors($input){ |
|
173 | - if( $input->get_validation_errors() ){ |
|
174 | - return "<label id='" . $input->html_id() . "-error' class='error' for='{$input->html_name()}'>" . $input->get_validation_error_string() . "</label>"; |
|
175 | - }else{ |
|
172 | + public function display_errors($input) { |
|
173 | + if ($input->get_validation_errors()) { |
|
174 | + return "<label id='".$input->html_id()."-error' class='error' for='{$input->html_name()}'>".$input->get_validation_error_string()."</label>"; |
|
175 | + } else { |
|
176 | 176 | return ''; |
177 | 177 | } |
178 | 178 | } |
@@ -182,10 +182,10 @@ discard block |
||
182 | 182 | * @param EE_Form_Input_Base $input |
183 | 183 | * @return string |
184 | 184 | */ |
185 | - public function display_help_text( $input ){ |
|
186 | - if ( $input->html_help_text() != '' ) { |
|
185 | + public function display_help_text($input) { |
|
186 | + if ($input->html_help_text() != '') { |
|
187 | 187 | $tag = is_admin() ? 'p' : 'span'; |
188 | - return '<' . $tag . ' id="' . $input->html_id() . '-help" class="' . $input->html_help_class() . '" style="' . $input->html_help_style() . '">' . $input->html_help_text() . '</' . $tag . '>'; |
|
188 | + return '<'.$tag.' id="'.$input->html_id().'-help" class="'.$input->html_help_class().'" style="'.$input->html_help_style().'">'.$input->html_help_text().'</'.$tag.'>'; |
|
189 | 189 | } |
190 | 190 | return ''; |
191 | 191 | } |
@@ -197,13 +197,13 @@ discard block |
||
197 | 197 | * @param string $html |
198 | 198 | * @return string |
199 | 199 | */ |
200 | - public function add_form_section_hooks_and_filters( $html ){ |
|
200 | + public function add_form_section_hooks_and_filters($html) { |
|
201 | 201 | // replace dashes and spaces with underscores |
202 | - $hook_name = str_replace( array( '-', ' ' ), '_', $this->_form_section->html_id() ); |
|
203 | - do_action( 'AHEE__Form_Section_Layout__' . $hook_name, $this->_form_section ); |
|
204 | - $html = apply_filters( 'AFEE__Form_Section_Layout__' . $hook_name . '__html', $html, $this->_form_section ); |
|
205 | - $html .= EEH_HTML::nl() . '<!-- AHEE__Form_Section_Layout__' . $hook_name . '__html -->'; |
|
206 | - $html .= EEH_HTML::nl() . '<!-- AFEE__Form_Section_Layout__' . $hook_name . ' -->'; |
|
202 | + $hook_name = str_replace(array('-', ' '), '_', $this->_form_section->html_id()); |
|
203 | + do_action('AHEE__Form_Section_Layout__'.$hook_name, $this->_form_section); |
|
204 | + $html = apply_filters('AFEE__Form_Section_Layout__'.$hook_name.'__html', $html, $this->_form_section); |
|
205 | + $html .= EEH_HTML::nl().'<!-- AHEE__Form_Section_Layout__'.$hook_name.'__html -->'; |
|
206 | + $html .= EEH_HTML::nl().'<!-- AFEE__Form_Section_Layout__'.$hook_name.' -->'; |
|
207 | 207 | return $html; |
208 | 208 | } |
209 | 209 |
@@ -172,7 +172,7 @@ |
||
172 | 172 | public function display_errors($input){ |
173 | 173 | if( $input->get_validation_errors() ){ |
174 | 174 | return "<label id='" . $input->html_id() . "-error' class='error' for='{$input->html_name()}'>" . $input->get_validation_error_string() . "</label>"; |
175 | - }else{ |
|
175 | + } else{ |
|
176 | 176 | return ''; |
177 | 177 | } |
178 | 178 | } |
@@ -1,13 +1,13 @@ discard block |
||
1 | 1 | <div id="reg-admin-approve-decline-reg-status-dv"> |
2 | 2 | |
3 | 3 | <h2 id="reg-admin-reg-details-reg-status-hdr"> |
4 | - <?php echo __( 'Current Registration Status : ', 'event_espresso' ); ?> |
|
4 | + <?php echo __('Current Registration Status : ', 'event_espresso'); ?> |
|
5 | 5 | <span class="<?php echo $reg_status_class; ?> bigger-text"><?php echo $reg_status_value; ?></span> |
6 | 6 | </h2> |
7 | - <?php do_action( 'AHEE__reg_status_change_buttons__after_header', $REG_ID ); ?> |
|
7 | + <?php do_action('AHEE__reg_status_change_buttons__after_header', $REG_ID); ?> |
|
8 | 8 | |
9 | 9 | <h3 id="reg-admin-reg-details-reg-status-hdr"> |
10 | - <?php echo __( 'Change Registration Status to :', 'event_espresso' ); ?> |
|
10 | + <?php echo __('Change Registration Status to :', 'event_espresso'); ?> |
|
11 | 11 | </h3> |
12 | 12 | |
13 | 13 | <form id="reg_status_change_form" method="POST" action="<?php echo $form_url; ?>"> |
@@ -16,15 +16,15 @@ discard block |
||
16 | 16 | <input type="hidden" name="return" value="view_registration"> |
17 | 17 | <?php echo $nonce; ?> |
18 | 18 | <?php echo $status_buttons; ?> |
19 | - <?php if ( $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'registration_message_type' ) ) : ?> |
|
19 | + <?php if ($attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'registration_message_type')) : ?> |
|
20 | 20 | <span id="send-related-messages-dv"> |
21 | - <label for="txn-reg-status-send-notifications-inp" class="important-notice"><?php _e( '...and send related messages ?', 'event_espresso' ); ?> |
|
21 | + <label for="txn-reg-status-send-notifications-inp" class="important-notice"><?php _e('...and send related messages ?', 'event_espresso'); ?> |
|
22 | 22 | <input type="checkbox" value="1" id="txn-reg-status-send-notifications-inp" name="txn_reg_status_change[send_notifications]"> |
23 | 23 | </label> |
24 | 24 | <br/> |
25 | 25 | </span> |
26 | 26 | <br/> |
27 | - <p class="description"><?php _e( 'If the "send related messages"checkbox is checked when changing status, then the related messages will be sent to the registrant.', 'event_espresso' ); ?></p> |
|
27 | + <p class="description"><?php _e('If the "send related messages"checkbox is checked when changing status, then the related messages will be sent to the registrant.', 'event_espresso'); ?></p> |
|
28 | 28 | <?php endif; ?> |
29 | 29 | </form> |
30 | 30 | </div> |
@@ -118,10 +118,10 @@ discard block |
||
118 | 118 | // add generic non-identifying messages for non-privileged users |
119 | 119 | if ( ! WP_DEBUG ) { |
120 | 120 | $output .= '<span class="ee-error-user-msg-spn">' |
121 | - . trim( $msg ) |
|
122 | - . '</span> <sup>' |
|
123 | - . $code |
|
124 | - . '</sup><br />'; |
|
121 | + . trim( $msg ) |
|
122 | + . '</span> <sup>' |
|
123 | + . $code |
|
124 | + . '</sup><br />'; |
|
125 | 125 | } else { |
126 | 126 | // or helpful developer messages if debugging is on |
127 | 127 | $output .= ' |
@@ -130,39 +130,39 @@ discard block |
||
130 | 130 | ' |
131 | 131 | . sprintf( |
132 | 132 | __( '%1$sAn %2$s was thrown!%3$s code: %4$s', 'event_espresso' ), |
133 | - '<strong class="ee-error-dev-msg-str">', |
|
133 | + '<strong class="ee-error-dev-msg-str">', |
|
134 | 134 | get_class( $exception ), |
135 | 135 | '</strong> <span>', |
136 | 136 | $code . '</span>' |
137 | 137 | ) |
138 | 138 | . '<br /> |
139 | 139 | <span class="big-text">"' |
140 | - . trim( $msg ) |
|
141 | - . '"</span><br/> |
|
140 | + . trim( $msg ) |
|
141 | + . '"</span><br/> |
|
142 | 142 | <a id="display-ee-error-trace-1' |
143 | - . $time |
|
144 | - . '" class="display-ee-error-trace-lnk small-text" rel="ee-error-trace-1' |
|
145 | - . $time |
|
146 | - . '"> |
|
143 | + . $time |
|
144 | + . '" class="display-ee-error-trace-lnk small-text" rel="ee-error-trace-1' |
|
145 | + . $time |
|
146 | + . '"> |
|
147 | 147 | ' |
148 | - . __( 'click to view backtrace and class/method details', 'event_espresso' ) |
|
149 | - . ' |
|
148 | + . __( 'click to view backtrace and class/method details', 'event_espresso' ) |
|
149 | + . ' |
|
150 | 150 | </a><br /> |
151 | 151 | ' |
152 | - . $exception->getFile() |
|
153 | - . sprintf( |
|
154 | - __( '%1$s( line no: %2$s )%3$s', 'event_espresso' ), |
|
155 | - ' <span class="small-text lt-grey-text">', |
|
156 | - $exception->getLine(), |
|
157 | - '</span>' |
|
158 | - ) |
|
159 | - . ' |
|
152 | + . $exception->getFile() |
|
153 | + . sprintf( |
|
154 | + __( '%1$s( line no: %2$s )%3$s', 'event_espresso' ), |
|
155 | + ' <span class="small-text lt-grey-text">', |
|
156 | + $exception->getLine(), |
|
157 | + '</span>' |
|
158 | + ) |
|
159 | + . ' |
|
160 | 160 | </p> |
161 | 161 | <div id="ee-error-trace-1' |
162 | - . $time |
|
163 | - . '-dv" class="ee-error-trace-dv" style="display: none;"> |
|
162 | + . $time |
|
163 | + . '-dv" class="ee-error-trace-dv" style="display: none;"> |
|
164 | 164 | ' |
165 | - . $trace_details; |
|
165 | + . $trace_details; |
|
166 | 166 | if ( ! empty( $class ) ) { |
167 | 167 | $output .= ' |
168 | 168 | <div style="padding:3px; margin:0 0 1em; border:1px solid #999; background:#fff; border-radius:3px;"> |
@@ -1,8 +1,8 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | namespace EventEspresso\core\exceptions; |
3 | 3 | |
4 | -if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
5 | - exit( 'No direct script access allowed' ); |
|
4 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
5 | + exit('No direct script access allowed'); |
|
6 | 6 | } |
7 | 7 | |
8 | 8 | |
@@ -22,9 +22,9 @@ discard block |
||
22 | 22 | /** |
23 | 23 | * @param \Exception $exception |
24 | 24 | */ |
25 | - public function __construct( \Exception $exception ) { |
|
26 | - if ( WP_DEBUG ) { |
|
27 | - $this->displayException( $exception ); |
|
25 | + public function __construct(\Exception $exception) { |
|
26 | + if (WP_DEBUG) { |
|
27 | + $this->displayException($exception); |
|
28 | 28 | } |
29 | 29 | } |
30 | 30 | |
@@ -34,27 +34,27 @@ discard block |
||
34 | 34 | * @access protected |
35 | 35 | * @param \Exception $exception |
36 | 36 | */ |
37 | - protected function displayException( \Exception $exception ) { |
|
37 | + protected function displayException(\Exception $exception) { |
|
38 | 38 | |
39 | 39 | $error_code = ''; |
40 | 40 | $trace_details = ''; |
41 | 41 | $time = time(); |
42 | 42 | $trace = $exception->getTrace(); |
43 | 43 | // get separate user and developer messages if they exist |
44 | - $msg = explode( '||', $exception->getMessage() ); |
|
44 | + $msg = explode('||', $exception->getMessage()); |
|
45 | 45 | $user_msg = $msg[0]; |
46 | - $dev_msg = isset( $msg[1] ) ? $msg[1] : $msg[0]; |
|
46 | + $dev_msg = isset($msg[1]) ? $msg[1] : $msg[0]; |
|
47 | 47 | $msg = WP_DEBUG ? $dev_msg : $user_msg; |
48 | 48 | // start gathering output |
49 | 49 | $output = $this->exceptionStyles(); |
50 | 50 | $output .= ' |
51 | 51 | <div id="ee-error-message" class="error">'; |
52 | - if ( ! WP_DEBUG ) { |
|
52 | + if ( ! WP_DEBUG) { |
|
53 | 53 | $output .= ' |
54 | 54 | <p>'; |
55 | 55 | } |
56 | 56 | // process trace info |
57 | - if ( empty( $trace ) ) { |
|
57 | + if (empty($trace)) { |
|
58 | 58 | $trace_details .= __( |
59 | 59 | 'Sorry, but no trace information was available for this exception.', |
60 | 60 | 'event_espresso' |
@@ -67,47 +67,47 @@ discard block |
||
67 | 67 | <th scope="col" align="right" style="width:2.5%;">#</th> |
68 | 68 | <th scope="col" align="right" style="width:3.5%;">Line</th> |
69 | 69 | <th scope="col" align="left" style="width:40%;">File</th> |
70 | - <th scope="col" align="left">' . __( 'Class', 'event_espresso' ) . '->' . __( 'Method( arguments )', 'event_espresso' ) . '</th> |
|
70 | + <th scope="col" align="left">' . __('Class', 'event_espresso').'->'.__('Method( arguments )', 'event_espresso').'</th> |
|
71 | 71 | </tr>'; |
72 | - $last_on_stack = count( $trace ) - 1; |
|
72 | + $last_on_stack = count($trace) - 1; |
|
73 | 73 | // reverse array so that stack is in proper chronological order |
74 | - $sorted_trace = array_reverse( $trace ); |
|
75 | - foreach ( $sorted_trace as $nmbr => $trace ) { |
|
76 | - $file = isset( $trace['file'] ) ? $trace['file'] : ''; |
|
77 | - $class = isset( $trace['class'] ) ? $trace['class'] : ''; |
|
78 | - $type = isset( $trace['type'] ) ? $trace['type'] : ''; |
|
79 | - $function = isset( $trace['function'] ) ? $trace['function'] : ''; |
|
80 | - $args = isset( $trace['args'] ) ? $this->_convert_args_to_string( $trace['args'] ) : ''; |
|
81 | - $args = isset( $trace['args'] ) && count( $trace['args'] ) > 4 ? ' <br />' . $args . '<br />' : $args; |
|
82 | - $line = isset( $trace['line'] ) ? $trace['line'] : ''; |
|
74 | + $sorted_trace = array_reverse($trace); |
|
75 | + foreach ($sorted_trace as $nmbr => $trace) { |
|
76 | + $file = isset($trace['file']) ? $trace['file'] : ''; |
|
77 | + $class = isset($trace['class']) ? $trace['class'] : ''; |
|
78 | + $type = isset($trace['type']) ? $trace['type'] : ''; |
|
79 | + $function = isset($trace['function']) ? $trace['function'] : ''; |
|
80 | + $args = isset($trace['args']) ? $this->_convert_args_to_string($trace['args']) : ''; |
|
81 | + $args = isset($trace['args']) && count($trace['args']) > 4 ? ' <br />'.$args.'<br />' : $args; |
|
82 | + $line = isset($trace['line']) ? $trace['line'] : ''; |
|
83 | 83 | $zebra = $nmbr % 2 !== 0 ? ' odd' : ''; |
84 | - if ( empty( $file ) && ! empty( $class ) ) { |
|
85 | - $a = new \ReflectionClass( $class ); |
|
84 | + if (empty($file) && ! empty($class)) { |
|
85 | + $a = new \ReflectionClass($class); |
|
86 | 86 | $file = $a->getFileName(); |
87 | - if ( empty( $line ) && ! empty( $function ) ) { |
|
88 | - $b = new \ReflectionMethod( $class, $function ); |
|
87 | + if (empty($line) && ! empty($function)) { |
|
88 | + $b = new \ReflectionMethod($class, $function); |
|
89 | 89 | $line = $b->getStartLine(); |
90 | 90 | } |
91 | 91 | } |
92 | - if ( $nmbr === $last_on_stack ) { |
|
92 | + if ($nmbr === $last_on_stack) { |
|
93 | 93 | $file = $exception->getFile() !== '' ? $exception->getFile() : $file; |
94 | 94 | $line = $exception->getLine() !== '' ? $exception->getLine() : $line; |
95 | - $error_code = $this->generate_error_code( $file, $trace['function'], $line ); |
|
95 | + $error_code = $this->generate_error_code($file, $trace['function'], $line); |
|
96 | 96 | } |
97 | - $file = \EEH_File::standardise_directory_separators( $file ); |
|
98 | - $nmbr = ! empty( $nmbr ) ? $nmbr : ' '; |
|
99 | - $line = ! empty( $line ) ? $line : ' '; |
|
100 | - $file = ! empty( $file ) ? $file : ' '; |
|
101 | - $class_display = ! empty( $class ) ? $class : ''; |
|
102 | - $type = ! empty( $type ) ? $type : ''; |
|
103 | - $function = ! empty( $function ) ? $function : ''; |
|
104 | - $args = ! empty( $args ) ? '( ' . $args . ' )' : '()'; |
|
97 | + $file = \EEH_File::standardise_directory_separators($file); |
|
98 | + $nmbr = ! empty($nmbr) ? $nmbr : ' '; |
|
99 | + $line = ! empty($line) ? $line : ' '; |
|
100 | + $file = ! empty($file) ? $file : ' '; |
|
101 | + $class_display = ! empty($class) ? $class : ''; |
|
102 | + $type = ! empty($type) ? $type : ''; |
|
103 | + $function = ! empty($function) ? $function : ''; |
|
104 | + $args = ! empty($args) ? '( '.$args.' )' : '()'; |
|
105 | 105 | $trace_details .= ' |
106 | 106 | <tr> |
107 | - <td align="right" valign="top" class="' . $zebra . '">' . $nmbr . '</td> |
|
108 | - <td align="right" valign="top" class="' . $zebra . '">' . $line . '</td> |
|
109 | - <td align="left" valign="top" class="' . $zebra . '">' . $file . '</td> |
|
110 | - <td align="left" valign="top" class="' . $zebra . '">' . $class_display . $type . $function . $args . '</td> |
|
107 | + <td align="right" valign="top" class="' . $zebra.'">'.$nmbr.'</td> |
|
108 | + <td align="right" valign="top" class="' . $zebra.'">'.$line.'</td> |
|
109 | + <td align="left" valign="top" class="' . $zebra.'">'.$file.'</td> |
|
110 | + <td align="left" valign="top" class="' . $zebra.'">'.$class_display.$type.$function.$args.'</td> |
|
111 | 111 | </tr>'; |
112 | 112 | } |
113 | 113 | $trace_details .= ' |
@@ -116,9 +116,9 @@ discard block |
||
116 | 116 | } |
117 | 117 | $code = $exception->getCode() ? $exception->getCode() : $error_code; |
118 | 118 | // add generic non-identifying messages for non-privileged users |
119 | - if ( ! WP_DEBUG ) { |
|
119 | + if ( ! WP_DEBUG) { |
|
120 | 120 | $output .= '<span class="ee-error-user-msg-spn">' |
121 | - . trim( $msg ) |
|
121 | + . trim($msg) |
|
122 | 122 | . '</span> <sup>' |
123 | 123 | . $code |
124 | 124 | . '</sup><br />'; |
@@ -129,15 +129,15 @@ discard block |
||
129 | 129 | <p class="ee-error-dev-msg-pg"> |
130 | 130 | ' |
131 | 131 | . sprintf( |
132 | - __( '%1$sAn %2$s was thrown!%3$s code: %4$s', 'event_espresso' ), |
|
132 | + __('%1$sAn %2$s was thrown!%3$s code: %4$s', 'event_espresso'), |
|
133 | 133 | '<strong class="ee-error-dev-msg-str">', |
134 | - get_class( $exception ), |
|
134 | + get_class($exception), |
|
135 | 135 | '</strong> <span>', |
136 | - $code . '</span>' |
|
136 | + $code.'</span>' |
|
137 | 137 | ) |
138 | 138 | . '<br /> |
139 | 139 | <span class="big-text">"' |
140 | - . trim( $msg ) |
|
140 | + . trim($msg) |
|
141 | 141 | . '"</span><br/> |
142 | 142 | <a id="display-ee-error-trace-1' |
143 | 143 | . $time |
@@ -145,13 +145,13 @@ discard block |
||
145 | 145 | . $time |
146 | 146 | . '"> |
147 | 147 | ' |
148 | - . __( 'click to view backtrace and class/method details', 'event_espresso' ) |
|
148 | + . __('click to view backtrace and class/method details', 'event_espresso') |
|
149 | 149 | . ' |
150 | 150 | </a><br /> |
151 | 151 | ' |
152 | 152 | . $exception->getFile() |
153 | 153 | . sprintf( |
154 | - __( '%1$s( line no: %2$s )%3$s', 'event_espresso' ), |
|
154 | + __('%1$s( line no: %2$s )%3$s', 'event_espresso'), |
|
155 | 155 | ' <span class="small-text lt-grey-text">', |
156 | 156 | $exception->getLine(), |
157 | 157 | '</span>' |
@@ -163,14 +163,14 @@ discard block |
||
163 | 163 | . '-dv" class="ee-error-trace-dv" style="display: none;"> |
164 | 164 | ' |
165 | 165 | . $trace_details; |
166 | - if ( ! empty( $class ) ) { |
|
166 | + if ( ! empty($class)) { |
|
167 | 167 | $output .= ' |
168 | 168 | <div style="padding:3px; margin:0 0 1em; border:1px solid #999; background:#fff; border-radius:3px;"> |
169 | 169 | <div style="padding:1em 2em; border:1px solid #999; background:#fcfcfc;"> |
170 | - <h3>' . __( 'Class Details', 'event_espresso' ) . '</h3>'; |
|
171 | - $a = new \ReflectionClass( $class ); |
|
170 | + <h3>' . __('Class Details', 'event_espresso').'</h3>'; |
|
171 | + $a = new \ReflectionClass($class); |
|
172 | 172 | $output .= ' |
173 | - <pre>' . $a . '</pre> |
|
173 | + <pre>' . $a.'</pre> |
|
174 | 174 | </div> |
175 | 175 | </div>'; |
176 | 176 | } |
@@ -180,16 +180,16 @@ discard block |
||
180 | 180 | <br />'; |
181 | 181 | } |
182 | 182 | // remove last linebreak |
183 | - $output = substr( $output, 0, count( $output ) - 7 ); |
|
184 | - if ( ! WP_DEBUG ) { |
|
183 | + $output = substr($output, 0, count($output) - 7); |
|
184 | + if ( ! WP_DEBUG) { |
|
185 | 185 | $output .= ' |
186 | 186 | </p>'; |
187 | 187 | } |
188 | 188 | $output .= ' |
189 | 189 | </div>'; |
190 | - $output .= $this->printScripts( true ); |
|
191 | - if ( defined( 'DOING_AJAX' ) ) { |
|
192 | - echo wp_json_encode( array( 'error' => $output ) ); |
|
190 | + $output .= $this->printScripts(true); |
|
191 | + if (defined('DOING_AJAX')) { |
|
192 | + echo wp_json_encode(array('error' => $output)); |
|
193 | 193 | exit(); |
194 | 194 | } |
195 | 195 | echo $output; |
@@ -206,56 +206,56 @@ discard block |
||
206 | 206 | * @param bool $array |
207 | 207 | * @return string |
208 | 208 | */ |
209 | - private function _convert_args_to_string( $arguments = array(), $indent = 0, $array = false ) { |
|
209 | + private function _convert_args_to_string($arguments = array(), $indent = 0, $array = false) { |
|
210 | 210 | $args = array(); |
211 | - $args_count = count( $arguments ); |
|
212 | - if ( $args_count > 2 ) { |
|
211 | + $args_count = count($arguments); |
|
212 | + if ($args_count > 2) { |
|
213 | 213 | $indent++; |
214 | 214 | $args[] = '<br />'; |
215 | 215 | } |
216 | 216 | $x = 0; |
217 | - foreach ( $arguments as $arg ) { |
|
217 | + foreach ($arguments as $arg) { |
|
218 | 218 | $x++; |
219 | - for( $i = 0; $i < $indent; $i++ ) { |
|
219 | + for ($i = 0; $i < $indent; $i++) { |
|
220 | 220 | $args[] = ' '; |
221 | 221 | } |
222 | - if ( is_string( $arg ) ) { |
|
223 | - if ( ! $array && strlen( $arg ) > 75 ) { |
|
222 | + if (is_string($arg)) { |
|
223 | + if ( ! $array && strlen($arg) > 75) { |
|
224 | 224 | $args[] = "<br />"; |
225 | - for ( $i = 0; $i <= $indent; $i++ ) { |
|
225 | + for ($i = 0; $i <= $indent; $i++) { |
|
226 | 226 | $args[] = ' '; |
227 | 227 | } |
228 | - $args[] = "'" . $arg . "'<br />"; |
|
228 | + $args[] = "'".$arg."'<br />"; |
|
229 | 229 | } else { |
230 | - $args[] = " '" . $arg . "'"; |
|
230 | + $args[] = " '".$arg."'"; |
|
231 | 231 | } |
232 | - } elseif ( is_array( $arg ) ) { |
|
233 | - $arg_count = count( $arg ); |
|
234 | - if ( $arg_count > 2 ) { |
|
232 | + } elseif (is_array($arg)) { |
|
233 | + $arg_count = count($arg); |
|
234 | + if ($arg_count > 2) { |
|
235 | 235 | $indent++; |
236 | - $args[] = " array(" . $this->_convert_args_to_string( $arg, $indent, true ) . ")"; |
|
236 | + $args[] = " array(".$this->_convert_args_to_string($arg, $indent, true).")"; |
|
237 | 237 | $indent--; |
238 | - } else if ( $arg_count === 0 ) { |
|
238 | + } else if ($arg_count === 0) { |
|
239 | 239 | $args[] = " array()"; |
240 | 240 | } else { |
241 | - $args[] = " array( " . $this->_convert_args_to_string( $arg ) . " )"; |
|
241 | + $args[] = " array( ".$this->_convert_args_to_string($arg)." )"; |
|
242 | 242 | } |
243 | - } elseif ( $arg === null ) { |
|
243 | + } elseif ($arg === null) { |
|
244 | 244 | $args[] = ' null'; |
245 | - } elseif ( is_bool( $arg ) ) { |
|
245 | + } elseif (is_bool($arg)) { |
|
246 | 246 | $args[] = $arg ? ' true' : ' false'; |
247 | - } elseif ( is_object( $arg ) ) { |
|
248 | - $args[] = get_class( $arg ); |
|
249 | - } elseif ( is_resource( $arg ) ) { |
|
250 | - $args[] = get_resource_type( $arg ); |
|
247 | + } elseif (is_object($arg)) { |
|
248 | + $args[] = get_class($arg); |
|
249 | + } elseif (is_resource($arg)) { |
|
250 | + $args[] = get_resource_type($arg); |
|
251 | 251 | } else { |
252 | 252 | $args[] = $arg; |
253 | 253 | } |
254 | - if ( $x === $args_count ) { |
|
255 | - if ( $args_count > 2 ) { |
|
254 | + if ($x === $args_count) { |
|
255 | + if ($args_count > 2) { |
|
256 | 256 | $args[] = "<br />"; |
257 | 257 | $indent--; |
258 | - for ( $i = 1; $i < $indent; $i++ ) { |
|
258 | + for ($i = 1; $i < $indent; $i++) { |
|
259 | 259 | $args[] = ' '; |
260 | 260 | } |
261 | 261 | } |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | $args[] = $args_count > 2 ? ",<br />" : ', '; |
264 | 264 | } |
265 | 265 | } |
266 | - return implode( '', $args ); |
|
266 | + return implode('', $args); |
|
267 | 267 | } |
268 | 268 | |
269 | 269 | |
@@ -278,11 +278,11 @@ discard block |
||
278 | 278 | * @param string $line |
279 | 279 | * @return string |
280 | 280 | */ |
281 | - protected function generate_error_code( $file = '', $func = '', $line = '' ) { |
|
282 | - $file_bits = explode( '.', basename( $file ) ); |
|
283 | - $error_code = ! empty( $file_bits[0] ) ? $file_bits[0] : ''; |
|
284 | - $error_code .= ! empty( $func ) ? ' - ' . $func : ''; |
|
285 | - $error_code .= ! empty( $line ) ? ' - ' . $line : ''; |
|
281 | + protected function generate_error_code($file = '', $func = '', $line = '') { |
|
282 | + $file_bits = explode('.', basename($file)); |
|
283 | + $error_code = ! empty($file_bits[0]) ? $file_bits[0] : ''; |
|
284 | + $error_code .= ! empty($func) ? ' - '.$func : ''; |
|
285 | + $error_code .= ! empty($line) ? ' - '.$line : ''; |
|
286 | 286 | return $error_code; |
287 | 287 | } |
288 | 288 | |
@@ -366,26 +366,26 @@ discard block |
||
366 | 366 | * @param bool $force_print |
367 | 367 | * @return string|void |
368 | 368 | */ |
369 | - private function printScripts( $force_print = false ) { |
|
370 | - if ( ! $force_print && ( did_action( 'admin_enqueue_scripts' ) || did_action( 'wp_enqueue_scripts' ) ) ) { |
|
371 | - if ( wp_script_is( 'ee_error_js', 'enqueued' ) ) { |
|
369 | + private function printScripts($force_print = false) { |
|
370 | + if ( ! $force_print && (did_action('admin_enqueue_scripts') || did_action('wp_enqueue_scripts'))) { |
|
371 | + if (wp_script_is('ee_error_js', 'enqueued')) { |
|
372 | 372 | return ''; |
373 | - } else if ( wp_script_is( 'ee_error_js', 'registered' ) ) { |
|
374 | - add_filter( 'FHEE_load_css', '__return_true' ); |
|
375 | - add_filter( 'FHEE_load_js', '__return_true' ); |
|
376 | - wp_enqueue_script( 'ee_error_js' ); |
|
377 | - wp_localize_script( 'ee_error_js', 'ee_settings', array( 'wp_debug' => WP_DEBUG ) ); |
|
373 | + } else if (wp_script_is('ee_error_js', 'registered')) { |
|
374 | + add_filter('FHEE_load_css', '__return_true'); |
|
375 | + add_filter('FHEE_load_js', '__return_true'); |
|
376 | + wp_enqueue_script('ee_error_js'); |
|
377 | + wp_localize_script('ee_error_js', 'ee_settings', array('wp_debug' => WP_DEBUG)); |
|
378 | 378 | } |
379 | 379 | } else { |
380 | 380 | return ' |
381 | 381 | <script> |
382 | 382 | /* <![CDATA[ */ |
383 | -var ee_settings = {"wp_debug":"' . WP_DEBUG . '"}; |
|
383 | +var ee_settings = {"wp_debug":"' . WP_DEBUG.'"}; |
|
384 | 384 | /* ]]> */ |
385 | 385 | </script> |
386 | -<script src="' . includes_url() . 'js/jquery/jquery.js" type="text/javascript"></script> |
|
387 | -<script src="' . EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js' . '?ver=' . espresso_version() . '" type="text/javascript"></script> |
|
388 | -<script src="' . EE_GLOBAL_ASSETS_URL . 'scripts/EE_Error.js' . '?ver=' . espresso_version() . '" type="text/javascript"></script> |
|
386 | +<script src="' . includes_url().'js/jquery/jquery.js" type="text/javascript"></script> |
|
387 | +<script src="' . EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js'.'?ver='.espresso_version().'" type="text/javascript"></script> |
|
388 | +<script src="' . EE_GLOBAL_ASSETS_URL.'scripts/EE_Error.js'.'?ver='.espresso_version().'" type="text/javascript"></script> |
|
389 | 389 | '; |
390 | 390 | } |
391 | 391 | return ''; |
@@ -1,8 +1,8 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | namespace EventEspresso\core\libraries\form_sections\form_handlers; |
3 | 3 | |
4 | -if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
5 | - exit( 'No direct script access allowed' ); |
|
4 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
5 | + exit('No direct script access allowed'); |
|
6 | 6 | } |
7 | 7 | |
8 | 8 | |
@@ -26,8 +26,8 @@ discard block |
||
26 | 26 | * @param int $code |
27 | 27 | * @param \Exception $previous |
28 | 28 | */ |
29 | - public function __construct( $actual, $message = '', $code = 0, \Exception $previous = null ) { |
|
30 | - if ( empty( $message ) ) { |
|
29 | + public function __construct($actual, $message = '', $code = 0, \Exception $previous = null) { |
|
30 | + if (empty($message)) { |
|
31 | 31 | $message = sprintf( |
32 | 32 | __( |
33 | 33 | 'A valid Form Handler was expected but instead "%1$s" was received.', |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | $actual |
37 | 37 | ); |
38 | 38 | } |
39 | - parent::__construct( $message, $code, $previous ); |
|
39 | + parent::__construct($message, $code, $previous); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | } |
@@ -3,8 +3,8 @@ discard block |
||
3 | 3 | |
4 | 4 | use EE_Form_Section_Proper; |
5 | 5 | |
6 | -if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
7 | - exit( 'No direct script access allowed' ); |
|
6 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
7 | + exit('No direct script access allowed'); |
|
8 | 8 | } |
9 | 9 | |
10 | 10 | |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | /** |
37 | 37 | * @param \EE_Form_Section_Proper $form |
38 | 38 | */ |
39 | - public function setForm( \EE_Form_Section_Proper $form ); |
|
39 | + public function setForm(\EE_Form_Section_Proper $form); |
|
40 | 40 | |
41 | 41 | |
42 | 42 | |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | /** |
54 | 54 | * @param boolean $displayable |
55 | 55 | */ |
56 | - public function setDisplayable( $displayable = false ); |
|
56 | + public function setDisplayable($displayable = false); |
|
57 | 57 | |
58 | 58 | |
59 | 59 | |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | /** |
95 | 95 | * @param string $submit_btn_text |
96 | 96 | */ |
97 | - public function setSubmitBtnText( $submit_btn_text ); |
|
97 | + public function setSubmitBtnText($submit_btn_text); |
|
98 | 98 | |
99 | 99 | |
100 | 100 | |
@@ -108,14 +108,14 @@ discard block |
||
108 | 108 | /** |
109 | 109 | * @param string $form_action |
110 | 110 | */ |
111 | - public function setFormAction( $form_action ); |
|
111 | + public function setFormAction($form_action); |
|
112 | 112 | |
113 | 113 | |
114 | 114 | |
115 | 115 | /** |
116 | 116 | * @param array $form_args |
117 | 117 | */ |
118 | - public function addFormActionArgs( $form_args = array() ); |
|
118 | + public function addFormActionArgs($form_args = array()); |
|
119 | 119 | |
120 | 120 | |
121 | 121 | |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | * |
136 | 136 | * @param string $form_config |
137 | 137 | */ |
138 | - public function setFormConfig( $form_config ); |
|
138 | + public function setFormConfig($form_config); |
|
139 | 139 | |
140 | 140 | |
141 | 141 | |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | * @param array $submitted_form_data |
188 | 188 | * @return bool |
189 | 189 | */ |
190 | - public function process( $submitted_form_data = array() ); |
|
190 | + public function process($submitted_form_data = array()); |
|
191 | 191 | |
192 | 192 | |
193 | 193 | |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | * @param string $text |
198 | 198 | * @return \EE_Submit_Input |
199 | 199 | */ |
200 | - public function generateSubmitButton( $text = '' ); |
|
200 | + public function generateSubmitButton($text = ''); |
|
201 | 201 | |
202 | 202 | |
203 | 203 | |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | * @param string $text |
217 | 217 | * @return \EE_Submit_Input |
218 | 218 | */ |
219 | - public function generateCancelButton( $text = '' ); |
|
219 | + public function generateCancelButton($text = ''); |
|
220 | 220 | |
221 | 221 | |
222 | 222 |