WordImpress / Give

includes/class-give-logging.php

Spacing +70 added lines, -70 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -43,15 +43,15 @@ 
 	 */
 	public function __setup_hooks() {
 		// Create the log post type
-		add_action( 'init', array( $this, 'register_post_type' ), 1 );
+		add_action('init', array($this, 'register_post_type'), 1);
 
 		// Create types taxonomy and default types
-		add_action( 'init', array( $this, 'register_taxonomy' ), 1 );
+		add_action('init', array($this, 'register_taxonomy'), 1);
 
-		add_action( 'save_post_give_payment', array( $this, 'background_process_delete_cache' ) );
-		add_action( 'save_post_give_forms', array( $this, 'background_process_delete_cache' ) );
-		add_action( 'save_post_give_log', array( $this, 'background_process_delete_cache' ) );
-		add_action( 'give_delete_log_cache', array( $this, 'delete_cache' ) );
+		add_action('save_post_give_payment', array($this, 'background_process_delete_cache'));
+		add_action('save_post_give_forms', array($this, 'background_process_delete_cache'));
+		add_action('save_post_give_log', array($this, 'background_process_delete_cache'));
+		add_action('give_delete_log_cache', array($this, 'delete_cache'));
 	}
 
 	/**
@@ -68,7 +68,7 @@ 
 		/* Logs post type */
 		$log_args = array(
 			'labels'              => array(
-				'name' => esc_html__( 'Logs', 'give' ),
+				'name' => esc_html__('Logs', 'give'),
 			),
 			'public'              => false,
 			'exclude_from_search' => true,
@@ -77,11 +77,11 @@ 
 			'query_var'           => false,
 			'rewrite'             => false,
 			'capability_type'     => 'post',
-			'supports'            => array( 'title', 'editor' ),
+			'supports'            => array('title', 'editor'),
 			'can_export'          => true,
 		);
 
-		register_post_type( 'give_log', $log_args );
+		register_post_type('give_log', $log_args);
 	}
 
 	/**
@@ -95,9 +95,9 @@ 
 	 * @return void
 	 */
 	public function register_taxonomy() {
-		register_taxonomy( 'give_log_type', 'give_log', array(
+		register_taxonomy('give_log_type', 'give_log', array(
 			'public' => false,
-		) );
+		));
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 			'api_request',
 		);
 
-		return apply_filters( 'give_log_types', $terms );
+		return apply_filters('give_log_types', $terms);
 	}
 
 	/**
@@ -132,8 +132,8 @@ 
 	 *
 	 * @return bool         Whether log type is valid.
 	 */
-	public function valid_type( $type ) {
-		return in_array( $type, $this->log_types() );
+	public function valid_type($type) {
+		return in_array($type, $this->log_types());
 	}
 
 	/**
@@ -152,7 +152,7 @@ 
 	 *
 	 * @return int             Log ID.
 	 */
-	public function add( $title = '', $message = '', $parent = 0, $type = null ) {
+	public function add($title = '', $message = '', $parent = 0, $type = null) {
 		$log_data = array(
 			'post_title'   => $title,
 			'post_content' => $message,
@@ -160,7 +160,7 @@ 
 			'log_type'     => $type,
 		);
 
-		return $this->insert_log( $log_data );
+		return $this->insert_log($log_data);
 	}
 
 	/**
@@ -177,12 +177,12 @@ 
 	 *
 	 * @return array             An array of the connected logs.
 	 */
-	public function get_logs( $object_id = 0, $type = null, $paged = null ) {
-		return $this->get_connected_logs( array(
+	public function get_logs($object_id = 0, $type = null, $paged = null) {
+		return $this->get_connected_logs(array(
 			'post_parent' => $object_id,
 			'paged'       => $paged,
 			'log_type'    => $type,
-		) );
+		));
 	}
 
 	/**
@@ -196,7 +196,7 @@ 
 	 *
 	 * @return int             The ID of the newly created log item.
 	 */
-	public function insert_log( $log_data = array(), $log_meta = array() ) {
+	public function insert_log($log_data = array(), $log_meta = array()) {
 		$defaults = array(
 			'post_type'    => 'give_log',
 			'post_status'  => 'publish',
@@ -205,7 +205,7 @@ 
 			'log_type'     => false,
 		);
 
-		$args = wp_parse_args( $log_data, $defaults );
+		$args = wp_parse_args($log_data, $defaults);
 
 		/**
 		 * Fires before inserting log entry.
@@ -215,20 +215,20 @@ 
 		 * @param array $log_data Log entry data.
 		 * @param array $log_meta Log entry meta.
 		 */
-		do_action( 'give_pre_insert_log', $log_data, $log_meta );
+		do_action('give_pre_insert_log', $log_data, $log_meta);
 
 		// Store the log entry
-		$log_id = wp_insert_post( $args );
+		$log_id = wp_insert_post($args);
 
 		// Set the log type, if any
-		if ( $log_data['log_type'] && $this->valid_type( $log_data['log_type'] ) ) {
-			wp_set_object_terms( $log_id, $log_data['log_type'], 'give_log_type', false );
+		if ($log_data['log_type'] && $this->valid_type($log_data['log_type'])) {
+			wp_set_object_terms($log_id, $log_data['log_type'], 'give_log_type', false);
 		}
 
 		// Set log meta, if any
-		if ( $log_id && ! empty( $log_meta ) ) {
-			foreach ( (array) $log_meta as $key => $meta ) {
-				update_post_meta( $log_id, '_give_log_' . sanitize_key( $key ), $meta );
+		if ($log_id && ! empty($log_meta)) {
+			foreach ((array) $log_meta as $key => $meta) {
+				update_post_meta($log_id, '_give_log_'.sanitize_key($key), $meta);
 			}
 		}
 
@@ -241,7 +241,7 @@ 
 		 * @param array $log_data Log entry data.
 		 * @param array $log_meta Log entry meta.
 		 */
-		do_action( 'give_post_insert_log', $log_id, $log_data, $log_meta );
+		do_action('give_post_insert_log', $log_id, $log_data, $log_meta);
 
 		return $log_id;
 	}
@@ -257,7 +257,7 @@ 
 	 *
 	 * @return bool|null       True if successful, false otherwise.
 	 */
-	public function update_log( $log_data = array(), $log_meta = array() ) {
+	public function update_log($log_data = array(), $log_meta = array()) {
 
 		/**
 		 * Fires before updating log entry.
@@ -267,7 +267,7 @@ 
 		 * @param array $log_data Log entry data.
 		 * @param array $log_meta Log entry meta.
 		 */
-		do_action( 'give_pre_update_log', $log_data, $log_meta );
+		do_action('give_pre_update_log', $log_data, $log_meta);
 
 		$defaults = array(
 			'post_type'   => 'give_log',
@@ -275,15 +275,15 @@ 
 			'post_parent' => 0,
 		);
 
-		$args = wp_parse_args( $log_data, $defaults );
+		$args = wp_parse_args($log_data, $defaults);
 
 		// Store the log entry
-		$log_id = wp_update_post( $args );
+		$log_id = wp_update_post($args);
 
-		if ( $log_id && ! empty( $log_meta ) ) {
-			foreach ( (array) $log_meta as $key => $meta ) {
-				if ( ! empty( $meta ) ) {
-					update_post_meta( $log_id, '_give_log_' . sanitize_key( $key ), $meta );
+		if ($log_id && ! empty($log_meta)) {
+			foreach ((array) $log_meta as $key => $meta) {
+				if ( ! empty($meta)) {
+					update_post_meta($log_id, '_give_log_'.sanitize_key($key), $meta);
 				}
 			}
 		}
@@ -297,7 +297,7 @@ 
 		 * @param array $log_data Log entry data.
 		 * @param array $log_meta Log entry meta.
 		 */
-		do_action( 'give_post_update_log', $log_id, $log_data, $log_meta );
+		do_action('give_post_update_log', $log_id, $log_data, $log_meta);
 	}
 
 	/**
@@ -312,19 +312,19 @@ 
 	 *
 	 * @return array|false Array if logs were found, false otherwise.
 	 */
-	public function get_connected_logs( $args = array() ) {
+	public function get_connected_logs($args = array()) {
 
 		$defaults = array(
 			'post_type'      => 'give_log',
 			'posts_per_page' => 20,
 			'post_status'    => 'publish',
-			'paged'          => get_query_var( 'paged' ),
+			'paged'          => get_query_var('paged'),
 			'log_type'       => false,
 		);
 
-		$query_args = wp_parse_args( $args, $defaults );
+		$query_args = wp_parse_args($args, $defaults);
 
-		if ( $query_args['log_type'] && $this->valid_type( $query_args['log_type'] ) ) {
+		if ($query_args['log_type'] && $this->valid_type($query_args['log_type'])) {
 			$query_args['tax_query'] = array(
 				array(
 					'taxonomy' => 'give_log_type',
@@ -334,9 +334,9 @@ 
 			);
 		}
 
-		$logs = get_posts( $query_args );
+		$logs = get_posts($query_args);
 
-		if ( $logs ) {
+		if ($logs) {
 			return $logs;
 		}
 
@@ -359,20 +359,20 @@ 
 	 *
 	 * @return int                Log count.
 	 */
-	public function get_log_count( $object_id = 0, $type = null, $meta_query = null, $date_query = null ) {
+	public function get_log_count($object_id = 0, $type = null, $meta_query = null, $date_query = null) {
 
 		$query_args = array(
 			'post_type'      => 'give_log',
-			'posts_per_page' => - 1,
+			'posts_per_page' => -1,
 			'post_status'    => 'publish',
 			'fields'         => 'ids',
 		);
 
-		if ( $object_id ) {
+		if ($object_id) {
 			$query_args['post_parent'] = $object_id;
 		}
 
-		if ( ! empty( $type ) && $this->valid_type( $type ) ) {
+		if ( ! empty($type) && $this->valid_type($type)) {
 			$query_args['tax_query'] = array(
 				array(
 					'taxonomy' => 'give_log_type',
@@ -382,24 +382,24 @@ 
 			);
 		}
 
-		if ( ! empty( $meta_query ) ) {
+		if ( ! empty($meta_query)) {
 			$query_args['meta_query'] = $meta_query;
 		}
 
-		if ( ! empty( $date_query ) ) {
+		if ( ! empty($date_query)) {
 			$query_args['date_query'] = $date_query;
 		}
 
 		// Get cache key for current query.
-		$cache_key = give_get_cache_key( 'get_log_count', $query_args );
+		$cache_key = give_get_cache_key('get_log_count', $query_args);
 
 		// check if cache already exist or not.
-		if ( ! ( $logs_count = get_option( $cache_key ) ) ) {
-			$logs       = new WP_Query( $query_args );
+		if ( ! ($logs_count = get_option($cache_key))) {
+			$logs       = new WP_Query($query_args);
 			$logs_count = (int) $logs->post_count;
 
 			// Cache results.
-			add_option( $cache_key, $logs_count, '', 'no' );
+			add_option($cache_key, $logs_count, '', 'no');
 		}
 
 		return $logs_count;
@@ -419,16 +419,16 @@ 
 	 *
 	 * @return void
 	 */
-	public function delete_logs( $object_id = 0, $type = null, $meta_query = null ) {
+	public function delete_logs($object_id = 0, $type = null, $meta_query = null) {
 		$query_args = array(
 			'post_parent'    => $object_id,
 			'post_type'      => 'give_log',
-			'posts_per_page' => - 1,
+			'posts_per_page' => -1,
 			'post_status'    => 'publish',
 			'fields'         => 'ids',
 		);
 
-		if ( ! empty( $type ) && $this->valid_type( $type ) ) {
+		if ( ! empty($type) && $this->valid_type($type)) {
 			$query_args['tax_query'] = array(
 				array(
 					'taxonomy' => 'give_log_type',
@@ -438,15 +438,15 @@ 
 			);
 		}
 
-		if ( ! empty( $meta_query ) ) {
+		if ( ! empty($meta_query)) {
 			$query_args['meta_query'] = $meta_query;
 		}
 
-		$logs = get_posts( $query_args );
+		$logs = get_posts($query_args);
 
-		if ( $logs ) {
-			foreach ( $logs as $log ) {
-				wp_delete_post( $log, true );
+		if ($logs) {
+			foreach ($logs as $log) {
+				wp_delete_post($log, true);
 			}
 		}
 	}
@@ -459,8 +459,8 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public function background_process_delete_cache( $post_id ) {
-		wp_schedule_single_event( time(), 'give_delete_log_cache' );
+	public function background_process_delete_cache($post_id) {
+		wp_schedule_single_event(time(), 'give_delete_log_cache');
 	}
 
 	/**
@@ -482,13 +482,13 @@ 
 		);
 
 		// Bailout.
-		if ( empty( $cache_option_names ) ) {
+		if (empty($cache_option_names)) {
 			return false;
 		}
 
 		// Delete log cache.
-		foreach ( $cache_option_names as $option_name ) {
-			delete_option( $option_name['option_name'] );
+		foreach ($cache_option_names as $option_name) {
+			delete_option($option_name['option_name']);
 		}
 	}
 }
@@ -511,10 +511,10 @@ 
  *
  * @return int             ID of the new log entry.
  */
-function give_record_log( $title = '', $message = '', $parent = 0, $type = null ) {
+function give_record_log($title = '', $message = '', $parent = 0, $type = null) {
 	/* @var Give_Logging $give_logs */
 	global $give_logs;
-	$log = $give_logs->add( $title, $message, $parent, $type );
+	$log = $give_logs->add($title, $message, $parent, $type);
 
 	return $log;
 }

includes/scripts.php

Spacing +152 added lines, -152 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,25 +25,25 @@ 
  */
 function give_load_scripts() {
 
-	$js_dir         = GIVE_PLUGIN_URL . 'assets/js/frontend/';
-	$js_plugins     = GIVE_PLUGIN_URL . 'assets/js/plugins/';
-	$scripts_footer = ( give_is_setting_enabled( give_get_option( 'scripts_footer' ) ) ) ? true : false;
+	$js_dir         = GIVE_PLUGIN_URL.'assets/js/frontend/';
+	$js_plugins     = GIVE_PLUGIN_URL.'assets/js/plugins/';
+	$scripts_footer = (give_is_setting_enabled(give_get_option('scripts_footer'))) ? true : false;
 
 	// Use minified libraries if SCRIPT_DEBUG is turned off.
-	$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
+	$suffix = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
 
 	// Localize / PHP to AJAX vars.
-	$localize_give_vars = apply_filters( 'give_global_script_vars', array(
+	$localize_give_vars = apply_filters('give_global_script_vars', array(
 		'ajaxurl'             => give_get_ajax_url(),
-		'checkout_nonce'      => wp_create_nonce( 'give_checkout_nonce' ),
-		'currency_sign'       => give_currency_filter( '' ),
+		'checkout_nonce'      => wp_create_nonce('give_checkout_nonce'),
+		'currency_sign'       => give_currency_filter(''),
 		'currency_pos'        => give_get_currency_position(),
 		'thousands_separator' => give_get_price_thousand_separator(),
 		'decimal_separator'   => give_get_price_decimal_separator(),
-		'no_gateway'          => __( 'Please select a payment method.', 'give' ),
-		'bad_minimum'         => __( 'The minimum donation amount for this form is', 'give' ),
-		'general_loading'     => __( 'Loading...', 'give' ),
-		'purchase_loading'    => __( 'Please Wait...', 'give' ),
+		'no_gateway'          => __('Please select a payment method.', 'give'),
+		'bad_minimum'         => __('The minimum donation amount for this form is', 'give'),
+		'general_loading'     => __('Loading...', 'give'),
+		'purchase_loading'    => __('Please Wait...', 'give'),
 		'number_decimals'     => give_get_price_decimals(),
 		'give_version'        => GIVE_VERSION,
 		'magnific_options'    => apply_filters(
@@ -57,81 +57,81 @@ 
 			'give_form_translation_js',
 			array(
 				// Field name               Validation message.
-				'payment-mode'           => __( 'Please select payment mode.', 'give' ),
-				'give_first'             => __( 'Please enter your first name.', 'give' ),
-				'give_email'             => __( 'Please enter a valid email address.', 'give' ),
-				'give_user_login'        => __( 'Invalid username. Only lowercase letters (a-z) and numbers are allowed.', 'give' ),
-				'give_user_pass'         => __( 'Enter a password.', 'give' ),
-				'give_user_pass_confirm' => __( 'Enter the password confirmation.', 'give' ),
-				'give_agree_to_terms'    => __( 'You must agree to the terms and conditions.', 'give' ),
+				'payment-mode'           => __('Please select payment mode.', 'give'),
+				'give_first'             => __('Please enter your first name.', 'give'),
+				'give_email'             => __('Please enter a valid email address.', 'give'),
+				'give_user_login'        => __('Invalid username. Only lowercase letters (a-z) and numbers are allowed.', 'give'),
+				'give_user_pass'         => __('Enter a password.', 'give'),
+				'give_user_pass_confirm' => __('Enter the password confirmation.', 'give'),
+				'give_agree_to_terms'    => __('You must agree to the terms and conditions.', 'give'),
 			)
 		),
-	) );
+	));
 
-	$localize_give_ajax = apply_filters( 'give_global_ajax_vars', array(
+	$localize_give_ajax = apply_filters('give_global_ajax_vars', array(
 		'ajaxurl'         => give_get_ajax_url(),
-		'loading'         => __( 'Loading', 'give' ),
+		'loading'         => __('Loading', 'give'),
 		// General loading message.
-		'select_option'   => __( 'Please select an option', 'give' ),
+		'select_option'   => __('Please select an option', 'give'),
 		// Variable pricing error with multi-donation option enabled.
-		'default_gateway' => give_get_default_gateway( null ),
-		'permalinks'      => get_option( 'permalink_structure' ) ? '1' : '0',
+		'default_gateway' => give_get_default_gateway(null),
+		'permalinks'      => get_option('permalink_structure') ? '1' : '0',
 		'number_decimals' => give_get_price_decimals(),
-	) );
+	));
 
 	// DEBUG is On.
-	if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
+	if (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) {
 
-		if ( give_is_cc_verify_enabled() ) {
-			wp_register_script( 'give-cc-validator', $js_plugins . 'jquery.payment' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-			wp_enqueue_script( 'give-cc-validator' );
+		if (give_is_cc_verify_enabled()) {
+			wp_register_script('give-cc-validator', $js_plugins.'jquery.payment'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+			wp_enqueue_script('give-cc-validator');
 		}
 
-		wp_register_script( 'give-float-labels', $js_plugins . 'float-labels' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-float-labels' );
+		wp_register_script('give-float-labels', $js_plugins.'float-labels'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-float-labels');
 
-		wp_register_script( 'give-blockui', $js_plugins . 'jquery.blockUI' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-blockui' );
+		wp_register_script('give-blockui', $js_plugins.'jquery.blockUI'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-blockui');
 
-		wp_register_script( 'give-qtip', $js_plugins . 'jquery.qtip' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-qtip' );
+		wp_register_script('give-qtip', $js_plugins.'jquery.qtip'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-qtip');
 
-		wp_register_script( 'give-accounting', $js_plugins . 'accounting' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-accounting' );
+		wp_register_script('give-accounting', $js_plugins.'accounting'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-accounting');
 
-		wp_register_script( 'give-magnific', $js_plugins . 'jquery.magnific-popup' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-magnific' );
+		wp_register_script('give-magnific', $js_plugins.'jquery.magnific-popup'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-magnific');
 
-		wp_register_script( 'give-checkout-global', $js_dir . 'give-checkout-global' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-checkout-global' );
+		wp_register_script('give-checkout-global', $js_dir.'give-checkout-global'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-checkout-global');
 
 		// General scripts.
-		wp_register_script( 'give-scripts', $js_dir . 'give' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-scripts' );
+		wp_register_script('give-scripts', $js_dir.'give'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-scripts');
 
 		// Load AJAX scripts, if enabled.
-		wp_register_script( 'give-ajax', $js_dir . 'give-ajax' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-ajax' );
+		wp_register_script('give-ajax', $js_dir.'give-ajax'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-ajax');
 
 		// Localize / Pass AJAX vars from PHP,
-		wp_localize_script( 'give-checkout-global', 'give_global_vars', $localize_give_vars );
-		wp_localize_script( 'give-ajax', 'give_scripts', $localize_give_ajax );
+		wp_localize_script('give-checkout-global', 'give_global_vars', $localize_give_vars);
+		wp_localize_script('give-ajax', 'give_scripts', $localize_give_ajax);
 
 	} else {
 
 		// DEBUG is OFF (one JS file to rule them all!).
-		wp_register_script( 'give', $js_dir . 'give.all.min.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give' );
+		wp_register_script('give', $js_dir.'give.all.min.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give');
 
 		// Localize / Pass AJAX vars from PHP.
-		wp_localize_script( 'give', 'give_global_vars', $localize_give_vars );
-		wp_localize_script( 'give', 'give_scripts', $localize_give_ajax );
+		wp_localize_script('give', 'give_global_vars', $localize_give_vars);
+		wp_localize_script('give', 'give_scripts', $localize_give_ajax);
 
 	}
 
 }
 
-add_action( 'wp_enqueue_scripts', 'give_load_scripts' );
+add_action('wp_enqueue_scripts', 'give_load_scripts');
 
 /**
  * Register styles.
@@ -144,16 +144,16 @@ 
  */
 function give_register_styles() {
 
-	if ( ! give_is_setting_enabled( give_get_option( 'css' ) ) ) {
+	if ( ! give_is_setting_enabled(give_get_option('css'))) {
 		return;
 	}
 
-	wp_register_style( 'give-styles', give_get_stylesheet_uri(), array(), GIVE_VERSION, 'all' );
-	wp_enqueue_style( 'give-styles' );
+	wp_register_style('give-styles', give_get_stylesheet_uri(), array(), GIVE_VERSION, 'all');
+	wp_enqueue_style('give-styles');
 
 }
 
-add_action( 'wp_enqueue_scripts', 'give_register_styles' );
+add_action('wp_enqueue_scripts', 'give_register_styles');
 
 
 /**
@@ -166,19 +166,19 @@ 
 function give_get_stylesheet_uri() {
 
 	// Use minified libraries if SCRIPT_DEBUG is turned off.
-	$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
+	$suffix = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
 
 	// LTR or RTL files.
-	$direction = ( is_rtl() ) ? '-rtl' : '';
+	$direction = (is_rtl()) ? '-rtl' : '';
 
-	$file          = 'give' . $direction . $suffix . '.css';
+	$file          = 'give'.$direction.$suffix.'.css';
 	$templates_dir = give_get_theme_template_dir_name();
 
-	$child_theme_style_sheet    = trailingslashit( get_stylesheet_directory() ) . $templates_dir . $file;
-	$child_theme_style_sheet_2  = trailingslashit( get_stylesheet_directory() ) . $templates_dir . 'give' . $direction . '.css';
-	$parent_theme_style_sheet   = trailingslashit( get_template_directory() ) . $templates_dir . $file;
-	$parent_theme_style_sheet_2 = trailingslashit( get_template_directory() ) . $templates_dir . 'give' . $direction . '.css';
-	$give_plugin_style_sheet    = trailingslashit( give_get_templates_dir() ) . $file;
+	$child_theme_style_sheet    = trailingslashit(get_stylesheet_directory()).$templates_dir.$file;
+	$child_theme_style_sheet_2  = trailingslashit(get_stylesheet_directory()).$templates_dir.'give'.$direction.'.css';
+	$parent_theme_style_sheet   = trailingslashit(get_template_directory()).$templates_dir.$file;
+	$parent_theme_style_sheet_2 = trailingslashit(get_template_directory()).$templates_dir.'give'.$direction.'.css';
+	$give_plugin_style_sheet    = trailingslashit(give_get_templates_dir()).$file;
 
 	$uri = false;
 
@@ -188,23 +188,23 @@ 
 	 * followed by non minified version, even if SCRIPT_DEBUG is not enabled.
 	 * This allows users to copy just give.css to their theme.
 	 */
-	if ( file_exists( $child_theme_style_sheet ) || ( ! empty( $suffix ) && ( $nonmin = file_exists( $child_theme_style_sheet_2 ) ) ) ) {
-		if ( ! empty( $nonmin ) ) {
-			$uri = trailingslashit( get_stylesheet_directory_uri() ) . $templates_dir . 'give' . $direction . '.css';
+	if (file_exists($child_theme_style_sheet) || ( ! empty($suffix) && ($nonmin = file_exists($child_theme_style_sheet_2)))) {
+		if ( ! empty($nonmin)) {
+			$uri = trailingslashit(get_stylesheet_directory_uri()).$templates_dir.'give'.$direction.'.css';
 		} else {
-			$uri = trailingslashit( get_stylesheet_directory_uri() ) . $templates_dir . $file;
+			$uri = trailingslashit(get_stylesheet_directory_uri()).$templates_dir.$file;
 		}
-	} elseif ( file_exists( $parent_theme_style_sheet ) || ( ! empty( $suffix ) && ( $nonmin = file_exists( $parent_theme_style_sheet_2 ) ) ) ) {
-		if ( ! empty( $nonmin ) ) {
-			$uri = trailingslashit( get_template_directory_uri() ) . $templates_dir . 'give' . $direction . '.css';
+	} elseif (file_exists($parent_theme_style_sheet) || ( ! empty($suffix) && ($nonmin = file_exists($parent_theme_style_sheet_2)))) {
+		if ( ! empty($nonmin)) {
+			$uri = trailingslashit(get_template_directory_uri()).$templates_dir.'give'.$direction.'.css';
 		} else {
-			$uri = trailingslashit( get_template_directory_uri() ) . $templates_dir . $file;
+			$uri = trailingslashit(get_template_directory_uri()).$templates_dir.$file;
 		}
-	} elseif ( file_exists( $give_plugin_style_sheet ) || file_exists( $give_plugin_style_sheet ) ) {
-		$uri = trailingslashit( give_get_templates_url() ) . $file;
+	} elseif (file_exists($give_plugin_style_sheet) || file_exists($give_plugin_style_sheet)) {
+		$uri = trailingslashit(give_get_templates_url()).$file;
 	}
 
-	return apply_filters( 'give_get_stylesheet_uri', $uri );
+	return apply_filters('give_get_stylesheet_uri', $uri);
 
 }
 
@@ -221,73 +221,73 @@ 
  *
  * @return void
  */
-function give_load_admin_scripts( $hook ) {
+function give_load_admin_scripts($hook) {
 
 	global $post, $post_type;
 
 	$give_options = give_get_settings();
 
 	// Directories of assets.
-	$js_dir     = GIVE_PLUGIN_URL . 'assets/js/admin/';
-	$js_plugins = GIVE_PLUGIN_URL . 'assets/js/plugins/';
-	$css_dir    = GIVE_PLUGIN_URL . 'assets/css/';
+	$js_dir     = GIVE_PLUGIN_URL.'assets/js/admin/';
+	$js_plugins = GIVE_PLUGIN_URL.'assets/js/plugins/';
+	$css_dir    = GIVE_PLUGIN_URL.'assets/css/';
 
 	// Use minified libraries if SCRIPT_DEBUG is turned off.
-	$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
+	$suffix = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
 
 	// LTR or RTL files.
-	$direction = ( is_rtl() ) ? '-rtl' : '';
+	$direction = (is_rtl()) ? '-rtl' : '';
 
 	// Global Admin.
-	wp_register_style( 'give-admin-bar-notification', $css_dir . 'adminbar-style.css' );
-	wp_enqueue_style( 'give-admin-bar-notification' );
+	wp_register_style('give-admin-bar-notification', $css_dir.'adminbar-style.css');
+	wp_enqueue_style('give-admin-bar-notification');
 
 	// Give Admin Only.
-	if ( ! apply_filters( 'give_load_admin_scripts', give_is_admin_page(), $hook ) ) {
+	if ( ! apply_filters('give_load_admin_scripts', give_is_admin_page(), $hook)) {
 		return;
 	}
 
 	// CSS.
-	wp_register_style( 'jquery-ui-css', $css_dir . 'jquery-ui-fresh' . $suffix . '.css' );
-	wp_enqueue_style( 'jquery-ui-css' );
-	wp_register_style( 'give-admin', $css_dir . 'give-admin' . $direction . $suffix . '.css', array(), GIVE_VERSION );
-	wp_enqueue_style( 'give-admin' );
-	wp_register_style( 'jquery-chosen', $css_dir . 'chosen' . $suffix . '.css', array(), GIVE_VERSION );
-	wp_enqueue_style( 'jquery-chosen' );
-	wp_enqueue_style( 'thickbox' );
+	wp_register_style('jquery-ui-css', $css_dir.'jquery-ui-fresh'.$suffix.'.css');
+	wp_enqueue_style('jquery-ui-css');
+	wp_register_style('give-admin', $css_dir.'give-admin'.$direction.$suffix.'.css', array(), GIVE_VERSION);
+	wp_enqueue_style('give-admin');
+	wp_register_style('jquery-chosen', $css_dir.'chosen'.$suffix.'.css', array(), GIVE_VERSION);
+	wp_enqueue_style('jquery-chosen');
+	wp_enqueue_style('thickbox');
 
 	// JS.
-	wp_register_script( 'jquery-chosen', $js_plugins . 'chosen.jquery' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION );
-	wp_enqueue_script( 'jquery-chosen' );
+	wp_register_script('jquery-chosen', $js_plugins.'chosen.jquery'.$suffix.'.js', array('jquery'), GIVE_VERSION);
+	wp_enqueue_script('jquery-chosen');
 
-	wp_register_script( 'give-accounting', $js_plugins . 'accounting' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
-	wp_enqueue_script( 'give-accounting' );
+	wp_register_script('give-accounting', $js_plugins.'accounting'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
+	wp_enqueue_script('give-accounting');
 
-	wp_register_script( 'give-admin-scripts', $js_dir . 'admin-scripts' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
-	wp_enqueue_script( 'give-admin-scripts' );
+	wp_register_script('give-admin-scripts', $js_dir.'admin-scripts'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
+	wp_enqueue_script('give-admin-scripts');
 
-	wp_register_script( 'jquery-flot', $js_plugins . 'jquery.flot' . $suffix . '.js' );
-	wp_enqueue_script( 'jquery-flot' );
+	wp_register_script('jquery-flot', $js_plugins.'jquery.flot'.$suffix.'.js');
+	wp_enqueue_script('jquery-flot');
 
-	wp_register_script( 'give-qtip', $js_plugins . 'jquery.qtip' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
-	wp_enqueue_script( 'give-qtip' );
+	wp_register_script('give-qtip', $js_plugins.'jquery.qtip'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
+	wp_enqueue_script('give-qtip');
 
-	wp_register_script( 'give-repeatable-fields', $js_plugins . 'repeatable-fields' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
-	wp_enqueue_script( 'give-repeatable-fields' );
+	wp_register_script('give-repeatable-fields', $js_plugins.'repeatable-fields'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
+	wp_enqueue_script('give-repeatable-fields');
 
-	wp_enqueue_script( 'jquery-ui-datepicker' );
-	wp_enqueue_script( 'thickbox' );
+	wp_enqueue_script('jquery-ui-datepicker');
+	wp_enqueue_script('thickbox');
 
 	// Forms CPT Script.
-	if ( $post_type === 'give_forms' ) {
-		wp_register_script( 'give-admin-forms-scripts', $js_dir . 'admin-forms' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
-		wp_enqueue_script( 'give-admin-forms-scripts' );
+	if ($post_type === 'give_forms') {
+		wp_register_script('give-admin-forms-scripts', $js_dir.'admin-forms'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
+		wp_enqueue_script('give-admin-forms-scripts');
 	}
 
 	// Settings Scripts.
-	if ( isset( $_GET['page'] ) && $_GET['page'] == 'give-settings' ) {
-		wp_register_script( 'give-admin-settings-scripts', $js_dir . 'admin-settings' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
-		wp_enqueue_script( 'give-admin-settings-scripts' );
+	if (isset($_GET['page']) && $_GET['page'] == 'give-settings') {
+		wp_register_script('give-admin-settings-scripts', $js_dir.'admin-settings'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
+		wp_enqueue_script('give-admin-settings-scripts');
 	}
 
 	// Price Separators.
@@ -295,60 +295,60 @@ 
 	$decimal_separator  = give_get_price_decimal_separator();
 
 	// Localize strings & variables for JS.
-	wp_localize_script( 'give-admin-scripts', 'give_vars', array(
-		'post_id'                        => isset( $post->ID ) ? $post->ID : null,
+	wp_localize_script('give-admin-scripts', 'give_vars', array(
+		'post_id'                        => isset($post->ID) ? $post->ID : null,
 		'give_version'                   => GIVE_VERSION,
 		'thousands_separator'            => $thousand_separator,
 		'decimal_separator'              => $decimal_separator,
-		'quick_edit_warning'             => __( 'Not available for variable priced forms.', 'give' ),
-		'delete_payment'                 => __( 'Are you sure you wish to delete this payment?', 'give' ),
-		'delete_payment_note'            => __( 'Are you sure you wish to delete this note?', 'give' ),
-		'revoke_api_key'                 => __( 'Are you sure you wish to revoke this API key?', 'give' ),
-		'regenerate_api_key'             => __( 'Are you sure you wish to regenerate this API key?', 'give' ),
-		'resend_receipt'                 => __( 'Are you sure you wish to resend the donation receipt?', 'give' ),
-		'logo'                           => __( 'Logo', 'give' ),
-		'use_this_image'                 => __( 'Use this image', 'give' ),
-		'one_option'                     => __( 'Choose a form', 'give' ),
-		'one_or_more_option'             => __( 'Choose one or more forms', 'give' ),
-		'currency_sign'                  => give_currency_filter( '' ),
-		'currency_pos'                   => isset( $give_options['currency_position'] ) ? $give_options['currency_position'] : 'before',
-		'currency_decimals'              => give_currency_decimal_filter( give_get_price_decimals() ),
-		'batch_export_no_class'          => __( 'You must choose a method.', 'give' ),
-		'batch_export_no_reqs'           => __( 'Required fields not completed.', 'give' ),
-		'reset_stats_warn'               => __( 'Are you sure you want to reset Give? This process is <strong><em>not reversible</em></strong> and will delete all data regardless of test or live mode. Please be sure you have a recent backup before proceeding.', 'give' ),
-		'price_format_guide'             => sprintf( __( 'Please enter amount in monetary decimal ( %1$s ) format without thousand separator ( %2$s ) .', 'give' ), $decimal_separator, $thousand_separator ),
+		'quick_edit_warning'             => __('Not available for variable priced forms.', 'give'),
+		'delete_payment'                 => __('Are you sure you wish to delete this payment?', 'give'),
+		'delete_payment_note'            => __('Are you sure you wish to delete this note?', 'give'),
+		'revoke_api_key'                 => __('Are you sure you wish to revoke this API key?', 'give'),
+		'regenerate_api_key'             => __('Are you sure you wish to regenerate this API key?', 'give'),
+		'resend_receipt'                 => __('Are you sure you wish to resend the donation receipt?', 'give'),
+		'logo'                           => __('Logo', 'give'),
+		'use_this_image'                 => __('Use this image', 'give'),
+		'one_option'                     => __('Choose a form', 'give'),
+		'one_or_more_option'             => __('Choose one or more forms', 'give'),
+		'currency_sign'                  => give_currency_filter(''),
+		'currency_pos'                   => isset($give_options['currency_position']) ? $give_options['currency_position'] : 'before',
+		'currency_decimals'              => give_currency_decimal_filter(give_get_price_decimals()),
+		'batch_export_no_class'          => __('You must choose a method.', 'give'),
+		'batch_export_no_reqs'           => __('Required fields not completed.', 'give'),
+		'reset_stats_warn'               => __('Are you sure you want to reset Give? This process is <strong><em>not reversible</em></strong> and will delete all data regardless of test or live mode. Please be sure you have a recent backup before proceeding.', 'give'),
+		'price_format_guide'             => sprintf(__('Please enter amount in monetary decimal ( %1$s ) format without thousand separator ( %2$s ) .', 'give'), $decimal_separator, $thousand_separator),
 		/* translators : %s: Donation form options metabox */
-		'confirm_before_remove_row_text' => __( 'Do you want to delete this level?', 'give' ),
-		'matched_success_failure_page'   => __( 'You cannot set the success and failed pages to the same page', 'give' ),
-		'dismiss_notice_text'            => __( 'Dismiss this notice.', 'give' ),
+		'confirm_before_remove_row_text' => __('Do you want to delete this level?', 'give'),
+		'matched_success_failure_page'   => __('You cannot set the success and failed pages to the same page', 'give'),
+		'dismiss_notice_text'            => __('Dismiss this notice.', 'give'),
 		'bulk_action' => array(
 			'delete'         => array(
-				'zero_payment_selected' => __( 'You must choose at least one or more payments to delete.', 'give' ),
-				'delete_payment'        => __( 'Are you sure you want to permanently delete this donation?', 'give' ),
-				'delete_payments'       => __( 'Are you sure you want to permanently delete the selected {payment_count} donations?', 'give' ),
+				'zero_payment_selected' => __('You must choose at least one or more payments to delete.', 'give'),
+				'delete_payment'        => __('Are you sure you want to permanently delete this donation?', 'give'),
+				'delete_payments'       => __('Are you sure you want to permanently delete the selected {payment_count} donations?', 'give'),
 			),
 			'resend_receipt' => array(
-				'zero_recipient_selected' => __( 'You must choose at least one or more recipients to resend the email receipt.', 'give' ),
-				'resend_receipt'          => __( 'Are you sure you want to resend the email receipt to this recipient?', 'give' ),
-				'resend_receipts'         => __( 'Are you sure you want to resend the emails receipt to {payment_count} recipients?', 'give' ),
+				'zero_recipient_selected' => __('You must choose at least one or more recipients to resend the email receipt.', 'give'),
+				'resend_receipt'          => __('Are you sure you want to resend the email receipt to this recipient?', 'give'),
+				'resend_receipts'         => __('Are you sure you want to resend the emails receipt to {payment_count} recipients?', 'give'),
 			),
 		),
-		'upgrade_confirmation' => __( 'Please make sure to create a database backup before initiating the upgrade.', 'give' ),
+		'upgrade_confirmation' => __('Please make sure to create a database backup before initiating the upgrade.', 'give'),
 		'metabox_fields' => array(
 			'media' => array(
-				'button_title' => esc_html__( 'Choose Attachment', 'give' ),
+				'button_title' => esc_html__('Choose Attachment', 'give'),
 			)
 		)
-	) );
+	));
 
-	if ( function_exists( 'wp_enqueue_media' ) && version_compare( get_bloginfo( 'version' ), '3.5', '>=' ) ) {
+	if (function_exists('wp_enqueue_media') && version_compare(get_bloginfo('version'), '3.5', '>=')) {
 		// call for new media manager.
 		wp_enqueue_media();
 	}
 
 }
 
-add_action( 'admin_enqueue_scripts', 'give_load_admin_scripts', 100 );
+add_action('admin_enqueue_scripts', 'give_load_admin_scripts', 100);
 
 /**
  * Admin Give Icon
@@ -363,13 +363,13 @@ 
 	?>
     <style type="text/css" media="screen">
 
-        <?php if ( version_compare( get_bloginfo( 'version' ), '3.8-RC', '>=' ) || version_compare( get_bloginfo( 'version' ), '3.8', '>=' ) ) { ?>
+        <?php if (version_compare(get_bloginfo('version'), '3.8-RC', '>=') || version_compare(get_bloginfo('version'), '3.8', '>=')) { ?>
         @font-face {
             font-family: 'give-icomoon';
-            src: url('<?php echo GIVE_PLUGIN_URL . '/assets/fonts/icomoon.eot?ngjl88'; ?>');
-            src: url('<?php echo GIVE_PLUGIN_URL . '/assets/fonts/icomoon.eot?#iefixngjl88'?>') format('embedded-opentype'),
-            url('<?php echo GIVE_PLUGIN_URL . '/assets/fonts/icomoon.woff?ngjl88'; ?>') format('woff'),
-            url('<?php echo GIVE_PLUGIN_URL . '/assets/fonts/icomoon.svg?ngjl88#icomoon'; ?>') format('svg');
+            src: url('<?php echo GIVE_PLUGIN_URL.'/assets/fonts/icomoon.eot?ngjl88'; ?>');
+            src: url('<?php echo GIVE_PLUGIN_URL.'/assets/fonts/icomoon.eot?#iefixngjl88'?>') format('embedded-opentype'),
+            url('<?php echo GIVE_PLUGIN_URL.'/assets/fonts/icomoon.woff?ngjl88'; ?>') format('woff'),
+            url('<?php echo GIVE_PLUGIN_URL.'/assets/fonts/icomoon.svg?ngjl88#icomoon'; ?>') format('svg');
             font-weight: normal;
             font-style: normal;
         }
@@ -388,7 +388,7 @@ 
 	<?php
 }
 
-add_action( 'admin_head', 'give_admin_icon' );
+add_action('admin_head', 'give_admin_icon');
 
 /**
  * Admin js code
@@ -418,4 +418,4 @@ 
 	<?php
 }
 
-add_action( 'admin_head', 'give_admin_hide_notice_shortly_js' );
+add_action('admin_head', 'give_admin_hide_notice_shortly_js');

give.php

Spacing +138 added lines, -138 removed lines

@@ -40,11 +40,11 @@ 
  */

 

 // Exit if accessed directly.

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

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

 	exit;

 }

 

-if ( ! class_exists( 'Give' ) ) :

+if ( ! class_exists('Give')) :

 

 	/**

 	 * Main Give Class

@@ -195,11 +195,11 @@ 
 		 * @return    Give

 		 */

 		public static function instance() {

-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof Give ) ) {

+			if ( ! isset(self::$instance) && ! (self::$instance instanceof Give)) {

 				self::$instance = new Give;

 				self::$instance->setup_constants();

 

-				add_action( 'plugins_loaded', array( self::$instance, 'load_textdomain' ) );

+				add_action('plugins_loaded', array(self::$instance, 'load_textdomain'));

 

 				self::$instance->includes();

 				self::$instance->roles           = new Give_Roles();

@@ -232,7 +232,7 @@ 
 		 */

 		public function __clone() {

 			// Cloning instances of the class is forbidden

-			_doing_it_wrong( __FUNCTION__, __( 'Cheatin’ huh?', 'give' ), '1.0' );

+			_doing_it_wrong(__FUNCTION__, __('Cheatin’ huh?', 'give'), '1.0');

 		}

 

 		/**

@@ -245,7 +245,7 @@ 
 		 */

 		public function __wakeup() {

 			// Unserializing instances of the class is forbidden.

-			_doing_it_wrong( __FUNCTION__, __( 'Cheatin’ huh?', 'give' ), '1.0' );

+			_doing_it_wrong(__FUNCTION__, __('Cheatin’ huh?', 'give'), '1.0');

 		}

 

 		/**

@@ -259,33 +259,33 @@ 
 		private function setup_constants() {

 

 			// Plugin version

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

-				define( 'GIVE_VERSION', '1.8.3' );

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

+				define('GIVE_VERSION', '1.8.3');

 			}

 

 			// Plugin Folder Path

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

-				define( 'GIVE_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );

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

+				define('GIVE_PLUGIN_DIR', plugin_dir_path(__FILE__));

 			}

 

 			// Plugin Folder URL

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

-				define( 'GIVE_PLUGIN_URL', plugin_dir_url( __FILE__ ) );

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

+				define('GIVE_PLUGIN_URL', plugin_dir_url(__FILE__));

 			}

 

 			// Plugin Basename aka: "give/give.php"

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

-				define( 'GIVE_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );

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

+				define('GIVE_PLUGIN_BASENAME', plugin_basename(__FILE__));

 			}

 

 			// Plugin Root File

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

-				define( 'GIVE_PLUGIN_FILE', __FILE__ );

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

+				define('GIVE_PLUGIN_FILE', __FILE__);

 			}

 

 			// Make sure CAL_GREGORIAN is defined

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

-				define( 'CAL_GREGORIAN', 1 );

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

+				define('CAL_GREGORIAN', 1);

 			}

 		}

 

@@ -300,122 +300,122 @@ 
 		private function includes() {

 			global $give_options;

 

-			require_once GIVE_PLUGIN_DIR . 'includes/admin/class-admin-settings.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/admin/class-give-settings.php';

+			require_once GIVE_PLUGIN_DIR.'includes/admin/class-admin-settings.php';

+			require_once GIVE_PLUGIN_DIR.'includes/admin/class-give-settings.php';

 			$give_options = give_get_settings();

 

-			require_once GIVE_PLUGIN_DIR . 'includes/admin/give-metabox-functions.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/post-types.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/scripts.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/ajax-functions.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/actions.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/filters.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/api/class-give-api.php';

-

-			require_once GIVE_PLUGIN_DIR . 'includes/class-give-roles.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/class-give-template-loader.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/class-give-donate-form.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/class-give-db.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/class-give-db-customers.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/class-give-db-customer-meta.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/class-give-customer.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/class-give-stats.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/class-give-session.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/class-give-html-elements.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/class-give-logging.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/class-give-license-handler.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/class-give-cron.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/class-give-email-access.php';

-

-			require_once GIVE_PLUGIN_DIR . 'includes/country-functions.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/template-functions.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/misc-functions.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/forms/functions.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/forms/template.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/forms/widget.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/shortcodes.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/formatting.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/price-functions.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/error-tracking.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/process-donation.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/login-register.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/user-functions.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/plugin-compatibility.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/deprecated/deprecated-functions.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/deprecated/deprecated-actions.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/deprecated/deprecated-filters.php';

-

-			require_once GIVE_PLUGIN_DIR . 'includes/payments/functions.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/payments/actions.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/payments/class-payment-stats.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/payments/class-payments-query.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/payments/class-give-payment.php';

-

-			require_once GIVE_PLUGIN_DIR . 'includes/gateways/functions.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/gateways/actions.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/gateways/paypal-standard.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/gateways/offline-donations.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/gateways/manual.php';

-

-			require_once GIVE_PLUGIN_DIR . 'includes/emails/class-give-emails.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/emails/class-give-email-tags.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/emails/functions.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/emails/template.php';

-			require_once GIVE_PLUGIN_DIR . 'includes/emails/actions.php';

-

-            if( defined( 'WP_CLI' ) && WP_CLI ) {

-                require_once GIVE_PLUGIN_DIR . 'includes/class-give-cli-commands.php';

+			require_once GIVE_PLUGIN_DIR.'includes/admin/give-metabox-functions.php';

+			require_once GIVE_PLUGIN_DIR.'includes/post-types.php';

+			require_once GIVE_PLUGIN_DIR.'includes/scripts.php';

+			require_once GIVE_PLUGIN_DIR.'includes/ajax-functions.php';

+			require_once GIVE_PLUGIN_DIR.'includes/actions.php';

+			require_once GIVE_PLUGIN_DIR.'includes/filters.php';

+			require_once GIVE_PLUGIN_DIR.'includes/api/class-give-api.php';

+

+			require_once GIVE_PLUGIN_DIR.'includes/class-give-roles.php';

+			require_once GIVE_PLUGIN_DIR.'includes/class-give-template-loader.php';

+			require_once GIVE_PLUGIN_DIR.'includes/class-give-donate-form.php';

+			require_once GIVE_PLUGIN_DIR.'includes/class-give-db.php';

+			require_once GIVE_PLUGIN_DIR.'includes/class-give-db-customers.php';

+			require_once GIVE_PLUGIN_DIR.'includes/class-give-db-customer-meta.php';

+			require_once GIVE_PLUGIN_DIR.'includes/class-give-customer.php';

+			require_once GIVE_PLUGIN_DIR.'includes/class-give-stats.php';

+			require_once GIVE_PLUGIN_DIR.'includes/class-give-session.php';

+			require_once GIVE_PLUGIN_DIR.'includes/class-give-html-elements.php';

+			require_once GIVE_PLUGIN_DIR.'includes/class-give-logging.php';

+			require_once GIVE_PLUGIN_DIR.'includes/class-give-license-handler.php';

+			require_once GIVE_PLUGIN_DIR.'includes/class-give-cron.php';

+			require_once GIVE_PLUGIN_DIR.'includes/class-give-email-access.php';

+

+			require_once GIVE_PLUGIN_DIR.'includes/country-functions.php';

+			require_once GIVE_PLUGIN_DIR.'includes/template-functions.php';

+			require_once GIVE_PLUGIN_DIR.'includes/misc-functions.php';

+			require_once GIVE_PLUGIN_DIR.'includes/forms/functions.php';

+			require_once GIVE_PLUGIN_DIR.'includes/forms/template.php';

+			require_once GIVE_PLUGIN_DIR.'includes/forms/widget.php';

+			require_once GIVE_PLUGIN_DIR.'includes/shortcodes.php';

+			require_once GIVE_PLUGIN_DIR.'includes/formatting.php';

+			require_once GIVE_PLUGIN_DIR.'includes/price-functions.php';

+			require_once GIVE_PLUGIN_DIR.'includes/error-tracking.php';

+			require_once GIVE_PLUGIN_DIR.'includes/process-donation.php';

+			require_once GIVE_PLUGIN_DIR.'includes/login-register.php';

+			require_once GIVE_PLUGIN_DIR.'includes/user-functions.php';

+			require_once GIVE_PLUGIN_DIR.'includes/plugin-compatibility.php';

+			require_once GIVE_PLUGIN_DIR.'includes/deprecated/deprecated-functions.php';

+			require_once GIVE_PLUGIN_DIR.'includes/deprecated/deprecated-actions.php';

+			require_once GIVE_PLUGIN_DIR.'includes/deprecated/deprecated-filters.php';

+

+			require_once GIVE_PLUGIN_DIR.'includes/payments/functions.php';

+			require_once GIVE_PLUGIN_DIR.'includes/payments/actions.php';

+			require_once GIVE_PLUGIN_DIR.'includes/payments/class-payment-stats.php';

+			require_once GIVE_PLUGIN_DIR.'includes/payments/class-payments-query.php';

+			require_once GIVE_PLUGIN_DIR.'includes/payments/class-give-payment.php';

+

+			require_once GIVE_PLUGIN_DIR.'includes/gateways/functions.php';

+			require_once GIVE_PLUGIN_DIR.'includes/gateways/actions.php';

+			require_once GIVE_PLUGIN_DIR.'includes/gateways/paypal-standard.php';

+			require_once GIVE_PLUGIN_DIR.'includes/gateways/offline-donations.php';

+			require_once GIVE_PLUGIN_DIR.'includes/gateways/manual.php';

+

+			require_once GIVE_PLUGIN_DIR.'includes/emails/class-give-emails.php';

+			require_once GIVE_PLUGIN_DIR.'includes/emails/class-give-email-tags.php';

+			require_once GIVE_PLUGIN_DIR.'includes/emails/functions.php';

+			require_once GIVE_PLUGIN_DIR.'includes/emails/template.php';

+			require_once GIVE_PLUGIN_DIR.'includes/emails/actions.php';

+

+            if (defined('WP_CLI') && WP_CLI) {

+                require_once GIVE_PLUGIN_DIR.'includes/class-give-cli-commands.php';

             }

 

-			if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {

-

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/admin-footer.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/welcome.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/admin-pages.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/class-admin-notices.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/class-api-keys-table.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/class-i18n-module.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/admin-actions.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/admin-filters.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/system-info.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/add-ons.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/plugins.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/dashboard-widgets.php';

-

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/payments/actions.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/payments/payments-history.php';

-

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/customers/customers.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/customers/customer-functions.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/customers/customer-actions.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/forms/metabox.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/forms/class-metabox-form-data.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/forms/dashboard-columns.php';

-

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/export/export-functions.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/reports.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/tools.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/tools/tools-actions.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/pdf-reports.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/class-give-graph.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/graphing.php';

-

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/shortcodes/abstract-shortcode-generator.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/shortcodes/class-shortcode-button.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/shortcodes/shortcode-give-form.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/shortcodes/shortcode-give-goal.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/shortcodes/shortcode-give-login.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/shortcodes/shortcode-give-register.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/shortcodes/shortcode-give-profile-editor.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/shortcodes/shortcode-give-donation-history.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/shortcodes/shortcode-give-receipt.php';

-

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/upgrades/upgrade-functions.php';

-				require_once GIVE_PLUGIN_DIR . 'includes/admin/upgrades/upgrades.php';

+			if (is_admin() || (defined('WP_CLI') && WP_CLI)) {

+

+				require_once GIVE_PLUGIN_DIR.'includes/admin/admin-footer.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/welcome.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/admin-pages.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/class-admin-notices.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/class-api-keys-table.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/class-i18n-module.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/admin-actions.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/admin-filters.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/system-info.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/add-ons.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/plugins.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/dashboard-widgets.php';

+

+				require_once GIVE_PLUGIN_DIR.'includes/admin/payments/actions.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/payments/payments-history.php';

+

+				require_once GIVE_PLUGIN_DIR.'includes/admin/customers/customers.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/customers/customer-functions.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/customers/customer-actions.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/forms/metabox.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/forms/class-metabox-form-data.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/forms/dashboard-columns.php';

+

+				require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/export/export-functions.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/reports.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/tools.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/tools/tools-actions.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/pdf-reports.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/class-give-graph.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/graphing.php';

+

+				require_once GIVE_PLUGIN_DIR.'includes/admin/shortcodes/abstract-shortcode-generator.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/shortcodes/class-shortcode-button.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/shortcodes/shortcode-give-form.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/shortcodes/shortcode-give-goal.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/shortcodes/shortcode-give-login.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/shortcodes/shortcode-give-register.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/shortcodes/shortcode-give-profile-editor.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/shortcodes/shortcode-give-donation-history.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/shortcodes/shortcode-give-receipt.php';

+

+				require_once GIVE_PLUGIN_DIR.'includes/admin/upgrades/upgrade-functions.php';

+				require_once GIVE_PLUGIN_DIR.'includes/admin/upgrades/upgrades.php';

 

 			}

 

-			require_once GIVE_PLUGIN_DIR . 'includes/install.php';

+			require_once GIVE_PLUGIN_DIR.'includes/install.php';

 

 		}

 

@@ -429,26 +429,26 @@ 
 		 */

 		public function load_textdomain() {

 			// Set filter for Give's languages directory

-			$give_lang_dir = dirname( plugin_basename( GIVE_PLUGIN_FILE ) ) . '/languages/';

-			$give_lang_dir = apply_filters( 'give_languages_directory', $give_lang_dir );

+			$give_lang_dir = dirname(plugin_basename(GIVE_PLUGIN_FILE)).'/languages/';

+			$give_lang_dir = apply_filters('give_languages_directory', $give_lang_dir);

 

 			// Traditional WordPress plugin locale filter

-			$locale = apply_filters( 'plugin_locale', get_locale(), 'give' );

-			$mofile = sprintf( '%1$s-%2$s.mo', 'give', $locale );

+			$locale = apply_filters('plugin_locale', get_locale(), 'give');

+			$mofile = sprintf('%1$s-%2$s.mo', 'give', $locale);

 

 			// Setup paths to current locale file

-			$mofile_local  = $give_lang_dir . $mofile;

-			$mofile_global = WP_LANG_DIR . '/give/' . $mofile;

+			$mofile_local  = $give_lang_dir.$mofile;

+			$mofile_global = WP_LANG_DIR.'/give/'.$mofile;

 

-			if ( file_exists( $mofile_global ) ) {

+			if (file_exists($mofile_global)) {

 				// Look in global /wp-content/languages/give folder

-				load_textdomain( 'give', $mofile_global );

-			} elseif ( file_exists( $mofile_local ) ) {

+				load_textdomain('give', $mofile_global);

+			} elseif (file_exists($mofile_local)) {

 				// Look in local location from filter `give_languages_directory`

-				load_textdomain( 'give', $mofile_local );

+				load_textdomain('give', $mofile_local);

 			} else {

 				// Load the default language files packaged up w/ Give

-				load_plugin_textdomain( 'give', false, $give_lang_dir );

+				load_plugin_textdomain('give', false, $give_lang_dir);

 			}

 		}