WordImpress / Give

includes/admin/upgrades/upgrades.php

Spacing +17 added lines, -17 removed lines

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

Braces +5 added lines, -2 removed lines

@@ -64,11 +64,14 @@
 				}, 250 );
 			</script>
 
-		<?php else : ?>
+		<?php else {
+	: ?>
 
 			<div id="give-upgrade-status">
 				<p style="font-size: 20px;max-width: 900px;">
-					<?php _e( 'The upgrade process has started, please be patient and do not close this window or navigate away from this page. This could take several minutes depending on the upgrade and the size of your website. You will be automatically redirected when the upgrade is finished.', 'give' ); ?>
+					<?php _e( 'The upgrade process has started, please be patient and do not close this window or navigate away from this page. This could take several minutes depending on the upgrade and the size of your website. You will be automatically redirected when the upgrade is finished.', 'give' );
+}
+?>
 					<img src="<?php echo GIVE_PLUGIN_URL . '/assets/images/spinner.gif'; ?>" id="give-upgrade-loader" style="  position: relative; top: 3px; left: 6px;" />
 				</p>
 			</div>

includes/admin/welcome.php

Indentation +9 added lines, -9 removed lines

@@ -1,14 +1,14 @@
 <?php
 /**
- * Give Welcome Page Class
- *
- * @description Displays on plugin activation
- * @package     Give
- * @subpackage  Admin/Welcome
- * @copyright   Copyright (c) 2015, WordImpress
- * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
- * @since       1.0
- */
+	 * Give Welcome Page Class
+	 *
+	 * @description Displays on plugin activation
+	 * @package     Give
+	 * @subpackage  Admin/Welcome
+	 * @copyright   Copyright (c) 2015, WordImpress
+	 * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+	 * @since       1.0
+	 */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {

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/ajax-functions.php

Spacing +66 added lines, -66 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,27 +25,27 @@ 
 function give_test_ajax_works() {
 
 	// Check if the Airplane Mode plugin is installed
-	if ( class_exists( 'Airplane_Mode_Core' ) ) {
+	if (class_exists('Airplane_Mode_Core')) {
 
 		$airplane = Airplane_Mode_Core::getInstance();
 
-		if ( method_exists( $airplane, 'enabled' ) ) {
+		if (method_exists($airplane, 'enabled')) {
 
-			if ( $airplane->enabled() ) {
+			if ($airplane->enabled()) {
 				return true;
 			}
 
 		} else {
 
-			if ( $airplane->check_status() == 'on' ) {
+			if ($airplane->check_status() == 'on') {
 				return true;
 			}
 		}
 	}
 
-	add_filter( 'block_local_requests', '__return_false' );
+	add_filter('block_local_requests', '__return_false');
 
-	if ( get_transient( '_give_ajax_works' ) ) {
+	if (get_transient('_give_ajax_works')) {
 		return true;
 	}
 
@@ -57,35 +57,35 @@ 
 		)
 	);
 
-	$ajax  = wp_remote_post( give_get_ajax_url(), $params );
+	$ajax  = wp_remote_post(give_get_ajax_url(), $params);
 	$works = true;
 
-	if ( is_wp_error( $ajax ) ) {
+	if (is_wp_error($ajax)) {
 
 		$works = false;
 
 	} else {
 
-		if( empty( $ajax['response'] ) ) {
+		if (empty($ajax['response'])) {
 			$works = false;
 		}
 
-		if( empty( $ajax['response']['code'] ) || 200 !== (int) $ajax['response']['code'] ) {
+		if (empty($ajax['response']['code']) || 200 !== (int) $ajax['response']['code']) {
 			$works = false;
 		}
 
-		if( empty( $ajax['response']['message'] ) || 'OK' !== $ajax['response']['message'] ) {
+		if (empty($ajax['response']['message']) || 'OK' !== $ajax['response']['message']) {
 			$works = false;
 		}
 
-		if( ! isset( $ajax['body'] ) || 0 !== (int) $ajax['body'] ) {
+		if ( ! isset($ajax['body']) || 0 !== (int) $ajax['body']) {
 			$works = false;
 		}
 
 	}
 
-	if ( $works ) {
-		set_transient( '_give_ajax_works', '1', DAY_IN_SECONDS );
+	if ($works) {
+		set_transient('_give_ajax_works', '1', DAY_IN_SECONDS);
 	}
 
 	return $works;
@@ -99,16 +99,16 @@ 
  * @return string
  */
 function give_get_ajax_url() {
-	$scheme = defined( 'FORCE_SSL_ADMIN' ) && FORCE_SSL_ADMIN ? 'https' : 'admin';
+	$scheme = defined('FORCE_SSL_ADMIN') && FORCE_SSL_ADMIN ? 'https' : 'admin';
 
 	$current_url = give_get_current_page_url();
-	$ajax_url    = admin_url( 'admin-ajax.php', $scheme );
+	$ajax_url    = admin_url('admin-ajax.php', $scheme);
 
-	if ( preg_match( '/^https/', $current_url ) && ! preg_match( '/^https/', $ajax_url ) ) {
-		$ajax_url = preg_replace( '/^http/', 'https', $ajax_url );
+	if (preg_match('/^https/', $current_url) && ! preg_match('/^https/', $ajax_url)) {
+		$ajax_url = preg_replace('/^http/', 'https', $ajax_url);
 	}
 
-	return apply_filters( 'give_ajax_url', $ajax_url );
+	return apply_filters('give_ajax_url', $ajax_url);
 }
 
 /**
@@ -118,11 +118,11 @@ 
  * @return void
  */
 function give_load_checkout_login_fields() {
-	do_action( 'give_purchase_form_login_fields' );
+	do_action('give_purchase_form_login_fields');
 	give_die();
 }
 
-add_action( 'wp_ajax_nopriv_give_checkout_login', 'give_load_checkout_login_fields' );
+add_action('wp_ajax_nopriv_give_checkout_login', 'give_load_checkout_login_fields');
 
 /**
  * Load Checkout Register Fields via AJAX
@@ -131,11 +131,11 @@ 
  * @return void
  */
 function give_load_checkout_register_fields() {
-	do_action( 'give_purchase_form_register_fields' );
+	do_action('give_purchase_form_register_fields');
 	give_die();
 }
 
-add_action( 'wp_ajax_nopriv_checkout_register', 'give_load_checkout_register_fields' );
+add_action('wp_ajax_nopriv_checkout_register', 'give_load_checkout_register_fields');
 
 /**
  * Get Form Title via AJAX (used only in WordPress Admin)
@@ -144,9 +144,9 @@ 
  * @return void
  */
 function give_ajax_get_form_title() {
-	if ( isset( $_POST['form_id'] ) ) {
-		$title = get_the_title( $_POST['form_id'] );
-		if ( $title ) {
+	if (isset($_POST['form_id'])) {
+		$title = get_the_title($_POST['form_id']);
+		if ($title) {
 			echo $title;
 		} else {
 			echo 'fail';
@@ -155,8 +155,8 @@ 
 	give_die();
 }
 
-add_action( 'wp_ajax_give_get_form_title', 'give_ajax_get_form_title' );
-add_action( 'wp_ajax_nopriv_give_get_form_title', 'give_ajax_get_form_title' );
+add_action('wp_ajax_give_get_form_title', 'give_ajax_get_form_title');
+add_action('wp_ajax_nopriv_give_get_form_title', 'give_ajax_get_form_title');
 
 /**
  * Retrieve a states drop down
@@ -166,23 +166,23 @@ 
  */
 function give_ajax_get_states_field() {
 
-	if ( empty( $_POST['country'] ) ) {
+	if (empty($_POST['country'])) {
 		$_POST['country'] = give_get_country();
 	}
-	$states = give_get_states( $_POST['country'] );
+	$states = give_get_states($_POST['country']);
 
-	if ( ! empty( $states ) ) {
+	if ( ! empty($states)) {
 
 		$args = array(
 			'name'             => $_POST['field_name'],
 			'id'               => $_POST['field_name'],
-			'class'            => $_POST['field_name'] . '  give-select',
-			'options'          => give_get_states( $_POST['country'] ),
+			'class'            => $_POST['field_name'].'  give-select',
+			'options'          => give_get_states($_POST['country']),
 			'show_option_all'  => false,
 			'show_option_none' => false
 		);
 
-		$response = Give()->html->select( $args );
+		$response = Give()->html->select($args);
 
 	} else {
 
@@ -194,8 +194,8 @@ 
 	give_die();
 }
 
-add_action( 'wp_ajax_give_get_states', 'give_ajax_get_states_field' );
-add_action( 'wp_ajax_nopriv_give_get_states', 'give_ajax_get_states_field' );
+add_action('wp_ajax_give_get_states', 'give_ajax_get_states_field');
+add_action('wp_ajax_nopriv_give_get_states', 'give_ajax_get_states_field');
 
 /**
  * Retrieve a states drop down
@@ -206,17 +206,17 @@ 
 function give_ajax_form_search() {
 	global $wpdb;
 
-	$search  = esc_sql( sanitize_text_field( $_GET['s'] ) );
+	$search  = esc_sql(sanitize_text_field($_GET['s']));
 	$results = array();
-	if ( current_user_can( 'edit_give_forms' ) ) {
-		$items = $wpdb->get_results( "SELECT ID,post_title FROM $wpdb->posts WHERE `post_type` = 'give_forms' AND `post_title` LIKE '%$search%' LIMIT 50" );
+	if (current_user_can('edit_give_forms')) {
+		$items = $wpdb->get_results("SELECT ID,post_title FROM $wpdb->posts WHERE `post_type` = 'give_forms' AND `post_title` LIKE '%$search%' LIMIT 50");
 	} else {
-		$items = $wpdb->get_results( "SELECT ID,post_title FROM $wpdb->posts WHERE `post_type` = 'give_forms' AND `post_status` = 'publish' AND `post_title` LIKE '%$search%' LIMIT 50" );
+		$items = $wpdb->get_results("SELECT ID,post_title FROM $wpdb->posts WHERE `post_type` = 'give_forms' AND `post_status` = 'publish' AND `post_title` LIKE '%$search%' LIMIT 50");
 	}
 
-	if ( $items ) {
+	if ($items) {
 
-		foreach ( $items as $item ) {
+		foreach ($items as $item) {
 
 			$results[] = array(
 				'id'   => $item->ID,
@@ -228,18 +228,18 @@ 
 
 		$items[] = array(
 			'id'   => 0,
-			'name' => __( 'No results found', 'give' )
+			'name' => __('No results found', 'give')
 		);
 
 	}
 
-	echo json_encode( $results );
+	echo json_encode($results);
 
 	give_die();
 }
 
-add_action( 'wp_ajax_give_form_search', 'give_ajax_form_search' );
-add_action( 'wp_ajax_nopriv_give_form_search', 'give_ajax_form_search' );
+add_action('wp_ajax_give_form_search', 'give_ajax_form_search');
+add_action('wp_ajax_nopriv_give_form_search', 'give_ajax_form_search');
 
 /**
  * Search the donors database via Ajax
@@ -250,21 +250,21 @@ 
 function give_ajax_donor_search() {
 	global $wpdb;
 
-	$search  = esc_sql( sanitize_text_field( $_GET['s'] ) );
+	$search  = esc_sql(sanitize_text_field($_GET['s']));
 	$results = array();
-	if ( ! current_user_can( 'view_give_reports' ) ) {
+	if ( ! current_user_can('view_give_reports')) {
 		$donors = array();
 	} else {
-		$donors = $wpdb->get_results( "SELECT id,name,email FROM {$wpdb->prefix}give_donors WHERE `name` LIKE '%$search%' OR `email` LIKE '%$search%' LIMIT 50" );
+		$donors = $wpdb->get_results("SELECT id,name,email FROM {$wpdb->prefix}give_donors WHERE `name` LIKE '%$search%' OR `email` LIKE '%$search%' LIMIT 50");
 	}
 
-	if ( $donors ) {
+	if ($donors) {
 
-		foreach ( $donors as $donor ) {
+		foreach ($donors as $donor) {
 
 			$results[] = array(
 				'id'   => $donor->id,
-				'name' => $donor->name . '(' . $donor->email . ')'
+				'name' => $donor->name.'('.$donor->email.')'
 			);
 		}
 
@@ -272,17 +272,17 @@ 
 
 		$donors[] = array(
 			'id'   => 0,
-			'name' => __( 'No results found', 'give' )
+			'name' => __('No results found', 'give')
 		);
 
 	}
 
-	echo json_encode( $results );
+	echo json_encode($results);
 
 	give_die();
 }
 
-add_action( 'wp_ajax_give_donor_search', 'give_ajax_donor_search' );
+add_action('wp_ajax_give_donor_search', 'give_ajax_donor_search');
 
 
 /**
@@ -293,30 +293,30 @@ 
  */
 function give_ajax_search_users() {
 
-	if ( current_user_can( 'manage_give_settings' ) ) {
+	if (current_user_can('manage_give_settings')) {
 
-		$search_query = trim( $_POST['user_name'] );
+		$search_query = trim($_POST['user_name']);
 
-		$found_users = get_users( array(
+		$found_users = get_users(array(
 				'number' => 9999,
-				'search' => $search_query . '*'
+				'search' => $search_query.'*'
 			)
 		);
 
 		$user_list = '<ul>';
-		if ( $found_users ) {
-			foreach ( $found_users as $user ) {
-				$user_list .= '<li><a href="#" data-login="' . esc_attr( $user->user_login ) . '">' . esc_html( $user->user_login ) . '</a></li>';
+		if ($found_users) {
+			foreach ($found_users as $user) {
+				$user_list .= '<li><a href="#" data-login="'.esc_attr($user->user_login).'">'.esc_html($user->user_login).'</a></li>';
 			}
 		} else {
-			$user_list .= '<li>' . __( 'No users found', 'give' ) . '</li>';
+			$user_list .= '<li>'.__('No users found', 'give').'</li>';
 		}
 		$user_list .= '</ul>';
 
-		echo json_encode( array( 'results' => $user_list ) );
+		echo json_encode(array('results' => $user_list));
 
 	}
 	die();
 }
 
-add_action( 'wp_ajax_give_search_users', 'give_ajax_search_users' );
\ No newline at end of file
+add_action('wp_ajax_give_search_users', 'give_ajax_search_users');
\ No newline at end of file

includes/api/class-give-api-v1.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined('ABSPATH')) exit;
 
 /**
  * Give_API_V1 Class

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Give_API_V1 Class

includes/class-give-customer.php

Spacing +126 added lines, -126 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -96,29 +96,29 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function __construct( $_id_or_email = false, $by_user_id = false ) {
+	public function __construct($_id_or_email = false, $by_user_id = false) {
 
 		$this->db = new Give_DB_Customers;
 
-		if ( false === $_id_or_email || ( is_numeric( $_id_or_email ) && (int) $_id_or_email !== absint( $_id_or_email ) ) ) {
+		if (false === $_id_or_email || (is_numeric($_id_or_email) && (int) $_id_or_email !== absint($_id_or_email))) {
 			return false;
 		}
 
-		$by_user_id = is_bool( $by_user_id ) ? $by_user_id : false;
+		$by_user_id = is_bool($by_user_id) ? $by_user_id : false;
 
-		if ( is_numeric( $_id_or_email ) ) {
+		if (is_numeric($_id_or_email)) {
 			$field = $by_user_id ? 'user_id' : 'id';
 		} else {
 			$field = 'email';
 		}
 
-		$customer = $this->db->get_customer_by( $field, $_id_or_email );
+		$customer = $this->db->get_customer_by($field, $_id_or_email);
 
-		if ( empty( $customer ) || ! is_object( $customer ) ) {
+		if (empty($customer) || ! is_object($customer)) {
 			return false;
 		}
 
-		$this->setup_customer( $customer );
+		$this->setup_customer($customer);
 
 	}
 
@@ -131,15 +131,15 @@ 
 	 *
 	 * @return bool             If the setup was successful or not
 	 */
-	private function setup_customer( $customer ) {
+	private function setup_customer($customer) {
 
-		if ( ! is_object( $customer ) ) {
+		if ( ! is_object($customer)) {
 			return false;
 		}
 
-		foreach ( $customer as $key => $value ) {
+		foreach ($customer as $key => $value) {
 
-			switch ( $key ) {
+			switch ($key) {
 
 				case 'notes':
 					$this->$key = $this->get_notes();
@@ -154,7 +154,7 @@ 
 		}
 
 		// Customer ID and email are the only things that are necessary, make sure they exist
-		if ( ! empty( $this->id ) && ! empty( $this->email ) ) {
+		if ( ! empty($this->id) && ! empty($this->email)) {
 			return true;
 		}
 
@@ -167,15 +167,15 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function __get( $key ) {
+	public function __get($key) {
 
-		if ( method_exists( $this, 'get_' . $key ) ) {
+		if (method_exists($this, 'get_'.$key)) {
 
-			return call_user_func( array( $this, 'get_' . $key ) );
+			return call_user_func(array($this, 'get_'.$key));
 
 		} else {
 
-			return new WP_Error( 'give-customer-invalid-property', sprintf( __( 'Can\'t get property %s', 'give' ), $key ) );
+			return new WP_Error('give-customer-invalid-property', sprintf(__('Can\'t get property %s', 'give'), $key));
 
 		}
 
@@ -190,9 +190,9 @@ 
 	 *
 	 * @return mixed        False if not a valid creation, Customer ID if user is found or valid creation
 	 */
-	public function create( $data = array() ) {
+	public function create($data = array()) {
 
-		if ( $this->id != 0 || empty( $data ) ) {
+		if ($this->id != 0 || empty($data)) {
 			return false;
 		}
 
@@ -200,34 +200,34 @@ 
 			'payment_ids' => ''
 		);
 
-		$args = wp_parse_args( $data, $defaults );
-		$args = $this->sanitize_columns( $args );
+		$args = wp_parse_args($data, $defaults);
+		$args = $this->sanitize_columns($args);
 
-		if ( empty( $args['email'] ) || ! is_email( $args['email'] ) ) {
+		if (empty($args['email']) || ! is_email($args['email'])) {
 			return false;
 		}
 
-		if ( ! empty( $args['payment_ids'] ) && is_array( $args['payment_ids'] ) ) {
-			$args['payment_ids'] = implode( ',', array_unique( array_values( $args['payment_ids'] ) ) );
+		if ( ! empty($args['payment_ids']) && is_array($args['payment_ids'])) {
+			$args['payment_ids'] = implode(',', array_unique(array_values($args['payment_ids'])));
 		}
 
-		do_action( 'give_customer_pre_create', $args );
+		do_action('give_customer_pre_create', $args);
 
 		$created = false;
 
 		// The DB class 'add' implies an update if the customer being asked to be created already exists
-		if ( $this->db->add( $data ) ) {
+		if ($this->db->add($data)) {
 
 			// We've successfully added/updated the customer, reset the class vars with the new data
-			$customer = $this->db->get_customer_by( 'email', $args['email'] );
+			$customer = $this->db->get_customer_by('email', $args['email']);
 
 			// Setup the customer data with the values from DB
-			$this->setup_customer( $customer );
+			$this->setup_customer($customer);
 
 			$created = $this->id;
 		}
 
-		do_action( 'give_customer_post_create', $created, $args );
+		do_action('give_customer_post_create', $created, $args);
 
 		return $created;
 
@@ -242,27 +242,27 @@ 
 	 *
 	 * @return bool         If the update was successful or not
 	 */
-	public function update( $data = array() ) {
+	public function update($data = array()) {
 
-		if ( empty( $data ) ) {
+		if (empty($data)) {
 			return false;
 		}
 
-		$data = $this->sanitize_columns( $data );
+		$data = $this->sanitize_columns($data);
 
-		do_action( 'give_customer_pre_update', $this->id, $data );
+		do_action('give_customer_pre_update', $this->id, $data);
 
 		$updated = false;
 
-		if ( $this->db->update( $this->id, $data ) ) {
+		if ($this->db->update($this->id, $data)) {
 
-			$customer = $this->db->get_customer_by( 'id', $this->id );
-			$this->setup_customer( $customer );
+			$customer = $this->db->get_customer_by('id', $this->id);
+			$this->setup_customer($customer);
 
 			$updated = true;
 		}
 
-		do_action( 'give_customer_post_update', $updated, $this->id, $data );
+		do_action('give_customer_post_update', $updated, $this->id, $data);
 
 		return $updated;
 	}
@@ -278,44 +278,44 @@ 
 	 *
 	 * @return bool            If the attachment was successfuly
 	 */
-	public function attach_payment( $payment_id = 0, $update_stats = true ) {
+	public function attach_payment($payment_id = 0, $update_stats = true) {
 
-		if ( empty( $payment_id ) ) {
+		if (empty($payment_id)) {
 			return false;
 		}
 
-		if ( empty( $this->payment_ids ) ) {
+		if (empty($this->payment_ids)) {
 
 			$new_payment_ids = $payment_id;
 
 		} else {
 
-			$payment_ids = array_map( 'absint', explode( ',', $this->payment_ids ) );
+			$payment_ids = array_map('absint', explode(',', $this->payment_ids));
 
-			if ( in_array( $payment_id, $payment_ids ) ) {
+			if (in_array($payment_id, $payment_ids)) {
 				$update_stats = false;
 			}
 
 			$payment_ids[] = $payment_id;
 
-			$new_payment_ids = implode( ',', array_unique( array_values( $payment_ids ) ) );
+			$new_payment_ids = implode(',', array_unique(array_values($payment_ids)));
 
 		}
 
-		do_action( 'give_customer_pre_attach_payment', $payment_id, $this->id );
+		do_action('give_customer_pre_attach_payment', $payment_id, $this->id);
 
-		$payment_added = $this->update( array( 'payment_ids' => $new_payment_ids ) );
+		$payment_added = $this->update(array('payment_ids' => $new_payment_ids));
 
-		if ( $payment_added ) {
+		if ($payment_added) {
 
 			$this->payment_ids = $new_payment_ids;
 
 			// We added this payment successfully, increment the stats
-			if ( $update_stats ) {
-				$payment_amount = give_get_payment_amount( $payment_id );
+			if ($update_stats) {
+				$payment_amount = give_get_payment_amount($payment_id);
 
-				if ( ! empty( $payment_amount ) ) {
-					$this->increase_value( $payment_amount );
+				if ( ! empty($payment_amount)) {
+					$this->increase_value($payment_amount);
 				}
 
 				$this->increase_purchase_count();
@@ -323,7 +323,7 @@ 
 
 		}
 
-		do_action( 'give_customer_post_attach_payment', $payment_added, $payment_id, $this->id );
+		do_action('give_customer_post_attach_payment', $payment_added, $payment_id, $this->id);
 
 		return $payment_added;
 	}
@@ -339,44 +339,44 @@ 
 	 *
 	 * @return boolean             If the removal was successful
 	 */
-	public function remove_payment( $payment_id = 0, $update_stats = true ) {
+	public function remove_payment($payment_id = 0, $update_stats = true) {
 
-		if ( empty( $payment_id ) ) {
+		if (empty($payment_id)) {
 			return false;
 		}
 
 		$new_payment_ids = '';
 
-		if ( ! empty( $this->payment_ids ) ) {
+		if ( ! empty($this->payment_ids)) {
 
-			$payment_ids = array_map( 'absint', explode( ',', $this->payment_ids ) );
+			$payment_ids = array_map('absint', explode(',', $this->payment_ids));
 
-			$pos = array_search( $payment_id, $payment_ids );
-			if ( false === $pos ) {
+			$pos = array_search($payment_id, $payment_ids);
+			if (false === $pos) {
 				return false;
 			}
 
-			unset( $payment_ids[ $pos ] );
-			$payment_ids = array_filter( $payment_ids );
+			unset($payment_ids[$pos]);
+			$payment_ids = array_filter($payment_ids);
 
-			$new_payment_ids = implode( ',', array_unique( array_values( $payment_ids ) ) );
+			$new_payment_ids = implode(',', array_unique(array_values($payment_ids)));
 
 		}
 
-		do_action( 'give_customer_pre_remove_payment', $payment_id, $this->id );
+		do_action('give_customer_pre_remove_payment', $payment_id, $this->id);
 
-		$payment_removed = $this->update( array( 'payment_ids' => $new_payment_ids ) );
+		$payment_removed = $this->update(array('payment_ids' => $new_payment_ids));
 
-		if ( $payment_removed ) {
+		if ($payment_removed) {
 
 			$this->payment_ids = $new_payment_ids;
 
-			if ( $update_stats ) {
+			if ($update_stats) {
 				// We removed this payment successfully, decrement the stats
-				$payment_amount = give_get_payment_amount( $payment_id );
+				$payment_amount = give_get_payment_amount($payment_id);
 
-				if ( ! empty( $payment_amount ) ) {
-					$this->decrease_value( $payment_amount );
+				if ( ! empty($payment_amount)) {
+					$this->decrease_value($payment_amount);
 				}
 
 				$this->decrease_purchase_count();
@@ -384,7 +384,7 @@ 
 
 		}
 
-		do_action( 'give_customer_post_remove_payment', $payment_removed, $payment_id, $this->id );
+		do_action('give_customer_post_remove_payment', $payment_removed, $payment_id, $this->id);
 
 		return $payment_removed;
 
@@ -399,22 +399,22 @@ 
 	 *
 	 * @return int            The purchase count
 	 */
-	public function increase_purchase_count( $count = 1 ) {
+	public function increase_purchase_count($count = 1) {
 
 		// Make sure it's numeric and not negative
-		if ( ! is_numeric( $count ) || $count != absint( $count ) ) {
+		if ( ! is_numeric($count) || $count != absint($count)) {
 			return false;
 		}
 
 		$new_total = (int) $this->purchase_count + (int) $count;
 
-		do_action( 'give_customer_pre_increase_purchase_count', $count, $this->id );
+		do_action('give_customer_pre_increase_purchase_count', $count, $this->id);
 
-		if ( $this->update( array( 'purchase_count' => $new_total ) ) ) {
+		if ($this->update(array('purchase_count' => $new_total))) {
 			$this->purchase_count = $new_total;
 		}
 
-		do_action( 'give_customer_post_increase_purchase_count', $this->purchase_count, $count, $this->id );
+		do_action('give_customer_post_increase_purchase_count', $this->purchase_count, $count, $this->id);
 
 		return $this->purchase_count;
 	}
@@ -428,26 +428,26 @@ 
 	 *
 	 * @return mixed          If successful, the new count, otherwise false
 	 */
-	public function decrease_purchase_count( $count = 1 ) {
+	public function decrease_purchase_count($count = 1) {
 
 		// Make sure it's numeric and not negative
-		if ( ! is_numeric( $count ) || $count != absint( $count ) ) {
+		if ( ! is_numeric($count) || $count != absint($count)) {
 			return false;
 		}
 
 		$new_total = (int) $this->purchase_count - (int) $count;
 
-		if ( $new_total < 0 ) {
+		if ($new_total < 0) {
 			$new_total = 0;
 		}
 
-		do_action( 'give_customer_pre_decrease_purchase_count', $count, $this->id );
+		do_action('give_customer_pre_decrease_purchase_count', $count, $this->id);
 
-		if ( $this->update( array( 'purchase_count' => $new_total ) ) ) {
+		if ($this->update(array('purchase_count' => $new_total))) {
 			$this->purchase_count = $new_total;
 		}
 
-		do_action( 'give_customer_post_decrease_purchase_count', $this->purchase_count, $count, $this->id );
+		do_action('give_customer_post_decrease_purchase_count', $this->purchase_count, $count, $this->id);
 
 		return $this->purchase_count;
 	}
@@ -461,17 +461,17 @@ 
 	 *
 	 * @return mixed         If successful, the new value, otherwise false
 	 */
-	public function increase_value( $value = 0.00 ) {
+	public function increase_value($value = 0.00) {
 
-		$new_value = floatval( $this->purchase_value ) + $value;
+		$new_value = floatval($this->purchase_value) + $value;
 
-		do_action( 'give_customer_pre_increase_value', $value, $this->id );
+		do_action('give_customer_pre_increase_value', $value, $this->id);
 
-		if ( $this->update( array( 'purchase_value' => $new_value ) ) ) {
+		if ($this->update(array('purchase_value' => $new_value))) {
 			$this->purchase_value = $new_value;
 		}
 
-		do_action( 'give_customer_post_increase_value', $this->purchase_value, $value, $this->id );
+		do_action('give_customer_post_increase_value', $this->purchase_value, $value, $this->id);
 
 		return $this->purchase_value;
 	}
@@ -485,21 +485,21 @@ 
 	 *
 	 * @return mixed         If successful, the new value, otherwise false
 	 */
-	public function decrease_value( $value = 0.00 ) {
+	public function decrease_value($value = 0.00) {
 
-		$new_value = floatval( $this->purchase_value ) - $value;
+		$new_value = floatval($this->purchase_value) - $value;
 
-		if ( $new_value < 0 ) {
+		if ($new_value < 0) {
 			$new_value = 0.00;
 		}
 
-		do_action( 'give_customer_pre_decrease_value', $value, $this->id );
+		do_action('give_customer_pre_decrease_value', $value, $this->id);
 
-		if ( $this->update( array( 'purchase_value' => $new_value ) ) ) {
+		if ($this->update(array('purchase_value' => $new_value))) {
 			$this->purchase_value = $new_value;
 		}
 
-		do_action( 'give_customer_post_decrease_value', $this->purchase_value, $value, $this->id );
+		do_action('give_customer_post_decrease_value', $this->purchase_value, $value, $this->id);
 
 		return $this->purchase_value;
 	}
@@ -514,15 +514,15 @@ 
 	 *
 	 * @return array           The notes requsted
 	 */
-	public function get_notes( $length = 20, $paged = 1 ) {
+	public function get_notes($length = 20, $paged = 1) {
 
-		$length = is_numeric( $length ) ? $length : 20;
-		$offset = is_numeric( $paged ) && $paged != 1 ? ( ( absint( $paged ) - 1 ) * $length ) : 0;
+		$length = is_numeric($length) ? $length : 20;
+		$offset = is_numeric($paged) && $paged != 1 ? ((absint($paged) - 1) * $length) : 0;
 
 		$all_notes   = $this->get_raw_notes();
-		$notes_array = array_reverse( array_filter( explode( "\n\n", $all_notes ) ) );
+		$notes_array = array_reverse(array_filter(explode("\n\n", $all_notes)));
 
-		$desired_notes = array_slice( $notes_array, $offset, $length );
+		$desired_notes = array_slice($notes_array, $offset, $length);
 
 		return $desired_notes;
 
@@ -537,9 +537,9 @@ 
 	public function get_notes_count() {
 
 		$all_notes   = $this->get_raw_notes();
-		$notes_array = array_reverse( array_filter( explode( "\n\n", $all_notes ) ) );
+		$notes_array = array_reverse(array_filter(explode("\n\n", $all_notes)));
 
-		return count( $notes_array );
+		return count($notes_array);
 
 	}
 
@@ -552,32 +552,32 @@ 
 	 *
 	 * @return string|boolean The new note if added succesfully, false otherwise
 	 */
-	public function add_note( $note = '' ) {
+	public function add_note($note = '') {
 
-		$note = trim( $note );
-		if ( empty( $note ) ) {
+		$note = trim($note);
+		if (empty($note)) {
 			return false;
 		}
 
 		$notes = $this->get_raw_notes();
 
-		if ( empty( $notes ) ) {
+		if (empty($notes)) {
 			$notes = '';
 		}
 
-		$note_string = date_i18n( 'F j, Y H:i:s', current_time( 'timestamp' ) ) . ' - ' . $note;
-		$new_note    = apply_filters( 'give_customer_add_note_string', $note_string );
-		$notes .= "\n\n" . $new_note;
+		$note_string = date_i18n('F j, Y H:i:s', current_time('timestamp')).' - '.$note;
+		$new_note    = apply_filters('give_customer_add_note_string', $note_string);
+		$notes .= "\n\n".$new_note;
 
-		do_action( 'give_customer_pre_add_note', $new_note, $this->id );
+		do_action('give_customer_pre_add_note', $new_note, $this->id);
 
-		$updated = $this->update( array( 'notes' => $notes ) );
+		$updated = $this->update(array('notes' => $notes));
 
-		if ( $updated ) {
+		if ($updated) {
 			$this->notes = $this->get_notes();
 		}
 
-		do_action( 'give_customer_post_add_note', $this->notes, $new_note, $this->id );
+		do_action('give_customer_post_add_note', $this->notes, $new_note, $this->id);
 
 		// Return the formatted note, so we can test, as well as update any displays
 		return $new_note;
@@ -592,7 +592,7 @@ 
 	 */
 	private function get_raw_notes() {
 
-		$all_notes = $this->db->get_column( 'notes', $this->id );
+		$all_notes = $this->db->get_column('notes', $this->id);
 
 		return $all_notes;
 
@@ -607,51 +607,51 @@ 
 	 *
 	 * @return array       The sanitized data, based off column defaults
 	 */
-	private function sanitize_columns( $data ) {
+	private function sanitize_columns($data) {
 
 		$columns        = $this->db->get_columns();
 		$default_values = $this->db->get_column_defaults();
 
-		foreach ( $columns as $key => $type ) {
+		foreach ($columns as $key => $type) {
 
 			// Only sanitize data that we were provided
-			if ( ! array_key_exists( $key, $data ) ) {
+			if ( ! array_key_exists($key, $data)) {
 				continue;
 			}
 
-			switch ( $type ) {
+			switch ($type) {
 
 				case '%s':
-					if ( 'email' == $key ) {
-						$data[ $key ] = sanitize_email( $data[ $key ] );
-					} elseif ( 'notes' == $key ) {
-						$data[ $key ] = strip_tags( $data[ $key ] );
+					if ('email' == $key) {
+						$data[$key] = sanitize_email($data[$key]);
+					} elseif ('notes' == $key) {
+						$data[$key] = strip_tags($data[$key]);
 					} else {
-						$data[ $key ] = sanitize_text_field( $data[ $key ] );
+						$data[$key] = sanitize_text_field($data[$key]);
 					}
 					break;
 
 				case '%d':
-					if ( ! is_numeric( $data[ $key ] ) || (int) $data[ $key ] !== absint( $data[ $key ] ) ) {
-						$data[ $key ] = $default_values[ $key ];
+					if ( ! is_numeric($data[$key]) || (int) $data[$key] !== absint($data[$key])) {
+						$data[$key] = $default_values[$key];
 					} else {
-						$data[ $key ] = absint( $data[ $key ] );
+						$data[$key] = absint($data[$key]);
 					}
 					break;
 
 				case '%f':
 					// Convert what was given to a float
-					$value = floatval( $data[ $key ] );
+					$value = floatval($data[$key]);
 
-					if ( ! is_float( $value ) ) {
-						$data[ $key ] = $default_values[ $key ];
+					if ( ! is_float($value)) {
+						$data[$key] = $default_values[$key];
 					} else {
-						$data[ $key ] = $value;
+						$data[$key] = $value;
 					}
 					break;
 
 				default:
-					$data[ $key ] = sanitize_text_field( $data[ $key ] );
+					$data[$key] = sanitize_text_field($data[$key]);
 					break;
 
 			}

includes/class-give-db.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * Give DB base class
- *
- * @package     Give
- * @subpackage  Classes/Give DB
- * @copyright   Copyright (c) 2015, WordImpress
- * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
- * @since       1.0
- */
+	 * Give DB base class
+	 *
+	 * @package     Give
+	 * @subpackage  Classes/Give DB
+	 * @copyright   Copyright (c) 2015, WordImpress
+	 * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+	 * @since       1.0
+	 */
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 } // Exit if accessed directly

Spacing +34 added lines, -34 removed lines

@@ -8,7 +8,7 @@ 
  * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
  * @since       1.0
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 } // Exit if accessed directly
 
@@ -77,10 +77,10 @@ 
 	 * @since   1.0
 	 * @return  object
 	 */
-	public function get( $row_id ) {
+	public function get($row_id) {
 		global $wpdb;
 
-		return $wpdb->get_row( "SELECT * FROM $this->table_name WHERE $this->primary_key = $row_id LIMIT 1;" );
+		return $wpdb->get_row("SELECT * FROM $this->table_name WHERE $this->primary_key = $row_id LIMIT 1;");
 	}
 
 	/**
@@ -90,10 +90,10 @@ 
 	 * @since   1.0
 	 * @return  object
 	 */
-	public function get_by( $column, $row_id ) {
+	public function get_by($column, $row_id) {
 		global $wpdb;
 
-		return $wpdb->get_row( "SELECT * FROM $this->table_name WHERE $column = '$row_id' LIMIT 1;" );
+		return $wpdb->get_row("SELECT * FROM $this->table_name WHERE $column = '$row_id' LIMIT 1;");
 	}
 
 	/**
@@ -103,10 +103,10 @@ 
 	 * @since   1.0
 	 * @return  string
 	 */
-	public function get_column( $column, $row_id ) {
+	public function get_column($column, $row_id) {
 		global $wpdb;
 
-		return $wpdb->get_var( "SELECT $column FROM $this->table_name WHERE $this->primary_key = $row_id LIMIT 1;" );
+		return $wpdb->get_var("SELECT $column FROM $this->table_name WHERE $this->primary_key = $row_id LIMIT 1;");
 	}
 
 	/**
@@ -116,10 +116,10 @@ 
 	 * @since   1.0
 	 * @return  string
 	 */
-	public function get_column_by( $column, $column_where, $column_value ) {
+	public function get_column_by($column, $column_where, $column_value) {
 		global $wpdb;
 
-		return $wpdb->get_var( "SELECT $column FROM $this->table_name WHERE $column_where = '$column_value' LIMIT 1;" );
+		return $wpdb->get_var("SELECT $column FROM $this->table_name WHERE $column_where = '$column_value' LIMIT 1;");
 	}
 
 	/**
@@ -129,30 +129,30 @@ 
 	 * @since   1.0
 	 * @return  int
 	 */
-	public function insert( $data, $type = '' ) {
+	public function insert($data, $type = '') {
 		global $wpdb;
 
 		// Set default values
-		$data = wp_parse_args( $data, $this->get_column_defaults() );
+		$data = wp_parse_args($data, $this->get_column_defaults());
 
-		do_action( 'give_pre_insert_' . $type, $data );
+		do_action('give_pre_insert_'.$type, $data);
 
 		// Initialise column format array
 		$column_formats = $this->get_columns();
 
 		// Force fields to lower case
-		$data = array_change_key_case( $data );
+		$data = array_change_key_case($data);
 
 		// White list columns
-		$data = array_intersect_key( $data, $column_formats );
+		$data = array_intersect_key($data, $column_formats);
 
 		// Reorder $column_formats to match the order of columns given in $data
-		$data_keys      = array_keys( $data );
-		$column_formats = array_merge( array_flip( $data_keys ), $column_formats );
+		$data_keys      = array_keys($data);
+		$column_formats = array_merge(array_flip($data_keys), $column_formats);
 
-		$wpdb->insert( $this->table_name, $data, $column_formats );
+		$wpdb->insert($this->table_name, $data, $column_formats);
 
-		do_action( 'give_post_insert_' . $type, $wpdb->insert_id, $data );
+		do_action('give_post_insert_'.$type, $wpdb->insert_id, $data);
 
 		return $wpdb->insert_id;
 	}
@@ -164,18 +164,18 @@ 
 	 * @since   1.0
 	 * @return  bool
 	 */
-	public function update( $row_id, $data = array(), $where = '' ) {
+	public function update($row_id, $data = array(), $where = '') {
 
 		global $wpdb;
 
 		// Row ID must be positive integer
-		$row_id = absint( $row_id );
+		$row_id = absint($row_id);
 
-		if ( empty( $row_id ) ) {
+		if (empty($row_id)) {
 			return false;
 		}
 
-		if ( empty( $where ) ) {
+		if (empty($where)) {
 			$where = $this->primary_key;
 		}
 
@@ -183,16 +183,16 @@ 
 		$column_formats = $this->get_columns();
 
 		// Force fields to lower case
-		$data = array_change_key_case( $data );
+		$data = array_change_key_case($data);
 
 		// White list columns
-		$data = array_intersect_key( $data, $column_formats );
+		$data = array_intersect_key($data, $column_formats);
 
 		// Reorder $column_formats to match the order of columns given in $data
-		$data_keys      = array_keys( $data );
-		$column_formats = array_merge( array_flip( $data_keys ), $column_formats );
+		$data_keys      = array_keys($data);
+		$column_formats = array_merge(array_flip($data_keys), $column_formats);
 
-		if ( false === $wpdb->update( $this->table_name, $data, array( $where => $row_id ), $column_formats ) ) {
+		if (false === $wpdb->update($this->table_name, $data, array($where => $row_id), $column_formats)) {
 			return false;
 		}
 
@@ -206,18 +206,18 @@ 
 	 * @since   1.0
 	 * @return  bool
 	 */
-	public function delete( $row_id = 0 ) {
+	public function delete($row_id = 0) {
 
 		global $wpdb;
 
 		// Row ID must be positive integer
-		$row_id = absint( $row_id );
+		$row_id = absint($row_id);
 
-		if ( empty( $row_id ) ) {
+		if (empty($row_id)) {
 			return false;
 		}
 
-		if ( false === $wpdb->query( $wpdb->prepare( "DELETE FROM $this->table_name WHERE $this->primary_key = %d", $row_id ) ) ) {
+		if (false === $wpdb->query($wpdb->prepare("DELETE FROM $this->table_name WHERE $this->primary_key = %d", $row_id))) {
 			return false;
 		}
 
@@ -231,11 +231,11 @@ 
 	 * @param  string $table The table name
 	 * @return bool          If the table name exists
 	 */
-	public function table_exists( $table ) {
+	public function table_exists($table) {
 		global $wpdb;
-		$table = sanitize_text_field( $table );
+		$table = sanitize_text_field($table);
 		
-		return $wpdb->get_var( $wpdb->prepare( "SHOW TABLES LIKE '%s'", $table ) ) === $table;
+		return $wpdb->get_var($wpdb->prepare("SHOW TABLES LIKE '%s'", $table)) === $table;
 	}
 
 }

includes/class-give-donate-form.php

Spacing +62 added lines, -62 removed lines

@@ -63,37 +63,37 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function __construct( $_id = false, $_args = array() ) {
+	public function __construct($_id = false, $_args = array()) {
 
-		if ( false === $_id ) {
+		if (false === $_id) {
 
 			$defaults = array(
 				'post_type'   => 'give_forms',
 				'post_status' => 'draft',
-				'post_title'  => __( 'New Give Form', 'give' )
+				'post_title'  => __('New Give Form', 'give')
 			);
 
-			$args = wp_parse_args( $_args, $defaults );
+			$args = wp_parse_args($_args, $defaults);
 
-			$_id = wp_insert_post( $args, true );
+			$_id = wp_insert_post($args, true);
 
 		}
 
-		$donate_form = WP_Post::get_instance( $_id );
+		$donate_form = WP_Post::get_instance($_id);
 
-		if ( ! is_object( $donate_form ) ) {
+		if ( ! is_object($donate_form)) {
 			return false;
 		}
 
-		if ( ! is_a( $donate_form, 'WP_Post' ) ) {
+		if ( ! is_a($donate_form, 'WP_Post')) {
 			return false;
 		}
 
-		if ( 'give_forms' !== $donate_form->post_type ) {
+		if ('give_forms' !== $donate_form->post_type) {
 			return false;
 		}
 
-		foreach ( $donate_form as $key => $value ) {
+		foreach ($donate_form as $key => $value) {
 
 			$this->$key = $value;
 
@@ -106,15 +106,15 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function __get( $key ) {
+	public function __get($key) {
 
-		if ( method_exists( $this, 'get_' . $key ) ) {
+		if (method_exists($this, 'get_'.$key)) {
 
-			return call_user_func( array( $this, 'get_' . $key ) );
+			return call_user_func(array($this, 'get_'.$key));
 
 		} else {
 
-			throw new Exception( 'Can\'t get property ' . $key );
+			throw new Exception('Can\'t get property '.$key);
 
 		}
 
@@ -140,13 +140,13 @@ 
 	 */
 	public function get_price() {
 
-		if ( ! isset( $this->price ) ) {
+		if ( ! isset($this->price)) {
 
-			$this->price = get_post_meta( $this->ID, '_give_set_price', true );
+			$this->price = get_post_meta($this->ID, '_give_set_price', true);
 
-			if ( $this->price ) {
+			if ($this->price) {
 
-				$this->price = give_sanitize_amount( $this->price );
+				$this->price = give_sanitize_amount($this->price);
 
 			} else {
 
@@ -156,7 +156,7 @@ 
 
 		}
 
-		return apply_filters( 'give_get_set_price', $this->price, $this->ID );
+		return apply_filters('give_get_set_price', $this->price, $this->ID);
 	}
 
 	/**
@@ -167,13 +167,13 @@ 
 	 */
 	public function get_prices() {
 
-		if ( ! isset( $this->prices ) ) {
+		if ( ! isset($this->prices)) {
 
-			$this->prices = get_post_meta( $this->ID, '_give_donation_levels', true );
+			$this->prices = get_post_meta($this->ID, '_give_donation_levels', true);
 
 		}
 
-		return apply_filters( 'give_get_donation_levels', $this->prices, $this->ID );
+		return apply_filters('give_get_donation_levels', $this->prices, $this->ID);
 
 	}
 
@@ -185,13 +185,13 @@ 
 	 */
 	public function get_goal() {
 
-		if ( ! isset( $this->goal ) ) {
+		if ( ! isset($this->goal)) {
 
-			$this->goal = get_post_meta( $this->ID, '_give_set_goal', true );
+			$this->goal = get_post_meta($this->ID, '_give_set_goal', true);
 
-			if ( $this->goal ) {
+			if ($this->goal) {
 
-				$this->goal = give_sanitize_amount( $this->goal );
+				$this->goal = give_sanitize_amount($this->goal);
 
 			} else {
 
@@ -201,7 +201,7 @@ 
 
 		}
 
-		return apply_filters( 'give_get_set_goal', $this->goal, $this->ID );
+		return apply_filters('give_get_set_goal', $this->goal, $this->ID);
 
 	}
 
@@ -213,9 +213,9 @@ 
 	 */
 	public function is_single_price_mode() {
 
-		$ret = get_post_meta( $this->ID, '_give_price_options_mode', true );
+		$ret = get_post_meta($this->ID, '_give_price_options_mode', true);
 
-		return (bool) apply_filters( 'give_single_price_option_mode', $ret, $this->ID );
+		return (bool) apply_filters('give_single_price_option_mode', $ret, $this->ID);
 
 	}
 
@@ -229,14 +229,14 @@ 
 	 */
 	public function has_variable_prices() {
 
-		$option = get_post_meta( $this->ID, '_give_price_option', true );
+		$option = get_post_meta($this->ID, '_give_price_option', true);
 		$ret    = 0;
 
-		if ( $option === 'multi' ) {
+		if ($option === 'multi') {
 			$ret = 1;
 		}
 
-		return (bool) apply_filters( 'give_has_variable_prices', $ret, $this->ID );
+		return (bool) apply_filters('give_has_variable_prices', $ret, $this->ID);
 
 	}
 
@@ -249,15 +249,15 @@ 
 	 */
 	public function get_sales() {
 
-		if ( ! isset( $this->sales ) ) {
+		if ( ! isset($this->sales)) {
 
-			if ( '' == get_post_meta( $this->ID, '_give_form_sales', true ) ) {
-				add_post_meta( $this->ID, '_give_form_sales', 0 );
+			if ('' == get_post_meta($this->ID, '_give_form_sales', true)) {
+				add_post_meta($this->ID, '_give_form_sales', 0);
 			} // End if
 
-			$this->sales = get_post_meta( $this->ID, '_give_form_sales', true );
+			$this->sales = get_post_meta($this->ID, '_give_form_sales', true);
 
-			if ( $this->sales < 0 ) {
+			if ($this->sales < 0) {
 				// Never let sales be less than zero
 				$this->sales = 0;
 			}
@@ -276,10 +276,10 @@ 
 	 */
 	public function increase_sales() {
 
-		$sales = give_get_form_sales_stats( $this->ID );
+		$sales = give_get_form_sales_stats($this->ID);
 		$sales = $sales + 1;
 
-		if ( update_post_meta( $this->ID, '_give_form_sales', $sales ) ) {
+		if (update_post_meta($this->ID, '_give_form_sales', $sales)) {
 			$this->sales = $sales;
 
 			return $sales;
@@ -296,13 +296,13 @@ 
 	 */
 	public function decrease_sales() {
 
-		$sales = give_get_form_sales_stats( $this->ID );
-		if ( $sales > 0 ) // Only decrease if not already zero
+		$sales = give_get_form_sales_stats($this->ID);
+		if ($sales > 0) // Only decrease if not already zero
 		{
 			$sales = $sales - 1;
 		}
 
-		if ( update_post_meta( $this->ID, '_give_form_sales', $sales ) ) {
+		if (update_post_meta($this->ID, '_give_form_sales', $sales)) {
 			$this->sales = $sales;
 
 			return $sales;
@@ -320,15 +320,15 @@ 
 	 */
 	public function get_earnings() {
 
-		if ( ! isset( $this->earnings ) ) {
+		if ( ! isset($this->earnings)) {
 
-			if ( '' == get_post_meta( $this->ID, '_give_form_earnings', true ) ) {
-				add_post_meta( $this->ID, '_give_form_earnings', 0 );
+			if ('' == get_post_meta($this->ID, '_give_form_earnings', true)) {
+				add_post_meta($this->ID, '_give_form_earnings', 0);
 			}
 
-			$this->earnings = get_post_meta( $this->ID, '_give_form_earnings', true );
+			$this->earnings = get_post_meta($this->ID, '_give_form_earnings', true);
 
-			if ( $this->earnings < 0 ) {
+			if ($this->earnings < 0) {
 				// Never let earnings be less than zero
 				$this->earnings = 0;
 			}
@@ -345,12 +345,12 @@ 
 	 * @since 1.0
 	 * @return float|false
 	 */
-	public function increase_earnings( $amount = 0 ) {
+	public function increase_earnings($amount = 0) {
 
-		$earnings = give_get_form_earnings_stats( $this->ID );
+		$earnings = give_get_form_earnings_stats($this->ID);
 		$earnings = $earnings + (float) $amount;
 
-		if ( update_post_meta( $this->ID, '_give_form_earnings', $earnings ) ) {
+		if (update_post_meta($this->ID, '_give_form_earnings', $earnings)) {
 			$this->earnings = $earnings;
 
 			return $earnings;
@@ -366,16 +366,16 @@ 
 	 * @since 1.0
 	 * @return float|false
 	 */
-	public function decrease_earnings( $amount ) {
+	public function decrease_earnings($amount) {
 
-		$earnings = give_get_form_earnings_stats( $this->ID );
+		$earnings = give_get_form_earnings_stats($this->ID);
 
-		if ( $earnings > 0 ) // Only decrease if greater than zero
+		if ($earnings > 0) // Only decrease if greater than zero
 		{
 			$earnings = $earnings - (float) $amount;
 		}
 
-		if ( update_post_meta( $this->ID, '_give_form_earnings', $earnings ) ) {
+		if (update_post_meta($this->ID, '_give_form_earnings', $earnings)) {
 			$this->earnings = $earnings;
 
 			return $earnings;
@@ -391,22 +391,22 @@ 
 	 * @since 1.0
 	 * @return bool
 	 */
-	public function is_free( $price_id = false ) {
+	public function is_free($price_id = false) {
 
 		$is_free          = false;
-		$variable_pricing = give_has_variable_prices( $this->ID );
+		$variable_pricing = give_has_variable_prices($this->ID);
 
-		if ( $variable_pricing && ! is_null( $price_id ) && $price_id !== false ) {
-			$price = give_get_price_option_amount( $this->ID, $price_id );
-		} elseif ( ! $variable_pricing ) {
-			$price = get_post_meta( $this->ID, '_give_set_price', true );
+		if ($variable_pricing && ! is_null($price_id) && $price_id !== false) {
+			$price = give_get_price_option_amount($this->ID, $price_id);
+		} elseif ( ! $variable_pricing) {
+			$price = get_post_meta($this->ID, '_give_set_price', true);
 		}
 
-		if ( isset( $price ) && (float) $price == 0 ) {
+		if (isset($price) && (float) $price == 0) {
 			$is_free = true;
 		}
 
-		return (bool) apply_filters( 'give_is_free_donation', $is_free, $this->ID, $price_id );
+		return (bool) apply_filters('give_is_free_donation', $is_free, $this->ID, $price_id);
 
 	}
 

Braces +6 added lines, -2 removed lines

@@ -297,10 +297,12 @@ 
 	public function decrease_sales() {
 
 		$sales = give_get_form_sales_stats( $this->ID );
-		if ( $sales > 0 ) // Only decrease if not already zero
+		if ( $sales > 0 ) {
+			// Only decrease if not already zero
 		{
 			$sales = $sales - 1;
 		}
+		}
 
 		if ( update_post_meta( $this->ID, '_give_form_sales', $sales ) ) {
 			$this->sales = $sales;
@@ -370,10 +372,12 @@ 
 
 		$earnings = give_get_form_earnings_stats( $this->ID );
 
-		if ( $earnings > 0 ) // Only decrease if greater than zero
+		if ( $earnings > 0 ) {
+			// Only decrease if greater than zero
 		{
 			$earnings = $earnings - (float) $amount;
 		}
+		}
 
 		if ( update_post_meta( $this->ID, '_give_form_earnings', $earnings ) ) {
 			$this->earnings = $earnings;

includes/class-give-html-elements.php

Spacing +124 added lines, -124 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -33,7 +33,7 @@ 
 	 *
 	 * @return string $output Give forms dropdown
 	 */
-	public function forms_dropdown( $args = array() ) {
+	public function forms_dropdown($args = array()) {
 
 		$defaults = array(
 			'name'        => 'forms',
@@ -43,43 +43,43 @@ 
 			'selected'    => 0,
 			'chosen'      => false,
 			'number'      => 30,
-			'placeholder' => sprintf( __( 'Select a %s', 'give' ), give_get_forms_label_singular() )
+			'placeholder' => sprintf(__('Select a %s', 'give'), give_get_forms_label_singular())
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
-		$forms = get_posts( array(
+		$forms = get_posts(array(
 			'post_type'      => 'give_forms',
 			'orderby'        => 'title',
 			'order'          => 'ASC',
 			'posts_per_page' => $args['number']
-		) );
+		));
 
 		$options = array();
 
-		if ( $forms ) {
-			$options[0] = sprintf( __( 'Select a %s', 'give' ), give_get_forms_label_singular() );
-			foreach ( $forms as $form ) {
-				$options[ absint( $form->ID ) ] = esc_html( $form->post_title );
+		if ($forms) {
+			$options[0] = sprintf(__('Select a %s', 'give'), give_get_forms_label_singular());
+			foreach ($forms as $form) {
+				$options[absint($form->ID)] = esc_html($form->post_title);
 			}
 		} else {
-			$options[0] = __( 'No Give Forms Found', 'give' );
+			$options[0] = __('No Give Forms Found', 'give');
 		}
 
 		// This ensures that any selected forms are included in the drop down
-		if ( is_array( $args['selected'] ) ) {
-			foreach ( $args['selected'] as $item ) {
-				if ( ! in_array( $item, $options ) ) {
-					$options[ $item ] = get_the_title( $item );
+		if (is_array($args['selected'])) {
+			foreach ($args['selected'] as $item) {
+				if ( ! in_array($item, $options)) {
+					$options[$item] = get_the_title($item);
 				}
 			}
-		} elseif ( is_numeric( $args['selected'] ) && $args['selected'] !== 0 ) {
-			if ( ! in_array( $args['selected'], $options ) ) {
-				$options[ $args['selected'] ] = get_the_title( $args['selected'] );
+		} elseif (is_numeric($args['selected']) && $args['selected'] !== 0) {
+			if ( ! in_array($args['selected'], $options)) {
+				$options[$args['selected']] = get_the_title($args['selected']);
 			}
 		}
 
-		$output = $this->select( array(
+		$output = $this->select(array(
 			'name'             => $args['name'],
 			'selected'         => $args['selected'],
 			'id'               => $args['id'],
@@ -90,7 +90,7 @@ 
 			'placeholder'      => $args['placeholder'],
 			'show_option_all'  => false,
 			'show_option_none' => false
-		) );
+		));
 
 		return $output;
 	}
@@ -105,7 +105,7 @@ 
 	 *
 	 * @return string $output Donor dropdown
 	 */
-	public function donor_dropdown( $args = array() ) {
+	public function donor_dropdown($args = array()) {
 
 		$defaults = array(
 			'name'        => 'customers',
@@ -114,38 +114,38 @@ 
 			'multiple'    => false,
 			'selected'    => 0,
 			'chosen'      => true,
-			'placeholder' => __( 'Select a Donor', 'give' ),
+			'placeholder' => __('Select a Donor', 'give'),
 			'number'      => 30
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
-		$customers = Give()->customers->get_customers( array(
+		$customers = Give()->customers->get_customers(array(
 			'number' => $args['number']
-		) );
+		));
 
 		$options = array();
 
-		if ( $customers ) {
-			$options[0] = __( 'No donor attached', 'give' );
-			foreach ( $customers as $customer ) {
-				$options[ absint( $customer->id ) ] = esc_html( $customer->name . ' (' . $customer->email . ')' );
+		if ($customers) {
+			$options[0] = __('No donor attached', 'give');
+			foreach ($customers as $customer) {
+				$options[absint($customer->id)] = esc_html($customer->name.' ('.$customer->email.')');
 			}
 		} else {
-			$options[0] = __( 'No donors found', 'give' );
+			$options[0] = __('No donors found', 'give');
 		}
 
-		if ( ! empty( $args['selected'] ) ) {
+		if ( ! empty($args['selected'])) {
 
 			// If a selected customer has been specified, we need to ensure it's in the initial list of customers displayed
 
-			if ( ! array_key_exists( $args['selected'], $options ) ) {
+			if ( ! array_key_exists($args['selected'], $options)) {
 
-				$customer = new Give_Customer( $args['selected'] );
+				$customer = new Give_Customer($args['selected']);
 
-				if ( $customer ) {
+				if ($customer) {
 
-					$options[ absint( $args['selected'] ) ] = esc_html( $customer->name . ' (' . $customer->email . ')' );
+					$options[absint($args['selected'])] = esc_html($customer->name.' ('.$customer->email.')');
 
 				}
 
@@ -153,17 +153,17 @@ 
 
 		}
 
-		$output = $this->select( array(
+		$output = $this->select(array(
 			'name'             => $args['name'],
 			'selected'         => $args['selected'],
 			'id'               => $args['id'],
-			'class'            => $args['class'] . ' give-customer-select',
+			'class'            => $args['class'].' give-customer-select',
 			'options'          => $options,
 			'multiple'         => $args['multiple'],
 			'chosen'           => $args['chosen'],
 			'show_option_all'  => false,
 			'show_option_none' => false
-		) );
+		));
 
 		return $output;
 	}
@@ -180,21 +180,21 @@ 
 	 *
 	 * @return string $output Category dropdown
 	 */
-	public function category_dropdown( $name = 'give_forms_categories', $selected = 0 ) {
-		$categories = get_terms( 'give_forms_category', apply_filters( 'give_forms_category_dropdown', array() ) );
+	public function category_dropdown($name = 'give_forms_categories', $selected = 0) {
+		$categories = get_terms('give_forms_category', apply_filters('give_forms_category_dropdown', array()));
 		$options    = array();
 
-		foreach ( $categories as $category ) {
-			$options[ absint( $category->term_id ) ] = esc_html( $category->name );
+		foreach ($categories as $category) {
+			$options[absint($category->term_id)] = esc_html($category->name);
 		}
 
-		$output = $this->select( array(
+		$output = $this->select(array(
 			'name'             => $name,
 			'selected'         => $selected,
 			'options'          => $options,
-			'show_option_all'  => __( 'All Categories', 'give' ),
+			'show_option_all'  => __('All Categories', 'give'),
 			'show_option_none' => false
-		) );
+		));
 
 		return $output;
 	}
@@ -212,25 +212,25 @@ 
 	 *
 	 * @return string $output Year dropdown
 	 */
-	public function year_dropdown( $name = 'year', $selected = 0, $years_before = 5, $years_after = 0 ) {
-		$current    = date( 'Y' );
-		$start_year = $current - absint( $years_before );
-		$end_year   = $current + absint( $years_after );
-		$selected   = empty( $selected ) ? date( 'Y' ) : $selected;
+	public function year_dropdown($name = 'year', $selected = 0, $years_before = 5, $years_after = 0) {
+		$current    = date('Y');
+		$start_year = $current - absint($years_before);
+		$end_year   = $current + absint($years_after);
+		$selected   = empty($selected) ? date('Y') : $selected;
 		$options    = array();
 
-		while ( $start_year <= $end_year ) {
-			$options[ absint( $start_year ) ] = $start_year;
-			$start_year ++;
+		while ($start_year <= $end_year) {
+			$options[absint($start_year)] = $start_year;
+			$start_year++;
 		}
 
-		$output = $this->select( array(
+		$output = $this->select(array(
 			'name'             => $name,
 			'selected'         => $selected,
 			'options'          => $options,
 			'show_option_all'  => false,
 			'show_option_none' => false
-		) );
+		));
 
 		return $output;
 	}
@@ -247,23 +247,23 @@ 
 	 *
 	 * @return string $output Month dropdown
 	 */
-	public function month_dropdown( $name = 'month', $selected = 0 ) {
+	public function month_dropdown($name = 'month', $selected = 0) {
 		$month    = 1;
 		$options  = array();
-		$selected = empty( $selected ) ? date( 'n' ) : $selected;
+		$selected = empty($selected) ? date('n') : $selected;
 
-		while ( $month <= 12 ) {
-			$options[ absint( $month ) ] = give_month_num_to_name( $month );
-			$month ++;
+		while ($month <= 12) {
+			$options[absint($month)] = give_month_num_to_name($month);
+			$month++;
 		}
 
-		$output = $this->select( array(
+		$output = $this->select(array(
 			'name'             => $name,
 			'selected'         => $selected,
 			'options'          => $options,
 			'show_option_all'  => false,
 			'show_option_none' => false
-		) );
+		));
 
 		return $output;
 	}
@@ -277,7 +277,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function select( $args = array() ) {
+	public function select($args = array()) {
 		$defaults = array(
 			'options'          => array(),
 			'name'             => null,
@@ -287,60 +287,60 @@ 
 			'chosen'           => false,
 			'placeholder'      => null,
 			'multiple'         => false,
-			'show_option_all'  => _x( 'All', 'all dropdown items', 'give' ),
-			'show_option_none' => _x( 'None', 'no dropdown items', 'give' )
+			'show_option_all'  => _x('All', 'all dropdown items', 'give'),
+			'show_option_none' => _x('None', 'no dropdown items', 'give')
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 
-		if ( $args['multiple'] ) {
+		if ($args['multiple']) {
 			$multiple = ' MULTIPLE';
 		} else {
 			$multiple = '';
 		}
 
-		if ( $args['chosen'] ) {
+		if ($args['chosen']) {
 			$args['class'] .= ' give-select-chosen';
 		}
 
-		if ( $args['placeholder'] ) {
+		if ($args['placeholder']) {
 			$placeholder = $args['placeholder'];
 		} else {
 			$placeholder = '';
 		}
 
-		$output = '<select name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( sanitize_key( str_replace( '-', '_', $args['id'] ) ) ) . '" class="give-select ' . esc_attr( $args['class'] ) . '"' . $multiple . ' data-placeholder="' . $placeholder . '">';
+		$output = '<select name="'.esc_attr($args['name']).'" id="'.esc_attr(sanitize_key(str_replace('-', '_', $args['id']))).'" class="give-select '.esc_attr($args['class']).'"'.$multiple.' data-placeholder="'.$placeholder.'">';
 
-		if ( $args['show_option_all'] ) {
-			if ( $args['multiple'] ) {
-				$selected = selected( true, in_array( 0, $args['selected'] ), false );
+		if ($args['show_option_all']) {
+			if ($args['multiple']) {
+				$selected = selected(true, in_array(0, $args['selected']), false);
 			} else {
-				$selected = selected( $args['selected'], 0, false );
+				$selected = selected($args['selected'], 0, false);
 			}
-			$output .= '<option value="all"' . $selected . '>' . esc_html( $args['show_option_all'] ) . '</option>';
+			$output .= '<option value="all"'.$selected.'>'.esc_html($args['show_option_all']).'</option>';
 		}
 
-		if ( ! empty( $args['options'] ) ) {
+		if ( ! empty($args['options'])) {
 
-			if ( $args['show_option_none'] ) {
-				if ( $args['multiple'] ) {
-					$selected = selected( true, in_array( - 1, $args['selected'] ), false );
+			if ($args['show_option_none']) {
+				if ($args['multiple']) {
+					$selected = selected(true, in_array( -1, $args['selected'] ), false);
 				} else {
-					$selected = selected( $args['selected'], - 1, false );
+					$selected = selected($args['selected'], - 1, false);
 				}
-				$output .= '<option value="-1"' . $selected . '>' . esc_html( $args['show_option_none'] ) . '</option>';
+				$output .= '<option value="-1"'.$selected.'>'.esc_html($args['show_option_none']).'</option>';
 			}
 
-			foreach ( $args['options'] as $key => $option ) {
+			foreach ($args['options'] as $key => $option) {
 
-				if ( $args['multiple'] && is_array( $args['selected'] ) ) {
-					$selected = selected( true, in_array( $key, $args['selected'] ), false );
+				if ($args['multiple'] && is_array($args['selected'])) {
+					$selected = selected(true, in_array($key, $args['selected']), false);
 				} else {
-					$selected = selected( $args['selected'], $key, false );
+					$selected = selected($args['selected'], $key, false);
 				}
 
-				$output .= '<option value="' . esc_attr( $key ) . '"' . $selected . '>' . esc_html( $option ) . '</option>';
+				$output .= '<option value="'.esc_attr($key).'"'.$selected.'>'.esc_html($option).'</option>';
 			}
 		}
 
@@ -358,7 +358,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function checkbox( $args = array() ) {
+	public function checkbox($args = array()) {
 		$defaults = array(
 			'name'    => null,
 			'current' => null,
@@ -369,16 +369,16 @@ 
 			)
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$options = '';
-		if ( ! empty( $args['options']['disabled'] ) ) {
+		if ( ! empty($args['options']['disabled'])) {
 			$options .= ' disabled="disabled"';
-		} elseif ( ! empty( $args['options']['readonly'] ) ) {
+		} elseif ( ! empty($args['options']['readonly'])) {
 			$options .= ' readonly';
 		}
 
-		$output = '<input type="checkbox"' . $options . ' name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['name'] ) . '" class="' . $args['class'] . ' ' . esc_attr( $args['name'] ) . '" ' . checked( 1, $args['current'], false ) . ' />';
+		$output = '<input type="checkbox"'.$options.' name="'.esc_attr($args['name']).'" id="'.esc_attr($args['name']).'" class="'.$args['class'].' '.esc_attr($args['name']).'" '.checked(1, $args['current'], false).' />';
 
 		return $output;
 	}
@@ -392,22 +392,22 @@ 
 	 *
 	 * @return string Text field
 	 */
-	public function text( $args = array() ) {
+	public function text($args = array()) {
 		// Backwards compatabliity
-		if ( func_num_args() > 1 ) {
+		if (func_num_args() > 1) {
 			$args = func_get_args();
 
 			$name  = $args[0];
-			$value = isset( $args[1] ) ? $args[1] : '';
-			$label = isset( $args[2] ) ? $args[2] : '';
-			$desc  = isset( $args[3] ) ? $args[3] : '';
+			$value = isset($args[1]) ? $args[1] : '';
+			$label = isset($args[2]) ? $args[2] : '';
+			$desc  = isset($args[3]) ? $args[3] : '';
 		}
 
 		$defaults = array(
-			'name'         => isset( $name ) ? $name : 'text',
-			'value'        => isset( $value ) ? $value : null,
-			'label'        => isset( $label ) ? $label : null,
-			'desc'         => isset( $desc ) ? $desc : null,
+			'name'         => isset($name) ? $name : 'text',
+			'value'        => isset($value) ? $value : null,
+			'label'        => isset($label) ? $label : null,
+			'desc'         => isset($desc) ? $desc : null,
 			'placeholder'  => '',
 			'class'        => 'regular-text',
 			'disabled'     => false,
@@ -415,29 +415,29 @@ 
 			'data'         => false
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$disabled = '';
-		if ( $args['disabled'] ) {
+		if ($args['disabled']) {
 			$disabled = ' disabled="disabled"';
 		}
 
 		$data = '';
-		if ( ! empty( $args['data'] ) ) {
-			foreach ( $args['data'] as $key => $value ) {
-				$data .= 'data-' . $key . '="' . $value . '" ';
+		if ( ! empty($args['data'])) {
+			foreach ($args['data'] as $key => $value) {
+				$data .= 'data-'.$key.'="'.$value.'" ';
 			}
 		}
 
-		$output = '<span id="give-' . sanitize_key( $args['name'] ) . '-wrap">';
+		$output = '<span id="give-'.sanitize_key($args['name']).'-wrap">';
 
-		$output .= '<label class="give-label" for="give-' . sanitize_key( $args['name'] ) . '">' . esc_html( $args['label'] ) . '</label>';
+		$output .= '<label class="give-label" for="give-'.sanitize_key($args['name']).'">'.esc_html($args['label']).'</label>';
 
-		if ( ! empty( $args['desc'] ) ) {
-			$output .= '<span class="give-description">' . esc_html( $args['desc'] ) . '</span>';
+		if ( ! empty($args['desc'])) {
+			$output .= '<span class="give-description">'.esc_html($args['desc']).'</span>';
 		}
 
-		$output .= '<input type="text" name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['name'] ) . '" autocomplete="' . esc_attr( $args['autocomplete'] ) . '" value="' . esc_attr( $args['value'] ) . '" placeholder="' . esc_attr( $args['placeholder'] ) . '" class="' . $args['class'] . '" ' . $data . '' . $disabled . '/>';
+		$output .= '<input type="text" name="'.esc_attr($args['name']).'" id="'.esc_attr($args['name']).'" autocomplete="'.esc_attr($args['autocomplete']).'" value="'.esc_attr($args['value']).'" placeholder="'.esc_attr($args['placeholder']).'" class="'.$args['class'].'" '.$data.''.$disabled.'/>';
 
 		$output .= '</span>';
 
@@ -453,7 +453,7 @@ 
 	 *
 	 * @return string textarea
 	 */
-	public function textarea( $args = array() ) {
+	public function textarea($args = array()) {
 		$defaults = array(
 			'name'     => 'textarea',
 			'value'    => null,
@@ -463,21 +463,21 @@ 
 			'disabled' => false
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$disabled = '';
-		if ( $args['disabled'] ) {
+		if ($args['disabled']) {
 			$disabled = ' disabled="disabled"';
 		}
 
-		$output = '<span id="give-' . sanitize_key( $args['name'] ) . '-wrap">';
+		$output = '<span id="give-'.sanitize_key($args['name']).'-wrap">';
 
-		$output .= '<label class="give-label" for="give-' . sanitize_key( $args['name'] ) . '">' . esc_html( $args['label'] ) . '</label>';
+		$output .= '<label class="give-label" for="give-'.sanitize_key($args['name']).'">'.esc_html($args['label']).'</label>';
 
-		$output .= '<textarea name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['name'] ) . '" class="' . $args['class'] . '"' . $disabled . '>' . esc_attr( $args['value'] ) . '</textarea>';
+		$output .= '<textarea name="'.esc_attr($args['name']).'" id="'.esc_attr($args['name']).'" class="'.$args['class'].'"'.$disabled.'>'.esc_attr($args['value']).'</textarea>';
 
-		if ( ! empty( $args['desc'] ) ) {
-			$output .= '<span class="give-description">' . esc_html( $args['desc'] ) . '</span>';
+		if ( ! empty($args['desc'])) {
+			$output .= '<span class="give-description">'.esc_html($args['desc']).'</span>';
 		}
 
 		$output .= '</span>';
@@ -494,12 +494,12 @@ 
 	 *
 	 * @return string text field with ajax search
 	 */
-	public function ajax_user_search( $args = array() ) {
+	public function ajax_user_search($args = array()) {
 
 		$defaults = array(
 			'name'         => 'user_id',
 			'value'        => null,
-			'placeholder'  => __( 'Enter username', 'give' ),
+			'placeholder'  => __('Enter username', 'give'),
 			'label'        => null,
 			'desc'         => null,
 			'class'        => '',
@@ -508,13 +508,13 @@ 
 			'data'         => false
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
-		$args['class'] = 'give-ajax-user-search ' . $args['class'];
+		$args['class'] = 'give-ajax-user-search '.$args['class'];
 
 		$output = '<span class="give_user_search_wrap">';
-		$output .= $this->text( $args );
-		$output .= '<span class="give_user_search_results hidden"><a class="give-ajax-user-cancel" title="' . __( 'Cancel', 'give' ) . '" aria-label="' . __( 'Cancel', 'give' ) . '" href="#">x</a><span></span></span>';
+		$output .= $this->text($args);
+		$output .= '<span class="give_user_search_results hidden"><a class="give-ajax-user-cancel" title="'.__('Cancel', 'give').'" aria-label="'.__('Cancel', 'give').'" href="#">x</a><span></span></span>';
 		$output .= '</span>';
 
 		return $output;

includes/class-give-license-handler.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Give License handler
- *
- * This class simplifies the process of adding license information to new Give add-ons.
- *
- * @version 1.0
- */
+	 * Give License handler
+	 *
+	 * This class simplifies the process of adding license information to new Give add-ons.
+	 *
+	 * @version 1.0
+	 */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {

Spacing +63 added lines, -63 removed lines

@@ -8,11 +8,11 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'Give_License' ) ) :
+if ( ! class_exists('Give_License')) :
 
 	/**
 	 * Give_License Class
@@ -38,16 +38,16 @@ 
 		 * @param string  $_optname
 		 * @param string  $_api_url
 		 */
-		public function __construct( $_file, $_item_name, $_version, $_author, $_optname = null, $_api_url = null ) {
+		public function __construct($_file, $_item_name, $_version, $_author, $_optname = null, $_api_url = null) {
 			global $give_options;
 
 			$this->file           = $_file;
 			$this->item_name      = $_item_name;
-			$this->item_shortname = 'give_' . preg_replace( '/[^a-zA-Z0-9_\s]/', '', str_replace( ' ', '_', strtolower( $this->item_name ) ) );
+			$this->item_shortname = 'give_'.preg_replace('/[^a-zA-Z0-9_\s]/', '', str_replace(' ', '_', strtolower($this->item_name)));
 			$this->version        = $_version;
-			$this->license        = isset( $give_options[ $this->item_shortname . '_license_key' ] ) ? trim( $give_options[ $this->item_shortname . '_license_key' ] ) : '';
+			$this->license        = isset($give_options[$this->item_shortname.'_license_key']) ? trim($give_options[$this->item_shortname.'_license_key']) : '';
 			$this->author         = $_author;
-			$this->api_url        = is_null( $_api_url ) ? $this->api_url : $_api_url;
+			$this->api_url        = is_null($_api_url) ? $this->api_url : $_api_url;
 
 
 			// Setup hooks
@@ -63,7 +63,7 @@ 
 		 * @return  void
 		 */
 		private function includes() {
-			if ( ! class_exists( 'EDD_SL_Plugin_Updater' ) ) {
+			if ( ! class_exists('EDD_SL_Plugin_Updater')) {
 				require_once 'admin/EDD_SL_Plugin_Updater.php';
 			}
 		}
@@ -77,18 +77,18 @@ 
 		private function hooks() {
 
 			// Register settings
-			add_filter( 'give_settings_licenses', array( $this, 'settings' ), 1 );
+			add_filter('give_settings_licenses', array($this, 'settings'), 1);
 
 			// Activate license key on settings save
-			add_action( 'admin_init', array( $this, 'activate_license' ) );
+			add_action('admin_init', array($this, 'activate_license'));
 
 			// Deactivate license key
-			add_action( 'admin_init', array( $this, 'deactivate_license' ) );
+			add_action('admin_init', array($this, 'deactivate_license'));
 
 			// Updater
-			add_action( 'admin_init', array( $this, 'auto_updater' ), 0 );
+			add_action('admin_init', array($this, 'auto_updater'), 0);
 
-			add_action( 'admin_notices', array( $this, 'notices' ) );
+			add_action('admin_notices', array($this, 'notices'));
 		}
 
 		/**
@@ -100,7 +100,7 @@ 
 		 */
 		public function auto_updater() {
 
-			if ( 'valid' !== get_option( $this->item_shortname . '_license_active' ) ) {
+			if ('valid' !== get_option($this->item_shortname.'_license_active')) {
 				return;
 			}
 
@@ -127,20 +127,20 @@ 
 		 *
 		 * @return  array
 		 */
-		public function settings( $settings ) {
+		public function settings($settings) {
 
 			$give_license_settings = array(
 				array(
-					'name'    => sprintf( __( '%1$s', 'give' ), $this->item_name ),
-					'id'      => $this->item_shortname . '_license_key',
+					'name'    => sprintf(__('%1$s', 'give'), $this->item_name),
+					'id'      => $this->item_shortname.'_license_key',
 					'desc'    => '',
 					'type'    => 'license_key',
-					'options' => array( 'is_valid_license_option' => $this->item_shortname . '_license_active' ),
+					'options' => array('is_valid_license_option' => $this->item_shortname.'_license_active'),
 					'size'    => 'regular'
 				)
 			);
 
-			return array_merge( $settings, $give_license_settings );
+			return array_merge($settings, $give_license_settings);
 		}
 
 		/**
@@ -152,18 +152,18 @@ 
 		 *
 		 * @return  array
 		 */
-		public function license_settings_content( $settings ) {
+		public function license_settings_content($settings) {
 
 			$give_license_settings = array(
 				array(
-					'name' => __( 'Add-on Licenses', 'give' ),
+					'name' => __('Add-on Licenses', 'give'),
 					'desc' => '<hr>',
 					'type' => 'give_title',
 					'id'   => 'give_title'
 				),
 			);
 
-			return array_merge( $settings, $give_license_settings );
+			return array_merge($settings, $give_license_settings);
 		}
 
 
@@ -175,34 +175,34 @@ 
 		 */
 		public function activate_license() {
 
-			if ( ! isset( $_POST[ $this->item_shortname . '_license_key' ] ) ) {
+			if ( ! isset($_POST[$this->item_shortname.'_license_key'])) {
 				return;
 			}
 
-			foreach ( $_POST as $key => $value ) {
-				if ( false !== strpos( $key, 'license_key_deactivate' ) ) {
+			foreach ($_POST as $key => $value) {
+				if (false !== strpos($key, 'license_key_deactivate')) {
 					// Don't activate a key when deactivating a different key
 					return;
 				}
 			}
 
-			if ( ! wp_verify_nonce( $_REQUEST[ $this->item_shortname . '_license_key-nonce' ], $this->item_shortname . '_license_key-nonce' ) ) {
+			if ( ! wp_verify_nonce($_REQUEST[$this->item_shortname.'_license_key-nonce'], $this->item_shortname.'_license_key-nonce')) {
 
-				wp_die( __( 'Nonce verification failed', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+				wp_die(__('Nonce verification failed', 'give'), __('Error', 'give'), array('response' => 403));
 
 			}
 
-			if ( ! current_user_can( 'manage_give_settings' ) ) {
+			if ( ! current_user_can('manage_give_settings')) {
 				return;
 			}
 
-			if ( 'valid' === get_option( $this->item_shortname . '_license_active' ) ) {
+			if ('valid' === get_option($this->item_shortname.'_license_active')) {
 				return;
 			}
 
-			$license = sanitize_text_field( $_POST[ $this->item_shortname . '_license_key' ] );
+			$license = sanitize_text_field($_POST[$this->item_shortname.'_license_key']);
 
-			if ( empty( $license ) ) {
+			if (empty($license)) {
 				return;
 			}
 
@@ -210,7 +210,7 @@ 
 			$api_params = array(
 				'edd_action' => 'activate_license', //never change from "edd_" to "give_"!
 				'license'    => $license,
-				'item_name'  => urlencode( $this->item_name ),
+				'item_name'  => urlencode($this->item_name),
 				'url'        => home_url()
 			);
 
@@ -225,22 +225,22 @@ 
 			);
 
 			// Make sure there are no errors
-			if ( is_wp_error( $response ) ) {
+			if (is_wp_error($response)) {
 				return;
 			}
 
 			// Tell WordPress to look for updates
-			set_site_transient( 'update_plugins', null );
+			set_site_transient('update_plugins', null);
 
 			// Decode license data
-			$license_data = json_decode( wp_remote_retrieve_body( $response ) );
+			$license_data = json_decode(wp_remote_retrieve_body($response));
 
-			update_option( $this->item_shortname . '_license_active', $license_data->license );
+			update_option($this->item_shortname.'_license_active', $license_data->license);
 
-			if ( ! (bool) $license_data->success ) {
-				set_transient( 'give_license_error', $license_data, 1000 );
+			if ( ! (bool) $license_data->success) {
+				set_transient('give_license_error', $license_data, 1000);
 			} else {
-				delete_transient( 'give_license_error' );
+				delete_transient('give_license_error');
 			}
 		}
 
@@ -253,28 +253,28 @@ 
 		 */
 		public function deactivate_license() {
 
-			if ( ! isset( $_POST[ $this->item_shortname . '_license_key' ] ) ) {
+			if ( ! isset($_POST[$this->item_shortname.'_license_key'])) {
 				return;
 			}
 
-			if ( ! wp_verify_nonce( $_REQUEST[ $this->item_shortname . '_license_key-nonce' ], $this->item_shortname . '_license_key-nonce' ) ) {
+			if ( ! wp_verify_nonce($_REQUEST[$this->item_shortname.'_license_key-nonce'], $this->item_shortname.'_license_key-nonce')) {
 
-				wp_die( __( 'Nonce verification failed', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+				wp_die(__('Nonce verification failed', 'give'), __('Error', 'give'), array('response' => 403));
 
 			}
 
-			if ( ! current_user_can( 'manage_give_settings' ) ) {
+			if ( ! current_user_can('manage_give_settings')) {
 				return;
 			}
 
 			// Run on deactivate button press
-			if ( isset( $_POST[ $this->item_shortname . '_license_key_deactivate' ] ) ) {
+			if (isset($_POST[$this->item_shortname.'_license_key_deactivate'])) {
 
 				// Data to send to the API
 				$api_params = array(
 					'edd_action' => 'deactivate_license', //never change from "edd_" to "give_"!
 					'license'    => $this->license,
-					'item_name'  => urlencode( $this->item_name ),
+					'item_name'  => urlencode($this->item_name),
 					'url'        => home_url()
 				);
 
@@ -290,19 +290,19 @@ 
 
 
 				// Make sure there are no errors
-				if ( is_wp_error( $response ) ) {
+				if (is_wp_error($response)) {
 					return;
 				}
 
 				// Decode the license data
-				$license_data = json_decode( wp_remote_retrieve_body( $response ) );
+				$license_data = json_decode(wp_remote_retrieve_body($response));
 
-				delete_option( $this->item_shortname . '_license_active' );
+				delete_option($this->item_shortname.'_license_active');
 
-				if ( ! (bool) $license_data->success ) {
-					set_transient( 'give_license_error', $license_data, 1000 );
+				if ( ! (bool) $license_data->success) {
+					set_transient('give_license_error', $license_data, 1000);
 				} else {
-					delete_transient( 'give_license_error' );
+					delete_transient('give_license_error');
 				}
 			}
 		}
@@ -316,57 +316,57 @@ 
 		 */
 		public function notices() {
 
-			if ( ! isset( $_GET['page'] ) || 'give-settings' !== $_GET['page'] ) {
+			if ( ! isset($_GET['page']) || 'give-settings' !== $_GET['page']) {
 				return;
 			}
 
-			if ( ! isset( $_GET['tab'] ) || 'licenses' !== $_GET['tab'] ) {
+			if ( ! isset($_GET['tab']) || 'licenses' !== $_GET['tab']) {
 				return;
 			}
 
-			$license_error = get_transient( 'give_license_error' );
+			$license_error = get_transient('give_license_error');
 
-			if ( false === $license_error ) {
+			if (false === $license_error) {
 				return;
 			}
 
-			if ( ! empty( $license_error->error ) ) {
+			if ( ! empty($license_error->error)) {
 
-				switch ( $license_error->error ) {
+				switch ($license_error->error) {
 
 					case 'item_name_mismatch' :
 
-						$message = __( 'This license does not belong to the product you have entered it for.', 'give' );
+						$message = __('This license does not belong to the product you have entered it for.', 'give');
 						break;
 
 					case 'no_activations_left' :
 
-						$message = __( 'This license does not have any activations left', 'give' );
+						$message = __('This license does not have any activations left', 'give');
 						break;
 
 					case 'expired' :
 
-						$message = __( 'This license key is expired. Please renew it.', 'give' );
+						$message = __('This license key is expired. Please renew it.', 'give');
 						break;
 
 					default :
 
-						$message = sprintf( __( 'There was a problem activating your license key, please try again or contact support. Error code: %s', 'give' ), $license_error->error );
+						$message = sprintf(__('There was a problem activating your license key, please try again or contact support. Error code: %s', 'give'), $license_error->error);
 						break;
 
 				}
 
 			}
 
-			if ( ! empty( $message ) ) {
+			if ( ! empty($message)) {
 
 				echo '<div class="error">';
-				echo '<p>' . $message . '</p>';
+				echo '<p>'.$message.'</p>';
 				echo '</div>';
 
 			}
 
-			delete_transient( 'give_license_error' );
+			delete_transient('give_license_error');
 
 		}
 	}