From b9a89e45899859855775f06adce72f61f80f1be2 Mon Sep 17 00:00:00 2001 From: Nicola Mustone Date: Tue, 21 Oct 2014 09:43:57 +0200 Subject: [PATCH] Fixed indentation and added wp_unslash --- .../gateways/bacs/class-wc-gateway-bacs.php | 298 +++++++++--------- 1 file changed, 149 insertions(+), 149 deletions(-) diff --git a/includes/gateways/bacs/class-wc-gateway-bacs.php b/includes/gateways/bacs/class-wc-gateway-bacs.php index 319b3ddf636..3922a74f70a 100644 --- a/includes/gateways/bacs/class-wc-gateway-bacs.php +++ b/includes/gateways/bacs/class-wc-gateway-bacs.php @@ -9,18 +9,18 @@ if ( ! defined( 'ABSPATH' ) ) { * * Provides a Bank Transfer Payment Gateway. Based on code by Mike Pepper. * - * @class WC_Gateway_BACS - * @extends WC_Payment_Gateway - * @version 2.1.0 - * @package WooCommerce/Classes/Payment - * @author WooThemes + * @class WC_Gateway_BACS + * @extends WC_Payment_Gateway + * @version 2.1.0 + * @package WooCommerce/Classes/Payment + * @author WooThemes */ class WC_Gateway_BACS extends WC_Payment_Gateway { - /** - * Constructor for the gateway. - */ - public function __construct() { + /** + * Constructor for the gateway. + */ + public function __construct() { $this->id = 'bacs'; $this->icon = apply_filters('woocommerce_bacs_icon', ''); $this->has_fields = false; @@ -31,7 +31,7 @@ class WC_Gateway_BACS extends WC_Payment_Gateway { $this->init_form_fields(); $this->init_settings(); - // Define user set variables + // Define user set variables $this->title = $this->get_option( 'title' ); $this->description = $this->get_option( 'description' ); $this->instructions = $this->get_option( 'instructions', $this->description ); @@ -53,17 +53,17 @@ class WC_Gateway_BACS extends WC_Payment_Gateway { // Actions add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) ); add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'save_account_details' ) ); - add_action( 'woocommerce_thankyou_bacs', array( $this, 'thankyou_page' ) ); + add_action( 'woocommerce_thankyou_bacs', array( $this, 'thankyou_page' ) ); - // Customer Emails - add_action( 'woocommerce_email_before_order_table', array( $this, 'email_instructions' ), 10, 3 ); - } + // Customer Emails + add_action( 'woocommerce_email_before_order_table', array( $this, 'email_instructions' ), 10, 3 ); + } - /** - * Initialise Gateway Settings Form Fields - */ - public function init_form_fields() { - $this->form_fields = array( + /** + * Initialise Gateway Settings Form Fields + */ + public function init_form_fields() { + $this->form_fields = array( 'enabled' => array( 'title' => __( 'Enable/Disable', 'woocommerce' ), 'type' => 'checkbox', @@ -95,88 +95,88 @@ class WC_Gateway_BACS extends WC_Payment_Gateway { 'type' => 'account_details' ), ); - } + } - /** - * generate_account_details_html function. - */ - public function generate_account_details_html() { - ob_start(); - ?> - - : - - - - - - - - - - - - - - - account_details ) { - foreach ( $this->account_details as $account ) { - $i++; + /** + * generate_account_details_html function. + */ + public function generate_account_details_html() { + ob_start(); + ?> + + + - - + + $account_names[ $i ], + $accounts[] = array( + 'account_name' => $account_names[ $i ], 'account_number' => $account_numbers[ $i ], 'bank_name' => $bank_names[ $i ], 'sort_code' => $sort_codes[ $i ], 'iban' => $ibans[ $i ], 'bic' => $bics[ $i ] - ); - } - } + ); + } + } - update_option( 'woocommerce_bacs_accounts', $accounts ); - } + update_option( 'woocommerce_bacs_accounts', $accounts ); + } - /** - * Output for the order received page. - */ - public function thankyou_page( $order_id ) { + /** + * Output for the order received page. + */ + public function thankyou_page( $order_id ) { if ( $this->instructions ) { - echo wpautop( wptexturize( wp_kses_post( $this->instructions ) ) ); - } - $this->bank_details( $order_id ); - } + echo wpautop( wptexturize( wp_kses_post( $this->instructions ) ) ); + } + $this->bank_details( $order_id ); + } - /** - * Add content to the WC emails. - * - * @access public - * @param WC_Order $order - * @param bool $sent_to_admin - * @param bool $plain_text - * @return void - */ - public function email_instructions( $order, $sent_to_admin, $plain_text = false ) { - if ( ! $sent_to_admin && 'bacs' === $order->payment_method && $order->has_status( 'on-hold' ) ) { + /** + * Add content to the WC emails. + * + * @access public + * @param WC_Order $order + * @param bool $sent_to_admin + * @param bool $plain_text + * @return void + */ + public function email_instructions( $order, $sent_to_admin, $plain_text = false ) { + if ( ! $sent_to_admin && 'bacs' === $order->payment_method && $order->has_status( 'on-hold' ) ) { if ( $this->instructions ) { echo wpautop( wptexturize( $this->instructions ) ) . PHP_EOL; } $this->bank_details( $order->id ); } - } + } - /** - * Get bank details and place into a list format - */ - private function bank_details( $order_id = '' ) { - if ( empty( $this->account_details ) ) { - return; - } + /** + * Get bank details and place into a list format + */ + private function bank_details( $order_id = '' ) { + if ( empty( $this->account_details ) ) { + return; + } - echo '

' . __( 'Our Bank Details', 'woocommerce' ) . '

' . PHP_EOL; + echo '

' . __( 'Our Bank Details', 'woocommerce' ) . '

' . PHP_EOL; - $bacs_accounts = apply_filters( 'woocommerce_bacs_accounts', $this->account_details ); + $bacs_accounts = apply_filters( 'woocommerce_bacs_accounts', $this->account_details ); - if ( ! empty( $bacs_accounts ) ) { - foreach ( $bacs_accounts as $bacs_account ) { - $bacs_account = (object) $bacs_account; + if ( ! empty( $bacs_accounts ) ) { + foreach ( $bacs_accounts as $bacs_account ) { + $bacs_account = (object) $bacs_account; if ( $bacs_account->account_name || $bacs_account->bank_name ) { - echo '

' . implode( ' - ', array_filter( array( $bacs_account->account_name, $bacs_account->bank_name ) ) ) . '

' . PHP_EOL; + echo '

' . wp_unslash( implode( ' - ', array_filter( array( $bacs_account->account_name, $bacs_account->bank_name ) ) ) ) . '

' . PHP_EOL; } - echo ''; + } + } + } - /** - * Process the payment and return the result - * - * @param int $order_id - * @return array - */ - public function process_payment( $order_id ) { + /** + * Process the payment and return the result + * + * @param int $order_id + * @return array + */ + public function process_payment( $order_id ) { $order = wc_get_order( $order_id ); @@ -306,8 +306,8 @@ class WC_Gateway_BACS extends WC_Payment_Gateway { // Return thankyou redirect return array( - 'result' => 'success', - 'redirect' => $this->get_return_url( $order ) + 'result' => 'success', + 'redirect' => $this->get_return_url( $order ) ); - } + } }
 
: + + + + + + + + + + + + + + account_details ) { + foreach ( $this->account_details as $account ) { + $i++; - echo ' - - - - - - - - '; - } - } - ?> - - - - - - -
 
- -