Changeset 6600 for sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-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/payment-request.php (modified) (12 diffs)

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

@@ -1 +1 @@
 <?php
+
+use WordCamp\Utilities;
 
 /*
@@ -968 +970 @@
         $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 ) {
@@ -1046 +1048 @@
 
             if ( ! empty( $row ) ) {
-                fputcsv( $report, wcorg_esc_csv( $row ) );
+                fputcsv( $report, Utilities\Export_CSV::esc_csv( $row ) );
             }
         }
@@ -1079 +1081 @@
 
         // 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;
@@ -1127 +1129 @@
 
             // Payment Header
-            fputcsv( $report, wcorg_esc_csv( array(
+            fputcsv( $report, Utilities\Export_CSV::esc_csv( array(
                 'PMTHDR',
                 'USPS',
@@ -1140 +1142 @@
 
             // Payee Name Record
-            fputcsv( $report, wcorg_esc_csv( array(
+            fputcsv( $report, Utilities\Export_CSV::esc_csv( array(
                 'PAYENM',
                 substr( $payable_to, 0, 35 ),
@@ -1148 +1150 @@
 
             // Payee Address Record
-            fputcsv( $report, wcorg_esc_csv( array(
+            fputcsv( $report, Utilities\Export_CSV::esc_csv( array(
                 'PYEADD',
                 substr( get_post_meta( $post->ID, '_camppayments_vendor_street_address', true ), 0, 35 ),
@@ -1155 +1157 @@
 
             // 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( get_post_meta( $post->ID, '_camppayments_vendor_city', true ), 0, 35 ),
@@ -1167 +1169 @@
 
             // Payment Description
-            fputcsv( $report, wcorg_esc_csv( array(
+            fputcsv( $report, Utilities\Export_CSV::esc_csv( array(
                 'PYTDES',
                 substr( $description, 0, 122 ),
@@ -1176 +1178 @@
 
         // 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
@@ -1384 +1386 @@
 
         // 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;
@@ -1587 +1589 @@
             // 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 );