eventespresso / event-espresso-core

modules/bot_trap/EED_Bot_Trap.module.php

Spacing +52 added lines, -52 removed lines

@@ -18,7 +18,7 @@ 
 	 * @return EED_Bot_Trap
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -31,12 +31,12 @@ 
 	 */
 	public static function set_hooks() {
         if (
-			apply_filters( 'FHEE__EED_Bot_Trap__set_hooks__use_bot_trap', true ) &&
+			apply_filters('FHEE__EED_Bot_Trap__set_hooks__use_bot_trap', true) &&
 			\EE_Registry::instance()->CFG->registration->use_bot_trap
 		) {
             \EED_Bot_Trap::set_trap();
 			// redirect bots to bogus success page
-			\EE_Config::register_route( 'ticket_selection_received', 'EED_Bot_Trap', 'display_bot_trap_success' );
+			\EE_Config::register_route('ticket_selection_received', 'EED_Bot_Trap', 'display_bot_trap_success');
 		}
 	}
 
@@ -49,7 +49,7 @@ 
 	 *  @return 	void
 	 */
 	public static function set_trap() {
-        define('EE_BOT_TRAP_BASE_URL', plugin_dir_url(__FILE__) . DS);
+        define('EE_BOT_TRAP_BASE_URL', plugin_dir_url(__FILE__).DS);
         add_action(
             'AHEE__ticket_selector_chart__template__after_ticket_selector',
             array('EED_Bot_Trap', 'generate_bot_trap'),
@@ -81,12 +81,12 @@ 
         }
         add_action(
 			'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template',
-			array( 'EED_Bot_Trap', 'bot_trap_settings_form' ),
+			array('EED_Bot_Trap', 'bot_trap_settings_form'),
 			10
 		);
 		add_filter(
 			'FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration',
-			array( 'EED_Bot_Trap', 'update_bot_trap_settings_form' ),
+			array('EED_Bot_Trap', 'update_bot_trap_settings_form'),
 			10, 1
 		);
 	}
@@ -100,7 +100,7 @@ 
 	 * @param    WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {}
+	public function run($WP) {}
 
 
 
@@ -111,15 +111,15 @@ 
 	 * @return    void
 	 */
 	public static function generate_bot_trap() {
-		$do_not_enter = esc_html__( 'please do not enter anything in this input', 'event_espresso' );
+		$do_not_enter = esc_html__('please do not enter anything in this input', 'event_espresso');
 		$time = microtime(true);
 		$html = '<div class="tkt-slctr-request-processor-dv" style="float:left; margin:0 0 0 -999em; height: 0;">';
-		$html .= '<label for="tkt-slctr-request-processor-email-' . $time . '">' . $do_not_enter  . '</label>';
-		$html .= '<input type="email" id="tkt-slctr-request-processor-email-' . $time  .'" name="tkt-slctr-request-processor-email" value=""/>';
+		$html .= '<label for="tkt-slctr-request-processor-email-'.$time.'">'.$do_not_enter.'</label>';
+		$html .= '<input type="email" id="tkt-slctr-request-processor-email-'.$time.'" name="tkt-slctr-request-processor-email" value=""/>';
 		$html .= '<input type="hidden" name="tkt-slctr-request-processor-token" value="';
-		if ( EE_Registry::instance()->CFG->registration->use_encryption ) {
-			EE_Registry::instance()->load_core( 'EE_Encryption' );
-			$html .= EE_Encryption::instance()->encrypt( $time );
+		if (EE_Registry::instance()->CFG->registration->use_encryption) {
+			EE_Registry::instance()->load_core('EE_Encryption');
+			$html .= EE_Encryption::instance()->encrypt($time);
 		} else {
 			$html .= $time;
 		}
@@ -137,38 +137,38 @@ 
      *                                              It should receive one argument: a boolean indicating
      *                                              whether the trap was triggered by suspicious timing or not.
 	 */
-	public static function process_bot_trap( $triggered_trap_callback = array() ) {
+	public static function process_bot_trap($triggered_trap_callback = array()) {
         // what's your email address Mr. Bot ?
-		$empty_trap = isset( $_REQUEST[ 'tkt-slctr-request-processor-email' ] )
-                      && $_REQUEST[ 'tkt-slctr-request-processor-email' ] === ''
+		$empty_trap = isset($_REQUEST['tkt-slctr-request-processor-email'])
+                      && $_REQUEST['tkt-slctr-request-processor-email'] === ''
             ? true
             : false;
 		// get encrypted timestamp for when the form was originally displayed
-		$bot_trap_timestamp = isset( $_REQUEST[ 'tkt-slctr-request-processor-token' ] )
-            ? sanitize_text_field( $_REQUEST[ 'tkt-slctr-request-processor-token' ] )
+		$bot_trap_timestamp = isset($_REQUEST['tkt-slctr-request-processor-token'])
+            ? sanitize_text_field($_REQUEST['tkt-slctr-request-processor-token'])
             : '';
 		// decrypt and convert to absolute  integer
-		if ( EE_Registry::instance()->CFG->registration->use_encryption ) {
-			EE_Registry::instance()->load_core( 'EE_Encryption' );
-			$bot_trap_timestamp = absint( EE_Encryption::instance()->decrypt( $bot_trap_timestamp ) );
+		if (EE_Registry::instance()->CFG->registration->use_encryption) {
+			EE_Registry::instance()->load_core('EE_Encryption');
+			$bot_trap_timestamp = absint(EE_Encryption::instance()->decrypt($bot_trap_timestamp));
 		} else {
-			$bot_trap_timestamp = absint( $bot_trap_timestamp );
+			$bot_trap_timestamp = absint($bot_trap_timestamp);
 		}
 		// ticket form submitted too impossibly fast ( after now ) or more than an hour later ???
-		$suspicious_timing = $bot_trap_timestamp > time() || $bot_trap_timestamp < ( time() - HOUR_IN_SECONDS )
+		$suspicious_timing = $bot_trap_timestamp > time() || $bot_trap_timestamp < (time() - HOUR_IN_SECONDS)
             ? true
             : false;
 		// are we human ?
-		if ( $empty_trap && ! $suspicious_timing ) {
+		if ($empty_trap && ! $suspicious_timing) {
 		    do_action('AHEE__EED_Bot_Trap__process_bot_trap__trap_not_triggered');
 			return;
 		}
 		// check the given callback is valid first before executing
-		if ( ! is_callable($triggered_trap_callback ) ) {
+		if ( ! is_callable($triggered_trap_callback)) {
 			// invalid callback so lets just sub in our default.
-            $triggered_trap_callback = array( 'EED_Bot_Trap', 'triggered_trap_response' );
+            $triggered_trap_callback = array('EED_Bot_Trap', 'triggered_trap_response');
 		}
-		call_user_func_array($triggered_trap_callback, array( $suspicious_timing ) );
+		call_user_func_array($triggered_trap_callback, array($suspicious_timing));
 	}
 
 
@@ -179,15 +179,15 @@ 
 	 *
 	 * @param bool  $suspicious_timing  If true, then the bot trap was triggered due to the suspicious timing test.
 	 */
-	public static function triggered_trap_response( $suspicious_timing ) {
+	public static function triggered_trap_response($suspicious_timing) {
 		// UH OH...
 		$redirect_url = add_query_arg(
-			array( 'ee' => 'ticket_selection_received' ),
+			array('ee' => 'ticket_selection_received'),
 			EE_Registry::instance()->CFG->core->reg_page_url()
 		);
-		if ( $suspicious_timing ) {
+		if ($suspicious_timing) {
 			$redirect_url = add_query_arg(
-				array( 'ee-notice' => urlencode( esc_html__( 'We\'re sorry, but your ticket selections could not be processed due to a server timing error. Please hit the back button on your browser and try again.', 'event_espresso' ) ) ),
+				array('ee-notice' => urlencode(esc_html__('We\'re sorry, but your ticket selections could not be processed due to a server timing error. Please hit the back button on your browser and try again.', 'event_espresso'))),
 				$redirect_url
 			);
 		}
@@ -218,10 +218,10 @@ 
 	 * @return    void
 	 */
 	public static function display_bot_trap_success() {
-		add_filter( 'FHEE__EED_Single_Page_Checkout__run', '__return_false' );
-		$bot_notice = esc_html__( 'Thank you so much. Your ticket selections have been received for consideration.', 'event_espresso' );
-		$bot_notice = isset( $_REQUEST[ 'ee-notice' ] ) && $_REQUEST[ 'ee-notice' ] !== '' ? sanitize_text_field( stripslashes( $_REQUEST[ 'ee-notice' ] ) ) : $bot_notice;
-		EE_Registry::instance()->REQ->add_output( EEH_HTML::div( $bot_notice, '', 'ee-attention' ) );
+		add_filter('FHEE__EED_Single_Page_Checkout__run', '__return_false');
+		$bot_notice = esc_html__('Thank you so much. Your ticket selections have been received for consideration.', 'event_espresso');
+		$bot_notice = isset($_REQUEST['ee-notice']) && $_REQUEST['ee-notice'] !== '' ? sanitize_text_field(stripslashes($_REQUEST['ee-notice'])) : $bot_notice;
+		EE_Registry::instance()->REQ->add_output(EEH_HTML::div($bot_notice, '', 'ee-attention'));
 	}
 
 
@@ -256,20 +256,20 @@ 
 				'html_id'         			=> 'bot_trap_settings',
 				'layout_strategy' 	=> new EE_Admin_Two_Column_Layout(),
 				'subsections'     		=> array(
-					'bot_trap_hdr' 		=> new EE_Form_Section_HTML( EEH_HTML::h2( esc_html__( 'Bot Trap Settings', 'event_espresso' ) ) ),
+					'bot_trap_hdr' 		=> new EE_Form_Section_HTML(EEH_HTML::h2(esc_html__('Bot Trap Settings', 'event_espresso'))),
 					'use_bot_trap' 		=> new EE_Yes_No_Input(
 						array(
-							'html_label_text' 	=> esc_html__( 'Enable Bot Trap', 'event_espresso' ),
-							'html_help_text' 		=>  esc_html__( 'The Event Espresso Bot Trap will insert a fake input into your Ticket Selector forms that is hidden from regular site visitors, but visible to spam bots. Because the input asks for an email address, it is irresistible to spam bots who will of course enter text into it. Since regular site visitors can not see this input, any value detected during form submission means a bot has been detected, which will then be blocked from submitting the form.', 'event_espresso' ),
-							'default'        			=> isset( EE_Registry::instance()->CFG->registration->use_bot_trap ) ? EE_Registry::instance()->CFG->registration->use_bot_trap : true,
+							'html_label_text' 	=> esc_html__('Enable Bot Trap', 'event_espresso'),
+							'html_help_text' 		=>  esc_html__('The Event Espresso Bot Trap will insert a fake input into your Ticket Selector forms that is hidden from regular site visitors, but visible to spam bots. Because the input asks for an email address, it is irresistible to spam bots who will of course enter text into it. Since regular site visitors can not see this input, any value detected during form submission means a bot has been detected, which will then be blocked from submitting the form.', 'event_espresso'),
+							'default'        			=> isset(EE_Registry::instance()->CFG->registration->use_bot_trap) ? EE_Registry::instance()->CFG->registration->use_bot_trap : true,
 							'required'        		=> false
 						)
 					),
 					'use_encryption' 		=> new EE_Yes_No_Input(
 						array(
-							'html_label_text' 	=> esc_html__( 'Encrypt Bot Trap Data', 'event_espresso' ),
-							'html_help_text' 		=>  esc_html__( 'One way to detect spam bots is by looking at how long it takes them to submit a form. They are often inhumanly fast, or will submit forms hours, days, or even weeks after the form was first scraped off the web. The Event Espresso Bot Trap will send a timestamp with the Ticket Selector form when it is submitted. By default, this timestamp is encrypted so that the spam bots can not change it, but encryption may cause issues on some servers due to configuration "conflicts". If you continuously get caught in the bot trap, then try setting this option to "No". This may increase the number of spam submissions you receive, but increases server compatibility.', 'event_espresso' ),
-							'default'        			=> isset( EE_Registry::instance()->CFG->registration->use_encryption ) ? EE_Registry::instance()->CFG->registration->use_encryption : true,
+							'html_label_text' 	=> esc_html__('Encrypt Bot Trap Data', 'event_espresso'),
+							'html_help_text' 		=>  esc_html__('One way to detect spam bots is by looking at how long it takes them to submit a form. They are often inhumanly fast, or will submit forms hours, days, or even weeks after the form was first scraped off the web. The Event Espresso Bot Trap will send a timestamp with the Ticket Selector form when it is submitted. By default, this timestamp is encrypted so that the spam bots can not change it, but encryption may cause issues on some servers due to configuration "conflicts". If you continuously get caught in the bot trap, then try setting this option to "No". This may increase the number of spam submissions you receive, but increases server compatibility.', 'event_espresso'),
+							'default'        			=> isset(EE_Registry::instance()->CFG->registration->use_encryption) ? EE_Registry::instance()->CFG->registration->use_encryption : true,
 							'required'        		=> false
 						)
 					),
@@ -287,30 +287,30 @@ 
 	 * @param \EE_Registration_Config $EE_Registration_Config
 	 * @return \EE_Registration_Config
 	 */
-	public static function update_bot_trap_settings_form( EE_Registration_Config $EE_Registration_Config ) {
+	public static function update_bot_trap_settings_form(EE_Registration_Config $EE_Registration_Config) {
 		try {
 			$bot_trap_settings_form = EED_Bot_Trap::_bot_trap_settings_form();
 			// if not displaying a form, then check for form submission
-			if ( $bot_trap_settings_form->was_submitted() ) {
+			if ($bot_trap_settings_form->was_submitted()) {
 				// capture form data
 				$bot_trap_settings_form->receive_form_submission();
 				// validate form data
-				if ( $bot_trap_settings_form->is_valid() ) {
+				if ($bot_trap_settings_form->is_valid()) {
 					// grab validated data from form
 					$valid_data = $bot_trap_settings_form->valid_data();
-					if ( isset( $valid_data[ 'use_bot_trap' ], $valid_data[ 'use_encryption' ] ) ) {
-						$EE_Registration_Config->use_bot_trap = $valid_data[ 'use_bot_trap' ];
-						$EE_Registration_Config->use_encryption = $valid_data[ 'use_encryption' ];
+					if (isset($valid_data['use_bot_trap'], $valid_data['use_encryption'])) {
+						$EE_Registration_Config->use_bot_trap = $valid_data['use_bot_trap'];
+						$EE_Registration_Config->use_encryption = $valid_data['use_encryption'];
 					} else {
-						EE_Error::add_error( esc_html__( 'Invalid or missing Bot Trap settings. Please refresh the form and try again.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+						EE_Error::add_error(esc_html__('Invalid or missing Bot Trap settings. Please refresh the form and try again.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					}
 				} else {
-					if ( $bot_trap_settings_form->submission_error_message() != '' ) {
-						EE_Error::add_error( $bot_trap_settings_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__ );
+					if ($bot_trap_settings_form->submission_error_message() != '') {
+						EE_Error::add_error($bot_trap_settings_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__);
 					}
 				}
 			}
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 		return $EE_Registration_Config;

shortcodes/espresso_ticket_selector/EES_Espresso_Ticket_Selector.shortcode.php

Spacing +9 added lines, -9 removed lines

@@ -50,8 +50,8 @@ 
 	 * @access    public
 	 * @param \WP $WP
 	 */
-	public function run( WP $WP ) {
-		add_filter( 'FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true' );
+	public function run(WP $WP) {
+		add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true');
 	}
 
 
@@ -62,14 +62,14 @@ 
 	 *  @param		array 	$attributes
 	 *  @return 	string
 	 */
-	public function process_shortcode( $attributes = array() ) {
-		extract( $attributes );
-		$event_id = isset( $event_id ) ? $event_id : 0;
-		$event = EE_Registry::instance()->load_model( 'Event' )->get_one_by_ID( $event_id );
+	public function process_shortcode($attributes = array()) {
+		extract($attributes);
+		$event_id = isset($event_id) ? $event_id : 0;
+		$event = EE_Registry::instance()->load_model('Event')->get_one_by_ID($event_id);
 		ob_start();
-		do_action( 'AHEE_event_details_before_post', $event_id );
-		espresso_ticket_selector( $event );
-		do_action( 'AHEE_event_details_after_post' );
+		do_action('AHEE_event_details_before_post', $event_id);
+		espresso_ticket_selector($event);
+		do_action('AHEE_event_details_after_post');
 		return ob_get_clean();
 	}
 

caffeinated/payment_methods/Paypal_Pro/EEG_Paypal_Pro.gateway.php

Spacing +52 added lines, -52 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EEG_Paypal_Pro extends EE_Onsite_Gateway{
+class EEG_Paypal_Pro extends EE_Onsite_Gateway {
 	/**
 	 *
 	 * @var $_paypal_api_username string
@@ -88,30 +88,30 @@ 
 	 * } @see parent::do_direct_payment for more info
 	 * @return \EE_Payment|\EEI_Payment
 	 */
-	public function do_direct_payment($payment,$billing_info = null){
+	public function do_direct_payment($payment, $billing_info = null) {
 		$transaction = $payment->transaction();
 		$primary_registrant = $transaction->primary_registration();
-		$order_description  = $this->_format_order_description( $payment );
+		$order_description  = $this->_format_order_description($payment);
 		//charge for the full amount. Show itemized list
-		if( $this->_can_easily_itemize_transaction_for( $payment ) ){
+		if ($this->_can_easily_itemize_transaction_for($payment)) {
 			$item_num = 1;
 			$total_line_item = $transaction->total_line_item();
 			$order_items = array();
 			foreach ($total_line_item->get_items() as $line_item) {
 				//ignore line items with a quantity of 0
-				if( $line_item->quantity() == 0 ) {
+				if ($line_item->quantity() == 0) {
 					continue;
 				}
 				$item = array(
 						// Item Name.  127 char max.
 						'l_name' => substr(
-							$this->_format_line_item_name( $line_item, $payment ),
+							$this->_format_line_item_name($line_item, $payment),
 							0,
 							127
 						),
 						// Item description.  127 char max.
 						'l_desc' => substr( 
-							$this->_format_line_item_desc( $line_item, $payment ),
+							$this->_format_line_item_desc($line_item, $payment),
 							0,
 							127
 						),
@@ -135,20 +135,20 @@ 
 			}
 			$item_amount = $total_line_item->get_items_total();
 			$tax_amount = $total_line_item->get_total_tax();
-		}else{
+		} else {
 			$order_items = array();
 			$item_amount = $payment->amount();
 			$tax_amount = 0;
-			array_push($order_items,array(
+			array_push($order_items, array(
 				// Item Name.  127 char max.
 				'l_name' => substr(
-					$this->_format_partial_payment_line_item_name( $payment ),
+					$this->_format_partial_payment_line_item_name($payment),
 					0,
 					127
 				),
 				// Item description.  127 char max.
 				'l_desc' => substr( 
-					$this->_format_partial_payment_line_item_desc( $payment ),
+					$this->_format_partial_payment_line_item_desc($payment),
 					0,
 					127
 				),
@@ -196,11 +196,11 @@ 
 			// Payer's salutation.  20 char max.
 			'salutation' => '',
 			// Payer's first name.  25 char max.
-			'firstname' => substr($billing_info['first_name'],0,25),
+			'firstname' => substr($billing_info['first_name'], 0, 25),
 			// Payer's middle name.  25 char max.
 			'middlename' => '',
 			// Payer's last name.  25 char max.
-			'lastname' => substr($billing_info['last_name'],0,25),
+			'lastname' => substr($billing_info['last_name'], 0, 25),
 			// Payer's suffix.  12 char max.
 			'suffix' => ''
 		);
@@ -213,13 +213,13 @@ 
 			// Required.  Name of City.
 			'city' => $billing_info['city'],
 			// Required. Name of State or Province.
-			'state' => substr( $billing_info['state'], 0, 40 ),
+			'state' => substr($billing_info['state'], 0, 40),
 			// Required.  Country code.
 			'countrycode' => $billing_info['country'],
 			// Required.  Postal code of payer.
 			'zip' => $billing_info['zip'],
 			// Phone Number of payer.  20 char max.
-			'shiptophonenum' => substr($billing_info['phone'],0,20)
+			'shiptophonenum' => substr($billing_info['phone'], 0, 20)
 		);
 
 
@@ -229,7 +229,7 @@ 
 			// Required.  Three-letter currency code.  Default is USD.
 			'currencycode' => $payment->currency_code(),
 			// Required if you include itemized cart details. (L_AMTn, etc.)  Subtotal of items not including S&H, or tax.
-			'itemamt' => $this->format_currency($item_amount),//
+			'itemamt' => $this->format_currency($item_amount), //
 			// Total shipping costs for the order.  If you specify shippingamt, you must also specify itemamt.
 			'shippingamt' => '',
 			// Total handling costs for the order.  If you specify handlingamt, you must also specify itemamt.
@@ -241,10 +241,10 @@ 
 			// Free-form field for your own use.  256 char max.
 			'custom' => $primary_registrant ? $primary_registrant->ID() : '',
 			// Your own invoice or tracking number
-			'invnum' => wp_generate_password(12,false),//$transaction->ID(),
+			'invnum' => wp_generate_password(12, false), //$transaction->ID(),
 			// URL for receiving Instant Payment Notifications.  This overrides what your profile is set to use.
 			'notifyurl' => '',
-			'buttonsource' => 'EventEspresso_SP',//EE will blow up if you change this
+			'buttonsource' => 'EventEspresso_SP', //EE will blow up if you change this
 		);
 		// Wrap all data arrays into a single, "master" array which will be passed into the class function.
 		$PayPalRequestData = array(
@@ -257,32 +257,32 @@ 
 				'OrderItems' => $order_items,
 		);
 		$this->_log_clean_request($PayPalRequestData, $payment);
-		try{
+		try {
 			$PayPalResult = $this->prep_and_curl_request($PayPalRequestData);
 			//remove PCI-sensitive data so it doesn't get stored
-			$PayPalResult = $this->_log_clean_response($PayPalResult,$payment);
+			$PayPalResult = $this->_log_clean_response($PayPalResult, $payment);
 
 			$message = isset($PayPalResult['L_LONGMESSAGE0']) ? $PayPalResult['L_LONGMESSAGE0'] : $PayPalResult['ACK'];
-			if( empty($PayPalResult[ 'RAWRESPONSE' ] ) ) {
-				$payment->set_status( $this->_pay_model->failed_status() ) ;
-				$payment->set_gateway_response( __( 'No response received from Paypal Pro', 'event_espresso' ) );
+			if (empty($PayPalResult['RAWRESPONSE'])) {
+				$payment->set_status($this->_pay_model->failed_status());
+				$payment->set_gateway_response(__('No response received from Paypal Pro', 'event_espresso'));
 				$payment->set_details($PayPalResult);
-			}else{
-				if($this->_APICallSuccessful($PayPalResult)){
+			} else {
+				if ($this->_APICallSuccessful($PayPalResult)) {
 					$payment->set_status($this->_pay_model->approved_status());
-				}else{
+				} else {
 					$payment->set_status($this->_pay_model->declined_status());
 				}
 				//make sure we interpret the AMT as a float, not an international string (where periods are thousand separators)
-				$payment->set_amount(isset($PayPalResult['AMT']) ? floatval( $PayPalResult['AMT'] ) : 0);
+				$payment->set_amount(isset($PayPalResult['AMT']) ? floatval($PayPalResult['AMT']) : 0);
 				$payment->set_gateway_response($message);
-				$payment->set_txn_id_chq_nmbr(isset( $PayPalResult['TRANSACTIONID'] )? $PayPalResult['TRANSACTIONID'] : null);
+				$payment->set_txn_id_chq_nmbr(isset($PayPalResult['TRANSACTIONID']) ? $PayPalResult['TRANSACTIONID'] : null);
 
 				$primary_registration_code = $primary_registrant instanceof EE_Registration ? $primary_registrant->reg_code() : '';
 				$payment->set_extra_accntng($primary_registration_code);
 				$payment->set_details($PayPalResult);
 			}
-		}catch(Exception $e){
+		} catch (Exception $e) {
 			$payment->set_status($this->_pay_model->failed_status());
 			$payment->set_gateway_response($e->getMessage());
 		}
@@ -299,7 +299,7 @@ 
 	 * @param EEI_Payment $payment
 	 * @return array
 	 */
-	private function _log_clean_request($request,$payment){
+	private function _log_clean_request($request, $payment) {
 		$cleaned_request_data = $request;
 		unset($cleaned_request_data['CCDetails']['acct']);
 		unset($cleaned_request_data['CCDetails']['cvv2']);
@@ -315,13 +315,13 @@ 
 	 * @param EEI_Payment $payment
 	 * @return array cleaned
 	 */
-	private function _log_clean_response($response,$payment){
+	private function _log_clean_response($response, $payment) {
 		unset($response['REQUESTDATA']['CREDITCARDTYPE']);
 		unset($response['REQUESTDATA']['ACCT']);
 		unset($response['REQUESTDATA']['EXPDATE']);
 		unset($response['REQUESTDATA']['CVV2']);
 		unset($response['RAWREQUEST']);
-		$this->log(array('Paypal Response'=>$response),$payment);
+		$this->log(array('Paypal Response'=>$response), $payment);
 		return $response;
 	}
 
@@ -346,32 +346,32 @@ 
 		// DP Fields
 		$DPFields = isset($DataArray['DPFields']) ? $DataArray['DPFields'] : array();
 		foreach ($DPFields as $DPFieldsVar => $DPFieldsVal)
-			$DPFieldsNVP .= '&' . strtoupper($DPFieldsVar) . '=' . urlencode($DPFieldsVal);
+			$DPFieldsNVP .= '&'.strtoupper($DPFieldsVar).'='.urlencode($DPFieldsVal);
 
 		// CC Details Fields
 		$CCDetails = isset($DataArray['CCDetails']) ? $DataArray['CCDetails'] : array();
 		foreach ($CCDetails as $CCDetailsVar => $CCDetailsVal)
-			$CCDetailsNVP .= '&' . strtoupper($CCDetailsVar) . '=' . urlencode($CCDetailsVal);
+			$CCDetailsNVP .= '&'.strtoupper($CCDetailsVar).'='.urlencode($CCDetailsVal);
 
 		// PayerInfo Type Fields
 		$PayerInfo = isset($DataArray['PayerInfo']) ? $DataArray['PayerInfo'] : array();
 		foreach ($PayerInfo as $PayerInfoVar => $PayerInfoVal)
-			$PayerInfoNVP .= '&' . strtoupper($PayerInfoVar) . '=' . urlencode($PayerInfoVal);
+			$PayerInfoNVP .= '&'.strtoupper($PayerInfoVar).'='.urlencode($PayerInfoVal);
 
 		// Payer Name Fields
 		$PayerName = isset($DataArray['PayerName']) ? $DataArray['PayerName'] : array();
 		foreach ($PayerName as $PayerNameVar => $PayerNameVal)
-			$PayerNameNVP .= '&' . strtoupper($PayerNameVar) . '=' . urlencode($PayerNameVal);
+			$PayerNameNVP .= '&'.strtoupper($PayerNameVar).'='.urlencode($PayerNameVal);
 
 		// Address Fields (Billing)
 		$BillingAddress = isset($DataArray['BillingAddress']) ? $DataArray['BillingAddress'] : array();
 		foreach ($BillingAddress as $BillingAddressVar => $BillingAddressVal)
-			$BillingAddressNVP .= '&' . strtoupper($BillingAddressVar) . '=' . urlencode($BillingAddressVal);
+			$BillingAddressNVP .= '&'.strtoupper($BillingAddressVar).'='.urlencode($BillingAddressVal);
 
 		// Payment Details Type Fields
 		$PaymentDetails = isset($DataArray['PaymentDetails']) ? $DataArray['PaymentDetails'] : array();
 		foreach ($PaymentDetails as $PaymentDetailsVar => $PaymentDetailsVal)
-			$PaymentDetailsNVP .= '&' . strtoupper($PaymentDetailsVar) . '=' . urlencode($PaymentDetailsVal);
+			$PaymentDetailsNVP .= '&'.strtoupper($PaymentDetailsVar).'='.urlencode($PaymentDetailsVal);
 
 		// Payment Details Item Type Fields
 		$OrderItems = isset($DataArray['OrderItems']) ? $DataArray['OrderItems'] : array();
@@ -379,22 +379,22 @@ 
 		foreach ($OrderItems as $OrderItemsVar => $OrderItemsVal) {
 			$CurrentItem = $OrderItems[$OrderItemsVar];
 			foreach ($CurrentItem as $CurrentItemVar => $CurrentItemVal)
-				$OrderItemsNVP .= '&' . strtoupper($CurrentItemVar) . $n . '=' . urlencode($CurrentItemVal);
+				$OrderItemsNVP .= '&'.strtoupper($CurrentItemVar).$n.'='.urlencode($CurrentItemVal);
 			$n++;
 		}
 
 		// Ship To Address Fields
 		$ShippingAddress = isset($DataArray['ShippingAddress']) ? $DataArray['ShippingAddress'] : array();
 		foreach ($ShippingAddress as $ShippingAddressVar => $ShippingAddressVal)
-			$ShippingAddressNVP .= '&' . strtoupper($ShippingAddressVar) . '=' . urlencode($ShippingAddressVal);
+			$ShippingAddressNVP .= '&'.strtoupper($ShippingAddressVar).'='.urlencode($ShippingAddressVal);
 
 		// 3D Secure Fields
 		$Secure3D = isset($DataArray['Secure3D']) ? $DataArray['Secure3D'] : array();
 		foreach ($Secure3D as $Secure3DVar => $Secure3DVal)
-			$Secure3DNVP .= '&' . strtoupper($Secure3DVar) . '=' . urlencode($Secure3DVal);
+			$Secure3DNVP .= '&'.strtoupper($Secure3DVar).'='.urlencode($Secure3DVal);
 
 		// Now that we have each chunk we need to go ahead and append them all together for our entire NVP string
-		$NVPRequest = 'USER=' . $this->_username . '&PWD=' . $this->_password . '&VERSION=64.0' . '&SIGNATURE=' . $this->_signature . $DPFieldsNVP . $CCDetailsNVP . $PayerInfoNVP . $PayerNameNVP . $BillingAddressNVP . $PaymentDetailsNVP . $OrderItemsNVP . $ShippingAddressNVP . $Secure3DNVP;
+		$NVPRequest = 'USER='.$this->_username.'&PWD='.$this->_password.'&VERSION=64.0'.'&SIGNATURE='.$this->_signature.$DPFieldsNVP.$CCDetailsNVP.$PayerInfoNVP.$PayerNameNVP.$BillingAddressNVP.$PaymentDetailsNVP.$OrderItemsNVP.$ShippingAddressNVP.$Secure3DNVP;
 		$NVPResponse = $this->_CURLRequest($NVPRequest);
 		$NVPRequestArray = $this->_NVPToArray($NVPRequest);
 		$NVPResponseArray = $this->_NVPToArray($NVPResponse);
@@ -418,7 +418,7 @@ 
 	private function _CURLRequest($Request) {
 		$EndPointURL = $this->_debug_mode ? 'https://api-3t.sandbox.paypal.com/nvp' : 'https://api-3t.paypal.com/nvp';
 		$curl = curl_init();
-		curl_setopt($curl, CURLOPT_VERBOSE, apply_filters('FHEE__EEG_Paypal_Pro__CurlRequest__CURLOPT_VERBOSE', TRUE ) );
+		curl_setopt($curl, CURLOPT_VERBOSE, apply_filters('FHEE__EEG_Paypal_Pro__CurlRequest__CURLOPT_VERBOSE', TRUE));
 		curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE);
 		curl_setopt($curl, CURLOPT_TIMEOUT, 60);
 		curl_setopt($curl, CURLOPT_URL, $EndPointURL);
@@ -468,9 +468,9 @@ 
 	private function _APICallSuccessful($PayPalResult) {
 		$approved = false;
 		// check main response message from PayPal
-		if (isset($PayPalResult['ACK']) && !empty($PayPalResult['ACK'])) {
+		if (isset($PayPalResult['ACK']) && ! empty($PayPalResult['ACK'])) {
 			$ack = strtoupper($PayPalResult['ACK']);
-			$approved = ( $ack == 'SUCCESS' || $ack == 'SUCCESSWITHWARNING' || $ack == 'PARTIALSUCCESS' ) ? true : false;
+			$approved = ($ack == 'SUCCESS' || $ack == 'SUCCESSWITHWARNING' || $ack == 'PARTIALSUCCESS') ? true : false;
 		}
 
 		return $approved;
@@ -486,11 +486,11 @@ 
 
 		$Errors = array();
 		$n = 0;
-		while (isset($DataArray['L_ERRORCODE' . $n . ''])) {
-			$LErrorCode = isset($DataArray['L_ERRORCODE' . $n . '']) ? $DataArray['L_ERRORCODE' . $n . ''] : '';
-			$LShortMessage = isset($DataArray['L_SHORTMESSAGE' . $n . '']) ? $DataArray['L_SHORTMESSAGE' . $n . ''] : '';
-			$LLongMessage = isset($DataArray['L_LONGMESSAGE' . $n . '']) ? $DataArray['L_LONGMESSAGE' . $n . ''] : '';
-			$LSeverityCode = isset($DataArray['L_SEVERITYCODE' . $n . '']) ? $DataArray['L_SEVERITYCODE' . $n . ''] : '';
+		while (isset($DataArray['L_ERRORCODE'.$n.''])) {
+			$LErrorCode = isset($DataArray['L_ERRORCODE'.$n.'']) ? $DataArray['L_ERRORCODE'.$n.''] : '';
+			$LShortMessage = isset($DataArray['L_SHORTMESSAGE'.$n.'']) ? $DataArray['L_SHORTMESSAGE'.$n.''] : '';
+			$LLongMessage = isset($DataArray['L_LONGMESSAGE'.$n.'']) ? $DataArray['L_LONGMESSAGE'.$n.''] : '';
+			$LSeverityCode = isset($DataArray['L_SEVERITYCODE'.$n.'']) ? $DataArray['L_SEVERITYCODE'.$n.''] : '';
 
 			$CurrentItem = array(
 					'L_ERRORCODE' => $LErrorCode,
@@ -530,7 +530,7 @@ 
 				elseif ($CurrentErrorVar == 'L_SEVERITYCODE')
 					$CurrentVarName = 'Severity Code';
 
-				$error .= '<br />' . $CurrentVarName . ': ' . $CurrentErrorVal;
+				$error .= '<br />'.$CurrentVarName.': '.$CurrentErrorVal;
 			}
 		}
 		return $error;

caffeinated/modules/ticket_selector_caff/EED_Ticket_Selector_Caff.module.php

Spacing +27 added lines, -27 removed lines

@@ -16,7 +16,7 @@ 
 	 * @return EED_Ticket_Selector_Caff
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -37,24 +37,24 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks_admin() {
-		define( 'TICKET_SELECTOR_CAFF_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
-		add_action( 'AHEE__template_settings__template__before_settings_form', array( 'EED_Ticket_Selector_Caff', 'template_settings_form' ), 10 );
-		add_filter( 'FHEE__General_Settings_Admin_Page__update_template_settings__data', array( 'EED_Ticket_Selector_Caff', 'update_template_settings' ), 10, 2 );
+		define('TICKET_SELECTOR_CAFF_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
+		add_action('AHEE__template_settings__template__before_settings_form', array('EED_Ticket_Selector_Caff', 'template_settings_form'), 10);
+		add_filter('FHEE__General_Settings_Admin_Page__update_template_settings__data', array('EED_Ticket_Selector_Caff', 'update_template_settings'), 10, 2);
 	}
 
 
 	//just required because of abstract declaration
-	public function run( $WP ) {
+	public function run($WP) {
 		$this->set_config();
 	}
 
 
 
 
-	protected function set_config(){
-		$this->set_config_section( 'template_settings' );
-		$this->set_config_class( 'EE_Ticket_Selector_Config' );
-		$this->set_config_name( 'EED_Ticket_Selector' );
+	protected function set_config() {
+		$this->set_config_section('template_settings');
+		$this->set_config_class('EE_Ticket_Selector_Config');
+		$this->set_config_name('EED_Ticket_Selector');
 	}
 
 
@@ -87,8 +87,8 @@ 
 					'FHEE__EED_Ticket_Selector_Caff___ticket_selector_settings_form__form_subsections',
 					array(
 						'appearance_settings_hdr' 	=> new EE_Form_Section_HTML(
-							EEH_HTML::br(2) .
-							EEH_HTML::h2( __( 'Ticket Selector Template Settings', 'event_espresso' ))
+							EEH_HTML::br(2).
+							EEH_HTML::h2(__('Ticket Selector Template Settings', 'event_espresso'))
 						),
 						'appearance_settings' 			=> EED_Ticket_Selector_Caff::_ticket_selector_appearance_settings()
 					)
@@ -113,9 +113,9 @@ 
 						array(
 							'show_ticket_details' => new EE_Yes_No_Input(
 								array(
-									'html_label_text' => __('Show Ticket Details?', 'event_espresso' ),
-									'html_help_text' => __( 'This lets you choose whether the extra ticket details section is displayed with the ticket selector.', 'event_espresso'),
-									'default' => isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details )
+									'html_label_text' => __('Show Ticket Details?', 'event_espresso'),
+									'html_help_text' => __('This lets you choose whether the extra ticket details section is displayed with the ticket selector.', 'event_espresso'),
+									'default' => isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details)
 										? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details
 										: true,
 									'display_html_label_text' => false
@@ -123,9 +123,9 @@ 
 							),
 							'show_ticket_sale_columns' => new EE_Yes_No_Input(
 								array(
-									'html_label_text' => __('Show Ticket Sale Info?', 'event_espresso' ),
-									'html_help_text' => __( 'This lets you indicate whether information about ticket sales is shown with ticket details in the ticket selector.', 'event_espresso'),
-									'default' => isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns )
+									'html_label_text' => __('Show Ticket Sale Info?', 'event_espresso'),
+									'html_help_text' => __('This lets you indicate whether information about ticket sales is shown with ticket details in the ticket selector.', 'event_espresso'),
+									'default' => isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns)
 										? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns
 										: true,
 									'display_html_label_text' => false
@@ -133,9 +133,9 @@ 
 							),
 							'show_expired_tickets' => new EE_Yes_No_Input(
 								array(
-									'html_label_text' => __( 'Show Expired Tickets?', 'event_espresso' ),
-									'html_help_text' => __( 'Indicate whether to show expired tickets in the ticket selector', 'event_espresso' ),
-									'default' => isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets )
+									'html_label_text' => __('Show Expired Tickets?', 'event_espresso'),
+									'html_help_text' => __('Indicate whether to show expired tickets in the ticket selector', 'event_espresso'),
+									'default' => isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets)
 										? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets
 										: true,
 									'display_html_label_text' => false
@@ -158,21 +158,21 @@ 
 	 * @param array              $REQ incoming request
 	 * @return EE_Template_Config
 	 */
-	public static function update_template_settings( EE_Template_Config $CFG, $REQ ) {
-		if ( ! isset( $CFG->EED_Ticket_Selector ) ) {
+	public static function update_template_settings(EE_Template_Config $CFG, $REQ) {
+		if ( ! isset($CFG->EED_Ticket_Selector)) {
 			$CFG->EED_Ticket_Selector = new EE_Ticket_Selector_Config();
 		}
 		try {
 			$ticket_selector_form = EED_Ticket_Selector_Caff::_ticket_selector_settings_form();
 
 			//check for form submission
-			if ( $ticket_selector_form->was_submitted() ) {
+			if ($ticket_selector_form->was_submitted()) {
 
 				//capture form data
 				$ticket_selector_form->receive_form_submission();
 
 				//validate form data
-				if ( $ticket_selector_form->is_valid() ) {
+				if ($ticket_selector_form->is_valid()) {
 
 					//grab validated data from form
 					$valid_data = $ticket_selector_form->valid_data();
@@ -182,13 +182,13 @@ 
 					$CFG->EED_Ticket_Selector->show_ticket_details = $valid_data['appearance_settings']['show_ticket_details'];
 					$CFG->EED_Ticket_Selector->show_expired_tickets = $valid_data['appearance_settings']['show_expired_tickets'];
 				} else {
-					if ( $ticket_selector_form->submission_error_message() !== '' ) {
-						EE_Error::add_error( $ticket_selector_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__ );
+					if ($ticket_selector_form->submission_error_message() !== '') {
+						EE_Error::add_error($ticket_selector_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__);
 					}
 				}
 
 			}
-		} catch( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 

core/admin/templates/admin_details_wrapper_no_sidebar.template.php

Spacing +2 added lines, -2 removed lines

@@ -21,8 +21,8 @@
 
 
         <div id="postbox-container-2" class="postbox-container">
-            <?php do_meta_boxes( $current_page, 'normal', NULL ); ?>
-            <?php do_meta_boxes( $current_page, 'advanced', NULL ); ?>
+            <?php do_meta_boxes($current_page, 'normal', NULL); ?>
+            <?php do_meta_boxes($current_page, 'advanced', NULL); ?>
         </div>
         <!-- postbox-container-2 -->
         <div class="clear"></div>

core/admin/PostShortcodeTracking.php

Doc Comments +1 added lines, -1 removed lines

@@ -259,7 +259,7 @@
      * @param  int $ID
      * @param      $shortcode_class
      * @param      $shortcode_posts
-     * @param      $page_for_posts
+     * @param      string $page_for_posts
      * @param bool $update_post_shortcodes
      * @return bool
      */

Indentation +445 added lines, -445 removed lines

@@ -2,7 +2,7 @@ 
 namespace EventEspresso\core\admin;
 
 if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-    exit( 'No direct script access allowed' );
+	exit( 'No direct script access allowed' );
 }
 
 
@@ -19,450 +19,450 @@ 
 class PostShortcodeTracking
 {
 
-    /**
-     * set_hooks_admin
-     *
-     * @access    public
-     */
-    public static function set_hooks_admin()
-    {
-        add_action(
-            'save_post',
-            array( 'EventEspresso\core\admin\PostShortcodeTracking', 'parse_post_content_on_save' ),
-            100,
-            2
-        );
-        add_action(
-            'delete_post',
-            array( 'EventEspresso\core\admin\PostShortcodeTracking', 'unset_post_shortcodes_on_delete' ),
-            100,
-            1
-        );
-        add_action(
-            'add_option_page_for_posts',
-            array( 'EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_initial_set' ),
-            100,
-            2
-        );
-        add_action(
-            'update_option',
-            array( 'EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_change' ),
-            100,
-            3
-        );
-        add_action(
-            'delete_option',
-            array( 'EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_delete' ),
-            100,
-            1
-        );
-    }
-
-
-
-    /**
-     *    parse_post_content_on_save
-     *    any time a post is saved, we need to check for any EE shortcodes that may be embedded in the content,
-     *    and then track what posts those shortcodes are on, so that we can initialize shortcodes well before
-     *    the_content() runs. this allows us to do things like enqueue scripts for shortcodes ONLY on the pages the
-     *    shortcodes are actually used on
-     *
-     * @access    public
-     * @param int      $post_ID
-     * @param \WP_Post $post
-     * @return    void
-     */
-    public static function parse_post_content_on_save( $post_ID, $post )
-    {
-        // if the post is trashed, then let's remove our post shortcode tracking
-        if ( $post instanceof \WP_Post && $post->post_status === 'trash' ) {
-            PostShortcodeTracking::unset_post_shortcodes_on_delete( $post_ID );
-            return;
-        }
-        // default post types
-        $post_types = array( 'post' => 0, 'page' => 1 );
-        // add CPTs
-        $CPTs = \EE_Register_CPTs::get_CPTs();
-        $post_types = array_merge( $post_types, $CPTs );
-        // for default or CPT posts...
-        if ( isset( $post_types[ $post->post_type ] ) ) {
-            // post on frontpage ?
-            $page_for_posts = \EE_Config::get_page_for_posts();
-            if ( $post->post_name === $page_for_posts ) {
-                PostShortcodeTracking::set_post_shortcodes_for_posts_page( $page_for_posts );
-                return;
-            }
-            // array of shortcodes indexed by post name
-            \EE_Registry::CFG()->core->post_shortcodes = isset( \EE_Registry::CFG()->core->post_shortcodes )
-                ? \EE_Registry::CFG()->core->post_shortcodes
-                : array();
-            // whether to proceed with update
-            $update_post_shortcodes = false;
-            // empty both arrays
-            \EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ] = array();
-            // check that posts page is already being tracked
-            if ( ! isset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ] ) ) {
-                // if not, then ensure that it is properly added
-                \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ] = array();
-            }
-            // loop thru shortcodes
-            foreach ( \EE_Registry::instance()->shortcodes as $EES_Shortcode => $shortcode_dir ) {
-                // convert to UPPERCASE to get actual shortcode
-                $EES_Shortcode = strtoupper( $EES_Shortcode );
-                // is the shortcode in the post_content ?
-                if ( strpos( $post->post_content, $EES_Shortcode ) !== false ) {
-                    // map shortcode to post names and post IDs
-                    \EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] = $post_ID;
-                    // and add this shortcode to the tracking for the blog page
-                    PostShortcodeTracking::set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode,
-                        $post_ID );
-                    $update_post_shortcodes = true;
-                } else {
-                    // shortcode is not present in post content, so check if we were tracking it previously
-                    // stop tracking if shortcode is not used in this specific post
-                    if ( isset( \EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] ) ) {
-                        unset( \EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] );
-                        $update_post_shortcodes = true;
-                    }
-                    // make sure that something is set for the shortcode posts (even though we may remove this)
-                    $shortcode_posts = isset(
-                        \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ]
-                    )
-                        ? \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ]
-                        : array();
-                    // and stop tracking for this shortcode on the blog page if it is not used
-                    $update_post_shortcodes = PostShortcodeTracking::unset_posts_page_shortcode_for_post(
-                        $post_ID,
-                        $EES_Shortcode,
-                        $shortcode_posts,
-                        $page_for_posts,
-                        $update_post_shortcodes
-                    )
-                        ? true
-                        : $update_post_shortcodes;
-                }
-            }
-            if ( $update_post_shortcodes ) {
-                PostShortcodeTracking::update_post_shortcodes( $page_for_posts );
-            }
-        }
-    }
-
-
-
-    /**
-     * set_post_shortcodes_for_posts_page (plz note: shortcodes is plural)
-     * called when updating the WordPress Posts Page,
-     * and adds shortcode tracking for the Posts Page, for all shortcodes currently tracked on individual posts
-     *
-     * @access protected
-     * @param  string $page_for_posts
-     * @return void
-     */
-    protected static function set_post_shortcodes_for_posts_page( $page_for_posts )
-    {
-        \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ] = array();
-        // loop thru shortcodes
-        foreach ( \EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes ) {
-            foreach ( $post_shortcodes as $EES_Shortcode => $post_ID ) {
-                PostShortcodeTracking::set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode, $post_ID );
-            }
-        }
-        PostShortcodeTracking::update_post_shortcodes( $page_for_posts );
-    }
-
-
-
-    /**
-     * set_post_shortcode_for_posts_page (plz note: shortcode is singular)
-     * adds Posts Page shortcode tracking for the supplied shortcode for an individual post
-     *
-     * @access protected
-     * @param  string $page_for_posts
-     * @param         $EES_Shortcode
-     * @param         $post_ID
-     */
-    protected static function set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode, $post_ID )
-    {
-        // critical page shortcodes that we do NOT want added to the Posts page (blog)
-        $critical_shortcodes = \EE_Registry::CFG()->core->get_critical_pages_shortcodes_array();
-        // if the shortcode is NOT one of the critical page shortcodes like ESPRESSO_TXN_PAGE
-        if ( in_array( $EES_Shortcode, $critical_shortcodes ) ) {
-            return;
-        }
-        // add shortcode to "Posts page" tracking
-        if ( isset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] ) ) {
-            // make sure tracking is in form of an array
-            if ( ! is_array( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] ) ) {
-                \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] = array(
-                    \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] => true,
-                );
-            }
-            \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] += array( $post_ID => true );
-        } else {
-            \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] = array( $post_ID => true );
-        }
-    }
-
-
-
-    /**
-     * unset_post_shortcodes_on_delete
-     *
-     * @access protected
-     * @param  int $ID
-     * @return void
-     */
-    public static function unset_post_shortcodes_on_delete( $ID )
-    {
-        $update_post_shortcodes = false;
-        // post on frontpage ?
-        $page_for_posts = \EE_Config::get_page_for_posts();
-        // looking for any references to this post
-        foreach ( \EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes ) {
-            // is this the "Posts Page" (blog) ?
-            if ( $post_name === $page_for_posts ) {
-                // loop thru shortcodes registered for the posts page
-                foreach ( $post_shortcodes as $shortcode_class => $shortcode_posts ) {
-                    $update_post_shortcodes = PostShortcodeTracking::unset_posts_page_shortcode_for_post(
-                        $ID,
-                        $shortcode_class,
-                        $shortcode_posts,
-                        $page_for_posts,
-                        $update_post_shortcodes
-                    )
-                        ? true
-                        : $update_post_shortcodes;
-                }
-            } else {
-                // loop thru shortcodes registered for each page
-                foreach ( $post_shortcodes as $shortcode_class => $post_ID ) {
-                    // if this is page is being deleted, then don't track any post shortcodes for it
-                    if ( $post_ID === $ID ) {
-                        unset( \EE_Registry::CFG()->core->post_shortcodes[ $post_name ] );
-                        $update_post_shortcodes = true;
-                    }
-                }
-            }
-        }
-        if ( $update_post_shortcodes ) {
-            PostShortcodeTracking::update_post_shortcodes( $page_for_posts );
-        }
-    }
-
-
-
-    /**
-     * unset_post_shortcodes_on_delete
-     *
-     * @access protected
-     * @param  int $ID
-     * @param      $shortcode_class
-     * @param      $shortcode_posts
-     * @param      $page_for_posts
-     * @param bool $update_post_shortcodes
-     * @return bool
-     */
-    protected static function unset_posts_page_shortcode_for_post(
-        $ID,
-        $shortcode_class,
-        $shortcode_posts,
-        $page_for_posts,
-        $update_post_shortcodes = false
-    ) {
-        // make sure that an array of post IDs is being tracked for each  shortcode
-        if ( ! is_array( $shortcode_posts ) ) {
-            \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] = array(
-                $shortcode_posts => true,
-            );
-            $update_post_shortcodes = true;
-        }
-        // now if the ID of the post being deleted is in the $shortcode_posts array
-        if ( is_array( $shortcode_posts ) && isset( $shortcode_posts[ $ID ] ) ) {
-            unset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ][ $ID ] );
-            $update_post_shortcodes = true;
-        }
-        // if nothing is registered for that shortcode anymore, then delete the shortcode altogether
-        if ( empty( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] ) ) {
-            unset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] );
-            $update_post_shortcodes = true;
-        }
-        return $update_post_shortcodes;
-    }
-
-
-
-    /**
-     *    update_post_shortcodes
-     *
-     * @access    public
-     * @param $page_for_posts
-     * @return    void
-     */
-    public static function update_post_shortcodes( $page_for_posts = '' )
-    {
-        // make sure page_for_posts is set
-        $page_for_posts = ! empty( $page_for_posts )
-            ? $page_for_posts
-            : \EE_Config::get_page_for_posts();
-        // allow others to mess stuff up :D
-        do_action(
-            'AHEE__\EventEspresso\core\admin\PostShortcodeTracking__update_post_shortcodes',
-            \EE_Config::instance()->core->post_shortcodes,
-            $page_for_posts
-        );
-        // keep old hookpoint for now, will deprecate later
-        do_action(
-            'AHEE__EE_Config__update_post_shortcodes',
-            \EE_Config::instance()->core->post_shortcodes,
-            $page_for_posts
-        );
-        // verify that post_shortcodes is set
-        \EE_Config::instance()->core->post_shortcodes = isset( \EE_Config::instance()->core->post_shortcodes )
-                                                        && is_array( \EE_Config::instance()->core->post_shortcodes )
-            ? \EE_Config::instance()->core->post_shortcodes
-            : array();
-        // cycle thru post_shortcodes
-        foreach ( \EE_Config::instance()->core->post_shortcodes as $post_name => $shortcodes ) {
-            // are there any shortcodes to track ?
-            if ( ! empty( $shortcodes ) ) {
-                // skip the posts page, because we want all shortcodes registered for it
-                if ( $post_name === $page_for_posts ) {
-                    continue;
-                }
-                // loop thru list of tracked shortcodes
-                foreach ( $shortcodes as $shortcode => $post_id ) {
-                    // make sure post still exists
-                    $post = get_post( $post_id );
-                    // check that the post name matches what we have saved
-                    if ( $post && $post->post_name === $post_name ) {
-                        // if so, then break before hitting the unset below
-                        continue;
-                    }
-                    // we don't like missing posts around here >:(
-                    unset( \EE_Config::instance()->core->post_shortcodes[ $post_name ] );
-                }
-            } else {
-                // you got no shortcodes to keep track of !
-                unset( \EE_Config::instance()->core->post_shortcodes[ $post_name ] );
-            }
-        }
-        // critical page shortcodes that we do NOT want added to the Posts page (blog)
-        $critical_shortcodes = \EE_Config::instance()->core->get_critical_pages_shortcodes_array();
-        $critical_shortcodes = array_flip( $critical_shortcodes );
-        foreach ( $critical_shortcodes as $critical_shortcode ) {
-            unset( \EE_Config::instance()->core->post_shortcodes[ $page_for_posts ][ $critical_shortcode ] );
-        }
-        //only show errors
-        \EE_Config::instance()->update_espresso_config();
-    }
-
-
-
-    /**
-     * reset_page_for_posts_on_initial_set
-     * if an admin is on the WP Reading Settings page and sets the option for "Posts page",
-     * when it had previously been unset,
-     * then we need to attribute any actively used shortcodes to the new blog page
-     *
-     * @access public
-     * @param  string $option
-     * @param  string $value
-     * @return void
-     */
-    public static function reset_page_for_posts_on_initial_set( $option, $value )
-    {
-        PostShortcodeTracking::reset_page_for_posts_on_change( $option, '', $value );
-    }
-
-
-
-    /**
-     *    reset_page_for_posts_on_change
-     *    if an admin is on the WP Reading Settings page and changes the option for "Posts page",
-     * then we need to attribute any actively used shortcodes for the previous blog page to the new blog page
-     *
-     * @access public
-     * @param  string $option
-     * @param  string $old_value
-     * @param  string $value
-     * @return void
-     */
-    public static function reset_page_for_posts_on_change( $option, $old_value = '', $value = '' )
-    {
-        if ( $option === 'page_for_posts' ) {
-            global $wpdb;
-            $table = $wpdb->posts;
-            $SQL = "SELECT post_name from $table WHERE post_type='posts' OR post_type='page' AND post_status='publish' AND ID=%d";
-            $new_page_for_posts = $value ? $wpdb->get_var( $wpdb->prepare( $SQL, $value ) ) : 'posts';
-            PostShortcodeTracking::set_post_shortcodes_for_posts_page( $new_page_for_posts );
-        }
-    }
-
-
-
-    /**
-     * reset_page_for_posts_on_delete
-     * if an admin deletes a page designated as the WP "Posts page",
-     * then we need to attribute any actively used shortcodes for that blog page to a generic 'posts' page
-     *
-     * @access public
-     * @param  string $option
-     * @return void
-     */
-    public static function reset_page_for_posts_on_delete( $option )
-    {
-        if ( $option === 'page_for_posts' ) {
-            PostShortcodeTracking::set_post_shortcodes_for_posts_page( 'posts' );
-        }
-    }
-
-
-
-    /**
-     * @param array|string $shortcodes
-     * @param bool         $index_results if passing more than one shortcode for the $shortcodes parameter above,
-     *                                    then setting this to true, will return as associative array indexed by
-     *                                    the shortcodes. If false, then the returned array will be unindexed
-     * @return array
-     */
-    public static function get_post_ids_for_shortcode( $shortcodes, $index_results = true )
-    {
-        $post_ids = array();
-        if ( is_array( $shortcodes ) ) {
-            foreach ( $shortcodes as $shortcode ) {
-                $new_post_ids = PostShortcodeTracking::get_post_ids_for_shortcode(
-                    $shortcode,
-                    $index_results
-                );
-                foreach ( $new_post_ids as $new_post_id ) {
-                    if ( $index_results ) {
-                        $post_ids[ $shortcode ][ $new_post_id ] = $new_post_id;
-                    } else {
-                        $post_ids[ $new_post_id ] = $new_post_id;
-                    }
-                }
-            }
-        } else {
-            $shortcode = strtoupper( $shortcodes );
-            $shortcode = strpos( $shortcode, 'ESPRESSO_' ) !== 0 ? "ESPRESSO_{$shortcode}" : $shortcode;
-            $page_for_posts = \EE_Config::get_page_for_posts();
-            // looking for any references to this post
-            foreach ( \EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes ) {
-                // if this is the "Posts Page" (blog), then skip it
-                if ( $post_name === $page_for_posts ) {
-                    continue;
-                }
-                // loop thru shortcodes registered for each page, and grab post id for matches
-                foreach ( (array) $post_shortcodes as $post_shortcode => $post_ID ) {
-                    if ( $post_shortcode === $shortcode ) {
-                        $post_ids[ $post_ID ] = $post_ID;
-                    }
-                }
-            }
-        }
-        return $post_ids;
-    }
+	/**
+	 * set_hooks_admin
+	 *
+	 * @access    public
+	 */
+	public static function set_hooks_admin()
+	{
+		add_action(
+			'save_post',
+			array( 'EventEspresso\core\admin\PostShortcodeTracking', 'parse_post_content_on_save' ),
+			100,
+			2
+		);
+		add_action(
+			'delete_post',
+			array( 'EventEspresso\core\admin\PostShortcodeTracking', 'unset_post_shortcodes_on_delete' ),
+			100,
+			1
+		);
+		add_action(
+			'add_option_page_for_posts',
+			array( 'EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_initial_set' ),
+			100,
+			2
+		);
+		add_action(
+			'update_option',
+			array( 'EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_change' ),
+			100,
+			3
+		);
+		add_action(
+			'delete_option',
+			array( 'EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_delete' ),
+			100,
+			1
+		);
+	}
+
+
+
+	/**
+	 *    parse_post_content_on_save
+	 *    any time a post is saved, we need to check for any EE shortcodes that may be embedded in the content,
+	 *    and then track what posts those shortcodes are on, so that we can initialize shortcodes well before
+	 *    the_content() runs. this allows us to do things like enqueue scripts for shortcodes ONLY on the pages the
+	 *    shortcodes are actually used on
+	 *
+	 * @access    public
+	 * @param int      $post_ID
+	 * @param \WP_Post $post
+	 * @return    void
+	 */
+	public static function parse_post_content_on_save( $post_ID, $post )
+	{
+		// if the post is trashed, then let's remove our post shortcode tracking
+		if ( $post instanceof \WP_Post && $post->post_status === 'trash' ) {
+			PostShortcodeTracking::unset_post_shortcodes_on_delete( $post_ID );
+			return;
+		}
+		// default post types
+		$post_types = array( 'post' => 0, 'page' => 1 );
+		// add CPTs
+		$CPTs = \EE_Register_CPTs::get_CPTs();
+		$post_types = array_merge( $post_types, $CPTs );
+		// for default or CPT posts...
+		if ( isset( $post_types[ $post->post_type ] ) ) {
+			// post on frontpage ?
+			$page_for_posts = \EE_Config::get_page_for_posts();
+			if ( $post->post_name === $page_for_posts ) {
+				PostShortcodeTracking::set_post_shortcodes_for_posts_page( $page_for_posts );
+				return;
+			}
+			// array of shortcodes indexed by post name
+			\EE_Registry::CFG()->core->post_shortcodes = isset( \EE_Registry::CFG()->core->post_shortcodes )
+				? \EE_Registry::CFG()->core->post_shortcodes
+				: array();
+			// whether to proceed with update
+			$update_post_shortcodes = false;
+			// empty both arrays
+			\EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ] = array();
+			// check that posts page is already being tracked
+			if ( ! isset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ] ) ) {
+				// if not, then ensure that it is properly added
+				\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ] = array();
+			}
+			// loop thru shortcodes
+			foreach ( \EE_Registry::instance()->shortcodes as $EES_Shortcode => $shortcode_dir ) {
+				// convert to UPPERCASE to get actual shortcode
+				$EES_Shortcode = strtoupper( $EES_Shortcode );
+				// is the shortcode in the post_content ?
+				if ( strpos( $post->post_content, $EES_Shortcode ) !== false ) {
+					// map shortcode to post names and post IDs
+					\EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] = $post_ID;
+					// and add this shortcode to the tracking for the blog page
+					PostShortcodeTracking::set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode,
+						$post_ID );
+					$update_post_shortcodes = true;
+				} else {
+					// shortcode is not present in post content, so check if we were tracking it previously
+					// stop tracking if shortcode is not used in this specific post
+					if ( isset( \EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] ) ) {
+						unset( \EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] );
+						$update_post_shortcodes = true;
+					}
+					// make sure that something is set for the shortcode posts (even though we may remove this)
+					$shortcode_posts = isset(
+						\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ]
+					)
+						? \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ]
+						: array();
+					// and stop tracking for this shortcode on the blog page if it is not used
+					$update_post_shortcodes = PostShortcodeTracking::unset_posts_page_shortcode_for_post(
+						$post_ID,
+						$EES_Shortcode,
+						$shortcode_posts,
+						$page_for_posts,
+						$update_post_shortcodes
+					)
+						? true
+						: $update_post_shortcodes;
+				}
+			}
+			if ( $update_post_shortcodes ) {
+				PostShortcodeTracking::update_post_shortcodes( $page_for_posts );
+			}
+		}
+	}
+
+
+
+	/**
+	 * set_post_shortcodes_for_posts_page (plz note: shortcodes is plural)
+	 * called when updating the WordPress Posts Page,
+	 * and adds shortcode tracking for the Posts Page, for all shortcodes currently tracked on individual posts
+	 *
+	 * @access protected
+	 * @param  string $page_for_posts
+	 * @return void
+	 */
+	protected static function set_post_shortcodes_for_posts_page( $page_for_posts )
+	{
+		\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ] = array();
+		// loop thru shortcodes
+		foreach ( \EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes ) {
+			foreach ( $post_shortcodes as $EES_Shortcode => $post_ID ) {
+				PostShortcodeTracking::set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode, $post_ID );
+			}
+		}
+		PostShortcodeTracking::update_post_shortcodes( $page_for_posts );
+	}
+
+
+
+	/**
+	 * set_post_shortcode_for_posts_page (plz note: shortcode is singular)
+	 * adds Posts Page shortcode tracking for the supplied shortcode for an individual post
+	 *
+	 * @access protected
+	 * @param  string $page_for_posts
+	 * @param         $EES_Shortcode
+	 * @param         $post_ID
+	 */
+	protected static function set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode, $post_ID )
+	{
+		// critical page shortcodes that we do NOT want added to the Posts page (blog)
+		$critical_shortcodes = \EE_Registry::CFG()->core->get_critical_pages_shortcodes_array();
+		// if the shortcode is NOT one of the critical page shortcodes like ESPRESSO_TXN_PAGE
+		if ( in_array( $EES_Shortcode, $critical_shortcodes ) ) {
+			return;
+		}
+		// add shortcode to "Posts page" tracking
+		if ( isset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] ) ) {
+			// make sure tracking is in form of an array
+			if ( ! is_array( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] ) ) {
+				\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] = array(
+					\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] => true,
+				);
+			}
+			\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] += array( $post_ID => true );
+		} else {
+			\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] = array( $post_ID => true );
+		}
+	}
+
+
+
+	/**
+	 * unset_post_shortcodes_on_delete
+	 *
+	 * @access protected
+	 * @param  int $ID
+	 * @return void
+	 */
+	public static function unset_post_shortcodes_on_delete( $ID )
+	{
+		$update_post_shortcodes = false;
+		// post on frontpage ?
+		$page_for_posts = \EE_Config::get_page_for_posts();
+		// looking for any references to this post
+		foreach ( \EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes ) {
+			// is this the "Posts Page" (blog) ?
+			if ( $post_name === $page_for_posts ) {
+				// loop thru shortcodes registered for the posts page
+				foreach ( $post_shortcodes as $shortcode_class => $shortcode_posts ) {
+					$update_post_shortcodes = PostShortcodeTracking::unset_posts_page_shortcode_for_post(
+						$ID,
+						$shortcode_class,
+						$shortcode_posts,
+						$page_for_posts,
+						$update_post_shortcodes
+					)
+						? true
+						: $update_post_shortcodes;
+				}
+			} else {
+				// loop thru shortcodes registered for each page
+				foreach ( $post_shortcodes as $shortcode_class => $post_ID ) {
+					// if this is page is being deleted, then don't track any post shortcodes for it
+					if ( $post_ID === $ID ) {
+						unset( \EE_Registry::CFG()->core->post_shortcodes[ $post_name ] );
+						$update_post_shortcodes = true;
+					}
+				}
+			}
+		}
+		if ( $update_post_shortcodes ) {
+			PostShortcodeTracking::update_post_shortcodes( $page_for_posts );
+		}
+	}
+
+
+
+	/**
+	 * unset_post_shortcodes_on_delete
+	 *
+	 * @access protected
+	 * @param  int $ID
+	 * @param      $shortcode_class
+	 * @param      $shortcode_posts
+	 * @param      $page_for_posts
+	 * @param bool $update_post_shortcodes
+	 * @return bool
+	 */
+	protected static function unset_posts_page_shortcode_for_post(
+		$ID,
+		$shortcode_class,
+		$shortcode_posts,
+		$page_for_posts,
+		$update_post_shortcodes = false
+	) {
+		// make sure that an array of post IDs is being tracked for each  shortcode
+		if ( ! is_array( $shortcode_posts ) ) {
+			\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] = array(
+				$shortcode_posts => true,
+			);
+			$update_post_shortcodes = true;
+		}
+		// now if the ID of the post being deleted is in the $shortcode_posts array
+		if ( is_array( $shortcode_posts ) && isset( $shortcode_posts[ $ID ] ) ) {
+			unset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ][ $ID ] );
+			$update_post_shortcodes = true;
+		}
+		// if nothing is registered for that shortcode anymore, then delete the shortcode altogether
+		if ( empty( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] ) ) {
+			unset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] );
+			$update_post_shortcodes = true;
+		}
+		return $update_post_shortcodes;
+	}
+
+
+
+	/**
+	 *    update_post_shortcodes
+	 *
+	 * @access    public
+	 * @param $page_for_posts
+	 * @return    void
+	 */
+	public static function update_post_shortcodes( $page_for_posts = '' )
+	{
+		// make sure page_for_posts is set
+		$page_for_posts = ! empty( $page_for_posts )
+			? $page_for_posts
+			: \EE_Config::get_page_for_posts();
+		// allow others to mess stuff up :D
+		do_action(
+			'AHEE__\EventEspresso\core\admin\PostShortcodeTracking__update_post_shortcodes',
+			\EE_Config::instance()->core->post_shortcodes,
+			$page_for_posts
+		);
+		// keep old hookpoint for now, will deprecate later
+		do_action(
+			'AHEE__EE_Config__update_post_shortcodes',
+			\EE_Config::instance()->core->post_shortcodes,
+			$page_for_posts
+		);
+		// verify that post_shortcodes is set
+		\EE_Config::instance()->core->post_shortcodes = isset( \EE_Config::instance()->core->post_shortcodes )
+														&& is_array( \EE_Config::instance()->core->post_shortcodes )
+			? \EE_Config::instance()->core->post_shortcodes
+			: array();
+		// cycle thru post_shortcodes
+		foreach ( \EE_Config::instance()->core->post_shortcodes as $post_name => $shortcodes ) {
+			// are there any shortcodes to track ?
+			if ( ! empty( $shortcodes ) ) {
+				// skip the posts page, because we want all shortcodes registered for it
+				if ( $post_name === $page_for_posts ) {
+					continue;
+				}
+				// loop thru list of tracked shortcodes
+				foreach ( $shortcodes as $shortcode => $post_id ) {
+					// make sure post still exists
+					$post = get_post( $post_id );
+					// check that the post name matches what we have saved
+					if ( $post && $post->post_name === $post_name ) {
+						// if so, then break before hitting the unset below
+						continue;
+					}
+					// we don't like missing posts around here >:(
+					unset( \EE_Config::instance()->core->post_shortcodes[ $post_name ] );
+				}
+			} else {
+				// you got no shortcodes to keep track of !
+				unset( \EE_Config::instance()->core->post_shortcodes[ $post_name ] );
+			}
+		}
+		// critical page shortcodes that we do NOT want added to the Posts page (blog)
+		$critical_shortcodes = \EE_Config::instance()->core->get_critical_pages_shortcodes_array();
+		$critical_shortcodes = array_flip( $critical_shortcodes );
+		foreach ( $critical_shortcodes as $critical_shortcode ) {
+			unset( \EE_Config::instance()->core->post_shortcodes[ $page_for_posts ][ $critical_shortcode ] );
+		}
+		//only show errors
+		\EE_Config::instance()->update_espresso_config();
+	}
+
+
+
+	/**
+	 * reset_page_for_posts_on_initial_set
+	 * if an admin is on the WP Reading Settings page and sets the option for "Posts page",
+	 * when it had previously been unset,
+	 * then we need to attribute any actively used shortcodes to the new blog page
+	 *
+	 * @access public
+	 * @param  string $option
+	 * @param  string $value
+	 * @return void
+	 */
+	public static function reset_page_for_posts_on_initial_set( $option, $value )
+	{
+		PostShortcodeTracking::reset_page_for_posts_on_change( $option, '', $value );
+	}
+
+
+
+	/**
+	 *    reset_page_for_posts_on_change
+	 *    if an admin is on the WP Reading Settings page and changes the option for "Posts page",
+	 * then we need to attribute any actively used shortcodes for the previous blog page to the new blog page
+	 *
+	 * @access public
+	 * @param  string $option
+	 * @param  string $old_value
+	 * @param  string $value
+	 * @return void
+	 */
+	public static function reset_page_for_posts_on_change( $option, $old_value = '', $value = '' )
+	{
+		if ( $option === 'page_for_posts' ) {
+			global $wpdb;
+			$table = $wpdb->posts;
+			$SQL = "SELECT post_name from $table WHERE post_type='posts' OR post_type='page' AND post_status='publish' AND ID=%d";
+			$new_page_for_posts = $value ? $wpdb->get_var( $wpdb->prepare( $SQL, $value ) ) : 'posts';
+			PostShortcodeTracking::set_post_shortcodes_for_posts_page( $new_page_for_posts );
+		}
+	}
+
+
+
+	/**
+	 * reset_page_for_posts_on_delete
+	 * if an admin deletes a page designated as the WP "Posts page",
+	 * then we need to attribute any actively used shortcodes for that blog page to a generic 'posts' page
+	 *
+	 * @access public
+	 * @param  string $option
+	 * @return void
+	 */
+	public static function reset_page_for_posts_on_delete( $option )
+	{
+		if ( $option === 'page_for_posts' ) {
+			PostShortcodeTracking::set_post_shortcodes_for_posts_page( 'posts' );
+		}
+	}
+
+
+
+	/**
+	 * @param array|string $shortcodes
+	 * @param bool         $index_results if passing more than one shortcode for the $shortcodes parameter above,
+	 *                                    then setting this to true, will return as associative array indexed by
+	 *                                    the shortcodes. If false, then the returned array will be unindexed
+	 * @return array
+	 */
+	public static function get_post_ids_for_shortcode( $shortcodes, $index_results = true )
+	{
+		$post_ids = array();
+		if ( is_array( $shortcodes ) ) {
+			foreach ( $shortcodes as $shortcode ) {
+				$new_post_ids = PostShortcodeTracking::get_post_ids_for_shortcode(
+					$shortcode,
+					$index_results
+				);
+				foreach ( $new_post_ids as $new_post_id ) {
+					if ( $index_results ) {
+						$post_ids[ $shortcode ][ $new_post_id ] = $new_post_id;
+					} else {
+						$post_ids[ $new_post_id ] = $new_post_id;
+					}
+				}
+			}
+		} else {
+			$shortcode = strtoupper( $shortcodes );
+			$shortcode = strpos( $shortcode, 'ESPRESSO_' ) !== 0 ? "ESPRESSO_{$shortcode}" : $shortcode;
+			$page_for_posts = \EE_Config::get_page_for_posts();
+			// looking for any references to this post
+			foreach ( \EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes ) {
+				// if this is the "Posts Page" (blog), then skip it
+				if ( $post_name === $page_for_posts ) {
+					continue;
+				}
+				// loop thru shortcodes registered for each page, and grab post id for matches
+				foreach ( (array) $post_shortcodes as $post_shortcode => $post_ID ) {
+					if ( $post_shortcode === $shortcode ) {
+						$post_ids[ $post_ID ] = $post_ID;
+					}
+				}
+			}
+		}
+		return $post_ids;
+	}
 
 
 

Spacing +98 added lines, -98 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\admin;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-    exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+    exit('No direct script access allowed');
 }
 
 
@@ -28,31 +28,31 @@ 
     {
         add_action(
             'save_post',
-            array( 'EventEspresso\core\admin\PostShortcodeTracking', 'parse_post_content_on_save' ),
+            array('EventEspresso\core\admin\PostShortcodeTracking', 'parse_post_content_on_save'),
             100,
             2
         );
         add_action(
             'delete_post',
-            array( 'EventEspresso\core\admin\PostShortcodeTracking', 'unset_post_shortcodes_on_delete' ),
+            array('EventEspresso\core\admin\PostShortcodeTracking', 'unset_post_shortcodes_on_delete'),
             100,
             1
         );
         add_action(
             'add_option_page_for_posts',
-            array( 'EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_initial_set' ),
+            array('EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_initial_set'),
             100,
             2
         );
         add_action(
             'update_option',
-            array( 'EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_change' ),
+            array('EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_change'),
             100,
             3
         );
         add_action(
             'delete_option',
-            array( 'EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_delete' ),
+            array('EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_delete'),
             100,
             1
         );
@@ -72,63 +72,63 @@ 
      * @param \WP_Post $post
      * @return    void
      */
-    public static function parse_post_content_on_save( $post_ID, $post )
+    public static function parse_post_content_on_save($post_ID, $post)
     {
         // if the post is trashed, then let's remove our post shortcode tracking
-        if ( $post instanceof \WP_Post && $post->post_status === 'trash' ) {
-            PostShortcodeTracking::unset_post_shortcodes_on_delete( $post_ID );
+        if ($post instanceof \WP_Post && $post->post_status === 'trash') {
+            PostShortcodeTracking::unset_post_shortcodes_on_delete($post_ID);
             return;
         }
         // default post types
-        $post_types = array( 'post' => 0, 'page' => 1 );
+        $post_types = array('post' => 0, 'page' => 1);
         // add CPTs
         $CPTs = \EE_Register_CPTs::get_CPTs();
-        $post_types = array_merge( $post_types, $CPTs );
+        $post_types = array_merge($post_types, $CPTs);
         // for default or CPT posts...
-        if ( isset( $post_types[ $post->post_type ] ) ) {
+        if (isset($post_types[$post->post_type])) {
             // post on frontpage ?
             $page_for_posts = \EE_Config::get_page_for_posts();
-            if ( $post->post_name === $page_for_posts ) {
-                PostShortcodeTracking::set_post_shortcodes_for_posts_page( $page_for_posts );
+            if ($post->post_name === $page_for_posts) {
+                PostShortcodeTracking::set_post_shortcodes_for_posts_page($page_for_posts);
                 return;
             }
             // array of shortcodes indexed by post name
-            \EE_Registry::CFG()->core->post_shortcodes = isset( \EE_Registry::CFG()->core->post_shortcodes )
+            \EE_Registry::CFG()->core->post_shortcodes = isset(\EE_Registry::CFG()->core->post_shortcodes)
                 ? \EE_Registry::CFG()->core->post_shortcodes
                 : array();
             // whether to proceed with update
             $update_post_shortcodes = false;
             // empty both arrays
-            \EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ] = array();
+            \EE_Registry::CFG()->core->post_shortcodes[$post->post_name] = array();
             // check that posts page is already being tracked
-            if ( ! isset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ] ) ) {
+            if ( ! isset(\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts])) {
                 // if not, then ensure that it is properly added
-                \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ] = array();
+                \EE_Registry::CFG()->core->post_shortcodes[$page_for_posts] = array();
             }
             // loop thru shortcodes
-            foreach ( \EE_Registry::instance()->shortcodes as $EES_Shortcode => $shortcode_dir ) {
+            foreach (\EE_Registry::instance()->shortcodes as $EES_Shortcode => $shortcode_dir) {
                 // convert to UPPERCASE to get actual shortcode
-                $EES_Shortcode = strtoupper( $EES_Shortcode );
+                $EES_Shortcode = strtoupper($EES_Shortcode);
                 // is the shortcode in the post_content ?
-                if ( strpos( $post->post_content, $EES_Shortcode ) !== false ) {
+                if (strpos($post->post_content, $EES_Shortcode) !== false) {
                     // map shortcode to post names and post IDs
-                    \EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] = $post_ID;
+                    \EE_Registry::CFG()->core->post_shortcodes[$post->post_name][$EES_Shortcode] = $post_ID;
                     // and add this shortcode to the tracking for the blog page
-                    PostShortcodeTracking::set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode,
-                        $post_ID );
+                    PostShortcodeTracking::set_post_shortcode_for_posts_page($page_for_posts, $EES_Shortcode,
+                        $post_ID);
                     $update_post_shortcodes = true;
                 } else {
                     // shortcode is not present in post content, so check if we were tracking it previously
                     // stop tracking if shortcode is not used in this specific post
-                    if ( isset( \EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] ) ) {
-                        unset( \EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] );
+                    if (isset(\EE_Registry::CFG()->core->post_shortcodes[$post->post_name][$EES_Shortcode])) {
+                        unset(\EE_Registry::CFG()->core->post_shortcodes[$post->post_name][$EES_Shortcode]);
                         $update_post_shortcodes = true;
                     }
                     // make sure that something is set for the shortcode posts (even though we may remove this)
                     $shortcode_posts = isset(
-                        \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ]
+                        \EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode]
                     )
-                        ? \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ]
+                        ? \EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode]
                         : array();
                     // and stop tracking for this shortcode on the blog page if it is not used
                     $update_post_shortcodes = PostShortcodeTracking::unset_posts_page_shortcode_for_post(
@@ -142,8 +142,8 @@ 
                         : $update_post_shortcodes;
                 }
             }
-            if ( $update_post_shortcodes ) {
-                PostShortcodeTracking::update_post_shortcodes( $page_for_posts );
+            if ($update_post_shortcodes) {
+                PostShortcodeTracking::update_post_shortcodes($page_for_posts);
             }
         }
     }
@@ -159,16 +159,16 @@ 
      * @param  string $page_for_posts
      * @return void
      */
-    protected static function set_post_shortcodes_for_posts_page( $page_for_posts )
+    protected static function set_post_shortcodes_for_posts_page($page_for_posts)
     {
-        \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ] = array();
+        \EE_Registry::CFG()->core->post_shortcodes[$page_for_posts] = array();
         // loop thru shortcodes
-        foreach ( \EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes ) {
-            foreach ( $post_shortcodes as $EES_Shortcode => $post_ID ) {
-                PostShortcodeTracking::set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode, $post_ID );
+        foreach (\EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes) {
+            foreach ($post_shortcodes as $EES_Shortcode => $post_ID) {
+                PostShortcodeTracking::set_post_shortcode_for_posts_page($page_for_posts, $EES_Shortcode, $post_ID);
             }
         }
-        PostShortcodeTracking::update_post_shortcodes( $page_for_posts );
+        PostShortcodeTracking::update_post_shortcodes($page_for_posts);
     }
 
 
@@ -182,25 +182,25 @@ 
      * @param         $EES_Shortcode
      * @param         $post_ID
      */
-    protected static function set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode, $post_ID )
+    protected static function set_post_shortcode_for_posts_page($page_for_posts, $EES_Shortcode, $post_ID)
     {
         // critical page shortcodes that we do NOT want added to the Posts page (blog)
         $critical_shortcodes = \EE_Registry::CFG()->core->get_critical_pages_shortcodes_array();
         // if the shortcode is NOT one of the critical page shortcodes like ESPRESSO_TXN_PAGE
-        if ( in_array( $EES_Shortcode, $critical_shortcodes ) ) {
+        if (in_array($EES_Shortcode, $critical_shortcodes)) {
             return;
         }
         // add shortcode to "Posts page" tracking
-        if ( isset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] ) ) {
+        if (isset(\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode])) {
             // make sure tracking is in form of an array
-            if ( ! is_array( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] ) ) {
-                \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] = array(
-                    \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] => true,
+            if ( ! is_array(\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode])) {
+                \EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode] = array(
+                    \EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode] => true,
                 );
             }
-            \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] += array( $post_ID => true );
+            \EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode] += array($post_ID => true);
         } else {
-            \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] = array( $post_ID => true );
+            \EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode] = array($post_ID => true);
         }
     }
 
@@ -213,17 +213,17 @@ 
      * @param  int $ID
      * @return void
      */
-    public static function unset_post_shortcodes_on_delete( $ID )
+    public static function unset_post_shortcodes_on_delete($ID)
     {
         $update_post_shortcodes = false;
         // post on frontpage ?
         $page_for_posts = \EE_Config::get_page_for_posts();
         // looking for any references to this post
-        foreach ( \EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes ) {
+        foreach (\EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes) {
             // is this the "Posts Page" (blog) ?
-            if ( $post_name === $page_for_posts ) {
+            if ($post_name === $page_for_posts) {
                 // loop thru shortcodes registered for the posts page
-                foreach ( $post_shortcodes as $shortcode_class => $shortcode_posts ) {
+                foreach ($post_shortcodes as $shortcode_class => $shortcode_posts) {
                     $update_post_shortcodes = PostShortcodeTracking::unset_posts_page_shortcode_for_post(
                         $ID,
                         $shortcode_class,
@@ -236,17 +236,17 @@ 
                 }
             } else {
                 // loop thru shortcodes registered for each page
-                foreach ( $post_shortcodes as $shortcode_class => $post_ID ) {
+                foreach ($post_shortcodes as $shortcode_class => $post_ID) {
                     // if this is page is being deleted, then don't track any post shortcodes for it
-                    if ( $post_ID === $ID ) {
-                        unset( \EE_Registry::CFG()->core->post_shortcodes[ $post_name ] );
+                    if ($post_ID === $ID) {
+                        unset(\EE_Registry::CFG()->core->post_shortcodes[$post_name]);
                         $update_post_shortcodes = true;
                     }
                 }
             }
         }
-        if ( $update_post_shortcodes ) {
-            PostShortcodeTracking::update_post_shortcodes( $page_for_posts );
+        if ($update_post_shortcodes) {
+            PostShortcodeTracking::update_post_shortcodes($page_for_posts);
         }
     }
 
@@ -271,20 +271,20 @@ 
         $update_post_shortcodes = false
     ) {
         // make sure that an array of post IDs is being tracked for each  shortcode
-        if ( ! is_array( $shortcode_posts ) ) {
-            \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] = array(
+        if ( ! is_array($shortcode_posts)) {
+            \EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$shortcode_class] = array(
                 $shortcode_posts => true,
             );
             $update_post_shortcodes = true;
         }
         // now if the ID of the post being deleted is in the $shortcode_posts array
-        if ( is_array( $shortcode_posts ) && isset( $shortcode_posts[ $ID ] ) ) {
-            unset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ][ $ID ] );
+        if (is_array($shortcode_posts) && isset($shortcode_posts[$ID])) {
+            unset(\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$shortcode_class][$ID]);
             $update_post_shortcodes = true;
         }
         // if nothing is registered for that shortcode anymore, then delete the shortcode altogether
-        if ( empty( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] ) ) {
-            unset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] );
+        if (empty(\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$shortcode_class])) {
+            unset(\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$shortcode_class]);
             $update_post_shortcodes = true;
         }
         return $update_post_shortcodes;
@@ -299,10 +299,10 @@ 
      * @param $page_for_posts
      * @return    void
      */
-    public static function update_post_shortcodes( $page_for_posts = '' )
+    public static function update_post_shortcodes($page_for_posts = '')
     {
         // make sure page_for_posts is set
-        $page_for_posts = ! empty( $page_for_posts )
+        $page_for_posts = ! empty($page_for_posts)
             ? $page_for_posts
             : \EE_Config::get_page_for_posts();
         // allow others to mess stuff up :D
@@ -318,40 +318,40 @@ 
             $page_for_posts
         );
         // verify that post_shortcodes is set
-        \EE_Config::instance()->core->post_shortcodes = isset( \EE_Config::instance()->core->post_shortcodes )
-                                                        && is_array( \EE_Config::instance()->core->post_shortcodes )
+        \EE_Config::instance()->core->post_shortcodes = isset(\EE_Config::instance()->core->post_shortcodes)
+                                                        && is_array(\EE_Config::instance()->core->post_shortcodes)
             ? \EE_Config::instance()->core->post_shortcodes
             : array();
         // cycle thru post_shortcodes
-        foreach ( \EE_Config::instance()->core->post_shortcodes as $post_name => $shortcodes ) {
+        foreach (\EE_Config::instance()->core->post_shortcodes as $post_name => $shortcodes) {
             // are there any shortcodes to track ?
-            if ( ! empty( $shortcodes ) ) {
+            if ( ! empty($shortcodes)) {
                 // skip the posts page, because we want all shortcodes registered for it
-                if ( $post_name === $page_for_posts ) {
+                if ($post_name === $page_for_posts) {
                     continue;
                 }
                 // loop thru list of tracked shortcodes
-                foreach ( $shortcodes as $shortcode => $post_id ) {
+                foreach ($shortcodes as $shortcode => $post_id) {
                     // make sure post still exists
-                    $post = get_post( $post_id );
+                    $post = get_post($post_id);
                     // check that the post name matches what we have saved
-                    if ( $post && $post->post_name === $post_name ) {
+                    if ($post && $post->post_name === $post_name) {
                         // if so, then break before hitting the unset below
                         continue;
                     }
                     // we don't like missing posts around here >:(
-                    unset( \EE_Config::instance()->core->post_shortcodes[ $post_name ] );
+                    unset(\EE_Config::instance()->core->post_shortcodes[$post_name]);
                 }
             } else {
                 // you got no shortcodes to keep track of !
-                unset( \EE_Config::instance()->core->post_shortcodes[ $post_name ] );
+                unset(\EE_Config::instance()->core->post_shortcodes[$post_name]);
             }
         }
         // critical page shortcodes that we do NOT want added to the Posts page (blog)
         $critical_shortcodes = \EE_Config::instance()->core->get_critical_pages_shortcodes_array();
-        $critical_shortcodes = array_flip( $critical_shortcodes );
-        foreach ( $critical_shortcodes as $critical_shortcode ) {
-            unset( \EE_Config::instance()->core->post_shortcodes[ $page_for_posts ][ $critical_shortcode ] );
+        $critical_shortcodes = array_flip($critical_shortcodes);
+        foreach ($critical_shortcodes as $critical_shortcode) {
+            unset(\EE_Config::instance()->core->post_shortcodes[$page_for_posts][$critical_shortcode]);
         }
         //only show errors
         \EE_Config::instance()->update_espresso_config();
@@ -370,9 +370,9 @@ 
      * @param  string $value
      * @return void
      */
-    public static function reset_page_for_posts_on_initial_set( $option, $value )
+    public static function reset_page_for_posts_on_initial_set($option, $value)
     {
-        PostShortcodeTracking::reset_page_for_posts_on_change( $option, '', $value );
+        PostShortcodeTracking::reset_page_for_posts_on_change($option, '', $value);
     }
 
 
@@ -388,14 +388,14 @@ 
      * @param  string $value
      * @return void
      */
-    public static function reset_page_for_posts_on_change( $option, $old_value = '', $value = '' )
+    public static function reset_page_for_posts_on_change($option, $old_value = '', $value = '')
     {
-        if ( $option === 'page_for_posts' ) {
+        if ($option === 'page_for_posts') {
             global $wpdb;
             $table = $wpdb->posts;
             $SQL = "SELECT post_name from $table WHERE post_type='posts' OR post_type='page' AND post_status='publish' AND ID=%d";
-            $new_page_for_posts = $value ? $wpdb->get_var( $wpdb->prepare( $SQL, $value ) ) : 'posts';
-            PostShortcodeTracking::set_post_shortcodes_for_posts_page( $new_page_for_posts );
+            $new_page_for_posts = $value ? $wpdb->get_var($wpdb->prepare($SQL, $value)) : 'posts';
+            PostShortcodeTracking::set_post_shortcodes_for_posts_page($new_page_for_posts);
         }
     }
 
@@ -410,10 +410,10 @@ 
      * @param  string $option
      * @return void
      */
-    public static function reset_page_for_posts_on_delete( $option )
+    public static function reset_page_for_posts_on_delete($option)
     {
-        if ( $option === 'page_for_posts' ) {
-            PostShortcodeTracking::set_post_shortcodes_for_posts_page( 'posts' );
+        if ($option === 'page_for_posts') {
+            PostShortcodeTracking::set_post_shortcodes_for_posts_page('posts');
         }
     }
 
@@ -426,37 +426,37 @@ 
      *                                    the shortcodes. If false, then the returned array will be unindexed
      * @return array
      */
-    public static function get_post_ids_for_shortcode( $shortcodes, $index_results = true )
+    public static function get_post_ids_for_shortcode($shortcodes, $index_results = true)
     {
         $post_ids = array();
-        if ( is_array( $shortcodes ) ) {
-            foreach ( $shortcodes as $shortcode ) {
+        if (is_array($shortcodes)) {
+            foreach ($shortcodes as $shortcode) {
                 $new_post_ids = PostShortcodeTracking::get_post_ids_for_shortcode(
                     $shortcode,
                     $index_results
                 );
-                foreach ( $new_post_ids as $new_post_id ) {
-                    if ( $index_results ) {
-                        $post_ids[ $shortcode ][ $new_post_id ] = $new_post_id;
+                foreach ($new_post_ids as $new_post_id) {
+                    if ($index_results) {
+                        $post_ids[$shortcode][$new_post_id] = $new_post_id;
                     } else {
-                        $post_ids[ $new_post_id ] = $new_post_id;
+                        $post_ids[$new_post_id] = $new_post_id;
                     }
                 }
             }
         } else {
-            $shortcode = strtoupper( $shortcodes );
-            $shortcode = strpos( $shortcode, 'ESPRESSO_' ) !== 0 ? "ESPRESSO_{$shortcode}" : $shortcode;
+            $shortcode = strtoupper($shortcodes);
+            $shortcode = strpos($shortcode, 'ESPRESSO_') !== 0 ? "ESPRESSO_{$shortcode}" : $shortcode;
             $page_for_posts = \EE_Config::get_page_for_posts();
             // looking for any references to this post
-            foreach ( \EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes ) {
+            foreach (\EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes) {
                 // if this is the "Posts Page" (blog), then skip it
-                if ( $post_name === $page_for_posts ) {
+                if ($post_name === $page_for_posts) {
                     continue;
                 }
                 // loop thru shortcodes registered for each page, and grab post id for matches
-                foreach ( (array) $post_shortcodes as $post_shortcode => $post_ID ) {
-                    if ( $post_shortcode === $shortcode ) {
-                        $post_ids[ $post_ID ] = $post_ID;
+                foreach ((array) $post_shortcodes as $post_shortcode => $post_ID) {
+                    if ($post_shortcode === $shortcode) {
+                        $post_ids[$post_ID] = $post_ID;
                     }
                 }
             }

admin_pages/general_settings/templates/countries_settings.template.php

Spacing +4 added lines, -4 removed lines

@@ -5,10 +5,10 @@ 
 ?>
 <div class="padding">
 
-	<h2 class="ee-admin-settings-hdr"><?php _e('Countries and States/Provinces', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('country_select_info');?></h2>
+	<h2 class="ee-admin-settings-hdr"><?php _e('Countries and States/Provinces', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('country_select_info'); ?></h2>
 	<table class="form-table">
 		<tbody>
-        <?php echo EEH_Form_Fields::generate_form_input( $countries ); ?>
+        <?php echo EEH_Form_Fields::generate_form_input($countries); ?>
 		</tbody>
 	</table>
 	<br/>
@@ -16,12 +16,12 @@ 
         <?php _e('The country that is selected above will populate the Country Details settings and the options for States/Provinces. This information will be used throughout Event Espresso including for registration purposes and how currency is displayed. If you make a change to the country on this page, it is important that you also update your Contact Information on the Your Organization tab.', 'event_espresso'); ?>
 	</p>
 	<div id="country-details-settings-dv">
-		<h2 class="ee-admin-settings-hdr"><?php _e('Country Details', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('country_details_info');?></h2>
+		<h2 class="ee-admin-settings-hdr"><?php _e('Country Details', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('country_details_info'); ?></h2>
 		<div id="country-details-dv"><?php  echo $country_details_settings; ?></div>
 	</div>
 
 	<div id="country-states-settings-dv">
-		<h2 class="ee-admin-settings-hdr"><?php _e( 'States/Provinces', 'event_espresso' );?> <?php echo EEH_Template::get_help_tab_link('country_states_info');?></h2>
+		<h2 class="ee-admin-settings-hdr"><?php _e('States/Provinces', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('country_states_info'); ?></h2>
 		<div id="country-states-dv"><?php  echo $country_states_settings; ?></div>
 	</div>
 

admin_pages/general_settings/templates/admin_option_settings.template.php

Spacing +5 added lines, -5 removed lines

@@ -6,7 +6,7 @@ 
 ?>
 <div class="padding">
 
-	<?php do_action( 'AHEE__admin_option_settings__template__before', $template_args ); ?>
+	<?php do_action('AHEE__admin_option_settings__template__before', $template_args); ?>
 
 	<?php /* @todo put back once we have a dashboard widget to use
 	<h2 class="ee-admin-settings-hdr">
@@ -71,7 +71,7 @@ 
 	</table>
 <?php endif; */ ?>
 
-	<?php if ( EE_Registry::instance()->CAP->current_user_can( 'manage_options', 'display_admin_settings_options_promote_and_affiliate' ) ) : ?>
+	<?php if (EE_Registry::instance()->CAP->current_user_can('manage_options', 'display_admin_settings_options_promote_and_affiliate')) : ?>
 		<h2 class="ee-admin-settings-hdr">
 			<?php _e('Promote Event Espresso', 'event_espresso'); ?> <span id="affiliate_info"><?php echo EEH_Template::get_help_tab_link('affiliate_info'); ?></span>
 		</h2>
@@ -86,14 +86,14 @@ 
 						</label>
 					</th>
 					<td>
-						<?php echo EEH_Form_Fields::select_input('show_reg_footer', $values, $show_reg_footer ); ?>
+						<?php echo EEH_Form_Fields::select_input('show_reg_footer', $values, $show_reg_footer); ?>
 					</td>
 				</tr>
 
 				<tr>
 					<th>
                         <label for="affiliate_id">
-                        <?php printf( __('Event Espresso %sAffiliate%s ID', 'event_espresso'), '<a href="http://eventespresso.com/affiliates/" target="_blank">', '</a>' ); ?>
+                        <?php printf(__('Event Espresso %sAffiliate%s ID', 'event_espresso'), '<a href="http://eventespresso.com/affiliates/" target="_blank">', '</a>'); ?>
                         </label>
                     </th>
 					<td>
@@ -123,7 +123,7 @@ 
 					</label>
 				</th>
 				<td>
-					<?php echo EEH_Form_Fields::select_input('help_tour_activation', $values, $help_tour_activation ); ?>
+					<?php echo EEH_Form_Fields::select_input('help_tour_activation', $values, $help_tour_activation); ?>
 				</td>
 			</tr>
 		</tbody>

core/db_classes/EE_Base_Class.class.php

Spacing +483 added lines, -483 removed lines

@@ -1,5 +1,5 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed');}
-do_action( 'AHEE_log', __FILE__, ' FILE LOADED', '' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed'); }
+do_action('AHEE_log', __FILE__, ' FILE LOADED', '');
 /**
  *
  * Event Espresso
@@ -117,59 +117,59 @@ 
 	 * @throws EE_Error
 	 * @return \EE_Base_Class
 	 */
-	protected function __construct( $fieldValues = array(), $bydb = FALSE, $timezone = '', $date_formats = array() ){
+	protected function __construct($fieldValues = array(), $bydb = FALSE, $timezone = '', $date_formats = array()) {
 
-		$className=get_class($this);
+		$className = get_class($this);
 
-		do_action("AHEE__{$className}__construct",$this,$fieldValues);
-		$model=$this->get_model();
-		$model_fields = $model->field_settings( FALSE );
+		do_action("AHEE__{$className}__construct", $this, $fieldValues);
+		$model = $this->get_model();
+		$model_fields = $model->field_settings(FALSE);
 		// ensure $fieldValues is an array
-		$fieldValues = is_array( $fieldValues ) ? $fieldValues : array( $fieldValues );
+		$fieldValues = is_array($fieldValues) ? $fieldValues : array($fieldValues);
 		// EEH_Debug_Tools::printr( $fieldValues, '$fieldValues  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 		// verify client code has not passed any invalid field names
-		foreach($fieldValues as $field_name=> $field_value){
-			if( ! isset( $model_fields[ $field_name] ) ){
-				throw new EE_Error(sprintf(__("Invalid field (%s) passed to constructor of %s. Allowed fields are :%s", "event_espresso"),$field_name,get_class($this),implode(", ",array_keys($model_fields))));
+		foreach ($fieldValues as $field_name=> $field_value) {
+			if ( ! isset($model_fields[$field_name])) {
+				throw new EE_Error(sprintf(__("Invalid field (%s) passed to constructor of %s. Allowed fields are :%s", "event_espresso"), $field_name, get_class($this), implode(", ", array_keys($model_fields))));
 			}
 		}
 		// EEH_Debug_Tools::printr( $model_fields, '$model_fields  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		$this->_timezone = EEH_DTT_Helper::get_valid_timezone_string( $timezone );
+		$this->_timezone = EEH_DTT_Helper::get_valid_timezone_string($timezone);
 
-		if ( ! empty( $date_formats ) && is_array( $date_formats ) ) {
+		if ( ! empty($date_formats) && is_array($date_formats)) {
 			$this->_dt_frmt = $date_formats[0];
 			$this->_tm_frmt = $date_formats[1];
 		} else {
 			//set default formats for date and time
-			$this->_dt_frmt = get_option( 'date_format' );
-			$this->_tm_frmt = get_option( 'time_format' );
+			$this->_dt_frmt = get_option('date_format');
+			$this->_tm_frmt = get_option('time_format');
 		}
 
 		//if db model is instantiating
-		if ( $bydb ){
+		if ($bydb) {
 			//client code has indicated these field values are from the database
-			foreach( $model_fields as $fieldName => $field ){
-				$this->set_from_db( $fieldName, isset( $fieldValues[ $fieldName] ) ? $fieldValues[ $fieldName ] : null );
+			foreach ($model_fields as $fieldName => $field) {
+				$this->set_from_db($fieldName, isset($fieldValues[$fieldName]) ? $fieldValues[$fieldName] : null);
 			}
 		} else {
 			//we're constructing a brand
 			//new instance of the model object. Generally, this means we'll need to do more field validation
-			foreach( $model_fields as $fieldName => $field ){
-				$this->set( $fieldName, isset( $fieldValues[ $fieldName ] ) ? $fieldValues[ $fieldName ] : null, true );
+			foreach ($model_fields as $fieldName => $field) {
+				$this->set($fieldName, isset($fieldValues[$fieldName]) ? $fieldValues[$fieldName] : null, true);
 			}
 		}
 
 		//remember what values were passed to this constructor
 		$this->_props_n_values_provided_in_constructor = $fieldValues;
 		//remember in entity mapper
-		if( ! $bydb  && $model->has_primary_key_field() && $this->ID() ){
+		if ( ! $bydb && $model->has_primary_key_field() && $this->ID()) {
 			$model->add_to_entity_map($this);
 		}
 		//setup all the relations
-		foreach($this->get_model()->relation_settings() as $relation_name=>$relation_obj){
-			if($relation_obj instanceof EE_Belongs_To_Relation){
+		foreach ($this->get_model()->relation_settings() as $relation_name=>$relation_obj) {
+			if ($relation_obj instanceof EE_Belongs_To_Relation) {
 				$this->_model_relations[$relation_name] = NULL;
-			}else{
+			} else {
 				$this->_model_relations[$relation_name] = array();
 			}
 		}
@@ -177,7 +177,7 @@ 
 		 * Action done at the end of each model object construction
 		 * @param EE_Base_Class $this the model object just created
 		 */
-		do_action( 'AHEE__EE_Base_Class__construct__finished', $this );
+		do_action('AHEE__EE_Base_Class__construct__finished', $this);
 	}
 
 	/**
@@ -197,7 +197,7 @@ 
 	 * @param boolean $allow_persist
 	 * @return boolean
 	 */
-	public function set_allow_persist( $allow_persist ) {
+	public function set_allow_persist($allow_persist) {
 		return $this->_allow_persist = $allow_persist;
 	}
 
@@ -211,11 +211,11 @@ 
 	 * @return mixed|null
 	 * @throws \EE_Error
 	 */
-	public function get_original( $field_name ){
-		if( isset( $this->_props_n_values_provided_in_constructor[ $field_name ] ) &&
-				$field_settings = $this->get_model()->field_settings_for( $field_name )){
-			return $field_settings->prepare_for_get( $this->_props_n_values_provided_in_constructor[ $field_name ] );
-		}else{
+	public function get_original($field_name) {
+		if (isset($this->_props_n_values_provided_in_constructor[$field_name]) &&
+				$field_settings = $this->get_model()->field_settings_for($field_name)) {
+			return $field_settings->prepare_for_get($this->_props_n_values_provided_in_constructor[$field_name]);
+		} else {
 			return NULL;
 		}
 	}
@@ -225,7 +225,7 @@ 
 	 * @param EE_Base_Class $obj
 	 * @return string
 	 */
-	public function get_class($obj){
+	public function get_class($obj) {
 		return get_class($obj);
 	}
 
@@ -240,19 +240,19 @@ 
 	 * @param bool      $use_default
 	 * @throws \EE_Error
 	 */
-	public function set( $field_name, $field_value, $use_default = FALSE ){
-		$field_obj = $this->get_model()->field_settings_for( $field_name );
-		if ( $field_obj instanceof EE_Model_Field_Base ) {
+	public function set($field_name, $field_value, $use_default = FALSE) {
+		$field_obj = $this->get_model()->field_settings_for($field_name);
+		if ($field_obj instanceof EE_Model_Field_Base) {
 //			if ( method_exists( $field_obj, 'set_timezone' )) {
-			if ( $field_obj instanceof EE_Datetime_Field ) {
-				$field_obj->set_timezone( $this->_timezone );
-				$field_obj->set_date_format( $this->_dt_frmt );
-				$field_obj->set_time_format( $this->_tm_frmt );
+			if ($field_obj instanceof EE_Datetime_Field) {
+				$field_obj->set_timezone($this->_timezone);
+				$field_obj->set_date_format($this->_dt_frmt);
+				$field_obj->set_time_format($this->_tm_frmt);
 			}
 
 			$holder_of_value = $field_obj->prepare_for_set($field_value);
 			//should the value be null?
-			if( ($field_value === NULL || $holder_of_value === NULL || $holder_of_value ==='') && $use_default){
+			if (($field_value === NULL || $holder_of_value === NULL || $holder_of_value === '') && $use_default) {
 				$this->_fields[$field_name] = $field_obj->get_default_value();
 
 				/**
@@ -264,26 +264,26 @@ 
 				 */
 				if (
 					$field_obj instanceof EE_Datetime_Field
-					&& $this->_fields[ $field_name ] !== null
+					&& $this->_fields[$field_name] !== null
 					&& ! $this->_fields[$field_name] instanceof DateTime
 				) {
-					empty( $this->_fields[$field_name] )
-						? $this->set( $field_name, time() )
-						: $this->set( $field_name, $this->_fields[$field_name] );
+					empty($this->_fields[$field_name])
+						? $this->set($field_name, time())
+						: $this->set($field_name, $this->_fields[$field_name]);
 				}
 
-			}else{
+			} else {
 				$this->_fields[$field_name] = $holder_of_value;
 			}
 
 			//if we're not in the constructor...
 			//now check if what we set was a primary key
-			if(
+			if (
 				//note: props_n_values_provided_in_constructor is only set at the END of the constructor
 				$this->_props_n_values_provided_in_constructor
 				&& $field_value
-				&& $field_name === self::_get_primary_key_name( get_class( $this ) )
-			){
+				&& $field_name === self::_get_primary_key_name(get_class($this))
+			) {
 				//if so, we want all this object's fields to be filled either with
 				//what we've explicitly set on this model
 				//or what we have in the db
@@ -291,20 +291,20 @@ 
 				$fields_on_model = self::_get_model(get_class($this))->field_settings();
 
 				$obj_in_db = self::_get_model(get_class($this))->get_one_by_ID($field_value);
-				foreach($fields_on_model as $field_obj){
-					if( ! array_key_exists($field_obj->get_name(), $this->_props_n_values_provided_in_constructor)
-						&& $field_obj->get_name() !== $field_name ){
+				foreach ($fields_on_model as $field_obj) {
+					if ( ! array_key_exists($field_obj->get_name(), $this->_props_n_values_provided_in_constructor)
+						&& $field_obj->get_name() !== $field_name) {
 
-						$this->set($field_obj->get_name(),$obj_in_db->get($field_obj->get_name()));
+						$this->set($field_obj->get_name(), $obj_in_db->get($field_obj->get_name()));
 					}
 				}
 				//oh this model object has an ID? well make sure its in the entity mapper
 				$this->get_model()->add_to_entity_map($this);
 			}
 			//let's unset any cache for this field_name from the $_cached_properties property.
-			$this->_clear_cached_property( $field_name );
-		}else{
-			throw new EE_Error( sprintf( __( "A valid EE_Model_Field_Base could not be found for the given field name: %s", "event_espresso" ), $field_name  ) );
+			$this->_clear_cached_property($field_name);
+		} else {
+			throw new EE_Error(sprintf(__("A valid EE_Model_Field_Base could not be found for the given field name: %s", "event_espresso"), $field_name));
 		}
 
 	}
@@ -321,14 +321,14 @@ 
 	 * @return int|bool @see EE_Base_Class::update_extra_meta() for return docs.
 	 * @throws \EE_Error
 	 */
-	public function set_field_or_extra_meta( $field_name, $field_value ) {
-		if ( $this->get_model()->has_field( $field_name ) ) {
-			$this->set( $field_name, $field_value );
+	public function set_field_or_extra_meta($field_name, $field_value) {
+		if ($this->get_model()->has_field($field_name)) {
+			$this->set($field_name, $field_value);
 			return true;
 		} else {
 			//ensure this object is saved first so that extra meta can be properly related.
 			$this->save();
-			return $this->update_extra_meta( $field_name, $field_value );
+			return $this->update_extra_meta($field_name, $field_value);
 		}
 	}
 
@@ -349,12 +349,12 @@ 
 	 * @return mixed|null  value for the field if found.  null if not found.
 	 * @throws \EE_Error
 	 */
-	public function get_field_or_extra_meta( $field_name ) {
-		if ( $this->get_model()->has_field( $field_name ) ) {
-			$column_value = $this->get( $field_name );
+	public function get_field_or_extra_meta($field_name) {
+		if ($this->get_model()->has_field($field_name)) {
+			$column_value = $this->get($field_name);
 		} else {
 			//This isn't a column in the main table, let's see if it is in the extra meta.
-			$column_value = $this->get_extra_meta( $field_name, true, null );
+			$column_value = $this->get_extra_meta($field_name, true, null);
 		}
 		return $column_value;
 	}
@@ -370,18 +370,18 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function set_timezone( $timezone = '' ) {
-		$this->_timezone = EEH_DTT_Helper::get_valid_timezone_string( $timezone );
+	public function set_timezone($timezone = '') {
+		$this->_timezone = EEH_DTT_Helper::get_valid_timezone_string($timezone);
 		//make sure we clear all cached properties because they won't be relevant now
 		$this->_clear_cached_properties();
 
 		//make sure we update field settings and the date for all EE_Datetime_Fields
-		$model_fields = $this->get_model()->field_settings( false );
-		foreach ( $model_fields as $field_name => $field_obj ) {
-			if ( $field_obj instanceof EE_Datetime_Field ) {
-				$field_obj->set_timezone( $this->_timezone );
-				if ( isset( $this->_fields[$field_name] ) && $this->_fields[$field_name] instanceof DateTime ) {
-					$this->_fields[$field_name]->setTimezone( new DateTimeZone( $this->_timezone ) );
+		$model_fields = $this->get_model()->field_settings(false);
+		foreach ($model_fields as $field_name => $field_obj) {
+			if ($field_obj instanceof EE_Datetime_Field) {
+				$field_obj->set_timezone($this->_timezone);
+				if (isset($this->_fields[$field_name]) && $this->_fields[$field_name] instanceof DateTime) {
+					$this->_fields[$field_name]->setTimezone(new DateTimeZone($this->_timezone));
 				}
 			}
 		}
@@ -410,7 +410,7 @@ 
 	 *
 	 * @param string $format   should be a format recognizable by PHP date() functions.
 	 */
-	public function set_date_format( $format ) {
+	public function set_date_format($format) {
 		$this->_dt_frmt = $format;
 		//clear cached_properties because they won't be relevant now.
 		$this->_clear_cached_properties();
@@ -426,7 +426,7 @@ 
 	 * @since 4.6
 	 * @param string $format should be a format recognizable by PHP date() functions.
 	 */
-	public function set_time_format( $format ) {
+	public function set_time_format($format) {
 		$this->_tm_frmt = $format;
 		//clear cached_properties because they won't be relevant now.
 		$this->_clear_cached_properties();
@@ -443,8 +443,8 @@ 
 	 *
 	 * @return mixed string|array
 	 */
-	public function get_format( $full = true ) {
-		return $full ? $this->_dt_frmt . ' ' . $this->_tm_frmt : array( $this->_dt_frmt, $this->_tm_frmt );
+	public function get_format($full = true) {
+		return $full ? $this->_dt_frmt.' '.$this->_tm_frmt : array($this->_dt_frmt, $this->_tm_frmt);
 	}
 
 
@@ -462,17 +462,17 @@ 
 	 * @throws EE_Error
 	 * @return mixed    index into cache, or just TRUE if the relation is of type Belongs_To (because there's only one related thing, no array)
 	 */
-	public function cache( $relationName = '', $object_to_cache = NULL, $cache_id = NULL ){
+	public function cache($relationName = '', $object_to_cache = NULL, $cache_id = NULL) {
 		// its entirely possible that there IS no related object yet in which case there is nothing to cache.
-		if ( ! $object_to_cache instanceof EE_Base_Class ) {
+		if ( ! $object_to_cache instanceof EE_Base_Class) {
 			return FALSE;
 		}
 		// also get "how" the object is related, or throw an error
-		if( ! $relationship_to_model = $this->get_model()->related_settings_for( $relationName )) {
-			throw new EE_Error( sprintf( __( 'There is no relationship to %s on a %s. Cannot cache it', 'event_espresso' ), $relationName, get_class( $this )));
+		if ( ! $relationship_to_model = $this->get_model()->related_settings_for($relationName)) {
+			throw new EE_Error(sprintf(__('There is no relationship to %s on a %s. Cannot cache it', 'event_espresso'), $relationName, get_class($this)));
 		}
 		// how many things are related ?
-		if( $relationship_to_model instanceof EE_Belongs_To_Relation ){
+		if ($relationship_to_model instanceof EE_Belongs_To_Relation) {
 			// if it's a "belongs to" relationship, then there's only one related model object  eg, if this is a registration, there's only 1 attendee for it
 			// so for these model objects just set it to be cached
 			$this->_model_relations[$relationName] = $object_to_cache;
@@ -480,26 +480,26 @@ 
 		} else {
 			// otherwise, this is the "many" side of a one to many relationship, so we'll add the object to the array of related objects for that type.
 			// eg: if this is an event, there are many registrations for that event, so we cache the registrations in an array
-			if( ! is_array( $this->_model_relations[$relationName] )) {
+			if ( ! is_array($this->_model_relations[$relationName])) {
 				// if for some reason, the cached item is a model object, then stick that in the array, otherwise start with an empty array
-				$this->_model_relations[$relationName] = $this->_model_relations[$relationName] instanceof EE_Base_Class ? array( $this->_model_relations[$relationName] ) : array();
+				$this->_model_relations[$relationName] = $this->_model_relations[$relationName] instanceof EE_Base_Class ? array($this->_model_relations[$relationName]) : array();
 			}
 			// first check for a cache_id which is normally empty
-			if ( ! empty( $cache_id )) {
+			if ( ! empty($cache_id)) {
 				// if the cache_id exists, then it means we are purposely trying to cache this with a known key that can then be used to retrieve the object later on
-				$this->_model_relations[$relationName][ $cache_id ] = $object_to_cache;
+				$this->_model_relations[$relationName][$cache_id] = $object_to_cache;
 				$return = $cache_id;
-			} elseif ( $object_to_cache->ID() ) {
+			} elseif ($object_to_cache->ID()) {
 				// OR the cached object originally came from the db, so let's just use it's PK for an ID
-				$this->_model_relations[$relationName][ $object_to_cache->ID() ] = $object_to_cache;
+				$this->_model_relations[$relationName][$object_to_cache->ID()] = $object_to_cache;
 				$return = $object_to_cache->ID();
 			} else {
 				// OR it's a new object with no ID, so just throw it in the array with an auto-incremented ID
 				$this->_model_relations[$relationName][] = $object_to_cache;
 				  // move the internal pointer to the end of the array
-				end( $this->_model_relations[$relationName] );
+				end($this->_model_relations[$relationName]);
 				// and grab the key so that we can return it
-				$return = key( $this->_model_relations[$relationName] );
+				$return = key($this->_model_relations[$relationName]);
 			}
 
 		}
@@ -518,11 +518,11 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	protected function _set_cached_property( $fieldname, $value, $cache_type = NULL ) {
+	protected function _set_cached_property($fieldname, $value, $cache_type = NULL) {
 		//first make sure this property exists
 		$this->get_model()->field_settings_for($fieldname);
 
-		$cache_type = empty( $cache_type ) ? 'standard' : $cache_type;
+		$cache_type = empty($cache_type) ? 'standard' : $cache_type;
 		$this->_cached_properties[$fieldname][$cache_type] = $value;
 	}
 
@@ -543,36 +543,36 @@ 
 	 * @return mixed                   whatever the value for the property is we're retrieving
 	 * @throws \EE_Error
 	 */
-	protected function _get_cached_property( $fieldname, $pretty = FALSE, $extra_cache_ref = NULL ) {
+	protected function _get_cached_property($fieldname, $pretty = FALSE, $extra_cache_ref = NULL) {
 		//verify the field exists
 		$this->get_model()->field_settings_for($fieldname);
 
 		$cache_type = $pretty ? 'pretty' : 'standard';
-		$cache_type .= !empty( $extra_cache_ref ) ? '_' . $extra_cache_ref : '';
+		$cache_type .= ! empty($extra_cache_ref) ? '_'.$extra_cache_ref : '';
 
-		if ( isset( $this->_cached_properties[$fieldname][$cache_type] ) ) {
+		if (isset($this->_cached_properties[$fieldname][$cache_type])) {
 			return $this->_cached_properties[$fieldname][$cache_type];
 		}
 
 		$field_obj = $this->get_model()->field_settings_for($fieldname);
-		if ( $field_obj instanceof EE_Model_Field_Base ) {
+		if ($field_obj instanceof EE_Model_Field_Base) {
 			/**
 			 * maybe this is EE_Datetime_Field.  If so we need to make sure timezone and
 			 * formats are correct.
 			 */
-			if ( $field_obj instanceof EE_Datetime_Field ) {
-				$field_obj->set_timezone( $this->_timezone );
-				$field_obj->set_date_format( $this->_dt_frmt, $pretty );
-				$field_obj->set_time_format( $this->_tm_frmt, $pretty );
+			if ($field_obj instanceof EE_Datetime_Field) {
+				$field_obj->set_timezone($this->_timezone);
+				$field_obj->set_date_format($this->_dt_frmt, $pretty);
+				$field_obj->set_time_format($this->_tm_frmt, $pretty);
 			}
 
-			if( ! isset($this->_fields[$fieldname])){
+			if ( ! isset($this->_fields[$fieldname])) {
 				$this->_fields[$fieldname] = NULL;
 			}
 			$value = $pretty
 				? $field_obj->prepare_for_pretty_echoing($this->_fields[$fieldname], $extra_cache_ref)
-				: $field_obj->prepare_for_get($this->_fields[$fieldname] );
-			$this->_set_cached_property( $fieldname, $value, $cache_type );
+				: $field_obj->prepare_for_get($this->_fields[$fieldname]);
+			$this->_set_cached_property($fieldname, $value, $cache_type);
 			return $value;
 		}
 		return null;
@@ -598,9 +598,9 @@ 
 	 * @param  string $property_name the property to remove if it exists (from the _cached_properties array)
 	 * @return void
 	 */
-	protected function _clear_cached_property( $property_name ) {
-		if ( isset( $this->_cached_properties[ $property_name ] ) ) {
-			unset( $this->_cached_properties[ $property_name ] );
+	protected function _clear_cached_property($property_name) {
+		if (isset($this->_cached_properties[$property_name])) {
+			unset($this->_cached_properties[$property_name]);
 		}
 	}
 
@@ -614,12 +614,12 @@ 
 	 * @return EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	protected function ensure_related_thing_is_model_obj($object_or_id,$model_name){
+	protected function ensure_related_thing_is_model_obj($object_or_id, $model_name) {
 		$other_model_instance = self::_get_model_instance_with_name(
-			self::_get_model_classname( $model_name ),
+			self::_get_model_classname($model_name),
 			$this->_timezone
 		);
-		return $other_model_instance->ensure_is_obj( $object_or_id );
+		return $other_model_instance->ensure_is_obj($object_or_id);
 	}
 
 
@@ -636,32 +636,32 @@ 
 	 * @throws EE_Error
 	 * @return EE_Base_Class | boolean from which was cleared from the cache, or true if we requested to remove a relation from all
 	 */
-	public function clear_cache($relationName, $object_to_remove_or_index_into_array = NULL, $clear_all = FALSE){
+	public function clear_cache($relationName, $object_to_remove_or_index_into_array = NULL, $clear_all = FALSE) {
 		$relationship_to_model = $this->get_model()->related_settings_for($relationName);
 		$index_in_cache = '';
-		if( ! $relationship_to_model){
+		if ( ! $relationship_to_model) {
 			throw new EE_Error(
 				sprintf(
-					__( "There is no relationship to %s on a %s. Cannot clear that cache", 'event_espresso' ),
+					__("There is no relationship to %s on a %s. Cannot clear that cache", 'event_espresso'),
 					$relationName,
-					get_class( $this )
+					get_class($this)
 				)
 			);
 		}
-		if($clear_all){
+		if ($clear_all) {
 			$obj_removed = true;
 			$this->_model_relations[$relationName]  = null;
-		}elseif($relationship_to_model instanceof EE_Belongs_To_Relation){
+		}elseif ($relationship_to_model instanceof EE_Belongs_To_Relation) {
 			$obj_removed = $this->_model_relations[$relationName];
 			$this->_model_relations[$relationName]  = null;
-		}else{
-			if($object_to_remove_or_index_into_array instanceof EE_Base_Class && $object_to_remove_or_index_into_array->ID()){
+		} else {
+			if ($object_to_remove_or_index_into_array instanceof EE_Base_Class && $object_to_remove_or_index_into_array->ID()) {
 				$index_in_cache = $object_to_remove_or_index_into_array->ID();
-				if( is_array($this->_model_relations[$relationName]) && ! isset($this->_model_relations[$relationName][$index_in_cache])){
+				if (is_array($this->_model_relations[$relationName]) && ! isset($this->_model_relations[$relationName][$index_in_cache])) {
 					$index_found_at = NULL;
 					//find this object in the array even though it has a different key
-					foreach($this->_model_relations[$relationName] as $index=>$obj){
-						if(
+					foreach ($this->_model_relations[$relationName] as $index=>$obj) {
+						if (
 							$obj instanceof EE_Base_Class
 							&& (
 								$obj == $object_to_remove_or_index_into_array
@@ -672,34 +672,34 @@ 
 							break;
 						}
 					}
-					if($index_found_at){
+					if ($index_found_at) {
 						$index_in_cache = $index_found_at;
-					}else{
+					} else {
 						//it wasn't found. huh. well obviously it doesn't need to be removed from teh cache
 						//if it wasn't in it to begin with. So we're done
 						return $object_to_remove_or_index_into_array;
 					}
 				}
-			}elseif($object_to_remove_or_index_into_array instanceof EE_Base_Class){
+			}elseif ($object_to_remove_or_index_into_array instanceof EE_Base_Class) {
 				//so they provided a model object, but it's not yet saved to the DB... so let's go hunting for it!
-				foreach($this->get_all_from_cache($relationName) as $index => $potentially_obj_we_want){
-					if($potentially_obj_we_want == $object_to_remove_or_index_into_array){
+				foreach ($this->get_all_from_cache($relationName) as $index => $potentially_obj_we_want) {
+					if ($potentially_obj_we_want == $object_to_remove_or_index_into_array) {
 						$index_in_cache = $index;
 					}
 				}
-			}else{
+			} else {
 				$index_in_cache = $object_to_remove_or_index_into_array;
 			}
 			//supposedly we've found it. But it could just be that the client code
 			//provided a bad index/object
 			if (
 				isset(
-					$this->_model_relations[ $relationName ],
-					$this->_model_relations[ $relationName ][ $index_in_cache ]
+					$this->_model_relations[$relationName],
+					$this->_model_relations[$relationName][$index_in_cache]
 				)
 			) {
-				$obj_removed = $this->_model_relations[ $relationName ][ $index_in_cache ];
-				unset( $this->_model_relations[ $relationName ][ $index_in_cache ] );
+				$obj_removed = $this->_model_relations[$relationName][$index_in_cache];
+				unset($this->_model_relations[$relationName][$index_in_cache]);
 			} else {
 				//that thing was never cached anyways.
 				$obj_removed = null;
@@ -720,24 +720,24 @@ 
 	 * @return boolean TRUE on success, FALSE on fail
 	 * @throws \EE_Error
 	 */
-	public function update_cache_after_object_save( $relationName, EE_Base_Class $newly_saved_object, $current_cache_id = '') {
+	public function update_cache_after_object_save($relationName, EE_Base_Class $newly_saved_object, $current_cache_id = '') {
 		// verify that incoming object is of the correct type
-		$obj_class = 'EE_' . $relationName;
-		if ( $newly_saved_object instanceof $obj_class ) {
+		$obj_class = 'EE_'.$relationName;
+		if ($newly_saved_object instanceof $obj_class) {
 			/* @type EE_Base_Class $newly_saved_object*/
 			// now get the type of relation
-			$relationship_to_model = $this->get_model()->related_settings_for( $relationName );
+			$relationship_to_model = $this->get_model()->related_settings_for($relationName);
 			// if this is a 1:1 relationship
-			if( $relationship_to_model instanceof EE_Belongs_To_Relation ) {
+			if ($relationship_to_model instanceof EE_Belongs_To_Relation) {
 				// then just replace the cached object with the newly saved object
 				$this->_model_relations[$relationName] = $newly_saved_object;
 				return TRUE;
 			// or if it's some kind of sordid feral polyamorous relationship...
-			} elseif ( is_array( $this->_model_relations[$relationName] ) && isset( $this->_model_relations[$relationName][ $current_cache_id ] )) {
+			} elseif (is_array($this->_model_relations[$relationName]) && isset($this->_model_relations[$relationName][$current_cache_id])) {
 				// then remove the current cached item
-				unset( $this->_model_relations[$relationName][ $current_cache_id ] );
+				unset($this->_model_relations[$relationName][$current_cache_id]);
 				// and cache the newly saved object using it's new ID
-				$this->_model_relations[$relationName][ $newly_saved_object->ID() ] = $newly_saved_object;
+				$this->_model_relations[$relationName][$newly_saved_object->ID()] = $newly_saved_object;
 				return TRUE;
 			}
 		}
@@ -753,11 +753,11 @@ 
 	 * @param string $relationName
 	 * @return EE_Base_Class
 	 */
-	public function get_one_from_cache($relationName){
-		$cached_array_or_object = isset( $this->_model_relations[$relationName] ) ? $this->_model_relations[$relationName] : null;
-		if(is_array($cached_array_or_object)){
+	public function get_one_from_cache($relationName) {
+		$cached_array_or_object = isset($this->_model_relations[$relationName]) ? $this->_model_relations[$relationName] : null;
+		if (is_array($cached_array_or_object)) {
 			return array_shift($cached_array_or_object);
-		}else{
+		} else {
 			return $cached_array_or_object;
 		}
 	}
@@ -772,23 +772,23 @@ 
 	 * @throws \EE_Error
 	 * @return EE_Base_Class[] NOT necessarily indexed by primary keys
 	 */
-	public function get_all_from_cache($relationName){
-		$objects = isset( $this->_model_relations[$relationName] ) ? $this->_model_relations[$relationName] : array();
+	public function get_all_from_cache($relationName) {
+		$objects = isset($this->_model_relations[$relationName]) ? $this->_model_relations[$relationName] : array();
 		// if the result is not an array, but exists, make it an array
-		$objects = is_array( $objects ) ? $objects : array( $objects );
+		$objects = is_array($objects) ? $objects : array($objects);
 		//bugfix for https://events.codebasehq.com/projects/event-espresso/tickets/7143
 		//basically, if this model object was stored in the session, and these cached model objects
 		//already have IDs, let's make sure they're in their model's entity mapper
 		//otherwise we will have duplicates next time we call
 		// EE_Registry::instance()->load_model( $relationName )->get_one_by_ID( $result->ID() );
-		$model = EE_Registry::instance()->load_model( $relationName );
-		foreach( $objects as $model_object ){
-			if( $model instanceof EEM_Base && $model_object instanceof EE_Base_Class ){
+		$model = EE_Registry::instance()->load_model($relationName);
+		foreach ($objects as $model_object) {
+			if ($model instanceof EEM_Base && $model_object instanceof EE_Base_Class) {
 				//ensure its in the map if it has an ID; otherwise it will be added to the map when its saved
-				if( $model_object->ID() ){
-					$model->add_to_entity_map( $model_object );
+				if ($model_object->ID()) {
+					$model->add_to_entity_map($model_object);
 				}
-			}else{
+			} else {
 				throw new EE_Error(
 					sprintf(
 						__(
@@ -796,7 +796,7 @@ 
 							'event_espresso'
 						),
 						$relationName,
-						gettype( $model_object )
+						gettype($model_object)
 					)
 				);
 			}
@@ -818,15 +818,15 @@ 
 	 * @return array|EE_Base_Class[]
 	 * @throws \EE_Error
 	 */
-	public function next_x( $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null ) {
-		$field = empty( $field_to_order_by ) && $this->get_model()->has_primary_key_field()
+	public function next_x($field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null) {
+		$field = empty($field_to_order_by) && $this->get_model()->has_primary_key_field()
 			? $this->get_model()->get_primary_key_field()->get_name()
 			: $field_to_order_by;
-		$current_value = ! empty( $field ) ? $this->get( $field ) : null;
-		if ( empty( $field ) || empty( $current_value ) ) {
+		$current_value = ! empty($field) ? $this->get($field) : null;
+		if (empty($field) || empty($current_value)) {
 			return array();
 		}
-		return $this->get_model()->next_x( $current_value, $field, $limit, $query_params, $columns_to_select );
+		return $this->get_model()->next_x($current_value, $field, $limit, $query_params, $columns_to_select);
 	}
 
 
@@ -843,15 +843,15 @@ 
 	 * @return array|EE_Base_Class[]
 	 * @throws \EE_Error
 	 */
-	public function previous_x( $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null ) {
-		$field = empty( $field_to_order_by ) && $this->get_model()->has_primary_key_field()
+	public function previous_x($field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null) {
+		$field = empty($field_to_order_by) && $this->get_model()->has_primary_key_field()
 			? $this->get_model()->get_primary_key_field()->get_name()
 			: $field_to_order_by;
-		$current_value = ! empty( $field ) ? $this->get( $field ) : null;
-		if ( empty( $field ) || empty( $current_value ) ) {
+		$current_value = ! empty($field) ? $this->get($field) : null;
+		if (empty($field) || empty($current_value)) {
 			return array();
 		}
-		return $this->get_model()->previous_x( $current_value, $field, $limit, $query_params, $columns_to_select );
+		return $this->get_model()->previous_x($current_value, $field, $limit, $query_params, $columns_to_select);
 	}
 
 
@@ -867,15 +867,15 @@ 
 	 * @return array|EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	public function next( $field_to_order_by = null, $query_params = array(), $columns_to_select = null ) {
-		$field = empty( $field_to_order_by ) && $this->get_model()->has_primary_key_field()
+	public function next($field_to_order_by = null, $query_params = array(), $columns_to_select = null) {
+		$field = empty($field_to_order_by) && $this->get_model()->has_primary_key_field()
 			? $this->get_model()->get_primary_key_field()->get_name()
 			: $field_to_order_by;
-		$current_value = ! empty( $field ) ? $this->get( $field ) : null;
-		if ( empty( $field ) || empty( $current_value ) ) {
+		$current_value = ! empty($field) ? $this->get($field) : null;
+		if (empty($field) || empty($current_value)) {
 			return array();
 		}
-		return $this->get_model()->next( $current_value, $field, $query_params, $columns_to_select );
+		return $this->get_model()->next($current_value, $field, $query_params, $columns_to_select);
 	}
 
 
@@ -891,15 +891,15 @@ 
 	 * @return array|EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	public function previous( $field_to_order_by = null, $query_params = array(), $columns_to_select = null ) {
-		$field = empty( $field_to_order_by ) && $this->get_model()->has_primary_key_field()
+	public function previous($field_to_order_by = null, $query_params = array(), $columns_to_select = null) {
+		$field = empty($field_to_order_by) && $this->get_model()->has_primary_key_field()
 			? $this->get_model()->get_primary_key_field()->get_name()
 			: $field_to_order_by;
-		$current_value = ! empty( $field ) ? $this->get( $field ) : null;
-		if ( empty( $field ) || empty( $current_value ) ) {
+		$current_value = ! empty($field) ? $this->get($field) : null;
+		if (empty($field) || empty($current_value)) {
 			return array();
 		}
-		return $this->get_model()->previous( $current_value, $field, $query_params, $columns_to_select );
+		return $this->get_model()->previous($current_value, $field, $query_params, $columns_to_select);
 	}
 
 
@@ -912,25 +912,25 @@ 
 	 * @param mixed  $field_value_from_db
 	 * @throws \EE_Error
 	 */
-	public function set_from_db($field_name,$field_value_from_db){
+	public function set_from_db($field_name, $field_value_from_db) {
 		$field_obj = $this->get_model()->field_settings_for($field_name);
-		if ( $field_obj instanceof EE_Model_Field_Base ) {
+		if ($field_obj instanceof EE_Model_Field_Base) {
 			//you would think the DB has no NULLs for non-null label fields right? wrong!
 			//eg, a CPT model object could have an entry in the posts table, but no
 			//entry in the meta table. Meaning that all its columns in the meta table
 			//are null! yikes! so when we find one like that, use defaults for its meta columns
-			if($field_value_from_db === NULL ){
-				if( $field_obj->is_nullable()){
+			if ($field_value_from_db === NULL) {
+				if ($field_obj->is_nullable()) {
 					//if the field allows nulls, then let it be null
 					$field_value = NULL;
-				}else{
+				} else {
 					$field_value = $field_obj->get_default_value();
 				}
-			}else{
-				$field_value = $field_obj->prepare_for_set_from_db( $field_value_from_db );
+			} else {
+				$field_value = $field_obj->prepare_for_set_from_db($field_value_from_db);
 			}
 			$this->_fields[$field_name] = $field_value;
-			$this->_clear_cached_property( $field_name );
+			$this->_clear_cached_property($field_name);
 		}
 	}
 
@@ -946,8 +946,8 @@ 
 	 * @return mixed
 	 * @throws \EE_Error
 	 */
-	public function get($field_name, $extra_cache_ref = NULL ){
-		return $this->_get_cached_property( $field_name, FALSE, $extra_cache_ref );
+	public function get($field_name, $extra_cache_ref = NULL) {
+		return $this->_get_cached_property($field_name, FALSE, $extra_cache_ref);
 	}
 
 
@@ -980,10 +980,10 @@ 
 	 *                                         just null is returned (because that indicates that likely
 	 *                                         this field is nullable).
 	 */
-	public function get_DateTime_object( $field_name ) {
-		$field_settings = $this->get_model()->field_settings_for( $field_name );
+	public function get_DateTime_object($field_name) {
+		$field_settings = $this->get_model()->field_settings_for($field_name);
 
-		if ( ! $field_settings instanceof EE_Datetime_Field ) {
+		if ( ! $field_settings instanceof EE_Datetime_Field) {
 			EE_Error::add_error(
 				sprintf(
 					__(
@@ -1015,7 +1015,7 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function e($field_name, $extra_cache_ref = NULL){
+	public function e($field_name, $extra_cache_ref = NULL) {
 		echo $this->get_pretty($field_name, $extra_cache_ref);
 	}
 
@@ -1029,8 +1029,8 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function f($field_name){
-		$this->e($field_name,'form_input');
+	public function f($field_name) {
+		$this->e($field_name, 'form_input');
 	}
 
 
@@ -1043,8 +1043,8 @@ 
 	 * @return mixed
 	 * @throws \EE_Error
 	 */
-	public function get_pretty($field_name, $extra_cache_ref = NULL){
-		return  $this->_get_cached_property( $field_name, TRUE, $extra_cache_ref );
+	public function get_pretty($field_name, $extra_cache_ref = NULL) {
+		return  $this->_get_cached_property($field_name, TRUE, $extra_cache_ref);
 	}
 
 
@@ -1062,36 +1062,36 @@ 
 	 * @return void | string | bool | EE_Error string on success, FALSE on fail, or EE_Error Exception is thrown if field is not a valid dtt field, or void if echoing
 	 * @throws \EE_Error
 	 */
-	protected function _get_datetime( $field_name, $dt_frmt = NULL, $tm_frmt = NULL, $date_or_time = NULL, $echo = FALSE ) {
+	protected function _get_datetime($field_name, $dt_frmt = NULL, $tm_frmt = NULL, $date_or_time = NULL, $echo = FALSE) {
 
-		$in_dt_frmt = empty($dt_frmt) ? $this->_dt_frmt :  $dt_frmt;
+		$in_dt_frmt = empty($dt_frmt) ? $this->_dt_frmt : $dt_frmt;
 		$in_tm_frmt = empty($tm_frmt) ? $this->_tm_frmt : $tm_frmt;
 
 		//validate field for datetime and returns field settings if valid.
-		$field = $this->_get_dtt_field_settings( $field_name );
+		$field = $this->_get_dtt_field_settings($field_name);
 
 		//clear cached property if either formats are not null.
-		if( $dt_frmt !== null || $tm_frmt !== null ) {
-			$this->_clear_cached_property( $field_name );
+		if ($dt_frmt !== null || $tm_frmt !== null) {
+			$this->_clear_cached_property($field_name);
 			//reset format properties because they are used in get()
 			$this->_dt_frmt = $in_dt_frmt;
 			$this->_tm_frmt = $in_tm_frmt;
 		}
-		if ( $echo ) {
-			$field->set_pretty_date_format( $in_dt_frmt );
+		if ($echo) {
+			$field->set_pretty_date_format($in_dt_frmt);
 		} else {
-			$field->set_date_format( $in_dt_frmt );
+			$field->set_date_format($in_dt_frmt);
 		}
-		if ( $echo ) {
-			$field->set_pretty_time_format( $in_tm_frmt );
+		if ($echo) {
+			$field->set_pretty_time_format($in_tm_frmt);
 		} else {
-			$field->set_time_format( $in_tm_frmt );
+			$field->set_time_format($in_tm_frmt);
 		}
 		//set timezone in field object
-		$field->set_timezone( $this->_timezone );
+		$field->set_timezone($this->_timezone);
 
 		//set the output returned
-		switch ( $date_or_time ) {
+		switch ($date_or_time) {
 
 			case 'D' :
 				$field->set_date_time_output('date');
@@ -1106,11 +1106,11 @@ 
 		}
 
 
-		if ( $echo ) {
-			$this->e( $field_name, $date_or_time );
+		if ($echo) {
+			$this->e($field_name, $date_or_time);
 			return '';
 		 }
-		return $this->get( $field_name, $date_or_time );
+		return $this->get($field_name, $date_or_time);
 	}
 
 
@@ -1123,8 +1123,8 @@ 
 	 * @return string            datetime value formatted
 	 * @throws \EE_Error
 	 */
-	public function get_date( $field_name, $format = NULL ) {
-		return $this->_get_datetime( $field_name, $format, NULL, 'D' );
+	public function get_date($field_name, $format = NULL) {
+		return $this->_get_datetime($field_name, $format, NULL, 'D');
 	}
 
 
@@ -1134,8 +1134,8 @@ 
 	 * @param null $format
 	 * @throws \EE_Error
 	 */
-	public function e_date( $field_name, $format = NULL ) {
-		$this->_get_datetime( $field_name, $format, NULL, 'D', TRUE );
+	public function e_date($field_name, $format = NULL) {
+		$this->_get_datetime($field_name, $format, NULL, 'D', TRUE);
 	}
 
 
@@ -1148,8 +1148,8 @@ 
 	 * @return string             datetime value formatted
 	 * @throws \EE_Error
 	 */
-	public function get_time( $field_name, $format = NULL ) {
-		return $this->_get_datetime( $field_name, NULL, $format, 'T' );
+	public function get_time($field_name, $format = NULL) {
+		return $this->_get_datetime($field_name, NULL, $format, 'T');
 	}
 
 
@@ -1159,8 +1159,8 @@ 
 	 * @param null $format
 	 * @throws \EE_Error
 	 */
-	public function e_time( $field_name, $format = NULL ) {
-		$this->_get_datetime( $field_name, NULL, $format, 'T', TRUE );
+	public function e_time($field_name, $format = NULL) {
+		$this->_get_datetime($field_name, NULL, $format, 'T', TRUE);
 	}
 
 
@@ -1174,8 +1174,8 @@ 
 	 * @return string             datetime value formatted
 	 * @throws \EE_Error
 	 */
-	public function get_datetime( $field_name, $dt_frmt = NULL, $tm_frmt = NULL ) {
-		return $this->_get_datetime( $field_name, $dt_frmt, $tm_frmt );
+	public function get_datetime($field_name, $dt_frmt = NULL, $tm_frmt = NULL) {
+		return $this->_get_datetime($field_name, $dt_frmt, $tm_frmt);
 	}
 
 
@@ -1186,8 +1186,8 @@ 
 	 * @param null $tm_frmt
 	 * @throws \EE_Error
 	 */
-	public function e_datetime( $field_name, $dt_frmt = NULL, $tm_frmt = NULL ) {
-		$this->_get_datetime( $field_name, $dt_frmt, $tm_frmt, NULL, TRUE);
+	public function e_datetime($field_name, $dt_frmt = NULL, $tm_frmt = NULL) {
+		$this->_get_datetime($field_name, $dt_frmt, $tm_frmt, NULL, TRUE);
 	}
 
 
@@ -1201,11 +1201,11 @@ 
 	 * @throws \EE_Error
 	 *                           field name.
 	 */
-	public function get_i18n_datetime( $field_name, $format = NULL ) {
-		$format = empty( $format ) ? $this->_dt_frmt . ' ' . $this->_tm_frmt : $format;
+	public function get_i18n_datetime($field_name, $format = NULL) {
+		$format = empty($format) ? $this->_dt_frmt.' '.$this->_tm_frmt : $format;
 		return date_i18n(
 			$format,
-			EEH_DTT_Helper::get_timestamp_with_offset( $this->get_raw( $field_name ), $this->_timezone )
+			EEH_DTT_Helper::get_timestamp_with_offset($this->get_raw($field_name), $this->_timezone)
 		);
 	}
 
@@ -1218,14 +1218,14 @@ 
 	 * @throws EE_Error
 	 * @return EE_Datetime_Field
 	 */
-	protected function _get_dtt_field_settings( $field_name ) {
+	protected function _get_dtt_field_settings($field_name) {
 		$field = $this->get_model()->field_settings_for($field_name);
 
 		//check if field is dtt
-		if ( $field instanceof EE_Datetime_Field ) {
+		if ($field instanceof EE_Datetime_Field) {
 			return $field;
 		} else {
-			throw new EE_Error( sprintf( __('The field name "%s" has been requested for the EE_Base_Class datetime functions and it is not a valid EE_Datetime_Field.  Please check the spelling of the field and make sure it has been setup as a EE_Datetime_Field in the %s model constructor', 'event_espresso'), $field_name, self::_get_model_classname( get_class($this) ) ) );
+			throw new EE_Error(sprintf(__('The field name "%s" has been requested for the EE_Base_Class datetime functions and it is not a valid EE_Datetime_Field.  Please check the spelling of the field and make sure it has been setup as a EE_Datetime_Field in the %s model constructor', 'event_espresso'), $field_name, self::_get_model_classname(get_class($this))));
 		}
 	}
 
@@ -1246,8 +1246,8 @@ 
 	 * @param string          $fieldname the name of the field the time is being set on (must match a EE_Datetime_Field)
 	 * @throws \EE_Error
 	 */
-	protected function _set_time_for( $time, $fieldname ) {
-		$this->_set_date_time( 'T', $time, $fieldname );
+	protected function _set_time_for($time, $fieldname) {
+		$this->_set_date_time('T', $time, $fieldname);
 	}
 
 
@@ -1260,8 +1260,8 @@ 
 	 * @param string          $fieldname the name of the field the date is being set on (must match a EE_Datetime_Field)
 	 * @throws \EE_Error
 	 */
-	protected function _set_date_for( $date, $fieldname ) {
-		$this->_set_date_time( 'D', $date, $fieldname );
+	protected function _set_date_for($date, $fieldname) {
+		$this->_set_date_time('D', $date, $fieldname);
 	}
 
 
@@ -1275,26 +1275,26 @@ 
 	 * @param string          $fieldname      the name of the field the date OR time is being set on (must match a EE_Datetime_Field property)
 	 * @throws \EE_Error
 	 */
-	protected function _set_date_time( $what = 'T', $datetime_value, $fieldname ) {
-		$field = $this->_get_dtt_field_settings( $fieldname );
-		$field->set_timezone( $this->_timezone );
-		$field->set_date_format( $this->_dt_frmt );
-		$field->set_time_format( $this->_tm_frmt );
-		switch ( $what ) {
+	protected function _set_date_time($what = 'T', $datetime_value, $fieldname) {
+		$field = $this->_get_dtt_field_settings($fieldname);
+		$field->set_timezone($this->_timezone);
+		$field->set_date_format($this->_dt_frmt);
+		$field->set_time_format($this->_tm_frmt);
+		switch ($what) {
 			case 'T' :
-				$this->_fields[ $fieldname ] = $field->prepare_for_set_with_new_time(
+				$this->_fields[$fieldname] = $field->prepare_for_set_with_new_time(
 					$datetime_value,
-					$this->_fields[ $fieldname ]
+					$this->_fields[$fieldname]
 				);
 				break;
 			case 'D' :
-				$this->_fields[ $fieldname ] = $field->prepare_for_set_with_new_date(
+				$this->_fields[$fieldname] = $field->prepare_for_set_with_new_date(
 					$datetime_value,
-					$this->_fields[ $fieldname ]
+					$this->_fields[$fieldname]
 				);
 				break;
 			case 'B' :
-				$this->_fields[ $fieldname ] = $field->prepare_for_set( $datetime_value );
+				$this->_fields[$fieldname] = $field->prepare_for_set($datetime_value);
 				break;
 		}
 		$this->_clear_cached_property($fieldname);
@@ -1316,17 +1316,17 @@ 
 	 * @throws EE_Error
 	 * @return string timestamp
 	 */
-	public function display_in_my_timezone( $field_name, $callback = 'get_datetime', $args = NULL, $prepend = '', $append = '' ) {
+	public function display_in_my_timezone($field_name, $callback = 'get_datetime', $args = NULL, $prepend = '', $append = '') {
 		$timezone = EEH_DTT_Helper::get_timezone();
-		if ( $timezone === $this->_timezone ) {
+		if ($timezone === $this->_timezone) {
 			return '';
 		}
 		$original_timezone = $this->_timezone;
-		$this->set_timezone( $timezone );
+		$this->set_timezone($timezone);
 
 		$fn = (array) $field_name;
-		$args = array_merge( $fn, (array) $args );
-		if ( ! method_exists( $this, $callback ) ) {
+		$args = array_merge($fn, (array) $args);
+		if ( ! method_exists($this, $callback)) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -1338,9 +1338,9 @@ 
 			);
 		}
 		$args = (array) $args;
-		$return =  $prepend . call_user_func_array( array( $this, $callback ), $args ) . $append;
+		$return = $prepend.call_user_func_array(array($this, $callback), $args).$append;
 
-		$this->set_timezone( $original_timezone );
+		$this->set_timezone($original_timezone);
 		return $return;
 	}
 
@@ -1354,7 +1354,7 @@ 
 	 * @return boolean | int
 	 * @throws \EE_Error
 	 */
-	public function delete(){
+	public function delete() {
 		/**
 		 * Called just before the `EE_Base_Class::_delete` method call.
 		 * Note: `EE_Base_Class::_delete` might be overridden by child classes so any client code hooking into these actions
@@ -1363,7 +1363,7 @@ 
 		 *
 		 * @param EE_Base_Class $model_object about to be 'deleted'
 		 */
-		do_action( 'AHEE__EE_Base_Class__delete__before', $this );
+		do_action('AHEE__EE_Base_Class__delete__before', $this);
 		$result = $this->_delete();
 		/**
 		 * Called just after the `EE_Base_Class::_delete` method call.
@@ -1373,7 +1373,7 @@ 
 		 * @param EE_Base_Class $model_object that was just 'deleted'
 		 * @param boolean $result
 		 */
-		do_action( 'AHEE__EE_Base_Class__delete__end', $this, $result );
+		do_action('AHEE__EE_Base_Class__delete__end', $this, $result);
 		return $result;
 	}
 
@@ -1399,22 +1399,22 @@ 
 	 * @return bool | int
 	 * @throws \EE_Error
 	 */
-	public function delete_permanently(){
+	public function delete_permanently() {
 		/**
 		 * Called just before HARD deleting a model object
 		 *
 		 * @param EE_Base_Class $model_object about to be 'deleted'
 		 */
-		do_action( 'AHEE__EE_Base_Class__delete_permanently__before', $this );
-		$model=$this->get_model();
-		$result=$model->delete_permanently_by_ID($this->ID());
+		do_action('AHEE__EE_Base_Class__delete_permanently__before', $this);
+		$model = $this->get_model();
+		$result = $model->delete_permanently_by_ID($this->ID());
 		$this->refresh_cache_of_related_objects();
 		/**
 		 * Called just after HARD deleting a model object
 		 * @param EE_Base_Class $model_object that was just 'deleted'
 		 * @param boolean $result
 		 */
-		do_action( 'AHEE__EE_Base_Class__delete_permanently__end', $this, $result );
+		do_action('AHEE__EE_Base_Class__delete_permanently__end', $this, $result);
 		return $result;
 	}
 
@@ -1427,18 +1427,18 @@ 
 	 * @throws \EE_Error
 	 */
         public function refresh_cache_of_related_objects() {
-            foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ) {
-                if( ! empty( $this->_model_relations[ $relation_name ] ) ) {
-                    $related_objects = $this->_model_relations[ $relation_name ];
-                    if( $relation_obj instanceof EE_Belongs_To_Relation ) {
+            foreach ($this->get_model()->relation_settings() as $relation_name => $relation_obj) {
+                if ( ! empty($this->_model_relations[$relation_name])) {
+                    $related_objects = $this->_model_relations[$relation_name];
+                    if ($relation_obj instanceof EE_Belongs_To_Relation) {
                         //this relation only stores a single model object, not an array
                         //but let's make it consistent
-                        $related_objects = array( $related_objects );
+                        $related_objects = array($related_objects);
                     }
-                    foreach( $related_objects as $related_object ) {
+                    foreach ($related_objects as $related_object) {
                         //only refresh their cache if they're in memory
-                        if( $related_object instanceof EE_Base_Class ) {
-							$related_object->clear_cache( $this->get_model()->get_this_model_name(), $this );
+                        if ($related_object instanceof EE_Base_Class) {
+							$related_object->clear_cache($this->get_model()->get_this_model_name(), $this);
                         }
                     }
                 }
@@ -1458,17 +1458,17 @@ 
 	 * @return int , 1 on a successful update, the ID of the new entry on insert; 0 on failure or if the model object
 	 * isn't allowed to persist (as determined by EE_Base_Class::allow_persist())
 	 */
-	public function save($set_cols_n_values=array()) {
+	public function save($set_cols_n_values = array()) {
 		/**
 		 * Filters the fields we're about to save on the model object
 		 *
 		 * @param array $set_cols_n_values
 		 * @param EE_Base_Class $model_object
 		 */
-		$set_cols_n_values = (array)apply_filters( 'FHEE__EE_Base_Class__save__set_cols_n_values', $set_cols_n_values, $this  );
+		$set_cols_n_values = (array) apply_filters('FHEE__EE_Base_Class__save__set_cols_n_values', $set_cols_n_values, $this);
 		//set attributes as provided in $set_cols_n_values
-		foreach($set_cols_n_values as $column=>$value){
-			$this->set($column,$value);
+		foreach ($set_cols_n_values as $column=>$value) {
+			$this->set($column, $value);
 		}
 		/**
 		 * Saving a model object.
@@ -1476,8 +1476,8 @@ 
 		 * Before we perform a save, this action is fired.
 		 * @param EE_Base_Class $model_object the model object about to be saved.
 		 */
-		do_action( 'AHEE__EE_Base_Class__save__begin', $this );
-		if( ! $this->allow_persist() ) {
+		do_action('AHEE__EE_Base_Class__save__begin', $this);
+		if ( ! $this->allow_persist()) {
 			return 0;
 		}
 		//now get current attribute values
@@ -1487,61 +1487,61 @@ 
 		$old_assumption_concerning_value_preparation = $this->get_model()->get_assumption_concerning_values_already_prepared_by_model_object();
 		$this->get_model()->assume_values_already_prepared_by_model_object(true);
 		//does this model have an autoincrement PK?
-		if($this->get_model()->has_primary_key_field()){
-			if($this->get_model()->get_primary_key_field()->is_auto_increment()){
+		if ($this->get_model()->has_primary_key_field()) {
+			if ($this->get_model()->get_primary_key_field()->is_auto_increment()) {
 				//ok check if it's set, if so: update; if not, insert
-				if ( ! empty( $save_cols_n_values[self::_get_primary_key_name( get_class($this) )] ) ){
-					$results = $this->get_model()->update_by_ID ( $save_cols_n_values, $this->ID() );
+				if ( ! empty($save_cols_n_values[self::_get_primary_key_name(get_class($this))])) {
+					$results = $this->get_model()->update_by_ID($save_cols_n_values, $this->ID());
 				} else {
-					unset($save_cols_n_values[self::_get_primary_key_name( get_class( $this) )]);
-					$results = $this->get_model()->insert( $save_cols_n_values );
-					if($results){
+					unset($save_cols_n_values[self::_get_primary_key_name(get_class($this))]);
+					$results = $this->get_model()->insert($save_cols_n_values);
+					if ($results) {
 						//if successful, set the primary key
 						//but don't use the normal SET method, because it will check if
 						//an item with the same ID exists in the mapper & db, then
 						//will find it in the db (because we just added it) and THAT object
 						//will get added to the mapper before we can add this one!
 						//but if we just avoid using the SET method, all that headache can be avoided
-						$pk_field_name =self::_get_primary_key_name( get_class($this));
+						$pk_field_name = self::_get_primary_key_name(get_class($this));
 						$this->_fields[$pk_field_name] = $results;
 						$this->_clear_cached_property($pk_field_name);
-						$this->get_model()->add_to_entity_map( $this );
+						$this->get_model()->add_to_entity_map($this);
 						$this->_update_cached_related_model_objs_fks();
 					}
 				}
-			}else{//PK is NOT auto-increment
+			} else {//PK is NOT auto-increment
 				//so check if one like it already exists in the db
-				if( $this->get_model()->exists_by_ID( $this->ID() ) ){
-					if( WP_DEBUG && ! $this->in_entity_map() ){
+				if ($this->get_model()->exists_by_ID($this->ID())) {
+					if (WP_DEBUG && ! $this->in_entity_map()) {
 						throw new EE_Error(
 							sprintf(
-								__( 'Using a model object %1$s that is NOT in the entity map, can lead to unexpected errors. You should either: %4$s 1. Put it in the entity mapper by calling %2$s %4$s 2. Discard this model object and use what is in the entity mapper %4$s 3. Fetch from the database using %3$s', 'event_espresso' ),
+								__('Using a model object %1$s that is NOT in the entity map, can lead to unexpected errors. You should either: %4$s 1. Put it in the entity mapper by calling %2$s %4$s 2. Discard this model object and use what is in the entity mapper %4$s 3. Fetch from the database using %3$s', 'event_espresso'),
 								get_class($this),
-								get_class( $this->get_model() ) . '::instance()->add_to_entity_map()',
-								get_class( $this->get_model() ) . '::instance()->get_one_by_ID()',
+								get_class($this->get_model()).'::instance()->add_to_entity_map()',
+								get_class($this->get_model()).'::instance()->get_one_by_ID()',
 								'<br />'
 							)
 						);
 					}
 					$results = $this->get_model()->update_by_ID($save_cols_n_values, $this->ID());
-				}else{
+				} else {
 					$results = $this->get_model()->insert($save_cols_n_values);
 					$this->_update_cached_related_model_objs_fks();
 				}
 			}
-		}else{//there is NO primary key
+		} else {//there is NO primary key
 			$already_in_db = false;
-			foreach($this->get_model()->unique_indexes() as $index){
+			foreach ($this->get_model()->unique_indexes() as $index) {
 				$uniqueness_where_params = array_intersect_key($save_cols_n_values, $index->fields());
-				if($this->get_model()->exists(array($uniqueness_where_params))){
+				if ($this->get_model()->exists(array($uniqueness_where_params))) {
 					$already_in_db = true;
 				}
 			}
-			if( $already_in_db ){
-				$combined_pk_fields_n_values = array_intersect_key( $save_cols_n_values, $this->get_model()->get_combined_primary_key_fields() );
-				$results = $this->get_model()->update( $save_cols_n_values,$combined_pk_fields_n_values );
-			}else{
-				$results = $this->get_model()->insert( $save_cols_n_values );
+			if ($already_in_db) {
+				$combined_pk_fields_n_values = array_intersect_key($save_cols_n_values, $this->get_model()->get_combined_primary_key_fields());
+				$results = $this->get_model()->update($save_cols_n_values, $combined_pk_fields_n_values);
+			} else {
+				$results = $this->get_model()->insert($save_cols_n_values);
 			}
 		}
 		//restore the old assumption about values being prepared by the model object
@@ -1554,7 +1554,7 @@ 
 		 * @param boolean|int $results if it were updated, TRUE or FALSE; if it were newly inserted
 		 * the new ID (or 0 if an error occurred and it wasn't updated)
 		 */
-		do_action( 'AHEE__EE_Base_Class__save__end', $this, $results );
+		do_action('AHEE__EE_Base_Class__save__end', $this, $results);
 		return $results;
 	}
 
@@ -1569,15 +1569,15 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	protected function _update_cached_related_model_objs_fks(){
-		foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ){
-			if( $relation_obj instanceof EE_Has_Many_Relation ){
-				foreach( $this->get_all_from_cache( $relation_name ) as $related_model_obj_in_cache) {
+	protected function _update_cached_related_model_objs_fks() {
+		foreach ($this->get_model()->relation_settings() as $relation_name => $relation_obj) {
+			if ($relation_obj instanceof EE_Has_Many_Relation) {
+				foreach ($this->get_all_from_cache($relation_name) as $related_model_obj_in_cache) {
 					$fk_to_this = $related_model_obj_in_cache->get_model()->get_foreign_key_to(
 						$this->get_model()->get_this_model_name()
 					);
-					$related_model_obj_in_cache->set($fk_to_this->get_name(), $this->ID() );
-					if( $related_model_obj_in_cache->ID() ){
+					$related_model_obj_in_cache->set($fk_to_this->get_name(), $this->ID());
+					if ($related_model_obj_in_cache->ID()) {
 						$related_model_obj_in_cache->save();
 					}
 				}
@@ -1598,21 +1598,21 @@ 
 	 * @return int ID of new model object on save; 0 on failure+
 	 * @throws \EE_Error
 	 */
-	public function save_new_cached_related_model_objs(){
+	public function save_new_cached_related_model_objs() {
 		//make sure this has been saved
-		if( ! $this->ID()){
+		if ( ! $this->ID()) {
 			$id = $this->save();
-		}else{
+		} else {
 			$id = $this->ID();
 		}
 		//now save all the NEW cached model objects  (ie they don't exist in the DB)
-		foreach($this->get_model()->relation_settings() as $relationName => $relationObj){
+		foreach ($this->get_model()->relation_settings() as $relationName => $relationObj) {
 
 
-			if($this->_model_relations[$relationName]){
+			if ($this->_model_relations[$relationName]) {
 				//is this a relation where we should expect just ONE related object (ie, EE_Belongs_To_relation)
 				//or MANY related objects (ie, EE_HABTM_Relation or EE_Has_Many_Relation)?
-				if($relationObj instanceof EE_Belongs_To_Relation){
+				if ($relationObj instanceof EE_Belongs_To_Relation) {
 					//add a relation to that relation type (which saves the appropriate thing in the process)
 					//but ONLY if it DOES NOT exist in the DB
 					/* @var $related_model_obj EE_Base_Class */
@@ -1621,8 +1621,8 @@ 
 						$this->_add_relation_to($related_model_obj, $relationName);
 						$related_model_obj->save_new_cached_related_model_objs();
 //					}
-				}else{
-					foreach($this->_model_relations[$relationName] as $related_model_obj){
+				} else {
+					foreach ($this->_model_relations[$relationName] as $related_model_obj) {
 						//add a relation to that relation type (which saves the appropriate thing in the process)
 						//but ONLY if it DOES NOT exist in the DB
 //						if( ! $related_model_obj->ID()){
@@ -1643,8 +1643,8 @@ 
 	 * @return \EEM_Base | \EEM_CPT_Base
 	 */
 	public function get_model() {
-		$modelName = self::_get_model_classname( get_class($this) );
-		return self::_get_model_instance_with_name($modelName, $this->_timezone );
+		$modelName = self::_get_model_classname(get_class($this));
+		return self::_get_model_instance_with_name($modelName, $this->_timezone);
 	}
 
 
@@ -1655,10 +1655,10 @@ 
 	 * @return mixed bool|EE_Base_Class|EEM_CPT_Base
 	 * @throws \EE_Error
 	 */
-	protected static function _get_object_from_entity_mapper($props_n_values, $classname){
+	protected static function _get_object_from_entity_mapper($props_n_values, $classname) {
 		//TODO: will not work for Term_Relationships because they have no PK!
-		$primary_id_ref = self::_get_primary_key_name( $classname );
-		if ( array_key_exists( $primary_id_ref, $props_n_values ) && !empty( $props_n_values[$primary_id_ref] ) ) {
+		$primary_id_ref = self::_get_primary_key_name($classname);
+		if (array_key_exists($primary_id_ref, $props_n_values) && ! empty($props_n_values[$primary_id_ref])) {
 			$id = $props_n_values[$primary_id_ref];
 			return self::_get_model($classname)->get_from_entity_map($id);
 		}
@@ -1679,37 +1679,37 @@ 
 	 * @return mixed (EE_Base_Class|bool)
 	 * @throws \EE_Error
 	 */
-	protected static function _check_for_object( $props_n_values, $classname, $timezone = NULL, $date_formats = array() ) {
+	protected static function _check_for_object($props_n_values, $classname, $timezone = NULL, $date_formats = array()) {
 		$existing = null;
-		if ( self::_get_model( $classname )->has_primary_key_field() ) {
-			$primary_id_ref = self::_get_primary_key_name( $classname );
-			if ( array_key_exists( $primary_id_ref, $props_n_values )
-			     && ! empty( $props_n_values[ $primary_id_ref ] )
+		if (self::_get_model($classname)->has_primary_key_field()) {
+			$primary_id_ref = self::_get_primary_key_name($classname);
+			if (array_key_exists($primary_id_ref, $props_n_values)
+			     && ! empty($props_n_values[$primary_id_ref])
 			) {
-				$existing = self::_get_model( $classname, $timezone )->get_one_by_ID(
-					$props_n_values[ $primary_id_ref ]
+				$existing = self::_get_model($classname, $timezone)->get_one_by_ID(
+					$props_n_values[$primary_id_ref]
 				);
 			}
-		} elseif ( self::_get_model( $classname, $timezone )->has_all_combined_primary_key_fields( $props_n_values ) ) {
+		} elseif (self::_get_model($classname, $timezone)->has_all_combined_primary_key_fields($props_n_values)) {
 			//no primary key on this model, but there's still a matching item in the DB
-			$existing = self::_get_model( $classname, $timezone )->get_one_by_ID(
-				self::_get_model( $classname, $timezone )->get_index_primary_key_string( $props_n_values )
+			$existing = self::_get_model($classname, $timezone)->get_one_by_ID(
+				self::_get_model($classname, $timezone)->get_index_primary_key_string($props_n_values)
 			);
 		}
-		if ( $existing ) {
+		if ($existing) {
 
 			//set date formats if present before setting values
-			if ( ! empty( $date_formats ) && is_array( $date_formats ) ) {
-				$existing->set_date_format( $date_formats[0] );
-				$existing->set_time_format( $date_formats[1] );
+			if ( ! empty($date_formats) && is_array($date_formats)) {
+				$existing->set_date_format($date_formats[0]);
+				$existing->set_time_format($date_formats[1]);
 			} else {
 				//set default formats for date and time
-				$existing->set_date_format( get_option( 'date_format' ) );
-				$existing->set_time_format( get_option( 'time_format' ) );
+				$existing->set_date_format(get_option('date_format'));
+				$existing->set_time_format(get_option('time_format'));
 			}
 
-			foreach ( $props_n_values as $property => $field_value ) {
-				$existing->set( $property, $field_value );
+			foreach ($props_n_values as $property => $field_value) {
+				$existing->set($property, $field_value);
 			}
 			return $existing;
 		} else {
@@ -1727,9 +1727,9 @@ 
 	 * @throws EE_Error
 	 * @return EEM_Base
 	 */
-	protected static function  _get_model( $classname, $timezone = NULL ){
+	protected static function  _get_model($classname, $timezone = NULL) {
 		//find model for this class
-		if( ! $classname ){
+		if ( ! $classname) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -1740,8 +1740,8 @@ 
 				)
 			);
 		}
-		$modelName=self::_get_model_classname($classname);
-		return self::_get_model_instance_with_name($modelName, $timezone );
+		$modelName = self::_get_model_classname($classname);
+		return self::_get_model_instance_with_name($modelName, $timezone);
 	}
 
 
@@ -1752,10 +1752,10 @@ 
 	 * @param null   $timezone
 	 * @return EEM_Base
 	 */
-	protected static function _get_model_instance_with_name($model_classname, $timezone = NULL){
-		$model_classname = str_replace( 'EEM_', '', $model_classname );
-		$model = EE_Registry::instance()->load_model( $model_classname );
-		$model->set_timezone( $timezone );
+	protected static function _get_model_instance_with_name($model_classname, $timezone = NULL) {
+		$model_classname = str_replace('EEM_', '', $model_classname);
+		$model = EE_Registry::instance()->load_model($model_classname);
+		$model->set_timezone($timezone);
 		return $model;
 	}
 
@@ -1767,10 +1767,10 @@ 
 	 * @param null $model_name
 	 * @return string like EEM_Attendee
 	 */
-	private static function _get_model_classname( $model_name = null){
-		if(strpos($model_name,"EE_")===0){
-			$model_classname=str_replace("EE_","EEM_",$model_name);
-		}else{
+	private static function _get_model_classname($model_name = null) {
+		if (strpos($model_name, "EE_") === 0) {
+			$model_classname = str_replace("EE_", "EEM_", $model_name);
+		} else {
 			$model_classname = "EEM_".$model_name;
 		}
 		return $model_classname;
@@ -1784,16 +1784,16 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	protected static function _get_primary_key_name( $classname = NULL ){
-		if( ! $classname){
+	protected static function _get_primary_key_name($classname = NULL) {
+		if ( ! $classname) {
 			throw new EE_Error(
 				sprintf(
-					__( "What were you thinking calling _get_primary_key_name(%s)", "event_espresso" ),
+					__("What were you thinking calling _get_primary_key_name(%s)", "event_espresso"),
 					$classname
 				)
 			);
 		}
-		return self::_get_model( $classname )->get_primary_key_field()->get_name();
+		return self::_get_model($classname)->get_primary_key_field()->get_name();
 	}
 
 
@@ -1807,12 +1807,12 @@ 
 	 * @return mixed, if the primary key is of type INT it'll be an int. Otherwise it could be a string
 	 * @throws \EE_Error
 	 */
-	public function ID(){
+	public function ID() {
 		//now that we know the name of the variable, use a variable variable to get its value and return its
-		if( $this->get_model()->has_primary_key_field() ) {
-			return $this->_fields[ self::_get_primary_key_name( get_class($this) ) ];
-		}else{
-			return $this->get_model()->get_index_primary_key_string( $this->_fields );
+		if ($this->get_model()->has_primary_key_field()) {
+			return $this->_fields[self::_get_primary_key_name(get_class($this))];
+		} else {
+			return $this->get_model()->get_index_primary_key_string($this->_fields);
 		}
 	}
 
@@ -1830,38 +1830,38 @@ 
 	 * @throws EE_Error
 	 * @return EE_Base_Class the object the relation was added to
 	 */
-	public function _add_relation_to( $otherObjectModelObjectOrID,$relationName, $extra_join_model_fields_n_values = array(), $cache_id = NULL ){
+	public function _add_relation_to($otherObjectModelObjectOrID, $relationName, $extra_join_model_fields_n_values = array(), $cache_id = NULL) {
 		//if this thing exists in the DB, save the relation to the DB
-		if( $this->ID() ){
-			$otherObject = $this->get_model()->add_relationship_to( $this, $otherObjectModelObjectOrID, $relationName, $extra_join_model_fields_n_values );
+		if ($this->ID()) {
+			$otherObject = $this->get_model()->add_relationship_to($this, $otherObjectModelObjectOrID, $relationName, $extra_join_model_fields_n_values);
 			//clear cache so future get_many_related and get_first_related() return new results.
-			$this->clear_cache( $relationName, $otherObject, TRUE );
-                        if( $otherObject instanceof EE_Base_Class ) {
-                            $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this );
+			$this->clear_cache($relationName, $otherObject, TRUE);
+                        if ($otherObject instanceof EE_Base_Class) {
+                            $otherObject->clear_cache($this->get_model()->get_this_model_name(), $this);
                         }
 		} else {
 			//this thing doesn't exist in the DB,  so just cache it
-			if( ! $otherObjectModelObjectOrID instanceof EE_Base_Class){
-				throw new EE_Error( sprintf(
-					__( 'Before a model object is saved to the database, calls to _add_relation_to must be passed an actual object, not just an ID. You provided %s as the model object to a %s', 'event_espresso' ),
+			if ( ! $otherObjectModelObjectOrID instanceof EE_Base_Class) {
+				throw new EE_Error(sprintf(
+					__('Before a model object is saved to the database, calls to _add_relation_to must be passed an actual object, not just an ID. You provided %s as the model object to a %s', 'event_espresso'),
 					$otherObjectModelObjectOrID,
-					get_class( $this )
+					get_class($this)
 				));
 			} else {
 				$otherObject = $otherObjectModelObjectOrID;
 			}
-			$this->cache( $relationName, $otherObjectModelObjectOrID, $cache_id );
+			$this->cache($relationName, $otherObjectModelObjectOrID, $cache_id);
 		}
-                if( $otherObject instanceof EE_Base_Class ) {
+                if ($otherObject instanceof EE_Base_Class) {
                     //fix the reciprocal relation too
-                    if( $otherObject->ID() ) {
+                    if ($otherObject->ID()) {
                             //its saved so assumed relations exist in the DB, so we can just
                             //clear the cache so future queries use the updated info in the DB
-                            $otherObject->clear_cache( $this->get_model()->get_this_model_name(), null, true );
+                            $otherObject->clear_cache($this->get_model()->get_this_model_name(), null, true);
                     } else {
 
                             //it's not saved, so it caches relations like this
-                            $otherObject->cache( $this->get_model()->get_this_model_name(), $this );
+                            $otherObject->cache($this->get_model()->get_this_model_name(), $this);
                     }
                 }
 		return $otherObject;
@@ -1885,17 +1885,17 @@ 
 	 * @return EE_Base_Class the relation was removed from
 	 * @throws \EE_Error
 	 */
-	public function _remove_relation_to($otherObjectModelObjectOrID,$relationName, $where_query = array() ){
-		if ( $this->ID() ) {
+	public function _remove_relation_to($otherObjectModelObjectOrID, $relationName, $where_query = array()) {
+		if ($this->ID()) {
 			//if this exists in the DB, save the relation change to the DB too
-			$otherObject = $this->get_model()->remove_relationship_to( $this, $otherObjectModelObjectOrID, $relationName, $where_query );
-			$this->clear_cache( $relationName, $otherObject );
+			$otherObject = $this->get_model()->remove_relationship_to($this, $otherObjectModelObjectOrID, $relationName, $where_query);
+			$this->clear_cache($relationName, $otherObject);
 		} else {
 			//this doesn't exist in the DB, just remove it from the cache
-			$otherObject = $this->clear_cache( $relationName, $otherObjectModelObjectOrID );
+			$otherObject = $this->clear_cache($relationName, $otherObjectModelObjectOrID);
 		}
-                if( $otherObject instanceof EE_Base_Class ) {
-                    $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this );
+                if ($otherObject instanceof EE_Base_Class) {
+                    $otherObject->clear_cache($this->get_model()->get_this_model_name(), $this);
                 }
 		return $otherObject;
 	}
@@ -1910,18 +1910,18 @@ 
 	 * @return EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	public function _remove_relations($relationName,$where_query_params = array()){
-		if ( $this->ID() ) {
+	public function _remove_relations($relationName, $where_query_params = array()) {
+		if ($this->ID()) {
 			//if this exists in the DB, save the relation change to the DB too
-			$otherObjects = $this->get_model()->remove_relations( $this, $relationName, $where_query_params );
-			$this->clear_cache( $relationName, null, true );
+			$otherObjects = $this->get_model()->remove_relations($this, $relationName, $where_query_params);
+			$this->clear_cache($relationName, null, true);
 		} else {
 			//this doesn't exist in the DB, just remove it from the cache
-			$otherObjects = $this->clear_cache( $relationName, null, true );
+			$otherObjects = $this->clear_cache($relationName, null, true);
 		}
-                if( is_array( $otherObjects ) ) {
-                    foreach ( $otherObjects as $otherObject ) {
-                            $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this );
+                if (is_array($otherObjects)) {
+                    foreach ($otherObjects as $otherObject) {
+                            $otherObject->clear_cache($this->get_model()->get_this_model_name(), $this);
                     }
                 }
 		return $otherObjects;
@@ -1941,27 +1941,27 @@ 
 	 * @throws \EE_Error
 	 *                             or might not be saved yet. Consider using EEM_Base::get_IDs() on these results if you want IDs
 	 */
-	public function get_many_related($relationName,$query_params = array()){
-		if($this->ID()){
+	public function get_many_related($relationName, $query_params = array()) {
+		if ($this->ID()) {
 			//this exists in the DB, so get the related things from either the cache or the DB
 			//if there are query parameters, forget about caching the related model objects.
-			if( $query_params ){
+			if ($query_params) {
 				$related_model_objects = $this->get_model()->get_all_related($this, $relationName, $query_params);
-			}else{
+			} else {
 				//did we already cache the result of this query?
 				$cached_results = $this->get_all_from_cache($relationName);
-				if ( ! $cached_results ){
+				if ( ! $cached_results) {
 					$related_model_objects = $this->get_model()->get_all_related($this, $relationName, $query_params);
 					//if no query parameters were passed, then we got all the related model objects
 					//for that relation. We can cache them then.
-					foreach($related_model_objects as $related_model_object){
+					foreach ($related_model_objects as $related_model_object) {
 						$this->cache($relationName, $related_model_object);
 					}
-				}else{
+				} else {
 					$related_model_objects = $cached_results;
 				}
 			}
-		}else{
+		} else {
 			//this doesn't exist in the DB, so just get the related things from the cache
 			$related_model_objects = $this->get_all_from_cache($relationName);
 		}
@@ -1979,8 +1979,8 @@ 
 	 * @param bool   	$distinct       if we want to only count the distinct values for the column then you can trigger that by the setting $distinct to TRUE;
 	 * @return int
 	 */
-	public function count_related($relation_name, $query_params =array(),$field_to_count = NULL, $distinct = FALSE){
-		return $this->get_model()->count_related($this,$relation_name,$query_params,$field_to_count,$distinct);
+	public function count_related($relation_name, $query_params = array(), $field_to_count = NULL, $distinct = FALSE) {
+		return $this->get_model()->count_related($this, $relation_name, $query_params, $field_to_count, $distinct);
 	}
 
 
@@ -1994,7 +1994,7 @@ 
 	 * 						By default, uses primary key (which doesn't make much sense, so you should probably change it)
 	 * @return int
 	 */
-	public function sum_related($relation_name, $query_params = array(), $field_to_sum = null){
+	public function sum_related($relation_name, $query_params = array(), $field_to_sum = null) {
 		return $this->get_model()->sum_related($this, $relation_name, $query_params, $field_to_sum);
 	}
 
@@ -2008,33 +2008,33 @@ 
 	 * @return EE_Base_Class (not an array, a single object)
 	 * @throws \EE_Error
 	 */
-	public function get_first_related($relationName,$query_params = array()){
-		if($this->ID()){//this exists in the DB, get from the cache OR the DB
+	public function get_first_related($relationName, $query_params = array()) {
+		if ($this->ID()) {//this exists in the DB, get from the cache OR the DB
 
 			//if they've provided some query parameters, don't bother trying to cache the result
 			//also make sure we're not caching the result of get_first_related
 			//on a relation which should have an array of objects (because the cache might have an array of objects)
-			if ($query_params || ! $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation){
-				$related_model_object =  $this->get_model()->get_first_related($this, $relationName, $query_params);
-			}else{
+			if ($query_params || ! $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation) {
+				$related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params);
+			} else {
 				//first, check if we've already cached the result of this query
 				$cached_result = $this->get_one_from_cache($relationName);
-				if ( ! $cached_result ){
+				if ( ! $cached_result) {
 
 					$related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params);
-					$this->cache($relationName,$related_model_object);
-				}else{
+					$this->cache($relationName, $related_model_object);
+				} else {
 					$related_model_object = $cached_result;
 				}
 			}
-		}else{
+		} else {
 			$related_model_object = null;
 			//this doesn't exist in the Db, but maybe the relation is of type belongs to, and so the related thing might
-			if( $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation){
-				$related_model_object =  $this->get_model()->get_first_related($this, $relationName, $query_params);
+			if ($this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation) {
+				$related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params);
 			}
 			//this doesn't exist in the DB and apparently the thing it belongs to doesn't either, just get what's cached on this object
-			if( ! $related_model_object){
+			if ( ! $related_model_object) {
 				$related_model_object = $this->get_one_from_cache($relationName);
 			}
 
@@ -2056,12 +2056,12 @@ 
 	 * @return int how many deleted
 	 * @throws \EE_Error
 	 */
-	public function delete_related($relationName,$query_params = array()){
-		if($this->ID()){
-			$count =  $this->get_model()->delete_related($this, $relationName, $query_params);
-		}else{
+	public function delete_related($relationName, $query_params = array()) {
+		if ($this->ID()) {
+			$count = $this->get_model()->delete_related($this, $relationName, $query_params);
+		} else {
 			$count = count($this->get_all_from_cache($relationName));
-			$this->clear_cache($relationName,NULL,TRUE);
+			$this->clear_cache($relationName, NULL, TRUE);
 		}
 		return $count;
 	}
@@ -2080,13 +2080,13 @@ 
 	 * @return int how many deleted (including those soft deleted)
 	 * @throws \EE_Error
 	 */
-	public function delete_related_permanently($relationName,$query_params = array()){
-		if($this->ID()){
-			$count =  $this->get_model()->delete_related_permanently($this, $relationName, $query_params);
-		}else{
+	public function delete_related_permanently($relationName, $query_params = array()) {
+		if ($this->ID()) {
+			$count = $this->get_model()->delete_related_permanently($this, $relationName, $query_params);
+		} else {
 			$count = count($this->get_all_from_cache($relationName));
 		}
-		$this->clear_cache($relationName,NULL,TRUE);
+		$this->clear_cache($relationName, NULL, TRUE);
 		return $count;
 	}
 
@@ -2102,7 +2102,7 @@ 
 	 * @param  string $field_name property to check
 	 * @return bool            				  TRUE if existing,FALSE if not.
 	 */
-	public function is_set( $field_name ) {
+	public function is_set($field_name) {
 		return isset($this->_fields[$field_name]);
 	}
 
@@ -2114,11 +2114,11 @@ 
 	 * @throws EE_Error
 	 * @return bool                              TRUE if existing, throw EE_Error if not.
 	 */
-	protected function _property_exists( $properties ) {
+	protected function _property_exists($properties) {
 
-		foreach ( (array) $properties as $property_name ) {
+		foreach ((array) $properties as $property_name) {
 			//first make sure this property exists
-			if ( ! $this->_fields[ $property_name ] ) {
+			if ( ! $this->_fields[$property_name]) {
 				throw new EE_Error(
 					sprintf(
 						__(
@@ -2146,7 +2146,7 @@ 
 		$fields = $this->get_model()->field_settings(FALSE);
 		$properties = array();
 		//remove prepended underscore
-		foreach ( $fields as $field_name => $settings ) {
+		foreach ($fields as $field_name => $settings) {
 			$properties[$field_name] = $this->get($field_name);
 		}
 		return $properties;
@@ -2176,10 +2176,10 @@ 
 	 * @throws EE_Error
 	 * @return mixed whatever the plugin which calls add_filter decides
 	 */
-	public function __call($methodName,$args){
-		$className=get_class($this);
-		$tagName="FHEE__{$className}__{$methodName}";
-		if ( ! has_filter( $tagName ) ) {
+	public function __call($methodName, $args) {
+		$className = get_class($this);
+		$tagName = "FHEE__{$className}__{$methodName}";
+		if ( ! has_filter($tagName)) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -2192,7 +2192,7 @@ 
 				)
 			);
 		}
-		return apply_filters($tagName,null,$this,$args);
+		return apply_filters($tagName, null, $this, $args);
 	}
 
 
@@ -2208,7 +2208,7 @@ 
 	 * @throws \EE_Error
 	 * NOTE: if the values haven't changed, returns 0
 	 */
-	public function update_extra_meta($meta_key,$meta_value,$previous_value = NULL){
+	public function update_extra_meta($meta_key, $meta_value, $previous_value = NULL) {
 		$query_params = array(
 			array(
 				'EXM_key'  => $meta_key,
@@ -2216,17 +2216,17 @@ 
 				'EXM_type' => $this->get_model()->get_this_model_name()
 			)
 		);
-		if ( $previous_value !== null ) {
+		if ($previous_value !== null) {
 			$query_params[0]['EXM_value'] = $meta_value;
 		}
-		$existing_rows_like_that = EEM_Extra_Meta::instance()->get_all( $query_params );
-		if ( ! $existing_rows_like_that ) {
-			return $this->add_extra_meta( $meta_key, $meta_value );
+		$existing_rows_like_that = EEM_Extra_Meta::instance()->get_all($query_params);
+		if ( ! $existing_rows_like_that) {
+			return $this->add_extra_meta($meta_key, $meta_value);
 		} else {
-			foreach ( $existing_rows_like_that as $existing_row ) {
-				$existing_row->save( array( 'EXM_value' => $meta_value ) );
+			foreach ($existing_rows_like_that as $existing_row) {
+				$existing_row->save(array('EXM_value' => $meta_value));
 			}
-			return count( $existing_rows_like_that );
+			return count($existing_rows_like_that);
 		}
 	}
 
@@ -2243,8 +2243,8 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function add_extra_meta($meta_key,$meta_value,$unique = false){
-		if ( $unique ) {
+	public function add_extra_meta($meta_key, $meta_value, $unique = false) {
+		if ($unique) {
 			$existing_extra_meta = EEM_Extra_Meta::instance()->get_one(
 				array(
 					array(
@@ -2254,7 +2254,7 @@ 
 					)
 				)
 			);
-			if ( $existing_extra_meta ) {
+			if ($existing_extra_meta) {
 				return false;
 			}
 		}
@@ -2281,7 +2281,7 @@ 
 	 * @return int number of extra meta rows deleted
 	 * @throws \EE_Error
 	 */
-	public function delete_extra_meta($meta_key,$meta_value = NULL){
+	public function delete_extra_meta($meta_key, $meta_value = NULL) {
 		$query_params = array(
 			array(
 				'EXM_key'  => $meta_key,
@@ -2289,10 +2289,10 @@ 
 				'EXM_type' => $this->get_model()->get_this_model_name()
 			)
 		);
-		if ( $meta_value !== null ) {
+		if ($meta_value !== null) {
 			$query_params[0]['EXM_value'] = $meta_value;
 		}
-		return EEM_Extra_Meta::instance()->delete( $query_params );
+		return EEM_Extra_Meta::instance()->delete($query_params);
 	}
 
 
@@ -2308,25 +2308,25 @@ 
 	 * @return mixed single value if $single; array if ! $single
 	 * @throws \EE_Error
 	 */
-	public function get_extra_meta($meta_key,$single = FALSE,$default = NULL){
-		if($single){
-			$result = $this->get_first_related('Extra_Meta',array(array('EXM_key'=>$meta_key)));
-			if ( $result instanceof EE_Extra_Meta ){
+	public function get_extra_meta($meta_key, $single = FALSE, $default = NULL) {
+		if ($single) {
+			$result = $this->get_first_related('Extra_Meta', array(array('EXM_key'=>$meta_key)));
+			if ($result instanceof EE_Extra_Meta) {
 				return $result->value();
-			}else{
+			} else {
 				return $default;
 			}
-		}else{
-			$results =  $this->get_many_related('Extra_Meta',array(array('EXM_key'=>$meta_key)));
-			if($results){
+		} else {
+			$results = $this->get_many_related('Extra_Meta', array(array('EXM_key'=>$meta_key)));
+			if ($results) {
 				$values = array();
-				foreach($results as $result){
-					if ( $result instanceof EE_Extra_Meta ){
+				foreach ($results as $result) {
+					if ($result instanceof EE_Extra_Meta) {
 						$values[$result->ID()] = $result->value();
 					}
 				}
 				return $values;
-			}else{
+			} else {
 				return $default;
 			}
 		}
@@ -2348,20 +2348,20 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	public function all_extra_meta_array($one_of_each_key = true){
+	public function all_extra_meta_array($one_of_each_key = true) {
 		$return_array = array();
-		if($one_of_each_key){
+		if ($one_of_each_key) {
 			$extra_meta_objs = $this->get_many_related('Extra_Meta', array('group_by'=>'EXM_key'));
-			foreach($extra_meta_objs as $extra_meta_obj){
-				if ( $extra_meta_obj instanceof EE_Extra_Meta ) {
+			foreach ($extra_meta_objs as $extra_meta_obj) {
+				if ($extra_meta_obj instanceof EE_Extra_Meta) {
 					$return_array[$extra_meta_obj->key()] = $extra_meta_obj->value();
 				}
 			}
-		}else{
+		} else {
 			$extra_meta_objs = $this->get_many_related('Extra_Meta');
-			foreach($extra_meta_objs as $extra_meta_obj){
-				if ( $extra_meta_obj instanceof EE_Extra_Meta ) {
-					if( ! isset($return_array[$extra_meta_obj->key()])){
+			foreach ($extra_meta_objs as $extra_meta_obj) {
+				if ($extra_meta_obj instanceof EE_Extra_Meta) {
+					if ( ! isset($return_array[$extra_meta_obj->key()])) {
 						$return_array[$extra_meta_obj->key()] = array();
 					}
 					$return_array[$extra_meta_obj->key()][$extra_meta_obj->ID()] = $extra_meta_obj->value();
@@ -2379,19 +2379,19 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function name(){
+	public function name() {
 		//find a field that's not a text field
 		$field_we_can_use = $this->get_model()->get_a_field_of_type('EE_Text_Field_Base');
-		if($field_we_can_use){
+		if ($field_we_can_use) {
 			return $this->get($field_we_can_use->get_name());
-		}else{
+		} else {
 			$first_few_properties = $this->model_field_array();
-			$first_few_properties = array_slice($first_few_properties,0,3);
+			$first_few_properties = array_slice($first_few_properties, 0, 3);
 			$name_parts = array();
-			foreach( $first_few_properties as $name=> $value ){
+			foreach ($first_few_properties as $name=> $value) {
 				$name_parts[] = "$name:$value";
 			}
-			return implode(",",$name_parts);
+			return implode(",", $name_parts);
 		}
 	}
 
@@ -2404,11 +2404,11 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function in_entity_map(){
-		if( $this->ID() && $this->get_model()->get_from_entity_map( $this->ID() ) === $this ) {
+	public function in_entity_map() {
+		if ($this->ID() && $this->get_model()->get_from_entity_map($this->ID()) === $this) {
 			//well, if we looked, did we find it in the entity map?
 			return TRUE;
-		}else{
+		} else {
 			return FALSE;
 		}
 	}
@@ -2419,21 +2419,21 @@ 
 	 * @throws EE_Error if this model object isn't in the entity mapper (because then you should
 	 * just use what's in the entity mapper and refresh it) and WP_DEBUG is TRUE
 	 */
-	public function refresh_from_db(){
-		if( $this->ID() && $this->in_entity_map() ){
-			$this->get_model()->refresh_entity_map_from_db( $this->ID() );
-		}else{
+	public function refresh_from_db() {
+		if ($this->ID() && $this->in_entity_map()) {
+			$this->get_model()->refresh_entity_map_from_db($this->ID());
+		} else {
 			//if it doesn't have ID, you shouldn't be asking to refresh it from teh database (because its not in the database)
 			//if it has an ID but it's not in the map, and you're asking me to refresh it
 			//that's kinda dangerous. You should just use what's in the entity map, or add this to the entity map if there's
 			//absolutely nothing in it for this ID
-			if( WP_DEBUG ) {
+			if (WP_DEBUG) {
 				throw new EE_Error(
 					sprintf(
-						__( 'Trying to refresh a model object with ID "%1$s" that\'s not in the entity map? First off: you should put it in the entity map by calling %2$s. Second off, if you want what\'s in the database right now, you should just call %3$s yourself and discard this model object.', 'event_espresso' ),
+						__('Trying to refresh a model object with ID "%1$s" that\'s not in the entity map? First off: you should put it in the entity map by calling %2$s. Second off, if you want what\'s in the database right now, you should just call %3$s yourself and discard this model object.', 'event_espresso'),
 						$this->ID(),
-						get_class( $this->get_model() ) . '::instance()->add_to_entity_map()',
-						get_class( $this->get_model() ) . '::instance()->refresh_entity_map()'
+						get_class($this->get_model()).'::instance()->add_to_entity_map()',
+						get_class($this->get_model()).'::instance()->refresh_entity_map()'
 					)
 				);
 			}
@@ -2447,11 +2447,11 @@ 
 	 * (probably a bad assumption they have made, oh well)
 	 * @return string
 	 */
-	public function __toString(){
+	public function __toString() {
 		try {
-			return sprintf( '%s (%s)', $this->name(), $this->ID() );
-		} catch ( Exception $e ) {
-			EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__ );
+			return sprintf('%s (%s)', $this->name(), $this->ID());
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
 			return '';
 		}
 	}
@@ -2487,16 +2487,16 @@ 
 	 * @throws \EE_Error
 	 */
 	public function __sleep() {
-		foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ) {
-			if( $relation_obj instanceof EE_Belongs_To_Relation ) {
-				$classname = 'EE_' . $this->get_model()->get_this_model_name();
-				if( $this->get_one_from_cache( $relation_name ) instanceof $classname &&
-						$this->get_one_from_cache( $relation_name )->ID() ) {
-					$this->clear_cache( $relation_name, $this->get_one_from_cache( $relation_name )->ID() );
+		foreach ($this->get_model()->relation_settings() as $relation_name => $relation_obj) {
+			if ($relation_obj instanceof EE_Belongs_To_Relation) {
+				$classname = 'EE_'.$this->get_model()->get_this_model_name();
+				if ($this->get_one_from_cache($relation_name) instanceof $classname &&
+						$this->get_one_from_cache($relation_name)->ID()) {
+					$this->clear_cache($relation_name, $this->get_one_from_cache($relation_name)->ID());
 				}
 			}
 		}
-		return array_keys( get_object_vars( $this ) );
+		return array_keys(get_object_vars($this));
 	}