eventespresso / event-espresso-core

core/libraries/messages/messenger/EE_Email_messenger.class.php

Spacing +55 added lines, -55 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -29,7 +29,7 @@ 
 /**
  * This sets up the email messenger for the EE_messages (notifications) subsystem in EE.
  */
-class EE_Email_messenger extends EE_messenger  {
+class EE_Email_messenger extends EE_messenger {
 
 	/**
 	 * The following are the properties that email requires for the message going out.
@@ -77,7 +77,7 @@ 
 	protected function _set_valid_shortcodes() {
 		//remember by leaving the other fields not set, those fields will inherit the valid shortcodes from the message type.
 		$this->_valid_shortcodes = array(
-			'to' => array('email','event_author', 'primary_registration_details', 'recipient_details'),
+			'to' => array('email', 'event_author', 'primary_registration_details', 'recipient_details'),
 			'from' => array('email', 'event_author', 'primary_registration_details', 'recipient_details')
 			);
 	}
@@ -111,7 +111,7 @@ 
 				'shortcodes' => array('organization', 'primary_registration_details', 'event_author', 'primary_registration_details', 'recipient_details')
 				),
 			'content' => array(
-				'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'primary_registration_details', 'primary_registration_list', 'event_author', 'recipient_details', 'recipient_list', 'transaction', 'messenger')
+				'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'primary_registration_details', 'primary_registration_list', 'event_author', 'recipient_details', 'recipient_list', 'transaction', 'messenger')
 				),
 			'attendee_list' => array(
 				'shortcodes' => array('attendee', 'event_list', 'ticket_list'),
@@ -122,7 +122,7 @@ 
 				'required' => array('[EVENT_LIST]')
 				),
 			'ticket_list' => array(
-				'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list','primary_registration_details', 'recipient_details'),
+				'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'primary_registration_details', 'recipient_details'),
 				'required' => array('[TICKET_LIST]')
 				),
 			'datetime_list' => array(
@@ -141,21 +141,21 @@ 
 	 *
 	 * @since 4.5.0
 	 */
-	public function do_secondary_messenger_hooks( $sending_messenger_name ) {
-		if ( $sending_messenger_name = 'html' ) {
-			add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( $this, 'add_email_css' ), 10, 8 );
+	public function do_secondary_messenger_hooks($sending_messenger_name) {
+		if ($sending_messenger_name = 'html') {
+			add_filter('FHEE__EE_Messages_Template_Pack__get_variation', array($this, 'add_email_css'), 10, 8);
 		}
 	}
 
 
 
 
-	public function add_email_css( $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack ) {
+	public function add_email_css($variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack) {
 		//prevent recursion on this callback.
-		remove_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( $this, 'add_email_css' ), 10 );
-		$variation = $this->get_variation( $template_pack, $message_type, $url, 'main', $variation, FALSE  );
+		remove_filter('FHEE__EE_Messages_Template_Pack__get_variation', array($this, 'add_email_css'), 10);
+		$variation = $this->get_variation($template_pack, $message_type, $url, 'main', $variation, FALSE);
 
-		add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( $this, 'add_email_css' ), 10, 8 );
+		add_filter('FHEE__EE_Messages_Template_Pack__get_variation', array($this, 'add_email_css'), 10, 8);
 		return $variation;
 	}
 
@@ -187,7 +187,7 @@ 
 				'required' => FALSE,
 				'validation' => FALSE,
 				'format' => '%s',
-				'value' => sprintf( __('Test email sent from %s', 'event_espresso'), get_bloginfo('name') ),
+				'value' => sprintf(__('Test email sent from %s', 'event_espresso'), get_bloginfo('name')),
 				'default'=> '',
 				'css_class' => ''
 				)
@@ -349,16 +349,16 @@ 
 	 * @return bool | WP_Error  true if message delivered, false if it didn't deliver OR bubble up any error object if present.
 	 */
 	protected function _send_message() {
-		$success =  wp_mail(
-			html_entity_decode( $this->_to, ENT_QUOTES, "UTF-8" ),
-			stripslashes( html_entity_decode( $this->_subject, ENT_QUOTES, "UTF-8" )),
+		$success = wp_mail(
+			html_entity_decode($this->_to, ENT_QUOTES, "UTF-8"),
+			stripslashes(html_entity_decode($this->_subject, ENT_QUOTES, "UTF-8")),
 			$this->_body(),
 			$this->_headers()
 		);
-		if ( ! $success ) {
+		if ( ! $success) {
 			EE_Error::add_error(
 				sprintf(
-					__( 'The email did not send successfully.%3$sThe WordPress wp_mail function is used for sending mails but does not give any useful information when an email fails to send.%3$sIt is possible the "to" address (%1$s) or "from" address (%2$s) is invalid.%3$s', 'event_espresso'),
+					__('The email did not send successfully.%3$sThe WordPress wp_mail function is used for sending mails but does not give any useful information when an email fails to send.%3$sIt is possible the "to" address (%1$s) or "from" address (%2$s) is invalid.%3$s', 'event_espresso'),
 					$this->_to,
 					$this->_from,
 					'<br />'
@@ -377,7 +377,7 @@ 
 	 * @return string html body of the message content and the related css.
 	 */
 	protected function _preview() {
-		return $this->_body( true );
+		return $this->_body(true);
 	}
 
 
@@ -392,18 +392,18 @@ 
 	 */
 	protected function _headers() {
 		$this->_ensure_has_from_email_address();
-		$from = stripslashes_deep( html_entity_decode($this->_from,  ENT_QUOTES,"UTF-8" ) );
+		$from = stripslashes_deep(html_entity_decode($this->_from, ENT_QUOTES, "UTF-8"));
 		$headers = array(
 			'MIME-Version: 1.0',
-			'From:' . $from,
-			'Reply-To:' . $from,
+			'From:'.$from,
+			'Reply-To:'.$from,
 			'Content-Type:text/html; charset=utf-8'
 			);
 
 		//but wait!  Header's for the from is NOT reliable because some plugins don't respect From: as set in the header.
-		add_filter( 'wp_mail_from',  array( $this, 'set_from_address' ), 100 );
-		add_filter( 'wp_mail_from_name', array( $this, 'set_from_name' ), 100 );
-		return apply_filters( 'FHEE__EE_Email_messenger___headers', $headers, $this->_incoming_message_type, $this );
+		add_filter('wp_mail_from', array($this, 'set_from_address'), 100);
+		add_filter('wp_mail_from_name', array($this, 'set_from_name'), 100);
+		return apply_filters('FHEE__EE_Email_messenger___headers', $headers, $this->_incoming_message_type, $this);
 	}
 
 
@@ -412,7 +412,7 @@ 
 	 * address for the from address to avoid problems with sending emails.
 	 */
 	protected function _ensure_has_from_email_address() {
-		if ( empty( $this->_from ) ) {
+		if (empty($this->_from)) {
 			$this->_from = get_bloginfo('admin_email');
 		}
 	}
@@ -429,21 +429,21 @@ 
 	 * @return array
 	 */
 	private function _parse_from() {
-		if ( strpos( $this->_from, '<' ) !== false ) {
-			$from_name = substr( $this->_from, 0, strpos( $this->_from, '<' ) - 1 );
-			$from_name = str_replace( '"', '', $from_name );
-			$from_name = trim( $from_name );
-
-			$from_email = substr( $this->_from, strpos( $this->_from, '<' ) + 1 );
-			$from_email = str_replace( '>', '', $from_email );
-			$from_email = trim( $from_email );
-		} elseif ( trim( $this->_from ) !== '' ) {
+		if (strpos($this->_from, '<') !== false) {
+			$from_name = substr($this->_from, 0, strpos($this->_from, '<') - 1);
+			$from_name = str_replace('"', '', $from_name);
+			$from_name = trim($from_name);
+
+			$from_email = substr($this->_from, strpos($this->_from, '<') + 1);
+			$from_email = str_replace('>', '', $from_email);
+			$from_email = trim($from_email);
+		} elseif (trim($this->_from) !== '') {
 			$from_name = '';
-			$from_email = trim( $this->_from );
+			$from_email = trim($this->_from);
 		} else {
 			$from_name = $from_email = '';
 		}
-		return array( $from_name, $from_email );
+		return array($from_name, $from_email);
 	}
 
 
@@ -456,10 +456,10 @@ 
 	 *
 	 * @param string $from_email What the original from_email is.
 	 */
-	public function set_from_address( $from_email ) {
+	public function set_from_address($from_email) {
 		$parsed_from = $this->_parse_from();
 		//includes fallback if the parsing failed.
-		$from_email = is_array( $parsed_from ) && ! empty( $parsed_from[1] ) ? $parsed_from[1] : get_bloginfo( 'admin_email' );
+		$from_email = is_array($parsed_from) && ! empty($parsed_from[1]) ? $parsed_from[1] : get_bloginfo('admin_email');
 		return $from_email;
 	}
 
@@ -473,16 +473,16 @@ 
 	 *
 	 * @param string $from_name The original from_name.
 	 */
-	public function set_from_name( $from_name ) {
+	public function set_from_name($from_name) {
 		$parsed_from = $this->_parse_from();
-		if ( is_array( $parsed_from) && ! empty( $parsed_from[0] ) ) {
-			$from_name =  $parsed_from[0];
+		if (is_array($parsed_from) && ! empty($parsed_from[0])) {
+			$from_name = $parsed_from[0];
 		}
 
 		//if from name is "WordPress" let's sub in the site name instead (more friendly!)
 		$from_name = $from_name == 'WordPress' ? get_bloginfo() : $from_name;
 
-		return stripslashes_deep( html_entity_decode($from_name,  ENT_QUOTES,"UTF-8" ) );
+		return stripslashes_deep(html_entity_decode($from_name, ENT_QUOTES, "UTF-8"));
 	}
 
 
@@ -493,14 +493,14 @@ 
 	 * @param bool $preview will determine whether this is preview template or not.
 	 * @return string formatted body for email.
 	 */
-	protected function _body( $preview = false ) {
+	protected function _body($preview = false) {
 		//setup template args!
 		$this->_template_args = array(
 			'subject' => $this->_subject,
 			'from' => $this->_from,
-			'main_body' => wpautop(stripslashes_deep( html_entity_decode($this->_content,  ENT_QUOTES,"UTF-8" ) ))
+			'main_body' => wpautop(stripslashes_deep(html_entity_decode($this->_content, ENT_QUOTES, "UTF-8")))
 			);
-		$body =  $this->_get_main_template( $preview );
+		$body = $this->_get_main_template($preview);
 
 		/**
 		 * This filter allows one to bypass the CSSToInlineStyles tool and leave the body untouched.
@@ -508,17 +508,17 @@ 
 		 * @type    bool    $preview    Indicates whether a preview is being generated or not.
 		 * @return  bool    true  indicates to use the inliner, false bypasses it.
 		 */
-		if ( apply_filters( 'FHEE__EE_Email_messenger__apply_CSSInliner ', true, $preview ) ) {
+		if (apply_filters('FHEE__EE_Email_messenger__apply_CSSInliner ', true, $preview)) {
 
 			//require CssToInlineStyles library and its dependencies via composer autoloader
-			require_once EE_THIRD_PARTY . 'cssinliner/vendor/autoload.php';
+			require_once EE_THIRD_PARTY.'cssinliner/vendor/autoload.php';
 
 			//now if this isn't a preview, let's setup the body so it has inline styles
-			if ( ! $preview || ( $preview && defined( 'DOING_AJAX' ) ) ) {
-				$style = file_get_contents( $this->get_variation( $this->_tmp_pack, $this->_incoming_message_type->name, FALSE, 'main', $this->_variation ), TRUE );
-				$CSS = new TijsVerkoyen\CssToInlineStyles\CssToInlineStyles( $body, $style );
-				$body = ltrim( $CSS->convert( true ), ">\n" ); //for some reason the library has a bracket and new line at the beginning.  This takes care of that.
-				$body = ltrim( $body, "<?" ); //see https://events.codebasehq.com/projects/event-espresso/tickets/8609
+			if ( ! $preview || ($preview && defined('DOING_AJAX'))) {
+				$style = file_get_contents($this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, FALSE, 'main', $this->_variation), TRUE);
+				$CSS = new TijsVerkoyen\CssToInlineStyles\CssToInlineStyles($body, $style);
+				$body = ltrim($CSS->convert(true), ">\n"); //for some reason the library has a bracket and new line at the beginning.  This takes care of that.
+				$body = ltrim($body, "<?"); //see https://events.codebasehq.com/projects/event-espresso/tickets/8609
 			}
 
 		}
@@ -537,8 +537,8 @@ 
 	public function get_existing_test_settings() {
 		$settings = parent::get_existing_test_settings();
 		//override subject if present because we always want it to be fresh.
-		if ( is_array( $settings ) && ! empty( $settings['subject'] ) ) {
-			$settings['subject'] = sprintf( __('Test email sent from %s', 'event_espresso'), get_bloginfo('name') );
+		if (is_array($settings) && ! empty($settings['subject'])) {
+			$settings['subject'] = sprintf(__('Test email sent from %s', 'event_espresso'), get_bloginfo('name'));
 		}
 		return $settings;
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -426,7 +426,7 @@
 	 *
 	 * @since 4.3.1
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	private function _parse_from() {
 		if ( strpos( $this->_from, '<' ) !== false ) {

Braces +2 added lines, -1 removed lines

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

core/libraries/messages/messenger/EE_Html_messenger.class.php

Spacing +62 added lines, -62 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'NO direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('NO direct script access allowed');
 }
 
 
@@ -43,16 +43,16 @@ 
 	public function __construct() {
 		//set properties
 		$this->name = 'html';
-		$this->description = __( 'This messenger outputs a message to a browser for display.', 'event_espresso' );
+		$this->description = __('This messenger outputs a message to a browser for display.', 'event_espresso');
 		$this->label = array(
-			'singular' => __( 'html', 'event_espresso' ),
-			'plural'   => __( 'html', 'event_espresso' ),
+			'singular' => __('html', 'event_espresso'),
+			'plural'   => __('html', 'event_espresso'),
 		);
 		$this->activate_on_install = true;
 		// add the "powered by EE" credit link to the HTML receipt and invoice
 		add_filter(
 			'FHEE__EE_Html_messenger___send_message__main_body',
-			array( $this, 'add_powered_by_credit_link_to_receipt_and_invoice' ),
+			array($this, 'add_powered_by_credit_link_to_receipt_and_invoice'),
 			10,
 			3
 		);
@@ -91,7 +91,7 @@ 
 	 * @see abstract declaration in EE_messenger for details.
 	 */
 	protected function _set_admin_pages() {
-		$this->admin_registered_pages = array( 'events_edit' => true );
+		$this->admin_registered_pages = array('events_edit' => true);
 	}
 
 
@@ -111,7 +111,7 @@ 
 	protected function _set_validator_config() {
 		$this->_validator_config = array(
 			'subject'                       => array(
-				'shortcodes' => array( 'organization', 'primary_registration_details', 'email', 'transaction' ),
+				'shortcodes' => array('organization', 'primary_registration_details', 'email', 'transaction'),
 			),
 			'content'                       => array(
 				'shortcodes' => array(
@@ -137,7 +137,7 @@ 
 					'primary_registration_list',
 					'event_author',
 				),
-				'required'   => array( '[EVENT_LIST]' ),
+				'required'   => array('[EVENT_LIST]'),
 			),
 			'ticket_list'                   => array(
 				'shortcodes' => array(
@@ -148,39 +148,39 @@ 
 					'line_item_list',
 					'venue',
 				),
-				'required'   => array( '[TICKET_LIST]' ),
+				'required'   => array('[TICKET_LIST]'),
 			),
 			'ticket_line_item_no_pms'       => array(
-				'shortcodes' => array( 'line_item', 'ticket' ),
-				'required'   => array( '[TICKET_LINE_ITEM_LIST]' ),
+				'shortcodes' => array('line_item', 'ticket'),
+				'required'   => array('[TICKET_LINE_ITEM_LIST]'),
 			),
 			'ticket_line_item_pms'          => array(
-				'shortcodes' => array( 'line_item', 'ticket', 'line_item_list' ),
-				'required'   => array( '[TICKET_LINE_ITEM_LIST]' ),
+				'shortcodes' => array('line_item', 'ticket', 'line_item_list'),
+				'required'   => array('[TICKET_LINE_ITEM_LIST]'),
 			),
 			'price_modifier_line_item_list' => array(
-				'shortcodes' => array( 'line_item' ),
-				'required'   => array( '[PRICE_MODIFIER_LINE_ITEM_LIST]' ),
+				'shortcodes' => array('line_item'),
+				'required'   => array('[PRICE_MODIFIER_LINE_ITEM_LIST]'),
 			),
 			'datetime_list'                 => array(
-				'shortcodes' => array( 'datetime' ),
-				'required'   => array( '[DATETIME_LIST]' ),
+				'shortcodes' => array('datetime'),
+				'required'   => array('[DATETIME_LIST]'),
 			),
 			'attendee_list'                 => array(
-				'shortcodes' => array( 'attendee' ),
-				'required'   => array( '[ATTENDEE_LIST]' ),
+				'shortcodes' => array('attendee'),
+				'required'   => array('[ATTENDEE_LIST]'),
 			),
 			'tax_line_item_list'            => array(
-				'shortcodes' => array( 'line_item' ),
-				'required'   => array( '[TAX_LINE_ITEM_LIST]' ),
+				'shortcodes' => array('line_item'),
+				'required'   => array('[TAX_LINE_ITEM_LIST]'),
 			),
 			'additional_line_item_list'     => array(
-				'shortcodes' => array( 'line_item' ),
-				'required'   => array( '[ADDITIONAL_LINE_ITEM_LIST]' ),
+				'shortcodes' => array('line_item'),
+				'required'   => array('[ADDITIONAL_LINE_ITEM_LIST]'),
 			),
 			'payment_list'                  => array(
-				'shortcodes' => array( 'payment' ),
-				'required'   => array( '[PAYMENT_LIST_*]' ),
+				'shortcodes' => array('payment'),
+				'required'   => array('[PAYMENT_LIST_*]'),
 			),
 		);
 	}
@@ -196,9 +196,9 @@ 
 	 * @param string $sending_messenger_name the name of the sending messenger so we only set the hooks needed.
 	 * @return void
 	 */
-	public function do_secondary_messenger_hooks( $sending_messenger_name ) {
-		if ( $sending_messenger_name = 'pdf' ) {
-			add_filter( 'EE_messenger__get_variation__variation', array( $this, 'add_html_css' ), 10, 8 );
+	public function do_secondary_messenger_hooks($sending_messenger_name) {
+		if ($sending_messenger_name = 'pdf') {
+			add_filter('EE_messenger__get_variation__variation', array($this, 'add_html_css'), 10, 8);
 		}
 	}
 
@@ -247,7 +247,7 @@ 
 	 */
 	public function enqueue_scripts_styles() {
 		parent::enqueue_scripts_styles();
-		do_action( 'AHEE__EE_Html_messenger__enqueue_scripts_styles' );
+		do_action('AHEE__EE_Html_messenger__enqueue_scripts_styles');
 	}
 
 
@@ -275,7 +275,7 @@ 
 		$this->_template_fields = array(
 			'subject' => array(
 				'input'      => 'text',
-				'label'      => __( 'Page Title', 'event_espresso' ),
+				'label'      => __('Page Title', 'event_espresso'),
 				'type'       => 'string',
 				'required'   => true,
 				'validation' => true,
@@ -288,7 +288,7 @@ 
 				'content' => array(
 					'main'                          => array(
 						'input'      => 'wp_editor',
-						'label'      => __( 'Main Content', 'event_espresso' ),
+						'label'      => __('Main Content', 'event_espresso'),
 						'type'       => 'string',
 						'required'   => true,
 						'validation' => true,
@@ -303,7 +303,7 @@ 
 						'validation'          => true,
 						'format'              => '%s',
 						'rows'                => '15',
-						'shortcodes_required' => array( '[EVENT_LIST]' ),
+						'shortcodes_required' => array('[EVENT_LIST]'),
 					),
 					'ticket_list'                   => array(
 						'input'               => 'textarea',
@@ -314,11 +314,11 @@ 
 						'format'              => '%s',
 						'css_class'           => 'large-text',
 						'rows'                => '10',
-						'shortcodes_required' => array( '[TICKET_LIST]' ),
+						'shortcodes_required' => array('[TICKET_LIST]'),
 					),
 					'ticket_line_item_no_pms'       => array(
 						'input'               => 'textarea',
-						'label'               => '[TICKET_LINE_ITEM_LIST] <br>' . __(
+						'label'               => '[TICKET_LINE_ITEM_LIST] <br>'.__(
 								'Ticket Line Item List with no Price Modifiers',
 								'event_espresso'
 							),
@@ -328,11 +328,11 @@ 
 						'format'              => '%s',
 						'css_class'           => 'large-text',
 						'rows'                => '5',
-						'shortcodes_required' => array( '[TICKET_LINE_ITEM_LIST]' ),
+						'shortcodes_required' => array('[TICKET_LINE_ITEM_LIST]'),
 					),
 					'ticket_line_item_pms'          => array(
 						'input'               => 'textarea',
-						'label'               => '[TICKET_LINE_ITEM_LIST] <br>' . __(
+						'label'               => '[TICKET_LINE_ITEM_LIST] <br>'.__(
 								'Ticket Line Item List with Price Modifiers',
 								'event_espresso'
 							),
@@ -342,7 +342,7 @@ 
 						'format'              => '%s',
 						'css_class'           => 'large-text',
 						'rows'                => '5',
-						'shortcodes_required' => array( '[TICKET_LINE_ITEM_LIST]' ),
+						'shortcodes_required' => array('[TICKET_LINE_ITEM_LIST]'),
 					),
 					'price_modifier_line_item_list' => array(
 						'input'               => 'textarea',
@@ -353,7 +353,7 @@ 
 						'format'              => '%s',
 						'css_class'           => 'large-text',
 						'rows'                => '5',
-						'shortcodes_required' => array( '[PRICE_MODIFIER_LINE_ITEM_LIST]' ),
+						'shortcodes_required' => array('[PRICE_MODIFIER_LINE_ITEM_LIST]'),
 					),
 					'datetime_list'                 => array(
 						'input'               => 'textarea',
@@ -364,7 +364,7 @@ 
 						'format'              => '%s',
 						'css_class'           => 'large-text',
 						'rows'                => '5',
-						'shortcodes_required' => array( '[DATETIME_LIST]' ),
+						'shortcodes_required' => array('[DATETIME_LIST]'),
 					),
 					'attendee_list'                 => array(
 						'input'               => 'textarea',
@@ -375,7 +375,7 @@ 
 						'format'              => '%s',
 						'css_class'           => 'large-text',
 						'rows'                => '5',
-						'shortcodes_required' => array( '[ATTENDEE_LIST]' ),
+						'shortcodes_required' => array('[ATTENDEE_LIST]'),
 					),
 					'tax_line_item_list'            => array(
 						'input'               => 'textarea',
@@ -386,7 +386,7 @@ 
 						'format'              => '%s',
 						'css_class'           => 'large-text',
 						'rows'                => '5',
-						'shortcodes_required' => array( '[TAX_LINE_ITEM_LIST]' ),
+						'shortcodes_required' => array('[TAX_LINE_ITEM_LIST]'),
 					),
 					'additional_line_item_list'     => array(
 						'input'               => 'textarea',
@@ -397,7 +397,7 @@ 
 						'format'              => '%s',
 						'css_class'           => 'large-text',
 						'rows'                => '5',
-						'shortcodes_required' => array( '[ADDITIONAL_LINE_ITEM_LIST]' ),
+						'shortcodes_required' => array('[ADDITIONAL_LINE_ITEM_LIST]'),
 					),
 					'payment_list'                  => array(
 						'input'               => 'textarea',
@@ -408,7 +408,7 @@ 
 						'format'              => '%s',
 						'css_class'           => 'large-text',
 						'rows'                => '5',
-						'shortcodes_required' => array( '[PAYMENT_LIST_*]' ),
+						'shortcodes_required' => array('[PAYMENT_LIST_*]'),
 					),
 				),
 			),
@@ -422,7 +422,7 @@ 
 	 * @since 4.5.0
 	 */
 	protected function _set_default_message_types() {
-		$this->_default_message_types = array( 'receipt', 'invoice' );
+		$this->_default_message_types = array('receipt', 'invoice');
 	}
 
 
@@ -432,7 +432,7 @@ 
 	 * @since 4.5.0
 	 */
 	protected function _set_valid_message_types() {
-		$this->_valid_message_types = array( 'receipt', 'invoice' );
+		$this->_valid_message_types = array('receipt', 'invoice');
 	}
 
 
@@ -445,7 +445,7 @@ 
 	 */
 	protected function _send_message() {
 		$this->_template_args = array(
-			'page_title' => html_entity_decode( stripslashes( $this->_subject ), ENT_QUOTES, "UTF-8" ),
+			'page_title' => html_entity_decode(stripslashes($this->_subject), ENT_QUOTES, "UTF-8"),
 			'base_css'   => $this->get_variation(
 				$this->_tmp_pack,
 				$this->_incoming_message_type->name,
@@ -483,7 +483,7 @@ 
 			),
 		);
 		$this->_deregister_wp_hooks();
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts_styles' ) );
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts_styles'));
 		echo $this->_get_main_template();
 		exit();
 	}
@@ -499,16 +499,16 @@ 
 	 * @return void
 	 */
 	protected function _deregister_wp_hooks() {
-		remove_all_actions( 'wp_head' );
-		remove_all_actions( 'wp_footer' );
-		remove_all_actions( 'wp_print_footer_scripts' );
-		remove_all_actions( 'wp_enqueue_scripts' );
+		remove_all_actions('wp_head');
+		remove_all_actions('wp_footer');
+		remove_all_actions('wp_print_footer_scripts');
+		remove_all_actions('wp_enqueue_scripts');
 		global $wp_scripts, $wp_styles;
 		$wp_scripts = $wp_styles = array();
 		//just add back in wp_enqueue_scripts and wp_print_footer_scripts cause that's all we want to load.
-		add_action( 'wp_footer', 'wp_print_footer_scripts' );
-		add_action( 'wp_print_footer_scripts', '_wp_footer_scripts' );
-		add_action( 'wp_head', 'wp_enqueue_scripts' );
+		add_action('wp_footer', 'wp_print_footer_scripts');
+		add_action('wp_print_footer_scripts', '_wp_footer_scripts');
+		add_action('wp_head', 'wp_enqueue_scripts');
 	}
 
 
@@ -520,11 +520,11 @@ 
 	 * @param bool $preview
 	 * @return string
 	 */
-	protected function _get_main_template( $preview = false ) {
-		$wrapper_template = $this->_tmp_pack->get_wrapper( $this->name, 'main' );
+	protected function _get_main_template($preview = false) {
+		$wrapper_template = $this->_tmp_pack->get_wrapper($this->name, 'main');
 		//include message type as a template arg
 		$this->_template_args['message_type'] = $this->_incoming_message_type;
-		return EEH_Template::display_template( $wrapper_template, $this->_template_args, true );
+		return EEH_Template::display_template($wrapper_template, $this->_template_args, true);
 	}
 
 
@@ -557,15 +557,15 @@ 
 		EE_message_type $incoming_message_type
 	) {
 		if (
-			( $incoming_message_type->name === 'invoice' || $incoming_message_type->name === 'receipt' )
-			&& apply_filters( 'FHEE_EE_Html_messenger__add_powered_by_credit_link_to_receipt_and_invoice', true )
+			($incoming_message_type->name === 'invoice' || $incoming_message_type->name === 'receipt')
+			&& apply_filters('FHEE_EE_Html_messenger__add_powered_by_credit_link_to_receipt_and_invoice', true)
 		) {
 			$content .= \EEH_Template::powered_by_event_espresso(
 				'aln-cntr',
 				'',
-				array( 'utm_content' => 'messages_system' )
+				array('utm_content' => 'messages_system')
 			)
-			. EEH_HTML::div( EEH_HTML::p('&nbsp;') );
+			. EEH_HTML::div(EEH_HTML::p('&nbsp;'));
 		}
 		return $content;
 	}

modules/ticket_selector/TicketSelectorIframeEmbedButton.php

Indentation +21 added lines, -21 removed lines

@@ -17,27 +17,27 @@
 class TicketSelectorIframeEmbedButton extends IframeEmbedButton
 {
 
-    /**
-     * TicketSelectorIframeEmbedButton constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct(
-            esc_html__( 'Ticket Selector', 'event_espresso' ),
-            'ticket_selector'
-        );
-    }
-
-
-
-    /**
-     * Adds an iframe embed code button to the Event editor.
-     */
-    public function addEventEditorIframeEmbedButton()
-    {
-        // add button for iframe code to event editor.
-        $this->addEventEditorIframeEmbedButtonFilter();
-    }
+	/**
+	 * TicketSelectorIframeEmbedButton constructor.
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			esc_html__( 'Ticket Selector', 'event_espresso' ),
+			'ticket_selector'
+		);
+	}
+
+
+
+	/**
+	 * Adds an iframe embed code button to the Event editor.
+	 */
+	public function addEventEditorIframeEmbedButton()
+	{
+		// add button for iframe code to event editor.
+		$this->addEventEditorIframeEmbedButtonFilter();
+	}
 
 
 

Spacing +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
 
 use EventEspresso\core\libraries\iframe_display\IframeEmbedButton;
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 
 
@@ -23,7 +23,7 @@ 
     public function __construct()
     {
         parent::__construct(
-            esc_html__( 'Ticket Selector', 'event_espresso' ),
+            esc_html__('Ticket Selector', 'event_espresso'),
             'ticket_selector'
         );
     }

core/Factory.php

Spacing +11 added lines, -11 removed lines

@@ -3,8 +3,8 @@ 
 
 use EventEspresso\core\libraries\iframe_display\Iframe;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -26,10 +26,10 @@ 
 	 * @return mixed|null
 	 * @throws \EE_Error
 	 */
-	public static function create( $class_name, $arguments = array() ) {
-		if ( empty( $class_name ) ) {
+	public static function create($class_name, $arguments = array()) {
+		if (empty($class_name)) {
 			throw new \EE_Error(
-				__( 'You must provide a class name in order to instantiate it.', 'event_espresso' )
+				__('You must provide a class name in order to instantiate it.', 'event_espresso')
 			);
 		}
 		// if ( ! class_exists( $class_name ) ) {
@@ -41,20 +41,20 @@ 
 		// 	);
 		// }
 		$object = null;
-		switch ( $class_name ) {
+		switch ($class_name) {
 
 			case 'EE_Request' :
-				$object = new \EE_Request( $_GET, $_POST, $_COOKIE );
+				$object = new \EE_Request($_GET, $_POST, $_COOKIE);
 				break;
 
 			case 'Iframe' :
-				$title = isset( $arguments['title'] ) ? $arguments['title'] : null;
-				$content = isset( $arguments['content'] ) ? $arguments['content'] : null;
-				$object = new Iframe( $title, $content );
+				$title = isset($arguments['title']) ? $arguments['title'] : null;
+				$content = isset($arguments['content']) ? $arguments['content'] : null;
+				$object = new Iframe($title, $content);
 				break;
 
 			default :
-				$object = new $class_name( $arguments );
+				$object = new $class_name($arguments);
 
 		}
 

caffeinated/core/libraries/messages/message_type/newsletter/EE_Newsletter_message_type.class.php

Spacing +28 added lines, -28 removed lines

@@ -22,10 +22,10 @@ 
 
 	public function __construct() {
 		$this->name = 'newsletter';
-		$this->description = __( 'Batch message type messages are triggered manually by the admin for sending notifications to a selected group of recipients. This should only be used for more general notification type messages that contain information specific for the recipients. For "newsletter" type messages we recommend using an email list service like MailChimp, because sending non-related mail-outs to contacts increases the risk of your site domain getting added to spam lists, which will prevent messages getting to users.', 'event_espresso' );
+		$this->description = __('Batch message type messages are triggered manually by the admin for sending notifications to a selected group of recipients. This should only be used for more general notification type messages that contain information specific for the recipients. For "newsletter" type messages we recommend using an email list service like MailChimp, because sending non-related mail-outs to contacts increases the risk of your site domain getting added to spam lists, which will prevent messages getting to users.', 'event_espresso');
 		$this->label = array(
-			'singular' => __( 'batch', 'event_espresso' ),
-			'plural' => __( 'batches', 'event_espresso' )
+			'singular' => __('batch', 'event_espresso'),
+			'plural' => __('batches', 'event_espresso')
 			);
 		$this->_master_templates = array(
 			'email' => 'registration',
@@ -49,9 +49,9 @@ 
 
 
 
-	protected function _get_data_for_context( $context, EE_Registration $registration, $id ) {
+	protected function _get_data_for_context($context, EE_Registration $registration, $id) {
 		//newsletter message type data handler is 'Registrations' and it expects an array of EE_Registration objects.
-		return array( $registration );
+		return array($registration);
 	}
 
 
@@ -64,15 +64,15 @@ 
 
 	protected function _set_contexts() {
 		$this->_context_label = array(
-			'label' => __( 'recipient', 'event_espresso' ),
-			'plural' => __( 'recipients', 'event_espresso' ),
-			'description' => __( 'Recipient\'s are who will receive the message.', 'event_espresso' )
+			'label' => __('recipient', 'event_espresso'),
+			'plural' => __('recipients', 'event_espresso'),
+			'description' => __('Recipient\'s are who will receive the message.', 'event_espresso')
 			);
 
 		$this->_contexts = array(
 			'attendee' => array(
-				'label' => __( 'Registrant', 'event_espresso' ),
-				'description' => __( 'This template goes to selected registrants.', 'event_espresso' )
+				'label' => __('Registrant', 'event_espresso'),
+				'description' => __('This template goes to selected registrants.', 'event_espresso')
 				)
 			);
 	}
@@ -98,13 +98,13 @@ 
 			'newsletter',
 			);
 
-		foreach ( $this->_valid_shortcodes as $context => $shortcodes ) {
-			foreach ( $shortcodes as $key => $shortcode ) {
-				if ( ! in_array( $shortcode, $included_shortcodes ) ) {
-					unset( $this->_valid_shortcodes[ $context ][ $key ] );
+		foreach ($this->_valid_shortcodes as $context => $shortcodes) {
+			foreach ($shortcodes as $key => $shortcode) {
+				if ( ! in_array($shortcode, $included_shortcodes)) {
+					unset($this->_valid_shortcodes[$context][$key]);
 				}
 			}
-			$this->_valid_shortcodes[ $context ][] = 'newsletter';
+			$this->_valid_shortcodes[$context][] = 'newsletter';
 		}
 
 	}
@@ -118,44 +118,44 @@ 
 		$addressee = array();
 
 		//looping through registrations
-		foreach ( $this->_data->registrations as $reg_id => $details ) {
+		foreach ($this->_data->registrations as $reg_id => $details) {
 			//set $attendee array to blank on each loop
 			$aee = array();
 
 			//need to get the attendee from this registration.
-			$attendee = isset( $details['att_obj'] ) && $details['att_obj'] instanceof EE_Attendee
+			$attendee = isset($details['att_obj']) && $details['att_obj'] instanceof EE_Attendee
 				? $details['att_obj']
 				: null;
 
-			if ( ! $attendee instanceof EE_Attendee ) {
+			if ( ! $attendee instanceof EE_Attendee) {
 				continue;
 			}
 
 			//set $aee from attendee object
 			$aee['att_obj'] = $attendee;
-			$aee['reg_objs'] = isset( $this->_data->attendees[ $attendee->ID() ]['reg_objs'] )
-				? $this->_data->attendees[ $attendee->ID() ]['reg_objs']
+			$aee['reg_objs'] = isset($this->_data->attendees[$attendee->ID()]['reg_objs'])
+				? $this->_data->attendees[$attendee->ID()]['reg_objs']
 				: array();
 			$aee['attendee_email'] = $attendee->email();
-			$aee['tkt_objs'] = isset( $this->_data->attendees[ $attendee->ID() ]['tkt_objs'] )
-				? $this->_data->attendees[ $attendee->ID() ]['tkt_objs']
+			$aee['tkt_objs'] = isset($this->_data->attendees[$attendee->ID()]['tkt_objs'])
+				? $this->_data->attendees[$attendee->ID()]['tkt_objs']
 				: array();
 
-			if ( isset( $this->_data->attendees[ $attendee->ID() ]['evt_objs'] ) ) {
-				$aee['evt_objs'] = $this->_data->attendees[ $attendee->ID() ]['evt_objs'];
-				$aee['events'] = $this->_data->attendees[ $attendee->ID() ]['evt_objs'];
+			if (isset($this->_data->attendees[$attendee->ID()]['evt_objs'])) {
+				$aee['evt_objs'] = $this->_data->attendees[$attendee->ID()]['evt_objs'];
+				$aee['events'] = $this->_data->attendees[$attendee->ID()]['evt_objs'];
 			} else {
 				$aee['evt_objs'] = $aee['events'] = array();
 			}
 
-			$aee['reg_obj'] = isset( $details['reg_obj'] )
+			$aee['reg_obj'] = isset($details['reg_obj'])
 				? $details['reg_obj']
 				: null;
 			$aee['attendees'] = $this->_data->attendees;
 
 			//merge in the primary attendee data
-			$aee = array_merge( $this->_default_addressee_data, $aee );
-			$addressee[] = new EE_Messages_Addressee( $aee );
+			$aee = array_merge($this->_default_addressee_data, $aee);
+			$addressee[] = new EE_Messages_Addressee($aee);
 		}
 		return $addressee;
 	}

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  * @subpackage helpers
  * @since           4.3.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * The message type for newsletter type of messages.

payment_methods/Paypal_Standard/EEG_Paypal_Standard.gateway.php

Indentation +30 added lines, -30 removed lines

@@ -274,26 +274,26 @@ 
 		if ( ! $this->validate_ipn( $update_info, $payment ) ) {
 			return $payment;
 		}
-        // kill request here if this is a refund, we don't support them yet (we'd need to adjust the transaction,
-        // registrations, ticket counts, etc)
-        if (
-            (
-                $update_info[ 'payment_status' ] === 'Refunded'
-                || $update_info[ 'payment_status' ] === 'Partially_Refunded'
-            )
-            && apply_filters( 'FHEE__EEG_Paypal_Standard__handle_payment_update__kill_refund_request', true )
-        ) {
-            throw new EventEspresso\core\exceptions\IpnException(
-                sprintf(
-                    esc_html__( 'Event Espresso does not yet support %1$s IPNs from PayPal', 'event_espresso'),
-                    $update_info['payment_status']
-                ),
-                EventEspresso\core\exceptions\IpnException::UNSUPPORTED,
-                null,
-                $payment,
-                $update_info
-            );
-        }
+		// kill request here if this is a refund, we don't support them yet (we'd need to adjust the transaction,
+		// registrations, ticket counts, etc)
+		if (
+			(
+				$update_info[ 'payment_status' ] === 'Refunded'
+				|| $update_info[ 'payment_status' ] === 'Partially_Refunded'
+			)
+			&& apply_filters( 'FHEE__EEG_Paypal_Standard__handle_payment_update__kill_refund_request', true )
+		) {
+			throw new EventEspresso\core\exceptions\IpnException(
+				sprintf(
+					esc_html__( 'Event Espresso does not yet support %1$s IPNs from PayPal', 'event_espresso'),
+					$update_info['payment_status']
+				),
+				EventEspresso\core\exceptions\IpnException::UNSUPPORTED,
+				null,
+				$payment,
+				$update_info
+			);
+		}
 		//ok, well let's process this payment then!
 		switch ( $update_info[ 'payment_status' ] ) {
 
@@ -541,17 +541,17 @@ 
 
 		//might paypal have changed the taxes?
 		if( $this->_paypal_taxes && $payment_was_itemized ) {
-            // note that we're doing this BEFORE adding shipping;
+			// note that we're doing this BEFORE adding shipping;
 			// we actually want PayPal's shipping to remain non-taxable
-            $this->_line_item->set_line_items_taxable( $transaction_total_line_item, true, 'paypal_shipping' );
-            $this->_line_item->set_total_tax_to(
-	            $transaction_total_line_item,
-                (float)$update_info['tax'],
-                esc_html__( 'Taxes', 'event_espresso' ),
-                esc_html__( 'Calculated by Paypal', 'event_espresso' ),
-                'paypal_tax'
-            );
-            $grand_total_needs_resaving = TRUE;
+			$this->_line_item->set_line_items_taxable( $transaction_total_line_item, true, 'paypal_shipping' );
+			$this->_line_item->set_total_tax_to(
+				$transaction_total_line_item,
+				(float)$update_info['tax'],
+				esc_html__( 'Taxes', 'event_espresso' ),
+				esc_html__( 'Calculated by Paypal', 'event_espresso' ),
+				'paypal_tax'
+			);
+			$grand_total_needs_resaving = TRUE;
 		}
 
 		$shipping_amount = (float)$update_info[ 'mc_shipping' ];

Spacing +122 added lines, -122 removed lines

@@ -70,7 +70,7 @@ 
 	 * @return EEG_Paypal_Standard
 	 */
 	public function __construct() {
-		$this->set_uses_separate_IPN_request( true ) ;
+		$this->set_uses_separate_IPN_request(true);
 		parent::__construct();
 	}
 
@@ -80,7 +80,7 @@ 
 	 * Also sets the gateway url class variable based on whether debug mode is enabled or not
 	 * @param array $settings_array
 	 */
-	public function set_settings($settings_array){
+	public function set_settings($settings_array) {
 		parent::set_settings($settings_array);
 		$this->_gateway_url = $this->_debug_mode
 			? 'https://www.sandbox.paypal.com/cgi-bin/webscr'
@@ -114,42 +114,42 @@ 
 
 		$total_discounts_to_cart_total = $transaction->paid();
 		//only itemize the order if we're paying for the rest of the order's amount
-		if( EEH_Money::compare_floats( $payment->amount(), $transaction->total(), '==' ) ) {
-			$payment->update_extra_meta( EEG_Paypal_Standard::itemized_payment_option_name, true );
+		if (EEH_Money::compare_floats($payment->amount(), $transaction->total(), '==')) {
+			$payment->update_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, true);
 			//this payment is for the remaining transaction amount,
 			//keep track of exactly how much the itemized order amount equals
 			$itemized_sum = 0;
 			$shipping_previously_added = 0;
 			//so let's show all the line items
-			foreach($total_line_item->get_items() as $line_item){
-				if ( $line_item instanceof EE_Line_Item ) {
+			foreach ($total_line_item->get_items() as $line_item) {
+				if ($line_item instanceof EE_Line_Item) {
 					//it's some kind of discount
-					if( $line_item->total() < 0 ) {
-						$total_discounts_to_cart_total += abs( $line_item->total() );
+					if ($line_item->total() < 0) {
+						$total_discounts_to_cart_total += abs($line_item->total());
 						$itemized_sum += $line_item->total();
 						continue;
 					}
 					//dont include shipping again.
-					if( strpos( $line_item->code(), 'paypal_shipping_') === 0 ) {
+					if (strpos($line_item->code(), 'paypal_shipping_') === 0) {
 						$shipping_previously_added = $line_item->total();
 						continue;
 					}
-					$redirect_args[ 'item_name_' . $item_num ] = substr(
-						$this->_format_line_item_name( $line_item, $payment ),
+					$redirect_args['item_name_'.$item_num] = substr(
+						$this->_format_line_item_name($line_item, $payment),
 						0, 127
 					);
-					$redirect_args[ 'amount_' . $item_num ] = $line_item->unit_price();
-					$redirect_args[ 'quantity_' . $item_num ] = $line_item->quantity();
+					$redirect_args['amount_'.$item_num] = $line_item->unit_price();
+					$redirect_args['quantity_'.$item_num] = $line_item->quantity();
 					//if we're not letting PayPal calculate shipping, tell them its 0
-					if ( ! $this->_paypal_shipping ) {
-						$redirect_args[ 'shipping_' . $item_num ] = '0';
-						$redirect_args[ 'shipping2_' . $item_num ] = '0';
+					if ( ! $this->_paypal_shipping) {
+						$redirect_args['shipping_'.$item_num] = '0';
+						$redirect_args['shipping2_'.$item_num] = '0';
 					}
 					$item_num++;
 					$itemized_sum += $line_item->total();
 				}
 			}
-			$taxes_li = $this->_line_item->get_taxes_subtotal( $total_line_item );
+			$taxes_li = $this->_line_item->get_taxes_subtotal($total_line_item);
 			//ideally itemized sum equals the transaction total. but if not (which is weird)
 			//and the itemized sum is LESS than the transaction total
 			//add another line item
@@ -159,47 +159,47 @@ 
 				$transaction->total() - $itemized_sum - $taxes_li->total() - $shipping_previously_added,
 				2
 			);
-			if( $itemized_sum_diff_from_txn_total < 0 ) {
+			if ($itemized_sum_diff_from_txn_total < 0) {
 				//itemized sum is too big
-				$total_discounts_to_cart_total += abs( $itemized_sum_diff_from_txn_total );
-			} elseif( $itemized_sum_diff_from_txn_total > 0 ) {
-				$redirect_args[ 'item_name_' . $item_num ] = substr(
-						__( 'Other charges', 'event_espresso' ), 0, 127 );
-				$redirect_args[ 'amount_' . $item_num ] = $this->format_currency( $itemized_sum_diff_from_txn_total );
-				$redirect_args[ 'quantity_' . $item_num ] = 1;
+				$total_discounts_to_cart_total += abs($itemized_sum_diff_from_txn_total);
+			} elseif ($itemized_sum_diff_from_txn_total > 0) {
+				$redirect_args['item_name_'.$item_num] = substr(
+						__('Other charges', 'event_espresso'), 0, 127 );
+				$redirect_args['amount_'.$item_num] = $this->format_currency($itemized_sum_diff_from_txn_total);
+				$redirect_args['quantity_'.$item_num] = 1;
 				$item_num++;
 			}
-			if( $total_discounts_to_cart_total > 0 ) {
-				$redirect_args[ 'discount_amount_cart' ] = $this->format_currency( $total_discounts_to_cart_total );
+			if ($total_discounts_to_cart_total > 0) {
+				$redirect_args['discount_amount_cart'] = $this->format_currency($total_discounts_to_cart_total);
 			}
 			//add our taxes to the order if we're NOT using PayPal's
-			if( ! $this->_paypal_taxes ){
+			if ( ! $this->_paypal_taxes) {
 				$redirect_args['tax_cart'] = $total_line_item->get_total_tax();
 			}
 		} else {
-			$payment->update_extra_meta( EEG_Paypal_Standard::itemized_payment_option_name, false );
+			$payment->update_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, false);
 			//partial payment that's not for the remaining amount, so we can't send an itemized list
-			$redirect_args['item_name_' . $item_num] = substr(
-				$this->_format_partial_payment_line_item_name( $payment ),
+			$redirect_args['item_name_'.$item_num] = substr(
+				$this->_format_partial_payment_line_item_name($payment),
 				0, 127
 			);
-			$redirect_args['amount_' . $item_num] = $payment->amount();
-			$redirect_args['shipping_' . $item_num ] = '0';
-			$redirect_args['shipping2_' . $item_num ] = '0';
+			$redirect_args['amount_'.$item_num] = $payment->amount();
+			$redirect_args['shipping_'.$item_num] = '0';
+			$redirect_args['shipping2_'.$item_num] = '0';
 			$redirect_args['tax_cart'] = '0';
 			$item_num++;
 		}
 
-		if($this->_debug_mode){
-			$redirect_args['item_name_' . $item_num] = 'DEBUG INFO (this item only added in sandbox mode';
-			$redirect_args['amount_' . $item_num] = 0;
+		if ($this->_debug_mode) {
+			$redirect_args['item_name_'.$item_num] = 'DEBUG INFO (this item only added in sandbox mode';
+			$redirect_args['amount_'.$item_num] = 0;
 			$redirect_args['on0_'.$item_num] = 'NOTIFY URL';
-			$redirect_args['os0_' . $item_num] = $notify_url;
+			$redirect_args['os0_'.$item_num] = $notify_url;
 			$redirect_args['on1_'.$item_num] = 'RETURN URL';
-			$redirect_args['os1_' . $item_num] = $return_url;
+			$redirect_args['os1_'.$item_num] = $return_url;
 //			$redirect_args['option_index_' . $item_num] = 1; // <-- dunno if this is needed ?
-			$redirect_args['shipping_' . $item_num ] = '0';
-			$redirect_args['shipping2_' . $item_num ] = '0';
+			$redirect_args['shipping_'.$item_num] = '0';
+			$redirect_args['shipping2_'.$item_num] = '0';
 		}
 
 		$redirect_args['business'] = $this->_paypal_id;
@@ -209,14 +209,14 @@ 
 		$redirect_args['cmd'] = '_cart';
 		$redirect_args['upload'] = 1;
 		$redirect_args['currency_code'] = $payment->currency_code();
-		$redirect_args['rm'] = 2;//makes the user return with method=POST
-		if($this->_image_url){
+		$redirect_args['rm'] = 2; //makes the user return with method=POST
+		if ($this->_image_url) {
 			$redirect_args['image_url'] = $this->_image_url;
 		}
 		$redirect_args['no_shipping'] = $this->_shipping_details;
-		$redirect_args['bn'] = 'EventEspresso_SP';//EE will blow up if you change this
+		$redirect_args['bn'] = 'EventEspresso_SP'; //EE will blow up if you change this
 
-		$redirect_args = apply_filters( "FHEE__EEG_Paypal_Standard__set_redirection_info__arguments", $redirect_args, $this );
+		$redirect_args = apply_filters("FHEE__EEG_Paypal_Standard__set_redirection_info__arguments", $redirect_args, $this);
 
 		$payment->set_redirect_url($this->_gateway_url);
 		$payment->set_redirect_args($redirect_args);
@@ -224,7 +224,7 @@ 
 		$this->log(
 			array(
 				'message'     => sprintf(
-					__( 'PayPal payment request initiated.', 'event_espresso' )
+					__('PayPal payment request initiated.', 'event_espresso')
 				),
 				'transaction' => $transaction->model_field_array(),
 			),
@@ -244,14 +244,14 @@ 
 	 * @return \EEI_Payment updated
 	 * @throws \EE_Error, IpnException
 	 */
-	public function handle_payment_update( $update_info, $transaction ){
+	public function handle_payment_update($update_info, $transaction) {
 		// verify there's payment data that's been sent
-		if ( empty( $update_info[ 'payment_status' ] ) || empty( $update_info[ 'txn_id' ] ) ) {
+		if (empty($update_info['payment_status']) || empty($update_info['txn_id'])) {
 			// log the results
 			$this->log(
 				array(
 					'message' => sprintf(
-						__( 'PayPal IPN response is missing critical payment data. This may indicate a PDT request and require your PayPal account settings to be corrected.', 'event_espresso' )
+						__('PayPal IPN response is missing critical payment data. This may indicate a PDT request and require your PayPal account settings to be corrected.', 'event_espresso')
 					),
 					'update_info' => $update_info,
 				),
@@ -259,33 +259,33 @@ 
 			);
 			// waaaait... is this a PDT request? (see https://developer.paypal.com/docs/classic/products/payment-data-transfer/)
 			// indicated by the "tx" argument? If so, we don't need it. We'll just use the IPN data when it comes
-			if ( isset( $update_info[ 'tx' ] ) ) {
+			if (isset($update_info['tx'])) {
 				return $transaction->last_payment();
 			} else {
 				return null;
 			}
 		}
-		$payment = $this->_pay_model->get_payment_by_txn_id_chq_nmbr( $update_info[ 'txn_id' ] );
-		if ( ! $payment instanceof EEI_Payment ) {
+		$payment = $this->_pay_model->get_payment_by_txn_id_chq_nmbr($update_info['txn_id']);
+		if ( ! $payment instanceof EEI_Payment) {
 			$payment = $transaction->last_payment();
 		}
 		// ok, then validate the IPN. Even if we've already processed this payment,
 		// let PayPal know we don't want to hear from them anymore!
-		if ( ! $this->validate_ipn( $update_info, $payment ) ) {
+		if ( ! $this->validate_ipn($update_info, $payment)) {
 			return $payment;
 		}
         // kill request here if this is a refund, we don't support them yet (we'd need to adjust the transaction,
         // registrations, ticket counts, etc)
         if (
             (
-                $update_info[ 'payment_status' ] === 'Refunded'
-                || $update_info[ 'payment_status' ] === 'Partially_Refunded'
+                $update_info['payment_status'] === 'Refunded'
+                || $update_info['payment_status'] === 'Partially_Refunded'
             )
-            && apply_filters( 'FHEE__EEG_Paypal_Standard__handle_payment_update__kill_refund_request', true )
+            && apply_filters('FHEE__EEG_Paypal_Standard__handle_payment_update__kill_refund_request', true)
         ) {
             throw new EventEspresso\core\exceptions\IpnException(
                 sprintf(
-                    esc_html__( 'Event Espresso does not yet support %1$s IPNs from PayPal', 'event_espresso'),
+                    esc_html__('Event Espresso does not yet support %1$s IPNs from PayPal', 'event_espresso'),
                     $update_info['payment_status']
                 ),
                 EventEspresso\core\exceptions\IpnException::UNSUPPORTED,
@@ -295,34 +295,34 @@ 
             );
         }
 		//ok, well let's process this payment then!
-		switch ( $update_info[ 'payment_status' ] ) {
+		switch ($update_info['payment_status']) {
 
 			case 'Completed' :
 				$status = $this->_pay_model->approved_status();
-				$gateway_response = esc_html__( 'The payment is approved.', 'event_espresso' );
+				$gateway_response = esc_html__('The payment is approved.', 'event_espresso');
 				break;
 
 			case 'Pending' :
 				$status = $this->_pay_model->pending_status();
-				$gateway_response = esc_html__( 'The payment is in progress. Another message will be sent when payment is approved.', 'event_espresso' );
+				$gateway_response = esc_html__('The payment is in progress. Another message will be sent when payment is approved.', 'event_espresso');
 				break;
 
 			case 'Denied' :
 				$status = $this->_pay_model->declined_status();
-				$gateway_response = esc_html__( 'The payment has been declined.', 'event_espresso' );
+				$gateway_response = esc_html__('The payment has been declined.', 'event_espresso');
 				break;
 
 			case 'Expired' :
 			case 'Failed' :
 				$status = $this->_pay_model->failed_status();
-				$gateway_response = esc_html__( 'The payment failed for technical reasons or expired.', 'event_espresso' );
+				$gateway_response = esc_html__('The payment failed for technical reasons or expired.', 'event_espresso');
 				break;
 
 			case 'Refunded' :
 			case 'Partially_Refunded' :
 				// even though it's a refund, we consider the payment as approved, it just has a negative value
 				$status = $this->_pay_model->approved_status();
-				$gateway_response = esc_html__( 'The payment has been refunded. Please update registrations accordingly.', 'event_espresso' );
+				$gateway_response = esc_html__('The payment has been refunded. Please update registrations accordingly.', 'event_espresso');
 				break;
 
 			case 'Voided' :
@@ -330,19 +330,19 @@ 
 			case 'Canceled_Reversal' :
 			default :
 				$status = $this->_pay_model->cancelled_status();
-				$gateway_response = esc_html__( 'The payment was cancelled, reversed, or voided. Please update registrations accordingly.', 'event_espresso' );
+				$gateway_response = esc_html__('The payment was cancelled, reversed, or voided. Please update registrations accordingly.', 'event_espresso');
 				break;
 
 		}
 
 		//check if we've already processed this payment
-		if ( $payment instanceof EEI_Payment ) {
+		if ($payment instanceof EEI_Payment) {
 			//payment exists. if this has the exact same status and amount, don't bother updating. just return
-			if ( $payment->status() === $status && (float)$payment->amount() === (float)$update_info[ 'mc_gross' ] ) {
+			if ($payment->status() === $status && (float) $payment->amount() === (float) $update_info['mc_gross']) {
 				// DUPLICATED IPN! don't bother updating transaction
 				throw new IpnException(
 					sprintf(
-						esc_html__( 'It appears we have received a duplicate IPN from PayPal for payment %d', 'event_espresso' ),
+						esc_html__('It appears we have received a duplicate IPN from PayPal for payment %d', 'event_espresso'),
 						$payment->ID()
 					),
 					IpnException::DUPLICATE,
@@ -352,14 +352,14 @@ 
 				);
 			} else {
 				// new payment yippee !!!
-				$payment->set_status( $status );
-				$payment->set_amount( (float)$update_info[ 'mc_gross' ] );
-				$payment->set_gateway_response( $gateway_response );
-				$payment->set_details( $update_info );
-				$payment->set_txn_id_chq_nmbr( $update_info[ 'txn_id' ] );
+				$payment->set_status($status);
+				$payment->set_amount((float) $update_info['mc_gross']);
+				$payment->set_gateway_response($gateway_response);
+				$payment->set_details($update_info);
+				$payment->set_txn_id_chq_nmbr($update_info['txn_id']);
 				$this->log(
 					array(
-						'message'  => esc_html__( 'Updated payment either from IPN or as part of POST from PayPal', 'event_espresso' ),
+						'message'  => esc_html__('Updated payment either from IPN or as part of POST from PayPal', 'event_espresso'),
 						'url'      => $this->_process_response_url(),
 						'payment'  => $payment->model_field_array(),
 						'IPN_data' => $update_info
@@ -369,7 +369,7 @@ 
 			}
 
 		}
-		do_action( 'FHEE__EEG_Paypal_Standard__handle_payment_update__payment_processed', $payment, $this );
+		do_action('FHEE__EEG_Paypal_Standard__handle_payment_update__payment_processed', $payment, $this);
 		return $payment;
 	}
 
@@ -384,9 +384,9 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function validate_ipn( $update_info, $payment ) {
+	public function validate_ipn($update_info, $payment) {
 		//allow us to skip validating IPNs with PayPal (useful for testing)
-		if ( apply_filters( 'FHEE__EEG_Paypal_Standard__validate_ipn__skip', false ) ) {
+		if (apply_filters('FHEE__EEG_Paypal_Standard__validate_ipn__skip', false)) {
 			return true;
 		}
 		//...otherwise, we actually don't care what the $update_info is, we need to look
@@ -394,22 +394,22 @@ 
 		// Reading POSTed data directly from $_POST causes serialization issues with array data in the POST.
 		// Instead, read raw POST data from the input stream.
 		// @see https://gist.github.com/xcommerce-gists/3440401
-		$raw_post_data = file_get_contents( 'php://input' );
-		$raw_post_array = explode( '&', $raw_post_data );
+		$raw_post_data = file_get_contents('php://input');
+		$raw_post_array = explode('&', $raw_post_data);
 		$update_info = array();
-		foreach ( $raw_post_array as $keyval ) {
-			$keyval = explode( '=', $keyval );
-			if ( count( $keyval ) === 2 ) {
-				$update_info[ $keyval[ 0 ] ] = urldecode( $keyval[ 1 ] );
+		foreach ($raw_post_array as $keyval) {
+			$keyval = explode('=', $keyval);
+			if (count($keyval) === 2) {
+				$update_info[$keyval[0]] = urldecode($keyval[1]);
 			}
 		}
 		// read the IPN message sent from PayPal and prepend 'cmd=_notify-validate'
 		$req = 'cmd=_notify-validate';
-		$uses_get_magic_quotes = function_exists( 'get_magic_quotes_gpc' ) && get_magic_quotes_gpc() === 1
+		$uses_get_magic_quotes = function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc() === 1
 			? true
 			: false;
-		foreach ( $update_info as $key => $value ) {
-			$value = $uses_get_magic_quotes ? urlencode( stripslashes( $value ) ) : urlencode( $value );
+		foreach ($update_info as $key => $value) {
+			$value = $uses_get_magic_quotes ? urlencode(stripslashes($value)) : urlencode($value);
 			$req .= "&$key=$value";
 		}
 		// HTTP POST the complete, unaltered IPN back to PayPal
@@ -418,38 +418,38 @@ 
 			array(
 				'body' 				=> $req,
 				'sslverify' 		=> false,
-				'timeout' 		=> 60 ,
+				'timeout' 		=> 60,
 				// make sure to set a site specific unique "user-agent" string since the WordPres default gets declined by PayPal
 				// plz see: https://github.com/websharks/s2member/issues/610
-				'user-agent' 	=> 'Event Espresso v' . EVENT_ESPRESSO_VERSION . '; ' . home_url(),
+				'user-agent' 	=> 'Event Espresso v'.EVENT_ESPRESSO_VERSION.'; '.home_url(),
 				'httpversion' => '1.1'
 			)
 		);
 		// then check the response
 		if (
-			array_key_exists( 'body', $response )
-			&& ! is_wp_error( $response )
-			&& strcmp( $response[ 'body' ], "VERIFIED" ) === 0
+			array_key_exists('body', $response)
+			&& ! is_wp_error($response)
+			&& strcmp($response['body'], "VERIFIED") === 0
 		) {
 			return true;
 		}
 		// huh, something's wack... the IPN didn't validate. We must have replied to the IPN incorrectly,
 		// or their API must have changed: http://www.paypalobjects.com/en_US/ebook/PP_OrderManagement_IntegrationGuide/ipn.html
-		if( $response instanceof WP_Error ) {
+		if ($response instanceof WP_Error) {
 			$error_msg = sprintf(
-				esc_html__( 'WP Error. Code: "%1$s", Message: "%2$s", Data: "%3$s"', 'event_espresso' ),
+				esc_html__('WP Error. Code: "%1$s", Message: "%2$s", Data: "%3$s"', 'event_espresso'),
 				$response->get_error_code(),
 				$response->get_error_message(),
-				print_r( $response->get_error_data(), true )
+				print_r($response->get_error_data(), true)
 			);
-		} elseif( is_array( $response ) && isset( $response[ 'body' ] ) ) {
-			$error_msg = $response[ 'body' ];
+		} elseif (is_array($response) && isset($response['body'])) {
+			$error_msg = $response['body'];
 		} else {
-			$error_msg = print_r( $response, true );
+			$error_msg = print_r($response, true);
 		}
-		$payment->set_gateway_response( sprintf( esc_html__( "IPN Validation failed! Paypal responded with '%s'", "event_espresso" ), $error_msg ) );
-		$payment->set_details( array( 'REQUEST' => $update_info, 'VALIDATION_RESPONSE' => $response ) );
-		$payment->set_status( EEM_Payment::status_id_failed );
+		$payment->set_gateway_response(sprintf(esc_html__("IPN Validation failed! Paypal responded with '%s'", "event_espresso"), $error_msg));
+		$payment->set_details(array('REQUEST' => $update_info, 'VALIDATION_RESPONSE' => $response));
+		$payment->set_status(EEM_Payment::status_id_failed);
 		// log the results
 		$this->log(
 			array(
@@ -469,9 +469,9 @@ 
 	 * @return string
 	 */
 	protected function _process_response_url() {
-		if ( isset( $_SERVER[ 'HTTP_HOST' ], $_SERVER[ 'REQUEST_URI' ] ) ) {
+		if (isset($_SERVER['HTTP_HOST'], $_SERVER['REQUEST_URI'])) {
 			$url = is_ssl() ? 'https://' : 'http://';
-			$url .= EEH_URL::filter_input_server_url( 'HTTP_HOST' );
+			$url .= EEH_URL::filter_input_server_url('HTTP_HOST');
 			$url .= EEH_URL::filter_input_server_url();
 		} else {
 			$url = 'unknown';
@@ -488,12 +488,12 @@ 
 	 * @param EEI_Payment $payment
 	 * @throws \EE_Error
 	 */
-	public function update_txn_based_on_payment( $payment ) {
+	public function update_txn_based_on_payment($payment) {
 		$update_info = $payment->details();
 		/** @var EE_Transaction $transaction */
 		$transaction = $payment->transaction();
-		$payment_was_itemized = $payment->get_extra_meta( EEG_Paypal_Standard::itemized_payment_option_name, true, false );
-		if( ! $transaction ){
+		$payment_was_itemized = $payment->get_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, true, false);
+		if ( ! $transaction) {
 			$this->log(
 				esc_html__(
 					'Payment with ID %d has no related transaction, and so update_txn_based_on_payment couldn\'t be executed properly',
@@ -503,10 +503,10 @@ 
 			);
 			return;
 		}
-		if(
-			! is_array( $update_info )
-			|| ! isset( $update_info[ 'mc_shipping' ] )
-			|| ! isset( $update_info[ 'tax' ] )
+		if (
+			! is_array($update_info)
+			|| ! isset($update_info['mc_shipping'])
+			|| ! isset($update_info['tax'])
 		) {
 			$this->log(
 				array(
@@ -521,7 +521,7 @@ 
 			);
 			return;
 		}
-		if( $payment->status() !== $this->_pay_model->approved_status() ) {
+		if ($payment->status() !== $this->_pay_model->approved_status()) {
 			$this->log(
 				array(
 					'message' => esc_html__(
@@ -540,44 +540,44 @@ 
 		$transaction_total_line_item = $transaction->total_line_item();
 
 		//might paypal have changed the taxes?
-		if( $this->_paypal_taxes && $payment_was_itemized ) {
+		if ($this->_paypal_taxes && $payment_was_itemized) {
             // note that we're doing this BEFORE adding shipping;
 			// we actually want PayPal's shipping to remain non-taxable
-            $this->_line_item->set_line_items_taxable( $transaction_total_line_item, true, 'paypal_shipping' );
+            $this->_line_item->set_line_items_taxable($transaction_total_line_item, true, 'paypal_shipping');
             $this->_line_item->set_total_tax_to(
 	            $transaction_total_line_item,
-                (float)$update_info['tax'],
-                esc_html__( 'Taxes', 'event_espresso' ),
-                esc_html__( 'Calculated by Paypal', 'event_espresso' ),
+                (float) $update_info['tax'],
+                esc_html__('Taxes', 'event_espresso'),
+                esc_html__('Calculated by Paypal', 'event_espresso'),
                 'paypal_tax'
             );
             $grand_total_needs_resaving = TRUE;
 		}
 
-		$shipping_amount = (float)$update_info[ 'mc_shipping' ];
+		$shipping_amount = (float) $update_info['mc_shipping'];
 		//might paypal have added shipping?
-		if( $this->_paypal_shipping && $shipping_amount && $payment_was_itemized ){
+		if ($this->_paypal_shipping && $shipping_amount && $payment_was_itemized) {
 			$this->_line_item->add_unrelated_item(
 				$transaction_total_line_item,
-				sprintf( esc_html__('Shipping for transaction %1$s', 'event_espresso'), $transaction->ID() ),
+				sprintf(esc_html__('Shipping for transaction %1$s', 'event_espresso'), $transaction->ID()),
 				$shipping_amount,
 				esc_html__('Shipping charges calculated by Paypal', 'event_espresso'),
 				1,
 				false,
-				'paypal_shipping_' . $transaction->ID()
+				'paypal_shipping_'.$transaction->ID()
 			);
 			$grand_total_needs_resaving = true;
 		}
 
-		if( $grand_total_needs_resaving ){
-			$transaction_total_line_item->save_this_and_descendants_to_txn( $transaction->ID() );
+		if ($grand_total_needs_resaving) {
+			$transaction_total_line_item->save_this_and_descendants_to_txn($transaction->ID());
 			/** @var EE_Registration_Processor $registration_processor */
-			$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
-			$registration_processor->update_registration_final_prices( $transaction );
+			$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
+			$registration_processor->update_registration_final_prices($transaction);
 		}
 		$this->log(
 			array(
-				'message'                     => esc_html__( 'Updated transaction related to payment', 'event_espresso' ),
+				'message'                     => esc_html__('Updated transaction related to payment', 'event_espresso'),
 				'url'                         => $this->_process_response_url(),
 				'transaction (updated)'       => $transaction->model_field_array(),
 				'payment (updated)'           => $payment->model_field_array(),

core/exceptions/IpnException.php

Indentation +51 added lines, -51 removed lines

@@ -2,7 +2,7 @@ 
 namespace EventEspresso\core\exceptions;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -21,71 +21,71 @@ 
 class IpnException extends \LogicException
 {
 
-    const DUPLICATE          = 1;
+	const DUPLICATE          = 1;
 
-    const UNABLE_TO_VALIDATE = 2;
+	const UNABLE_TO_VALIDATE = 2;
 
-    const UNSUPPORTED        = 3;
+	const UNSUPPORTED        = 3;
 
-    /**
-     * @var \EE_Payment
-     */
-    protected $payment;
+	/**
+	 * @var \EE_Payment
+	 */
+	protected $payment;
 
-    /**
-     * @var mixed IPN data, usually an array or object
-     */
-    protected $ipn_data;
+	/**
+	 * @var mixed IPN data, usually an array or object
+	 */
+	protected $ipn_data;
 
 
 
-    public function __construct(
-        $message,
-        $code = 0,
-        \Exception $previous = null,
-        \EE_Payment $payment = null,
-        $ipn_data = array()
-    ) {
-        parent::__construct($message, $code, $previous);
-        $this->payment = $payment;
-        $this->ipn_data = $ipn_data;
-    }
+	public function __construct(
+		$message,
+		$code = 0,
+		\Exception $previous = null,
+		\EE_Payment $payment = null,
+		$ipn_data = array()
+	) {
+		parent::__construct($message, $code, $previous);
+		$this->payment = $payment;
+		$this->ipn_data = $ipn_data;
+	}
 
 
 
-    /**
-     * Gets the payment associated with this IPN, if known
-     *
-     * @return \EE_Payment
-     */
-    public function getPayment()
-    {
-        return $this->payment;
-    }
+	/**
+	 * Gets the payment associated with this IPN, if known
+	 *
+	 * @return \EE_Payment
+	 */
+	public function getPayment()
+	{
+		return $this->payment;
+	}
 
 
 
-    /**
-     * Returns the payment's properties as an array (even if there is no payment, in which case it's an empty array)
-     *
-     * @return array
-     * @throws \EE_Error
-     */
-    public function getPaymentProperties()
-    {
-        return $this->getPayment() instanceof \EE_Payment ? $this->getPayment()->model_field_array() : array();
-    }
+	/**
+	 * Returns the payment's properties as an array (even if there is no payment, in which case it's an empty array)
+	 *
+	 * @return array
+	 * @throws \EE_Error
+	 */
+	public function getPaymentProperties()
+	{
+		return $this->getPayment() instanceof \EE_Payment ? $this->getPayment()->model_field_array() : array();
+	}
 
 
 
-    /**
-     * Returns an array, object, or string, however, the IPN data was received
-     *
-     * @return mixed
-     */
-    public function getIpnData()
-    {
-        return $this->ipn_data;
-    }
+	/**
+	 * Returns an array, object, or string, however, the IPN data was received
+	 *
+	 * @return mixed
+	 */
+	public function getIpnData()
+	{
+		return $this->ipn_data;
+	}
 
 }
\ No newline at end of file

modules/invalid_checkout_access/EED_Invalid_Checkout_Access.module.php

Spacing +8 added lines, -8 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 use EventEspresso\modules\invalid_checkout_access\InvalidCheckoutAccess;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -36,12 +36,12 @@ 
 	public static function set_hooks_admin() {
 		add_action(
 			'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template',
-			array( 'EED_Invalid_Checkout_Access', 'display_invalid_checkout_access_form' ),
+			array('EED_Invalid_Checkout_Access', 'display_invalid_checkout_access_form'),
 			15
 		);
 		add_filter(
 			'FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration',
-			array( 'EED_Invalid_Checkout_Access', 'process_invalid_checkout_access_form' )
+			array('EED_Invalid_Checkout_Access', 'process_invalid_checkout_access_form')
 		);
 	}
 
@@ -53,7 +53,7 @@ 
 	 *
 	 * @var WP $WP
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 		// TODO: Implement run() method.
 	}
 
@@ -63,7 +63,7 @@ 
 	 * @return InvalidCheckoutAccess
 	 */
 	public static function getInvalidCheckoutAccess() {
-		if ( ! self::$invalid_checkout_access_form instanceof InvalidCheckoutAccess ) {
+		if ( ! self::$invalid_checkout_access_form instanceof InvalidCheckoutAccess) {
 			self::$invalid_checkout_access_form = new InvalidCheckoutAccess();
 		}
 		return self::$invalid_checkout_access_form;
@@ -90,9 +90,9 @@ 
 	 * @param \EE_Registration_Config $EE_Registration_Config
 	 * @return \EE_Registration_Config
 	 */
-	public static function process_invalid_checkout_access_form( \EE_Registration_Config $EE_Registration_Config ) {
+	public static function process_invalid_checkout_access_form(\EE_Registration_Config $EE_Registration_Config) {
 		$invalid_checkout_access_form = \EED_Invalid_Checkout_Access::getInvalidCheckoutAccess();
-		return $invalid_checkout_access_form->processForm( $EE_Registration_Config );
+		return $invalid_checkout_access_form->processForm($EE_Registration_Config);
 	}
 
 

core/EE_Session.core.php

Braces +1 added lines, -1 removed lines

@@ -341,7 +341,7 @@
 		}
 		 if ( ! empty( $key ))  {
 			return  isset( $this->_session_data[ $key ] ) ? $this->_session_data[ $key ] : NULL;
-		}  else  {
+		} else  {
 			return $this->_session_data;
 		}
 	}

Doc Comments +5 added lines, -5 removed lines

@@ -433,7 +433,7 @@ 
 	  * set session data
 	  * @access 	public
 	  * @param 	array $data
-	  * @return 	TRUE on success, FALSE on fail
+	  * @return 	boolean on success, FALSE on fail
 	  */
 	public function set_session_data( $data ) {
 
@@ -461,7 +461,7 @@ 
 	 /**
 	  * @initiate session
 	  * @access   private
-	  * @return TRUE on success, FALSE on fail
+	  * @return boolean on success, FALSE on fail
 	  * @throws \EventEspresso\core\exceptions\InvalidSessionDataException
 	  * @throws \EE_Error
 	  */
@@ -681,7 +681,7 @@ 
       * @update session data  prior to saving to the db
       * @access public
       * @param bool $new_session
-      * @return TRUE on success, FALSE on fail
+      * @return boolean on success, FALSE on fail
       * @throws \EE_Error
       */
 	public function update( $new_session = FALSE ) {
@@ -787,7 +787,7 @@ 
 	  * _save_session_to_db
 	  *
 	  * @access public
-	  * @return string
+	  * @return boolean
 	  * @throws \EE_Error
 	  */
 	private function _save_session_to_db() {
@@ -959,7 +959,7 @@ 
 	  * @access public
 	  * @param array $data_to_reset
 	  * @param bool  $show_all_notices
-	  * @return TRUE on success, FALSE on fail
+	  * @return boolean on success, FALSE on fail
 	  */
 	public function reset_data( $data_to_reset = array(), $show_all_notices = FALSE ) {
 		// if $data_to_reset is not in an array, then put it in one

Indentation +290 added lines, -290 removed lines

@@ -22,19 +22,19 @@ 
 	  */
 	 private static $_instance;
 
-     /**
-      * @var CacheStorageInterface $cache_storage
-      */
-     protected $cache_storage;
-
-     /**
-      * EE_Encryption object
-      *
-      * @var EE_Encryption
-      */
-     protected $encryption;
-
-     /**
+	 /**
+	  * @var CacheStorageInterface $cache_storage
+	  */
+	 protected $cache_storage;
+
+	 /**
+	  * EE_Encryption object
+	  *
+	  * @var EE_Encryption
+	  */
+	 protected $encryption;
+
+	 /**
 	  * the session id
 	  * @var string
 	  */
@@ -65,12 +65,12 @@ 
 	  */
 	 private $_expiration;
 
-    /**
-     * whether or not session has expired at some point
-     *
-     * @var boolean
-     */
-    private $_expired = false;
+	/**
+	 * whether or not session has expired at some point
+	 *
+	 * @var boolean
+	 */
+	private $_expired = false;
 
 	 /**
 	  * current time as Unix timestamp in GMT
@@ -107,30 +107,30 @@ 
 	  * @var array
 	  */
 	 private $_default_session_vars = array (
-        'id'            => null,
-        'user_id'       => null,
-        'ip_address'    => null,
-        'user_agent'    => null,
-        'init_access'   => null,
-        'last_access'   => null,
-        'expiration'    => null,
-        'pages_visited' => array(),
+		'id'            => null,
+		'user_id'       => null,
+		'ip_address'    => null,
+		'user_agent'    => null,
+		'init_access'   => null,
+		'last_access'   => null,
+		'expiration'    => null,
+		'pages_visited' => array(),
 	);
 
 
 
 	 /**
 	  * @singleton method used to instantiate class object
-      * @param CacheStorageInterface $cache_storage
-      * @param \EE_Encryption        $encryption
+	  * @param CacheStorageInterface $cache_storage
+	  * @param \EE_Encryption        $encryption
 	  * @return EE_Session
 	  * @throws InvalidSessionDataException
 	  * @throws \EE_Error
 	  */
 	public static function instance(
-        CacheStorageInterface $cache_storage = null,
-        EE_Encryption $encryption = null
-    ) {
+		CacheStorageInterface $cache_storage = null,
+		EE_Encryption $encryption = null
+	) {
 		// check if class object is instantiated
 		// session loading is turned ON by default, but prior to the init hook, can be turned back OFF via:
 		// add_filter( 'FHEE_load_EE_Session', '__return_false' );
@@ -143,10 +143,10 @@ 
 
 
 	 /**
-      * protected constructor to prevent direct creation
-      *
-      * @param CacheStorageInterface $cache_storage
-      * @param \EE_Encryption $encryption
+	  * protected constructor to prevent direct creation
+	  *
+	  * @param CacheStorageInterface $cache_storage
+	  * @param \EE_Encryption $encryption
 	  * @throws \EE_Error
 	  * @throws \EventEspresso\core\exceptions\InvalidSessionDataException
 	  */
@@ -181,59 +181,59 @@ 
 				$this->{$var_name} = $session_setting;
 			}
 		}
-         $this->cache_storage = $cache_storage;
-         // are we using encryption?
-         $this->_use_encryption = $encryption instanceof EE_Encryption && EE_Registry::instance()->CFG->admin->encode_session_data();
-         // \EEH_Debug_Tools::printr($this->_use_encryption, '$this->_use_encryption', __FILE__, __LINE__);
-        // encrypt data via: $this->encryption->encrypt();
-        $this->encryption = $encryption;
+		 $this->cache_storage = $cache_storage;
+		 // are we using encryption?
+		 $this->_use_encryption = $encryption instanceof EE_Encryption && EE_Registry::instance()->CFG->admin->encode_session_data();
+		 // \EEH_Debug_Tools::printr($this->_use_encryption, '$this->_use_encryption', __FILE__, __LINE__);
+		// encrypt data via: $this->encryption->encrypt();
+		$this->encryption = $encryption;
 		// filter hook allows outside functions/classes/plugins to change default empty cart
 		$extra_default_session_vars = apply_filters( 'FHEE__EE_Session__construct__extra_default_session_vars', array() );
 		array_merge( $this->_default_session_vars, $extra_default_session_vars );
 		// apply default session vars
 		$this->_set_defaults();
-         add_action('AHEE__EE_System__initialize', array($this, 'open_session'));
-         // check request for 'clear_session' param
+		 add_action('AHEE__EE_System__initialize', array($this, 'open_session'));
+		 // check request for 'clear_session' param
 		add_action( 'AHEE__EE_Request_Handler__construct__complete', array( $this, 'wp_loaded' ));
 		// once everything is all said and done,
 		add_action( 'shutdown', array( $this, 'update' ), 100 );
-         $this->configure_garbage_collection_filters();
+		 $this->configure_garbage_collection_filters();
 	}
 
 
 
-     /**
-      * @return void
-      * @throws \EventEspresso\core\exceptions\InvalidSessionDataException
-      * @throws \EE_Error
-      */
+	 /**
+	  * @return void
+	  * @throws \EventEspresso\core\exceptions\InvalidSessionDataException
+	  * @throws \EE_Error
+	  */
 	 public function open_session() {
-         // check for existing session and retrieve it from db
-         if ( ! $this->_espresso_session()) {
-             // or just start a new one
-             $this->_create_espresso_session();
-         }
-     }
+		 // check for existing session and retrieve it from db
+		 if ( ! $this->_espresso_session()) {
+			 // or just start a new one
+			 $this->_create_espresso_session();
+		 }
+	 }
 
 
 
-    /**
-     * @return bool
-     */
-    public function expired()
-    {
-        return $this->_expired;
-    }
+	/**
+	 * @return bool
+	 */
+	public function expired()
+	{
+		return $this->_expired;
+	}
 
 
 
-    /**
-     * @return void
-     */
-    public function reset_expired()
-    {
-        $this->_expired = false;
-    }
+	/**
+	 * @return void
+	 */
+	public function reset_expired()
+	{
+		$this->_expired = false;
+	}
 
 
 	 /**
@@ -245,24 +245,24 @@ 
 
 
 
-    /**
-     * @return int
-     */
-    public function extension()
-    {
-        return apply_filters('FHEE__EE_Session__extend_expiration__seconds_added', (10 * MINUTE_IN_SECONDS));
-    }
+	/**
+	 * @return int
+	 */
+	public function extension()
+	{
+		return apply_filters('FHEE__EE_Session__extend_expiration__seconds_added', (10 * MINUTE_IN_SECONDS));
+	}
 
 
 
-    /**
-     * @param int $time number of seconds to add to session expiration
-     */
-    public function extend_expiration($time = 0)
-    {
-        $time = $time ? $time : $this->extension();
-        $this->_expiration += absint($time);
-    }
+	/**
+	 * @param int $time number of seconds to add to session expiration
+	 */
+	public function extend_expiration($time = 0)
+	{
+		$time = $time ? $time : $this->extension();
+		$this->_expiration += absint($time);
+	}
 
 
 
@@ -306,15 +306,15 @@ 
 
 
 
-    /**
-     * @param \EE_Cart $cart
-     * @return bool
-     */
-    public function set_cart(EE_Cart $cart)
-    {
-        $this->_session_data['cart'] = $cart;
-        return true;
-    }
+	/**
+	 * @param \EE_Cart $cart
+	 * @return bool
+	 */
+	public function set_cart(EE_Cart $cart)
+	{
+		$this->_session_data['cart'] = $cart;
+		return true;
+	}
 
 
 
@@ -322,7 +322,7 @@ 
 	  * reset_cart
 	  */
 	 public function reset_cart() {
-        do_action('AHEE__EE_Session__reset_cart__before_reset', $this);
+		do_action('AHEE__EE_Session__reset_cart__before_reset', $this);
 		 $this->_session_data['cart'] = NULL;
 	 }
 
@@ -355,7 +355,7 @@ 
 	  * reset_checkout
 	  */
 	 public function reset_checkout() {
-        do_action('AHEE__EE_Session__reset_checkout__before_reset', $this);
+		do_action('AHEE__EE_Session__reset_checkout__before_reset', $this);
 		 $this->_session_data['checkout'] = NULL;
 	 }
 
@@ -365,9 +365,9 @@ 
 	  * @return \EE_Checkout
 	  */
 	 public function checkout() {
-        return isset($this->_session_data['checkout']) && $this->_session_data['checkout'] instanceof EE_Checkout
-            ? $this->_session_data['checkout']
-            : null;
+		return isset($this->_session_data['checkout']) && $this->_session_data['checkout'] instanceof EE_Checkout
+			? $this->_session_data['checkout']
+			: null;
 	 }
 
 
@@ -390,7 +390,7 @@ 
 	  * reset_transaction
 	  */
 	 public function reset_transaction() {
-        do_action('AHEE__EE_Session__reset_transaction__before_reset', $this);
+		do_action('AHEE__EE_Session__reset_transaction__before_reset', $this);
 		 $this->_session_data['transaction'] = NULL;
 	 }
 
@@ -400,10 +400,10 @@ 
 	  * @return \EE_Transaction
 	  */
 	 public function transaction() {
-        return isset($this->_session_data['transaction'])
-               && $this->_session_data['transaction'] instanceof EE_Transaction
-           ? $this->_session_data['transaction']
-           : null;
+		return isset($this->_session_data['transaction'])
+			   && $this->_session_data['transaction'] instanceof EE_Transaction
+		   ? $this->_session_data['transaction']
+		   : null;
 	 }
 
 
@@ -480,16 +480,16 @@ 
 		// set the "user agent"
 		$this->_user_agent = isset($_SERVER['HTTP_USER_AGENT']) ? esc_attr( $_SERVER['HTTP_USER_AGENT'] ) : FALSE;
 		// now let's retrieve what's in the db
-        $session_data = $this->_retrieve_session_data();
-        if (! empty($session_data)) {
-            // get the current time in UTC
+		$session_data = $this->_retrieve_session_data();
+		if (! empty($session_data)) {
+			// get the current time in UTC
 			$this->_time = isset( $this->_time ) ? $this->_time : time();
 			// and reset the session expiration
 			$this->_expiration = isset( $session_data['expiration'] )
 				? $session_data['expiration']
 				: $this->_time + $this->_lifespan;
 		} else {
-            // set initial site access time and the session expiration
+			// set initial site access time and the session expiration
 			$this->_set_init_access_and_expiration();
 			// set referer
 			$this->_session_data[ 'pages_visited' ][ $this->_session_data['init_access'] ] = isset( $_SERVER['HTTP_REFERER'] )
@@ -498,14 +498,14 @@ 
 			// no previous session = go back and create one (on top of the data above)
 			return FALSE;
 		}
-        // now the user agent
+		// now the user agent
 		if ( $session_data['user_agent'] !== $this->_user_agent ) {
 			return FALSE;
 		}
 		// wait a minute... how old are you?
 		if ( $this->_time > $this->_expiration ) {
 			// yer too old fer me!
-            $this->_expired = true;
+			$this->_expired = true;
 			// wipe out everything that isn't a default session datum
 			$this->clear_session( __CLASS__, __FUNCTION__ );
 		}
@@ -517,101 +517,101 @@ 
 
 
 
-     /**
-      * _get_session_data
-      * Retrieves the session data, and attempts to correct any encoding issues that can occur due to improperly setup databases
-      *
-      * @return array
-      * @throws \EventEspresso\core\exceptions\InvalidSessionDataException
-      */
-     protected function _retrieve_session_data()
-     {
-         $ssn_key = EE_Session::session_id_prefix . $this->_sid;
-         try {
-             // we're using WP's Transient API to store session data using the PHP session ID as the option name
-             $session_data = $this->cache_storage->get($ssn_key, false);
-	         if (empty($session_data)) {
-		         return array();
-             }
-             if (apply_filters('FHEE__EE_Session___perform_session_id_hash_check', WP_DEBUG)) {
-                 $hash_check = $this->cache_storage->get(
-                     EE_Session::hash_check_prefix . $this->_sid,
-                     false
-                 );
-                 if ($hash_check && $hash_check !== md5($session_data)) {
-	                 EE_Error::add_error(
-                         sprintf(
-                             __(
-                                 'The stored data for session %1$s failed to pass a hash check and therefore appears to be invalid.',
-                                 'event_espresso'
-                             ),
-                             EE_Session::session_id_prefix . $this->_sid
-                         ),
-                         __FILE__, __FUNCTION__, __LINE__
-                     );
-                 }
-             }
-         } catch (Exception $e) {
-             // let's just eat that error for now and attempt to correct any corrupted data
-             global $wpdb;
-             $row = $wpdb->get_row(
-                 $wpdb->prepare(
-                     "SELECT option_value FROM {$wpdb->options} WHERE option_name = %s LIMIT 1",
-                     '_transient_' . $ssn_key
-                 )
-             );
-             $session_data = is_object($row) ? $row->option_value : null;
-             if ($session_data) {
-                 $session_data = preg_replace_callback(
-                     '!s:(d+):"(.*?)";!',
-                     function ($match) {
-                         return $match[1] === strlen($match[2])
-                             ? $match[0]
-                             : 's:' . strlen($match[2]) . ':"' . $match[2] . '";';
-                     },
-                     $session_data
-                 );
-             }
-	         $session_data = maybe_unserialize($session_data);
-         }
-	     // in case the data is encoded... try to decode it
-         $session_data = $this->encryption instanceof EE_Encryption
-             ? $this->encryption->base64_string_decode($session_data)
-             : $session_data;
-
-         if ( ! is_array($session_data)) {
-             try {
-	             $session_data = maybe_unserialize($session_data);
-             } catch (Exception $e) {
-                 $msg = esc_html__(
-                     'An error occurred while attempting to unserialize the session data.',
-                     'event_espresso'
-                 );
-                 $msg .= WP_DEBUG
-                     ? '<br><pre>' . print_r($session_data, true) . '</pre><br>' . $this->find_serialize_error($session_data)
-                     : '';
-                 throw new InvalidSessionDataException($msg, 0, $e);
-             }
-         }
-         // just a check to make sure the session array is indeed an array
-         if ( ! is_array($session_data)) {
-             // no?!?! then something is wrong
-             $msg = esc_html__(
-                 'The session data is missing, invalid, or corrupted.',
-                 'event_espresso'
-             );
-             $msg .= WP_DEBUG
-                 ? '<br><pre>' . print_r($session_data, true) . '</pre><br>' . $this->find_serialize_error($session_data)
-                 : '';
-	         throw new InvalidSessionDataException($msg);
-         }
-	     if ( isset($session_data['transaction'] ) && absint($session_data['transaction'] ) !== 0 ) {
-             $session_data['transaction'] = EEM_Transaction::instance()->get_one_by_ID(
-                 $session_data['transaction']
-	         );
-	     }
-         return $session_data;
-     }
+	 /**
+	  * _get_session_data
+	  * Retrieves the session data, and attempts to correct any encoding issues that can occur due to improperly setup databases
+	  *
+	  * @return array
+	  * @throws \EventEspresso\core\exceptions\InvalidSessionDataException
+	  */
+	 protected function _retrieve_session_data()
+	 {
+		 $ssn_key = EE_Session::session_id_prefix . $this->_sid;
+		 try {
+			 // we're using WP's Transient API to store session data using the PHP session ID as the option name
+			 $session_data = $this->cache_storage->get($ssn_key, false);
+			 if (empty($session_data)) {
+				 return array();
+			 }
+			 if (apply_filters('FHEE__EE_Session___perform_session_id_hash_check', WP_DEBUG)) {
+				 $hash_check = $this->cache_storage->get(
+					 EE_Session::hash_check_prefix . $this->_sid,
+					 false
+				 );
+				 if ($hash_check && $hash_check !== md5($session_data)) {
+					 EE_Error::add_error(
+						 sprintf(
+							 __(
+								 'The stored data for session %1$s failed to pass a hash check and therefore appears to be invalid.',
+								 'event_espresso'
+							 ),
+							 EE_Session::session_id_prefix . $this->_sid
+						 ),
+						 __FILE__, __FUNCTION__, __LINE__
+					 );
+				 }
+			 }
+		 } catch (Exception $e) {
+			 // let's just eat that error for now and attempt to correct any corrupted data
+			 global $wpdb;
+			 $row = $wpdb->get_row(
+				 $wpdb->prepare(
+					 "SELECT option_value FROM {$wpdb->options} WHERE option_name = %s LIMIT 1",
+					 '_transient_' . $ssn_key
+				 )
+			 );
+			 $session_data = is_object($row) ? $row->option_value : null;
+			 if ($session_data) {
+				 $session_data = preg_replace_callback(
+					 '!s:(d+):"(.*?)";!',
+					 function ($match) {
+						 return $match[1] === strlen($match[2])
+							 ? $match[0]
+							 : 's:' . strlen($match[2]) . ':"' . $match[2] . '";';
+					 },
+					 $session_data
+				 );
+			 }
+			 $session_data = maybe_unserialize($session_data);
+		 }
+		 // in case the data is encoded... try to decode it
+		 $session_data = $this->encryption instanceof EE_Encryption
+			 ? $this->encryption->base64_string_decode($session_data)
+			 : $session_data;
+
+		 if ( ! is_array($session_data)) {
+			 try {
+				 $session_data = maybe_unserialize($session_data);
+			 } catch (Exception $e) {
+				 $msg = esc_html__(
+					 'An error occurred while attempting to unserialize the session data.',
+					 'event_espresso'
+				 );
+				 $msg .= WP_DEBUG
+					 ? '<br><pre>' . print_r($session_data, true) . '</pre><br>' . $this->find_serialize_error($session_data)
+					 : '';
+				 throw new InvalidSessionDataException($msg, 0, $e);
+			 }
+		 }
+		 // just a check to make sure the session array is indeed an array
+		 if ( ! is_array($session_data)) {
+			 // no?!?! then something is wrong
+			 $msg = esc_html__(
+				 'The session data is missing, invalid, or corrupted.',
+				 'event_espresso'
+			 );
+			 $msg .= WP_DEBUG
+				 ? '<br><pre>' . print_r($session_data, true) . '</pre><br>' . $this->find_serialize_error($session_data)
+				 : '';
+			 throw new InvalidSessionDataException($msg);
+		 }
+		 if ( isset($session_data['transaction'] ) && absint($session_data['transaction'] ) !== 0 ) {
+			 $session_data['transaction'] = EEM_Transaction::instance()->get_one_by_ID(
+				 $session_data['transaction']
+			 );
+		 }
+		 return $session_data;
+	 }
 
 
 
@@ -678,13 +678,13 @@ 
 
 
 
-     /**
-      * @update session data  prior to saving to the db
-      * @access public
-      * @param bool $new_session
-      * @return TRUE on success, FALSE on fail
-      * @throws \EE_Error
-      */
+	 /**
+	  * @update session data  prior to saving to the db
+	  * @access public
+	  * @param bool $new_session
+	  * @return TRUE on success, FALSE on fail
+	  * @throws \EE_Error
+	  */
 	public function update( $new_session = FALSE ) {
 		$this->_session_data = isset( $this->_session_data )
 			&& is_array( $this->_session_data )
@@ -770,12 +770,12 @@ 
 
 
 
-     /**
-      * @create session data array
-      * @access public
-      * @return bool
-      * @throws \EE_Error
-      */
+	 /**
+	  * @create session data array
+	  * @access public
+	  * @return bool
+	  * @throws \EE_Error
+	  */
 	private function _create_espresso_session( ) {
 		do_action( 'AHEE_log', __CLASS__, __FUNCTION__, '' );
 		// use the update function for now with $new_session arg set to TRUE
@@ -795,19 +795,19 @@ 
 		if (
 			// if the current request is NOT one of the following
 			! (
-                // an an AJAX request from the frontend
-                EE_Registry::instance()->REQ->front_ajax
-                || (
-                    // OR an admin request that is NOT AJAX
+				// an an AJAX request from the frontend
+				EE_Registry::instance()->REQ->front_ajax
+				|| (
+					// OR an admin request that is NOT AJAX
 					! ( defined( 'DOING_AJAX' ) && DOING_AJAX )
-                    && is_admin()
+					&& is_admin()
 				)
-                || (
-                    // OR an espresso page
-                    EE_Registry::instance()->REQ instanceof EE_Request_Handler
-                    && EE_Registry::instance()->REQ->is_espresso_page()
-                )
-            )
+				|| (
+					// OR an espresso page
+					EE_Registry::instance()->REQ instanceof EE_Request_Handler
+					&& EE_Registry::instance()->REQ->is_espresso_page()
+				)
+			)
 		) {
 			return false;
 		}
@@ -818,27 +818,27 @@ 
 			}
 			$this->_session_data['transaction'] = $transaction->ID();
 		}
-        // then serialize all of our session data
+		// then serialize all of our session data
 		$session_data = serialize($this->_session_data);
 		// do we need to also encode it to avoid corrupted data when saved to the db?
 		$session_data = $this->_use_encryption
-            ? $this->encryption->base64_string_encode( $session_data )
-            : $session_data;
+			? $this->encryption->base64_string_encode( $session_data )
+			: $session_data;
 		// maybe save hash check
 		if ( apply_filters( 'FHEE__EE_Session___perform_session_id_hash_check', WP_DEBUG ) ) {
-            $this->cache_storage->add(
-                EE_Session::hash_check_prefix . $this->_sid,
-                md5($session_data),
-                $this->_lifespan
-            );
-        }
-        // we're using the Transient API for storing session data,
-        return $this->cache_storage->add(
-            EE_Session::session_id_prefix . $this->_sid,
-            $session_data,
-            $this->_lifespan
-        );
-    }
+			$this->cache_storage->add(
+				EE_Session::hash_check_prefix . $this->_sid,
+				md5($session_data),
+				$this->_lifespan
+			);
+		}
+		// we're using the Transient API for storing session data,
+		return $this->cache_storage->add(
+			EE_Session::session_id_prefix . $this->_sid,
+			$session_data,
+			$this->_lifespan
+		);
+	}
 
 
 
@@ -931,18 +931,18 @@ 
 
 
 
-     /**
-      * Clear EE_Session data
-      *
-      * @access public
-      * @param string $class
-      * @param string $function
-      * @return void
-      * @throws \EE_Error
-      */
+	 /**
+	  * Clear EE_Session data
+	  *
+	  * @access public
+	  * @param string $class
+	  * @param string $function
+	  * @return void
+	  * @throws \EE_Error
+	  */
 	public function clear_session( $class = '', $function = '' ) {
 		//echo '<h3 style="color:#999;line-height:.9em;"><span style="color:#2EA2CC">' . __CLASS__ . '</span>::<span style="color:#E76700">' . __FUNCTION__ . '( ' . $class . '::' . $function . '() )</span><br/><span style="font-size:9px;font-weight:normal;">' . __FILE__ . '</span>    <b style="font-size:10px;">  ' . __LINE__ . ' </b></h3>';
-        do_action( 'AHEE_log', __FILE__, __FUNCTION__, 'session cleared by : ' . $class . '::' .  $function . '()' );
+		do_action( 'AHEE_log', __FILE__, __FUNCTION__, 'session cleared by : ' . $class . '::' .  $function . '()' );
 		$this->reset_cart();
 		$this->reset_checkout();
 		$this->reset_transaction();
@@ -1009,12 +1009,12 @@ 
 
 
 
-     /**
-      *   wp_loaded
-      *
-      * @access public
-      * @throws \EE_Error
-      */
+	 /**
+	  *   wp_loaded
+	  *
+	  * @access public
+	  * @throws \EE_Error
+	  */
 	public function wp_loaded() {
 		if ( isset(  EE_Registry::instance()->REQ ) && EE_Registry::instance()->REQ->is_set( 'clear_session' )) {
 			$this->clear_session( __CLASS__, __FUNCTION__ );
@@ -1023,12 +1023,12 @@ 
 
 
 
-     /**
-      * Used to reset the entire object (for tests).
-      *
-      * @since 4.3.0
-      * @throws \EE_Error
-      */
+	 /**
+	  * Used to reset the entire object (for tests).
+	  *
+	  * @since 4.3.0
+	  * @throws \EE_Error
+	  */
 	public function reset_instance() {
 		$this->clear_session();
 		self::$_instance = NULL;
@@ -1036,29 +1036,29 @@ 
 
 
 
-     public function configure_garbage_collection_filters()
-     {
-         // run old filter we had for controlling session cleanup
-         $expired_session_transient_delete_query_limit = absint(
-             apply_filters(
-                 'FHEE__EE_Session__garbage_collection___expired_session_transient_delete_query_limit',
-                 50
-             )
-         );
-         // is there a value? or one that is different than the default 50 records?
-         if ($expired_session_transient_delete_query_limit === 0) {
-             // hook into TransientCacheStorage in case Session cleanup was turned off
-             add_filter('FHEE__TransientCacheStorage__transient_cleanup_schedule', '__return_zero');
-         } else if ($expired_session_transient_delete_query_limit !== 50) {
-             // or use that for the new transient cleanup query limit
-             add_filter(
-                 'FHEE__TransientCacheStorage__clearExpiredTransients__limit',
-                 function () use ($expired_session_transient_delete_query_limit) {
-                     return $expired_session_transient_delete_query_limit;
-                 }
-             );
-         }
-     }
+	 public function configure_garbage_collection_filters()
+	 {
+		 // run old filter we had for controlling session cleanup
+		 $expired_session_transient_delete_query_limit = absint(
+			 apply_filters(
+				 'FHEE__EE_Session__garbage_collection___expired_session_transient_delete_query_limit',
+				 50
+			 )
+		 );
+		 // is there a value? or one that is different than the default 50 records?
+		 if ($expired_session_transient_delete_query_limit === 0) {
+			 // hook into TransientCacheStorage in case Session cleanup was turned off
+			 add_filter('FHEE__TransientCacheStorage__transient_cleanup_schedule', '__return_zero');
+		 } else if ($expired_session_transient_delete_query_limit !== 50) {
+			 // or use that for the new transient cleanup query limit
+			 add_filter(
+				 'FHEE__TransientCacheStorage__clearExpiredTransients__limit',
+				 function () use ($expired_session_transient_delete_query_limit) {
+					 return $expired_session_transient_delete_query_limit;
+				 }
+			 );
+		 }
+	 }
 
 
 

Spacing +151 added lines, -151 removed lines

@@ -1,7 +1,7 @@ 
 <?php use EventEspresso\core\exceptions\InvalidSessionDataException;
 use EventEspresso\core\services\cache\CacheStorageInterface;
 
-if (!defined( 'EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed');}
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed'); }
 /**
  *
  * EE_Session class
@@ -106,7 +106,7 @@ 
 	  * array for defining default session vars
 	  * @var array
 	  */
-	 private $_default_session_vars = array (
+	 private $_default_session_vars = array(
         'id'            => null,
         'user_id'       => null,
         'ip_address'    => null,
@@ -134,8 +134,8 @@ 
 		// check if class object is instantiated
 		// session loading is turned ON by default, but prior to the init hook, can be turned back OFF via:
 		// add_filter( 'FHEE_load_EE_Session', '__return_false' );
-		if ( ! self::$_instance instanceof EE_Session && apply_filters( 'FHEE_load_EE_Session', true ) ) {
-			self::$_instance = new self($cache_storage, $encryption );
+		if ( ! self::$_instance instanceof EE_Session && apply_filters('FHEE_load_EE_Session', true)) {
+			self::$_instance = new self($cache_storage, $encryption);
 		}
 		return self::$_instance;
 	}
@@ -150,15 +150,15 @@ 
 	  * @throws \EE_Error
 	  * @throws \EventEspresso\core\exceptions\InvalidSessionDataException
 	  */
-	 protected function __construct(CacheStorageInterface $cache_storage, EE_Encryption $encryption = null ) {
+	 protected function __construct(CacheStorageInterface $cache_storage, EE_Encryption $encryption = null) {
 
 		// session loading is turned ON by default, but prior to the init hook, can be turned back OFF via: add_filter( 'FHEE_load_EE_Session', '__return_false' );
-		if ( ! apply_filters( 'FHEE_load_EE_Session', true ) ) {
+		if ( ! apply_filters('FHEE_load_EE_Session', true)) {
 			return;
 		}
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		if ( ! defined( 'ESPRESSO_SESSION' ) ) {
-			define( 'ESPRESSO_SESSION', true );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		if ( ! defined('ESPRESSO_SESSION')) {
+			define('ESPRESSO_SESSION', true);
 		}
 		// default session lifespan in seconds
 		$this->_lifespan = apply_filters(
@@ -172,12 +172,12 @@ 
 		 * 		}
 		 */
 		// retrieve session options from db
-		$session_settings = (array) get_option( 'ee_session_settings', array() );
-		if ( ! empty( $session_settings )) {
+		$session_settings = (array) get_option('ee_session_settings', array());
+		if ( ! empty($session_settings)) {
 			// cycle though existing session options
-			foreach ( $session_settings as $var_name => $session_setting ) {
+			foreach ($session_settings as $var_name => $session_setting) {
 				// set values for class properties
-				$var_name = '_' . $var_name;
+				$var_name = '_'.$var_name;
 				$this->{$var_name} = $session_setting;
 			}
 		}
@@ -188,15 +188,15 @@ 
         // encrypt data via: $this->encryption->encrypt();
         $this->encryption = $encryption;
 		// filter hook allows outside functions/classes/plugins to change default empty cart
-		$extra_default_session_vars = apply_filters( 'FHEE__EE_Session__construct__extra_default_session_vars', array() );
-		array_merge( $this->_default_session_vars, $extra_default_session_vars );
+		$extra_default_session_vars = apply_filters('FHEE__EE_Session__construct__extra_default_session_vars', array());
+		array_merge($this->_default_session_vars, $extra_default_session_vars);
 		// apply default session vars
 		$this->_set_defaults();
          add_action('AHEE__EE_System__initialize', array($this, 'open_session'));
          // check request for 'clear_session' param
-		add_action( 'AHEE__EE_Request_Handler__construct__complete', array( $this, 'wp_loaded' ));
+		add_action('AHEE__EE_Request_Handler__construct__complete', array($this, 'wp_loaded'));
 		// once everything is all said and done,
-		add_action( 'shutdown', array( $this, 'update' ), 100 );
+		add_action('shutdown', array($this, 'update'), 100);
          $this->configure_garbage_collection_filters();
 	}
 
@@ -284,11 +284,11 @@ 
 	 */
 	private function _set_defaults() {
 		// set some defaults
-		foreach ( $this->_default_session_vars as $key => $default_var ) {
-			if ( is_array( $default_var )) {
-				$this->_session_data[ $key ] = array();
+		foreach ($this->_default_session_vars as $key => $default_var) {
+			if (is_array($default_var)) {
+				$this->_session_data[$key] = array();
 			} else {
-				$this->_session_data[ $key ] = '';
+				$this->_session_data[$key] = '';
 			}
 		}
 	}
@@ -332,9 +332,9 @@ 
 	  * @param $ID
 	  * @return \EE_Cart
 	  */
-	 public function cart( $ID ) {
-		 return isset( $this->_session_data['cart'], $this->_session_data['cart'][ $ID ] )
-			 ? $this->_session_data['cart'][ $ID ]
+	 public function cart($ID) {
+		 return isset($this->_session_data['cart'], $this->_session_data['cart'][$ID])
+			 ? $this->_session_data['cart'][$ID]
 			 : NULL;
 	 }
 
@@ -344,7 +344,7 @@ 
 	  * @param \EE_Checkout $checkout
 	  * @return bool
 	  */
-	 public function set_checkout( EE_Checkout $checkout ) {
+	 public function set_checkout(EE_Checkout $checkout) {
 		 $this->_session_data['checkout'] = $checkout;
 		 return TRUE;
 	 }
@@ -377,9 +377,9 @@ 
 	  * @return bool
 	  * @throws \EE_Error
 	  */
-	 public function set_transaction( EE_Transaction $transaction ) {
+	 public function set_transaction(EE_Transaction $transaction) {
 		 // first remove the session from the transaction before we save the transaction in the session
-		 $transaction->set_txn_session_data( NULL );
+		 $transaction->set_txn_session_data(NULL);
 		 $this->_session_data['transaction'] = $transaction;
 		 return TRUE;
 	 }
@@ -415,15 +415,15 @@ 
 	  * @param bool $reset_cache
 	  * @return    array
 	  */
-	public function get_session_data( $key = NULL, $reset_cache = FALSE ) {
-		if ( $reset_cache ) {
+	public function get_session_data($key = NULL, $reset_cache = FALSE) {
+		if ($reset_cache) {
 			$this->reset_cart();
 			$this->reset_checkout();
 			$this->reset_transaction();
 		}
-		 if ( ! empty( $key ))  {
-			return  isset( $this->_session_data[ $key ] ) ? $this->_session_data[ $key ] : NULL;
-		}  else  {
+		 if ( ! empty($key)) {
+			return  isset($this->_session_data[$key]) ? $this->_session_data[$key] : NULL;
+		} else {
 			return $this->_session_data;
 		}
 	}
@@ -436,20 +436,20 @@ 
 	  * @param 	array $data
 	  * @return 	TRUE on success, FALSE on fail
 	  */
-	public function set_session_data( $data ) {
+	public function set_session_data($data) {
 
 		// nothing ??? bad data ??? go home!
-		if ( empty( $data ) || ! is_array( $data )) {
-			EE_Error::add_error( __( 'No session data or invalid session data was provided.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($data) || ! is_array($data)) {
+			EE_Error::add_error(__('No session data or invalid session data was provided.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
-		foreach ( $data as $key =>$value ) {
-			if ( isset( $this->_default_session_vars[ $key ] )) {
-				EE_Error::add_error( sprintf( __( 'Sorry! %s is a default session datum and can not be reset.', 'event_espresso' ), $key ), __FILE__, __FUNCTION__, __LINE__ );
+		foreach ($data as $key =>$value) {
+			if (isset($this->_default_session_vars[$key])) {
+				EE_Error::add_error(sprintf(__('Sorry! %s is a default session datum and can not be reset.', 'event_espresso'), $key), __FILE__, __FUNCTION__, __LINE__);
 				return FALSE;
 			} else {
-				$this->_session_data[ $key ] = $value;
+				$this->_session_data[$key] = $value;
 			}
 		}
 
@@ -467,9 +467,9 @@ 
 	  * @throws \EE_Error
 	  */
 	private function _espresso_session() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		// check that session has started
-		if ( session_id() === '' ) {
+		if (session_id() === '') {
 			//starts a new session if one doesn't already exist, or re-initiates an existing one
 			session_start();
 		}
@@ -478,39 +478,39 @@ 
 		// and the visitors IP
 		$this->_ip_address = $this->_visitor_ip();
 		// set the "user agent"
-		$this->_user_agent = isset($_SERVER['HTTP_USER_AGENT']) ? esc_attr( $_SERVER['HTTP_USER_AGENT'] ) : FALSE;
+		$this->_user_agent = isset($_SERVER['HTTP_USER_AGENT']) ? esc_attr($_SERVER['HTTP_USER_AGENT']) : FALSE;
 		// now let's retrieve what's in the db
         $session_data = $this->_retrieve_session_data();
-        if (! empty($session_data)) {
+        if ( ! empty($session_data)) {
             // get the current time in UTC
-			$this->_time = isset( $this->_time ) ? $this->_time : time();
+			$this->_time = isset($this->_time) ? $this->_time : time();
 			// and reset the session expiration
-			$this->_expiration = isset( $session_data['expiration'] )
+			$this->_expiration = isset($session_data['expiration'])
 				? $session_data['expiration']
 				: $this->_time + $this->_lifespan;
 		} else {
             // set initial site access time and the session expiration
 			$this->_set_init_access_and_expiration();
 			// set referer
-			$this->_session_data[ 'pages_visited' ][ $this->_session_data['init_access'] ] = isset( $_SERVER['HTTP_REFERER'] )
-				? esc_attr( $_SERVER['HTTP_REFERER'] )
+			$this->_session_data['pages_visited'][$this->_session_data['init_access']] = isset($_SERVER['HTTP_REFERER'])
+				? esc_attr($_SERVER['HTTP_REFERER'])
 				: '';
 			// no previous session = go back and create one (on top of the data above)
 			return FALSE;
 		}
         // now the user agent
-		if ( $session_data['user_agent'] !== $this->_user_agent ) {
+		if ($session_data['user_agent'] !== $this->_user_agent) {
 			return FALSE;
 		}
 		// wait a minute... how old are you?
-		if ( $this->_time > $this->_expiration ) {
+		if ($this->_time > $this->_expiration) {
 			// yer too old fer me!
             $this->_expired = true;
 			// wipe out everything that isn't a default session datum
-			$this->clear_session( __CLASS__, __FUNCTION__ );
+			$this->clear_session(__CLASS__, __FUNCTION__);
 		}
 		// make event espresso session data available to plugin
-		$this->_session_data = array_merge( $this->_session_data, $session_data );
+		$this->_session_data = array_merge($this->_session_data, $session_data);
 		return TRUE;
 
 	}
@@ -526,7 +526,7 @@ 
       */
      protected function _retrieve_session_data()
      {
-         $ssn_key = EE_Session::session_id_prefix . $this->_sid;
+         $ssn_key = EE_Session::session_id_prefix.$this->_sid;
          try {
              // we're using WP's Transient API to store session data using the PHP session ID as the option name
              $session_data = $this->cache_storage->get($ssn_key, false);
@@ -535,7 +535,7 @@ 
              }
              if (apply_filters('FHEE__EE_Session___perform_session_id_hash_check', WP_DEBUG)) {
                  $hash_check = $this->cache_storage->get(
-                     EE_Session::hash_check_prefix . $this->_sid,
+                     EE_Session::hash_check_prefix.$this->_sid,
                      false
                  );
                  if ($hash_check && $hash_check !== md5($session_data)) {
@@ -545,7 +545,7 @@ 
                                  'The stored data for session %1$s failed to pass a hash check and therefore appears to be invalid.',
                                  'event_espresso'
                              ),
-                             EE_Session::session_id_prefix . $this->_sid
+                             EE_Session::session_id_prefix.$this->_sid
                          ),
                          __FILE__, __FUNCTION__, __LINE__
                      );
@@ -557,17 +557,17 @@ 
              $row = $wpdb->get_row(
                  $wpdb->prepare(
                      "SELECT option_value FROM {$wpdb->options} WHERE option_name = %s LIMIT 1",
-                     '_transient_' . $ssn_key
+                     '_transient_'.$ssn_key
                  )
              );
              $session_data = is_object($row) ? $row->option_value : null;
              if ($session_data) {
                  $session_data = preg_replace_callback(
                      '!s:(d+):"(.*?)";!',
-                     function ($match) {
+                     function($match) {
                          return $match[1] === strlen($match[2])
                              ? $match[0]
-                             : 's:' . strlen($match[2]) . ':"' . $match[2] . '";';
+                             : 's:'.strlen($match[2]).':"'.$match[2].'";';
                      },
                      $session_data
                  );
@@ -588,7 +588,7 @@ 
                      'event_espresso'
                  );
                  $msg .= WP_DEBUG
-                     ? '<br><pre>' . print_r($session_data, true) . '</pre><br>' . $this->find_serialize_error($session_data)
+                     ? '<br><pre>'.print_r($session_data, true).'</pre><br>'.$this->find_serialize_error($session_data)
                      : '';
                  throw new InvalidSessionDataException($msg, 0, $e);
              }
@@ -601,11 +601,11 @@ 
                  'event_espresso'
              );
              $msg .= WP_DEBUG
-                 ? '<br><pre>' . print_r($session_data, true) . '</pre><br>' . $this->find_serialize_error($session_data)
+                 ? '<br><pre>'.print_r($session_data, true).'</pre><br>'.$this->find_serialize_error($session_data)
                  : '';
 	         throw new InvalidSessionDataException($msg);
          }
-	     if ( isset($session_data['transaction'] ) && absint($session_data['transaction'] ) !== 0 ) {
+	     if (isset($session_data['transaction']) && absint($session_data['transaction']) !== 0) {
              $session_data['transaction'] = EEM_Transaction::instance()->get_one_by_ID(
                  $session_data['transaction']
 	         );
@@ -626,12 +626,12 @@ 
 	  */
 	protected function _generate_session_id() {
 		// check if the SID was passed explicitly, otherwise get from session, then add salt and hash it to reduce length
-		if ( isset( $_REQUEST[ 'EESID' ] ) ) {
-			$session_id = sanitize_text_field( $_REQUEST[ 'EESID' ] );
+		if (isset($_REQUEST['EESID'])) {
+			$session_id = sanitize_text_field($_REQUEST['EESID']);
 		} else {
-			$session_id = md5( session_id() . get_current_blog_id() . $this->_get_sid_salt() );
+			$session_id = md5(session_id().get_current_blog_id().$this->_get_sid_salt());
 		}
-		return apply_filters( 'FHEE__EE_Session___generate_session_id__session_id', $session_id );
+		return apply_filters('FHEE__EE_Session___generate_session_id__session_id', $session_id);
 	}
 
 
@@ -643,20 +643,20 @@ 
 	  */
 	protected function _get_sid_salt() {
 		// was session id salt already saved to db ?
-		if ( empty( $this->_sid_salt ) ) {
+		if (empty($this->_sid_salt)) {
 			// no?  then maybe use WP defined constant
-			if ( defined( 'AUTH_SALT' ) ) {
+			if (defined('AUTH_SALT')) {
 				$this->_sid_salt = AUTH_SALT;
 			}
 			// if salt doesn't exist or is too short
-			if ( strlen( $this->_sid_salt ) < 32 ) {
+			if (strlen($this->_sid_salt) < 32) {
 				// create a new one
-				$this->_sid_salt = wp_generate_password( 64 );
+				$this->_sid_salt = wp_generate_password(64);
 			}
 			// and save it as a permanent session setting
-			$session_settings = get_option( 'ee_session_settings' );
-			$session_settings[ 'sid_salt' ] = $this->_sid_salt;
-			update_option( 'ee_session_settings', $session_settings );
+			$session_settings = get_option('ee_session_settings');
+			$session_settings['sid_salt'] = $this->_sid_salt;
+			update_option('ee_session_settings', $session_settings);
 		}
 		return $this->_sid_salt;
 	}
@@ -685,19 +685,19 @@ 
       * @return TRUE on success, FALSE on fail
       * @throws \EE_Error
       */
-	public function update( $new_session = FALSE ) {
-		$this->_session_data = isset( $this->_session_data )
-			&& is_array( $this->_session_data )
-			&& isset( $this->_session_data['id'])
+	public function update($new_session = FALSE) {
+		$this->_session_data = isset($this->_session_data)
+			&& is_array($this->_session_data)
+			&& isset($this->_session_data['id'])
 			? $this->_session_data
 			: array();
-		if ( empty( $this->_session_data )) {
+		if (empty($this->_session_data)) {
 			$this->_set_defaults();
 		}
 		$session_data = array();
-		foreach ( $this->_session_data as $key => $value ) {
+		foreach ($this->_session_data as $key => $value) {
 
-			switch( $key ) {
+			switch ($key) {
 
 				case 'id' :
 					// session ID
@@ -715,7 +715,7 @@ 
 				break;
 
 				case 'init_access' :
-					$session_data['init_access'] = absint( $value );
+					$session_data['init_access'] = absint($value);
 				break;
 
 				case 'last_access' :
@@ -725,7 +725,7 @@ 
 
 				case 'expiration' :
 					// when the session expires
-					$session_data['expiration'] = ! empty( $this->_expiration )
+					$session_data['expiration'] = ! empty($this->_expiration)
 						? $this->_expiration
 						: $session_data['init_access'] + $this->_lifespan;
 				break;
@@ -737,11 +737,11 @@ 
 
 				case 'pages_visited' :
 					$page_visit = $this->_get_page_visit();
-					if ( $page_visit ) {
+					if ($page_visit) {
 						// set pages visited where the first will be the http referrer
-						$this->_session_data[ 'pages_visited' ][ $this->_time ] = $page_visit;
+						$this->_session_data['pages_visited'][$this->_time] = $page_visit;
 						// we'll only save the last 10 page visits.
-						$session_data[ 'pages_visited' ] = array_slice( $this->_session_data['pages_visited'], -10 );
+						$session_data['pages_visited'] = array_slice($this->_session_data['pages_visited'], -10);
 					}
 				break;
 
@@ -755,9 +755,9 @@ 
 
 		$this->_session_data = $session_data;
 		// creating a new session does not require saving to the db just yet
-		if ( ! $new_session ) {
+		if ( ! $new_session) {
 			// ready? let's save
-			if ( $this->_save_session_to_db() ) {
+			if ($this->_save_session_to_db()) {
 				return TRUE;
 			} else {
 				return FALSE;
@@ -777,9 +777,9 @@ 
       * @throws \EE_Error
       */
 	private function _create_espresso_session( ) {
-		do_action( 'AHEE_log', __CLASS__, __FUNCTION__, '' );
+		do_action('AHEE_log', __CLASS__, __FUNCTION__, '');
 		// use the update function for now with $new_session arg set to TRUE
-		return  $this->update( TRUE ) ? TRUE : FALSE;
+		return  $this->update(TRUE) ? TRUE : FALSE;
 	}
 
 
@@ -799,7 +799,7 @@ 
                 EE_Registry::instance()->REQ->front_ajax
                 || (
                     // OR an admin request that is NOT AJAX
-					! ( defined( 'DOING_AJAX' ) && DOING_AJAX )
+					! (defined('DOING_AJAX') && DOING_AJAX)
                     && is_admin()
 				)
                 || (
@@ -812,8 +812,8 @@ 
 			return false;
 		}
 		$transaction = $this->transaction();
-		if ( $transaction instanceof EE_Transaction ) {
-			if ( ! $transaction->ID() ) {
+		if ($transaction instanceof EE_Transaction) {
+			if ( ! $transaction->ID()) {
 				$transaction->save();
 			}
 			$this->_session_data['transaction'] = $transaction->ID();
@@ -822,19 +822,19 @@ 
 		$session_data = serialize($this->_session_data);
 		// do we need to also encode it to avoid corrupted data when saved to the db?
 		$session_data = $this->_use_encryption
-            ? $this->encryption->base64_string_encode( $session_data )
+            ? $this->encryption->base64_string_encode($session_data)
             : $session_data;
 		// maybe save hash check
-		if ( apply_filters( 'FHEE__EE_Session___perform_session_id_hash_check', WP_DEBUG ) ) {
+		if (apply_filters('FHEE__EE_Session___perform_session_id_hash_check', WP_DEBUG)) {
             $this->cache_storage->add(
-                EE_Session::hash_check_prefix . $this->_sid,
+                EE_Session::hash_check_prefix.$this->_sid,
                 md5($session_data),
                 $this->_lifespan
             );
         }
         // we're using the Transient API for storing session data,
         return $this->cache_storage->add(
-            EE_Session::session_id_prefix . $this->_sid,
+            EE_Session::session_id_prefix.$this->_sid,
             $session_data,
             $this->_lifespan
         );
@@ -863,10 +863,10 @@ 
 			'HTTP_FORWARDED',
 			'REMOTE_ADDR'
 		);
-		foreach ( $server_keys as $key ){
-			if ( isset( $_SERVER[ $key ] )) {
-				foreach ( array_map( 'trim', explode( ',', $_SERVER[ $key ] )) as $ip ) {
-					if ( $ip === '127.0.0.1' || filter_var( $ip, FILTER_VALIDATE_IP ) !== FALSE ) {
+		foreach ($server_keys as $key) {
+			if (isset($_SERVER[$key])) {
+				foreach (array_map('trim', explode(',', $_SERVER[$key])) as $ip) {
+					if ($ip === '127.0.0.1' || filter_var($ip, FILTER_VALIDATE_IP) !== FALSE) {
 						$visitor_ip = $ip;
 					}
 				}
@@ -885,32 +885,32 @@ 
 	 *			@return string
 	 */
 	public function _get_page_visit() {
-		$page_visit = home_url('/') . 'wp-admin/admin-ajax.php';
+		$page_visit = home_url('/').'wp-admin/admin-ajax.php';
 		// check for request url
-		if ( isset( $_SERVER['REQUEST_URI'] )) {
+		if (isset($_SERVER['REQUEST_URI'])) {
 			$http_host = '';
 			$page_id = '?';
 			$e_reg = '';
-			$request_uri = esc_url( $_SERVER['REQUEST_URI'] );
-			$ru_bits = explode( '?', $request_uri );
+			$request_uri = esc_url($_SERVER['REQUEST_URI']);
+			$ru_bits = explode('?', $request_uri);
 			$request_uri = $ru_bits[0];
 			// check for and grab host as well
-			if ( isset( $_SERVER['HTTP_HOST'] )) {
-				$http_host = esc_url( $_SERVER['HTTP_HOST'] );
+			if (isset($_SERVER['HTTP_HOST'])) {
+				$http_host = esc_url($_SERVER['HTTP_HOST']);
 			}
 			// check for page_id in SERVER REQUEST
-			if ( isset( $_REQUEST['page_id'] )) {
+			if (isset($_REQUEST['page_id'])) {
 				// rebuild $e_reg without any of the extra parameters
-				$page_id = '?page_id=' . esc_attr( $_REQUEST['page_id'] ) . '&amp;';
+				$page_id = '?page_id='.esc_attr($_REQUEST['page_id']).'&amp;';
 			}
 			// check for $e_reg in SERVER REQUEST
-			if ( isset( $_REQUEST['ee'] )) {
+			if (isset($_REQUEST['ee'])) {
 				// rebuild $e_reg without any of the extra parameters
-				$e_reg = 'ee=' . esc_attr( $_REQUEST['ee'] );
+				$e_reg = 'ee='.esc_attr($_REQUEST['ee']);
 			}
-			$page_visit = rtrim( $http_host . $request_uri . $page_id . $e_reg, '?' );
+			$page_visit = rtrim($http_host.$request_uri.$page_id.$e_reg, '?');
 		}
-		return $page_visit !== home_url( '/wp-admin/admin-ajax.php' ) ? $page_visit : '';
+		return $page_visit !== home_url('/wp-admin/admin-ajax.php') ? $page_visit : '';
 
 	}
 
@@ -940,14 +940,14 @@ 
       * @return void
       * @throws \EE_Error
       */
-	public function clear_session( $class = '', $function = '' ) {
+	public function clear_session($class = '', $function = '') {
 		//echo '<h3 style="color:#999;line-height:.9em;"><span style="color:#2EA2CC">' . __CLASS__ . '</span>::<span style="color:#E76700">' . __FUNCTION__ . '( ' . $class . '::' . $function . '() )</span><br/><span style="font-size:9px;font-weight:normal;">' . __FILE__ . '</span>    <b style="font-size:10px;">  ' . __LINE__ . ' </b></h3>';
-        do_action( 'AHEE_log', __FILE__, __FUNCTION__, 'session cleared by : ' . $class . '::' .  $function . '()' );
+        do_action('AHEE_log', __FILE__, __FUNCTION__, 'session cleared by : '.$class.'::'.$function.'()');
 		$this->reset_cart();
 		$this->reset_checkout();
 		$this->reset_transaction();
 		// wipe out everything that isn't a default session datum
-		$this->reset_data( array_keys( $this->_session_data ));
+		$this->reset_data(array_keys($this->_session_data));
 		// reset initial site access time and the session expiration
 		$this->_set_init_access_and_expiration();
 		$this->_save_session_to_db();
@@ -962,42 +962,42 @@ 
 	  * @param bool  $show_all_notices
 	  * @return TRUE on success, FALSE on fail
 	  */
-	public function reset_data( $data_to_reset = array(), $show_all_notices = FALSE ) {
+	public function reset_data($data_to_reset = array(), $show_all_notices = FALSE) {
 		// if $data_to_reset is not in an array, then put it in one
-		if ( ! is_array( $data_to_reset ) ) {
-			$data_to_reset = array ( $data_to_reset );
+		if ( ! is_array($data_to_reset)) {
+			$data_to_reset = array($data_to_reset);
 		}
 		// nothing ??? go home!
-		if ( empty( $data_to_reset )) {
-			EE_Error::add_error( __( 'No session data could be reset, because no session var name was provided.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($data_to_reset)) {
+			EE_Error::add_error(__('No session data could be reset, because no session var name was provided.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		$return_value = TRUE;
 		// since $data_to_reset is an array, cycle through the values
-		foreach ( $data_to_reset as $reset ) {
+		foreach ($data_to_reset as $reset) {
 
 			// first check to make sure it is a valid session var
-			if ( isset( $this->_session_data[ $reset ] )) {
+			if (isset($this->_session_data[$reset])) {
 				// then check to make sure it is not a default var
-				if ( ! array_key_exists( $reset, $this->_default_session_vars )) {
+				if ( ! array_key_exists($reset, $this->_default_session_vars)) {
 					// remove session var
-					unset( $this->_session_data[ $reset ] );
-					if ( $show_all_notices ) {
-						EE_Error::add_success( sprintf( __( 'The session variable %s was removed.', 'event_espresso' ), $reset ), __FILE__, __FUNCTION__, __LINE__ );
+					unset($this->_session_data[$reset]);
+					if ($show_all_notices) {
+						EE_Error::add_success(sprintf(__('The session variable %s was removed.', 'event_espresso'), $reset), __FILE__, __FUNCTION__, __LINE__);
 					}
-					$return_value = !isset($return_value) ? TRUE : $return_value;
+					$return_value = ! isset($return_value) ? TRUE : $return_value;
 
 				} else {
 					// yeeeeeeeeerrrrrrrrrrr OUT !!!!
-					if ( $show_all_notices ) {
-						EE_Error::add_error( sprintf( __( 'Sorry! %s is a default session datum and can not be reset.', 'event_espresso' ), $reset ), __FILE__, __FUNCTION__, __LINE__ );
+					if ($show_all_notices) {
+						EE_Error::add_error(sprintf(__('Sorry! %s is a default session datum and can not be reset.', 'event_espresso'), $reset), __FILE__, __FUNCTION__, __LINE__);
 					}
 					$return_value = FALSE;
 				}
 
-			} else if ( $show_all_notices ) {
+			} else if ($show_all_notices) {
 				// oops! that session var does not exist!
-				EE_Error::add_error( sprintf( __( 'The session item provided, %s, is invalid or does not exist.', 'event_espresso' ), $reset ), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(sprintf(__('The session item provided, %s, is invalid or does not exist.', 'event_espresso'), $reset), __FILE__, __FUNCTION__, __LINE__);
 				$return_value = FALSE;
 			}
 
@@ -1016,8 +1016,8 @@ 
       * @throws \EE_Error
       */
 	public function wp_loaded() {
-		if ( isset(  EE_Registry::instance()->REQ ) && EE_Registry::instance()->REQ->is_set( 'clear_session' )) {
-			$this->clear_session( __CLASS__, __FUNCTION__ );
+		if (isset(EE_Registry::instance()->REQ) && EE_Registry::instance()->REQ->is_set('clear_session')) {
+			$this->clear_session(__CLASS__, __FUNCTION__);
 		}
 	}
 
@@ -1053,7 +1053,7 @@ 
              // or use that for the new transient cleanup query limit
              add_filter(
                  'FHEE__TransientCacheStorage__clearExpiredTransients__limit',
-                 function () use ($expired_session_transient_delete_query_limit) {
+                 function() use ($expired_session_transient_delete_query_limit) {
                      return $expired_session_transient_delete_query_limit;
                  }
              );
@@ -1067,34 +1067,34 @@ 
 	  * @param $data1
 	  * @return string
 	  */
-	 private function find_serialize_error( $data1 ) {
+	 private function find_serialize_error($data1) {
 		$error = '<pre>';
 		 $data2 = preg_replace_callback(
 			 '!s:(\d+):"(.*?)";!',
-			 function ( $match ) {
-				 return ( $match[1] === strlen( $match[2] ) )
+			 function($match) {
+				 return ($match[1] === strlen($match[2]))
 					 ? $match[0]
 					 : 's:'
-					   . strlen( $match[2] )
+					   . strlen($match[2])
 					   . ':"'
 					   . $match[2]
 					   . '";';
 			 },
 			 $data1
 		 );
-		$max = ( strlen( $data1 ) > strlen( $data2 ) ) ? strlen( $data1 ) : strlen( $data2 );
-		$error .= $data1 . PHP_EOL;
-		$error .= $data2 . PHP_EOL;
-		for ( $i = 0; $i < $max; $i++ ) {
-			if ( @$data1[ $i ] !== @$data2[ $i ] ) {
-				$error .= 'Difference ' . @$data1[ $i ] . ' != ' . @$data2[ $i ] . PHP_EOL;
-				$error .= "\t-> ORD number " . ord( @$data1[ $i ] ) . ' != ' . ord( @$data2[ $i ] ) . PHP_EOL;
-				$error .= "\t-> Line Number = $i" . PHP_EOL;
-				$start = ( $i - 20 );
-				$start = ( $start < 0 ) ? 0 : $start;
+		$max = (strlen($data1) > strlen($data2)) ? strlen($data1) : strlen($data2);
+		$error .= $data1.PHP_EOL;
+		$error .= $data2.PHP_EOL;
+		for ($i = 0; $i < $max; $i++) {
+			if (@$data1[$i] !== @$data2[$i]) {
+				$error .= 'Difference '.@$data1[$i].' != '.@$data2[$i].PHP_EOL;
+				$error .= "\t-> ORD number ".ord(@$data1[$i]).' != '.ord(@$data2[$i]).PHP_EOL;
+				$error .= "\t-> Line Number = $i".PHP_EOL;
+				$start = ($i - 20);
+				$start = ($start < 0) ? 0 : $start;
 				$length = 40;
 				$point = $max - $i;
-				if ( $point < 20 ) {
+				if ($point < 20) {
 					$rlength = 1;
 					$rpoint = -$point;
 				} else {
@@ -1103,16 +1103,16 @@ 
 				}
 				$error .= "\t-> Section Data1  = ";
 				$error .= substr_replace(
-					substr( $data1, $start, $length ),
-					"<b style=\"color:green\">{$data1[ $i ]}</b>",
+					substr($data1, $start, $length),
+					"<b style=\"color:green\">{$data1[$i]}</b>",
 					$rpoint,
 					$rlength
 				);
 				$error .= PHP_EOL;
 				$error .= "\t-> Section Data2  = ";
 				$error .= substr_replace(
-					substr( $data2, $start, $length ),
-					"<b style=\"color:red\">{$data2[ $i ]}</b>",
+					substr($data2, $start, $length),
+					"<b style=\"color:red\">{$data2[$i]}</b>",
 					$rpoint,
 					$rlength
 				);