<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[6600] sites/trunk/wordcamp.org/public_html/wp-content/plugins: WordCamp Payments: Call `Export_CSV::esc_csv()` instead of `wcorg_esc_csv()`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/6600">6600</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/6600","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-02-12 17:39:09 +0000 (Mon, 12 Feb 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WordCamp Payments: Call `Export_CSV::esc_csv()` instead of `wcorg_esc_csv()`.
The latter was removed in favor of the former.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixbadgegeneratorincludesindesignbadgesphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/includes/indesign-badges.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludespaymentrequestphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludesreimbursementrequestphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/reimbursement-request.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixbadgegeneratorincludesindesignbadgesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/includes/indesign-badges.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/includes/indesign-badges.php 2018-02-12 17:35:19 UTC (rev 6599)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/includes/indesign-badges.php 2018-02-12 17:39:09 UTC (rev 6600)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,6 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> use \CampTix\Badge_Generator;
</span><span class="cx" style="display: block; padding: 0 10px"> use \CampTix\Badge_Generator\HTML;
</span><span class="cx" style="display: block; padding: 0 10px"> use \WordCamp\Logger;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use WordCamp\Utilities;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> defined( 'WPINC' ) or die();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,7 +212,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> throw new \Exception( __( "Couldn't open CSV file.", 'wordcamporg' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $csv_handle, wcorg_esc_csv( get_header_row( $admin_flags, $questions ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $csv_handle, Utilities\Export_CSV::esc_csv( get_header_row( $admin_flags, $questions ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $attendees as $attendee ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $row = get_attendee_csv_row( $attendee, $gravatar_folder, $destination_directory, $empty_twitter, $admin_flags, $questions );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,7 +221,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $csv_handle, wcorg_esc_csv( $row ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $csv_handle, Utilities\Export_CSV::esc_csv( $row ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> fclose( $csv_handle );
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludespaymentrequestphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php 2018-02-12 17:35:19 UTC (rev 6599)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php 2018-02-12 17:39:09 UTC (rev 6600)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use WordCamp\Utilities;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Create the Vendor Payments post type and associated functionality
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -967,7 +969,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> $report = fopen( 'php://output', 'w' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( $column_headings ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( $column_headings ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach( $args['data'] as $entry ) {
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $entry->blog_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1045,7 +1047,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $row ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( $row ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( $row ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1078,7 +1080,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // File Header
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( array( 'FILHDR', 'PWS', $options['pws_customer_id'], date( 'm/d/Y' ), date( 'Hi' ) ) ), ',', '|' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( array( 'FILHDR', 'PWS', $options['pws_customer_id'], date( 'm/d/Y' ), date( 'Hi' ) ) ), ',', '|' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $total = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $count = 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1126,7 +1128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Payment Header
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'PMTHDR',
</span><span class="cx" style="display: block; padding: 0 10px"> 'USPS',
</span><span class="cx" style="display: block; padding: 0 10px"> 'QKCHECKS',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1139,7 +1141,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) ), ',', '|' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Payee Name Record
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'PAYENM',
</span><span class="cx" style="display: block; padding: 0 10px"> substr( $payable_to, 0, 35 ),
</span><span class="cx" style="display: block; padding: 0 10px"> '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1147,17 +1149,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) ), ',', '|' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Payee Address Record
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'PYEADD',
</span><span class="cx" style="display: block; padding: 0 10px"> substr( get_post_meta( $post->ID, '_camppayments_vendor_street_address', true ), 0, 35 ),
</span><span class="cx" style="display: block; padding: 0 10px"> '',
</span><span class="cx" style="display: block; padding: 0 10px"> ) ), ',', '|' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Additional Payee Address Record
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( array( 'ADDPYE', '', '' ) ), ',', '|' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( array( 'ADDPYE', '', '' ) ), ',', '|' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Payee Postal Record
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'PYEPOS',
</span><span class="cx" style="display: block; padding: 0 10px"> substr( get_post_meta( $post->ID, '_camppayments_vendor_city', true ), 0, 35 ),
</span><span class="cx" style="display: block; padding: 0 10px"> substr( get_post_meta( $post->ID, '_camppayments_vendor_state', true ), 0, 35 ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1166,7 +1168,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) ), ',', '|' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Payment Description
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'PYTDES',
</span><span class="cx" style="display: block; padding: 0 10px"> substr( $description, 0, 122 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) ), ',', '|' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1175,7 +1177,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // File Trailer
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( array( 'FILTRL', $count * 6 + 2 ) ), ',', '|' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( array( 'FILTRL', $count * 6 + 2 ) ), ',', '|' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Update counter and unlock
</span><span class="cx" style="display: block; padding: 0 10px"> $start = absint( get_site_option( '_wcb_jpm_checks_counter', 0 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1383,7 +1385,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $report = fopen( 'php://output', 'w' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // JPM Header
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( array( 'HEADER', gmdate( 'YmdHis' ), '1' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( array( 'HEADER', gmdate( 'YmdHis' ), '1' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $total = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $count = 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1586,12 +1588,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Use for debugging.
</span><span class="cx" style="display: block; padding: 0 10px"> // print_r( $row );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( array_values( $row ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( array_values( $row ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // JPM Trailer
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( array( 'TRAILER', $count, $total ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( array( 'TRAILER', $count, $total ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> fclose( $report );
</span><span class="cx" style="display: block; padding: 0 10px"> $results = ob_get_clean();
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludesreimbursementrequestphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/reimbursement-request.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/reimbursement-request.php 2018-02-12 17:35:19 UTC (rev 6599)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/reimbursement-request.php 2018-02-12 17:39:09 UTC (rev 6600)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,6 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordCamp\Budgets\Reimbursement_Requests;
</span><span class="cx" style="display: block; padding: 0 10px"> use WCP_Encryption;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use WordCamp\Utilities;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> defined( 'WPINC' ) or die();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -864,7 +865,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> $report = fopen( 'php://output', 'w' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( $column_headings ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( $column_headings ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach( $args['data'] as $entry ) {
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $entry->blog_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -937,12 +938,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $row ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( $row ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( $row ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Break out expenses into individual line items
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $expenses as $expense ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( _generate_payment_report_default_line_items( $expense, $row ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( _generate_payment_report_default_line_items( $expense, $row ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1004,7 +1005,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // File Header
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( array( 'FILHDR', 'PWS', $options['pws_customer_id'], date( 'm/d/Y' ), date( 'Hi' ) ) ), ',', '|' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( array( 'FILHDR', 'PWS', $options['pws_customer_id'], date( 'm/d/Y' ), date( 'Hi' ) ) ), ',', '|' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $total = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $count = 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1063,7 +1064,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $description = html_entity_decode( $description );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Payment Header
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'PMTHDR',
</span><span class="cx" style="display: block; padding: 0 10px"> 'USPS',
</span><span class="cx" style="display: block; padding: 0 10px"> 'QKCHECKS',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1076,7 +1077,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) ), ',', '|' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Payee Name Record
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'PAYENM',
</span><span class="cx" style="display: block; padding: 0 10px"> substr( $payable_to, 0, 35 ),
</span><span class="cx" style="display: block; padding: 0 10px"> '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1084,17 +1085,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) ), ',', '|' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Payee Address Record
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'PYEADD',
</span><span class="cx" style="display: block; padding: 0 10px"> substr( WCP_Encryption::maybe_decrypt( get_post_meta( $post->ID, '_wcbrr_check_street_address', true ) ), 0, 35 ),
</span><span class="cx" style="display: block; padding: 0 10px"> '',
</span><span class="cx" style="display: block; padding: 0 10px"> ) ), ',', '|' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Additional Payee Address Record
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( array( 'ADDPYE', '', '' ) ), ',', '|' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( array( 'ADDPYE', '', '' ) ), ',', '|' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Payee Postal Record
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'PYEPOS',
</span><span class="cx" style="display: block; padding: 0 10px"> substr( WCP_Encryption::maybe_decrypt( get_post_meta( $post->ID, '_wcbrr_check_city', true ) ), 0, 35 ),
</span><span class="cx" style="display: block; padding: 0 10px"> substr( WCP_Encryption::maybe_decrypt( get_post_meta( $post->ID, '_wcbrr_check_state', true ) ), 0, 35 ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1103,7 +1104,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) ), ',', '|' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Payment Description
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'PYTDES',
</span><span class="cx" style="display: block; padding: 0 10px"> substr( $description, 0, 122 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) ), ',', '|' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1112,7 +1113,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // File Trailer
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( array( 'FILTRL', $count * 6 + 2 ) ), ',', '|' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( array( 'FILTRL', $count * 6 + 2 ) ), ',', '|' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Update counter and unlock
</span><span class="cx" style="display: block; padding: 0 10px"> $start = absint( get_site_option( '_wcb_jpm_checks_counter', 0 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1328,7 +1329,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $report = fopen( 'php://output', 'w' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // JPM Header
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( array( 'HEADER', gmdate( 'YmdHis' ), '1' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( array( 'HEADER', gmdate( 'YmdHis' ), '1' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $total = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $count = 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1539,12 +1540,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Use for debugging.
</span><span class="cx" style="display: block; padding: 0 10px"> // print_r( $row );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( array_values( $row ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( array_values( $row ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // JPM Trailer
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, wcorg_esc_csv( array( 'TRAILER', $count, $total ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fputcsv( $report, Utilities\Export_CSV::esc_csv( array( 'TRAILER', $count, $total ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> fclose( $report );
</span><span class="cx" style="display: block; padding: 0 10px"> $results = ob_get_clean();
</span></span></pre>
</div>
</div>
</body>
</html>