Changeset 2298

Timestamp:

01/15/2016 06:07:53 PM (9 years ago)

Author:

iandunn

Message:

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/

Location:

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network

Files:

• bootstrap.php (modified) (1 diff)
• includes/payment-requests-dashboard.php (modified) (1 diff)
• includes/payment-requests-list-table.php (modified) (1 diff)
• includes/wordcamp-budgets-dashboard.php (added)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/bootstrap.php

@@ -16 +16 @@
 
 if ( is_admin() ) {
+    require_once( __DIR__ . '/includes/wordcamp-budgets-dashboard.php' );
     require_once( __DIR__ . '/includes/payment-requests-dashboard.php' );
 

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-dashboard.php

@@ -489 +489 @@
         }
     }
-
-    /**
-     * 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;
-    }
 }

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-list-table.php

@@ -173 +173 @@
         $amount = get_post_meta( $request->ID, '_camppayments_payment_amount', true );
 
-        $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 />~&nbsp;%s&nbsp;USD', esc_html( number_format( $usd_amount, 2 ) ) );
-            }
-
-            return $output;
-        } elseif ( $amount ) {
-            return esc_html( $amount );
-        }
+        return wp_kses(
+            \WordCamp\Budgets_Dashboard\format_amount( $amount, $currency ),
+            array( 'br' => array() )
+        );
     }