<!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>[6601] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/sponsor-payment-stripe.php: WordCamp Payments: Apply coding standards to `sponsor-payment-stripe.php`.</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/6601">6601</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/6601","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:13 +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: Apply coding standards to `sponsor-payment-stripe.php`.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludessponsorpaymentstripephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/sponsor-payment-stripe.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludessponsorpaymentstripephp"></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/sponsor-payment-stripe.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/sponsor-payment-stripe.php 2018-02-12 17:39:09 UTC (rev 6600)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/sponsor-payment-stripe.php 2018-02-12 17:39:13 UTC (rev 6601)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,13 +4,14 @@
</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"> namespace WordCamp\Budgets\Sponsor_Payment_Stripe;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use WordCamp_Budgets;
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-const STEP_SELECT_INVOICE = 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const STEP_SELECT_INVOICE = 1;
</ins><span class="cx" style="display: block; padding: 0 10px"> const STEP_PAYMENT_DETAILS = 2;
</span><span class="cx" style="display: block; padding: 0 10px"> const STEP_PAYMENT_SUCCESS = 3;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-const CSS_VERSION = 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const CSS_VERSION = 1;
</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"> * Render the payment UI
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,21 +20,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * It is invoked from the template-sponsorship-payment.php page template in the central theme.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function render() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $keys = _get_keys();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Make sure we have Stripe keys and an HMAC.
- $keys = _get_keys();
- if ( empty( $keys['publishable'] ) || empty( $keys['secret'] ) || empty( $keys['hmac_key'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $keys['publishable'] ) || empty( $keys['secret'] ) || empty( $keys['hmac_key'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Make sure WordCamp_Budgets is available.
</del><span class="cx" style="display: block; padding: 0 10px"> require_once( __DIR__ . '/wordcamp-budgets.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'keys' => $keys,
- 'step' => STEP_SELECT_INVOICE,
- 'wordcamps' => _get_wordcamps(),
- 'currencies' => \WordCamp_Budgets::get_currencies(),
- 'errors' => array(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'keys' => $keys,
+ 'step' => STEP_SELECT_INVOICE,
+ 'wordcamps' => _get_wordcamps(),
+ 'currencies' => WordCamp_Budgets::get_currencies(),
+ 'errors' => array(),
</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"> if ( ! empty( $_POST['sponsor_payment_submit'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,10 +53,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'wcorg_sponsor_payment_stripe', array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Stripe API credentials.
</span><span class="cx" style="display: block; padding: 0 10px"> 'publishable' => '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'secret' => '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'secret' => '',
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // An HMAC key used to sign some data in between requests.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'hmac_key' => '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'hmac_key' => '',
</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">@@ -70,16 +70,19 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $wordcamps ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wordcamps = get_posts( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_type' => 'wordcamp',
- 'post_status' => \WordCamp_Loader::get_public_post_statuses(),
- 'posts_per_page' => -1,
- 'orderby' => 'title',
- 'order' => 'asc',
- 'meta_query' => array( array(
- 'key' => 'Start Date (YYYY-mm-dd)',
- 'value' => strtotime( '-3 months' ),
- 'compare' => '>'
- ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_type' => 'wordcamp',
+ 'post_status' => \WordCamp_Loader::get_public_post_statuses(),
+ 'posts_per_page' => - 1,
+ 'orderby' => 'title',
+ 'order' => 'asc',
+
+ 'meta_query' => array(
+ array(
+ 'key' => 'Start Date (YYYY-mm-dd)',
+ 'value' => strtotime( '-3 months' ),
+ 'compare' => '>'
+ )
+ )
</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">@@ -99,9 +102,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $step = isset( $_POST['step'] ) ? absint( $_POST['step'] ) : STEP_SELECT_INVOICE;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $_POST['step'] ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // An invoice, event, currency and amount have been selected.
</ins><span class="cx" style="display: block; padding: 0 10px"> case STEP_SELECT_INVOICE:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // An invoice, event, currency and amount have been selected.
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $_POST['currency'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data['errors'][] = 'Please select a currency.';
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,7 +133,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure the selected WordCamp is valid.
</span><span class="cx" style="display: block; padding: 0 10px"> $wordcamp_id = absint( $_POST['wordcamp_id'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $valid_ids = wp_list_pluck( _get_wordcamps(), 'ID' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $valid_ids = wp_list_pluck( _get_wordcamps(), 'ID' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $wordcamp_id, $valid_ids ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data['errors'][] = 'Please select a valid event.';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,7 +145,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- $invoice_id = absint( $_POST['invoice_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $invoice_id = absint( $_POST['invoice_id'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $wordcamp_site_id = get_wordcamp_site_id( get_post( $wordcamp_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $wordcamp_site_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data['errors'][] = 'Could not find a site for this WordCamp.';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,25 +153,24 @@
</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"> // Next step is to collect the card details via Stripe.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data['step'] = STEP_PAYMENT_DETAILS;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data['step'] = STEP_PAYMENT_DETAILS;
</ins><span class="cx" style="display: block; padding: 0 10px"> $data['payment'] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'currency' => $currency,
- 'amount' => $amount,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'currency' => $currency,
+ 'amount' => $amount,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wordcamp_id' => $wordcamp_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'invoice_id' => $invoice_id,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'invoice_id' => $invoice_id,
</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"> // Passed through to the charge step.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data['payment_data_json'] = json_encode( $data['payment'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data['payment_data_json'] = json_encode( $data['payment'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $data['payment_data_signature'] = hash_hmac( 'sha256', $data['payment_data_json'], $data['keys']['hmac_key'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a WordCamp object for convenience.
</span><span class="cx" style="display: block; padding: 0 10px"> $data['payment']['wordcamp_obj'] = get_post( $wordcamp_id );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The card details have been entered and Stripe has submitted our form.
</ins><span class="cx" style="display: block; padding: 0 10px"> case STEP_PAYMENT_DETAILS:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // The card details have been entered and Stripe has submitted our form.
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $_POST['stripeToken'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data['errors'][] = 'Stripe token not found.';
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,14 +178,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure our data hasn't been altered.
</span><span class="cx" style="display: block; padding: 0 10px"> $payment_data_str = wp_unslash( $_POST['payment_data_json'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $payment_data = json_decode( $payment_data_str, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $payment_data = json_decode( $payment_data_str, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! hash_equals( hash_hmac( 'sha256', $payment_data_str, $data['keys']['hmac_key'] ), $_POST['payment_data_signature'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data['errors'][] = 'Could not verify payload signature.';
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- $wordcamp_obj = get_post( $payment_data['wordcamp_id'] );
- $wordcamp_site_id = get_wordcamp_site_id( $wordcamp_obj );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wordcamp_obj = get_post( $payment_data['wordcamp_id'] );
+ $wordcamp_site_id = get_wordcamp_site_id( $wordcamp_obj );
</ins><span class="cx" style="display: block; padding: 0 10px"> $wordcamp_site_url = set_url_scheme( esc_url_raw( get_blog_option( $wordcamp_site_id, 'home', '' ) ), 'https' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( __DIR__ . '/stripe-php/init.php' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,15 +193,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><span class="cx" style="display: block; padding: 0 10px"> $charge = \Stripe\Charge::create( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'amount' => round( $payment_data['amount'], 2 ) * 100,
- 'currency' => $payment_data['currency'],
- 'source' => $_POST['stripeToken'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'amount' => round( $payment_data['amount'], 2 ) * 100,
+ 'currency' => $payment_data['currency'],
+ 'source' => $_POST['stripeToken'],
</ins><span class="cx" style="display: block; padding: 0 10px"> 'description' => 'WordCamp Sponsorship: ' . $wordcamp_obj->post_title,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'metadata' => array(
- 'invoice_id' => $payment_data['invoice_id'],
- 'wordcamp_id' => $payment_data['wordcamp_id'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'metadata' => array(
+ 'invoice_id' => $payment_data['invoice_id'],
+ 'wordcamp_id' => $payment_data['wordcamp_id'],
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wordcamp_site_id' => $wordcamp_site_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wordcamp_url' => $wordcamp_site_url,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wordcamp_url' => $wordcamp_site_url,
</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"> } catch ( \Stripe\Error\Card $e ) {
</span></span></pre>
</div>
</div>
</body>
</html>