@@ -17,13 +17,13 @@ discard block |
||
17 | 17 | * @since 4.8.30.rc.007 |
18 | 18 | * |
19 | 19 | */ |
20 | -if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
21 | - exit( 'No direct script access allowed' ); |
|
20 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
21 | + exit('No direct script access allowed'); |
|
22 | 22 | } |
23 | 23 | |
24 | -define( 'BATCH_URL', plugin_dir_url( __FILE__ ) ); |
|
24 | +define('BATCH_URL', plugin_dir_url(__FILE__)); |
|
25 | 25 | |
26 | -class EED_Batch extends EED_Module{ |
|
26 | +class EED_Batch extends EED_Module { |
|
27 | 27 | |
28 | 28 | /** |
29 | 29 | * Possibly value for $_REQUEST[ 'batch' ]. Indicates to run a job that |
@@ -70,9 +70,9 @@ discard block |
||
70 | 70 | public static function set_hooks() { |
71 | 71 | //because this is a possibel attack vector, let's have this disabled until |
72 | 72 | //we at least have a real use for it on the frontend |
73 | - if( apply_filters( 'FHEE__EED_Batch__set_hooks__enable_frontend_batch', false ) ) { |
|
74 | - add_action( 'wp_enqueue_scripts', array( self::instance(), 'enqueue_scripts' ) ); |
|
75 | - add_filter( 'template_include', array( self::instance(), 'override_template' ), 99 ); |
|
73 | + if (apply_filters('FHEE__EED_Batch__set_hooks__enable_frontend_batch', false)) { |
|
74 | + add_action('wp_enqueue_scripts', array(self::instance(), 'enqueue_scripts')); |
|
75 | + add_filter('template_include', array(self::instance(), 'override_template'), 99); |
|
76 | 76 | } |
77 | 77 | } |
78 | 78 | |
@@ -80,28 +80,28 @@ discard block |
||
80 | 80 | * Initializes some hooks for the admin in order to run batch jobs |
81 | 81 | */ |
82 | 82 | public static function set_hooks_admin() { |
83 | - add_action( 'admin_menu', array( self::instance(), 'register_admin_pages' ) ); |
|
84 | - add_action( 'admin_enqueue_scripts', array( self::instance(), 'enqueue_scripts' ) ); |
|
83 | + add_action('admin_menu', array(self::instance(), 'register_admin_pages')); |
|
84 | + add_action('admin_enqueue_scripts', array(self::instance(), 'enqueue_scripts')); |
|
85 | 85 | |
86 | 86 | //ajax |
87 | - add_action('wp_ajax_espresso_batch_continue',array(self::instance(),'batch_continue')); |
|
88 | - add_action('wp_ajax_espresso_batch_cleanup',array(self::instance(),'batch_cleanup')); |
|
89 | - add_action('wp_ajax_nopriv_espresso_batch_continue',array(self::instance(),'batch_continue')); |
|
90 | - add_action('wp_ajax_nopriv_espresso_batch_cleanup',array(self::instance(),'batch_cleanup')); |
|
87 | + add_action('wp_ajax_espresso_batch_continue', array(self::instance(), 'batch_continue')); |
|
88 | + add_action('wp_ajax_espresso_batch_cleanup', array(self::instance(), 'batch_cleanup')); |
|
89 | + add_action('wp_ajax_nopriv_espresso_batch_continue', array(self::instance(), 'batch_continue')); |
|
90 | + add_action('wp_ajax_nopriv_espresso_batch_cleanup', array(self::instance(), 'batch_cleanup')); |
|
91 | 91 | } |
92 | 92 | |
93 | 93 | /** |
94 | 94 | * Enqueues batch scripts on the frontend or admin, and creates a job |
95 | 95 | */ |
96 | 96 | public function enqueue_scripts() { |
97 | - if( isset( $_REQUEST[ 'espresso_batch' ] ) |
|
97 | + if (isset($_REQUEST['espresso_batch']) |
|
98 | 98 | || |
99 | 99 | ( |
100 | - isset( $_REQUEST[ 'page' ] ) |
|
101 | - && $_REQUEST[ 'page' ] == 'espresso_batch' |
|
100 | + isset($_REQUEST['page']) |
|
101 | + && $_REQUEST['page'] == 'espresso_batch' |
|
102 | 102 | ) |
103 | 103 | ) { |
104 | - switch( $this->batch_request_type() ) { |
|
104 | + switch ($this->batch_request_type()) { |
|
105 | 105 | case self::batch_job: |
106 | 106 | $this->enqueue_scripts_styles_batch_create(); |
107 | 107 | break; |
@@ -117,11 +117,11 @@ discard block |
||
117 | 117 | */ |
118 | 118 | public function enqueue_scripts_styles_batch_create() { |
119 | 119 | $job_response = $this->_enqueue_batch_job_scripts_and_styles_and_start_job(); |
120 | - wp_enqueue_script( 'batch_runner_init', BATCH_URL . '/assets/batch_runner_init.js', array( 'batch_runner' ), EVENT_ESPRESSO_VERSION, true ); |
|
121 | - wp_localize_script( 'batch_runner_init', 'ee_job_response', $job_response->to_array() ); |
|
122 | - wp_localize_script( 'batch_runner_init', 'ee_job_i18n', |
|
120 | + wp_enqueue_script('batch_runner_init', BATCH_URL.'/assets/batch_runner_init.js', array('batch_runner'), EVENT_ESPRESSO_VERSION, true); |
|
121 | + wp_localize_script('batch_runner_init', 'ee_job_response', $job_response->to_array()); |
|
122 | + wp_localize_script('batch_runner_init', 'ee_job_i18n', |
|
123 | 123 | array( |
124 | - 'return_url' => $_REQUEST['return_url' ], |
|
124 | + 'return_url' => $_REQUEST['return_url'], |
|
125 | 125 | )); |
126 | 126 | } |
127 | 127 | |
@@ -131,15 +131,15 @@ discard block |
||
131 | 131 | public function enqueue_scripts_styles_batch_file_create() { |
132 | 132 | //creates a job based on the request variable |
133 | 133 | $job_response = $this->_enqueue_batch_job_scripts_and_styles_and_start_job(); |
134 | - wp_enqueue_script( 'batch_file_runner_init', BATCH_URL . '/assets/batch_file_runner_init.js', array( 'batch_runner' ), EVENT_ESPRESSO_VERSION, true ); |
|
135 | - wp_localize_script( 'batch_file_runner_init', 'ee_job_response', $job_response->to_array() ); |
|
136 | - wp_localize_script( 'batch_file_runner_init', 'ee_job_i18n', |
|
134 | + wp_enqueue_script('batch_file_runner_init', BATCH_URL.'/assets/batch_file_runner_init.js', array('batch_runner'), EVENT_ESPRESSO_VERSION, true); |
|
135 | + wp_localize_script('batch_file_runner_init', 'ee_job_response', $job_response->to_array()); |
|
136 | + wp_localize_script('batch_file_runner_init', 'ee_job_i18n', |
|
137 | 137 | array( |
138 | 138 | 'download_and_redirecting' => sprintf( |
139 | 139 | __('File Generation complete. Downloading, and %1$sredirecting%2$s...', 'event_espresso'), |
140 | - '<a href="' . $_REQUEST['return_url' ] .'">', |
|
140 | + '<a href="'.$_REQUEST['return_url'].'">', |
|
141 | 141 | '</a>' ), |
142 | - 'return_url' => $_REQUEST['return_url' ], |
|
142 | + 'return_url' => $_REQUEST['return_url'], |
|
143 | 143 | )); |
144 | 144 | } |
145 | 145 | |
@@ -150,18 +150,18 @@ discard block |
||
150 | 150 | * @return \EventEspressoBatchRequest\Helpers\JobStepResponse |
151 | 151 | */ |
152 | 152 | protected function _enqueue_batch_job_scripts_and_styles_and_start_job() { |
153 | - wp_register_script( 'progress_bar', EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/progress_bar.js', array( 'jquery' ) ); |
|
154 | - wp_enqueue_style( 'progress_bar', EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/progress_bar.css', array(), EVENT_ESPRESSO_VERSION ); |
|
155 | - wp_enqueue_script( 'batch_runner', EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/batch_runner.js', array( 'progress_bar' )); |
|
153 | + wp_register_script('progress_bar', EE_PLUGIN_DIR_URL.'core/libraries/batch/Assets/progress_bar.js', array('jquery')); |
|
154 | + wp_enqueue_style('progress_bar', EE_PLUGIN_DIR_URL.'core/libraries/batch/Assets/progress_bar.css', array(), EVENT_ESPRESSO_VERSION); |
|
155 | + wp_enqueue_script('batch_runner', EE_PLUGIN_DIR_URL.'core/libraries/batch/Assets/batch_runner.js', array('progress_bar')); |
|
156 | 156 | //just copy the bits of EE admin's eei18n that we need in the JS |
157 | - wp_localize_script( 'batch_runner', 'eei18n', array( 'ajax_url' => WP_AJAX_URL, 'is_admin' => (bool)is_admin() ) ); |
|
158 | - $job_handler_classname = stripslashes( $_GET[ 'job_handler' ] ); |
|
157 | + wp_localize_script('batch_runner', 'eei18n', array('ajax_url' => WP_AJAX_URL, 'is_admin' => (bool) is_admin())); |
|
158 | + $job_handler_classname = stripslashes($_GET['job_handler']); |
|
159 | 159 | $request_data = array_diff_key( |
160 | 160 | $_REQUEST, |
161 | - array_flip( array( 'action', 'page', 'ee', 'batch' ) ) ); |
|
161 | + array_flip(array('action', 'page', 'ee', 'batch')) ); |
|
162 | 162 | $batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor(); |
163 | 163 | //eg 'EventEspressoBatchRequest\JobHandlers\RegistrationsReport' |
164 | - $job_response = $batch_runner->create_job( $job_handler_classname, $request_data ); |
|
164 | + $job_response = $batch_runner->create_job($job_handler_classname, $request_data); |
|
165 | 165 | //remember the response for later. We need it to display the page body |
166 | 166 | $this->_job_step_response = $job_response; |
167 | 167 | return $job_response; |
@@ -172,9 +172,9 @@ discard block |
||
172 | 172 | * @param string $template |
173 | 173 | * @return string |
174 | 174 | */ |
175 | - public function override_template( $template ) { |
|
176 | - if( isset( $_REQUEST[ 'espresso_batch' ] ) && isset( $_REQUEST[ 'batch' ] ) ) { |
|
177 | - return EE_MODULES . 'batch' . DS . 'templates' . DS . 'batch_frontend_wrapper.template.html'; |
|
175 | + public function override_template($template) { |
|
176 | + if (isset($_REQUEST['espresso_batch']) && isset($_REQUEST['batch'])) { |
|
177 | + return EE_MODULES.'batch'.DS.'templates'.DS.'batch_frontend_wrapper.template.html'; |
|
178 | 178 | } |
179 | 179 | return $template; |
180 | 180 | } |
@@ -185,11 +185,11 @@ discard block |
||
185 | 185 | public function register_admin_pages() { |
186 | 186 | add_submenu_page( |
187 | 187 | '', //parent slug. we don't want this to actually appear in the menu |
188 | - __( 'Batch Job', 'event_espresso' ), //page title |
|
188 | + __('Batch Job', 'event_espresso'), //page title |
|
189 | 189 | 'n/a', //menu title |
190 | 190 | 'read', //we want this page to actually be accessible to anyone, |
191 | 191 | 'espresso_batch', //menu slug |
192 | - array( self::instance(), 'show_admin_page' ) |
|
192 | + array(self::instance(), 'show_admin_page') |
|
193 | 193 | ); |
194 | 194 | } |
195 | 195 | |
@@ -199,8 +199,8 @@ discard block |
||
199 | 199 | */ |
200 | 200 | public function show_admin_page() { |
201 | 201 | echo EEH_Template::locate_template( |
202 | - EE_MODULES . 'batch' . DS . 'templates' . DS . 'batch_wrapper.template.html', |
|
203 | - array( 'batch_request_type' => $this->batch_request_type() ) |
|
202 | + EE_MODULES.'batch'.DS.'templates'.DS.'batch_wrapper.template.html', |
|
203 | + array('batch_request_type' => $this->batch_request_type()) |
|
204 | 204 | ); |
205 | 205 | } |
206 | 206 | |
@@ -208,10 +208,10 @@ discard block |
||
208 | 208 | * Receives ajax calls for continuing a job |
209 | 209 | */ |
210 | 210 | public function batch_continue() { |
211 | - $job_id = sanitize_text_field( $_REQUEST[ 'job_id' ] ); |
|
211 | + $job_id = sanitize_text_field($_REQUEST['job_id']); |
|
212 | 212 | $batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor(); |
213 | - $response_obj = $batch_runner->continue_job( $job_id); |
|
214 | - $this->_return_json( $response_obj->to_array() ); |
|
213 | + $response_obj = $batch_runner->continue_job($job_id); |
|
214 | + $this->_return_json($response_obj->to_array()); |
|
215 | 215 | } |
216 | 216 | |
217 | 217 | /** |
@@ -219,10 +219,10 @@ discard block |
||
219 | 219 | * @return type |
220 | 220 | */ |
221 | 221 | public function batch_cleanup() { |
222 | - $job_id = sanitize_text_field( $_REQUEST[ 'job_id' ] ); |
|
222 | + $job_id = sanitize_text_field($_REQUEST['job_id']); |
|
223 | 223 | $batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor(); |
224 | - $response_obj = $batch_runner->cleanup_job( $job_id ); |
|
225 | - $this->_return_json( $response_obj->to_array() ); |
|
224 | + $response_obj = $batch_runner->cleanup_job($job_id); |
|
225 | + $this->_return_json($response_obj->to_array()); |
|
226 | 226 | } |
227 | 227 | |
228 | 228 | |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | * 'isEEajax' => true,//indicates this is a response from EE |
239 | 239 | * ) |
240 | 240 | */ |
241 | - protected function _return_json( $data ) { |
|
241 | + protected function _return_json($data) { |
|
242 | 242 | $json = array( |
243 | 243 | 'notices' => EE_Error::get_notices(), |
244 | 244 | 'data' => $data, |
@@ -247,13 +247,13 @@ discard block |
||
247 | 247 | |
248 | 248 | |
249 | 249 | // make sure there are no php errors or headers_sent. Then we can set correct json header. |
250 | - if ( NULL === error_get_last() || ! headers_sent() ) { |
|
250 | + if (NULL === error_get_last() || ! headers_sent()) { |
|
251 | 251 | header('Content-Type: application/json; charset=UTF-8'); |
252 | 252 | } |
253 | - if( function_exists( 'wp_json_encode' ) ) { |
|
254 | - echo wp_json_encode( $json ); |
|
253 | + if (function_exists('wp_json_encode')) { |
|
254 | + echo wp_json_encode($json); |
|
255 | 255 | } else { |
256 | - echo json_encode( $json ); |
|
256 | + echo json_encode($json); |
|
257 | 257 | } |
258 | 258 | exit(); |
259 | 259 | } |
@@ -270,16 +270,16 @@ discard block |
||
270 | 270 | * @return string: EED_Batch::batch_job, EED_Batch::batch_file_job, EED_Batch::batch_not_job |
271 | 271 | */ |
272 | 272 | public function batch_request_type() { |
273 | - if( $this->_batch_request_type === null ) { |
|
274 | - if( isset( $_GET[ 'batch' ] ) ) { |
|
275 | - if( $_GET[ 'batch' ] == self::batch_job ) { |
|
273 | + if ($this->_batch_request_type === null) { |
|
274 | + if (isset($_GET['batch'])) { |
|
275 | + if ($_GET['batch'] == self::batch_job) { |
|
276 | 276 | $this->_batch_request_type = self::batch_job; |
277 | - } elseif( $_GET[ 'batch' ] == self::batch_file_job ) { |
|
277 | + } elseif ($_GET['batch'] == self::batch_file_job) { |
|
278 | 278 | $this->_batch_request_type = self::batch_file_job; |
279 | 279 | } |
280 | 280 | } |
281 | 281 | //if we didn't find that it was a batch request, indicate it wasn't |
282 | - if( $this->_batch_request_type === null ) { |
|
282 | + if ($this->_batch_request_type === null) { |
|
283 | 283 | $this->_batch_request_type = self::batch_not_job; |
284 | 284 | } |
285 | 285 | } |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | * Unnecessary |
291 | 291 | * @param type $WP |
292 | 292 | */ |
293 | - public function run( $WP ) { |
|
293 | + public function run($WP) { |
|
294 | 294 | |
295 | 295 | } |
296 | 296 |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | |
8 | 8 | function ee_resurse_into_array($data) { |
9 | 9 | if (is_object($data) || $data instanceof __PHP_Incomplete_Class) {//is_object($incomplete_class) actually returns false, hence why we check for it |
10 | - $data = (array)$data; |
|
10 | + $data = (array) $data; |
|
11 | 11 | } |
12 | 12 | if (is_array($data)) { |
13 | 13 | if (EEH_Array::is_associative_array($data)) { |
@@ -19,10 +19,10 @@ discard block |
||
19 | 19 | ?> |
20 | 20 | <tr> |
21 | 21 | <td> |
22 | - <?php echo $data_key;?> |
|
22 | + <?php echo $data_key; ?> |
|
23 | 23 | </td> |
24 | 24 | <td> |
25 | - <?php ee_resurse_into_array($data_values);?> |
|
25 | + <?php ee_resurse_into_array($data_values); ?> |
|
26 | 26 | </td> |
27 | 27 | </tr> |
28 | 28 | <?php |
@@ -36,31 +36,31 @@ discard block |
||
36 | 36 | <ul> |
37 | 37 | <?php |
38 | 38 | foreach ($data as $datum) { |
39 | - echo "<li>";ee_resurse_into_array($datum);echo "</li>"; |
|
39 | + echo "<li>"; ee_resurse_into_array($datum); echo "</li>"; |
|
40 | 40 | }?> |
41 | 41 | </ul> |
42 | 42 | <?php |
43 | 43 | } |
44 | - }else { |
|
44 | + } else { |
|
45 | 45 | //simple value |
46 | 46 | echo $data; |
47 | 47 | } |
48 | 48 | } |
49 | 49 | ?> |
50 | 50 | <h1> |
51 | - <?php _e("System Information", "event_espresso");?> |
|
51 | + <?php _e("System Information", "event_espresso"); ?> |
|
52 | 52 | </h1> |
53 | 53 | <div class="padding"> |
54 | - <h2><?php _e("Raw System Data", "event_espresso");?></h2> |
|
54 | + <h2><?php _e("Raw System Data", "event_espresso"); ?></h2> |
|
55 | 55 | <textarea class="system_status_info"> |
56 | 56 | <?php print_r($system_stati)?> |
57 | 57 | </textarea> |
58 | - <h2><?php _e("System Data (formatted)", "event_espresso");?></h2> |
|
58 | + <h2><?php _e("System Data (formatted)", "event_espresso"); ?></h2> |
|
59 | 59 | <table class="widefat"> |
60 | 60 | <?php |
61 | 61 | foreach ($system_stati as $status_category_slug => $data) { |
62 | 62 | if (is_object($data)) { |
63 | - $data = (array)$data; |
|
63 | + $data = (array) $data; |
|
64 | 64 | } |
65 | 65 | ?> |
66 | 66 | <thead> |
@@ -1,9 +1,9 @@ discard block |
||
1 | 1 | <div id="admin-primary-mbox-dv" class="admin-primary-mbox-dv"> |
2 | 2 | |
3 | - <h3 class="admin-primary-mbox-h4"><?php echo isset($event_name) ? $event_name . ' Custom Template' : ''; ?></h3> |
|
3 | + <h3 class="admin-primary-mbox-h4"><?php echo isset($event_name) ? $event_name.' Custom Template' : ''; ?></h3> |
|
4 | 4 | <input type="hidden" id="ee-msg-current-context" name="MTP_context" value="<?php echo $context; ?>" /> |
5 | 5 | <!-- if this is not a global template then let's show the name and description fields --> |
6 | - <?php if ( ! $MTP->is_global() ) : ?> |
|
6 | + <?php if ( ! $MTP->is_global()) : ?> |
|
7 | 7 | <div class="non-global-mtp-fields"> |
8 | 8 | <p> |
9 | 9 | <?php _e('This is a custom template. Custom Templates have an editable name and description to help you differentiate between templates.', 'event_espresso'); ?> |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | <?php endif; ?> |
26 | 26 | <!-- we need to loop through the template_fields so we know our structure --> |
27 | 27 | <?php |
28 | - if ( isset($template_fields) && !empty($template_fields) && !is_wp_error($template_fields) ) { |
|
28 | + if (isset($template_fields) && ! empty($template_fields) && ! is_wp_error($template_fields)) { |
|
29 | 29 | echo $template_fields; |
30 | 30 | } else { |
31 | 31 | ?> |
@@ -631,8 +631,6 @@ |
||
631 | 631 | /** |
632 | 632 | * handles toggleing the checkin status for the registration, |
633 | 633 | * @access protected |
634 | - * @param boolean $check_in |
|
635 | - * @return void |
|
636 | 634 | */ |
637 | 635 | protected function _toggle_checkin_status() { |
638 | 636 | //first let's get the query args out of the way for the redirect |
@@ -453,9 +453,9 @@ discard block |
||
453 | 453 | |
454 | 454 | /** |
455 | 455 | * generates Business Reports regarding Registrations |
456 | - * @access protected |
|
457 | - * @return void |
|
458 | - */ |
|
456 | + * @access protected |
|
457 | + * @return void |
|
458 | + */ |
|
459 | 459 | protected function _registration_reports() { |
460 | 460 | $template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php'; |
461 | 461 | $this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_reports_template_data, true ); |
@@ -630,10 +630,10 @@ discard block |
||
630 | 630 | |
631 | 631 | /** |
632 | 632 | * handles toggleing the checkin status for the registration, |
633 | - * @access protected |
|
634 | - * @param boolean $check_in |
|
635 | - * @return void |
|
636 | - */ |
|
633 | + * @access protected |
|
634 | + * @param boolean $check_in |
|
635 | + * @return void |
|
636 | + */ |
|
637 | 637 | protected function _toggle_checkin_status() { |
638 | 638 | //first let's get the query args out of the way for the redirect |
639 | 639 | $query_args = array( |
@@ -754,9 +754,9 @@ discard block |
||
754 | 754 | |
755 | 755 | /** |
756 | 756 | * generates HTML for the Event Registrations List Table |
757 | - * @access protected |
|
758 | - * @return void |
|
759 | - */ |
|
757 | + * @access protected |
|
758 | + * @return void |
|
759 | + */ |
|
760 | 760 | protected function _event_registrations_list_table() { |
761 | 761 | do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
762 | 762 | $this->_admin_page_title .= isset( $this->_req_data['event_id'] ) ? $this->get_action_link_or_button('new_registration', 'add-registrant', array('event_id' => $this->_req_data['event_id']), 'add-new-h2') : ''; |
@@ -786,11 +786,11 @@ discard block |
||
786 | 786 | 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_approved, |
787 | 787 | 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_approved, FALSE, 'sentence' ) |
788 | 788 | ), |
789 | - 'cancelled_status' => array( |
|
789 | + 'cancelled_status' => array( |
|
790 | 790 | 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_cancelled, |
791 | 791 | 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, FALSE, 'sentence' ) |
792 | 792 | ), |
793 | - 'declined_status' => array( |
|
793 | + 'declined_status' => array( |
|
794 | 794 | 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_declined, |
795 | 795 | 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_declined, FALSE, 'sentence' ) |
796 | 796 | ), |
@@ -818,9 +818,9 @@ discard block |
||
818 | 818 | /** |
819 | 819 | * get_attendees |
820 | 820 | * @param bool $count whether to return count or data. |
821 | - * @access public |
|
822 | - * @return array |
|
823 | - */ |
|
821 | + * @access public |
|
822 | + * @return array |
|
823 | + */ |
|
824 | 824 | public function get_event_attendees( $per_page = 10, $count = FALSE, $trash = FALSE, $orderby = '' ) { |
825 | 825 | |
826 | 826 | do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) |
|
2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
3 | 3 | exit('NO direct script access allowed'); |
4 | 4 | |
5 | 5 | /** |
@@ -37,20 +37,20 @@ discard block |
||
37 | 37 | protected $_reports_template_data = array(); |
38 | 38 | |
39 | 39 | |
40 | - public function __construct( $routing = TRUE ) { |
|
41 | - parent::__construct( $routing ); |
|
42 | - define( 'REG_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'registrations/templates/'); |
|
43 | - define( 'REG_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND . 'registrations/assets/'); |
|
44 | - define( 'REG_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'registrations/assets/'); |
|
40 | + public function __construct($routing = TRUE) { |
|
41 | + parent::__construct($routing); |
|
42 | + define('REG_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'registrations/templates/'); |
|
43 | + define('REG_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND.'registrations/assets/'); |
|
44 | + define('REG_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'registrations/assets/'); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | |
48 | 48 | protected function _extend_page_config() { |
49 | - $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'registrations'; |
|
49 | + $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'registrations'; |
|
50 | 50 | |
51 | - $reg_id = ! empty( $this->_req_data['_REG_ID'] ) && ! is_array( $this->_req_data['_REG_ID'] ) ? $this->_req_data['_REG_ID'] : 0; |
|
52 | - $att_id = ! empty( $this->_req_data[ 'ATT_ID' ] ) ? ! is_array( $this->_req_data['ATT_ID'] ) : 0; |
|
53 | - $att_id = ! empty( $this->_req_data['post'] ) && ! is_array( $this->_req_data['post'] ) ? $this->_req_data['post'] : $att_id; |
|
51 | + $reg_id = ! empty($this->_req_data['_REG_ID']) && ! is_array($this->_req_data['_REG_ID']) ? $this->_req_data['_REG_ID'] : 0; |
|
52 | + $att_id = ! empty($this->_req_data['ATT_ID']) ? ! is_array($this->_req_data['ATT_ID']) : 0; |
|
53 | + $att_id = ! empty($this->_req_data['post']) && ! is_array($this->_req_data['post']) ? $this->_req_data['post'] : $att_id; |
|
54 | 54 | |
55 | 55 | $new_page_routes = array( |
56 | 56 | 'reports' => array( |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | ) |
90 | 90 | ); |
91 | 91 | |
92 | - $this->_page_routes = array_merge( $this->_page_routes, $new_page_routes ); |
|
92 | + $this->_page_routes = array_merge($this->_page_routes, $new_page_routes); |
|
93 | 93 | |
94 | 94 | $new_page_config = array( |
95 | 95 | 'reports' => array( |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | 'filename' => 'registrations_reports' |
104 | 104 | ) |
105 | 105 | ), |
106 | - 'help_tour' => array( 'Registration_Reports_Help_Tour' ), |
|
106 | + 'help_tour' => array('Registration_Reports_Help_Tour'), |
|
107 | 107 | 'require_nonce' => FALSE |
108 | 108 | ), |
109 | 109 | 'event_registrations' => array( |
@@ -134,8 +134,8 @@ discard block |
||
134 | 134 | 'filename' => 'registrations_event_checkin_other' |
135 | 135 | ) |
136 | 136 | ), |
137 | - 'help_tour' => array( 'Event_Checkin_Help_Tour' ), |
|
138 | - 'qtips' => array('Registration_List_Table_Tips' ), |
|
137 | + 'help_tour' => array('Event_Checkin_Help_Tour'), |
|
138 | + 'qtips' => array('Registration_List_Table_Tips'), |
|
139 | 139 | 'list_table' => 'EE_Event_Registrations_List_Table', |
140 | 140 | 'metaboxes' => array(), |
141 | 141 | 'require_nonce' => FALSE |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | // var_dump($this->_req_data); |
157 | 157 | // exit(); |
158 | 158 | |
159 | - $this->_page_config = array_merge( $this->_page_config, $new_page_config ); |
|
159 | + $this->_page_config = array_merge($this->_page_config, $new_page_config); |
|
160 | 160 | $this->_page_config['contact_list']['list_table'] = 'Extend_EE_Attendee_Contact_List_Table'; |
161 | 161 | $this->_page_config['default']['list_table'] = 'Extend_EE_Registrations_List_Table'; |
162 | 162 | } |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | |
166 | 166 | protected function _ajax_hooks() { |
167 | 167 | parent::_ajax_hooks(); |
168 | - add_action('wp_ajax_get_newsletter_form_content', array( $this, 'get_newsletter_form_content') ); |
|
168 | + add_action('wp_ajax_get_newsletter_form_content', array($this, 'get_newsletter_form_content')); |
|
169 | 169 | } |
170 | 170 | |
171 | 171 | |
@@ -175,20 +175,20 @@ discard block |
||
175 | 175 | |
176 | 176 | //if newsletter message type is active then let's add filter and load js for it. |
177 | 177 | EE_Registry::instance()->load_helper('MSG_Template'); |
178 | - if ( EEH_MSG_Template::is_mt_active('newsletter') ) { |
|
178 | + if (EEH_MSG_Template::is_mt_active('newsletter')) { |
|
179 | 179 | //enqueue newsletter js |
180 | - wp_enqueue_script( 'ee-newsletter-trigger', REG_CAF_ASSETS_URL . 'ee-newsletter-trigger.js', array( 'ee-dialog'), EVENT_ESPRESSO_VERSION, TRUE ); |
|
181 | - wp_enqueue_style( 'ee-newsletter-trigger-css', REG_CAF_ASSETS_URL . 'ee-newsletter-trigger.css', array(), EVENT_ESPRESSO_VERSION ); |
|
180 | + wp_enqueue_script('ee-newsletter-trigger', REG_CAF_ASSETS_URL.'ee-newsletter-trigger.js', array('ee-dialog'), EVENT_ESPRESSO_VERSION, TRUE); |
|
181 | + wp_enqueue_style('ee-newsletter-trigger-css', REG_CAF_ASSETS_URL.'ee-newsletter-trigger.css', array(), EVENT_ESPRESSO_VERSION); |
|
182 | 182 | //hook in buttons for newsletter message type trigger. |
183 | - add_action('AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', array( $this, 'add_newsletter_action_buttons'), 10 ); |
|
183 | + add_action('AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', array($this, 'add_newsletter_action_buttons'), 10); |
|
184 | 184 | } |
185 | 185 | } |
186 | 186 | |
187 | 187 | |
188 | 188 | |
189 | 189 | public function load_scripts_styles_reports() { |
190 | - wp_register_script( 'ee-reg-reports-js', REG_CAF_ASSETS_URL . 'ee-registration-admin-reports.js', array( 'google-charts' ), EVENT_ESPRESSO_VERSION, true ); |
|
191 | - wp_enqueue_script( 'ee-reg-reports-js' ); |
|
190 | + wp_register_script('ee-reg-reports-js', REG_CAF_ASSETS_URL.'ee-registration-admin-reports.js', array('google-charts'), EVENT_ESPRESSO_VERSION, true); |
|
191 | + wp_enqueue_script('ee-reg-reports-js'); |
|
192 | 192 | $this->_registration_reports_js_setup(); |
193 | 193 | } |
194 | 194 | |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | 'slug' => 'all', |
221 | 221 | 'label' => __('All', 'event_espresso'), |
222 | 222 | 'count' => 0, |
223 | - 'bulk_action' => !isset( $this->_req_data['event_id'] ) ? array() : array( |
|
223 | + 'bulk_action' => ! isset($this->_req_data['event_id']) ? array() : array( |
|
224 | 224 | 'toggle_checkin_status' => __('Toggle Check-In', 'event_espresso'), |
225 | 225 | //'trash_registrations' => __('Trash Registrations', 'event_espresso') |
226 | 226 | ) |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | 'slug' => 'all', |
239 | 239 | 'label' => __('All', 'event_espresso'), |
240 | 240 | 'count' => 0, |
241 | - 'bulk_action' => array( 'delete_checkin_rows' => __('Delete Check-In Rows', 'event_espresso') ) |
|
241 | + 'bulk_action' => array('delete_checkin_rows' => __('Delete Check-In Rows', 'event_espresso')) |
|
242 | 242 | ), |
243 | 243 | ); |
244 | 244 | } |
@@ -254,20 +254,20 @@ discard block |
||
254 | 254 | */ |
255 | 255 | public function get_newsletter_form_content() { |
256 | 256 | //do a nonce check cause we're not coming in from an normal route here. |
257 | - $nonce = isset( $this->_req_data['get_newsletter_form_content_nonce'] ) ? sanitize_text_field( $this->_req_data['get_newsletter_form_content_nonce'] ) : ''; |
|
257 | + $nonce = isset($this->_req_data['get_newsletter_form_content_nonce']) ? sanitize_text_field($this->_req_data['get_newsletter_form_content_nonce']) : ''; |
|
258 | 258 | $nonce_ref = 'get_newsletter_form_content_nonce'; |
259 | 259 | |
260 | - $this->_verify_nonce( $nonce, $nonce_ref ); |
|
260 | + $this->_verify_nonce($nonce, $nonce_ref); |
|
261 | 261 | //let's get the mtp for the incoming MTP_ ID |
262 | - if ( !isset( $this->_req_data['GRP_ID'] ) ) { |
|
263 | - EE_Error::add_error( __('There must be something broken with the js or html structure because the required data for getting a message template group is not present (need an GRP_ID).', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
262 | + if ( ! isset($this->_req_data['GRP_ID'])) { |
|
263 | + EE_Error::add_error(__('There must be something broken with the js or html structure because the required data for getting a message template group is not present (need an GRP_ID).', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
264 | 264 | $this->_template_args['success'] = FALSE; |
265 | 265 | $this->_template_args['error'] = TRUE; |
266 | 266 | $this->_return_json(); |
267 | 267 | } |
268 | - $MTPG = EEM_Message_Template_Group::instance()->get_one_by_ID( $this->_req_data['GRP_ID'] ); |
|
269 | - if ( ! $MTPG instanceof EE_Message_Template_Group ) { |
|
270 | - EE_Error::add_error( sprintf( __('The GRP_ID given (%d) does not appear to have a corresponding row in the database.', 'event_espresso'), $this->_req_data['GRP_ID'] ), __FILE__, __FUNCTION__, __LINE__ ); |
|
268 | + $MTPG = EEM_Message_Template_Group::instance()->get_one_by_ID($this->_req_data['GRP_ID']); |
|
269 | + if ( ! $MTPG instanceof EE_Message_Template_Group) { |
|
270 | + EE_Error::add_error(sprintf(__('The GRP_ID given (%d) does not appear to have a corresponding row in the database.', 'event_espresso'), $this->_req_data['GRP_ID']), __FILE__, __FUNCTION__, __LINE__); |
|
271 | 271 | $this->_template_args['success'] = FALSE; |
272 | 272 | $this->_template_args['error'] = TRUE; |
273 | 273 | $this->_return_json(); |
@@ -276,11 +276,11 @@ discard block |
||
276 | 276 | $MTPs = $MTPG->context_templates(); |
277 | 277 | $MTPs = $MTPs['attendee']; |
278 | 278 | $template_fields = array(); |
279 | - foreach ( $MTPs as $MTP ) { |
|
279 | + foreach ($MTPs as $MTP) { |
|
280 | 280 | $field = $MTP->get('MTP_template_field'); |
281 | - if ( $field == 'content' ) { |
|
281 | + if ($field == 'content') { |
|
282 | 282 | $content = $MTP->get('MTP_content'); |
283 | - if ( !empty( $content['newsletter_content'] ) ) { |
|
283 | + if ( ! empty($content['newsletter_content'])) { |
|
284 | 284 | $template_fields['newsletter_content'] = $content['newsletter_content']; |
285 | 285 | } |
286 | 286 | continue; |
@@ -293,7 +293,7 @@ discard block |
||
293 | 293 | $this->_template_args['data'] = array( |
294 | 294 | 'batch_message_from' => isset($template_fields['from']) ? $template_fields['from'] : '', |
295 | 295 | 'batch_message_subject' => isset($template_fields['subject']) ? $template_fields['subject'] : '', |
296 | - 'batch_message_content' => isset( $template_fields['newsletter_content'] ) ? $template_fields['newsletter_content'] : '' |
|
296 | + 'batch_message_content' => isset($template_fields['newsletter_content']) ? $template_fields['newsletter_content'] : '' |
|
297 | 297 | ); |
298 | 298 | $this->_return_json(); |
299 | 299 | } |
@@ -309,8 +309,8 @@ discard block |
||
309 | 309 | * @param EE_Admin_List_Table $list_table |
310 | 310 | * @return string html string for extra buttons |
311 | 311 | */ |
312 | - public function add_newsletter_action_buttons( EE_Admin_List_Table $list_table ) { |
|
313 | - if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_registrations_newsletter_selected_send' ) ) { |
|
312 | + public function add_newsletter_action_buttons(EE_Admin_List_Table $list_table) { |
|
313 | + if ( ! EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_registrations_newsletter_selected_send')) { |
|
314 | 314 | return ''; |
315 | 315 | } |
316 | 316 | |
@@ -319,13 +319,13 @@ discard block |
||
319 | 319 | 'event_registrations', |
320 | 320 | 'default' |
321 | 321 | ); |
322 | - if ( $this->_current_page == 'espresso_registrations' && in_array( $this->_req_action, $routes_to_add_to ) ) { |
|
323 | - if ( ( $this->_req_action == 'event_registrations' && empty( $this->_req_data['event_id'] ) ) || ( isset( $this->_req_data['status'] ) && $this->_req_data['status'] == 'trash' ) ) { |
|
322 | + if ($this->_current_page == 'espresso_registrations' && in_array($this->_req_action, $routes_to_add_to)) { |
|
323 | + if (($this->_req_action == 'event_registrations' && empty($this->_req_data['event_id'])) || (isset($this->_req_data['status']) && $this->_req_data['status'] == 'trash')) { |
|
324 | 324 | echo ''; |
325 | 325 | } else { |
326 | - $button_text = sprintf( __('Send Batch Message (%s selected)', 'event_espresso'), '<span class="send-selected-newsletter-count">0</span>' ); |
|
327 | - echo '<button id="selected-batch-send-trigger" class="button secondary-button"><span class="dashicons dashicons-email "></span>' . $button_text . '</button>'; |
|
328 | - add_action('admin_footer', array( $this, 'newsletter_send_form_skeleton') ); |
|
326 | + $button_text = sprintf(__('Send Batch Message (%s selected)', 'event_espresso'), '<span class="send-selected-newsletter-count">0</span>'); |
|
327 | + echo '<button id="selected-batch-send-trigger" class="button secondary-button"><span class="dashicons dashicons-email "></span>'.$button_text.'</button>'; |
|
328 | + add_action('admin_footer', array($this, 'newsletter_send_form_skeleton')); |
|
329 | 329 | } |
330 | 330 | } |
331 | 331 | } |
@@ -337,38 +337,38 @@ discard block |
||
337 | 337 | $list_table = $this->_list_table_object; |
338 | 338 | $codes = array(); |
339 | 339 | //need to templates for the newsletter message type for the template selector. |
340 | - $values[] = array( 'text' => __('Select Template to Use', 'event_espresso'), 'id' => 0 ); |
|
341 | - $mtps = EEM_Message_Template_Group::instance()->get_all( array( array( 'MTP_message_type' => 'newsletter', 'MTP_messenger' => 'email' ) ) ); |
|
342 | - foreach ( $mtps as $mtp ) { |
|
340 | + $values[] = array('text' => __('Select Template to Use', 'event_espresso'), 'id' => 0); |
|
341 | + $mtps = EEM_Message_Template_Group::instance()->get_all(array(array('MTP_message_type' => 'newsletter', 'MTP_messenger' => 'email'))); |
|
342 | + foreach ($mtps as $mtp) { |
|
343 | 343 | $name = $mtp->name(); |
344 | 344 | $values[] = array( |
345 | - 'text' => empty( $name ) ? __('Global', 'event_espresso') : $name, |
|
345 | + 'text' => empty($name) ? __('Global', 'event_espresso') : $name, |
|
346 | 346 | 'id' => $mtp->ID() |
347 | 347 | ); |
348 | 348 | } |
349 | 349 | |
350 | 350 | //need to get a list of shortcodes that are available for the newsletter message type. |
351 | 351 | EE_Registry::instance()->load_helper('MSG_Template'); |
352 | - $shortcodes = EEH_MSG_Template::get_shortcodes( 'newsletter', 'email', array(), 'attendee', FALSE ); |
|
353 | - foreach ( $shortcodes as $field => $shortcode_array ) { |
|
354 | - $codes[$field] = implode(', ', array_keys($shortcode_array ) ); |
|
352 | + $shortcodes = EEH_MSG_Template::get_shortcodes('newsletter', 'email', array(), 'attendee', FALSE); |
|
353 | + foreach ($shortcodes as $field => $shortcode_array) { |
|
354 | + $codes[$field] = implode(', ', array_keys($shortcode_array)); |
|
355 | 355 | } |
356 | 356 | |
357 | 357 | $shortcodes = $codes; |
358 | 358 | |
359 | - $form_template = REG_CAF_TEMPLATE_PATH . 'newsletter-send-form.template.php'; |
|
359 | + $form_template = REG_CAF_TEMPLATE_PATH.'newsletter-send-form.template.php'; |
|
360 | 360 | $form_template_args = array( |
361 | 361 | 'form_action' => admin_url('admin.php?page=espresso_registrations'), |
362 | 362 | 'form_route' => 'newsletter_selected_send', |
363 | 363 | 'form_nonce_name' => 'newsletter_selected_send_nonce', |
364 | - 'form_nonce' => wp_create_nonce( 'newsletter_selected_send_nonce' ), |
|
364 | + 'form_nonce' => wp_create_nonce('newsletter_selected_send_nonce'), |
|
365 | 365 | 'redirect_back_to' => $this->_req_action, |
366 | - 'ajax_nonce' => wp_create_nonce( 'get_newsletter_form_content_nonce'), |
|
367 | - 'template_selector' => EEH_Form_Fields::select_input('newsletter_mtp_selected', $values ), |
|
366 | + 'ajax_nonce' => wp_create_nonce('get_newsletter_form_content_nonce'), |
|
367 | + 'template_selector' => EEH_Form_Fields::select_input('newsletter_mtp_selected', $values), |
|
368 | 368 | 'shortcodes' => $shortcodes, |
369 | 369 | 'id_type' => $list_table instanceof EE_Attendee_Contact_List_Table ? 'contact' : 'registration' |
370 | 370 | ); |
371 | - EEH_Template::display_template( $form_template, $form_template_args ); |
|
371 | + EEH_Template::display_template($form_template, $form_template_args); |
|
372 | 372 | } |
373 | 373 | |
374 | 374 | |
@@ -383,35 +383,35 @@ discard block |
||
383 | 383 | protected function _newsletter_selected_send() { |
384 | 384 | $success = TRUE; |
385 | 385 | //first we need to make sure we have a GRP_ID so we know what template we're sending and updating! |
386 | - if ( empty( $this->_req_data['newsletter_mtp_selected'] ) ) { |
|
387 | - EE_Error::add_error( __('In order to send a message, a Message Template GRP_ID is needed. It was not provided so messages were not sent.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
386 | + if (empty($this->_req_data['newsletter_mtp_selected'])) { |
|
387 | + EE_Error::add_error(__('In order to send a message, a Message Template GRP_ID is needed. It was not provided so messages were not sent.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
388 | 388 | $success = FALSE; |
389 | 389 | } |
390 | 390 | |
391 | - if ( $success ) { |
|
391 | + if ($success) { |
|
392 | 392 | //update Message template in case there are any changes |
393 | - $MTPG = EEM_Message_Template_Group::instance()->get_one_by_ID( $this->_req_data['newsletter_mtp_selected'] ); |
|
393 | + $MTPG = EEM_Message_Template_Group::instance()->get_one_by_ID($this->_req_data['newsletter_mtp_selected']); |
|
394 | 394 | $MTPs = $MTPG instanceof EE_Message_Template_Group ? $MTPG->context_templates() : array(); |
395 | - if ( empty( $MTPs ) ) { |
|
396 | - EE_Error::add_error( __('Unable to retrieve message template fields from the db. Messages not sent.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
395 | + if (empty($MTPs)) { |
|
396 | + EE_Error::add_error(__('Unable to retrieve message template fields from the db. Messages not sent.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
397 | 397 | $success = FALSE; |
398 | 398 | } |
399 | 399 | |
400 | 400 | //let's just update the specific fields |
401 | - foreach ( $MTPs['attendee'] as $MTP ) { |
|
401 | + foreach ($MTPs['attendee'] as $MTP) { |
|
402 | 402 | $field = $MTP->get('MTP_template_field'); |
403 | 403 | $content = $MTP->get('MTP_content'); |
404 | 404 | $new_content = $content; |
405 | - switch( $field ) { |
|
405 | + switch ($field) { |
|
406 | 406 | case 'from' : |
407 | - $new_content = !empty( $this->_req_data['batch_message']['from'] ) ? $this->_req_data['batch_message']['from'] : $content; |
|
407 | + $new_content = ! empty($this->_req_data['batch_message']['from']) ? $this->_req_data['batch_message']['from'] : $content; |
|
408 | 408 | break; |
409 | 409 | case 'subject' : |
410 | - $new_content = !empty( $this->_req_data['batch_message']['subject'] ) ? $this->_req_data['batch_message']['subject'] : $content; |
|
410 | + $new_content = ! empty($this->_req_data['batch_message']['subject']) ? $this->_req_data['batch_message']['subject'] : $content; |
|
411 | 411 | break; |
412 | 412 | case 'content' : |
413 | 413 | $new_content = $content; |
414 | - $new_content['newsletter_content'] = !empty( $this->_req_data['batch_message']['content'] ) ? $this->_req_data['batch_message']['content'] : $content['newsletter_content']; |
|
414 | + $new_content['newsletter_content'] = ! empty($this->_req_data['batch_message']['content']) ? $this->_req_data['batch_message']['content'] : $content['newsletter_content']; |
|
415 | 415 | break; |
416 | 416 | default : |
417 | 417 | continue; |
@@ -422,20 +422,20 @@ discard block |
||
422 | 422 | } |
423 | 423 | |
424 | 424 | //great fields are updated! now let's make sure we just have contact objects (EE_Attendee). |
425 | - $id_type = !empty( $this->_req_data['batch_message']['id_type'] ) ? $this->_req_data['batch_message']['id_type'] : 'registration'; |
|
425 | + $id_type = ! empty($this->_req_data['batch_message']['id_type']) ? $this->_req_data['batch_message']['id_type'] : 'registration'; |
|
426 | 426 | |
427 | 427 | //id_type will affect how we assemble the ids. |
428 | - $ids = !empty( $this->_req_data['batch_message']['ids'] ) ? json_decode( stripslashes($this->_req_data['batch_message']['ids']) ) : array(); |
|
428 | + $ids = ! empty($this->_req_data['batch_message']['ids']) ? json_decode(stripslashes($this->_req_data['batch_message']['ids'])) : array(); |
|
429 | 429 | |
430 | - $contacts = $id_type == 'registration' ? EEM_Attendee::instance()->get_array_of_contacts_from_reg_ids( $ids ) : EEM_Attendee::instance()->get_all( array( array( 'ATT_ID' => array('in', $ids ) ) ) ); |
|
430 | + $contacts = $id_type == 'registration' ? EEM_Attendee::instance()->get_array_of_contacts_from_reg_ids($ids) : EEM_Attendee::instance()->get_all(array(array('ATT_ID' => array('in', $ids)))); |
|
431 | 431 | |
432 | 432 | //we do _action because ALL triggers are handled in EED_Messages. |
433 | - do_action('AHEE__Extend_Registrations_Admin_Page___newsletter_selected_send', $contacts, $MTPG->ID() ); |
|
433 | + do_action('AHEE__Extend_Registrations_Admin_Page___newsletter_selected_send', $contacts, $MTPG->ID()); |
|
434 | 434 | } |
435 | 435 | $query_args = array( |
436 | - 'action' => !empty( $this->_req_data['redirect_back_to'] ) ? $this->_req_data['redirect_back_to'] : 'default' |
|
436 | + 'action' => ! empty($this->_req_data['redirect_back_to']) ? $this->_req_data['redirect_back_to'] : 'default' |
|
437 | 437 | ); |
438 | - $this->_redirect_after_action( FALSE, '', '', $query_args, TRUE ); |
|
438 | + $this->_redirect_after_action(FALSE, '', '', $query_args, TRUE); |
|
439 | 439 | } |
440 | 440 | |
441 | 441 | |
@@ -457,8 +457,8 @@ discard block |
||
457 | 457 | * @return void |
458 | 458 | */ |
459 | 459 | protected function _registration_reports() { |
460 | - $template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php'; |
|
461 | - $this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_reports_template_data, true ); |
|
460 | + $template_path = EE_ADMIN_TEMPLATE.'admin_reports.template.php'; |
|
461 | + $this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_reports_template_data, true); |
|
462 | 462 | // the final template wrapper |
463 | 463 | $this->display_admin_page_with_no_sidebar(); |
464 | 464 | |
@@ -471,41 +471,41 @@ discard block |
||
471 | 471 | * |
472 | 472 | * @return string |
473 | 473 | */ |
474 | - private function _registrations_per_day_report( $period = '-1 month' ) { |
|
474 | + private function _registrations_per_day_report($period = '-1 month') { |
|
475 | 475 | $report_ID = 'reg-admin-registrations-per-day-report-dv'; |
476 | 476 | |
477 | 477 | $REG = EEM_Registration::instance(); |
478 | 478 | |
479 | - $results = $REG->get_registrations_per_day_report( $period ); |
|
479 | + $results = $REG->get_registrations_per_day_report($period); |
|
480 | 480 | |
481 | 481 | $results = (array) $results; |
482 | 482 | $regs = array(); |
483 | 483 | $subtitle = ''; |
484 | 484 | |
485 | - if( $results ) { |
|
486 | - $regs[] = array( __( 'Date (only days with registrations are shown)', 'event_espresso' ), __('Total Registrations', 'event_espresso' ) ); |
|
487 | - foreach ( $results as $result ) { |
|
488 | - $regs[] = array( $result->regDate, (int) $result->total ); |
|
485 | + if ($results) { |
|
486 | + $regs[] = array(__('Date (only days with registrations are shown)', 'event_espresso'), __('Total Registrations', 'event_espresso')); |
|
487 | + foreach ($results as $result) { |
|
488 | + $regs[] = array($result->regDate, (int) $result->total); |
|
489 | 489 | } |
490 | 490 | |
491 | 491 | //setup the date range. |
492 | - EE_Registry::instance()->load_helper( 'DTT_Helper' ); |
|
493 | - $beginning_date = new DateTime( "now " . $period, new DateTimeZone( EEH_DTT_Helper::get_timezone() ) ); |
|
494 | - $ending_date = new DateTime( "now", new DateTimeZone( EEH_DTT_Helper::get_timezone() ) ); |
|
495 | - $subtitle = sprintf( _x( 'For the period: %s to %s', 'Used to give date range', 'event_espresso' ), $beginning_date->format( 'Y-m-d' ), $ending_date->format( 'Y-m-d' ) ); |
|
492 | + EE_Registry::instance()->load_helper('DTT_Helper'); |
|
493 | + $beginning_date = new DateTime("now ".$period, new DateTimeZone(EEH_DTT_Helper::get_timezone())); |
|
494 | + $ending_date = new DateTime("now", new DateTimeZone(EEH_DTT_Helper::get_timezone())); |
|
495 | + $subtitle = sprintf(_x('For the period: %s to %s', 'Used to give date range', 'event_espresso'), $beginning_date->format('Y-m-d'), $ending_date->format('Y-m-d')); |
|
496 | 496 | } |
497 | 497 | |
498 | - $report_title = __( 'Total Registrations per Day', 'event_espresso' ); |
|
498 | + $report_title = __('Total Registrations per Day', 'event_espresso'); |
|
499 | 499 | |
500 | 500 | $report_params = array( |
501 | 501 | 'title' => $report_title, |
502 | 502 | 'subtitle' => $subtitle, |
503 | 503 | 'id' => $report_ID, |
504 | 504 | 'regs' => $regs, |
505 | - 'noResults' => empty( $regs ), |
|
506 | - 'noRegsMsg' => sprintf( __('%sThere are currently no registration records in the last month for this report.%s', 'event_espresso'), '<h2>' . $report_title . '</h2><p>', '</p>' ), |
|
505 | + 'noResults' => empty($regs), |
|
506 | + 'noRegsMsg' => sprintf(__('%sThere are currently no registration records in the last month for this report.%s', 'event_espresso'), '<h2>'.$report_title.'</h2><p>', '</p>'), |
|
507 | 507 | ); |
508 | - wp_localize_script( 'ee-reg-reports-js', 'regPerDay', $report_params ); |
|
508 | + wp_localize_script('ee-reg-reports-js', 'regPerDay', $report_params); |
|
509 | 509 | |
510 | 510 | return $report_ID; |
511 | 511 | } |
@@ -517,41 +517,41 @@ discard block |
||
517 | 517 | * |
518 | 518 | * @return string |
519 | 519 | */ |
520 | - private function _registrations_per_event_report( $period = '-1 month' ) { |
|
520 | + private function _registrations_per_event_report($period = '-1 month') { |
|
521 | 521 | |
522 | 522 | $report_ID = 'reg-admin-registrations-per-event-report-dv'; |
523 | 523 | |
524 | 524 | $REG = EEM_Registration::instance(); |
525 | 525 | |
526 | - $results = $REG->get_registrations_per_event_report( $period ); |
|
526 | + $results = $REG->get_registrations_per_event_report($period); |
|
527 | 527 | $results = (array) $results; |
528 | 528 | $regs = array(); |
529 | 529 | $subtitle = ''; |
530 | 530 | |
531 | - if ( $results ) { |
|
532 | - $regs[] = array( __( 'Event', 'event_espresso' ), __('Total Registrations', 'event_espresso' ) ); |
|
533 | - foreach ( $results as $result ) { |
|
534 | - $regs[] = array( wp_trim_words( $result->event_name, 4, '...' ), (int) $result->total ); |
|
531 | + if ($results) { |
|
532 | + $regs[] = array(__('Event', 'event_espresso'), __('Total Registrations', 'event_espresso')); |
|
533 | + foreach ($results as $result) { |
|
534 | + $regs[] = array(wp_trim_words($result->event_name, 4, '...'), (int) $result->total); |
|
535 | 535 | } |
536 | 536 | |
537 | 537 | //setup the date range. |
538 | - EE_Registry::instance()->load_helper( 'DTT_Helper' ); |
|
539 | - $beginning_date = new DateTime( "now " . $period, new DateTimeZone( EEH_DTT_Helper::get_timezone() ) ); |
|
540 | - $ending_date = new DateTime( "now", new DateTimeZone( EEH_DTT_Helper::get_timezone() ) ); |
|
541 | - $subtitle = sprintf( _x( 'For the period: %s to %s', 'Used to give date range', 'event_espresso' ), $beginning_date->format( 'Y-m-d' ), $ending_date->format( 'Y-m-d' ) ); |
|
538 | + EE_Registry::instance()->load_helper('DTT_Helper'); |
|
539 | + $beginning_date = new DateTime("now ".$period, new DateTimeZone(EEH_DTT_Helper::get_timezone())); |
|
540 | + $ending_date = new DateTime("now", new DateTimeZone(EEH_DTT_Helper::get_timezone())); |
|
541 | + $subtitle = sprintf(_x('For the period: %s to %s', 'Used to give date range', 'event_espresso'), $beginning_date->format('Y-m-d'), $ending_date->format('Y-m-d')); |
|
542 | 542 | } |
543 | 543 | |
544 | - $report_title = __( 'Total Registrations per Event', 'event_espresso' ); |
|
544 | + $report_title = __('Total Registrations per Event', 'event_espresso'); |
|
545 | 545 | |
546 | 546 | $report_params = array( |
547 | 547 | 'title' => $report_title, |
548 | 548 | 'subtitle' => $subtitle, |
549 | 549 | 'id' => $report_ID, |
550 | 550 | 'regs' => $regs, |
551 | - 'noResults' => empty( $regs ), |
|
552 | - 'noRegsMsg' => sprintf( __('%sThere are currently no registration records in the last month for this report.%s', 'event_espresso'), '<h2>' . $report_title . '</h2><p>', '</p>' ), |
|
551 | + 'noResults' => empty($regs), |
|
552 | + 'noRegsMsg' => sprintf(__('%sThere are currently no registration records in the last month for this report.%s', 'event_espresso'), '<h2>'.$report_title.'</h2><p>', '</p>'), |
|
553 | 553 | ); |
554 | - wp_localize_script( 'ee-reg-reports-js', 'regPerEvent', $report_params ); |
|
554 | + wp_localize_script('ee-reg-reports-js', 'regPerEvent', $report_params); |
|
555 | 555 | |
556 | 556 | return $report_ID; |
557 | 557 | } |
@@ -565,8 +565,8 @@ discard block |
||
565 | 565 | * @return void |
566 | 566 | */ |
567 | 567 | protected function _registration_checkin_list_table() { |
568 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
569 | - $reg_id = isset( $this->_req_data['_REGID'] ) ? $this->_req_data['_REGID'] : null; |
|
568 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
569 | + $reg_id = isset($this->_req_data['_REGID']) ? $this->_req_data['_REGID'] : null; |
|
570 | 570 | $reg = EEM_Registration::instance()->get_one_by_ID($reg_id); |
571 | 571 | $this->_admin_page_title .= $this->get_action_link_or_button('new_registration', 'add-registrant', array('event_id' => $reg->event_ID()), 'add-new-h2'); |
572 | 572 | |
@@ -580,15 +580,15 @@ discard block |
||
580 | 580 | 'desc' => __('This indicates the attendee has been checked out', 'event_espresso') |
581 | 581 | ) |
582 | 582 | ); |
583 | - $this->_template_args['after_list_table'] = $this->_display_legend( $legend_items ); |
|
583 | + $this->_template_args['after_list_table'] = $this->_display_legend($legend_items); |
|
584 | 584 | |
585 | 585 | |
586 | - $dtt_id = isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : NULL; |
|
587 | - $go_back_url = !empty( $reg_id ) ? EE_Admin_Page::add_query_args_and_nonce(array('action' => 'event_registrations', 'event_id' => EEM_Registration::instance()->get_one_by_ID($reg_id)->get_first_related('Event')->ID(), 'DTT_ID' => $dtt_id ), $this->_admin_base_url ) : ''; |
|
586 | + $dtt_id = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : NULL; |
|
587 | + $go_back_url = ! empty($reg_id) ? EE_Admin_Page::add_query_args_and_nonce(array('action' => 'event_registrations', 'event_id' => EEM_Registration::instance()->get_one_by_ID($reg_id)->get_first_related('Event')->ID(), 'DTT_ID' => $dtt_id), $this->_admin_base_url) : ''; |
|
588 | 588 | |
589 | - $this->_template_args['before_list_table'] = !empty( $reg_id ) && !empty( $dtt_id ) ? '<h2>' . sprintf(__("%s's check in records for %s at the event, %s", 'event_espresso'), '<span id="checkin-attendee-name">' . EEM_Registration::instance()->get_one_by_ID($reg_id)->get_first_related('Attendee')->full_name() . '</span>', '<span id="checkin-dtt"><a href="' . $go_back_url . '">' . EEM_Datetime::instance()->get_one_by_ID($dtt_id)->start_date_and_time() . ' - ' . EEM_Datetime::instance()->get_one_by_ID($dtt_id)->end_date_and_time() . '</a></span>', '<span id="checkin-event-name">' . EEM_Datetime::instance()->get_one_by_ID($dtt_id)->get_first_related('Event')->get('EVT_name') . '</span>' ) . '</h2>' : ''; |
|
590 | - $this->_template_args['list_table_hidden_fields'] = !empty( $reg_id ) ? '<input type="hidden" name="_REGID" value="' . $reg_id . '">' : ''; |
|
591 | - $this->_template_args['list_table_hidden_fields'] .= !empty( $dtt_id ) ? '<input type="hidden" name="DTT_ID" value="' . $dtt_id . '">' : ''; |
|
589 | + $this->_template_args['before_list_table'] = ! empty($reg_id) && ! empty($dtt_id) ? '<h2>'.sprintf(__("%s's check in records for %s at the event, %s", 'event_espresso'), '<span id="checkin-attendee-name">'.EEM_Registration::instance()->get_one_by_ID($reg_id)->get_first_related('Attendee')->full_name().'</span>', '<span id="checkin-dtt"><a href="'.$go_back_url.'">'.EEM_Datetime::instance()->get_one_by_ID($dtt_id)->start_date_and_time().' - '.EEM_Datetime::instance()->get_one_by_ID($dtt_id)->end_date_and_time().'</a></span>', '<span id="checkin-event-name">'.EEM_Datetime::instance()->get_one_by_ID($dtt_id)->get_first_related('Event')->get('EVT_name').'</span>').'</h2>' : ''; |
|
590 | + $this->_template_args['list_table_hidden_fields'] = ! empty($reg_id) ? '<input type="hidden" name="_REGID" value="'.$reg_id.'">' : ''; |
|
591 | + $this->_template_args['list_table_hidden_fields'] .= ! empty($dtt_id) ? '<input type="hidden" name="DTT_ID" value="'.$dtt_id.'">' : ''; |
|
592 | 592 | |
593 | 593 | $this->display_admin_list_table_page_with_no_sidebar(); |
594 | 594 | } |
@@ -601,24 +601,24 @@ discard block |
||
601 | 601 | */ |
602 | 602 | public function toggle_checkin_status() { |
603 | 603 | //first make sure we have the necessary data |
604 | - if ( !isset( $this->_req_data['_regid'] ) ) { |
|
605 | - EE_Error::add_error( __('There must be something broken with the html structure because the required data for toggling the Check-in status is not being sent via ajax', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
604 | + if ( ! isset($this->_req_data['_regid'])) { |
|
605 | + EE_Error::add_error(__('There must be something broken with the html structure because the required data for toggling the Check-in status is not being sent via ajax', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
606 | 606 | $this->_template_args['success'] = FALSE; |
607 | 607 | $this->_template_args['error'] = TRUE; |
608 | 608 | $this->_return_json(); |
609 | 609 | }; |
610 | 610 | |
611 | 611 | //do a nonce check cause we're not coming in from an normal route here. |
612 | - $nonce = isset( $this->_req_data['checkinnonce'] ) ? sanitize_text_field( $this->_req_data['checkinnonce'] ) : ''; |
|
612 | + $nonce = isset($this->_req_data['checkinnonce']) ? sanitize_text_field($this->_req_data['checkinnonce']) : ''; |
|
613 | 613 | $nonce_ref = 'checkin_nonce'; |
614 | 614 | |
615 | - $this->_verify_nonce( $nonce, $nonce_ref ); |
|
615 | + $this->_verify_nonce($nonce, $nonce_ref); |
|
616 | 616 | |
617 | 617 | //beautiful! Made it this far so let's get the status. |
618 | 618 | $new_status = $this->_toggle_checkin_status(); |
619 | 619 | |
620 | 620 | //setup new class to return via ajax |
621 | - $this->_template_args['admin_page_content'] = 'clickable trigger-checkin checkin-icons checkedin-status-' . $new_status; |
|
621 | + $this->_template_args['admin_page_content'] = 'clickable trigger-checkin checkin-icons checkedin-status-'.$new_status; |
|
622 | 622 | $this->_template_args['success'] = TRUE; |
623 | 623 | $this->_return_json(); |
624 | 624 | } |
@@ -638,32 +638,32 @@ discard block |
||
638 | 638 | //first let's get the query args out of the way for the redirect |
639 | 639 | $query_args = array( |
640 | 640 | 'action' => 'event_registrations', |
641 | - 'event_id' => isset( $this->_req_data['event_id'] ) ? $this->_req_data['event_id'] : NULL, |
|
642 | - 'DTT_ID' => isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : NULL |
|
641 | + 'event_id' => isset($this->_req_data['event_id']) ? $this->_req_data['event_id'] : NULL, |
|
642 | + 'DTT_ID' => isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : NULL |
|
643 | 643 | ); |
644 | 644 | $new_status = FALSE; |
645 | 645 | |
646 | 646 | // bulk action check in toggle |
647 | - if ( ! empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] )) { |
|
647 | + if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) { |
|
648 | 648 | // cycle thru checkboxes |
649 | - while ( list( $REG_ID, $value ) = each($this->_req_data['checkbox'])) { |
|
650 | - $DTT_ID = isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : NULL; |
|
649 | + while (list($REG_ID, $value) = each($this->_req_data['checkbox'])) { |
|
650 | + $DTT_ID = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : NULL; |
|
651 | 651 | $new_status = $this->_toggle_checkin($REG_ID, $DTT_ID); |
652 | 652 | } |
653 | 653 | |
654 | - } elseif ( isset( $this->_req_data['_regid'] ) ) { |
|
654 | + } elseif (isset($this->_req_data['_regid'])) { |
|
655 | 655 | //coming from ajax request |
656 | - $DTT_ID = isset( $this->_req_data['dttid'] ) ? $this->_req_data['dttid'] : NULL; |
|
656 | + $DTT_ID = isset($this->_req_data['dttid']) ? $this->_req_data['dttid'] : NULL; |
|
657 | 657 | $query_args['DTT_ID'] = $DTT_ID; |
658 | 658 | $new_status = $this->_toggle_checkin($this->_req_data['_regid'], $DTT_ID); |
659 | 659 | } else { |
660 | - EE_Error::add_error(__('Missing some required data to toggle the Check-in', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
660 | + EE_Error::add_error(__('Missing some required data to toggle the Check-in', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
661 | 661 | } |
662 | 662 | |
663 | - if ( defined('DOING_AJAX' ) ) |
|
663 | + if (defined('DOING_AJAX')) |
|
664 | 664 | return $new_status; |
665 | 665 | |
666 | - $this->_redirect_after_action( FALSE,'', '', $query_args, TRUE ); |
|
666 | + $this->_redirect_after_action(FALSE, '', '', $query_args, TRUE); |
|
667 | 667 | |
668 | 668 | } |
669 | 669 | |
@@ -679,11 +679,11 @@ discard block |
||
679 | 679 | */ |
680 | 680 | private function _toggle_checkin($REG_ID, $DTT_ID) { |
681 | 681 | $REG = EEM_Registration::instance()->get_one_by_ID($REG_ID); |
682 | - $new_status = $REG->toggle_checkin_status( $DTT_ID ); |
|
683 | - if ( $new_status !== FALSE ) { |
|
684 | - EE_Error::add_success($REG->get_checkin_msg($DTT_ID) ); |
|
682 | + $new_status = $REG->toggle_checkin_status($DTT_ID); |
|
683 | + if ($new_status !== FALSE) { |
|
684 | + EE_Error::add_success($REG->get_checkin_msg($DTT_ID)); |
|
685 | 685 | } else { |
686 | - EE_Error::add_error($REG->get_checkin_msg($DTT_ID, TRUE), __FILE__, __FUNCTION__, __LINE__ ); |
|
686 | + EE_Error::add_error($REG->get_checkin_msg($DTT_ID, TRUE), __FILE__, __FUNCTION__, __LINE__); |
|
687 | 687 | $new_status = FALSE; |
688 | 688 | } |
689 | 689 | return $new_status; |
@@ -699,28 +699,28 @@ discard block |
||
699 | 699 | protected function _delete_checkin_rows() { |
700 | 700 | $query_args = array( |
701 | 701 | 'action' => 'registration_checkins', |
702 | - 'DTT_ID' => isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : 0, |
|
703 | - '_REGID' => isset( $this->_req_data['_REGID'] ) ? $this->_req_data['_REGID'] : 0 |
|
702 | + 'DTT_ID' => isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : 0, |
|
703 | + '_REGID' => isset($this->_req_data['_REGID']) ? $this->_req_data['_REGID'] : 0 |
|
704 | 704 | ); |
705 | - if ( !empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] ) ) { |
|
706 | - while ( list( $CHK_ID, $value ) = each( $this->_req_data['checkbox'] ) ) { |
|
705 | + if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) { |
|
706 | + while (list($CHK_ID, $value) = each($this->_req_data['checkbox'])) { |
|
707 | 707 | $errors = 0; |
708 | - if ( ! EEM_Checkin::instance()->delete_by_ID($CHK_ID ) ) { |
|
708 | + if ( ! EEM_Checkin::instance()->delete_by_ID($CHK_ID)) { |
|
709 | 709 | $errors++; |
710 | 710 | } |
711 | 711 | } |
712 | 712 | } else { |
713 | - EE_Error::add_error(__('So, something went wrong with the bulk delete because there was no data received for instructions on WHAT to delete!', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
714 | - $this->_redirect_after_action( FALSE, '', '', $query_args, TRUE ); |
|
713 | + EE_Error::add_error(__('So, something went wrong with the bulk delete because there was no data received for instructions on WHAT to delete!', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
714 | + $this->_redirect_after_action(FALSE, '', '', $query_args, TRUE); |
|
715 | 715 | } |
716 | 716 | |
717 | - if ( $errors > 0 ) { |
|
718 | - EE_Error::add_error( sprintf( __('There were %d records that did not delete successfully', 'event_espresso'), $errors ), __FILE__, __FUNCTION__, __LINE__ ); |
|
717 | + if ($errors > 0) { |
|
718 | + EE_Error::add_error(sprintf(__('There were %d records that did not delete successfully', 'event_espresso'), $errors), __FILE__, __FUNCTION__, __LINE__); |
|
719 | 719 | } else { |
720 | - EE_Error::add_success( __('Records were successfully deleted', 'event_espresso') ); |
|
720 | + EE_Error::add_success(__('Records were successfully deleted', 'event_espresso')); |
|
721 | 721 | } |
722 | 722 | |
723 | - $this->_redirect_after_action( FALSE, '', '', $query_args, TRUE ); |
|
723 | + $this->_redirect_after_action(FALSE, '', '', $query_args, TRUE); |
|
724 | 724 | } |
725 | 725 | |
726 | 726 | |
@@ -732,20 +732,20 @@ discard block |
||
732 | 732 | protected function _delete_checkin_row() { |
733 | 733 | $query_args = array( |
734 | 734 | 'action' => 'registration_checkins', |
735 | - 'DTT_ID' => isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : 0, |
|
736 | - '_REGID' => isset( $this->_req_data['_REGID'] ) ? $this->_req_data['_REGID'] : 0 |
|
735 | + 'DTT_ID' => isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : 0, |
|
736 | + '_REGID' => isset($this->_req_data['_REGID']) ? $this->_req_data['_REGID'] : 0 |
|
737 | 737 | ); |
738 | 738 | |
739 | - if ( !empty( $this->_req_data['CHK_ID'] ) ) { |
|
740 | - if ( ! EEM_Checkin::instance()->delete_by_ID($this->_req_data['CHK_ID'] ) ) { |
|
741 | - EE_Error::add_error(__('Something went wrong and this check-in record was not deleted', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
739 | + if ( ! empty($this->_req_data['CHK_ID'])) { |
|
740 | + if ( ! EEM_Checkin::instance()->delete_by_ID($this->_req_data['CHK_ID'])) { |
|
741 | + EE_Error::add_error(__('Something went wrong and this check-in record was not deleted', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
742 | 742 | } else { |
743 | - EE_Error::add_success( __('Check-In record successfully deleted', 'event_espresso') ); |
|
743 | + EE_Error::add_success(__('Check-In record successfully deleted', 'event_espresso')); |
|
744 | 744 | } |
745 | 745 | } else { |
746 | - EE_Error::add_error(__('In order to delete a Check-in record, there must be a Check-In ID available. There is not. It is not your fault, there is just a gremlin living in the code', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
746 | + EE_Error::add_error(__('In order to delete a Check-in record, there must be a Check-In ID available. There is not. It is not your fault, there is just a gremlin living in the code', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
747 | 747 | } |
748 | - $this->_redirect_after_action( FALSE, '', '', $query_args, TRUE ); |
|
748 | + $this->_redirect_after_action(FALSE, '', '', $query_args, TRUE); |
|
749 | 749 | } |
750 | 750 | |
751 | 751 | |
@@ -758,8 +758,8 @@ discard block |
||
758 | 758 | * @return void |
759 | 759 | */ |
760 | 760 | protected function _event_registrations_list_table() { |
761 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
762 | - $this->_admin_page_title .= isset( $this->_req_data['event_id'] ) ? $this->get_action_link_or_button('new_registration', 'add-registrant', array('event_id' => $this->_req_data['event_id']), 'add-new-h2') : ''; |
|
761 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
762 | + $this->_admin_page_title .= isset($this->_req_data['event_id']) ? $this->get_action_link_or_button('new_registration', 'add-registrant', array('event_id' => $this->_req_data['event_id']), 'add-new-h2') : ''; |
|
763 | 763 | |
764 | 764 | $legend_items = array( |
765 | 765 | 'star-icon' => array( |
@@ -783,31 +783,31 @@ discard block |
||
783 | 783 | 'desc' => __('View All Check-in Records for this Registrant', 'event_espresso') |
784 | 784 | ), |
785 | 785 | 'approved_status' => array( |
786 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_approved, |
|
787 | - 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_approved, FALSE, 'sentence' ) |
|
786 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_approved, |
|
787 | + 'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence') |
|
788 | 788 | ), |
789 | 789 | 'cancelled_status' => array( |
790 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_cancelled, |
|
791 | - 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, FALSE, 'sentence' ) |
|
790 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_cancelled, |
|
791 | + 'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, FALSE, 'sentence') |
|
792 | 792 | ), |
793 | 793 | 'declined_status' => array( |
794 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_declined, |
|
795 | - 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_declined, FALSE, 'sentence' ) |
|
794 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_declined, |
|
795 | + 'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_declined, FALSE, 'sentence') |
|
796 | 796 | ), |
797 | 797 | 'not_approved' => array( |
798 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_not_approved, |
|
799 | - 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, FALSE, 'sentence' ) |
|
798 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_not_approved, |
|
799 | + 'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, FALSE, 'sentence') |
|
800 | 800 | ), |
801 | 801 | 'pending_status' => array( |
802 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_pending_payment, |
|
803 | - 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, FALSE, 'sentence' ) |
|
802 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_pending_payment, |
|
803 | + 'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, FALSE, 'sentence') |
|
804 | 804 | )/**/ |
805 | 805 | ); |
806 | - $this->_template_args['after_list_table'] = $this->_display_legend( $legend_items ); |
|
806 | + $this->_template_args['after_list_table'] = $this->_display_legend($legend_items); |
|
807 | 807 | |
808 | - $event_id = isset( $this->_req_data['event_id'] ) ? $this->_req_data['event_id'] : null; |
|
809 | - $this->_template_args['before_list_table'] = !empty( $event_id ) ? '<h2>' . sprintf(__('Viewing Registrations for Event: %s', 'event_espresso'), EEM_Event::instance()->get_one_by_ID($event_id)->get('EVT_name') ) . '</h2>' : ''; |
|
810 | - $this->_template_args['list_table_hidden_fields'] = !empty( $event_id ) ? '<input type="hidden" name="event_id" value="' . $event_id . '">' : ''; |
|
808 | + $event_id = isset($this->_req_data['event_id']) ? $this->_req_data['event_id'] : null; |
|
809 | + $this->_template_args['before_list_table'] = ! empty($event_id) ? '<h2>'.sprintf(__('Viewing Registrations for Event: %s', 'event_espresso'), EEM_Event::instance()->get_one_by_ID($event_id)->get('EVT_name')).'</h2>' : ''; |
|
810 | + $this->_template_args['list_table_hidden_fields'] = ! empty($event_id) ? '<input type="hidden" name="event_id" value="'.$event_id.'">' : ''; |
|
811 | 811 | |
812 | 812 | $this->display_admin_list_table_page_with_no_sidebar(); |
813 | 813 | } |
@@ -821,15 +821,15 @@ discard block |
||
821 | 821 | * @access public |
822 | 822 | * @return array |
823 | 823 | */ |
824 | - public function get_event_attendees( $per_page = 10, $count = FALSE, $trash = FALSE, $orderby = '' ) { |
|
824 | + public function get_event_attendees($per_page = 10, $count = FALSE, $trash = FALSE, $orderby = '') { |
|
825 | 825 | |
826 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
827 | - require_once(EE_MODELS . 'EEM_Attendee.model.php'); |
|
826 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
827 | + require_once(EE_MODELS.'EEM_Attendee.model.php'); |
|
828 | 828 | //$ATT_MDL = EEM_Attendee::instance(); |
829 | 829 | |
830 | - $EVT_ID = isset($this->_req_data['event_id']) ? absint( $this->_req_data['event_id'] ) : FALSE; |
|
831 | - $CAT_ID = isset($this->_req_data['category_id']) ? absint( $this->_req_data['category_id'] ) : FALSE; |
|
832 | - $DTT_ID = isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : NULL; |
|
830 | + $EVT_ID = isset($this->_req_data['event_id']) ? absint($this->_req_data['event_id']) : FALSE; |
|
831 | + $CAT_ID = isset($this->_req_data['category_id']) ? absint($this->_req_data['category_id']) : FALSE; |
|
832 | + $DTT_ID = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : NULL; |
|
833 | 833 | |
834 | 834 | $this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : $orderby; |
835 | 835 | |
@@ -842,94 +842,94 @@ discard block |
||
842 | 842 | // $orderby = 'reg.REG_final_price'; |
843 | 843 | } |
844 | 844 | |
845 | - $sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'ASC'; |
|
845 | + $sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'ASC'; |
|
846 | 846 | |
847 | - $current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1; |
|
848 | - $per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page; |
|
847 | + $current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1; |
|
848 | + $per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page; |
|
849 | 849 | |
850 | 850 | |
851 | - $offset = ($current_page-1)*$per_page; |
|
852 | - $limit = $count ? NULL : array( $offset, $per_page ); |
|
853 | - $query_params = array(array('Event.status'=>array('IN', array_keys(EEM_Event::instance()->get_status_array())))); |
|
854 | - if ($EVT_ID){ |
|
855 | - $query_params[0]['EVT_ID']=$EVT_ID; |
|
851 | + $offset = ($current_page - 1) * $per_page; |
|
852 | + $limit = $count ? NULL : array($offset, $per_page); |
|
853 | + $query_params = array(array('Event.status'=>array('IN', array_keys(EEM_Event::instance()->get_status_array())))); |
|
854 | + if ($EVT_ID) { |
|
855 | + $query_params[0]['EVT_ID'] = $EVT_ID; |
|
856 | 856 | } |
857 | - if($CAT_ID){ |
|
857 | + if ($CAT_ID) { |
|
858 | 858 | throw new EE_Error("You specified a Category Id for this query. Thats odd because we are now using terms and taxonomies. So did you mean the term taxonomy id o rthe term id?"); |
859 | 859 | } |
860 | 860 | |
861 | 861 | //if DTT is included we do multiple datetimes. |
862 | - if ( $DTT_ID ) { |
|
862 | + if ($DTT_ID) { |
|
863 | 863 | $query_params[0]['Ticket.Datetime.DTT_ID'] = $DTT_ID; |
864 | 864 | } |
865 | 865 | |
866 | 866 | //make sure we only have default where on the current regs |
867 | 867 | $query_params['default_where_conditions'] = 'this_model_only'; |
868 | 868 | |
869 | - $status_ids_array = apply_filters( 'FHEE__Extend_Registrations_Admin_Page__get_event_attendees__status_ids_array', array( EEM_Registration::status_id_pending_payment, EEM_Registration::status_id_approved ) ); |
|
869 | + $status_ids_array = apply_filters('FHEE__Extend_Registrations_Admin_Page__get_event_attendees__status_ids_array', array(EEM_Registration::status_id_pending_payment, EEM_Registration::status_id_approved)); |
|
870 | 870 | |
871 | - $query_params[0]['STS_ID']= array('IN', $status_ids_array ); |
|
871 | + $query_params[0]['STS_ID'] = array('IN', $status_ids_array); |
|
872 | 872 | |
873 | - if($trash){ |
|
874 | - $query_params[0]['Attendee.status']= EEM_CPT_Base::post_status_trashed; |
|
873 | + if ($trash) { |
|
874 | + $query_params[0]['Attendee.status'] = EEM_CPT_Base::post_status_trashed; |
|
875 | 875 | } |
876 | 876 | |
877 | - if ( isset( $this->_req_data['s'] ) ) { |
|
878 | - $sstr = '%' . $this->_req_data['s'] . '%'; |
|
877 | + if (isset($this->_req_data['s'])) { |
|
878 | + $sstr = '%'.$this->_req_data['s'].'%'; |
|
879 | 879 | $query_params[0]['OR'] = array( |
880 | - 'Event.EVT_name' => array( 'LIKE', $sstr), |
|
881 | - 'Event.EVT_desc' => array( 'LIKE', $sstr ), |
|
882 | - 'Event.EVT_short_desc' => array( 'LIKE' , $sstr ), |
|
883 | - 'Attendee.ATT_fname' => array( 'LIKE', $sstr ), |
|
884 | - 'Attendee.ATT_lname' => array( 'LIKE', $sstr ), |
|
885 | - 'Attendee.ATT_short_bio' => array( 'LIKE', $sstr ), |
|
886 | - 'Attendee.ATT_email' => array('LIKE', $sstr ), |
|
887 | - 'Attendee.ATT_address' => array( 'LIKE', $sstr ), |
|
888 | - 'Attendee.ATT_address2' => array( 'LIKE', $sstr ), |
|
889 | - 'Attendee.ATT_city' => array( 'LIKE', $sstr ), |
|
890 | - 'REG_final_price' => array( 'LIKE', $sstr ), |
|
891 | - 'REG_code' => array( 'LIKE', $sstr ), |
|
892 | - 'REG_count' => array( 'LIKE' , $sstr ), |
|
893 | - 'REG_group_size' => array( 'LIKE' , $sstr ), |
|
894 | - 'Ticket.TKT_name' => array( 'LIKE', $sstr ), |
|
895 | - 'Ticket.TKT_description' => array( 'LIKE', $sstr ) |
|
880 | + 'Event.EVT_name' => array('LIKE', $sstr), |
|
881 | + 'Event.EVT_desc' => array('LIKE', $sstr), |
|
882 | + 'Event.EVT_short_desc' => array('LIKE', $sstr), |
|
883 | + 'Attendee.ATT_fname' => array('LIKE', $sstr), |
|
884 | + 'Attendee.ATT_lname' => array('LIKE', $sstr), |
|
885 | + 'Attendee.ATT_short_bio' => array('LIKE', $sstr), |
|
886 | + 'Attendee.ATT_email' => array('LIKE', $sstr), |
|
887 | + 'Attendee.ATT_address' => array('LIKE', $sstr), |
|
888 | + 'Attendee.ATT_address2' => array('LIKE', $sstr), |
|
889 | + 'Attendee.ATT_city' => array('LIKE', $sstr), |
|
890 | + 'REG_final_price' => array('LIKE', $sstr), |
|
891 | + 'REG_code' => array('LIKE', $sstr), |
|
892 | + 'REG_count' => array('LIKE', $sstr), |
|
893 | + 'REG_group_size' => array('LIKE', $sstr), |
|
894 | + 'Ticket.TKT_name' => array('LIKE', $sstr), |
|
895 | + 'Ticket.TKT_description' => array('LIKE', $sstr) |
|
896 | 896 | ); |
897 | 897 | } |
898 | 898 | |
899 | 899 | $query_params['order_by'][$orderby] = $sort; |
900 | 900 | $query_params['limit'] = $limit; |
901 | - $query_params['force_join'] = array('Attendee');//force join to attendee model so that it gets cached, because we're going to need the attendee for each registration |
|
902 | - if($count){ |
|
903 | - $registrations = EEM_Registration::instance()->count(array($query_params[0], 'default_where_conditions' => 'this_model_only' )); |
|
904 | - }else{ |
|
901 | + $query_params['force_join'] = array('Attendee'); //force join to attendee model so that it gets cached, because we're going to need the attendee for each registration |
|
902 | + if ($count) { |
|
903 | + $registrations = EEM_Registration::instance()->count(array($query_params[0], 'default_where_conditions' => 'this_model_only')); |
|
904 | + } else { |
|
905 | 905 | $registrations = EEM_Registration::instance()->get_all($query_params); |
906 | 906 | |
907 | 907 | |
908 | 908 | // $registrations = EEM_Registration::instance(); |
909 | 909 | // $all_attendees = EEM_Attendee::instance()->get_event_attendees( $EVT_ID, $CAT_ID, $reg_status, $trash, $orderby, $sort, $limit, $output ); |
910 | - if ( isset( $registrations[0] ) && $registrations[0] instanceof EE_Registration ) { |
|
910 | + if (isset($registrations[0]) && $registrations[0] instanceof EE_Registration) { |
|
911 | 911 | //EEH_Debug_Tools::printr( $all_attendees[0], '$all_attendees[0] <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' ); |
912 | 912 | // name |
913 | 913 | $first_registration = $registrations[0]; |
914 | 914 | $event_obj = $first_registration->event_obj(); |
915 | - if($event_obj){ |
|
915 | + if ($event_obj) { |
|
916 | 916 | $event_name = $first_registration->event_obj()->name(); |
917 | - $event_date = 'TODO: we need to get date from earliest price date or should this be the actual event date?';//$first_registration->date_obj()->reg_start_date_and_time('l F j, Y,', ' g:i:s a');// isset( $registrations[0]->DTT_EVT_start ) ? date( 'l F j, Y, g:i:s a', $registrations[0]->DTT_EVT_start ) : ''; |
|
917 | + $event_date = 'TODO: we need to get date from earliest price date or should this be the actual event date?'; //$first_registration->date_obj()->reg_start_date_and_time('l F j, Y,', ' g:i:s a');// isset( $registrations[0]->DTT_EVT_start ) ? date( 'l F j, Y, g:i:s a', $registrations[0]->DTT_EVT_start ) : ''; |
|
918 | 918 | // edit event link |
919 | - if ( $event_name != '' ) { |
|
920 | - $edit_event_url = self::add_query_args_and_nonce( array( 'action'=>'edit_event', 'EVT_ID'=>$EVT_ID ), EVENTS_ADMIN_URL ); |
|
921 | - $edit_event_lnk = '<a href="'.$edit_event_url.'" title="' . esc_attr__( 'Edit ', 'event_espresso' ) . $event_name . '">' . __( 'Edit Event', 'event_espresso' ) . '</a>'; |
|
922 | - $event_name .= ' <span class="admin-page-header-edit-lnk not-bold">' . $edit_event_lnk . '</span>' ; |
|
919 | + if ($event_name != '') { |
|
920 | + $edit_event_url = self::add_query_args_and_nonce(array('action'=>'edit_event', 'EVT_ID'=>$EVT_ID), EVENTS_ADMIN_URL); |
|
921 | + $edit_event_lnk = '<a href="'.$edit_event_url.'" title="'.esc_attr__('Edit ', 'event_espresso').$event_name.'">'.__('Edit Event', 'event_espresso').'</a>'; |
|
922 | + $event_name .= ' <span class="admin-page-header-edit-lnk not-bold">'.$edit_event_lnk.'</span>'; |
|
923 | 923 | } |
924 | 924 | |
925 | - $back_2_reg_url = self::add_query_args_and_nonce( array( 'action'=>'default' ), REG_ADMIN_URL ); |
|
926 | - $back_2_reg_lnk = '<a href="'.$back_2_reg_url.'" title="' . esc_attr__( 'click to return to viewing all registrations ', 'event_espresso' ) . '">« ' . __( 'Back to All Registrations', 'event_espresso' ) . '</a>'; |
|
925 | + $back_2_reg_url = self::add_query_args_and_nonce(array('action'=>'default'), REG_ADMIN_URL); |
|
926 | + $back_2_reg_lnk = '<a href="'.$back_2_reg_url.'" title="'.esc_attr__('click to return to viewing all registrations ', 'event_espresso').'">« '.__('Back to All Registrations', 'event_espresso').'</a>'; |
|
927 | 927 | |
928 | 928 | $this->_template_args['before_admin_page_content'] = ' |
929 | 929 | <div id="admin-page-header"> |
930 | - <h1><span class="small-text not-bold">'.__( 'Event: ', 'event_espresso' ).'</span>'. $event_name .'</h1> |
|
931 | - <h3><span class="small-text not-bold">'.__( 'Date: ', 'event_espresso' ). '</span>'. $event_date .'</h3> |
|
932 | - <span class="admin-page-header-go-back-lnk not-bold">' . $back_2_reg_lnk . '</span> |
|
930 | + <h1><span class="small-text not-bold">'.__('Event: ', 'event_espresso').'</span>'.$event_name.'</h1> |
|
931 | + <h3><span class="small-text not-bold">'.__('Date: ', 'event_espresso').'</span>'.$event_date.'</h3> |
|
932 | + <span class="admin-page-header-go-back-lnk not-bold">' . $back_2_reg_lnk.'</span> |
|
933 | 933 | </div> |
934 | 934 | '; |
935 | 935 | } |
@@ -191,7 +191,7 @@ |
||
191 | 191 | * generates Business Report showing total revenue per event. |
192 | 192 | * |
193 | 193 | * @param string $period The period (acceptable by PHP Datetime constructor) for which the report is generated. |
194 | - * @return int |
|
194 | + * @return string |
|
195 | 195 | */ |
196 | 196 | private function _revenue_per_event_report( $period = '-1 month' ) { |
197 | 197 |
@@ -122,9 +122,9 @@ |
||
122 | 122 | /** |
123 | 123 | * _transaction_reports |
124 | 124 | * generates Business Reports regarding Transactions |
125 | - * |
|
126 | - * @return void |
|
127 | - */ |
|
125 | + * |
|
126 | + * @return void |
|
127 | + */ |
|
128 | 128 | protected function _transaction_reports() { |
129 | 129 | $template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php'; |
130 | 130 | $this->_admin_page_title = __('Transactions', 'event_espresso'); |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) |
|
2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
3 | 3 | exit('NO direct script access allowed'); |
4 | 4 | |
5 | 5 | /** |
@@ -42,11 +42,11 @@ discard block |
||
42 | 42 | * @param bool $routing |
43 | 43 | * @return \Extend_Transactions_Admin_Page |
44 | 44 | */ |
45 | - public function __construct( $routing = TRUE ) { |
|
46 | - parent::__construct( $routing ); |
|
47 | - define( 'TXN_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/templates/'); |
|
48 | - define( 'TXN_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/assets/'); |
|
49 | - define( 'TXN_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'transactions/assets/'); |
|
45 | + public function __construct($routing = TRUE) { |
|
46 | + parent::__construct($routing); |
|
47 | + define('TXN_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'transactions/templates/'); |
|
48 | + define('TXN_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND.'transactions/assets/'); |
|
49 | + define('TXN_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'transactions/assets/'); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | * @return void |
59 | 59 | */ |
60 | 60 | protected function _extend_page_config() { |
61 | - $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'transactions'; |
|
61 | + $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'transactions'; |
|
62 | 62 | |
63 | 63 | $new_page_routes = array( |
64 | 64 | 'reports' => array( |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | ) |
68 | 68 | ); |
69 | 69 | |
70 | - $this->_page_routes = array_merge( $this->_page_routes, $new_page_routes ); |
|
70 | + $this->_page_routes = array_merge($this->_page_routes, $new_page_routes); |
|
71 | 71 | |
72 | 72 | $new_page_config = array( |
73 | 73 | 'reports' => array( |
@@ -81,11 +81,11 @@ discard block |
||
81 | 81 | 'filename' => 'transactions_reports' |
82 | 82 | ) |
83 | 83 | ), |
84 | - 'help_tour' => array( 'Transaction_Reports_Help_Tour' ), |
|
84 | + 'help_tour' => array('Transaction_Reports_Help_Tour'), |
|
85 | 85 | 'require_nonce' => FALSE |
86 | 86 | ) |
87 | 87 | ); |
88 | - $this->_page_config = array_merge( $this->_page_config, $new_page_config ); |
|
88 | + $this->_page_config = array_merge($this->_page_config, $new_page_config); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | |
@@ -97,8 +97,8 @@ discard block |
||
97 | 97 | * @return void |
98 | 98 | */ |
99 | 99 | public function load_scripts_styles_reports() { |
100 | - wp_register_script( 'ee-txn-reports-js', TXN_CAF_ASSETS_URL . 'ee-transaction-admin-reports.js', array( 'google-charts' ), EVENT_ESPRESSO_VERSION, true ); |
|
101 | - wp_enqueue_script( 'ee-txn-reports-js' ); |
|
100 | + wp_register_script('ee-txn-reports-js', TXN_CAF_ASSETS_URL.'ee-transaction-admin-reports.js', array('google-charts'), EVENT_ESPRESSO_VERSION, true); |
|
101 | + wp_enqueue_script('ee-txn-reports-js'); |
|
102 | 102 | $this->_transaction_reports_js_setup(); |
103 | 103 | EE_Registry::instance()->load_helper('Money'); |
104 | 104 | EE_Registry::$i18n_js_strings['currency_format'] = EEH_Money::get_format_for_google_charts(); |
@@ -126,9 +126,9 @@ discard block |
||
126 | 126 | * @return void |
127 | 127 | */ |
128 | 128 | protected function _transaction_reports() { |
129 | - $template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php'; |
|
129 | + $template_path = EE_ADMIN_TEMPLATE.'admin_reports.template.php'; |
|
130 | 130 | $this->_admin_page_title = __('Transactions', 'event_espresso'); |
131 | - $this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_reports_template_data, TRUE ); |
|
131 | + $this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_reports_template_data, TRUE); |
|
132 | 132 | |
133 | 133 | // the final template wrapper |
134 | 134 | $this->display_admin_page_with_no_sidebar(); |
@@ -143,43 +143,43 @@ discard block |
||
143 | 143 | * @param string $period The period (acceptable by PHP Datetime constructor) for which the report is generated. |
144 | 144 | * @return string |
145 | 145 | */ |
146 | - private function _revenue_per_day_report( $period = '-1 month' ) { |
|
146 | + private function _revenue_per_day_report($period = '-1 month') { |
|
147 | 147 | |
148 | 148 | $report_ID = 'txn-admin-revenue-per-day-report-dv'; |
149 | 149 | |
150 | 150 | $TXN = EEM_Transaction::instance(); |
151 | 151 | |
152 | - $results = $TXN->get_revenue_per_day_report( $period ); |
|
152 | + $results = $TXN->get_revenue_per_day_report($period); |
|
153 | 153 | $results = (array) $results; |
154 | 154 | $revenue = array(); |
155 | 155 | $subtitle = ''; |
156 | 156 | |
157 | - if ( $results ) { |
|
158 | - $revenue[] = array( __( 'Date (only shows dates that have a revenue greater than 1)', 'event_espresso' ), __( 'Total Revenue', 'event_espresso' ) ); |
|
159 | - foreach ( $results as $result ) { |
|
160 | - if ( $result->revenue > 1 ) { |
|
161 | - $revenue[] = array( $result->txnDate, (float) $result->revenue ); |
|
157 | + if ($results) { |
|
158 | + $revenue[] = array(__('Date (only shows dates that have a revenue greater than 1)', 'event_espresso'), __('Total Revenue', 'event_espresso')); |
|
159 | + foreach ($results as $result) { |
|
160 | + if ($result->revenue > 1) { |
|
161 | + $revenue[] = array($result->txnDate, (float) $result->revenue); |
|
162 | 162 | } |
163 | 163 | } |
164 | 164 | |
165 | 165 | //setup the date range. |
166 | - EE_Registry::instance()->load_helper( 'DTT_Helper' ); |
|
167 | - $beginning_date = new DateTime( 'now' . $period, new DateTimeZone( EEH_DTT_Helper::get_timezone() ) ); |
|
168 | - $ending_date = new DateTime( 'now', new DateTimeZone( EEH_DTT_Helper::get_timezone() ) ); |
|
169 | - $subtitle = sprintf( _x( 'For the period: %s to %s', 'Used to give date range', 'event_espresso' ), $beginning_date->format( 'Y-m-d' ), $ending_date->format( 'Y-m-d' ) ); |
|
166 | + EE_Registry::instance()->load_helper('DTT_Helper'); |
|
167 | + $beginning_date = new DateTime('now'.$period, new DateTimeZone(EEH_DTT_Helper::get_timezone())); |
|
168 | + $ending_date = new DateTime('now', new DateTimeZone(EEH_DTT_Helper::get_timezone())); |
|
169 | + $subtitle = sprintf(_x('For the period: %s to %s', 'Used to give date range', 'event_espresso'), $beginning_date->format('Y-m-d'), $ending_date->format('Y-m-d')); |
|
170 | 170 | } |
171 | 171 | |
172 | - $report_title = __( 'Total Revenue per Day' ); |
|
172 | + $report_title = __('Total Revenue per Day'); |
|
173 | 173 | |
174 | 174 | $report_params = array( |
175 | 175 | 'title' => $report_title, |
176 | 176 | 'subtitle' => $subtitle, |
177 | 177 | 'id' => $report_ID, |
178 | 178 | 'revenue' => $revenue, |
179 | - 'noResults' => empty( $revenue ), |
|
180 | - 'noTxnMsg' => sprintf( __( '%sThere are currently no transaction records in the last month for this report.%s', 'event_espresso' ), '<h2>' . $report_title . '</h2><p>', '</p>' ) |
|
179 | + 'noResults' => empty($revenue), |
|
180 | + 'noTxnMsg' => sprintf(__('%sThere are currently no transaction records in the last month for this report.%s', 'event_espresso'), '<h2>'.$report_title.'</h2><p>', '</p>') |
|
181 | 181 | ); |
182 | - wp_localize_script( 'ee-txn-reports-js', 'txnRevPerDay', $report_params ); |
|
182 | + wp_localize_script('ee-txn-reports-js', 'txnRevPerDay', $report_params); |
|
183 | 183 | |
184 | 184 | return $report_ID; |
185 | 185 | } |
@@ -193,44 +193,44 @@ discard block |
||
193 | 193 | * @param string $period The period (acceptable by PHP Datetime constructor) for which the report is generated. |
194 | 194 | * @return int |
195 | 195 | */ |
196 | - private function _revenue_per_event_report( $period = '-1 month' ) { |
|
196 | + private function _revenue_per_event_report($period = '-1 month') { |
|
197 | 197 | |
198 | 198 | $report_ID = 'txn-admin-revenue-per-event-report-dv'; |
199 | 199 | |
200 | 200 | $TXN = EEM_Transaction::instance(); |
201 | - $results = $TXN->get_revenue_per_event_report( $period ); |
|
201 | + $results = $TXN->get_revenue_per_event_report($period); |
|
202 | 202 | $results = (array) $results; |
203 | 203 | $revenue = array(); |
204 | 204 | $subtitle = ''; |
205 | 205 | |
206 | - if ( $results ) { |
|
207 | - $revenue[] = array( __( 'Event (only events that have a revenue greater than 1 are shown)', 'event_espresso' ), __( 'Total Revenue', 'event_espresso' ) ); |
|
208 | - foreach ( $results as $result ) { |
|
209 | - if ( $result->revenue > 1 ) { |
|
210 | - $event_name = stripslashes( html_entity_decode( $result->event_name, ENT_QUOTES, 'UTF-8' ) ); |
|
211 | - $event_name = wp_trim_words( $event_name, 5, '...' ); |
|
212 | - $revenue[] = array( $event_name, (float) $result->revenue ); |
|
206 | + if ($results) { |
|
207 | + $revenue[] = array(__('Event (only events that have a revenue greater than 1 are shown)', 'event_espresso'), __('Total Revenue', 'event_espresso')); |
|
208 | + foreach ($results as $result) { |
|
209 | + if ($result->revenue > 1) { |
|
210 | + $event_name = stripslashes(html_entity_decode($result->event_name, ENT_QUOTES, 'UTF-8')); |
|
211 | + $event_name = wp_trim_words($event_name, 5, '...'); |
|
212 | + $revenue[] = array($event_name, (float) $result->revenue); |
|
213 | 213 | } |
214 | 214 | } |
215 | 215 | |
216 | 216 | //setup the date range. |
217 | - EE_Registry::instance()->load_helper( 'DTT_Helper' ); |
|
218 | - $beginning_date = new DateTime( 'now' . $period, new DateTimeZone( EEH_DTT_Helper::get_timezone() ) ); |
|
219 | - $ending_date = new DateTime( 'now', new DateTimeZone( EEH_DTT_Helper::get_timezone() ) ); |
|
220 | - $subtitle = sprintf( _x( 'For the period: %s to %s', 'Used to give date range', 'event_espresso' ), $beginning_date->format( 'Y-m-d' ), $ending_date->format( 'Y-m-d' ) ); |
|
217 | + EE_Registry::instance()->load_helper('DTT_Helper'); |
|
218 | + $beginning_date = new DateTime('now'.$period, new DateTimeZone(EEH_DTT_Helper::get_timezone())); |
|
219 | + $ending_date = new DateTime('now', new DateTimeZone(EEH_DTT_Helper::get_timezone())); |
|
220 | + $subtitle = sprintf(_x('For the period: %s to %s', 'Used to give date range', 'event_espresso'), $beginning_date->format('Y-m-d'), $ending_date->format('Y-m-d')); |
|
221 | 221 | } |
222 | 222 | |
223 | - $report_title = __( 'Total Revenue per Event' ); |
|
223 | + $report_title = __('Total Revenue per Event'); |
|
224 | 224 | |
225 | 225 | $report_params = array( |
226 | 226 | 'title' => $report_title, |
227 | 227 | 'subtitle' => $subtitle, |
228 | 228 | 'id' => $report_ID, |
229 | 229 | 'revenue' => $revenue, |
230 | - 'noResults' => empty( $revenue ), |
|
231 | - 'noTxnMsg' => sprintf( __( '%sThere are currently no transaction records in the last month for this report.%s', 'event_espresso' ), '<h2>' . $report_title . '</h2><p>', '</p>' ) |
|
230 | + 'noResults' => empty($revenue), |
|
231 | + 'noTxnMsg' => sprintf(__('%sThere are currently no transaction records in the last month for this report.%s', 'event_espresso'), '<h2>'.$report_title.'</h2><p>', '</p>') |
|
232 | 232 | ); |
233 | - wp_localize_script( 'ee-txn-reports-js', 'txnRevPerEvent', $report_params ); |
|
233 | + wp_localize_script('ee-txn-reports-js', 'txnRevPerEvent', $report_params); |
|
234 | 234 | |
235 | 235 | return $report_ID; |
236 | 236 | } |
@@ -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 | * Event Espresso |
@@ -26,9 +26,9 @@ discard block |
||
26 | 26 | */ |
27 | 27 | ?> |
28 | 28 | <tr> |
29 | - <th><h3><?php _e("Invoice Gateway Settings", 'event_espresso');?></h3></th> |
|
29 | + <th><h3><?php _e("Invoice Gateway Settings", 'event_espresso'); ?></h3></th> |
|
30 | 30 | <td> |
31 | - <span class="description"><?php _e("The following settings affect the functioning of the Invoice gateway.", 'event_espresso');?></span> |
|
31 | + <span class="description"><?php _e("The following settings affect the functioning of the Invoice gateway.", 'event_espresso'); ?></span> |
|
32 | 32 | </td> |
33 | 33 | </tr> |
34 | 34 | <?php |
@@ -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 | * Event Espresso |
@@ -26,9 +26,9 @@ discard block |
||
26 | 26 | */ |
27 | 27 | ?> |
28 | 28 | <tr> |
29 | - <th><h3><?php _e("Invoice Display Settings", 'event_espresso');?></h3></th> |
|
29 | + <th><h3><?php _e("Invoice Display Settings", 'event_espresso'); ?></h3></th> |
|
30 | 30 | <td> |
31 | - <span class="description"><?php _e("The following settings affect the content and/or appearance of the downloadable PDF invoice.", 'event_espresso');?></span> |
|
31 | + <span class="description"><?php _e("The following settings affect the content and/or appearance of the downloadable PDF invoice.", 'event_espresso'); ?></span> |
|
32 | 32 | </td> |
33 | 33 | </tr> |
34 | 34 | <?php |
@@ -15,9 +15,9 @@ discard block |
||
15 | 15 | * @return boolean |
16 | 16 | */ |
17 | 17 | function ee_deprecated_using_old_registration_admin_custom_questions_form_hooks() { |
18 | - $in_use = has_filter( 'FHEE__Registrations_Admin_Page___update_attendee_registration_form__qstns' ) |
|
19 | - || has_action( 'AHEE__Registrations_Admin_Page___save_attendee_registration_form__after_reg_and_attendee_save' ); |
|
20 | - if( $in_use ) { |
|
18 | + $in_use = has_filter('FHEE__Registrations_Admin_Page___update_attendee_registration_form__qstns') |
|
19 | + || has_action('AHEE__Registrations_Admin_Page___save_attendee_registration_form__after_reg_and_attendee_save'); |
|
20 | + if ($in_use) { |
|
21 | 21 | $msg = __( |
22 | 22 | 'We detected you are using the filter FHEE__Registrations_Admin_Page___update_attendee_registration_form__qstns or AHEE__Registrations_Admin_Page___save_attendee_registration_form__after_reg_and_attendee_save.' |
23 | 23 | . 'Both of these have been deprecated and should not be used anymore. You should instead use FHEE__EE_Form_Section_Proper___construct__options_array to customize the contents of the form,' |
@@ -26,18 +26,18 @@ discard block |
||
26 | 26 | 'event_espresso' ) |
27 | 27 | ; |
28 | 28 | EE_Error::doing_it_wrong( |
29 | - __CLASS__ . '::' . __FUNCTION__, |
|
29 | + __CLASS__.'::'.__FUNCTION__, |
|
30 | 30 | $msg, |
31 | 31 | '4.8.32.rc.000' |
32 | 32 | ); |
33 | 33 | //it seems the doing_it_wrong messages get output during some hidden html tags, so add an error to make sure this gets noticed |
34 | - if ( is_admin() && ! defined( 'DOING_AJAX' ) ) { |
|
35 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
34 | + if (is_admin() && ! defined('DOING_AJAX')) { |
|
35 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
36 | 36 | } |
37 | 37 | } |
38 | 38 | return $in_use; |
39 | 39 | } |
40 | -add_action( 'AHEE__Registrations_Admin_Page___registration_details_metabox__start', 'ee_deprecated_using_old_registration_admin_custom_questions_form_hooks' ); |
|
40 | +add_action('AHEE__Registrations_Admin_Page___registration_details_metabox__start', 'ee_deprecated_using_old_registration_admin_custom_questions_form_hooks'); |
|
41 | 41 | |
42 | 42 | /** |
43 | 43 | * @deprecated since 4.8.32.rc.000 because it has issues on https://events.codebasehq.com/projects/event-espresso/tickets/9165 |
@@ -46,34 +46,34 @@ discard block |
||
46 | 46 | * @param EE_Admin_Page $admin_page |
47 | 47 | * @return void |
48 | 48 | */ |
49 | -function ee_deprecated_update_attendee_registration_form_old( $admin_page ) { |
|
49 | +function ee_deprecated_update_attendee_registration_form_old($admin_page) { |
|
50 | 50 | //check if the old hooks are in use. If not, do the default |
51 | - if( ! ee_deprecated_using_old_registration_admin_custom_questions_form_hooks() |
|
52 | - || ! $admin_page instanceof EE_Admin_Page ) { |
|
51 | + if ( ! ee_deprecated_using_old_registration_admin_custom_questions_form_hooks() |
|
52 | + || ! $admin_page instanceof EE_Admin_Page) { |
|
53 | 53 | return; |
54 | 54 | } |
55 | 55 | $req_data = $admin_page->get_request_data(); |
56 | - $qstns = isset( $req_data['qstn'] ) ? $req_data['qstn'] : FALSE; |
|
57 | - $REG_ID = isset( $req_data['_REG_ID'] ) ? absint( $req_data['_REG_ID'] ) : FALSE; |
|
58 | - $qstns = apply_filters( 'FHEE__Registrations_Admin_Page___update_attendee_registration_form__qstns', $qstns ); |
|
59 | - if ( ! $REG_ID || ! $qstns ) { |
|
60 | - EE_Error::add_error( __('An error occurred. No registration ID and/or registration questions were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
56 | + $qstns = isset($req_data['qstn']) ? $req_data['qstn'] : FALSE; |
|
57 | + $REG_ID = isset($req_data['_REG_ID']) ? absint($req_data['_REG_ID']) : FALSE; |
|
58 | + $qstns = apply_filters('FHEE__Registrations_Admin_Page___update_attendee_registration_form__qstns', $qstns); |
|
59 | + if ( ! $REG_ID || ! $qstns) { |
|
60 | + EE_Error::add_error(__('An error occurred. No registration ID and/or registration questions were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
61 | 61 | } |
62 | 62 | $success = TRUE; |
63 | 63 | |
64 | 64 | // allow others to get in on this awesome fun :D |
65 | - do_action( 'AHEE__Registrations_Admin_Page___save_attendee_registration_form__after_reg_and_attendee_save', $REG_ID, $qstns ); |
|
65 | + do_action('AHEE__Registrations_Admin_Page___save_attendee_registration_form__after_reg_and_attendee_save', $REG_ID, $qstns); |
|
66 | 66 | // loop thru questions... FINALLY!!! |
67 | 67 | |
68 | - foreach ( $qstns as $QST_ID => $qstn ) { |
|
68 | + foreach ($qstns as $QST_ID => $qstn) { |
|
69 | 69 | //if $qstn isn't an array then it doesn't already have an answer, so let's create the answer |
70 | - if ( !is_array($qstn) ) { |
|
71 | - $success = $this->_save_new_answer( $REG_ID, $QST_ID, $qstn); |
|
70 | + if ( ! is_array($qstn)) { |
|
71 | + $success = $this->_save_new_answer($REG_ID, $QST_ID, $qstn); |
|
72 | 72 | continue; |
73 | 73 | } |
74 | 74 | |
75 | 75 | |
76 | - foreach ( $qstn as $ANS_ID => $ANS_value ) { |
|
76 | + foreach ($qstn as $ANS_ID => $ANS_value) { |
|
77 | 77 | //get answer |
78 | 78 | $query_params = array( |
79 | 79 | 0 => array( |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | ); |
85 | 85 | $answer = EEM_Answer::instance()->get_one($query_params); |
86 | 86 | //this MAY be an array but NOT have an answer because its multi select. If so then we need to create the answer |
87 | - if ( ! $answer instanceof EE_Answer ) { |
|
87 | + if ( ! $answer instanceof EE_Answer) { |
|
88 | 88 | $set_values = array( |
89 | 89 | 'QST_ID' => $QST_ID, |
90 | 90 | 'REG_ID' => $REG_ID, |
@@ -99,11 +99,11 @@ discard block |
||
99 | 99 | } |
100 | 100 | } |
101 | 101 | $what = __('Registration Form', 'event_espresso'); |
102 | - $route = $REG_ID ? array( 'action' => 'view_registration', '_REG_ID' => $REG_ID ) : array( 'action' => 'default' ); |
|
103 | - $admin_page->redirect_after_action( $success, $what, __('updated', 'event_espresso'), $route ); |
|
102 | + $route = $REG_ID ? array('action' => 'view_registration', '_REG_ID' => $REG_ID) : array('action' => 'default'); |
|
103 | + $admin_page->redirect_after_action($success, $what, __('updated', 'event_espresso'), $route); |
|
104 | 104 | exit; |
105 | 105 | } |
106 | -add_action( 'AHEE__Registrations_Admin_Page___update_attendee_registration_form__start', 'ee_deprecated_update_attendee_registration_form_old', 10, 1 ); |
|
106 | +add_action('AHEE__Registrations_Admin_Page___update_attendee_registration_form__start', 'ee_deprecated_update_attendee_registration_form_old', 10, 1); |
|
107 | 107 | /** |
108 | 108 | * Render the registration admin page's custom questions area in the old fashion |
109 | 109 | * and firing the old hooks. When this method is removed, we can probably also |
@@ -116,31 +116,31 @@ discard block |
||
116 | 116 | * @return bool |
117 | 117 | * @throws \EE_Error |
118 | 118 | */ |
119 | -function ee_deprecated_reg_questions_meta_box_old( $do_default_action, $admin_page, $registration ) { |
|
119 | +function ee_deprecated_reg_questions_meta_box_old($do_default_action, $admin_page, $registration) { |
|
120 | 120 | //check if the old hooks are in use. If not, do the default |
121 | - if( ! ee_deprecated_using_old_registration_admin_custom_questions_form_hooks() |
|
122 | - || ! $admin_page instanceof EE_Admin_Page ) { |
|
121 | + if ( ! ee_deprecated_using_old_registration_admin_custom_questions_form_hooks() |
|
122 | + || ! $admin_page instanceof EE_Admin_Page) { |
|
123 | 123 | return $do_default_action; |
124 | 124 | } |
125 | - add_filter( 'FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', array( $admin_page, 'form_before_question_group' ), 10, 1 ); |
|
126 | - add_filter( 'FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', array( $admin_page, 'form_after_question_group' ), 10, 1 ); |
|
127 | - add_filter( 'FHEE__EEH_Form_Fields__label_html', array( $admin_page, 'form_form_field_label_wrap' ), 10, 1 ); |
|
128 | - add_filter( 'FHEE__EEH_Form_Fields__input_html', array( $admin_page, 'form_form_field_input__wrap' ), 10, 1 ); |
|
125 | + add_filter('FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', array($admin_page, 'form_before_question_group'), 10, 1); |
|
126 | + add_filter('FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', array($admin_page, 'form_after_question_group'), 10, 1); |
|
127 | + add_filter('FHEE__EEH_Form_Fields__label_html', array($admin_page, 'form_form_field_label_wrap'), 10, 1); |
|
128 | + add_filter('FHEE__EEH_Form_Fields__input_html', array($admin_page, 'form_form_field_input__wrap'), 10, 1); |
|
129 | 129 | |
130 | - $question_groups = EEM_Event::instance()->assemble_array_of_groups_questions_and_options( $registration, $registration->get('EVT_ID') ); |
|
130 | + $question_groups = EEM_Event::instance()->assemble_array_of_groups_questions_and_options($registration, $registration->get('EVT_ID')); |
|
131 | 131 | |
132 | - EE_Registry::instance()->load_helper( 'Form_Fields' ); |
|
132 | + EE_Registry::instance()->load_helper('Form_Fields'); |
|
133 | 133 | $template_args = array( |
134 | - 'att_questions' => EEH_Form_Fields::generate_question_groups_html( $question_groups ), |
|
134 | + 'att_questions' => EEH_Form_Fields::generate_question_groups_html($question_groups), |
|
135 | 135 | 'reg_questions_form_action' => 'edit_registration', |
136 | 136 | 'REG_ID' => $registration->ID() |
137 | 137 | ); |
138 | - $template_path = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_reg_questions.template.php'; |
|
139 | - echo EEH_Template::display_template( $template_path, $template_args, TRUE ); |
|
138 | + $template_path = REG_TEMPLATE_PATH.'reg_admin_details_main_meta_box_reg_questions.template.php'; |
|
139 | + echo EEH_Template::display_template($template_path, $template_args, TRUE); |
|
140 | 140 | //indicate that we should not do the default admin page code |
141 | 141 | return false; |
142 | 142 | } |
143 | -add_action( 'FHEE__Registrations_Admin_Page___reg_questions_meta_box__do_default', 'ee_deprecated_reg_questions_meta_box_old', 10, 3 ); |
|
143 | +add_action('FHEE__Registrations_Admin_Page___reg_questions_meta_box__do_default', 'ee_deprecated_reg_questions_meta_box_old', 10, 3); |
|
144 | 144 | |
145 | 145 | /** |
146 | 146 | * ee_deprecated__registration_checkout__button_text |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | * @param \EE_Checkout $checkout |
150 | 150 | * @return string |
151 | 151 | */ |
152 | -function ee_deprecated__registration_checkout__button_text( $submit_button_text, EE_Checkout $checkout ) { |
|
152 | +function ee_deprecated__registration_checkout__button_text($submit_button_text, EE_Checkout $checkout) { |
|
153 | 153 | // list of old filters |
154 | 154 | $deprecated_filters = array( |
155 | 155 | 'update_registration_details' => true, |
@@ -159,16 +159,16 @@ discard block |
||
159 | 159 | 'proceed_to' => true, |
160 | 160 | ); |
161 | 161 | // loop thru and call doing_it_wrong() or remove any that aren't being used |
162 | - foreach ( $deprecated_filters as $deprecated_filter => $on ) { |
|
162 | + foreach ($deprecated_filters as $deprecated_filter => $on) { |
|
163 | 163 | // was this filter called ? |
164 | - if ( has_action( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__' . $deprecated_filter )) { |
|
164 | + if (has_action('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__'.$deprecated_filter)) { |
|
165 | 165 | // only display doing_it_wrong() notice to Event Admins during non-AJAX requests |
166 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_ee', 'hide_doing_it_wrong_for_deprecated_SPCO_filter' ) && ! defined( 'DOING_AJAX' ) ) { |
|
166 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_ee', 'hide_doing_it_wrong_for_deprecated_SPCO_filter') && ! defined('DOING_AJAX')) { |
|
167 | 167 | EE_Error::doing_it_wrong( |
168 | - 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__' . $deprecated_filter, |
|
168 | + 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__'.$deprecated_filter, |
|
169 | 169 | sprintf( |
170 | - __( 'The %1$s filter is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the following new filter: %2$s"%3$s" found in "%4$s"', 'event_espresso' ), |
|
171 | - 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__' . $deprecated_filter, |
|
170 | + __('The %1$s filter is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the following new filter: %2$s"%3$s" found in "%4$s"', 'event_espresso'), |
|
171 | + 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__'.$deprecated_filter, |
|
172 | 172 | '<br />', |
173 | 173 | 'FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text', |
174 | 174 | '/modules/single_page_checkout/inc/EE_SPCO_Reg_Step.class.php' |
@@ -178,24 +178,24 @@ discard block |
||
178 | 178 | ); |
179 | 179 | } |
180 | 180 | } else { |
181 | - unset( $deprecated_filters[ $deprecated_filter ] ); |
|
181 | + unset($deprecated_filters[$deprecated_filter]); |
|
182 | 182 | } |
183 | 183 | } |
184 | - if ( ! empty( $deprecated_filters )) { |
|
185 | - |
|
186 | - if ( $checkout->current_step->slug() == 'attendee_information' && $checkout->revisit && isset( $deprecated_filters[ 'update_registration_details' ] )) { |
|
187 | - $submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__update_registration_details', $submit_button_text ); |
|
188 | - } else if ( $checkout->current_step->slug() == 'payment_options' && $checkout->revisit && isset( $deprecated_filters[ 'process_payment' ] ) ) { |
|
189 | - $submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__process_payment', $submit_button_text ); |
|
190 | - } else if ( $checkout->next_step instanceof EE_SPCO_Reg_Step && $checkout->next_step->slug() == 'finalize_registration' && isset( $deprecated_filters[ 'finalize_registration' ] ) ) { |
|
191 | - $submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__finalize_registration', $submit_button_text ); |
|
184 | + if ( ! empty($deprecated_filters)) { |
|
185 | + |
|
186 | + if ($checkout->current_step->slug() == 'attendee_information' && $checkout->revisit && isset($deprecated_filters['update_registration_details'])) { |
|
187 | + $submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__update_registration_details', $submit_button_text); |
|
188 | + } else if ($checkout->current_step->slug() == 'payment_options' && $checkout->revisit && isset($deprecated_filters['process_payment'])) { |
|
189 | + $submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__process_payment', $submit_button_text); |
|
190 | + } else if ($checkout->next_step instanceof EE_SPCO_Reg_Step && $checkout->next_step->slug() == 'finalize_registration' && isset($deprecated_filters['finalize_registration'])) { |
|
191 | + $submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__finalize_registration', $submit_button_text); |
|
192 | 192 | } |
193 | - if ( $checkout->next_step instanceof EE_SPCO_Reg_Step ) { |
|
194 | - if ( $checkout->payment_required() && $checkout->next_step->slug() == 'payment_options' && isset( $deprecated_filters[ 'and_proceed_to_payment' ] ) ) { |
|
195 | - $submit_button_text .= apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__and_proceed_to_payment', $submit_button_text ); |
|
193 | + if ($checkout->next_step instanceof EE_SPCO_Reg_Step) { |
|
194 | + if ($checkout->payment_required() && $checkout->next_step->slug() == 'payment_options' && isset($deprecated_filters['and_proceed_to_payment'])) { |
|
195 | + $submit_button_text .= apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__and_proceed_to_payment', $submit_button_text); |
|
196 | 196 | } |
197 | - if ( $checkout->next_step->slug() != 'finalize_registration' && ! $checkout->revisit && isset( $deprecated_filters[ 'proceed_to' ] ) ) { |
|
198 | - $submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__proceed_to', $submit_button_text ) . $checkout->next_step->name(); |
|
197 | + if ($checkout->next_step->slug() != 'finalize_registration' && ! $checkout->revisit && isset($deprecated_filters['proceed_to'])) { |
|
198 | + $submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__proceed_to', $submit_button_text).$checkout->next_step->name(); |
|
199 | 199 | } |
200 | 200 | } |
201 | 201 | |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | return $submit_button_text; |
204 | 204 | |
205 | 205 | } |
206 | -add_filter( 'FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text', 'ee_deprecated__registration_checkout__button_text', 10, 2 ); |
|
206 | +add_filter('FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text', 'ee_deprecated__registration_checkout__button_text', 10, 2); |
|
207 | 207 | |
208 | 208 | |
209 | 209 | |
@@ -214,16 +214,16 @@ discard block |
||
214 | 214 | * @param \EE_Checkout $checkout |
215 | 215 | * @param boolean $status_updates |
216 | 216 | */ |
217 | -function ee_deprecated_finalize_transaction( EE_Checkout $checkout, $status_updates ) { |
|
217 | +function ee_deprecated_finalize_transaction(EE_Checkout $checkout, $status_updates) { |
|
218 | 218 | $action_ref = NULL; |
219 | - $action_ref = has_action( 'AHEE__EE_Transaction__finalize__new_transaction' ) ? 'AHEE__EE_Transaction__finalize__new_transaction' : $action_ref; |
|
220 | - $action_ref = has_action( 'AHEE__EE_Transaction__finalize__all_transaction' ) ? 'AHEE__EE_Transaction__finalize__all_transaction' : $action_ref; |
|
221 | - if ( $action_ref ) { |
|
219 | + $action_ref = has_action('AHEE__EE_Transaction__finalize__new_transaction') ? 'AHEE__EE_Transaction__finalize__new_transaction' : $action_ref; |
|
220 | + $action_ref = has_action('AHEE__EE_Transaction__finalize__all_transaction') ? 'AHEE__EE_Transaction__finalize__all_transaction' : $action_ref; |
|
221 | + if ($action_ref) { |
|
222 | 222 | |
223 | 223 | EE_Error::doing_it_wrong( |
224 | 224 | $action_ref, |
225 | 225 | sprintf( |
226 | - __( 'This action is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use one of the following new actions: %1$s"%3$s" found in "%2$s" %1$s"%4$s" found in "%2$s" %1$s"%5$s" found in "%2$s" %1$s"%6$s" found in "%2$s"', 'event_espresso' ), |
|
226 | + __('This action is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use one of the following new actions: %1$s"%3$s" found in "%2$s" %1$s"%4$s" found in "%2$s" %1$s"%5$s" found in "%2$s" %1$s"%6$s" found in "%2$s"', 'event_espresso'), |
|
227 | 227 | '<br />', |
228 | 228 | '/core/business/EE_Transaction_Processor.class.php', |
229 | 229 | 'AHEE__EE_Transaction_Processor__finalize', |
@@ -234,29 +234,29 @@ discard block |
||
234 | 234 | '4.6.0', |
235 | 235 | E_USER_DEPRECATED |
236 | 236 | ); |
237 | - switch ( $action_ref ) { |
|
237 | + switch ($action_ref) { |
|
238 | 238 | case 'AHEE__EE_Transaction__finalize__new_transaction' : |
239 | - do_action( 'AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, $checkout->admin_request ); |
|
239 | + do_action('AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, $checkout->admin_request); |
|
240 | 240 | break; |
241 | 241 | case 'AHEE__EE_Transaction__finalize__all_transaction' : |
242 | - do_action( 'AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, array( 'new_reg' => ! $checkout->revisit, 'to_approved' => $status_updates ), $checkout->admin_request ); |
|
242 | + do_action('AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, array('new_reg' => ! $checkout->revisit, 'to_approved' => $status_updates), $checkout->admin_request); |
|
243 | 243 | break; |
244 | 244 | } |
245 | 245 | } |
246 | 246 | } |
247 | -add_action( 'AHEE__EE_SPCO_Reg_Step_Finalize_Registration__process_reg_step__completed', 'ee_deprecated_finalize_transaction', 10, 2 ); |
|
247 | +add_action('AHEE__EE_SPCO_Reg_Step_Finalize_Registration__process_reg_step__completed', 'ee_deprecated_finalize_transaction', 10, 2); |
|
248 | 248 | /** |
249 | 249 | * ee_deprecated_finalize_registration |
250 | 250 | * |
251 | 251 | * @param EE_Registration $registration |
252 | 252 | */ |
253 | -function ee_deprecated_finalize_registration( EE_Registration $registration ) { |
|
254 | - $action_ref = has_action( 'AHEE__EE_Registration__finalize__update_and_new_reg' ) ? 'AHEE__EE_Registration__finalize__update_and_new_reg' : NULL; |
|
255 | - if ( $action_ref ) { |
|
253 | +function ee_deprecated_finalize_registration(EE_Registration $registration) { |
|
254 | + $action_ref = has_action('AHEE__EE_Registration__finalize__update_and_new_reg') ? 'AHEE__EE_Registration__finalize__update_and_new_reg' : NULL; |
|
255 | + if ($action_ref) { |
|
256 | 256 | EE_Error::doing_it_wrong( |
257 | 257 | $action_ref, |
258 | 258 | sprintf( |
259 | - __( 'This action is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the following new action: %1$s"%3$s" found in "%2$s"', 'event_espresso' ), |
|
259 | + __('This action is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the following new action: %1$s"%3$s" found in "%2$s"', 'event_espresso'), |
|
260 | 260 | '<br />', |
261 | 261 | '/core/business/EE_Registration_Processor.class.php', |
262 | 262 | 'AHEE__EE_Registration_Processor__trigger_registration_status_changed_hook' |
@@ -264,10 +264,10 @@ discard block |
||
264 | 264 | '4.6.0', |
265 | 265 | E_USER_DEPRECATED |
266 | 266 | ); |
267 | - do_action( 'AHEE__EE_Registration__finalize__update_and_new_reg', $registration, ( is_admin() && ! ( defined( 'DOING_AJAX' ) && DOING_AJAX ))); |
|
267 | + do_action('AHEE__EE_Registration__finalize__update_and_new_reg', $registration, (is_admin() && ! (defined('DOING_AJAX') && DOING_AJAX))); |
|
268 | 268 | } |
269 | 269 | } |
270 | -add_action( 'AHEE__EE_Registration_Processor__trigger_registration_update_notifications', 'ee_deprecated_finalize_registration', 10, 1 ); |
|
270 | +add_action('AHEE__EE_Registration_Processor__trigger_registration_update_notifications', 'ee_deprecated_finalize_registration', 10, 1); |
|
271 | 271 | |
272 | 272 | |
273 | 273 | |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | * |
289 | 289 | * @return array |
290 | 290 | */ |
291 | -function ee_deprecated_get_templates( $templates, EE_messenger $messenger, EE_message_type $message_type, EE_Messages_Template_Pack $template_pack ) { |
|
291 | +function ee_deprecated_get_templates($templates, EE_messenger $messenger, EE_message_type $message_type, EE_Messages_Template_Pack $template_pack) { |
|
292 | 292 | $old_default_classnames = array( |
293 | 293 | 'EE_Messages_Email_Cancelled_Registration_Defaults', |
294 | 294 | 'EE_Messages_Email_Declined_Registration_Defaults', |
@@ -304,23 +304,23 @@ discard block |
||
304 | 304 | |
305 | 305 | $old_class_instance = new stdClass(); |
306 | 306 | |
307 | - foreach ( $old_default_classnames as $classname ) { |
|
308 | - $filter_ref = 'FHEE__' . $classname . '___create_new_templates___templates'; |
|
309 | - if ( has_filter( $filter_ref ) ) { |
|
310 | - EE_Error::doing_it_wrong( $filter_ref, __('This filter is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the new filter provided which is "FHEE__EE_Template_Pack___get_templates__templates" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED ); |
|
307 | + foreach ($old_default_classnames as $classname) { |
|
308 | + $filter_ref = 'FHEE__'.$classname.'___create_new_templates___templates'; |
|
309 | + if (has_filter($filter_ref)) { |
|
310 | + EE_Error::doing_it_wrong($filter_ref, __('This filter is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the new filter provided which is "FHEE__EE_Template_Pack___get_templates__templates" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED); |
|
311 | 311 | } |
312 | - $templates = apply_filters( $filter_ref, $templates, $old_class_instance ); |
|
312 | + $templates = apply_filters($filter_ref, $templates, $old_class_instance); |
|
313 | 313 | } |
314 | 314 | |
315 | 315 | return $templates; |
316 | 316 | } |
317 | -add_filter( 'FHEE__EE_Template_Pack___get_templates__templates', 'ee_deprecated_get_templates', 10, 4 ); |
|
317 | +add_filter('FHEE__EE_Template_Pack___get_templates__templates', 'ee_deprecated_get_templates', 10, 4); |
|
318 | 318 | |
319 | 319 | /** |
320 | 320 | * Called after EED_Module::set_hooks() and EED_Module::set_admin_hooks() was called. |
321 | 321 | * Checks if any deprecated hooks were hooked-into and provide doing_it_wrong messages appropriately. |
322 | 322 | */ |
323 | -function ee_deprecated_hooks(){ |
|
323 | +function ee_deprecated_hooks() { |
|
324 | 324 | /** |
325 | 325 | * @var $hooks array where keys are hook names, and their values are array{ |
326 | 326 | * @type string $version when deprecated |
@@ -331,26 +331,26 @@ discard block |
||
331 | 331 | $hooks = array( |
332 | 332 | 'AHEE__EE_System___do_setup_validations' => array( |
333 | 333 | 'version' => '4.6.0', |
334 | - 'alternative' => __( 'Instead use "AHEE__EEH_Activation__validate_messages_system" which is called after validating messages (done on every new install, upgrade, reactivation, and downgrade)', 'event_espresso' ), |
|
334 | + 'alternative' => __('Instead use "AHEE__EEH_Activation__validate_messages_system" which is called after validating messages (done on every new install, upgrade, reactivation, and downgrade)', 'event_espresso'), |
|
335 | 335 | 'still_works' => FALSE |
336 | 336 | ) |
337 | 337 | ); |
338 | - foreach( $hooks as $name => $deprecation_info ){ |
|
339 | - if( has_action( $name ) ){ |
|
338 | + foreach ($hooks as $name => $deprecation_info) { |
|
339 | + if (has_action($name)) { |
|
340 | 340 | EE_Error::doing_it_wrong( |
341 | 341 | $name, |
342 | 342 | sprintf( |
343 | - __('This filter is deprecated. %1$s%2$s','event_espresso'), |
|
344 | - $deprecation_info[ 'still_works' ] ? __('It *may* work as an attempt to build in backwards compatibility.', 'event_espresso') : __( 'It has been completely removed.', 'event_espresso' ), |
|
345 | - isset( $deprecation_info[ 'alternative' ] ) ? $deprecation_info[ 'alternative' ] : __( 'Please read the current EE4 documentation further or contact Support.', 'event_espresso' ) |
|
343 | + __('This filter is deprecated. %1$s%2$s', 'event_espresso'), |
|
344 | + $deprecation_info['still_works'] ? __('It *may* work as an attempt to build in backwards compatibility.', 'event_espresso') : __('It has been completely removed.', 'event_espresso'), |
|
345 | + isset($deprecation_info['alternative']) ? $deprecation_info['alternative'] : __('Please read the current EE4 documentation further or contact Support.', 'event_espresso') |
|
346 | 346 | ), |
347 | - isset( $deprecation_info[ 'version' ] ) ? $deprecation_info[ 'version' ] : __( 'recently', 'event_espresso' ), |
|
347 | + isset($deprecation_info['version']) ? $deprecation_info['version'] : __('recently', 'event_espresso'), |
|
348 | 348 | E_USER_DEPRECATED |
349 | 349 | ); |
350 | 350 | } |
351 | 351 | } |
352 | 352 | } |
353 | -add_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', 'ee_deprecated_hooks' ); |
|
353 | +add_action('AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', 'ee_deprecated_hooks'); |
|
354 | 354 | |
355 | 355 | |
356 | 356 | |
@@ -373,25 +373,25 @@ discard block |
||
373 | 373 | * |
374 | 374 | * @return string The default contents for the messenger, message type, context and field. |
375 | 375 | */ |
376 | -function ee_deprecated_get_default_field_content( $contents, $actual_path, EE_messenger $messenger, EE_message_type $message_type, $field, $context, EE_Messages_Template_Pack $template_pack ) { |
|
376 | +function ee_deprecated_get_default_field_content($contents, $actual_path, EE_messenger $messenger, EE_message_type $message_type, $field, $context, EE_Messages_Template_Pack $template_pack) { |
|
377 | 377 | |
378 | 378 | $classnames_to_try = array( |
379 | - get_class( $messenger ) => $messenger, |
|
380 | - get_class( $message_type ) => $message_type, |
|
379 | + get_class($messenger) => $messenger, |
|
380 | + get_class($message_type) => $message_type, |
|
381 | 381 | 'EE_Messages_Base' => $message_type |
382 | 382 | ); |
383 | 383 | |
384 | - foreach ( $classnames_to_try as $classname => $obj ) { |
|
385 | - $filter_ref = 'FHEE__' . $classname . '__get_default_field_content'; |
|
386 | - if ( has_filter( $filter_ref ) ) { |
|
387 | - EE_Error::doing_it_wrong( $filter_ref, __('This filter is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_specific_template__contents" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED ); |
|
384 | + foreach ($classnames_to_try as $classname => $obj) { |
|
385 | + $filter_ref = 'FHEE__'.$classname.'__get_default_field_content'; |
|
386 | + if (has_filter($filter_ref)) { |
|
387 | + EE_Error::doing_it_wrong($filter_ref, __('This filter is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_specific_template__contents" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED); |
|
388 | 388 | } |
389 | - $contents = apply_filters( $filter_ref, $contents, $obj ); |
|
389 | + $contents = apply_filters($filter_ref, $contents, $obj); |
|
390 | 390 | } |
391 | 391 | |
392 | 392 | return $contents; |
393 | 393 | } |
394 | -add_filter( 'FHEE__EE_Messages_Template_Pack__get_specific_template__contents', 'ee_deprecated_get_default_field_content', 10, 7 ); |
|
394 | +add_filter('FHEE__EE_Messages_Template_Pack__get_specific_template__contents', 'ee_deprecated_get_default_field_content', 10, 7); |
|
395 | 395 | |
396 | 396 | |
397 | 397 | |
@@ -419,23 +419,23 @@ discard block |
||
419 | 419 | * |
420 | 420 | * @return string The path to the file being used. |
421 | 421 | */ |
422 | -function ee_deprecated_get_inline_css_template_filters( $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack ) { |
|
422 | +function ee_deprecated_get_inline_css_template_filters($variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack) { |
|
423 | 423 | |
424 | - if ( $messenger == 'email' ) { |
|
424 | + if ($messenger == 'email') { |
|
425 | 425 | $filter_ref = $url ? 'FHEE__EE_Email_Messenger__get_inline_css_template__css_url' : 'FHEE__EE_Email_Messenger__get_inline_css_template__css_path'; |
426 | - } elseif ( $messenger == 'html' ) { |
|
426 | + } elseif ($messenger == 'html') { |
|
427 | 427 | $filter_ref = $url ? 'FHEE__EE_Html_messenger__get_inline_css_template__css_url' : 'FHEE__EE_Html_messenger__get_inline_css_template__css_path'; |
428 | 428 | } else { |
429 | 429 | return $variation_path; |
430 | 430 | } |
431 | 431 | |
432 | - if ( has_filter( $filter_ref ) ) { |
|
433 | - EE_Error::doing_it_wrong( $filter_ref, __('This filter is deprecated. It is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_variation" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED ); |
|
432 | + if (has_filter($filter_ref)) { |
|
433 | + EE_Error::doing_it_wrong($filter_ref, __('This filter is deprecated. It is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_variation" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED); |
|
434 | 434 | } |
435 | 435 | |
436 | - return apply_filters( $filter_ref, $variation_path, $url, $type ); |
|
436 | + return apply_filters($filter_ref, $variation_path, $url, $type); |
|
437 | 437 | } |
438 | -add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', 'ee_deprecated_get_inline_css_template_filters', 10, 8 ); |
|
438 | +add_filter('FHEE__EE_Messages_Template_Pack__get_variation', 'ee_deprecated_get_inline_css_template_filters', 10, 8); |
|
439 | 439 | |
440 | 440 | |
441 | 441 | |
@@ -451,78 +451,78 @@ discard block |
||
451 | 451 | class EE_Messages_Init extends EE_Base { |
452 | 452 | |
453 | 453 | public function __construct() { |
454 | - self::doing_it_wrong_call( __METHOD__ ); |
|
454 | + self::doing_it_wrong_call(__METHOD__); |
|
455 | 455 | } |
456 | 456 | |
457 | 457 | /** |
458 | 458 | * @param $method_name |
459 | 459 | */ |
460 | - public static function doing_it_wrong_call( $method_name ) { |
|
461 | - EE_Error::doing_it_wrong( __CLASS__, sprintf( __('The %s in this class is deprecated as of EE4.5.0. All functionality formerly in this class is now in the EED_Messages module.', 'event_espresso'), $method_name ), '4.5.0', E_USER_DEPRECATED ); |
|
460 | + public static function doing_it_wrong_call($method_name) { |
|
461 | + EE_Error::doing_it_wrong(__CLASS__, sprintf(__('The %s in this class is deprecated as of EE4.5.0. All functionality formerly in this class is now in the EED_Messages module.', 'event_espresso'), $method_name), '4.5.0', E_USER_DEPRECATED); |
|
462 | 462 | } |
463 | 463 | |
464 | 464 | /** |
465 | 465 | * @deprecated 4.5.0 |
466 | 466 | */ |
467 | 467 | public static function set_autoloaders() { |
468 | - self::doing_it_wrong_call( __METHOD__ ); |
|
468 | + self::doing_it_wrong_call(__METHOD__); |
|
469 | 469 | EED_Messages::set_autoloaders(); |
470 | 470 | } |
471 | 471 | |
472 | 472 | /** |
473 | 473 | * @deprecated 4.5.0 |
474 | 474 | */ |
475 | - public function payment_reminder( $transaction ) { |
|
476 | - self::doing_it_wrong_call( __METHOD__ ); |
|
477 | - EED_Messages::payment_reminder( $transaction ); |
|
475 | + public function payment_reminder($transaction) { |
|
476 | + self::doing_it_wrong_call(__METHOD__); |
|
477 | + EED_Messages::payment_reminder($transaction); |
|
478 | 478 | } |
479 | 479 | |
480 | 480 | /** |
481 | 481 | * @deprecated 4.5.0 |
482 | 482 | */ |
483 | - public function payment( $transaction, $payment ) { |
|
484 | - self::doing_it_wrong_call( __METHOD__ ); |
|
485 | - EED_Messages::payment( $transaction, $payment ); |
|
483 | + public function payment($transaction, $payment) { |
|
484 | + self::doing_it_wrong_call(__METHOD__); |
|
485 | + EED_Messages::payment($transaction, $payment); |
|
486 | 486 | } |
487 | 487 | |
488 | 488 | /** |
489 | 489 | * @deprecated 4.5.0 |
490 | 490 | */ |
491 | - public function cancelled_registration( $transaction ) { |
|
492 | - self::doing_it_wrong_call( __METHOD__ ); |
|
493 | - EED_Messages::cancelled_registration( $transaction ); |
|
491 | + public function cancelled_registration($transaction) { |
|
492 | + self::doing_it_wrong_call(__METHOD__); |
|
493 | + EED_Messages::cancelled_registration($transaction); |
|
494 | 494 | } |
495 | 495 | |
496 | 496 | /** |
497 | 497 | * @deprecated 4.5.0 |
498 | 498 | */ |
499 | - public function maybe_registration( $transaction, $reg_msg, $from_admin ) { |
|
500 | - self::doing_it_wrong_call( __METHOD__ ); |
|
501 | - EED_Messages::maybe_registration( $transaction, $reg_msg, $from_admin ); |
|
499 | + public function maybe_registration($transaction, $reg_msg, $from_admin) { |
|
500 | + self::doing_it_wrong_call(__METHOD__); |
|
501 | + EED_Messages::maybe_registration($transaction, $reg_msg, $from_admin); |
|
502 | 502 | } |
503 | 503 | |
504 | 504 | /** |
505 | 505 | * @deprecated 4.5.0 |
506 | 506 | */ |
507 | - public function process_resend( $success, $req_data ) { |
|
508 | - self::doing_it_wrong_call( __METHOD__ ); |
|
509 | - EED_Messages::process_resend( $req_data ); |
|
507 | + public function process_resend($success, $req_data) { |
|
508 | + self::doing_it_wrong_call(__METHOD__); |
|
509 | + EED_Messages::process_resend($req_data); |
|
510 | 510 | } |
511 | 511 | |
512 | 512 | /** |
513 | 513 | * @deprecated 4.5.0 |
514 | 514 | */ |
515 | - public function process_admin_payment( $success, $payment ) { |
|
516 | - self::doing_it_wrong_call( __METHOD__ ); |
|
517 | - EED_Messages::process_admin_payment( $success, $payment ); |
|
515 | + public function process_admin_payment($success, $payment) { |
|
516 | + self::doing_it_wrong_call(__METHOD__); |
|
517 | + EED_Messages::process_admin_payment($success, $payment); |
|
518 | 518 | } |
519 | 519 | |
520 | 520 | /** |
521 | 521 | * @deprecated 4.5.0 |
522 | 522 | */ |
523 | - public function send_newsletter_message( $contacts, $grp_id ) { |
|
524 | - self::doing_it_wrong_call( __METHOD__ ); |
|
525 | - EED_Messages::send_newsletter_message( $contacts, $grp_id ); |
|
523 | + public function send_newsletter_message($contacts, $grp_id) { |
|
524 | + self::doing_it_wrong_call(__METHOD__); |
|
525 | + EED_Messages::send_newsletter_message($contacts, $grp_id); |
|
526 | 526 | } |
527 | 527 | |
528 | 528 | |
@@ -543,13 +543,13 @@ discard block |
||
543 | 543 | * |
544 | 544 | * @return array additional cpts. |
545 | 545 | */ |
546 | -function ee_deprecated_get_cpts( $cpts ) { |
|
547 | - if ( has_filter( 'FHEE__EE_Register_CPTs__construct__CPTs' ) ) { |
|
548 | - EE_Error::doing_it_wrong( 'FHEE__EE_Register_CPTs__construct__CPTs', __('This filter is deprecated. It will still work for the time being. However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_CPTs__cpts" found in EE_Register_CPTs::get_CPTs()', 'event_espresso'), '4.5.0', E_USER_DEPRECATED ); |
|
546 | +function ee_deprecated_get_cpts($cpts) { |
|
547 | + if (has_filter('FHEE__EE_Register_CPTs__construct__CPTs')) { |
|
548 | + EE_Error::doing_it_wrong('FHEE__EE_Register_CPTs__construct__CPTs', __('This filter is deprecated. It will still work for the time being. However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_CPTs__cpts" found in EE_Register_CPTs::get_CPTs()', 'event_espresso'), '4.5.0', E_USER_DEPRECATED); |
|
549 | 549 | } |
550 | - return apply_filters( 'FHEE__EE_Register_CPTs__construct__CPTs', $cpts ); |
|
550 | + return apply_filters('FHEE__EE_Register_CPTs__construct__CPTs', $cpts); |
|
551 | 551 | } |
552 | -add_filter( 'FHEE__EE_Register_CPTs__get_CPTs__cpts', 'ee_deprecated_get_cpts', 10 ); |
|
552 | +add_filter('FHEE__EE_Register_CPTs__get_CPTs__cpts', 'ee_deprecated_get_cpts', 10); |
|
553 | 553 | |
554 | 554 | |
555 | 555 | |
@@ -563,10 +563,10 @@ discard block |
||
563 | 563 | * |
564 | 564 | * @return array additional custom taxonomies. |
565 | 565 | */ |
566 | -function ee_deprecated_get_taxonomies( $cts ) { |
|
567 | - if ( has_filter( 'FHEE__EE_Register_CPTs__construct__taxonomies' ) ) { |
|
568 | - EE_Error::doing_it_wrong( 'FHEE__EE_Register_CPTs__construct__taxonomies', __('This filter is deprecated. It will still work for the time being. However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_taxonomies__taxonomies" found in EE_Register_CPTs::get_taxonomies()', 'event_espresso'), '4.5.0', E_USER_DEPRECATED ); |
|
566 | +function ee_deprecated_get_taxonomies($cts) { |
|
567 | + if (has_filter('FHEE__EE_Register_CPTs__construct__taxonomies')) { |
|
568 | + EE_Error::doing_it_wrong('FHEE__EE_Register_CPTs__construct__taxonomies', __('This filter is deprecated. It will still work for the time being. However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_taxonomies__taxonomies" found in EE_Register_CPTs::get_taxonomies()', 'event_espresso'), '4.5.0', E_USER_DEPRECATED); |
|
569 | 569 | } |
570 | - return apply_filters( 'FHEE__EE_Register_CPTs__construct__taxonomies', $cts ); |
|
570 | + return apply_filters('FHEE__EE_Register_CPTs__construct__taxonomies', $cts); |
|
571 | 571 | } |
572 | -add_filter( 'FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', 'ee_deprecated_get_taxonomies', 10 ); |
|
572 | +add_filter('FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', 'ee_deprecated_get_taxonomies', 10); |
@@ -105,17 +105,17 @@ discard block |
||
105 | 105 | } |
106 | 106 | add_action( 'AHEE__Registrations_Admin_Page___update_attendee_registration_form__start', 'ee_deprecated_update_attendee_registration_form_old', 10, 1 ); |
107 | 107 | /** |
108 | - * Render the registration admin page's custom questions area in the old fashion |
|
109 | - * and firing the old hooks. When this method is removed, we can probably also |
|
110 | - * remove the deprecated methods form_before_question_group, form_after_question_group, |
|
111 | - * form_form_field_label_wrap and form_form_field_input__wrap in Registrations_Admin_Page |
|
112 | - * |
|
113 | - * @param boolean $do_default_action |
|
114 | - * @param EE_Admin_Page $admin_page |
|
115 | - * @param EE_Registration $registration |
|
116 | - * @return bool |
|
117 | - * @throws \EE_Error |
|
118 | - */ |
|
108 | + * Render the registration admin page's custom questions area in the old fashion |
|
109 | + * and firing the old hooks. When this method is removed, we can probably also |
|
110 | + * remove the deprecated methods form_before_question_group, form_after_question_group, |
|
111 | + * form_form_field_label_wrap and form_form_field_input__wrap in Registrations_Admin_Page |
|
112 | + * |
|
113 | + * @param boolean $do_default_action |
|
114 | + * @param EE_Admin_Page $admin_page |
|
115 | + * @param EE_Registration $registration |
|
116 | + * @return bool |
|
117 | + * @throws \EE_Error |
|
118 | + */ |
|
119 | 119 | function ee_deprecated_reg_questions_meta_box_old( $do_default_action, $admin_page, $registration ) { |
120 | 120 | //check if the old hooks are in use. If not, do the default |
121 | 121 | if( ! ee_deprecated_using_old_registration_admin_custom_questions_form_hooks() |
@@ -246,10 +246,10 @@ discard block |
||
246 | 246 | } |
247 | 247 | add_action( 'AHEE__EE_SPCO_Reg_Step_Finalize_Registration__process_reg_step__completed', 'ee_deprecated_finalize_transaction', 10, 2 ); |
248 | 248 | /** |
249 | - * ee_deprecated_finalize_registration |
|
250 | - * |
|
251 | - * @param EE_Registration $registration |
|
252 | - */ |
|
249 | + * ee_deprecated_finalize_registration |
|
250 | + * |
|
251 | + * @param EE_Registration $registration |
|
252 | + */ |
|
253 | 253 | function ee_deprecated_finalize_registration( EE_Registration $registration ) { |
254 | 254 | $action_ref = has_action( 'AHEE__EE_Registration__finalize__update_and_new_reg' ) ? 'AHEE__EE_Registration__finalize__update_and_new_reg' : NULL; |
255 | 255 | if ( $action_ref ) { |
@@ -503,7 +503,7 @@ |
||
503 | 503 | /** |
504 | 504 | * @param $message_types |
505 | 505 | * @param array $extra |
506 | - * @return mixed|string |
|
506 | + * @return string |
|
507 | 507 | */ |
508 | 508 | protected function _get_admin_content_events_edit( $message_types, $extra ) { |
509 | 509 | //defaults |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) |
|
2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
3 | 3 | exit('NO direct script access allowed'); |
4 | 4 | |
5 | 5 | /** |
@@ -43,9 +43,9 @@ discard block |
||
43 | 43 | * |
44 | 44 | * @param EE_Admin_Page $admin_page |
45 | 45 | */ |
46 | - public function __construct( $admin_page ) { |
|
46 | + public function __construct($admin_page) { |
|
47 | 47 | parent::__construct($admin_page); |
48 | - require_once( EE_HELPERS . 'EEH_DTT_Helper.helper.php' ); |
|
48 | + require_once(EE_HELPERS.'EEH_DTT_Helper.helper.php'); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | */ |
55 | 55 | protected function _setup_data() { |
56 | 56 | $this->_data = $this->_admin_page->get_events($this->_per_page, $this->_current_page); |
57 | - $this->_all_data_count = $this->_admin_page->get_events(0,0, TRUE); |
|
57 | + $this->_all_data_count = $this->_admin_page->get_events(0, 0, TRUE); |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | |
@@ -85,17 +85,17 @@ discard block |
||
85 | 85 | |
86 | 86 | |
87 | 87 | $this->_sortable_columns = array( |
88 | - 'id' => array( 'EVT_ID' => true ), |
|
89 | - 'name' => array( 'EVT_name' => false ), |
|
90 | - 'author' => array( 'EVT_wp_user' => false ), |
|
91 | - 'venue' => array( 'Venue.VNU_name' => false ), |
|
88 | + 'id' => array('EVT_ID' => true), |
|
89 | + 'name' => array('EVT_name' => false), |
|
90 | + 'author' => array('EVT_wp_user' => false), |
|
91 | + 'venue' => array('Venue.VNU_name' => false), |
|
92 | 92 | 'start_date_time' => array('Datetime.DTT_EVT_start' => false), |
93 | 93 | 'reg_begins' => array('Datetime.Ticket.TKT_start_date' => false), |
94 | 94 | ); |
95 | 95 | |
96 | 96 | $this->_primary_column = 'id'; |
97 | 97 | |
98 | - $this->_hidden_columns = array( 'author' ); |
|
98 | + $this->_hidden_columns = array('author'); |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | protected function _add_view_counts() { |
114 | 114 | $this->_views['all']['count'] = $this->_admin_page->total_events(); |
115 | 115 | $this->_views['draft']['count'] = $this->_admin_page->total_events_draft(); |
116 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_events', 'espresso_events_trash_events' ) ) { |
|
116 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_events', 'espresso_events_trash_events')) { |
|
117 | 117 | $this->_views['trash']['count'] = $this->_admin_page->total_trashed_events(); |
118 | 118 | } |
119 | 119 | } |
@@ -124,11 +124,11 @@ discard block |
||
124 | 124 | * |
125 | 125 | * @return string |
126 | 126 | */ |
127 | - protected function _get_row_class( $item ) { |
|
128 | - $class = parent::_get_row_class( $item ); |
|
127 | + protected function _get_row_class($item) { |
|
128 | + $class = parent::_get_row_class($item); |
|
129 | 129 | //add status class |
130 | - $class .= $item instanceof EE_Event ? ' ee-status-strip event-status-' . $item->get_active_status() : ''; |
|
131 | - if ( $this->_has_checkbox_column ) { |
|
130 | + $class .= $item instanceof EE_Event ? ' ee-status-strip event-status-'.$item->get_active_status() : ''; |
|
131 | + if ($this->_has_checkbox_column) { |
|
132 | 132 | $class .= ' has-checkbox-column'; |
133 | 133 | } |
134 | 134 | return $class; |
@@ -140,8 +140,8 @@ discard block |
||
140 | 140 | * |
141 | 141 | * @return string |
142 | 142 | */ |
143 | - public function column_status( EE_Event $item ) { |
|
144 | - return '<span class="ee-status-strip ee-status-strip-td event-status-' . $item->get_active_status() . '"></span>'; |
|
143 | + public function column_status(EE_Event $item) { |
|
144 | + return '<span class="ee-status-strip ee-status-strip-td event-status-'.$item->get_active_status().'"></span>'; |
|
145 | 145 | }/**/ |
146 | 146 | |
147 | 147 | |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | * |
151 | 151 | * @return string |
152 | 152 | */ |
153 | - public function column_cb( $item ) { |
|
153 | + public function column_cb($item) { |
|
154 | 154 | $this->_dtt = $item->primary_datetime(); //set this for use in other columns |
155 | 155 | |
156 | 156 | //does event have any attached registrations? |
@@ -166,9 +166,9 @@ discard block |
||
166 | 166 | * |
167 | 167 | * @return mixed|string |
168 | 168 | */ |
169 | - public function column_id( EE_Event $item ) { |
|
169 | + public function column_id(EE_Event $item) { |
|
170 | 170 | $content = $item->ID(); |
171 | - $content .= ' <span class="show-on-mobile-view-only">' . $item->name() . '</span>'; |
|
171 | + $content .= ' <span class="show-on-mobile-view-only">'.$item->name().'</span>'; |
|
172 | 172 | return $content; |
173 | 173 | } |
174 | 174 | |
@@ -178,16 +178,16 @@ discard block |
||
178 | 178 | * |
179 | 179 | * @return string |
180 | 180 | */ |
181 | - public function column_name( EE_Event $item ) { |
|
181 | + public function column_name(EE_Event $item) { |
|
182 | 182 | $edit_query_args = array( |
183 | 183 | 'action' => 'edit', |
184 | 184 | 'post' => $item->ID() |
185 | 185 | ); |
186 | - $edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EVENTS_ADMIN_URL ); |
|
187 | - $actions = $this->_column_name_action_setup( $item ); |
|
186 | + $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL); |
|
187 | + $actions = $this->_column_name_action_setup($item); |
|
188 | 188 | $status = ''; //$item->status() !== 'publish' ? ' (' . $item->status() . ')' : ''; |
189 | - $content = '<strong><a class="row-title" href="' . $edit_link . '">' . $item->name() . '</a></strong>' . $status; |
|
190 | - $content .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status( $item->get_active_status(), false, 'sentence' ) . '</span>'; |
|
189 | + $content = '<strong><a class="row-title" href="'.$edit_link.'">'.$item->name().'</a></strong>'.$status; |
|
190 | + $content .= '<br><span class="ee-status-text-small">'.EEH_Template::pretty_status($item->get_active_status(), false, 'sentence').'</span>'; |
|
191 | 191 | $content .= $this->row_actions($actions); |
192 | 192 | return $content; |
193 | 193 | |
@@ -204,72 +204,72 @@ discard block |
||
204 | 204 | * |
205 | 205 | * @return array array of actions |
206 | 206 | */ |
207 | - protected function _column_name_action_setup( EE_Event $item ) { |
|
207 | + protected function _column_name_action_setup(EE_Event $item) { |
|
208 | 208 | //todo: remove when attendees is active |
209 | - if ( !defined('REG_ADMIN_URL') ) |
|
209 | + if ( ! defined('REG_ADMIN_URL')) |
|
210 | 210 | define('REG_ADMIN_URL', EVENTS_ADMIN_URL); |
211 | 211 | |
212 | 212 | $actions = array(); |
213 | 213 | |
214 | - if ( EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $item->ID() ) ) { |
|
214 | + if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $item->ID())) { |
|
215 | 215 | $edit_query_args = array( |
216 | 216 | 'action' => 'edit', |
217 | 217 | 'post' => $item->ID() |
218 | 218 | ); |
219 | - $edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EVENTS_ADMIN_URL ); |
|
220 | - $actions['edit'] = '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Event', 'event_espresso') . '">' . __('Edit', 'event_espresso') . '</a>'; |
|
219 | + $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL); |
|
220 | + $actions['edit'] = '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Event', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>'; |
|
221 | 221 | |
222 | 222 | } |
223 | 223 | |
224 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $item->ID() ) ) { |
|
224 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID())) { |
|
225 | 225 | $attendees_query_args = array( |
226 | 226 | 'action' => 'default', |
227 | 227 | 'event_id' => $item->ID() |
228 | 228 | ); |
229 | - $attendees_link = EE_Admin_Page::add_query_args_and_nonce( $attendees_query_args, REG_ADMIN_URL ); |
|
230 | - $actions['attendees'] = '<a href="' . $attendees_link . '" title="' . esc_attr__('View Registrations', 'event_espresso') . '">' . __('Registrations', 'event_espresso') . '</a>'; |
|
229 | + $attendees_link = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL); |
|
230 | + $actions['attendees'] = '<a href="'.$attendees_link.'" title="'.esc_attr__('View Registrations', 'event_espresso').'">'.__('Registrations', 'event_espresso').'</a>'; |
|
231 | 231 | } |
232 | 232 | |
233 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_trash_event', $item->ID() ) ) { |
|
233 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_trash_event', $item->ID())) { |
|
234 | 234 | $trash_event_query_args = array( |
235 | 235 | 'action' => 'trash_event', |
236 | 236 | 'EVT_ID' => $item->ID() |
237 | 237 | ); |
238 | - $trash_event_link = EE_Admin_Page::add_query_args_and_nonce( $trash_event_query_args, EVENTS_ADMIN_URL ); |
|
238 | + $trash_event_link = EE_Admin_Page::add_query_args_and_nonce($trash_event_query_args, EVENTS_ADMIN_URL); |
|
239 | 239 | } |
240 | 240 | |
241 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_restore_event', $item->ID() ) ) { |
|
241 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_restore_event', $item->ID())) { |
|
242 | 242 | $restore_event_query_args = array( |
243 | 243 | 'action' => 'restore_event', |
244 | 244 | 'EVT_ID' => $item->ID() |
245 | 245 | ); |
246 | - $restore_event_link = EE_Admin_Page::add_query_args_and_nonce( $restore_event_query_args, EVENTS_ADMIN_URL ); |
|
246 | + $restore_event_link = EE_Admin_Page::add_query_args_and_nonce($restore_event_query_args, EVENTS_ADMIN_URL); |
|
247 | 247 | } |
248 | 248 | |
249 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_delete_event', $item->ID() ) ) { |
|
249 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_delete_event', $item->ID())) { |
|
250 | 250 | $delete_event_query_args = array( |
251 | 251 | 'action' => 'delete_event', |
252 | 252 | 'EVT_ID' => $item->ID() |
253 | 253 | ); |
254 | - $delete_event_link = EE_Admin_Page::add_query_args_and_nonce( $delete_event_query_args, EVENTS_ADMIN_URL ); |
|
254 | + $delete_event_link = EE_Admin_Page::add_query_args_and_nonce($delete_event_query_args, EVENTS_ADMIN_URL); |
|
255 | 255 | } |
256 | 256 | |
257 | 257 | $view_link = get_permalink($item->ID()); |
258 | 258 | |
259 | - $actions['view'] = '<a href="' . $view_link . '" title="' . esc_attr__('View Event', 'event_espresso') . '">' . __('View', 'event_espresso') . '</a>'; |
|
259 | + $actions['view'] = '<a href="'.$view_link.'" title="'.esc_attr__('View Event', 'event_espresso').'">'.__('View', 'event_espresso').'</a>'; |
|
260 | 260 | |
261 | - switch ( $item->get( 'status' ) ) { |
|
261 | + switch ($item->get('status')) { |
|
262 | 262 | case 'trash' : |
263 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_restore_event', $item->ID() ) ) { |
|
264 | - $actions['restore_from_trash'] = '<a href="' . $restore_event_link . '" title="' . esc_attr__('Restore from Trash', 'event_espresso') . '">' . __('Restore from Trash', 'event_espresso') . '</a>'; |
|
263 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_restore_event', $item->ID())) { |
|
264 | + $actions['restore_from_trash'] = '<a href="'.$restore_event_link.'" title="'.esc_attr__('Restore from Trash', 'event_espresso').'">'.__('Restore from Trash', 'event_espresso').'</a>'; |
|
265 | 265 | } |
266 | - if ( $item->count_related('Registration') === 0 && EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_delete_event', $item->ID() ) ) { |
|
267 | - $actions['delete'] = '<a href="' . $delete_event_link . '" title="' . esc_attr__('Delete Permanently', 'event_espresso') . '">' . __('Delete Permanently', 'event_espresso') . '</a>'; |
|
266 | + if ($item->count_related('Registration') === 0 && EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_delete_event', $item->ID())) { |
|
267 | + $actions['delete'] = '<a href="'.$delete_event_link.'" title="'.esc_attr__('Delete Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>'; |
|
268 | 268 | } |
269 | 269 | break; |
270 | 270 | default : |
271 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_trash_event', $item->ID() ) ) { |
|
272 | - $actions['move to trash'] = '<a href="' . $trash_event_link . '" title="' . esc_attr__('Trash Event', 'event_espresso') . '">' . __('Trash', 'event_espresso') . '</a>'; |
|
271 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_trash_event', $item->ID())) { |
|
272 | + $actions['move to trash'] = '<a href="'.$trash_event_link.'" title="'.esc_attr__('Trash Event', 'event_espresso').'">'.__('Trash', 'event_espresso').'</a>'; |
|
273 | 273 | } |
274 | 274 | } |
275 | 275 | return $actions; |
@@ -281,17 +281,17 @@ discard block |
||
281 | 281 | * |
282 | 282 | * @return string |
283 | 283 | */ |
284 | - public function column_author( EE_Event $item ) { |
|
284 | + public function column_author(EE_Event $item) { |
|
285 | 285 | //user author info |
286 | - $event_author = get_userdata( $item->wp_user() ); |
|
287 | - $gravatar = get_avatar( $item->wp_user(), '15' ); |
|
286 | + $event_author = get_userdata($item->wp_user()); |
|
287 | + $gravatar = get_avatar($item->wp_user(), '15'); |
|
288 | 288 | //filter link |
289 | 289 | $query_args = array( |
290 | 290 | 'action' => 'default', |
291 | 291 | 'EVT_wp_user' => $item->wp_user() |
292 | 292 | ); |
293 | - $filter_url = EE_Admin_Page::add_query_args_and_nonce( $query_args, EVENTS_ADMIN_URL ); |
|
294 | - return $gravatar . ' <a href="' . $filter_url . '" title="' . esc_attr__('Click to filter events by this author.', 'event_espresso') . '">' . $event_author->display_name . '</a>'; |
|
293 | + $filter_url = EE_Admin_Page::add_query_args_and_nonce($query_args, EVENTS_ADMIN_URL); |
|
294 | + return $gravatar.' <a href="'.$filter_url.'" title="'.esc_attr__('Click to filter events by this author.', 'event_espresso').'">'.$event_author->display_name.'</a>'; |
|
295 | 295 | } |
296 | 296 | |
297 | 297 | |
@@ -300,9 +300,9 @@ discard block |
||
300 | 300 | * |
301 | 301 | * @return string |
302 | 302 | */ |
303 | - public function column_venue( EE_Event $item ) { |
|
304 | - $venue = $item->get_first_related( 'Venue' ); |
|
305 | - return !empty( $venue ) ? $venue->name() : ''; |
|
303 | + public function column_venue(EE_Event $item) { |
|
304 | + $venue = $item->get_first_related('Venue'); |
|
305 | + return ! empty($venue) ? $venue->name() : ''; |
|
306 | 306 | } |
307 | 307 | |
308 | 308 | |
@@ -311,10 +311,10 @@ discard block |
||
311 | 311 | * |
312 | 312 | * @throws EE_Error |
313 | 313 | */ |
314 | - public function column_start_date_time( EE_Event $item ) { |
|
315 | - echo !empty( $this->_dtt ) ? $this->_dtt->get_i18n_datetime('DTT_EVT_start') : __('No Date was saved for this Event', 'event_espresso'); |
|
314 | + public function column_start_date_time(EE_Event $item) { |
|
315 | + echo ! empty($this->_dtt) ? $this->_dtt->get_i18n_datetime('DTT_EVT_start') : __('No Date was saved for this Event', 'event_espresso'); |
|
316 | 316 | //display in user's timezone? |
317 | - echo !empty( $this->_dtt ) ? $this->_dtt->display_in_my_timezone('DTT_EVT_start', 'get_i18n_datetime', '', 'My Timezone: ' ) : ''; |
|
317 | + echo ! empty($this->_dtt) ? $this->_dtt->display_in_my_timezone('DTT_EVT_start', 'get_i18n_datetime', '', 'My Timezone: ') : ''; |
|
318 | 318 | |
319 | 319 | } |
320 | 320 | |
@@ -324,11 +324,11 @@ discard block |
||
324 | 324 | * |
325 | 325 | * @throws EE_Error |
326 | 326 | */ |
327 | - public function column_reg_begins( EE_Event $item ) { |
|
327 | + public function column_reg_begins(EE_Event $item) { |
|
328 | 328 | $reg_start = $item->get_ticket_with_earliest_start_time(); |
329 | - echo !empty( $reg_start ) ? $reg_start->get_i18n_datetime('TKT_start_date') : __('No Tickets have been setup for this Event', 'event_espresso'); |
|
329 | + echo ! empty($reg_start) ? $reg_start->get_i18n_datetime('TKT_start_date') : __('No Tickets have been setup for this Event', 'event_espresso'); |
|
330 | 330 | //display in user's timezone? |
331 | - echo !empty( $reg_start ) ? $reg_start->display_in_my_timezone('TKT_start_date', 'get_i18n_datetime', '', 'My Timezone: ' ) : '';/**/ |
|
331 | + echo ! empty($reg_start) ? $reg_start->display_in_my_timezone('TKT_start_date', 'get_i18n_datetime', '', 'My Timezone: ') : ''; /**/ |
|
332 | 332 | } |
333 | 333 | |
334 | 334 | |
@@ -337,14 +337,14 @@ discard block |
||
337 | 337 | * |
338 | 338 | * @return int|string |
339 | 339 | */ |
340 | - public function column_attendees( EE_Event $item ) { |
|
340 | + public function column_attendees(EE_Event $item) { |
|
341 | 341 | $attendees_query_args = array( |
342 | 342 | 'action' => 'default', |
343 | 343 | 'event_id' => $item->ID() |
344 | 344 | ); |
345 | - $attendees_link = EE_Admin_Page::add_query_args_and_nonce( $attendees_query_args, REG_ADMIN_URL ); |
|
346 | - $registered_attendees = EEM_Registration::instance()->get_event_registration_count( $item->ID() ); |
|
347 | - return EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $item->ID() ) ? '<a href="' . $attendees_link . '">' . $registered_attendees . '</a>' : $registered_attendees; |
|
345 | + $attendees_link = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL); |
|
346 | + $registered_attendees = EEM_Registration::instance()->get_event_registration_count($item->ID()); |
|
347 | + return EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID()) ? '<a href="'.$attendees_link.'">'.$registered_attendees.'</a>' : $registered_attendees; |
|
348 | 348 | } |
349 | 349 | |
350 | 350 | |
@@ -353,8 +353,8 @@ discard block |
||
353 | 353 | * |
354 | 354 | * @return float |
355 | 355 | */ |
356 | - public function column_tkts_sold( EE_Event $item ) { |
|
357 | - return EEM_Ticket::instance()->sum(array( array('Datetime.EVT_ID' => $item->ID() )), 'TKT_sold' ); |
|
356 | + public function column_tkts_sold(EE_Event $item) { |
|
357 | + return EEM_Ticket::instance()->sum(array(array('Datetime.EVT_ID' => $item->ID())), 'TKT_sold'); |
|
358 | 358 | } |
359 | 359 | |
360 | 360 | |
@@ -363,38 +363,38 @@ discard block |
||
363 | 363 | * |
364 | 364 | * @return string |
365 | 365 | */ |
366 | - public function column_actions( EE_Event $item ) { |
|
366 | + public function column_actions(EE_Event $item) { |
|
367 | 367 | //todo: remove when attendees is active |
368 | - if ( !defined('REG_ADMIN_URL') ) |
|
368 | + if ( ! defined('REG_ADMIN_URL')) |
|
369 | 369 | define('REG_ADMIN_URL', EVENTS_ADMIN_URL); |
370 | 370 | $actionlinks = array(); |
371 | 371 | |
372 | 372 | $view_link = get_permalink($item->ID()); |
373 | 373 | |
374 | - $actionlinks[] = '<a href="' . $view_link . '" title="' . esc_attr__('View Event', 'event_espresso') . '" target="_blank">'; |
|
374 | + $actionlinks[] = '<a href="'.$view_link.'" title="'.esc_attr__('View Event', 'event_espresso').'" target="_blank">'; |
|
375 | 375 | $actionlinks[] = '<div class="dashicons dashicons-search"></div></a>'; |
376 | 376 | |
377 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'espresso_events_edit', $item->ID() ) ) { |
|
377 | + if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $item->ID())) { |
|
378 | 378 | $edit_query_args = array( |
379 | 379 | 'action' => 'edit', |
380 | 380 | 'post' => $item->ID() |
381 | 381 | ); |
382 | - $edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EVENTS_ADMIN_URL ); |
|
383 | - $actionlinks[] = '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Event', 'event_espresso') . '"><div class="ee-icon ee-icon-calendar-edit"></div></a>'; |
|
382 | + $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL); |
|
383 | + $actionlinks[] = '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Event', 'event_espresso').'"><div class="ee-icon ee-icon-calendar-edit"></div></a>'; |
|
384 | 384 | } |
385 | 385 | |
386 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $item->ID() ) ) { |
|
386 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID())) { |
|
387 | 387 | $attendees_query_args = array( |
388 | 388 | 'action' => 'default', |
389 | 389 | 'event_id' => $item->ID() |
390 | 390 | ); |
391 | - $attendees_link = EE_Admin_Page::add_query_args_and_nonce( $attendees_query_args, REG_ADMIN_URL ); |
|
392 | - $actionlinks[] = '<a href="' . $attendees_link . '" title="' . esc_attr__('View Registrants', 'event_espresso') . '"><div class="dashicons dashicons-groups"></div></a>'; |
|
391 | + $attendees_link = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL); |
|
392 | + $actionlinks[] = '<a href="'.$attendees_link.'" title="'.esc_attr__('View Registrants', 'event_espresso').'"><div class="dashicons dashicons-groups"></div></a>'; |
|
393 | 393 | } |
394 | 394 | |
395 | - $actionlinks = apply_filters( 'FHEE__Events_Admin_List_Table__column_actions__action_links', $actionlinks, $item ); |
|
395 | + $actionlinks = apply_filters('FHEE__Events_Admin_List_Table__column_actions__action_links', $actionlinks, $item); |
|
396 | 396 | |
397 | - return $this->_action_string( implode( "\n\t", $actionlinks ), $item, 'div' ); |
|
397 | + return $this->_action_string(implode("\n\t", $actionlinks), $item, 'div'); |
|
398 | 398 | } |
399 | 399 | |
400 | 400 |