eventespresso / event-espresso-core

caffeinated/modules/ticket_selector_caff/EED_Ticket_Selector_Caff.module.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

Indentation +40 added lines, -40 removed lines

@@ -47,14 +47,14 @@ 
 	 * @param \WP $WP
 	 */
 	public function run( $WP ) {
-        $this->set_config();
+		$this->set_config();
 	}
 
 
 
 
 	protected function set_config(){
-        $this->set_config_section( 'template_settings' );
+		$this->set_config_section( 'template_settings' );
 		$this->set_config_class( 'EE_Ticket_Selector_Config' );
 		$this->set_config_name( 'EED_Ticket_Selector' );
 	}
@@ -103,27 +103,27 @@ 
 
 
 
-    /**
-     * @return \EE_Form_Section_Proper
-     * @throws \EE_Error
-     */
-    public static function _ticket_selector_appearance_settings() {
-        if ( ! \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config ) {
-            \EED_Ticket_Selector::instance()->set_config();
-            \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector = \EED_Ticket_Selector::instance()->config();
-        }
-        // get option for whether to show datetime selector in TS
-	    $show_datetime_selector = \EE_Registry::instance()
-		    ->CFG
-		    ->template_settings
-		    ->EED_Ticket_Selector
-		    ->getShowDatetimeSelector();
-	    // and option for how may datetimes must exist if display is conditional
-	    $datetime_selector_threshold = \EE_Registry::instance()
-		    ->CFG
-		    ->template_settings
-		    ->EED_Ticket_Selector
-		    ->getDatetimeSelectorThreshold();
+	/**
+	 * @return \EE_Form_Section_Proper
+	 * @throws \EE_Error
+	 */
+	public static function _ticket_selector_appearance_settings() {
+		if ( ! \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config ) {
+			\EED_Ticket_Selector::instance()->set_config();
+			\EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector = \EED_Ticket_Selector::instance()->config();
+		}
+		// get option for whether to show datetime selector in TS
+		$show_datetime_selector = \EE_Registry::instance()
+			->CFG
+			->template_settings
+			->EED_Ticket_Selector
+			->getShowDatetimeSelector();
+		// and option for how may datetimes must exist if display is conditional
+		$datetime_selector_threshold = \EE_Registry::instance()
+			->CFG
+			->template_settings
+			->EED_Ticket_Selector
+			->getDatetimeSelectorThreshold();
 
 		return new EE_Form_Section_Proper(
 			array(
@@ -165,16 +165,16 @@ 
 								)
 							),
 							'show_datetime_selector' => new EE_Select_Input(
-                                \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->getShowDatetimeSelectorOptions(false),
+								\EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->getShowDatetimeSelectorOptions(false),
 								array(
 									'html_label_text' => esc_html__( 'Show Datetime Selector?', 'event_espresso' ),
 									'html_help_text' => sprintf(
-									    esc_html__(
-									        'Indicates whether or not to display a dropdown select box above each ticket selector that displays dates for the available tickets. Ticket options will then be hidden until a date is selected, and then only tickets for that date are shown.%1$sOptions include:%1$s • do not show datetime selector%1$s   this option will NEVER display a datetime selector, regardless of how many datetimes exist.%1$s • maybe show datetime selector%1$s   this option will conditionally display a datetime selector when the number of datetimes for the event matches the value set for "Datetime Selector Threshold".',
-                                            'event_espresso'
-                                        ),
-                                        '<br>'
-                                    ),
+										esc_html__(
+											'Indicates whether or not to display a dropdown select box above each ticket selector that displays dates for the available tickets. Ticket options will then be hidden until a date is selected, and then only tickets for that date are shown.%1$sOptions include:%1$s &bull; do not show datetime selector%1$s &nbsp; this option will NEVER display a datetime selector, regardless of how many datetimes exist.%1$s &bull; maybe show datetime selector%1$s &nbsp; this option will conditionally display a datetime selector when the number of datetimes for the event matches the value set for "Datetime Selector Threshold".',
+											'event_espresso'
+										),
+										'<br>'
+									),
 									'default' => ! empty( $show_datetime_selector )
 										? $show_datetime_selector
 										: \EE_Ticket_Selector_Config::DO_NOT_SHOW_DATETIME_SELECTOR,
@@ -182,13 +182,13 @@ 
 								)
 							),
 							'datetime_selector_threshold' => new EE_Select_Input(
-                                range(0,10),
+								range(0,10),
 								array(
 									'html_label_text' => esc_html__( 'Datetime Selector Threshold', 'event_espresso' ),
 									'html_help_text' => esc_html__(
-                                        'The number of datetimes an event has to have before conditionally displaying a datetime selector',
-                                        'event_espresso'
-                                    ),
+										'The number of datetimes an event has to have before conditionally displaying a datetime selector',
+										'event_espresso'
+									),
 									'default' => ! empty( $datetime_selector_threshold )
 										? $datetime_selector_threshold
 										: 3,
@@ -214,8 +214,8 @@ 
 	 */
 	public static function update_template_settings( EE_Template_Config $CFG, $REQ ) {
 		if ( ! $CFG->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config ) {
-            \EED_Ticket_Selector::instance()->set_config();
-            $CFG->EED_Ticket_Selector = \EED_Ticket_Selector::instance()->config();
+			\EED_Ticket_Selector::instance()->set_config();
+			$CFG->EED_Ticket_Selector = \EED_Ticket_Selector::instance()->config();
 		}
 		try {
 			$ticket_selector_form = EED_Ticket_Selector_Caff::_ticket_selector_settings_form();
@@ -237,11 +237,11 @@ 
 					$CFG->EED_Ticket_Selector->show_ticket_details = $valid_data['appearance_settings']['show_ticket_details'];
 					$CFG->EED_Ticket_Selector->show_expired_tickets = $valid_data['appearance_settings']['show_expired_tickets'];
 					$CFG->EED_Ticket_Selector->setShowDatetimeSelector(
-					    $valid_data['appearance_settings']['show_datetime_selector']
-                    );
+						$valid_data['appearance_settings']['show_datetime_selector']
+					);
 					$CFG->EED_Ticket_Selector->setDatetimeSelectorThreshold(
-					    $valid_data['appearance_settings']['datetime_selector_threshold']
-                    );
+						$valid_data['appearance_settings']['datetime_selector_threshold']
+					);
 				} else {
 					if ( $ticket_selector_form->submission_error_message() !== '' ) {
 						EE_Error::add_error( $ticket_selector_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__ );

Spacing +33 added lines, -33 removed lines

@@ -16,7 +16,7 @@ 
 	 * @return EED_Ticket_Selector_Caff
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -37,26 +37,26 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks_admin() {
-		define( 'TICKET_SELECTOR_CAFF_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
-		add_action( 'AHEE__template_settings__template__before_settings_form', array( 'EED_Ticket_Selector_Caff', 'template_settings_form' ), 10 );
-		add_filter( 'FHEE__General_Settings_Admin_Page__update_template_settings__data', array( 'EED_Ticket_Selector_Caff', 'update_template_settings' ), 10, 2 );
+		define('TICKET_SELECTOR_CAFF_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
+		add_action('AHEE__template_settings__template__before_settings_form', array('EED_Ticket_Selector_Caff', 'template_settings_form'), 10);
+		add_filter('FHEE__General_Settings_Admin_Page__update_template_settings__data', array('EED_Ticket_Selector_Caff', 'update_template_settings'), 10, 2);
 	}
 
 
 	/**
 	 * @param \WP $WP
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
         $this->set_config();
 	}
 
 
 
 
-	protected function set_config(){
-        $this->set_config_section( 'template_settings' );
-		$this->set_config_class( 'EE_Ticket_Selector_Config' );
-		$this->set_config_name( 'EED_Ticket_Selector' );
+	protected function set_config() {
+        $this->set_config_section('template_settings');
+		$this->set_config_class('EE_Ticket_Selector_Config');
+		$this->set_config_name('EED_Ticket_Selector');
 	}
 
 
@@ -91,8 +91,8 @@ 
 					'FHEE__EED_Ticket_Selector_Caff___ticket_selector_settings_form__form_subsections',
 					array(
 						'appearance_settings_hdr' 	=> new EE_Form_Section_HTML(
-							EEH_HTML::br(2) .
-							EEH_HTML::h2( esc_html__( 'Ticket Selector Template Settings', 'event_espresso' ))
+							EEH_HTML::br(2).
+							EEH_HTML::h2(esc_html__('Ticket Selector Template Settings', 'event_espresso'))
 						),
 						'appearance_settings' 			=> EED_Ticket_Selector_Caff::_ticket_selector_appearance_settings()
 					)
@@ -108,7 +108,7 @@ 
      * @throws \EE_Error
      */
     public static function _ticket_selector_appearance_settings() {
-        if ( ! \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config ) {
+        if ( ! \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config) {
             \EED_Ticket_Selector::instance()->set_config();
             \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector = \EED_Ticket_Selector::instance()->config();
         }
@@ -136,9 +136,9 @@ 
 						array(
 							'show_ticket_details' => new EE_Yes_No_Input(
 								array(
-									'html_label_text' => esc_html__('Show Ticket Details?', 'event_espresso' ),
-									'html_help_text' => esc_html__( 'This lets you choose whether the extra ticket details section is displayed with the ticket selector.', 'event_espresso'),
-									'default' => isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details )
+									'html_label_text' => esc_html__('Show Ticket Details?', 'event_espresso'),
+									'html_help_text' => esc_html__('This lets you choose whether the extra ticket details section is displayed with the ticket selector.', 'event_espresso'),
+									'default' => isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details)
 										? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details
 										: true,
 									'display_html_label_text' => false
@@ -146,9 +146,9 @@ 
 							),
 							'show_ticket_sale_columns' => new EE_Yes_No_Input(
 								array(
-									'html_label_text' => esc_html__('Show Ticket Sale Info?', 'event_espresso' ),
-									'html_help_text' => esc_html__( 'This lets you indicate whether information about ticket sales is shown with ticket details in the ticket selector.', 'event_espresso'),
-									'default' => isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns )
+									'html_label_text' => esc_html__('Show Ticket Sale Info?', 'event_espresso'),
+									'html_help_text' => esc_html__('This lets you indicate whether information about ticket sales is shown with ticket details in the ticket selector.', 'event_espresso'),
+									'default' => isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns)
 										? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns
 										: true,
 									'display_html_label_text' => false
@@ -156,9 +156,9 @@ 
 							),
 							'show_expired_tickets' => new EE_Yes_No_Input(
 								array(
-									'html_label_text' => esc_html__( 'Show Expired Tickets?', 'event_espresso' ),
-									'html_help_text' => esc_html__( 'Indicate whether to show expired tickets in the ticket selector', 'event_espresso' ),
-									'default' => isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets )
+									'html_label_text' => esc_html__('Show Expired Tickets?', 'event_espresso'),
+									'html_help_text' => esc_html__('Indicate whether to show expired tickets in the ticket selector', 'event_espresso'),
+									'default' => isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets)
 										? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets
 										: true,
 									'display_html_label_text' => false
@@ -167,7 +167,7 @@ 
 							'show_datetime_selector' => new EE_Select_Input(
                                 \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->getShowDatetimeSelectorOptions(false),
 								array(
-									'html_label_text' => esc_html__( 'Show Datetime Selector?', 'event_espresso' ),
+									'html_label_text' => esc_html__('Show Datetime Selector?', 'event_espresso'),
 									'html_help_text' => sprintf(
 									    esc_html__(
 									        'Indicates whether or not to display a dropdown select box above each ticket selector that displays dates for the available tickets. Ticket options will then be hidden until a date is selected, and then only tickets for that date are shown.%1$sOptions include:%1$s • do not show datetime selector%1$s   this option will NEVER display a datetime selector, regardless of how many datetimes exist.%1$s • maybe show datetime selector%1$s   this option will conditionally display a datetime selector when the number of datetimes for the event matches the value set for "Datetime Selector Threshold".',
@@ -175,21 +175,21 @@ 
                                         ),
                                         '<br>'
                                     ),
-									'default' => ! empty( $show_datetime_selector )
+									'default' => ! empty($show_datetime_selector)
 										? $show_datetime_selector
 										: \EE_Ticket_Selector_Config::DO_NOT_SHOW_DATETIME_SELECTOR,
 									'display_html_label_text' => false
 								)
 							),
 							'datetime_selector_threshold' => new EE_Select_Input(
-                                range(0,10),
+                                range(0, 10),
 								array(
-									'html_label_text' => esc_html__( 'Datetime Selector Threshold', 'event_espresso' ),
+									'html_label_text' => esc_html__('Datetime Selector Threshold', 'event_espresso'),
 									'html_help_text' => esc_html__(
                                         'The number of datetimes an event has to have before conditionally displaying a datetime selector',
                                         'event_espresso'
                                     ),
-									'default' => ! empty( $datetime_selector_threshold )
+									'default' => ! empty($datetime_selector_threshold)
 										? $datetime_selector_threshold
 										: 3,
 									'display_html_label_text' => false
@@ -212,8 +212,8 @@ 
 	 * @param array              $REQ incoming request
 	 * @return EE_Template_Config
 	 */
-	public static function update_template_settings( EE_Template_Config $CFG, $REQ ) {
-		if ( ! $CFG->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config ) {
+	public static function update_template_settings(EE_Template_Config $CFG, $REQ) {
+		if ( ! $CFG->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config) {
             \EED_Ticket_Selector::instance()->set_config();
             $CFG->EED_Ticket_Selector = \EED_Ticket_Selector::instance()->config();
 		}
@@ -221,13 +221,13 @@ 
 			$ticket_selector_form = EED_Ticket_Selector_Caff::_ticket_selector_settings_form();
 
 			//check for form submission
-			if ( $ticket_selector_form->was_submitted() ) {
+			if ($ticket_selector_form->was_submitted()) {
 
 				//capture form data
 				$ticket_selector_form->receive_form_submission();
 
 				//validate form data
-				if ( $ticket_selector_form->is_valid() ) {
+				if ($ticket_selector_form->is_valid()) {
 
 					//grab validated data from form
 					$valid_data = $ticket_selector_form->valid_data();
@@ -243,13 +243,13 @@ 
 					    $valid_data['appearance_settings']['datetime_selector_threshold']
                     );
 				} else {
-					if ( $ticket_selector_form->submission_error_message() !== '' ) {
-						EE_Error::add_error( $ticket_selector_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__ );
+					if ($ticket_selector_form->submission_error_message() !== '') {
+						EE_Error::add_error($ticket_selector_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__);
 					}
 				}
 
 			}
-		} catch( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 

caffeinated/payment_methods/Paypal_Pro/EE_PMT_Paypal_Pro.pm.php

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

Spacing +30 added lines, -30 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_PMT_Paypal_Pro extends EE_PMT_Base{
+class EE_PMT_Paypal_Pro extends EE_PMT_Base {
 
 	/**
 	 * @param EE_Payment_Method $pm_instance
@@ -35,7 +35,7 @@ 
 		require_once($this->file_folder().'EEG_Paypal_Pro.gateway.php');
 		$this->_gateway = new EEG_Paypal_Pro();
 		$this->_pretty_name = __("Paypal Pro", 'event_espresso');
-		$this->_default_description = __( 'Please provide the following billing information.', 'event_espresso' );
+		$this->_default_description = __('Please provide the following billing information.', 'event_espresso');
 		$this->_requires_https = true;
 		parent::__construct($pm_instance);
 	}
@@ -51,21 +51,21 @@ 
 			'extra_meta_inputs'=>array(
 //				'paypal_email'=>new EE_Email_Input(), not actually used
 				'username'=>new EE_Text_Input(array(
-					'html_label_text'=>  sprintf(__("Paypal API Username %s", "event_espresso"),$this->get_help_tab_link()),
+					'html_label_text'=>  sprintf(__("Paypal API Username %s", "event_espresso"), $this->get_help_tab_link()),
 					'required' => true
 				)),
 				'password'=>new EE_Text_Input(array(
-					'html_label_text'=>  sprintf(__("Paypal API Password %s", "event_espresso"),$this->get_help_tab_link()),
+					'html_label_text'=>  sprintf(__("Paypal API Password %s", "event_espresso"), $this->get_help_tab_link()),
 					'required' => true
 				)),
 				'signature'=>new EE_Text_Input(array(
-					'html_label_text'=>  sprintf(__("Paypal API Signature %s", "event_espresso"),$this->get_help_tab_link()),
+					'html_label_text'=>  sprintf(__("Paypal API Signature %s", "event_espresso"), $this->get_help_tab_link()),
 					'required' => true
 				)),
 				'credit_card_types'=>new EE_Checkbox_Multi_Input(
 						$this->card_types_supported(),
 						array(
-							'html_label_text' => __( 'Card Types Supported', 'event_espresso' ),
+							'html_label_text' => __('Card Types Supported', 'event_espresso'),
 							'required' => true )),
 				)
 			)
@@ -79,10 +79,10 @@ 
 	 * @throws \EE_Error
 	 * @return EE_Billing_Info_Form
 	 */
-	public function generate_new_billing_form( EE_Transaction $transaction = NULL ) {
-		$allowed_types = $this->_pm_instance->get_extra_meta( 'credit_card_types', TRUE );
+	public function generate_new_billing_form(EE_Transaction $transaction = NULL) {
+		$allowed_types = $this->_pm_instance->get_extra_meta('credit_card_types', TRUE);
 		//if allowed types is a string or empty array or null...
-		if( empty( $allowed_types )) {
+		if (empty($allowed_types)) {
 			$allowed_types = array();
 		}
 
@@ -93,26 +93,26 @@ 
 //				'html_id'=> 'ee-Paypal_Pro-billing-form',
 				'subsections'=>array(
 					'credit_card'=>new EE_Credit_Card_Input(
-						array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __( 'Card Number', 'event_espresso' ))
+						array('required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Card Number', 'event_espresso'))
 					),
 					'credit_card_type'=>new EE_Select_Input(
 						//the options are set dynamically
-						array_intersect_key( EE_PMT_Paypal_Pro::card_types_supported(), array_flip( $allowed_types )),
-						array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __( 'Card Type', 'event_espresso' ))
+						array_intersect_key(EE_PMT_Paypal_Pro::card_types_supported(), array_flip($allowed_types)),
+						array('required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Card Type', 'event_espresso'))
 					),
 					'exp_month'=>new EE_Credit_Card_Month_Input(
-						TRUE, array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' =>  __( 'Expiry Month', 'event_espresso' )  )
+						TRUE, array('required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' =>  __('Expiry Month', 'event_espresso'))
 					),
 					'exp_year'=>new EE_Credit_Card_Year_Input(
-						array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __( 'Expiry Year', 'event_espresso' )  )
+						array('required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Expiry Year', 'event_espresso'))
 					),
 					'cvv'=>new EE_CVV_Input(
-						array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __( 'CVV', 'event_espresso' ) )
+						array('required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('CVV', 'event_espresso'))
 					),
 				)
 			)
 		);
-		return $this->apply_billing_form_debug_settings( $billing_form );
+		return $this->apply_billing_form_debug_settings($billing_form);
 	}
 
 
@@ -124,19 +124,19 @@ 
 	 * @param \EE_Billing_Info_Form $billing_form
 	 * @return \EE_Billing_Info_Form
 	 */
-	public function apply_billing_form_debug_settings( EE_Billing_Info_Form $billing_form ) {
-		if ( $this->_pm_instance->debug_mode() ) {
+	public function apply_billing_form_debug_settings(EE_Billing_Info_Form $billing_form) {
+		if ($this->_pm_instance->debug_mode()) {
 			$billing_form->add_subsections(
-				array( 'fyi_about_autofill' => $billing_form->payment_fields_autofilled_notice_html() ),
+				array('fyi_about_autofill' => $billing_form->payment_fields_autofilled_notice_html()),
 				'credit_card'
 			);
 			$billing_form->add_subsections(
-				array( 'debug_content' => new EE_Form_Section_HTML_From_Template( dirname(__FILE__).DS.'templates'.DS.'paypal_pro_debug_info.template.php' )),
+				array('debug_content' => new EE_Form_Section_HTML_From_Template(dirname(__FILE__).DS.'templates'.DS.'paypal_pro_debug_info.template.php')),
 				'first_name'
 			);
-			$billing_form->get_input( 'credit_card_type' )->set_default( 'Visa' );
-			$billing_form->get_input( 'exp_year' )->set_default( 2018);
-			$billing_form->get_input( 'cvv' )->set_default( '115' );
+			$billing_form->get_input('credit_card_type')->set_default('Visa');
+			$billing_form->get_input('exp_year')->set_default(2018);
+			$billing_form->get_input('cvv')->set_default('115');
 		}
 		return $billing_form;
 	}
@@ -148,7 +148,7 @@ 
 	 * Keys are their values, values are their pretty names.
 	 * @return array
 	 */
-	public static function card_types_supported(){
+	public static function card_types_supported() {
 		return array(
 			'Visa'=>  __("Visa", 'event_espresso'),
 			'MasterCard'=>  __("MasterCard", 'event_espresso'),
@@ -164,7 +164,7 @@ 
 	 * @see EE_PMT_Base::help_tabs_config()
 	 * @return array
 	 */
-	public function help_tabs_config(){
+	public function help_tabs_config() {
 		return array(
 			$this->get_help_tab_name() => array(
 						'title' => __('PayPal Pro Settings', 'event_espresso'),
@@ -179,10 +179,10 @@ 
 	 * @param EE_Billing_Info_Form $billing_form
 	 * @return array
 	 */
-	protected function _get_billing_values_from_form( $billing_form ){
-		$billing_values = parent::_get_billing_values_from_form( $billing_form );
-		$billing_values[ 'country' ] = $billing_form->get_input_value( 'country' );
-		$billing_values[ 'credit_card_type' ] = $billing_form->get_input_value( 'credit_card_type' );
+	protected function _get_billing_values_from_form($billing_form) {
+		$billing_values = parent::_get_billing_values_from_form($billing_form);
+		$billing_values['country'] = $billing_form->get_input_value('country');
+		$billing_values['credit_card_type'] = $billing_form->get_input_value('credit_card_type');
 		return $billing_values;
 	}
 

core/CPTs/EE_CPT_Event_Strategy.core.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

Spacing +33 added lines, -33 removed lines

@@ -39,13 +39,13 @@ 
 	 * @param WP_Query $wp_query
 	 * @param array $CPT
 	 */
-	public function __construct( $wp_query, $CPT = array() ) {
-		if ( $wp_query instanceof WP_Query ) {
+	public function __construct($wp_query, $CPT = array()) {
+		if ($wp_query instanceof WP_Query) {
 			$WP_Query = $wp_query;
 			$this->CPT = $CPT;
 		} else {
-			$WP_Query = isset( $wp_query[ 'WP_Query' ] ) ? $wp_query[ 'WP_Query' ] : null;
-			$this->CPT = isset( $wp_query[ 'CPT' ] ) ? $wp_query[ 'CPT' ] : null;
+			$WP_Query = isset($wp_query['WP_Query']) ? $wp_query['WP_Query'] : null;
+			$this->CPT = isset($wp_query['CPT']) ? $wp_query['CPT'] : null;
 		}
 		// !!!!!!!!!!  IMPORTANT !!!!!!!!!!!!
 		// here's the list of available filters in the WP_Query object
@@ -59,10 +59,10 @@ 
 		// 'posts_fields'
 		// 'posts_join'
 		$this->_add_filters();
-		if ( $WP_Query instanceof WP_Query ) {
-			$WP_Query->is_espresso_event_single = is_singular() && isset( $WP_Query->query->post_type ) && $WP_Query->query->post_type == 'espresso_events' ? TRUE : FALSE;
+		if ($WP_Query instanceof WP_Query) {
+			$WP_Query->is_espresso_event_single = is_singular() && isset($WP_Query->query->post_type) && $WP_Query->query->post_type == 'espresso_events' ? TRUE : FALSE;
 			$WP_Query->is_espresso_event_archive = is_post_type_archive('espresso_events') ? TRUE : FALSE;
-			$WP_Query->is_espresso_event_taxonomy = is_tax( 'espresso_event_categories' ) ? TRUE : FALSE;
+			$WP_Query->is_espresso_event_taxonomy = is_tax('espresso_event_categories') ? TRUE : FALSE;
 		}
 
 	}
@@ -74,13 +74,13 @@ 
 	 * (which will get removed in case the next call to get_posts ISN'T
 	 * for event CPTs)
 	 */
-	protected function _add_filters(){
-		add_filter( 'posts_fields', array( $this, 'posts_fields' ), 1, 2 );
-		add_filter( 'posts_join', array( $this, 'posts_join' ), 1, 2 );
-		add_filter( 'posts_where', array( $this, 'posts_where' ), 10, 2 );
+	protected function _add_filters() {
+		add_filter('posts_fields', array($this, 'posts_fields'), 1, 2);
+		add_filter('posts_join', array($this, 'posts_join'), 1, 2);
+		add_filter('posts_where', array($this, 'posts_where'), 10, 2);
 		// add_filter( 'the_posts', array( $this, 'the_posts' ), 1, 2 );
-		add_filter( 'posts_orderby', array( $this, 'posts_orderby' ), 1, 2 );
-		add_filter( 'posts_groupby', array( $this, 'posts_groupby' ), 1, 2 );
+		add_filter('posts_orderby', array($this, 'posts_orderby'), 1, 2);
+		add_filter('posts_groupby', array($this, 'posts_groupby'), 1, 2);
 	}
 
 
@@ -90,13 +90,13 @@ 
 	 * This is to avoid applying this CPT strategy for other posts or CPTs (eg,
 	 * we don't want to join to the datetime table when querying for venues, do we!?)
 	 */
-	protected function _remove_filters(){
-		remove_filter( 'posts_fields', array( $this, 'posts_fields' ), 1 );
-		remove_filter( 'posts_join', array( $this, 'posts_join' ), 1 );
-		remove_filter( 'posts_where', array( $this, 'posts_where' ), 10 );
+	protected function _remove_filters() {
+		remove_filter('posts_fields', array($this, 'posts_fields'), 1);
+		remove_filter('posts_join', array($this, 'posts_join'), 1);
+		remove_filter('posts_where', array($this, 'posts_where'), 10);
 		// remove_filter( 'the_posts', array( $this, 'the_posts' ), 1 );
-		remove_filter( 'posts_orderby', array( $this, 'posts_orderby' ), 1 );
-		remove_filter( 'posts_groupby', array( $this, 'posts_groupby' ), 1 );
+		remove_filter('posts_orderby', array($this, 'posts_orderby'), 1);
+		remove_filter('posts_groupby', array($this, 'posts_groupby'), 1);
 	}
 
 
@@ -109,7 +109,7 @@ 
 	 * @param WP_Query $wp_query
 	 * @return    string
 	 */
-	public function posts_fields( $SQL, WP_Query $wp_query ) {
+	public function posts_fields($SQL, WP_Query $wp_query) {
 		if (
 			$wp_query instanceof WP_Query
 			&&
@@ -120,11 +120,11 @@ 
 			)
 		) {
 			// adds something like ", wp_esp_datetime.* " to WP Query SELECT statement
-			$SQL .= ', ' . EEM_Datetime::instance()->table() . '.* ' ;
-			if ( $wp_query->is_espresso_event_archive || $wp_query->is_espresso_event_taxonomy ) {
+			$SQL .= ', '.EEM_Datetime::instance()->table().'.* ';
+			if ($wp_query->is_espresso_event_archive || $wp_query->is_espresso_event_taxonomy) {
 				// because we only want to retrieve the next upcoming datetime for each event:
 				// add something like ", MIN( wp_esp_datetime.DTT_EVT_start ) as event_start_date " to WP Query SELECT statement
-				$SQL .= ', MIN( ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start ) as event_start_date ' ;
+				$SQL .= ', MIN( '.EEM_Datetime::instance()->table().'.DTT_EVT_start ) as event_start_date ';
 			}
 		}
 		return $SQL;
@@ -141,7 +141,7 @@ 
 	 * @internal  param \WP_Query $WP_Query
 	 * @return    string
 	 */
-	public function posts_join( $SQL, WP_Query $wp_query ) {
+	public function posts_join($SQL, WP_Query $wp_query) {
 		if (
 			$wp_query instanceof WP_Query
 			&&
@@ -152,7 +152,7 @@ 
 			)
 		) {
 			// adds something like " LEFT JOIN wp_esp_datetime ON ( wp_esp_datetime.EVT_ID = wp_posts.ID ) " to WP Query JOIN statement
-			$SQL .= ' INNER JOIN ' . EEM_Datetime::instance()->table() . ' ON ( ' . EEM_Event::instance()->table() . '.ID = ' . EEM_Datetime::instance()->table() . '.' . EEM_Event::instance()->primary_key_name() . ' ) ';
+			$SQL .= ' INNER JOIN '.EEM_Datetime::instance()->table().' ON ( '.EEM_Event::instance()->table().'.ID = '.EEM_Datetime::instance()->table().'.'.EEM_Event::instance()->primary_key_name().' ) ';
 		}
 		return $SQL;
 	}
@@ -167,7 +167,7 @@ 
 	 * @param WP_Query $wp_query
 	 * @return    string
 	 */
-	public function posts_where( $SQL, WP_Query $wp_query ) {
+	public function posts_where($SQL, WP_Query $wp_query) {
 //		global $wpdb;
 		if (
 			$wp_query instanceof WP_Query
@@ -177,8 +177,8 @@ 
 				|| $wp_query->is_espresso_event_taxonomy
 			)
 		) {
-			if ( ! isset( EE_Registry::instance()->CFG->template_settings->EED_Events_Archive ) || ! isset( EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->display_expired_events ) || ! EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->display_expired_events ) {
-				$SQL .=  ' AND ' . EEM_Datetime::instance()->table() . ".DTT_EVT_end > '" . current_time( 'mysql', true ) . "' ";
+			if ( ! isset(EE_Registry::instance()->CFG->template_settings->EED_Events_Archive) || ! isset(EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->display_expired_events) || ! EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->display_expired_events) {
+				$SQL .= ' AND '.EEM_Datetime::instance()->table().".DTT_EVT_end > '".current_time('mysql', true)."' ";
 			}
 		}
 		return $SQL;
@@ -194,7 +194,7 @@ 
 	 * @param 	WP_Query $wp_query
 	 * @return 	string
 	 */
-	public function posts_orderby( $SQL, WP_Query $wp_query ) {
+	public function posts_orderby($SQL, WP_Query $wp_query) {
 		if (
 			$wp_query instanceof WP_Query
 			&&
@@ -218,7 +218,7 @@ 
 	 * @param WP_Query $wp_query
 	 * @return    string
 	 */
-	public function posts_groupby( $SQL, WP_Query $wp_query ) {
+	public function posts_groupby($SQL, WP_Query $wp_query) {
 		if (
 			$wp_query instanceof WP_Query
 			&&
@@ -231,7 +231,7 @@ 
 			// we're joining to the datetimes table, where there can be MANY datetimes for a single event, but we want to only show each event only once
 			// (whereas if we didn't group them by the post's ID, then we would end up with many repeats)
 			global $wpdb;
-			$SQL = $wpdb->posts . '.ID ';
+			$SQL = $wpdb->posts.'.ID ';
 		}
 		return $SQL;
 	}
@@ -246,7 +246,7 @@ 
 	 * @param WP_Query $wp_query
 	 * @return    array
 	 */
-	public function the_posts( $posts, WP_Query $wp_query ) {
+	public function the_posts($posts, WP_Query $wp_query) {
 		return $posts;
 	}
 
@@ -262,7 +262,7 @@ 
 	 * @param      $single
 	 * @return    string
 	 */
-	public function get_EE_post_type_metadata( $meta_value = NULL, $post_id, $meta_key, $single ) {
+	public function get_EE_post_type_metadata($meta_value = NULL, $post_id, $meta_key, $single) {
 		return $meta_value;
 	}
 

core/CPTs/EE_CPT_Venue_Strategy.core.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

Spacing +10 added lines, -10 removed lines

@@ -39,15 +39,15 @@ 
 	 * @param 	array 	$arguments
 	 * @return \EE_CPT_Venue_Strategy
 	 */
-	public function __construct( $arguments = array() ) {
-		$this->CPT = isset( $arguments['CPT'] ) ? $arguments['CPT'] : NULL;
-		$WP_Query = isset( $arguments['WP_Query'] ) ? $arguments['WP_Query'] : NULL;
-		if ( $WP_Query instanceof WP_Query && ! $WP_Query->is_tag ) {
-			$WP_Query->is_espresso_venue_single = is_singular() && isset( $WP_Query->query->post_type ) && $WP_Query->query->post_type == 'espresso_venues' ? TRUE : FALSE;
+	public function __construct($arguments = array()) {
+		$this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : NULL;
+		$WP_Query = isset($arguments['WP_Query']) ? $arguments['WP_Query'] : NULL;
+		if ($WP_Query instanceof WP_Query && ! $WP_Query->is_tag) {
+			$WP_Query->is_espresso_venue_single = is_singular() && isset($WP_Query->query->post_type) && $WP_Query->query->post_type == 'espresso_venues' ? TRUE : FALSE;
 			$WP_Query->is_espresso_venue_archive = is_post_type_archive('espresso_venues') ? TRUE : FALSE;
-			$WP_Query->is_espresso_venue_taxonomy = is_tax( 'espresso_venue_categories' ) ? TRUE : FALSE;
+			$WP_Query->is_espresso_venue_taxonomy = is_tax('espresso_venue_categories') ? TRUE : FALSE;
 		}
-		add_filter( 'the_posts', array( $this, 'the_posts' ), 1, 2 );
+		add_filter('the_posts', array($this, 'the_posts'), 1, 2);
 	}
 
 
@@ -60,12 +60,12 @@ 
 	 * @param WP_Query $wp_query
 	 * @return    void
 	 */
-	public function the_posts( $posts, WP_Query $wp_query) {
+	public function the_posts($posts, WP_Query $wp_query) {
 		// automagically load the EEH_Venue_View helper so that it's functions are available
-		if ( isset( EE_Registry::instance()->CFG->map_settings->use_google_maps ) && EE_Registry::instance()->CFG->map_settings->use_google_maps ) {
+		if (isset(EE_Registry::instance()->CFG->map_settings->use_google_maps) && EE_Registry::instance()->CFG->map_settings->use_google_maps) {
 			EEH_Maps::espresso_google_map_js();
 		}
-		remove_filter( 'the_posts', array( $this, 'the_posts' ), 1, 2 );
+		remove_filter('the_posts', array($this, 'the_posts'), 1, 2);
 		return $posts;
 	}
 

core/EES_Shortcode.shortcode.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

Spacing +19 added lines, -19 removed lines

@@ -42,7 +42,7 @@ 
 	 * @param WP $WP
 	 * @return    void
 	 */
-	public abstract function run( WP $WP );
+	public abstract function run(WP $WP);
 
 
 
@@ -54,7 +54,7 @@ 
 	 *  @param		array 	$attributes
 	 *  @return 	mixed
 	 */
-	public abstract function process_shortcode( $attributes = array() );
+	public abstract function process_shortcode($attributes = array());
 
 
 
@@ -65,13 +65,13 @@ 
 	 * @param 	string $shortcode_class
 	 * @return 	\EES_Shortcode
 	 */
-	final public static function instance( $shortcode_class = NULL ) {
-		$shortcode_class = ! empty( $shortcode_class ) ? $shortcode_class : get_called_class();
-		if ( $shortcode_class == 'EES_Shortcode' || empty( $shortcode_class )) {
+	final public static function instance($shortcode_class = NULL) {
+		$shortcode_class = ! empty($shortcode_class) ? $shortcode_class : get_called_class();
+		if ($shortcode_class == 'EES_Shortcode' || empty($shortcode_class)) {
 			return NULL;
 		}
-		$shortcode = str_replace( 'EES_', '', strtoupper( $shortcode_class ));
-		$shortcode_obj = isset( EE_Registry::instance()->shortcodes->{$shortcode} ) ? EE_Registry::instance()->shortcodes->{$shortcode} : NULL;
+		$shortcode = str_replace('EES_', '', strtoupper($shortcode_class));
+		$shortcode_obj = isset(EE_Registry::instance()->shortcodes->{$shortcode} ) ? EE_Registry::instance()->shortcodes->{$shortcode} : NULL;
 		return $shortcode_obj instanceof $shortcode_class || $shortcode_class == 'self' ? $shortcode_obj : new $shortcode_class();
 	}
 
@@ -86,23 +86,23 @@ 
 	 * @param 	$attributes
 	 * @return 	mixed
 	 */
-	final public static function fallback_shortcode_processor( $attributes ) {
-		if ( EE_Maintenance_Mode::disable_frontend_for_maintenance() ) {
+	final public static function fallback_shortcode_processor($attributes) {
+		if (EE_Maintenance_Mode::disable_frontend_for_maintenance()) {
 			return null;
 		}
 		// what shortcode was actually parsed ?
 		$shortcode_class = get_called_class();
 		// notify rest of system that fallback processor was triggered
-		add_filter( 'FHEE__fallback_shortcode_processor__' . $shortcode_class, '__return_true' );
+		add_filter('FHEE__fallback_shortcode_processor__'.$shortcode_class, '__return_true');
 		// get instance of actual shortcode
-		$shortcode_obj = self::instance( $shortcode_class );
+		$shortcode_obj = self::instance($shortcode_class);
 		// verify class
-		if ( $shortcode_obj instanceof EES_Shortcode ) {
+		if ($shortcode_obj instanceof EES_Shortcode) {
 			global $wp;
-			$shortcode_obj->run( $wp );
+			$shortcode_obj->run($wp);
 			// set attributes and run the shortcode
-			$shortcode_obj->_attributes = (array)$attributes;
-			return $shortcode_obj->process_shortcode( $shortcode_obj->_attributes );
+			$shortcode_obj->_attributes = (array) $attributes;
+			return $shortcode_obj->process_shortcode($shortcode_obj->_attributes);
 		} else {
 			return NULL;
 		}
@@ -118,7 +118,7 @@ 
 	 * @param 	$attributes
 	 * @return 	string
 	 */
-	final public static function invalid_shortcode_processor( $attributes ) {
+	final public static function invalid_shortcode_processor($attributes) {
 		return '';
 	}
 
@@ -132,11 +132,11 @@ 
 	 */
 	final public function __construct() {
 		// get classname, remove EES_prefix, and convert to UPPERCASE
-		$shortcode = strtoupper( str_replace( 'EES_', '', get_class( $this )));
+		$shortcode = strtoupper(str_replace('EES_', '', get_class($this)));
 		// assign shortcode to the preferred callback, which overwrites the "fallback shortcode processor" assigned earlier
-		add_shortcode( $shortcode, array( $this, 'process_shortcode' ));
+		add_shortcode($shortcode, array($this, 'process_shortcode'));
 		// make sure system knows this is an EE page
-		EE_Registry::instance()->REQ->set_espresso_page( TRUE );
+		EE_Registry::instance()->REQ->set_espresso_page(TRUE);
 	}
 
 

core/EE_Addon.core.php

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		//so in case teh IPN is arriving later, let's try to process an IPN!
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
 			return $this->handle_ipn($_POST, $transaction );
-		}else{
+		} else{
 			return parent::finalize_payment_for( $transaction );
 		}
 	}

Spacing +84 added lines, -84 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  *
@@ -95,7 +95,7 @@ 
 	 *    class constructor
 	 */
 	public function __construct() {
-		add_action( 'AHEE__EE_System__load_controllers__load_admin_controllers', array( $this, 'admin_init' ) );
+		add_action('AHEE__EE_System__load_controllers__load_admin_controllers', array($this, 'admin_init'));
 	}
 
 
@@ -103,7 +103,7 @@ 
 	/**
 	 * @param mixed $version
 	 */
-	public function set_version( $version = NULL ) {
+	public function set_version($version = NULL) {
 		$this->_version = $version;
 	}
 
@@ -121,7 +121,7 @@ 
 	/**
 	 * @param mixed $min_core_version
 	 */
-	public function set_min_core_version( $min_core_version = NULL ) {
+	public function set_min_core_version($min_core_version = NULL) {
 		$this->_min_core_version = $min_core_version;
 	}
 
@@ -142,7 +142,7 @@ 
 	 * @param string $addon_name
 	 * @return boolean
 	 */
-	function set_name( $addon_name ) {
+	function set_name($addon_name) {
 		return $this->_addon_name = $addon_name;
 	}
 
@@ -170,7 +170,7 @@ 
 	/**
 	 * @param string $plugin_basename
 	 */
-	public function set_plugin_basename( $plugin_basename ) {
+	public function set_plugin_basename($plugin_basename) {
 
 		$this->_plugin_basename = $plugin_basename;
 	}
@@ -190,7 +190,7 @@ 
 	/**
 	 * @param string $plugin_slug
 	 */
-	public function set_plugin_slug( $plugin_slug ) {
+	public function set_plugin_slug($plugin_slug) {
 
 		$this->_plugin_slug = $plugin_slug;
 	}
@@ -210,7 +210,7 @@ 
 	/**
 	 * @param string $plugin_action_slug
 	 */
-	public function set_plugin_action_slug( $plugin_action_slug ) {
+	public function set_plugin_action_slug($plugin_action_slug) {
 
 		$this->_plugin_action_slug = $plugin_action_slug;
 	}
@@ -230,9 +230,9 @@ 
 	/**
 	 * @param array $plugins_page_row
 	 */
-	public function set_plugins_page_row( $plugins_page_row = array() ) {
+	public function set_plugins_page_row($plugins_page_row = array()) {
 		// sigh.... check for example content that I stupidly merged to master and remove it if found
-		if ( ! is_array( $plugins_page_row ) && strpos( $plugins_page_row, '<h3>Promotions Addon Upsell Info</h3>' ) !== false ) {
+		if ( ! is_array($plugins_page_row) && strpos($plugins_page_row, '<h3>Promotions Addon Upsell Info</h3>') !== false) {
 			$plugins_page_row = '';
 		}
 		$this->_plugins_page_row = $plugins_page_row;
@@ -251,7 +251,7 @@ 
 		do_action("AHEE__{$classname}__new_install");
 		do_action("AHEE__EE_Addon__new_install", $this);
 		EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
-		add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ) );
+		add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required'));
 	}
 
 
@@ -266,16 +266,16 @@ 
 		do_action("AHEE__{$classname}__reactivation");
 		do_action("AHEE__EE_Addon__reactivation", $this);
 		EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
-		add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ) );
+		add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required'));
 	}
 
-	public function deactivation(){
+	public function deactivation() {
 		$classname = get_class($this);
 //		echo "Deactivating $classname";die;
 		do_action("AHEE__{$classname}__deactivation");
 		do_action("AHEE__EE_Addon__deactivation", $this);
 		//check if the site no longer needs to be in maintenance mode
-		EE_Register_Addon::deregister( $this->name() );
+		EE_Register_Addon::deregister($this->name());
 		EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
 	}
 
@@ -289,16 +289,16 @@ 
 	 * This is a resource-intensive job so we prefer to only do it when necessary
 	 * @return void
 	 */
-	public function initialize_db_if_no_migrations_required( $verify_schema = true ) {
-		if( $verify_schema === '' ) {
+	public function initialize_db_if_no_migrations_required($verify_schema = true) {
+		if ($verify_schema === '') {
 			//wp core bug imo: if no args are passed to `do_action('some_hook_name')` besides the hook's name
 			//(ie, no 2nd or 3rd arguments), instead of calling the registered callbacks with no arguments, it
 			//calls them with an argument of an empty string (ie ""), which evaluates to false
 			//so we need to treat the empty string as if nothing had been passed, and should instead use the default
 			$verify_schema = true;
 		}
-		if ( EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ) {
-			if( $verify_schema ) {
+		if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
+			if ($verify_schema) {
 				$this->initialize_db();
 			}
 			$this->initialize_default_data();
@@ -312,15 +312,15 @@ 
 			 */
 			EE_Registry::instance()->load_helper('Activation');
 			EEH_Activation::initialize_db_content();
-			update_option( 'ee_flush_rewrite_rules', TRUE );
+			update_option('ee_flush_rewrite_rules', TRUE);
 			//in case there are lots of addons being activated at once, let's force garbage collection
 			//to help avoid memory limit errors
 			//EEH_Debug_Tools::instance()->measure_memory( 'db content initialized for ' . get_class( $this), true );
 			gc_collect_cycles();
-		}else{
+		} else {
 			//ask the data migration manager to init this addon's data
 			//when migrations are finished because we can't do it now
-			EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for( $this->name() );
+			EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for($this->name());
 		}
 	}
 
@@ -334,20 +334,20 @@ 
 	 */
 	public function initialize_db() {
 		//find the migration script that sets the database to be compatible with the code
-		$current_dms_name = EE_Data_Migration_Manager::instance()->get_most_up_to_date_dms( $this->name() );
-		if( $current_dms_name ){
-			$current_data_migration_script = EE_Registry::instance()->load_dms( $current_dms_name );
-			$current_data_migration_script->set_migrating( FALSE );
+		$current_dms_name = EE_Data_Migration_Manager::instance()->get_most_up_to_date_dms($this->name());
+		if ($current_dms_name) {
+			$current_data_migration_script = EE_Registry::instance()->load_dms($current_dms_name);
+			$current_data_migration_script->set_migrating(FALSE);
 			$current_data_migration_script->schema_changes_before_migration();
 			$current_data_migration_script->schema_changes_after_migration();
-			if ( $current_data_migration_script->get_errors() ) {
-				foreach( $current_data_migration_script->get_errors() as $error ) {
-					EE_Error::add_error( $error, __FILE__, __FUNCTION__, __LINE__ );
+			if ($current_data_migration_script->get_errors()) {
+				foreach ($current_data_migration_script->get_errors() as $error) {
+					EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__);
 				}
 			}
 		}
 		//if not DMS was found that should be ok. This addon just doesn't require any database changes
-		EE_Data_Migration_Manager::instance()->update_current_database_state_to( array( 'slug' => $this->name(), 'version' => $this->version() ) );
+		EE_Data_Migration_Manager::instance()->update_current_database_state_to(array('slug' => $this->name(), 'version' => $this->version()));
 	}
 
 
@@ -369,7 +369,7 @@ 
 		 * default data)
 		 * @param EE_Addon $addon the addon that called this
 		 */
-		do_action( 'AHEE__EE_Addon__initialize_default_data__begin', $this );
+		do_action('AHEE__EE_Addon__initialize_default_data__begin', $this);
 		//override to insert default data. It is safe to use the models here
 		//because the site should not be in maintenance mode
 	}
@@ -388,7 +388,7 @@ 
 		do_action("AHEE__EE_Addon__upgrade", $this);
 		EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
 		//also it's possible there is new default data that needs to be added
-		add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ) );
+		add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required'));
 	}
 
 
@@ -401,7 +401,7 @@ 
 		do_action("AHEE__{$classname}__downgrade");
 		do_action("AHEE__EE_Addon__downgrade", $this);
 		//it's possible there's old default data that needs to be double-checked
-		add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ) );
+		add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required'));
 	}
 
 
@@ -412,7 +412,7 @@ 
 	 * plugin activation only. In the future, we'll want to do it on plugin updates too
 	 * @return bool
 	 */
-	public function set_db_update_option_name(){
+	public function set_db_update_option_name() {
 		EE_Error::doing_it_wrong(__FUNCTION__, __('EE_Addon::set_db_update_option_name was renamed to EE_Addon::set_activation_indicator_option', 'event_espresso'), '4.3.0.alpha.016');
 		//let's just handle this on the next request, ok? right now we're just not really ready
 		return $this->set_activation_indicator_option();
@@ -440,7 +440,7 @@ 
 	 */
 	public function set_activation_indicator_option() {
 		// let's just handle this on the next request, ok? right now we're just not really ready
-		return update_option( $this->get_activation_indicator_option_name(), TRUE );
+		return update_option($this->get_activation_indicator_option_name(), TRUE);
 	}
 
 
@@ -448,8 +448,8 @@ 
 	 * Gets the name of the wp option which is used to temporarily indicate that this addon was activated
 	 * @return string
 	 */
-	public function get_activation_indicator_option_name(){
-		return 'ee_activation_' . $this->name();
+	public function get_activation_indicator_option_name() {
+		return 'ee_activation_'.$this->name();
 	}
 
 
@@ -459,7 +459,7 @@ 
 	 * Used by EE_System to set the request type of this addon. Should not be used by addon developers
 	 * @param int $req_type
 	 */
-	function set_req_type( $req_type ) {
+	function set_req_type($req_type) {
 		$this->_req_type = $req_type;
 	}
 
@@ -470,7 +470,7 @@ 
 	 * of addons
 	 */
 	function detect_req_type() {
-		if( ! $this->_req_type ){
+		if ( ! $this->_req_type) {
 			$this->detect_activation_or_upgrade();
 		}
 		return $this->_req_type;
@@ -483,36 +483,36 @@ 
 	 * Should only be called once per request
 	 * @return void
 	 */
-	function detect_activation_or_upgrade(){
+	function detect_activation_or_upgrade() {
 		$activation_history_for_addon = $this->get_activation_history();
 //		d($activation_history_for_addon);
 		$request_type = EE_System::detect_req_type_given_activation_history($activation_history_for_addon, $this->get_activation_indicator_option_name(), $this->version());
 		$this->set_req_type($request_type);
 		$classname = get_class($this);
-		switch($request_type){
+		switch ($request_type) {
 			case EE_System::req_type_new_activation:
-				do_action( "AHEE__{$classname}__detect_activations_or_upgrades__new_activation" );
-				do_action( "AHEE__EE_Addon__detect_activations_or_upgrades__new_activation", $this );
+				do_action("AHEE__{$classname}__detect_activations_or_upgrades__new_activation");
+				do_action("AHEE__EE_Addon__detect_activations_or_upgrades__new_activation", $this);
 				$this->new_install();
-				$this->update_list_of_installed_versions( $activation_history_for_addon );
+				$this->update_list_of_installed_versions($activation_history_for_addon);
 				break;
 			case EE_System::req_type_reactivation:
-				do_action( "AHEE__{$classname}__detect_activations_or_upgrades__reactivation" );
-				do_action( "AHEE__EE_Addon__detect_activations_or_upgrades__reactivation", $this );
+				do_action("AHEE__{$classname}__detect_activations_or_upgrades__reactivation");
+				do_action("AHEE__EE_Addon__detect_activations_or_upgrades__reactivation", $this);
 				$this->reactivation();
-				$this->update_list_of_installed_versions( $activation_history_for_addon );
+				$this->update_list_of_installed_versions($activation_history_for_addon);
 				break;
 			case EE_System::req_type_upgrade:
-				do_action( "AHEE__{$classname}__detect_activations_or_upgrades__upgrade" );
-				do_action( "AHEE__EE_Addon__detect_activations_or_upgrades__upgrade", $this );
+				do_action("AHEE__{$classname}__detect_activations_or_upgrades__upgrade");
+				do_action("AHEE__EE_Addon__detect_activations_or_upgrades__upgrade", $this);
 				$this->upgrade();
-				$this->update_list_of_installed_versions($activation_history_for_addon );
+				$this->update_list_of_installed_versions($activation_history_for_addon);
 				break;
 			case EE_System::req_type_downgrade:
-				do_action( "AHEE__{$classname}__detect_activations_or_upgrades__downgrade" );
-				do_action( "AHEE__EE_Addon__detect_activations_or_upgrades__downgrade", $this );
+				do_action("AHEE__{$classname}__detect_activations_or_upgrades__downgrade");
+				do_action("AHEE__EE_Addon__detect_activations_or_upgrades__downgrade", $this);
 				$this->downgrade();
-				$this->update_list_of_installed_versions($activation_history_for_addon );
+				$this->update_list_of_installed_versions($activation_history_for_addon);
 				break;
 			case EE_System::req_type_normal:
 			default:
@@ -520,7 +520,7 @@ 
 				break;
 		}
 
-		do_action( "AHEE__{$classname}__detect_if_activation_or_upgrade__complete" );
+		do_action("AHEE__{$classname}__detect_if_activation_or_upgrade__complete");
 	}
 
 	/**
@@ -529,17 +529,17 @@ 
 	 * @param string $current_version_to_add
 	 * @return boolean success
 	 */
-	public function update_list_of_installed_versions($version_history = NULL,$current_version_to_add = NULL) {
-		if( ! $version_history ) {
+	public function update_list_of_installed_versions($version_history = NULL, $current_version_to_add = NULL) {
+		if ( ! $version_history) {
 			$version_history = $this->get_activation_history();
 		}
-		if( $current_version_to_add == NULL){
+		if ($current_version_to_add == NULL) {
 			$current_version_to_add = $this->version();
 		}
-		$version_history[ $current_version_to_add ][] = date( 'Y-m-d H:i:s',time() );
+		$version_history[$current_version_to_add][] = date('Y-m-d H:i:s', time());
 		// resave
 //		echo "updating list of installed versions:".$this->get_activation_history_option_name();d($version_history);
-		return update_option( $this->get_activation_history_option_name(), $version_history );
+		return update_option($this->get_activation_history_option_name(), $version_history);
 	}
 
 	/**
@@ -547,8 +547,8 @@ 
 	 * of this addon
 	 * @return string
 	 */
-	function get_activation_history_option_name(){
-		return self::ee_addon_version_history_option_prefix . $this->name();
+	function get_activation_history_option_name() {
+		return self::ee_addon_version_history_option_prefix.$this->name();
 	}
 
 
@@ -557,7 +557,7 @@ 
 	 * Gets the wp option which stores the activation history for this addon
 	 * @return array
 	 */
-	function get_activation_history(){
+	function get_activation_history() {
 		return get_option($this->get_activation_history_option_name(), NULL);
 	}
 
@@ -566,8 +566,8 @@ 
 	/**
 	 * @param string $config_section
 	 */
-	public function set_config_section( $config_section = '' ) {
-		$this->_config_section = ! empty( $config_section ) ? $config_section : 'addons';
+	public function set_config_section($config_section = '') {
+		$this->_config_section = ! empty($config_section) ? $config_section : 'addons';
 	}
 	/**
 	 *	filepath to the main file, which can be used for register_activation_hook, register_deactivation_hook, etc.
@@ -580,14 +580,14 @@ 
 	 * Sets the filepath to the main plugin file
 	 * @param string $filepath
 	 */
-	public function set_main_plugin_file( $filepath ) {
+	public function set_main_plugin_file($filepath) {
 		$this->_main_plugin_file = $filepath;
 	}
 	/**
 	 * gets the filepath to teh main file
 	 * @return string
 	 */
-	public function get_main_plugin_file(){
+	public function get_main_plugin_file() {
 		return $this->_main_plugin_file;
 	}
 
@@ -597,15 +597,15 @@ 
 	 * @return string
 	 */
 	public function get_main_plugin_file_basename() {
-		return plugin_basename( $this->get_main_plugin_file() );
+		return plugin_basename($this->get_main_plugin_file());
 	}
 
 	/**
 	 * Gets the folder name which contains the main plugin file
 	 * @return string
 	 */
-	public function get_main_plugin_file_dirname(){
-		return dirname( $this->get_main_plugin_file() );
+	public function get_main_plugin_file_dirname() {
+		return dirname($this->get_main_plugin_file());
 	}
 
 
@@ -614,11 +614,11 @@ 
 	 *
 *@return string
 	 */
-	public function admin_init(){
+	public function admin_init() {
 		// is admin and not in M-Mode ?
-		if ( is_admin() && ! EE_Maintenance_Mode::instance()->level() ) {
-			add_filter( 'plugin_action_links', array( $this, 'plugin_action_links' ), 10, 2 );
-			add_filter( 'after_plugin_row_' . $this->_plugin_basename, array( $this, 'after_plugin_row' ), 10, 3 );
+		if (is_admin() && ! EE_Maintenance_Mode::instance()->level()) {
+			add_filter('plugin_action_links', array($this, 'plugin_action_links'), 10, 2);
+			add_filter('after_plugin_row_'.$this->_plugin_basename, array($this, 'after_plugin_row'), 10, 3);
 		}
 	}
 
@@ -633,10 +633,10 @@ 
 	 * @param $file
 	 * @return array
 	 */
-	public function plugin_action_links( $links, $file ) {
-		if ( $file == $this->plugin_basename() && $this->plugin_action_slug() != '' ) {
+	public function plugin_action_links($links, $file) {
+		if ($file == $this->plugin_basename() && $this->plugin_action_slug() != '') {
 			// before other links
-			array_unshift( $links, '<a href="admin.php?page=' . $this->plugin_action_slug() . '">' . __( 'Settings' ) . '</a>' );
+			array_unshift($links, '<a href="admin.php?page='.$this->plugin_action_slug().'">'.__('Settings').'</a>');
 		}
 		return $links;
 	}
@@ -654,17 +654,17 @@ 
 	 * @param $status
 	 * @return string
 	 */
-	public function after_plugin_row( $plugin_file, $plugin_data, $status ) {
+	public function after_plugin_row($plugin_file, $plugin_data, $status) {
 
 		$after_plugin_row = '';
-		if ( $plugin_file == $this->plugin_basename() && $this->get_plugins_page_row() != '' ) {
+		if ($plugin_file == $this->plugin_basename() && $this->get_plugins_page_row() != '') {
 			$class = $status ? 'active' : 'inactive';
 			$plugins_page_row = $this->get_plugins_page_row();
-			$link_text = isset( $plugins_page_row[ 'link_text' ] ) ? $plugins_page_row[ 'link_text' ] : '';
-			$link_url = isset( $plugins_page_row[ 'link_url' ] ) ? $plugins_page_row[ 'link_url' ] : '';
-			$description = isset( $plugins_page_row[ 'description' ] ) ? $plugins_page_row[ 'description' ] : $plugins_page_row;
-			if ( ! empty( $link_text ) && ! empty( $link_url ) && ! empty( $description )) {
-				$after_plugin_row .= '<tr id="' . sanitize_title( $plugin_file ) . '-ee-addon" class="' . $class . '">';
+			$link_text = isset($plugins_page_row['link_text']) ? $plugins_page_row['link_text'] : '';
+			$link_url = isset($plugins_page_row['link_url']) ? $plugins_page_row['link_url'] : '';
+			$description = isset($plugins_page_row['description']) ? $plugins_page_row['description'] : $plugins_page_row;
+			if ( ! empty($link_text) && ! empty($link_url) && ! empty($description)) {
+				$after_plugin_row .= '<tr id="'.sanitize_title($plugin_file).'-ee-addon" class="'.$class.'">';
 				$after_plugin_row .= '<th class="check-column" scope="row"></th>';
 				$after_plugin_row .= '<td class="ee-addon-upsell-info-title-td plugin-title column-primary">';
 				$after_plugin_row .= '<style>
@@ -706,7 +706,7 @@ 
 </style>';
 				$after_plugin_row .= '
 <p class="ee-addon-upsell-info-dv">
-	<a class="ee-button" href="' . $link_url . '">' . $link_text . ' &nbsp;<span class="dashicons dashicons-arrow-right-alt2" style="margin:0;"></span></a>
+	<a class="ee-button" href="' . $link_url.'">'.$link_text.' &nbsp;<span class="dashicons dashicons-arrow-right-alt2" style="margin:0;"></span></a>
 </p>';
 				$after_plugin_row .= '</td>';
 				$after_plugin_row .= '<td class="ee-addon-upsell-info-desc-td column-description desc">';

Doc Comments +2 added lines, -2 removed lines

@@ -119,7 +119,7 @@ 
 
 
 	/**
-	 * @param mixed $min_core_version
+	 * @param string $min_core_version
 	 */
 	public function set_min_core_version( $min_core_version = NULL ) {
 		$this->_min_core_version = $min_core_version;
@@ -140,7 +140,7 @@ 
 	/**
 	 * Sets addon_name
 	 * @param string $addon_name
-	 * @return boolean
+	 * @return string
 	 */
 	function set_name( $addon_name ) {
 		return $this->_addon_name = $addon_name;

core/EE_Base.core.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 *		@ override magic methods
 	 *		@ return void
 	 */	
-	public function __set($a,$b) { return FALSE; }
+	public function __set($a, $b) { return FALSE; }
 	public function __get($a) { return FALSE; }
 	public function __isset($a) { return FALSE; }
 	public function __unset($a) { return FALSE; }

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

core/EE_Error.core.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

Indentation +180 added lines, -180 removed lines

@@ -18,52 +18,52 @@ 
 
 
 	/**
-	* 	name of the file to log exceptions to
-	* 	@access	private
-    *	@var string
-	*/
+	 * 	name of the file to log exceptions to
+	 * 	@access	private
+	 *	@var string
+	 */
 	private static $_exception_log_file = 'espresso_error_log.txt';
 
 	/**
-	* 	the exception
-	* 	@access	private
-    *	@var object
-	*/
+	 * 	the exception
+	 * 	@access	private
+	 *	@var object
+	 */
 	private $_exception;
 
 	/**
-	* 	stores details for all exception
-	* 	@access	private
-    *	@var array
-	*/
+	 * 	stores details for all exception
+	 * 	@access	private
+	 *	@var array
+	 */
 	private static $_all_exceptions = array();
 
 	/**
-	* 	tracks number of errors
-	* 	@access	private
-    *	@var int
-	*/
+	 * 	tracks number of errors
+	 * 	@access	private
+	 *	@var int
+	 */
 	private static $_error_count = 0;
 
 	/**
-	* 	has JS been loaded ?
-	* 	@access	private
-    *	@var boolean
-	*/
+	 * 	has JS been loaded ?
+	 * 	@access	private
+	 *	@var boolean
+	 */
 	private static $_js_loaded = FALSE;
 
 	/**
-	* 	has shutdown action been added ?
-	* 	@access	private
-    *	@var boolean
-	*/
+	 * 	has shutdown action been added ?
+	 * 	@access	private
+	 *	@var boolean
+	 */
 	private static $_action_added = FALSE;
 
 	/**
-	* 	has shutdown action been added ?
-	* 	@access	private
-    *	@var boolean
-	*/
+	 * 	has shutdown action been added ?
+	 * 	@access	private
+	 *	@var boolean
+	 */
 	private static $_espresso_notices = array( 'success' => FALSE, 'errors' => FALSE, 'attention' => FALSE );
 
 
@@ -71,10 +71,10 @@ 
 
 
 	/**
-	*	@override default exception handling
-	*	@access public
-	*	@echo string
-	*/
+	 *	@override default exception handling
+	 *	@access public
+	 *	@echo string
+	 */
 	function __construct( $message, $code = 0, Exception $previous = NULL ) {
 		if ( version_compare( phpversion(), '5.3.0', '<' )) {
 			parent::__construct( $message, $code );
@@ -173,10 +173,10 @@ 
 
 
 	/**
-	*	fatal_error_handler
-	*	@access public
-	*	@return void
-	*/
+	 *	fatal_error_handler
+	 *	@access public
+	 *	@return void
+	 */
 	public static function fatal_error_handler() {
 		$last_error = error_get_last();
 		if ( $last_error['type'] === E_ERROR ) {
@@ -221,11 +221,11 @@ 
 
 
 	/**
-	*	_add_actions
-	*	@access public
-	*	@return void
-	*/
-    public function get_error() {
+	 *	_add_actions
+	 *	@access public
+	 *	@return void
+	 */
+	public function get_error() {
 
 		if( apply_filters( 'FHEE__EE_Error__get_error__show_normal_exceptions', FALSE ) ){
 			throw $this;
@@ -254,37 +254,37 @@ 
 
 
 
-    /**
-     *    has_error
-     *
-     * @access public
-     * @param bool   $check_stored
-     * @param string $type_to_check
-     * @return bool
-     */
-    public static function has_error( $check_stored = false, $type_to_check = 'errors' ){
-	    $has_error = isset(self::$_espresso_notices[$type_to_check]) && ! empty(self::$_espresso_notices[$type_to_check])
-            ? true
-            : false;
-	    if ( $check_stored && ! $has_error ) {
-		    $notices = (array) get_option( 'ee_notices', array() );
-		    foreach ( $notices as $type => $notice ) {
-			    if ( $type === $type_to_check && $notice ) {
-				    return true;
-			    }
-		    }
-	    }
-	    return $has_error;
-    }
+	/**
+	 *    has_error
+	 *
+	 * @access public
+	 * @param bool   $check_stored
+	 * @param string $type_to_check
+	 * @return bool
+	 */
+	public static function has_error( $check_stored = false, $type_to_check = 'errors' ){
+		$has_error = isset(self::$_espresso_notices[$type_to_check]) && ! empty(self::$_espresso_notices[$type_to_check])
+			? true
+			: false;
+		if ( $check_stored && ! $has_error ) {
+			$notices = (array) get_option( 'ee_notices', array() );
+			foreach ( $notices as $type => $notice ) {
+				if ( $type === $type_to_check && $notice ) {
+					return true;
+				}
+			}
+		}
+		return $has_error;
+	}
 
 
 
 	/**
-	*	display_errors
-	*	@access public
-	*	@echo string
-	*/
-    public function display_errors(){
+	 *	display_errors
+	 *	@access public
+	 *	@echo string
+	 */
+	public function display_errors(){
 
 		$trace_details = '';
 
@@ -356,7 +356,7 @@ 
 			// process trace info
 			if ( empty( $ex['trace'] )) {
 
-	            $trace_details .= __( 'Sorry, but no trace information was available for this exception.', 'event_espresso' );
+				$trace_details .= __( 'Sorry, but no trace information was available for this exception.', 'event_espresso' );
 
 			} else {
 
@@ -408,7 +408,7 @@ 
 					$function_dsply = ! empty( $function ) ? $function : '&nbsp;';
 					$args_dsply = ! empty( $args ) ? '( ' . $args . ' )' : '';
 
-		              $trace_details .= '
+					  $trace_details .= '
 					<tr>
 						<td align="right" class="' . $zebra . '">' . $nmbr_dsply . '</td>
 						<td align="right" class="' . $zebra . '">' . $line_dsply . '</td>
@@ -420,7 +420,7 @@ 
 
 				}
 
-	            $trace_details .= '
+				$trace_details .= '
 			 </table>
 			</div>';
 
@@ -500,12 +500,12 @@ 
 
 
 	/**
-	*	generate string from exception trace args
-	*
-	*	@access private
-	*	@ param array $arguments
-	*	@ return string
-	*/
+	 *	generate string from exception trace args
+	 *
+	 *	@access private
+	 *	@ param array $arguments
+	 *	@ return string
+	 */
 	private function _convert_args_to_string ( $arguments = array(), $array = FALSE ) {
 
 		$arg_string = '';
@@ -549,15 +549,15 @@ 
 
 
 	/**
-	* 	add error message
-	*
-	*	@access public
-	* 	@param		string		$msg	the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev
-	* 	@param		string		$file		the file that the error occurred in - just use __FILE__
-	* 	@param		string		$func	the function/method that the error occurred in - just use __FUNCTION__
-	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
-	* 	@return 		void
-	*/
+	 * 	add error message
+	 *
+	 *	@access public
+	 * 	@param		string		$msg	the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev
+	 * 	@param		string		$file		the file that the error occurred in - just use __FILE__
+	 * 	@param		string		$func	the function/method that the error occurred in - just use __FUNCTION__
+	 * 	@param		string		$line	the line number where the error occurred - just use __LINE__
+	 * 	@return 		void
+	 */
 	public static function add_error( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
 		self::_add_notice ( 'errors', $msg, $file, $func, $line );
 		self::$_error_count++;
@@ -585,15 +585,15 @@ 
 
 
 	/**
-	* 	add success message
-	*
-	*	@access public
-	* 	@param		string		$msg	the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev
-	* 	@param		string		$file		the file that the error occurred in - just use __FILE__
-	* 	@param		string		$func	the function/method that the error occurred in - just use __FUNCTION__
-	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
-	* 	@return 		void
-	*/
+	 * 	add success message
+	 *
+	 *	@access public
+	 * 	@param		string		$msg	the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev
+	 * 	@param		string		$file		the file that the error occurred in - just use __FILE__
+	 * 	@param		string		$func	the function/method that the error occurred in - just use __FUNCTION__
+	 * 	@param		string		$line	the line number where the error occurred - just use __LINE__
+	 * 	@return 		void
+	 */
 	public static function add_success( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
 		self::_add_notice ( 'success', $msg, $file, $func, $line );
 	}
@@ -603,15 +603,15 @@ 
 
 
 	/**
-	* 	add attention message
-	*
-	*	@access public
-	* 	@param		string		$msg	the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev
-	* 	@param		string		$file		the file that the error occurred in - just use __FILE__
-	* 	@param		string		$func	the function/method that the error occurred in - just use __FUNCTION__
-	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
-	* 	@return 		void
-	*/
+	 * 	add attention message
+	 *
+	 *	@access public
+	 * 	@param		string		$msg	the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev
+	 * 	@param		string		$file		the file that the error occurred in - just use __FILE__
+	 * 	@param		string		$func	the function/method that the error occurred in - just use __FUNCTION__
+	 * 	@param		string		$line	the line number where the error occurred - just use __LINE__
+	 * 	@return 		void
+	 */
 	public static function add_attention( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
 		self::_add_notice ( 'attention', $msg, $file, $func, $line );
 	}
@@ -621,16 +621,16 @@ 
 
 
 	/**
-	* 	add success message
-	*
-	*	@access public
-	* 	@param		string		$type	whether the message is for a success or error notification
-	* 	@param		string		$msg	the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev
-	* 	@param		string		$file		the file that the error occurred in - just use __FILE__
-	* 	@param		string		$func	the function/method that the error occurred in - just use __FUNCTION__
-	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
-	* 	@return 		void
-	*/
+	 * 	add success message
+	 *
+	 *	@access public
+	 * 	@param		string		$type	whether the message is for a success or error notification
+	 * 	@param		string		$msg	the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev
+	 * 	@param		string		$file		the file that the error occurred in - just use __FILE__
+	 * 	@param		string		$func	the function/method that the error occurred in - just use __FUNCTION__
+	 * 	@param		string		$line	the line number where the error occurred - just use __LINE__
+	 * 	@return 		void
+	 */
 	private static function _add_notice( $type = 'success', $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
 		if ( empty( $msg )) {
 			EE_Error::doing_it_wrong(
@@ -689,11 +689,11 @@ 
 
 
 	/**
-	* 	in some case it may be necessary to overwrite the existing success messages
-	*
-	*	@access public
-	* 	@return 		void
-	*/
+	 * 	in some case it may be necessary to overwrite the existing success messages
+	 *
+	 *	@access public
+	 * 	@return 		void
+	 */
 	public static function overwrite_success() {
 		self::$_espresso_notices['success'] = FALSE;
 	}
@@ -703,11 +703,11 @@ 
 
 
 	/**
-	* 	in some case it may be necessary to overwrite the existing attention messages
-	*
-	*	@access public
-	* 	@return 		void
-	*/
+	 * 	in some case it may be necessary to overwrite the existing attention messages
+	 *
+	 *	@access public
+	 * 	@return 		void
+	 */
 	public static function overwrite_attention() {
 		self::$_espresso_notices['attention'] = FALSE;
 	}
@@ -717,11 +717,11 @@ 
 
 
 	/**
-	* 	in some case it may be necessary to overwrite the existing error messages
-	*
-	*	@access public
-	* 	@return 		void
-	*/
+	 * 	in some case it may be necessary to overwrite the existing error messages
+	 *
+	 *	@access public
+	 * 	@return 		void
+	 */
 	public static function overwrite_errors() {
 		self::$_espresso_notices['errors'] = FALSE;
 	}
@@ -729,24 +729,24 @@ 
 
 
 	/**
-	*	reset_notices
-	*	@access private
-	*	@return void
-	*/
+	 *	reset_notices
+	 *	@access private
+	 *	@return void
+	 */
 	public static function reset_notices(){
-    	self::$_espresso_notices['success'] = FALSE;
-    	self::$_espresso_notices['attention'] = FALSE;
-    	self::$_espresso_notices['errors'] = FALSE;
-    }
+		self::$_espresso_notices['success'] = FALSE;
+		self::$_espresso_notices['attention'] = FALSE;
+		self::$_espresso_notices['errors'] = FALSE;
+	}
 
 
 
 	/**
-	*	has_errors
-	*	@access public
-	*	@return int
-	*/
-    public static function has_notices(){
+	 *	has_errors
+	 *	@access public
+	 *	@return int
+	 */
+	public static function has_notices(){
 		$has_notices = 0;
 		// check for success messages
 		$has_notices = self::$_espresso_notices['success'] && ! empty(  self::$_espresso_notices['success'] ) ? 3 : $has_notices;
@@ -777,15 +777,15 @@ 
 
 
 	/**
-	* 	compile all error or success messages into one string
-	*	@see EE_Error::get_raw_notices if you want the raw notices without any preparations made to them
-	*
-	*	@access public
-	* 	@param		boolean		$format_output		whether or not to format the messages for display in the WP admin
-	* 	@param		boolean		$save_to_transient	whether or not to save notices to the db for retrieval on next request - ONLY do this just before redirecting
-	* 	@param		boolean		$remove_empty		whether or not to unset empty messages
-	* 	@return 		array
-	*/
+	 * 	compile all error or success messages into one string
+	 *	@see EE_Error::get_raw_notices if you want the raw notices without any preparations made to them
+	 *
+	 *	@access public
+	 * 	@param		boolean		$format_output		whether or not to format the messages for display in the WP admin
+	 * 	@param		boolean		$save_to_transient	whether or not to save notices to the db for retrieval on next request - ONLY do this just before redirecting
+	 * 	@param		boolean		$remove_empty		whether or not to unset empty messages
+	 * 	@return 		array
+	 */
 	public static function get_notices( $format_output = TRUE, $save_to_transient = FALSE, $remove_empty = TRUE ) {
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 
@@ -897,14 +897,14 @@ 
 
 
 	/**
-	* 	add_persistent_admin_notice
-	*
-	*	@access 	public
-	* 	@param		string	$pan_name	the name, or key of the Persistent Admin Notice to be stored
-	* 	@param		string	$pan_message	the message to be stored persistently until dismissed
-	* 	@param bool $force_update allows one to enforce the reappearance of a persistent message.
-	* 	@return 		void
-	*/
+	 * 	add_persistent_admin_notice
+	 *
+	 *	@access 	public
+	 * 	@param		string	$pan_name	the name, or key of the Persistent Admin Notice to be stored
+	 * 	@param		string	$pan_message	the message to be stored persistently until dismissed
+	 * 	@param bool $force_update allows one to enforce the reappearance of a persistent message.
+	 * 	@return 		void
+	 */
 	public static function add_persistent_admin_notice( $pan_name = '', $pan_message, $force_update = FALSE ) {
 		if ( ! empty( $pan_name ) && ! empty( $pan_message )) {
 			$persistent_admin_notices = get_option( 'ee_pers_admin_notices', array() );
@@ -1067,11 +1067,11 @@ 
 
 
 	/**
-	* 	enqueue_error_scripts
-	*
-	*	@access public
-	* 	@return 		void
-	*/
+	 * 	enqueue_error_scripts
+	 *
+	 *	@access public
+	 * 	@return 		void
+	 */
 	public static function enqueue_error_scripts() {
 		self::_print_scripts();
 	}
@@ -1079,15 +1079,15 @@ 
 
 
 	/**
-	*	create error code from filepath, function name,
-	*	and line number where exception or error was thrown
-	*
-	*	@access public
-	*	@param string $file
-	*	@param string $func
-	*	@param string $line
-	*	@return string
-	*/
+	 *	create error code from filepath, function name,
+	 *	and line number where exception or error was thrown
+	 *
+	 *	@access public
+	 *	@param string $file
+	 *	@param string $func
+	 *	@param string $line
+	 *	@return string
+	 */
 	public static function generate_error_code ( $file = '', $func = '', $line = '' ) {
 		$file = explode( '.', basename( $file ));
 		$error_code = ! empty( $file[0] ) ? $file[0] : '';
@@ -1101,13 +1101,13 @@ 
 
 
 	/**
-	*	write exception details to log file
-	*
-	*	@access public
-	*	@ param timestamp $time
-	*	@ param object $ex
-	*	@ return void
-	*/
+	 *	write exception details to log file
+	 *
+	 *	@access public
+	 *	@ param timestamp $time
+	 *	@ param object $ex
+	 *	@ return void
+	 */
 	public function write_to_error_log ( $time = FALSE, $ex = FALSE, $clear = FALSE ) {
 
 		if ( ! $ex ) {

Doc Comments +6 added lines, -6 removed lines

@@ -88,7 +88,7 @@ 
 	/**
 	 *    error_handler
 	 * @access public
-	 * @param $code
+	 * @param integer $code
 	 * @param $message
 	 * @param $file
 	 * @param $line
@@ -189,7 +189,7 @@ 
 	/**
 	 *    _format_error
 	 * @access private
-	 * @param $code
+	 * @param string $code
 	 * @param $message
 	 * @param $file
 	 * @param $line
@@ -223,7 +223,7 @@ 
 	/**
 	*	_add_actions
 	*	@access public
-	*	@return void
+	*	@return string|null
 	*/
     public function get_error() {
 
@@ -998,7 +998,7 @@ 
 	 *
 	 * @access    public
 	 * @param string $return_url
-	 * @return    array
+	 * @return    string
 	 */
 	public static function get_persistent_admin_notices( $return_url = '' ) {
 		$notices = '';
@@ -1030,7 +1030,7 @@ 
 	 *
 	 * @access 	public
 	 * @param 	bool $force_print
-	 * @return 	void
+	 * @return 	null|string
 	 */
 	private static function _print_scripts( $force_print = FALSE ) {
 		if (( did_action( 'admin_enqueue_scripts' ) || did_action( 'wp_enqueue_scripts' )) && ! $force_print ) {
@@ -1179,7 +1179,7 @@ 
 
 	/**
 	 * Like get_notices, but returns an array of all the notices of the given type.
-	 * @return array {
+	 * @return boolean {
 	 *	@type array $success all the success messages
 	 *	@type array $errors all the error messages
 	 *	@type array $attention all the attention messages

Spacing +247 added lines, -247 removed lines

@@ -1,8 +1,8 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 // if you're a dev and want to receive all errors via email add this to your wp-config.php: define( 'EE_ERROR_EMAILS', TRUE );
-if ( defined( 'WP_DEBUG' ) && WP_DEBUG === TRUE && defined( 'EE_ERROR_EMAILS' ) && EE_ERROR_EMAILS === TRUE ) {
-	set_error_handler( array( 'EE_Error', 'error_handler' ));
-	register_shutdown_function( array( 'EE_Error', 'fatal_error_handler' ));
+if (defined('WP_DEBUG') && WP_DEBUG === TRUE && defined('EE_ERROR_EMAILS') && EE_ERROR_EMAILS === TRUE) {
+	set_error_handler(array('EE_Error', 'error_handler'));
+	register_shutdown_function(array('EE_Error', 'fatal_error_handler'));
 }
 /**
  *
@@ -64,7 +64,7 @@ 
 	* 	@access	private
     *	@var boolean
 	*/
-	private static $_espresso_notices = array( 'success' => FALSE, 'errors' => FALSE, 'attention' => FALSE );
+	private static $_espresso_notices = array('success' => FALSE, 'errors' => FALSE, 'attention' => FALSE);
 
 
 
@@ -75,11 +75,11 @@ 
 	*	@access public
 	*	@echo string
 	*/
-	function __construct( $message, $code = 0, Exception $previous = NULL ) {
-		if ( version_compare( phpversion(), '5.3.0', '<' )) {
-			parent::__construct( $message, $code );
+	function __construct($message, $code = 0, Exception $previous = NULL) {
+		if (version_compare(phpversion(), '5.3.0', '<')) {
+			parent::__construct($message, $code);
 		} else {
-			parent::__construct( $message, $code, $previous );
+			parent::__construct($message, $code, $previous);
 		}
 	}
 
@@ -94,10 +94,10 @@ 
 	 * @param $line
 	 * @return void
 	 */
-	public static function error_handler( $code, $message, $file, $line ) {
-		$type = EE_Error::error_type( $code );
+	public static function error_handler($code, $message, $file, $line) {
+		$type = EE_Error::error_type($code);
 		$site = site_url();
-		switch ( $site ) {
+		switch ($site) {
 			case 'http://ee4.eventespresso.com/' :
 			case 'http://ee4decaf.eventespresso.com/' :
 			case 'http://ee4hf.eventespresso.com/' :
@@ -110,16 +110,16 @@ 
 				$to = 'developers@eventespresso.com';
 				break;
 			default :
-				$to = get_option( 'admin_email' );
+				$to = get_option('admin_email');
 		}
-		$subject = $type . ' ' . $message . ' in ' . EVENT_ESPRESSO_VERSION . ' on ' . site_url();
-		$msg = EE_Error::_format_error( $type, $message, $file, $line );
-		if ( function_exists( 'wp_mail' )) {
-			add_filter( 'wp_mail_content_type', array( 'EE_Error', 'set_content_type' ));
-			wp_mail( $to, $subject, $msg );
+		$subject = $type.' '.$message.' in '.EVENT_ESPRESSO_VERSION.' on '.site_url();
+		$msg = EE_Error::_format_error($type, $message, $file, $line);
+		if (function_exists('wp_mail')) {
+			add_filter('wp_mail_content_type', array('EE_Error', 'set_content_type'));
+			wp_mail($to, $subject, $msg);
 		}
 		echo '<div id="message" class="espresso-notices error"><p>';
-		echo $type . ': ' . $message . '<br />' . $file . ' line ' . $line;
+		echo $type.': '.$message.'<br />'.$file.' line '.$line;
 		echo '<br /></p></div>';
 	}
 
@@ -132,8 +132,8 @@ 
 	 * @param $code
 	 * @return string
 	 */
-	public static function error_type( $code ) {
-		switch( $code ) {
+	public static function error_type($code) {
+		switch ($code) {
 			case E_ERROR: // 1 //
 			return 'E_ERROR';
 			case E_WARNING: // 2 //
@@ -179,8 +179,8 @@ 
 	*/
 	public static function fatal_error_handler() {
 		$last_error = error_get_last();
-		if ( $last_error['type'] === E_ERROR ) {
-			EE_Error::error_handler( E_ERROR, $last_error['message'], $last_error['file'], $last_error['line'] );
+		if ($last_error['type'] === E_ERROR) {
+			EE_Error::error_handler(E_ERROR, $last_error['message'], $last_error['file'], $last_error['line']);
 		}
 	}
 
@@ -195,7 +195,7 @@ 
 	 * @param $line
 	 * @return string
 	 */
-	private static function _format_error( $code, $message, $file, $line ) {
+	private static function _format_error($code, $message, $file, $line) {
 		$html  = "<table cellpadding='5'><thead bgcolor='#f8f8f8'><th>Item</th><th align='left'>Details</th></thead><tbody>";
 		$html .= "<tr valign='top'><td><b>Code</b></td><td>$code</td></tr>";
 		$html .= "<tr valign='top'><td><b>Error</b></td><td>$message</td></tr>";
@@ -213,7 +213,7 @@ 
 	 * @param $content_type
 	 * @return string
 	 */
-	public static function set_content_type( $content_type ) {
+	public static function set_content_type($content_type) {
 		return 'text/html';
 	}
 
@@ -227,24 +227,24 @@ 
 	*/
     public function get_error() {
 
-		if( apply_filters( 'FHEE__EE_Error__get_error__show_normal_exceptions', FALSE ) ){
+		if (apply_filters('FHEE__EE_Error__get_error__show_normal_exceptions', FALSE)) {
 			throw $this;
 		}
 		// get separate user and developer messages if they exist
-		$msg = explode( '||', $this->getMessage() );
+		$msg = explode('||', $this->getMessage());
 		$user_msg = $msg[0];
-		$dev_msg = isset( $msg[1] ) ? $msg[1] : $msg[0];
+		$dev_msg = isset($msg[1]) ? $msg[1] : $msg[0];
 		$msg = WP_DEBUG ? $dev_msg : $user_msg;
 
 		// add details to _all_exceptions array
 		$x_time = time();
-		self::$_all_exceptions[ $x_time ]['name'] 	= get_class( $this );
-		self::$_all_exceptions[ $x_time ]['file'] 		= $this->getFile();
-		self::$_all_exceptions[ $x_time ]['line'] 		= $this->getLine();
-		self::$_all_exceptions[ $x_time ]['msg'] 	= $msg;
-		self::$_all_exceptions[ $x_time ]['code'] 	= $this->getCode();
-		self::$_all_exceptions[ $x_time ]['trace'] 	= $this->getTrace();
-		self::$_all_exceptions[ $x_time ]['string'] 	= $this->getTraceAsString();
+		self::$_all_exceptions[$x_time]['name'] = get_class($this);
+		self::$_all_exceptions[$x_time]['file'] 		= $this->getFile();
+		self::$_all_exceptions[$x_time]['line'] 		= $this->getLine();
+		self::$_all_exceptions[$x_time]['msg'] = $msg;
+		self::$_all_exceptions[$x_time]['code'] = $this->getCode();
+		self::$_all_exceptions[$x_time]['trace'] 	= $this->getTrace();
+		self::$_all_exceptions[$x_time]['string'] = $this->getTraceAsString();
 		self::$_error_count++;
 
 		//add_action( 'shutdown', array( $this, 'display_errors' ));
@@ -262,14 +262,14 @@ 
      * @param string $type_to_check
      * @return bool
      */
-    public static function has_error( $check_stored = false, $type_to_check = 'errors' ){
+    public static function has_error($check_stored = false, $type_to_check = 'errors') {
 	    $has_error = isset(self::$_espresso_notices[$type_to_check]) && ! empty(self::$_espresso_notices[$type_to_check])
             ? true
             : false;
-	    if ( $check_stored && ! $has_error ) {
-		    $notices = (array) get_option( 'ee_notices', array() );
-		    foreach ( $notices as $type => $notice ) {
-			    if ( $type === $type_to_check && $notice ) {
+	    if ($check_stored && ! $has_error) {
+		    $notices = (array) get_option('ee_notices', array());
+		    foreach ($notices as $type => $notice) {
+			    if ($type === $type_to_check && $notice) {
 				    return true;
 			    }
 		    }
@@ -284,7 +284,7 @@ 
 	*	@access public
 	*	@echo string
 	*/
-    public function display_errors(){
+    public function display_errors() {
 
 		$trace_details = '';
 
@@ -345,18 +345,18 @@ 
 </style>
 <div id="ee-error-message" class="error">';
 
-		if ( ! WP_DEBUG ) {
+		if ( ! WP_DEBUG) {
 			$output .= '
 	<p>';
 		}
 
 		// cycle thru errors
-		foreach ( self::$_all_exceptions as $time => $ex ) {
+		foreach (self::$_all_exceptions as $time => $ex) {
 
 			// process trace info
-			if ( empty( $ex['trace'] )) {
+			if (empty($ex['trace'])) {
 
-	            $trace_details .= __( 'Sorry, but no trace information was available for this exception.', 'event_espresso' );
+	            $trace_details .= __('Sorry, but no trace information was available for this exception.', 'event_espresso');
 
 			} else {
 
@@ -371,50 +371,50 @@ 
 					<th scope="col" align="left">Method( arguments )</th>
 				</tr>';
 
-				$last_on_stack = count( $ex['trace'] ) - 1;
+				$last_on_stack = count($ex['trace']) - 1;
 				// reverse array so that stack is in proper chronological order
-				$sorted_trace = array_reverse( $ex['trace'] );
+				$sorted_trace = array_reverse($ex['trace']);
 
-				foreach ( $sorted_trace as $nmbr => $trace ) {
+				foreach ($sorted_trace as $nmbr => $trace) {
 
-					$file = isset( $trace['file'] ) ? $trace['file'] : '' ;
-					$class = isset( $trace['class'] ) ? $trace['class'] : '';
-					$type = isset( $trace['type'] ) ? $trace['type'] : '';
-					$function = isset( $trace['function'] ) ? $trace['function'] : '';
-					$args = isset( $trace['args'] ) ? $this->_convert_args_to_string( $trace['args'] ) : '';
-					$line = isset( $trace['line'] ) ? $trace['line'] : '';
+					$file = isset($trace['file']) ? $trace['file'] : '';
+					$class = isset($trace['class']) ? $trace['class'] : '';
+					$type = isset($trace['type']) ? $trace['type'] : '';
+					$function = isset($trace['function']) ? $trace['function'] : '';
+					$args = isset($trace['args']) ? $this->_convert_args_to_string($trace['args']) : '';
+					$line = isset($trace['line']) ? $trace['line'] : '';
 					$zebra = $nmbr % 2 ? ' odd' : '';
 
-					if ( empty( $file ) && ! empty( $class )) {
-						$a = new ReflectionClass( $class );
+					if (empty($file) && ! empty($class)) {
+						$a = new ReflectionClass($class);
 						$file = $a->getFileName();
-						if ( empty( $line ) && ! empty( $function )) {
-							$b = new ReflectionMethod( $class, $function );
+						if (empty($line) && ! empty($function)) {
+							$b = new ReflectionMethod($class, $function);
 							$line = $b->getStartLine();
 						}
 					}
 
-					if ( $nmbr == $last_on_stack ) {
+					if ($nmbr == $last_on_stack) {
 						$file = $ex['file'] != '' ? $ex['file'] : $file;
 						$line = $ex['line'] != '' ? $ex['line'] : $line;
-						$error_code = self::generate_error_code ( $file, $trace['function'], $line );
+						$error_code = self::generate_error_code($file, $trace['function'], $line);
 					}
 
-					$nmbr_dsply = ! empty( $nmbr ) ? $nmbr : '&nbsp;';
-					$line_dsply = ! empty( $line ) ? $line : '&nbsp;';
-					$file_dsply = ! empty( $file ) ? $file : '&nbsp;';
-					$class_dsply = ! empty( $class ) ? $class : '&nbsp;';
-					$type_dsply = ! empty( $type ) ? $type : '&nbsp;';
-					$function_dsply = ! empty( $function ) ? $function : '&nbsp;';
-					$args_dsply = ! empty( $args ) ? '( ' . $args . ' )' : '';
+					$nmbr_dsply = ! empty($nmbr) ? $nmbr : '&nbsp;';
+					$line_dsply = ! empty($line) ? $line : '&nbsp;';
+					$file_dsply = ! empty($file) ? $file : '&nbsp;';
+					$class_dsply = ! empty($class) ? $class : '&nbsp;';
+					$type_dsply = ! empty($type) ? $type : '&nbsp;';
+					$function_dsply = ! empty($function) ? $function : '&nbsp;';
+					$args_dsply = ! empty($args) ? '( '.$args.' )' : '';
 
 		              $trace_details .= '
 					<tr>
-						<td align="right" class="' . $zebra . '">' . $nmbr_dsply . '</td>
-						<td align="right" class="' . $zebra . '">' . $line_dsply . '</td>
-						<td align="left" class="' . $zebra . '">' . $file_dsply . '</td>
-						<td align="left" class="' . $zebra . '">' . $class_dsply . '</td>
-						<td align="left" class="' . $zebra . '">' . $type_dsply . $function_dsply . $args_dsply . '</td>
+						<td align="right" class="' . $zebra.'">'.$nmbr_dsply.'</td>
+						<td align="right" class="' . $zebra.'">'.$line_dsply.'</td>
+						<td align="left" class="' . $zebra.'">'.$file_dsply.'</td>
+						<td align="left" class="' . $zebra.'">'.$class_dsply.'</td>
+						<td align="left" class="' . $zebra.'">'.$type_dsply.$function_dsply.$args_dsply.'</td>
 					</tr>';
 
 
@@ -429,9 +429,9 @@ 
 			$ex['code'] = $ex['code'] ? $ex['code'] : $error_code;
 
 			// add generic non-identifying messages for non-privileged uesrs
-			if ( ! WP_DEBUG ) {
+			if ( ! WP_DEBUG) {
 
-				$output .= '<span class="ee-error-user-msg-spn">' . trim( $ex['msg'] )  . '</span> &nbsp; <sup>' . $ex['code'] . '</sup><br />';
+				$output .= '<span class="ee-error-user-msg-spn">'.trim($ex['msg']).'</span> &nbsp; <sup>'.$ex['code'].'</sup><br />';
 
 			} else {
 
@@ -439,24 +439,24 @@ 
 				$output .= '
 		<div class="ee-error-dev-msg-dv">
 			<p class="ee-error-dev-msg-pg">
-				<strong class="ee-error-dev-msg-str">An ' . $ex['name'] . ' exception was thrown!</strong>  &nbsp; <span>code: ' . $ex['code'] . '</span><br />
-				<span class="big-text">"' . trim( $ex['msg'] ) . '"</span><br/>
-				<a id="display-ee-error-trace-' . self::$_error_count . $time . '" class="display-ee-error-trace-lnk small-text" rel="ee-error-trace-' . self::$_error_count . $time . '">
-					' . __( 'click to view backtrace and class/method details', 'event_espresso' ) . '
+				<strong class="ee-error-dev-msg-str">An ' . $ex['name'].' exception was thrown!</strong>  &nbsp; <span>code: '.$ex['code'].'</span><br />
+				<span class="big-text">"' . trim($ex['msg']).'"</span><br/>
+				<a id="display-ee-error-trace-' . self::$_error_count.$time.'" class="display-ee-error-trace-lnk small-text" rel="ee-error-trace-'.self::$_error_count.$time.'">
+					' . __('click to view backtrace and class/method details', 'event_espresso').'
 				</a><br />
 				<span class="small-text lt-grey-text">'.$ex['file'].' &nbsp; ( line no: '.$ex['line'].' )</span>
 			</p>
-			<div id="ee-error-trace-' . self::$_error_count . $time . '-dv" class="ee-error-trace-dv" style="display: none;">
+			<div id="ee-error-trace-' . self::$_error_count.$time.'-dv" class="ee-error-trace-dv" style="display: none;">
 				' . $trace_details;
 
-				if ( ! empty( $class )) {
+				if ( ! empty($class)) {
 					$output .= '
 				<div style="padding:3px; margin:0 0 1em; border:1px solid #666; background:#fff; border-radius:3px;">
 					<div style="padding:1em 2em; border:1px solid #666; background:#f9f9f9;">
 						<h3>Class Details</h3>';
-						$a = new ReflectionClass( $class );
+						$a = new ReflectionClass($class);
 						$output .= '
-						<pre>' . $a . '</pre>
+						<pre>' . $a.'</pre>
 					</div>
 				</div>';
 				}
@@ -468,14 +468,14 @@ 
 
 			}
 
-			$this->write_to_error_log( $time, $ex );
+			$this->write_to_error_log($time, $ex);
 
 		}
 
 		// remove last linebreak
-		$output = substr( $output, 0, ( count( $output ) - 7 ));
+		$output = substr($output, 0, (count($output) - 7));
 
-		if ( ! WP_DEBUG ) {
+		if ( ! WP_DEBUG) {
 			$output .= '
 	</p>';
 		}
@@ -483,10 +483,10 @@ 
 		$output .= '
 </div>';
 
-		$output .= self::_print_scripts( TRUE );
+		$output .= self::_print_scripts(TRUE);
 
-		if ( defined( 'DOING_AJAX' )) {
-			echo wp_json_encode( array( 'error' => $output ));
+		if (defined('DOING_AJAX')) {
+			echo wp_json_encode(array('error' => $output));
 			exit();
 		}
 
@@ -506,29 +506,29 @@ 
 	*	@ param array $arguments
 	*	@ return string
 	*/
-	private function _convert_args_to_string ( $arguments = array(), $array = FALSE ) {
+	private function _convert_args_to_string($arguments = array(), $array = FALSE) {
 
 		$arg_string = '';
-		if ( ! empty( $arguments )) {
+		if ( ! empty($arguments)) {
 
 			$args = array();
 
-			foreach ( $arguments as $arg ) {
+			foreach ($arguments as $arg) {
 
-				if ( ! empty( $arg )) {
+				if ( ! empty($arg)) {
 
-					if ( is_string( $arg )) {
-						$args[] = " '" . $arg . "'";
-					} elseif ( is_array( $arg )) {
-						$args[] = 'ARRAY(' . $this->_convert_args_to_string( $arg, TRUE );
-					} elseif ( is_null( $arg )) {
+					if (is_string($arg)) {
+						$args[] = " '".$arg."'";
+					} elseif (is_array($arg)) {
+						$args[] = 'ARRAY('.$this->_convert_args_to_string($arg, TRUE);
+					} elseif (is_null($arg)) {
 						$args[] = ' NULL';
-					} elseif ( is_bool( $arg )) {
-						$args[] = ( $arg ) ? ' TRUE' : ' FALSE';
-					} elseif ( is_object( $arg )) {
-						$args[] = ' OBJECT ' . get_class( $arg );
-					} elseif ( is_resource( $arg )) {
-						$args[] = get_resource_type( $arg );
+					} elseif (is_bool($arg)) {
+						$args[] = ($arg) ? ' TRUE' : ' FALSE';
+					} elseif (is_object($arg)) {
+						$args[] = ' OBJECT '.get_class($arg);
+					} elseif (is_resource($arg)) {
+						$args[] = get_resource_type($arg);
 					} else {
 						$args[] = $arg;
 					}
@@ -536,9 +536,9 @@ 
 				}
 
 			}
-			$arg_string = implode( ', ', $args );
+			$arg_string = implode(', ', $args);
 		}
-		if ( $array ) {
+		if ($array) {
 			$arg_string .= ' )';
 		}
 		return $arg_string;
@@ -558,8 +558,8 @@ 
 	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
 	* 	@return 		void
 	*/
-	public static function add_error( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
-		self::_add_notice ( 'errors', $msg, $file, $func, $line );
+	public static function add_error($msg = NULL, $file = NULL, $func = NULL, $line = NULL) {
+		self::_add_notice('errors', $msg, $file, $func, $line);
 		self::$_error_count++;
 	}
 
@@ -572,11 +572,11 @@ 
 	 * @param string $line
 	 * @throws EE_Error
 	 */
-	public static function throw_exception_if_debugging( $msg = null, $file = null, $func = null, $line = null ) {
-		if( WP_DEBUG ) {
-			throw new EE_Error( $msg );
-		} else  {
-			EE_Error::add_error( $msg, $file, $func, $line );
+	public static function throw_exception_if_debugging($msg = null, $file = null, $func = null, $line = null) {
+		if (WP_DEBUG) {
+			throw new EE_Error($msg);
+		} else {
+			EE_Error::add_error($msg, $file, $func, $line);
 		}
 	}
 
@@ -594,8 +594,8 @@ 
 	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
 	* 	@return 		void
 	*/
-	public static function add_success( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
-		self::_add_notice ( 'success', $msg, $file, $func, $line );
+	public static function add_success($msg = NULL, $file = NULL, $func = NULL, $line = NULL) {
+		self::_add_notice('success', $msg, $file, $func, $line);
 	}
 
 
@@ -612,8 +612,8 @@ 
 	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
 	* 	@return 		void
 	*/
-	public static function add_attention( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
-		self::_add_notice ( 'attention', $msg, $file, $func, $line );
+	public static function add_attention($msg = NULL, $file = NULL, $func = NULL, $line = NULL) {
+		self::_add_notice('attention', $msg, $file, $func, $line);
 	}
 
 
@@ -631,12 +631,12 @@ 
 	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
 	* 	@return 		void
 	*/
-	private static function _add_notice( $type = 'success', $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
-		if ( empty( $msg )) {
+	private static function _add_notice($type = 'success', $msg = NULL, $file = NULL, $func = NULL, $line = NULL) {
+		if (empty($msg)) {
 			EE_Error::doing_it_wrong(
-				'EE_Error::add_' . $type . '()',
+				'EE_Error::add_'.$type.'()',
 				sprintf(
-					__( 'Notifications are not much use without a message! Please add a message to the EE_Error::add_%s() call made in %s on line %d', 'event_espresso' ),
+					__('Notifications are not much use without a message! Please add a message to the EE_Error::add_%s() call made in %s on line %d', 'event_espresso'),
 					$type,
 					$file,
 					$line
@@ -644,17 +644,17 @@ 
 				EVENT_ESPRESSO_VERSION
 			);
 		}
-		if ( $type == 'errors' && ( empty( $file ) || empty( $func ) || empty( $line ))) {
+		if ($type == 'errors' && (empty($file) || empty($func) || empty($line))) {
 			EE_Error::doing_it_wrong(
 				'EE_Error::add_error()',
-				__('You need to provide the file name, function name, and line number that the error occurred on in order to better assist with debugging.', 'event_espresso' ),
+				__('You need to provide the file name, function name, and line number that the error occurred on in order to better assist with debugging.', 'event_espresso'),
 				EVENT_ESPRESSO_VERSION
 			);
 		}
 		// get separate user and developer messages if they exist
-		$msg = explode( '||', $msg );
+		$msg = explode('||', $msg);
 		$user_msg = $msg[0];
-		$dev_msg = isset( $msg[1] ) ? $msg[1] : $msg[0];
+		$dev_msg = isset($msg[1]) ? $msg[1] : $msg[0];
 		/**
 		 * Do an action so other code can be triggered when a notice is created
 		 * @param string $type can be 'errors', 'attention', or 'success'
@@ -664,22 +664,22 @@ 
 		 * @param string $func function where error was generated
 		 * @param string $line line where error was generated
 		 */
-		do_action( 'AHEE__EE_Error___add_notice', $type, $user_msg, $dev_msg, $file, $func, $line );
+		do_action('AHEE__EE_Error___add_notice', $type, $user_msg, $dev_msg, $file, $func, $line);
 		$msg = WP_DEBUG ? $dev_msg : $user_msg;
 		// add notice if message exists
-		if ( ! empty( $msg )) {
+		if ( ! empty($msg)) {
 			// get error code
-			$notice_code = EE_Error::generate_error_code( $file, $func, $line );
-			if ( WP_DEBUG && $type == 'errors' ) {
-				$msg .= '<br/><span class="tiny-text">' . $notice_code . '</span>';
+			$notice_code = EE_Error::generate_error_code($file, $func, $line);
+			if (WP_DEBUG && $type == 'errors') {
+				$msg .= '<br/><span class="tiny-text">'.$notice_code.'</span>';
 			}
 			// add notice. Index by code if it's not blank
-			if( $notice_code ) {
-				self::$_espresso_notices[ $type ][ $notice_code ] = $msg;
+			if ($notice_code) {
+				self::$_espresso_notices[$type][$notice_code] = $msg;
 			} else {
-				self::$_espresso_notices[ $type ][] = $msg;
+				self::$_espresso_notices[$type][] = $msg;
 			}
-			add_action( 'wp_footer', array( 'EE_Error', 'enqueue_error_scripts' ), 1 );
+			add_action('wp_footer', array('EE_Error', 'enqueue_error_scripts'), 1);
 		}
 
 	}
@@ -733,7 +733,7 @@ 
 	*	@access private
 	*	@return void
 	*/
-	public static function reset_notices(){
+	public static function reset_notices() {
     	self::$_espresso_notices['success'] = FALSE;
     	self::$_espresso_notices['attention'] = FALSE;
     	self::$_espresso_notices['errors'] = FALSE;
@@ -746,14 +746,14 @@ 
 	*	@access public
 	*	@return int
 	*/
-    public static function has_notices(){
+    public static function has_notices() {
 		$has_notices = 0;
 		// check for success messages
-		$has_notices = self::$_espresso_notices['success'] && ! empty(  self::$_espresso_notices['success'] ) ? 3 : $has_notices;
+		$has_notices = self::$_espresso_notices['success'] && ! empty(self::$_espresso_notices['success']) ? 3 : $has_notices;
 		// check for attention messages
-		$has_notices = self::$_espresso_notices['attention'] && ! empty(  self::$_espresso_notices['attention'] ) ? 2 : $has_notices;
+		$has_notices = self::$_espresso_notices['attention'] && ! empty(self::$_espresso_notices['attention']) ? 2 : $has_notices;
 		// check for error messages
-		$has_notices = self::$_espresso_notices['errors'] && ! empty(  self::$_espresso_notices['errors'] ) ? 1 : $has_notices;
+		$has_notices = self::$_espresso_notices['errors'] && ! empty(self::$_espresso_notices['errors']) ? 1 : $has_notices;
 		return $has_notices;
 	}
 
@@ -768,9 +768,9 @@ 
 	 */
 	public static function get_vanilla_notices() {
 		return array(
-			'success' => isset( self::$_espresso_notices['success'] ) ? self::$_espresso_notices['success'] : array(),
-			'attention' => isset( self::$_espresso_notices['attention'] )  ? self::$_espresso_notices['attention'] : array(),
-			'errors' => isset( self::$_espresso_notices['errors'] ) ? self::$_espresso_notices['errors'] : array(),
+			'success' => isset(self::$_espresso_notices['success']) ? self::$_espresso_notices['success'] : array(),
+			'attention' => isset(self::$_espresso_notices['attention']) ? self::$_espresso_notices['attention'] : array(),
+			'errors' => isset(self::$_espresso_notices['errors']) ? self::$_espresso_notices['errors'] : array(),
 		);
 	}
 
@@ -786,8 +786,8 @@ 
 	* 	@param		boolean		$remove_empty		whether or not to unset empty messages
 	* 	@return 		array
 	*/
-	public static function get_notices( $format_output = TRUE, $save_to_transient = FALSE, $remove_empty = TRUE ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+	public static function get_notices($format_output = TRUE, $save_to_transient = FALSE, $remove_empty = TRUE) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		$success_messages = '';
 		$attention_messages = '';
@@ -797,44 +797,44 @@ 
 		// EEH_Debug_Tools::printr( self::$_espresso_notices, 'espresso_notices  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 
 		// either save notices to the db
-		if ( $save_to_transient ) {
-			update_option( 'ee_notices', self::$_espresso_notices );
+		if ($save_to_transient) {
+			update_option('ee_notices', self::$_espresso_notices);
 			return;
 		}
 		// grab any notices that have been previously saved
-		if ( $notices = get_option( 'ee_notices', FALSE )) {
-			foreach ( $notices as $type => $notice ) {
-				if ( is_array( $notice ) && ! empty( $notice )) {
+		if ($notices = get_option('ee_notices', FALSE)) {
+			foreach ($notices as $type => $notice) {
+				if (is_array($notice) && ! empty($notice)) {
 					// make sure that existing notice type is an array
-					self::$_espresso_notices[ $type ] =  is_array( self::$_espresso_notices[ $type ] ) && ! empty( self::$_espresso_notices[ $type ] ) ? self::$_espresso_notices[ $type ] : array();
+					self::$_espresso_notices[$type] = is_array(self::$_espresso_notices[$type]) && ! empty(self::$_espresso_notices[$type]) ? self::$_espresso_notices[$type] : array();
 					// merge stored notices with any newly created ones
-					self::$_espresso_notices[ $type ] = array_merge( self::$_espresso_notices[ $type ], $notice );
+					self::$_espresso_notices[$type] = array_merge(self::$_espresso_notices[$type], $notice);
 					$print_scripts = TRUE;
 				}
 			}
 			// now clear any stored notices
-			update_option( 'ee_notices', FALSE );
+			update_option('ee_notices', FALSE);
 		}
 
 		// check for success messages
-		if ( self::$_espresso_notices['success'] && ! empty(  self::$_espresso_notices['success'] )) {
+		if (self::$_espresso_notices['success'] && ! empty(self::$_espresso_notices['success'])) {
 			// combine messages
-			$success_messages .= implode( self::$_espresso_notices['success'], '<br />' );
+			$success_messages .= implode(self::$_espresso_notices['success'], '<br />');
 			$print_scripts = TRUE;
 		}
 
 		// check for attention messages
-		if ( self::$_espresso_notices['attention'] && ! empty(  self::$_espresso_notices['attention'] ) ) {
+		if (self::$_espresso_notices['attention'] && ! empty(self::$_espresso_notices['attention'])) {
 			// combine messages
-			$attention_messages .= implode( self::$_espresso_notices['attention'], '<br />' );
+			$attention_messages .= implode(self::$_espresso_notices['attention'], '<br />');
 			$print_scripts = TRUE;
 		}
 
 		// check for error messages
-		if ( self::$_espresso_notices['errors'] && ! empty(  self::$_espresso_notices['errors'] ) ) {
-			$error_messages .= count( self::$_espresso_notices['errors'] ) > 1 ? __( 'The following errors have occurred:<br />', 'event_espresso' ) : __( 'An error has occurred:<br />', 'event_espresso' );
+		if (self::$_espresso_notices['errors'] && ! empty(self::$_espresso_notices['errors'])) {
+			$error_messages .= count(self::$_espresso_notices['errors']) > 1 ? __('The following errors have occurred:<br />', 'event_espresso') : __('An error has occurred:<br />', 'event_espresso');
 			// combine messages
-			$error_messages .= implode( self::$_espresso_notices['errors'], '<br />' );
+			$error_messages .= implode(self::$_espresso_notices['errors'], '<br />');
 			$print_scripts = TRUE;
 		}
 
@@ -848,21 +848,21 @@ 
 				$css_id = is_admin() ? 'message' : 'espresso-notices-success';
 				$css_class = is_admin() ? 'updated fade' : 'success fade-away';
 				//showMessage( $success_messages );
-				$notices .= '<div id="' . $css_id . '" class="espresso-notices ' . $css_class . '" style="display:none;"><p>' . $success_messages . '</p>' . $close . '</div>';
+				$notices .= '<div id="'.$css_id.'" class="espresso-notices '.$css_class.'" style="display:none;"><p>'.$success_messages.'</p>'.$close.'</div>';
 			}
 
 			if ($attention_messages != '') {
 				$css_id = is_admin() ? 'message' : 'espresso-notices-attention';
 				$css_class = is_admin() ? 'updated ee-notices-attention' : 'attention fade-away';
 				//showMessage( $error_messages, TRUE );
-				$notices .= '<div id="' . $css_id . '" class="espresso-notices ' . $css_class . '" style="display:none;"><p>' . $attention_messages . '</p>' . $close . '</div>';
+				$notices .= '<div id="'.$css_id.'" class="espresso-notices '.$css_class.'" style="display:none;"><p>'.$attention_messages.'</p>'.$close.'</div>';
 			}
 
 			if ($error_messages != '') {
 				$css_id = is_admin() ? 'message' : 'espresso-notices-error';
 				$css_class = is_admin() ? 'error' : 'error fade-away';
 				//showMessage( $error_messages, TRUE );
-				$notices .= '<div id="' . $css_id . '" class="espresso-notices ' . $css_class . '" style="display:none;"><p>' . $error_messages . '</p>' . $close . '</div>';
+				$notices .= '<div id="'.$css_id.'" class="espresso-notices '.$css_class.'" style="display:none;"><p>'.$error_messages.'</p>'.$close.'</div>';
 			}
 
 			$notices .= '</div>';
@@ -875,7 +875,7 @@ 
 					'errors' => $error_messages
 			);
 
-			if ( $remove_empty ) {
+			if ($remove_empty) {
 				// remove empty notices
 				foreach ($notices as $type => $notice) {
 					if (empty($notice)) {
@@ -885,7 +885,7 @@ 
 			}
 		}
 
-		if ( $print_scripts ) {
+		if ($print_scripts) {
 			self::_print_scripts();
 		}
 
@@ -905,17 +905,17 @@ 
 	* 	@param bool $force_update allows one to enforce the reappearance of a persistent message.
 	* 	@return 		void
 	*/
-	public static function add_persistent_admin_notice( $pan_name = '', $pan_message, $force_update = FALSE ) {
-		if ( ! empty( $pan_name ) && ! empty( $pan_message )) {
-			$persistent_admin_notices = get_option( 'ee_pers_admin_notices', array() );
+	public static function add_persistent_admin_notice($pan_name = '', $pan_message, $force_update = FALSE) {
+		if ( ! empty($pan_name) && ! empty($pan_message)) {
+			$persistent_admin_notices = get_option('ee_pers_admin_notices', array());
 			//maybe initialize persistent_admin_notices
-			if ( empty( $persistent_admin_notices )) {
-				add_option( 'ee_pers_admin_notices', array(), '', 'no' );
+			if (empty($persistent_admin_notices)) {
+				add_option('ee_pers_admin_notices', array(), '', 'no');
 			}
-			$pan_name = sanitize_key( $pan_name );
-			if ( ! array_key_exists( $pan_name, $persistent_admin_notices ) || $force_update ) {
-				$persistent_admin_notices[ $pan_name ] = $pan_message;
-				update_option( 'ee_pers_admin_notices', $persistent_admin_notices );
+			$pan_name = sanitize_key($pan_name);
+			if ( ! array_key_exists($pan_name, $persistent_admin_notices) || $force_update) {
+				$persistent_admin_notices[$pan_name] = $pan_message;
+				update_option('ee_pers_admin_notices', $persistent_admin_notices);
 			}
 		}
 	}
@@ -931,34 +931,34 @@ 
 	 * @param bool          $return_immediately
 	 * @return        void
 	 */
-	public static function dismiss_persistent_admin_notice( $pan_name = '', $purge = FALSE, $return_immediately = FALSE ) {
-		$pan_name = EE_Registry::instance()->REQ->is_set( 'ee_nag_notice' ) ? EE_Registry::instance()->REQ->get( 'ee_nag_notice' ) : $pan_name;
-		if ( ! empty( $pan_name )) {
-			$persistent_admin_notices = get_option( 'ee_pers_admin_notices', array() );
+	public static function dismiss_persistent_admin_notice($pan_name = '', $purge = FALSE, $return_immediately = FALSE) {
+		$pan_name = EE_Registry::instance()->REQ->is_set('ee_nag_notice') ? EE_Registry::instance()->REQ->get('ee_nag_notice') : $pan_name;
+		if ( ! empty($pan_name)) {
+			$persistent_admin_notices = get_option('ee_pers_admin_notices', array());
 			// check if notice we wish to dismiss is actually in the $persistent_admin_notices array
-			if ( is_array( $persistent_admin_notices ) && isset( $persistent_admin_notices[ $pan_name ] )) {
+			if (is_array($persistent_admin_notices) && isset($persistent_admin_notices[$pan_name])) {
 				// completely delete nag notice, or just NULL message so that it can NOT be added again ?
-				if ( $purge ) {
-					unset( $persistent_admin_notices[ $pan_name ] );
+				if ($purge) {
+					unset($persistent_admin_notices[$pan_name]);
 				} else {
-					$persistent_admin_notices[ $pan_name ] = NULL;
+					$persistent_admin_notices[$pan_name] = NULL;
 				}
-				if ( update_option( 'ee_pers_admin_notices', $persistent_admin_notices ) === FALSE ) {
-					EE_Error::add_error( sprintf( __( 'The persistent admin notice for "%s" could not be deleted.', 'event_espresso' ), $pan_name ), __FILE__, __FUNCTION__, __LINE__ );
+				if (update_option('ee_pers_admin_notices', $persistent_admin_notices) === FALSE) {
+					EE_Error::add_error(sprintf(__('The persistent admin notice for "%s" could not be deleted.', 'event_espresso'), $pan_name), __FILE__, __FUNCTION__, __LINE__);
 				}
 			}
 		}
-		if ( $return_immediately ) {
+		if ($return_immediately) {
 			return;
-		} else if ( EE_Registry::instance()->REQ->ajax ) {
+		} else if (EE_Registry::instance()->REQ->ajax) {
 			// grab any notices and concatenate into string
-			echo wp_json_encode( array( 'errors' => implode( '<br />', EE_Error::get_notices( FALSE ))));
+			echo wp_json_encode(array('errors' => implode('<br />', EE_Error::get_notices(FALSE))));
 			exit();
 		} else {
 			// save errors to a transient to be displayed on next request (after redirect)
-			EE_Error::get_notices( FALSE, TRUE );
-			$return_url = EE_Registry::instance()->REQ->is_set( 'return_url' ) ? EE_Registry::instance()->REQ->get( 'return_url' ) : '';
-			wp_safe_redirect( urldecode( $return_url ));
+			EE_Error::get_notices(FALSE, TRUE);
+			$return_url = EE_Registry::instance()->REQ->is_set('return_url') ? EE_Registry::instance()->REQ->get('return_url') : '';
+			wp_safe_redirect(urldecode($return_url));
 		}
 	}
 
@@ -973,20 +973,20 @@ 
 	 * @param  string $return_url  URL to go back to after nag notice is dismissed
 	 * @return string
 	 */
-	public static function display_persistent_admin_notices( $pan_name = '', $pan_message = '', $return_url = '' ) {
-		if ( ! empty( $pan_name ) && ! empty( $pan_message )) {
+	public static function display_persistent_admin_notices($pan_name = '', $pan_message = '', $return_url = '') {
+		if ( ! empty($pan_name) && ! empty($pan_message)) {
 			$args = array(
 				'nag_notice' => $pan_name,
-				'return_url' => urlencode( $return_url ),
+				'return_url' => urlencode($return_url),
 				'ajax_url' => WP_AJAX_URL,
-				'unknown_error' => __( 'An unknown error has occurred on the server while attempting to dismiss this notice.', 'event_espresso' )
+				'unknown_error' => __('An unknown error has occurred on the server while attempting to dismiss this notice.', 'event_espresso')
 			);
-			wp_localize_script( 'espresso_core', 'ee_dismiss', $args );
+			wp_localize_script('espresso_core', 'ee_dismiss', $args);
 			return '
-			<div id="' . $pan_name . '" class="espresso-notices updated ee-nag-notice clearfix" style="border-left: 4px solid #fcb93c;">
-				<p>' . $pan_message . '</p>
-				<a class="dismiss-ee-nag-notice hide-if-no-js" style="float: right; cursor: pointer; text-decoration:none;" rel="' . $pan_name . '">
-					<span class="dashicons dashicons-dismiss" style="position:relative; top:-1px; margin-right:.25em;"></span>'.__( 'Dismiss', 'event_espresso' ) .'
+			<div id="' . $pan_name.'" class="espresso-notices updated ee-nag-notice clearfix" style="border-left: 4px solid #fcb93c;">
+				<p>' . $pan_message.'</p>
+				<a class="dismiss-ee-nag-notice hide-if-no-js" style="float: right; cursor: pointer; text-decoration:none;" rel="' . $pan_name.'">
+					<span class="dashicons dashicons-dismiss" style="position:relative; top:-1px; margin-right:.25em;"></span>'.__('Dismiss', 'event_espresso').'
 				</a>
 				<div style="clear:both;"></div>
 			</div>';
@@ -1003,24 +1003,24 @@ 
 	 * @param string $return_url
 	 * @return    array
 	 */
-	public static function get_persistent_admin_notices( $return_url = '' ) {
+	public static function get_persistent_admin_notices($return_url = '') {
 		$notices = '';
 		// check for persistent admin notices
 		//filter the list though so plugins can notify the admin in a different way if they want
 		$persistent_admin_notices = apply_filters(
 			'FHEE__EE_Error__get_persistent_admin_notices',
-			get_option( 'ee_pers_admin_notices', FALSE ),
+			get_option('ee_pers_admin_notices', FALSE),
 			'ee_pers_admin_notices',
 			$return_url
 		);
-		if ( $persistent_admin_notices ) {
+		if ($persistent_admin_notices) {
 			// load scripts
-			wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_register_script( 'ee_error_js', EE_GLOBAL_ASSETS_URL . 'scripts/EE_Error.js', array('espresso_core'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_enqueue_script( 'ee_error_js' );
+			wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_register_script('ee_error_js', EE_GLOBAL_ASSETS_URL.'scripts/EE_Error.js', array('espresso_core'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_enqueue_script('ee_error_js');
 			// and display notices
-			foreach( $persistent_admin_notices as $pan_name => $pan_message ) {
-				$notices .= self::display_persistent_admin_notices( $pan_name, $pan_message, $return_url );
+			foreach ($persistent_admin_notices as $pan_name => $pan_message) {
+				$notices .= self::display_persistent_admin_notices($pan_name, $pan_message, $return_url);
 			}
 		}
 		return $notices;
@@ -1035,26 +1035,26 @@ 
 	 * @param 	bool $force_print
 	 * @return 	void
 	 */
-	private static function _print_scripts( $force_print = FALSE ) {
-		if (( did_action( 'admin_enqueue_scripts' ) || did_action( 'wp_enqueue_scripts' )) && ! $force_print ) {
-			if ( wp_script_is( 'ee_error_js', 'enqueued' )) {
+	private static function _print_scripts($force_print = FALSE) {
+		if ((did_action('admin_enqueue_scripts') || did_action('wp_enqueue_scripts')) && ! $force_print) {
+			if (wp_script_is('ee_error_js', 'enqueued')) {
 				return;
-			} else if ( wp_script_is( 'ee_error_js', 'registered' )) {
-				add_filter( 'FHEE_load_css', '__return_true' );
-				add_filter( 'FHEE_load_js', '__return_true' );
-				wp_enqueue_script( 'ee_error_js' );
-				wp_localize_script( 'ee_error_js','ee_settings', array( 'wp_debug'=>WP_DEBUG ));
+			} else if (wp_script_is('ee_error_js', 'registered')) {
+				add_filter('FHEE_load_css', '__return_true');
+				add_filter('FHEE_load_js', '__return_true');
+				wp_enqueue_script('ee_error_js');
+				wp_localize_script('ee_error_js', 'ee_settings', array('wp_debug'=>WP_DEBUG));
 			}
 		} else {
 			return '
 <script>
 /* <![CDATA[ */
-var ee_settings = {"wp_debug":"' . WP_DEBUG . '"};
+var ee_settings = {"wp_debug":"' . WP_DEBUG.'"};
 /* ]]> */
 </script>
-<script src="' . includes_url() . 'js/jquery/jquery.js" type="text/javascript"></script>
-<script src="' . EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js' . '?ver=' . espresso_version() . '" type="text/javascript"></script>
-<script src="' . EE_GLOBAL_ASSETS_URL . 'scripts/EE_Error.js' . '?ver=' . espresso_version() . '" type="text/javascript"></script>
+<script src="' . includes_url().'js/jquery/jquery.js" type="text/javascript"></script>
+<script src="' . EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js'.'?ver='.espresso_version().'" type="text/javascript"></script>
+<script src="' . EE_GLOBAL_ASSETS_URL.'scripts/EE_Error.js'.'?ver='.espresso_version().'" type="text/javascript"></script>
 ';
 
 		}
@@ -1088,11 +1088,11 @@ 
 	*	@param string $line
 	*	@return string
 	*/
-	public static function generate_error_code ( $file = '', $func = '', $line = '' ) {
-		$file = explode( '.', basename( $file ));
-		$error_code = ! empty( $file[0] ) ? $file[0] : '';
-		$error_code .= ! empty( $func ) ? ' - ' . $func : '';
-		$error_code .= ! empty( $line ) ? ' - ' . $line : '';
+	public static function generate_error_code($file = '', $func = '', $line = '') {
+		$file = explode('.', basename($file));
+		$error_code = ! empty($file[0]) ? $file[0] : '';
+		$error_code .= ! empty($func) ? ' - '.$func : '';
+		$error_code .= ! empty($line) ? ' - '.$line : '';
 		return $error_code;
 	}
 
@@ -1108,36 +1108,36 @@ 
 	*	@ param object $ex
 	*	@ return void
 	*/
-	public function write_to_error_log ( $time = FALSE, $ex = FALSE, $clear = FALSE ) {
+	public function write_to_error_log($time = FALSE, $ex = FALSE, $clear = FALSE) {
 
-		if ( ! $ex ) {
+		if ( ! $ex) {
 			return;
 		}
 
-		if ( ! $time ) {
+		if ( ! $time) {
 			$time = time();
 		}
 
-		$exception_log = '----------------------------------------------------------------------------------------' . PHP_EOL;
-		$exception_log .= '[' . date( 'Y-m-d H:i:s', $time ) . ']  Exception Details' . PHP_EOL;
-		$exception_log .= 'Message: ' . $ex['msg'] . PHP_EOL;
-		$exception_log .= 'Code: '. $ex['code'] . PHP_EOL;
-		$exception_log .= 'File: '. $ex['file'] . PHP_EOL;
-		$exception_log .= 'Line No: ' . $ex['line'] . PHP_EOL;
-		$exception_log .= 'Stack trace: ' . PHP_EOL;
-		$exception_log .= $ex['string'] . PHP_EOL;
-		$exception_log .= '----------------------------------------------------------------------------------------' . PHP_EOL;
+		$exception_log = '----------------------------------------------------------------------------------------'.PHP_EOL;
+		$exception_log .= '['.date('Y-m-d H:i:s', $time).']  Exception Details'.PHP_EOL;
+		$exception_log .= 'Message: '.$ex['msg'].PHP_EOL;
+		$exception_log .= 'Code: '.$ex['code'].PHP_EOL;
+		$exception_log .= 'File: '.$ex['file'].PHP_EOL;
+		$exception_log .= 'Line No: '.$ex['line'].PHP_EOL;
+		$exception_log .= 'Stack trace: '.PHP_EOL;
+		$exception_log .= $ex['string'].PHP_EOL;
+		$exception_log .= '----------------------------------------------------------------------------------------'.PHP_EOL;
 
 		try {
-			EEH_File::ensure_file_exists_and_is_writable( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . self::$_exception_log_file );
-			EEH_File::add_htaccess_deny_from_all( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' );
-			if ( ! $clear ) {
+			EEH_File::ensure_file_exists_and_is_writable(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.self::$_exception_log_file);
+			EEH_File::add_htaccess_deny_from_all(EVENT_ESPRESSO_UPLOAD_DIR.'logs');
+			if ( ! $clear) {
 				//get existing log file and append new log info
-				$exception_log = EEH_File::get_file_contents( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . self::$_exception_log_file ) . $exception_log;
+				$exception_log = EEH_File::get_file_contents(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.self::$_exception_log_file).$exception_log;
 			}
-			EEH_File::write_to_file( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . self::$_exception_log_file, $exception_log );
-		} catch( EE_Error $e ){
-			EE_Error::add_error( sprintf( __(  'Event Espresso error logging could not be setup because: %s', 'event_espresso' ), $e->getMessage() ));
+			EEH_File::write_to_file(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.self::$_exception_log_file, $exception_log);
+		} catch (EE_Error $e) {
+			EE_Error::add_error(sprintf(__('Event Espresso error logging could not be setup because: %s', 'event_espresso'), $e->getMessage()));
 			return;
 		}
 
@@ -1173,8 +1173,8 @@ 
 		$applies_when = '',
 		$error_type = null
 	) {
-		if ( defined('WP_DEBUG') && WP_DEBUG ) {
-			EEH_Debug_Tools::instance()->doing_it_wrong( $function, $message, $version, $applies_when, $error_type );
+		if (defined('WP_DEBUG') && WP_DEBUG) {
+			EEH_Debug_Tools::instance()->doing_it_wrong($function, $message, $version, $applies_when, $error_type);
 		}
 	}
 
@@ -1208,13 +1208,13 @@ 
  */
 function espresso_error_enqueue_scripts() {
 	// js for error handling
-	wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, FALSE );
-	wp_register_script( 'ee_error_js', EE_GLOBAL_ASSETS_URL . 'scripts/EE_Error.js', array('espresso_core'), EVENT_ESPRESSO_VERSION, FALSE );
+	wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, FALSE);
+	wp_register_script('ee_error_js', EE_GLOBAL_ASSETS_URL.'scripts/EE_Error.js', array('espresso_core'), EVENT_ESPRESSO_VERSION, FALSE);
 }
-if ( is_admin() ) {
-	add_action( 'admin_enqueue_scripts', 'espresso_error_enqueue_scripts', 2 );
+if (is_admin()) {
+	add_action('admin_enqueue_scripts', 'espresso_error_enqueue_scripts', 2);
 } else {
-	add_action( 'wp_enqueue_scripts', 'espresso_error_enqueue_scripts', 2 );
+	add_action('wp_enqueue_scripts', 'espresso_error_enqueue_scripts', 2);
 }
 
 

core/EE_Log.core.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if (!defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 /**
  * Event Espresso

Spacing +56 added lines, -56 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
  *
  * Class EE_Log
@@ -62,7 +62,7 @@ 
 	 * @return EE_Log
 	 */
 	public static function instance() {
-		if ( ! self::$_instance instanceof EE_Log ) {
+		if ( ! self::$_instance instanceof EE_Log) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -74,11 +74,11 @@ 
 	 */
 	private function __construct() {
 
-		if ( ! EE_Registry::instance()->CFG->admin->use_full_logging && ! EE_Registry::instance()->CFG->admin->use_remote_logging ) {
+		if ( ! EE_Registry::instance()->CFG->admin->use_full_logging && ! EE_Registry::instance()->CFG->admin->use_remote_logging) {
 			return;
 		}
 
-		$this->_logs_folder = EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS;
+		$this->_logs_folder = EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS;
 		$this->_log_file = EE_Registry::instance()->CFG->admin->log_file_name();
 		$this->_log = '';
 		$this->_debug_file = EE_Registry::instance()->CFG->admin->debug_file_name();
@@ -86,15 +86,15 @@ 
 		$this->_remote_logging_url = EE_Registry::instance()->CFG->admin->remote_logging_url;
 		$this->_remote_log = '';
 
-		add_action( 'admin_init', array( $this, 'verify_filesystem' ), -10 );
-		add_action( 'AHEE_log', array( $this, 'log' ), 10, 4 );
-		if ( EE_Registry::instance()->CFG->admin->use_full_logging ) {
-			add_action( 'shutdown', array( $this, 'write_log' ), 9999 );
+		add_action('admin_init', array($this, 'verify_filesystem'), -10);
+		add_action('AHEE_log', array($this, 'log'), 10, 4);
+		if (EE_Registry::instance()->CFG->admin->use_full_logging) {
+			add_action('shutdown', array($this, 'write_log'), 9999);
 			// if WP_DEBUG
-			add_action( 'shutdown', array( $this, 'write_debug' ), 9999 );
+			add_action('shutdown', array($this, 'write_debug'), 9999);
 		}
-		if ( EE_Registry::instance()->CFG->admin->use_remote_logging ) {
-			add_action( 'shutdown', array( $this, 'send_log' ), 9999 );
+		if (EE_Registry::instance()->CFG->admin->use_remote_logging) {
+			add_action('shutdown', array($this, 'send_log'), 9999);
 		}
 
 	}
@@ -108,11 +108,11 @@ 
 	 */
 	public function verify_filesystem() {
 		try {
-			EEH_File::ensure_file_exists_and_is_writable( $this->_logs_folder . $this->_log_file );
-			EEH_File::ensure_file_exists_and_is_writable( $this->_logs_folder . $this->_debug_file );
-			EEH_File::add_htaccess_deny_from_all( $this->_logs_folder );
-		} catch( EE_Error $e ){
-			EE_Error::add_error( sprintf( __(  'Event Espresso logging could not be setup because: %s', 'event_espresso' ), ' &nbsp; &nbsp; ' . $e->getMessage() ), __FILE__, __FUNCTION__, __LINE__ );
+			EEH_File::ensure_file_exists_and_is_writable($this->_logs_folder.$this->_log_file);
+			EEH_File::ensure_file_exists_and_is_writable($this->_logs_folder.$this->_debug_file);
+			EEH_File::add_htaccess_deny_from_all($this->_logs_folder);
+		} catch (EE_Error $e) {
+			EE_Error::add_error(sprintf(__('Event Espresso logging could not be setup because: %s', 'event_espresso'), ' &nbsp; &nbsp; '.$e->getMessage()), __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
 	}
@@ -129,15 +129,15 @@ 
 	 * @param string $type
 	 * @return string
 	 */
-	private function _format_message( $file = '', $function = '', $message = '', $type = '' ) {
-		$msg = '----------------------------------------------------------------------------------------' . PHP_EOL;
-		$msg .= '[' . current_time( 'mysql' ) . '] ';
-		$msg .= ! empty( $file ) ? basename( $file ) : '';
-		$msg .= ! empty( $file ) && ! empty( $function ) ? ' -> ' : '';
-		$msg .= ! empty( $function ) ? $function . '()' : '';
+	private function _format_message($file = '', $function = '', $message = '', $type = '') {
+		$msg = '----------------------------------------------------------------------------------------'.PHP_EOL;
+		$msg .= '['.current_time('mysql').'] ';
+		$msg .= ! empty($file) ? basename($file) : '';
+		$msg .= ! empty($file) && ! empty($function) ? ' -> ' : '';
+		$msg .= ! empty($function) ? $function.'()' : '';
 		$msg .= PHP_EOL;
-		$type = ! empty( $type ) ? $type : 'log message';
-		$msg .= ! empty( $message ) ? "\t" . '[' . $type . '] ' . $message . PHP_EOL : '';
+		$type = ! empty($type) ? $type : 'log message';
+		$msg .= ! empty($message) ? "\t".'['.$type.'] '.$message.PHP_EOL : '';
 		return $msg;
 	}
 
@@ -152,8 +152,8 @@ 
 	 * @param string $message
 	 * @param string $type
 	 */
-	public function log( $file = '', $function = '', $message = '', $type = '' ) {
-		$this->_log .= $this->_format_message( $file, $function, $message, $type );
+	public function log($file = '', $function = '', $message = '', $type = '') {
+		$this->_log .= $this->_format_message($file, $function, $message, $type);
 	}
 
 
@@ -165,10 +165,10 @@ 
 	public function write_log() {
 		try {
 			//get existing log file and append new log info
-			$this->_log = EEH_File::get_file_contents( $this->_logs_folder . $this->_log_file ) . $this->_log;
-			EEH_File::write_to_file( $this->_logs_folder . $this->_log_file, $this->_log, 'Event Espresso Log' );
-		} catch( EE_Error $e ){
-			EE_Error::add_error( sprintf( __(  'Could not write to the Event Espresso log file because: %s', 'event_espresso' ), ' &nbsp; &nbsp; ' . $e->getMessage() ), __FILE__, __FUNCTION__, __LINE__ );
+			$this->_log = EEH_File::get_file_contents($this->_logs_folder.$this->_log_file).$this->_log;
+			EEH_File::write_to_file($this->_logs_folder.$this->_log_file, $this->_log, 'Event Espresso Log');
+		} catch (EE_Error $e) {
+			EE_Error::add_error(sprintf(__('Could not write to the Event Espresso log file because: %s', 'event_espresso'), ' &nbsp; &nbsp; '.$e->getMessage()), __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
 	}
@@ -181,31 +181,31 @@ 
 	 */
 	public function send_log() {
 
-		if ( empty( $this->_remote_logging_url )) {
+		if (empty($this->_remote_logging_url)) {
 			return;
 		}
 
-		$data = 'domain=' . $_SERVER['HTTP_HOST'];
-		$data .= '&ip=' . $_SERVER['SERVER_ADDR'];
-		$data .= '&server_type=' . $_SERVER['SERVER_SOFTWARE'];
-		$data .= '&time=' . time();
-		$data .= '&remote_log=' . $this->_log;
-		$data .= '&request_array=' . json_encode( $_REQUEST );
+		$data = 'domain='.$_SERVER['HTTP_HOST'];
+		$data .= '&ip='.$_SERVER['SERVER_ADDR'];
+		$data .= '&server_type='.$_SERVER['SERVER_SOFTWARE'];
+		$data .= '&time='.time();
+		$data .= '&remote_log='.$this->_log;
+		$data .= '&request_array='.json_encode($_REQUEST);
 		$data .= '&action=save';
 
-		if ( defined( 'EELOGGING_PASS' )) {
-			$data .= '&pass=' . EELOGGING_PASS;
+		if (defined('EELOGGING_PASS')) {
+			$data .= '&pass='.EELOGGING_PASS;
 		}
-		if ( defined( 'EELOGGING_KEY' )) {
-			$data .= '&key=' . EELOGGING_KEY;
+		if (defined('EELOGGING_KEY')) {
+			$data .= '&key='.EELOGGING_KEY;
 		}
 
-		$c = curl_init( $this->_remote_logging_url );
-		curl_setopt( $c, CURLOPT_POST, TRUE );
-		curl_setopt( $c, CURLOPT_POSTFIELDS, $data );
-		curl_setopt( $c, CURLOPT_RETURNTRANSFER, TRUE );
-		curl_exec( $c );
-		curl_close( $c );
+		$c = curl_init($this->_remote_logging_url);
+		curl_setopt($c, CURLOPT_POST, TRUE);
+		curl_setopt($c, CURLOPT_POSTFIELDS, $data);
+		curl_setopt($c, CURLOPT_RETURNTRANSFER, TRUE);
+		curl_exec($c);
+		curl_close($c);
 	}
 
 
@@ -216,18 +216,18 @@ 
 	 * previous entries are overwritten
 	 */
 	public function write_debug() {
-		if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+		if (defined('WP_DEBUG') && WP_DEBUG) {
 			$this->_debug_log = '';
-			foreach ( $_GET as $key => $value ) {
-				$this->_debug_log .= '$_GET["' . $key . '"] = "' . serialize($value) . '"' . PHP_EOL;
+			foreach ($_GET as $key => $value) {
+				$this->_debug_log .= '$_GET["'.$key.'"] = "'.serialize($value).'"'.PHP_EOL;
 			}
-			foreach ( $_POST as $key => $value ) {
-				$this->_debug_log .= '$_POST["' . $key . '"] = "' . serialize($value) . '"' . PHP_EOL;
+			foreach ($_POST as $key => $value) {
+				$this->_debug_log .= '$_POST["'.$key.'"] = "'.serialize($value).'"'.PHP_EOL;
 			}
 			try {
-				EEH_File::write_to_file( $this->_logs_folder . $this->_debug_file, $this->_debug_log, 'Event Espresso Debug Log' );
-			} catch( EE_Error $e ){
-				EE_Error::add_error( sprintf( __(  'Could not write to the Event Espresso debug log file because: %s', 'event_espresso' ), ' &nbsp; &nbsp; ' . $e->getMessage() ), __FILE__, __FUNCTION__, __LINE__ );
+				EEH_File::write_to_file($this->_logs_folder.$this->_debug_file, $this->_debug_log, 'Event Espresso Debug Log');
+			} catch (EE_Error $e) {
+				EE_Error::add_error(sprintf(__('Could not write to the Event Espresso debug log file because: %s', 'event_espresso'), ' &nbsp; &nbsp; '.$e->getMessage()), __FILE__, __FUNCTION__, __LINE__);
 				return;
 			}
 		}
@@ -239,7 +239,7 @@ 
 	 * __clone
 	 */
 	public function __clone() {
-		trigger_error( __( 'Clone is not allowed.', 'event_espresso' ), E_USER_ERROR );
+		trigger_error(__('Clone is not allowed.', 'event_espresso'), E_USER_ERROR);
 	}