Changeset 2576

Timestamp:

02/24/2016 07:23:47 PM (11 years ago)

Author:

kovshenin

Message:

WordCamp.org: Use different file names for different export types.

File:

• sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-dashboard.php (modified) (2 diffs)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-dashboard.php

@@ -275 +275 @@
                                 'label' => 'Default',
                                 'mime_type' => 'text/csv',
-                                'ext' => 'csv',
                                 'callback' => array( __CLASS__, '_generate_payment_report_default' ),
+                                'filename' => 'wordcamp-payments-%s-%s-default.csv',
                         ),
                         'jpm_wires' => array(
                                 'label' => 'JP Morgan Access - Wire Payments',
                                 'mime_type' => 'text/csv',
-                                'ext' => 'csv',
                                 'callback' => array( __CLASS__, '_generate_payment_report_jpm_wires' ),
+                                'filename' => 'wordcamp-payments-%s-%s-jpm-wires.csv',
                         ),
                         'jpm_ach' => array(
                                 'label' => 'JP Morgan - NACHA',
                                 'mime_type' => 'text/plain',
-                                'ext' => 'ach',
                                 'callback' => array( __CLASS__, '_generate_payment_report_jpm_ach' ),
+                                'filename' => 'wordcamp-payments-%s-%s-jpm-ach.ach',
                         ),
                         'jpm_checks' => array(
                                 'label' => 'JP Morgan - Quick Checks',
                                 'mime_type' => 'text/csv',
-                                'ext' => 'csv',
                                 'callback' => array( __CLASS__, '_generate_payment_report_jpm_checks' ),
+                                'filename' => 'wordcamp-payments-%s-%s-jpm-checks.csv',
                         ),
                 );
@@ -321 +321 @@
                 $start_date = strtotime( $_POST['wcpn_export_start_date'] . ' 00:00:00' );
                 $end_date   = strtotime( $_POST['wcpn_export_end_date']   . ' 23:59:59' );
-                $filename   = sanitize_file_name( sprintf( 'wordcamp-payments-%s-to-%s.%s',
-                        date( 'Y-m-d', $start_date ), date( 'Y-m-d', $end_date ), $export_type['ext'] ) );
+                $filename = sprintf( $export_type['filename'], date( 'Ymd', $start_date ), date( 'Ymd', $end_date ) );
+                $filename = sanitize_file_name( $filename );
 
                 $report = self::generate_payment_report( $_POST['wcpn_date_type'], $start_date, $end_date, $export_type );