WordImpress / Give

includes/admin/welcome.php

Spacing +104 added lines, -104 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'));
 	}
 
 	/**
@@ -51,38 +51,38 @@ 
 	public function admin_menus() {
 		// About Page
 		add_dashboard_page(
-			__( 'Welcome to Give', 'give' ),
-			__( 'Welcome to Give', 'give' ),
+			__('Welcome to Give', 'give'),
+			__('Welcome to Give', 'give'),
 			$this->minimum_capability,
 			'give-about',
-			array( $this, 'about_screen' )
+			array($this, 'about_screen')
 		);
 
 		// Changelog Page
 		add_dashboard_page(
-			__( 'Give Changelog', 'give' ),
-			__( 'Give Changelog', 'give' ),
+			__('Give Changelog', 'give'),
+			__('Give Changelog', 'give'),
 			$this->minimum_capability,
 			'give-changelog',
-			array( $this, 'changelog_screen' )
+			array($this, 'changelog_screen')
 		);
 
 		// Getting Started Page
 		add_dashboard_page(
-			__( 'Getting started with Give', 'give' ),
-			__( 'Getting started with Give', 'give' ),
+			__('Getting started with Give', 'give'),
+			__('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(
-			__( 'The people that build Give', 'give' ),
-			__( 'The people that build Give', 'give' ),
+			__('The people that build Give', 'give'),
+			__('The people that build Give', 'give'),
 			$this->minimum_capability,
 			'give-credits',
-			array( $this, 'credits_screen' )
+			array($this, 'credits_screen')
 		);
 	}
 
@@ -95,13 +95,13 @@ 
 	 */
 	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');
 
 		// Badge for welcome page
-		$badge_url = GIVE_PLUGIN_URL . 'assets/images/give-badge.png';
+		$badge_url = GIVE_PLUGIN_URL.'assets/images/give-badge.png';
 
 		?>
 		<style type="text/css" media="screen">
@@ -215,20 +215,20 @@ 
 	 * @return void
 	 */
 	public function tabs() {
-		$selected = isset( $_GET['page'] ) ? $_GET['page'] : 'give-about';
+		$selected = isset($_GET['page']) ? $_GET['page'] : 'give-about';
 		?>
 		<h1 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 _e( "About Give", 'give' ); ?>
+			<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 _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 _e( 'Getting Started', 'give' ); ?>
+			<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 _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 _e( 'Credits', 'give' ); ?>
+			<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 _e('Credits', 'give'); ?>
 			</a>
-			<a class="nav-tab <?php echo $selected == 'give-add-ons' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( null, 'index.php' ) ) . 'edit.php?post_type=give_forms&page=give-addons'; ?>">
-				<?php _e( 'Add-ons', 'give' ); ?>
+			<a class="nav-tab <?php echo $selected == 'give-add-ons' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url(admin_url(null, 'index.php')).'edit.php?post_type=give_forms&page=give-addons'; ?>">
+				<?php _e('Add-ons', 'give'); ?>
 			</a>
 		</h1>
 	<?php
@@ -242,20 +242,20 @@ 
 	 * @return void
 	 */
 	public function about_screen() {
-		list( $display_version ) = explode( '-', GIVE_VERSION );
+		list($display_version) = explode('-', GIVE_VERSION);
 		?>
 		<div class="wrap about-wrap">
-			<h1 class="welcome-h1"><?php printf( __( 'Welcome to Give %s', 'give' ), $display_version ); ?></h1>
+			<h1 class="welcome-h1"><?php printf(__('Welcome to Give %s', 'give'), $display_version); ?></h1>
 
 			<?php give_social_media_elements() ?>
 
-			<div class="about-text"><?php printf( __( '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. </You>We encourage you to check out the <a href="%s" title="View the Give plugin documentation online" target="_blank">plugin documentation</a> and getting started guide below.', 'give' ), 'https://givewp.com/documenation/' ); ?></div>
+			<div class="about-text"><?php printf(__('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. </You>We encourage you to check out the <a href="%s" title="View the Give plugin documentation online" target="_blank">plugin documentation</a> and getting started guide below.', 'give'), 'https://givewp.com/documenation/'); ?></div>
 
-			<p class="newsletter-intro"><?php _e( 'Be sure to sign up for the Give newsletter below to stay informed of important updates and news.', 'give' ); ?></p>
+			<p class="newsletter-intro"><?php _e('Be sure to sign up for the Give newsletter below to stay informed of important updates and news.', 'give'); ?></p>
 
 			<?php give_get_newsletter() ?>
 
-			<div class="give-badge"><?php printf( __( 'Version %s', 'give' ), $display_version ); ?></div>
+			<div class="give-badge"><?php printf(__('Version %s', 'give'), $display_version); ?></div>
 
 
 
@@ -264,15 +264,15 @@ 
 			<div class="feature-section clearfix introduction">
 
 				<div class="video feature-section-item">
-					<img src="<?php echo GIVE_PLUGIN_URL . '/assets/images/give-form-mockup.png' ?>" title="A Give donation form" alt="A Give donation form">
+					<img src="<?php echo GIVE_PLUGIN_URL.'/assets/images/give-form-mockup.png' ?>" title="A Give donation form" alt="A Give donation form">
 
 				</div>
 
 				<div class="content feature-section-item last-feature">
 
-					<h3><?php _e( 'Give - Democratizing Generosity', 'give' ); ?></h3>
+					<h3><?php _e('Give - Democratizing Generosity', 'give'); ?></h3>
 
-					<p><?php _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 _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" title="Visit the Give Website">Learn More
 						<span class="dashicons dashicons-external"></span></a>
 
@@ -285,9 +285,9 @@ 
 
 				<div class="content feature-section-item">
 
-					<h3><?php _e( 'Getting to Know Give', 'give' ); ?></h3>
+					<h3><?php _e('Getting to Know Give', 'give'); ?></h3>
 
-					<p><?php _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 an 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 _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 an 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>
 					<a href="https://givewp.com/documentation" target="_blank" class="button-secondary" title="Visit the Give Website">View Documentation
 						<span class="dashicons dashicons-external"></span></a>
 
@@ -295,7 +295,7 @@ 
 
 				<div class="content  feature-section-item last-feature">
 
-					<img src="<?php echo GIVE_PLUGIN_URL . '/assets/images/give-logo-photo-mashup.png' ?>" title="Give" alt="Give">
+					<img src="<?php echo GIVE_PLUGIN_URL.'/assets/images/give-logo-photo-mashup.png' ?>" title="Give" alt="Give">
 
 				</div>
 
@@ -315,18 +315,18 @@ 
 	 * @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 _e( 'Give Changelog', 'give' ); ?></h1>
+			<h1><?php _e('Give Changelog', 'give'); ?></h1>
 
-			<div class="about-text"><?php printf( __( 'Thank you for updating to the latest version! Give %s is ready to make your online store faster, safer, and better!', 'give' ), $display_version ); ?></div>
-			<div class="give-badge"><?php printf( __( 'Version %s', 'give' ), $display_version ); ?></div>
+			<div class="about-text"><?php printf(__('Thank you for updating to the latest version! Give %s is ready to make your online store faster, safer, and better!', 'give'), $display_version); ?></div>
+			<div class="give-badge"><?php printf(__('Version %s', 'give'), $display_version); ?></div>
 
 			<?php $this->tabs(); ?>
 
 			<div class="changelog">
-				<h3><?php _e( 'Full Changelog', 'give' ); ?></h3>
+				<h3><?php _e('Full Changelog', 'give'); ?></h3>
 
 				<div class="feature-section">
 					<?php echo $this->parse_readme(); ?>
@@ -334,10 +334,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 _e( 'Go to Give Settings', 'give' ); ?></a>
+				), 'edit.php'))); ?>"><?php _e('Go to Give Settings', 'give'); ?></a>
 			</div>
 		</div>
 	<?php
@@ -351,35 +351,35 @@ 
 	 * @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">
-			<h1 class="welcome-h1"><?php printf( __( 'Give %s - Getting Started Guide', 'give' ), $display_version ); ?></h1>
+			<h1 class="welcome-h1"><?php printf(__('Give %s - Getting Started Guide', 'give'), $display_version); ?></h1>
 
 			<?php give_social_media_elements() ?>
 
-			<div class="about-text"><?php _e( 'Welcome to the getting started guide.', 'give' ); ?></div>
+			<div class="about-text"><?php _e('Welcome to the getting started guide.', 'give'); ?></div>
 
-			<p class="newsletter-intro"><?php _e( 'Don\'t forget to sign up for the newsletter!', 'give' ); ?>.</p>
+			<p class="newsletter-intro"><?php _e('Don\'t forget to sign up for the newsletter!', 'give'); ?>.</p>
 
 			<?php give_get_newsletter() ?>
 
-			<div class="give-badge"><?php printf( __( 'Version %s', 'give' ), $display_version ); ?></div>
+			<div class="give-badge"><?php printf(__('Version %s', 'give'), $display_version); ?></div>
 
 			<?php $this->tabs(); ?>
 
 
-			<div class="about-text"><?php printf( __( '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 ); ?></div>
+			<div class="about-text"><?php printf(__('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); ?></div>
 
 
 			<div class="feature-section clearfix">
 
 				<div class="content feature-section-item">
-					<h3><?php _e( 'STEP 1: Create a New Form', 'give' ); ?></h3>
+					<h3><?php _e('STEP 1: Create a New Form', 'give'); ?></h3>
 
-					<p><?php _e( 'Give is driven by it\'s powerful form building features. But it is not simply a "form". From the "Add New Form" page you\'ll be able to choose how and where you want to receive your donations. You\'ll be able to set the donation amounts. You even get to choose whether you want to create a whole page for your form, or embed it on a different page of your site.', 'give' ); ?></p>
+					<p><?php _e('Give is driven by it\'s powerful form building features. But it is not simply a "form". From the "Add New Form" page you\'ll be able to choose how and where you want to receive your donations. You\'ll be able to set the donation amounts. You even get to choose whether you want to create a whole page for your form, or embed it on a different page of your site.', 'give'); ?></p>
 
-					<p><?php _e( 'But all of these features begin simply by going to the menu and choosing "Add New Form."', 'give' ); ?></p>
+					<p><?php _e('But all of these features begin simply by going to the menu and choosing "Add New Form."', 'give'); ?></p>
 				</div>
 
 				<div class="content feature-section-item last-feature">
@@ -396,9 +396,9 @@ 
 				</div>
 
 				<div class="content feature-section-item last-feature">
-					<h3><?php _e( 'STEP 2: Choose Your Levels', 'give' ); ?></h3>
+					<h3><?php _e('STEP 2: Choose Your Levels', 'give'); ?></h3>
 
-					<p><?php _e( 'Each Form can be set to receive either a pre-determined amount or have multiple suggested levels of giving. Choosing "Multi-level Donation" opens up the levels section where you can add as many levels as you like with your own custom names and amounts.', 'give' ); ?></p>
+					<p><?php _e('Each Form can be set to receive either a pre-determined amount or have multiple suggested levels of giving. Choosing "Multi-level Donation" opens up the levels section where you can add as many levels as you like with your own custom names and amounts.', 'give'); ?></p>
 				</div>
 
 			</div>
@@ -407,11 +407,11 @@ 
 			<div class="feature-section clearfix">
 
 				<div class="content feature-section-item add-content">
-					<h3><?php _e( 'STEP 3: Landing Page or Shortcode Mode?', 'give' ); ?></h3>
+					<h3><?php _e('STEP 3: Landing Page or Shortcode Mode?', 'give'); ?></h3>
 
-					<p><?php _e( 'Every form you create in Give can either become it\'s own stand-alone page, or it can be inserted into any other page or post throughout your site as a Shortcode.', 'give' ); ?></p>
+					<p><?php _e('Every form you create in Give can either become it\'s own stand-alone page, or it can be inserted into any other page or post throughout your site as a Shortcode.', 'give'); ?></p>
 
-					<p><?php _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 _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">
@@ -428,9 +428,9 @@ 
 				</div>
 
 				<div class="content feature-section-item last-feature">
-					<h3><?php _e( 'STEP 4: Configure Your Display Options', 'give' ); ?></h3>
+					<h3><?php _e('STEP 4: Configure Your Display Options', 'give'); ?></h3>
 
-					<p><?php _e( 'Lastly, you can present the form in a lot of different ways. With the "Display Options" section you can configure how the credit card field appears, the submit button text, which Gateway you want to use, whether Guests (non-logged in users) can donate or not, and a log-in form.', 'give' ); ?></p>
+					<p><?php _e('Lastly, you can present the form in a lot of different ways. With the "Display Options" section you can configure how the credit card field appears, the submit button text, which Gateway you want to use, whether Guests (non-logged in users) can donate or not, and a log-in form.', 'give'); ?></p>
 				</div>
 
 
@@ -450,26 +450,26 @@ 
 	 * @return void
 	 */
 	public function credits_screen() {
-		list( $display_version ) = explode( '-', GIVE_VERSION );
+		list($display_version) = explode('-', GIVE_VERSION);
 		?>
 		<div class="wrap about-wrap">
-			<h1 class="welcome-h1"><?php printf( __( 'Give %s - Credits', 'give' ), $display_version ); ?></h1>
+			<h1 class="welcome-h1"><?php printf(__('Give %s - Credits', 'give'), $display_version); ?></h1>
 
 			<?php give_social_media_elements() ?>
 
-			<div class="about-text"><?php printf( __( 'Thanks to all those who have contributed code directly or indirectly. ', 'give' ), $display_version ); ?></div>
+			<div class="about-text"><?php printf(__('Thanks to all those who have contributed code directly or indirectly. ', 'give'), $display_version); ?></div>
 
-			<div class="about-text"><?php _e( 'Welcome to the getting started guide.', 'give' ); ?></div>
+			<div class="about-text"><?php _e('Welcome to the getting started guide.', 'give'); ?></div>
 
 			<p class="newsletter-intro">Be sure to sign up for the Give newsletter below to stay informed of important updates and news.</p>
 
 			<?php give_get_newsletter() ?>
 
-			<div class="give-badge"><?php printf( __( 'Version %s', 'give' ), $display_version ); ?></div>
+			<div class="give-badge"><?php printf(__('Version %s', 'give'), $display_version); ?></div>
 
 			<?php $this->tabs(); ?>
 
-			<p class="about-description"><?php _e( 'Give is created by a dedicated team of developers. If you are interested in contributing please visit the <a href="https://github.com/WordImpress/give" target="_blank">GitHub Repo</a>.', 'give' ); ?></p>
+			<p class="about-description"><?php _e('Give is created by a dedicated team of developers. If you are interested in contributing please visit the <a href="https://github.com/WordImpress/give" target="_blank">GitHub Repo</a>.', 'give'); ?></p>
 
 			<?php echo $this->contributors(); ?>
 		</div>
@@ -484,21 +484,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>' . __( 'No valid changlog was found.', 'give' ) . '</p>';
+		if ( ! $file) {
+			$readme = '<p>'.__('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;
@@ -515,21 +515,21 @@ 
 	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="%s" title="%s">',
-				esc_url( 'https://github.com/' . $contributor->login ),
-				esc_html( sprintf( __( 'View %s', 'give' ), $contributor->login ) )
+			$contributor_list .= sprintf('<a href="%s" title="%s">',
+				esc_url('https://github.com/'.$contributor->login),
+				esc_html(sprintf(__('View %s', 'give'), $contributor->login))
 			);
-			$contributor_list .= sprintf( '<img src="%s" width="64" height="64" class="gravatar" alt="%s" />', esc_url( $contributor->avatar_url ), esc_html( $contributor->login ) );
+			$contributor_list .= sprintf('<img src="%s" width="64" height="64" class="gravatar" alt="%s" />', esc_url($contributor->avatar_url), esc_html($contributor->login));
 			$contributor_list .= '</a>';
-			$contributor_list .= sprintf( '<a class="web" href="%s">%s</a>', esc_url( 'https://github.com/' . $contributor->login ), esc_html( $contributor->login ) );
+			$contributor_list .= sprintf('<a class="web" href="%s">%s</a>', esc_url('https://github.com/'.$contributor->login), esc_html($contributor->login));
 			$contributor_list .= '</a>';
 			$contributor_list .= '</li>';
 		}
@@ -547,25 +547,25 @@ 
 	 * @return array $contributors List of contributors
 	 */
 	public function get_contributors() {
-		$contributors = get_transient( 'give_contributors' );
+		$contributors = get_transient('give_contributors');
 
-		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();
 		}
 
-		set_transient( 'give_contributors', $contributors, 3600 );
+		set_transient('give_contributors', $contributors, 3600);
 
 		return $contributors;
 	}
@@ -584,24 +584,24 @@ 
 
 
 		// Bail if no activation redirect
-		if ( ! get_transient( '_give_activation_redirect' ) ) {
+		if ( ! get_transient('_give_activation_redirect')) {
 			return;
 		}
 
 		// Delete the redirect transient
-		delete_transient( '_give_activation_redirect' );
+		delete_transient('_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( isset( $give_options['disable_welcome'] ) ) { // Welcome is disabled in settings
+		} elseif (isset($give_options['disable_welcome'])) { // Welcome is disabled in settings
 
 		} else { // Welcome is NOT disabled in settings
 			wp_safe_redirect(admin_url('index.php?page=give-about'));

includes/class-give-cron.php

Spacing +9 added lines, -9 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -29,8 +29,8 @@ 
 	 * @see   Give_Cron::weekly_events()
 	 */
 	public function __construct() {
-		add_filter( 'cron_schedules', array( $this, 'add_schedules' ) );
-		add_action( 'wp', array( $this, 'schedule_Events' ) );
+		add_filter('cron_schedules', array($this, 'add_schedules'));
+		add_action('wp', array($this, 'schedule_Events'));
 	}
 
 	/**
@@ -42,11 +42,11 @@ 
 	 *
 	 * @return array
 	 */
-	public function add_schedules( $schedules = array() ) {
+	public function add_schedules($schedules = array()) {
 		// Adds once weekly to the existing schedules.
 		$schedules['weekly'] = array(
 			'interval' => 604800,
-			'display'  => __( 'Once Weekly', 'easy-digital-downloads' )
+			'display'  => __('Once Weekly', 'easy-digital-downloads')
 		);
 
 		return $schedules;
@@ -72,8 +72,8 @@ 
 	 * @return void
 	 */
 	private function weekly_events() {
-		if ( ! wp_next_scheduled( 'give_weekly_scheduled_events' ) ) {
-			wp_schedule_event( current_time( 'timestamp' ), 'weekly', 'give_weekly_scheduled_events' );
+		if ( ! wp_next_scheduled('give_weekly_scheduled_events')) {
+			wp_schedule_event(current_time('timestamp'), 'weekly', 'give_weekly_scheduled_events');
 		}
 	}
 
@@ -85,8 +85,8 @@ 
 	 * @return void
 	 */
 	private function daily_events() {
-		if ( ! wp_next_scheduled( 'give_daily_scheduled_events' ) ) {
-			wp_schedule_event( current_time( 'timestamp' ), 'daily', 'give_daily_scheduled_events' );
+		if ( ! wp_next_scheduled('give_daily_scheduled_events')) {
+			wp_schedule_event(current_time('timestamp'), 'daily', 'give_daily_scheduled_events');
 		}
 	}
 

includes/admin/reporting/reports.php

Spacing +102 added lines, -102 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -32,32 +32,32 @@ 
 function give_reports_page() {
 	global $give_options;
 
-	$current_page = admin_url( 'edit.php?post_type=give_forms&page=give-reports' );
-	$active_tab   = isset( $_GET['tab'] ) ? $_GET['tab'] : 'reports';
+	$current_page = admin_url('edit.php?post_type=give_forms&page=give-reports');
+	$active_tab   = isset($_GET['tab']) ? $_GET['tab'] : 'reports';
 	?>
 	<div class="wrap">
 		<h1 class="nav-tab-wrapper">
-			<a href="<?php echo esc_url( add_query_arg( array(
+			<a href="<?php echo esc_url(add_query_arg(array(
 				'tab'              => 'reports',
 				'settings-updated' => false
-			), $current_page ) ); ?>" class="nav-tab <?php echo $active_tab == 'reports' ? 'nav-tab-active' : ''; ?>"><?php _e( 'Reports', 'give' ); ?></a>
-			<?php if ( current_user_can( 'export_give_reports' ) ) { ?>
-				<a href="<?php echo esc_url( add_query_arg( array(
+			), $current_page)); ?>" class="nav-tab <?php echo $active_tab == 'reports' ? 'nav-tab-active' : ''; ?>"><?php _e('Reports', 'give'); ?></a>
+			<?php if (current_user_can('export_give_reports')) { ?>
+				<a href="<?php echo esc_url(add_query_arg(array(
 					'tab'              => 'export',
 					'settings-updated' => false
-				), $current_page ) ); ?>" class="nav-tab <?php echo $active_tab == 'export' ? 'nav-tab-active' : ''; ?>"><?php _e( 'Export', 'give' ); ?></a>
+				), $current_page)); ?>" class="nav-tab <?php echo $active_tab == 'export' ? 'nav-tab-active' : ''; ?>"><?php _e('Export', 'give'); ?></a>
 			<?php } ?>
-			<a href="<?php echo esc_url( add_query_arg( array(
+			<a href="<?php echo esc_url(add_query_arg(array(
 				'tab'              => 'logs',
 				'settings-updated' => false
-			), $current_page ) ); ?>" class="nav-tab <?php echo $active_tab == 'logs' ? 'nav-tab-active' : ''; ?>"><?php _e( 'Logs', 'give' ); ?></a>
-			<?php do_action( 'give_reports_tabs' ); ?>
+			), $current_page)); ?>" class="nav-tab <?php echo $active_tab == 'logs' ? 'nav-tab-active' : ''; ?>"><?php _e('Logs', 'give'); ?></a>
+			<?php do_action('give_reports_tabs'); ?>
 		</h1>
 
 		<?php
-		do_action( 'give_reports_page_top' );
-		do_action( 'give_reports_tab_' . $active_tab );
-		do_action( 'give_reports_page_bottom' );
+		do_action('give_reports_page_top');
+		do_action('give_reports_tab_'.$active_tab);
+		do_action('give_reports_page_bottom');
 		?>
 	</div><!-- .wrap -->
 	<?php
@@ -71,13 +71,13 @@ 
  */
 function give_reports_default_views() {
 	$views = array(
-		'earnings' => __( 'Income', 'give' ),
+		'earnings' => __('Income', 'give'),
 		'forms'    => give_get_forms_label_plural(),
-		'donors'   => __( 'Donors', 'give' ),
-		'gateways' => __( 'Payment Methods', 'give' )
+		'donors'   => __('Donors', 'give'),
+		'gateways' => __('Payment Methods', 'give')
 	);
 
-	$views = apply_filters( 'give_report_views', $views );
+	$views = apply_filters('give_report_views', $views);
 
 	return $views;
 }
@@ -93,15 +93,15 @@ 
  * @return string $view Report View
  *
  */
-function give_get_reporting_view( $default = 'earnings' ) {
+function give_get_reporting_view($default = 'earnings') {
 
-	if ( ! isset( $_GET['view'] ) || ! in_array( $_GET['view'], array_keys( give_reports_default_views() ) ) ) {
+	if ( ! isset($_GET['view']) || ! in_array($_GET['view'], array_keys(give_reports_default_views()))) {
 		$view = $default;
 	} else {
 		$view = $_GET['view'];
 	}
 
-	return apply_filters( 'give_get_reporting_view', $view );
+	return apply_filters('give_get_reporting_view', $view);
 }
 
 /**
@@ -114,14 +114,14 @@ 
 	$current_view = 'earnings';
 	$views        = give_reports_default_views();
 
-	if ( isset( $_GET['view'] ) && array_key_exists( $_GET['view'], $views ) ) {
+	if (isset($_GET['view']) && array_key_exists($_GET['view'], $views)) {
 		$current_view = $_GET['view'];
 	}
 
-	do_action( 'give_reports_view_' . $current_view );
+	do_action('give_reports_view_'.$current_view);
 }
 
-add_action( 'give_reports_tab_reports', 'give_reports_tab_reports' );
+add_action('give_reports_tab_reports', 'give_reports_tab_reports');
 
 /**
  * Renders the Reports Page Views Drop Downs
@@ -131,25 +131,25 @@ 
  */
 function give_report_views() {
 	$views        = give_reports_default_views();
-	$current_view = isset( $_GET['view'] ) ? $_GET['view'] : 'earnings';
-	do_action( 'give_report_view_actions_before' );
+	$current_view = isset($_GET['view']) ? $_GET['view'] : 'earnings';
+	do_action('give_report_view_actions_before');
 	?>
 	<form id="give-reports-filter" method="get">
 		<select id="give-reports-view" name="view">
-			<option value="-1"><?php _e( 'Report Type', 'give' ); ?></option>
-			<?php foreach ( $views as $view_id => $label ) : ?>
-				<option value="<?php echo esc_attr( $view_id ); ?>" <?php selected( $view_id, $current_view ); ?>><?php echo $label; ?></option>
+			<option value="-1"><?php _e('Report Type', 'give'); ?></option>
+			<?php foreach ($views as $view_id => $label) : ?>
+				<option value="<?php echo esc_attr($view_id); ?>" <?php selected($view_id, $current_view); ?>><?php echo $label; ?></option>
 			<?php endforeach; ?>
 		</select>
 
-		<?php do_action( 'give_report_view_actions' ); ?>
+		<?php do_action('give_report_view_actions'); ?>
 
 		<input type="hidden" name="post_type" value="give_forms" />
 		<input type="hidden" name="page" value="give-reports" />
-		<?php submit_button( __( 'Show', 'give' ), 'secondary', 'submit', false ); ?>
+		<?php submit_button(__('Show', 'give'), 'secondary', 'submit', false); ?>
 	</form>
 	<?php
-	do_action( 'give_report_view_actions_after' );
+	do_action('give_report_view_actions_after');
 }
 
 /**
@@ -162,18 +162,18 @@ 
  */
 function give_reports_forms_table() {
 
-	if ( isset( $_GET['form-id'] ) ) {
+	if (isset($_GET['form-id'])) {
 		return;
 	}
 
-	include( dirname( __FILE__ ) . '/class-form-reports-table.php' );
+	include(dirname(__FILE__).'/class-form-reports-table.php');
 
 	$give_table = new Give_Form_Reports_Table();
 	$give_table->prepare_items();
 	$give_table->display();
 }
 
-add_action( 'give_reports_view_forms', 'give_reports_forms_table' );
+add_action('give_reports_view_forms', 'give_reports_forms_table');
 
 /**
  * Renders the detailed report for a specific give form
@@ -182,7 +182,7 @@ 
  * @return void
  */
 function give_reports_form_details() {
-	if ( ! isset( $_GET['form-id'] ) ) {
+	if ( ! isset($_GET['form-id'])) {
 		return;
 	}
 	?>
@@ -190,14 +190,14 @@ 
 		<div class="actions bulkactions">
 			<?php give_report_views(); ?>
 			&nbsp;
-			<button onclick="history.go(-1);" class="button-secondary"><?php _e( 'Go Back', 'give' ); ?></button>
+			<button onclick="history.go(-1);" class="button-secondary"><?php _e('Go Back', 'give'); ?></button>
 		</div>
 	</div>
 	<?php
-	give_reports_graph_of_form( absint( $_GET['form-id'] ) );
+	give_reports_graph_of_form(absint($_GET['form-id']));
 }
 
-add_action( 'give_reports_view_forms', 'give_reports_form_details' );
+add_action('give_reports_view_forms', 'give_reports_form_details');
 
 /**
  * Renders the Reports Donors Table
@@ -208,28 +208,28 @@ 
  * @return void
  */
 function give_reports_donors_table() {
-	include( dirname( __FILE__ ) . '/class-donor-reports-table.php' );
+	include(dirname(__FILE__).'/class-donor-reports-table.php');
 
 	$give_table = new Give_Donor_Reports_Table();
 	$give_table->prepare_items();
 	?>
 	<div class="wrap give-reports-donors-wrap">
-		<?php do_action( 'give_logs_donors_table_top' ); ?>
-		<form id="give-donors-filter" method="get" action="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-reports&view=donors' ); ?>">
+		<?php do_action('give_logs_donors_table_top'); ?>
+		<form id="give-donors-filter" method="get" action="<?php echo admin_url('edit.php?post_type=give_forms&page=give-reports&view=donors'); ?>">
 			<?php
-			$give_table->search_box( __( 'Search', 'give' ), 'give-donors' );
+			$give_table->search_box(__('Search', 'give'), 'give-donors');
 			$give_table->display();
 			?>
 			<input type="hidden" name="post_type" value="give_forms" />
 			<input type="hidden" name="page" value="give-reports" />
 			<input type="hidden" name="view" value="donors" />
 		</form>
-		<?php do_action( 'give_logs_donors_table_bottom' ); ?>
+		<?php do_action('give_logs_donors_table_bottom'); ?>
 	</div>
 	<?php
 }
 
-add_action( 'give_reports_view_donors', 'give_reports_donors_table' );
+add_action('give_reports_view_donors', 'give_reports_donors_table');
 
 
 /**
@@ -241,14 +241,14 @@ 
  * @return void
  */
 function give_reports_gateways_table() {
-	include( dirname( __FILE__ ) . '/class-gateways-reports-table.php' );
+	include(dirname(__FILE__).'/class-gateways-reports-table.php');
 
 	$give_table = new Give_Gateawy_Reports_Table();
 	$give_table->prepare_items();
 	$give_table->display();
 }
 
-add_action( 'give_reports_view_gateways', 'give_reports_gateways_table' );
+add_action('give_reports_view_gateways', 'give_reports_gateways_table');
 
 
 /**
@@ -260,7 +260,7 @@ 
 function give_reports_earnings() {
 	?>
 	<div class="tablenav top reports-table-nav">
-		<h3 class="alignleft reports-earnings-title"><span><?php _e( 'Income Over Time', 'give' ); ?></span></h3>
+		<h3 class="alignleft reports-earnings-title"><span><?php _e('Income Over Time', 'give'); ?></span></h3>
 
 		<div class="alignright actions reports-views-wrap"><?php give_report_views(); ?></div>
 	</div>
@@ -268,7 +268,7 @@ 
 	give_reports_graph();
 }
 
-add_action( 'give_reports_view_earnings', 'give_reports_earnings' );
+add_action('give_reports_view_earnings', 'give_reports_earnings');
 
 
 /**
@@ -283,51 +283,51 @@ 
 		<div id="post-body">
 			<div id="post-body-content">
 
-				<?php do_action( 'give_reports_tab_export_content_top' ); ?>
+				<?php do_action('give_reports_tab_export_content_top'); ?>
 
 
 				<table class="widefat export-options-table give-table">
 					<thead>
 					<tr>
-						<th class="row-title"><?php _e( 'Export Type', 'give' ); ?></th>
-						<th><?php _e( 'Export Options', 'give' ); ?></th>
+						<th class="row-title"><?php _e('Export Type', 'give'); ?></th>
+						<th><?php _e('Export Options', 'give'); ?></th>
 					</tr>
 					</thead>
 					<tbody>
-					<?php do_action( 'give_reports_tab_export_table_top' ); ?>
+					<?php do_action('give_reports_tab_export_table_top'); ?>
 					<tr class="give-export-pdf-sales-earnings">
 						<td class="row-title">
-							<h3><span><?php _e( 'Export PDF of Donations and Income', 'give' ); ?></span></h3>
+							<h3><span><?php _e('Export PDF of Donations and Income', 'give'); ?></span></h3>
 
-							<p><?php _e( 'Download a PDF of Donations and Income reports for all forms for the current year.', 'give' ); ?></p>
+							<p><?php _e('Download a PDF of Donations and Income reports for all forms for the current year.', 'give'); ?></p>
 						</td>
 						<td>
-							<a class="button" href="<?php echo wp_nonce_url( add_query_arg( array( 'give-action' => 'generate_pdf' ) ), 'give_generate_pdf' ); ?>"><?php _e( 'Generate PDF', 'give' ); ?></a>
+							<a class="button" href="<?php echo wp_nonce_url(add_query_arg(array('give-action' => 'generate_pdf')), 'give_generate_pdf'); ?>"><?php _e('Generate PDF', 'give'); ?></a>
 						</td>
 					</tr>
 					<tr class="alternate give-export-sales-earnings">
 						<td class="row-title">
-							<h3><span><?php _e( 'Export Income and Donation Stats', 'give' ); ?></span></h3>
+							<h3><span><?php _e('Export Income and Donation Stats', 'give'); ?></span></h3>
 
-							<p><?php _e( 'Download a CSV of income and donations over time.', 'give' ); ?></p>
+							<p><?php _e('Download a CSV of income and donations over time.', 'give'); ?></p>
 						</td>
 						<td>
 							<form method="post">
-								<?php echo Give()->html->year_dropdown( 'start_year' ); ?>
-								<?php echo Give()->html->month_dropdown( 'start_month' ); ?>
-								<?php echo _x( 'to', 'Date one to date two', 'give' ); ?>
-								<?php echo Give()->html->year_dropdown( 'end_year' ); ?>
-								<?php echo Give()->html->month_dropdown( 'end_month' ); ?>
+								<?php echo Give()->html->year_dropdown('start_year'); ?>
+								<?php echo Give()->html->month_dropdown('start_month'); ?>
+								<?php echo _x('to', 'Date one to date two', 'give'); ?>
+								<?php echo Give()->html->year_dropdown('end_year'); ?>
+								<?php echo Give()->html->month_dropdown('end_month'); ?>
 								<input type="hidden" name="give-action" value="earnings_export" />
-								<input type="submit" value="<?php _e( 'Generate CSV', 'give' ); ?>" class="button-secondary" />
+								<input type="submit" value="<?php _e('Generate CSV', 'give'); ?>" class="button-secondary" />
 							</form>
 						</td>
 					</tr>
 					<tr class="give-export-payment-history">
 						<td class="row-title">
-							<h3><span><?php _e( 'Export Donation History', 'give' ); ?></span></h3>
+							<h3><span><?php _e('Export Donation History', 'give'); ?></span></h3>
 
-							<p><?php _e( 'Download a CSV of all donations recorded.', 'give' ); ?></p>
+							<p><?php _e('Download a CSV of all donations recorded.', 'give'); ?></p>
 						</td>
 						<td>
 
@@ -335,57 +335,57 @@ 
 								<?php echo Give()->html->year_dropdown(); ?>
 								<?php echo Give()->html->month_dropdown(); ?>
 								<select name="give_export_payment_status">
-									<option value="0"><?php _e( 'All Statuses', 'give' ); ?></option>
+									<option value="0"><?php _e('All Statuses', 'give'); ?></option>
 									<?php
 									$statuses = give_get_payment_statuses();
-									foreach ( $statuses as $status => $label ) {
-										echo '<option value="' . $status . '">' . $label . '</option>';
+									foreach ($statuses as $status => $label) {
+										echo '<option value="'.$status.'">'.$label.'</option>';
 									}
 									?>
 								</select>
 								<input type="hidden" name="give-action" value="payment_export" />
-								<input type="submit" value="<?php _e( 'Generate CSV', 'give' ); ?>" class="button-secondary" />
+								<input type="submit" value="<?php _e('Generate CSV', 'give'); ?>" class="button-secondary" />
 							</form>
 
 						</td>
 					</tr>
 					<tr class="alt give-export-donors">
 						<td class="row-title">
-							<h3><span><?php _e( 'Export Donors in CSV', 'give' ); ?></span></h3>
+							<h3><span><?php _e('Export Donors in CSV', 'give'); ?></span></h3>
 
-							<p><?php _e( 'Download a CSV of all donors\' emails. Optionally export only donors that have donated to a particular form. Note: if you have a large number of donors, exporting the donation stats may fail.', 'give' ); ?></p>
+							<p><?php _e('Download a CSV of all donors\' emails. Optionally export only donors that have donated to a particular form. Note: if you have a large number of donors, exporting the donation stats may fail.', 'give'); ?></p>
 						</td>
 						<td>
 							<form method="post" id="give_donor_export">
 								<select name="give_export_download" id="give_donor_export_download">
-									<option value="0"><?php printf( __( 'All %s', 'give' ), give_get_forms_label_plural() ); ?></option>
+									<option value="0"><?php printf(__('All %s', 'give'), give_get_forms_label_plural()); ?></option>
 									<?php
-									$forms = get_posts( array(
+									$forms = get_posts(array(
 										'post_type'      => 'give_forms',
-										'posts_per_page' => - 1
-									) );
-									if ( $forms ) {
-										foreach ( $forms as $form ) {
-											echo '<option value="' . $form->ID . '">' . get_the_title( $form->ID ) . '</option>';
+										'posts_per_page' => -1
+									));
+									if ($forms) {
+										foreach ($forms as $form) {
+											echo '<option value="'.$form->ID.'">'.get_the_title($form->ID).'</option>';
 										}
 									}
 									?>
 								</select>
 								<select name="give_export_option" id="give_donor_export_option">
-									<option value="emails"><?php _e( 'Emails', 'give' ); ?></option>
-									<option value="emails_and_names"><?php _e( 'Emails and Names', 'give' ); ?></option>
-									<option value="full"><?php _e( 'Emails, Names, and Purchase Stats', 'give' ); ?></option>
+									<option value="emails"><?php _e('Emails', 'give'); ?></option>
+									<option value="emails_and_names"><?php _e('Emails and Names', 'give'); ?></option>
+									<option value="full"><?php _e('Emails, Names, and Purchase Stats', 'give'); ?></option>
 								</select>
 								<input type="hidden" name="give-action" value="email_export" />
-								<input type="submit" value="<?php _e( 'Generate CSV', 'give' ); ?>" class="button-secondary" />
+								<input type="submit" value="<?php _e('Generate CSV', 'give'); ?>" class="button-secondary" />
 							</form>
 						</td>
 					</tr>
-					<?php do_action( 'give_reports_tab_export_table_bottom' ); ?>
+					<?php do_action('give_reports_tab_export_table_bottom'); ?>
 					</tbody>
 				</table>
 
-				<?php do_action( 'give_reports_tab_export_content_bottom' ); ?>
+				<?php do_action('give_reports_tab_export_content_bottom'); ?>
 
 			</div>
 			<!-- .post-body-content -->
@@ -395,7 +395,7 @@ 
 	<?php
 }
 
-add_action( 'give_reports_tab_export', 'give_reports_tab_export' );
+add_action('give_reports_tab_export', 'give_reports_tab_export');
 
 /**
  * Renders the Reports page
@@ -404,19 +404,19 @@ 
  * @return void
  */
 function give_reports_tab_logs() {
-	require( GIVE_PLUGIN_DIR . 'includes/admin/reporting/logs.php' );
+	require(GIVE_PLUGIN_DIR.'includes/admin/reporting/logs.php');
 
 	$current_view = 'sales';
 	$log_views    = give_log_default_views();
 
-	if ( isset( $_GET['view'] ) && array_key_exists( $_GET['view'], $log_views ) ) {
+	if (isset($_GET['view']) && array_key_exists($_GET['view'], $log_views)) {
 		$current_view = $_GET['view'];
 	}
 
-	do_action( 'give_logs_view_' . $current_view );
+	do_action('give_logs_view_'.$current_view);
 }
 
-add_action( 'give_reports_tab_logs', 'give_reports_tab_logs' );
+add_action('give_reports_tab_logs', 'give_reports_tab_logs');
 
 /**
  * Retrieves estimated monthly earnings and sales
@@ -426,9 +426,9 @@ 
  */
 function give_estimated_monthly_stats() {
 
-	$estimated = get_transient( 'give_estimated_monthly_stats' );
+	$estimated = get_transient('give_estimated_monthly_stats');
 
-	if ( false === $estimated ) {
+	if (false === $estimated) {
 
 		$estimated = array(
 			'earnings' => 0,
@@ -437,20 +437,20 @@ 
 
 		$stats = new Give_Payment_Stats;
 
-		$to_date_earnings = $stats->get_earnings( 0, 'this_month' );
-		$to_date_sales    = $stats->get_sales( 0, 'this_month' );
+		$to_date_earnings = $stats->get_earnings(0, 'this_month');
+		$to_date_sales    = $stats->get_sales(0, 'this_month');
 
-		$current_day   = date( 'd', current_time( 'timestamp' ) );
-		$current_month = date( 'n', current_time( 'timestamp' ) );
-		$current_year  = date( 'Y', current_time( 'timestamp' ) );
-		$days_in_month = cal_days_in_month( CAL_GREGORIAN, $current_month, $current_year );
+		$current_day   = date('d', current_time('timestamp'));
+		$current_month = date('n', current_time('timestamp'));
+		$current_year  = date('Y', current_time('timestamp'));
+		$days_in_month = cal_days_in_month(CAL_GREGORIAN, $current_month, $current_year);
 
-		$estimated['earnings'] = ( $to_date_earnings / $current_day ) * $days_in_month;
-		$estimated['sales']    = ( $to_date_sales / $current_day ) * $days_in_month;
+		$estimated['earnings'] = ($to_date_earnings / $current_day) * $days_in_month;
+		$estimated['sales']    = ($to_date_sales / $current_day) * $days_in_month;
 
 		// Cache for one day
-		set_transient( 'give_estimated_monthly_stats', $estimated, 86400 );
+		set_transient('give_estimated_monthly_stats', $estimated, 86400);
 	}
 
-	return maybe_unserialize( $estimated );
+	return maybe_unserialize($estimated);
 }

includes/misc-functions.php

Indentation +8 added lines, -8 removed lines

@@ -727,10 +727,10 @@ 
 		}
 
 		if ( ! is_int( $params[1] )
-		     && ! is_float( $params[1] )
-		     && ! is_string( $params[1] )
-		     && $params[1] !== null
-		     && ! ( is_object( $params[1] ) && method_exists( $params[1], '__toString' ) )
+			 && ! is_float( $params[1] )
+			 && ! is_string( $params[1] )
+			 && $params[1] !== null
+			 && ! ( is_object( $params[1] ) && method_exists( $params[1], '__toString' ) )
 		) {
 			trigger_error( 'array_column(): The column key should be either a string or an integer', E_USER_WARNING );
 
@@ -738,10 +738,10 @@ 
 		}
 
 		if ( isset( $params[2] )
-		     && ! is_int( $params[2] )
-		     && ! is_float( $params[2] )
-		     && ! is_string( $params[2] )
-		     && ! ( is_object( $params[2] ) && method_exists( $params[2], '__toString' ) )
+			 && ! is_int( $params[2] )
+			 && ! is_float( $params[2] )
+			 && ! is_string( $params[2] )
+			 && ! ( is_object( $params[2] ) && method_exists( $params[2], '__toString' ) )
 		) {
 			trigger_error( 'array_column(): The index key should be either a string or an integer', E_USER_WARNING );
 

Doc Comments +6 added lines, -6 removed lines

@@ -339,7 +339,7 @@ 
  *
  * @since 1.0
  * @uses  Give()->session->get()
- * @return mixed array | false
+ * @return string array | false
  */
 function give_get_purchase_session() {
 	return Give()->session->get( 'give_purchase' );
@@ -376,7 +376,7 @@ 
  * Returns the webhost this site is using if possible
  *
  * @since 1.0
- * @return mixed string $host if detected, false otherwise
+ * @return string string $host if detected, false otherwise
  */
 function give_get_host() {
 	$host = false;
@@ -547,7 +547,7 @@ 
  *
  * @since 1.0
  *
- * @param unknown $n
+ * @param integer $n
  *
  * @return string Short month name
  */
@@ -677,9 +677,9 @@ 
 /**
  * Create SVG library function
  *
- * @param $icon
+ * @param string $icon
  *
- * @return mixed
+ * @return string
  */
 function give_svg_icons( $icon ) {
 
@@ -736,7 +736,7 @@ 
 	 *
 	 * @param array $input     A multi-dimensional array (record set) from which to pull
 	 *                         a column of values.
-	 * @param mixed $columnKey The column of values to return. This value may be the
+	 * @param string $columnKey The column of values to return. This value may be the
 	 *                         integer key of the column you wish to retrieve, or it
 	 *                         may be the string key name for an associative array.
 	 * @param mixed $indexKey  (Optional.) The column to use as the index/keys for

Spacing +158 added lines, -158 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,9 +24,9 @@ 
 function give_is_test_mode() {
 	global $give_options;
 
-	$ret = ! empty( $give_options['test_mode'] );
+	$ret = ! empty($give_options['test_mode']);
 
-	return (bool) apply_filters( 'give_is_test_mode', $ret );
+	return (bool) apply_filters('give_is_test_mode', $ret);
 }
 
 /**
@@ -37,9 +37,9 @@ 
  */
 function give_get_currency() {
 	global $give_options;
-	$currency = isset( $give_options['currency'] ) ? $give_options['currency'] : 'USD';
+	$currency = isset($give_options['currency']) ? $give_options['currency'] : 'USD';
 
-	return apply_filters( 'give_currency', $currency );
+	return apply_filters('give_currency', $currency);
 }
 
 /**
@@ -51,9 +51,9 @@ 
  */
 function give_get_currency_position() {
 	global $give_options;
-	$currency_pos = isset( $give_options['currency_position'] ) ? $give_options['currency_position'] : 'before';
+	$currency_pos = isset($give_options['currency_position']) ? $give_options['currency_position'] : 'before';
 
-	return apply_filters( 'give_currency_position', $currency_pos );
+	return apply_filters('give_currency_position', $currency_pos);
 }
 
 
@@ -65,36 +65,36 @@ 
  */
 function give_get_currencies() {
 	$currencies = array(
-		'USD'  => __( 'US Dollars ($)', 'give' ),
-		'EUR'  => __( 'Euros (€)', 'give' ),
-		'GBP'  => __( 'Pounds Sterling (£)', 'give' ),
-		'AUD'  => __( 'Australian Dollars ($)', 'give' ),
-		'BRL'  => __( 'Brazilian Real (R$)', 'give' ),
-		'CAD'  => __( 'Canadian Dollars ($)', 'give' ),
-		'CZK'  => __( 'Czech Koruna (Kč)', 'give' ),
-		'DKK'  => __( 'Danish Krone (kr)', 'give' ),
-		'HKD'  => __( 'Hong Kong Dollar ($)', 'give' ),
-		'HUF'  => __( 'Hungarian Forint (Ft)', 'give' ),
-		'ILS'  => __( 'Israeli Shekel (₪)', 'give' ),
-		'JPY'  => __( 'Japanese Yen (¥)', 'give' ),
-		'MYR'  => __( 'Malaysian Ringgits (RM)', 'give' ),
-		'MXN'  => __( 'Mexican Peso ($)', 'give' ),
-		'NZD'  => __( 'New Zealand Dollar ($)', 'give' ),
-		'NOK'  => __( 'Norwegian Krone (Kr.)', 'give' ),
-		'PHP'  => __( 'Philippine Pesos (₱)', 'give' ),
-		'PLN'  => __( 'Polish Zloty (zł)', 'give' ),
-		'SGD'  => __( 'Singapore Dollar ($)', 'give' ),
-		'SEK'  => __( 'Swedish Krona (kr)', 'give' ),
-		'CHF'  => __( 'Swiss Franc (CHF)', 'give' ),
-		'TWD'  => __( 'Taiwan New Dollars (NT$)', 'give' ),
-		'THB'  => __( 'Thai Baht (฿)', 'give' ),
-		'INR'  => __( 'Indian Rupee (₹)', 'give' ),
-		'TRY'  => __( 'Turkish Lira (₺)', 'give' ),
-		'RIAL' => __( 'Iranian Rial (﷼)', 'give' ),
-		'RUB'  => __( 'Russian Rubles (руб)', 'give' )
+		'USD'  => __('US Dollars ($)', 'give'),
+		'EUR'  => __('Euros (€)', 'give'),
+		'GBP'  => __('Pounds Sterling (£)', 'give'),
+		'AUD'  => __('Australian Dollars ($)', 'give'),
+		'BRL'  => __('Brazilian Real (R$)', 'give'),
+		'CAD'  => __('Canadian Dollars ($)', 'give'),
+		'CZK'  => __('Czech Koruna (Kč)', 'give'),
+		'DKK'  => __('Danish Krone (kr)', 'give'),
+		'HKD'  => __('Hong Kong Dollar ($)', 'give'),
+		'HUF'  => __('Hungarian Forint (Ft)', 'give'),
+		'ILS'  => __('Israeli Shekel (₪)', 'give'),
+		'JPY'  => __('Japanese Yen (¥)', 'give'),
+		'MYR'  => __('Malaysian Ringgits (RM)', 'give'),
+		'MXN'  => __('Mexican Peso ($)', 'give'),
+		'NZD'  => __('New Zealand Dollar ($)', 'give'),
+		'NOK'  => __('Norwegian Krone (Kr.)', 'give'),
+		'PHP'  => __('Philippine Pesos (₱)', 'give'),
+		'PLN'  => __('Polish Zloty (zł)', 'give'),
+		'SGD'  => __('Singapore Dollar ($)', 'give'),
+		'SEK'  => __('Swedish Krona (kr)', 'give'),
+		'CHF'  => __('Swiss Franc (CHF)', 'give'),
+		'TWD'  => __('Taiwan New Dollars (NT$)', 'give'),
+		'THB'  => __('Thai Baht (฿)', 'give'),
+		'INR'  => __('Indian Rupee (₹)', 'give'),
+		'TRY'  => __('Turkish Lira (₺)', 'give'),
+		'RIAL' => __('Iranian Rial (﷼)', 'give'),
+		'RUB'  => __('Russian Rubles (руб)', 'give')
 	);
 
-	return apply_filters( 'give_currencies', $currencies );
+	return apply_filters('give_currencies', $currencies);
 }
 
 
@@ -109,12 +109,12 @@ 
  *
  * @return string           The symbol to use for the currency
  */
-function give_currency_symbol( $currency = '' ) {
+function give_currency_symbol($currency = '') {
 
-	if ( empty( $currency ) ) {
+	if (empty($currency)) {
 		$currency = give_get_currency();
 	}
-	switch ( $currency ) :
+	switch ($currency) :
 		case 'GBP' :
 			$symbol = '£';
 			break;
@@ -183,7 +183,7 @@ 
 			break;
 	endswitch;
 
-	return apply_filters( 'give_currency_symbol', $symbol, $currency );
+	return apply_filters('give_currency_symbol', $symbol, $currency);
 }
 
 
@@ -195,13 +195,13 @@ 
  */
 function give_get_current_page_url() {
 
-	if ( is_front_page() ) {
-		$current_url = home_url( '/' );
+	if (is_front_page()) {
+		$current_url = home_url('/');
 	} else {
-		$current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+		$current_url = (is_ssl() ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
 	}
 
-	return apply_filters( 'give_get_current_page_url', esc_url( $current_url ) );
+	return apply_filters('give_get_current_page_url', esc_url($current_url));
 }
 
 
@@ -222,15 +222,15 @@ 
 	 */
 	$gateways = give_get_enabled_payment_gateways();
 
-	if ( count( $gateways ) == 1 && ! isset( $gateways['paypal'] ) && ! isset( $gateways['manual'] ) ) {
+	if (count($gateways) == 1 && ! isset($gateways['paypal']) && ! isset($gateways['manual'])) {
 		$ret = true;
-	} else if ( count( $gateways ) == 1 ) {
+	} else if (count($gateways) == 1) {
 		$ret = false;
-	} else if ( count( $gateways ) == 2 && isset( $gateways['paypal'] ) && isset( $gateways['manual'] ) ) {
+	} else if (count($gateways) == 2 && isset($gateways['paypal']) && isset($gateways['manual'])) {
 		$ret = false;
 	}
 
-	return (bool) apply_filters( 'give_verify_credit_cards', $ret );
+	return (bool) apply_filters('give_verify_credit_cards', $ret);
 }
 
 /**
@@ -242,26 +242,26 @@ 
 function give_get_timezone_id() {
 
 	// if site timezone string exists, return it
-	if ( $timezone = get_option( 'timezone_string' ) ) {
+	if ($timezone = get_option('timezone_string')) {
 		return $timezone;
 	}
 
 	// get UTC offset, if it isn't set return UTC
-	if ( ! ( $utc_offset = 3600 * get_option( 'gmt_offset', 0 ) ) ) {
+	if ( ! ($utc_offset = 3600 * get_option('gmt_offset', 0))) {
 		return 'UTC';
 	}
 
 	// attempt to guess the timezone string from the UTC offset
-	$timezone = timezone_name_from_abbr( '', $utc_offset );
+	$timezone = timezone_name_from_abbr('', $utc_offset);
 
 	// last try, guess timezone string manually
-	if ( $timezone === false ) {
+	if ($timezone === false) {
 
-		$is_dst = date( 'I' );
+		$is_dst = date('I');
 
-		foreach ( timezone_abbreviations_list() as $abbr ) {
-			foreach ( $abbr as $city ) {
-				if ( $city['dst'] == $is_dst && $city['offset'] == $utc_offset ) {
+		foreach (timezone_abbreviations_list() as $abbr) {
+			foreach ($abbr as $city) {
+				if ($city['dst'] == $is_dst && $city['offset'] == $utc_offset) {
 					return $city['timezone_id'];
 				}
 			}
@@ -285,17 +285,17 @@ 
 
 	$ip = '127.0.0.1';
 
-	if ( ! empty( $_SERVER['HTTP_CLIENT_IP'] ) ) {
+	if ( ! empty($_SERVER['HTTP_CLIENT_IP'])) {
 		//check ip from share internet
 		$ip = $_SERVER['HTTP_CLIENT_IP'];
-	} elseif ( ! empty( $_SERVER['HTTP_X_FORWARDED_FOR'] ) ) {
+	} elseif ( ! empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
 		//to check ip is pass from proxy
 		$ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
-	} elseif ( ! empty( $_SERVER['REMOTE_ADDR'] ) ) {
+	} elseif ( ! empty($_SERVER['REMOTE_ADDR'])) {
 		$ip = $_SERVER['REMOTE_ADDR'];
 	}
 
-	return apply_filters( 'give_get_ip', $ip );
+	return apply_filters('give_get_ip', $ip);
 }
 
 
@@ -310,8 +310,8 @@ 
  *
  * @uses  Give()->session->set()
  */
-function give_set_purchase_session( $purchase_data = array() ) {
-	Give()->session->set( 'give_purchase', $purchase_data );
+function give_set_purchase_session($purchase_data = array()) {
+	Give()->session->set('give_purchase', $purchase_data);
 }
 
 /**
@@ -325,7 +325,7 @@ 
  * @return mixed array | false
  */
 function give_get_purchase_session() {
-	return Give()->session->get( 'give_purchase' );
+	return Give()->session->get('give_purchase');
 }
 
 /**
@@ -340,14 +340,14 @@ 
  *
  * @return string
  */
-function give_get_purchase_summary( $purchase_data, $email = true ) {
+function give_get_purchase_summary($purchase_data, $email = true) {
 	$summary = '';
 
-	if ( $email ) {
-		$summary .= $purchase_data['user_email'] . ' - ';
+	if ($email) {
+		$summary .= $purchase_data['user_email'].' - ';
 	}
 
-	$summary .= get_the_title( $purchase_data['post_data']['give-form-id'] );
+	$summary .= get_the_title($purchase_data['post_data']['give-form-id']);
 
 	return $summary;
 }
@@ -364,31 +364,31 @@ 
 function give_get_host() {
 	$host = false;
 
-	if ( defined( 'WPE_APIKEY' ) ) {
+	if (defined('WPE_APIKEY')) {
 		$host = 'WP Engine';
-	} elseif ( defined( 'PAGELYBIN' ) ) {
+	} elseif (defined('PAGELYBIN')) {
 		$host = 'Pagely';
-	} elseif ( DB_HOST == 'localhost:/tmp/mysql5.sock' ) {
+	} elseif (DB_HOST == 'localhost:/tmp/mysql5.sock') {
 		$host = 'ICDSoft';
-	} elseif ( DB_HOST == 'mysqlv5' ) {
+	} elseif (DB_HOST == 'mysqlv5') {
 		$host = 'NetworkSolutions';
-	} elseif ( strpos( DB_HOST, 'ipagemysql.com' ) !== false ) {
+	} elseif (strpos(DB_HOST, 'ipagemysql.com') !== false) {
 		$host = 'iPage';
-	} elseif ( strpos( DB_HOST, 'ipowermysql.com' ) !== false ) {
+	} elseif (strpos(DB_HOST, 'ipowermysql.com') !== false) {
 		$host = 'IPower';
-	} elseif ( strpos( DB_HOST, '.gridserver.com' ) !== false ) {
+	} elseif (strpos(DB_HOST, '.gridserver.com') !== false) {
 		$host = 'MediaTemple Grid';
-	} elseif ( strpos( DB_HOST, '.pair.com' ) !== false ) {
+	} elseif (strpos(DB_HOST, '.pair.com') !== false) {
 		$host = 'pair Networks';
-	} elseif ( strpos( DB_HOST, '.stabletransit.com' ) !== false ) {
+	} elseif (strpos(DB_HOST, '.stabletransit.com') !== false) {
 		$host = 'Rackspace Cloud';
-	} elseif ( strpos( DB_HOST, '.sysfix.eu' ) !== false ) {
+	} elseif (strpos(DB_HOST, '.sysfix.eu') !== false) {
 		$host = 'SysFix.eu Power Hosting';
-	} elseif ( strpos( $_SERVER['SERVER_NAME'], 'Flywheel' ) !== false ) {
+	} elseif (strpos($_SERVER['SERVER_NAME'], 'Flywheel') !== false) {
 		$host = 'Flywheel';
 	} else {
 		// Adding a general fallback for data gathering
-		$host = 'DBH: ' . DB_HOST . ', SRV: ' . $_SERVER['SERVER_NAME'];
+		$host = 'DBH: '.DB_HOST.', SRV: '.$_SERVER['SERVER_NAME'];
 	}
 
 	return $host;
@@ -404,67 +404,67 @@ 
  *
  * @return bool true if host matches, false if not
  */
-function give_is_host( $host = false ) {
+function give_is_host($host = false) {
 
 	$return = false;
 
-	if ( $host ) {
-		$host = str_replace( ' ', '', strtolower( $host ) );
+	if ($host) {
+		$host = str_replace(' ', '', strtolower($host));
 
-		switch ( $host ) {
+		switch ($host) {
 			case 'wpengine':
-				if ( defined( 'WPE_APIKEY' ) ) {
+				if (defined('WPE_APIKEY')) {
 					$return = true;
 				}
 				break;
 			case 'pagely':
-				if ( defined( 'PAGELYBIN' ) ) {
+				if (defined('PAGELYBIN')) {
 					$return = true;
 				}
 				break;
 			case 'icdsoft':
-				if ( DB_HOST == 'localhost:/tmp/mysql5.sock' ) {
+				if (DB_HOST == 'localhost:/tmp/mysql5.sock') {
 					$return = true;
 				}
 				break;
 			case 'networksolutions':
-				if ( DB_HOST == 'mysqlv5' ) {
+				if (DB_HOST == 'mysqlv5') {
 					$return = true;
 				}
 				break;
 			case 'ipage':
-				if ( strpos( DB_HOST, 'ipagemysql.com' ) !== false ) {
+				if (strpos(DB_HOST, 'ipagemysql.com') !== false) {
 					$return = true;
 				}
 				break;
 			case 'ipower':
-				if ( strpos( DB_HOST, 'ipowermysql.com' ) !== false ) {
+				if (strpos(DB_HOST, 'ipowermysql.com') !== false) {
 					$return = true;
 				}
 				break;
 			case 'mediatemplegrid':
-				if ( strpos( DB_HOST, '.gridserver.com' ) !== false ) {
+				if (strpos(DB_HOST, '.gridserver.com') !== false) {
 					$return = true;
 				}
 				break;
 			case 'pairnetworks':
-				if ( strpos( DB_HOST, '.pair.com' ) !== false ) {
+				if (strpos(DB_HOST, '.pair.com') !== false) {
 					$return = true;
 				}
 				break;
 			case 'rackspacecloud':
-				if ( strpos( DB_HOST, '.stabletransit.com' ) !== false ) {
+				if (strpos(DB_HOST, '.stabletransit.com') !== false) {
 					$return = true;
 				}
 				break;
 			case 'sysfix.eu':
 			case 'sysfix.eupowerhosting':
-				if ( strpos( DB_HOST, '.sysfix.eu' ) !== false ) {
+				if (strpos(DB_HOST, '.sysfix.eu') !== false) {
 					$return = true;
 				}
 				break;
 			case 'flywheel':
-				if ( strpos( $_SERVER['SERVER_NAME'], 'Flywheel' ) !== false ) {
+				if (strpos($_SERVER['SERVER_NAME'], 'Flywheel') !== false) {
 					$return = true;
 				}
 				break;
@@ -497,20 +497,20 @@ 
  * @param string $replacement Optional. The function that should have been called
  * @param array $backtrace Optional. Contains stack backtrace of deprecated function
  */
-function _give_deprecated_function( $function, $version, $replacement = null, $backtrace = null ) {
-	do_action( 'give_deprecated_function_run', $function, $replacement, $version );
+function _give_deprecated_function($function, $version, $replacement = null, $backtrace = null) {
+	do_action('give_deprecated_function_run', $function, $replacement, $version);
 
-	$show_errors = current_user_can( 'manage_options' );
+	$show_errors = current_user_can('manage_options');
 
 	// Allow plugin to filter the output error trigger
-	if ( WP_DEBUG && apply_filters( 'give_deprecated_function_trigger_error', $show_errors ) ) {
-		if ( ! is_null( $replacement ) ) {
-			trigger_error( sprintf( __( '%1$s is <strong>deprecated</strong> since Give version %2$s! Use %3$s instead.', 'give' ), $function, $version, $replacement ) );
-			trigger_error( print_r( $backtrace, 1 ) ); // Limited to previous 1028 characters, but since we only need to move back 1 in stack that should be fine.
+	if (WP_DEBUG && apply_filters('give_deprecated_function_trigger_error', $show_errors)) {
+		if ( ! is_null($replacement)) {
+			trigger_error(sprintf(__('%1$s is <strong>deprecated</strong> since Give version %2$s! Use %3$s instead.', 'give'), $function, $version, $replacement));
+			trigger_error(print_r($backtrace, 1)); // Limited to previous 1028 characters, but since we only need to move back 1 in stack that should be fine.
 			// Alternatively we could dump this to a file.
 		} else {
-			trigger_error( sprintf( __( '%1$s is <strong>deprecated</strong> since Give version %2$s with no alternative available.', 'give' ), $function, $version ) );
-			trigger_error( print_r( $backtrace, 1 ) );// Limited to previous 1028 characters, but since we only need to move back 1 in stack that should be fine.
+			trigger_error(sprintf(__('%1$s is <strong>deprecated</strong> since Give version %2$s with no alternative available.', 'give'), $function, $version));
+			trigger_error(print_r($backtrace, 1)); // Limited to previous 1028 characters, but since we only need to move back 1 in stack that should be fine.
 			// Alternatively we could dump this to a file.
 		}
 	}
@@ -524,8 +524,8 @@ 
  * @return string $post_id
  */
 function give_get_admin_post_id() {
-	$post_id = isset( $_GET['post'] ) ? $_GET['post'] : null;
-	if ( ! $post_id && isset( $_POST['post_id'] ) ) {
+	$post_id = isset($_GET['post']) ? $_GET['post'] : null;
+	if ( ! $post_id && isset($_POST['post_id'])) {
 		$post_id = $_POST['post_id'];
 	}
 
@@ -539,7 +539,7 @@ 
  * @return string Arg separator output
  */
 function give_get_php_arg_separator_output() {
-	return ini_get( 'arg_separator.output' );
+	return ini_get('arg_separator.output');
 }
 
 
@@ -554,10 +554,10 @@ 
  *
  * @return string Short month name
  */
-function give_month_num_to_name( $n ) {
-	$timestamp = mktime( 0, 0, 0, $n, 1, 2005 );
+function give_month_num_to_name($n) {
+	$timestamp = mktime(0, 0, 0, $n, 1, 2005);
 
-	return date_i18n( "M", $timestamp );
+	return date_i18n("M", $timestamp);
 }
 
 
@@ -570,10 +570,10 @@ 
  *
  * @return bool Whether or not function is disabled.
  */
-function give_is_func_disabled( $function ) {
-	$disabled = explode( ',', ini_get( 'disable_functions' ) );
+function give_is_func_disabled($function) {
+	$disabled = explode(',', ini_get('disable_functions'));
 
-	return in_array( $function, $disabled );
+	return in_array($function, $disabled);
 }
 
 
@@ -588,7 +588,7 @@ 
 
 		<form action="//givewp.us3.list-manage.com/subscribe/post?u=3ccb75d68bda4381e2f45794c&amp;id=12a081aa13" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
 			<div class="give-newsletter-confirmation">
-				<p><?php _e( 'Thanks for Subscribing!', 'give' ); ?> :)</p>
+				<p><?php _e('Thanks for Subscribing!', 'give'); ?> :)</p>
 			</div>
 
 			<table class="form-table give-newsletter-form">
@@ -684,7 +684,7 @@ 
  *
  * @return mixed
  */
-function give_svg_icons( $icon ) {
+function give_svg_icons($icon) {
 
 	// Store your SVGs in an associative array
 	$svgs = array(
@@ -696,7 +696,7 @@ 
 	);
 
 	// Return the chosen icon's SVG string
-	return $svgs[ $icon ];
+	return $svgs[$icon];
 }
 
 /**
@@ -708,15 +708,15 @@ 
  *
  * @return mixed
  */
-function modify_nav_menu_meta_box_object( $post_type ) {
-	if ( isset( $post_type->name ) && $post_type->name == 'give_forms' ) {
+function modify_nav_menu_meta_box_object($post_type) {
+	if (isset($post_type->name) && $post_type->name == 'give_forms') {
 		$post_type->labels->name = 'Donation Forms';
 	}
 
 	return $post_type;
 }
 
-add_filter( 'nav_menu_meta_box_object', 'modify_nav_menu_meta_box_object' );
+add_filter('nav_menu_meta_box_object', 'modify_nav_menu_meta_box_object');
 
 
 /**
@@ -729,7 +729,7 @@ 
  * @license    http://opensource.org/licenses/MIT MIT
  */
 
-if ( ! function_exists( 'array_column' ) ) {
+if ( ! function_exists('array_column')) {
 	/**
 	 * Returns the values from a single column of the input array, identified by
 	 * the $columnKey.
@@ -748,56 +748,56 @@ 
 	 *
 	 * @return array
 	 */
-	function array_column( $input = null, $columnKey = null, $indexKey = null ) {
+	function array_column($input = null, $columnKey = null, $indexKey = null) {
 		// Using func_get_args() in order to check for proper number of
 		// parameters and trigger errors exactly as the built-in array_column()
 		// does in PHP 5.5.
 		$argc   = func_num_args();
 		$params = func_get_args();
 
-		if ( $argc < 2 ) {
-			trigger_error( "array_column() expects at least 2 parameters, {$argc} given", E_USER_WARNING );
+		if ($argc < 2) {
+			trigger_error("array_column() expects at least 2 parameters, {$argc} given", E_USER_WARNING);
 
 			return null;
 		}
 
-		if ( ! is_array( $params[0] ) ) {
+		if ( ! is_array($params[0])) {
 			trigger_error(
-				'array_column() expects parameter 1 to be array, ' . gettype( $params[0] ) . ' given',
+				'array_column() expects parameter 1 to be array, '.gettype($params[0]).' given',
 				E_USER_WARNING
 			);
 
 			return null;
 		}
 
-		if ( ! is_int( $params[1] )
-		     && ! is_float( $params[1] )
-		     && ! is_string( $params[1] )
+		if ( ! is_int($params[1])
+		     && ! is_float($params[1])
+		     && ! is_string($params[1])
 		     && $params[1] !== null
-		     && ! ( is_object( $params[1] ) && method_exists( $params[1], '__toString' ) )
+		     && ! (is_object($params[1]) && method_exists($params[1], '__toString'))
 		) {
-			trigger_error( 'array_column(): The column key should be either a string or an integer', E_USER_WARNING );
+			trigger_error('array_column(): The column key should be either a string or an integer', E_USER_WARNING);
 
 			return false;
 		}
 
-		if ( isset( $params[2] )
-		     && ! is_int( $params[2] )
-		     && ! is_float( $params[2] )
-		     && ! is_string( $params[2] )
-		     && ! ( is_object( $params[2] ) && method_exists( $params[2], '__toString' ) )
+		if (isset($params[2])
+		     && ! is_int($params[2])
+		     && ! is_float($params[2])
+		     && ! is_string($params[2])
+		     && ! (is_object($params[2]) && method_exists($params[2], '__toString'))
 		) {
-			trigger_error( 'array_column(): The index key should be either a string or an integer', E_USER_WARNING );
+			trigger_error('array_column(): The index key should be either a string or an integer', E_USER_WARNING);
 
 			return false;
 		}
 
 		$paramsInput     = $params[0];
-		$paramsColumnKey = ( $params[1] !== null ) ? (string) $params[1] : null;
+		$paramsColumnKey = ($params[1] !== null) ? (string) $params[1] : null;
 
 		$paramsIndexKey = null;
-		if ( isset( $params[2] ) ) {
-			if ( is_float( $params[2] ) || is_int( $params[2] ) ) {
+		if (isset($params[2])) {
+			if (is_float($params[2]) || is_int($params[2])) {
 				$paramsIndexKey = (int) $params[2];
 			} else {
 				$paramsIndexKey = (string) $params[2];
@@ -806,26 +806,26 @@ 
 
 		$resultArray = array();
 
-		foreach ( $paramsInput as $row ) {
+		foreach ($paramsInput as $row) {
 			$key    = $value = null;
 			$keySet = $valueSet = false;
 
-			if ( $paramsIndexKey !== null && array_key_exists( $paramsIndexKey, $row ) ) {
+			if ($paramsIndexKey !== null && array_key_exists($paramsIndexKey, $row)) {
 				$keySet = true;
-				$key    = (string) $row[ $paramsIndexKey ];
+				$key    = (string) $row[$paramsIndexKey];
 			}
 
-			if ( $paramsColumnKey === null ) {
+			if ($paramsColumnKey === null) {
 				$valueSet = true;
 				$value    = $row;
-			} elseif ( is_array( $row ) && array_key_exists( $paramsColumnKey, $row ) ) {
+			} elseif (is_array($row) && array_key_exists($paramsColumnKey, $row)) {
 				$valueSet = true;
-				$value    = $row[ $paramsColumnKey ];
+				$value    = $row[$paramsColumnKey];
 			}
 
-			if ( $valueSet ) {
-				if ( $keySet ) {
-					$resultArray[ $key ] = $value;
+			if ($valueSet) {
+				if ($keySet) {
+					$resultArray[$key] = $value;
 				} else {
 					$resultArray[] = $value;
 				}
@@ -847,39 +847,39 @@ 
  *
  * @return bool Whether the receipt is visible or not.
  */
-function give_can_view_receipt( $payment_key = '' ) {
+function give_can_view_receipt($payment_key = '') {
 
 	$return = false;
 
-	if ( empty( $payment_key ) ) {
+	if (empty($payment_key)) {
 		return $return;
 	}
 
 	global $give_receipt_args;
 
-	$give_receipt_args['id'] = give_get_purchase_id_by_key( $payment_key );
+	$give_receipt_args['id'] = give_get_purchase_id_by_key($payment_key);
 
-	$user_id = (int) give_get_payment_user_id( $give_receipt_args['id'] );
+	$user_id = (int) give_get_payment_user_id($give_receipt_args['id']);
 
-	$payment_meta = give_get_payment_meta( $give_receipt_args['id'] );
+	$payment_meta = give_get_payment_meta($give_receipt_args['id']);
 
-	if ( is_user_logged_in() ) {
-		if ( $user_id === (int) get_current_user_id() ) {
+	if (is_user_logged_in()) {
+		if ($user_id === (int) get_current_user_id()) {
 			$return = true;
-		} elseif ( wp_get_current_user()->user_email === give_get_payment_user_email( $give_receipt_args['id'] ) ) {
+		} elseif (wp_get_current_user()->user_email === give_get_payment_user_email($give_receipt_args['id'])) {
 			$return = true;
-		} elseif ( current_user_can( 'view_give_sensitive_data' ) ) {
+		} elseif (current_user_can('view_give_sensitive_data')) {
 			$return = true;
 		}
 	}
 
 	$session = give_get_purchase_session();
-	if ( ! empty( $session ) && ! is_user_logged_in() ) {
-		if ( $session['purchase_key'] === $payment_meta['key'] ) {
+	if ( ! empty($session) && ! is_user_logged_in()) {
+		if ($session['purchase_key'] === $payment_meta['key']) {
 			$return = true;
 		}
 	}
 
-	return (bool) apply_filters( 'give_can_view_receipt', $return, $payment_key );
+	return (bool) apply_filters('give_can_view_receipt', $return, $payment_key);
 
 }
\ No newline at end of file

includes/admin/upgrades/upgrade-functions.php

Spacing +57 added lines, -57 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,18 +47,18 @@ 
 	 */
 
 	//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(
-			'<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(
-			'<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'))
 		);
 	}
 
@@ -68,7 +68,7 @@ 
 
 }
 
-add_action( 'admin_notices', 'give_show_upgrade_notices' );
+add_action('admin_notices', 'give_show_upgrade_notices');
 
 /**
  * Triggers all upgrade functions
@@ -80,26 +80,26 @@ 
  */
 function give_trigger_upgrades() {
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( __( 'You do not have permission to do Give upgrades', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(__('You do not have permission to do Give upgrades', 'give'), __('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
@@ -110,15 +110,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);
 
 }
 
@@ -131,9 +131,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;
 	}
 
@@ -141,9 +141,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);
 }
 
 /**
@@ -154,9 +154,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();
 	}
 
@@ -175,30 +175,30 @@ 
  */
 function give_v132_upgrade_give_payment_customer_id() {
 	global $wpdb;
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( __( 'You do not have permission to do Give upgrades', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(__('You do not have permission to do Give upgrades', 'give'), __('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
@@ -212,14 +212,14 @@ 
 
 	global $wpdb;
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( __( 'You do not have permission to do Give upgrades', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(__('You do not have permission to do Give upgrades', 'give'), __('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
@@ -229,32 +229,32 @@ 
 	$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');

includes/admin/add-ons.php

Spacing +12 added lines, -12 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,12 +25,12 @@ 
 function give_add_ons_page() {
 	ob_start(); ?>
 	<div class="wrap" id="give-add-ons">
-		<h2><?php _e( 'Give Add-ons', 'give' ); ?>
-			&nbsp;&mdash;&nbsp;<a href="https://givewp.com/addons/" class="button-primary give-view-addons-all" title="<?php _e( 'Browse All Add-ons', 'give' ); ?>" target="_blank"><?php _e( 'View All Add-ons', 'give' ); ?>
+		<h2><?php _e('Give Add-ons', 'give'); ?>
+			&nbsp;&mdash;&nbsp;<a href="https://givewp.com/addons/" class="button-primary give-view-addons-all" title="<?php _e('Browse All Add-ons', 'give'); ?>" target="_blank"><?php _e('View All Add-ons', 'give'); ?>
 				<span class="dashicons dashicons-external"></span></a>
 		</h2>
 
-		<p><?php _e( 'The following Add-ons extend the functionality of Give.', 'give' ); ?></p>
+		<p><?php _e('The following Add-ons extend the functionality of Give.', 'give'); ?></p>
 		<?php echo give_add_ons_get_feed(); ?>
 	</div>
 	<?php
@@ -48,18 +48,18 @@ 
 function give_add_ons_get_feed() {
 
 	$addons_debug = false; //set to true to debug
-	$cache        = get_transient( 'give_add_ons_feed' );
+	$cache        = get_transient('give_add_ons_feed');
 
-	if ( $cache === false || $addons_debug === true && WP_DEBUG === true ) {
-		$feed = wp_remote_get( 'https://givewp.com/downloads/feed/', array( 'sslverify' => false ) );
+	if ($cache === false || $addons_debug === true && WP_DEBUG === true) {
+		$feed = wp_remote_get('https://givewp.com/downloads/feed/', array('sslverify' => false));
 
-		if ( ! is_wp_error( $feed ) ) {
-			if ( isset( $feed['body'] ) && strlen( $feed['body'] ) > 0 ) {
-				$cache = wp_remote_retrieve_body( $feed );
-				set_transient( 'give_add_ons_feed', $cache, 3600 );
+		if ( ! is_wp_error($feed)) {
+			if (isset($feed['body']) && strlen($feed['body']) > 0) {
+				$cache = wp_remote_retrieve_body($feed);
+				set_transient('give_add_ons_feed', $cache, 3600);
 			}
 		} else {
-			$cache = '<div class="error"><p>' . __( 'There was an error retrieving the Give Add-ons list from the server. Please try again later.', 'give' ) . '</div>';
+			$cache = '<div class="error"><p>'.__('There was an error retrieving the Give Add-ons list from the server. Please try again later.', 'give').'</div>';
 		}
 	}
 

includes/admin/reporting/class-gateways-reports-table.php

Spacing +33 added lines, -33 removed lines

@@ -10,13 +10,13 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 // Load WP_List_Table if not loaded
-if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+if ( ! class_exists('WP_List_Table')) {
+	require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -45,11 +45,11 @@ 
 		global $status, $page;
 
 		// Set parent defaults
-		parent::__construct( array(
-			'singular' => give_get_forms_label_singular(),    // Singular name of the listed records
-			'plural'   => give_get_forms_label_plural(),        // Plural name of the listed records
+		parent::__construct(array(
+			'singular' => give_get_forms_label_singular(), // Singular name of the listed records
+			'plural'   => give_get_forms_label_plural(), // Plural name of the listed records
 			'ajax'     => false                        // Does this table support ajax?
-		) );
+		));
 
 	}
 
@@ -64,10 +64,10 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $item, $column_name ) {
-		switch ( $column_name ) {
+	public function column_default($item, $column_name) {
+		switch ($column_name) {
 			default:
-				return $item[ $column_name ];
+				return $item[$column_name];
 		}
 	}
 
@@ -80,11 +80,11 @@ 
 	 */
 	public function get_columns() {
 		$columns = array(
-			'label'           => esc_attr__( 'Gateway', 'give' ),
-			'complete_sales'  => esc_attr__( 'Complete Transactions', 'give' ),
-			'pending_sales'   => esc_attr__( 'Pending / Failed Transactions', 'give' ),
-			'total_sales'     => esc_attr__( 'Total Transactions', 'give' ),
-			'total_donations' => esc_attr__( 'Total Donations', 'give' )
+			'label'           => esc_attr__('Gateway', 'give'),
+			'complete_sales'  => esc_attr__('Complete Transactions', 'give'),
+			'pending_sales'   => esc_attr__('Pending / Failed Transactions', 'give'),
+			'total_sales'     => esc_attr__('Total Transactions', 'give'),
+			'total_donations' => esc_attr__('Total Donations', 'give')
 		);
 
 		return $columns;
@@ -99,7 +99,7 @@ 
 	 * @return int Current page number
 	 */
 	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 
@@ -110,7 +110,7 @@ 
 	 * @since  1.0
 	 * @return void
 	 */
-	public function bulk_actions( $which = '' ) {
+	public function bulk_actions($which = '') {
 		// These aren't really bulk actions but this outputs the markup in the right place
 		give_report_views();
 	}
@@ -123,23 +123,23 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function display_tablenav( $which ) {
+	protected function display_tablenav($which) {
 
-		if ( 'top' == $which ) {
-			wp_nonce_field( 'bulk-' . $this->_args['plural'] );
+		if ('top' == $which) {
+			wp_nonce_field('bulk-'.$this->_args['plural']);
 		}
 		?>
-		<div class="tablenav gateways-report-tablenav give-clearfix <?php echo esc_attr( $which ); ?>">
+		<div class="tablenav gateways-report-tablenav give-clearfix <?php echo esc_attr($which); ?>">
 
-			<h3 class="alignleft reports-earnings-title"><span><?php _e( 'Payment Methods Report', 'give' ); ?></span></h3>
+			<h3 class="alignleft reports-earnings-title"><span><?php _e('Payment Methods Report', 'give'); ?></span></h3>
 
 			<div class="alignright tablenav-right">
 				<div class="actions bulkactions">
-					<?php $this->bulk_actions( $which ); ?>
+					<?php $this->bulk_actions($which); ?>
 				</div>
 				<?php
-				$this->extra_tablenav( $which );
-				$this->pagination( $which );
+				$this->extra_tablenav($which);
+				$this->pagination($which);
 				?>
 			</div>
 
@@ -164,18 +164,18 @@ 
 		$gateways     = give_get_payment_gateways();
 		$stats        = new Give_Payment_Stats();
 
-		foreach ( $gateways as $gateway_id => $gateway ) {
+		foreach ($gateways as $gateway_id => $gateway) {
 
-			$complete_count = give_count_sales_by_gateway( $gateway_id, 'publish' );
-			$pending_count  = give_count_sales_by_gateway( $gateway_id, array( 'pending', 'failed' ) );
+			$complete_count = give_count_sales_by_gateway($gateway_id, 'publish');
+			$pending_count  = give_count_sales_by_gateway($gateway_id, array('pending', 'failed'));
 
 			$reports_data[] = array(
 				'ID'              => $gateway_id,
 				'label'           => $gateway['admin_label'],
-				'complete_sales'  => give_format_amount( $complete_count, false ),
-				'pending_sales'   => give_format_amount( $pending_count, false ),
-				'total_sales'     => give_format_amount( $complete_count + $pending_count, false ),
-				'total_donations' => give_currency_filter( give_format_amount( $stats->get_earnings( 0, 0, 0, $gateway_id ) ) )
+				'complete_sales'  => give_format_amount($complete_count, false),
+				'pending_sales'   => give_format_amount($pending_count, false),
+				'total_sales'     => give_format_amount($complete_count + $pending_count, false),
+				'total_donations' => give_currency_filter(give_format_amount($stats->get_earnings(0, 0, 0, $gateway_id)))
 			);
 		}
 
@@ -197,7 +197,7 @@ 
 		$columns               = $this->get_columns();
 		$hidden                = array(); // No hidden columns
 		$sortable              = $this->get_sortable_columns();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 		$this->items           = $this->reports_data();
 
 	}

includes/payments/class-payment-stats.php

Spacing +46 added lines, -46 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -39,46 +39,46 @@ 
 	 *
 	 * @return float|int
 	 */
-	public function get_sales( $form_id = 0, $start_date = false, $end_date = false, $status = 'publish' ) {
+	public function get_sales($form_id = 0, $start_date = false, $end_date = false, $status = 'publish') {
 
-		$this->setup_dates( $start_date, $end_date );
+		$this->setup_dates($start_date, $end_date);
 
 		// Make sure start date is valid
-		if ( is_wp_error( $this->start_date ) ) {
+		if (is_wp_error($this->start_date)) {
 			return $this->start_date;
 		}
 
 		// Make sure end date is valid
-		if ( is_wp_error( $this->end_date ) ) {
+		if (is_wp_error($this->end_date)) {
 			return $this->end_date;
 		}
 
-		if ( empty( $form_id ) ) {
+		if (empty($form_id)) {
 
 			// Global sale stats
-			add_filter( 'give_count_payments_where', array( $this, 'count_where' ) );
+			add_filter('give_count_payments_where', array($this, 'count_where'));
 
-			if ( is_array( $status ) ) {
+			if (is_array($status)) {
 				$count = 0;
-				foreach ( $status as $payment_status ) {
+				foreach ($status as $payment_status) {
 					$count += give_count_payments()->$payment_status;
 				}
 			} else {
 				$count = give_count_payments()->$status;
 			}
 
-			remove_filter( 'give_count_payments_where', array( $this, 'count_where' ) );
+			remove_filter('give_count_payments_where', array($this, 'count_where'));
 
 		} else {
 
 			// Product specific stats
 			global $give_logs;
 
-			add_filter( 'posts_where', array( $this, 'payments_where' ) );
+			add_filter('posts_where', array($this, 'payments_where'));
 
-			$count = $give_logs->get_log_count( $form_id, 'sale' );
+			$count = $give_logs->get_log_count($form_id, 'sale');
 
-			remove_filter( 'posts_where', array( $this, 'payments_where' ) );
+			remove_filter('posts_where', array($this, 'payments_where'));
 
 		}
 
@@ -100,31 +100,31 @@ 
 	 *
 	 * @return float|int
 	 */
-	public function get_earnings( $form_id = 0, $start_date = false, $end_date = false, $gateway_id = false ) {
+	public function get_earnings($form_id = 0, $start_date = false, $end_date = false, $gateway_id = false) {
 
 		global $wpdb;
 
-		$this->setup_dates( $start_date, $end_date );
+		$this->setup_dates($start_date, $end_date);
 
 		// Make sure start date is valid
-		if ( is_wp_error( $this->start_date ) ) {
+		if (is_wp_error($this->start_date)) {
 			return $this->start_date;
 		}
 
 		// Make sure end date is valid
-		if ( is_wp_error( $this->end_date ) ) {
+		if (is_wp_error($this->end_date)) {
 			return $this->end_date;
 		}
 
-		add_filter( 'posts_where', array( $this, 'payments_where' ) );
+		add_filter('posts_where', array($this, 'payments_where'));
 
-		if ( empty( $form_id ) ) {
+		if (empty($form_id)) {
 
 			// Global earning stats
 			$args = array(
 				'post_type'              => 'give_payment',
 				'nopaging'               => true,
-				'post_status'            => array( 'publish', 'revoked' ),
+				'post_status'            => array('publish', 'revoked'),
 				'fields'                 => 'ids',
 				'update_post_term_cache' => false,
 				'suppress_filters'       => false,
@@ -136,24 +136,24 @@ 
 			);
 
 			//Filter by Gateway ID meta_key
-			if ( $gateway_id !== false ) {
+			if ($gateway_id !== false) {
 				$args['meta_key']   = '_give_payment_gateway';
 				$args['meta_value'] = $gateway_id;
 			}
 
-			$args = apply_filters( 'give_stats_earnings_args', $args );
-			$key  = 'give_stats_' . substr( md5( serialize( $args ) ), 0, 15 );
+			$args = apply_filters('give_stats_earnings_args', $args);
+			$key  = 'give_stats_'.substr(md5(serialize($args)), 0, 15);
 
-			$earnings = get_transient( $key );
-			if ( false === $earnings ) {
-				$sales    = get_posts( $args );
+			$earnings = get_transient($key);
+			if (false === $earnings) {
+				$sales    = get_posts($args);
 				$earnings = 0;
-				if ( $sales ) {
-					$sales = implode( ',', $sales );
-					$earnings += $wpdb->get_var( "SELECT SUM(meta_value) FROM $wpdb->postmeta WHERE meta_key = '_give_payment_total' AND post_id IN({$sales})" );
+				if ($sales) {
+					$sales = implode(',', $sales);
+					$earnings += $wpdb->get_var("SELECT SUM(meta_value) FROM $wpdb->postmeta WHERE meta_key = '_give_payment_total' AND post_id IN({$sales})");
 				}
 				// Cache the results for one hour
-				set_transient( $key, $earnings, HOUR_IN_SECONDS );
+				set_transient($key, $earnings, HOUR_IN_SECONDS);
 			}
 
 		} else {
@@ -174,34 +174,34 @@ 
 				// This is not a valid query arg, but is used for cache keying
 			);
 
-			$args = apply_filters( 'give_stats_earnings_args', $args );
-			$key  = 'give_stats_' . substr( md5( serialize( $args ) ), 0, 15 );
+			$args = apply_filters('give_stats_earnings_args', $args);
+			$key  = 'give_stats_'.substr(md5(serialize($args)), 0, 15);
 			//Set transient for faster stats
-			$earnings = get_transient( $key );
+			$earnings = get_transient($key);
 
-			if ( false === $earnings ) {
+			if (false === $earnings) {
 
-				$log_ids  = $give_logs->get_connected_logs( $args, 'sale' );
+				$log_ids  = $give_logs->get_connected_logs($args, 'sale');
 				$earnings = 0;
 
-				if ( $log_ids ) {
-					$log_ids     = implode( ',', $log_ids );
-					$payment_ids = $wpdb->get_col( "SELECT meta_value FROM $wpdb->postmeta WHERE meta_key='_give_log_payment_id' AND post_id IN ($log_ids);" );
-					foreach ( $payment_ids as $payment_id ) {
-						$earnings += give_get_payment_amount( $payment_id );
+				if ($log_ids) {
+					$log_ids     = implode(',', $log_ids);
+					$payment_ids = $wpdb->get_col("SELECT meta_value FROM $wpdb->postmeta WHERE meta_key='_give_log_payment_id' AND post_id IN ($log_ids);");
+					foreach ($payment_ids as $payment_id) {
+						$earnings += give_get_payment_amount($payment_id);
 					}
 				}
 
 				// Cache the results for one hour
-				set_transient( $key, $earnings, 60 * 60 );
+				set_transient($key, $earnings, 60 * 60);
 			}
 		}
 
 		//remove our filter
-		remove_filter( 'posts_where', array( $this, 'payments_where' ) );
+		remove_filter('posts_where', array($this, 'payments_where'));
 
 		//return earnings
-		return round( $earnings, give_currency_decimal_filter() );
+		return round($earnings, give_currency_decimal_filter());
 
 	}
 
@@ -215,16 +215,16 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_best_selling( $number = 10 ) {
+	public function get_best_selling($number = 10) {
 
 		global $wpdb;
 
-		$give_forms = $wpdb->get_results( $wpdb->prepare(
+		$give_forms = $wpdb->get_results($wpdb->prepare(
 			"SELECT post_id as form_id, max(meta_value) as sales
 				FROM $wpdb->postmeta WHERE meta_key='_give_form_sales' AND meta_value > 0
 				GROUP BY meta_value+0
 				DESC LIMIT %d;", $number
-		) );
+		));
 
 		return $give_forms;
 	}

includes/emails/class-give-email-tags.php

Doc Comments +2 added lines, -1 removed lines

@@ -50,6 +50,7 @@ 
 	 *
 	 * @param string   $tag  Email tag to be replace in email
 	 * @param callable $func Hook to run when email tag is found
+	 * @param string $description
 	 */
 	public function add( $tag, $description, $func ) {
 		if ( is_callable( $func ) ) {
@@ -477,7 +478,7 @@ 
  *
  * @param int $payment_id
  *
- * @return int payment_id
+ * @return string payment_id
  */
 function give_email_tag_payment_id( $payment_id ) {
 	return give_get_payment_number( $payment_id );

Spacing +89 added lines, -89 removed lines

@@ -23,7 +23,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -51,9 +51,9 @@ 
 	 * @param string $tag Email tag to be replace in email
 	 * @param callable $func Hook to run when email tag is found
 	 */
-	public function add( $tag, $description, $func ) {
-		if ( is_callable( $func ) ) {
-			$this->tags[ $tag ] = array(
+	public function add($tag, $description, $func) {
+		if (is_callable($func)) {
+			$this->tags[$tag] = array(
 				'tag'         => $tag,
 				'description' => $description,
 				'func'        => $func
@@ -68,8 +68,8 @@ 
 	 *
 	 * @param string $tag Email tag to remove hook from
 	 */
-	public function remove( $tag ) {
-		unset( $this->tags[ $tag ] );
+	public function remove($tag) {
+		unset($this->tags[$tag]);
 	}
 
 	/**
@@ -81,8 +81,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function email_tag_exists( $tag ) {
-		return array_key_exists( $tag, $this->tags );
+	public function email_tag_exists($tag) {
+		return array_key_exists($tag, $this->tags);
 	}
 
 	/**
@@ -106,16 +106,16 @@ 
 	 *
 	 * @return string Content with email tags filtered out.
 	 */
-	public function do_tags( $content, $payment_id ) {
+	public function do_tags($content, $payment_id) {
 
 		// Check if there is atleast one tag added
-		if ( empty( $this->tags ) || ! is_array( $this->tags ) ) {
+		if (empty($this->tags) || ! is_array($this->tags)) {
 			return $content;
 		}
 
 		$this->payment_id = $payment_id;
 
-		$new_content = preg_replace_callback( "/{([A-z0-9\-\_]+)}/s", array( $this, 'do_tag' ), $content );
+		$new_content = preg_replace_callback("/{([A-z0-9\-\_]+)}/s", array($this, 'do_tag'), $content);
 
 		$this->payment_id = null;
 
@@ -131,17 +131,17 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function do_tag( $m ) {
+	public function do_tag($m) {
 
 		// Get tag
 		$tag = $m[1];
 
 		// Return tag if tag not set
-		if ( ! $this->email_tag_exists( $tag ) ) {
+		if ( ! $this->email_tag_exists($tag)) {
 			return $m[0];
 		}
 
-		return call_user_func( $this->tags[ $tag ]['func'], $this->payment_id, $tag );
+		return call_user_func($this->tags[$tag]['func'], $this->payment_id, $tag);
 	}
 
 }
@@ -155,8 +155,8 @@ 
  * @param string $description Description of the email tag added
  * @param callable $func Hook to run when email tag is found
  */
-function give_add_email_tag( $tag, $description, $func ) {
-	Give()->email_tags->add( $tag, $description, $func );
+function give_add_email_tag($tag, $description, $func) {
+	Give()->email_tags->add($tag, $description, $func);
 }
 
 /**
@@ -166,8 +166,8 @@ 
  *
  * @param string $tag Email tag to remove hook from
  */
-function give_remove_email_tag( $tag ) {
-	Give()->email_tags->remove( $tag );
+function give_remove_email_tag($tag) {
+	Give()->email_tags->remove($tag);
 }
 
 /**
@@ -179,8 +179,8 @@ 
  *
  * @return bool
  */
-function give_email_tag_exists( $tag ) {
-	return Give()->email_tags->email_tag_exists( $tag );
+function give_email_tag_exists($tag) {
+	return Give()->email_tags->email_tag_exists($tag);
 }
 
 /**
@@ -209,13 +209,13 @@ 
 	$email_tags = give_get_email_tags();
 
 	// Check
-	if ( count( $email_tags ) > 0 ) {
+	if (count($email_tags) > 0) {
 
 		// Loop
-		foreach ( $email_tags as $email_tag ) {
+		foreach ($email_tags as $email_tag) {
 
 			// Add email tag to list
-			$list .= '<code>{' . $email_tag['tag'] . '}</code> - ' . $email_tag['description'] . '<br/>';
+			$list .= '<code>{'.$email_tag['tag'].'}</code> - '.$email_tag['description'].'<br/>';
 
 		}
 
@@ -235,13 +235,13 @@ 
  *
  * @return string Content with email tags filtered out.
  */
-function give_do_email_tags( $content, $payment_id ) {
+function give_do_email_tags($content, $payment_id) {
 
 	// Replace all tags
-	$content = Give()->email_tags->do_tags( $content, $payment_id );
+	$content = Give()->email_tags->do_tags($content, $payment_id);
 
 	// Maintaining backwards compatibility
-	$content = apply_filters( 'give_email_template_tags', $content, give_get_payment_meta( $payment_id ), $payment_id );
+	$content = apply_filters('give_email_template_tags', $content, give_get_payment_meta($payment_id), $payment_id);
 
 	// Return content
 	return $content;
@@ -253,10 +253,10 @@ 
  * @since 1.0
  */
 function give_load_email_tags() {
-	do_action( 'give_add_email_tags' );
+	do_action('give_add_email_tags');
 }
 
-add_action( 'init', 'give_load_email_tags', - 999 );
+add_action('init', 'give_load_email_tags', - 999);
 
 /**
  * Add default Give email template tags
@@ -269,82 +269,82 @@ 
 	$email_tags = array(
 		array(
 			'tag'         => 'donation',
-			'description' => __( 'The name of completed donation form', 'give' ),
+			'description' => __('The name of completed donation form', 'give'),
 			'function'    => 'give_email_tag_donation'
 		),
 		array(
 			'tag'         => 'name',
-			'description' => __( 'The donor\'s first name', 'give' ),
+			'description' => __('The donor\'s first name', 'give'),
 			'function'    => 'give_email_tag_first_name'
 		),
 		array(
 			'tag'         => 'fullname',
-			'description' => __( 'The donor\'s full name, first and last', 'give' ),
+			'description' => __('The donor\'s full name, first and last', 'give'),
 			'function'    => 'give_email_tag_fullname'
 		),
 		array(
 			'tag'         => 'username',
-			'description' => __( 'The donor\'s user name on the site, if they registered an account', 'give' ),
+			'description' => __('The donor\'s user name on the site, if they registered an account', 'give'),
 			'function'    => 'give_email_tag_username'
 		),
 		array(
 			'tag'         => 'user_email',
-			'description' => __( 'The donor\'s email address', 'give' ),
+			'description' => __('The donor\'s email address', 'give'),
 			'function'    => 'give_email_tag_user_email'
 		),
 		array(
 			'tag'         => 'billing_address',
-			'description' => __( 'The donor\'s billing address', 'give' ),
+			'description' => __('The donor\'s billing address', 'give'),
 			'function'    => 'give_email_tag_billing_address'
 		),
 		array(
 			'tag'         => 'date',
-			'description' => __( 'The date of the donation', 'give' ),
+			'description' => __('The date of the donation', 'give'),
 			'function'    => 'give_email_tag_date'
 		),
 		array(
 			'tag'         => 'price',
-			'description' => __( 'The total price of the donation', 'give' ),
+			'description' => __('The total price of the donation', 'give'),
 			'function'    => 'give_email_tag_price'
 		),
 		array(
 			'tag'         => 'payment_id',
-			'description' => __( 'The unique ID number for this donation', 'give' ),
+			'description' => __('The unique ID number for this donation', 'give'),
 			'function'    => 'give_email_tag_payment_id'
 		),
 		array(
 			'tag'         => 'receipt_id',
-			'description' => __( 'The unique ID number for this donation receipt', 'give' ),
+			'description' => __('The unique ID number for this donation receipt', 'give'),
 			'function'    => 'give_email_tag_receipt_id'
 		),
 		array(
 			'tag'         => 'payment_method',
-			'description' => __( 'The method of payment used for this donation', 'give' ),
+			'description' => __('The method of payment used for this donation', 'give'),
 			'function'    => 'give_email_tag_payment_method'
 		),
 		array(
 			'tag'         => 'sitename',
-			'description' => __( 'Your site name', 'give' ),
+			'description' => __('Your site name', 'give'),
 			'function'    => 'give_email_tag_sitename'
 		),
 		array(
 			'tag'         => 'receipt_link',
-			'description' => __( 'Adds a link so users can view their receipt directly on your website if they are unable to view it in the browser correctly.', 'give' ),
+			'description' => __('Adds a link so users can view their receipt directly on your website if they are unable to view it in the browser correctly.', 'give'),
 			'function'    => 'give_email_tag_receipt_link'
 		),
 	);
 
 	// Apply give_email_tags filter
-	$email_tags = apply_filters( 'give_email_tags', $email_tags );
+	$email_tags = apply_filters('give_email_tags', $email_tags);
 
 	// Add email tags
-	foreach ( $email_tags as $email_tag ) {
-		give_add_email_tag( $email_tag['tag'], $email_tag['description'], $email_tag['function'] );
+	foreach ($email_tags as $email_tag) {
+		give_add_email_tag($email_tag['tag'], $email_tag['description'], $email_tag['function']);
 	}
 
 }
 
-add_action( 'give_add_email_tags', 'give_setup_email_tags' );
+add_action('give_add_email_tags', 'give_setup_email_tags');
 
 
 /**
@@ -355,12 +355,12 @@ 
  *
  * @return string name
  */
-function give_email_tag_first_name( $payment_id ) {
-	$payment_data = give_get_payment_meta( $payment_id );
-	if ( empty( $payment_data['user_info'] ) ) {
+function give_email_tag_first_name($payment_id) {
+	$payment_data = give_get_payment_meta($payment_id);
+	if (empty($payment_data['user_info'])) {
 		return '';
 	}
-	$email_name = give_get_email_names( $payment_data['user_info'] );
+	$email_name = give_get_email_names($payment_data['user_info']);
 
 	return $email_name['name'];
 }
@@ -373,12 +373,12 @@ 
  *
  * @return string fullname
  */
-function give_email_tag_fullname( $payment_id ) {
-	$payment_data = give_get_payment_meta( $payment_id );
-	if ( empty( $payment_data['user_info'] ) ) {
+function give_email_tag_fullname($payment_id) {
+	$payment_data = give_get_payment_meta($payment_id);
+	if (empty($payment_data['user_info'])) {
 		return '';
 	}
-	$email_name = give_get_email_names( $payment_data['user_info'] );
+	$email_name = give_get_email_names($payment_data['user_info']);
 
 	return $email_name['fullname'];
 }
@@ -391,12 +391,12 @@ 
  *
  * @return string username
  */
-function give_email_tag_username( $payment_id ) {
-	$payment_data = give_get_payment_meta( $payment_id );
-	if ( empty( $payment_data['user_info'] ) ) {
+function give_email_tag_username($payment_id) {
+	$payment_data = give_get_payment_meta($payment_id);
+	if (empty($payment_data['user_info'])) {
 		return '';
 	}
-	$email_name = give_get_email_names( $payment_data['user_info'] );
+	$email_name = give_get_email_names($payment_data['user_info']);
 
 	return $email_name['username'];
 }
@@ -409,8 +409,8 @@ 
  *
  * @return string user_email
  */
-function give_email_tag_user_email( $payment_id ) {
-	return give_get_payment_user_email( $payment_id );
+function give_email_tag_user_email($payment_id) {
+	return give_get_payment_user_email($payment_id);
 }
 
 /**
@@ -421,10 +421,10 @@ 
  *
  * @return string billing_address
  */
-function give_email_tag_billing_address( $payment_id ) {
+function give_email_tag_billing_address($payment_id) {
 
-	$user_info    = give_get_payment_meta_user_info( $payment_id );
-	$user_address = ! empty( $user_info['address'] ) ? $user_info['address'] : array(
+	$user_info    = give_get_payment_meta_user_info($payment_id);
+	$user_address = ! empty($user_info['address']) ? $user_info['address'] : array(
 		'line1'   => '',
 		'line2'   => '',
 		'city'    => '',
@@ -433,11 +433,11 @@ 
 		'zip'     => ''
 	);
 
-	$return = $user_address['line1'] . "\n";
-	if ( ! empty( $user_address['line2'] ) ) {
-		$return .= $user_address['line2'] . "\n";
+	$return = $user_address['line1']."\n";
+	if ( ! empty($user_address['line2'])) {
+		$return .= $user_address['line2']."\n";
 	}
-	$return .= $user_address['city'] . ' ' . $user_address['zip'] . ' ' . $user_address['state'] . "\n";
+	$return .= $user_address['city'].' '.$user_address['zip'].' '.$user_address['state']."\n";
 	$return .= $user_address['country'];
 
 	return $return;
@@ -451,10 +451,10 @@ 
  *
  * @return string date
  */
-function give_email_tag_date( $payment_id ) {
-	$payment_data = give_get_payment_meta( $payment_id );
+function give_email_tag_date($payment_id) {
+	$payment_data = give_get_payment_meta($payment_id);
 
-	return date_i18n( get_option( 'date_format' ), strtotime( $payment_data['date'] ) );
+	return date_i18n(get_option('date_format'), strtotime($payment_data['date']));
 }
 
 /**
@@ -465,10 +465,10 @@ 
  *
  * @return string price
  */
-function give_email_tag_price( $payment_id ) {
-	$price = give_currency_filter( give_format_amount( give_get_payment_amount( $payment_id ) ), give_get_payment_currency_code( $payment_id ) );
+function give_email_tag_price($payment_id) {
+	$price = give_currency_filter(give_format_amount(give_get_payment_amount($payment_id)), give_get_payment_currency_code($payment_id));
 
-	return html_entity_decode( $price, ENT_COMPAT, 'UTF-8' );
+	return html_entity_decode($price, ENT_COMPAT, 'UTF-8');
 }
 
 /**
@@ -479,8 +479,8 @@ 
  *
  * @return int payment_id
  */
-function give_email_tag_payment_id( $payment_id ) {
-	return give_get_payment_number( $payment_id );
+function give_email_tag_payment_id($payment_id) {
+	return give_get_payment_number($payment_id);
 }
 
 /**
@@ -491,8 +491,8 @@ 
  *
  * @return string receipt_id
  */
-function give_email_tag_receipt_id( $payment_id ) {
-	return give_get_payment_key( $payment_id );
+function give_email_tag_receipt_id($payment_id) {
+	return give_get_payment_key($payment_id);
 }
 
 /**
@@ -503,9 +503,9 @@ 
  *
  * @return string $form_title
  */
-function give_email_tag_donation( $payment_id ) {
-	$payment_data = give_get_payment_meta( $payment_id );
-	$form_title   = ( ! empty( $payment_data['form_title'] ) ? $payment_data['form_title'] : __( 'There was an error retrieving this donation title', 'give' ) );
+function give_email_tag_donation($payment_id) {
+	$payment_data = give_get_payment_meta($payment_id);
+	$form_title   = ( ! empty($payment_data['form_title']) ? $payment_data['form_title'] : __('There was an error retrieving this donation title', 'give'));
 
 	return $form_title;
 }
@@ -518,8 +518,8 @@ 
  *
  * @return string gateway
  */
-function give_email_tag_payment_method( $payment_id ) {
-	return give_get_gateway_checkout_label( give_get_payment_gateway( $payment_id ) );
+function give_email_tag_payment_method($payment_id) {
+	return give_get_gateway_checkout_label(give_get_payment_gateway($payment_id));
 }
 
 /**
@@ -530,8 +530,8 @@ 
  *
  * @return string sitename
  */
-function give_email_tag_sitename( $payment_id ) {
-	return wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES );
+function give_email_tag_sitename($payment_id) {
+	return wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES);
 }
 
 /**
@@ -543,15 +543,15 @@ 
  *
  * @return string receipt_link
  */
-function give_email_tag_receipt_link( $payment_id ) {
+function give_email_tag_receipt_link($payment_id) {
 
-	$receipt_url = esc_url( add_query_arg( array(
-		'payment_key' => give_get_payment_key( $payment_id ),
+	$receipt_url = esc_url(add_query_arg(array(
+		'payment_key' => give_get_payment_key($payment_id),
 		'give_action' => 'view_receipt'
-	), home_url() ) );
-	$formatted   = sprintf( __( '%1$sView it in your browser %2$s', 'give' ), '<a href="' . $receipt_url . '">', '&raquo;</a>' );
+	), home_url()));
+	$formatted = sprintf(__('%1$sView it in your browser %2$s', 'give'), '<a href="'.$receipt_url.'">', '&raquo;</a>');
 
-	if ( give_get_option( 'email_template' ) !== 'none' ) {
+	if (give_get_option('email_template') !== 'none') {
 		return $formatted;
 	} else {
 		return $receipt_url;