<!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>[2298] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network: WordCamp Budgets Dashboard: Centralize currency conversion and formatting.</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/2298">2298</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/2298","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>2016-01-15 18:07:53 +0000 (Fri, 15 Jan 2016)</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 Budgets Dashboard: Centralize currency conversion and formatting.
These will be used by upcoming modules in addition to the current one.
Note that escaping was removed from `format_amount()`, since that should be done as late as possible.
`wp_kses()` is performant in this situation. See https://www.tollmanz.com/wp-kses-performance/</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkbootstrapphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/bootstrap.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludespaymentrequestsdashboardphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-dashboard.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludespaymentrequestslisttablephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-list-table.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludeswordcampbudgetsdashboardphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/wordcamp-budgets-dashboard.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkbootstrapphp"></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-network/bootstrap.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-network/bootstrap.php 2016-01-15 11:47:16 UTC (rev 2297)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/bootstrap.php 2016-01-15 18:07:53 UTC (rev 2298)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,6 +15,7 @@
</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="cx" style="display: block; padding: 0 10px"> if ( is_admin() ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ require_once( __DIR__ . '/includes/wordcamp-budgets-dashboard.php' );
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once( __DIR__ . '/includes/payment-requests-dashboard.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['Payment_Requests_Dashboard'] = new \Payment_Requests_Dashboard();
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludespaymentrequestsdashboardphp"></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-network/includes/payment-requests-dashboard.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-network/includes/payment-requests-dashboard.php 2016-01-15 11:47:16 UTC (rev 2297)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-dashboard.php 2016-01-15 18:07:53 UTC (rev 2298)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -488,43 +488,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<a class="nav-tab ' . $active . '" href="' . esc_url( $url ) . '">' . esc_html( $section_caption ) . '</a>';
</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">-
- /**
- * Currency Conversion
- *
- * @param string $from What currency are we selling.
- * @param string $to What currency are we buying.
- * @param float $amount How much we're selling.
- *
- * @return float Converted amount.
- */
- public static function convert_currency( $from, $to, $amount ) {
- global $wpdb;
-
- $from = strtolower( $from );
- $to = strtolower( $to );
- $cache_key = md5( sprintf( 'wcp-exchange-rate-%s:%s', $from, $to ) );
-
- $rate = 0;
- if ( false === ( $rate = get_transient( $cache_key ) ) ) {
- $url = 'https://query.yahooapis.com/v1/public/yql';
- $url = add_query_arg( 'format', 'json', $url );
- $url = add_query_arg( 'env', rawurlencode( 'store://datatables.org/alltableswithkeys' ), $url );
- $url = add_query_arg( 'q', rawurlencode( $wpdb->prepare( 'select * from yahoo.finance.xchange where pair = %s', $from . $to ) ), $url );
-
- $request = wp_remote_get( esc_url_raw( $url ) );
- $body = json_decode( wp_remote_retrieve_body( $request ), true );
-
- if ( ! empty( $body['query']['results']['rate']['Ask'] ) ) {
- $rate = floatval( $body['query']['results']['rate']['Ask'] );
- }
-
- set_transient( $cache_key, $rate, 24 * HOUR_IN_SECONDS );
- }
-
- if ( $rate < 0.0000000001 )
- return 0;
-
- return $amount * $rate;
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludespaymentrequestslisttablephp"></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-network/includes/payment-requests-list-table.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-network/includes/payment-requests-list-table.php 2016-01-15 11:47:16 UTC (rev 2297)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-list-table.php 2016-01-15 18:07:53 UTC (rev 2298)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,22 +172,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $currency = get_post_meta( $request->ID, '_camppayments_currency', true );
</span><span class="cx" style="display: block; padding: 0 10px"> $amount = get_post_meta( $request->ID, '_camppayments_payment_amount', true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $amount = preg_replace( '#[^\d.-]+#', '', $amount );
- $amount = floatval( $amount );
-
- if ( strpos( $currency, 'null' ) === false && $amount ) {
- $output = sprintf( '%s %s', esc_html( number_format( $amount, 2 ) ), esc_html( $currency ) );
-
- if ( $currency != 'USD' ) {
- $usd_amount = Payment_Requests_Dashboard::convert_currency( $currency, 'usd', $amount );
- if ( $usd_amount )
- $output .= sprintf( '<br />~ %s USD', esc_html( number_format( $usd_amount, 2 ) ) );
- }
-
- return $output;
- } elseif ( $amount ) {
- return esc_html( $amount );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return wp_kses(
+ \WordCamp\Budgets_Dashboard\format_amount( $amount, $currency ),
+ array( 'br' => 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"> /**
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludeswordcampbudgetsdashboardphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/wordcamp-budgets-dashboard.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-network/includes/wordcamp-budgets-dashboard.php (rev 0)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/wordcamp-budgets-dashboard.php 2016-01-15 18:07:53 UTC (rev 2298)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,78 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+namespace WordCamp\Budgets_Dashboard;
+defined( 'WPINC' ) or die();
+
+/*
+ * Core functionality and helper functions shared between modules
+ */
+
+
+/**
+ * Format an amount for display
+ *
+ * @param float $amount
+ * @param string $currency
+ *
+ * @return string
+ */
+function format_amount( $amount, $currency ) {
+ $formatted_amount = '';
+ $amount = preg_replace( '#[^\d.-]+#', '', $amount );
+ $amount = floatval( $amount );
+
+ if ( false === strpos( $currency, 'null' ) && $amount ) {
+ $formatted_amount = sprintf( '%s %s', number_format( $amount, 2 ), $currency );
+
+ if ( 'USD' !== $currency ) {
+ $usd_amount = convert_currency( $currency, 'usd', $amount );
+
+ if ( $usd_amount ) {
+ $formatted_amount .= sprintf( '<br />~ %s USD', number_format( $usd_amount, 2 ) );
+ }
+ }
+ }
+
+ return $formatted_amount;
+}
+
+/**
+ * Currency Conversion
+ *
+ * @param string $from What currency are we selling.
+ * @param string $to What currency are we buying.
+ * @param float $amount How much we're selling.
+ *
+ * @return float Converted amount.
+ */
+function convert_currency( $from, $to, $amount ) {
+ global $wpdb;
+
+ $from = strtolower( $from );
+ $to = strtolower( $to );
+ $cache_key = md5( sprintf( 'wcp-exchange-rate-%s:%s', $from, $to ) );
+
+ $rate = 0;
+
+ if ( false === ( $rate = get_transient( $cache_key ) ) ) {
+ $url = 'https://query.yahooapis.com/v1/public/yql';
+ $url = add_query_arg( 'format', 'json', $url );
+ $url = add_query_arg( 'env', rawurlencode( 'store://datatables.org/alltableswithkeys' ), $url );
+ $url = add_query_arg( 'q', rawurlencode( $wpdb->prepare( 'select * from yahoo.finance.xchange where pair = %s', $from . $to ) ), $url );
+
+ $request = wp_remote_get( esc_url_raw( $url ) );
+ $body = json_decode( wp_remote_retrieve_body( $request ), true );
+
+ if ( ! empty( $body['query']['results']['rate']['Ask'] ) ) {
+ $rate = floatval( $body['query']['results']['rate']['Ask'] );
+ }
+
+ set_transient( $cache_key, $rate, 24 * HOUR_IN_SECONDS );
+ }
+
+ if ( $rate < 0.0000000001 ) {
+ return 0;
+ }
+
+ return $amount * $rate;
+}
</ins></span></pre>
</div>
</div>
</body>
</html>