WordImpress /
Give
@@ -9,13 +9,13 @@ discard block |
||
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | 11 | // Exit if accessed directly |
| 12 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 12 | +if ( ! defined('ABSPATH')) { |
|
| 13 | 13 | exit; |
| 14 | 14 | } |
| 15 | 15 | |
| 16 | 16 | // Load WP_List_Table if not loaded |
| 17 | -if ( ! class_exists( 'WP_List_Table' ) ) { |
|
| 18 | - require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php'; |
|
| 17 | +if ( ! class_exists('WP_List_Table')) { |
|
| 18 | + require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php'; |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | /** |
@@ -45,11 +45,11 @@ discard block |
||
| 45 | 45 | global $status, $page; |
| 46 | 46 | |
| 47 | 47 | // Set parent defaults |
| 48 | - parent::__construct( array( |
|
| 49 | - 'singular' => give_get_forms_label_singular(), // Singular name of the listed records |
|
| 50 | - 'plural' => give_get_forms_label_plural(), // Plural name of the listed records |
|
| 48 | + parent::__construct(array( |
|
| 49 | + 'singular' => give_get_forms_label_singular(), // Singular name of the listed records |
|
| 50 | + 'plural' => give_get_forms_label_plural(), // Plural name of the listed records |
|
| 51 | 51 | 'ajax' => false // Does this table support ajax? |
| 52 | - ) ); |
|
| 52 | + )); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | /** |
@@ -63,14 +63,14 @@ discard block |
||
| 63 | 63 | * |
| 64 | 64 | * @return string Column Name |
| 65 | 65 | */ |
| 66 | - public function column_default( $item, $column_name ) { |
|
| 67 | - switch ( $column_name ) { |
|
| 66 | + public function column_default($item, $column_name) { |
|
| 67 | + switch ($column_name) { |
|
| 68 | 68 | case 'ID' : |
| 69 | 69 | return $item['ID_label']; |
| 70 | 70 | case 'error' : |
| 71 | - return get_the_title( $item['ID'] ) ? get_the_title( $item['ID'] ) : esc_html__( 'Payment Error', 'give' ); |
|
| 71 | + return get_the_title($item['ID']) ? get_the_title($item['ID']) : esc_html__('Payment Error', 'give'); |
|
| 72 | 72 | default: |
| 73 | - return $item[ $column_name ]; |
|
| 73 | + return $item[$column_name]; |
|
| 74 | 74 | } |
| 75 | 75 | } |
| 76 | 76 | |
@@ -84,29 +84,29 @@ discard block |
||
| 84 | 84 | * |
| 85 | 85 | * @return void |
| 86 | 86 | */ |
| 87 | - public function column_message( $item ) { |
|
| 87 | + public function column_message($item) { |
|
| 88 | 88 | |
| 89 | 89 | ?> |
| 90 | - <a href="#TB_inline?width=640&inlineId=log-message-<?php echo $item['ID']; ?>" class="thickbox" title="<?php esc_attr_e( 'View Log Message', 'give' ); ?> "><?php esc_html_e( 'View Log Message', 'give' ); ?></a> |
|
| 90 | + <a href="#TB_inline?width=640&inlineId=log-message-<?php echo $item['ID']; ?>" class="thickbox" title="<?php esc_attr_e('View Log Message', 'give'); ?> "><?php esc_html_e('View Log Message', 'give'); ?></a> |
|
| 91 | 91 | <div id="log-message-<?php echo $item['ID']; ?>" style="display:none;"> |
| 92 | 92 | <?php |
| 93 | 93 | |
| 94 | - $log_message = get_post_field( 'post_content', $item['ID'] ); |
|
| 94 | + $log_message = get_post_field('post_content', $item['ID']); |
|
| 95 | 95 | |
| 96 | - $serialized = strpos( $log_message, '{"' ); |
|
| 96 | + $serialized = strpos($log_message, '{"'); |
|
| 97 | 97 | |
| 98 | 98 | // Check to see if the log message contains serialized information |
| 99 | - if ( $serialized !== false ) { |
|
| 100 | - $length = strlen( $log_message ) - $serialized; |
|
| 101 | - $intro = substr( $log_message, 0, - $length ); |
|
| 102 | - $data = substr( $log_message, $serialized, strlen( $log_message ) - 1 ); |
|
| 99 | + if ($serialized !== false) { |
|
| 100 | + $length = strlen($log_message) - $serialized; |
|
| 101 | + $intro = substr($log_message, 0, - $length); |
|
| 102 | + $data = substr($log_message, $serialized, strlen($log_message) - 1); |
|
| 103 | 103 | |
| 104 | - echo wpautop( $intro ); |
|
| 105 | - echo wpautop( '<strong>' . esc_html__( 'Log data:', 'give' ) . '</strong>' ); |
|
| 106 | - echo '<div style="word-wrap: break-word;">' . wpautop( $data ) . '</div>'; |
|
| 104 | + echo wpautop($intro); |
|
| 105 | + echo wpautop('<strong>'.esc_html__('Log data:', 'give').'</strong>'); |
|
| 106 | + echo '<div style="word-wrap: break-word;">'.wpautop($data).'</div>'; |
|
| 107 | 107 | } else { |
| 108 | 108 | // No serialized data found |
| 109 | - echo wpautop( $log_message ); |
|
| 109 | + echo wpautop($log_message); |
|
| 110 | 110 | } |
| 111 | 111 | ?> |
| 112 | 112 | </div> |
@@ -122,12 +122,12 @@ discard block |
||
| 122 | 122 | */ |
| 123 | 123 | public function get_columns() { |
| 124 | 124 | $columns = array( |
| 125 | - 'ID' => esc_html__( 'Log ID', 'give' ), |
|
| 126 | - 'payment_id' => esc_html__( 'Payment ID', 'give' ), |
|
| 127 | - 'error' => esc_html__( 'Error', 'give' ), |
|
| 128 | - 'message' => esc_html__( 'Error Message', 'give' ), |
|
| 129 | - 'gateway' => esc_html__( 'Gateway', 'give' ), |
|
| 130 | - 'date' => esc_html__( 'Date', 'give' ) |
|
| 125 | + 'ID' => esc_html__('Log ID', 'give'), |
|
| 126 | + 'payment_id' => esc_html__('Payment ID', 'give'), |
|
| 127 | + 'error' => esc_html__('Error', 'give'), |
|
| 128 | + 'message' => esc_html__('Error Message', 'give'), |
|
| 129 | + 'gateway' => esc_html__('Gateway', 'give'), |
|
| 130 | + 'date' => esc_html__('Date', 'give') |
|
| 131 | 131 | ); |
| 132 | 132 | |
| 133 | 133 | return $columns; |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | * @return int Current page number |
| 142 | 142 | */ |
| 143 | 143 | public function get_paged() { |
| 144 | - return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1; |
|
| 144 | + return isset($_GET['paged']) ? absint($_GET['paged']) : 1; |
|
| 145 | 145 | } |
| 146 | 146 | |
| 147 | 147 | /** |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | * @since 1.0 |
| 152 | 152 | * @return void |
| 153 | 153 | */ |
| 154 | - public function bulk_actions( $which = '' ) { |
|
| 154 | + public function bulk_actions($which = '') { |
|
| 155 | 155 | give_log_views(); |
| 156 | 156 | } |
| 157 | 157 | |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | global $give_logs; |
| 168 | 168 | |
| 169 | 169 | // Prevent the queries from getting cached. Without this there are occasional memory issues for some installs |
| 170 | - wp_suspend_cache_addition( true ); |
|
| 170 | + wp_suspend_cache_addition(true); |
|
| 171 | 171 | |
| 172 | 172 | $logs_data = array(); |
| 173 | 173 | $paged = $this->get_paged(); |
@@ -176,17 +176,17 @@ discard block |
||
| 176 | 176 | 'paged' => $paged |
| 177 | 177 | ); |
| 178 | 178 | |
| 179 | - $logs = $give_logs->get_connected_logs( $log_query ); |
|
| 179 | + $logs = $give_logs->get_connected_logs($log_query); |
|
| 180 | 180 | |
| 181 | - if ( $logs ) { |
|
| 182 | - foreach ( $logs as $log ) { |
|
| 181 | + if ($logs) { |
|
| 182 | + foreach ($logs as $log) { |
|
| 183 | 183 | |
| 184 | 184 | $logs_data[] = array( |
| 185 | 185 | 'ID' => $log->ID, |
| 186 | - 'ID_label' => '<span class=\'give-item-label give-item-label-gray\'>' . $log->ID . '</span>', |
|
| 186 | + 'ID_label' => '<span class=\'give-item-label give-item-label-gray\'>'.$log->ID.'</span>', |
|
| 187 | 187 | 'payment_id' => $log->post_parent, |
| 188 | 188 | 'error' => 'error', |
| 189 | - 'gateway' => give_get_payment_gateway( $log->post_parent ), |
|
| 189 | + 'gateway' => give_get_payment_gateway($log->post_parent), |
|
| 190 | 190 | 'date' => $log->post_date |
| 191 | 191 | ); |
| 192 | 192 | } |
@@ -207,19 +207,19 @@ discard block |
||
| 207 | 207 | * |
| 208 | 208 | * @param string $which |
| 209 | 209 | */ |
| 210 | - protected function display_tablenav( $which ) { |
|
| 211 | - if ( 'top' === $which ) { |
|
| 212 | - wp_nonce_field( 'bulk-' . $this->_args['plural'] ); |
|
| 210 | + protected function display_tablenav($which) { |
|
| 211 | + if ('top' === $which) { |
|
| 212 | + wp_nonce_field('bulk-'.$this->_args['plural']); |
|
| 213 | 213 | } |
| 214 | 214 | ?> |
| 215 | - <div class="tablenav <?php echo esc_attr( $which ); ?>"> |
|
| 215 | + <div class="tablenav <?php echo esc_attr($which); ?>"> |
|
| 216 | 216 | |
| 217 | 217 | <div class="alignleft actions bulkactions"> |
| 218 | - <?php $this->bulk_actions( $which ); ?> |
|
| 218 | + <?php $this->bulk_actions($which); ?> |
|
| 219 | 219 | </div> |
| 220 | 220 | <?php |
| 221 | - $this->extra_tablenav( $which ); |
|
| 222 | - $this->pagination( $which ); |
|
| 221 | + $this->extra_tablenav($which); |
|
| 222 | + $this->pagination($which); |
|
| 223 | 223 | ?> |
| 224 | 224 | |
| 225 | 225 | <br class="clear"/> |
@@ -246,15 +246,15 @@ discard block |
||
| 246 | 246 | $columns = $this->get_columns(); |
| 247 | 247 | $hidden = array(); // No hidden columns |
| 248 | 248 | $sortable = $this->get_sortable_columns(); |
| 249 | - $this->_column_headers = array( $columns, $hidden, $sortable ); |
|
| 249 | + $this->_column_headers = array($columns, $hidden, $sortable); |
|
| 250 | 250 | $current_page = $this->get_pagenum(); |
| 251 | 251 | $this->items = $this->get_logs(); |
| 252 | - $total_items = $give_logs->get_log_count( 0, 'gateway_error' ); |
|
| 252 | + $total_items = $give_logs->get_log_count(0, 'gateway_error'); |
|
| 253 | 253 | |
| 254 | - $this->set_pagination_args( array( |
|
| 254 | + $this->set_pagination_args(array( |
|
| 255 | 255 | 'total_items' => $total_items, |
| 256 | 256 | 'per_page' => $this->per_page, |
| 257 | - 'total_pages' => ceil( $total_items / $this->per_page ) |
|
| 257 | + 'total_pages' => ceil($total_items / $this->per_page) |
|
| 258 | 258 | ) |
| 259 | 259 | ); |
| 260 | 260 | } |
@@ -10,13 +10,13 @@ discard block |
||
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | 12 | // Exit if accessed directly |
| 13 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 13 | +if ( ! defined('ABSPATH')) { |
|
| 14 | 14 | exit; |
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | // Load WP_List_Table if not loaded |
| 18 | -if ( ! class_exists( 'WP_List_Table' ) ) { |
|
| 19 | - require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php'; |
|
| 18 | +if ( ! class_exists('WP_List_Table')) { |
|
| 19 | + require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php'; |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | /** |
@@ -62,11 +62,11 @@ discard block |
||
| 62 | 62 | global $status, $page; |
| 63 | 63 | |
| 64 | 64 | // Set parent defaults |
| 65 | - parent::__construct( array( |
|
| 66 | - 'singular' => esc_html__( 'Donor', 'give' ), // Singular name of the listed records |
|
| 67 | - 'plural' => esc_html__( 'Donors', 'give' ), // Plural name of the listed records |
|
| 65 | + parent::__construct(array( |
|
| 66 | + 'singular' => esc_html__('Donor', 'give'), // Singular name of the listed records |
|
| 67 | + 'plural' => esc_html__('Donors', 'give'), // Plural name of the listed records |
|
| 68 | 68 | 'ajax' => false // Does this table support ajax? |
| 69 | - ) ); |
|
| 69 | + )); |
|
| 70 | 70 | |
| 71 | 71 | } |
| 72 | 72 | |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | * |
| 84 | 84 | * @return false |
| 85 | 85 | */ |
| 86 | - public function search_box( $text, $input_id ) { |
|
| 86 | + public function search_box($text, $input_id) { |
|
| 87 | 87 | return; |
| 88 | 88 | } |
| 89 | 89 | |
@@ -98,20 +98,20 @@ discard block |
||
| 98 | 98 | * |
| 99 | 99 | * @return void |
| 100 | 100 | */ |
| 101 | - public function give_search_box( $text, $input_id ) { |
|
| 102 | - $input_id = $input_id . '-search-input'; |
|
| 101 | + public function give_search_box($text, $input_id) { |
|
| 102 | + $input_id = $input_id.'-search-input'; |
|
| 103 | 103 | |
| 104 | - if ( ! empty( $_REQUEST['orderby'] ) ) { |
|
| 105 | - echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />'; |
|
| 104 | + if ( ! empty($_REQUEST['orderby'])) { |
|
| 105 | + echo '<input type="hidden" name="orderby" value="'.esc_attr($_REQUEST['orderby']).'" />'; |
|
| 106 | 106 | } |
| 107 | - if ( ! empty( $_REQUEST['order'] ) ) { |
|
| 108 | - echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />'; |
|
| 107 | + if ( ! empty($_REQUEST['order'])) { |
|
| 108 | + echo '<input type="hidden" name="order" value="'.esc_attr($_REQUEST['order']).'" />'; |
|
| 109 | 109 | } |
| 110 | 110 | ?> |
| 111 | 111 | <p class="search-box donor-search"> |
| 112 | 112 | <label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label> |
| 113 | 113 | <input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" /> |
| 114 | - <?php submit_button( $text, 'button', false, false, array( 'ID' => 'search-submit' ) ); ?> |
|
| 114 | + <?php submit_button($text, 'button', false, false, array('ID' => 'search-submit')); ?> |
|
| 115 | 115 | </p> |
| 116 | 116 | <?php |
| 117 | 117 | } |
@@ -124,29 +124,29 @@ discard block |
||
| 124 | 124 | * |
| 125 | 125 | * @param string $which |
| 126 | 126 | */ |
| 127 | - protected function display_tablenav( $which ) { |
|
| 127 | + protected function display_tablenav($which) { |
|
| 128 | 128 | |
| 129 | - if ( 'top' == $which ) { |
|
| 130 | - wp_nonce_field( 'bulk-' . $this->_args['plural'] ); |
|
| 129 | + if ('top' == $which) { |
|
| 130 | + wp_nonce_field('bulk-'.$this->_args['plural']); |
|
| 131 | 131 | } |
| 132 | 132 | ?> |
| 133 | - <div class="tablenav give-clearfix <?php echo esc_attr( $which ); ?>"> |
|
| 133 | + <div class="tablenav give-clearfix <?php echo esc_attr($which); ?>"> |
|
| 134 | 134 | |
| 135 | - <h3 class="alignleft reports-earnings-title"><span><?php esc_html_e( 'Donors Report', 'give' ); ?></span></h3> |
|
| 135 | + <h3 class="alignleft reports-earnings-title"><span><?php esc_html_e('Donors Report', 'give'); ?></span></h3> |
|
| 136 | 136 | |
| 137 | 137 | <div class="alignright tablenav-right"> |
| 138 | 138 | <div class="actions bulkactions"> |
| 139 | 139 | <?php |
| 140 | - if ( 'top' == $which ) { |
|
| 141 | - $this->give_search_box( esc_html__( 'Search Donors', 'give' ), 'give-donors-report-search' ); |
|
| 140 | + if ('top' == $which) { |
|
| 141 | + $this->give_search_box(esc_html__('Search Donors', 'give'), 'give-donors-report-search'); |
|
| 142 | 142 | } |
| 143 | 143 | |
| 144 | - $this->bulk_actions( $which ); ?> |
|
| 144 | + $this->bulk_actions($which); ?> |
|
| 145 | 145 | |
| 146 | 146 | </div> |
| 147 | 147 | <?php |
| 148 | - $this->extra_tablenav( $which ); |
|
| 149 | - $this->pagination( $which ); |
|
| 148 | + $this->extra_tablenav($which); |
|
| 149 | + $this->pagination($which); |
|
| 150 | 150 | ?> |
| 151 | 151 | </div> |
| 152 | 152 | |
@@ -168,25 +168,25 @@ discard block |
||
| 168 | 168 | * |
| 169 | 169 | * @return string Column Name |
| 170 | 170 | */ |
| 171 | - public function column_default( $item, $column_name ) { |
|
| 172 | - switch ( $column_name ) { |
|
| 171 | + public function column_default($item, $column_name) { |
|
| 172 | + switch ($column_name) { |
|
| 173 | 173 | |
| 174 | 174 | case 'num_purchases' : |
| 175 | - $value = '<a href="' . |
|
| 176 | - admin_url( '/edit.php?post_type=give_forms&page=give-payment-history&user=' . urlencode( $item['email'] ) |
|
| 177 | - ) . '">' . esc_html( $item['num_purchases'] ) . '</a>'; |
|
| 175 | + $value = '<a href="'. |
|
| 176 | + admin_url('/edit.php?post_type=give_forms&page=give-payment-history&user='.urlencode($item['email']) |
|
| 177 | + ).'">'.esc_html($item['num_purchases']).'</a>'; |
|
| 178 | 178 | break; |
| 179 | 179 | |
| 180 | 180 | case 'amount_spent' : |
| 181 | - $value = give_currency_filter( give_format_amount( $item[ $column_name ] ) ); |
|
| 181 | + $value = give_currency_filter(give_format_amount($item[$column_name])); |
|
| 182 | 182 | break; |
| 183 | 183 | |
| 184 | 184 | default: |
| 185 | - $value = isset( $item[ $column_name ] ) ? $item[ $column_name ] : null; |
|
| 185 | + $value = isset($item[$column_name]) ? $item[$column_name] : null; |
|
| 186 | 186 | break; |
| 187 | 187 | } |
| 188 | 188 | |
| 189 | - return apply_filters( 'give_report_column_' . $column_name, $value, $item['id'] ); |
|
| 189 | + return apply_filters('give_report_column_'.$column_name, $value, $item['id']); |
|
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | /** |
@@ -198,14 +198,14 @@ discard block |
||
| 198 | 198 | */ |
| 199 | 199 | public function get_columns() { |
| 200 | 200 | $columns = array( |
| 201 | - 'name' => esc_html__( 'Name', 'give' ), |
|
| 202 | - 'id' => esc_html__( 'ID', 'give' ), |
|
| 203 | - 'email' => esc_html__( 'Email', 'give' ), |
|
| 204 | - 'num_purchases' => esc_html__( 'Purchases', 'give' ), |
|
| 205 | - 'amount_spent' => esc_html__( 'Total Spent', 'give' ) |
|
| 201 | + 'name' => esc_html__('Name', 'give'), |
|
| 202 | + 'id' => esc_html__('ID', 'give'), |
|
| 203 | + 'email' => esc_html__('Email', 'give'), |
|
| 204 | + 'num_purchases' => esc_html__('Purchases', 'give'), |
|
| 205 | + 'amount_spent' => esc_html__('Total Spent', 'give') |
|
| 206 | 206 | ); |
| 207 | 207 | |
| 208 | - return apply_filters( 'give_report_donor_columns', $columns ); |
|
| 208 | + return apply_filters('give_report_donor_columns', $columns); |
|
| 209 | 209 | |
| 210 | 210 | } |
| 211 | 211 | |
@@ -218,10 +218,10 @@ discard block |
||
| 218 | 218 | */ |
| 219 | 219 | public function get_sortable_columns() { |
| 220 | 220 | return array( |
| 221 | - 'id' => array( 'id', true ), |
|
| 222 | - 'name' => array( 'name', true ), |
|
| 223 | - 'num_purchases' => array( 'purchase_count', false ), |
|
| 224 | - 'amount_spent' => array( 'purchase_value', false ), |
|
| 221 | + 'id' => array('id', true), |
|
| 222 | + 'name' => array('name', true), |
|
| 223 | + 'num_purchases' => array('purchase_count', false), |
|
| 224 | + 'amount_spent' => array('purchase_value', false), |
|
| 225 | 225 | ); |
| 226 | 226 | } |
| 227 | 227 | |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | * @since 1.0 |
| 233 | 233 | * @return void |
| 234 | 234 | */ |
| 235 | - public function bulk_actions( $which = '' ) { |
|
| 235 | + public function bulk_actions($which = '') { |
|
| 236 | 236 | // These aren't really bulk actions but this outputs the markup in the right place |
| 237 | 237 | give_report_views(); |
| 238 | 238 | } |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | * @return int Current page number |
| 246 | 246 | */ |
| 247 | 247 | public function get_paged() { |
| 248 | - return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1; |
|
| 248 | + return isset($_GET['paged']) ? absint($_GET['paged']) : 1; |
|
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | /** |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | * @return mixed string If search is present, false otherwise |
| 257 | 257 | */ |
| 258 | 258 | public function get_search() { |
| 259 | - return ! empty( $_GET['s'] ) ? urldecode( trim( $_GET['s'] ) ) : false; |
|
| 259 | + return ! empty($_GET['s']) ? urldecode(trim($_GET['s'])) : false; |
|
| 260 | 260 | } |
| 261 | 261 | |
| 262 | 262 | /** |
@@ -273,10 +273,10 @@ discard block |
||
| 273 | 273 | |
| 274 | 274 | $data = array(); |
| 275 | 275 | $paged = $this->get_paged(); |
| 276 | - $offset = $this->per_page * ( $paged - 1 ); |
|
| 276 | + $offset = $this->per_page * ($paged - 1); |
|
| 277 | 277 | $search = $this->get_search(); |
| 278 | - $order = isset( $_GET['order'] ) ? sanitize_text_field( $_GET['order'] ) : 'DESC'; |
|
| 279 | - $orderby = isset( $_GET['orderby'] ) ? sanitize_text_field( $_GET['orderby'] ) : 'id'; |
|
| 278 | + $order = isset($_GET['order']) ? sanitize_text_field($_GET['order']) : 'DESC'; |
|
| 279 | + $orderby = isset($_GET['orderby']) ? sanitize_text_field($_GET['orderby']) : 'id'; |
|
| 280 | 280 | |
| 281 | 281 | $args = array( |
| 282 | 282 | 'number' => $this->per_page, |
@@ -285,21 +285,21 @@ discard block |
||
| 285 | 285 | 'orderby' => $orderby |
| 286 | 286 | ); |
| 287 | 287 | |
| 288 | - if ( is_email( $search ) ) { |
|
| 288 | + if (is_email($search)) { |
|
| 289 | 289 | $args['email'] = $search; |
| 290 | - } elseif ( is_numeric( $search ) ) { |
|
| 290 | + } elseif (is_numeric($search)) { |
|
| 291 | 291 | $args['id'] = $search; |
| 292 | 292 | } |
| 293 | 293 | |
| 294 | - $donors = Give()->customers->get_customers( $args ); |
|
| 294 | + $donors = Give()->customers->get_customers($args); |
|
| 295 | 295 | |
| 296 | - if ( $donors ) { |
|
| 296 | + if ($donors) { |
|
| 297 | 297 | |
| 298 | - $this->count = count( $donors ); |
|
| 298 | + $this->count = count($donors); |
|
| 299 | 299 | |
| 300 | - foreach ( $donors as $donor ) { |
|
| 300 | + foreach ($donors as $donor) { |
|
| 301 | 301 | |
| 302 | - $user_id = ! empty( $donor->user_id ) ? absint( $donor->user_id ) : 0; |
|
| 302 | + $user_id = ! empty($donor->user_id) ? absint($donor->user_id) : 0; |
|
| 303 | 303 | |
| 304 | 304 | $data[] = array( |
| 305 | 305 | 'id' => $donor->id, |
@@ -332,16 +332,16 @@ discard block |
||
| 332 | 332 | $hidden = array(); // No hidden columns |
| 333 | 333 | $sortable = $this->get_sortable_columns(); |
| 334 | 334 | |
| 335 | - $this->_column_headers = array( $columns, $hidden, $sortable ); |
|
| 335 | + $this->_column_headers = array($columns, $hidden, $sortable); |
|
| 336 | 336 | |
| 337 | 337 | $this->items = $this->reports_data(); |
| 338 | 338 | |
| 339 | 339 | $this->total = give_count_total_customers(); |
| 340 | 340 | |
| 341 | - $this->set_pagination_args( array( |
|
| 341 | + $this->set_pagination_args(array( |
|
| 342 | 342 | 'total_items' => $this->total, |
| 343 | 343 | 'per_page' => $this->per_page, |
| 344 | - 'total_pages' => ceil( $this->total / $this->per_page ) |
|
| 345 | - ) ); |
|
| 344 | + 'total_pages' => ceil($this->total / $this->per_page) |
|
| 345 | + )); |
|
| 346 | 346 | } |
| 347 | 347 | } |
| 348 | 348 | \ No newline at end of file |
@@ -10,13 +10,13 @@ discard block |
||
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | 12 | // Exit if accessed directly |
| 13 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 13 | +if ( ! defined('ABSPATH')) { |
|
| 14 | 14 | exit; |
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | // Load WP_List_Table if not loaded |
| 18 | -if ( ! class_exists( 'WP_List_Table' ) ) { |
|
| 19 | - require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php'; |
|
| 18 | +if ( ! class_exists('WP_List_Table')) { |
|
| 19 | + require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php'; |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | /** |
@@ -50,13 +50,13 @@ discard block |
||
| 50 | 50 | global $status, $page; |
| 51 | 51 | |
| 52 | 52 | // Set parent defaults |
| 53 | - parent::__construct( array( |
|
| 54 | - 'singular' => give_get_forms_label_singular(), // Singular name of the listed records |
|
| 55 | - 'plural' => give_get_forms_label_plural(), // Plural name of the listed records |
|
| 53 | + parent::__construct(array( |
|
| 54 | + 'singular' => give_get_forms_label_singular(), // Singular name of the listed records |
|
| 55 | + 'plural' => give_get_forms_label_plural(), // Plural name of the listed records |
|
| 56 | 56 | 'ajax' => false // Does this table support ajax? |
| 57 | - ) ); |
|
| 57 | + )); |
|
| 58 | 58 | |
| 59 | - add_action( 'give_report_view_actions', array( $this, 'category_filter' ) ); |
|
| 59 | + add_action('give_report_view_actions', array($this, 'category_filter')); |
|
| 60 | 60 | $this->query(); |
| 61 | 61 | |
| 62 | 62 | } |
@@ -72,18 +72,18 @@ discard block |
||
| 72 | 72 | * |
| 73 | 73 | * @return string Column Name |
| 74 | 74 | */ |
| 75 | - public function column_default( $item, $column_name ) { |
|
| 76 | - switch ( $column_name ) { |
|
| 75 | + public function column_default($item, $column_name) { |
|
| 76 | + switch ($column_name) { |
|
| 77 | 77 | case 'earnings' : |
| 78 | - return give_currency_filter( give_format_amount( $item[ $column_name ] ) ); |
|
| 78 | + return give_currency_filter(give_format_amount($item[$column_name])); |
|
| 79 | 79 | case 'average_sales' : |
| 80 | - return round( $item[ $column_name ] ); |
|
| 80 | + return round($item[$column_name]); |
|
| 81 | 81 | case 'average_earnings' : |
| 82 | - return give_currency_filter( give_format_amount( $item[ $column_name ] ) ); |
|
| 82 | + return give_currency_filter(give_format_amount($item[$column_name])); |
|
| 83 | 83 | case 'details' : |
| 84 | - return '<a href="' . admin_url( 'edit.php?post_type=give_forms&page=give-reports&view=forms&form-id=' . $item['ID'] ) . '">' . esc_html__( 'View Detailed Report', 'give' ) . '</a>'; |
|
| 84 | + return '<a href="'.admin_url('edit.php?post_type=give_forms&page=give-reports&view=forms&form-id='.$item['ID']).'">'.esc_html__('View Detailed Report', 'give').'</a>'; |
|
| 85 | 85 | default: |
| 86 | - return $item[ $column_name ]; |
|
| 86 | + return $item[$column_name]; |
|
| 87 | 87 | } |
| 88 | 88 | } |
| 89 | 89 | |
@@ -97,11 +97,11 @@ discard block |
||
| 97 | 97 | public function get_columns() { |
| 98 | 98 | $columns = array( |
| 99 | 99 | 'title' => give_get_forms_label_singular(), |
| 100 | - 'sales' => esc_html__( 'Donations', 'give' ), |
|
| 101 | - 'earnings' => esc_html__( 'Income', 'give' ), |
|
| 102 | - 'average_sales' => esc_html__( 'Monthly Average Donations', 'give' ), |
|
| 103 | - 'average_earnings' => esc_html__( 'Monthly Average Income', 'give' ), |
|
| 104 | - 'details' => esc_html__( 'Detailed Report', 'give' ) |
|
| 100 | + 'sales' => esc_html__('Donations', 'give'), |
|
| 101 | + 'earnings' => esc_html__('Income', 'give'), |
|
| 102 | + 'average_sales' => esc_html__('Monthly Average Donations', 'give'), |
|
| 103 | + 'average_earnings' => esc_html__('Monthly Average Income', 'give'), |
|
| 104 | + 'details' => esc_html__('Detailed Report', 'give') |
|
| 105 | 105 | ); |
| 106 | 106 | |
| 107 | 107 | return $columns; |
@@ -116,9 +116,9 @@ discard block |
||
| 116 | 116 | */ |
| 117 | 117 | public function get_sortable_columns() { |
| 118 | 118 | return array( |
| 119 | - 'title' => array( 'title', true ), |
|
| 120 | - 'sales' => array( 'sales', false ), |
|
| 121 | - 'earnings' => array( 'earnings', false ), |
|
| 119 | + 'title' => array('title', true), |
|
| 120 | + 'sales' => array('sales', false), |
|
| 121 | + 'earnings' => array('earnings', false), |
|
| 122 | 122 | ); |
| 123 | 123 | } |
| 124 | 124 | |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | * @return int Current page number |
| 131 | 131 | */ |
| 132 | 132 | public function get_paged() { |
| 133 | - return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1; |
|
| 133 | + return isset($_GET['paged']) ? absint($_GET['paged']) : 1; |
|
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | * @return int Category ID |
| 143 | 143 | */ |
| 144 | 144 | public function get_category() { |
| 145 | - return isset( $_GET['category'] ) ? absint( $_GET['category'] ) : 0; |
|
| 145 | + return isset($_GET['category']) ? absint($_GET['category']) : 0; |
|
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | |
@@ -155,8 +155,8 @@ discard block |
||
| 155 | 155 | */ |
| 156 | 156 | public function get_total_forms() { |
| 157 | 157 | $total = 0; |
| 158 | - $counts = wp_count_posts( 'give_forms', 'readable' ); |
|
| 159 | - foreach ( $counts as $status => $count ) { |
|
| 158 | + $counts = wp_count_posts('give_forms', 'readable'); |
|
| 159 | + foreach ($counts as $status => $count) { |
|
| 160 | 160 | $total += $count; |
| 161 | 161 | } |
| 162 | 162 | |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | * @since 1.0 |
| 171 | 171 | * @return void |
| 172 | 172 | */ |
| 173 | - public function bulk_actions( $which = '' ) { |
|
| 173 | + public function bulk_actions($which = '') { |
|
| 174 | 174 | // These aren't really bulk actions but this outputs the markup in the right place |
| 175 | 175 | give_report_views(); |
| 176 | 176 | } |
@@ -183,23 +183,23 @@ discard block |
||
| 183 | 183 | * |
| 184 | 184 | * @param string $which |
| 185 | 185 | */ |
| 186 | - protected function display_tablenav( $which ) { |
|
| 186 | + protected function display_tablenav($which) { |
|
| 187 | 187 | |
| 188 | - if ( 'top' == $which ) { |
|
| 189 | - wp_nonce_field( 'bulk-' . $this->_args['plural'] ); |
|
| 188 | + if ('top' == $which) { |
|
| 189 | + wp_nonce_field('bulk-'.$this->_args['plural']); |
|
| 190 | 190 | } |
| 191 | 191 | ?> |
| 192 | - <div class="tablenav give-clearfix <?php echo esc_attr( $which ); ?>"> |
|
| 192 | + <div class="tablenav give-clearfix <?php echo esc_attr($which); ?>"> |
|
| 193 | 193 | |
| 194 | - <h3 class="alignleft reports-earnings-title"><span><?php esc_html_e( 'Donation Forms Report', 'give' ); ?></span></h3> |
|
| 194 | + <h3 class="alignleft reports-earnings-title"><span><?php esc_html_e('Donation Forms Report', 'give'); ?></span></h3> |
|
| 195 | 195 | |
| 196 | 196 | <div class="alignright tablenav-right"> |
| 197 | 197 | <div class="actions bulkactions"> |
| 198 | - <?php $this->bulk_actions( $which ); ?> |
|
| 198 | + <?php $this->bulk_actions($which); ?> |
|
| 199 | 199 | </div> |
| 200 | 200 | <?php |
| 201 | - $this->extra_tablenav( $which ); |
|
| 202 | - $this->pagination( $which ); |
|
| 201 | + $this->extra_tablenav($which); |
|
| 202 | + $this->pagination($which); |
|
| 203 | 203 | ?> |
| 204 | 204 | </div> |
| 205 | 205 | |
@@ -219,9 +219,9 @@ discard block |
||
| 219 | 219 | */ |
| 220 | 220 | public function category_filter() { |
| 221 | 221 | |
| 222 | - $categories = get_terms( 'form_category' ); |
|
| 223 | - if ( $categories && ! is_wp_error( $categories ) ) { |
|
| 224 | - echo Give()->html->category_dropdown( 'category', $this->get_category() ); |
|
| 222 | + $categories = get_terms('form_category'); |
|
| 223 | + if ($categories && ! is_wp_error($categories)) { |
|
| 224 | + echo Give()->html->category_dropdown('category', $this->get_category()); |
|
| 225 | 225 | } |
| 226 | 226 | } |
| 227 | 227 | |
@@ -235,8 +235,8 @@ discard block |
||
| 235 | 235 | */ |
| 236 | 236 | public function query() { |
| 237 | 237 | |
| 238 | - $orderby = isset( $_GET['orderby'] ) ? $_GET['orderby'] : 'title'; |
|
| 239 | - $order = isset( $_GET['order'] ) ? $_GET['order'] : 'DESC'; |
|
| 238 | + $orderby = isset($_GET['orderby']) ? $_GET['orderby'] : 'title'; |
|
| 239 | + $order = isset($_GET['order']) ? $_GET['order'] : 'DESC'; |
|
| 240 | 240 | $category = $this->get_category(); |
| 241 | 241 | |
| 242 | 242 | $args = array( |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | 'suppress_filters' => true |
| 250 | 250 | ); |
| 251 | 251 | |
| 252 | - if ( ! empty( $category ) ) { |
|
| 252 | + if ( ! empty($category)) { |
|
| 253 | 253 | $args['tax_query'] = array( |
| 254 | 254 | array( |
| 255 | 255 | 'taxonomy' => 'form_category', |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | ); |
| 259 | 259 | } |
| 260 | 260 | |
| 261 | - switch ( $orderby ) : |
|
| 261 | + switch ($orderby) : |
|
| 262 | 262 | case 'title' : |
| 263 | 263 | $args['orderby'] = 'title'; |
| 264 | 264 | break; |
@@ -274,9 +274,9 @@ discard block |
||
| 274 | 274 | break; |
| 275 | 275 | endswitch; |
| 276 | 276 | |
| 277 | - $args = apply_filters( 'give_form_reports_prepare_items_args', $args, $this ); |
|
| 277 | + $args = apply_filters('give_form_reports_prepare_items_args', $args, $this); |
|
| 278 | 278 | |
| 279 | - $this->products = new WP_Query( $args ); |
|
| 279 | + $this->products = new WP_Query($args); |
|
| 280 | 280 | |
| 281 | 281 | } |
| 282 | 282 | |
@@ -292,15 +292,15 @@ discard block |
||
| 292 | 292 | |
| 293 | 293 | $give_forms = $this->products->posts; |
| 294 | 294 | |
| 295 | - if ( $give_forms ) { |
|
| 296 | - foreach ( $give_forms as $form ) { |
|
| 295 | + if ($give_forms) { |
|
| 296 | + foreach ($give_forms as $form) { |
|
| 297 | 297 | $reports_data[] = array( |
| 298 | 298 | 'ID' => $form, |
| 299 | - 'title' => get_the_title( $form ), |
|
| 300 | - 'sales' => give_get_form_sales_stats( $form ), |
|
| 301 | - 'earnings' => give_get_form_earnings_stats( $form ), |
|
| 302 | - 'average_sales' => give_get_average_monthly_form_sales( $form ), |
|
| 303 | - 'average_earnings' => give_get_average_monthly_form_earnings( $form ) |
|
| 299 | + 'title' => get_the_title($form), |
|
| 300 | + 'sales' => give_get_form_sales_stats($form), |
|
| 301 | + 'earnings' => give_get_form_earnings_stats($form), |
|
| 302 | + 'average_sales' => give_get_average_monthly_form_sales($form), |
|
| 303 | + 'average_earnings' => give_get_average_monthly_form_earnings($form) |
|
| 304 | 304 | ); |
| 305 | 305 | } |
| 306 | 306 | } |
@@ -328,7 +328,7 @@ discard block |
||
| 328 | 328 | |
| 329 | 329 | $sortable = $this->get_sortable_columns(); |
| 330 | 330 | |
| 331 | - $this->_column_headers = array( $columns, $hidden, $sortable ); |
|
| 331 | + $this->_column_headers = array($columns, $hidden, $sortable); |
|
| 332 | 332 | |
| 333 | 333 | $data = $this->reports_data(); |
| 334 | 334 | |
@@ -336,10 +336,10 @@ discard block |
||
| 336 | 336 | |
| 337 | 337 | $this->items = $data; |
| 338 | 338 | |
| 339 | - $this->set_pagination_args( array( |
|
| 339 | + $this->set_pagination_args(array( |
|
| 340 | 340 | 'total_items' => $total_items, |
| 341 | 341 | 'per_page' => $this->per_page, |
| 342 | - 'total_pages' => ceil( $total_items / $this->per_page ) |
|
| 342 | + 'total_pages' => ceil($total_items / $this->per_page) |
|
| 343 | 343 | ) |
| 344 | 344 | ); |
| 345 | 345 | } |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | 12 | // Exit if accessed directly |
| 13 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 13 | +if ( ! defined('ABSPATH')) { |
|
| 14 | 14 | exit; |
| 15 | 15 | } |
| 16 | 16 | |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | $dates = give_get_report_dates(); |
| 26 | 26 | |
| 27 | 27 | // Determine graph options |
| 28 | - switch ( $dates['range'] ) : |
|
| 28 | + switch ($dates['range']) : |
|
| 29 | 29 | case 'today' : |
| 30 | 30 | case 'yesterday' : |
| 31 | 31 | $day_by_day = true; |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | $day_by_day = false; |
| 38 | 38 | break; |
| 39 | 39 | case 'other' : |
| 40 | - if ( $dates['m_end'] - $dates['m_start'] >= 2 || $dates['year_end'] > $dates['year'] && ( $dates['m_start'] != '12' && $dates['m_end'] != '1' ) ) { |
|
| 40 | + if ($dates['m_end'] - $dates['m_start'] >= 2 || $dates['year_end'] > $dates['year'] && ($dates['m_start'] != '12' && $dates['m_end'] != '1')) { |
|
| 41 | 41 | $day_by_day = false; |
| 42 | 42 | } else { |
| 43 | 43 | $day_by_day = true; |
@@ -49,61 +49,61 @@ discard block |
||
| 49 | 49 | endswitch; |
| 50 | 50 | |
| 51 | 51 | $earnings_totals = 0.00; // Total earnings for time period shown |
| 52 | - $sales_totals = 0; // Total sales for time period shown |
|
| 52 | + $sales_totals = 0; // Total sales for time period shown |
|
| 53 | 53 | |
| 54 | 54 | $earnings_data = array(); |
| 55 | 55 | $sales_data = array(); |
| 56 | 56 | |
| 57 | - if ( $dates['range'] == 'today' || $dates['range'] == 'yesterday' ) { |
|
| 57 | + if ($dates['range'] == 'today' || $dates['range'] == 'yesterday') { |
|
| 58 | 58 | // Hour by hour |
| 59 | 59 | $hour = 1; |
| 60 | - $month = date( 'n', current_time( 'timestamp' ) ); |
|
| 61 | - while ( $hour <= 23 ) : |
|
| 60 | + $month = date('n', current_time('timestamp')); |
|
| 61 | + while ($hour <= 23) : |
|
| 62 | 62 | |
| 63 | - $sales = give_get_sales_by_date( $dates['day'], $month, $dates['year'], $hour ); |
|
| 64 | - $earnings = give_get_earnings_by_date( $dates['day'], $month, $dates['year'], $hour ); |
|
| 63 | + $sales = give_get_sales_by_date($dates['day'], $month, $dates['year'], $hour); |
|
| 64 | + $earnings = give_get_earnings_by_date($dates['day'], $month, $dates['year'], $hour); |
|
| 65 | 65 | |
| 66 | 66 | $sales_totals += $sales; |
| 67 | 67 | $earnings_totals += $earnings; |
| 68 | 68 | |
| 69 | - $date = mktime( $hour, 0, 0, $month, $dates['day'], $dates['year'] ) * 1000; |
|
| 70 | - $sales_data[] = array( $date, $sales ); |
|
| 71 | - $earnings_data[] = array( $date, $earnings ); |
|
| 69 | + $date = mktime($hour, 0, 0, $month, $dates['day'], $dates['year']) * 1000; |
|
| 70 | + $sales_data[] = array($date, $sales); |
|
| 71 | + $earnings_data[] = array($date, $earnings); |
|
| 72 | 72 | |
| 73 | - $hour ++; |
|
| 73 | + $hour++; |
|
| 74 | 74 | endwhile; |
| 75 | 75 | |
| 76 | - } elseif ( $dates['range'] == 'this_week' || $dates['range'] == 'last_week' ) { |
|
| 76 | + } elseif ($dates['range'] == 'this_week' || $dates['range'] == 'last_week') { |
|
| 77 | 77 | |
| 78 | 78 | // Day by day |
| 79 | 79 | $day = $dates['day']; |
| 80 | 80 | $day_end = $dates['day_end']; |
| 81 | 81 | $month = $dates['m_start']; |
| 82 | - while ( $day <= $day_end ) : |
|
| 83 | - $sales = give_get_sales_by_date( $day, $month, $dates['year'] ); |
|
| 82 | + while ($day <= $day_end) : |
|
| 83 | + $sales = give_get_sales_by_date($day, $month, $dates['year']); |
|
| 84 | 84 | $sales_totals += $sales; |
| 85 | 85 | |
| 86 | - $earnings = give_get_earnings_by_date( $day, $month, $dates['year'] ); |
|
| 86 | + $earnings = give_get_earnings_by_date($day, $month, $dates['year']); |
|
| 87 | 87 | $earnings_totals += $earnings; |
| 88 | 88 | |
| 89 | - $date = mktime( 0, 0, 0, $month, $day, $dates['year'] ) * 1000; |
|
| 90 | - $sales_data[] = array( $date, $sales ); |
|
| 91 | - $earnings_data[] = array( $date, $earnings ); |
|
| 92 | - $day ++; |
|
| 89 | + $date = mktime(0, 0, 0, $month, $day, $dates['year']) * 1000; |
|
| 90 | + $sales_data[] = array($date, $sales); |
|
| 91 | + $earnings_data[] = array($date, $earnings); |
|
| 92 | + $day++; |
|
| 93 | 93 | endwhile; |
| 94 | 94 | |
| 95 | 95 | } else { |
| 96 | 96 | |
| 97 | 97 | $y = $dates['year']; |
| 98 | - while ( $y <= $dates['year_end'] ) : |
|
| 98 | + while ($y <= $dates['year_end']) : |
|
| 99 | 99 | |
| 100 | - if ( $dates['year'] == $dates['year_end'] ) { |
|
| 100 | + if ($dates['year'] == $dates['year_end']) { |
|
| 101 | 101 | $month_start = $dates['m_start']; |
| 102 | 102 | $month_end = $dates['m_end']; |
| 103 | - } elseif ( $y == $dates['year'] ) { |
|
| 103 | + } elseif ($y == $dates['year']) { |
|
| 104 | 104 | $month_start = $dates['m_start']; |
| 105 | 105 | $month_end = 12; |
| 106 | - } elseif ( $y == $dates['year_end'] ) { |
|
| 106 | + } elseif ($y == $dates['year_end']) { |
|
| 107 | 107 | $month_start = 1; |
| 108 | 108 | $month_end = $dates['m_end']; |
| 109 | 109 | } else { |
@@ -112,48 +112,48 @@ discard block |
||
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | $i = $month_start; |
| 115 | - while ( $i <= $month_end ) : |
|
| 115 | + while ($i <= $month_end) : |
|
| 116 | 116 | |
| 117 | - if ( $day_by_day ) : |
|
| 117 | + if ($day_by_day) : |
|
| 118 | 118 | |
| 119 | - if ( $i == $month_end ) { |
|
| 119 | + if ($i == $month_end) { |
|
| 120 | 120 | |
| 121 | 121 | $num_of_days = $dates['day_end']; |
| 122 | 122 | |
| 123 | 123 | } else { |
| 124 | 124 | |
| 125 | - $num_of_days = cal_days_in_month( CAL_GREGORIAN, $i, $y ); |
|
| 125 | + $num_of_days = cal_days_in_month(CAL_GREGORIAN, $i, $y); |
|
| 126 | 126 | |
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | $d = $dates['day']; |
| 130 | 130 | |
| 131 | - while ( $d <= $num_of_days ) : |
|
| 131 | + while ($d <= $num_of_days) : |
|
| 132 | 132 | |
| 133 | - $sales = give_get_sales_by_date( $d, $i, $y ); |
|
| 133 | + $sales = give_get_sales_by_date($d, $i, $y); |
|
| 134 | 134 | $sales_totals += $sales; |
| 135 | 135 | |
| 136 | - $earnings = give_get_earnings_by_date( $d, $i, $y ); |
|
| 136 | + $earnings = give_get_earnings_by_date($d, $i, $y); |
|
| 137 | 137 | $earnings_totals += $earnings; |
| 138 | 138 | |
| 139 | - $date = mktime( 0, 0, 0, $i, $d, $y ) * 1000; |
|
| 140 | - $sales_data[] = array( $date, $sales ); |
|
| 141 | - $earnings_data[] = array( $date, $earnings ); |
|
| 142 | - $d ++; |
|
| 139 | + $date = mktime(0, 0, 0, $i, $d, $y) * 1000; |
|
| 140 | + $sales_data[] = array($date, $sales); |
|
| 141 | + $earnings_data[] = array($date, $earnings); |
|
| 142 | + $d++; |
|
| 143 | 143 | |
| 144 | 144 | endwhile; |
| 145 | 145 | |
| 146 | 146 | else : |
| 147 | 147 | |
| 148 | - $sales = give_get_sales_by_date( null, $i, $y ); |
|
| 148 | + $sales = give_get_sales_by_date(null, $i, $y); |
|
| 149 | 149 | $sales_totals += $sales; |
| 150 | 150 | |
| 151 | - $earnings = give_get_earnings_by_date( null, $i, $y ); |
|
| 151 | + $earnings = give_get_earnings_by_date(null, $i, $y); |
|
| 152 | 152 | $earnings_totals += $earnings; |
| 153 | 153 | |
| 154 | - if ( $i == $month_end ) { |
|
| 154 | + if ($i == $month_end) { |
|
| 155 | 155 | |
| 156 | - $num_of_days = cal_days_in_month( CAL_GREGORIAN, $i, $y ); |
|
| 156 | + $num_of_days = cal_days_in_month(CAL_GREGORIAN, $i, $y); |
|
| 157 | 157 | |
| 158 | 158 | } else { |
| 159 | 159 | |
@@ -161,24 +161,24 @@ discard block |
||
| 161 | 161 | |
| 162 | 162 | } |
| 163 | 163 | |
| 164 | - $date = mktime( 0, 0, 0, $i, $num_of_days, $y ) * 1000; |
|
| 165 | - $sales_data[] = array( $date, $sales ); |
|
| 166 | - $earnings_data[] = array( $date, $earnings ); |
|
| 164 | + $date = mktime(0, 0, 0, $i, $num_of_days, $y) * 1000; |
|
| 165 | + $sales_data[] = array($date, $sales); |
|
| 166 | + $earnings_data[] = array($date, $earnings); |
|
| 167 | 167 | |
| 168 | 168 | endif; |
| 169 | 169 | |
| 170 | - $i ++; |
|
| 170 | + $i++; |
|
| 171 | 171 | |
| 172 | 172 | endwhile; |
| 173 | 173 | |
| 174 | - $y ++; |
|
| 174 | + $y++; |
|
| 175 | 175 | endwhile; |
| 176 | 176 | |
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | $data = array( |
| 180 | - esc_html__( 'Income', 'give' ) => $earnings_data, |
|
| 181 | - esc_html__( 'Donations', 'give' ) => $sales_data |
|
| 180 | + esc_html__('Income', 'give') => $earnings_data, |
|
| 181 | + esc_html__('Donations', 'give') => $sales_data |
|
| 182 | 182 | ); |
| 183 | 183 | |
| 184 | 184 | // start our own output buffer |
@@ -190,12 +190,12 @@ discard block |
||
| 190 | 190 | <div class="postbox"> |
| 191 | 191 | <div class="inside"> |
| 192 | 192 | <?php |
| 193 | - $graph = new Give_Graph( $data ); |
|
| 194 | - $graph->set( 'x_mode', 'time' ); |
|
| 195 | - $graph->set( 'multiple_y_axes', true ); |
|
| 193 | + $graph = new Give_Graph($data); |
|
| 194 | + $graph->set('x_mode', 'time'); |
|
| 195 | + $graph->set('multiple_y_axes', true); |
|
| 196 | 196 | $graph->display(); |
| 197 | 197 | |
| 198 | - if ( 'this_month' == $dates['range'] ) { |
|
| 198 | + if ('this_month' == $dates['range']) { |
|
| 199 | 199 | $estimated = give_estimated_monthly_stats(); |
| 200 | 200 | } |
| 201 | 201 | ?> |
@@ -206,32 +206,32 @@ discard block |
||
| 206 | 206 | <tbody> |
| 207 | 207 | <tr> |
| 208 | 208 | <td class="row-title"> |
| 209 | - <label for="tablecell"><?php esc_html_e( 'Total income for period: ', 'give' ); ?></label></td> |
|
| 210 | - <td><?php echo give_currency_filter( give_format_amount( $earnings_totals ) ); ?></td> |
|
| 209 | + <label for="tablecell"><?php esc_html_e('Total income for period: ', 'give'); ?></label></td> |
|
| 210 | + <td><?php echo give_currency_filter(give_format_amount($earnings_totals)); ?></td> |
|
| 211 | 211 | </tr> |
| 212 | 212 | <tr class="alternate"> |
| 213 | 213 | <td class="row-title"> |
| 214 | - <label for="tablecell"><?php esc_html_e( 'Total donations for period shown: ', 'give' ); ?></label> |
|
| 214 | + <label for="tablecell"><?php esc_html_e('Total donations for period shown: ', 'give'); ?></label> |
|
| 215 | 215 | </td> |
| 216 | 216 | <td><?php echo $sales_totals; ?></td> |
| 217 | 217 | </tr> |
| 218 | - <?php if ( 'this_month' == $dates['range'] ) : ?> |
|
| 218 | + <?php if ('this_month' == $dates['range']) : ?> |
|
| 219 | 219 | <tr> |
| 220 | 220 | <td class="row-title"> |
| 221 | - <label for="tablecell"><?php esc_html_e( 'Estimated monthly income: ', 'give' ); ?></label> |
|
| 221 | + <label for="tablecell"><?php esc_html_e('Estimated monthly income: ', 'give'); ?></label> |
|
| 222 | 222 | </td> |
| 223 | - <td><?php echo give_currency_filter( give_format_amount( $estimated['earnings'] ) ); ?></td> |
|
| 223 | + <td><?php echo give_currency_filter(give_format_amount($estimated['earnings'])); ?></td> |
|
| 224 | 224 | </tr> |
| 225 | 225 | <tr class="alternate"> |
| 226 | 226 | <td class="row-title"> |
| 227 | - <label for="tablecell"><?php esc_html_e( 'Estimated monthly donations: ', 'give' ); ?></label> |
|
| 227 | + <label for="tablecell"><?php esc_html_e('Estimated monthly donations: ', 'give'); ?></label> |
|
| 228 | 228 | </td> |
| 229 | - <td><?php echo floor( $estimated['sales'] ); ?></td> |
|
| 229 | + <td><?php echo floor($estimated['sales']); ?></td> |
|
| 230 | 230 | </tr> |
| 231 | 231 | <?php endif; ?> |
| 232 | 232 | </table> |
| 233 | 233 | |
| 234 | - <?php do_action( 'give_reports_graph_additional_stats' ); ?> |
|
| 234 | + <?php do_action('give_reports_graph_additional_stats'); ?> |
|
| 235 | 235 | |
| 236 | 236 | </div> |
| 237 | 237 | </div> |
@@ -249,12 +249,12 @@ discard block |
||
| 249 | 249 | * @since 1.0 |
| 250 | 250 | * @return void |
| 251 | 251 | */ |
| 252 | -function give_reports_graph_of_form( $form_id = 0 ) { |
|
| 252 | +function give_reports_graph_of_form($form_id = 0) { |
|
| 253 | 253 | // Retrieve the queried dates |
| 254 | 254 | $dates = give_get_report_dates(); |
| 255 | 255 | |
| 256 | 256 | // Determine graph options |
| 257 | - switch ( $dates['range'] ) : |
|
| 257 | + switch ($dates['range']) : |
|
| 258 | 258 | case 'today' : |
| 259 | 259 | case 'yesterday' : |
| 260 | 260 | $day_by_day = true; |
@@ -272,7 +272,7 @@ discard block |
||
| 272 | 272 | $day_by_day = false; |
| 273 | 273 | break; |
| 274 | 274 | case 'other' : |
| 275 | - if ( $dates['m_end'] - $dates['m_start'] >= 2 || $dates['year_end'] > $dates['year'] ) { |
|
| 275 | + if ($dates['m_end'] - $dates['m_start'] >= 2 || $dates['year_end'] > $dates['year']) { |
|
| 276 | 276 | $day_by_day = false; |
| 277 | 277 | } else { |
| 278 | 278 | $day_by_day = true; |
@@ -284,75 +284,75 @@ discard block |
||
| 284 | 284 | endswitch; |
| 285 | 285 | |
| 286 | 286 | $earnings_totals = (float) 0.00; // Total earnings for time period shown |
| 287 | - $sales_totals = 0; // Total sales for time period shown |
|
| 287 | + $sales_totals = 0; // Total sales for time period shown |
|
| 288 | 288 | |
| 289 | 289 | $earnings_data = array(); |
| 290 | 290 | $sales_data = array(); |
| 291 | 291 | $stats = new Give_Payment_Stats; |
| 292 | 292 | |
| 293 | - if ( $dates['range'] == 'today' || $dates['range'] == 'yesterday' ) { |
|
| 293 | + if ($dates['range'] == 'today' || $dates['range'] == 'yesterday') { |
|
| 294 | 294 | |
| 295 | 295 | // Hour by hour |
| 296 | 296 | $month = $dates['m_start']; |
| 297 | 297 | $hour = 1; |
| 298 | 298 | $minute = 0; |
| 299 | 299 | $second = 0; |
| 300 | - while ( $hour <= 23 ) : |
|
| 300 | + while ($hour <= 23) : |
|
| 301 | 301 | |
| 302 | - if ( $hour == 23 ) { |
|
| 302 | + if ($hour == 23) { |
|
| 303 | 303 | $minute = $second = 59; |
| 304 | 304 | } |
| 305 | 305 | |
| 306 | - $date = mktime( $hour, $minute, $second, $month, $dates['day'], $dates['year'] ); |
|
| 307 | - $date_end = mktime( $hour + 1, $minute, $second, $month, $dates['day'], $dates['year'] ); |
|
| 306 | + $date = mktime($hour, $minute, $second, $month, $dates['day'], $dates['year']); |
|
| 307 | + $date_end = mktime($hour + 1, $minute, $second, $month, $dates['day'], $dates['year']); |
|
| 308 | 308 | |
| 309 | - $sales = $stats->get_sales( $form_id, $date, $date_end ); |
|
| 309 | + $sales = $stats->get_sales($form_id, $date, $date_end); |
|
| 310 | 310 | $sales_totals += $sales; |
| 311 | 311 | |
| 312 | - $earnings = $stats->get_earnings( $form_id, $date, $date_end ); |
|
| 312 | + $earnings = $stats->get_earnings($form_id, $date, $date_end); |
|
| 313 | 313 | $earnings_totals += $earnings; |
| 314 | 314 | |
| 315 | - $sales_data[] = array( $date * 1000, $sales ); |
|
| 316 | - $earnings_data[] = array( $date * 1000, $earnings ); |
|
| 315 | + $sales_data[] = array($date * 1000, $sales); |
|
| 316 | + $earnings_data[] = array($date * 1000, $earnings); |
|
| 317 | 317 | |
| 318 | - $hour ++; |
|
| 318 | + $hour++; |
|
| 319 | 319 | endwhile; |
| 320 | 320 | |
| 321 | - } elseif ( $dates['range'] == 'this_week' || $dates['range'] == 'last_week' ) { |
|
| 321 | + } elseif ($dates['range'] == 'this_week' || $dates['range'] == 'last_week') { |
|
| 322 | 322 | |
| 323 | 323 | //Day by day |
| 324 | 324 | $day = $dates['day']; |
| 325 | 325 | $day_end = $dates['day_end']; |
| 326 | 326 | $month = $dates['m_start']; |
| 327 | - while ( $day <= $day_end ) : |
|
| 327 | + while ($day <= $day_end) : |
|
| 328 | 328 | |
| 329 | - $date = mktime( 0, 0, 0, $month, $day, $dates['year'] ); |
|
| 330 | - $date_end = mktime( 0, 0, 0, $month, $day + 1, $dates['year'] ); |
|
| 331 | - $sales = $stats->get_sales( $form_id, $date, $date_end ); |
|
| 329 | + $date = mktime(0, 0, 0, $month, $day, $dates['year']); |
|
| 330 | + $date_end = mktime(0, 0, 0, $month, $day + 1, $dates['year']); |
|
| 331 | + $sales = $stats->get_sales($form_id, $date, $date_end); |
|
| 332 | 332 | $sales_totals += $sales; |
| 333 | 333 | |
| 334 | - $earnings = $stats->get_earnings( $form_id, $date, $date_end ); |
|
| 334 | + $earnings = $stats->get_earnings($form_id, $date, $date_end); |
|
| 335 | 335 | $earnings_totals += $earnings; |
| 336 | 336 | |
| 337 | - $sales_data[] = array( $date * 1000, $sales ); |
|
| 338 | - $earnings_data[] = array( $date * 1000, $earnings ); |
|
| 337 | + $sales_data[] = array($date * 1000, $sales); |
|
| 338 | + $earnings_data[] = array($date * 1000, $earnings); |
|
| 339 | 339 | |
| 340 | - $day ++; |
|
| 340 | + $day++; |
|
| 341 | 341 | endwhile; |
| 342 | 342 | |
| 343 | 343 | } else { |
| 344 | 344 | |
| 345 | 345 | $y = $dates['year']; |
| 346 | 346 | |
| 347 | - while ( $y <= $dates['year_end'] ) : |
|
| 347 | + while ($y <= $dates['year_end']) : |
|
| 348 | 348 | |
| 349 | 349 | $last_year = false; |
| 350 | 350 | |
| 351 | - if ( $dates['year'] == $dates['year_end'] ) { |
|
| 351 | + if ($dates['year'] == $dates['year_end']) { |
|
| 352 | 352 | $month_start = $dates['m_start']; |
| 353 | 353 | $month_end = $dates['m_end']; |
| 354 | 354 | $last_year = true; |
| 355 | - } elseif ( $y == $dates['year'] ) { |
|
| 355 | + } elseif ($y == $dates['year']) { |
|
| 356 | 356 | $month_start = $dates['m_start']; |
| 357 | 357 | $month_end = 12; |
| 358 | 358 | } else { |
@@ -361,75 +361,75 @@ discard block |
||
| 361 | 361 | } |
| 362 | 362 | |
| 363 | 363 | $i = $month_start; |
| 364 | - while ( $i <= $month_end ) : |
|
| 364 | + while ($i <= $month_end) : |
|
| 365 | 365 | |
| 366 | - if ( $day_by_day ) : |
|
| 366 | + if ($day_by_day) : |
|
| 367 | 367 | |
| 368 | - if ( $i == $month_end && $last_year ) { |
|
| 368 | + if ($i == $month_end && $last_year) { |
|
| 369 | 369 | |
| 370 | 370 | $num_of_days = $dates['day_end']; |
| 371 | 371 | |
| 372 | 372 | } else { |
| 373 | 373 | |
| 374 | - $num_of_days = cal_days_in_month( CAL_GREGORIAN, $i, $y ); |
|
| 374 | + $num_of_days = cal_days_in_month(CAL_GREGORIAN, $i, $y); |
|
| 375 | 375 | |
| 376 | 376 | } |
| 377 | 377 | |
| 378 | 378 | $d = $dates['day']; |
| 379 | - while ( $d <= $num_of_days ) : |
|
| 379 | + while ($d <= $num_of_days) : |
|
| 380 | 380 | |
| 381 | - $date = mktime( 0, 0, 0, $i, $d, $y ); |
|
| 382 | - $end_date = mktime( 23, 59, 59, $i, $d, $y ); |
|
| 381 | + $date = mktime(0, 0, 0, $i, $d, $y); |
|
| 382 | + $end_date = mktime(23, 59, 59, $i, $d, $y); |
|
| 383 | 383 | |
| 384 | - $sales = $stats->get_sales( $form_id, $date, $end_date ); |
|
| 384 | + $sales = $stats->get_sales($form_id, $date, $end_date); |
|
| 385 | 385 | $sales_totals += $sales; |
| 386 | 386 | |
| 387 | - $earnings = $stats->get_earnings( $form_id, $date, $end_date ); |
|
| 387 | + $earnings = $stats->get_earnings($form_id, $date, $end_date); |
|
| 388 | 388 | $earnings_totals += $earnings; |
| 389 | 389 | |
| 390 | - $sales_data[] = array( $date * 1000, $sales ); |
|
| 391 | - $earnings_data[] = array( $date * 1000, $earnings ); |
|
| 392 | - $d ++; |
|
| 390 | + $sales_data[] = array($date * 1000, $sales); |
|
| 391 | + $earnings_data[] = array($date * 1000, $earnings); |
|
| 392 | + $d++; |
|
| 393 | 393 | |
| 394 | 394 | endwhile; |
| 395 | 395 | |
| 396 | 396 | else : |
| 397 | 397 | |
| 398 | - $num_of_days = cal_days_in_month( CAL_GREGORIAN, $i, $y ); |
|
| 398 | + $num_of_days = cal_days_in_month(CAL_GREGORIAN, $i, $y); |
|
| 399 | 399 | |
| 400 | - $date = mktime( 0, 0, 0, $i, 1, $y ); |
|
| 401 | - $end_date = mktime( 23, 59, 59, $i, $num_of_days, $y ); |
|
| 400 | + $date = mktime(0, 0, 0, $i, 1, $y); |
|
| 401 | + $end_date = mktime(23, 59, 59, $i, $num_of_days, $y); |
|
| 402 | 402 | |
| 403 | - $sales = $stats->get_sales( $form_id, $date, $end_date ); |
|
| 403 | + $sales = $stats->get_sales($form_id, $date, $end_date); |
|
| 404 | 404 | $sales_totals += $sales; |
| 405 | 405 | |
| 406 | - $earnings = $stats->get_earnings( $form_id, $date, $end_date ); |
|
| 406 | + $earnings = $stats->get_earnings($form_id, $date, $end_date); |
|
| 407 | 407 | $earnings_totals += $earnings; |
| 408 | 408 | |
| 409 | - $sales_data[] = array( $date * 1000, $sales ); |
|
| 410 | - $earnings_data[] = array( $date * 1000, $earnings ); |
|
| 409 | + $sales_data[] = array($date * 1000, $sales); |
|
| 410 | + $earnings_data[] = array($date * 1000, $earnings); |
|
| 411 | 411 | endif; |
| 412 | 412 | |
| 413 | - $i ++; |
|
| 413 | + $i++; |
|
| 414 | 414 | |
| 415 | 415 | endwhile; |
| 416 | 416 | |
| 417 | - $y ++; |
|
| 417 | + $y++; |
|
| 418 | 418 | endwhile; |
| 419 | 419 | |
| 420 | 420 | } |
| 421 | 421 | |
| 422 | 422 | $data = array( |
| 423 | - esc_html__( 'Income', 'give' ) => $earnings_data, |
|
| 424 | - esc_html__( 'Donations', 'give' ) => $sales_data |
|
| 423 | + esc_html__('Income', 'give') => $earnings_data, |
|
| 424 | + esc_html__('Donations', 'give') => $sales_data |
|
| 425 | 425 | ); |
| 426 | 426 | |
| 427 | 427 | ?> |
| 428 | 428 | <h3><span><?php |
| 429 | 429 | printf( |
| 430 | 430 | /* translators: %s: form title */ |
| 431 | - esc_html__( 'Income Over Time for %s', 'give' ), |
|
| 432 | - get_the_title( $form_id ) |
|
| 431 | + esc_html__('Income Over Time for %s', 'give'), |
|
| 432 | + get_the_title($form_id) |
|
| 433 | 433 | ); |
| 434 | 434 | ?></span></h3> |
| 435 | 435 | |
@@ -437,9 +437,9 @@ discard block |
||
| 437 | 437 | <div class="postbox"> |
| 438 | 438 | <div class="inside"> |
| 439 | 439 | <?php |
| 440 | - $graph = new Give_Graph( $data ); |
|
| 441 | - $graph->set( 'x_mode', 'time' ); |
|
| 442 | - $graph->set( 'multiple_y_axes', true ); |
|
| 440 | + $graph = new Give_Graph($data); |
|
| 441 | + $graph->set('x_mode', 'time'); |
|
| 442 | + $graph->set('multiple_y_axes', true); |
|
| 443 | 443 | $graph->display(); |
| 444 | 444 | ?> |
| 445 | 445 | </div> |
@@ -449,26 +449,26 @@ discard block |
||
| 449 | 449 | <tbody> |
| 450 | 450 | <tr> |
| 451 | 451 | <td class="row-title"> |
| 452 | - <label for="tablecell"><?php esc_html_e( 'Total income for period: ', 'give' ); ?></label></td> |
|
| 453 | - <td><?php echo give_currency_filter( give_format_amount( $earnings_totals ) ); ?></td> |
|
| 452 | + <label for="tablecell"><?php esc_html_e('Total income for period: ', 'give'); ?></label></td> |
|
| 453 | + <td><?php echo give_currency_filter(give_format_amount($earnings_totals)); ?></td> |
|
| 454 | 454 | </tr> |
| 455 | 455 | <tr class="alternate"> |
| 456 | 456 | <td class="row-title"> |
| 457 | - <label for="tablecell"><?php esc_html_e( 'Total donations for period: ', 'give' ); ?></label> |
|
| 457 | + <label for="tablecell"><?php esc_html_e('Total donations for period: ', 'give'); ?></label> |
|
| 458 | 458 | </td> |
| 459 | 459 | <td><?php echo $sales_totals; ?></td> |
| 460 | 460 | </tr> |
| 461 | 461 | <tr> |
| 462 | 462 | <td class="row-title"> |
| 463 | - <label for="tablecell"><?php esc_html_e( 'Average monthly income: ', 'give' ); ?></label> |
|
| 463 | + <label for="tablecell"><?php esc_html_e('Average monthly income: ', 'give'); ?></label> |
|
| 464 | 464 | </td> |
| 465 | - <td><?php echo give_currency_filter( give_format_amount( give_get_average_monthly_form_earnings( $form_id ) ) ); ?></td> |
|
| 465 | + <td><?php echo give_currency_filter(give_format_amount(give_get_average_monthly_form_earnings($form_id))); ?></td> |
|
| 466 | 466 | </tr> |
| 467 | 467 | <tr class="alternate"> |
| 468 | 468 | <td class="row-title"> |
| 469 | - <label for="tablecell"><?php esc_html_e( 'Average monthly donations: ', 'give' ); ?></label> |
|
| 469 | + <label for="tablecell"><?php esc_html_e('Average monthly donations: ', 'give'); ?></label> |
|
| 470 | 470 | </td> |
| 471 | - <td><?php echo number_format( give_get_average_monthly_form_sales( $form_id ), 0 ); ?></td> |
|
| 471 | + <td><?php echo number_format(give_get_average_monthly_form_sales($form_id), 0); ?></td> |
|
| 472 | 472 | </tr> |
| 473 | 473 | </tbody> |
| 474 | 474 | </table> |
@@ -485,29 +485,29 @@ discard block |
||
| 485 | 485 | * @return void |
| 486 | 486 | */ |
| 487 | 487 | function give_reports_graph_controls() { |
| 488 | - $date_options = apply_filters( 'give_report_date_options', array( |
|
| 489 | - 'today' => esc_html__( 'Today', 'give' ), |
|
| 490 | - 'yesterday' => esc_html__( 'Yesterday', 'give' ), |
|
| 491 | - 'this_week' => esc_html__( 'This Week', 'give' ), |
|
| 492 | - 'last_week' => esc_html__( 'Last Week', 'give' ), |
|
| 493 | - 'this_month' => esc_html__( 'This Month', 'give' ), |
|
| 494 | - 'last_month' => esc_html__( 'Last Month', 'give' ), |
|
| 495 | - 'this_quarter' => esc_html__( 'This Quarter', 'give' ), |
|
| 496 | - 'last_quarter' => esc_html__( 'Last Quarter', 'give' ), |
|
| 497 | - 'this_year' => esc_html__( 'This Year', 'give' ), |
|
| 498 | - 'last_year' => esc_html__( 'Last Year', 'give' ), |
|
| 499 | - 'other' => esc_html__( 'Custom', 'give' ) |
|
| 500 | - ) ); |
|
| 488 | + $date_options = apply_filters('give_report_date_options', array( |
|
| 489 | + 'today' => esc_html__('Today', 'give'), |
|
| 490 | + 'yesterday' => esc_html__('Yesterday', 'give'), |
|
| 491 | + 'this_week' => esc_html__('This Week', 'give'), |
|
| 492 | + 'last_week' => esc_html__('Last Week', 'give'), |
|
| 493 | + 'this_month' => esc_html__('This Month', 'give'), |
|
| 494 | + 'last_month' => esc_html__('Last Month', 'give'), |
|
| 495 | + 'this_quarter' => esc_html__('This Quarter', 'give'), |
|
| 496 | + 'last_quarter' => esc_html__('Last Quarter', 'give'), |
|
| 497 | + 'this_year' => esc_html__('This Year', 'give'), |
|
| 498 | + 'last_year' => esc_html__('Last Year', 'give'), |
|
| 499 | + 'other' => esc_html__('Custom', 'give') |
|
| 500 | + )); |
|
| 501 | 501 | |
| 502 | 502 | $dates = give_get_report_dates(); |
| 503 | 503 | $display = $dates['range'] == 'other' ? '' : 'style="display:none;"'; |
| 504 | 504 | $view = give_get_reporting_view(); |
| 505 | 505 | |
| 506 | - if ( empty( $dates['day_end'] ) ) { |
|
| 507 | - $dates['day_end'] = cal_days_in_month( CAL_GREGORIAN, date( 'n' ), date( 'Y' ) ); |
|
| 506 | + if (empty($dates['day_end'])) { |
|
| 507 | + $dates['day_end'] = cal_days_in_month(CAL_GREGORIAN, date('n'), date('Y')); |
|
| 508 | 508 | } |
| 509 | 509 | |
| 510 | - do_action( 'give_report_graph_controls_before' ); |
|
| 510 | + do_action('give_report_graph_controls_before'); |
|
| 511 | 511 | ?> |
| 512 | 512 | <form id="give-graphs-filter" method="get" class="alignright"> |
| 513 | 513 | <div class="tablenav top alignright"> |
@@ -515,53 +515,53 @@ discard block |
||
| 515 | 515 | |
| 516 | 516 | <input type="hidden" name="post_type" value="give_forms" /> |
| 517 | 517 | <input type="hidden" name="page" value="give-reports" /> |
| 518 | - <input type="hidden" name="view" value="<?php echo esc_attr( $view ); ?>" /> |
|
| 518 | + <input type="hidden" name="view" value="<?php echo esc_attr($view); ?>" /> |
|
| 519 | 519 | |
| 520 | - <?php if ( isset( $_GET['form-id'] ) ) : ?> |
|
| 521 | - <input type="hidden" name="form-id" value="<?php echo absint( $_GET['form-id'] ); ?>" /> |
|
| 520 | + <?php if (isset($_GET['form-id'])) : ?> |
|
| 521 | + <input type="hidden" name="form-id" value="<?php echo absint($_GET['form-id']); ?>" /> |
|
| 522 | 522 | <?php endif; ?> |
| 523 | 523 | |
| 524 | 524 | <div id="give-graphs-date-options-wrap" class="alignright"> |
| 525 | 525 | <select id="give-graphs-date-options" name="range"> |
| 526 | - <?php foreach ( $date_options as $key => $option ) : ?> |
|
| 527 | - <option value="<?php echo esc_attr( $key ); ?>"<?php selected( $key, $dates['range'] ); ?>><?php echo esc_html( $option ); ?></option> |
|
| 526 | + <?php foreach ($date_options as $key => $option) : ?> |
|
| 527 | + <option value="<?php echo esc_attr($key); ?>"<?php selected($key, $dates['range']); ?>><?php echo esc_html($option); ?></option> |
|
| 528 | 528 | <?php endforeach; ?> |
| 529 | 529 | </select> |
| 530 | 530 | |
| 531 | - <input type="submit" class="button-secondary" value="<?php esc_attr_e( 'Filter', 'give' ); ?>" /> |
|
| 531 | + <input type="submit" class="button-secondary" value="<?php esc_attr_e('Filter', 'give'); ?>" /> |
|
| 532 | 532 | </div> |
| 533 | 533 | |
| 534 | 534 | <div id="give-date-range-options" <?php echo $display; ?>> |
| 535 | - <span><?php esc_html_e( 'From', 'give' ); ?> </span> |
|
| 535 | + <span><?php esc_html_e('From', 'give'); ?> </span> |
|
| 536 | 536 | <select id="give-graphs-month-start" name="m_start"> |
| 537 | - <?php for ( $i = 1; $i <= 12; $i ++ ) : ?> |
|
| 538 | - <option value="<?php echo absint( $i ); ?>" <?php selected( $i, $dates['m_start'] ); ?>><?php echo give_month_num_to_name( $i ); ?></option> |
|
| 537 | + <?php for ($i = 1; $i <= 12; $i++) : ?> |
|
| 538 | + <option value="<?php echo absint($i); ?>" <?php selected($i, $dates['m_start']); ?>><?php echo give_month_num_to_name($i); ?></option> |
|
| 539 | 539 | <?php endfor; ?> |
| 540 | 540 | </select> |
| 541 | 541 | <select id="give-graphs-day-start" name="day"> |
| 542 | - <?php for ( $i = 1; $i <= 31; $i ++ ) : ?> |
|
| 543 | - <option value="<?php echo absint( $i ); ?>" <?php selected( $i, $dates['day'] ); ?>><?php echo $i; ?></option> |
|
| 542 | + <?php for ($i = 1; $i <= 31; $i++) : ?> |
|
| 543 | + <option value="<?php echo absint($i); ?>" <?php selected($i, $dates['day']); ?>><?php echo $i; ?></option> |
|
| 544 | 544 | <?php endfor; ?> |
| 545 | 545 | </select> |
| 546 | 546 | <select id="give-graphs-year-start" name="year"> |
| 547 | - <?php for ( $i = 2007; $i <= date( 'Y' ); $i ++ ) : ?> |
|
| 548 | - <option value="<?php echo absint( $i ); ?>" <?php selected( $i, $dates['year'] ); ?>><?php echo $i; ?></option> |
|
| 547 | + <?php for ($i = 2007; $i <= date('Y'); $i++) : ?> |
|
| 548 | + <option value="<?php echo absint($i); ?>" <?php selected($i, $dates['year']); ?>><?php echo $i; ?></option> |
|
| 549 | 549 | <?php endfor; ?> |
| 550 | 550 | </select> |
| 551 | - <span><?php esc_html_e( 'To', 'give' ); ?> </span> |
|
| 551 | + <span><?php esc_html_e('To', 'give'); ?> </span> |
|
| 552 | 552 | <select id="give-graphs-month-end" name="m_end"> |
| 553 | - <?php for ( $i = 1; $i <= 12; $i ++ ) : ?> |
|
| 554 | - <option value="<?php echo absint( $i ); ?>" <?php selected( $i, $dates['m_end'] ); ?>><?php echo give_month_num_to_name( $i ); ?></option> |
|
| 553 | + <?php for ($i = 1; $i <= 12; $i++) : ?> |
|
| 554 | + <option value="<?php echo absint($i); ?>" <?php selected($i, $dates['m_end']); ?>><?php echo give_month_num_to_name($i); ?></option> |
|
| 555 | 555 | <?php endfor; ?> |
| 556 | 556 | </select> |
| 557 | 557 | <select id="give-graphs-day-end" name="day_end"> |
| 558 | - <?php for ( $i = 1; $i <= 31; $i ++ ) : ?> |
|
| 559 | - <option value="<?php echo absint( $i ); ?>" <?php selected( $i, $dates['day_end'] ); ?>><?php echo $i; ?></option> |
|
| 558 | + <?php for ($i = 1; $i <= 31; $i++) : ?> |
|
| 559 | + <option value="<?php echo absint($i); ?>" <?php selected($i, $dates['day_end']); ?>><?php echo $i; ?></option> |
|
| 560 | 560 | <?php endfor; ?> |
| 561 | 561 | </select> |
| 562 | 562 | <select id="give-graphs-year-end" name="year_end"> |
| 563 | - <?php for ( $i = 2007; $i <= date( 'Y' ); $i ++ ) : ?> |
|
| 564 | - <option value="<?php echo absint( $i ); ?>" <?php selected( $i, $dates['year_end'] ); ?>><?php echo $i; ?></option> |
|
| 563 | + <?php for ($i = 2007; $i <= date('Y'); $i++) : ?> |
|
| 564 | + <option value="<?php echo absint($i); ?>" <?php selected($i, $dates['year_end']); ?>><?php echo $i; ?></option> |
|
| 565 | 565 | <?php endfor; ?> |
| 566 | 566 | </select> |
| 567 | 567 | </div> |
@@ -571,7 +571,7 @@ discard block |
||
| 571 | 571 | </div> |
| 572 | 572 | </form> |
| 573 | 573 | <?php |
| 574 | - do_action( 'give_report_graph_controls_after' ); |
|
| 574 | + do_action('give_report_graph_controls_after'); |
|
| 575 | 575 | } |
| 576 | 576 | |
| 577 | 577 | /** |
@@ -586,65 +586,65 @@ discard block |
||
| 586 | 586 | function give_get_report_dates() { |
| 587 | 587 | $dates = array(); |
| 588 | 588 | |
| 589 | - $current_time = current_time( 'timestamp' ); |
|
| 589 | + $current_time = current_time('timestamp'); |
|
| 590 | 590 | |
| 591 | - $dates['range'] = isset( $_GET['range'] ) ? $_GET['range'] : 'this_month'; |
|
| 592 | - $dates['year'] = isset( $_GET['year'] ) ? $_GET['year'] : date( 'Y' ); |
|
| 593 | - $dates['year_end'] = isset( $_GET['year_end'] ) ? $_GET['year_end'] : date( 'Y' ); |
|
| 594 | - $dates['m_start'] = isset( $_GET['m_start'] ) ? $_GET['m_start'] : 1; |
|
| 595 | - $dates['m_end'] = isset( $_GET['m_end'] ) ? $_GET['m_end'] : 12; |
|
| 596 | - $dates['day'] = isset( $_GET['day'] ) ? $_GET['day'] : 1; |
|
| 597 | - $dates['day_end'] = isset( $_GET['day_end'] ) ? $_GET['day_end'] : cal_days_in_month( CAL_GREGORIAN, $dates['m_end'], $dates['year'] ); |
|
| 591 | + $dates['range'] = isset($_GET['range']) ? $_GET['range'] : 'this_month'; |
|
| 592 | + $dates['year'] = isset($_GET['year']) ? $_GET['year'] : date('Y'); |
|
| 593 | + $dates['year_end'] = isset($_GET['year_end']) ? $_GET['year_end'] : date('Y'); |
|
| 594 | + $dates['m_start'] = isset($_GET['m_start']) ? $_GET['m_start'] : 1; |
|
| 595 | + $dates['m_end'] = isset($_GET['m_end']) ? $_GET['m_end'] : 12; |
|
| 596 | + $dates['day'] = isset($_GET['day']) ? $_GET['day'] : 1; |
|
| 597 | + $dates['day_end'] = isset($_GET['day_end']) ? $_GET['day_end'] : cal_days_in_month(CAL_GREGORIAN, $dates['m_end'], $dates['year']); |
|
| 598 | 598 | |
| 599 | 599 | // Modify dates based on predefined ranges |
| 600 | - switch ( $dates['range'] ) : |
|
| 600 | + switch ($dates['range']) : |
|
| 601 | 601 | |
| 602 | 602 | case 'this_month' : |
| 603 | - $dates['m_start'] = date( 'n', $current_time ); |
|
| 604 | - $dates['m_end'] = date( 'n', $current_time ); |
|
| 603 | + $dates['m_start'] = date('n', $current_time); |
|
| 604 | + $dates['m_end'] = date('n', $current_time); |
|
| 605 | 605 | $dates['day'] = 1; |
| 606 | - $dates['day_end'] = cal_days_in_month( CAL_GREGORIAN, $dates['m_end'], $dates['year'] ); |
|
| 607 | - $dates['year'] = date( 'Y' ); |
|
| 608 | - $dates['year_end'] = date( 'Y' ); |
|
| 606 | + $dates['day_end'] = cal_days_in_month(CAL_GREGORIAN, $dates['m_end'], $dates['year']); |
|
| 607 | + $dates['year'] = date('Y'); |
|
| 608 | + $dates['year_end'] = date('Y'); |
|
| 609 | 609 | break; |
| 610 | 610 | |
| 611 | 611 | case 'last_month' : |
| 612 | - if ( date( 'n' ) == 1 ) { |
|
| 612 | + if (date('n') == 1) { |
|
| 613 | 613 | $dates['m_start'] = 12; |
| 614 | 614 | $dates['m_end'] = 12; |
| 615 | - $dates['year'] = date( 'Y', $current_time ) - 1; |
|
| 616 | - $dates['year_end'] = date( 'Y', $current_time ) - 1; |
|
| 615 | + $dates['year'] = date('Y', $current_time) - 1; |
|
| 616 | + $dates['year_end'] = date('Y', $current_time) - 1; |
|
| 617 | 617 | } else { |
| 618 | - $dates['m_start'] = date( 'n' ) - 1; |
|
| 619 | - $dates['m_end'] = date( 'n' ) - 1; |
|
| 618 | + $dates['m_start'] = date('n') - 1; |
|
| 619 | + $dates['m_end'] = date('n') - 1; |
|
| 620 | 620 | $dates['year_end'] = $dates['year']; |
| 621 | 621 | } |
| 622 | - $dates['day_end'] = cal_days_in_month( CAL_GREGORIAN, $dates['m_end'], $dates['year'] ); |
|
| 622 | + $dates['day_end'] = cal_days_in_month(CAL_GREGORIAN, $dates['m_end'], $dates['year']); |
|
| 623 | 623 | break; |
| 624 | 624 | |
| 625 | 625 | case 'today' : |
| 626 | - $dates['day'] = date( 'd', $current_time ); |
|
| 627 | - $dates['m_start'] = date( 'n', $current_time ); |
|
| 628 | - $dates['m_end'] = date( 'n', $current_time ); |
|
| 629 | - $dates['year'] = date( 'Y', $current_time ); |
|
| 626 | + $dates['day'] = date('d', $current_time); |
|
| 627 | + $dates['m_start'] = date('n', $current_time); |
|
| 628 | + $dates['m_end'] = date('n', $current_time); |
|
| 629 | + $dates['year'] = date('Y', $current_time); |
|
| 630 | 630 | break; |
| 631 | 631 | |
| 632 | 632 | case 'yesterday' : |
| 633 | 633 | |
| 634 | - $year = date( 'Y', $current_time ); |
|
| 635 | - $month = date( 'n', $current_time ); |
|
| 636 | - $day = date( 'd', $current_time ); |
|
| 634 | + $year = date('Y', $current_time); |
|
| 635 | + $month = date('n', $current_time); |
|
| 636 | + $day = date('d', $current_time); |
|
| 637 | 637 | |
| 638 | - if ( $month == 1 && $day == 1 ) { |
|
| 638 | + if ($month == 1 && $day == 1) { |
|
| 639 | 639 | |
| 640 | 640 | $year -= 1; |
| 641 | 641 | $month = 12; |
| 642 | - $day = cal_days_in_month( CAL_GREGORIAN, $month, $year ); |
|
| 642 | + $day = cal_days_in_month(CAL_GREGORIAN, $month, $year); |
|
| 643 | 643 | |
| 644 | - } elseif ( $month > 1 && $day == 1 ) { |
|
| 644 | + } elseif ($month > 1 && $day == 1) { |
|
| 645 | 645 | |
| 646 | 646 | $month -= 1; |
| 647 | - $day = cal_days_in_month( CAL_GREGORIAN, $month, $year ); |
|
| 647 | + $day = cal_days_in_month(CAL_GREGORIAN, $month, $year); |
|
| 648 | 648 | |
| 649 | 649 | } else { |
| 650 | 650 | |
@@ -660,91 +660,91 @@ discard block |
||
| 660 | 660 | break; |
| 661 | 661 | |
| 662 | 662 | case 'this_week' : |
| 663 | - $dates['day'] = date( 'd', $current_time - ( date( 'w', $current_time ) - 1 ) * 60 * 60 * 24 ) - 1; |
|
| 664 | - $dates['day'] += get_option( 'start_of_week' ); |
|
| 663 | + $dates['day'] = date('d', $current_time - (date('w', $current_time) - 1) * 60 * 60 * 24) - 1; |
|
| 664 | + $dates['day'] += get_option('start_of_week'); |
|
| 665 | 665 | $dates['day_end'] = $dates['day'] + 6; |
| 666 | - $dates['m_start'] = date( 'n', $current_time ); |
|
| 667 | - $dates['m_end'] = date( 'n', $current_time ); |
|
| 668 | - $dates['year'] = date( 'Y', $current_time ); |
|
| 666 | + $dates['m_start'] = date('n', $current_time); |
|
| 667 | + $dates['m_end'] = date('n', $current_time); |
|
| 668 | + $dates['year'] = date('Y', $current_time); |
|
| 669 | 669 | break; |
| 670 | 670 | |
| 671 | 671 | case 'last_week' : |
| 672 | - $dates['day'] = date( 'd', $current_time - ( date( 'w' ) - 1 ) * 60 * 60 * 24 ) - 8; |
|
| 673 | - $dates['day'] += get_option( 'start_of_week' ); |
|
| 672 | + $dates['day'] = date('d', $current_time - (date('w') - 1) * 60 * 60 * 24) - 8; |
|
| 673 | + $dates['day'] += get_option('start_of_week'); |
|
| 674 | 674 | $dates['day_end'] = $dates['day'] + 6; |
| 675 | - $dates['year'] = date( 'Y' ); |
|
| 676 | - |
|
| 677 | - if ( date( 'j', $current_time ) <= 7 ) { |
|
| 678 | - $dates['m_start'] = date( 'n', $current_time ) - 1; |
|
| 679 | - $dates['m_end'] = date( 'n', $current_time ) - 1; |
|
| 680 | - if ( $dates['m_start'] <= 1 ) { |
|
| 681 | - $dates['year'] = date( 'Y', $current_time ) - 1; |
|
| 682 | - $dates['year_end'] = date( 'Y', $current_time ) - 1; |
|
| 675 | + $dates['year'] = date('Y'); |
|
| 676 | + |
|
| 677 | + if (date('j', $current_time) <= 7) { |
|
| 678 | + $dates['m_start'] = date('n', $current_time) - 1; |
|
| 679 | + $dates['m_end'] = date('n', $current_time) - 1; |
|
| 680 | + if ($dates['m_start'] <= 1) { |
|
| 681 | + $dates['year'] = date('Y', $current_time) - 1; |
|
| 682 | + $dates['year_end'] = date('Y', $current_time) - 1; |
|
| 683 | 683 | } |
| 684 | 684 | } else { |
| 685 | - $dates['m_start'] = date( 'n', $current_time ); |
|
| 686 | - $dates['m_end'] = date( 'n', $current_time ); |
|
| 685 | + $dates['m_start'] = date('n', $current_time); |
|
| 686 | + $dates['m_end'] = date('n', $current_time); |
|
| 687 | 687 | } |
| 688 | 688 | break; |
| 689 | 689 | |
| 690 | 690 | case 'this_quarter' : |
| 691 | - $month_now = date( 'n', $current_time ); |
|
| 691 | + $month_now = date('n', $current_time); |
|
| 692 | 692 | |
| 693 | - if ( $month_now <= 3 ) { |
|
| 693 | + if ($month_now <= 3) { |
|
| 694 | 694 | |
| 695 | 695 | $dates['m_start'] = 1; |
| 696 | 696 | $dates['m_end'] = 4; |
| 697 | - $dates['year'] = date( 'Y', $current_time ); |
|
| 697 | + $dates['year'] = date('Y', $current_time); |
|
| 698 | 698 | |
| 699 | - } else if ( $month_now <= 6 ) { |
|
| 699 | + } else if ($month_now <= 6) { |
|
| 700 | 700 | |
| 701 | 701 | $dates['m_start'] = 4; |
| 702 | 702 | $dates['m_end'] = 7; |
| 703 | - $dates['year'] = date( 'Y', $current_time ); |
|
| 703 | + $dates['year'] = date('Y', $current_time); |
|
| 704 | 704 | |
| 705 | - } else if ( $month_now <= 9 ) { |
|
| 705 | + } else if ($month_now <= 9) { |
|
| 706 | 706 | |
| 707 | 707 | $dates['m_start'] = 7; |
| 708 | 708 | $dates['m_end'] = 10; |
| 709 | - $dates['year'] = date( 'Y', $current_time ); |
|
| 709 | + $dates['year'] = date('Y', $current_time); |
|
| 710 | 710 | |
| 711 | 711 | } else { |
| 712 | 712 | |
| 713 | 713 | $dates['m_start'] = 10; |
| 714 | 714 | $dates['m_end'] = 1; |
| 715 | - $dates['year'] = date( 'Y', $current_time ); |
|
| 716 | - $dates['year_end'] = date( 'Y', $current_time ) + 1; |
|
| 715 | + $dates['year'] = date('Y', $current_time); |
|
| 716 | + $dates['year_end'] = date('Y', $current_time) + 1; |
|
| 717 | 717 | |
| 718 | 718 | } |
| 719 | 719 | break; |
| 720 | 720 | |
| 721 | 721 | case 'last_quarter' : |
| 722 | - $month_now = date( 'n' ); |
|
| 722 | + $month_now = date('n'); |
|
| 723 | 723 | |
| 724 | - if ( $month_now <= 3 ) { |
|
| 724 | + if ($month_now <= 3) { |
|
| 725 | 725 | |
| 726 | 726 | $dates['m_start'] = 10; |
| 727 | 727 | $dates['m_end'] = 12; |
| 728 | - $dates['year'] = date( 'Y', $current_time ) - 1; // Previous year |
|
| 729 | - $dates['year_end'] = date( 'Y', $current_time ) - 1; // Previous year |
|
| 728 | + $dates['year'] = date('Y', $current_time) - 1; // Previous year |
|
| 729 | + $dates['year_end'] = date('Y', $current_time) - 1; // Previous year |
|
| 730 | 730 | |
| 731 | - } else if ( $month_now <= 6 ) { |
|
| 731 | + } else if ($month_now <= 6) { |
|
| 732 | 732 | |
| 733 | 733 | $dates['m_start'] = 1; |
| 734 | 734 | $dates['m_end'] = 3; |
| 735 | - $dates['year'] = date( 'Y', $current_time ); |
|
| 735 | + $dates['year'] = date('Y', $current_time); |
|
| 736 | 736 | |
| 737 | - } else if ( $month_now <= 9 ) { |
|
| 737 | + } else if ($month_now <= 9) { |
|
| 738 | 738 | |
| 739 | 739 | $dates['m_start'] = 4; |
| 740 | 740 | $dates['m_end'] = 6; |
| 741 | - $dates['year'] = date( 'Y', $current_time ); |
|
| 741 | + $dates['year'] = date('Y', $current_time); |
|
| 742 | 742 | |
| 743 | 743 | } else { |
| 744 | 744 | |
| 745 | 745 | $dates['m_start'] = 7; |
| 746 | 746 | $dates['m_end'] = 9; |
| 747 | - $dates['year'] = date( 'Y', $current_time ); |
|
| 747 | + $dates['year'] = date('Y', $current_time); |
|
| 748 | 748 | |
| 749 | 749 | } |
| 750 | 750 | break; |
@@ -752,19 +752,19 @@ discard block |
||
| 752 | 752 | case 'this_year' : |
| 753 | 753 | $dates['m_start'] = 1; |
| 754 | 754 | $dates['m_end'] = 12; |
| 755 | - $dates['year'] = date( 'Y', $current_time ); |
|
| 755 | + $dates['year'] = date('Y', $current_time); |
|
| 756 | 756 | break; |
| 757 | 757 | |
| 758 | 758 | case 'last_year' : |
| 759 | 759 | $dates['m_start'] = 1; |
| 760 | 760 | $dates['m_end'] = 12; |
| 761 | - $dates['year'] = date( 'Y', $current_time ) - 1; |
|
| 762 | - $dates['year_end'] = date( 'Y', $current_time ) - 1; |
|
| 761 | + $dates['year'] = date('Y', $current_time) - 1; |
|
| 762 | + $dates['year_end'] = date('Y', $current_time) - 1; |
|
| 763 | 763 | break; |
| 764 | 764 | |
| 765 | 765 | endswitch; |
| 766 | 766 | |
| 767 | - return apply_filters( 'give_report_dates', $dates ); |
|
| 767 | + return apply_filters('give_report_dates', $dates); |
|
| 768 | 768 | } |
| 769 | 769 | |
| 770 | 770 | /** |
@@ -774,17 +774,17 @@ discard block |
||
| 774 | 774 | * |
| 775 | 775 | * @param $data |
| 776 | 776 | */ |
| 777 | -function give_parse_report_dates( $data ) { |
|
| 777 | +function give_parse_report_dates($data) { |
|
| 778 | 778 | $dates = give_get_report_dates(); |
| 779 | 779 | |
| 780 | 780 | $view = give_get_reporting_view(); |
| 781 | - $id = isset( $_GET['form-id'] ) ? $_GET['form-id'] : null; |
|
| 781 | + $id = isset($_GET['form-id']) ? $_GET['form-id'] : null; |
|
| 782 | 782 | |
| 783 | - wp_redirect( add_query_arg( $dates, admin_url( 'edit.php?post_type=give_forms&page=give-reports&view=' . esc_attr( $view ) . '&form-id=' . absint( $id ) ) ) ); |
|
| 783 | + wp_redirect(add_query_arg($dates, admin_url('edit.php?post_type=give_forms&page=give-reports&view='.esc_attr($view).'&form-id='.absint($id)))); |
|
| 784 | 784 | give_die(); |
| 785 | 785 | } |
| 786 | 786 | |
| 787 | -add_action( 'give_filter_reports', 'give_parse_report_dates' ); |
|
| 787 | +add_action('give_filter_reports', 'give_parse_report_dates'); |
|
| 788 | 788 | |
| 789 | 789 | |
| 790 | 790 | /** |
@@ -796,16 +796,16 @@ discard block |
||
| 796 | 796 | */ |
| 797 | 797 | function give_reports_refresh_button() { |
| 798 | 798 | |
| 799 | - $url = wp_nonce_url( add_query_arg( array( |
|
| 799 | + $url = wp_nonce_url(add_query_arg(array( |
|
| 800 | 800 | 'give_action' => 'refresh_reports_transients', |
| 801 | 801 | 'give-message' => 'refreshed-reports' |
| 802 | - ) ), 'give-refresh-reports' ); |
|
| 802 | + )), 'give-refresh-reports'); |
|
| 803 | 803 | |
| 804 | - echo '<a href="' . $url . '" data-tooltip="' . esc_attr__( 'Clicking this will clear the reports cache.', 'give' ) . '" data-tooltip-my-position="right center" data-tooltip-target-position="left center" class="button alignright give-refresh-reports-button give-tooltip">' . esc_html__( 'Refresh Reports', 'give' ) . '</a>'; |
|
| 804 | + echo '<a href="'.$url.'" data-tooltip="'.esc_attr__('Clicking this will clear the reports cache.', 'give').'" data-tooltip-my-position="right center" data-tooltip-target-position="left center" class="button alignright give-refresh-reports-button give-tooltip">'.esc_html__('Refresh Reports', 'give').'</a>'; |
|
| 805 | 805 | |
| 806 | 806 | } |
| 807 | 807 | |
| 808 | -add_action( 'give_reports_graph_additional_stats', 'give_reports_refresh_button' ); |
|
| 808 | +add_action('give_reports_graph_additional_stats', 'give_reports_refresh_button'); |
|
| 809 | 809 | |
| 810 | 810 | /** |
| 811 | 811 | * Trigger the refresh of reports transients |
@@ -816,18 +816,18 @@ discard block |
||
| 816 | 816 | * |
| 817 | 817 | * @return void |
| 818 | 818 | */ |
| 819 | -function give_run_refresh_reports_transients( $data ) { |
|
| 819 | +function give_run_refresh_reports_transients($data) { |
|
| 820 | 820 | |
| 821 | - if ( ! wp_verify_nonce( $data['_wpnonce'], 'give-refresh-reports' ) ) { |
|
| 821 | + if ( ! wp_verify_nonce($data['_wpnonce'], 'give-refresh-reports')) { |
|
| 822 | 822 | return; |
| 823 | 823 | } |
| 824 | 824 | |
| 825 | 825 | //Delete transients |
| 826 | - delete_transient( 'give_estimated_monthly_stats' ); |
|
| 827 | - delete_transient( 'give_earnings_total' ); |
|
| 828 | - delete_transient( md5( 'give_earnings_this_monththis_month' ) ); |
|
| 829 | - delete_transient( md5( 'give_earnings_todaytoday' ) ); |
|
| 826 | + delete_transient('give_estimated_monthly_stats'); |
|
| 827 | + delete_transient('give_earnings_total'); |
|
| 828 | + delete_transient(md5('give_earnings_this_monththis_month')); |
|
| 829 | + delete_transient(md5('give_earnings_todaytoday')); |
|
| 830 | 830 | |
| 831 | 831 | } |
| 832 | 832 | |
| 833 | -add_action( 'give_refresh_reports_transients', 'give_run_refresh_reports_transients' ); |
|
| 834 | 833 | \ No newline at end of file |
| 834 | +add_action('give_refresh_reports_transients', 'give_run_refresh_reports_transients'); |
|
| 835 | 835 | \ No newline at end of file |
@@ -9,13 +9,13 @@ discard block |
||
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | 11 | // Exit if accessed directly |
| 12 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 12 | +if ( ! defined('ABSPATH')) { |
|
| 13 | 13 | exit; |
| 14 | 14 | } |
| 15 | 15 | |
| 16 | 16 | // Load WP_List_Table if not loaded |
| 17 | -if ( ! class_exists( 'WP_List_Table' ) ) { |
|
| 18 | - require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php'; |
|
| 17 | +if ( ! class_exists('WP_List_Table')) { |
|
| 18 | + require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php'; |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | /** |
@@ -44,13 +44,13 @@ discard block |
||
| 44 | 44 | global $status, $page; |
| 45 | 45 | |
| 46 | 46 | // Set parent defaults |
| 47 | - parent::__construct( array( |
|
| 48 | - 'singular' => give_get_forms_label_singular(), // Singular name of the listed records |
|
| 49 | - 'plural' => give_get_forms_label_plural(), // Plural name of the listed records |
|
| 47 | + parent::__construct(array( |
|
| 48 | + 'singular' => give_get_forms_label_singular(), // Singular name of the listed records |
|
| 49 | + 'plural' => give_get_forms_label_plural(), // Plural name of the listed records |
|
| 50 | 50 | 'ajax' => false // Does this table support ajax? |
| 51 | - ) ); |
|
| 51 | + )); |
|
| 52 | 52 | |
| 53 | - add_action( 'give_log_view_actions', array( $this, 'give_forms_filter' ) ); |
|
| 53 | + add_action('give_log_view_actions', array($this, 'give_forms_filter')); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | /** |
@@ -64,37 +64,37 @@ discard block |
||
| 64 | 64 | * |
| 65 | 65 | * @return string Column Name |
| 66 | 66 | */ |
| 67 | - public function column_default( $item, $column_name ) { |
|
| 67 | + public function column_default($item, $column_name) { |
|
| 68 | 68 | |
| 69 | - $payment = give_get_payment_by( 'id', $item['payment_id'] ); |
|
| 69 | + $payment = give_get_payment_by('id', $item['payment_id']); |
|
| 70 | 70 | |
| 71 | - switch ( $column_name ) { |
|
| 71 | + switch ($column_name) { |
|
| 72 | 72 | case 'form' : |
| 73 | - return '<a href="' . esc_url( add_query_arg( 'form', $item[ $column_name ] ) ) . '" >' . get_the_title( $item[ $column_name ] ) . '</a>'; |
|
| 73 | + return '<a href="'.esc_url(add_query_arg('form', $item[$column_name])).'" >'.get_the_title($item[$column_name]).'</a>'; |
|
| 74 | 74 | |
| 75 | 75 | case 'user_id' : |
| 76 | - return '<a href="' . |
|
| 77 | - admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&user=' . ( ! empty( $item['user_id'] ) ? urlencode( $item['user_id'] ) : give_get_payment_user_email( $item['payment_id'] ) ) ) . |
|
| 78 | - '">' . $item['user_name'] . '</a>'; |
|
| 76 | + return '<a href="'. |
|
| 77 | + admin_url('edit.php?post_type=give_forms&page=give-payment-history&user='.( ! empty($item['user_id']) ? urlencode($item['user_id']) : give_get_payment_user_email($item['payment_id']))). |
|
| 78 | + '">'.$item['user_name'].'</a>'; |
|
| 79 | 79 | |
| 80 | 80 | case 'amount' : |
| 81 | - return give_currency_filter( give_format_amount( $item['amount'] ) ); |
|
| 81 | + return give_currency_filter(give_format_amount($item['amount'])); |
|
| 82 | 82 | |
| 83 | 83 | case 'status' : |
| 84 | 84 | |
| 85 | - $value = '<div class="give-donation-status status-' . sanitize_title( give_get_payment_status( $payment, true ) ) . '"><span class="give-donation-status-icon"></span> ' . give_get_payment_status( $payment, true ) . '</div>'; |
|
| 85 | + $value = '<div class="give-donation-status status-'.sanitize_title(give_get_payment_status($payment, true)).'"><span class="give-donation-status-icon"></span> '.give_get_payment_status($payment, true).'</div>'; |
|
| 86 | 86 | |
| 87 | - if ( $payment->mode == 'test' ) { |
|
| 88 | - $value .= ' <span class="give-item-label give-item-label-orange give-test-mode-transactions-label" data-tooltip="' . esc_attr__( 'This payment was made in test mode', 'give' ) . '">' . esc_html__( 'Test', 'give' ) . '</span>'; |
|
| 87 | + if ($payment->mode == 'test') { |
|
| 88 | + $value .= ' <span class="give-item-label give-item-label-orange give-test-mode-transactions-label" data-tooltip="'.esc_attr__('This payment was made in test mode', 'give').'">'.esc_html__('Test', 'give').'</span>'; |
|
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | return $value; |
| 92 | 92 | |
| 93 | 93 | case 'payment_id' : |
| 94 | - return '<a href="' . admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&id=' . $item['payment_id'] ) . '">' . give_get_payment_number( $item['payment_id'] ) . '</a>'; |
|
| 94 | + return '<a href="'.admin_url('edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&id='.$item['payment_id']).'">'.give_get_payment_number($item['payment_id']).'</a>'; |
|
| 95 | 95 | |
| 96 | 96 | default: |
| 97 | - return $item[ $column_name ]; |
|
| 97 | + return $item[$column_name]; |
|
| 98 | 98 | } |
| 99 | 99 | } |
| 100 | 100 | |
@@ -107,13 +107,13 @@ discard block |
||
| 107 | 107 | */ |
| 108 | 108 | public function get_columns() { |
| 109 | 109 | $columns = array( |
| 110 | - 'ID' => esc_html__( 'Log ID', 'give' ), |
|
| 111 | - 'user_id' => esc_html__( 'Donor', 'give' ), |
|
| 110 | + 'ID' => esc_html__('Log ID', 'give'), |
|
| 111 | + 'user_id' => esc_html__('Donor', 'give'), |
|
| 112 | 112 | 'form' => give_get_forms_label_singular(), |
| 113 | - 'amount' => esc_html__( 'Donation Amount', 'give' ), |
|
| 114 | - 'status' => esc_html__( 'Status', 'give' ), |
|
| 115 | - 'payment_id' => esc_html__( 'Transaction ID', 'give' ), |
|
| 116 | - 'date' => esc_html__( 'Date', 'give' ) |
|
| 113 | + 'amount' => esc_html__('Donation Amount', 'give'), |
|
| 114 | + 'status' => esc_html__('Status', 'give'), |
|
| 115 | + 'payment_id' => esc_html__('Transaction ID', 'give'), |
|
| 116 | + 'date' => esc_html__('Date', 'give') |
|
| 117 | 117 | ); |
| 118 | 118 | |
| 119 | 119 | return $columns; |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | * @return int Current page number |
| 128 | 128 | */ |
| 129 | 129 | public function get_paged() { |
| 130 | - return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1; |
|
| 130 | + return isset($_GET['paged']) ? absint($_GET['paged']) : 1; |
|
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | /** |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | * @return mixed int If User ID, string If Email/Login |
| 139 | 139 | */ |
| 140 | 140 | public function get_filtered_user() { |
| 141 | - return isset( $_GET['user'] ) ? absint( $_GET['user'] ) : false; |
|
| 141 | + return isset($_GET['user']) ? absint($_GET['user']) : false; |
|
| 142 | 142 | } |
| 143 | 143 | |
| 144 | 144 | /** |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | * @return int Download ID |
| 150 | 150 | */ |
| 151 | 151 | public function get_filtered_give_form() { |
| 152 | - return ! empty( $_GET['form'] ) ? absint( $_GET['form'] ) : false; |
|
| 152 | + return ! empty($_GET['form']) ? absint($_GET['form']) : false; |
|
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | /** |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | * @return mixed string If search is present, false otherwise |
| 161 | 161 | */ |
| 162 | 162 | public function get_search() { |
| 163 | - return ! empty( $_GET['s'] ) ? urldecode( trim( $_GET['s'] ) ) : false; |
|
| 163 | + return ! empty($_GET['s']) ? urldecode(trim($_GET['s'])) : false; |
|
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | |
@@ -176,20 +176,20 @@ discard block |
||
| 176 | 176 | * |
| 177 | 177 | * @param string $which |
| 178 | 178 | */ |
| 179 | - protected function display_tablenav( $which ) { |
|
| 179 | + protected function display_tablenav($which) { |
|
| 180 | 180 | |
| 181 | - if ( 'top' === $which ) { |
|
| 182 | - wp_nonce_field( 'bulk-' . $this->_args['plural'] ); |
|
| 181 | + if ('top' === $which) { |
|
| 182 | + wp_nonce_field('bulk-'.$this->_args['plural']); |
|
| 183 | 183 | } |
| 184 | 184 | ?> |
| 185 | - <div class="tablenav <?php echo esc_attr( $which ); ?>"> |
|
| 185 | + <div class="tablenav <?php echo esc_attr($which); ?>"> |
|
| 186 | 186 | |
| 187 | 187 | <div class="alignleft actions bulkactions"> |
| 188 | - <?php $this->bulk_actions( $which ); ?> |
|
| 188 | + <?php $this->bulk_actions($which); ?> |
|
| 189 | 189 | </div> |
| 190 | 190 | <?php |
| 191 | - $this->extra_tablenav( $which ); |
|
| 192 | - $this->pagination( $which ); |
|
| 191 | + $this->extra_tablenav($which); |
|
| 192 | + $this->pagination($which); |
|
| 193 | 193 | ?> |
| 194 | 194 | |
| 195 | 195 | <br class="clear"/> |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | |
| 213 | 213 | $meta_query = array(); |
| 214 | 214 | |
| 215 | - if ( $user ) { |
|
| 215 | + if ($user) { |
|
| 216 | 216 | // Show only logs from a specific user |
| 217 | 217 | $meta_query[] = array( |
| 218 | 218 | 'key' => '_give_log_user_id', |
@@ -221,8 +221,8 @@ discard block |
||
| 221 | 221 | } |
| 222 | 222 | |
| 223 | 223 | $search = $this->get_search(); |
| 224 | - if ( $search ) { |
|
| 225 | - if ( is_email( $search ) ) { |
|
| 224 | + if ($search) { |
|
| 225 | + if (is_email($search)) { |
|
| 226 | 226 | // This is an email search. We use this to ensure it works for guest users and logged-in users |
| 227 | 227 | $key = '_give_log_user_info'; |
| 228 | 228 | $compare = 'LIKE'; |
@@ -231,32 +231,32 @@ discard block |
||
| 231 | 231 | $key = '_give_log_user_id'; |
| 232 | 232 | $compare = 'LIKE'; |
| 233 | 233 | |
| 234 | - if ( ! is_numeric( $search ) ) { |
|
| 234 | + if ( ! is_numeric($search)) { |
|
| 235 | 235 | // Searching for user by username |
| 236 | - $user = get_user_by( 'login', $search ); |
|
| 236 | + $user = get_user_by('login', $search); |
|
| 237 | 237 | |
| 238 | - if ( $user ) { |
|
| 238 | + if ($user) { |
|
| 239 | 239 | // Found one, set meta value to user's ID |
| 240 | 240 | $search = $user->ID; |
| 241 | 241 | } else { |
| 242 | 242 | // No user found so let's do a real search query |
| 243 | - $users = new WP_User_Query( array( |
|
| 243 | + $users = new WP_User_Query(array( |
|
| 244 | 244 | 'search' => $search, |
| 245 | - 'search_columns' => array( 'user_url', 'user_nicename' ), |
|
| 245 | + 'search_columns' => array('user_url', 'user_nicename'), |
|
| 246 | 246 | 'number' => 1, |
| 247 | 247 | 'fields' => 'ids' |
| 248 | - ) ); |
|
| 248 | + )); |
|
| 249 | 249 | |
| 250 | 250 | $found_user = $users->get_results(); |
| 251 | 251 | |
| 252 | - if ( $found_user ) { |
|
| 252 | + if ($found_user) { |
|
| 253 | 253 | $search = $found_user[0]; |
| 254 | 254 | } |
| 255 | 255 | } |
| 256 | 256 | } |
| 257 | 257 | } |
| 258 | 258 | |
| 259 | - if ( ! $this->file_search ) { |
|
| 259 | + if ( ! $this->file_search) { |
|
| 260 | 260 | // Meta query only works for non file name searche |
| 261 | 261 | $meta_query[] = array( |
| 262 | 262 | 'key' => $key, |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | * @since 1.0 |
| 278 | 278 | * @return void |
| 279 | 279 | */ |
| 280 | - function bulk_actions( $which = '' ) { |
|
| 280 | + function bulk_actions($which = '') { |
|
| 281 | 281 | give_log_views(); |
| 282 | 282 | } |
| 283 | 283 | |
@@ -289,22 +289,22 @@ discard block |
||
| 289 | 289 | * @return void |
| 290 | 290 | */ |
| 291 | 291 | public function give_forms_filter() { |
| 292 | - $give_forms = get_posts( array( |
|
| 292 | + $give_forms = get_posts(array( |
|
| 293 | 293 | 'post_type' => 'give_forms', |
| 294 | 294 | 'post_status' => 'any', |
| 295 | - 'posts_per_page' => - 1, |
|
| 295 | + 'posts_per_page' => -1, |
|
| 296 | 296 | 'orderby' => 'title', |
| 297 | 297 | 'order' => 'ASC', |
| 298 | 298 | 'fields' => 'ids', |
| 299 | 299 | 'update_post_meta_cache' => false, |
| 300 | 300 | 'update_post_term_cache' => false |
| 301 | - ) ); |
|
| 301 | + )); |
|
| 302 | 302 | |
| 303 | - if ( $give_forms ) { |
|
| 303 | + if ($give_forms) { |
|
| 304 | 304 | echo '<select name="form" id="give-log-form-filter">'; |
| 305 | - echo '<option value="0">' . esc_html__( 'All', 'give' ) . '</option>'; |
|
| 306 | - foreach ( $give_forms as $form ) { |
|
| 307 | - echo '<option value="' . $form . '"' . selected( $form, $this->get_filtered_give_form() ) . '>' . esc_html( get_the_title( $form ) ) . '</option>'; |
|
| 305 | + echo '<option value="0">'.esc_html__('All', 'give').'</option>'; |
|
| 306 | + foreach ($give_forms as $form) { |
|
| 307 | + echo '<option value="'.$form.'"'.selected($form, $this->get_filtered_give_form()).'>'.esc_html(get_the_title($form)).'</option>'; |
|
| 308 | 308 | } |
| 309 | 309 | echo '</select>'; |
| 310 | 310 | } |
@@ -322,11 +322,11 @@ discard block |
||
| 322 | 322 | global $give_logs; |
| 323 | 323 | |
| 324 | 324 | // Prevent the queries from getting cached. Without this there are occasional memory issues for some installs |
| 325 | - wp_suspend_cache_addition( true ); |
|
| 325 | + wp_suspend_cache_addition(true); |
|
| 326 | 326 | |
| 327 | 327 | $logs_data = array(); |
| 328 | 328 | $paged = $this->get_paged(); |
| 329 | - $give_form = empty( $_GET['s'] ) ? $this->get_filtered_give_form() : null; |
|
| 329 | + $give_form = empty($_GET['s']) ? $this->get_filtered_give_form() : null; |
|
| 330 | 330 | $user = $this->get_filtered_user(); |
| 331 | 331 | |
| 332 | 332 | $log_query = array( |
@@ -336,26 +336,26 @@ discard block |
||
| 336 | 336 | 'meta_query' => $this->get_meta_query() |
| 337 | 337 | ); |
| 338 | 338 | |
| 339 | - $logs = $give_logs->get_connected_logs( $log_query ); |
|
| 339 | + $logs = $give_logs->get_connected_logs($log_query); |
|
| 340 | 340 | |
| 341 | - if ( $logs ) { |
|
| 342 | - foreach ( $logs as $log ) { |
|
| 343 | - $payment_id = get_post_meta( $log->ID, '_give_log_payment_id', true ); |
|
| 341 | + if ($logs) { |
|
| 342 | + foreach ($logs as $log) { |
|
| 343 | + $payment_id = get_post_meta($log->ID, '_give_log_payment_id', true); |
|
| 344 | 344 | |
| 345 | 345 | // Make sure this payment hasn't been deleted |
| 346 | - if ( get_post( $payment_id ) ) : |
|
| 347 | - $user_info = give_get_payment_meta_user_info( $payment_id ); |
|
| 348 | - $payment_meta = give_get_payment_meta( $payment_id ); |
|
| 349 | - $payment_amount = give_get_payment_amount( $payment_id ); |
|
| 346 | + if (get_post($payment_id)) : |
|
| 347 | + $user_info = give_get_payment_meta_user_info($payment_id); |
|
| 348 | + $payment_meta = give_get_payment_meta($payment_id); |
|
| 349 | + $payment_amount = give_get_payment_amount($payment_id); |
|
| 350 | 350 | |
| 351 | 351 | $logs_data[] = array( |
| 352 | - 'ID' => '<span class="give-item-label give-item-label-gray">' . $log->ID . '</span>', |
|
| 352 | + 'ID' => '<span class="give-item-label give-item-label-gray">'.$log->ID.'</span>', |
|
| 353 | 353 | 'payment_id' => $payment_id, |
| 354 | 354 | 'form' => $log->post_parent, |
| 355 | 355 | 'amount' => $payment_amount, |
| 356 | 356 | 'user_id' => $user_info['id'], |
| 357 | - 'user_name' => $user_info['first_name'] . ' ' . $user_info['last_name'], |
|
| 358 | - 'date' => get_post_field( 'post_date', $payment_id ) |
|
| 357 | + 'user_name' => $user_info['first_name'].' '.$user_info['last_name'], |
|
| 358 | + 'date' => get_post_field('post_date', $payment_id) |
|
| 359 | 359 | ); |
| 360 | 360 | |
| 361 | 361 | endif; |
@@ -384,15 +384,15 @@ discard block |
||
| 384 | 384 | $columns = $this->get_columns(); |
| 385 | 385 | $hidden = array(); |
| 386 | 386 | $sortable = $this->get_sortable_columns(); |
| 387 | - $this->_column_headers = array( $columns, $hidden, $sortable ); |
|
| 387 | + $this->_column_headers = array($columns, $hidden, $sortable); |
|
| 388 | 388 | $current_page = $this->get_pagenum(); |
| 389 | 389 | $this->items = $this->get_logs(); |
| 390 | - $total_items = $give_logs->get_log_count( $this->get_filtered_give_form(), 'sale', $this->get_meta_query() ); |
|
| 390 | + $total_items = $give_logs->get_log_count($this->get_filtered_give_form(), 'sale', $this->get_meta_query()); |
|
| 391 | 391 | |
| 392 | - $this->set_pagination_args( array( |
|
| 392 | + $this->set_pagination_args(array( |
|
| 393 | 393 | 'total_items' => $total_items, |
| 394 | 394 | 'per_page' => $this->per_page, |
| 395 | - 'total_pages' => ceil( $total_items / $this->per_page ) |
|
| 395 | + 'total_pages' => ceil($total_items / $this->per_page) |
|
| 396 | 396 | ) |
| 397 | 397 | ); |
| 398 | 398 | } |
@@ -10,13 +10,13 @@ discard block |
||
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | 12 | // Exit if accessed directly |
| 13 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 13 | +if ( ! defined('ABSPATH')) { |
|
| 14 | 14 | exit; |
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | // Load WP_List_Table if not loaded |
| 18 | -if ( ! class_exists( 'WP_List_Table' ) ) { |
|
| 19 | - require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php'; |
|
| 18 | +if ( ! class_exists('WP_List_Table')) { |
|
| 19 | + require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php'; |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | /** |
@@ -45,11 +45,11 @@ discard block |
||
| 45 | 45 | global $status, $page; |
| 46 | 46 | |
| 47 | 47 | // Set parent defaults |
| 48 | - parent::__construct( array( |
|
| 49 | - 'singular' => give_get_forms_label_singular(), // Singular name of the listed records |
|
| 50 | - 'plural' => give_get_forms_label_plural(), // Plural name of the listed records |
|
| 48 | + parent::__construct(array( |
|
| 49 | + 'singular' => give_get_forms_label_singular(), // Singular name of the listed records |
|
| 50 | + 'plural' => give_get_forms_label_plural(), // Plural name of the listed records |
|
| 51 | 51 | 'ajax' => false // Does this table support ajax? |
| 52 | - ) ); |
|
| 52 | + )); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | /** |
@@ -63,20 +63,20 @@ discard block |
||
| 63 | 63 | * |
| 64 | 64 | * @return void |
| 65 | 65 | */ |
| 66 | - public function search_box( $text, $input_id ) { |
|
| 67 | - $input_id = $input_id . '-search-input'; |
|
| 66 | + public function search_box($text, $input_id) { |
|
| 67 | + $input_id = $input_id.'-search-input'; |
|
| 68 | 68 | |
| 69 | - if ( ! empty( $_REQUEST['orderby'] ) ) { |
|
| 70 | - echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />'; |
|
| 69 | + if ( ! empty($_REQUEST['orderby'])) { |
|
| 70 | + echo '<input type="hidden" name="orderby" value="'.esc_attr($_REQUEST['orderby']).'" />'; |
|
| 71 | 71 | } |
| 72 | - if ( ! empty( $_REQUEST['order'] ) ) { |
|
| 73 | - echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />'; |
|
| 72 | + if ( ! empty($_REQUEST['order'])) { |
|
| 73 | + echo '<input type="hidden" name="order" value="'.esc_attr($_REQUEST['order']).'" />'; |
|
| 74 | 74 | } |
| 75 | 75 | ?> |
| 76 | 76 | <p class="search-box"> |
| 77 | 77 | <label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label> |
| 78 | 78 | <input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" /> |
| 79 | - <?php submit_button( $text, 'button', false, false, array( 'ID' => 'search-submit' ) ); ?> |
|
| 79 | + <?php submit_button($text, 'button', false, false, array('ID' => 'search-submit')); ?> |
|
| 80 | 80 | </p> |
| 81 | 81 | <?php |
| 82 | 82 | } |
@@ -90,10 +90,10 @@ discard block |
||
| 90 | 90 | */ |
| 91 | 91 | public function get_columns() { |
| 92 | 92 | $columns = array( |
| 93 | - 'ID' => esc_html__( 'Log ID', 'give' ), |
|
| 94 | - 'details' => esc_html__( 'Request Details', 'give' ), |
|
| 95 | - 'ip' => esc_html__( 'Request IP', 'give' ), |
|
| 96 | - 'date' => esc_html__( 'Date', 'give' ) |
|
| 93 | + 'ID' => esc_html__('Log ID', 'give'), |
|
| 94 | + 'details' => esc_html__('Request Details', 'give'), |
|
| 95 | + 'ip' => esc_html__('Request IP', 'give'), |
|
| 96 | + 'date' => esc_html__('Date', 'give') |
|
| 97 | 97 | ); |
| 98 | 98 | |
| 99 | 99 | return $columns; |
@@ -110,10 +110,10 @@ discard block |
||
| 110 | 110 | * |
| 111 | 111 | * @return string Column Name |
| 112 | 112 | */ |
| 113 | - public function column_default( $item, $column_name ) { |
|
| 114 | - switch ( $column_name ) { |
|
| 113 | + public function column_default($item, $column_name) { |
|
| 114 | + switch ($column_name) { |
|
| 115 | 115 | default: |
| 116 | - return $item[ $column_name ]; |
|
| 116 | + return $item[$column_name]; |
|
| 117 | 117 | } |
| 118 | 118 | } |
| 119 | 119 | |
@@ -127,26 +127,26 @@ discard block |
||
| 127 | 127 | * |
| 128 | 128 | * @return void |
| 129 | 129 | */ |
| 130 | - public function column_details( $item ) { |
|
| 130 | + public function column_details($item) { |
|
| 131 | 131 | ?> |
| 132 | - <a href="#TB_inline?width=640&inlineId=log-details-<?php echo $item['ID']; ?>" class="thickbox" title="<?php esc_attr_e( 'View Request Details', 'give' ); ?> "><?php esc_html_e( 'View Request', 'give' ); ?></a> |
|
| 132 | + <a href="#TB_inline?width=640&inlineId=log-details-<?php echo $item['ID']; ?>" class="thickbox" title="<?php esc_attr_e('View Request Details', 'give'); ?> "><?php esc_html_e('View Request', 'give'); ?></a> |
|
| 133 | 133 | <div id="log-details-<?php echo $item['ID']; ?>" style="display:none;"> |
| 134 | 134 | <?php |
| 135 | 135 | |
| 136 | - $request = get_post_field( 'post_excerpt', $item['ID'] ); |
|
| 137 | - $error = get_post_field( 'post_content', $item['ID'] ); |
|
| 138 | - echo '<p><strong>' . esc_html__( 'API Request:', 'give' ) . '</strong></p>'; |
|
| 139 | - echo '<div>' . $request . '</div>'; |
|
| 140 | - if ( ! empty( $error ) ) { |
|
| 141 | - echo '<p><strong>' . esc_html__( 'Error', 'give' ) . '</strong></p>'; |
|
| 142 | - echo '<div>' . esc_html( $error ) . '</div>'; |
|
| 136 | + $request = get_post_field('post_excerpt', $item['ID']); |
|
| 137 | + $error = get_post_field('post_content', $item['ID']); |
|
| 138 | + echo '<p><strong>'.esc_html__('API Request:', 'give').'</strong></p>'; |
|
| 139 | + echo '<div>'.$request.'</div>'; |
|
| 140 | + if ( ! empty($error)) { |
|
| 141 | + echo '<p><strong>'.esc_html__('Error', 'give').'</strong></p>'; |
|
| 142 | + echo '<div>'.esc_html($error).'</div>'; |
|
| 143 | 143 | } |
| 144 | - echo '<p><strong>' . esc_html__( 'API User:', 'give' ) . '</strong></p>'; |
|
| 145 | - echo '<div>' . get_post_meta( $item['ID'], '_give_log_user', true ) . '</div>'; |
|
| 146 | - echo '<p><strong>' . esc_html__( 'API Key:', 'give' ) . '</strong></p>'; |
|
| 147 | - echo '<div>' . get_post_meta( $item['ID'], '_give_log_key', true ) . '</div>'; |
|
| 148 | - echo '<p><strong>' . esc_html__( 'Request Date:', 'give' ) . '</strong></p>'; |
|
| 149 | - echo '<div>' . get_post_field( 'post_date', $item['ID'] ) . '</div>'; |
|
| 144 | + echo '<p><strong>'.esc_html__('API User:', 'give').'</strong></p>'; |
|
| 145 | + echo '<div>'.get_post_meta($item['ID'], '_give_log_user', true).'</div>'; |
|
| 146 | + echo '<p><strong>'.esc_html__('API Key:', 'give').'</strong></p>'; |
|
| 147 | + echo '<div>'.get_post_meta($item['ID'], '_give_log_key', true).'</div>'; |
|
| 148 | + echo '<p><strong>'.esc_html__('Request Date:', 'give').'</strong></p>'; |
|
| 149 | + echo '<div>'.get_post_field('post_date', $item['ID']).'</div>'; |
|
| 150 | 150 | ?> |
| 151 | 151 | </div> |
| 152 | 152 | <?php |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | * @return mixed String if search is present, false otherwise |
| 161 | 161 | */ |
| 162 | 162 | public function get_search() { |
| 163 | - return ! empty( $_GET['s'] ) ? urldecode( trim( $_GET['s'] ) ) : false; |
|
| 163 | + return ! empty($_GET['s']) ? urldecode(trim($_GET['s'])) : false; |
|
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | |
@@ -176,19 +176,19 @@ discard block |
||
| 176 | 176 | * |
| 177 | 177 | * @param string $which |
| 178 | 178 | */ |
| 179 | - protected function display_tablenav( $which ) { |
|
| 180 | - if ( 'top' === $which ) { |
|
| 181 | - wp_nonce_field( 'bulk-' . $this->_args['plural'] ); |
|
| 179 | + protected function display_tablenav($which) { |
|
| 180 | + if ('top' === $which) { |
|
| 181 | + wp_nonce_field('bulk-'.$this->_args['plural']); |
|
| 182 | 182 | } |
| 183 | 183 | ?> |
| 184 | - <div class="tablenav <?php echo esc_attr( $which ); ?>"> |
|
| 184 | + <div class="tablenav <?php echo esc_attr($which); ?>"> |
|
| 185 | 185 | |
| 186 | 186 | <div class="alignleft actions bulkactions"> |
| 187 | - <?php $this->bulk_actions( $which ); ?> |
|
| 187 | + <?php $this->bulk_actions($which); ?> |
|
| 188 | 188 | </div> |
| 189 | 189 | <?php |
| 190 | - $this->extra_tablenav( $which ); |
|
| 191 | - $this->pagination( $which ); |
|
| 190 | + $this->extra_tablenav($which); |
|
| 191 | + $this->pagination($which); |
|
| 192 | 192 | ?> |
| 193 | 193 | |
| 194 | 194 | <br class="clear"/> |
@@ -210,31 +210,31 @@ discard block |
||
| 210 | 210 | |
| 211 | 211 | $search = $this->get_search(); |
| 212 | 212 | |
| 213 | - if ( $search ) { |
|
| 214 | - if ( filter_var( $search, FILTER_VALIDATE_IP ) ) { |
|
| 213 | + if ($search) { |
|
| 214 | + if (filter_var($search, FILTER_VALIDATE_IP)) { |
|
| 215 | 215 | // This is an IP address search |
| 216 | 216 | $key = '_give_log_request_ip'; |
| 217 | - } else if ( is_email( $search ) ) { |
|
| 217 | + } else if (is_email($search)) { |
|
| 218 | 218 | // This is an email search |
| 219 | - $userdata = get_user_by( 'email', $search ); |
|
| 219 | + $userdata = get_user_by('email', $search); |
|
| 220 | 220 | |
| 221 | - if ( $userdata ) { |
|
| 221 | + if ($userdata) { |
|
| 222 | 222 | $search = $userdata->ID; |
| 223 | 223 | } |
| 224 | 224 | |
| 225 | 225 | $key = '_give_log_user'; |
| 226 | - } elseif ( strlen( $search ) == 32 ) { |
|
| 226 | + } elseif (strlen($search) == 32) { |
|
| 227 | 227 | // Look for an API key |
| 228 | 228 | $key = '_give_log_key'; |
| 229 | - } elseif ( stristr( $search, 'token:' ) ) { |
|
| 229 | + } elseif (stristr($search, 'token:')) { |
|
| 230 | 230 | // Look for an API token |
| 231 | - $search = str_ireplace( 'token:', '', $search ); |
|
| 231 | + $search = str_ireplace('token:', '', $search); |
|
| 232 | 232 | $key = '_give_log_token'; |
| 233 | 233 | } else { |
| 234 | 234 | // This is (probably) a user ID search |
| 235 | - $userdata = get_userdata( $search ); |
|
| 235 | + $userdata = get_userdata($search); |
|
| 236 | 236 | |
| 237 | - if ( $userdata ) { |
|
| 237 | + if ($userdata) { |
|
| 238 | 238 | $search = $userdata->ID; |
| 239 | 239 | } |
| 240 | 240 | |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | * @return int Current page number |
| 261 | 261 | */ |
| 262 | 262 | public function get_paged() { |
| 263 | - return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1; |
|
| 263 | + return isset($_GET['paged']) ? absint($_GET['paged']) : 1; |
|
| 264 | 264 | } |
| 265 | 265 | |
| 266 | 266 | /** |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | * @since 1.0 |
| 271 | 271 | * @return void |
| 272 | 272 | */ |
| 273 | - function bulk_actions( $which = '' ) { |
|
| 273 | + function bulk_actions($which = '') { |
|
| 274 | 274 | give_log_views(); |
| 275 | 275 | } |
| 276 | 276 | |
@@ -293,14 +293,14 @@ discard block |
||
| 293 | 293 | 'meta_query' => $this->get_meta_query() |
| 294 | 294 | ); |
| 295 | 295 | |
| 296 | - $logs = $give_logs->get_connected_logs( $log_query ); |
|
| 296 | + $logs = $give_logs->get_connected_logs($log_query); |
|
| 297 | 297 | |
| 298 | - if ( $logs ) { |
|
| 299 | - foreach ( $logs as $log ) { |
|
| 298 | + if ($logs) { |
|
| 299 | + foreach ($logs as $log) { |
|
| 300 | 300 | |
| 301 | 301 | $logs_data[] = array( |
| 302 | 302 | 'ID' => $log->ID, |
| 303 | - 'ip' => get_post_meta( $log->ID, '_give_log_request_ip', true ), |
|
| 303 | + 'ip' => get_post_meta($log->ID, '_give_log_request_ip', true), |
|
| 304 | 304 | 'date' => $log->post_date |
| 305 | 305 | ); |
| 306 | 306 | } |
@@ -328,14 +328,14 @@ discard block |
||
| 328 | 328 | $columns = $this->get_columns(); |
| 329 | 329 | $hidden = array(); // No hidden columns |
| 330 | 330 | $sortable = $this->get_sortable_columns(); |
| 331 | - $this->_column_headers = array( $columns, $hidden, $sortable ); |
|
| 331 | + $this->_column_headers = array($columns, $hidden, $sortable); |
|
| 332 | 332 | $this->items = $this->get_logs(); |
| 333 | - $total_items = $give_logs->get_log_count( 0, 'api_requests' ); |
|
| 333 | + $total_items = $give_logs->get_log_count(0, 'api_requests'); |
|
| 334 | 334 | |
| 335 | - $this->set_pagination_args( array( |
|
| 335 | + $this->set_pagination_args(array( |
|
| 336 | 336 | 'total_items' => $total_items, |
| 337 | 337 | 'per_page' => $this->per_page, |
| 338 | - 'total_pages' => ceil( $total_items / $this->per_page ) |
|
| 338 | + 'total_pages' => ceil($total_items / $this->per_page) |
|
| 339 | 339 | ) |
| 340 | 340 | ); |
| 341 | 341 | } |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | 12 | // Exit if accessed directly |
| 13 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 13 | +if ( ! defined('ABSPATH')) { |
|
| 14 | 14 | exit; |
| 15 | 15 | } |
| 16 | 16 | |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | * |
| 24 | 24 | * @return array The altered list of views |
| 25 | 25 | */ |
| 26 | -function give_register_default_customer_views( $views ) { |
|
| 26 | +function give_register_default_customer_views($views) { |
|
| 27 | 27 | |
| 28 | 28 | $default_views = array( |
| 29 | 29 | 'overview' => 'give_customers_view', |
@@ -31,11 +31,11 @@ discard block |
||
| 31 | 31 | 'notes' => 'give_customer_notes_view' |
| 32 | 32 | ); |
| 33 | 33 | |
| 34 | - return array_merge( $views, $default_views ); |
|
| 34 | + return array_merge($views, $default_views); |
|
| 35 | 35 | |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | -add_filter( 'give_customer_views', 'give_register_default_customer_views', 1, 1 ); |
|
| 38 | +add_filter('give_customer_views', 'give_register_default_customer_views', 1, 1); |
|
| 39 | 39 | |
| 40 | 40 | /** |
| 41 | 41 | * Register a tab for the single customer view |
@@ -46,17 +46,17 @@ discard block |
||
| 46 | 46 | * |
| 47 | 47 | * @return array The altered list of tabs |
| 48 | 48 | */ |
| 49 | -function give_register_default_customer_tabs( $tabs ) { |
|
| 49 | +function give_register_default_customer_tabs($tabs) { |
|
| 50 | 50 | |
| 51 | 51 | $default_tabs = array( |
| 52 | - 'overview' => array( 'dashicon' => 'dashicons-admin-users', 'title' => esc_html__( 'Donor Profile', 'give' ) ), |
|
| 53 | - 'notes' => array( 'dashicon' => 'dashicons-admin-comments', 'title' => esc_html__( 'Donor Notes', 'give' ) ) |
|
| 52 | + 'overview' => array('dashicon' => 'dashicons-admin-users', 'title' => esc_html__('Donor Profile', 'give')), |
|
| 53 | + 'notes' => array('dashicon' => 'dashicons-admin-comments', 'title' => esc_html__('Donor Notes', 'give')) |
|
| 54 | 54 | ); |
| 55 | 55 | |
| 56 | - return array_merge( $tabs, $default_tabs ); |
|
| 56 | + return array_merge($tabs, $default_tabs); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | -add_filter( 'give_customer_tabs', 'give_register_default_customer_tabs', 1, 1 ); |
|
| 59 | +add_filter('give_customer_tabs', 'give_register_default_customer_tabs', 1, 1); |
|
| 60 | 60 | |
| 61 | 61 | /** |
| 62 | 62 | * Register the Delete icon as late as possible so it's at the bottom |
@@ -67,11 +67,11 @@ discard block |
||
| 67 | 67 | * |
| 68 | 68 | * @return array The altered list of tabs, with 'delete' at the bottom |
| 69 | 69 | */ |
| 70 | -function give_register_delete_customer_tab( $tabs ) { |
|
| 70 | +function give_register_delete_customer_tab($tabs) { |
|
| 71 | 71 | |
| 72 | - $tabs['delete'] = array( 'dashicon' => 'dashicons-trash', 'title' => esc_html__( 'Delete Donor', 'give' ) ); |
|
| 72 | + $tabs['delete'] = array('dashicon' => 'dashicons-trash', 'title' => esc_html__('Delete Donor', 'give')); |
|
| 73 | 73 | |
| 74 | 74 | return $tabs; |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | -add_filter( 'give_customer_tabs', 'give_register_delete_customer_tab', PHP_INT_MAX, 1 ); |
|
| 77 | +add_filter('give_customer_tabs', 'give_register_delete_customer_tab', PHP_INT_MAX, 1); |
|
@@ -10,13 +10,13 @@ discard block |
||
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | 12 | // Exit if accessed directly |
| 13 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 13 | +if ( ! defined('ABSPATH')) { |
|
| 14 | 14 | exit; |
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | // Load WP_List_Table if not loaded |
| 18 | -if ( ! class_exists( 'WP_List_Table' ) ) { |
|
| 19 | - require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php'; |
|
| 18 | +if ( ! class_exists('WP_List_Table')) { |
|
| 19 | + require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php'; |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | /** |
@@ -62,11 +62,11 @@ discard block |
||
| 62 | 62 | global $status, $page; |
| 63 | 63 | |
| 64 | 64 | // Set parent defaults |
| 65 | - parent::__construct( array( |
|
| 66 | - 'singular' => esc_html__( 'Donor', 'give' ), // Singular name of the listed records |
|
| 67 | - 'plural' => esc_html__( 'Donors', 'give' ), // Plural name of the listed records |
|
| 65 | + parent::__construct(array( |
|
| 66 | + 'singular' => esc_html__('Donor', 'give'), // Singular name of the listed records |
|
| 67 | + 'plural' => esc_html__('Donors', 'give'), // Plural name of the listed records |
|
| 68 | 68 | 'ajax' => false // Does this table support ajax? |
| 69 | - ) ); |
|
| 69 | + )); |
|
| 70 | 70 | |
| 71 | 71 | } |
| 72 | 72 | |
@@ -81,20 +81,20 @@ discard block |
||
| 81 | 81 | * |
| 82 | 82 | * @return void |
| 83 | 83 | */ |
| 84 | - public function search_box( $text, $input_id ) { |
|
| 85 | - $input_id = $input_id . '-search-input'; |
|
| 84 | + public function search_box($text, $input_id) { |
|
| 85 | + $input_id = $input_id.'-search-input'; |
|
| 86 | 86 | |
| 87 | - if ( ! empty( $_REQUEST['orderby'] ) ) { |
|
| 88 | - echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />'; |
|
| 87 | + if ( ! empty($_REQUEST['orderby'])) { |
|
| 88 | + echo '<input type="hidden" name="orderby" value="'.esc_attr($_REQUEST['orderby']).'" />'; |
|
| 89 | 89 | } |
| 90 | - if ( ! empty( $_REQUEST['order'] ) ) { |
|
| 91 | - echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />'; |
|
| 90 | + if ( ! empty($_REQUEST['order'])) { |
|
| 91 | + echo '<input type="hidden" name="order" value="'.esc_attr($_REQUEST['order']).'" />'; |
|
| 92 | 92 | } |
| 93 | 93 | ?> |
| 94 | 94 | <p class="search-box"> |
| 95 | 95 | <label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label> |
| 96 | 96 | <input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" /> |
| 97 | - <?php submit_button( $text, 'button', false, false, array( 'ID' => 'search-submit' ) ); ?> |
|
| 97 | + <?php submit_button($text, 'button', false, false, array('ID' => 'search-submit')); ?> |
|
| 98 | 98 | </p> |
| 99 | 99 | <?php |
| 100 | 100 | } |
@@ -110,42 +110,42 @@ discard block |
||
| 110 | 110 | * |
| 111 | 111 | * @return string Column Name |
| 112 | 112 | */ |
| 113 | - public function column_default( $item, $column_name ) { |
|
| 114 | - switch ( $column_name ) { |
|
| 113 | + public function column_default($item, $column_name) { |
|
| 114 | + switch ($column_name) { |
|
| 115 | 115 | |
| 116 | 116 | case 'num_purchases' : |
| 117 | - $value = '<a href="' . |
|
| 118 | - admin_url( '/edit.php?post_type=give_forms&page=give-payment-history&user=' . urlencode( $item['email'] ) |
|
| 119 | - ) . '">' . esc_html( $item['num_purchases'] ) . '</a>'; |
|
| 117 | + $value = '<a href="'. |
|
| 118 | + admin_url('/edit.php?post_type=give_forms&page=give-payment-history&user='.urlencode($item['email']) |
|
| 119 | + ).'">'.esc_html($item['num_purchases']).'</a>'; |
|
| 120 | 120 | break; |
| 121 | 121 | |
| 122 | 122 | case 'amount_spent' : |
| 123 | - $value = give_currency_filter( give_format_amount( $item[ $column_name ] ) ); |
|
| 123 | + $value = give_currency_filter(give_format_amount($item[$column_name])); |
|
| 124 | 124 | break; |
| 125 | 125 | |
| 126 | 126 | case 'date_created' : |
| 127 | - $value = date_i18n( get_option( 'date_format' ), strtotime( $item['date_created'] ) ); |
|
| 127 | + $value = date_i18n(get_option('date_format'), strtotime($item['date_created'])); |
|
| 128 | 128 | break; |
| 129 | 129 | |
| 130 | 130 | default: |
| 131 | - $value = isset( $item[ $column_name ] ) ? $item[ $column_name ] : null; |
|
| 131 | + $value = isset($item[$column_name]) ? $item[$column_name] : null; |
|
| 132 | 132 | break; |
| 133 | 133 | } |
| 134 | 134 | |
| 135 | - return apply_filters( 'give_report_column_' . $column_name, $value, $item['id'] ); |
|
| 135 | + return apply_filters('give_report_column_'.$column_name, $value, $item['id']); |
|
| 136 | 136 | |
| 137 | 137 | } |
| 138 | 138 | |
| 139 | - public function column_name( $item ) { |
|
| 140 | - $name = '#' . $item['id'] . ' '; |
|
| 141 | - $name .= ! empty( $item['name'] ) ? $item['name'] : '<em>' . esc_html__( 'Unnamed Donor', 'give' ) . '</em>'; |
|
| 142 | - $view_url = admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $item['id'] ); |
|
| 139 | + public function column_name($item) { |
|
| 140 | + $name = '#'.$item['id'].' '; |
|
| 141 | + $name .= ! empty($item['name']) ? $item['name'] : '<em>'.esc_html__('Unnamed Donor', 'give').'</em>'; |
|
| 142 | + $view_url = admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$item['id']); |
|
| 143 | 143 | $actions = array( |
| 144 | - 'view' => sprintf( '<a href="%1$s">%2$s</a>', $view_url, esc_html__( 'View Donor', 'give' ) ), |
|
| 145 | - 'delete' => sprintf( '<a href="%1$s">%2$s</a>', admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=delete&id=' . $item['id'] ), esc_html__( 'Delete', 'give' ) ) |
|
| 144 | + 'view' => sprintf('<a href="%1$s">%2$s</a>', $view_url, esc_html__('View Donor', 'give')), |
|
| 145 | + 'delete' => sprintf('<a href="%1$s">%2$s</a>', admin_url('edit.php?post_type=give_forms&page=give-donors&view=delete&id='.$item['id']), esc_html__('Delete', 'give')) |
|
| 146 | 146 | ); |
| 147 | 147 | |
| 148 | - return '<a href="' . esc_url( $view_url ) . '">' . $name . '</a>' . $this->row_actions( $actions ); |
|
| 148 | + return '<a href="'.esc_url($view_url).'">'.$name.'</a>'.$this->row_actions($actions); |
|
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | /** |
@@ -157,14 +157,14 @@ discard block |
||
| 157 | 157 | */ |
| 158 | 158 | public function get_columns() { |
| 159 | 159 | $columns = array( |
| 160 | - 'name' => esc_html__( 'Name', 'give' ), |
|
| 161 | - 'email' => esc_html__( 'Email', 'give' ), |
|
| 162 | - 'num_purchases' => esc_html__( 'Donations', 'give' ), |
|
| 163 | - 'amount_spent' => esc_html__( 'Total Donated', 'give' ), |
|
| 164 | - 'date_created' => esc_html__( 'Date Created', 'give' ) |
|
| 160 | + 'name' => esc_html__('Name', 'give'), |
|
| 161 | + 'email' => esc_html__('Email', 'give'), |
|
| 162 | + 'num_purchases' => esc_html__('Donations', 'give'), |
|
| 163 | + 'amount_spent' => esc_html__('Total Donated', 'give'), |
|
| 164 | + 'date_created' => esc_html__('Date Created', 'give') |
|
| 165 | 165 | ); |
| 166 | 166 | |
| 167 | - return apply_filters( 'give_report_customer_columns', $columns ); |
|
| 167 | + return apply_filters('give_report_customer_columns', $columns); |
|
| 168 | 168 | |
| 169 | 169 | } |
| 170 | 170 | |
@@ -177,10 +177,10 @@ discard block |
||
| 177 | 177 | */ |
| 178 | 178 | public function get_sortable_columns() { |
| 179 | 179 | return array( |
| 180 | - 'date_created' => array( 'date_created', true ), |
|
| 181 | - 'name' => array( 'name', true ), |
|
| 182 | - 'num_purchases' => array( 'purchase_count', false ), |
|
| 183 | - 'amount_spent' => array( 'purchase_value', false ), |
|
| 180 | + 'date_created' => array('date_created', true), |
|
| 181 | + 'name' => array('name', true), |
|
| 182 | + 'num_purchases' => array('purchase_count', false), |
|
| 183 | + 'amount_spent' => array('purchase_value', false), |
|
| 184 | 184 | ); |
| 185 | 185 | } |
| 186 | 186 | |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | * @since 1.0 |
| 192 | 192 | * @return void |
| 193 | 193 | */ |
| 194 | - public function bulk_actions( $which = '' ) { |
|
| 194 | + public function bulk_actions($which = '') { |
|
| 195 | 195 | // These aren't really bulk actions but this outputs the markup in the right place |
| 196 | 196 | } |
| 197 | 197 | |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | * @return int Current page number |
| 204 | 204 | */ |
| 205 | 205 | public function get_paged() { |
| 206 | - return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1; |
|
| 206 | + return isset($_GET['paged']) ? absint($_GET['paged']) : 1; |
|
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | /** |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | * @return mixed string If search is present, false otherwise |
| 215 | 215 | */ |
| 216 | 216 | public function get_search() { |
| 217 | - return ! empty( $_GET['s'] ) ? urldecode( trim( $_GET['s'] ) ) : false; |
|
| 217 | + return ! empty($_GET['s']) ? urldecode(trim($_GET['s'])) : false; |
|
| 218 | 218 | } |
| 219 | 219 | |
| 220 | 220 | /** |
@@ -231,10 +231,10 @@ discard block |
||
| 231 | 231 | |
| 232 | 232 | $data = array(); |
| 233 | 233 | $paged = $this->get_paged(); |
| 234 | - $offset = $this->per_page * ( $paged - 1 ); |
|
| 234 | + $offset = $this->per_page * ($paged - 1); |
|
| 235 | 235 | $search = $this->get_search(); |
| 236 | - $order = isset( $_GET['order'] ) ? sanitize_text_field( $_GET['order'] ) : 'DESC'; |
|
| 237 | - $orderby = isset( $_GET['orderby'] ) ? sanitize_text_field( $_GET['orderby'] ) : 'id'; |
|
| 236 | + $order = isset($_GET['order']) ? sanitize_text_field($_GET['order']) : 'DESC'; |
|
| 237 | + $orderby = isset($_GET['orderby']) ? sanitize_text_field($_GET['orderby']) : 'id'; |
|
| 238 | 238 | |
| 239 | 239 | $args = array( |
| 240 | 240 | 'number' => $this->per_page, |
@@ -243,21 +243,21 @@ discard block |
||
| 243 | 243 | 'orderby' => $orderby |
| 244 | 244 | ); |
| 245 | 245 | |
| 246 | - if ( is_email( $search ) ) { |
|
| 246 | + if (is_email($search)) { |
|
| 247 | 247 | $args['email'] = $search; |
| 248 | - } elseif ( is_numeric( $search ) ) { |
|
| 248 | + } elseif (is_numeric($search)) { |
|
| 249 | 249 | $args['id'] = $search; |
| 250 | 250 | } else { |
| 251 | 251 | $args['name'] = $search; |
| 252 | 252 | } |
| 253 | 253 | |
| 254 | - $customers = Give()->customers->get_customers( $args ); |
|
| 254 | + $customers = Give()->customers->get_customers($args); |
|
| 255 | 255 | |
| 256 | - if ( $customers ) { |
|
| 256 | + if ($customers) { |
|
| 257 | 257 | |
| 258 | - foreach ( $customers as $customer ) { |
|
| 258 | + foreach ($customers as $customer) { |
|
| 259 | 259 | |
| 260 | - $user_id = ! empty( $customer->user_id ) ? intval( $customer->user_id ) : 0; |
|
| 260 | + $user_id = ! empty($customer->user_id) ? intval($customer->user_id) : 0; |
|
| 261 | 261 | |
| 262 | 262 | $data[] = array( |
| 263 | 263 | 'id' => $customer->id, |
@@ -291,16 +291,16 @@ discard block |
||
| 291 | 291 | $hidden = array(); // No hidden columns |
| 292 | 292 | $sortable = $this->get_sortable_columns(); |
| 293 | 293 | |
| 294 | - $this->_column_headers = array( $columns, $hidden, $sortable ); |
|
| 294 | + $this->_column_headers = array($columns, $hidden, $sortable); |
|
| 295 | 295 | |
| 296 | 296 | $this->items = $this->reports_data(); |
| 297 | 297 | |
| 298 | 298 | $this->total = give_count_total_customers(); |
| 299 | 299 | |
| 300 | - $this->set_pagination_args( array( |
|
| 300 | + $this->set_pagination_args(array( |
|
| 301 | 301 | 'total_items' => $this->total, |
| 302 | 302 | 'per_page' => $this->per_page, |
| 303 | - 'total_pages' => ceil( $this->total / $this->per_page ) |
|
| 304 | - ) ); |
|
| 303 | + 'total_pages' => ceil($this->total / $this->per_page) |
|
| 304 | + )); |
|
| 305 | 305 | } |
| 306 | 306 | } |
| 307 | 307 | \ No newline at end of file |
@@ -13,330 +13,330 @@ |
||
| 13 | 13 | * @version 1.6 |
| 14 | 14 | */ |
| 15 | 15 | class EDD_SL_Plugin_Updater { |
| 16 | - private $api_url = ''; |
|
| 17 | - private $api_data = array(); |
|
| 18 | - private $name = ''; |
|
| 19 | - private $slug = ''; |
|
| 20 | - |
|
| 21 | - /** |
|
| 22 | - * Class constructor. |
|
| 23 | - * |
|
| 24 | - * @uses plugin_basename() |
|
| 25 | - * @uses hook() |
|
| 26 | - * |
|
| 27 | - * @param string $_api_url The URL pointing to the custom API endpoint. |
|
| 28 | - * @param string $_plugin_file Path to the plugin file. |
|
| 29 | - * @param array $_api_data Optional data to send with API calls. |
|
| 30 | - * @return void |
|
| 31 | - */ |
|
| 32 | - function __construct( $_api_url, $_plugin_file, $_api_data = null ) { |
|
| 33 | - $this->api_url = trailingslashit( $_api_url ); |
|
| 34 | - $this->api_data = $_api_data; |
|
| 35 | - $this->name = plugin_basename( $_plugin_file ); |
|
| 36 | - $this->slug = basename( $_plugin_file, '.php' ); |
|
| 37 | - $this->version = $_api_data['version']; |
|
| 38 | - |
|
| 39 | - // Set up hooks. |
|
| 40 | - $this->init(); |
|
| 41 | - add_action( 'admin_init', array( $this, 'show_changelog' ) ); |
|
| 42 | - } |
|
| 43 | - |
|
| 44 | - /** |
|
| 45 | - * Set up WordPress filters to hook into WP's update process. |
|
| 46 | - * |
|
| 47 | - * @uses add_filter() |
|
| 48 | - * |
|
| 49 | - * @return void |
|
| 50 | - */ |
|
| 51 | - public function init() { |
|
| 16 | + private $api_url = ''; |
|
| 17 | + private $api_data = array(); |
|
| 18 | + private $name = ''; |
|
| 19 | + private $slug = ''; |
|
| 20 | + |
|
| 21 | + /** |
|
| 22 | + * Class constructor. |
|
| 23 | + * |
|
| 24 | + * @uses plugin_basename() |
|
| 25 | + * @uses hook() |
|
| 26 | + * |
|
| 27 | + * @param string $_api_url The URL pointing to the custom API endpoint. |
|
| 28 | + * @param string $_plugin_file Path to the plugin file. |
|
| 29 | + * @param array $_api_data Optional data to send with API calls. |
|
| 30 | + * @return void |
|
| 31 | + */ |
|
| 32 | + function __construct( $_api_url, $_plugin_file, $_api_data = null ) { |
|
| 33 | + $this->api_url = trailingslashit( $_api_url ); |
|
| 34 | + $this->api_data = $_api_data; |
|
| 35 | + $this->name = plugin_basename( $_plugin_file ); |
|
| 36 | + $this->slug = basename( $_plugin_file, '.php' ); |
|
| 37 | + $this->version = $_api_data['version']; |
|
| 38 | + |
|
| 39 | + // Set up hooks. |
|
| 40 | + $this->init(); |
|
| 41 | + add_action( 'admin_init', array( $this, 'show_changelog' ) ); |
|
| 42 | + } |
|
| 43 | + |
|
| 44 | + /** |
|
| 45 | + * Set up WordPress filters to hook into WP's update process. |
|
| 46 | + * |
|
| 47 | + * @uses add_filter() |
|
| 48 | + * |
|
| 49 | + * @return void |
|
| 50 | + */ |
|
| 51 | + public function init() { |
|
| 52 | 52 | |
| 53 | - add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) ); |
|
| 54 | - add_filter( 'plugins_api', array( $this, 'plugins_api_filter' ), 10, 3 ); |
|
| 53 | + add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) ); |
|
| 54 | + add_filter( 'plugins_api', array( $this, 'plugins_api_filter' ), 10, 3 ); |
|
| 55 | 55 | |
| 56 | - add_action( 'after_plugin_row_' . $this->name, array( $this, 'show_update_notification' ), 10, 2 ); |
|
| 57 | - } |
|
| 56 | + add_action( 'after_plugin_row_' . $this->name, array( $this, 'show_update_notification' ), 10, 2 ); |
|
| 57 | + } |
|
| 58 | 58 | |
| 59 | - /** |
|
| 60 | - * Check for Updates at the defined API endpoint and modify the update array. |
|
| 61 | - * |
|
| 62 | - * This function dives into the update API just when WordPress creates its update array, |
|
| 63 | - * then adds a custom API call and injects the custom plugin data retrieved from the API. |
|
| 64 | - * It is reassembled from parts of the native WordPress plugin update code. |
|
| 65 | - * See wp-includes/update.php line 121 for the original wp_update_plugins() function. |
|
| 66 | - * |
|
| 67 | - * @uses api_request() |
|
| 68 | - * |
|
| 69 | - * @param array $_transient_data Update array build by WordPress. |
|
| 70 | - * @return array Modified update array with custom plugin data. |
|
| 71 | - */ |
|
| 72 | - function check_update( $_transient_data ) { |
|
| 59 | + /** |
|
| 60 | + * Check for Updates at the defined API endpoint and modify the update array. |
|
| 61 | + * |
|
| 62 | + * This function dives into the update API just when WordPress creates its update array, |
|
| 63 | + * then adds a custom API call and injects the custom plugin data retrieved from the API. |
|
| 64 | + * It is reassembled from parts of the native WordPress plugin update code. |
|
| 65 | + * See wp-includes/update.php line 121 for the original wp_update_plugins() function. |
|
| 66 | + * |
|
| 67 | + * @uses api_request() |
|
| 68 | + * |
|
| 69 | + * @param array $_transient_data Update array build by WordPress. |
|
| 70 | + * @return array Modified update array with custom plugin data. |
|
| 71 | + */ |
|
| 72 | + function check_update( $_transient_data ) { |
|
| 73 | 73 | |
| 74 | - global $pagenow; |
|
| 74 | + global $pagenow; |
|
| 75 | 75 | |
| 76 | - if( ! is_object( $_transient_data ) ) { |
|
| 77 | - $_transient_data = new stdClass; |
|
| 78 | - } |
|
| 76 | + if( ! is_object( $_transient_data ) ) { |
|
| 77 | + $_transient_data = new stdClass; |
|
| 78 | + } |
|
| 79 | 79 | |
| 80 | - if( 'plugins.php' == $pagenow && is_multisite() ) { |
|
| 81 | - return $_transient_data; |
|
| 82 | - } |
|
| 80 | + if( 'plugins.php' == $pagenow && is_multisite() ) { |
|
| 81 | + return $_transient_data; |
|
| 82 | + } |
|
| 83 | 83 | |
| 84 | - if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) { |
|
| 84 | + if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) { |
|
| 85 | 85 | |
| 86 | - $version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) ); |
|
| 86 | + $version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) ); |
|
| 87 | 87 | |
| 88 | - if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) { |
|
| 88 | + if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) { |
|
| 89 | 89 | |
| 90 | - $this->did_check = true; |
|
| 90 | + $this->did_check = true; |
|
| 91 | 91 | |
| 92 | - if( version_compare( $this->version, $version_info->new_version, '<' ) ) { |
|
| 92 | + if( version_compare( $this->version, $version_info->new_version, '<' ) ) { |
|
| 93 | 93 | |
| 94 | - $_transient_data->response[ $this->name ] = $version_info; |
|
| 94 | + $_transient_data->response[ $this->name ] = $version_info; |
|
| 95 | 95 | |
| 96 | - } |
|
| 96 | + } |
|
| 97 | 97 | |
| 98 | - $_transient_data->last_checked = time(); |
|
| 99 | - $_transient_data->checked[ $this->name ] = $this->version; |
|
| 98 | + $_transient_data->last_checked = time(); |
|
| 99 | + $_transient_data->checked[ $this->name ] = $this->version; |
|
| 100 | 100 | |
| 101 | - } |
|
| 101 | + } |
|
| 102 | 102 | |
| 103 | - } |
|
| 103 | + } |
|
| 104 | 104 | |
| 105 | - return $_transient_data; |
|
| 106 | - } |
|
| 105 | + return $_transient_data; |
|
| 106 | + } |
|
| 107 | 107 | |
| 108 | - /** |
|
| 109 | - * show update nofication row -- needed for multisite subsites, because WP won't tell you otherwise! |
|
| 110 | - * |
|
| 111 | - * @param string $file |
|
| 112 | - * @param array $plugin |
|
| 113 | - */ |
|
| 114 | - public function show_update_notification( $file, $plugin ) { |
|
| 108 | + /** |
|
| 109 | + * show update nofication row -- needed for multisite subsites, because WP won't tell you otherwise! |
|
| 110 | + * |
|
| 111 | + * @param string $file |
|
| 112 | + * @param array $plugin |
|
| 113 | + */ |
|
| 114 | + public function show_update_notification( $file, $plugin ) { |
|
| 115 | 115 | |
| 116 | - if( ! current_user_can( 'update_plugins' ) ) { |
|
| 117 | - return; |
|
| 118 | - } |
|
| 116 | + if( ! current_user_can( 'update_plugins' ) ) { |
|
| 117 | + return; |
|
| 118 | + } |
|
| 119 | 119 | |
| 120 | - if( ! is_multisite() ) { |
|
| 121 | - return; |
|
| 122 | - } |
|
| 120 | + if( ! is_multisite() ) { |
|
| 121 | + return; |
|
| 122 | + } |
|
| 123 | 123 | |
| 124 | - if ( $this->name != $file ) { |
|
| 125 | - return; |
|
| 126 | - } |
|
| 124 | + if ( $this->name != $file ) { |
|
| 125 | + return; |
|
| 126 | + } |
|
| 127 | 127 | |
| 128 | - // Remove our filter on the site transient |
|
| 129 | - remove_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ), 10 ); |
|
| 128 | + // Remove our filter on the site transient |
|
| 129 | + remove_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ), 10 ); |
|
| 130 | 130 | |
| 131 | - $update_cache = get_site_transient( 'update_plugins' ); |
|
| 131 | + $update_cache = get_site_transient( 'update_plugins' ); |
|
| 132 | 132 | |
| 133 | - if ( ! is_object( $update_cache ) || empty( $update_cache->response ) || empty( $update_cache->response[ $this->name ] ) ) { |
|
| 133 | + if ( ! is_object( $update_cache ) || empty( $update_cache->response ) || empty( $update_cache->response[ $this->name ] ) ) { |
|
| 134 | 134 | |
| 135 | - $cache_key = md5( 'edd_plugin_' .sanitize_key( $this->name ) . '_version_info' ); |
|
| 136 | - $version_info = get_transient( $cache_key ); |
|
| 135 | + $cache_key = md5( 'edd_plugin_' .sanitize_key( $this->name ) . '_version_info' ); |
|
| 136 | + $version_info = get_transient( $cache_key ); |
|
| 137 | 137 | |
| 138 | - if( false === $version_info ) { |
|
| 138 | + if( false === $version_info ) { |
|
| 139 | 139 | |
| 140 | - $version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) ); |
|
| 140 | + $version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) ); |
|
| 141 | 141 | |
| 142 | - set_transient( $cache_key, $version_info, 3600 ); |
|
| 143 | - } |
|
| 142 | + set_transient( $cache_key, $version_info, 3600 ); |
|
| 143 | + } |
|
| 144 | 144 | |
| 145 | 145 | |
| 146 | - if( ! is_object( $version_info ) ) { |
|
| 147 | - return; |
|
| 148 | - } |
|
| 146 | + if( ! is_object( $version_info ) ) { |
|
| 147 | + return; |
|
| 148 | + } |
|
| 149 | 149 | |
| 150 | - if( version_compare( $this->version, $version_info->new_version, '<' ) ) { |
|
| 150 | + if( version_compare( $this->version, $version_info->new_version, '<' ) ) { |
|
| 151 | 151 | |
| 152 | - $update_cache->response[ $this->name ] = $version_info; |
|
| 152 | + $update_cache->response[ $this->name ] = $version_info; |
|
| 153 | 153 | |
| 154 | - } |
|
| 154 | + } |
|
| 155 | 155 | |
| 156 | - $update_cache->last_checked = time(); |
|
| 157 | - $update_cache->checked[ $this->name ] = $this->version; |
|
| 156 | + $update_cache->last_checked = time(); |
|
| 157 | + $update_cache->checked[ $this->name ] = $this->version; |
|
| 158 | 158 | |
| 159 | - set_site_transient( 'update_plugins', $update_cache ); |
|
| 159 | + set_site_transient( 'update_plugins', $update_cache ); |
|
| 160 | 160 | |
| 161 | - } else { |
|
| 161 | + } else { |
|
| 162 | 162 | |
| 163 | - $version_info = $update_cache->response[ $this->name ]; |
|
| 163 | + $version_info = $update_cache->response[ $this->name ]; |
|
| 164 | 164 | |
| 165 | - } |
|
| 165 | + } |
|
| 166 | 166 | |
| 167 | - // Restore our filter |
|
| 168 | - add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) ); |
|
| 167 | + // Restore our filter |
|
| 168 | + add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) ); |
|
| 169 | 169 | |
| 170 | - if ( ! empty( $update_cache->response[ $this->name ] ) && version_compare( $this->version, $version_info->new_version, '<' ) ) { |
|
| 170 | + if ( ! empty( $update_cache->response[ $this->name ] ) && version_compare( $this->version, $version_info->new_version, '<' ) ) { |
|
| 171 | 171 | |
| 172 | - // build a plugin list row, with update notification |
|
| 173 | - $wp_list_table = _get_list_table( 'WP_Plugins_List_Table' ); |
|
| 174 | - echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">'; |
|
| 172 | + // build a plugin list row, with update notification |
|
| 173 | + $wp_list_table = _get_list_table( 'WP_Plugins_List_Table' ); |
|
| 174 | + echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">'; |
|
| 175 | 175 | |
| 176 | - $changelog_link = self_admin_url( 'index.php?edd_sl_action=view_plugin_changelog&plugin=' . $this->name . '&slug=' . $this->slug . '&TB_iframe=true&width=772&height=911' ); |
|
| 176 | + $changelog_link = self_admin_url( 'index.php?edd_sl_action=view_plugin_changelog&plugin=' . $this->name . '&slug=' . $this->slug . '&TB_iframe=true&width=772&height=911' ); |
|
| 177 | 177 | |
| 178 | - if ( empty( $version_info->download_link ) ) { |
|
| 179 | - printf( |
|
| 178 | + if ( empty( $version_info->download_link ) ) { |
|
| 179 | + printf( |
|
| 180 | 180 | /* translators: 1: name 2: changelog URL 3: version */ |
| 181 | - __( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'edd' ), |
|
| 182 | - esc_html( $version_info->name ), |
|
| 183 | - esc_url( $changelog_link ), |
|
| 184 | - esc_html( $version_info->new_version ) |
|
| 185 | - ); |
|
| 186 | - } else { |
|
| 187 | - printf( |
|
| 181 | + __( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'edd' ), |
|
| 182 | + esc_html( $version_info->name ), |
|
| 183 | + esc_url( $changelog_link ), |
|
| 184 | + esc_html( $version_info->new_version ) |
|
| 185 | + ); |
|
| 186 | + } else { |
|
| 187 | + printf( |
|
| 188 | 188 | /* translators: 1: name 2: changelog URL 3: version 4: update URL */ |
| 189 | - __( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'edd' ), |
|
| 190 | - esc_html( $version_info->name ), |
|
| 191 | - esc_url( $changelog_link ), |
|
| 192 | - esc_html( $version_info->new_version ), |
|
| 193 | - esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) |
|
| 194 | - ); |
|
| 195 | - } |
|
| 196 | - |
|
| 197 | - echo '</div></td></tr>'; |
|
| 198 | - } |
|
| 199 | - } |
|
| 200 | - |
|
| 201 | - |
|
| 202 | - /** |
|
| 203 | - * Updates information on the "View version x.x details" page with custom data. |
|
| 204 | - * |
|
| 205 | - * @uses api_request() |
|
| 206 | - * |
|
| 207 | - * @param mixed $_data |
|
| 208 | - * @param string $_action |
|
| 209 | - * @param object $_args |
|
| 210 | - * @return object $_data |
|
| 211 | - */ |
|
| 212 | - function plugins_api_filter( $_data, $_action = '', $_args = null ) { |
|
| 213 | - |
|
| 214 | - |
|
| 215 | - if ( $_action != 'plugin_information' ) { |
|
| 216 | - |
|
| 217 | - return $_data; |
|
| 218 | - |
|
| 219 | - } |
|
| 220 | - |
|
| 221 | - if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) { |
|
| 222 | - |
|
| 223 | - return $_data; |
|
| 224 | - |
|
| 225 | - } |
|
| 226 | - |
|
| 227 | - $to_send = array( |
|
| 228 | - 'slug' => $this->slug, |
|
| 229 | - 'is_ssl' => is_ssl(), |
|
| 230 | - 'fields' => array( |
|
| 231 | - 'banners' => false, // These will be supported soon hopefully |
|
| 232 | - 'reviews' => false |
|
| 233 | - ) |
|
| 234 | - ); |
|
| 235 | - |
|
| 236 | - $api_response = $this->api_request( 'plugin_information', $to_send ); |
|
| 237 | - |
|
| 238 | - if ( false !== $api_response ) { |
|
| 239 | - $_data = $api_response; |
|
| 240 | - } |
|
| 241 | - |
|
| 242 | - return $_data; |
|
| 243 | - } |
|
| 244 | - |
|
| 245 | - |
|
| 246 | - /** |
|
| 247 | - * Disable SSL verification in order to prevent download update failures |
|
| 248 | - * |
|
| 249 | - * @param array $args |
|
| 250 | - * @param string $url |
|
| 251 | - * @return object $array |
|
| 252 | - */ |
|
| 253 | - function http_request_args( $args, $url ) { |
|
| 254 | - // If it is an https request and we are performing a package download, disable ssl verification |
|
| 255 | - if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) { |
|
| 256 | - $args['sslverify'] = false; |
|
| 257 | - } |
|
| 258 | - return $args; |
|
| 259 | - } |
|
| 260 | - |
|
| 261 | - /** |
|
| 262 | - * Calls the API and, if successfull, returns the object delivered by the API. |
|
| 263 | - * |
|
| 264 | - * @uses get_bloginfo() |
|
| 265 | - * @uses wp_remote_post() |
|
| 266 | - * @uses is_wp_error() |
|
| 267 | - * |
|
| 268 | - * @param string $_action The requested action. |
|
| 269 | - * @param array $_data Parameters for the API action. |
|
| 270 | - * @return false||object |
|
| 271 | - */ |
|
| 272 | - private function api_request( $_action, $_data ) { |
|
| 273 | - |
|
| 274 | - global $wp_version; |
|
| 275 | - |
|
| 276 | - $data = array_merge( $this->api_data, $_data ); |
|
| 277 | - |
|
| 278 | - if ( $data['slug'] != $this->slug ) |
|
| 279 | - return; |
|
| 280 | - |
|
| 281 | - if ( empty( $data['license'] ) ) |
|
| 282 | - return; |
|
| 283 | - |
|
| 284 | - if( $this->api_url == home_url() ) { |
|
| 285 | - return false; // Don't allow a plugin to ping itself |
|
| 286 | - } |
|
| 287 | - |
|
| 288 | - $api_params = array( |
|
| 289 | - 'edd_action' => 'get_version', |
|
| 290 | - 'license' => $data['license'], |
|
| 291 | - 'item_name' => isset( $data['item_name'] ) ? $data['item_name'] : false, |
|
| 292 | - 'item_id' => isset( $data['item_id'] ) ? $data['item_id'] : false, |
|
| 293 | - 'slug' => $data['slug'], |
|
| 294 | - 'author' => $data['author'], |
|
| 295 | - 'url' => home_url() |
|
| 296 | - ); |
|
| 189 | + __( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'edd' ), |
|
| 190 | + esc_html( $version_info->name ), |
|
| 191 | + esc_url( $changelog_link ), |
|
| 192 | + esc_html( $version_info->new_version ), |
|
| 193 | + esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) |
|
| 194 | + ); |
|
| 195 | + } |
|
| 196 | + |
|
| 197 | + echo '</div></td></tr>'; |
|
| 198 | + } |
|
| 199 | + } |
|
| 200 | + |
|
| 201 | + |
|
| 202 | + /** |
|
| 203 | + * Updates information on the "View version x.x details" page with custom data. |
|
| 204 | + * |
|
| 205 | + * @uses api_request() |
|
| 206 | + * |
|
| 207 | + * @param mixed $_data |
|
| 208 | + * @param string $_action |
|
| 209 | + * @param object $_args |
|
| 210 | + * @return object $_data |
|
| 211 | + */ |
|
| 212 | + function plugins_api_filter( $_data, $_action = '', $_args = null ) { |
|
| 213 | + |
|
| 214 | + |
|
| 215 | + if ( $_action != 'plugin_information' ) { |
|
| 216 | + |
|
| 217 | + return $_data; |
|
| 218 | + |
|
| 219 | + } |
|
| 220 | + |
|
| 221 | + if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) { |
|
| 222 | + |
|
| 223 | + return $_data; |
|
| 224 | + |
|
| 225 | + } |
|
| 226 | + |
|
| 227 | + $to_send = array( |
|
| 228 | + 'slug' => $this->slug, |
|
| 229 | + 'is_ssl' => is_ssl(), |
|
| 230 | + 'fields' => array( |
|
| 231 | + 'banners' => false, // These will be supported soon hopefully |
|
| 232 | + 'reviews' => false |
|
| 233 | + ) |
|
| 234 | + ); |
|
| 235 | + |
|
| 236 | + $api_response = $this->api_request( 'plugin_information', $to_send ); |
|
| 237 | + |
|
| 238 | + if ( false !== $api_response ) { |
|
| 239 | + $_data = $api_response; |
|
| 240 | + } |
|
| 241 | + |
|
| 242 | + return $_data; |
|
| 243 | + } |
|
| 244 | + |
|
| 245 | + |
|
| 246 | + /** |
|
| 247 | + * Disable SSL verification in order to prevent download update failures |
|
| 248 | + * |
|
| 249 | + * @param array $args |
|
| 250 | + * @param string $url |
|
| 251 | + * @return object $array |
|
| 252 | + */ |
|
| 253 | + function http_request_args( $args, $url ) { |
|
| 254 | + // If it is an https request and we are performing a package download, disable ssl verification |
|
| 255 | + if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) { |
|
| 256 | + $args['sslverify'] = false; |
|
| 257 | + } |
|
| 258 | + return $args; |
|
| 259 | + } |
|
| 260 | + |
|
| 261 | + /** |
|
| 262 | + * Calls the API and, if successfull, returns the object delivered by the API. |
|
| 263 | + * |
|
| 264 | + * @uses get_bloginfo() |
|
| 265 | + * @uses wp_remote_post() |
|
| 266 | + * @uses is_wp_error() |
|
| 267 | + * |
|
| 268 | + * @param string $_action The requested action. |
|
| 269 | + * @param array $_data Parameters for the API action. |
|
| 270 | + * @return false||object |
|
| 271 | + */ |
|
| 272 | + private function api_request( $_action, $_data ) { |
|
| 273 | + |
|
| 274 | + global $wp_version; |
|
| 275 | + |
|
| 276 | + $data = array_merge( $this->api_data, $_data ); |
|
| 277 | + |
|
| 278 | + if ( $data['slug'] != $this->slug ) |
|
| 279 | + return; |
|
| 280 | + |
|
| 281 | + if ( empty( $data['license'] ) ) |
|
| 282 | + return; |
|
| 283 | + |
|
| 284 | + if( $this->api_url == home_url() ) { |
|
| 285 | + return false; // Don't allow a plugin to ping itself |
|
| 286 | + } |
|
| 287 | + |
|
| 288 | + $api_params = array( |
|
| 289 | + 'edd_action' => 'get_version', |
|
| 290 | + 'license' => $data['license'], |
|
| 291 | + 'item_name' => isset( $data['item_name'] ) ? $data['item_name'] : false, |
|
| 292 | + 'item_id' => isset( $data['item_id'] ) ? $data['item_id'] : false, |
|
| 293 | + 'slug' => $data['slug'], |
|
| 294 | + 'author' => $data['author'], |
|
| 295 | + 'url' => home_url() |
|
| 296 | + ); |
|
| 297 | 297 | |
| 298 | - $request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => false, 'body' => $api_params ) ); |
|
| 298 | + $request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => false, 'body' => $api_params ) ); |
|
| 299 | 299 | |
| 300 | - if ( ! is_wp_error( $request ) ) { |
|
| 301 | - $request = json_decode( wp_remote_retrieve_body( $request ) ); |
|
| 302 | - } |
|
| 300 | + if ( ! is_wp_error( $request ) ) { |
|
| 301 | + $request = json_decode( wp_remote_retrieve_body( $request ) ); |
|
| 302 | + } |
|
| 303 | 303 | |
| 304 | - if ( $request && isset( $request->sections ) ) { |
|
| 305 | - $request->sections = maybe_unserialize( $request->sections ); |
|
| 306 | - } else { |
|
| 307 | - $request = false; |
|
| 308 | - } |
|
| 304 | + if ( $request && isset( $request->sections ) ) { |
|
| 305 | + $request->sections = maybe_unserialize( $request->sections ); |
|
| 306 | + } else { |
|
| 307 | + $request = false; |
|
| 308 | + } |
|
| 309 | 309 | |
| 310 | - return $request; |
|
| 311 | - } |
|
| 310 | + return $request; |
|
| 311 | + } |
|
| 312 | 312 | |
| 313 | - public function show_changelog() { |
|
| 313 | + public function show_changelog() { |
|
| 314 | 314 | |
| 315 | 315 | |
| 316 | - if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) { |
|
| 317 | - return; |
|
| 318 | - } |
|
| 316 | + if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) { |
|
| 317 | + return; |
|
| 318 | + } |
|
| 319 | 319 | |
| 320 | - if( empty( $_REQUEST['plugin'] ) ) { |
|
| 321 | - return; |
|
| 322 | - } |
|
| 323 | - |
|
| 324 | - if( empty( $_REQUEST['slug'] ) ) { |
|
| 325 | - return; |
|
| 326 | - } |
|
| 327 | - |
|
| 328 | - if( ! current_user_can( 'update_plugins' ) ) { |
|
| 329 | - wp_die( esc_html__( 'You do not have permission to install plugin updates.', 'edd' ), esc_html__( 'Error', 'edd' ), array( 'response' => 403 ) ); |
|
| 330 | - } |
|
| 331 | - |
|
| 332 | - $response = $this->api_request( 'plugin_latest_version', array( 'slug' => $_REQUEST['slug'] ) ); |
|
| 333 | - |
|
| 334 | - if( $response && isset( $response->sections['changelog'] ) ) { |
|
| 335 | - echo '<div style="background:#fff;padding:10px;">' . $response->sections['changelog'] . '</div>'; |
|
| 336 | - } |
|
| 337 | - |
|
| 338 | - |
|
| 339 | - exit; |
|
| 340 | - } |
|
| 320 | + if( empty( $_REQUEST['plugin'] ) ) { |
|
| 321 | + return; |
|
| 322 | + } |
|
| 323 | + |
|
| 324 | + if( empty( $_REQUEST['slug'] ) ) { |
|
| 325 | + return; |
|
| 326 | + } |
|
| 327 | + |
|
| 328 | + if( ! current_user_can( 'update_plugins' ) ) { |
|
| 329 | + wp_die( esc_html__( 'You do not have permission to install plugin updates.', 'edd' ), esc_html__( 'Error', 'edd' ), array( 'response' => 403 ) ); |
|
| 330 | + } |
|
| 331 | + |
|
| 332 | + $response = $this->api_request( 'plugin_latest_version', array( 'slug' => $_REQUEST['slug'] ) ); |
|
| 333 | + |
|
| 334 | + if( $response && isset( $response->sections['changelog'] ) ) { |
|
| 335 | + echo '<div style="background:#fff;padding:10px;">' . $response->sections['changelog'] . '</div>'; |
|
| 336 | + } |
|
| 337 | + |
|
| 338 | + |
|
| 339 | + exit; |
|
| 340 | + } |
|
| 341 | 341 | |
| 342 | 342 | } |
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | //set_site_transient( 'update_plugins', null ); |
| 5 | 5 | |
| 6 | 6 | // Exit if accessed directly |
| 7 | -if ( ! defined( 'ABSPATH' ) ) exit; |
|
| 7 | +if ( ! defined('ABSPATH')) exit; |
|
| 8 | 8 | |
| 9 | 9 | /** |
| 10 | 10 | * Allows plugins to use their own update API. |
@@ -29,16 +29,16 @@ discard block |
||
| 29 | 29 | * @param array $_api_data Optional data to send with API calls. |
| 30 | 30 | * @return void |
| 31 | 31 | */ |
| 32 | - function __construct( $_api_url, $_plugin_file, $_api_data = null ) { |
|
| 33 | - $this->api_url = trailingslashit( $_api_url ); |
|
| 32 | + function __construct($_api_url, $_plugin_file, $_api_data = null) { |
|
| 33 | + $this->api_url = trailingslashit($_api_url); |
|
| 34 | 34 | $this->api_data = $_api_data; |
| 35 | - $this->name = plugin_basename( $_plugin_file ); |
|
| 36 | - $this->slug = basename( $_plugin_file, '.php' ); |
|
| 35 | + $this->name = plugin_basename($_plugin_file); |
|
| 36 | + $this->slug = basename($_plugin_file, '.php'); |
|
| 37 | 37 | $this->version = $_api_data['version']; |
| 38 | 38 | |
| 39 | 39 | // Set up hooks. |
| 40 | 40 | $this->init(); |
| 41 | - add_action( 'admin_init', array( $this, 'show_changelog' ) ); |
|
| 41 | + add_action('admin_init', array($this, 'show_changelog')); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | /** |
@@ -50,10 +50,10 @@ discard block |
||
| 50 | 50 | */ |
| 51 | 51 | public function init() { |
| 52 | 52 | |
| 53 | - add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) ); |
|
| 54 | - add_filter( 'plugins_api', array( $this, 'plugins_api_filter' ), 10, 3 ); |
|
| 53 | + add_filter('pre_set_site_transient_update_plugins', array($this, 'check_update')); |
|
| 54 | + add_filter('plugins_api', array($this, 'plugins_api_filter'), 10, 3); |
|
| 55 | 55 | |
| 56 | - add_action( 'after_plugin_row_' . $this->name, array( $this, 'show_update_notification' ), 10, 2 ); |
|
| 56 | + add_action('after_plugin_row_'.$this->name, array($this, 'show_update_notification'), 10, 2); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | /** |
@@ -69,34 +69,34 @@ discard block |
||
| 69 | 69 | * @param array $_transient_data Update array build by WordPress. |
| 70 | 70 | * @return array Modified update array with custom plugin data. |
| 71 | 71 | */ |
| 72 | - function check_update( $_transient_data ) { |
|
| 72 | + function check_update($_transient_data) { |
|
| 73 | 73 | |
| 74 | 74 | global $pagenow; |
| 75 | 75 | |
| 76 | - if( ! is_object( $_transient_data ) ) { |
|
| 76 | + if ( ! is_object($_transient_data)) { |
|
| 77 | 77 | $_transient_data = new stdClass; |
| 78 | 78 | } |
| 79 | 79 | |
| 80 | - if( 'plugins.php' == $pagenow && is_multisite() ) { |
|
| 80 | + if ('plugins.php' == $pagenow && is_multisite()) { |
|
| 81 | 81 | return $_transient_data; |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | - if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) { |
|
| 84 | + if (empty($_transient_data->response) || empty($_transient_data->response[$this->name])) { |
|
| 85 | 85 | |
| 86 | - $version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) ); |
|
| 86 | + $version_info = $this->api_request('plugin_latest_version', array('slug' => $this->slug)); |
|
| 87 | 87 | |
| 88 | - if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) { |
|
| 88 | + if (false !== $version_info && is_object($version_info) && isset($version_info->new_version)) { |
|
| 89 | 89 | |
| 90 | 90 | $this->did_check = true; |
| 91 | 91 | |
| 92 | - if( version_compare( $this->version, $version_info->new_version, '<' ) ) { |
|
| 92 | + if (version_compare($this->version, $version_info->new_version, '<')) { |
|
| 93 | 93 | |
| 94 | - $_transient_data->response[ $this->name ] = $version_info; |
|
| 94 | + $_transient_data->response[$this->name] = $version_info; |
|
| 95 | 95 | |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | $_transient_data->last_checked = time(); |
| 99 | - $_transient_data->checked[ $this->name ] = $this->version; |
|
| 99 | + $_transient_data->checked[$this->name] = $this->version; |
|
| 100 | 100 | |
| 101 | 101 | } |
| 102 | 102 | |
@@ -111,86 +111,86 @@ discard block |
||
| 111 | 111 | * @param string $file |
| 112 | 112 | * @param array $plugin |
| 113 | 113 | */ |
| 114 | - public function show_update_notification( $file, $plugin ) { |
|
| 114 | + public function show_update_notification($file, $plugin) { |
|
| 115 | 115 | |
| 116 | - if( ! current_user_can( 'update_plugins' ) ) { |
|
| 116 | + if ( ! current_user_can('update_plugins')) { |
|
| 117 | 117 | return; |
| 118 | 118 | } |
| 119 | 119 | |
| 120 | - if( ! is_multisite() ) { |
|
| 120 | + if ( ! is_multisite()) { |
|
| 121 | 121 | return; |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | - if ( $this->name != $file ) { |
|
| 124 | + if ($this->name != $file) { |
|
| 125 | 125 | return; |
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | // Remove our filter on the site transient |
| 129 | - remove_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ), 10 ); |
|
| 129 | + remove_filter('pre_set_site_transient_update_plugins', array($this, 'check_update'), 10); |
|
| 130 | 130 | |
| 131 | - $update_cache = get_site_transient( 'update_plugins' ); |
|
| 131 | + $update_cache = get_site_transient('update_plugins'); |
|
| 132 | 132 | |
| 133 | - if ( ! is_object( $update_cache ) || empty( $update_cache->response ) || empty( $update_cache->response[ $this->name ] ) ) { |
|
| 133 | + if ( ! is_object($update_cache) || empty($update_cache->response) || empty($update_cache->response[$this->name])) { |
|
| 134 | 134 | |
| 135 | - $cache_key = md5( 'edd_plugin_' .sanitize_key( $this->name ) . '_version_info' ); |
|
| 136 | - $version_info = get_transient( $cache_key ); |
|
| 135 | + $cache_key = md5('edd_plugin_'.sanitize_key($this->name).'_version_info'); |
|
| 136 | + $version_info = get_transient($cache_key); |
|
| 137 | 137 | |
| 138 | - if( false === $version_info ) { |
|
| 138 | + if (false === $version_info) { |
|
| 139 | 139 | |
| 140 | - $version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) ); |
|
| 140 | + $version_info = $this->api_request('plugin_latest_version', array('slug' => $this->slug)); |
|
| 141 | 141 | |
| 142 | - set_transient( $cache_key, $version_info, 3600 ); |
|
| 142 | + set_transient($cache_key, $version_info, 3600); |
|
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | |
| 146 | - if( ! is_object( $version_info ) ) { |
|
| 146 | + if ( ! is_object($version_info)) { |
|
| 147 | 147 | return; |
| 148 | 148 | } |
| 149 | 149 | |
| 150 | - if( version_compare( $this->version, $version_info->new_version, '<' ) ) { |
|
| 150 | + if (version_compare($this->version, $version_info->new_version, '<')) { |
|
| 151 | 151 | |
| 152 | - $update_cache->response[ $this->name ] = $version_info; |
|
| 152 | + $update_cache->response[$this->name] = $version_info; |
|
| 153 | 153 | |
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | $update_cache->last_checked = time(); |
| 157 | - $update_cache->checked[ $this->name ] = $this->version; |
|
| 157 | + $update_cache->checked[$this->name] = $this->version; |
|
| 158 | 158 | |
| 159 | - set_site_transient( 'update_plugins', $update_cache ); |
|
| 159 | + set_site_transient('update_plugins', $update_cache); |
|
| 160 | 160 | |
| 161 | 161 | } else { |
| 162 | 162 | |
| 163 | - $version_info = $update_cache->response[ $this->name ]; |
|
| 163 | + $version_info = $update_cache->response[$this->name]; |
|
| 164 | 164 | |
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | // Restore our filter |
| 168 | - add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) ); |
|
| 168 | + add_filter('pre_set_site_transient_update_plugins', array($this, 'check_update')); |
|
| 169 | 169 | |
| 170 | - if ( ! empty( $update_cache->response[ $this->name ] ) && version_compare( $this->version, $version_info->new_version, '<' ) ) { |
|
| 170 | + if ( ! empty($update_cache->response[$this->name]) && version_compare($this->version, $version_info->new_version, '<')) { |
|
| 171 | 171 | |
| 172 | 172 | // build a plugin list row, with update notification |
| 173 | - $wp_list_table = _get_list_table( 'WP_Plugins_List_Table' ); |
|
| 174 | - echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">'; |
|
| 173 | + $wp_list_table = _get_list_table('WP_Plugins_List_Table'); |
|
| 174 | + echo '<tr class="plugin-update-tr"><td colspan="'.$wp_list_table->get_column_count().'" class="plugin-update colspanchange"><div class="update-message">'; |
|
| 175 | 175 | |
| 176 | - $changelog_link = self_admin_url( 'index.php?edd_sl_action=view_plugin_changelog&plugin=' . $this->name . '&slug=' . $this->slug . '&TB_iframe=true&width=772&height=911' ); |
|
| 176 | + $changelog_link = self_admin_url('index.php?edd_sl_action=view_plugin_changelog&plugin='.$this->name.'&slug='.$this->slug.'&TB_iframe=true&width=772&height=911'); |
|
| 177 | 177 | |
| 178 | - if ( empty( $version_info->download_link ) ) { |
|
| 178 | + if (empty($version_info->download_link)) { |
|
| 179 | 179 | printf( |
| 180 | 180 | /* translators: 1: name 2: changelog URL 3: version */ |
| 181 | - __( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'edd' ), |
|
| 182 | - esc_html( $version_info->name ), |
|
| 183 | - esc_url( $changelog_link ), |
|
| 184 | - esc_html( $version_info->new_version ) |
|
| 181 | + __('There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'edd'), |
|
| 182 | + esc_html($version_info->name), |
|
| 183 | + esc_url($changelog_link), |
|
| 184 | + esc_html($version_info->new_version) |
|
| 185 | 185 | ); |
| 186 | 186 | } else { |
| 187 | 187 | printf( |
| 188 | 188 | /* translators: 1: name 2: changelog URL 3: version 4: update URL */ |
| 189 | - __( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'edd' ), |
|
| 190 | - esc_html( $version_info->name ), |
|
| 191 | - esc_url( $changelog_link ), |
|
| 192 | - esc_html( $version_info->new_version ), |
|
| 193 | - esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) |
|
| 189 | + __('There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'edd'), |
|
| 190 | + esc_html($version_info->name), |
|
| 191 | + esc_url($changelog_link), |
|
| 192 | + esc_html($version_info->new_version), |
|
| 193 | + esc_url(wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=').$this->name, 'upgrade-plugin_'.$this->name)) |
|
| 194 | 194 | ); |
| 195 | 195 | } |
| 196 | 196 | |
@@ -209,16 +209,16 @@ discard block |
||
| 209 | 209 | * @param object $_args |
| 210 | 210 | * @return object $_data |
| 211 | 211 | */ |
| 212 | - function plugins_api_filter( $_data, $_action = '', $_args = null ) { |
|
| 212 | + function plugins_api_filter($_data, $_action = '', $_args = null) { |
|
| 213 | 213 | |
| 214 | 214 | |
| 215 | - if ( $_action != 'plugin_information' ) { |
|
| 215 | + if ($_action != 'plugin_information') { |
|
| 216 | 216 | |
| 217 | 217 | return $_data; |
| 218 | 218 | |
| 219 | 219 | } |
| 220 | 220 | |
| 221 | - if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) { |
|
| 221 | + if ( ! isset($_args->slug) || ($_args->slug != $this->slug)) { |
|
| 222 | 222 | |
| 223 | 223 | return $_data; |
| 224 | 224 | |
@@ -233,9 +233,9 @@ discard block |
||
| 233 | 233 | ) |
| 234 | 234 | ); |
| 235 | 235 | |
| 236 | - $api_response = $this->api_request( 'plugin_information', $to_send ); |
|
| 236 | + $api_response = $this->api_request('plugin_information', $to_send); |
|
| 237 | 237 | |
| 238 | - if ( false !== $api_response ) { |
|
| 238 | + if (false !== $api_response) { |
|
| 239 | 239 | $_data = $api_response; |
| 240 | 240 | } |
| 241 | 241 | |
@@ -250,9 +250,9 @@ discard block |
||
| 250 | 250 | * @param string $url |
| 251 | 251 | * @return object $array |
| 252 | 252 | */ |
| 253 | - function http_request_args( $args, $url ) { |
|
| 253 | + function http_request_args($args, $url) { |
|
| 254 | 254 | // If it is an https request and we are performing a package download, disable ssl verification |
| 255 | - if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) { |
|
| 255 | + if (strpos($url, 'https://') !== false && strpos($url, 'edd_action=package_download')) { |
|
| 256 | 256 | $args['sslverify'] = false; |
| 257 | 257 | } |
| 258 | 258 | return $args; |
@@ -269,40 +269,40 @@ discard block |
||
| 269 | 269 | * @param array $_data Parameters for the API action. |
| 270 | 270 | * @return false||object |
| 271 | 271 | */ |
| 272 | - private function api_request( $_action, $_data ) { |
|
| 272 | + private function api_request($_action, $_data) { |
|
| 273 | 273 | |
| 274 | 274 | global $wp_version; |
| 275 | 275 | |
| 276 | - $data = array_merge( $this->api_data, $_data ); |
|
| 276 | + $data = array_merge($this->api_data, $_data); |
|
| 277 | 277 | |
| 278 | - if ( $data['slug'] != $this->slug ) |
|
| 278 | + if ($data['slug'] != $this->slug) |
|
| 279 | 279 | return; |
| 280 | 280 | |
| 281 | - if ( empty( $data['license'] ) ) |
|
| 281 | + if (empty($data['license'])) |
|
| 282 | 282 | return; |
| 283 | 283 | |
| 284 | - if( $this->api_url == home_url() ) { |
|
| 284 | + if ($this->api_url == home_url()) { |
|
| 285 | 285 | return false; // Don't allow a plugin to ping itself |
| 286 | 286 | } |
| 287 | 287 | |
| 288 | 288 | $api_params = array( |
| 289 | 289 | 'edd_action' => 'get_version', |
| 290 | 290 | 'license' => $data['license'], |
| 291 | - 'item_name' => isset( $data['item_name'] ) ? $data['item_name'] : false, |
|
| 292 | - 'item_id' => isset( $data['item_id'] ) ? $data['item_id'] : false, |
|
| 291 | + 'item_name' => isset($data['item_name']) ? $data['item_name'] : false, |
|
| 292 | + 'item_id' => isset($data['item_id']) ? $data['item_id'] : false, |
|
| 293 | 293 | 'slug' => $data['slug'], |
| 294 | 294 | 'author' => $data['author'], |
| 295 | 295 | 'url' => home_url() |
| 296 | 296 | ); |
| 297 | 297 | |
| 298 | - $request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => false, 'body' => $api_params ) ); |
|
| 298 | + $request = wp_remote_post($this->api_url, array('timeout' => 15, 'sslverify' => false, 'body' => $api_params)); |
|
| 299 | 299 | |
| 300 | - if ( ! is_wp_error( $request ) ) { |
|
| 301 | - $request = json_decode( wp_remote_retrieve_body( $request ) ); |
|
| 300 | + if ( ! is_wp_error($request)) { |
|
| 301 | + $request = json_decode(wp_remote_retrieve_body($request)); |
|
| 302 | 302 | } |
| 303 | 303 | |
| 304 | - if ( $request && isset( $request->sections ) ) { |
|
| 305 | - $request->sections = maybe_unserialize( $request->sections ); |
|
| 304 | + if ($request && isset($request->sections)) { |
|
| 305 | + $request->sections = maybe_unserialize($request->sections); |
|
| 306 | 306 | } else { |
| 307 | 307 | $request = false; |
| 308 | 308 | } |
@@ -313,26 +313,26 @@ discard block |
||
| 313 | 313 | public function show_changelog() { |
| 314 | 314 | |
| 315 | 315 | |
| 316 | - if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) { |
|
| 316 | + if (empty($_REQUEST['edd_sl_action']) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action']) { |
|
| 317 | 317 | return; |
| 318 | 318 | } |
| 319 | 319 | |
| 320 | - if( empty( $_REQUEST['plugin'] ) ) { |
|
| 320 | + if (empty($_REQUEST['plugin'])) { |
|
| 321 | 321 | return; |
| 322 | 322 | } |
| 323 | 323 | |
| 324 | - if( empty( $_REQUEST['slug'] ) ) { |
|
| 324 | + if (empty($_REQUEST['slug'])) { |
|
| 325 | 325 | return; |
| 326 | 326 | } |
| 327 | 327 | |
| 328 | - if( ! current_user_can( 'update_plugins' ) ) { |
|
| 329 | - wp_die( esc_html__( 'You do not have permission to install plugin updates.', 'edd' ), esc_html__( 'Error', 'edd' ), array( 'response' => 403 ) ); |
|
| 328 | + if ( ! current_user_can('update_plugins')) { |
|
| 329 | + wp_die(esc_html__('You do not have permission to install plugin updates.', 'edd'), esc_html__('Error', 'edd'), array('response' => 403)); |
|
| 330 | 330 | } |
| 331 | 331 | |
| 332 | - $response = $this->api_request( 'plugin_latest_version', array( 'slug' => $_REQUEST['slug'] ) ); |
|
| 332 | + $response = $this->api_request('plugin_latest_version', array('slug' => $_REQUEST['slug'])); |
|
| 333 | 333 | |
| 334 | - if( $response && isset( $response->sections['changelog'] ) ) { |
|
| 335 | - echo '<div style="background:#fff;padding:10px;">' . $response->sections['changelog'] . '</div>'; |
|
| 334 | + if ($response && isset($response->sections['changelog'])) { |
|
| 335 | + echo '<div style="background:#fff;padding:10px;">'.$response->sections['changelog'].'</div>'; |
|
| 336 | 336 | } |
| 337 | 337 | |
| 338 | 338 | |
