Changeset 6600 for sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/reimbursement-request.php

Timestamp:

02/12/2018 05:39:09 PM (8 years ago)

Author:

iandunn

Message:

WordCamp Payments: Call Export_CSV::esc_csv() instead of wcorg_esc_csv().

The latter was removed in favor of the former.

File:

• sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/reimbursement-request.php (modified) (12 diffs)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/reimbursement-request.php

@@ -7 +7 @@
 namespace WordCamp\Budgets\Reimbursement_Requests;
 use WCP_Encryption;
+use WordCamp\Utilities;
 
 defined( 'WPINC' ) or die();
@@ -865 +866 @@
     $report = fopen( 'php://output', 'w' );
 
-    fputcsv( $report, wcorg_esc_csv( $column_headings ) );
+    fputcsv( $report, Utilities\Export_CSV::esc_csv( $column_headings ) );
 
     foreach( $args['data'] as $entry ) {
@@ -938 +939 @@
 
         if ( ! empty( $row ) ) {
-            fputcsv( $report, wcorg_esc_csv( $row ) );
+            fputcsv( $report, Utilities\Export_CSV::esc_csv( $row ) );
         }
 
         // Break out expenses into individual line items
         foreach ( $expenses as $expense ) {
-            fputcsv( $report, wcorg_esc_csv( _generate_payment_report_default_line_items( $expense, $row ) ) );
+            fputcsv( $report, Utilities\Export_CSV::esc_csv( _generate_payment_report_default_line_items( $expense, $row ) ) );
         }
     }
@@ -1005 +1006 @@
 
     // File Header
-    fputcsv( $report, wcorg_esc_csv( array( 'FILHDR', 'PWS', $options['pws_customer_id'], date( 'm/d/Y' ), date( 'Hi' ) ) ), ',', '|' );
+    fputcsv( $report, Utilities\Export_CSV::esc_csv( array( 'FILHDR', 'PWS', $options['pws_customer_id'], date( 'm/d/Y' ), date( 'Hi' ) ) ), ',', '|' );
 
     $total = 0;
@@ -1064 +1065 @@
 
         // Payment Header
-        fputcsv( $report, wcorg_esc_csv( array(
+        fputcsv( $report, Utilities\Export_CSV::esc_csv( array(
             'PMTHDR',
             'USPS',
@@ -1077 +1078 @@
 
         // Payee Name Record
-        fputcsv( $report, wcorg_esc_csv( array(
+        fputcsv( $report, Utilities\Export_CSV::esc_csv( array(
             'PAYENM',
             substr( $payable_to, 0, 35 ),
@@ -1085 +1086 @@
 
         // Payee Address Record
-        fputcsv( $report, wcorg_esc_csv( array(
+        fputcsv( $report, Utilities\Export_CSV::esc_csv( array(
             'PYEADD',
             substr( WCP_Encryption::maybe_decrypt( get_post_meta( $post->ID, '_wcbrr_check_street_address', true ) ), 0, 35 ),
@@ -1092 +1093 @@
 
         // Additional Payee Address Record
-        fputcsv( $report, wcorg_esc_csv( array( 'ADDPYE', '', '' ) ), ',', '|' );
+        fputcsv( $report, Utilities\Export_CSV::esc_csv( array( 'ADDPYE', '', '' ) ), ',', '|' );
 
         // Payee Postal Record
-        fputcsv( $report, wcorg_esc_csv( array(
+        fputcsv( $report, Utilities\Export_CSV::esc_csv( array(
             'PYEPOS',
             substr( WCP_Encryption::maybe_decrypt( get_post_meta( $post->ID, '_wcbrr_check_city',     true ) ), 0, 35 ),
@@ -1104 +1105 @@
 
         // Payment Description
-        fputcsv( $report, wcorg_esc_csv( array(
+        fputcsv( $report, Utilities\Export_CSV::esc_csv( array(
             'PYTDES',
             substr( $description, 0, 122 ),
@@ -1113 +1114 @@
 
     // File Trailer
-    fputcsv( $report, wcorg_esc_csv( array( 'FILTRL', $count * 6 + 2 ) ), ',', '|' );
+    fputcsv( $report, Utilities\Export_CSV::esc_csv( array( 'FILTRL', $count * 6 + 2 ) ), ',', '|' );
 
     // Update counter and unlock
@@ -1329 +1330 @@
 
     // JPM Header
-    fputcsv( $report, wcorg_esc_csv( array( 'HEADER', gmdate( 'YmdHis' ), '1' ) ) );
+    fputcsv( $report, Utilities\Export_CSV::esc_csv( array( 'HEADER', gmdate( 'YmdHis' ), '1' ) ) );
 
     $total = 0;
@@ -1540 +1541 @@
         // print_r( $row );
 
-        fputcsv( $report, wcorg_esc_csv( array_values( $row ) ) );
+        fputcsv( $report, Utilities\Export_CSV::esc_csv( array_values( $row ) ) );
         restore_current_blog();
     }
 
     // JPM Trailer
-    fputcsv( $report, wcorg_esc_csv( array( 'TRAILER', $count, $total ) ) );
+    fputcsv( $report, Utilities\Export_CSV::esc_csv( array( 'TRAILER', $count, $total ) ) );
 
     fclose( $report );