Changeset 2347

Timestamp:

01/21/2016 08:41:54 PM (9 years ago)

Author:

iandunn

Message:

WordCamp Budgets: Centralize amount validation.

Location:

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

Files:

• wordcamp-payments-network/includes/wordcamp-budgets-dashboard.php (modified) (1 diff)
• wordcamp-payments/includes/payment-request.php (modified) (1 diff)
• wordcamp-payments/includes/sponsor-invoice.php (modified) (1 diff)
• wordcamp-payments/includes/wordcamp-budgets.php (modified) (1 diff)

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

@@ -19 +19 @@
 function format_amount( $amount, $currency ) {
     $formatted_amount = '';
-    $amount           = preg_replace( '#[^\d.-]+#', '', $amount );
-    $amount           = floatval( $amount );
+    $amount           = \WordCamp_Budgets::validate_amount( $amount );
 
     if ( false === strpos( $currency, 'null' ) && $amount ) {

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

@@ -654 +654 @@
 
                 case 'payment_amount':
-                    $safe_value = sanitize_text_field( $unsafe_value );
-                    $safe_value = preg_replace( '#[^\d.-]+#', '', $safe_value );
-                    $safe_value = round( floatval( $safe_value ), 2 );
+                    $safe_value = WordCamp_Budgets::validate_amount( $unsafe_value );
                     break;
 

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/sponsor-invoice.php

@@ -376 +376 @@
 
         if ( 'amount' == $field ) {
-            $value = preg_replace( '#[^\d.-]+#', '', $value );
-            $value = round( floatval( $value ), 2 );
+            $value = \WordCamp_Budgets::validate_amount( $value );
         }
 

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

@@ -78 +78 @@
             self::VERSION
         );
+    }
+
+    /**
+     * Validate an amount value
+     *
+     * @param string $amount
+     *
+     * @return float
+     */
+    public static function validate_amount( $amount ) {
+        $amount = sanitize_text_field( $amount );
+        $amount = preg_replace( '#[^\d.-]+#', '', $amount );
+        $amount = round( floatval( $amount ), 2 );
+        
+        return $amount;
     }