ravinderk / Give

includes/admin/shortcodes/abstract-shortcode-generator.php

Spacing +68 added lines, -68 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -62,11 +62,11 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function __construct( $shortcode ) {
+	public function __construct($shortcode) {
 
 		$this->shortcode_tag = $shortcode;
 
-		add_action( 'admin_init', array( $this, 'init' ) );
+		add_action('admin_init', array($this, 'init'));
 
 	}
 
@@ -77,9 +77,9 @@ 
 	 */
 	public function init() {
 
-		if ( $this->shortcode_tag ) {
+		if ($this->shortcode_tag) {
 
-			$this->self = get_class( $this );
+			$this->self = get_class($this);
 
 			$this->errors   = array();
 			$this->required = array();
@@ -88,18 +88,18 @@ 
 			$fields = $this->get_fields();
 
 			$defaults = array(
-				'btn_close' => esc_html__( 'Close', 'give' ),
-				'btn_okay'  => esc_html__( 'Insert Shortcode', 'give' ),
+				'btn_close' => esc_html__('Close', 'give'),
+				'btn_okay'  => esc_html__('Insert Shortcode', 'give'),
 				'errors'    => $this->errors,
 				'fields'    => $fields,
-				'label'     => '[' . $this->shortcode_tag . ']',
+				'label'     => '['.$this->shortcode_tag.']',
 				'required'  => $this->required,
-				'title'     => esc_html__( 'Insert Shortcode', 'give' ),
+				'title'     => esc_html__('Insert Shortcode', 'give'),
 			);
 
-			if ( user_can_richedit() ) {
+			if (user_can_richedit()) {
 
-				Give_Shortcode_Button::$shortcodes[ $this->shortcode_tag ] = wp_parse_args( $this->shortcode, $defaults );
+				Give_Shortcode_Button::$shortcodes[$this->shortcode_tag] = wp_parse_args($this->shortcode, $defaults);
 
 			}
 		}
@@ -128,13 +128,13 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_fields( $defined_fields ) {
+	protected function generate_fields($defined_fields) {
 
 		$fields = array();
 
-		if ( is_array( $defined_fields ) ) {
+		if (is_array($defined_fields)) {
 
-			foreach ( $defined_fields as $field ) {
+			foreach ($defined_fields as $field) {
 
 				$defaults = array(
 					'label'       => false,
@@ -145,14 +145,14 @@ 
 					'type'        => '',
 				);
 
-				$field  = wp_parse_args( (array) $field, $defaults );
-				$method = 'generate_' . strtolower( $field['type'] );
+				$field  = wp_parse_args((array) $field, $defaults);
+				$method = 'generate_'.strtolower($field['type']);
 
-				if ( method_exists( $this, $method ) ) {
+				if (method_exists($this, $method)) {
 
-					$field = call_user_func( array( $this, $method ), $field );
+					$field = call_user_func(array($this, $method), $field);
 
-					if ( $field ) {
+					if ($field) {
 						$fields[] = $field;
 					}
 				}
@@ -172,23 +172,23 @@ 
 	protected function get_fields() {
 
 		$defined_fields   = $this->define_fields();
-		$generated_fields = $this->generate_fields( $defined_fields );
+		$generated_fields = $this->generate_fields($defined_fields);
 
 		$errors = array();
 
-		if ( ! empty( $this->errors ) ) {
-			foreach ( $this->required as $name => $alert ) {
+		if ( ! empty($this->errors)) {
+			foreach ($this->required as $name => $alert) {
 				// Using WordPress function in place of array_column wp_list_pluck as it support older version as well.
-				if ( false === array_search( $name, give_list_pluck( $generated_fields, 'name' ) ) ) {
+				if (false === array_search($name, give_list_pluck($generated_fields, 'name'))) {
 
-					$errors[] = $this->errors[ $name ];
+					$errors[] = $this->errors[$name];
 				}
 			}
 
 			$this->errors = $errors;
 		}
 
-		if ( ! empty( $errors ) ) {
+		if ( ! empty($errors)) {
 
 			return $errors;
 		}
@@ -205,9 +205,9 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_container( $field ) {
+	protected function generate_container($field) {
 
-		if ( array_key_exists( 'html', $field ) ) {
+		if (array_key_exists('html', $field)) {
 
 			return array(
 				'type' => $field['type'],
@@ -227,9 +227,9 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_listbox( $field ) {
+	protected function generate_listbox($field) {
 
-		$listbox = shortcode_atts( array(
+		$listbox = shortcode_atts(array(
 			'label'    => '',
 			'minWidth' => '',
 			'name'     => false,
@@ -237,27 +237,27 @@ 
 			'type'     => '',
 			'value'    => '',
 			'classes'  => ''
-		), $field );
+		), $field);
 
-		if ( $this->validate( $field ) ) {
+		if ($this->validate($field)) {
 
 			$new_listbox = array();
 
-			foreach ( $listbox as $key => $value ) {
+			foreach ($listbox as $key => $value) {
 
-				if ( $key == 'value' && empty( $value ) ) {
-					$new_listbox[ $key ] = $listbox['name'];
-				} else if ( $value ) {
-					$new_listbox[ $key ] = $value;
+				if ($key == 'value' && empty($value)) {
+					$new_listbox[$key] = $listbox['name'];
+				} else if ($value) {
+					$new_listbox[$key] = $value;
 				}
 			}
 
 			// do not reindex array!
 			$field['options'] = array(
-				                    '' => ( $field['placeholder'] ? $field['placeholder'] : esc_attr__( '- Select -', 'give' ) ),
+				                    '' => ($field['placeholder'] ? $field['placeholder'] : esc_attr__('- Select -', 'give')),
 			                    ) + $field['options'];
 
-			foreach ( $field['options'] as $value => $text ) {
+			foreach ($field['options'] as $value => $text) {
 				$new_listbox['values'][] = array(
 					'text'  => $text,
 					'value' => $value,
@@ -279,7 +279,7 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_post( $field ) {
+	protected function generate_post($field) {
 
 		$args = array(
 			'post_type'        => 'post',
@@ -289,26 +289,26 @@ 
 			'suppress_filters' => false,
 		);
 
-		$args    = wp_parse_args( (array) $field['query_args'], $args );
+		$args    = wp_parse_args((array) $field['query_args'], $args);
 
-		$posts   = get_posts( $args );
+		$posts   = get_posts($args);
 		$options = array();
 
-		if ( ! empty( $posts ) ) {
-			foreach ( $posts as $post ) {
-				$options[ absint( $post->ID ) ] = empty( $post->post_title )
-					? sprintf( __( 'Untitled (#%s)', 'give' ), $post->ID )
-					: apply_filters( 'the_title', $post->post_title );
+		if ( ! empty($posts)) {
+			foreach ($posts as $post) {
+				$options[absint($post->ID)] = empty($post->post_title)
+					? sprintf(__('Untitled (#%s)', 'give'), $post->ID)
+					: apply_filters('the_title', $post->post_title);
 			}
 
 			$field['type']    = 'listbox';
 			$field['options'] = $options;
 
-			return $this->generate_listbox( $field );
+			return $this->generate_listbox($field);
 		}
 
 		// perform validation here before returning false
-		$this->validate( $field );
+		$this->validate($field);
 
 		return false;
 	}
@@ -322,9 +322,9 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_textbox( $field ) {
+	protected function generate_textbox($field) {
 
-		$textbox = shortcode_atts( array(
+		$textbox = shortcode_atts(array(
 			'label'       => '',
 			'maxLength'   => '',
 			'minHeight'   => '',
@@ -336,15 +336,15 @@ 
 			'value'       => '',
 			'classes'     => '',
 			'placeholder' => ''
-		), $field );
+		), $field);
 
 		// Remove empty placeholder.
-		if( empty( $textbox['placeholder'] ) ) {
-			unset( $textbox['placeholder'] );
+		if (empty($textbox['placeholder'])) {
+			unset($textbox['placeholder']);
 		}
 
-		if ( $this->validate( $field ) ) {
-			return array_filter( $textbox, array( $this, 'return_textbox_value' ) );
+		if ($this->validate($field)) {
+			return array_filter($textbox, array($this, 'return_textbox_value'));
 		}
 
 		return false;
@@ -357,7 +357,7 @@ 
 	 *
 	 * @return bool
 	 */
-	function return_textbox_value( $value ) {
+	function return_textbox_value($value) {
 		return $value !== '';
 	}
 
@@ -373,9 +373,9 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function validate( $field ) {
+	protected function validate($field) {
 
-		extract( shortcode_atts(
+		extract(shortcode_atts(
 				array(
 					'name'     => false,
 					'required' => false,
@@ -383,36 +383,36 @@ 
 				), $field )
 		);
 
-		if ( $name ) {
+		if ($name) {
 
-			if ( isset( $required['error'] ) ) {
+			if (isset($required['error'])) {
 
 				$error = array(
 					'type' => 'container',
 					'html' => $required['error'],
 				);
 
-				$this->errors[ $name ] = $this->generate_container( $error );
+				$this->errors[$name] = $this->generate_container($error);
 			}
 
-			if ( ! ! $required || is_array( $required ) ) {
+			if ( ! ! $required || is_array($required)) {
 
-				$alert = esc_html__( 'Some of the shortcode options are required.', 'give' );
+				$alert = esc_html__('Some of the shortcode options are required.', 'give');
 
-				if ( isset( $required['alert'] ) ) {
+				if (isset($required['alert'])) {
 
 					$alert = $required['alert'];
 
-				} else if ( ! empty( $label ) ) {
+				} else if ( ! empty($label)) {
 
 					$alert = sprintf(
 					/* translators: %s: option label */
-						esc_html__( 'The "%s" option is required.', 'give' ),
-						str_replace( ':', '', $label )
+						esc_html__('The "%s" option is required.', 'give'),
+						str_replace(':', '', $label)
 					);
 				}
 
-				$this->required[ $name ] = $alert;
+				$this->required[$name] = $alert;
 			}
 
 			return true;

includes/admin/settings/class-settings-gateways.php

Spacing +75 added lines, -75 removed lines

@@ -9,11 +9,11 @@ 
  * @since       1.8
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! class_exists( 'Give_Settings_Gateways' ) ) :
+if ( ! class_exists('Give_Settings_Gateways')) :
 
 	/**
 	 * Give_Settings_Gateways.
@@ -27,15 +27,15 @@ 
 		 */
 		public function __construct() {
 			$this->id    = 'gateways';
-			$this->label = esc_html__( 'Payment Gateways', 'give' );
+			$this->label = esc_html__('Payment Gateways', 'give');
 
 			$this->default_tab = 'gateways-settings';
 
 			parent::__construct();
 
 			// Do not use main form for this tab.
-			if ( give_get_current_setting_tab() === $this->id ) {
-				add_action( 'give_admin_field_enabled_gateways', array( $this, 'render_enabled_gateways' ), 10, 2 );
+			if (give_get_current_setting_tab() === $this->id) {
+				add_action('give_admin_field_enabled_gateways', array($this, 'render_enabled_gateways'), 10, 2);
 			}
 		}
 
@@ -49,7 +49,7 @@ 
 			$settings        = array();
 			$current_section = give_get_current_setting_section();
 
-			switch ( $current_section ) {
+			switch ($current_section) {
 				case 'paypal-standard':
 					$settings = array(
 						// Section 2: PayPal Standard.
@@ -58,55 +58,55 @@ 
 							'id'   => 'give_title_gateway_settings_2',
 						),
 						array(
-							'name' => __( 'PayPal Email', 'give' ),
-							'desc' => __( 'Enter your PayPal account\'s email.', 'give' ),
+							'name' => __('PayPal Email', 'give'),
+							'desc' => __('Enter your PayPal account\'s email.', 'give'),
 							'id'   => 'paypal_email',
 							'type' => 'email',
 						),
 						array(
-							'name' => __( 'PayPal Page Style', 'give' ),
-							'desc' => __( 'Enter the name of the PayPal page style to use, or leave blank to use the default.', 'give' ),
+							'name' => __('PayPal Page Style', 'give'),
+							'desc' => __('Enter the name of the PayPal page style to use, or leave blank to use the default.', 'give'),
 							'id'   => 'paypal_page_style',
 							'type' => 'text',
 						),
 						array(
-							'name'    => __( 'PayPal Transaction Type', 'give' ),
-							'desc'    => __( 'Nonprofits must verify their status to withdraw donations they receive via PayPal. PayPal users that are not verified nonprofits must demonstrate how their donations will be used, once they raise more than $10,000. By default, Give transactions are sent to PayPal as donations. You may change the transaction type using this option if you feel you may not meet PayPal\'s donation requirements.', 'give' ),
+							'name'    => __('PayPal Transaction Type', 'give'),
+							'desc'    => __('Nonprofits must verify their status to withdraw donations they receive via PayPal. PayPal users that are not verified nonprofits must demonstrate how their donations will be used, once they raise more than $10,000. By default, Give transactions are sent to PayPal as donations. You may change the transaction type using this option if you feel you may not meet PayPal\'s donation requirements.', 'give'),
 							'id'      => 'paypal_button_type',
 							'type'    => 'radio_inline',
 							'options' => array(
-								'donation' => __( 'Donation', 'give' ),
-								'standard' => __( 'Standard Transaction', 'give' )
+								'donation' => __('Donation', 'give'),
+								'standard' => __('Standard Transaction', 'give')
 							),
 							'default' => 'donation',
 						),
 						array(
-							'name'    => __( 'Billing Details', 'give' ),
-							'desc'    => __( 'This option will enable the billing details section for PayPal Standard which requires the donor\'s address to complete the donation. These fields are not required by PayPal to process the transaction, but you may have a need to collect the data.', 'give' ),
+							'name'    => __('Billing Details', 'give'),
+							'desc'    => __('This option will enable the billing details section for PayPal Standard which requires the donor\'s address to complete the donation. These fields are not required by PayPal to process the transaction, but you may have a need to collect the data.', 'give'),
 							'id'      => 'paypal_standard_billing_details',
 							'type'    => 'radio_inline',
 							'default' => 'disabled',
 							'options' => array(
-								'enabled'  => __( 'Enabled', 'give' ),
-								'disabled' => __( 'Disabled', 'give' ),
+								'enabled'  => __('Enabled', 'give'),
+								'disabled' => __('Disabled', 'give'),
 							)
 						),
 						array(
-							'name'    => __( 'PayPal IPN Verification', 'give' ),
-							'desc'    => __( 'If donations are not getting marked as complete, use a slightly less secure method of verifying donations.', 'give' ),
+							'name'    => __('PayPal IPN Verification', 'give'),
+							'desc'    => __('If donations are not getting marked as complete, use a slightly less secure method of verifying donations.', 'give'),
 							'id'      => 'paypal_verification',
 							'type'    => 'radio_inline',
 							'default' => 'enabled',
 							'options' => array(
-								'enabled'  => __( 'Enabled', 'give' ),
-								'disabled' => __( 'Disabled', 'give' ),
+								'enabled'  => __('Enabled', 'give'),
+								'disabled' => __('Disabled', 'give'),
 							)
 						),
 						array(
-							'name'  => __( 'PayPal Standard Gateway Settings Docs Link', 'give' ),
+							'name'  => __('PayPal Standard Gateway Settings Docs Link', 'give'),
 							'id'    => 'paypal_standard_gateway_settings_docs_link',
-							'url'   => esc_url( 'http://docs.givewp.com/settings-gateway-paypal-standard' ),
-							'title' => __( 'PayPal Standard Gateway Settings', 'give' ),
+							'url'   => esc_url('http://docs.givewp.com/settings-gateway-paypal-standard'),
+							'title' => __('PayPal Standard Gateway Settings', 'give'),
 							'type'  => 'give_docs_link',
 						),
 						array(
@@ -124,19 +124,19 @@ 
 							'id'   => 'give_title_gateway_settings_3',
 						),
 						array(
-							'name'    => __( 'Collect Billing Details', 'give' ),
-							'desc'    => __( 'Enable to request billing details for offline donations. Will appear above offline donation instructions. Can be enabled/disabled per form.', 'give' ),
+							'name'    => __('Collect Billing Details', 'give'),
+							'desc'    => __('Enable to request billing details for offline donations. Will appear above offline donation instructions. Can be enabled/disabled per form.', 'give'),
 							'id'      => 'give_offline_donation_enable_billing_fields',
 							'type'    => 'radio_inline',
 							'default' => 'disabled',
 							'options' => array(
-								'enabled'  => __( 'Enabled', 'give' ),
-								'disabled' => __( 'Disabled', 'give' )
+								'enabled'  => __('Enabled', 'give'),
+								'disabled' => __('Disabled', 'give')
 							)
 						),
 						array(
-							'name'    => __( 'Offline Donation Instructions', 'give' ),
-							'desc'    => __( 'The following content will appear for all forms when the user selects the offline donation payment option. Note: You may customize the content per form as needed.', 'give' ),
+							'name'    => __('Offline Donation Instructions', 'give'),
+							'desc'    => __('The following content will appear for all forms when the user selects the offline donation payment option. Note: You may customize the content per form as needed.', 'give'),
 							'id'      => 'global_offline_donation_content',
 							'default' => give_get_default_offline_donation_content(),
 							'type'    => 'wysiwyg',
@@ -145,10 +145,10 @@ 
 							)
 						),
 						array(
-							'name'  => esc_html__( 'Offline Donations Settings Docs Link', 'give' ),
+							'name'  => esc_html__('Offline Donations Settings Docs Link', 'give'),
 							'id'    => 'offline_gateway_settings_docs_link',
-							'url'   => esc_url( 'http://docs.givewp.com/offlinegateway' ),
-							'title' => __( 'Offline Gateway Settings', 'give' ),
+							'url'   => esc_url('http://docs.givewp.com/offlinegateway'),
+							'title' => __('Offline Gateway Settings', 'give'),
 							'type'  => 'give_docs_link',
 						),
 						array(
@@ -166,19 +166,19 @@ 
 							'type' => 'title'
 						),
 						array(
-							'name'    => __( 'Test Mode', 'give' ),
-							'desc'    => __( 'While in test mode no live donations are processed. To fully use test mode, you must have a sandbox (test) account for the payment gateway you are testing.', 'give' ),
+							'name'    => __('Test Mode', 'give'),
+							'desc'    => __('While in test mode no live donations are processed. To fully use test mode, you must have a sandbox (test) account for the payment gateway you are testing.', 'give'),
 							'id'      => 'test_mode',
 							'type'    => 'radio_inline',
 							'default' => 'disabled',
 							'options' => array(
-								'enabled'  => __( 'Enabled', 'give' ),
-								'disabled' => __( 'Disabled', 'give' ),
+								'enabled'  => __('Enabled', 'give'),
+								'disabled' => __('Disabled', 'give'),
 							)
 						),
 						array(
-							'name' => __( 'Enabled Gateways', 'give' ),
-							'desc' => __( 'Enable your payment gateway. Can be ordered by dragging.', 'give' ),
+							'name' => __('Enabled Gateways', 'give'),
+							'desc' => __('Enable your payment gateway. Can be ordered by dragging.', 'give'),
 							'id'   => 'gateways',
 							'type' => 'enabled_gateways'
 						),
@@ -190,7 +190,7 @@ 
 						 * This setting will not render on admin setting screen but help internal code to recognize "gateways_label"  setting and add them to give setting when save.
 						 */
 						array(
-							'name' => __( 'Gateways Label', 'give' ),
+							'name' => __('Gateways Label', 'give'),
 							'desc' => '',
 							'id'   => 'gateways_label',
 							'type' => 'gateways_label_hidden'
@@ -203,17 +203,17 @@ 
 						 * This setting will not render on admin setting screen but help internal code to recognize "default_gateway"  setting and add them to give setting when save.
 						 */
 						array(
-							'name' => __( 'Default Gateway', 'give' ),
-							'desc' => __( 'The gateway that will be selected by default.', 'give' ),
+							'name' => __('Default Gateway', 'give'),
+							'desc' => __('The gateway that will be selected by default.', 'give'),
 							'id'   => 'default_gateway',
 							'type' => 'default_gateway_hidden'
 						),
 
 						array(
-							'name'  => __( 'Gateways Docs Link', 'give' ),
+							'name'  => __('Gateways Docs Link', 'give'),
 							'id'    => 'gateway_settings_docs_link',
-							'url'   => esc_url( 'http://docs.givewp.com/settings-gateways' ),
-							'title' => __( 'Gateway Settings', 'give' ),
+							'url'   => esc_url('http://docs.givewp.com/settings-gateways'),
+							'title' => __('Gateway Settings', 'give'),
 							'type'  => 'give_docs_link',
 						),
 						array(
@@ -228,7 +228,7 @@ 
 			 * Filter the payment gateways settings.
 			 * Backward compatibility: Please do not use this filter. This filter is deprecated in 1.8
 			 */
-			$settings = apply_filters( 'give_settings_gateways', $settings );
+			$settings = apply_filters('give_settings_gateways', $settings);
 
 			/**
 			 * Filter the settings.
@@ -237,7 +237,7 @@ 
 			 *
 			 * @param  array $settings
 			 */
-			$settings = apply_filters( 'give_get_settings_' . $this->id, $settings );
+			$settings = apply_filters('give_get_settings_'.$this->id, $settings);
 
 			// Output.
 			return $settings;
@@ -251,12 +251,12 @@ 
 		 */
 		public function get_sections() {
 			$sections = array(
-				'gateways-settings' => __( 'Gateways', 'give' ),
-				'paypal-standard'   => __( 'PayPal Standard', 'give' ),
-				'offline-donations' => __( 'Offline Donations', 'give' )
+				'gateways-settings' => __('Gateways', 'give'),
+				'paypal-standard'   => __('PayPal Standard', 'give'),
+				'offline-donations' => __('Offline Donations', 'give')
 			);
 
-			return apply_filters( 'give_get_sections_' . $this->id, $sections );
+			return apply_filters('give_get_sections_'.$this->id, $sections);
 		}
 
 
@@ -269,11 +269,11 @@ 
 		 * @param $field
 		 * @param $settings
 		 */
-		public function render_enabled_gateways( $field, $settings ) {
+		public function render_enabled_gateways($field, $settings) {
 			$id              = $field['id'];
-			$gateways        = give_get_ordered_payment_gateways( give_get_payment_gateways() );
-			$gateways_label  = give_get_option( 'gateways_label', array() );
-			$default_gateway = give_get_option( 'default_gateway', current( array_keys( $gateways ) ) );
+			$gateways        = give_get_ordered_payment_gateways(give_get_payment_gateways());
+			$gateways_label  = give_get_option('gateways_label', array());
+			$default_gateway = give_get_option('default_gateway', current(array_keys($gateways)));
 
 			ob_start();
 
@@ -288,51 +288,51 @@ 
 						<span>%3$s</span>
 						<span>%4$s</span>
 						',
-				__( 'Gateway', 'give' ),
-				__( 'Label', 'give' ),
-				__( 'Default', 'give' ),
-				__( 'Enabled', 'give' )
+				__('Gateway', 'give'),
+				__('Label', 'give'),
+				__('Default', 'give'),
+				__('Enabled', 'give')
 			);
 			echo '</div>';
 
 			echo '<ul class="give-checklist-fields give-payment-gatways-list">';
-			foreach ( $gateways as $key => $option ) :
+			foreach ($gateways as $key => $option) :
 				$enabled = null;
-				if ( is_array( $settings ) && array_key_exists( $key, $settings ) ) {
+				if (is_array($settings) && array_key_exists($key, $settings)) {
 					$enabled = '1';
 				}
 
 				echo '<li>';
-				printf( '<span class="give-drag-handle"><span class="dashicons dashicons-menu"></span></span>' );
-				printf( '<span class="admin-label">%s</span>', esc_html( $option['admin_label'] ) );
+				printf('<span class="give-drag-handle"><span class="dashicons dashicons-menu"></span></span>');
+				printf('<span class="admin-label">%s</span>', esc_html($option['admin_label']));
 
 				$label = '';
-				if ( ! empty( $gateways_label[ $key ] ) ) {
-					$label = $gateways_label[ $key ];
+				if ( ! empty($gateways_label[$key])) {
+					$label = $gateways_label[$key];
 				}
 
 				printf(
 					'<input class="checkout-label" type="text" id="%1$s[%2$s]" name="%1$s[%2$s]" value="%3$s" placeholder="%4$s"/>',
 					'gateways_label',
-					esc_attr( $key ),
-					esc_html( $label ),
-					esc_html( $option['checkout_label'] )
+					esc_attr($key),
+					esc_html($label),
+					esc_html($option['checkout_label'])
 				);
 
 				printf(
 					'<input class="gateways-radio" type="radio" name="%1$s" value="%2$s" %3$s %4$s>',
 					'default_gateway',
 					$key,
-					checked( $key, $default_gateway, false ),
-					disabled( NULL, $enabled, false )
+					checked($key, $default_gateway, false),
+					disabled(NULL, $enabled, false)
 				);
 
 				printf(
 					'<input class="gateways-checkbox" name="%1$s[%2$s]" id="%1$s[%2$s]" type="checkbox" value="1" %3$s data-payment-gateway="%4$s"/>',
-					esc_attr( $id ),
-					esc_attr( $key ),
-					checked( '1', $enabled, false ),
-					esc_html( $option['admin_label'] )
+					esc_attr($id),
+					esc_attr($key),
+					checked('1', $enabled, false),
+					esc_html($option['admin_label'])
 				);
 				echo '</li>';
 			endforeach;

includes/admin/welcome.php

Spacing +108 added lines, -108 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -35,9 +35,9 @@ 
 	 * @since 1.0
 	 */
 	public function __construct() {
-		add_action( 'admin_menu', array( $this, 'admin_menus' ) );
-		add_action( 'admin_head', array( $this, 'admin_head' ) );
-		add_action( 'admin_init', array( $this, 'welcome' ) );
+		add_action('admin_menu', array($this, 'admin_menus'));
+		add_action('admin_head', array($this, 'admin_head'));
+		add_action('admin_init', array($this, 'welcome'));
 	}
 
 	/**
@@ -49,45 +49,45 @@ 
 	 * @return void
 	 */
 	public function admin_menus() {
-		list( $display_version ) = explode( '-', GIVE_VERSION );
+		list($display_version) = explode('-', GIVE_VERSION);
 
 		// About Page
 		add_dashboard_page(
 		/* translators: %s: Give version */
-			sprintf( esc_html__( 'Welcome to Give %s', 'give' ), $display_version ),
-			esc_html__( 'Welcome to Give', 'give' ),
+			sprintf(esc_html__('Welcome to Give %s', 'give'), $display_version),
+			esc_html__('Welcome to Give', 'give'),
 			$this->minimum_capability,
 			'give-about',
-			array( $this, 'about_screen' )
+			array($this, 'about_screen')
 		);
 
 		// Changelog Page
 		add_dashboard_page(
-			esc_html__( 'Give Changelog', 'give' ),
-			esc_html__( 'Give Changelog', 'give' ),
+			esc_html__('Give Changelog', 'give'),
+			esc_html__('Give Changelog', 'give'),
 			$this->minimum_capability,
 			'give-changelog',
-			array( $this, 'changelog_screen' )
+			array($this, 'changelog_screen')
 		);
 
 		// Getting Started Page
 		add_dashboard_page(
 		/* translators: %s: Give version */
-			sprintf( esc_html__( 'Give %s - Getting Started Guide', 'give' ), $display_version ),
-			esc_html__( 'Getting started with Give', 'give' ),
+			sprintf(esc_html__('Give %s - Getting Started Guide', 'give'), $display_version),
+			esc_html__('Getting started with Give', 'give'),
 			$this->minimum_capability,
 			'give-getting-started',
-			array( $this, 'getting_started_screen' )
+			array($this, 'getting_started_screen')
 		);
 
 		// Credits Page
 		add_dashboard_page(
 		/* translators: %s: Give version */
-			sprintf( esc_html__( 'Give %s - Credits', 'give' ), $display_version ),
-			esc_html__( 'The people that build Give', 'give' ),
+			sprintf(esc_html__('Give %s - Credits', 'give'), $display_version),
+			esc_html__('The people that build Give', 'give'),
 			$this->minimum_capability,
 			'give-credits',
-			array( $this, 'credits_screen' )
+			array($this, 'credits_screen')
 		);
 	}
 
@@ -100,10 +100,10 @@ 
 	 */
 	public function admin_head() {
 
-		remove_submenu_page( 'index.php', 'give-about' );
-		remove_submenu_page( 'index.php', 'give-changelog' );
-		remove_submenu_page( 'index.php', 'give-getting-started' );
-		remove_submenu_page( 'index.php', 'give-credits' );
+		remove_submenu_page('index.php', 'give-about');
+		remove_submenu_page('index.php', 'give-changelog');
+		remove_submenu_page('index.php', 'give-getting-started');
+		remove_submenu_page('index.php', 'give-credits');
 
 	}
 
@@ -115,24 +115,24 @@ 
 	 * @return void
 	 */
 	public function tabs() {
-		$selected = isset( $_GET['page'] ) ? $_GET['page'] : 'give-about';
+		$selected = isset($_GET['page']) ? $_GET['page'] : 'give-about';
 		?>
 		<h2 class="nav-tab-wrapper">
 			<a class="nav-tab <?php echo $selected == 'give-about' ? 'nav-tab-active' : ''; ?>"
-			   href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'give-about' ), 'index.php' ) ) ); ?>">
-				<?php esc_html_e( 'About Give', 'give' ); ?>
+			   href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'give-about'), 'index.php'))); ?>">
+				<?php esc_html_e('About Give', 'give'); ?>
 			</a>
 			<a class="nav-tab <?php echo $selected == 'give-getting-started' ? 'nav-tab-active' : ''; ?>"
-			   href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'give-getting-started' ), 'index.php' ) ) ); ?>">
-				<?php esc_html_e( 'Getting Started', 'give' ); ?>
+			   href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'give-getting-started'), 'index.php'))); ?>">
+				<?php esc_html_e('Getting Started', 'give'); ?>
 			</a>
 			<a class="nav-tab <?php echo $selected == 'give-credits' ? 'nav-tab-active' : ''; ?>"
-			   href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'give-credits' ), 'index.php' ) ) ); ?>">
-				<?php esc_html_e( 'Credits', 'give' ); ?>
+			   href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'give-credits'), 'index.php'))); ?>">
+				<?php esc_html_e('Credits', 'give'); ?>
 			</a>
 			<a class="nav-tab <?php echo $selected == 'give-add-ons' ? 'nav-tab-active' : ''; ?>"
-			   href="<?php echo esc_url( admin_url( 'edit.php?post_type=give_forms&page=give-addons' ) ); ?>">
-				<?php esc_html_e( 'Add-ons', 'give' ); ?>
+			   href="<?php echo esc_url(admin_url('edit.php?post_type=give_forms&page=give-addons')); ?>">
+				<?php esc_html_e('Add-ons', 'give'); ?>
 			</a>
 		</h2>
 		<?php
@@ -146,7 +146,7 @@ 
 	 * @return void
 	 */
 	public function about_screen() {
-		list( $display_version ) = explode( '-', GIVE_VERSION );
+		list($display_version) = explode('-', GIVE_VERSION);
 		?>
 		<div class="wrap about-wrap">
 
@@ -155,8 +155,8 @@ 
 			<p class="about-text"><?php
 				printf(
 				/* translators: %s: http://docs.givewp.com/docs */
-					__( 'Thank you for activating or updating to the latest version of Give! If you\'re a first time user, welcome! You\'re well on your way to empowering your cause. We encourage you to check out the <a href="%s" target="_blank">plugin documentation</a> and getting started guide below.', 'give' ),
-					esc_url( 'http://docs.givewp.com/docs' )
+					__('Thank you for activating or updating to the latest version of Give! If you\'re a first time user, welcome! You\'re well on your way to empowering your cause. We encourage you to check out the <a href="%s" target="_blank">plugin documentation</a> and getting started guide below.', 'give'),
+					esc_url('http://docs.givewp.com/docs')
 				);
 				?></p>
 
@@ -165,7 +165,7 @@ 
 			<div class="give-badge"><?php
 				printf(
 				/* translators: %s: Give version */
-					esc_html__( 'Version %s', 'give' ),
+					esc_html__('Version %s', 'give'),
 					$display_version
 				);
 				?></div>
@@ -175,17 +175,17 @@ 
 			<div class="feature-section clearfix introduction">
 
 				<div class="video feature-section-item">
-					<img src="<?php echo GIVE_PLUGIN_URL . 'assets/dist/images/give-logo-photo-mashup.png' ?>"
-						 alt="<?php esc_attr_e( 'Give', 'give' ); ?>">
+					<img src="<?php echo GIVE_PLUGIN_URL.'assets/dist/images/give-logo-photo-mashup.png' ?>"
+						 alt="<?php esc_attr_e('Give', 'give'); ?>">
 				</div>
 
 				<div class="content feature-section-item last-feature">
 
-					<h3><?php esc_html_e( 'Give - Democratizing Generosity', 'give' ); ?></h3>
+					<h3><?php esc_html_e('Give - Democratizing Generosity', 'give'); ?></h3>
 
-					<p><?php esc_html_e( 'Give empowers you to easily accept donations and setup fundraising campaigns, directly within WordPress. We created Give to provide a better donation experience for you and your users. Robust, flexible, and intuitive, the plugin is built from the ground up to be the goto donation solution for WordPress. Create powerful donation forms, embed them throughout your website, start a campaign, and exceed your fundraising goals with Give. This plugin is actively developed and proudly supported by folks who are dedicated to helping you and your cause.', 'give' ); ?></p>
+					<p><?php esc_html_e('Give empowers you to easily accept donations and setup fundraising campaigns, directly within WordPress. We created Give to provide a better donation experience for you and your users. Robust, flexible, and intuitive, the plugin is built from the ground up to be the goto donation solution for WordPress. Create powerful donation forms, embed them throughout your website, start a campaign, and exceed your fundraising goals with Give. This plugin is actively developed and proudly supported by folks who are dedicated to helping you and your cause.', 'give'); ?></p>
 					<a href="https://givewp.com" target="_blank" class="button-secondary">
-						<?php esc_html_e( 'Learn More', 'give' ); ?>
+						<?php esc_html_e('Learn More', 'give'); ?>
 						<span class="dashicons dashicons-external"></span>
 					</a>
 
@@ -198,25 +198,25 @@ 
 
 				<div class="content feature-section-item">
 
-					<h3><?php esc_html_e( 'Getting to Know Give', 'give' ); ?></h3>
+					<h3><?php esc_html_e('Getting to Know Give', 'give'); ?></h3>
 
-					<p><?php esc_html_e( 'Before you get started with Give we suggest you take a look at the online documentation. There you will find the getting started guide which will help you get up and running quickly. If you have a question, issue or bug with the Core plugin please submit an issue on the Give website. We also welcome your feedback and feature requests. Welcome to Give. We hope you much success with your cause.', 'give' ); ?></p>
+					<p><?php esc_html_e('Before you get started with Give we suggest you take a look at the online documentation. There you will find the getting started guide which will help you get up and running quickly. If you have a question, issue or bug with the Core plugin please submit an issue on the Give website. We also welcome your feedback and feature requests. Welcome to Give. We hope you much success with your cause.', 'give'); ?></p>
 
 					<h4>Find Out More:</h4>
 					<ul class="ul-disc">
 						<li><a href="https://givewp.com/"
-							   target="_blank"><?php esc_html_e( 'Visit the Give Website', 'give' ); ?></a></li>
+							   target="_blank"><?php esc_html_e('Visit the Give Website', 'give'); ?></a></li>
 						<li><a href="https://givewp.com/features/"
-							   target="_blank"><?php esc_html_e( 'View the Give Features', 'give' ); ?></a></li>
+							   target="_blank"><?php esc_html_e('View the Give Features', 'give'); ?></a></li>
 						<li><a href="https://givewp.com/documentation/"
-							   target="_blank"><?php esc_html_e( 'Read the Documentation', 'give' ); ?></a></li>
+							   target="_blank"><?php esc_html_e('Read the Documentation', 'give'); ?></a></li>
 					</ul>
 
 				</div>
 
 				<div class="content  feature-section-item last-feature">
-					<img src="<?php echo GIVE_PLUGIN_URL . '/assets/dist/images/admin/give-form-mockup.png' ?>"
-						 alt="<?php esc_attr_e( 'A Give donation form', 'give' ); ?>">
+					<img src="<?php echo GIVE_PLUGIN_URL.'/assets/dist/images/admin/give-form-mockup.png' ?>"
+						 alt="<?php esc_attr_e('A Give donation form', 'give'); ?>">
 				</div>
 
 			</div>
@@ -235,7 +235,7 @@ 
 	 * @return void
 	 */
 	public function changelog_screen() {
-		list( $display_version ) = explode( '-', GIVE_VERSION );
+		list($display_version) = explode('-', GIVE_VERSION);
 		?>
 		<div class="wrap about-wrap">
 			<h1><?php echo get_admin_page_title(); ?></h1>
@@ -243,14 +243,14 @@ 
 			<p class="about-text"><?php
 				printf(
 				/* translators: %s: Give version */
-					esc_html__( 'Thank you for updating to the latest version! Give %s is ready to make your online store faster, safer, and better!', 'give' ),
+					esc_html__('Thank you for updating to the latest version! Give %s is ready to make your online store faster, safer, and better!', 'give'),
 					$display_version
 				);
 				?></p>
 			<div class="give-badge"><?php
 				printf(
 				/* translators: %s: Give version */
-					esc_html__( 'Version %s', 'give' ),
+					esc_html__('Version %s', 'give'),
 					$display_version
 				);
 				?></div>
@@ -258,7 +258,7 @@ 
 			<?php $this->tabs(); ?>
 
 			<div class="changelog">
-				<h3><?php esc_html_e( 'Full Changelog', 'give' ); ?></h3>
+				<h3><?php esc_html_e('Full Changelog', 'give'); ?></h3>
 
 				<div class="feature-section">
 					<?php echo $this->parse_readme(); ?>
@@ -266,10 +266,10 @@ 
 			</div>
 
 			<div class="return-to-dashboard">
-				<a href="<?php echo esc_url( admin_url( add_query_arg( array(
+				<a href="<?php echo esc_url(admin_url(add_query_arg(array(
 					'post_type' => 'give_forms',
 					'page'      => 'give-settings'
-				), 'edit.php' ) ) ); ?>"><?php esc_html_e( 'Give Settings', 'give' ); ?></a>
+				), 'edit.php'))); ?>"><?php esc_html_e('Give Settings', 'give'); ?></a>
 			</div>
 		</div>
 		<?php
@@ -283,36 +283,36 @@ 
 	 * @return void
 	 */
 	public function getting_started_screen() {
-		list( $display_version ) = explode( '-', GIVE_VERSION );
+		list($display_version) = explode('-', GIVE_VERSION);
 		?>
 		<div class="wrap about-wrap get-started">
 
 			<?php $this->get_welcome_header() ?>
 
-			<p class="about-text"><?php esc_html_e( 'Welcome to the getting started guide.', 'give' ); ?></p>
+			<p class="about-text"><?php esc_html_e('Welcome to the getting started guide.', 'give'); ?></p>
 
 			<?php give_get_newsletter(); ?>
 
 			<div class="give-badge"><?php
 				printf(
 				/* translators: %s: Give version */
-					esc_html__( 'Version %s', 'give' ),
+					esc_html__('Version %s', 'give'),
 					$display_version
 				);
 				?></div>
 
 			<?php $this->tabs(); ?>
 
-			<p class="about-text"><?php printf( esc_html__( 'Getting started with Give is easy! We put together this quick start guide to help first time users of the plugin. Our goal is to get you up and running in no time. Let\'s begin!', 'give' ), $display_version ); ?></p>
+			<p class="about-text"><?php printf(esc_html__('Getting started with Give is easy! We put together this quick start guide to help first time users of the plugin. Our goal is to get you up and running in no time. Let\'s begin!', 'give'), $display_version); ?></p>
 
 			<div class="feature-section clearfix">
 
 				<div class="content feature-section-item">
-					<h3><?php esc_html_e( 'STEP 1: Create a New Form', 'give' ); ?></h3>
+					<h3><?php esc_html_e('STEP 1: Create a New Form', 'give'); ?></h3>
 
-					<p><?php esc_html_e( 'Give is driven by its powerful donation form building features. However, it is much more than just a "donation form." From the "Add Form" page you\'ll be able to choose how and where you want to receive your donations. You will also be able to set the preferred donation amounts.', 'give' ); ?></p>
+					<p><?php esc_html_e('Give is driven by its powerful donation form building features. However, it is much more than just a "donation form." From the "Add Form" page you\'ll be able to choose how and where you want to receive your donations. You will also be able to set the preferred donation amounts.', 'give'); ?></p>
 
-					<p><?php esc_html_e( 'All of these features begin by simply going to the menu and choosing "Donations > Add Form."', 'give' ); ?></p>
+					<p><?php esc_html_e('All of these features begin by simply going to the menu and choosing "Donations > Add Form."', 'give'); ?></p>
 				</div>
 
 				<div class="content feature-section-item last-feature">
@@ -329,9 +329,9 @@ 
 				</div>
 
 				<div class="content feature-section-item last-feature">
-					<h3><?php esc_html_e( 'STEP 2: Customize Your Donation Forms', 'give' ); ?></h3>
+					<h3><?php esc_html_e('STEP 2: Customize Your Donation Forms', 'give'); ?></h3>
 
-					<p><?php esc_html_e( 'Each donation form you create can be customized to receive either a pre-determined set donation amount or have multiple suggested levels of giving. Choosing "Multi-level Donation" opens up the donation levels view where you can add as many levels as you\'d like with your own custom names and suggested amounts. As well, you can allow donors to give a custom amount and even set up donation goals.', 'give' ); ?></p>
+					<p><?php esc_html_e('Each donation form you create can be customized to receive either a pre-determined set donation amount or have multiple suggested levels of giving. Choosing "Multi-level Donation" opens up the donation levels view where you can add as many levels as you\'d like with your own custom names and suggested amounts. As well, you can allow donors to give a custom amount and even set up donation goals.', 'give'); ?></p>
 				</div>
 
 			</div>
@@ -340,11 +340,11 @@ 
 			<div class="feature-section clearfix">
 
 				<div class="content feature-section-item add-content">
-					<h3><?php esc_html_e( 'STEP 3: Add Additional Content', 'give' ); ?></h3>
+					<h3><?php esc_html_e('STEP 3: Add Additional Content', 'give'); ?></h3>
 
-					<p><?php esc_html_e( 'Every donation form you create with Give can be used on its own stand-alone page, or it can be inserted into any other page or post throughout your site via a shortcode or widget.', 'give' ); ?></p>
+					<p><?php esc_html_e('Every donation form you create with Give can be used on its own stand-alone page, or it can be inserted into any other page or post throughout your site via a shortcode or widget.', 'give'); ?></p>
 
-					<p><?php esc_html_e( 'You can choose these different modes by going to the "Form Content" section. From there, you can choose to add content before or after the donation form on a page, or if you choose "None" perhaps you want to instead use the shortcode. You can find the shortcode in the top right column directly under the Publish/Save button. This feature gives you the most amount of flexibility with controlling your content on your website all within the same page.', 'give' ); ?></p>
+					<p><?php esc_html_e('You can choose these different modes by going to the "Form Content" section. From there, you can choose to add content before or after the donation form on a page, or if you choose "None" perhaps you want to instead use the shortcode. You can find the shortcode in the top right column directly under the Publish/Save button. This feature gives you the most amount of flexibility with controlling your content on your website all within the same page.', 'give'); ?></p>
 				</div>
 
 				<div class="content feature-section-item last-feature">
@@ -361,9 +361,9 @@ 
 				</div>
 
 				<div class="content feature-section-item last-feature">
-					<h3><?php esc_html_e( 'STEP 4: Configure Your Display Options', 'give' ); ?></h3>
+					<h3><?php esc_html_e('STEP 4: Configure Your Display Options', 'give'); ?></h3>
 
-					<p><?php esc_html_e( 'Lastly, you can present the form in a number of different ways that each create their own unique donor experience. The "Modal" display mode opens the credit card fieldset within a popup window. The "Reveal" mode will slide into place the additional fields. If you\'re looking for a simple button, then "Button" more is the way to go. This allows you to create a customizable "Donate Now" button which will open the donation form upon clicking. There\'s tons of possibilities here, give it a try!', 'give' ); ?></p>
+					<p><?php esc_html_e('Lastly, you can present the form in a number of different ways that each create their own unique donor experience. The "Modal" display mode opens the credit card fieldset within a popup window. The "Reveal" mode will slide into place the additional fields. If you\'re looking for a simple button, then "Button" more is the way to go. This allows you to create a customizable "Donate Now" button which will open the donation form upon clicking. There\'s tons of possibilities here, give it a try!', 'give'); ?></p>
 				</div>
 
 
@@ -383,20 +383,20 @@ 
 	 * @return void
 	 */
 	public function credits_screen() {
-		list( $display_version ) = explode( '-', GIVE_VERSION );
+		list($display_version) = explode('-', GIVE_VERSION);
 		?>
 		<div class="wrap about-wrap">
 
 			<?php $this->get_welcome_header() ?>
 
-			<p class="about-text"><?php esc_html_e( 'Thanks to all those who have contributed code directly or indirectly.', 'give' ); ?></p>
+			<p class="about-text"><?php esc_html_e('Thanks to all those who have contributed code directly or indirectly.', 'give'); ?></p>
 
 			<?php give_get_newsletter(); ?>
 
 			<div class="give-badge"><?php
 				printf(
 				/* translators: %s: Give version */
-					esc_html__( 'Version %s', 'give' ),
+					esc_html__('Version %s', 'give'),
 					$display_version
 				);
 				?></div>
@@ -406,8 +406,8 @@ 
 			<p class="about-description"><?php
 				printf(
 				/* translators: %s: https://github.com/WordImpress/give */
-					__( 'Give is created by a dedicated team of developers. If you are interested in contributing please visit the <a href="%s" target="_blank">GitHub Repo</a>.', 'give' ),
-					esc_url( 'https://github.com/WordImpress/give' )
+					__('Give is created by a dedicated team of developers. If you are interested in contributing please visit the <a href="%s" target="_blank">GitHub Repo</a>.', 'give'),
+					esc_url('https://github.com/WordImpress/give')
 				);
 				?></p>
 
@@ -424,21 +424,21 @@ 
 	 * @return string $readme HTML formatted readme file
 	 */
 	public function parse_readme() {
-		$file = file_exists( GIVE_PLUGIN_DIR . 'readme.txt' ) ? GIVE_PLUGIN_DIR . 'readme.txt' : null;
+		$file = file_exists(GIVE_PLUGIN_DIR.'readme.txt') ? GIVE_PLUGIN_DIR . 'readme.txt' : null;
 
-		if ( ! $file ) {
-			$readme = '<p>' . esc_html__( 'No valid changlog was found.', 'give' ) . '</p>';
+		if ( ! $file) {
+			$readme = '<p>'.esc_html__('No valid changlog was found.', 'give').'</p>';
 		} else {
-			$readme = file_get_contents( $file );
-			$readme = nl2br( esc_html( $readme ) );
-			$readme = explode( '== Changelog ==', $readme );
-			$readme = end( $readme );
-
-			$readme = preg_replace( '/`(.*?)`/', '<code>\\1</code>', $readme );
-			$readme = preg_replace( '/[\040]\*\*(.*?)\*\*/', ' <strong>\\1</strong>', $readme );
-			$readme = preg_replace( '/[\040]\*(.*?)\*/', ' <em>\\1</em>', $readme );
-			$readme = preg_replace( '/= (.*?) =/', '<h4>\\1</h4>', $readme );
-			$readme = preg_replace( '/\[(.*?)\]\((.*?)\)/', '<a href="\\2">\\1</a>', $readme );
+			$readme = file_get_contents($file);
+			$readme = nl2br(esc_html($readme));
+			$readme = explode('== Changelog ==', $readme);
+			$readme = end($readme);
+
+			$readme = preg_replace('/`(.*?)`/', '<code>\\1</code>', $readme);
+			$readme = preg_replace('/[\040]\*\*(.*?)\*\*/', ' <strong>\\1</strong>', $readme);
+			$readme = preg_replace('/[\040]\*(.*?)\*/', ' <em>\\1</em>', $readme);
+			$readme = preg_replace('/= (.*?) =/', '<h4>\\1</h4>', $readme);
+			$readme = preg_replace('/\[(.*?)\]\((.*?)\)/', '<a href="\\2">\\1</a>', $readme);
 		}
 
 		return $readme;
@@ -455,24 +455,24 @@ 
 	public function contributors() {
 		$contributors = $this->get_contributors();
 
-		if ( empty( $contributors ) ) {
+		if (empty($contributors)) {
 			return '';
 		}
 
 		$contributor_list = '<ul class="wp-people-group">';
 
-		foreach ( $contributors as $contributor ) {
+		foreach ($contributors as $contributor) {
 			$contributor_list .= '<li class="wp-person">';
 			$contributor_list .= sprintf(
 				'<a href="%1$s" target="_blank"><img src="%2$s" width="64" height="64" class="gravatar" alt="%3$s" /></a>',
-				esc_url( 'https://github.com/' . $contributor->login ),
-				esc_url( $contributor->avatar_url ),
-				esc_attr( $contributor->login )
+				esc_url('https://github.com/'.$contributor->login),
+				esc_url($contributor->avatar_url),
+				esc_attr($contributor->login)
 			);
 			$contributor_list .= sprintf(
 				'<a class="web" target="_blank" href="%1$s">%2$s</a>',
-				esc_url( 'https://github.com/' . $contributor->login ),
-				esc_html( $contributor->login )
+				esc_url('https://github.com/'.$contributor->login),
+				esc_html($contributor->login)
 			);
 			$contributor_list .= '</li>';
 		}
@@ -490,25 +490,25 @@ 
 	 * @return array $contributors List of contributors
 	 */
 	public function get_contributors() {
-		$contributors = Give_Cache::get( 'give_contributors', true );
+		$contributors = Give_Cache::get('give_contributors', true);
 
-		if ( false !== $contributors ) {
+		if (false !== $contributors) {
 			return $contributors;
 		}
 
-		$response = wp_remote_get( 'https://api.github.com/repos/WordImpress/Give/contributors', array( 'sslverify' => false ) );
+		$response = wp_remote_get('https://api.github.com/repos/WordImpress/Give/contributors', array('sslverify' => false));
 
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
+		if (is_wp_error($response) || 200 != wp_remote_retrieve_response_code($response)) {
 			return array();
 		}
 
-		$contributors = json_decode( wp_remote_retrieve_body( $response ) );
+		$contributors = json_decode(wp_remote_retrieve_body($response));
 
-		if ( ! is_array( $contributors ) ) {
+		if ( ! is_array($contributors)) {
 			return array();
 		}
 
-		Give_Cache::set( 'give_contributors', $contributors, HOUR_IN_SECONDS, true );
+		Give_Cache::set('give_contributors', $contributors, HOUR_IN_SECONDS, true);
 
 		return $contributors;
 	}
@@ -520,7 +520,7 @@ 
 	 */
 	public function get_welcome_header() {
 		// Badge for welcome page
-		$badge_url = GIVE_PLUGIN_URL . 'assets/dist/images/give-badge.png';
+		$badge_url = GIVE_PLUGIN_URL.'assets/dist/images/give-badge.png';
 		?>
 		<h1 class="welcome-h1"><?php echo get_admin_page_title(); ?></h1>
 		<?php $this->social_media_elements(); ?>
@@ -613,7 +613,7 @@ 
 			<a href="https://twitter.com/givewp" class="twitter-follow-button" data-show-count="false"><?php
 				printf(
 				/* translators: %s: Give twitter user @givewp */
-					esc_html_e( 'Follow %s', 'give' ),
+					esc_html_e('Follow %s', 'give'),
 					'@givewp'
 				);
 				?></a>
@@ -647,27 +647,27 @@ 
 	public function welcome() {
 
 		// Bail if no activation redirect
-		if ( ! Give_Cache::get( '_give_activation_redirect', true ) || wp_doing_ajax() ) {
+		if ( ! Give_Cache::get('_give_activation_redirect', true) || wp_doing_ajax()) {
 			return;
 		}
 
 		// Delete the redirect transient
-		Give_Cache::delete( Give_Cache::get_key( '_give_activation_redirect' ) );
+		Give_Cache::delete(Give_Cache::get_key('_give_activation_redirect'));
 
 		// Bail if activating from network, or bulk
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+		if (is_network_admin() || isset($_GET['activate-multi'])) {
 			return;
 		}
 
-		$upgrade = get_option( 'give_version_upgraded_from' );
+		$upgrade = get_option('give_version_upgraded_from');
 
-		if ( ! $upgrade ) { // First time install
-			wp_safe_redirect( admin_url( 'index.php?page=give-about' ) );
+		if ( ! $upgrade) { // First time install
+			wp_safe_redirect(admin_url('index.php?page=give-about'));
 			exit;
-		} elseif ( ! give_is_setting_enabled( give_get_option( 'welcome' ) ) ) { // Welcome is disabled in settings
+		} elseif ( ! give_is_setting_enabled(give_get_option('welcome'))) { // Welcome is disabled in settings
 
 		} else { // Welcome is NOT disabled in settings
-			wp_safe_redirect( admin_url( 'index.php?page=give-about' ) );
+			wp_safe_redirect(admin_url('index.php?page=give-about'));
 			exit;
 		}
 	}

includes/admin/emails/class-new-donor-register-email.php

Spacing +35 added lines, -35 removed lines

@@ -10,11 +10,11 @@ 
  */
 
 // Exit if access directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'Give_New_Donor_Register_Email' ) ) :
+if ( ! class_exists('Give_New_Donor_Register_Email')) :
 
 	/**
 	 * Give_New_Donor_Register_Email
@@ -31,35 +31,35 @@ 
 		 * @since   2.0
 		 */
 		public function init() {
-			$this->load( array(
+			$this->load(array(
 				'id'                    => 'new-donor-register',
-				'label'                 => __( 'New User Registration', 'give' ),
-				'description'           => __( 'Sent to designated recipient(s) when a new user registers on the site via a donation form.', 'give' ),
+				'label'                 => __('New User Registration', 'give'),
+				'description'           => __('Sent to designated recipient(s) when a new user registers on the site via a donation form.', 'give'),
 				'has_recipient_field'   => true,
 				'notification_status'   => 'enabled',
 				'has_preview_header'    => true,
-				'email_tag_context'     => array( 'donor', 'general' ),
+				'email_tag_context'     => array('donor', 'general'),
 				'form_metabox_setting'  => false,
 				'default_email_subject' => sprintf(
 					/* translators: %s: site name */
-					esc_attr__( '[%s] New User Registration', 'give' ),
-					get_bloginfo( 'name' )
+					esc_attr__('[%s] New User Registration', 'give'),
+					get_bloginfo('name')
 				),
 				'default_email_message' => $this->get_default_email_message(),
-				'default_email_header'  => __( 'New User Registration', 'give' ),
-			) );
+				'default_email_header'  => __('New User Registration', 'give'),
+			));
 
 			// Setup action hook.
 			add_action(
 				"give_{$this->config['id']}_email_notification",
-				array( $this, 'setup_email_notification' ),
+				array($this, 'setup_email_notification'),
 				10,
 				2
 			);
 
 			add_filter(
 				'give_email_preview_header',
-				array( $this, 'email_preview_header' ),
+				array($this, 'email_preview_header'),
 				10,
 				2
 			);
@@ -74,9 +74,9 @@ 
 		 * @return string
 		 */
 		function get_default_email_message() {
-			$message = esc_attr__( 'New user registration on your site {sitename}:', 'give' ) . "\r\n\r\n";
-			$message .= esc_attr__( 'Username: {username}', 'give' ) . "\r\n\r\n";
-			$message .= esc_attr__( 'Email: {user_email}', 'give' ) . "\r\n";
+			$message = esc_attr__('New user registration on your site {sitename}:', 'give')."\r\n\r\n";
+			$message .= esc_attr__('Username: {username}', 'give')."\r\n\r\n";
+			$message .= esc_attr__('Email: {user_email}', 'give')."\r\n";
 
 			/**
 			 * Filter the default email message
@@ -96,7 +96,7 @@ 
 		 * @since 2.0
 		 */
 		public function setup_email_data() {
-			Give()->emails->__set( 'heading', $this->get_email_header() );
+			Give()->emails->__set('heading', $this->get_email_header());
 		}
 
 
@@ -111,12 +111,12 @@ 
 		 *
 		 * @return string
 		 */
-		public function setup_email_notification( $user_id, $user_data ) {
+		public function setup_email_notification($user_id, $user_data) {
 			$this->setup_email_data();
 
-			$this->send_email_notification( array(
+			$this->send_email_notification(array(
 				'user_id' => $user_id,
-			) );
+			));
 		}
 
 
@@ -130,42 +130,42 @@ 
 		 * @param Give_New_Donor_Register_Email $email
 		 * @return string
 		 */
-		public function email_preview_header( $email_preview_header, $email ) {
+		public function email_preview_header($email_preview_header, $email) {
 			// Bailout.
-			if ( $this->config['id'] !== $email->config['id'] ) {
+			if ($this->config['id'] !== $email->config['id']) {
 				return $email_preview_header;
 			}
 
 			// Payment receipt switcher
-			$user_id = give_check_variable( give_clean( $_GET ), 'isset', 0, 'user_id' );
+			$user_id = give_check_variable(give_clean($_GET), 'isset', 0, 'user_id');
 
 			// Get payments.
 			$donors  = new Give_API();
-			$donors  = give_check_variable( $donors->get_donors(), 'empty', array(), 'donors' );
+			$donors  = give_check_variable($donors->get_donors(), 'empty', array(), 'donors');
 			$options = array();
 
 			// Default option.
-			$options[0] = esc_html__( 'No donor(s) found.', 'give' );
+			$options[0] = esc_html__('No donor(s) found.', 'give');
 
 			// Provide nice human readable options.
-			if ( $donors ) {
-				$options[0] = esc_html__( '- Select a donor -', 'give' );
-				foreach ( $donors as $donor ) {
+			if ($donors) {
+				$options[0] = esc_html__('- Select a donor -', 'give');
+				foreach ($donors as $donor) {
 					// Exclude customers for which wp user not exist.
-					if ( ! $donor['info']['user_id'] ) {
+					if ( ! $donor['info']['user_id']) {
 						continue;
 					}
-					$options[ $donor['info']['user_id'] ] = esc_html( '#' . $donor['info']['donor_id'] . ' - ' . $donor['info']['email'] );
+					$options[$donor['info']['user_id']] = esc_html('#'.$donor['info']['donor_id'].' - '.$donor['info']['email']);
 				}
 			}
 
-			$request_url_data = wp_parse_url( $_SERVER['REQUEST_URI'] );
+			$request_url_data = wp_parse_url($_SERVER['REQUEST_URI']);
 			$query            = $request_url_data['query'];
 
 			// Remove user id query param if set from request url.
-			$query = remove_query_arg( array( 'user_id' ), $query );
+			$query = remove_query_arg(array('user_id'), $query);
 
-			$request_url = home_url( '/?' . str_replace( '', '', $query ) );
+			$request_url = home_url('/?'.str_replace('', '', $query));
 			?>
 			<script type="text/javascript">
 				function change_preview() {
@@ -199,12 +199,12 @@ 
 			<div class="give_preview_email_user_id_main">
 
 				<label for="give_preview_email_user_id" class="give_preview_email_user_id_label">
-					<?php echo esc_html__( 'Preview email with a donor:', 'give' ); ?>
+					<?php echo esc_html__('Preview email with a donor:', 'give'); ?>
 				</label>
 
 				<?php
 				// The select field with 100 latest transactions
-				echo Give()->html->select( array(
+				echo Give()->html->select(array(
 					'name'             => 'preview_email_user_id',
 					'selected'         => $user_id,
 					'id'               => 'give_preview_email_user_id',
@@ -214,7 +214,7 @@ 
 					'select_atts'      => 'onchange="change_preview()"',
 					'show_option_all'  => false,
 					'show_option_none' => false,
-				) );
+				));
 				?>
 				<!-- Closing tag-->
 			</div>

includes/admin/emails/class-new-donation-email.php

Spacing +25 added lines, -25 removed lines

@@ -13,11 +13,11 @@ 
  */
 
 // Exit if access directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'Give_New_Donation_Email' ) ) :
+if ( ! class_exists('Give_New_Donation_Email')) :
 
 	/**
 	 * Give_New_Donation_Email
@@ -37,21 +37,21 @@ 
 		 */
 		public function init() {
 			// Initialize empty payment.
-			$this->payment = new Give_Payment( 0 );
+			$this->payment = new Give_Payment(0);
 
-			$this->load( array(
+			$this->load(array(
 				'id'                    => 'new-donation',
-				'label'                 => __( 'New Donation', 'give' ),
-				'description'           => __( 'Sent to designated recipient(s) when a new donation is received or a pending donation is marked as complete.', 'give' ),
+				'label'                 => __('New Donation', 'give'),
+				'description'           => __('Sent to designated recipient(s) when a new donation is received or a pending donation is marked as complete.', 'give'),
 				'has_recipient_field'   => true,
 				'notification_status'   => 'enabled',
 				'form_metabox_setting'  => true,
-				'default_email_subject' => esc_attr__( 'New Donation - #{payment_id}', 'give' ),
+				'default_email_subject' => esc_attr__('New Donation - #{payment_id}', 'give'),
 				'default_email_message' => give_get_default_donation_notification_email(),
-				'default_email_header'  => __( 'New Donation!', 'give' ),
-			) );
+				'default_email_header'  => __('New Donation!', 'give'),
+			));
 
-			add_action( "give_{$this->config['id']}_email_notification", array( $this, 'setup_email_notification' ) );
+			add_action("give_{$this->config['id']}_email_notification", array($this, 'setup_email_notification'));
 		}
 
 		/**
@@ -64,11 +64,11 @@ 
 		 *
 		 * @return string
 		 */
-		public function get_email_subject( $form_id = null ) {
+		public function get_email_subject($form_id = null) {
 			$subject = wp_strip_all_tags(
 				Give_Email_Notification_Util::get_value(
 					$this,
-					Give_Email_Setting_Field::get_prefix( $this, $form_id ) . 'email_subject',
+					Give_Email_Setting_Field::get_prefix($this, $form_id).'email_subject',
 					$form_id,
 					$this->config['default_email_subject']
 				)
@@ -80,14 +80,14 @@ 
 			 *
 			 * @since 1.0
 			 */
-			$subject = apply_filters( 'give_admin_donation_notification_subject', $subject, $this->payment->ID );
+			$subject = apply_filters('give_admin_donation_notification_subject', $subject, $this->payment->ID);
 
 			/**
 			 * Filters the donation notification subject.
 			 *
 			 * @since 2.0
 			 */
-			$subject = apply_filters( "give_{$this->config['id']}_get_email_subject", $subject, $this, $form_id );
+			$subject = apply_filters("give_{$this->config['id']}_get_email_subject", $subject, $this, $form_id);
 
 			return $subject;
 		}
@@ -103,10 +103,10 @@ 
 		 *
 		 * @return string
 		 */
-		public function get_email_message( $form_id = null ) {
+		public function get_email_message($form_id = null) {
 			$message = Give_Email_Notification_Util::get_value(
 				$this,
-				Give_Email_Setting_Field::get_prefix( $this, $form_id ) . 'email_message',
+				Give_Email_Setting_Field::get_prefix($this, $form_id).'email_message',
 				$form_id,
 				$this->config['default_email_message']
 			);
@@ -149,7 +149,7 @@ 
 		 * @param int $form_id
 		 * @return array
 		 */
-		public function get_email_attachments( $form_id = null ) {
+		public function get_email_attachments($form_id = null) {
 			/**
 			 * Filters the donation notification email attachments.
 			 * By default, there is no attachment but plugins can hook in to provide one more multiple.
@@ -212,9 +212,9 @@ 
 				$this->payment->payment_meta
 			);
 
-			Give()->emails->__set( 'from_name', $from_name );
-			Give()->emails->__set( 'from_email', $from_email );
-			Give()->emails->__set( 'heading', $this->get_email_header() );
+			Give()->emails->__set('from_name', $from_name);
+			Give()->emails->__set('from_email', $from_email);
+			Give()->emails->__set('heading', $this->get_email_header());
 
 			/**
 			 * Filters the donation notification email headers.
@@ -228,7 +228,7 @@ 
 				$this->payment->payment_meta
 			);
 
-			Give()->emails->__set( 'headers', $headers );
+			Give()->emails->__set('headers', $headers);
 		}
 
 		/**
@@ -239,16 +239,16 @@ 
 		 *
 		 * @param int $payment_id
 		 */
-		public function setup_email_notification( $payment_id ) {
-			$this->payment = new Give_Payment( $payment_id );
+		public function setup_email_notification($payment_id) {
+			$this->payment = new Give_Payment($payment_id);
 
 			// Set email data.
 			$this->setup_email_data();
 
 			// Send email.
-			$this->send_email_notification( array(
+			$this->send_email_notification(array(
 				'payment_id' => $payment_id,
-			) );
+			));
 		}
 	}
 

includes/admin/emails/class-email-notification-table.php

Spacing +46 added lines, -46 removed lines

@@ -36,10 +36,10 @@ 
 	 * @access public
 	 */
 	public function __construct() {
-		parent::__construct( array(
-			'singular' => __( 'Give Email Notification', 'give' ),
-			'plural'   => __( 'Give Email Notifications', 'give' ),
-		) );
+		parent::__construct(array(
+			'singular' => __('Give Email Notification', 'give'),
+			'plural'   => __('Give Email Notifications', 'give'),
+		));
 
 		$this->email_notifications = Give_Email_Notifications::get_instance();
 	}
@@ -59,13 +59,13 @@ 
 		 *
 		 * @since 2.0
 		 */
-		return apply_filters( 'give_email_notification_setting_columns', array(
-			'cb'         => __( 'Email Status', 'give' ),
-			'name'       => __( 'Email', 'give' ),
-			'email_type' => __( 'Content Type', 'give' ),
-			'recipient'  => __( 'Recipient(s)', 'give' ),
-			'setting'    => __( 'Edit Email', 'give' ),
-		) );
+		return apply_filters('give_email_notification_setting_columns', array(
+			'cb'         => __('Email Status', 'give'),
+			'name'       => __('Email', 'give'),
+			'email_type' => __('Content Type', 'give'),
+			'recipient'  => __('Recipient(s)', 'give'),
+			'setting'    => __('Edit Email', 'give'),
+		));
 	}
 
 	/**
@@ -78,19 +78,19 @@ 
 	 *
 	 * @return  string
 	 */
-	public function column_name( $email ) {
-		$edit_url = esc_url( admin_url( 'edit.php?post_type=give_forms&page=give-settings&tab=emails&section=' . $email->config['id'] ) );
-		$actions  = $this->get_row_actions( $email );
+	public function column_name($email) {
+		$edit_url = esc_url(admin_url('edit.php?post_type=give_forms&page=give-settings&tab=emails&section='.$email->config['id']));
+		$actions  = $this->get_row_actions($email);
 
 		ob_start();
 		?>
 		<a class="row-title" href="<?php echo $edit_url; ?>"><?php echo $email->config['label']; ?></a>
 
-		<?php if ( $desc = $email->config['description'] ) : ?>
-			<?php echo Give()->tooltips->render_help( esc_attr( $desc ) ); ?>
+		<?php if ($desc = $email->config['description']) : ?>
+			<?php echo Give()->tooltips->render_help(esc_attr($desc)); ?>
 		<?php endif; ?>
 
-		<?php echo $this->row_actions( $actions ); ?>
+		<?php echo $this->row_actions($actions); ?>
 		<?php
 		return ob_get_clean();
 	}
@@ -105,18 +105,18 @@ 
 	 *
 	 * @return string
 	 */
-	public function column_recipient( $email ) {
+	public function column_recipient($email) {
 		ob_start();
 
-		if( Give_Email_Notification_Util::has_recipient_field( $email ) ) {
+		if (Give_Email_Notification_Util::has_recipient_field($email)) {
 			$recipients = $email->get_recipient();
-			if ( is_array( $recipients ) ) {
-				$recipients = implode( '<br>', $recipients );
+			if (is_array($recipients)) {
+				$recipients = implode('<br>', $recipients);
 			}
 
 			echo $recipients;
 
-		} elseif ( ! empty( $email->config['recipient_group_name'] ) ) {
+		} elseif ( ! empty($email->config['recipient_group_name'])) {
 			echo $email->config['recipient_group_name'];
 		}
 
@@ -133,10 +133,10 @@ 
 	 *
 	 * @return string
 	 */
-	public function column_cb( $email ) {
+	public function column_cb($email) {
 		$notification_status  = $email->get_notification_status();
-		$user_can_edit_status = (int) Give_Email_Notification_Util::is_notification_status_editable( $email );
-		$icon_classes         = Give_Email_Notification_Util::is_email_notification_active( $email )
+		$user_can_edit_status = (int) Give_Email_Notification_Util::is_notification_status_editable($email);
+		$icon_classes         = Give_Email_Notification_Util::is_email_notification_active($email)
 			? 'dashicons dashicons-yes'
 			: 'dashicons dashicons-no-alt';
 		$attributes           = array(
@@ -146,15 +146,15 @@ 
 			'data-edit'   => $user_can_edit_status,
 		);
 
-		if ( ! $user_can_edit_status ) {
-			$icon_classes         = 'dashicons dashicons-lock';
+		if ( ! $user_can_edit_status) {
+			$icon_classes = 'dashicons dashicons-lock';
 
-			$attributes['data-notice'] = esc_attr( $email->config['notices']['non-notification-status-editable'] );
+			$attributes['data-notice'] = esc_attr($email->config['notices']['non-notification-status-editable']);
 		}
 
 		$html = sprintf(
 			'<span %1$s><i class="%2$s"></i></span></span><span class="spinner"></span>',
-			give_get_attribute_str( $attributes ),
+			give_get_attribute_str($attributes),
 			$icon_classes
 		);
 
@@ -172,10 +172,10 @@ 
 	 *
 	 * @return string
 	 */
-	public function column_email_type( Give_Email_Notification $email ) {
+	public function column_email_type(Give_Email_Notification $email) {
 		$email_content_type_label = apply_filters(
 			"give_email_list_render_{$email->config['id']}_email_content_type",
-			Give_Email_Notification_Util::get_formatted_email_type( $email->config['content_type'] ),
+			Give_Email_Notification_Util::get_formatted_email_type($email->config['content_type']),
 			$email
 		);
 
@@ -192,15 +192,15 @@ 
 	 *
 	 * @return string
 	 */
-	public function column_setting( Give_Email_Notification $email ) {
-		return Give()->tooltips->render_link( array(
-			'label'       => __( 'Edit', 'give' ) . " {$email->config['label']}",
+	public function column_setting(Give_Email_Notification $email) {
+		return Give()->tooltips->render_link(array(
+			'label'       => __('Edit', 'give')." {$email->config['label']}",
 			'tag_content' => '<span class="dashicons dashicons-admin-generic"></span>',
-			'link'        => esc_url( admin_url( 'edit.php?post_type=give_forms&page=give-settings&tab=emails&section=' . $email->config['id'] ) ),
+			'link'        => esc_url(admin_url('edit.php?post_type=give_forms&page=give-settings&tab=emails&section='.$email->config['id'])),
 			'attributes'  => array(
 				'class' => 'button button-small',
 			),
-		) );
+		));
 	}
 
 
@@ -214,8 +214,8 @@ 
 	 *
 	 * @return array
 	 */
-	private function get_row_actions( $email ) {
-		$edit_url = esc_url( admin_url( 'edit.php?post_type=give_forms&page=give-settings&tab=emails&section=' . $email->config['id'] ) );
+	private function get_row_actions($email) {
+		$edit_url = esc_url(admin_url('edit.php?post_type=give_forms&page=give-settings&tab=emails&section='.$email->config['id']));
 
 		/**
 		 * Filter the row actions
@@ -227,7 +227,7 @@ 
 		$row_actions = apply_filters(
 			'give_email_notification_row_actions',
 			array(
-				'edit' => "<a href=\"{$edit_url}\">" . __( 'Edit', 'give' ) . '</a>',
+				'edit' => "<a href=\"{$edit_url}\">".__('Edit', 'give').'</a>',
 			),
 			$email
 		);
@@ -248,22 +248,22 @@ 
 		$hidden                = array();
 		$email_notifications   = array();
 		$sortable              = $this->get_sortable_columns();
-		$this->_column_headers = array( $columns, $hidden, $sortable, $this->get_primary_column_name() );
+		$this->_column_headers = array($columns, $hidden, $sortable, $this->get_primary_column_name());
 
 		// Set email notifications.
 		/* @var Give_Email_Notification $email_notification */
-		foreach ( $this->email_notifications->get_email_notifications() as $email_notification ) {
-			if ( Give_Email_Notification_Util::is_show_on_emails_setting_page( $email_notification ) ) {
+		foreach ($this->email_notifications->get_email_notifications() as $email_notification) {
+			if (Give_Email_Notification_Util::is_show_on_emails_setting_page($email_notification)) {
 				$email_notifications[] = $email_notification;
 			}
 		}
 
-		$totalItems  = count( $email_notifications );
+		$totalItems  = count($email_notifications);
 		$this->items = $email_notifications;
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $totalItems,
 			'per_page'    => $this->per_page,
-		) );
+		));
 	}
 
 	/**
@@ -273,7 +273,7 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		_e( 'No give email notification found.', 'give' );
+		_e('No give email notification found.', 'give');
 	}
 
 	/**

includes/admin/emails/class-email-setting-field.php

Spacing +84 added lines, -84 removed lines

@@ -21,30 +21,30 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_setting_fields( Give_Email_Notification $email, $form_id = null ) {
-		$setting_fields = self::get_default_setting_fields( $email, $form_id );
+	public static function get_setting_fields(Give_Email_Notification $email, $form_id = null) {
+		$setting_fields = self::get_default_setting_fields($email, $form_id);
 
 		// Recipient field.
-		$setting_fields[] = self::get_recipient_setting_field( $email, $form_id, Give_Email_Notification_Util::has_recipient_field( $email ) );
+		$setting_fields[] = self::get_recipient_setting_field($email, $form_id, Give_Email_Notification_Util::has_recipient_field($email));
 
 		// Add extra setting field.
-		if ( $extra_setting_field = $email->get_extra_setting_fields( $form_id ) ) {
-			$setting_fields = array_merge( $setting_fields, $extra_setting_field );
+		if ($extra_setting_field = $email->get_extra_setting_fields($form_id)) {
+			$setting_fields = array_merge($setting_fields, $extra_setting_field);
 		}
 
 		// Preview field.
-		if ( Give_Email_Notification_Util::has_preview( $email ) ) {
-			$setting_fields[] = self::get_preview_setting_field( $email, $form_id );
+		if (Give_Email_Notification_Util::has_preview($email)) {
+			$setting_fields[] = self::get_preview_setting_field($email, $form_id);
 		}
 
-		$setting_fields = self::add_section_end( $email, $setting_fields );
+		$setting_fields = self::add_section_end($email, $setting_fields);
 
 		/**
 		 * Filter the email notification settings.
 		 *
 		 * @since 2.0
 		 */
-		return apply_filters( 'give_email_notification_setting_fields', $setting_fields, $email, $form_id );
+		return apply_filters('give_email_notification_setting_fields', $setting_fields, $email, $form_id);
 	}
 
 
@@ -58,11 +58,11 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function has_section_end( $setting ) {
-		$last_field      = end( $setting );
+	public static function has_section_end($setting) {
+		$last_field      = end($setting);
 		$has_section_end = false;
 
-		if ( 'sectionend' === $last_field['type'] ) {
+		if ('sectionend' === $last_field['type']) {
 			$has_section_end = true;
 		}
 
@@ -80,7 +80,7 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_section_start( Give_Email_Notification $email, $form_id = null ) {
+	public static function get_section_start(Give_Email_Notification $email, $form_id = null) {
 		// Add section end field.
 		$setting = array(
 			'id'    => "give_title_email_settings_{$email->config['id']}",
@@ -102,8 +102,8 @@ 
 	 *
 	 * @return array
 	 */
-	public static function add_section_end( Give_Email_Notification $email, $setting ) {
-		if ( ! self::has_section_end( $setting ) ) {
+	public static function add_section_end(Give_Email_Notification $email, $setting) {
+		if ( ! self::has_section_end($setting)) {
 			// Add section end field.
 			$setting[] = array(
 				'id'   => "give_title_email_settings_{$email->config['id']}",
@@ -125,26 +125,26 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_default_setting_fields( Give_Email_Notification $email, $form_id = null ) {
-		$settings[] = self::get_section_start( $email, $form_id );
-		$settings[] = self::get_notification_status_field( $email, $form_id );
+	public static function get_default_setting_fields(Give_Email_Notification $email, $form_id = null) {
+		$settings[] = self::get_section_start($email, $form_id);
+		$settings[] = self::get_notification_status_field($email, $form_id);
 
-		if ( ! Give_Email_Notification_Util::is_notification_status_editable( $email ) ) {
-			if ( $form_id || give_is_add_new_form_page() ) {
+		if ( ! Give_Email_Notification_Util::is_notification_status_editable($email)) {
+			if ($form_id || give_is_add_new_form_page()) {
 				// Do not allow admin to disable notification on perform basis.
-				unset( $settings[1]['options']['disabled'] );
+				unset($settings[1]['options']['disabled']);
 			} else {
 				// Do not allow admin to edit notification status globally.
-				unset( $settings[1] );
+				unset($settings[1]);
 			}
 		}
 
-		$settings[] = self::get_email_subject_field( $email, $form_id );
-		$settings[] = self::get_email_header_field( $email, $form_id );
-		$settings[] = self::get_email_message_field( $email, $form_id );
+		$settings[] = self::get_email_subject_field($email, $form_id);
+		$settings[] = self::get_email_header_field($email, $form_id);
+		$settings[] = self::get_email_message_field($email, $form_id);
 
-		if ( Give_Email_Notification_Util::is_content_type_editable( $email ) ) {
-			$settings[] = self::get_email_content_type_field( $email, $form_id );
+		if (Give_Email_Notification_Util::is_content_type_editable($email)) {
+			$settings[] = self::get_email_content_type_field($email, $form_id);
 		}
 
 		return $settings;
@@ -161,31 +161,31 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_notification_status_field( Give_Email_Notification $email, $form_id = null ) {
+	public static function get_notification_status_field(Give_Email_Notification $email, $form_id = null) {
 		$option = array(
-			'enabled'  => __( 'Enabled', 'give' ),
-			'disabled' => __( 'Disabled', 'give' ),
+			'enabled'  => __('Enabled', 'give'),
+			'disabled' => __('Disabled', 'give'),
 		);
 
 		$default_value = $email->get_notification_status();
 
 		// Add global options.
-		if ( $form_id || give_is_add_new_form_page() ) {
+		if ($form_id || give_is_add_new_form_page()) {
 			$option = array(
-				'global'   => __( 'Global Options' ),
-				'enabled'  => __( 'Customize', 'give' ),
-				'disabled' => __( 'Disabled', 'give' ),
+				'global'   => __('Global Options'),
+				'enabled'  => __('Customize', 'give'),
+				'disabled' => __('Disabled', 'give'),
 			);
 
 			$default_value = 'global';
 		}
 
-		$description = isset( $_GET['page'] ) && 'give-settings' === $_GET['page'] ? __( 'Choose whether you want this email enabled or not.', 'give' ) : sprintf( __( 'Global Options are set <a href="%s">in Give settings</a>. You may override them for this form here.', 'give' ), admin_url( 'edit.php?post_type=give_forms&page=give-settings&tab=emails' ) );
+		$description = isset($_GET['page']) && 'give-settings' === $_GET['page'] ? __('Choose whether you want this email enabled or not.', 'give') : sprintf(__('Global Options are set <a href="%s">in Give settings</a>. You may override them for this form here.', 'give'), admin_url('edit.php?post_type=give_forms&page=give-settings&tab=emails'));
 
 		return array(
-			'name'          => esc_html__( 'Notification', 'give' ),
+			'name'          => esc_html__('Notification', 'give'),
 			'desc'          => $description,
-			'id'            => self::get_prefix( $email, $form_id ) . 'notification',
+			'id'            => self::get_prefix($email, $form_id).'notification',
 			'type'          => 'radio_inline',
 			'default'       => $default_value,
 			'options'       => $option,
@@ -204,11 +204,11 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_email_subject_field( Give_Email_Notification $email, $form_id = null ) {
+	public static function get_email_subject_field(Give_Email_Notification $email, $form_id = null) {
 		return array(
-			'id'      => self::get_prefix( $email, $form_id ) . 'email_subject',
-			'name'    => esc_html__( 'Email Subject', 'give' ),
-			'desc'    => esc_html__( 'Enter the email subject line.', 'give' ),
+			'id'      => self::get_prefix($email, $form_id).'email_subject',
+			'name'    => esc_html__('Email Subject', 'give'),
+			'desc'    => esc_html__('Enter the email subject line.', 'give'),
 			'default' => $email->config['default_email_subject'],
 			'type'    => 'text',
 		);
@@ -224,11 +224,11 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_email_header_field( Give_Email_Notification $email, $form_id = null ) {
+	public static function get_email_header_field(Give_Email_Notification $email, $form_id = null) {
 		return array(
-			'id'      => self::get_prefix( $email, $form_id ) . 'email_header',
-			'name'    => esc_html__( 'Email Header', 'give' ),
-			'desc'    => esc_html__( 'Enter the email header that appears at the top of the email.', 'give' ),
+			'id'      => self::get_prefix($email, $form_id).'email_header',
+			'name'    => esc_html__('Email Header', 'give'),
+			'desc'    => esc_html__('Enter the email header that appears at the top of the email.', 'give'),
 			'default' => $email->config['default_email_header'],
 			'type'    => 'text',
 		);
@@ -245,28 +245,28 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_email_message_field( Give_Email_Notification $email, $form_id = null ) {
-		$desc = esc_html__( 'Enter the email message.', 'give' );
+	public static function get_email_message_field(Give_Email_Notification $email, $form_id = null) {
+		$desc = esc_html__('Enter the email message.', 'give');
 
-		if ( $email_tag_list = $email->get_allowed_email_tags( true ) ) {
+		if ($email_tag_list = $email->get_allowed_email_tags(true)) {
 			$desc = sprintf(
 				'%1$s <br> %2$s: %3$s %4$s',
-				__( 'The email that is sent to users after completing a successful donation. HTML is accepted.', 'give' ),
-				__( 'Available template tags', 'give' ),
+				__('The email that is sent to users after completing a successful donation. HTML is accepted.', 'give'),
+				__('Available template tags', 'give'),
 				$email_tag_list,
 				sprintf(
 					'<br><a href="%1$s" target="_blank">%2$s</a> %3$s',
-					esc_url( 'http://docs.givewp.com/meta-email-tags' ),
-					__( 'See our documentation', 'give' ),
-					__( 'for examples of how to use custom meta email tags to output additional donor or donation information in your Give emails.', 'give' )
+					esc_url('http://docs.givewp.com/meta-email-tags'),
+					__('See our documentation', 'give'),
+					__('for examples of how to use custom meta email tags to output additional donor or donation information in your Give emails.', 'give')
 				)
 			);
 
 		}
 
 		return array(
-			'id'      => self::get_prefix( $email, $form_id ) . 'email_message',
-			'name'    => esc_html__( 'Email message', 'give' ),
+			'id'      => self::get_prefix($email, $form_id).'email_message',
+			'name'    => esc_html__('Email message', 'give'),
 			'desc'    => $desc,
 			'type'    => 'wysiwyg',
 			'default' => $email->config['default_email_message'],
@@ -284,15 +284,15 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_email_content_type_field( Give_Email_Notification $email, $form_id = null ) {
+	public static function get_email_content_type_field(Give_Email_Notification $email, $form_id = null) {
 		return array(
-			'id'      => self::get_prefix( $email, $form_id ) . 'email_content_type',
-			'name'    => esc_html__( 'Email Content Type', 'give' ),
-			'desc'    => __( 'Choose email type.', 'give' ),
+			'id'      => self::get_prefix($email, $form_id).'email_content_type',
+			'name'    => esc_html__('Email Content Type', 'give'),
+			'desc'    => __('Choose email type.', 'give'),
 			'type'    => 'select',
 			'options' => array(
-				'text/html'  => Give_Email_Notification_Util::get_formatted_email_type( 'text/html' ),
-				'text/plain' => Give_Email_Notification_Util::get_formatted_email_type( 'text/plain' ),
+				'text/html'  => Give_Email_Notification_Util::get_formatted_email_type('text/html'),
+				'text/plain' => Give_Email_Notification_Util::get_formatted_email_type('text/plain'),
 			),
 			'default' => $email->config['content_type'],
 		);
@@ -312,29 +312,29 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_recipient_setting_field( Give_Email_Notification $email, $form_id = null, $edit_recipient = true ) {
+	public static function get_recipient_setting_field(Give_Email_Notification $email, $form_id = null, $edit_recipient = true) {
 		$recipient = array(
-			'id'               => self::get_prefix( $email, $form_id ) . 'recipient',
-			'name'             => esc_html__( 'Email Recipients', 'give' ),
-			'desc'             => __( 'Enter the email address(es) that should receive a notification.', 'give' ),
+			'id'               => self::get_prefix($email, $form_id).'recipient',
+			'name'             => esc_html__('Email Recipients', 'give'),
+			'desc'             => __('Enter the email address(es) that should receive a notification.', 'give'),
 			'type'             => 'email',
-			'default'          => get_bloginfo( 'admin_email' ),
+			'default'          => get_bloginfo('admin_email'),
 			'repeat'           => true,
-			'repeat_btn_title' => esc_html__( 'Add Recipient', 'give' ),
+			'repeat_btn_title' => esc_html__('Add Recipient', 'give'),
 		);
 
-		if ( $form_id || give_is_add_new_form_page() ) {
-			$recipient['name']    = __( 'Email', 'give' );
+		if ($form_id || give_is_add_new_form_page()) {
+			$recipient['name']    = __('Email', 'give');
 			$recipient['default'] = '';
 			$recipient['id']      = 'email';
-			$recipient['desc']    = __( 'Enter the email address that should receive a notification.', 'give' );
+			$recipient['desc']    = __('Enter the email address that should receive a notification.', 'give');
 
 			$recipient = array(
-				'id'      => self::get_prefix( $email, $form_id ) . 'recipient',
+				'id'      => self::get_prefix($email, $form_id).'recipient',
 				'type'    => 'group',
 				'options' => array(
-					'add_button'    => __( 'Add Email', 'give' ),
-					'header_title'  => __( 'Email Recipient', 'give' ),
+					'add_button'    => __('Add Email', 'give'),
+					'header_title'  => __('Email Recipient', 'give'),
 					'remove_button' => '<span class="dashicons dashicons-no"></span>',
 				),
 				'fields'  => array(
@@ -345,16 +345,16 @@ 
 
 		// Disable field if email donor has recipient field.
 		// @see https://github.com/WordImpress/Give/issues/2657
-		if ( ! $edit_recipient ) {
-			if ( 'group' == $recipient['type'] ) {
-				$recipient         = current( $recipient['fields'] );
+		if ( ! $edit_recipient) {
+			if ('group' == $recipient['type']) {
+				$recipient         = current($recipient['fields']);
 				$recipient['type'] = 'text';
 			}
 
 			$recipient['attributes']['disabled'] = 'disabled';
 			$recipient['value']                  = $recipient['default'] = '{donor_email}';
 			$recipient['repeat']                 = false;
-			$recipient['desc']                   = __( 'This email is automatically sent to the donor and the recipient cannot be customized.', 'give' );
+			$recipient['desc']                   = __('This email is automatically sent to the donor and the recipient cannot be customized.', 'give');
 		}
 
 		return $recipient;
@@ -371,12 +371,12 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_preview_setting_field( Give_Email_Notification $email, $form_id = null ) {
+	public static function get_preview_setting_field(Give_Email_Notification $email, $form_id = null) {
 		return array(
-			'name' => __( 'Preview Email', 'give' ),
-			'desc' => __( 'Click the "Preview Email" button to preview the email in your browser. Click the "Send Test Email" button to send a test email directly to your inbox.',
-				'give' ),
-			'id'   => self::get_prefix( $email, $form_id ) . 'preview_buttons',
+			'name' => __('Preview Email', 'give'),
+			'desc' => __('Click the "Preview Email" button to preview the email in your browser. Click the "Send Test Email" button to send a test email directly to your inbox.',
+				'give'),
+			'id'   => self::get_prefix($email, $form_id).'preview_buttons',
 			'type' => 'email_preview_buttons',
 		);
 	}
@@ -393,10 +393,10 @@ 
 	 *
 	 * @return string
 	 */
-	public static function get_prefix( Give_Email_Notification $email, $form_id = null ) {
+	public static function get_prefix(Give_Email_Notification $email, $form_id = null) {
 		$meta_key = "{$email->config['id']}_";
 
-		if ( $form_id || give_is_add_new_form_page() ) {
+		if ($form_id || give_is_add_new_form_page()) {
 			$meta_key = "_give_{$email->config['id']}_";
 		}
 

templates/shortcode-profile-editor.php

Spacing +61 added lines, -61 removed lines

@@ -10,25 +10,25 @@ 
 
 $current_user = wp_get_current_user();
 
-if ( is_user_logged_in() ) :
+if (is_user_logged_in()) :
 	$user_id = get_current_user_id();
-	$first_name   = get_user_meta( $user_id, 'first_name', true );
-	$last_name    = get_user_meta( $user_id, 'last_name', true );
-	$last_name    = get_user_meta( $user_id, 'last_name', true );
+	$first_name   = get_user_meta($user_id, 'first_name', true);
+	$last_name    = get_user_meta($user_id, 'last_name', true);
+	$last_name    = get_user_meta($user_id, 'last_name', true);
 	$display_name = $current_user->display_name;
-	$donor        = new Give_Donor( $user_id, true );
-	$address      = $donor->get_donor_address( array( 'address_type' => 'personal' ) );
-	$company_name = $donor->get_meta( '_give_donor_company', true );
-
-	if ( isset( $_GET['updated'] ) && 'true' === $_GET['updated'] && ! give_get_errors() ) {
-		if ( isset( $_GET['update_code'] ) ) {
-			if ( 1 === absint( $_GET['update_code'] ) ) {
-				printf( '<p class="give_success"><strong>%1$s</strong> %2$s</p>', esc_html__( 'Success:', 'give' ), esc_html__( 'Your profile has been updated.', 'give' ) );
+	$donor        = new Give_Donor($user_id, true);
+	$address      = $donor->get_donor_address(array('address_type' => 'personal'));
+	$company_name = $donor->get_meta('_give_donor_company', true);
+
+	if (isset($_GET['updated']) && 'true' === $_GET['updated'] && ! give_get_errors()) {
+		if (isset($_GET['update_code'])) {
+			if (1 === absint($_GET['update_code'])) {
+				printf('<p class="give_success"><strong>%1$s</strong> %2$s</p>', esc_html__('Success:', 'give'), esc_html__('Your profile has been updated.', 'give'));
 			}
 		}
 	}
 
-	Give()->notices->render_frontend_notices( 0 );
+	Give()->notices->render_frontend_notices(0);
 
 	/**
 	 * Fires in the profile editor shortcode, before the form.
@@ -37,57 +37,57 @@ 
 	 *
 	 * @since 1.0
 	 */
-	do_action( 'give_profile_editor_before' );
+	do_action('give_profile_editor_before');
 	?>
 
 	<form id="give_profile_editor_form" class="give-form" action="<?php echo give_get_current_page_url(); ?>" method="post">
 		<fieldset>
-			<legend id="give_profile_name_label"><?php _e( 'Profile', 'give' ); ?></legend>
+			<legend id="give_profile_name_label"><?php _e('Profile', 'give'); ?></legend>
 
 			<h3 id="give_personal_information_label"
-			    class="give-section-break"><?php _e( 'Change your Name', 'give' ); ?></h3>
+			    class="give-section-break"><?php _e('Change your Name', 'give'); ?></h3>
 
 			<p id="give_profile_first_name_wrap" class="form-row form-row-first form-row-responsive">
 				<label for="give_first_name">
-					<?php _e( 'First Name', 'give' ); ?>
+					<?php _e('First Name', 'give'); ?>
 					<span class="give-required-indicator  ">*</span>
 				</label>
 				<input name="give_first_name" id="give_first_name" class="text give-input" type="text"
-				       value="<?php echo esc_attr( $first_name ); ?>"/>
+				       value="<?php echo esc_attr($first_name); ?>"/>
 			</p>
 
 			<p id="give_profile_last_name_wrap" class="form-row form-row-last form-row-responsive">
-				<label for="give_last_name"><?php _e( 'Last Name', 'give' ); ?></label>
+				<label for="give_last_name"><?php _e('Last Name', 'give'); ?></label>
 				<input name="give_last_name" id="give_last_name" class="text give-input" type="text"
-				       value="<?php echo esc_attr( $last_name ); ?>"/>
+				       value="<?php echo esc_attr($last_name); ?>"/>
 			</p>
 
-			<?php if ( ! empty( $company_name ) ) : ?>
+			<?php if ( ! empty($company_name)) : ?>
 				<p id="give_profile_company_name_wrap" class="form-row form-row-wide">
-					<label for="give_company_name"><?php _e( 'Company Name', 'give' ); ?></label>
+					<label for="give_company_name"><?php _e('Company Name', 'give'); ?></label>
 					<input name="give_company_name" id="give_company_name" class="text give-input" type="text"
-					       value="<?php echo esc_attr( $company_name ); ?>"/>
+					       value="<?php echo esc_attr($company_name); ?>"/>
 				</p>
 			<?php endif; ?>
 
 			<p id="give_profile_display_name_wrap" class="form-row form-row-first form-row-responsive">
-				<label for="give_display_name"><?php _e( 'Display Name', 'give' ); ?></label>
+				<label for="give_display_name"><?php _e('Display Name', 'give'); ?></label>
 				<select name="give_display_name" id="give_display_name" class="select give-select">
-					<?php if ( ! empty( $current_user->first_name ) ): ?>
-						<option <?php selected( $display_name, $current_user->first_name ); ?>
-							value="<?php echo esc_attr( $current_user->first_name ); ?>"><?php echo esc_html( $current_user->first_name ); ?></option>
+					<?php if ( ! empty($current_user->first_name)): ?>
+						<option <?php selected($display_name, $current_user->first_name); ?>
+							value="<?php echo esc_attr($current_user->first_name); ?>"><?php echo esc_html($current_user->first_name); ?></option>
 					<?php endif; ?>
-					<option <?php selected( $display_name, $current_user->user_nicename ); ?>
-						value="<?php echo esc_attr( $current_user->user_nicename ); ?>"><?php echo esc_html( $current_user->user_nicename ); ?></option>
-					<?php if ( ! empty( $current_user->last_name ) ): ?>
-						<option <?php selected( $display_name, $current_user->last_name ); ?>
-							value="<?php echo esc_attr( $current_user->last_name ); ?>"><?php echo esc_html( $current_user->last_name ); ?></option>
+					<option <?php selected($display_name, $current_user->user_nicename); ?>
+						value="<?php echo esc_attr($current_user->user_nicename); ?>"><?php echo esc_html($current_user->user_nicename); ?></option>
+					<?php if ( ! empty($current_user->last_name)): ?>
+						<option <?php selected($display_name, $current_user->last_name); ?>
+							value="<?php echo esc_attr($current_user->last_name); ?>"><?php echo esc_html($current_user->last_name); ?></option>
 					<?php endif; ?>
-					<?php if ( ! empty( $current_user->first_name ) && ! empty( $current_user->last_name ) ): ?>
-						<option <?php selected( $display_name, $current_user->first_name . ' ' . $current_user->last_name ); ?>
-							value="<?php echo esc_attr( $current_user->first_name . ' ' . $current_user->last_name ); ?>"><?php echo esc_html( $current_user->first_name . ' ' . $current_user->last_name ); ?></option>
-						<option <?php selected( $display_name, $current_user->last_name . ' ' . $current_user->first_name ); ?>
-							value="<?php echo esc_attr( $current_user->last_name . ' ' . $current_user->first_name ); ?>"><?php echo esc_html( $current_user->last_name . ' ' . $current_user->first_name ); ?></option>
+					<?php if ( ! empty($current_user->first_name) && ! empty($current_user->last_name)): ?>
+						<option <?php selected($display_name, $current_user->first_name.' '.$current_user->last_name); ?>
+							value="<?php echo esc_attr($current_user->first_name.' '.$current_user->last_name); ?>"><?php echo esc_html($current_user->first_name.' '.$current_user->last_name); ?></option>
+						<option <?php selected($display_name, $current_user->last_name.' '.$current_user->first_name); ?>
+							value="<?php echo esc_attr($current_user->last_name.' '.$current_user->first_name); ?>"><?php echo esc_html($current_user->last_name.' '.$current_user->first_name); ?></option>
 					<?php endif; ?>
 				</select>
 				<?php
@@ -98,7 +98,7 @@ 
 				 *
 				 * @since 1.0
 				 */
-				do_action( 'give_profile_editor_name' );
+				do_action('give_profile_editor_name');
 				?>
 			</p>
 
@@ -110,16 +110,16 @@ 
 			 *
 			 * @since 1.0
 			 */
-			do_action( 'give_profile_editor_after_name' );
+			do_action('give_profile_editor_after_name');
 			?>
 
 			<p class="form-row form-row-last form-row-responsive">
 				<label for="give_email">
-					<?php _e( 'Email Address', 'give' ); ?>
+					<?php _e('Email Address', 'give'); ?>
 					<span class="give-required-indicator  ">*</span>
 				</label>
 				<input name="give_email" id="give_email" class="text give-input required" type="email"
-				       value="<?php echo esc_attr( $current_user->user_email ); ?>" required aria-required="true"/>
+				       value="<?php echo esc_attr($current_user->user_email); ?>" required aria-required="true"/>
 				<?php
 				/**
 				 * Fires in the profile editor shortcode, to the email section.
@@ -128,7 +128,7 @@ 
 				 *
 				 * @since 1.0
 				 */
-				do_action( 'give_profile_editor_email' );
+				do_action('give_profile_editor_email');
 				?>
 			</p>
 
@@ -140,21 +140,21 @@ 
 			 *
 			 * @since 1.0
 			 */
-			do_action( 'give_profile_editor_after_email' );
+			do_action('give_profile_editor_after_email');
 			?>
 
 			<h3 id="give_profile_password_label"
-			    class="give-section-break"><?php _e( 'Change your Password', 'give' ); ?></h3>
+			    class="give-section-break"><?php _e('Change your Password', 'give'); ?></h3>
 
 			<div id="give_profile_password_wrap" class="give-clearfix">
 				<p id="give_profile_password_wrap_1" class="form-row form-row-first form-row-responsive">
-					<label for="give_new_user_pass1"><?php _e( 'New Password', 'give' ); ?></label>
+					<label for="give_new_user_pass1"><?php _e('New Password', 'give'); ?></label>
 					<input name="give_new_user_pass1" id="give_new_user_pass1" class="password give-input"
 					       type="password"/>
 				</p>
 
 				<p id="give_profile_password_wrap_2" class="form-row form-row-last form-row-responsive">
-					<label for="give_new_user_pass2"><?php _e( 'Re-enter Password', 'give' ); ?></label>
+					<label for="give_new_user_pass2"><?php _e('Re-enter Password', 'give'); ?></label>
 					<input name="give_new_user_pass2" id="give_new_user_pass2" class="password give-input"
 					       type="password"/>
 					<?php
@@ -165,12 +165,12 @@ 
 					 *
 					 * @since 1.0
 					 */
-					do_action( 'give_profile_editor_password' );
+					do_action('give_profile_editor_password');
 					?>
 				</p>
 			</div>
 
-			<p class="give_password_change_notice"><?php _e( 'Please note after changing your password, you must log back in.', 'give' ); ?></p>
+			<p class="give_password_change_notice"><?php _e('Please note after changing your password, you must log back in.', 'give'); ?></p>
 
 			<?php
 			/**
@@ -180,17 +180,17 @@ 
 			 *
 			 * @since 1.0
 			 */
-			do_action( 'give_profile_editor_after_password' );
+			do_action('give_profile_editor_after_password');
 			?>
 
 			<p id="give_profile_submit_wrap">
 				<input type="hidden" name="give_profile_editor_nonce"
-				       value="<?php echo wp_create_nonce( 'give-profile-editor-nonce' ); ?>"/>
+				       value="<?php echo wp_create_nonce('give-profile-editor-nonce'); ?>"/>
 				<input type="hidden" name="give_action" value="edit_user_profile"/>
 				<input type="hidden" name="give_redirect"
-				       value="<?php echo esc_url( give_get_current_page_url() ); ?>"/>
+				       value="<?php echo esc_url(give_get_current_page_url()); ?>"/>
 				<input name="give_profile_editor_submit" id="give_profile_editor_submit" type="submit"
-				       class="give_submit" value="<?php _e( 'Save Changes', 'give' ); ?>"/>
+				       class="give_submit" value="<?php _e('Save Changes', 'give'); ?>"/>
 			</p>
 
 		</fieldset>
@@ -205,23 +205,23 @@ 
 	 *
 	 * @since 1.0
 	 */
-	do_action( 'give_profile_editor_after' );
+	do_action('give_profile_editor_after');
 	?>
 
 <?php
 else :
-	if ( isset( $_GET['updated'] ) && 'true' === $_GET['updated'] && ! give_get_errors() ) {
-		if ( isset( $_GET['update_code'] ) ) {
-			switch ( $_GET['update_code'] ) {
+	if (isset($_GET['updated']) && 'true' === $_GET['updated'] && ! give_get_errors()) {
+		if (isset($_GET['update_code'])) {
+			switch ($_GET['update_code']) {
 				case '2':
-					printf( '<p class="give_success"><strong>%1$s</strong> %2$s</p>', esc_html__( 'Success:', 'give' ), esc_html__( 'Your profile and password has been updated.', 'give' ) );
-					_e( 'Login with your new credentials.', 'give' );
+					printf('<p class="give_success"><strong>%1$s</strong> %2$s</p>', esc_html__('Success:', 'give'), esc_html__('Your profile and password has been updated.', 'give'));
+					_e('Login with your new credentials.', 'give');
 					echo give_login_form();
 					break;
 
 				case '3':
-					printf( '<p class="give_success"><strong>%1$s</strong> %2$s</p>', esc_html__( 'Success:', 'give' ), esc_html__( 'Your password has been updated.', 'give' ) );
-					_e( 'Login with your new credentials.', 'give' );
+					printf('<p class="give_success"><strong>%1$s</strong> %2$s</p>', esc_html__('Success:', 'give'), esc_html__('Your password has been updated.', 'give'));
+					_e('Login with your new credentials.', 'give');
 					echo give_login_form();
 					break;
 
@@ -230,7 +230,7 @@ 
 			}
 		}
 	} else {
-		_e( 'You need to login to edit your profile.', 'give' );
+		_e('You need to login to edit your profile.', 'give');
 		echo give_login_form();
 	}
 endif;

templates/history-donations.php

Spacing +66 added lines, -66 removed lines

@@ -4,28 +4,28 @@ 
  */
 
 $donations             = array();
-$donation_history_args = Give()->session->get( 'give_donation_history_args' );
+$donation_history_args = Give()->session->get('give_donation_history_args');
 
 // User's Donations.
-if ( is_user_logged_in() ) {
-	$donations = give_get_users_donations( get_current_user_id(), 20, true, 'any' );
-} elseif ( Give()->email_access->token_exists ) {
+if (is_user_logged_in()) {
+	$donations = give_get_users_donations(get_current_user_id(), 20, true, 'any');
+} elseif (Give()->email_access->token_exists) {
 	// Email Access Token?
-	$donations = give_get_users_donations( 0, 20, true, 'any' );
+	$donations = give_get_users_donations(0, 20, true, 'any');
 } elseif (
 	false !== Give()->session->get_session_expiration() ||
 	true === give_get_history_session()
 ) {
 	// Session active?
-	$email           = Give()->session->get( 'give_email' );
-	$donor           = Give()->donors->get_donor_by( 'email', $email );
-	$donations_count = count( explode( ',', $donor->payment_ids ) );
+	$email           = Give()->session->get('give_email');
+	$donor           = Give()->donors->get_donor_by('email', $email);
+	$donations_count = count(explode(',', $donor->payment_ids));
 
-	if ( $donations_count > give_get_limit_display_donations() ) {
+	if ($donations_count > give_get_limit_display_donations()) {
 
 		// Restrict Security Email Access option, if donation count of a donor is less than or equal to limit.
-		if ( true !== Give_Cache::get( "give_cache_email_throttle_limit_exhausted_{$donor->id}" ) ) {
-			add_action( 'give_donation_history_table_end', 'give_donation_history_table_end' );
+		if (true !== Give_Cache::get("give_cache_email_throttle_limit_exhausted_{$donor->id}")) {
+			add_action('give_donation_history_table_end', 'give_donation_history_table_end');
 		} else {
 			$value = Give()->email_access->verify_throttle / 60;
 
@@ -42,35 +42,35 @@ 
 			$message = (string) apply_filters(
 				'give_email_access_requests_exceed_notice',
 				sprintf(
-					__( 'Too many access email requests detected. Please wait %s before requesting a new donation history access link.', 'give' ),
-					sprintf( _n( '%s minute', '%s minutes', $value, 'give' ), $value )
+					__('Too many access email requests detected. Please wait %s before requesting a new donation history access link.', 'give'),
+					sprintf(_n('%s minute', '%s minutes', $value, 'give'), $value)
 				),
 				$value
 			);
 
-			give_set_error( 'give-limited-throttle',
+			give_set_error('give-limited-throttle',
 				$message
 			);
 		}
 
-		$donations = give_get_users_donations( $email, give_get_limit_display_donations(), true, 'any' );
+		$donations = give_get_users_donations($email, give_get_limit_display_donations(), true, 'any');
 	} else {
-		$donations = give_get_users_donations( $email, 20, true, 'any' );
+		$donations = give_get_users_donations($email, 20, true, 'any');
 	}
 }
 
-Give()->notices->render_frontend_notices( 0 );
+Give()->notices->render_frontend_notices(0);
 
-if ( $donations ) : ?>
+if ($donations) : ?>
 	<?php
 	$table_headings = array(
-		'id'             => __( 'ID', 'give' ),
-		'date'           => __( 'Date', 'give' ),
-		'donor'          => __( 'Donor', 'give' ),
-		'amount'         => __( 'Amount', 'give' ),
-		'status'         => __( 'Status', 'give' ),
-		'payment_method' => __( 'Payment Method', 'give' ),
-		'details'        => __( 'Details', 'give' ),
+		'id'             => __('ID', 'give'),
+		'date'           => __('Date', 'give'),
+		'donor'          => __('Donor', 'give'),
+		'amount'         => __('Amount', 'give'),
+		'status'         => __('Status', 'give'),
+		'payment_method' => __('Payment Method', 'give'),
+		'details'        => __('Details', 'give'),
 	);
 	?>
 	<div class="give_user_history_main" >
@@ -86,14 +86,14 @@ 
 				 *
 				 * @since 1.7
 				 */
-				do_action( 'give_donation_history_header_before' );
+				do_action('give_donation_history_header_before');
 
-				foreach ( $donation_history_args as $index => $value ) {
-					if ( filter_var( $donation_history_args[ $index ], FILTER_VALIDATE_BOOLEAN ) ) :
+				foreach ($donation_history_args as $index => $value) {
+					if (filter_var($donation_history_args[$index], FILTER_VALIDATE_BOOLEAN)) :
 						echo sprintf(
 							'<th scope="col" class="give-donation-%1$s>">%2$s</th>',
 							$index,
-							$table_headings[ $index ]
+							$table_headings[$index]
 						);
 					endif;
 				}
@@ -105,13 +105,13 @@ 
 				 *
 				 * @since 1.7
 				 */
-				do_action( 'give_donation_history_header_after' );
+				do_action('give_donation_history_header_after');
 				?>
 			</tr>
 			</thead>
-			<?php foreach ( $donations as $post ) :
-				setup_postdata( $post );
-				$donation_data = give_get_payment_meta( $post->ID ); ?>
+			<?php foreach ($donations as $post) :
+				setup_postdata($post);
+				$donation_data = give_get_payment_meta($post->ID); ?>
 				<tr class="give-donation-row">
 					<?php
 					/**
@@ -124,37 +124,37 @@ 
 					 * @param int   $post_id       The ID of the post.
 					 * @param mixed $donation_data Payment meta data.
 					 */
-					do_action( 'give_donation_history_row_start', $post->ID, $donation_data );
+					do_action('give_donation_history_row_start', $post->ID, $donation_data);
 
-					if ( filter_var( $donation_history_args['id'], FILTER_VALIDATE_BOOLEAN ) ) :
+					if (filter_var($donation_history_args['id'], FILTER_VALIDATE_BOOLEAN)) :
 						echo sprintf(
 							'<td class="give-donation-id"><span class="title-for-mobile">%2$s</span>%1$s</td>',
-							give_get_payment_number( $post->ID ), esc_html( $table_headings['id'] )
+							give_get_payment_number($post->ID), esc_html($table_headings['id'])
 						);
 					endif;
 
-					if ( filter_var( $donation_history_args['date'], FILTER_VALIDATE_BOOLEAN ) ) :
+					if (filter_var($donation_history_args['date'], FILTER_VALIDATE_BOOLEAN)) :
 						echo sprintf(
 							'<td class="give-donation-date"><span class="title-for-mobile">%2$s</span>%1$s</td>',
-							date_i18n( give_date_format(), strtotime( get_post_field( 'post_date', $post->ID ) ) ), esc_html( $table_headings['date'] )
+							date_i18n(give_date_format(), strtotime(get_post_field('post_date', $post->ID))), esc_html($table_headings['date'])
 						);
 					endif;
 
-					if ( filter_var( $donation_history_args['donor'], FILTER_VALIDATE_BOOLEAN ) ) :
+					if (filter_var($donation_history_args['donor'], FILTER_VALIDATE_BOOLEAN)) :
 						echo sprintf(
 							'<td class="give-donation-donor"><span class="title-for-mobile">%2$s</span>%1$s</td>',
-							give_get_donor_name_by( $post->ID ), $table_headings['donor']
+							give_get_donor_name_by($post->ID), $table_headings['donor']
 						);
 					endif;
 					?>
 
-					<?php if ( filter_var( $donation_history_args['amount'], FILTER_VALIDATE_BOOLEAN ) ) : ?>
+					<?php if (filter_var($donation_history_args['amount'], FILTER_VALIDATE_BOOLEAN)) : ?>
 						<td class="give-donation-amount">
-						<?php printf( '<span class="title-for-mobile">%1$s</span>', esc_html( $table_headings['amount'] ) ); ?>
+						<?php printf('<span class="title-for-mobile">%1$s</span>', esc_html($table_headings['amount'])); ?>
 						<span class="give-donation-amount">
 							<?php
-							$currency_code   = give_get_payment_currency_code( $post->ID );
-							$donation_amount = give_donation_amount( $post->ID, true );
+							$currency_code   = give_get_payment_currency_code($post->ID);
+							$donation_amount = give_donation_amount($post->ID, true);
 
 							/**
 							 * Filters the donation amount on Donation History Page.
@@ -166,45 +166,45 @@ 
 							 *
 							 * @return int
 							 */
-							echo apply_filters( 'give_donation_history_row_amount', $donation_amount, $post->ID );
+							echo apply_filters('give_donation_history_row_amount', $donation_amount, $post->ID);
 							?>
 						</span>
 						</td>
 					<?php endif; ?>
 
 					<?php
-					if ( filter_var( $donation_history_args['status'], FILTER_VALIDATE_BOOLEAN ) ) :
+					if (filter_var($donation_history_args['status'], FILTER_VALIDATE_BOOLEAN)) :
 						echo sprintf(
 							'<td class="give-donation-status"><span class="title-for-mobile">%2$s</span>%1$s</td>',
-							give_get_payment_status( $post, true ),
-							esc_html( $table_headings['status'] )
+							give_get_payment_status($post, true),
+							esc_html($table_headings['status'])
 						);
 					endif;
 
-					if ( filter_var( $donation_history_args['payment_method'], FILTER_VALIDATE_BOOLEAN ) ) :
+					if (filter_var($donation_history_args['payment_method'], FILTER_VALIDATE_BOOLEAN)) :
 						echo sprintf(
 							'<td class="give-donation-payment-method"><span class="title-for-mobile">%2$s</span>%1$s</td>',
-							give_get_gateway_checkout_label( give_get_payment_gateway( $post->ID ) ),
-							esc_html( $table_headings['payment_method'] )
+							give_get_gateway_checkout_label(give_get_payment_gateway($post->ID)),
+							esc_html($table_headings['payment_method'])
 						);
 					endif;
 					?>
 					<td class="give-donation-details">
 						<?php
 						// Display View Receipt or.
-						if ( 'publish' !== $post->post_status && 'subscription' !== $post->post_status ) :
+						if ('publish' !== $post->post_status && 'subscription' !== $post->post_status) :
 							echo sprintf(
 								'<span class="title-for-mobile">%4$s</span><a href="%1$s"><span class="give-donation-status %2$s">%3$s</span></a>',
 								esc_url(
 									add_query_arg(
 										'payment_key',
-										give_get_payment_key( $post->ID ),
+										give_get_payment_key($post->ID),
 										give_get_history_page_uri()
 									)
 								),
 								$post->post_status,
-								__( 'View', 'give' ) . ' ' . give_get_payment_status( $post, true ) . ' &raquo;',
-								esc_html( $table_headings['details'] )
+								__('View', 'give').' '.give_get_payment_status($post, true).' &raquo;',
+								esc_html($table_headings['details'])
 							);
 
 						else :
@@ -213,12 +213,12 @@ 
 								esc_url(
 									add_query_arg(
 										'payment_key',
-										give_get_payment_key( $post->ID ),
+										give_get_payment_key($post->ID),
 										give_get_history_page_uri()
 									)
 								),
-								__( 'View Receipt &raquo;', 'give' ),
-								esc_html( $table_headings['details'] )
+								__('View Receipt &raquo;', 'give'),
+								esc_html($table_headings['details'])
 							);
 
 						endif;
@@ -235,7 +235,7 @@ 
 					 * @param int   $post_id       The ID of the post.
 					 * @param mixed $donation_data Payment meta data.
 					 */
-					do_action( 'give_donation_history_row_end', $post->ID, $donation_data );
+					do_action('give_donation_history_row_end', $post->ID, $donation_data);
 					?>
 				</tr>
 			<?php endforeach; ?>
@@ -248,22 +248,22 @@ 
 			 *
 			 * @since 1.8.17
 			 */
-			do_action( 'give_donation_history_table_end' );
+			do_action('give_donation_history_table_end');
 			?>
 		</table>
 		<div id="give-donation-history-pagination" class="give_pagination navigation">
 			<?php
 			$big = 999999;
-			echo paginate_links( array(
-				'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+			echo paginate_links(array(
+				'base'    => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
 				'format'  => '?paged=%#%',
-				'current' => max( 1, get_query_var( 'paged' ) ),
-				'total'   => ceil( give_count_donations_of_donor() / 20 ), // 20 items per page
-			) );
+				'current' => max(1, get_query_var('paged')),
+				'total'   => ceil(give_count_donations_of_donor() / 20), // 20 items per page
+			));
 			?>
 		</div>
 	</div>
 	<?php wp_reset_postdata(); ?>
 <?php else : ?>
-	<?php Give()->notices->print_frontend_notice( __( 'It looks like you haven\'t made any donations.', 'give' ), true, 'success' ); ?>
+	<?php Give()->notices->print_frontend_notice(__('It looks like you haven\'t made any donations.', 'give'), true, 'success'); ?>
 <?php endif;