WordImpress / Give

includes/admin/shortcodes/shortcode-give-goal.php

Spacing +19 added lines, -19 removed lines

@@ -9,7 +9,7 @@ 
  * @since       1.3.0
  */
 
-defined( 'ABSPATH' ) or exit;
+defined('ABSPATH') or exit;
 
 class Give_Shortcode_Donation_Form_Goal extends Give_Shortcode_Generator {
 
@@ -18,10 +18,10 @@ 
 	 */
 	public function __construct() {
 
-		$this->shortcode['title'] = esc_html__( 'Donation Form Goal', 'give' );
-		$this->shortcode['label'] = esc_html__( 'Donation Form Goal', 'give' );
+		$this->shortcode['title'] = esc_html__('Donation Form Goal', 'give');
+		$this->shortcode['label'] = esc_html__('Donation Form Goal', 'give');
 
-		parent::__construct( 'give_goal' );
+		parent::__construct('give_goal');
 	}
 
 	/**
@@ -33,8 +33,8 @@ 
 
 		$create_form_link = sprintf(
 			/* translators: %s: create new form URL */
-			__( '<a href="%s">Create</a> a new Donation Form.', 'give' ),
-			admin_url( 'post-new.php?post_type=give_forms' )
+			__('<a href="%s">Create</a> a new Donation Form.', 'give'),
+			admin_url('post-new.php?post_type=give_forms')
 		);
 
 		return array(
@@ -44,35 +44,35 @@ 
 					'post_type' => 'give_forms',
 				),
 				'name'        => 'id',
-				'tooltip'     => esc_attr__( 'Select a Donation Form', 'give' ),
-				'placeholder' => esc_attr__( '- Select a Form -', 'give' ),
+				'tooltip'     => esc_attr__('Select a Donation Form', 'give'),
+				'placeholder' => esc_attr__('- Select a Form -', 'give'),
 				'required'    => array(
-					'alert' => esc_html__( 'You must first select a Form!', 'give' ),
-					'error' => sprintf( '<p class="strong">%s</p><p class="no-margin">%s</p>', esc_html__( 'No donation forms were found!', 'give' ), $create_form_link ),
+					'alert' => esc_html__('You must first select a Form!', 'give'),
+					'error' => sprintf('<p class="strong">%s</p><p class="no-margin">%s</p>', esc_html__('No donation forms were found!', 'give'), $create_form_link),
 				),
 			),
 			array(
 				'type' => 'container',
-				'html' => sprintf( '<p class="strong margin-top">%s</p>', esc_html__( 'Optional settings', 'give' ) ),
+				'html' => sprintf('<p class="strong margin-top">%s</p>', esc_html__('Optional settings', 'give')),
 			),
 			array(
 				'type'    => 'listbox',
 				'name'    => 'show_text',
-				'label'   => esc_html__( 'Show Text:', 'give' ),
-				'tooltip' => esc_attr__( 'This text displays the amount of income raised compared to the goal.', 'give' ),
+				'label'   => esc_html__('Show Text:', 'give'),
+				'tooltip' => esc_attr__('This text displays the amount of income raised compared to the goal.', 'give'),
 				'options' => array(
-					'true'  => esc_html__( 'Show', 'give' ),
-					'false' => esc_html__( 'Hide', 'give' ),
+					'true'  => esc_html__('Show', 'give'),
+					'false' => esc_html__('Hide', 'give'),
 				),
 			),
 			array(
 				'type'    => 'listbox',
 				'name'    => 'show_bar',
-				'label'   => esc_html__( 'Show Progress Bar:', 'give' ),
-				'tooltip' => esc_attr__( 'Do you want to display the goal\'s progress bar?', 'give' ),
+				'label'   => esc_html__('Show Progress Bar:', 'give'),
+				'tooltip' => esc_attr__('Do you want to display the goal\'s progress bar?', 'give'),
 				'options' => array(
-					'true'  => esc_html__( 'Show', 'give' ),
-					'false' => esc_html__( 'Hide', 'give' ),
+					'true'  => esc_html__('Show', 'give'),
+					'false' => esc_html__('Hide', 'give'),
 				),
 			),
 		);

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

Indentation +2 added lines, -2 removed lines

@@ -248,8 +248,8 @@
 
 			// do not reindex array!
 			$field['options'] = array(
-				                    '' => ( $field['placeholder'] ? $field['placeholder'] : esc_html__( '- Select -', 'give' ) ),
-			                    ) + $field['options'];
+									'' => ( $field['placeholder'] ? $field['placeholder'] : esc_html__( '- Select -', 'give' ) ),
+								) + $field['options'];
 
 			foreach ( $field['options'] as $value => $text ) {
 				$new_listbox['values'][] = array(

Spacing +64 added lines, -64 removed lines

@@ -11,7 +11,7 @@ 
  * @since       1.3.0
  */
 
-defined( 'ABSPATH' ) or exit;
+defined('ABSPATH') or exit;
 
 abstract class Give_Shortcode_Generator {
 
@@ -57,12 +57,12 @@ 
 	 *
 	 * @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'));
 
 	}
 
@@ -73,9 +73,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();
@@ -84,18 +84,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_attr__( 'Insert Shortcode', 'give' ),
+				'title'     => esc_attr__('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);
 
 			}
 		}
@@ -124,13 +124,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,
@@ -141,14 +141,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;
 					}
 				}
@@ -168,22 +168,22 @@ 
 	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 ( false === array_search( $name, array_column( $generated_fields, 'name' ) ) ) {
+		if ( ! empty($this->errors)) {
+			foreach ($this->required as $name => $alert) {
+				if (false === array_search($name, array_column($generated_fields, 'name'))) {
 
-					$errors[] = $this->errors[ $name ];
+					$errors[] = $this->errors[$name];
 				}
 			}
 
 			$this->errors = $errors;
 		}
 
-		if ( ! empty( $errors ) ) {
+		if ( ! empty($errors)) {
 
 			return $errors;
 		}
@@ -200,9 +200,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'],
@@ -222,36 +222,36 @@ 
 	 *
 	 * @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,
 			'tooltip'  => '',
 			'type'     => '',
 			'value'    => '',
-		), $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_html__( '- Select -', 'give' ) ),
+				                    '' => ($field['placeholder'] ? $field['placeholder'] : esc_html__('- Select -', 'give')),
 			                    ) + $field['options'];
 
-			foreach ( $field['options'] as $value => $text ) {
+			foreach ($field['options'] as $value => $text) {
 				$new_listbox['values'][] = array(
 					'text'  => $text,
 					'value' => $value,
@@ -273,7 +273,7 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_post( $field ) {
+	protected function generate_post($field) {
 
 		$args = array(
 			'post_type'      => 'post',
@@ -282,23 +282,23 @@ 
 			'posts_per_page' => 30,
 		);
 
-		$args    = wp_parse_args( (array) $field['query_args'], $args );
-		$posts   = get_posts( $args );
+		$args    = wp_parse_args((array) $field['query_args'], $args);
+		$posts   = get_posts($args);
 		$options = array();
 
-		if ( $posts ) {
-			foreach ( $posts as $post ) {
-				$options[ absint( $post->ID ) ] = esc_html__( $post->post_title );
+		if ($posts) {
+			foreach ($posts as $post) {
+				$options[absint($post->ID)] = esc_html__($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;
 	}
@@ -312,9 +312,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' => '',
@@ -324,10 +324,10 @@ 
 			'tooltip'   => '',
 			'type'      => '',
 			'value'     => '',
-		), $field );
+		), $field);
 
-		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;
@@ -340,7 +340,7 @@ 
 	 *
 	 * @return bool
 	 */
-	function return_textbox_value( $value ) {
+	function return_textbox_value($value) {
 		return $value !== '';
 	}
 
@@ -356,9 +356,9 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function validate( $field ) {
+	protected function validate($field) {
 
-		extract( shortcode_atts(
+		extract(shortcode_atts(
 				array(
 					'name'     => false,
 					'required' => false,
@@ -366,36 +366,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 lable */
-						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/shortcodes/shortcode-give-donation-history.php

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
  * @since       1.3.0
  */
 
-defined( 'ABSPATH' ) or exit;
+defined('ABSPATH') or exit;
 
 class Give_Shortcode_Donation_History extends Give_Shortcode_Generator {
 
@@ -18,9 +18,9 @@ 
 	 */
 	public function __construct() {
 
-		$this->shortcode['label'] = esc_html__( 'Donation History', 'give' );
+		$this->shortcode['label'] = esc_html__('Donation History', 'give');
 
-		parent::__construct( 'donation_history' );
+		parent::__construct('donation_history');
 	}
 }
 

includes/admin/shortcodes/shortcode-give-login.php

Spacing +6 added lines, -6 removed lines

@@ -9,7 +9,7 @@ 
  * @since       1.3.0
  */
 
-defined( 'ABSPATH' ) or exit;
+defined('ABSPATH') or exit;
 
 class Give_Shortcode_Login extends Give_Shortcode_Generator {
 
@@ -18,10 +18,10 @@ 
 	 */
 	public function __construct() {
 
-		$this->shortcode['title'] = esc_html__( 'Login', 'give' );
-		$this->shortcode['label'] = esc_html__( 'Login', 'give' );
+		$this->shortcode['title'] = esc_html__('Login', 'give');
+		$this->shortcode['label'] = esc_html__('Login', 'give');
 
-		parent::__construct( 'give_login' );
+		parent::__construct('give_login');
 	}
 
 	/**
@@ -34,13 +34,13 @@ 
 		return array(
 			array(
 				'type' => 'container',
-				'html' => sprintf( '<p class="no-margin">%s</p>', esc_html__( 'Redirect URL (optional):', 'give' ) ),
+				'html' => sprintf('<p class="no-margin">%s</p>', esc_html__('Redirect URL (optional):', 'give')),
 			),
 			array(
 				'type'     => 'textbox',
 				'name'     => 'redirect',
 				'minWidth' => 320,
-				'tooltip'  => esc_attr__( 'Enter an URL here to redirect to after login.', 'give' ),
+				'tooltip'  => esc_attr__('Enter an URL here to redirect to after login.', 'give'),
 			),
 		);
 	}

includes/admin/shortcodes/shortcode-give-register.php

Spacing +6 added lines, -6 removed lines

@@ -9,7 +9,7 @@ 
  * @since       1.3.0
  */
 
-defined( 'ABSPATH' ) or exit;
+defined('ABSPATH') or exit;
 
 class Give_Shortcode_Register extends Give_Shortcode_Generator {
 
@@ -18,10 +18,10 @@ 
 	 */
 	public function __construct() {
 
-		$this->shortcode['title'] = esc_html__( 'Register', 'give' );
-		$this->shortcode['label'] = esc_html__( 'Register', 'give' );
+		$this->shortcode['title'] = esc_html__('Register', 'give');
+		$this->shortcode['label'] = esc_html__('Register', 'give');
 
-		parent::__construct( 'give_register' );
+		parent::__construct('give_register');
 	}
 
 	/**
@@ -34,13 +34,13 @@ 
 		return array(
 			array(
 				'type' => 'container',
-				'html' => sprintf( '<p class="no-margin">%s</p>', esc_html__( 'Redirect URL (optional):', 'give' ) ),
+				'html' => sprintf('<p class="no-margin">%s</p>', esc_html__('Redirect URL (optional):', 'give')),
 			),
 			array(
 				'type'     => 'textbox',
 				'name'     => 'redirect',
 				'minWidth' => 320,
-				'tooltip'  => esc_attr__( 'Enter an URL here to redirect to after registering.', 'give' ),
+				'tooltip'  => esc_attr__('Enter an URL here to redirect to after registering.', 'give'),
 			),
 		);
 	}

includes/admin/forms/metabox.php

Spacing +190 added lines, -190 removed lines

@@ -10,11 +10,11 @@ 
  */

 

 // Exit if accessed directly

-if ( ! defined( 'ABSPATH' ) ) {

+if ( ! defined('ABSPATH')) {

 	exit;

 }

 

-add_filter( 'cmb2_meta_boxes', 'give_single_forms_cmb2_metaboxes' );

+add_filter('cmb2_meta_boxes', 'give_single_forms_cmb2_metaboxes');

 

 /**

  * Define the metabox and field configurations.

@@ -23,23 +23,23 @@ 
  *

  * @return array

  */

-function give_single_forms_cmb2_metaboxes( array $meta_boxes ) {

+function give_single_forms_cmb2_metaboxes(array $meta_boxes) {

 

 	$post_id               = give_get_admin_post_id();

-	$price                 = give_get_form_price( $post_id );

-	$custom_amount_minimum = give_get_form_minimum_price( $post_id );

-	$goal                  = give_get_form_goal( $post_id );

-	$variable_pricing      = give_has_variable_prices( $post_id );

-	$prices                = give_get_variable_prices( $post_id );

+	$price                 = give_get_form_price($post_id);

+	$custom_amount_minimum = give_get_form_minimum_price($post_id);

+	$goal                  = give_get_form_goal($post_id);

+	$variable_pricing      = give_has_variable_prices($post_id);

+	$prices                = give_get_variable_prices($post_id);

 

 	//No empty prices - min. 1.00 for new forms

-	if ( empty( $price ) && is_null( $post_id ) ) {

-		$price = esc_attr__( give_format_amount( '1.00' ) );

+	if (empty($price) && is_null($post_id)) {

+		$price = esc_attr__(give_format_amount('1.00'));

 	}

 

 	//Min. $1.00 for new forms

-	if ( empty( $custom_amount_minimum ) ) {

-		$custom_amount_minimum = esc_attr__( give_format_amount( '1.00' ) );

+	if (empty($custom_amount_minimum)) {

+		$custom_amount_minimum = esc_attr__(give_format_amount('1.00'));

 	}

 

 	// Start with an underscore to hide fields from custom fields list

@@ -48,326 +48,326 @@ 
 	/**

 	 * Repeatable Field Groups

 	 */

-	$meta_boxes['form_field_options'] = apply_filters( 'give_forms_field_options', array(

+	$meta_boxes['form_field_options'] = apply_filters('give_forms_field_options', array(

 		'id'           => 'form_field_options',

-		'title'        => esc_html__( 'Donation Options', 'give' ),

-		'object_types' => array( 'give_forms' ),

+		'title'        => esc_html__('Donation Options', 'give'),

+		'object_types' => array('give_forms'),

 		'context'      => 'normal',

 		'priority'     => 'high', //Show above Content WYSIWYG

-		'fields'       => apply_filters( 'give_forms_donation_form_metabox_fields', array(

+		'fields'       => apply_filters('give_forms_donation_form_metabox_fields', array(

 				//Donation Option

 				array(

-					'name'        => esc_html__( 'Donation Option', 'give' ),

-					'description' => esc_html__( 'Would you like this form to have one set donation price or multiple levels (for example, $10, $20, $50)?', 'give' ),

-					'id'          => $prefix . 'price_option',

+					'name'        => esc_html__('Donation Option', 'give'),

+					'description' => esc_html__('Would you like this form to have one set donation price or multiple levels (for example, $10, $20, $50)?', 'give'),

+					'id'          => $prefix.'price_option',

 					'type'        => 'radio_inline',

 					'default'     => 'set',

-					'options'     => apply_filters( 'give_forms_price_options', array(

-						'set'   => esc_html__( 'Set Donation', 'give' ),

-						'multi' => esc_html__( 'Multi-level Donation', 'give' ),

-					) ),

+					'options'     => apply_filters('give_forms_price_options', array(

+						'set'   => esc_html__('Set Donation', 'give'),

+						'multi' => esc_html__('Multi-level Donation', 'give'),

+					)),

 				),

 				array(

-					'name'         => esc_html__( 'Set Donation', 'give' ),

-					'description'  => esc_html__( 'This is the set donation amount for this form. If you have a "Custom Amount Minimum" set, make sure it is less than this amount.', 'give' ),

-					'id'           => $prefix . 'set_price',

+					'name'         => esc_html__('Set Donation', 'give'),

+					'description'  => esc_html__('This is the set donation amount for this form. If you have a "Custom Amount Minimum" set, make sure it is less than this amount.', 'give'),

+					'id'           => $prefix.'set_price',

 					'type'         => 'text_small',

 					'row_classes'  => 'give-subfield',

-					'before_field' => give_get_option( 'currency_position' ) == 'before' ? '<span class="give-money-symbol give-money-symbol-before">' . give_currency_symbol() . '</span>' : '',

-					'after_field'  => give_get_option( 'currency_position' ) == 'after' ? '<span class="give-money-symbol give-money-symbol-after">' . give_currency_symbol() . '</span>' : '',

+					'before_field' => give_get_option('currency_position') == 'before' ? '<span class="give-money-symbol give-money-symbol-before">'.give_currency_symbol().'</span>' : '',

+					'after_field'  => give_get_option('currency_position') == 'after' ? '<span class="give-money-symbol give-money-symbol-after">'.give_currency_symbol().'</span>' : '',

 					'attributes'   => array(

-						'placeholder' => give_format_amount( '1.00' ),

-						'value'       => give_format_amount( $price ),

+						'placeholder' => give_format_amount('1.00'),

+						'value'       => give_format_amount($price),

 						'class'       => 'cmb-type-text-small give-money-field',

 					),

 				),

 				//Donation levels: Header

 				array(

-					'id'   => $prefix . 'levels_header',

+					'id'   => $prefix.'levels_header',

 					'type' => 'levels_repeater_header',

 				),

 				//Donation Levels: Repeatable CMB2 Group

 				array(

-					'id'          => $prefix . 'donation_levels',

+					'id'          => $prefix.'donation_levels',

 					'type'        => 'group',

 					'row_classes' => 'give-subfield',

 					'options'     => array(

-						'add_button'    => esc_html__( 'Add Level', 'give' ),

+						'add_button'    => esc_html__('Add Level', 'give'),

 						'remove_button' => '<span class="dashicons dashicons-no"></span>',

 						'sortable'      => true, // beta

 					),

 					// Fields array works the same, except id's only need to be unique for this group. Prefix is not needed.

-					'fields'      => apply_filters( 'give_donation_levels_table_row', array(

+					'fields'      => apply_filters('give_donation_levels_table_row', array(

 						array(

-							'name' => esc_html__( 'ID', 'give' ),

-							'id'   => $prefix . 'id',

+							'name' => esc_html__('ID', 'give'),

+							'id'   => $prefix.'id',

 							'type' => 'levels_id',

 						),

 						array(

-							'name'         => esc_html__( 'Amount', 'give' ),

-							'id'           => $prefix . 'amount',

+							'name'         => esc_html__('Amount', 'give'),

+							'id'           => $prefix.'amount',

 							'type'         => 'text_small',

-							'before_field' => give_get_option( 'currency_position' ) == 'before' ? '<span class="give-money-symbol  give-money-symbol-before">' . give_currency_symbol() . '</span>' : '',

-							'after_field'  => give_get_option( 'currency_position' ) == 'after' ? '<span class="give-money-symbol  give-money-symbol-after">' . give_currency_symbol() . '</span>' : '',

+							'before_field' => give_get_option('currency_position') == 'before' ? '<span class="give-money-symbol  give-money-symbol-before">'.give_currency_symbol().'</span>' : '',

+							'after_field'  => give_get_option('currency_position') == 'after' ? '<span class="give-money-symbol  give-money-symbol-after">'.give_currency_symbol().'</span>' : '',

 							'attributes'   => array(

-								'placeholder' => give_format_amount( '1.00' ),

+								'placeholder' => give_format_amount('1.00'),

 								'class'       => 'cmb-type-text-small give-money-field',

 							),

 							'before'       => 'give_format_admin_multilevel_amount',

 						),

 						array(

-							'name'       => esc_html__( 'Text', 'give' ),

-							'id'         => $prefix . 'text',

+							'name'       => esc_html__('Text', 'give'),

+							'id'         => $prefix.'text',

 							'type'       => 'text',

 							'attributes' => array(

-								'placeholder' => esc_attr__( 'Donation Level', 'give' ),

+								'placeholder' => esc_attr__('Donation Level', 'give'),

 								'class'       => 'give-multilevel-text-field',

 							),

 						),

 						array(

-							'name' => esc_html__( 'Default', 'give' ),

-							'id'   => $prefix . 'default',

+							'name' => esc_html__('Default', 'give'),

+							'id'   => $prefix.'default',

 							'type' => 'give_default_radio_inline'

 						),

-					) ),

+					)),

 				),

 				//Display Style

 				array(

-					'name'        => esc_html__( 'Display Style', 'give' ),

-					'description' => esc_html__( 'Set how the donations levels will display on the form.', 'give' ),

-					'id'          => $prefix . 'display_style',

+					'name'        => esc_html__('Display Style', 'give'),

+					'description' => esc_html__('Set how the donations levels will display on the form.', 'give'),

+					'id'          => $prefix.'display_style',

 					'type'        => 'radio_inline',

 					'default'     => 'buttons',

 					'options'     => array(

-						'buttons'  => esc_html__( 'Buttons', 'give' ),

-						'radios'   => esc_html__( 'Radios', 'give' ),

-						'dropdown' => esc_html__( 'Dropdown', 'give' ),

+						'buttons'  => esc_html__('Buttons', 'give'),

+						'radios'   => esc_html__('Radios', 'give'),

+						'dropdown' => esc_html__('Dropdown', 'give'),

 					),

 				),

 				//Custom Amount

 				array(

-					'name'        => esc_html__( 'Custom Amount', 'give' ),

-					'description' => esc_html__( 'Do you want the user to be able to input their own donation amount?', 'give' ),

-					'id'          => $prefix . 'custom_amount',

+					'name'        => esc_html__('Custom Amount', 'give'),

+					'description' => esc_html__('Do you want the user to be able to input their own donation amount?', 'give'),

+					'id'          => $prefix.'custom_amount',

 					'type'        => 'radio_inline',

 					'default'     => 'no',

 					'options'     => array(

-						'yes' => esc_html__( 'Yes', 'give' ),

-						'no'  => esc_html__( 'No', 'give' ),

+						'yes' => esc_html__('Yes', 'give'),

+						'no'  => esc_html__('No', 'give'),

 					),

 				),

 				array(

-					'name'         => esc_html__( 'Custom Amount Minimum', 'give' ),

-					'description'  => esc_html__( 'If you would like to set a minimum custom donation amount please enter it here.', 'give' ),

-					'id'           => $prefix . 'custom_amount_minimum',

+					'name'         => esc_html__('Custom Amount Minimum', 'give'),

+					'description'  => esc_html__('If you would like to set a minimum custom donation amount please enter it here.', 'give'),

+					'id'           => $prefix.'custom_amount_minimum',

 					'type'         => 'text_small',

 					'row_classes'  => 'give-subfield',

-					'before_field' => give_get_option( 'currency_position' ) == 'before' ? '<span class="give-money-symbol give-money-symbol-before">' . give_currency_symbol() . '</span>' : '',

-					'after_field'  => give_get_option( 'currency_position' ) == 'after' ? '<span class="give-money-symbol give-money-symbol-after">' . give_currency_symbol() . '</span>' : '',

+					'before_field' => give_get_option('currency_position') == 'before' ? '<span class="give-money-symbol give-money-symbol-before">'.give_currency_symbol().'</span>' : '',

+					'after_field'  => give_get_option('currency_position') == 'after' ? '<span class="give-money-symbol give-money-symbol-after">'.give_currency_symbol().'</span>' : '',

 					'attributes'   => array(

-						'placeholder' => give_format_amount( '1.00' ),

-						'value'       => give_format_amount( $custom_amount_minimum ),

+						'placeholder' => give_format_amount('1.00'),

+						'value'       => give_format_amount($custom_amount_minimum),

 						'class'       => 'cmb-type-text-small give-money-field',

 					),

 				),

 				array(

-					'name'        => esc_html__( 'Custom Amount Text', 'give' ),

-					'description' => esc_html__( 'This text appears as a label below the custom amount field for set donation forms. For multi-level forms the text will appear as it\'s own level (ie button, radio, or select option).', 'give' ),

-					'id'          => $prefix . 'custom_amount_text',

+					'name'        => esc_html__('Custom Amount Text', 'give'),

+					'description' => esc_html__('This text appears as a label below the custom amount field for set donation forms. For multi-level forms the text will appear as it\'s own level (ie button, radio, or select option).', 'give'),

+					'id'          => $prefix.'custom_amount_text',

 					'type'        => 'text',

 					'row_classes' => 'give-subfield',

 					'attributes'  => array(

 						'rows'        => 3,

-						'placeholder' => esc_attr__( 'Give a Custom Amount', 'give' ),

+						'placeholder' => esc_attr__('Give a Custom Amount', 'give'),

 					),

 				),

 				//Goals

 				array(

-					'name'        => esc_html__( 'Goal', 'give' ),

-					'description' => esc_html__( 'Do you want to set a donation goal for this form?', 'give' ),

-					'id'          => $prefix . 'goal_option',

+					'name'        => esc_html__('Goal', 'give'),

+					'description' => esc_html__('Do you want to set a donation goal for this form?', 'give'),

+					'id'          => $prefix.'goal_option',

 					'type'        => 'radio_inline',

 					'default'     => 'no',

 					'options'     => array(

-						'yes' => esc_html__( 'Yes', 'give' ),

-						'no'  => esc_html__( 'No', 'give' ),

+						'yes' => esc_html__('Yes', 'give'),

+						'no'  => esc_html__('No', 'give'),

 					),

 				),

 				array(

-					'name'         => esc_html__( 'Goal Amount', 'give' ),

-					'description'  => esc_html__( 'This is the monetary goal amount you want to reach for this donation form.', 'give' ),

-					'id'           => $prefix . 'set_goal',

+					'name'         => esc_html__('Goal Amount', 'give'),

+					'description'  => esc_html__('This is the monetary goal amount you want to reach for this donation form.', 'give'),

+					'id'           => $prefix.'set_goal',

 					'type'         => 'text_small',

 					'row_classes'  => 'give-subfield',

-					'before_field' => give_get_option( 'currency_position' ) == 'before' ? '<span class="give-money-symbol give-money-symbol-before">' . give_currency_symbol() . '</span>' : '',

-					'after_field'  => give_get_option( 'currency_position' ) == 'after' ? '<span class="give-money-symbol give-money-symbol-after">' . give_currency_symbol() . '</span>' : '',

+					'before_field' => give_get_option('currency_position') == 'before' ? '<span class="give-money-symbol give-money-symbol-before">'.give_currency_symbol().'</span>' : '',

+					'after_field'  => give_get_option('currency_position') == 'after' ? '<span class="give-money-symbol give-money-symbol-after">'.give_currency_symbol().'</span>' : '',

 					'attributes'   => array(

-						'placeholder' => give_format_amount( '0.00' ),

-						'value'       => isset( $goal ) ? esc_attr__( give_format_amount( $goal ) ) : '',

+						'placeholder' => give_format_amount('0.00'),

+						'value'       => isset($goal) ? esc_attr__(give_format_amount($goal)) : '',

 						'class'       => 'cmb-type-text-small give-money-field',

 					),

 				),

 

 				array(

-					'name'        => esc_html__( 'Goal Format', 'give' ),

-					'description' => esc_html__( 'Would you like to display the total amount raised based on your monetary goal or a percentage? For instance, "$500 of $1,000 raised" or "50% funded".', 'give' ),

-					'id'          => $prefix . 'goal_format',

+					'name'        => esc_html__('Goal Format', 'give'),

+					'description' => esc_html__('Would you like to display the total amount raised based on your monetary goal or a percentage? For instance, "$500 of $1,000 raised" or "50% funded".', 'give'),

+					'id'          => $prefix.'goal_format',

 					'type'        => 'radio_inline',

 					'default'     => 'amount',

 					'row_classes' => 'give-subfield',

 					'options'     => array(

-						'amount'     => esc_html__( 'Amount ', 'give' ),

-						'percentage' => esc_html__( 'Percentage', 'give' ),

+						'amount'     => esc_html__('Amount ', 'give'),

+						'percentage' => esc_html__('Percentage', 'give'),

 					),

 				),

 				array(

-					'name'        => esc_html__( 'Goal Progress Bar Color', 'give' ),

-					'id'          => $prefix . 'goal_color',

+					'name'        => esc_html__('Goal Progress Bar Color', 'give'),

+					'id'          => $prefix.'goal_color',

 					'type'        => 'colorpicker',

 					'row_classes' => 'give-subfield',

 					'default'     => '#2bc253',

 				),

 

 				array(

-					'name'        => esc_html__( 'Close Form when Goal Achieved', 'give' ),

-					'desc'        => esc_html__( 'Would you like to close the donation forms and stop accepting donations once this goal has been met?', 'give' ),

-					'id'          => $prefix . 'close_form_when_goal_achieved',

+					'name'        => esc_html__('Close Form when Goal Achieved', 'give'),

+					'desc'        => esc_html__('Would you like to close the donation forms and stop accepting donations once this goal has been met?', 'give'),

+					'id'          => $prefix.'close_form_when_goal_achieved',

 					'type'        => 'radio_inline',

 					'row_classes' => 'give-subfield',

 					'options'     => array(

-						'yes' => esc_html__( 'Yes', 'give' ),

-						'no'  => esc_html__( 'No', 'give' ),

+						'yes' => esc_html__('Yes', 'give'),

+						'no'  => esc_html__('No', 'give'),

 					),

 					'default'     => 'no',

 				),

 				array(

-					'name'        => esc_html__( 'Goal Achieved Message', 'give' ),

-					'desc'        => esc_html__( 'Would you like to display a custom message when the goal is closed? If none is provided the default message will be displayed', 'give' ),

-					'id'          => $prefix . 'form_goal_achieved_message',

+					'name'        => esc_html__('Goal Achieved Message', 'give'),

+					'desc'        => esc_html__('Would you like to display a custom message when the goal is closed? If none is provided the default message will be displayed', 'give'),

+					'id'          => $prefix.'form_goal_achieved_message',

 					'type'        => 'textarea',

 					'row_classes' => 'give-subfield',

 					'attributes'  => array(

-						'placeholder' => esc_attr__( 'Thank you to all our donors, we have met our fundraising goal.', 'give' ),

+						'placeholder' => esc_attr__('Thank you to all our donors, we have met our fundraising goal.', 'give'),

 					),

 				)

 			)

 		)

-	) );

+	));

 

 

 	/**

 	 * Content Field

 	 */

-	$meta_boxes['form_content_options'] = apply_filters( 'give_forms_content_options', array(

+	$meta_boxes['form_content_options'] = apply_filters('give_forms_content_options', array(

 		'id'           => 'form_content_options',

-		'title'        => esc_html__( 'Form Content', 'give' ),

-		'object_types' => array( 'give_forms' ),

+		'title'        => esc_html__('Form Content', 'give'),

+		'object_types' => array('give_forms'),

 		'context'      => 'normal',

 		'priority'     => 'high', //Show above Content WYSIWYG

-		'fields'       => apply_filters( 'give_forms_content_options_metabox_fields', array(

+		'fields'       => apply_filters('give_forms_content_options_metabox_fields', array(

 				//Donation Option

 				array(

-					'name'        => esc_html__( 'Display Content', 'give' ),

-					'description' => esc_html__( 'Do you want to display content? If you select "Yes" a WYSIWYG editor will appear which you will be able to enter content to display above or below the form.', 'give' ),

-					'id'          => $prefix . 'content_option',

+					'name'        => esc_html__('Display Content', 'give'),

+					'description' => esc_html__('Do you want to display content? If you select "Yes" a WYSIWYG editor will appear which you will be able to enter content to display above or below the form.', 'give'),

+					'id'          => $prefix.'content_option',

 					'type'        => 'select',

-					'options'     => apply_filters( 'give_forms_content_options_select', array(

-							'none'           => esc_html__( 'No content', 'give' ),

-							'give_pre_form'  => esc_html__( 'Yes, display content ABOVE the form fields', 'give' ),

-							'give_post_form' => esc_html__( 'Yes, display content BELOW the form fields', 'give' ),

+					'options'     => apply_filters('give_forms_content_options_select', array(

+							'none'           => esc_html__('No content', 'give'),

+							'give_pre_form'  => esc_html__('Yes, display content ABOVE the form fields', 'give'),

+							'give_post_form' => esc_html__('Yes, display content BELOW the form fields', 'give'),

 						)

 					),

 					'default'     => 'none',

 				),

 				array(

-					'name'        => esc_html__( 'Content', 'give' ),

-					'description' => esc_html__( 'This content will display on the single give form page.', 'give' ),

-					'id'          => $prefix . 'form_content',

+					'name'        => esc_html__('Content', 'give'),

+					'description' => esc_html__('This content will display on the single give form page.', 'give'),

+					'id'          => $prefix.'form_content',

 					'row_classes' => 'give-subfield',

 					'type'        => 'wysiwyg'

 				),

 			)

 		)

-	) );

+	));

 

 

 	/**

 	 * Display Options

 	 */

-	$meta_boxes['form_display_options'] = apply_filters( 'give_form_display_options', array(

+	$meta_boxes['form_display_options'] = apply_filters('give_form_display_options', array(

 			'id'           => 'form_display_options',

-			'title'        => esc_html__( 'Form Display Options', 'give' ),

-			'object_types' => array( 'give_forms' ),

+			'title'        => esc_html__('Form Display Options', 'give'),

+			'object_types' => array('give_forms'),

 			'context'      => 'normal', //  'normal', 'advanced', or 'side'

 			'priority'     => 'high', //Show above Content WYSIWYG

 			'show_names'   => true, // Show field names on the left

-			'fields'       => apply_filters( 'give_forms_display_options_metabox_fields', array(

+			'fields'       => apply_filters('give_forms_display_options_metabox_fields', array(

 					array(

-						'name'    => esc_html__( 'Payment Fields', 'give' ),

-						'desc'    => esc_html__( 'How would you like to display payment information for this form? The "Show on Page" option will display the entire form when the page loads. "Reveal Upon Click" places a button below the donation fields and upon click slides into view the rest of the fields. "Modal Window Upon Click" is a similar option, rather than sliding into view the fields they will open in a shadow box or "modal" window.', 'give' ),

-						'id'      => $prefix . 'payment_display',

+						'name'    => esc_html__('Payment Fields', 'give'),

+						'desc'    => esc_html__('How would you like to display payment information for this form? The "Show on Page" option will display the entire form when the page loads. "Reveal Upon Click" places a button below the donation fields and upon click slides into view the rest of the fields. "Modal Window Upon Click" is a similar option, rather than sliding into view the fields they will open in a shadow box or "modal" window.', 'give'),

+						'id'      => $prefix.'payment_display',

 						'type'    => 'select',

 						'options' => array(

-							'onpage' => esc_html__( 'Show on Page', 'give' ),

-							'reveal' => esc_html__( 'Reveal Upon Click', 'give' ),

-							'modal'  => esc_html__( 'Modal Window Upon Click', 'give' ),

+							'onpage' => esc_html__('Show on Page', 'give'),

+							'reveal' => esc_html__('Reveal Upon Click', 'give'),

+							'modal'  => esc_html__('Modal Window Upon Click', 'give'),

 						),

 						'default' => 'onpage',

 					),

 					array(

-						'id'          => $prefix . 'reveal_label',

-						'name'        => esc_html__( 'Reveal / Modal Open Text', 'give' ),

-						'desc'        => esc_html__( 'The button label for completing the donation.', 'give' ),

+						'id'          => $prefix.'reveal_label',

+						'name'        => esc_html__('Reveal / Modal Open Text', 'give'),

+						'desc'        => esc_html__('The button label for completing the donation.', 'give'),

 						'type'        => 'text_small',

 						'row_classes' => 'give-subfield',

 						'attributes'  => array(

-							'placeholder' => esc_attr__( 'Donate Now', 'give' ),

+							'placeholder' => esc_attr__('Donate Now', 'give'),

 						),

 					),

 					array(

-						'id'         => $prefix . 'checkout_label',

-						'name'       => esc_html__( 'Complete Donation Text', 'give' ),

-						'desc'       => esc_html__( 'The button label for completing a donation.', 'give' ),

+						'id'         => $prefix.'checkout_label',

+						'name'       => esc_html__('Complete Donation Text', 'give'),

+						'desc'       => esc_html__('The button label for completing a donation.', 'give'),

 						'type'       => 'text_small',

 						'attributes' => array(

-							'placeholder' => esc_attr__( 'Donate Now', 'give' ),

+							'placeholder' => esc_attr__('Donate Now', 'give'),

 						),

 					),

 					array(

-						'name' => esc_html__( 'Default Gateway', 'give' ),

-						'desc' => esc_html__( 'By default, the gateway for this form will inherit the global default gateway (set under Give > Settings > Payment Gateways). This option allows you to customize the default gateway for this form only.', 'give' ),

-						'id'   => $prefix . 'default_gateway',

+						'name' => esc_html__('Default Gateway', 'give'),

+						'desc' => esc_html__('By default, the gateway for this form will inherit the global default gateway (set under Give > Settings > Payment Gateways). This option allows you to customize the default gateway for this form only.', 'give'),

+						'id'   => $prefix.'default_gateway',

 						'type' => 'default_gateway'

 					),

 					array(

-						'name' => esc_html__( 'Disable Guest Donations', 'give' ),

-						'desc' => esc_html__( 'Do you want to require users be logged-in to make donations?', 'give' ),

-						'id'   => $prefix . 'logged_in_only',

+						'name' => esc_html__('Disable Guest Donations', 'give'),

+						'desc' => esc_html__('Do you want to require users be logged-in to make donations?', 'give'),

+						'id'   => $prefix.'logged_in_only',

 						'type' => 'checkbox'

 					),

 					array(

-						'name'    => esc_html__( 'Register / Login Form', 'give' ),

-						'desc'    => esc_html__( 'Display the registration and login forms in the payment section for non-logged-in users.', 'give' ),

-						'id'      => $prefix . 'show_register_form',

+						'name'    => esc_html__('Register / Login Form', 'give'),

+						'desc'    => esc_html__('Display the registration and login forms in the payment section for non-logged-in users.', 'give'),

+						'id'      => $prefix.'show_register_form',

 						'type'    => 'select',

 						'options' => array(

-							'both'         => esc_html__( 'Registration and Login Forms', 'give' ),

-							'registration' => esc_html__( 'Registration Form Only', 'give' ),

-							'login'        => esc_html__( 'Login Form Only', 'give' ),

-							'none'         => esc_html__( 'None', 'give' ),

+							'both'         => esc_html__('Registration and Login Forms', 'give'),

+							'registration' => esc_html__('Registration Form Only', 'give'),

+							'login'        => esc_html__('Login Form Only', 'give'),

+							'none'         => esc_html__('None', 'give'),

 						),

 						'default' => 'none',

 					),

 					array(

-						'name'    => esc_html__( 'Floating Labels', 'give' ),

+						'name'    => esc_html__('Floating Labels', 'give'),

 						/* translators: %s: forms http://bradfrost.com/blog/post/float-label-pattern/ */

-						'desc'    => sprintf( __( 'Select the <a href="%s" target="_blank">floating labels</a> setting for this Give form.<br>Be aware that if you have the "Disable CSS" option enabled, you will need to style the floating labels yourself.', 'give' ), esc_url( "http://bradfrost.com/blog/post/float-label-pattern/" ) ),

-						'id'      => $prefix . 'form_floating_labels',

+						'desc'    => sprintf(__('Select the <a href="%s" target="_blank">floating labels</a> setting for this Give form.<br>Be aware that if you have the "Disable CSS" option enabled, you will need to style the floating labels yourself.', 'give'), esc_url("http://bradfrost.com/blog/post/float-label-pattern/")),

+						'id'      => $prefix.'form_floating_labels',

 						'type'    => 'select',

 						'options' => array(

-							''         => esc_html__( 'Use the global setting', 'give' ),

-							'enabled'  => esc_html__( 'Enabled', 'give' ),

-							'disabled' => esc_html__( 'Disabled', 'give' ),

+							''         => esc_html__('Use the global setting', 'give'),

+							'enabled'  => esc_html__('Enabled', 'give'),

+							'disabled' => esc_html__('Disabled', 'give'),

 						),

 						'default' => 'none',

 					)

@@ -379,47 +379,47 @@ 
 	/**

 	 * Terms & Conditions

 	 */

-	$meta_boxes['form_terms_options'] = apply_filters( 'give_forms_terms_options', array(

+	$meta_boxes['form_terms_options'] = apply_filters('give_forms_terms_options', array(

 		'id'           => 'form_terms_options',

-		'title'        => esc_html__( 'Terms and Conditions', 'give' ),

-		'object_types' => array( 'give_forms' ),

+		'title'        => esc_html__('Terms and Conditions', 'give'),

+		'object_types' => array('give_forms'),

 		'context'      => 'normal',

 		'priority'     => 'high', //Show above Content WYSIWYG

-		'fields'       => apply_filters( 'give_forms_terms_options_metabox_fields', array(

+		'fields'       => apply_filters('give_forms_terms_options_metabox_fields', array(

 				//Donation Option

 				array(

-					'name'        => esc_html__( 'Terms and Conditions', 'give' ),

-					'description' => esc_html__( 'Do you want to require the user to agree to terms and conditions prior to being able to complete their donation?', 'give' ),

-					'id'          => $prefix . 'terms_option',

+					'name'        => esc_html__('Terms and Conditions', 'give'),

+					'description' => esc_html__('Do you want to require the user to agree to terms and conditions prior to being able to complete their donation?', 'give'),

+					'id'          => $prefix.'terms_option',

 					'type'        => 'select',

-					'options'     => apply_filters( 'give_forms_content_options_select', array(

-							'none' => esc_html__( 'No', 'give' ),

-							'yes'  => esc_html__( 'Yes', 'give' ),

+					'options'     => apply_filters('give_forms_content_options_select', array(

+							'none' => esc_html__('No', 'give'),

+							'yes'  => esc_html__('Yes', 'give'),

 						)

 					),

 					'default'     => 'none',

 				),

 				array(

-					'id'          => $prefix . 'agree_label',

-					'name'        => esc_html__( 'Agree to Terms Label', 'give' ),

-					'desc'        => esc_html__( 'The label shown next to the agree to terms check box. Add your own to customize or leave blank to use the default text placeholder.', 'give' ),

+					'id'          => $prefix.'agree_label',

+					'name'        => esc_html__('Agree to Terms Label', 'give'),

+					'desc'        => esc_html__('The label shown next to the agree to terms check box. Add your own to customize or leave blank to use the default text placeholder.', 'give'),

 					'type'        => 'text',

 					'row_classes' => 'give-subfield',

 					'size'        => 'regular',

 					'attributes'  => array(

-						'placeholder' => esc_attr__( 'Agree to Terms?', 'give' ),

+						'placeholder' => esc_attr__('Agree to Terms?', 'give'),

 					),

 				),

 				array(

-					'id'          => $prefix . 'agree_text',

+					'id'          => $prefix.'agree_text',

 					'row_classes' => 'give-subfield',

-					'name'        => esc_html__( 'Agreement Text', 'give' ),

-					'desc'        => esc_html__( 'This is the actual text which the user will have to agree to in order to make a donation.', 'give' ),

+					'name'        => esc_html__('Agreement Text', 'give'),

+					'desc'        => esc_html__('This is the actual text which the user will have to agree to in order to make a donation.', 'give'),

 					'type'        => 'wysiwyg'

 				),

 			)

 		)

-	) );

+	));

 

 	return $meta_boxes;

 

@@ -433,11 +433,11 @@ 
 

 	<div class="table-container">

 		<div class="table-row">

-			<div class="table-cell col-amount"><?php esc_html_e( 'Amount', 'give' ); ?></div>

-			<div class="table-cell col-text"><?php esc_html_e( 'Text', 'give' ); ?></div>

-			<div class="table-cell col-default"><?php esc_html_e( 'Default', 'give' ); ?></div>

-			<?php do_action( 'give_donation_levels_table_head' ); ?>

-			<div class="table-cell col-sort"><?php esc_html_e( 'Sort', 'give' ); ?></div>

+			<div class="table-cell col-amount"><?php esc_html_e('Amount', 'give'); ?></div>

+			<div class="table-cell col-text"><?php esc_html_e('Text', 'give'); ?></div>

+			<div class="table-cell col-default"><?php esc_html_e('Default', 'give'); ?></div>

+			<?php do_action('give_donation_levels_table_head'); ?>

+			<div class="table-cell col-sort"><?php esc_html_e('Sort', 'give'); ?></div>

 

 		</div>

 	</div>

@@ -445,7 +445,7 @@ 
 	<?php

 }

 

-add_action( 'cmb2_render_levels_repeater_header', 'give_cmb_render_levels_repeater_header', 10 );

+add_action('cmb2_render_levels_repeater_header', 'give_cmb_render_levels_repeater_header', 10);

 

 

 /**

@@ -462,25 +462,25 @@ 
  * @param $object_type

  * @param $field_type_object

  */

-function give_cmb_render_levels_id( $field_object, $escaped_value, $object_id, $object_type, $field_type_object ) {

+function give_cmb_render_levels_id($field_object, $escaped_value, $object_id, $object_type, $field_type_object) {

 

-	$escaped_value = ( isset( $escaped_value['level_id'] ) ? $escaped_value['level_id'] : '' );

+	$escaped_value = (isset($escaped_value['level_id']) ? $escaped_value['level_id'] : '');

 

 	$field_options_array = array(

 		'class' => 'give-hidden give-level-id-input',

-		'name'  => $field_type_object->_name( '[level_id]' ),

-		'id'    => $field_type_object->_id( '_level_id' ),

+		'name'  => $field_type_object->_name('[level_id]'),

+		'id'    => $field_type_object->_id('_level_id'),

 		'value' => $escaped_value,

 		'type'  => 'number',

 		'desc'  => '',

 	);

 

-	echo '<p class="give-level-id">' . $escaped_value . '</p>';

-	echo $field_type_object->input( $field_options_array );

+	echo '<p class="give-level-id">'.$escaped_value.'</p>';

+	echo $field_type_object->input($field_options_array);

 

 }

 

-add_action( 'cmb2_render_levels_id', 'give_cmb_render_levels_id', 10, 5 );

+add_action('cmb2_render_levels_id', 'give_cmb_render_levels_id', 10, 5);

 

 

 /**

@@ -492,13 +492,13 @@ 
  * @param $object_type

  * @param $field_type_object

  */

-function give_cmb_give_default_radio_inline( $field_object, $escaped_value, $object_id, $object_type, $field_type_object ) {

-	echo '<input type="radio" class="cmb2-option donation-level-radio" name="' . $field_object->args['_name'] . '" id="' . $field_object->args['id'] . '" value="default" ' . checked( 'default', $escaped_value, false ) . '>';

-	echo '<label for="' . $field_object->args['id'] . '">Default</label>';

+function give_cmb_give_default_radio_inline($field_object, $escaped_value, $object_id, $object_type, $field_type_object) {

+	echo '<input type="radio" class="cmb2-option donation-level-radio" name="'.$field_object->args['_name'].'" id="'.$field_object->args['id'].'" value="default" '.checked('default', $escaped_value, false).'>';

+	echo '<label for="'.$field_object->args['id'].'">Default</label>';

 

 }

 

-add_action( 'cmb2_render_give_default_radio_inline', 'give_cmb_give_default_radio_inline', 10, 5 );

+add_action('cmb2_render_give_default_radio_inline', 'give_cmb_give_default_radio_inline', 10, 5);

 

 

 /**

@@ -508,20 +508,20 @@ 
  */

 function give_add_shortcode_to_publish_metabox() {

 

-	if ( 'give_forms' !== get_post_type() ) {

+	if ('give_forms' !== get_post_type()) {

 		return false;

 	}

 

 	global $post;

 

 	//Only enqueue scripts for CPT on post type screen

-	if ( 'give_forms' === $post->post_type ) {

+	if ('give_forms' === $post->post_type) {

 		//Shortcode column with select all input

-		$shortcode = htmlentities( '[give_form id="' . $post->ID . '"]' );

-		echo '<div class="shortcode-wrap box-sizing"><label>' . esc_html__( 'Give Form Shortcode:', 'give' ) . '</label><input onClick="this.setSelectionRange(0, this.value.length)" type="text" class="shortcode-input" readonly value="' . $shortcode . '"></div>';

+		$shortcode = htmlentities('[give_form id="'.$post->ID.'"]');

+		echo '<div class="shortcode-wrap box-sizing"><label>'.esc_html__('Give Form Shortcode:', 'give').'</label><input onClick="this.setSelectionRange(0, this.value.length)" type="text" class="shortcode-input" readonly value="'.$shortcode.'"></div>';

 

 	}

 

 }

 

-add_action( 'post_submitbox_misc_actions', 'give_add_shortcode_to_publish_metabox' );

+add_action('post_submitbox_misc_actions', 'give_add_shortcode_to_publish_metabox');

includes/admin/forms/dashboard-columns.php

Spacing +83 added lines, -83 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -27,34 +27,34 @@ 
  * @return array $form_columns Updated array of forms columns
  *  Post Type List Table
  */
-function give_form_columns( $give_form_columns ) {
+function give_form_columns($give_form_columns) {
 
 	//Standard columns
 	$give_form_columns = array(
 		'cb'            => '<input type="checkbox"/>',
-		'title'         => esc_html__( 'Name', 'give' ),
-		'form_category' => esc_html__( 'Categories', 'give' ),
-		'form_tag'      => esc_html__( 'Tags', 'give' ),
-		'price'         => esc_html__( 'Price', 'give' ),
-		'goal'          => esc_html__( 'Goal', 'give' ),
-		'donations'     => esc_html__( 'Donations', 'give' ),
-		'earnings'      => esc_html__( 'Income', 'give' ),
-		'shortcode'     => esc_html__( 'Shortcode', 'give' ),
-		'date'          => esc_html__( 'Date', 'give' )
+		'title'         => esc_html__('Name', 'give'),
+		'form_category' => esc_html__('Categories', 'give'),
+		'form_tag'      => esc_html__('Tags', 'give'),
+		'price'         => esc_html__('Price', 'give'),
+		'goal'          => esc_html__('Goal', 'give'),
+		'donations'     => esc_html__('Donations', 'give'),
+		'earnings'      => esc_html__('Income', 'give'),
+		'shortcode'     => esc_html__('Shortcode', 'give'),
+		'date'          => esc_html__('Date', 'give')
 	);
 
 	//Does the user want categories / tags?
-	if ( give_get_option( 'enable_categories' ) !== 'on' ) {
-		unset( $give_form_columns['form_category'] );
+	if (give_get_option('enable_categories') !== 'on') {
+		unset($give_form_columns['form_category']);
 	}
-	if ( give_get_option( 'enable_tags' ) !== 'on' ) {
-		unset( $give_form_columns['form_tag'] );
+	if (give_get_option('enable_tags') !== 'on') {
+		unset($give_form_columns['form_tag']);
 	}
 
-	return apply_filters( 'give_forms_columns', $give_form_columns );
+	return apply_filters('give_forms_columns', $give_form_columns);
 }
 
-add_filter( 'manage_edit-give_forms_columns', 'give_form_columns' );
+add_filter('manage_edit-give_forms_columns', 'give_form_columns');
 
 /**
  * Render Give Form Columns
@@ -66,67 +66,67 @@ 
  *
  * @return void
  */
-function give_render_form_columns( $column_name, $post_id ) {
-	if ( get_post_type( $post_id ) == 'give_forms' ) {
+function give_render_form_columns($column_name, $post_id) {
+	if (get_post_type($post_id) == 'give_forms') {
 		global $give_options;
 
-		$style = isset( $give_options['button_style'] ) ? $give_options['button_style'] : 'button';
-		$color = isset( $give_options['checkout_color'] ) ? $give_options['checkout_color'] : 'blue';
-		$color = ( $color == 'inherit' ) ? '' : $color;
+		$style = isset($give_options['button_style']) ? $give_options['button_style'] : 'button';
+		$color = isset($give_options['checkout_color']) ? $give_options['checkout_color'] : 'blue';
+		$color = ($color == 'inherit') ? '' : $color;
 
-		$purchase_text = ! empty( $give_options['add_to_cart_text'] ) ? $give_options['add_to_cart_text'] : esc_html__( 'Purchase', 'give' );
+		$purchase_text = ! empty($give_options['add_to_cart_text']) ? $give_options['add_to_cart_text'] : esc_html__('Purchase', 'give');
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 			case 'form_category':
-				echo get_the_term_list( $post_id, 'give_forms_category', '', ', ', '' );
+				echo get_the_term_list($post_id, 'give_forms_category', '', ', ', '');
 				break;
 			case 'form_tag':
-				echo get_the_term_list( $post_id, 'give_forms_tag', '', ', ', '' );
+				echo get_the_term_list($post_id, 'give_forms_tag', '', ', ', '');
 				break;
 			case 'price':
-				if ( give_has_variable_prices( $post_id ) ) {
-					echo give_price_range( $post_id );
+				if (give_has_variable_prices($post_id)) {
+					echo give_price_range($post_id);
 				} else {
-					echo give_price( $post_id, false );
-					echo '<input type="hidden" class="formprice-' . $post_id . '" value="' . give_get_form_price( $post_id ) . '" />';
+					echo give_price($post_id, false);
+					echo '<input type="hidden" class="formprice-'.$post_id.'" value="'.give_get_form_price($post_id).'" />';
 				}
 				break;
 			case 'goal':
-				$goal_option = get_post_meta( $post_id, '_give_goal_option', true );
-				if ( ! empty( $goal_option ) && $goal_option === 'yes' ) {
-					echo give_goal( $post_id, false );
+				$goal_option = get_post_meta($post_id, '_give_goal_option', true);
+				if ( ! empty($goal_option) && $goal_option === 'yes') {
+					echo give_goal($post_id, false);
 				} else {
-					esc_html_e( 'No Goal Set', 'give' );
+					esc_html_e('No Goal Set', 'give');
 				}
 
-				echo '<input type="hidden" class="formgoal-' . $post_id . '" value="' . give_get_form_goal( $post_id ) . '" />';
+				echo '<input type="hidden" class="formgoal-'.$post_id.'" value="'.give_get_form_goal($post_id).'" />';
 				break;
 			case 'donations':
-				if ( current_user_can( 'view_give_forms_stats', $post_id ) ) {
-					echo '<a href="' . esc_url( admin_url( 'edit.php?post_type=give_forms&page=give-reports&tab=logs&view=sales&form=' . $post_id ) ) . '">';
-					echo give_get_form_sales_stats( $post_id );
+				if (current_user_can('view_give_forms_stats', $post_id)) {
+					echo '<a href="'.esc_url(admin_url('edit.php?post_type=give_forms&page=give-reports&tab=logs&view=sales&form='.$post_id)).'">';
+					echo give_get_form_sales_stats($post_id);
 					echo '</a>';
 				} else {
 					echo '-';
 				}
 				break;
 			case 'earnings':
-				if ( current_user_can( 'view_give_forms_stats', $post_id ) ) {
-					echo '<a href="' . esc_url( admin_url( 'edit.php?post_type=give_forms&page=give-reports&view=forms&form-id=' . $post_id ) ) . '">';
-					echo give_currency_filter( give_format_amount( give_get_form_earnings_stats( $post_id ) ) );
+				if (current_user_can('view_give_forms_stats', $post_id)) {
+					echo '<a href="'.esc_url(admin_url('edit.php?post_type=give_forms&page=give-reports&view=forms&form-id='.$post_id)).'">';
+					echo give_currency_filter(give_format_amount(give_get_form_earnings_stats($post_id)));
 					echo '</a>';
 				} else {
 					echo '-';
 				}
 				break;
 			case 'shortcode':
-				echo '<input onclick="this.setSelectionRange(0, this.value.length)" type="text" class="shortcode-input" readonly="" value="[give_form id=&#34;' . absint( $post_id ) . '&#34;]">';
+				echo '<input onclick="this.setSelectionRange(0, this.value.length)" type="text" class="shortcode-input" readonly="" value="[give_form id=&#34;'.absint($post_id).'&#34;]">';
 				break;
 		}
 	}
 }
 
-add_action( 'manage_posts_custom_column', 'give_render_form_columns', 10, 2 );
+add_action('manage_posts_custom_column', 'give_render_form_columns', 10, 2);
 
 /**
  * Registers the sortable columns in the list table
@@ -137,7 +137,7 @@ 
  *
  * @return array $columns Array of sortable columns
  */
-function give_sortable_form_columns( $columns ) {
+function give_sortable_form_columns($columns) {
 	$columns['price']    = 'price';
 	$columns['sales']    = 'sales';
 	$columns['earnings'] = 'earnings';
@@ -146,7 +146,7 @@ 
 	return $columns;
 }
 
-add_filter( 'manage_edit-give_forms_sortable_columns', 'give_sortable_form_columns' );
+add_filter('manage_edit-give_forms_sortable_columns', 'give_sortable_form_columns');
 
 /**
  * Sorts Columns in the Forms List Table
@@ -157,11 +157,11 @@ 
  *
  * @return array $vars Array of all the sort variables
  */
-function give_sort_forms( $vars ) {
+function give_sort_forms($vars) {
 	// Check if we're viewing the "give_forms" post type
-	if ( isset( $vars['post_type'] ) && 'give_forms' == $vars['post_type'] ) {
+	if (isset($vars['post_type']) && 'give_forms' == $vars['post_type']) {
 		// Check if 'orderby' is set to "sales"
-		if ( isset( $vars['orderby'] ) && 'sales' == $vars['orderby'] ) {
+		if (isset($vars['orderby']) && 'sales' == $vars['orderby']) {
 			$vars = array_merge(
 				$vars,
 				array(
@@ -172,7 +172,7 @@ 
 		}
 
 		// Check if "orderby" is set to "earnings"
-		if ( isset( $vars['orderby'] ) && 'earnings' == $vars['orderby'] ) {
+		if (isset($vars['orderby']) && 'earnings' == $vars['orderby']) {
 			$vars = array_merge(
 				$vars,
 				array(
@@ -183,7 +183,7 @@ 
 		}
 
 		// Check if "orderby" is set to "price"
-		if ( isset( $vars['orderby'] ) && 'price' == $vars['orderby'] ) {
+		if (isset($vars['orderby']) && 'price' == $vars['orderby']) {
 			$vars = array_merge(
 				$vars,
 				array(
@@ -194,7 +194,7 @@ 
 		}
 
 		// Check if "orderby" is set to "goal"
-		if ( isset( $vars['orderby'] ) && 'goal' == $vars['orderby'] ) {
+		if (isset($vars['orderby']) && 'goal' == $vars['orderby']) {
 			$vars = array_merge(
 				$vars,
 				array(
@@ -217,16 +217,16 @@ 
  *
  * @return array       Array of all sort variables
  */
-function give_filter_forms( $vars ) {
-	if ( isset( $vars['post_type'] ) && 'give_forms' == $vars['post_type'] ) {
+function give_filter_forms($vars) {
+	if (isset($vars['post_type']) && 'give_forms' == $vars['post_type']) {
 
 		// If an author ID was passed, use it
-		if ( isset( $_REQUEST['author'] ) && ! current_user_can( 'view_give_reports' ) ) {
+		if (isset($_REQUEST['author']) && ! current_user_can('view_give_reports')) {
 
 			$author_id = $_REQUEST['author'];
-			if ( (int) $author_id !== get_current_user_id() ) {
+			if ((int) $author_id !== get_current_user_id()) {
 				// Tried to view the products of another person, sorry
-				wp_die( esc_html__( 'You do not have permission to view this data.', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 403 ) );
+				wp_die(esc_html__('You do not have permission to view this data.', 'give'), esc_html__('Error', 'give'), array('response' => 403));
 			}
 			$vars = array_merge(
 				$vars,
@@ -251,11 +251,11 @@ 
  * @return void
  */
 function give_forms_load() {
-	add_filter( 'request', 'give_sort_forms' );
-	add_filter( 'request', 'give_filter_forms' );
+	add_filter('request', 'give_sort_forms');
+	add_filter('request', 'give_filter_forms');
 }
 
-add_action( 'load-edit.php', 'give_forms_load', 9999 );
+add_action('load-edit.php', 'give_forms_load', 9999);
 
 /**
  * Remove Forms Month Filter
@@ -269,17 +269,17 @@ 
  * @global      $typenow The post type we are viewing
  * @return array Empty array disables the dropdown
  */
-function give_remove_month_filter( $dates ) {
+function give_remove_month_filter($dates) {
 	global $typenow;
 
-	if ( $typenow == 'give_forms' ) {
+	if ($typenow == 'give_forms') {
 		$dates = array();
 	}
 
 	return $dates;
 }
 
-add_filter( 'months_dropdown_results', 'give_remove_month_filter', 99 );
+add_filter('months_dropdown_results', 'give_remove_month_filter', 99);
 
 /**
  * Adds price field to Quick Edit options
@@ -291,8 +291,8 @@ 
  *
  * @return void
  */
-function give_price_field_quick_edit( $column_name, $post_type ) {
-	if ( $column_name != 'price' || $post_type != 'give_forms' ) {
+function give_price_field_quick_edit($column_name, $post_type) {
+	if ($column_name != 'price' || $post_type != 'give_forms') {
 		return;
 	}
 	?>
@@ -301,12 +301,12 @@ 
 			<h4><?php 
 				printf(
 					/* translators: %s: forms singular label */
-					esc_html__( '%s Configuration', 'give' ),
+					esc_html__('%s Configuration', 'give'),
 					give_get_forms_label_singular()
 				);
 			?></h4>
 			<label>
-				<span class="title"><?php esc_html_e( 'Price', 'give' ); ?></span>
+				<span class="title"><?php esc_html_e('Price', 'give'); ?></span>
 				<span class="input-text-wrap">
 					<input type="text" name="_give_regprice" class="text regprice" />
 				</span>
@@ -317,8 +317,8 @@ 
 	<?php
 }
 
-add_action( 'quick_edit_custom_box', 'give_price_field_quick_edit', 10, 2 );
-add_action( 'bulk_edit_custom_box', 'give_price_field_quick_edit', 10, 2 );
+add_action('quick_edit_custom_box', 'give_price_field_quick_edit', 10, 2);
+add_action('bulk_edit_custom_box', 'give_price_field_quick_edit', 10, 2);
 
 /**
  * Updates price when saving post
@@ -329,23 +329,23 @@ 
  *
  * @return void
  */
-function give_price_save_quick_edit( $post_id ) {
-	if ( ! isset( $_POST['post_type'] ) || 'give_forms' !== $_POST['post_type'] ) {
+function give_price_save_quick_edit($post_id) {
+	if ( ! isset($_POST['post_type']) || 'give_forms' !== $_POST['post_type']) {
 		return;
 	}
-	if ( ! current_user_can( 'edit_post', $post_id ) ) {
+	if ( ! current_user_can('edit_post', $post_id)) {
 		return $post_id;
 	}
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
 		return $post_id;
 	}
 
-	if ( isset( $_REQUEST['_give_regprice'] ) ) {
-		update_post_meta( $post_id, '_give_set_price', strip_tags( stripslashes( $_REQUEST['_give_regprice'] ) ) );
+	if (isset($_REQUEST['_give_regprice'])) {
+		update_post_meta($post_id, '_give_set_price', strip_tags(stripslashes($_REQUEST['_give_regprice'])));
 	}
 }
 
-add_action( 'save_post', 'give_price_save_quick_edit' );
+add_action('save_post', 'give_price_save_quick_edit');
 
 /**
  * Process bulk edit actions via AJAX
@@ -355,18 +355,18 @@ 
  */
 function give_save_bulk_edit() {
 
-	$post_ids = ( isset( $_POST['post_ids'] ) && ! empty( $_POST['post_ids'] ) ) ? $_POST['post_ids'] : array();
+	$post_ids = (isset($_POST['post_ids']) && ! empty($_POST['post_ids'])) ? $_POST['post_ids'] : array();
 
-	if ( ! empty( $post_ids ) && is_array( $post_ids ) ) {
-		$price = isset( $_POST['price'] ) ? strip_tags( stripslashes( $_POST['price'] ) ) : 0;
-		foreach ( $post_ids as $post_id ) {
+	if ( ! empty($post_ids) && is_array($post_ids)) {
+		$price = isset($_POST['price']) ? strip_tags(stripslashes($_POST['price'])) : 0;
+		foreach ($post_ids as $post_id) {
 
-			if ( ! current_user_can( 'edit_post', $post_id ) ) {
+			if ( ! current_user_can('edit_post', $post_id)) {
 				continue;
 			}
 
-			if ( ! empty( $price ) ) {
-				update_post_meta( $post_id, '_give_set_price', give_sanitize_amount( $price ) );
+			if ( ! empty($price)) {
+				update_post_meta($post_id, '_give_set_price', give_sanitize_amount($price));
 			}
 		}
 	}
@@ -374,4 +374,4 @@ 
 	die();
 }
 
-add_action( 'wp_ajax_give_save_bulk_edit', 'give_save_bulk_edit' );
+add_action('wp_ajax_give_save_bulk_edit', 'give_save_bulk_edit');

includes/admin/upgrades/upgrade-functions.php

Spacing +68 added lines, -68 removed lines

@@ -13,7 +13,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,18 +25,18 @@ 
  */
 function give_show_upgrade_notices() {
 
-	if ( isset( $_GET['page'] ) && $_GET['page'] == 'give-upgrades' ) {
+	if (isset($_GET['page']) && $_GET['page'] == 'give-upgrades') {
 		return;
 	} // Don't show notices on the upgrades page
 
-	$give_version = get_option( 'give_version' );
+	$give_version = get_option('give_version');
 
-	if ( ! $give_version ) {
+	if ( ! $give_version) {
 		// 1.0 is the first version to use this option so we must add it
 		$give_version = '1.0';
 	}
 
-	$give_version = preg_replace( '/[^0-9.].*/', '', $give_version );
+	$give_version = preg_replace('/[^0-9.].*/', '', $give_version);
 
 	/*
 	 *  NOTICE:
@@ -47,20 +47,20 @@ 
 	 */
 
 	//v1.3.2 Upgrades
-	if ( version_compare( $give_version, '1.3.2', '<' ) || ! give_has_upgrade_completed( 'upgrade_give_payment_customer_id' ) ) {
+	if (version_compare($give_version, '1.3.2', '<') || ! give_has_upgrade_completed('upgrade_give_payment_customer_id')) {
 		printf(
 			/* translators: %s: upgrade URL */
-			'<div class="updated"><p>' . __( 'Give needs to upgrade the donor database, click <a href="%s">here</a> to start the upgrade.', 'give' ) . '</p></div>',
-			esc_url( admin_url( 'index.php?page=give-upgrades&give-upgrade=upgrade_give_payment_customer_id' ) )
+			'<div class="updated"><p>'.__('Give needs to upgrade the donor database, click <a href="%s">here</a> to start the upgrade.', 'give').'</p></div>',
+			esc_url(admin_url('index.php?page=give-upgrades&give-upgrade=upgrade_give_payment_customer_id'))
 		);
 	}
 
 	//v1.3.4 Upgrades //ensure the user has gone through 1.3.4
-	if ( version_compare( $give_version, '1.3.4', '<' ) || ( ! give_has_upgrade_completed( 'upgrade_give_offline_status' ) && give_has_upgrade_completed( 'upgrade_give_payment_customer_id' ) ) ) {
+	if (version_compare($give_version, '1.3.4', '<') || ( ! give_has_upgrade_completed('upgrade_give_offline_status') && give_has_upgrade_completed('upgrade_give_payment_customer_id'))) {
 		printf(
 			/* translators: %s: upgrade URL */
-			'<div class="updated"><p>' . __( 'Give needs to upgrade the transaction database, click <a href="%s">here</a> to start the upgrade.', 'give' ) . '</p></div>',
-			esc_url( admin_url( 'index.php?page=give-upgrades&give-upgrade=upgrade_give_offline_status' ) )
+			'<div class="updated"><p>'.__('Give needs to upgrade the transaction database, click <a href="%s">here</a> to start the upgrade.', 'give').'</p></div>',
+			esc_url(admin_url('index.php?page=give-upgrades&give-upgrade=upgrade_give_offline_status'))
 		);
 	}
 
@@ -70,7 +70,7 @@ 
 
 }
 
-add_action( 'admin_notices', 'give_show_upgrade_notices' );
+add_action('admin_notices', 'give_show_upgrade_notices');
 
 /**
  * Triggers all upgrade functions
@@ -82,26 +82,26 @@ 
  */
 function give_trigger_upgrades() {
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( esc_html__( 'You do not have permission to do Give upgrades.', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(esc_html__('You do not have permission to do Give upgrades.', 'give'), esc_html__('Error', 'give'), array('response' => 403));
 	}
 
-	$give_version = get_option( 'give_version' );
+	$give_version = get_option('give_version');
 
-	if ( ! $give_version ) {
+	if ( ! $give_version) {
 		// 1.0 is the first version to use this option so we must add it
 		$give_version = '1.0';
-		add_option( 'give_version', $give_version );
+		add_option('give_version', $give_version);
 	}
 
-	update_option( 'give_version', GIVE_VERSION );
+	update_option('give_version', GIVE_VERSION);
 
-	if ( DOING_AJAX ) {
-		die( 'complete' );
+	if (DOING_AJAX) {
+		die('complete');
 	} // Let AJAX know that the upgrade is complete
 }
 
-add_action( 'wp_ajax_give_trigger_upgrades', 'give_trigger_upgrades' );
+add_action('wp_ajax_give_trigger_upgrades', 'give_trigger_upgrades');
 
 /**
  * Check if the upgrade routine has been run for a specific action
@@ -112,15 +112,15 @@ 
  *
  * @return bool                   If the action has been added to the completed actions array
  */
-function give_has_upgrade_completed( $upgrade_action = '' ) {
+function give_has_upgrade_completed($upgrade_action = '') {
 
-	if ( empty( $upgrade_action ) ) {
+	if (empty($upgrade_action)) {
 		return false;
 	}
 
 	$completed_upgrades = give_get_completed_upgrades();
 
-	return in_array( $upgrade_action, $completed_upgrades );
+	return in_array($upgrade_action, $completed_upgrades);
 
 }
 
@@ -133,9 +133,9 @@ 
  *
  * @return bool                   If the function was successfully added
  */
-function give_set_upgrade_complete( $upgrade_action = '' ) {
+function give_set_upgrade_complete($upgrade_action = '') {
 
-	if ( empty( $upgrade_action ) ) {
+	if (empty($upgrade_action)) {
 		return false;
 	}
 
@@ -143,9 +143,9 @@ 
 	$completed_upgrades[] = $upgrade_action;
 
 	// Remove any blanks, and only show uniques
-	$completed_upgrades = array_unique( array_values( $completed_upgrades ) );
+	$completed_upgrades = array_unique(array_values($completed_upgrades));
 
-	return update_option( 'give_completed_upgrades', $completed_upgrades );
+	return update_option('give_completed_upgrades', $completed_upgrades);
 }
 
 /**
@@ -156,9 +156,9 @@ 
  */
 function give_get_completed_upgrades() {
 
-	$completed_upgrades = get_option( 'give_completed_upgrades' );
+	$completed_upgrades = get_option('give_completed_upgrades');
 
-	if ( false === $completed_upgrades ) {
+	if (false === $completed_upgrades) {
 		$completed_upgrades = array();
 	}
 
@@ -177,30 +177,30 @@ 
  */
 function give_v132_upgrade_give_payment_customer_id() {
 	global $wpdb;
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( esc_html__( 'You do not have permission to do Give upgrades.', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(esc_html__('You do not have permission to do Give upgrades.', 'give'), esc_html__('Error', 'give'), array('response' => 403));
 	}
 
-	ignore_user_abort( true );
+	ignore_user_abort(true);
 
-	if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-		@set_time_limit( 0 );
+	if ( ! give_is_func_disabled('set_time_limit') && ! ini_get('safe_mode')) {
+		@set_time_limit(0);
 	}
 
 	//UPDATE DB METAKEYS
 	$sql   = "UPDATE $wpdb->postmeta SET meta_key = '_give_payment_customer_id' WHERE meta_key = '_give_payment_donor_id'";
-	$query = $wpdb->query( $sql );
+	$query = $wpdb->query($sql);
 
-	update_option( 'give_version', preg_replace( '/[^0-9.].*/', '', GIVE_VERSION ) );
-	give_set_upgrade_complete( 'upgrade_give_payment_customer_id' );
-	delete_option( 'give_doing_upgrade' );
-	wp_redirect( admin_url() );
+	update_option('give_version', preg_replace('/[^0-9.].*/', '', GIVE_VERSION));
+	give_set_upgrade_complete('upgrade_give_payment_customer_id');
+	delete_option('give_doing_upgrade');
+	wp_redirect(admin_url());
 	exit;
 
 
 }
 
-add_action( 'give_upgrade_give_payment_customer_id', 'give_v132_upgrade_give_payment_customer_id' );
+add_action('give_upgrade_give_payment_customer_id', 'give_v132_upgrade_give_payment_customer_id');
 
 /**
  * Upgrades the Offline Status
@@ -214,14 +214,14 @@ 
 
 	global $wpdb;
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( esc_html__( 'You do not have permission to do Give upgrades.', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(esc_html__('You do not have permission to do Give upgrades.', 'give'), esc_html__('Error', 'give'), array('response' => 403));
 	}
 
-	ignore_user_abort( true );
+	ignore_user_abort(true);
 
-	if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-		@set_time_limit( 0 );
+	if ( ! give_is_func_disabled('set_time_limit') && ! ini_get('safe_mode')) {
+		@set_time_limit(0);
 	}
 
 	// Get abandoned offline payments
@@ -231,35 +231,35 @@ 
 	$where .= "AND ( p.post_status = 'abandoned' )";
 	$where .= "AND ( m.meta_key = '_give_payment_gateway' AND m.meta_value = 'offline' )";
 
-	$sql            = $select . $join . $where;
-	$found_payments = $wpdb->get_col( $sql );
+	$sql            = $select.$join.$where;
+	$found_payments = $wpdb->get_col($sql);
 
 
-	foreach ( $found_payments as $payment ) {
+	foreach ($found_payments as $payment) {
 
 		//Only change ones marked abandoned since our release last week
 		//because the admin may have marked some abandoned themselves
-		$modified_time = get_post_modified_time( 'U', false, $payment );
+		$modified_time = get_post_modified_time('U', false, $payment);
 
 		//1450124863 =  12/10/2015 20:42:25
-		if ( $modified_time >= 1450124863 ) {
+		if ($modified_time >= 1450124863) {
 
-			give_update_payment_status( $payment, 'pending' );
+			give_update_payment_status($payment, 'pending');
 
 		}
 
 	}
 
-	update_option( 'give_version', preg_replace( '/[^0-9.].*/', '', GIVE_VERSION ) );
-	give_set_upgrade_complete( 'upgrade_give_offline_status' );
-	delete_option( 'give_doing_upgrade' );
-	wp_redirect( admin_url() );
+	update_option('give_version', preg_replace('/[^0-9.].*/', '', GIVE_VERSION));
+	give_set_upgrade_complete('upgrade_give_offline_status');
+	delete_option('give_doing_upgrade');
+	wp_redirect(admin_url());
 	exit;
 
 
 }
 
-add_action( 'give_upgrade_give_offline_status', 'give_v134_upgrade_give_offline_status' );
+add_action('give_upgrade_give_offline_status', 'give_v134_upgrade_give_offline_status');
 
 
 /**
@@ -271,17 +271,17 @@ 
  */
 function give_v152_cleanup_users() {
 
-	$give_version = get_option( 'give_version' );
+	$give_version = get_option('give_version');
 
-	if ( ! $give_version ) {
+	if ( ! $give_version) {
 		// 1.0 is the first version to use this option so we must add it
 		$give_version = '1.0';
 	}
 
-	$give_version = preg_replace( '/[^0-9.].*/', '', $give_version );
+	$give_version = preg_replace('/[^0-9.].*/', '', $give_version);
 
 	//v1.5.2 Upgrades
-	if ( version_compare( $give_version, '1.5.2', '<' ) || ! give_has_upgrade_completed( 'upgrade_give_user_caps_cleanup' ) ) {
+	if (version_compare($give_version, '1.5.2', '<') || ! give_has_upgrade_completed('upgrade_give_user_caps_cleanup')) {
 
 		//Delete all caps with "ss"
 		//Also delete all unused "campaign" roles
@@ -328,9 +328,9 @@ 
 		);
 	
 		global $wp_roles;
-		foreach ( $delete_caps as $cap ) {
-			foreach ( array_keys( $wp_roles->roles ) as $role ) {
-				$wp_roles->remove_cap( $role, $cap );
+		foreach ($delete_caps as $cap) {
+			foreach (array_keys($wp_roles->roles) as $role) {
+				$wp_roles->remove_cap($role, $cap);
 			}
 		}
 	
@@ -340,12 +340,12 @@ 
 		$roles->add_caps();
 		
 		//The Update Ran
-		update_option( 'give_version', preg_replace( '/[^0-9.].*/', '', GIVE_VERSION ) );
-		give_set_upgrade_complete( 'upgrade_give_user_caps_cleanup' );
-		delete_option( 'give_doing_upgrade' );
+		update_option('give_version', preg_replace('/[^0-9.].*/', '', GIVE_VERSION));
+		give_set_upgrade_complete('upgrade_give_user_caps_cleanup');
+		delete_option('give_doing_upgrade');
 
 	}
 
 }
 
-add_action( 'admin_init', 'give_v152_cleanup_users' );
\ No newline at end of file
+add_action('admin_init', 'give_v152_cleanup_users');
\ No newline at end of file

includes/admin/upgrades/upgrades.php

Spacing +17 added lines, -17 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -21,12 +21,12 @@ 
  * @return void
  */
 function give_upgrades_screen() {
-	$action = isset( $_GET['give-upgrade'] ) ? sanitize_text_field( $_GET['give-upgrade'] ) : '';
-	$step   = isset( $_GET['step'] ) ? absint( $_GET['step'] ) : 1;
-	$total  = isset( $_GET['total'] ) ? absint( $_GET['total'] ) : false;
-	$custom = isset( $_GET['custom'] ) ? absint( $_GET['custom'] ) : 0;
-	$number = isset( $_GET['number'] ) ? absint( $_GET['number'] ) : 100;
-	$steps  = round( ( $total / $number ), 0 );
+	$action = isset($_GET['give-upgrade']) ? sanitize_text_field($_GET['give-upgrade']) : '';
+	$step   = isset($_GET['step']) ? absint($_GET['step']) : 1;
+	$total  = isset($_GET['total']) ? absint($_GET['total']) : false;
+	$custom = isset($_GET['custom']) ? absint($_GET['custom']) : 0;
+	$number = isset($_GET['number']) ? absint($_GET['number']) : 100;
+	$steps  = round(($total / $number), 0);
 
 	$doing_upgrade_args = array(
 		'page'         => 'give-upgrades',
@@ -36,25 +36,25 @@ 
 		'custom'       => $custom,
 		'steps'        => $steps
 	);
-	update_option( 'give_doing_upgrade', $doing_upgrade_args );
-	if ( $step > $steps ) {
+	update_option('give_doing_upgrade', $doing_upgrade_args);
+	if ($step > $steps) {
 		// Prevent a weird case where the estimate was off. Usually only a couple.
 		$steps = $step;
 	}
 	?>
 	<div class="wrap">
-		<h2><?php esc_html_e( 'Give - Upgrades', 'give' ); ?></h2>
+		<h2><?php esc_html_e('Give - Upgrades', 'give'); ?></h2>
 
-		<?php if ( ! empty( $action ) ) : ?>
+		<?php if ( ! empty($action)) : ?>
 
 			<div id="give-upgrade-status">
-				<p style="font-size: 20px;max-width: 900px;"><?php esc_html_e( 'The upgrade process has started, please be patient and do not close this window or navigate away from this page. This could take several minutes depending on the upgrade and the size of your website. You will be automatically redirected when the upgrade is finished.', 'give' ); ?>
-					<img src="<?php echo GIVE_PLUGIN_URL . '/assets/images/spinner.gif'; ?>" id="give-upgrade-loader" style="  position: relative; top: 3px; left: 6px;" />
+				<p style="font-size: 20px;max-width: 900px;"><?php esc_html_e('The upgrade process has started, please be patient and do not close this window or navigate away from this page. This could take several minutes depending on the upgrade and the size of your website. You will be automatically redirected when the upgrade is finished.', 'give'); ?>
+					<img src="<?php echo GIVE_PLUGIN_URL.'/assets/images/spinner.gif'; ?>" id="give-upgrade-loader" style="  position: relative; top: 3px; left: 6px;" />
 				</p>
 
-				<?php if ( ! empty( $total ) ) : ?>
+				<?php if ( ! empty($total)) : ?>
 					<p>
-						<strong><?php printf( esc_html__( 'Step %d of approximately %d running', 'give' ), $step, $steps ); ?></strong>
+						<strong><?php printf(esc_html__('Step %d of approximately %d running', 'give'), $step, $steps); ?></strong>
 					</p>
 				<?php endif; ?>
 			</div>
@@ -68,8 +68,8 @@ 
 
 			<div id="give-upgrade-status">
 				<p style="font-size: 20px;max-width: 900px;">
-					<?php esc_html_e( 'The upgrade process has started, please be patient and do not close this window or navigate away from this page. This could take several minutes depending on the upgrade and the size of your website. You will be automatically redirected when the upgrade is finished.', 'give' ); ?>
-					<img src="<?php echo GIVE_PLUGIN_URL . '/assets/images/spinner.gif'; ?>" id="give-upgrade-loader" style="  position: relative; top: 3px; left: 6px;" />
+					<?php esc_html_e('The upgrade process has started, please be patient and do not close this window or navigate away from this page. This could take several minutes depending on the upgrade and the size of your website. You will be automatically redirected when the upgrade is finished.', 'give'); ?>
+					<img src="<?php echo GIVE_PLUGIN_URL.'/assets/images/spinner.gif'; ?>" id="give-upgrade-loader" style="  position: relative; top: 3px; left: 6px;" />
 				</p>
 			</div>
 			<script type="text/javascript">