eventespresso / event-espresso-core

caffeinated/payment_methods/Aim/EEG_Aim.gateway.php

Doc Comments +2 added lines, -4 removed lines

@@ -206,7 +206,8 @@ 
 	/**
 	 * Posts the request to AuthorizeNet & returns response.
 	 *
-	 * @return AuthorizeNetARB_Response The response.
+	 * @param EEI_Payment $payment
+	 * @return EE_AuthorizeNetAIM_Response The response.
 	 */
 	private function _sendRequest($payment) {
 		$this->_x_post_fields['login'] = $this->_login_id;
@@ -353,9 +354,6 @@ 
 	 * Constructor. Parses the AuthorizeNet response string.
 	 *
 	 * @param string $response	  The response from the AuthNet server.
-	 * @param string $delimiter	 The delimiter used (default is ",")
-	 * @param string $encap_char	The encap_char used (default is "|")
-	 * @param array  $custom_fields Any custom fields set in the request.
 	 */
 
 	public function __construct($response) {

Indentation +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
 			//in which case, we need to generate teh invoice num per request right here...
 			$this->setField('invoice_num', wp_generate_password(12,false));//$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']);
 			//tell AIM that any duplicates sent in the next 5 minutes are to be ignored
-            $this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS );
+			$this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS );
 
 
 			if ($this->_test_transactions) {

Braces +3 added lines, -2 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -107,7 +108,7 @@ 
 				foreach($total_line_item->tax_descendants() as $tax_line_item){
 					$this->addLineItem($item_num++, $tax_line_item->name(), $tax_line_item->desc(), 1, $tax_line_item->total(), 'N');
 				}
-			}else{//partial payment
+			} else{//partial payment
 				$order_description = sprintf(__("Payment of %s for %s", "event_espresso"),$payment->amount(),$primary_registrant->reg_code());
 			}
 

Spacing +33 added lines, -33 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_Aim extends EE_Onsite_Gateway{
+class EEG_Aim extends EE_Onsite_Gateway {
 	protected $_login_id;
 	protected $_transaction_key;
 	protected $_currencies_supported = array(
@@ -98,17 +98,17 @@ 
 			$primary_registrant = $transaction->primary_registration();
 			//if we're are charging for the full amount, show the normal line items
 			//and the itemized total adds up properly
-			if( $this->_can_easily_itemize_transaction_for( $payment ) ){
+			if ($this->_can_easily_itemize_transaction_for($payment)) {
 				$total_line_item = $transaction->total_line_item();
 				foreach ($total_line_item->get_items() as $line_item) {
 					$this->addLineItem($item_num++, $line_item->name(), $line_item->desc(), $line_item->quantity(), $line_item->unit_price(), 'N');
 					$order_description .= $line_item->desc().', ';
 				}
-				foreach($total_line_item->tax_descendants() as $tax_line_item){
+				foreach ($total_line_item->tax_descendants() as $tax_line_item) {
 					$this->addLineItem($item_num++, $tax_line_item->name(), $tax_line_item->desc(), 1, $tax_line_item->total(), 'N');
 				}
-			}else{//partial payment
-				$order_description = sprintf(__("Payment of %s for %s", "event_espresso"),$payment->amount(),$primary_registrant->reg_code());
+			} else {//partial payment
+				$order_description = sprintf(__("Payment of %s for %s", "event_espresso"), $payment->amount(), $primary_registrant->reg_code());
 			}
 
 
@@ -116,7 +116,7 @@ 
 
 			//start transaction
 			$this->setField('amount', $this->format_currency($payment->amount()));
-			$this->setField('description',substr(rtrim($order_description, ', '), 0, 255));
+			$this->setField('description', substr(rtrim($order_description, ', '), 0, 255));
 			$this->setField('card_num', $billing_info['credit_card']);
 			$this->setField('exp_date', $billing_info['exp_month'].$billing_info['exp_year']);
 			$this->setField('card_code', $billing_info['cvv']);
@@ -126,8 +126,8 @@ 
 			$this->setField('company', $billing_info['company']);
 			$this->setField('address', $billing_info['address'].' '.$billing_info['address2']);
 			$this->setField('city', $billing_info['city']);
-			$this->setField('state', $billing_info['state'] );
-			$this->setField('country', $billing_info['country'] );
+			$this->setField('state', $billing_info['state']);
+			$this->setField('country', $billing_info['country']);
 			$this->setField('zip', $billing_info['zip']);
 			$this->setField('fax', $billing_info['fax']);
 			$this->setField('cust_id', $primary_registrant->ID());
@@ -135,9 +135,9 @@ 
 			//invoice_num would be nice to have itbe unique per SPCO page-load, taht way if users
 			//press back, they don't submit a duplicate. However, we may be keepin gthe user on teh same spco page
 			//in which case, we need to generate teh invoice num per request right here...
-			$this->setField('invoice_num', wp_generate_password(12,false));//$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']);
+			$this->setField('invoice_num', wp_generate_password(12, false)); //$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']);
 			//tell AIM that any duplicates sent in the next 5 minutes are to be ignored
-            $this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS );
+            $this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS);
 
 
 			if ($this->_test_transactions) {
@@ -147,7 +147,7 @@ 
 			//Capture response
 			$this->type = "AUTH_CAPTURE";
 			$response = $this->_sendRequest($payment);
-			if (!empty($response)){
+			if ( ! empty($response)) {
 				if ($this->_debug_mode) {
 					$txn_id = $response->invoice_number;
 				} else {
@@ -156,15 +156,15 @@ 
 				$payment_status = $response->approved ? $this->_pay_model->approved_status() : $this->_pay_model->declined_status();
 				$payment->set_status($payment_status);
 				//make sure we interpret the AMT as a float, not an international string (where periods are thousand seperators)
-				$payment->set_amount( floatval( $response->amount ) );
-				$payment->set_gateway_response(sprintf("%s (code: %s)",$response->response_reason_text,$response->response_reason_code));
-				$payment->set_txn_id_chq_nmbr( $txn_id );
+				$payment->set_amount(floatval($response->amount));
+				$payment->set_gateway_response(sprintf("%s (code: %s)", $response->response_reason_text, $response->response_reason_code));
+				$payment->set_txn_id_chq_nmbr($txn_id);
 				$payment->set_extra_accntng($primary_registrant->reg_code());
-				$payment->set_details(print_r($response,true));
+				$payment->set_details(print_r($response, true));
 			} else {
 				$payment->set_status($this->_pay_model->failed_status());
 				$payment->set_gateway_response(__("There was no response from Authorize.net", 'event_espresso'));
-				$payment->set_details(print_r($response,true));
+				$payment->set_details(print_r($response, true));
 			}
 		return $payment;
 	}
@@ -215,22 +215,22 @@ 
 		$this->_x_post_fields['tran_key'] = $this->_transaction_key;
 		$x_keys = array();
 		foreach ($this->_x_post_fields as $key => $value) {
-			$x_keys[] = "x_$key=" . urlencode($value);
+			$x_keys[] = "x_$key=".urlencode($value);
 		}
 		// Add line items
 		foreach ($this->_additional_line_items as $key => $value) {
-			$x_keys[] =  "x_line_item=" . urlencode($value);
+			$x_keys[] = "x_line_item=".urlencode($value);
 		}
 		$this->_log_clean_request($x_keys, $payment);
 		$post_url = ($this->_debug_mode ? self::SANDBOX_URL : self::LIVE_URL);
 		$curl_request = curl_init($post_url);
-		curl_setopt($curl_request, CURLOPT_POSTFIELDS, implode("&",$x_keys));
+		curl_setopt($curl_request, CURLOPT_POSTFIELDS, implode("&", $x_keys));
 		curl_setopt($curl_request, CURLOPT_HEADER, 0);
 		curl_setopt($curl_request, CURLOPT_TIMEOUT, 45);
 		curl_setopt($curl_request, CURLOPT_RETURNTRANSFER, 1);
 		curl_setopt($curl_request, CURLOPT_SSL_VERIFYHOST, 2);
 		if ($this->VERIFY_PEER) {
-			curl_setopt($curl_request, CURLOPT_CAINFO, dirname(dirname(__FILE__)) . '/ssl/cert.pem');
+			curl_setopt($curl_request, CURLOPT_CAINFO, dirname(dirname(__FILE__)).'/ssl/cert.pem');
 		} else {
 			curl_setopt($curl_request, CURLOPT_SSL_VERIFYPEER, false);
 		}
@@ -242,7 +242,7 @@ 
 		$response = curl_exec($curl_request);
 
 		curl_close($curl_request);
-		$response_obj =  new EE_AuthorizeNetAIM_Response($response);
+		$response_obj = new EE_AuthorizeNetAIM_Response($response);
 
 		return $this->_log_and_clean_response($response_obj, $payment);
 	}
@@ -251,18 +251,18 @@ 
 	 * @param array $request_array
 	 * @param EEI_Payment $payment
 	 */
-	private function _log_clean_request($request_array,$payment){
-		$keys_to_filter_out = array( 'x_card_num', 'x_card_code', 'x_exp_date' );
-		foreach($request_array as $index => $keyvaltogether ) {
-			foreach( $keys_to_filter_out as $key ) {
-				if( strpos( $keyvaltogether, $key ) === 0 ){
+	private function _log_clean_request($request_array, $payment) {
+		$keys_to_filter_out = array('x_card_num', 'x_card_code', 'x_exp_date');
+		foreach ($request_array as $index => $keyvaltogether) {
+			foreach ($keys_to_filter_out as $key) {
+				if (strpos($keyvaltogether, $key) === 0) {
 					//found it at the first character
 					//so its one of them
-					unset( $request_array[ $index ] );
+					unset($request_array[$index]);
 				}
 			}
 		}
-		$this->log(array('AIM Request sent:'=>$request_array),$payment);
+		$this->log(array('AIM Request sent:'=>$request_array), $payment);
 	}
 
 	/**
@@ -270,9 +270,9 @@ 
 	 * @param EE_AuthorizeNetAIM_Response $response_obj
 	 * @param EE_Payment $payment
 	 */
-	private function _log_and_clean_response($response_obj,$payment){
+	private function _log_and_clean_response($response_obj, $payment) {
 		$response_obj->account_number = '';
-		$this->log(array('AIM Response received:'=>$response_obj),$payment);
+		$this->log(array('AIM Response received:'=>$response_obj), $payment);
 		return $response_obj;
 	}
 
@@ -368,7 +368,7 @@ 
 			// Split Array
 			$this->response = $response;
 			if ($encap_char) {
-				$this->_response_array = explode($encap_char . $delimiter . $encap_char, substr($response, 1, -1));
+				$this->_response_array = explode($encap_char.$delimiter.$encap_char, substr($response, 1, -1));
 			} else {
 				$this->_response_array = explode($delimiter, $response);
 			}
@@ -438,7 +438,7 @@ 
 			$this->held = ($this->response_code == self::HELD);
 
 			if ($this->error || $this->declined || $this->held) {
-				$this->error_message = '<p><strong class="credit_card_failure">Attention: your transaction was declined for the following reason(s):</strong><br />' . $this->response_reason_text . '<br /><span class="response_code">Response Code: ' . $this->response_code . '<br /></span><span class="response_subcode">Response Subcode: ' . $this->response_subcode . '</span></p><p>To try again, <a href="#payment_options">please click here</a>.</p> ';
+				$this->error_message = '<p><strong class="credit_card_failure">Attention: your transaction was declined for the following reason(s):</strong><br />'.$this->response_reason_text.'<br /><span class="response_code">Response Code: '.$this->response_code.'<br /></span><span class="response_subcode">Response Subcode: '.$this->response_subcode.'</span></p><p>To try again, <a href="#payment_options">please click here</a>.</p> ';
 
 
 				/* $this->error_message = "AuthorizeNet Error:

caffeinated/payment_methods/Paypal_Pro/EEG_Paypal_Pro.gateway.php

Doc Comments +1 added lines, -1 removed lines

@@ -392,7 +392,7 @@
 
 
 	/**
-	 * @param $Request
+	 * @param string $Request
 	 * @return mixed
 	 */
 	private function _CURLRequest($Request) {

Braces +42 added lines, -31 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -123,7 +124,7 @@ 
 			}
 			$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();
 			$single_item_desc = sprintf(__("Partial payment of %s for %s", "event_espresso"),$payment->amount(),$primary_registrant->reg_code());
@@ -248,10 +249,10 @@ 
 				$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{
+			} 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)
@@ -263,7 +264,7 @@ 
 				$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());
 		}
@@ -325,53 +326,62 @@ 
 
 		// DP Fields
 		$DPFields = isset($DataArray['DPFields']) ? $DataArray['DPFields'] : array();
-		foreach ($DPFields as $DPFieldsVar => $DPFieldsVal)
-			$DPFieldsNVP .= '&' . strtoupper($DPFieldsVar) . '=' . urlencode($DPFieldsVal);
+		foreach ($DPFields as $DPFieldsVar => $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);
+		foreach ($CCDetails as $CCDetailsVar => $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);
+		foreach ($PayerInfo as $PayerInfoVar => $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);
+		foreach ($PayerName as $PayerNameVar => $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);
+		foreach ($BillingAddress as $BillingAddressVar => $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);
+		foreach ($PaymentDetails as $PaymentDetailsVar => $PaymentDetailsVal) {
+					$PaymentDetailsNVP .= '&' . strtoupper($PaymentDetailsVar) . '=' . urlencode($PaymentDetailsVal);
+		}
 
 		// Payment Details Item Type Fields
 		$OrderItems = isset($DataArray['OrderItems']) ? $DataArray['OrderItems'] : array();
 		$n = 0;
 		foreach ($OrderItems as $OrderItemsVar => $OrderItemsVal) {
 			$CurrentItem = $OrderItems[$OrderItemsVar];
-			foreach ($CurrentItem as $CurrentItemVar => $CurrentItemVal)
-				$OrderItemsNVP .= '&' . strtoupper($CurrentItemVar) . $n . '=' . urlencode($CurrentItemVal);
+			foreach ($CurrentItem as $CurrentItemVar => $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);
+		foreach ($ShippingAddress as $ShippingAddressVar => $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);
+		foreach ($Secure3D as $Secure3DVar => $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;
@@ -500,14 +510,15 @@ 
 			$CurrentError = $Errors[$ErrorVar];
 			foreach ($CurrentError as $CurrentErrorVar => $CurrentErrorVal) {
 				$CurrentVarName = '';
-				if ($CurrentErrorVar == 'L_ERRORCODE')
-					$CurrentVarName = 'Error Code';
-				elseif ($CurrentErrorVar == 'L_SHORTMESSAGE')
-					$CurrentVarName = 'Short Message';
-				elseif ($CurrentErrorVar == 'L_LONGMESSAGE')
-					$CurrentVarName = 'Long Message';
-				elseif ($CurrentErrorVar == 'L_SEVERITYCODE')
-					$CurrentVarName = 'Severity Code';
+				if ($CurrentErrorVar == 'L_ERRORCODE') {
+									$CurrentVarName = 'Error Code';
+				} elseif ($CurrentErrorVar == 'L_SHORTMESSAGE') {
+									$CurrentVarName = 'Short Message';
+				} elseif ($CurrentErrorVar == 'L_LONGMESSAGE') {
+									$CurrentVarName = 'Long Message';
+				} elseif ($CurrentErrorVar == 'L_SEVERITYCODE') {
+									$CurrentVarName = 'Severity Code';
+				}
 
 				$error .= '<br />' . $CurrentVarName . ': ' . $CurrentErrorVal;
 			}

Spacing +51 added lines, -51 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,21 +88,21 @@ 
 	 * } @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  = sprintf(__("Event Registrations from %s", "event_espresso"),get_bloginfo('name'));
+		$order_description  = sprintf(__("Event Registrations from %s", "event_espresso"), get_bloginfo('name'));
 		//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) {
 				$item = array(
 						// Item Name.  127 char max.
-						'l_name' => substr($line_item->name(),0,127),
+						'l_name' => substr($line_item->name(), 0, 127),
 						// Item description.  127 char max.
-						'l_desc' => substr($line_item->desc(),0,127),
+						'l_desc' => substr($line_item->desc(), 0, 127),
 						// Cost of individual item.
 						'l_amt' => $line_item->unit_price(),
 						// Item Number.  127 char max.
@@ -123,14 +123,14 @@ 
 			}
 			$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();
-			$single_item_desc = sprintf(__("Partial payment of %s for %s", "event_espresso"),$payment->amount(),$primary_registrant->reg_code());
+			$single_item_desc = sprintf(__("Partial payment of %s for %s", "event_espresso"), $payment->amount(), $primary_registrant->reg_code());
 			$tax_amount = 0;
-			array_push($order_items,array(
+			array_push($order_items, array(
 				// Item Name.  127 char max.
-				'l_name' => sprintf(__("Partial payment for registration: %s", 'event_espresso'),$primary_registrant->reg_code()),
+				'l_name' => sprintf(__("Partial payment for registration: %s", 'event_espresso'), $primary_registrant->reg_code()),
 				// Item description.  127 char max.
 				'l_desc' => $single_item_desc,
 				// Cost of individual item.
@@ -177,11 +177,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' => ''
 		);
@@ -194,13 +194,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)
 		);
 
 
@@ -210,7 +210,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.
@@ -222,10 +222,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(
@@ -238,32 +238,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());
 		}
@@ -280,7 +280,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']);
@@ -296,13 +296,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;
 	}
 
@@ -327,32 +327,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();
@@ -360,22 +360,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);
@@ -399,7 +399,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);
@@ -449,9 +449,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;
@@ -467,11 +467,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,
@@ -511,7 +511,7 @@ 
 				elseif ($CurrentErrorVar == 'L_SEVERITYCODE')
 					$CurrentVarName = 'Severity Code';
 
-				$error .= '<br />' . $CurrentVarName . ': ' . $CurrentErrorVal;
+				$error .= '<br />'.$CurrentVarName.': '.$CurrentErrorVal;
 			}
 		}
 		return $error;

core/admin/EE_Admin_Hooks.core.php

Doc Comments +1 added lines, -1 removed lines

@@ -207,7 +207,7 @@
 
 	/**
 	 * constructor
-	 * @param EE_Admin_Page $admin_page the calling admin_page_object
+	 * @param EE_Admin_Page $adminpage the calling admin_page_object
 	 */
 	public function __construct( EE_Admin_Page $adminpage ) {
 

Braces +59 added lines, -35 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -217,12 +218,15 @@ 
 		$this->_set_hooks_properties();
 
 		//first let's verify we're on the right page
-		if ( !isset( $this->_req_data['page'] ) || ( isset( $this->_req_data['page'] ) && $this->_adminpage_obj->page_slug != $this->_req_data['page'] ) )
-			return; //get out nothing more to be done here.
+		if ( !isset( $this->_req_data['page'] ) || ( isset( $this->_req_data['page'] ) && $this->_adminpage_obj->page_slug != $this->_req_data['page'] ) ) {
+					return;
+		}
+		//get out nothing more to be done here.
 
 		//allow for extends to modify properties
-		if ( method_exists( $this, '_extend_properties' ) )
-			$this->_extend_properties();
+		if ( method_exists( $this, '_extend_properties' ) ) {
+					$this->_extend_properties();
+		}
 
 		$this->_set_page_object();
 		$this->_init_hooks();
@@ -305,8 +309,10 @@ 
 			}
 
 			//k now lets do the enqueues
-			if( !isset( $this->_scripts_styles['enqueues'] ) )
-				return;  //not sure if we should throw an error here or not.
+			if( !isset( $this->_scripts_styles['enqueues'] ) ) {
+							return;
+			}
+			//not sure if we should throw an error here or not.
 			foreach( $this->_scripts_styles['enqueues'] as $ref => $routes ) {
 				//make sure $routes is an array
 				$routes = (array) $routes;
@@ -323,8 +329,9 @@ 
 			}
 
 			//let's do the deregisters
-			if ( !isset( $this->_scripts_styles['deregisters'] ) )
-				return;
+			if ( !isset( $this->_scripts_styles['deregisters'] ) ) {
+							return;
+			}
 			foreach ( $this->_scripts_styles['deregisters'] as $ref => $details ) {
 				$defaults = array(
 					'type' => 'js'
@@ -376,8 +383,9 @@ 
 
 		//first default file (if exists)
 		$decaf_file = EE_ADMIN_PAGES . $this->_name . DS . $ref . '.core.php';
-		if ( is_readable( $decaf_file ) )
-		require_once( $decaf_file );
+		if ( is_readable( $decaf_file ) ) {
+				require_once( $decaf_file );
+		}
 
 		//now we have to do require for extended file (if needed)
 		if ( $this->_extend ) {
@@ -486,12 +494,14 @@ 
 
 		foreach ( $hook_filter_array as $hook => $args ) {
 			if ( method_exists( $this, $this->_current_route . '_' . $hook ) ) {
-				if ( isset( $this->_wp_action_filters_priority[$hook] ) )
-					$args['priority'] = $this->_wp_action_filters_priority[$hook];
-				if ( $args['type'] == 'action' )
-					add_action( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
-				else
-					add_filter( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
+				if ( isset( $this->_wp_action_filters_priority[$hook] ) ) {
+									$args['priority'] = $this->_wp_action_filters_priority[$hook];
+				}
+				if ( $args['type'] == 'action' ) {
+									add_action( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
+				} else {
+									add_filter( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
+				}
 			}
 		}
 
@@ -504,8 +514,10 @@ 
 	 */
 	private function _ajax_hooks() {
 
-		if ( empty( $this->_ajax_func) )
-			return; //get out there's nothing to take care of.
+		if ( empty( $this->_ajax_func) ) {
+					return;
+		}
+		//get out there's nothing to take care of.
 
 		foreach ( $this->_ajax_func as $action => $method ) {
 			//make sure method exists
@@ -528,8 +540,10 @@ 
 	 * @return void
 	 */
 	protected function _init_hooks() {
-		if ( empty( $this->_init_func) )
-			return; //get out there's nothing to take care of.
+		if ( empty( $this->_init_func) ) {
+					return;
+		}
+		//get out there's nothing to take care of.
 
 		//We need to determine what page_route we are on!
 		$current_route = isset ( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'default';
@@ -541,8 +555,9 @@ 
 				$msg[] = sprintf( __('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso' ), $method, $this->caller );
 				throw new EE_Error( implode('||', $msg ) );
 			}
-			if ( $route == $this->_current_route )
-				add_action('admin_init', array( $this, $method ) );
+			if ( $route == $this->_current_route ) {
+							add_action('admin_init', array( $this, $method ) );
+			}
 		}
 
 	}
@@ -557,8 +572,10 @@ 
 	 * @return void
 	 */
 	public function add_metaboxes() {
-		if ( empty( $this->_metaboxes ) )
-			return; //get out we don't have any metaboxes to set for this connection
+		if ( empty( $this->_metaboxes ) ) {
+					return;
+		}
+		//get out we don't have any metaboxes to set for this connection
 
 		$this->_handle_metabox_array( $this->_metaboxes );
 
@@ -569,19 +586,24 @@ 
 	private function _handle_metabox_array( $boxes, $add = TRUE ) {
 
 		foreach ( $boxes as $box ) {
-			if ( !isset($box['page_route']) )
-				continue; //we dont' have a valid array
+			if ( !isset($box['page_route']) ) {
+							continue;
+			}
+			//we dont' have a valid array
 
 			//let's make sure $box['page_route'] is an array so the "foreach" will work.
 			$box['page_route'] = (array) $box['page_route'];
 
 			foreach ( $box['page_route'] as $route ) {
-				if ( $route != $this->_current_route )
-					continue; //get out we only add metaboxes for set route.
-				if ( $add )
-					$this->_add_metabox($box);
-				else
-					$this->_remove_metabox($box);
+				if ( $route != $this->_current_route ) {
+									continue;
+				}
+				//get out we only add metaboxes for set route.
+				if ( $add ) {
+									$this->_add_metabox($box);
+				} else {
+									$this->_remove_metabox($box);
+				}
 			}
 		}
 	}
@@ -596,8 +618,10 @@ 
 	 */
 	public function remove_metaboxes() {
 
-		if ( empty( $this->_remove_metaboxes ) )
-			return; //get out there are no metaboxes to remove
+		if ( empty( $this->_remove_metaboxes ) ) {
+					return;
+		}
+		//get out there are no metaboxes to remove
 
 		$this->_handle_metabox_array( $this->_remove_metaboxes, FALSE );
 	}

Spacing +105 added lines, -105 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -209,7 +209,7 @@ 
 	 * constructor
 	 * @param EE_Admin_Page $admin_page the calling admin_page_object
 	 */
-	public function __construct( EE_Admin_Page $adminpage ) {
+	public function __construct(EE_Admin_Page $adminpage) {
 
 		$this->_adminpage_obj = $adminpage;
 		$this->_req_data = array_merge($_GET, $_POST);
@@ -217,11 +217,11 @@ 
 		$this->_set_hooks_properties();
 
 		//first let's verify we're on the right page
-		if ( !isset( $this->_req_data['page'] ) || ( isset( $this->_req_data['page'] ) && $this->_adminpage_obj->page_slug != $this->_req_data['page'] ) )
+		if ( ! isset($this->_req_data['page']) || (isset($this->_req_data['page']) && $this->_adminpage_obj->page_slug != $this->_req_data['page']))
 			return; //get out nothing more to be done here.
 
 		//allow for extends to modify properties
-		if ( method_exists( $this, '_extend_properties' ) )
+		if (method_exists($this, '_extend_properties'))
 			$this->_extend_properties();
 
 		$this->_set_page_object();
@@ -229,9 +229,9 @@ 
 		$this->_load_custom_methods();
 		$this->_load_routed_hooks();
 
-		add_action( 'admin_enqueue_scripts', array($this, 'enqueue_scripts_styles' ) );
-		add_action( 'admin_enqueue_scripts', array($this, 'add_metaboxes'), 20 );
-		add_action( 'admin_enqueue_scripts', array($this, 'remove_metaboxes'), 15 );
+		add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts_styles'));
+		add_action('admin_enqueue_scripts', array($this, 'add_metaboxes'), 20);
+		add_action('admin_enqueue_scripts', array($this, 'remove_metaboxes'), 15);
 
 		$this->_ajax_hooks();
 
@@ -272,15 +272,15 @@ 
 	 */
 	public function enqueue_scripts_styles() {
 
-		if ( !empty( $this->_scripts_styles ) ) {
+		if ( ! empty($this->_scripts_styles)) {
 			//first let's do all the registrations
-			if ( !isset($this->_scripts_styles['registers'] ) ) {
+			if ( ! isset($this->_scripts_styles['registers'])) {
 				$msg[] = __('There is no "registers" index in the <code>$this->_scripts_styles</code> property.', 'event_espresso');
-				$msg[] = sprintf ( __('Make sure you read the phpdoc comments above the definition of the $_scripts_styles property in the <code>EE_Admin_Hooks</code> class and modify according in the %s child', 'event_espresso'), '<strong>' . $this->caller . '</strong>' );
-				throw new EE_Error( implode( '||', $msg ) );
+				$msg[] = sprintf(__('Make sure you read the phpdoc comments above the definition of the $_scripts_styles property in the <code>EE_Admin_Hooks</code> class and modify according in the %s child', 'event_espresso'), '<strong>'.$this->caller.'</strong>');
+				throw new EE_Error(implode('||', $msg));
 			}
 
-			foreach( $this->_scripts_styles['registers'] as $ref => $details ) {
+			foreach ($this->_scripts_styles['registers'] as $ref => $details) {
 				$defaults = array(
 					'type' => 'js',
 					'url' => '',
@@ -289,48 +289,48 @@ 
 					'footer' => TRUE
 					);
 				$details = wp_parse_args($details, $defaults);
-				extract( $details );
+				extract($details);
 
 				//let's make sure that we set the 'registers' type if it's not set! We need it later to determine whhich enqueu we do
 				$this->_scripts_styles['registers'][$ref]['type'] = $type;
 
 				//let's make sure we're not missing any REQUIRED parameters
-				if ( empty($url) ) {
-					$msg[] = sprintf( __('Missing the url for the requested %s', 'event_espresso'), $type == 'js' ? 'script' : 'stylesheet' );
-					$msg[] = sprintf( __('Doublecheck your <code>$this->_scripts_styles</code> array in %s and make sure that there is a "url" set for the %s ref', 'event_espresso'), '<strong>' . $this->caller . '</strong>', $ref );
-					throw new EE_Error( implode( '||', $msg ) );
+				if (empty($url)) {
+					$msg[] = sprintf(__('Missing the url for the requested %s', 'event_espresso'), $type == 'js' ? 'script' : 'stylesheet');
+					$msg[] = sprintf(__('Doublecheck your <code>$this->_scripts_styles</code> array in %s and make sure that there is a "url" set for the %s ref', 'event_espresso'), '<strong>'.$this->caller.'</strong>', $ref);
+					throw new EE_Error(implode('||', $msg));
 				}
 				//made it here so let's do the appropriate registration
-				$type == 'js' ? wp_register_script( $ref, $url, $depends, $version, $footer ) : wp_register_style( $ref, $url, $depends, $version );
+				$type == 'js' ? wp_register_script($ref, $url, $depends, $version, $footer) : wp_register_style($ref, $url, $depends, $version);
 			}
 
 			//k now lets do the enqueues
-			if( !isset( $this->_scripts_styles['enqueues'] ) )
-				return;  //not sure if we should throw an error here or not.
-			foreach( $this->_scripts_styles['enqueues'] as $ref => $routes ) {
+			if ( ! isset($this->_scripts_styles['enqueues']))
+				return; //not sure if we should throw an error here or not.
+			foreach ($this->_scripts_styles['enqueues'] as $ref => $routes) {
 				//make sure $routes is an array
 				$routes = (array) $routes;
 
-				if ( in_array($this->_current_route, $routes ) ) {
+				if (in_array($this->_current_route, $routes)) {
 					$this->_scripts_styles['registers'][$ref]['type'] == 'js' ? wp_enqueue_script($ref) : wp_enqueue_style($ref);
 					//if we have a localization for the script let's do that too.
-					if ( isset( $this->_scripts_styles['localize'][$ref] ) ) {
-						foreach ( $this->_scripts_styles['localize'][$ref] as $object_name => $indexes ) {
-							wp_localize_script($ref, $object_name , $this->_scripts_styles['localize'][$ref][$object_name] );
+					if (isset($this->_scripts_styles['localize'][$ref])) {
+						foreach ($this->_scripts_styles['localize'][$ref] as $object_name => $indexes) {
+							wp_localize_script($ref, $object_name, $this->_scripts_styles['localize'][$ref][$object_name]);
 						}
 					}
 				}
 			}
 
 			//let's do the deregisters
-			if ( !isset( $this->_scripts_styles['deregisters'] ) )
+			if ( ! isset($this->_scripts_styles['deregisters']))
 				return;
-			foreach ( $this->_scripts_styles['deregisters'] as $ref => $details ) {
+			foreach ($this->_scripts_styles['deregisters'] as $ref => $details) {
 				$defaults = array(
 					'type' => 'js'
 					);
-				$details = wp_parse_args( $details, $defaults );
-				extract( $details );
+				$details = wp_parse_args($details, $defaults);
+				extract($details);
 
 				$type == 'js' ? wp_deregister_script($ref) : wp_deregister_style($ref);
 
@@ -349,7 +349,7 @@ 
 	 */
 	private function _set_defaults() {
 		$this->_ajax_func = $this->_init_func = $this->_metaboxes = $this->_scripts = $this->_styles = $this->_wp_action_filters_priority = array();
-		$this->_current_route = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'default';
+		$this->_current_route = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'default';
 		$this->caller = get_class($this);
 		$this->_extend = stripos($this->caller, 'Extend') ? TRUE : FALSE;
 	}
@@ -364,34 +364,34 @@ 
 	 */
 	protected function _set_page_object() {
 		//first make sure $this->_name is set
-		if ( empty( $this->_name ) ) {
+		if (empty($this->_name)) {
 			$msg[] = __('We can\'t load the page object', 'event_espresso');
-			$msg[] = sprintf( __("This is because the %s child class has not set the '_name' property", 'event_espresso'), $this->caller );
-			throw new EE_Error( implode( '||', $msg ) );
+			$msg[] = sprintf(__("This is because the %s child class has not set the '_name' property", 'event_espresso'), $this->caller);
+			throw new EE_Error(implode('||', $msg));
 		}
 
-		$ref = str_replace('_' , ' ', $this->_name); //take the_message -> the message
-		$ref = str_replace(' ', '_', ucwords($ref) ) . '_Admin_Page'; //take the message -> The_Message
+		$ref = str_replace('_', ' ', $this->_name); //take the_message -> the message
+		$ref = str_replace(' ', '_', ucwords($ref)).'_Admin_Page'; //take the message -> The_Message
 
 		//first default file (if exists)
-		$decaf_file = EE_ADMIN_PAGES . $this->_name . DS . $ref . '.core.php';
-		if ( is_readable( $decaf_file ) )
-		require_once( $decaf_file );
+		$decaf_file = EE_ADMIN_PAGES.$this->_name.DS.$ref.'.core.php';
+		if (is_readable($decaf_file))
+		require_once($decaf_file);
 
 		//now we have to do require for extended file (if needed)
-		if ( $this->_extend ) {
-			require_once( EE_CORE_CAF_ADMIN_EXTEND . $this->_name . DS . 'Extend_' . $ref . '.core.php' );
+		if ($this->_extend) {
+			require_once(EE_CORE_CAF_ADMIN_EXTEND.$this->_name.DS.'Extend_'.$ref.'.core.php');
 		}
 
 
 		//if we've got an extended class we use that!
-		$ref = $this->_extend ? 'Extend_' . $ref : $ref;
+		$ref = $this->_extend ? 'Extend_'.$ref : $ref;
 
 		//let's make sure the class exists
-		if ( !class_exists( $ref ) ) {
+		if ( ! class_exists($ref)) {
 			$msg[] = __('We can\'t load the page object', 'event_espresso');
-			$msg[] = sprintf( __('The class name that was given is %s. Check the spelling and make sure its correct, also there needs to be an autoloader setup for the class', 'event_espresso'), $ref );
-			throw new EE_Error( implode( '||', $msg ) );
+			$msg[] = sprintf(__('The class name that was given is %s. Check the spelling and make sure its correct, also there needs to be an autoloader setup for the class', 'event_espresso'), $ref);
+			throw new EE_Error(implode('||', $msg));
 		}
 
 		$a = new ReflectionClass($ref);
@@ -416,27 +416,27 @@ 
 		$method_callback = $this->_current_route == 'default' ? 'default_callback' : $this->_current_route;
 
 		//these run before the Admin_Page route executes.
-		if ( method_exists( $this, $method_callback ) ) {
-			call_user_func( array( $this, $method_callback) );
+		if (method_exists($this, $method_callback)) {
+			call_user_func(array($this, $method_callback));
 		}
 
 
 		//these run via the _redirect_after_action method in EE_Admin_Page which usually happens after non_UI methods in EE_Admin_Page classes.  There are two redirect actions, the first fires before $query_args might be manipulated by "save and close" actions and the seond fires right before the actual redirect happens.
 		//first the actions
 		//note that these action hooks will have the $query_args value available.
-		$admin_class_name = get_class( $this->_adminpage_obj );
+		$admin_class_name = get_class($this->_adminpage_obj);
 
-		if ( method_exists( $this, '_redirect_action_early_' . $this->_current_route ) ) {
-			add_action( 'AHEE__' . $admin_class_name . '___redirect_after_action__before_redirect_modification_' . $this->_current_route, array( $this, '_redirect_action_early_' . $this->_current_route ), 10 );
+		if (method_exists($this, '_redirect_action_early_'.$this->_current_route)) {
+			add_action('AHEE__'.$admin_class_name.'___redirect_after_action__before_redirect_modification_'.$this->_current_route, array($this, '_redirect_action_early_'.$this->_current_route), 10);
 		}
 
-		if ( method_exists( $this, '_redirect_action_' . $this->_current_route ) ) {
-			add_action( 'AHEE_redirect_' . $admin_class_name . $this->_current_route, array( $this, '_redirect_action_' . $this->_current_route ), 10 );
+		if (method_exists($this, '_redirect_action_'.$this->_current_route)) {
+			add_action('AHEE_redirect_'.$admin_class_name.$this->_current_route, array($this, '_redirect_action_'.$this->_current_route), 10);
 		}
 
 		//let's hook into the _redirect itself and allow for changing where the user goes after redirect.  This will have $query_args and $redirect_url available.
-		if ( method_exists( $this, '_redirect_filter_' . $this->_current_route ) ) {
-			add_filter( 'FHEE_redirect_' . $admin_class_name . $this->_current_route, array( $this, '_redirect_filter_' . $this->_current_route ), 10, 2 );
+		if (method_exists($this, '_redirect_filter_'.$this->_current_route)) {
+			add_filter('FHEE_redirect_'.$admin_class_name.$this->_current_route, array($this, '_redirect_filter_'.$this->_current_route), 10, 2);
 		}
 
 	}
@@ -459,12 +459,12 @@ 
 				'argnum' => 1,
 				'priority' => 10
 				),
-			'FHEE_list_table_views_' . $this->_adminpage_obj->page_slug . '_' . $this->_current_route => array(
+			'FHEE_list_table_views_'.$this->_adminpage_obj->page_slug.'_'.$this->_current_route => array(
 				'type' => 'filter',
 				'argnum' => 1,
 				'priority' => 10
 				),
-			'FHEE_list_table_views_' . $this->_adminpage_obj->page_slug => array(
+			'FHEE_list_table_views_'.$this->_adminpage_obj->page_slug => array(
 				'type' => 'filter',
 				'argnum' => 1,
 				'priority' => 10
@@ -483,14 +483,14 @@ 
 
 
 
-		foreach ( $hook_filter_array as $hook => $args ) {
-			if ( method_exists( $this, $this->_current_route . '_' . $hook ) ) {
-				if ( isset( $this->_wp_action_filters_priority[$hook] ) )
+		foreach ($hook_filter_array as $hook => $args) {
+			if (method_exists($this, $this->_current_route.'_'.$hook)) {
+				if (isset($this->_wp_action_filters_priority[$hook]))
 					$args['priority'] = $this->_wp_action_filters_priority[$hook];
-				if ( $args['type'] == 'action' )
-					add_action( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
+				if ($args['type'] == 'action')
+					add_action($hook, array($this, $this->_current_route.'_'.$hook), $args['priority'], $args['argnum']);
 				else
-					add_filter( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
+					add_filter($hook, array($this, $this->_current_route.'_'.$hook), $args['priority'], $args['argnum']);
 			}
 		}
 
@@ -503,18 +503,18 @@ 
 	 */
 	private function _ajax_hooks() {
 
-		if ( empty( $this->_ajax_func) )
+		if (empty($this->_ajax_func))
 			return; //get out there's nothing to take care of.
 
-		foreach ( $this->_ajax_func as $action => $method ) {
+		foreach ($this->_ajax_func as $action => $method) {
 			//make sure method exists
-			if ( !method_exists($this, $method) ) {
-				$msg[] = __('There is no corresponding method for the hook labeled in the _ajax_func array', 'event_espresso') . '<br />';
-				$msg[] = sprintf( __('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso' ), $method, $this->caller );
-				throw new EE_Error( implode('||', $msg ) );
+			if ( ! method_exists($this, $method)) {
+				$msg[] = __('There is no corresponding method for the hook labeled in the _ajax_func array', 'event_espresso').'<br />';
+				$msg[] = sprintf(__('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso'), $method, $this->caller);
+				throw new EE_Error(implode('||', $msg));
 			}
 
-			add_action('wp_ajax_' . $action, array( $this, $method ) );
+			add_action('wp_ajax_'.$action, array($this, $method));
 		}
 
 	}
@@ -527,21 +527,21 @@ 
 	 * @return void
 	 */
 	protected function _init_hooks() {
-		if ( empty( $this->_init_func) )
+		if (empty($this->_init_func))
 			return; //get out there's nothing to take care of.
 
 		//We need to determine what page_route we are on!
-		$current_route = isset ( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'default';
+		$current_route = isset ($_REQUEST['action']) ? $_REQUEST['action'] : 'default';
 
-		foreach ( $this->_init_func as $route => $method ) {
+		foreach ($this->_init_func as $route => $method) {
 			//make sure method exists
-			if ( !method_exists($this, $method) ) {
-				$msg[] = __('There is no corresponding method for the hook labeled in the _init_func array', 'event_espresso') . '<br />';
-				$msg[] = sprintf( __('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso' ), $method, $this->caller );
-				throw new EE_Error( implode('||', $msg ) );
+			if ( ! method_exists($this, $method)) {
+				$msg[] = __('There is no corresponding method for the hook labeled in the _init_func array', 'event_espresso').'<br />';
+				$msg[] = sprintf(__('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso'), $method, $this->caller);
+				throw new EE_Error(implode('||', $msg));
 			}
-			if ( $route == $this->_current_route )
-				add_action('admin_init', array( $this, $method ) );
+			if ($route == $this->_current_route)
+				add_action('admin_init', array($this, $method));
 		}
 
 	}
@@ -556,28 +556,28 @@ 
 	 * @return void
 	 */
 	public function add_metaboxes() {
-		if ( empty( $this->_metaboxes ) )
+		if (empty($this->_metaboxes))
 			return; //get out we don't have any metaboxes to set for this connection
 
-		$this->_handle_metabox_array( $this->_metaboxes );
+		$this->_handle_metabox_array($this->_metaboxes);
 
 	}
 
 
 
-	private function _handle_metabox_array( $boxes, $add = TRUE ) {
+	private function _handle_metabox_array($boxes, $add = TRUE) {
 
-		foreach ( $boxes as $box ) {
-			if ( !isset($box['page_route']) )
+		foreach ($boxes as $box) {
+			if ( ! isset($box['page_route']))
 				continue; //we dont' have a valid array
 
 			//let's make sure $box['page_route'] is an array so the "foreach" will work.
 			$box['page_route'] = (array) $box['page_route'];
 
-			foreach ( $box['page_route'] as $route ) {
-				if ( $route != $this->_current_route )
+			foreach ($box['page_route'] as $route) {
+				if ($route != $this->_current_route)
 					continue; //get out we only add metaboxes for set route.
-				if ( $add )
+				if ($add)
 					$this->_add_metabox($box);
 				else
 					$this->_remove_metabox($box);
@@ -595,10 +595,10 @@ 
 	 */
 	public function remove_metaboxes() {
 
-		if ( empty( $this->_remove_metaboxes ) )
+		if (empty($this->_remove_metaboxes))
 			return; //get out there are no metaboxes to remove
 
-		$this->_handle_metabox_array( $this->_remove_metaboxes, FALSE );
+		$this->_handle_metabox_array($this->_remove_metaboxes, FALSE);
 	}
 
 
@@ -608,53 +608,53 @@ 
 	 * @access private
 	 * @param array $args an array of args that have been set for this metabox by the child class
 	 */
-	private function _add_metabox( $args ) {
+	private function _add_metabox($args) {
 		$current_screen = get_current_screen();
-		$screen_id = is_object( $current_screen ) ? $current_screen->id : NULL;
-		$func = isset( $args['func'] ) ? $args['func'] : 'some_invalid_callback';
+		$screen_id = is_object($current_screen) ? $current_screen->id : NULL;
+		$func = isset($args['func']) ? $args['func'] : 'some_invalid_callback';
 
 		//set defaults
 		$defaults = array(
 			'func' => $func,
-			'id' => $this->caller . '_' . $func . '_metabox',
+			'id' => $this->caller.'_'.$func.'_metabox',
 			'priority' => 'default',
 			'label' => $this->caller,
 			'context' => 'advanced',
 			'callback_args' => array(),
-			'page' => isset( $args['page'] ) ? $args['page'] : $screen_id
+			'page' => isset($args['page']) ? $args['page'] : $screen_id
 			);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 		extract($args);
 
 
 		//make sure method exists
-		if ( !method_exists($this, $func) ) {
-			$msg[] = __('There is no corresponding method to display the metabox content', 'event_espresso') . '<br />';
-			$msg[] = sprintf( __('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso' ), $func, $this->caller );
-			throw new EE_Error( implode('||', $msg ) );
+		if ( ! method_exists($this, $func)) {
+			$msg[] = __('There is no corresponding method to display the metabox content', 'event_espresso').'<br />';
+			$msg[] = sprintf(__('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso'), $func, $this->caller);
+			throw new EE_Error(implode('||', $msg));
 		}
 
 		//everything checks out so lets add the metabox
-		add_meta_box( $id, $label, array( $this, $func ), $page, $context, $priority, $callback_args);
+		add_meta_box($id, $label, array($this, $func), $page, $context, $priority, $callback_args);
 	}
 
 
 
-	private function _remove_metabox( $args ) {
+	private function _remove_metabox($args) {
 		$current_screen = get_current_screen();
-		$screen_id = is_object( $current_screen ) ? $current_screen->id : NULL;
-		$func = isset( $args['func'] ) ? $args['func'] : 'some_invalid_callback';
+		$screen_id = is_object($current_screen) ? $current_screen->id : NULL;
+		$func = isset($args['func']) ? $args['func'] : 'some_invalid_callback';
 
 		//set defaults
 		$defaults = array(
-			'id' => isset( $args['id'] ) ? $args['id'] : $this->_current_route . '_' . $this->caller . '_' . $func . '_metabox',
+			'id' => isset($args['id']) ? $args['id'] : $this->_current_route.'_'.$this->caller.'_'.$func.'_metabox',
 			'context' => 'default',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : $screen_id
+			'screen' => isset($args['screen']) ? $args['screen'] : $screen_id
 		);
 
-		$args = wp_parse_args( $args, $defaults );
-		extract( $args );
+		$args = wp_parse_args($args, $defaults);
+		extract($args);
 
 		//everything checks out so lets remove the box!
 		remove_meta_box($id, $screen, $context);

core/admin/EE_Admin_List_Table.core.php

Doc Comments +2 added lines, -2 removed lines

@@ -304,7 +304,7 @@ 
 	/**
 	 * _get_hidden_fields
 	 * returns a html string of hidden fields so if any table filters are used the current view will be respected.
-	 * @return html string
+	 * @return string string
 	 */
 	protected function _get_hidden_fields() {
 		$action = isset( $this->_req_data['route'] ) ? $this->_req_data['route'] : '';
@@ -512,7 +512,7 @@ 
 	 * @since 4.1
 	 * @access public
 	 *
-	 * @param object $item The current item
+	 * @param EE_Message_Template_Group $item The current item
 	 */
 	public function single_row( $item ) {
 		$row_class = $this->_get_row_class( $item );

Indentation +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
  */
 
 if ( ! class_exists( 'WP_List_Table' )) {
-    require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
+	require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
 }
 
 abstract class EE_Admin_List_Table extends WP_List_Table {

Braces +14 added lines, -12 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 
 /**
@@ -362,8 +363,9 @@ 
 
 		$sortable = array();
 		foreach ( $_sortable as $id => $data ) {
-			if ( empty( $data ) )
-				continue;
+			if ( empty( $data ) ) {
+							continue;
+			}
 
 			//fix for offset errors with WP_List_Table default get_columninfo()
 			if ( is_array($data) ) {
@@ -375,8 +377,9 @@ 
 
 			$data = (array) $data;
 
-			if ( !isset( $data[1] ) )
-				$_data[1] = false;
+			if ( !isset( $data[1] ) ) {
+							$_data[1] = false;
+			}
 
 
 			$sortable[$id] = $_data;
@@ -399,11 +402,12 @@ 
 		$actions = array();
 		//the _views property should have the bulk_actions, so let's go through and extract them into a properly formatted array for the wp_list_table();
 		foreach ( $this->_views as $view => $args) {
-			if ( isset( $args['bulk_action']) && is_array($args['bulk_action']) && $this->_view == $view )
-				//each bulk action will correspond with a admin page route, so we can check whatever the capability is for that page route and skip adding the bulk action if no access for the current logged in user.
+			if ( isset( $args['bulk_action']) && is_array($args['bulk_action']) && $this->_view == $view ) {
+							//each bulk action will correspond with a admin page route, so we can check whatever the capability is for that page route and skip adding the bulk action if no access for the current logged in user.
 				foreach ( $args['bulk_action'] as $route =>$label ) {
 					if ( $this->_admin_page->check_user_access( $route, true ) ) {
 						$actions[$route] = $label;
+			}
 					}
 				}
 		}
@@ -633,14 +637,12 @@ 
 				echo '<th scope="row" class="check-column">';
 				echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_cb_content', $this->column_cb( $item ), $item, $this );
 				echo '</th>';
-			}
-			elseif ( method_exists( $this, 'column_' . $column_name ) ) {
+			} elseif ( method_exists( $this, 'column_' . $column_name ) ) {
 				echo "<td $attributes>";
 				echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_' . $column_name . '__column_content', call_user_func( array( $this, 'column_' . $column_name ), $item ), $item, $this );
 				echo $this->handle_row_actions( $item, $column_name, $primary );
 				echo "</td>";
-			}
-			else {
+			} else {
 				echo "<td $attributes>";
 				echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_default__column_content', $this->column_default( $item, $column_name ), $item, $column_name, $this );
 				echo $this->handle_row_actions( $item, $column_name, $primary );
@@ -656,7 +658,7 @@ 
 			$this->_filters();
 			echo $this->_get_hidden_fields();
 			echo '<br class="clear">';
-		}else{
+		} else{
 			echo '<div class="list-table-bottom-buttons alignleft actions">';
 			foreach($this->_bottom_buttons as $type => $action){
 				$route = isset( $action['route'] ) ? $action['route'] : '';

Spacing +92 added lines, -92 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 
@@ -31,8 +31,8 @@ 
  * ------------------------------------------------------------------------
  */
 
-if ( ! class_exists( 'WP_List_Table' )) {
-    require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
+if ( ! class_exists('WP_List_Table')) {
+    require_once(ABSPATH.'wp-admin/includes/class-wp-list-table.php');
 }
 
 abstract class EE_Admin_List_Table extends WP_List_Table {
@@ -243,16 +243,16 @@ 
 	 * constructor
 	 * @param EE_Admin_Page object $admin_page we use this for obtaining everything we need in the list table.
 	 */
-	public function __construct( EE_Admin_Page $admin_page ) {
+	public function __construct(EE_Admin_Page $admin_page) {
 		$this->_admin_page = $admin_page;
 		$this->_req_data = $this->_admin_page->get_request_data();
 		$this->_view = $this->_admin_page->get_view();
-		$this->_views = empty( $this->_views ) ? $this->_admin_page->get_list_table_view_RLs() : $this->_views;
+		$this->_views = empty($this->_views) ? $this->_admin_page->get_list_table_view_RLs() : $this->_views;
 		$this->_current_page = $this->get_pagenum();
-		$this->_screen = $this->_admin_page->get_current_page() . '_' . $this->_admin_page->get_current_view();
-		$this->_yes_no = array(  __('No', 'event_espresso'), __('Yes', 'event_espresso'));
+		$this->_screen = $this->_admin_page->get_current_page().'_'.$this->_admin_page->get_current_view();
+		$this->_yes_no = array(__('No', 'event_espresso'), __('Yes', 'event_espresso'));
 
-		$this->_per_page = $this->get_items_per_page( $this->_screen . '_per_page', 10 );
+		$this->_per_page = $this->get_items_per_page($this->_screen.'_per_page', 10);
 
 		$this->_setup_data();
 		$this->_add_view_counts();
@@ -262,7 +262,7 @@ 
 		$this->_set_properties();
 
 		//set primary column
-		add_filter( 'list_table_primary_column', array( $this, 'set_primary_column' ) );
+		add_filter('list_table_primary_column', array($this, 'set_primary_column'));
 
 		//set parent defaults
 		parent::__construct($this->_wp_list_args);
@@ -338,17 +338,17 @@ 
 	 * @return html string
 	 */
 	protected function _get_hidden_fields() {
-		$action = isset( $this->_req_data['route'] ) ? $this->_req_data['route'] : '';
-		$action = empty( $action ) && isset( $this->_req_data['action'] ) ? $this->_req_data['action'] : $action;
+		$action = isset($this->_req_data['route']) ? $this->_req_data['route'] : '';
+		$action = empty($action) && isset($this->_req_data['action']) ? $this->_req_data['action'] : $action;
 		//if action is STILL empty, then we set it to default
-		$action = empty( $action ) ? 'default' : $action;
-		$field = '<input type="hidden" name="page" value="' . $this->_req_data['page'] . '" />' . "\n";
-		$field .= '<input type="hidden" name="route" value="'. $action .'" />' . "\n";/**/
-		$field .= '<input type="hidden" name="perpage" value="' . $this->_per_page . '" />' . "\n";
+		$action = empty($action) ? 'default' : $action;
+		$field = '<input type="hidden" name="page" value="'.$this->_req_data['page'].'" />'."\n";
+		$field .= '<input type="hidden" name="route" value="'.$action.'" />'."\n"; /**/
+		$field .= '<input type="hidden" name="perpage" value="'.$this->_per_page.'" />'."\n";
 
 		$bulk_actions = $this->_get_bulk_actions();
-		foreach ( $bulk_actions as $bulk_action => $label ) {
-			$field .= '<input type="hidden" name="' . $bulk_action . '_nonce" value="' . wp_create_nonce  ( $bulk_action . '_nonce' ) . '" />' . "\n";
+		foreach ($bulk_actions as $bulk_action => $label) {
+			$field .= '<input type="hidden" name="'.$bulk_action.'_nonce" value="'.wp_create_nonce($bulk_action.'_nonce').'" />'."\n";
 		}
 
 		return $field;
@@ -378,15 +378,15 @@ 
 		 *
 		 * @var array
 		 */
-		$_sortable = apply_filters( "FHEE_manage_{$this->screen->id}_sortable_columns", $_sortable, $this->_screen );
+		$_sortable = apply_filters("FHEE_manage_{$this->screen->id}_sortable_columns", $_sortable, $this->_screen);
 
 		$sortable = array();
-		foreach ( $_sortable as $id => $data ) {
-			if ( empty( $data ) )
+		foreach ($_sortable as $id => $data) {
+			if (empty($data))
 				continue;
 
 			//fix for offset errors with WP_List_Table default get_columninfo()
-			if ( is_array($data) ) {
+			if (is_array($data)) {
 				$_data[0] = key($data);
 				$_data[1] = isset($data[1]) ? $data[1] : false;
 			} else {
@@ -395,14 +395,14 @@ 
 
 			$data = (array) $data;
 
-			if ( !isset( $data[1] ) )
+			if ( ! isset($data[1]))
 				$_data[1] = false;
 
 
 			$sortable[$id] = $_data;
 		}
 		$primary = $this->get_primary_column_name();
-		$this->_column_headers = array( $columns, $hidden, $sortable, $primary );
+		$this->_column_headers = array($columns, $hidden, $sortable, $primary);
 	}
 
 
@@ -411,8 +411,8 @@ 
 	 * @return string
 	 */
 	protected function get_primary_column_name() {
-		foreach( class_parents( $this ) as $parent ) {
-			if ( method_exists( $parent, 'get_primary_column_name' ) && $parent == 'WP_List_Table' ) {
+		foreach (class_parents($this) as $parent) {
+			if (method_exists($parent, 'get_primary_column_name') && $parent == 'WP_List_Table') {
 				return parent::get_primary_column_name();
 			}
 		}
@@ -424,10 +424,10 @@ 
 	 * Added for WP4.1 backward compat (@see https://events.codebasehq.com/projects/event-espresso/tickets/8814)
 	 * @return string
 	 */
-	protected function handle_row_actions( $item, $column_name, $primary ) {
-		foreach( class_parents( $this ) as $parent ) {
-			if ( method_exists( $parent, 'handle_row_actions' ) && $parent == 'WP_List_Table' ) {
-				return parent::handle_row_actions( $item, $column_name, $primary );
+	protected function handle_row_actions($item, $column_name, $primary) {
+		foreach (class_parents($this) as $parent) {
+			if (method_exists($parent, 'handle_row_actions') && $parent == 'WP_List_Table') {
+				return parent::handle_row_actions($item, $column_name, $primary);
 			}
 		}
 		return '';
@@ -445,11 +445,11 @@ 
 	protected function _get_bulk_actions() {
 		$actions = array();
 		//the _views property should have the bulk_actions, so let's go through and extract them into a properly formatted array for the wp_list_table();
-		foreach ( $this->_views as $view => $args) {
-			if ( isset( $args['bulk_action']) && is_array($args['bulk_action']) && $this->_view == $view )
+		foreach ($this->_views as $view => $args) {
+			if (isset($args['bulk_action']) && is_array($args['bulk_action']) && $this->_view == $view)
 				//each bulk action will correspond with a admin page route, so we can check whatever the capability is for that page route and skip adding the bulk action if no access for the current logged in user.
-				foreach ( $args['bulk_action'] as $route =>$label ) {
-					if ( $this->_admin_page->check_user_access( $route, true ) ) {
+				foreach ($args['bulk_action'] as $route =>$label) {
+					if ($this->_admin_page->check_user_access($route, true)) {
 						$actions[$route] = $label;
 					}
 				}
@@ -467,18 +467,18 @@ 
 	 */
 	private function _filters() {
 		$classname = get_class($this);
-		$filters = apply_filters( "FHEE__{$classname}__filters", (array) $this->_get_table_filters(), $this, $this->_screen );
+		$filters = apply_filters("FHEE__{$classname}__filters", (array) $this->_get_table_filters(), $this, $this->_screen);
 
-		if ( empty( $filters )) {
+		if (empty($filters)) {
 			return;
 		}
-		foreach ( $filters as $filter ) {
+		foreach ($filters as $filter) {
 			echo $filter;
 		}
 		//add filter button at end
-		echo '<input type="submit" class="button-secondary" value="' . __('Filter', 'event_espresso') . '" id="post-query-submit" />';
+		echo '<input type="submit" class="button-secondary" value="'.__('Filter', 'event_espresso').'" id="post-query-submit" />';
 		//add reset filters button at end
-		echo '<a class="button button-secondary"  href="' . $this->_admin_page->get_current_page_view_url() . '" style="display:inline-block">' . __('Reset Filters', 'event_espresso') . '</a>';
+		echo '<a class="button button-secondary"  href="'.$this->_admin_page->get_current_page_view_url().'" style="display:inline-block">'.__('Reset Filters', 'event_espresso').'</a>';
 	}
 
 
@@ -492,8 +492,8 @@ 
 	 * @param string $column_name
 	 * @return string
 	 */
-	public function set_primary_column( $column_name ) {
-		return ! empty( $this->_primary_column ) ? $this->_primary_column : $column_name;
+	public function set_primary_column($column_name) {
+		return ! empty($this->_primary_column) ? $this->_primary_column : $column_name;
 	}
 
 
@@ -512,7 +512,7 @@ 
 			array(
 				'total_items' => $total_items,
 				'per_page' => $this->_per_page,
-				'total_pages' => ceil($total_items / $this->_per_page )
+				'total_pages' => ceil($total_items / $this->_per_page)
 			)
 		);
 	}
@@ -528,7 +528,7 @@ 
 	 *
 	 * @return string html content for the column
 	 */
-	public function column_default( $item, $column_name ) {
+	public function column_default($item, $column_name) {
 		/**
 		 * Dynamic hook allowing for adding additional column content in this list table.
 		 * Note that $this->screen->id is in the format
@@ -538,7 +538,7 @@ 
 		 * hook prefix ("event-espresso") will be different.
 		 *
 		 */
-		do_action( 'AHEE__EE_Admin_List_Table__column_' . $column_name . '__' . $this->screen->id, $item, $this->_screen );
+		do_action('AHEE__EE_Admin_List_Table__column_'.$column_name.'__'.$this->screen->id, $item, $this->_screen);
 	}
 
 
@@ -554,7 +554,7 @@ 
 		 *
 		 * @var array
 		 */
-		$columns = apply_filters( 'FHEE_manage_'.$this->screen->id.'_columns', $this->_columns, $this->_screen );
+		$columns = apply_filters('FHEE_manage_'.$this->screen->id.'_columns', $this->_columns, $this->_screen);
 		return $columns;
 	}
 
@@ -566,18 +566,18 @@ 
 		$views = $this->get_views();
 		$assembled_views = '';
 
-		if ( empty( $views )) {
+		if (empty($views)) {
 			return;
 		}
 		echo "<ul class='subsubsub'>\n";
-		foreach ( $views as $view ) {
-			$count = isset($view['count'] ) && !empty($view['count']) ? absint( $view['count'] )  : 0;
-			if ( isset( $view['slug'] ) && isset( $view['class'] ) && isset( $view['url'] ) && isset( $view['label']) ) {
-				$assembled_views[ $view['slug'] ] = "\t<li class='" . $view['class'] . "'>" . '<a href="' . $view['url'] . '">' . $view['label'] . '</a> <span class="count">(' . $count . ')</span>';
+		foreach ($views as $view) {
+			$count = isset($view['count']) && ! empty($view['count']) ? absint($view['count']) : 0;
+			if (isset($view['slug']) && isset($view['class']) && isset($view['url']) && isset($view['label'])) {
+				$assembled_views[$view['slug']] = "\t<li class='".$view['class']."'>".'<a href="'.$view['url'].'">'.$view['label'].'</a> <span class="count">('.$count.')</span>';
 			}
 		}
 
-		echo is_array( $assembled_views) && ! empty( $assembled_views ) ? implode( " |</li>\n", $assembled_views ) . "</li>\n" : '';
+		echo is_array($assembled_views) && ! empty($assembled_views) ? implode(" |</li>\n", $assembled_views)."</li>\n" : '';
 		echo "</ul>";
 	}
 
@@ -590,10 +590,10 @@ 
 	 *
 	 * @param object $item The current item
 	 */
-	public function single_row( $item ) {
-		$row_class = $this->_get_row_class( $item );
-		echo '<tr class="' . esc_attr( $row_class ) . '">';
-		$this->single_row_columns( $item );
+	public function single_row($item) {
+		$row_class = $this->_get_row_class($item);
+		echo '<tr class="'.esc_attr($row_class).'">';
+		$this->single_row_columns($item);
 		echo '</tr>';
 	}
 
@@ -604,13 +604,13 @@ 
 	 * @param  object $item the current item
 	 * @return string
 	 */
-	protected function _get_row_class( $item ) {
+	protected function _get_row_class($item) {
 		static $row_class = '';
-		$row_class = ( $row_class == '' ? 'alternate' : '' );
+		$row_class = ($row_class == '' ? 'alternate' : '');
 
 		$new_row_class = $row_class;
 
-		if ( !empty($this->_ajax_sorting_callback) ) {
+		if ( ! empty($this->_ajax_sorting_callback)) {
 			$new_row_class .= ' rowsortable';
 		}
 
@@ -629,13 +629,13 @@ 
 
 	public function get_hidden_columns() {
 		$user_id = get_current_user_id();
-		$has_default = get_user_option('default'. $this->screen->id . 'columnshidden', $user_id);
-		if ( empty( $has_default ) && !empty($this->_hidden_columns ) ) {
-			update_user_option($user_id, 'default'.$this->screen->id . 'columnshidden', TRUE);
-			update_user_option($user_id, 'manage' . $this->screen->id . 'columnshidden', $this->_hidden_columns, TRUE );
+		$has_default = get_user_option('default'.$this->screen->id.'columnshidden', $user_id);
+		if (empty($has_default) && ! empty($this->_hidden_columns)) {
+			update_user_option($user_id, 'default'.$this->screen->id.'columnshidden', TRUE);
+			update_user_option($user_id, 'manage'.$this->screen->id.'columnshidden', $this->_hidden_columns, TRUE);
 		}
-		$ref = 'manage' . $this->screen->id . 'columnshidden';
-		$saved_columns = (array) get_user_option( $ref, $user_id );
+		$ref = 'manage'.$this->screen->id.'columnshidden';
+		$saved_columns = (array) get_user_option($ref, $user_id);
 		return $saved_columns;
 	}
 
@@ -650,47 +650,47 @@ 
 	 *
 	 * @param object $item The current item
 	 */
-	public function single_row_columns( $item ) {
-		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
+	public function single_row_columns($item) {
+		list($columns, $hidden, $sortable, $primary) = $this->get_column_info();
 
 		global $wp_version;
-		$use_hidden_class = version_compare( $wp_version, '4.3-RC', '>=' );
+		$use_hidden_class = version_compare($wp_version, '4.3-RC', '>=');
 
-		foreach ( $columns as $column_name => $column_display_name ) {
+		foreach ($columns as $column_name => $column_display_name) {
 
 			/**
 			 * With WordPress version 4.3.RC+ WordPress started using the hidden css class to control whether columns are
 			 * hidden or not instead of using "display:none;".  This bit of code provides backward compat.
 			 */
-			$hidden_class = $use_hidden_class && in_array( $column_name, $hidden ) ? ' hidden' : '';
-			$style = ! $use_hidden_class && in_array( $column_name, $hidden ) ? ' style="display:none;"' : '';
+			$hidden_class = $use_hidden_class && in_array($column_name, $hidden) ? ' hidden' : '';
+			$style = ! $use_hidden_class && in_array($column_name, $hidden) ? ' style="display:none;"' : '';
 
-			$classes = $column_name . ' column-' . $column_name.$hidden_class;
-			if ( $primary == $column_name ) {
+			$classes = $column_name.' column-'.$column_name.$hidden_class;
+			if ($primary == $column_name) {
 				$classes .= ' has-row-actions column-primary';
 			}
 
-			$data = ' data-colname="' . wp_strip_all_tags( $column_display_name ) . '"';
+			$data = ' data-colname="'.wp_strip_all_tags($column_display_name).'"';
 
 			$class = "class='$classes'";
 
 			$attributes = "$class$style$data";
 
-			if ( 'cb' === $column_name ) {
+			if ('cb' === $column_name) {
 				echo '<th scope="row" class="check-column">';
-				echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_cb_content', $this->column_cb( $item ), $item, $this );
+				echo apply_filters('FHEE__EE_Admin_List_Table__single_row_columns__column_cb_content', $this->column_cb($item), $item, $this);
 				echo '</th>';
 			}
-			elseif ( method_exists( $this, 'column_' . $column_name ) ) {
+			elseif (method_exists($this, 'column_'.$column_name)) {
 				echo "<td $attributes>";
-				echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_' . $column_name . '__column_content', call_user_func( array( $this, 'column_' . $column_name ), $item ), $item, $this );
-				echo $this->handle_row_actions( $item, $column_name, $primary );
+				echo apply_filters('FHEE__EE_Admin_List_Table__single_row_columns__column_'.$column_name.'__column_content', call_user_func(array($this, 'column_'.$column_name), $item), $item, $this);
+				echo $this->handle_row_actions($item, $column_name, $primary);
 				echo "</td>";
 			}
 			else {
 				echo "<td $attributes>";
-				echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_default__column_content', $this->column_default( $item, $column_name ), $item, $column_name, $this );
-				echo $this->handle_row_actions( $item, $column_name, $primary );
+				echo apply_filters('FHEE__EE_Admin_List_Table__single_row_columns__column_default__column_content', $this->column_default($item, $column_name), $item, $column_name, $this);
+				echo $this->handle_row_actions($item, $column_name, $primary);
 				echo "</td>";
 			}
 		}
@@ -698,19 +698,19 @@ 
 
 
 
-	public function extra_tablenav( $which ) {
-		if ( $which == 'top' ) {
+	public function extra_tablenav($which) {
+		if ($which == 'top') {
 			$this->_filters();
 			echo $this->_get_hidden_fields();
 			echo '<br class="clear">';
-		}else{
+		} else {
 			echo '<div class="list-table-bottom-buttons alignleft actions">';
-			foreach($this->_bottom_buttons as $type => $action){
-				$route = isset( $action['route'] ) ? $action['route'] : '';
-				$extra_request = isset( $action['extra_request'] ) ? $action['extra_request'] : '';
+			foreach ($this->_bottom_buttons as $type => $action) {
+				$route = isset($action['route']) ? $action['route'] : '';
+				$extra_request = isset($action['extra_request']) ? $action['extra_request'] : '';
 				echo $this->_admin_page->get_action_link_or_button($route, $type, $extra_request);
 			}
-			do_action( 'AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', $this, $this->_screen );
+			do_action('AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', $this, $this->_screen);
 			echo '</div>';
 		}
 		//echo $this->_entries_per_page_dropdown;
@@ -760,13 +760,13 @@ 
 	 *
 	 * @return string The assembled action elements container.
 	 */
-	protected function _action_string( $action_items, $item, $action_container = 'ul', $action_class = '', $action_id = '' ) {
+	protected function _action_string($action_items, $item, $action_container = 'ul', $action_class = '', $action_id = '') {
 		$content = '';
-		$action_class = ! empty( $action_class ) ? ' class="' . $action_class . '"' : '';
-		$action_id = ! empty( $action_id ) ? ' id="' . $action_id . '"' : '';
-		$content .= ! empty( $action_container ) ? '<' . $action_container . $action_class . $action_id . '>' : '';
-		$content .= apply_filters( 'FHEE__EE_Admin_List_Table___action_string__action_items', $action_items, $item, $this );
-		$content .= ! empty( $container ) ? '</' . $container . '>' : '';
+		$action_class = ! empty($action_class) ? ' class="'.$action_class.'"' : '';
+		$action_id = ! empty($action_id) ? ' id="'.$action_id.'"' : '';
+		$content .= ! empty($action_container) ? '<'.$action_container.$action_class.$action_id.'>' : '';
+		$content .= apply_filters('FHEE__EE_Admin_List_Table___action_string__action_items', $action_items, $item, $this);
+		$content .= ! empty($container) ? '</'.$container.'>' : '';
 		return $content;
 	}
 }

core/admin/EE_Admin_Page.core.php

Doc Comments +5 added lines, -6 removed lines

@@ -469,7 +469,7 @@ 
 	 *
 	 * @final
 	 * @access protected
-	 * @return void
+	 * @return false|null
 	 */
 	final protected function _page_setup() {
 
@@ -744,7 +744,7 @@ 
 	 * All this method does is verify the incoming request and make sure that routes exist for it.  We do this early so we know if we need to drop out.
 	 *
 	 * @access protected
-	 * @return void
+	 * @return false|null
 	 */
 	protected function _verify_routes() {
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
@@ -806,7 +806,7 @@ 
 	/**
 	 * this method simply verifies a given route and makes sure its an actual route available for the loaded page
 	 * @param  string $route the route name we're verifying
-	 * @return mixed  (bool|Exception)      we'll throw an exception if this isn't a valid route.
+	 * @return boolean  (bool|Exception)      we'll throw an exception if this isn't a valid route.
 	 */
 	protected function _verify_route( $route ) {
 		if ( array_key_exists( $this->_req_action, $this->_page_routes )) {
@@ -2189,7 +2189,7 @@ 
 	 * @param	string	$name		key used for the action ID (i.e. event_id)
 	 * @param	int		$id	id attached to the item published
 	 * @param	string	$delete	page route callback for the delete action
-	 * @param	string	$post_save_redirect_URL	custom URL to redirect to after Save & Close has been completed
+	 * @param	string	$save_close_redirect_URL	custom URL to redirect to after Save & Close has been completed
 	 * @param	boolean	$both_btns	whether to display BOTH the "Save & Close" and "Save" buttons or just the Save button
 	 */
 	protected function _set_publish_post_box_vars( $name = NULL, $id = FALSE, $delete = FALSE, $save_close_redirect_URL = NULL, $both_btns = TRUE ) {
@@ -2689,7 +2689,7 @@ 
 	/**
 	*		sort nav tabs
 	*		@access public
-	*		@return void
+	*		@return integer
 	*/
 	private function _sort_nav_tabs( $a, $b ) {
 		if ($a['order'] == $b['order']) {
@@ -3295,7 +3295,6 @@ 
 	 *
 	 * @access 	protected
 	 * @param string $tab
-	 * @param array $data
 	 * @param string $file	file where error occurred
 	 * @param string $func function  where error occurred
 	 * @param string $line	line no where error occurred

Indentation +59 added lines, -59 removed lines

@@ -1301,8 +1301,8 @@ 
 	 * 		verifies user access for this admin page
 	 * 		@param string $route_to_check if present then the capability for the route matching this string is checked.
 	 * 		@param bool   $verify_only Default is FALSE which means if user check fails then wp_die().  Otherwise just return false if verify fail.
-	*		@return 		BOOL|wp_die()
-	*/
+	 *		@return 		BOOL|wp_die()
+	 */
 	public function check_user_access( $route_to_check = '', $verify_only = FALSE ) {
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 		$route_to_check = empty( $route_to_check ) ? $this->_req_action : $route_to_check;
@@ -1703,11 +1703,11 @@ 
 
 
 	/**
-	*		admin_footer_scripts_eei18n_js_strings
-	*
-	*		@access 		public
-	*		@return 		void
-	*/
+	 *		admin_footer_scripts_eei18n_js_strings
+	 *
+	 *		@access 		public
+	 *		@return 		void
+	 */
 	public function admin_footer_scripts_eei18n_js_strings() {
 
 		EE_Registry::$i18n_js_strings['ajax_url'] = WP_AJAX_URL;
@@ -1763,11 +1763,11 @@ 
 
 
 	/**
-	*		load enhanced xdebug styles for ppl with failing eyesight
-	*
-	*		@access 		public
-	*		@return 		void
-	*/
+	 *		load enhanced xdebug styles for ppl with failing eyesight
+	 *
+	 *		@access 		public
+	 *		@return 		void
+	 */
 	public function add_xdebug_style() {
 		echo '<style>.xdebug-error { font-size:1.5em; }</style>';
 	}
@@ -1824,9 +1824,9 @@ 
 
 	/**
 	 * 		set current view for List Table
-	*		@access public
-	*		@return array
-	*/
+	 *		@access public
+	 *		@return array
+	 */
 	protected function _set_list_table_view() {
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 
@@ -1903,7 +1903,7 @@ 
 	 * @access protected
 	 * @param int $max_entries total number of rows in the table
 	 * @return string
-	*/
+	 */
 	protected function _entries_per_page_dropdown( $max_entries = FALSE ) {
 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
@@ -1948,9 +1948,9 @@ 
 
 	/**
 	 * 		_set_search_attributes
-	*		@access 		protected
-	*		@return 		void
-	*/
+	 *		@access 		protected
+	 *		@return 		void
+	 */
 	public function _set_search_attributes() {
 		$this->_template_args['search']['btn_label'] = sprintf( __( 'Search %s', 'event_espresso' ), empty( $this->_search_btn_label ) ? $this->page_label : $this->_search_btn_label );
 		$this->_template_args['search']['callback'] = 'search_' . $this->page_slug;
@@ -1970,7 +1970,7 @@ 
 	 * @link http://codex.wordpress.org/Function_Reference/add_meta_box
 	 * @access private
 	 * @return void
-	*/
+	 */
 	private function _add_registered_meta_boxes() {
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 
@@ -2230,9 +2230,9 @@ 
 
 	/**
 	 * 		displays an error message to ppl who have javascript disabled
-	*		@access 		private
-	*		@return 		string
-	*/
+	 *		@access 		private
+	 *		@return 		string
+	 */
 	private function _display_no_javascript_warning() {
 		?>
 		<noscript>
@@ -2255,9 +2255,9 @@ 
 
 	/**
 	 * 		displays espresso success and/or error notices
-	*		@access 		private
-	*		@return 		string
-	*/
+	 *		@access 		private
+	 *		@return 		string
+	 */
 	private function _display_espresso_notices() {
 		$notices = $this->_get_transient( TRUE );
 		echo stripslashes($notices);
@@ -2269,10 +2269,10 @@ 
 
 
 	/**
-	*		spinny things pacify the masses
-	*		@access private
-	*		@return string
-	*/
+	 *		spinny things pacify the masses
+	 *		@access private
+	 *		@return string
+	 */
 	protected function _add_admin_page_ajax_loading_img() {
 		?>
 			<div id="espresso-ajax-loading" class="ajax-loading-grey">
@@ -2286,10 +2286,10 @@ 
 
 
 	/**
-	*		add admin page overlay for modal boxes
-	*		@access private
-	*		@return string
-	*/
+	 *		add admin page overlay for modal boxes
+	 *		@access private
+	 *		@return string
+	 */
 	protected function _add_admin_page_overlay() {
 		?>
 		<div id="espresso-admin-page-overlay-dv" class=""></div>
@@ -2351,10 +2351,10 @@ 
 
 
 	/**
-	*		generates  HTML wrapper for an admin details page
-	*		@access public
-	*		@return void
-	*/
+	 *		generates  HTML wrapper for an admin details page
+	 *		@access public
+	 *		@return void
+	 */
 	public function display_admin_page_with_sidebar() {
 
 		$this->_display_admin_page(TRUE);
@@ -2364,10 +2364,10 @@ 
 
 
 	/**
-	*		generates  HTML wrapper for an admin details page (except no sidebar)
-	*		@access public
-	*		@return void
-	*/
+	 *		generates  HTML wrapper for an admin details page (except no sidebar)
+	 *		@access public
+	 *		@return void
+	 */
 	public function display_admin_page_with_no_sidebar() {
 		$this->_display_admin_page();
 	}
@@ -2591,11 +2591,11 @@ 
 		// make sure there are no php errors or headers_sent.  Then we can set correct json header.
 		if ( NULL === error_get_last() || ! headers_sent() )
 			header('Content-Type: application/json; charset=UTF-8');
-                if( function_exists( 'wp_json_encode' ) ) {
-                    echo wp_json_encode( $json );
-                } else {
-                    echo json_encode( $json );
-                }
+				if( function_exists( 'wp_json_encode' ) ) {
+					echo wp_json_encode( $json );
+				} else {
+					echo json_encode( $json );
+				}
 		exit();
 	}
 
@@ -2634,11 +2634,11 @@ 
 
 
 	/**
-	*		generates  HTML wrapper with Tabbed nav for an admin page
-	*		@access public
-	*		@param  boolean $about whether to use the special about page wrapper or default.
-	*		@return void
-	*/
+	 *		generates  HTML wrapper with Tabbed nav for an admin page
+	 *		@access public
+	 *		@param  boolean $about whether to use the special about page wrapper or default.
+	 *		@return void
+	 */
 	public function admin_page_wrapper($about = FALSE) {
 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
@@ -2692,15 +2692,15 @@ 
 
 
 	/**
-	*		sort nav tabs
-	*		@access public
-	*		@return void
-	*/
+	 *		sort nav tabs
+	 *		@access public
+	 *		@return void
+	 */
 	private function _sort_nav_tabs( $a, $b ) {
 		if ($a['order'] == $b['order']) {
-	        return 0;
-	    }
-	    return ($a['order'] < $b['order']) ? -1 : 1;
+			return 0;
+		}
+		return ($a['order'] < $b['order']) ? -1 : 1;
 	}
 
 

Braces +149 added lines, -94 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -156,8 +158,9 @@ 
 	 */
 	public function __construct( $routing = TRUE ) {
 
-		if ( strpos( $this->_get_dir(), 'caffeinated' ) !== false )
-			$this->_is_caf = TRUE;
+		if ( strpos( $this->_get_dir(), 'caffeinated' ) !== false ) {
+					$this->_is_caf = TRUE;
+		}
 
 		$this->_yes_no_values = array(
 			array('id' => TRUE, 'text' => __('Yes', 'event_espresso')),
@@ -188,8 +191,9 @@ 
 		$this->_do_other_page_hooks();
 
 		//This just allows us to have extending clases do something specific before the parent constructor runs _page_setup.
-		if ( method_exists( $this, '_before_page_setup' ) )
-			$this->_before_page_setup();
+		if ( method_exists( $this, '_before_page_setup' ) ) {
+					$this->_before_page_setup();
+		}
 
 		//set up page dependencies
 		$this->_page_setup();
@@ -496,7 +500,9 @@ 
 		global $ee_menu_slugs;
 		$ee_menu_slugs = (array) $ee_menu_slugs;
 
-		if ( ( !$this->_current_page || ! isset( $ee_menu_slugs[$this->_current_page] ) ) && !defined( 'DOING_AJAX') ) return FALSE;
+		if ( ( !$this->_current_page || ! isset( $ee_menu_slugs[$this->_current_page] ) ) && !defined( 'DOING_AJAX') ) {
+			return FALSE;
+		}
 
 
 		// becuz WP List tables have two duplicate select inputs for choosing bulk actions, we need to copy the action from the second to the first
@@ -531,12 +537,14 @@ 
 		}
 
 		//for caffeinated and other extended functionality.  If there is a _extend_page_config method then let's run that to modify the all the various page configuration arrays
-		if ( method_exists( $this, '_extend_page_config' ) )
-			$this->_extend_page_config();
+		if ( method_exists( $this, '_extend_page_config' ) ) {
+					$this->_extend_page_config();
+		}
 
 		//for CPT and other extended functionality. If there is an _extend_page_config_for_cpt then let's run that to modify all the various page configuration arrays.
-		if ( method_exists( $this, '_extend_page_config_for_cpt' ) )
-			$this->_extend_page_config_for_cpt();
+		if ( method_exists( $this, '_extend_page_config_for_cpt' ) ) {
+					$this->_extend_page_config_for_cpt();
+		}
 
 		//filter routes and page_config so addons can add their stuff. Filtering done per class
 		$this->_page_routes = apply_filters( 'FHEE__' . get_class($this) . '__page_setup__page_routes', $this->_page_routes, $this );
@@ -652,8 +660,9 @@ 
 		//add screen options - global, page child class, and view specific
 		$this->_add_global_screen_options();
 		$this->_add_screen_options();
-		if ( method_exists( $this, '_add_screen_options_' . $this->_current_view ) )
-			call_user_func( array( $this, '_add_screen_options_' . $this->_current_view ) );
+		if ( method_exists( $this, '_add_screen_options_' . $this->_current_view ) ) {
+					call_user_func( array( $this, '_add_screen_options_' . $this->_current_view ) );
+		}
 
 
 		//add help tab(s) and tours- set via page_config and qtips.
@@ -664,28 +673,32 @@ 
 		//add feature_pointers - global, page child class, and view specific
 		$this->_add_feature_pointers();
 		$this->_add_global_feature_pointers();
-		if ( method_exists( $this, '_add_feature_pointer_' . $this->_current_view ) )
-			call_user_func( array( $this, '_add_feature_pointer_' . $this->_current_view ) );
+		if ( method_exists( $this, '_add_feature_pointer_' . $this->_current_view ) ) {
+					call_user_func( array( $this, '_add_feature_pointer_' . $this->_current_view ) );
+		}
 
 		//enqueue scripts/styles - global, page class, and view specific
 		add_action('admin_enqueue_scripts', array($this, 'load_global_scripts_styles'), 5 );
 		add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles'), 10 );
-		if ( method_exists( $this, 'load_scripts_styles_' . $this->_current_view ) )
-			add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles_' . $this->_current_view ), 15 );
+		if ( method_exists( $this, 'load_scripts_styles_' . $this->_current_view ) ) {
+					add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles_' . $this->_current_view ), 15 );
+		}
 
 		add_action('admin_enqueue_scripts', array( $this, 'admin_footer_scripts_eei18n_js_strings' ), 100 );
 
 		//admin_print_footer_scripts - global, page child class, and view specific.  NOTE, despite the name, whenever possible, scripts should NOT be loaded using this.  In most cases that's doing_it_wrong().  But adding hidden container elements etc. is a good use case. Notice the late priority we're giving these
 		add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts_global' ), 99 );
 		add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts' ), 100 );
-		if ( method_exists( $this, 'admin_footer_scripts_' . $this->_current_view ) )
-			add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts_' . $this->_current_view ), 101 );
+		if ( method_exists( $this, 'admin_footer_scripts_' . $this->_current_view ) ) {
+					add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts_' . $this->_current_view ), 101 );
+		}
 
 		//admin footer scripts
 		add_action('admin_footer', array( $this, 'admin_footer_global' ), 99 );
 		add_action('admin_footer', array( $this, 'admin_footer'), 100 );
-		if ( method_exists( $this, 'admin_footer_' . $this->_current_view ) )
-			add_action('admin_footer', array( $this, 'admin_footer_' . $this->_current_view ), 101 );
+		if ( method_exists( $this, 'admin_footer_' . $this->_current_view ) ) {
+					add_action('admin_footer', array( $this, 'admin_footer_' . $this->_current_view ), 101 );
+		}
 
 
 		do_action( 'FHEE__EE_Admin_Page___load_page_dependencies__after_load', $this->page_slug );
@@ -758,7 +771,9 @@ 
 	protected function _verify_routes() {
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 
-		if ( !$this->_current_page && !defined( 'DOING_AJAX')) return FALSE;
+		if ( !$this->_current_page && !defined( 'DOING_AJAX')) {
+			return FALSE;
+		}
 
 		$this->_route = FALSE;
 		$func = FALSE;
@@ -868,8 +883,9 @@ 
 	 * @return void
 	 */
 	protected function _route_admin_request() {
-		if (  ! $this->_is_UI_request )
-			$this->_verify_routes();
+		if (  ! $this->_is_UI_request ) {
+					$this->_verify_routes();
+		}
 
 		$nonce_check = isset( $this->_route_config['require_nonce'] ) ? $this->_route_config['require_nonce'] : TRUE;
 
@@ -879,8 +895,9 @@ 
 			$this->_verify_nonce( $nonce, $this->_req_nonce );
 		}
 		//set the nav_tabs array but ONLY if this is  UI_request
-		if ( $this->_is_UI_request )
-			$this->_set_nav_tabs();
+		if ( $this->_is_UI_request ) {
+					$this->_set_nav_tabs();
+		}
 
 		// grab callback function
 		$func = is_array( $this->_route ) ? $this->_route['func'] : $this->_route;
@@ -917,8 +934,9 @@ 
 			}
 
 
-			if ( !empty( $error_msg ) && $base_call === FALSE && $addon_call === FALSE )
-				throw new EE_Error( $error_msg );
+			if ( !empty( $error_msg ) && $base_call === FALSE && $addon_call === FALSE ) {
+							throw new EE_Error( $error_msg );
+			}
 		}
 
 		//if we've routed and this route has a no headers route AND a sent_headers_route, then we need to reset the routing properties to the new route.
@@ -1045,8 +1063,9 @@ 
 				$tour_buttons = '<div class="ee-abs-container"><div class="ee-help-tour-restart-buttons">';
 				foreach ( $this->_help_tour['tours'] as $tour ) {
 					//if this is the end tour then we don't need to setup a button
-					if ( $tour instanceof EE_Help_Tour_final_stop )
-						continue;
+					if ( $tour instanceof EE_Help_Tour_final_stop ) {
+											continue;
+					}
 					$tb[] = '<button id="trigger-tour-' . $tour->get_slug() . '" class="button-primary trigger-ee-help-tour">' . $tour->get_label() . '</button>';
 				}
 				$tour_buttons .= implode('<br />', $tb);
@@ -1056,8 +1075,9 @@ 
 			// let's see if there is a help_sidebar set for the current route and we'll set that up for usage as well.
 			if ( is_array( $config ) && isset( $config['help_sidebar'] ) ) {
 				//check that the callback given is valid
-				if ( !method_exists($this, $config['help_sidebar'] ) )
-					throw new EE_Error( sprintf( __('The _page_config array has a callback set for the "help_sidebar" option.  However the callback given (%s) is not a valid callback.  Doublecheck the spelling and make sure this method exists for the class %s', 'event_espresso'), $config['help_sidebar'], get_class($this) ) );
+				if ( !method_exists($this, $config['help_sidebar'] ) ) {
+									throw new EE_Error( sprintf( __('The _page_config array has a callback set for the "help_sidebar" option.  However the callback given (%s) is not a valid callback.  Doublecheck the spelling and make sure this method exists for the class %s', 'event_espresso'), $config['help_sidebar'], get_class($this) ) );
+				}
 
 				$content = apply_filters( 'FHEE__' . get_class($this) . '__add_help_tabs__help_sidebar', call_user_func( array( $this, $config['help_sidebar'] ) ) );
 
@@ -1081,18 +1101,23 @@ 
 				}/**/
 
 
-			if ( !isset( $config['help_tabs'] ) ) return; //no help tabs for this route
+			if ( !isset( $config['help_tabs'] ) ) {
+				return;
+			}
+			//no help tabs for this route
 
 			foreach ( (array) $config['help_tabs'] as $tab_id => $cfg ) {
 				//we're here so there ARE help tabs!
 
 				//make sure we've got what we need
-				if ( !isset( $cfg['title'] ) )
-					throw new EE_Error( __('The _page_config array is not set up properly for help tabs.  It is missing a title', 'event_espresso') );
+				if ( !isset( $cfg['title'] ) ) {
+									throw new EE_Error( __('The _page_config array is not set up properly for help tabs.  It is missing a title', 'event_espresso') );
+				}
 
 
-				if ( !isset($cfg['filename']) && !isset( $cfg['callback'] ) && !isset( $cfg['content'] ) )
-					throw new EE_Error( __('The _page_config array is not setup properly for help tabs. It is missing a either a filename reference, or a callback reference or a content reference so there is no way to know the content for the help tab', 'event_espresso') );
+				if ( !isset($cfg['filename']) && !isset( $cfg['callback'] ) && !isset( $cfg['content'] ) ) {
+									throw new EE_Error( __('The _page_config array is not setup properly for help tabs. It is missing a either a filename reference, or a callback reference or a content reference so there is no way to know the content for the help tab', 'event_espresso') );
+				}
 
 
 
@@ -1155,14 +1180,16 @@ 
 		$this->_help_tour = array();
 
 		//exit early if help tours are turned off globally
-		if ( ! EE_Registry::instance()->CFG->admin->help_tour_activation || ( defined( 'EE_DISABLE_HELP_TOURS' ) && EE_DISABLE_HELP_TOURS ) )
-			return;
+		if ( ! EE_Registry::instance()->CFG->admin->help_tour_activation || ( defined( 'EE_DISABLE_HELP_TOURS' ) && EE_DISABLE_HELP_TOURS ) ) {
+					return;
+		}
 
 		//loop through _page_config to find any help_tour defined
 		foreach ( $this->_page_config as $route => $config ) {
 			//we're only going to set things up for this route
-			if ( $route !== $this->_req_action )
-				continue;
+			if ( $route !== $this->_req_action ) {
+							continue;
+			}
 
 			if ( isset( $config['help_tour'] ) ) {
 
@@ -1197,8 +1224,9 @@ 
 			}
 		}
 
-		if ( !empty( $tours ) )
-			$this->_help_tour['tours'] = $tours;
+		if ( !empty( $tours ) ) {
+					$this->_help_tour['tours'] = $tours;
+		}
 
 		//thats it!  Now that the $_help_tours property is set (or not) the scripts and html should be taken care of automatically.
 	}
@@ -1238,15 +1266,21 @@ 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 		$i = 0;
 		foreach ( $this->_page_config as $slug => $config ) {
-			if ( !is_array( $config ) || ( is_array($config) && (isset($config['nav']) && !$config['nav'] ) || !isset($config['nav'] ) ) )
-				continue; //no nav tab for this config
+			if ( !is_array( $config ) || ( is_array($config) && (isset($config['nav']) && !$config['nav'] ) || !isset($config['nav'] ) ) ) {
+							continue;
+			}
+			//no nav tab for this config
 
 			//check for persistent flag
-			if ( isset( $config['nav']['persistent']) && !$config['nav']['persistent'] && $slug !== $this->_req_action )
-				continue; //nav tab is only to appear when route requested.
+			if ( isset( $config['nav']['persistent']) && !$config['nav']['persistent'] && $slug !== $this->_req_action ) {
+							continue;
+			}
+			//nav tab is only to appear when route requested.
 
-			if ( ! $this->check_user_access( $slug, TRUE ) )
-				continue; //no nav tab becasue current user does not have access.
+			if ( ! $this->check_user_access( $slug, TRUE ) ) {
+							continue;
+			}
+			//no nav tab becasue current user does not have access.
 
 			$css_class = isset( $config['css_class'] ) ? $config['css_class'] . ' ' : '';
 			$this->_nav_tabs[$slug] = array(
@@ -1482,10 +1516,11 @@ 
 			$content .= EEH_Template::display_template( $template_path, $template_args, TRUE );
 		}
 
-		if ( $display )
-			echo $content;
-		else
-			return $content;
+		if ( $display ) {
+					echo $content;
+		} else {
+					return $content;
+		}
 	}
 
 
@@ -1502,8 +1537,9 @@ 
 		$method_name = '_help_popup_content_' . $this->_req_action;
 
 		//if method doesn't exist let's get out.
-		if ( !method_exists( $this, $method_name ) )
-			return array();
+		if ( !method_exists( $this, $method_name ) ) {
+					return array();
+		}
 
 		//k we're good to go let's retrieve the help array
 		$help_array = call_user_func( array( $this, $method_name ) );
@@ -1534,7 +1570,9 @@ 
 	 */
 	protected function _set_help_trigger( $trigger_id, $display = TRUE, $dimensions = array( '400', '640') ) {
 
-		if ( defined('DOING_AJAX') ) return;
+		if ( defined('DOING_AJAX') ) {
+			return;
+		}
 
 		//let's check and see if there is any content set for this popup.  If there isn't then we'll include a default title and content so that developers know something needs to be corrected
 		$help_array = $this->_get_help_content();
@@ -1552,10 +1590,11 @@ 
 		$content = '<a class="ee-dialog" href="?height='. $dimensions[0] . '&width=' . $dimensions[1] . '&inlineId=' . $trigger_id . '" target="_blank"><span class="question ee-help-popup-question"></span></a>';
 		$content = $content . $help_content;
 
-		if ( $display )
-			echo $content;
-		else
-			return $content;
+		if ( $display ) {
+					echo $content;
+		} else {
+					return $content;
+		}
 	}
 
 
@@ -1781,8 +1820,10 @@ 
 	protected function _set_list_table() {
 
 		//first is this a list_table view?
-		if ( !isset($this->_route_config['list_table']) )
-			return; //not a list_table view so get out.
+		if ( !isset($this->_route_config['list_table']) ) {
+					return;
+		}
+		//not a list_table view so get out.
 
 		//list table functions are per view specific (because some admin pages might have more than one listtable!)
 
@@ -1838,8 +1879,9 @@ 
 	 */
 	protected function _set_list_table_object() {
 		if ( isset($this->_route_config['list_table'] ) ) {
-			if ( !class_exists( $this->_route_config['list_table'] ) )
-				throw new EE_Error( sprintf( __('The %s class defined for the list table does not exist.  Please check the spelling of the class ref in the $_page_config property on %s.', 'event_espresso'), $this->_route_config['list_table'], get_class($this) ) );
+			if ( !class_exists( $this->_route_config['list_table'] ) ) {
+							throw new EE_Error( sprintf( __('The %s class defined for the list table does not exist.  Please check the spelling of the class ref in the $_page_config property on %s.', 'event_espresso'), $this->_route_config['list_table'], get_class($this) ) );
+			}
 			$a = new ReflectionClass($this->_route_config['list_table']);
 			$this->_list_table_object = $a->newInstance($this);
 		}
@@ -2114,8 +2156,9 @@ 
 	protected function _espresso_sponsors_post_box() {
 
 		$show_sponsors = apply_filters( 'FHEE_show_sponsors_meta_box', TRUE );
-		if ( $show_sponsors )
-			add_meta_box('espresso_sponsors_post_box', __('Event Espresso Highlights', 'event_espresso'), array( $this, 'espresso_sponsors_post_box'), $this->_wp_page_slug, 'side');
+		if ( $show_sponsors ) {
+					add_meta_box('espresso_sponsors_post_box', __('Event Espresso Highlights', 'event_espresso'), array( $this, 'espresso_sponsors_post_box'), $this->_wp_page_slug, 'side');
+		}
 	}
 
 
@@ -2398,8 +2441,9 @@ 
 
 		$template_path = $sidebar ?  EE_ADMIN_TEMPLATE . 'admin_details_wrapper.template.php' : EE_ADMIN_TEMPLATE . 'admin_details_wrapper_no_sidebar.template.php';
 
-		if ( defined('DOING_AJAX' ) )
-			$template_path = EE_ADMIN_TEMPLATE . 'admin_details_wrapper_no_sidebar_ajax.template.php';
+		if ( defined('DOING_AJAX' ) ) {
+					$template_path = EE_ADMIN_TEMPLATE . 'admin_details_wrapper_no_sidebar_ajax.template.php';
+		}
 
 		$template_path = !empty($this->_column_template_path) ? $this->_column_template_path : $template_path;
 
@@ -2510,10 +2554,11 @@ 
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
 
 		// the final template wrapper
-		if ( $sidebar )
-			$this->display_admin_page_with_sidebar();
-		else
-			$this->display_admin_page_with_no_sidebar();
+		if ( $sidebar ) {
+					$this->display_admin_page_with_sidebar();
+		} else {
+					$this->display_admin_page_with_no_sidebar();
+		}
 	}
 
 
@@ -2581,8 +2626,9 @@ 
 
 
 		// make sure there are no php errors or headers_sent.  Then we can set correct json header.
-		if ( NULL === error_get_last() || ! headers_sent() )
-			header('Content-Type: application/json; charset=UTF-8');
+		if ( NULL === error_get_last() || ! headers_sent() ) {
+					header('Content-Type: application/json; charset=UTF-8');
+		}
                 if( function_exists( 'wp_json_encode' ) ) {
                     echo wp_json_encode( $json );
                 } else {
@@ -2598,10 +2644,9 @@ 
 	 * @return json_obj|EE_Error
 	 */
 	public function return_json() {
-		if ( defined('DOING_AJAX') && DOING_AJAX )
-			$this->_return_json();
-
-		else {
+		if ( defined('DOING_AJAX') && DOING_AJAX ) {
+					$this->_return_json();
+		} else {
 			throw new EE_Error( sprintf( __('The public %s method can only be called when DOING_AJAX = TRUE', 'event_espresso'), __FUNCTION__ ) );
 		}
 	}
@@ -2748,7 +2793,9 @@ 
 			$id = $this->_current_view . '_' . $ref;
 			$name = !empty($actions) ? $actions[$key] : $ref;
 			$this->_template_args['save_buttons'] .= '<input type="submit" class="button-primary ' . $ref . '" value="' . $button . '" name="' . $name . '" id="' . $id . '" />';
-			if ( !$both ) break;
+			if ( !$both ) {
+				break;
+			}
 		}
 
 	}
@@ -3007,11 +3054,13 @@ 
 	 */
 	public function get_action_link_or_button($action, $type = 'add', $extra_request = array(), $class = 'button-primary', $base_url = FALSE, $exclude_nonce = false ) {
 		//first let's validate the action (if $base_url is FALSE otherwise validation will happen further along)
-		if ( !isset($this->_page_routes[$action]) && !$base_url )
-			throw new EE_Error( sprintf( __('There is no page route for given action for the button.  This action was given: %s', 'event_espresso'), $action) );
+		if ( !isset($this->_page_routes[$action]) && !$base_url ) {
+					throw new EE_Error( sprintf( __('There is no page route for given action for the button.  This action was given: %s', 'event_espresso'), $action) );
+		}
 
-		if ( !isset( $this->_labels['buttons'][$type] ) )
-			throw new EE_Error( sprintf( __('There is no label for the given button type (%s). Labels are set in the <code>_page_config</code> property.', 'event_espresso'), $type) );
+		if ( !isset( $this->_labels['buttons'][$type] ) ) {
+					throw new EE_Error( sprintf( __('There is no label for the given button type (%s). Labels are set in the <code>_page_config</code> property.', 'event_espresso'), $type) );
+		}
 
 		//finally check user access for this button.
 		$has_access = $this->check_user_access( $action, TRUE );
@@ -3025,8 +3074,9 @@ 
 			'action' => $action  );
 
 		//merge extra_request args but make sure our original action takes precedence and doesn't get overwritten.
-		if ( !empty($extra_request) )
-			$query_args = array_merge( $extra_request, $query_args );
+		if ( !empty($extra_request) ) {
+					$query_args = array_merge( $extra_request, $query_args );
+		}
 
 		$url = self::add_query_args_and_nonce( $query_args, $_base_url, false, $exclude_nonce );
 
@@ -3073,13 +3123,15 @@ 
 		if ( isset($_POST['wp_screen_options']) && is_array($_POST['wp_screen_options']) ) {
 			check_admin_referer( 'screen-options-nonce', 'screenoptionnonce' );
 
-			if ( !$user = wp_get_current_user() )
-			return;
+			if ( !$user = wp_get_current_user() ) {
+						return;
+			}
 			$option = $_POST['wp_screen_options']['option'];
 			$value = $_POST['wp_screen_options']['value'];
 
-			if ( $option != sanitize_key( $option ) )
-				return;
+			if ( $option != sanitize_key( $option ) ) {
+							return;
+			}
 
 			$map_option = $option;
 
@@ -3088,13 +3140,15 @@ 
 			switch ( $map_option ) {
 				case $this->_current_page . '_' .  $this->_current_view . '_per_page':
 					$value = (int) $value;
-					if ( $value < 1 || $value > 999 )
-						return;
+					if ( $value < 1 || $value > 999 ) {
+											return;
+					}
 					break;
 				default:
 					$value = apply_filters( 'FHEE__EE_Admin_Page___set_per_page_screen_options__value', false, $option, $value );
-					if ( false === $value )
-						return;
+					if ( false === $value ) {
+											return;
+					}
 					break;
 			}
 
@@ -3130,8 +3184,9 @@ 
 	protected function _add_transient( $route, $data, $notices = FALSE, $skip_route_verify = FALSE ) {
 		$user_id = get_current_user_id();
 
-		if ( !$skip_route_verify )
-			$this->_verify_route($route);
+		if ( !$skip_route_verify ) {
+					$this->_verify_route($route);
+		}
 
 
 		//now let's set the string for what kind of transient we're setting

Spacing +594 added lines, -594 removed lines

@@ -144,9 +144,9 @@ 
 	 * 		@access public
 	 * 		@return void
 	 */
-	public function __construct( $routing = TRUE ) {
+	public function __construct($routing = TRUE) {
 
-		if ( strpos( $this->_get_dir(), 'caffeinated' ) !== false )
+		if (strpos($this->_get_dir(), 'caffeinated') !== false)
 			$this->_is_caf = TRUE;
 
 		$this->_yes_no_values = array(
@@ -157,7 +157,7 @@ 
 
 
 		//set the _req_data property.
-		$this->_req_data = array_merge( $_GET, $_POST );
+		$this->_req_data = array_merge($_GET, $_POST);
 
 
 		//routing enabled?
@@ -178,7 +178,7 @@ 
 		$this->_do_other_page_hooks();
 
 		//This just allows us to have extending clases do something specific before the parent constructor runs _page_setup.
-		if ( method_exists( $this, '_before_page_setup' ) )
+		if (method_exists($this, '_before_page_setup'))
 			$this->_before_page_setup();
 
 		//set up page dependencies
@@ -448,16 +448,16 @@ 
 	 */
 	protected function _global_ajax_hooks() {
 		//for lazy loading of metabox content
-		add_action( 'wp_ajax_espresso-ajax-content', array( $this, 'ajax_metabox_content'), 10 );
+		add_action('wp_ajax_espresso-ajax-content', array($this, 'ajax_metabox_content'), 10);
 	}
 
 
 
 	public function ajax_metabox_content() {
-		$contentid = isset( $this->_req_data['contentid'] ) ? $this->_req_data['contentid'] : '';
-		$url = isset( $this->_req_data['contenturl'] ) ? $this->_req_data['contenturl'] : '';
+		$contentid = isset($this->_req_data['contentid']) ? $this->_req_data['contentid'] : '';
+		$url = isset($this->_req_data['contenturl']) ? $this->_req_data['contenturl'] : '';
 
-		self::cached_rss_display( $contentid, $url );
+		self::cached_rss_display($contentid, $url);
 		wp_die();
 	}
 
@@ -478,87 +478,87 @@ 
 
 
 		//admin_init stuff - global - we're setting this REALLY early so if EE_Admin pages have to hook into other WP pages they can.  But keep in mind, not everything is available from the EE_Admin Page object at this point.
-		add_action( 'admin_init', array( $this, 'admin_init_global' ), 5 );
+		add_action('admin_init', array($this, 'admin_init_global'), 5);
 
 
 		//next verify if we need to load anything...
-		$this->_current_page = !empty( $_GET['page'] ) ? sanitize_key( $_GET['page'] ) : FALSE;
-		$this->page_folder = strtolower( str_replace( '_Admin_Page', '', str_replace( 'Extend_', '', get_class($this) ) ) );
+		$this->_current_page = ! empty($_GET['page']) ? sanitize_key($_GET['page']) : FALSE;
+		$this->page_folder = strtolower(str_replace('_Admin_Page', '', str_replace('Extend_', '', get_class($this))));
 
 		global $ee_menu_slugs;
 		$ee_menu_slugs = (array) $ee_menu_slugs;
 
-		if ( ( !$this->_current_page || ! isset( $ee_menu_slugs[$this->_current_page] ) ) && !defined( 'DOING_AJAX') ) return FALSE;
+		if (( ! $this->_current_page || ! isset($ee_menu_slugs[$this->_current_page])) && ! defined('DOING_AJAX')) return FALSE;
 
 
 		// becuz WP List tables have two duplicate select inputs for choosing bulk actions, we need to copy the action from the second to the first
-		if ( isset( $this->_req_data['action2'] ) && $this->_req_data['action'] == -1 ) {
-			$this->_req_data['action'] = ! empty( $this->_req_data['action2'] ) && $this->_req_data['action2'] != -1 ? $this->_req_data['action2'] : $this->_req_data['action'];
+		if (isset($this->_req_data['action2']) && $this->_req_data['action'] == -1) {
+			$this->_req_data['action'] = ! empty($this->_req_data['action2']) && $this->_req_data['action2'] != -1 ? $this->_req_data['action2'] : $this->_req_data['action'];
 		}
 		// then set blank or -1 action values to 'default'
-		$this->_req_action = isset( $this->_req_data['action'] ) && ! empty( $this->_req_data['action'] ) && $this->_req_data['action'] != -1 ? sanitize_key( $this->_req_data['action'] ) : 'default';
+		$this->_req_action = isset($this->_req_data['action']) && ! empty($this->_req_data['action']) && $this->_req_data['action'] != -1 ? sanitize_key($this->_req_data['action']) : 'default';
 
 		//if action is 'default' after the above BUT we have  'route' var set, then let's use the route as the action.  This covers cases where we're coming in from a list table that isn't on the default route.
-		$this->_req_action = $this->_req_action == 'default' && isset( $this->_req_data['route'] ) ? $this->_req_data['route'] : $this->_req_action;
+		$this->_req_action = $this->_req_action == 'default' && isset($this->_req_data['route']) ? $this->_req_data['route'] : $this->_req_action;
 
 		//however if we are doing_ajax and we've got a 'route' set then that's what the req_action will be
 		$this->_req_action = defined('DOING_AJAX') && isset($this->_req_data['route']) ? $this->_req_data['route'] : $this->_req_action;
 
 		$this->_current_view = $this->_req_action;
-		$this->_req_nonce = $this->_req_action . '_nonce';
+		$this->_req_nonce = $this->_req_action.'_nonce';
 		$this->_define_page_props();
 
-		$this->_current_page_view_url = add_query_arg( array( 'page' => $this->_current_page, 'action' => $this->_current_view ),  $this->_admin_base_url );
+		$this->_current_page_view_url = add_query_arg(array('page' => $this->_current_page, 'action' => $this->_current_view), $this->_admin_base_url);
 
 		//default things
-		$this->_default_espresso_metaboxes = array('_espresso_news_post_box', '_espresso_links_post_box', '_espresso_ratings_request', '_espresso_sponsors_post_box' );
+		$this->_default_espresso_metaboxes = array('_espresso_news_post_box', '_espresso_links_post_box', '_espresso_ratings_request', '_espresso_sponsors_post_box');
 
 		//set page configs
 		$this->_set_page_routes();
 		$this->_set_page_config();
 
 		//let's include any referrer data in our default_query_args for this route for "stickiness".
-		if ( isset( $this->_req_data['wp_referer'] ) ) {
+		if (isset($this->_req_data['wp_referer'])) {
 			$this->_default_route_query_args['wp_referer'] = $this->_req_data['wp_referer'];
 		}
 
 		//for caffeinated and other extended functionality.  If there is a _extend_page_config method then let's run that to modify the all the various page configuration arrays
-		if ( method_exists( $this, '_extend_page_config' ) )
+		if (method_exists($this, '_extend_page_config'))
 			$this->_extend_page_config();
 
 		//for CPT and other extended functionality. If there is an _extend_page_config_for_cpt then let's run that to modify all the various page configuration arrays.
-		if ( method_exists( $this, '_extend_page_config_for_cpt' ) )
+		if (method_exists($this, '_extend_page_config_for_cpt'))
 			$this->_extend_page_config_for_cpt();
 
 		//filter routes and page_config so addons can add their stuff. Filtering done per class
-		$this->_page_routes = apply_filters( 'FHEE__' . get_class($this) . '__page_setup__page_routes', $this->_page_routes, $this );
-		$this->_page_config = apply_filters( 'FHEE__' . get_class($this) . '__page_setup__page_config', $this->_page_config, $this );
+		$this->_page_routes = apply_filters('FHEE__'.get_class($this).'__page_setup__page_routes', $this->_page_routes, $this);
+		$this->_page_config = apply_filters('FHEE__'.get_class($this).'__page_setup__page_config', $this->_page_config, $this);
 
 
 		//if AHEE__EE_Admin_Page__route_admin_request_$this->_current_view method is present then we call it hooked into the AHEE__EE_Admin_Page__route_admin_request action
-		if ( method_exists( $this, 'AHEE__EE_Admin_Page__route_admin_request_' . $this->_current_view ) ) {
-			add_action( 'AHEE__EE_Admin_Page__route_admin_request', array( $this, 'AHEE__EE_Admin_Page__route_admin_request_' . $this->_current_view ), 10, 2 );
+		if (method_exists($this, 'AHEE__EE_Admin_Page__route_admin_request_'.$this->_current_view)) {
+			add_action('AHEE__EE_Admin_Page__route_admin_request', array($this, 'AHEE__EE_Admin_Page__route_admin_request_'.$this->_current_view), 10, 2);
 		}
 
 
 		//next route only if routing enabled
-		if ( $this->_routing && !defined('DOING_AJAX') ) {
+		if ($this->_routing && ! defined('DOING_AJAX')) {
 
 			$this->_verify_routes();
 
 			//next let's just check user_access and kill if no access
 			$this->check_user_access();
 
-			if ( $this->_is_UI_request ) {
+			if ($this->_is_UI_request) {
 				//admin_init stuff - global, all views for this page class, specific view
-				add_action( 'admin_init', array( $this, 'admin_init' ), 10 );
-				if ( method_exists( $this, 'admin_init_' . $this->_current_view )) {
-					add_action( 'admin_init', array( $this, 'admin_init_' . $this->_current_view ), 15 );
+				add_action('admin_init', array($this, 'admin_init'), 10);
+				if (method_exists($this, 'admin_init_'.$this->_current_view)) {
+					add_action('admin_init', array($this, 'admin_init_'.$this->_current_view), 15);
 				}
 
 			} else {
 				//hijack regular WP loading and route admin request immediately
-				@ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
+				@ini_set('memory_limit', apply_filters('admin_memory_limit', WP_MAX_MEMORY_LIMIT));
 				$this->route_admin_request();
 			}
 		}
@@ -575,18 +575,18 @@ 
 	 * @return void
 	 */
 	private function _do_other_page_hooks() {
-		$registered_pages = apply_filters( 'FHEE_do_other_page_hooks_' . $this->page_slug, array() );
+		$registered_pages = apply_filters('FHEE_do_other_page_hooks_'.$this->page_slug, array());
 
-		foreach ( $registered_pages as $page ) {
+		foreach ($registered_pages as $page) {
 
 			//now let's setup the file name and class that should be present
 			$classname = str_replace('.class.php', '', $page);
 
 			//autoloaders should take care of loading file
-			if ( !class_exists( $classname ) ) {
-				$error_msg[] = sprintf( __('Something went wrong with loading the %s admin hooks page.', 'event_espresso' ), $page);
-				$error_msg[] = $error_msg[0] . "\r\n" . sprintf( __( 'There is no class in place for the %s admin hooks page.%sMake sure you have <strong>%s</strong> defined. If this is a non-EE-core admin page then you also must have an autoloader in place for your class', 'event_espresso'), $page, '<br />', $classname );
-				throw new EE_Error( implode( '||', $error_msg ));
+			if ( ! class_exists($classname)) {
+				$error_msg[] = sprintf(__('Something went wrong with loading the %s admin hooks page.', 'event_espresso'), $page);
+				$error_msg[] = $error_msg[0]."\r\n".sprintf(__('There is no class in place for the %s admin hooks page.%sMake sure you have <strong>%s</strong> defined. If this is a non-EE-core admin page then you also must have an autoloader in place for your class', 'event_espresso'), $page, '<br />', $classname);
+				throw new EE_Error(implode('||', $error_msg));
 			}
 
 			$a = new ReflectionClass($classname);
@@ -601,7 +601,7 @@ 
 	public function load_page_dependencies() {
 		try {
 			$this->_load_page_dependencies();
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 	}
@@ -619,16 +619,16 @@ 
 		$this->_current_screen = get_current_screen();
 
 		//load admin_notices - global, page class, and view specific
-		add_action( 'admin_notices', array( $this, 'admin_notices_global'), 5 );
-		add_action( 'admin_notices', array( $this, 'admin_notices' ), 10 );
-		if ( method_exists( $this, 'admin_notices_' . $this->_current_view ) ) {
-			add_action( 'admin_notices', array( $this, 'admin_notices_' . $this->_current_view ), 15 );
+		add_action('admin_notices', array($this, 'admin_notices_global'), 5);
+		add_action('admin_notices', array($this, 'admin_notices'), 10);
+		if (method_exists($this, 'admin_notices_'.$this->_current_view)) {
+			add_action('admin_notices', array($this, 'admin_notices_'.$this->_current_view), 15);
 		}
 
 		//load network admin_notices - global, page class, and view specific
-		add_action( 'network_admin_notices', array( $this, 'network_admin_notices_global'), 5 );
-		if ( method_exists( $this, 'network_admin_notices_' . $this->_current_view ) ) {
-			add_action( 'network_admin_notices', array( $this, 'network_admin_notices_' . $this->_current_view ) );
+		add_action('network_admin_notices', array($this, 'network_admin_notices_global'), 5);
+		if (method_exists($this, 'network_admin_notices_'.$this->_current_view)) {
+			add_action('network_admin_notices', array($this, 'network_admin_notices_'.$this->_current_view));
 		}
 
 		//this will save any per_page screen options if they are present
@@ -644,8 +644,8 @@ 
 		//add screen options - global, page child class, and view specific
 		$this->_add_global_screen_options();
 		$this->_add_screen_options();
-		if ( method_exists( $this, '_add_screen_options_' . $this->_current_view ) )
-			call_user_func( array( $this, '_add_screen_options_' . $this->_current_view ) );
+		if (method_exists($this, '_add_screen_options_'.$this->_current_view))
+			call_user_func(array($this, '_add_screen_options_'.$this->_current_view));
 
 
 		//add help tab(s) and tours- set via page_config and qtips.
@@ -656,33 +656,33 @@ 
 		//add feature_pointers - global, page child class, and view specific
 		$this->_add_feature_pointers();
 		$this->_add_global_feature_pointers();
-		if ( method_exists( $this, '_add_feature_pointer_' . $this->_current_view ) )
-			call_user_func( array( $this, '_add_feature_pointer_' . $this->_current_view ) );
+		if (method_exists($this, '_add_feature_pointer_'.$this->_current_view))
+			call_user_func(array($this, '_add_feature_pointer_'.$this->_current_view));
 
 		//enqueue scripts/styles - global, page class, and view specific
-		add_action('admin_enqueue_scripts', array($this, 'load_global_scripts_styles'), 5 );
-		add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles'), 10 );
-		if ( method_exists( $this, 'load_scripts_styles_' . $this->_current_view ) )
-			add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles_' . $this->_current_view ), 15 );
+		add_action('admin_enqueue_scripts', array($this, 'load_global_scripts_styles'), 5);
+		add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles'), 10);
+		if (method_exists($this, 'load_scripts_styles_'.$this->_current_view))
+			add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles_'.$this->_current_view), 15);
 
-		add_action('admin_enqueue_scripts', array( $this, 'admin_footer_scripts_eei18n_js_strings' ), 100 );
+		add_action('admin_enqueue_scripts', array($this, 'admin_footer_scripts_eei18n_js_strings'), 100);
 
 		//admin_print_footer_scripts - global, page child class, and view specific.  NOTE, despite the name, whenever possible, scripts should NOT be loaded using this.  In most cases that's doing_it_wrong().  But adding hidden container elements etc. is a good use case. Notice the late priority we're giving these
-		add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts_global' ), 99 );
-		add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts' ), 100 );
-		if ( method_exists( $this, 'admin_footer_scripts_' . $this->_current_view ) )
-			add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts_' . $this->_current_view ), 101 );
+		add_action('admin_print_footer_scripts', array($this, 'admin_footer_scripts_global'), 99);
+		add_action('admin_print_footer_scripts', array($this, 'admin_footer_scripts'), 100);
+		if (method_exists($this, 'admin_footer_scripts_'.$this->_current_view))
+			add_action('admin_print_footer_scripts', array($this, 'admin_footer_scripts_'.$this->_current_view), 101);
 
 		//admin footer scripts
-		add_action('admin_footer', array( $this, 'admin_footer_global' ), 99 );
-		add_action('admin_footer', array( $this, 'admin_footer'), 100 );
-		if ( method_exists( $this, 'admin_footer_' . $this->_current_view ) )
-			add_action('admin_footer', array( $this, 'admin_footer_' . $this->_current_view ), 101 );
+		add_action('admin_footer', array($this, 'admin_footer_global'), 99);
+		add_action('admin_footer', array($this, 'admin_footer'), 100);
+		if (method_exists($this, 'admin_footer_'.$this->_current_view))
+			add_action('admin_footer', array($this, 'admin_footer_'.$this->_current_view), 101);
 
 
-		do_action( 'FHEE__EE_Admin_Page___load_page_dependencies__after_load', $this->page_slug );
+		do_action('FHEE__EE_Admin_Page___load_page_dependencies__after_load', $this->page_slug);
 		//targeted hook
-		do_action( 'FHEE__EE_Admin_Page___load_page_dependencies__after_load__' . $this->page_slug . '__' . $this->_req_action );
+		do_action('FHEE__EE_Admin_Page___load_page_dependencies__after_load__'.$this->page_slug.'__'.$this->_req_action);
 
 	}
 
@@ -697,7 +697,7 @@ 
 	private function _set_defaults() {
 		$this->_current_screen = $this->_admin_page_title = $this->_req_action = $this->_req_nonce = $this->_event = $this->_template_path = $this->_column_template_path = NULL;
 
-		$this->_nav_tabs = $this_views = $this->_page_routes = $this->_page_config =  $this->_default_route_query_args = array();
+		$this->_nav_tabs = $this_views = $this->_page_routes = $this->_page_config = $this->_default_route_query_args = array();
 
 		$this->default_nav_tab_name = 'overview';
 
@@ -724,7 +724,7 @@ 
 	public function route_admin_request() {
 		try {
 			$this->_route_admin_request();
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 	}
@@ -735,7 +735,7 @@ 
 		$this->_wp_page_slug = $wp_page_slug;
 
 		//if in network admin then we need to append "-network" to the page slug. Why? Because that's how WP rolls...
-		if ( is_network_admin() ) {
+		if (is_network_admin()) {
 			$this->_wp_page_slug .= '-network';
 		}
 	}
@@ -748,53 +748,53 @@ 
 	 * @return void
 	 */
 	protected function _verify_routes() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		if ( !$this->_current_page && !defined( 'DOING_AJAX')) return FALSE;
+		if ( ! $this->_current_page && ! defined('DOING_AJAX')) return FALSE;
 
 		$this->_route = FALSE;
 		$func = FALSE;
 		$args = array();
 
 		// check that the page_routes array is not empty
-		if ( empty( $this->_page_routes )) {
+		if (empty($this->_page_routes)) {
 			// user error msg
-			$error_msg = sprintf( __('No page routes have been set for the %s admin page.', 'event_espresso'), $this->_admin_page_title );
+			$error_msg = sprintf(__('No page routes have been set for the %s admin page.', 'event_espresso'), $this->_admin_page_title);
 			// developer error msg
-			$error_msg .=  '||' . $error_msg . __( ' Make sure the "set_page_routes()" method exists, and is setting the "_page_routes" array properly.', 'event_espresso' );
-			throw new EE_Error( $error_msg );
+			$error_msg .= '||'.$error_msg.__(' Make sure the "set_page_routes()" method exists, and is setting the "_page_routes" array properly.', 'event_espresso');
+			throw new EE_Error($error_msg);
 		}
 
 		// and that the requested page route exists
-		if ( array_key_exists( $this->_req_action, $this->_page_routes )) {
-			$this->_route = $this->_page_routes[ $this->_req_action ];
+		if (array_key_exists($this->_req_action, $this->_page_routes)) {
+			$this->_route = $this->_page_routes[$this->_req_action];
 			$this->_route_config = isset($this->_page_config[$this->_req_action]) ? $this->_page_config[$this->_req_action] : array();
 		} else {
 			// user error msg
-			$error_msg =  sprintf( __( 'The requested page route does not exist for the %s admin page.', 'event_espresso' ), $this->_admin_page_title );
+			$error_msg = sprintf(__('The requested page route does not exist for the %s admin page.', 'event_espresso'), $this->_admin_page_title);
 			// developer error msg
-			$error_msg .=  '||' . $error_msg . sprintf( __( ' Create a key in the "_page_routes" array named "%s" and set its value to the appropriate method.', 'event_espresso' ), $this->_req_action );
-			throw new EE_Error( $error_msg );
+			$error_msg .= '||'.$error_msg.sprintf(__(' Create a key in the "_page_routes" array named "%s" and set its value to the appropriate method.', 'event_espresso'), $this->_req_action);
+			throw new EE_Error($error_msg);
 		}
 
 		// and that a default route exists
-		if ( ! array_key_exists( 'default', $this->_page_routes )) {
+		if ( ! array_key_exists('default', $this->_page_routes)) {
 			// user error msg
-			$error_msg = sprintf( __( 'A default page route has not been set for the % admin page.', 'event_espresso' ), $this->_admin_page_title );
+			$error_msg = sprintf(__('A default page route has not been set for the % admin page.', 'event_espresso'), $this->_admin_page_title);
 			// developer error msg
-			$error_msg .=  '||' . $error_msg . __( ' Create a key in the "_page_routes" array named "default" and set its value to your default page method.', 'event_espresso' );
-			throw new EE_Error( $error_msg );
+			$error_msg .= '||'.$error_msg.__(' Create a key in the "_page_routes" array named "default" and set its value to your default page method.', 'event_espresso');
+			throw new EE_Error($error_msg);
 		}
 
 
 		//first lets' catch if the UI request has EVER been set.
-		if ( $this->_is_UI_request === NULL ) {
+		if ($this->_is_UI_request === NULL) {
 			//lets set if this is a UI request or not.
-			$this->_is_UI_request = ( ! isset( $this->_req_data['noheader'] ) || $this->_req_data['noheader'] !== TRUE ) ? TRUE : FALSE;
+			$this->_is_UI_request = ( ! isset($this->_req_data['noheader']) || $this->_req_data['noheader'] !== TRUE) ? TRUE : FALSE;
 
 
 			//wait a minute... we might have a noheader in the route array
-			$this->_is_UI_request = is_array($this->_route) && isset($this->_route['noheader'] ) && $this->_route['noheader'] ? FALSE : $this->_is_UI_request;
+			$this->_is_UI_request = is_array($this->_route) && isset($this->_route['noheader']) && $this->_route['noheader'] ? FALSE : $this->_is_UI_request;
 		}
 
 		$this->_set_current_labels();
@@ -809,15 +809,15 @@ 
 	 * @param  string $route the route name we're verifying
 	 * @return mixed  (bool|Exception)      we'll throw an exception if this isn't a valid route.
 	 */
-	protected function _verify_route( $route ) {
-		if ( array_key_exists( $this->_req_action, $this->_page_routes )) {
+	protected function _verify_route($route) {
+		if (array_key_exists($this->_req_action, $this->_page_routes)) {
 			return true;
 		} else {
 			// user error msg
-			$error_msg =  sprintf( __( 'The given page route does not exist for the %s admin page.', 'event_espresso' ), $this->_admin_page_title );
+			$error_msg = sprintf(__('The given page route does not exist for the %s admin page.', 'event_espresso'), $this->_admin_page_title);
 			// developer error msg
-			$error_msg .=  '||' . $error_msg . sprintf( __( ' Check the route you are using in your method (%s) and make sure it matches a route set in your "_page_routes" array property', 'event_espresso' ), $route );
-			throw new EE_Error( $error_msg );
+			$error_msg .= '||'.$error_msg.sprintf(__(' Check the route you are using in your method (%s) and make sure it matches a route set in your "_page_routes" array property', 'event_espresso'), $route);
+			throw new EE_Error($error_msg);
 		}
 	}
 
@@ -831,18 +831,18 @@ 
 	 * @param  string $nonce_ref The nonce reference string (name0)
 	 * @return mixed (bool|die)
 	 */
-	protected function _verify_nonce( $nonce, $nonce_ref ) {
+	protected function _verify_nonce($nonce, $nonce_ref) {
 		// verify nonce against expected value
-		if ( ! wp_verify_nonce( $nonce, $nonce_ref) ) {
+		if ( ! wp_verify_nonce($nonce, $nonce_ref)) {
 			// these are not the droids you are looking for !!!
-			$msg = sprintf(__('%sNonce Fail.%s' , 'event_espresso'), '<a href="http://www.youtube.com/watch?v=56_S0WeTkzs">', '</a>' );
-			if ( WP_DEBUG ) {
-				$msg .= "\n  " . sprintf( __('In order to dynamically generate nonces for your actions, use the %s::add_query_args_and_nonce() method. May the Nonce be with you!', 'event_espresso' ), __CLASS__  );
+			$msg = sprintf(__('%sNonce Fail.%s', 'event_espresso'), '<a href="http://www.youtube.com/watch?v=56_S0WeTkzs">', '</a>');
+			if (WP_DEBUG) {
+				$msg .= "\n  ".sprintf(__('In order to dynamically generate nonces for your actions, use the %s::add_query_args_and_nonce() method. May the Nonce be with you!', 'event_espresso'), __CLASS__);
 			}
-			if ( ! defined( 'DOING_AJAX' )) {
-				wp_die( $msg );
+			if ( ! defined('DOING_AJAX')) {
+				wp_die($msg);
 			} else {
-				EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 				$this->_return_json();
 			}
 		}
@@ -860,63 +860,63 @@ 
 	 * @return void
 	 */
 	protected function _route_admin_request() {
-		if (  ! $this->_is_UI_request )
+		if ( ! $this->_is_UI_request)
 			$this->_verify_routes();
 
-		$nonce_check = isset( $this->_route_config['require_nonce'] ) ? $this->_route_config['require_nonce'] : TRUE;
+		$nonce_check = isset($this->_route_config['require_nonce']) ? $this->_route_config['require_nonce'] : TRUE;
 
-		if ( $this->_req_action != 'default' && $nonce_check ) {
+		if ($this->_req_action != 'default' && $nonce_check) {
 			// set nonce from post data
-			$nonce = isset($this->_req_data[ $this->_req_nonce  ]) ? sanitize_text_field( $this->_req_data[ $this->_req_nonce  ] ) : '';
-			$this->_verify_nonce( $nonce, $this->_req_nonce );
+			$nonce = isset($this->_req_data[$this->_req_nonce]) ? sanitize_text_field($this->_req_data[$this->_req_nonce]) : '';
+			$this->_verify_nonce($nonce, $this->_req_nonce);
 		}
 		//set the nav_tabs array but ONLY if this is  UI_request
-		if ( $this->_is_UI_request )
+		if ($this->_is_UI_request)
 			$this->_set_nav_tabs();
 
 		// grab callback function
-		$func = is_array( $this->_route ) ? $this->_route['func'] : $this->_route;
+		$func = is_array($this->_route) ? $this->_route['func'] : $this->_route;
 
 		// check if callback has args
-		$args = is_array( $this->_route ) && isset( $this->_route['args'] ) ? $this->_route['args'] : array();
+		$args = is_array($this->_route) && isset($this->_route['args']) ? $this->_route['args'] : array();
 
 		$error_msg = '';
 
 		//action right before calling route (hook is something like 'AHEE__Registrations_Admin_Page__route_admin_request')
-		if ( !did_action('AHEE__EE_Admin_Page__route_admin_request')) {
-			do_action( 'AHEE__EE_Admin_Page__route_admin_request', $this->_current_view, $this );
+		if ( ! did_action('AHEE__EE_Admin_Page__route_admin_request')) {
+			do_action('AHEE__EE_Admin_Page__route_admin_request', $this->_current_view, $this);
 		}
 
 		//right before calling the route, let's remove _wp_http_referer from the $_SERVER[REQUEST_URI] global (its now in _req_data for route processing).
-		$_SERVER['REQUEST_URI'] = remove_query_arg( '_wp_http_referer', wp_unslash( $_SERVER['REQUEST_URI'] ) );
+		$_SERVER['REQUEST_URI'] = remove_query_arg('_wp_http_referer', wp_unslash($_SERVER['REQUEST_URI']));
 
-		if ( ! empty( $func )) {
+		if ( ! empty($func)) {
 			$base_call = $addon_call = FALSE;
 			//try to access page route via this class
-			if ( ! is_array( $func ) && method_exists( $this, $func ) && ( $base_call = call_user_func_array( array( $this, &$func  ), $args ) ) === FALSE ) {
+			if ( ! is_array($func) && method_exists($this, $func) && ($base_call = call_user_func_array(array($this, &$func), $args)) === FALSE) {
 				// user error msg
-				$error_msg =  __( 'An error occurred. The  requested page route could not be found.', 'event_espresso' );
+				$error_msg = __('An error occurred. The  requested page route could not be found.', 'event_espresso');
 				// developer error msg
-				$error_msg .= '||' . sprintf( __( 'Page route "%s" could not be called. Check that the spelling for method names and actions in the "_page_routes" array are all correct.', 'event_espresso' ), $func );
+				$error_msg .= '||'.sprintf(__('Page route "%s" could not be called. Check that the spelling for method names and actions in the "_page_routes" array are all correct.', 'event_espresso'), $func);
 			}
 
 			//for pluggability by addons first let's see if just the function exists (this will also work in the case where $func is an array indicating class/method)
 			$args['admin_page_object'] = $this; //send along this admin page object for access by addons.
 
-			if ( $base_call === FALSE && ( $addon_call = call_user_func_array( $func, $args ) )=== FALSE ) {
-				$error_msg = __('An error occurred. The requested page route could not be found', 'event_espresso' );
-				$error_msg .= '||' . sprintf( __('Page route "%s" could not be called.  Check that the spelling for the function name and action in the "_page_routes" array filtered by your plugin is correct.', 'event_espresso'), $func );
+			if ($base_call === FALSE && ($addon_call = call_user_func_array($func, $args)) === FALSE) {
+				$error_msg = __('An error occurred. The requested page route could not be found', 'event_espresso');
+				$error_msg .= '||'.sprintf(__('Page route "%s" could not be called.  Check that the spelling for the function name and action in the "_page_routes" array filtered by your plugin is correct.', 'event_espresso'), $func);
 			}
 
 
-			if ( !empty( $error_msg ) && $base_call === FALSE && $addon_call === FALSE )
-				throw new EE_Error( $error_msg );
+			if ( ! empty($error_msg) && $base_call === FALSE && $addon_call === FALSE)
+				throw new EE_Error($error_msg);
 		}
 
 		//if we've routed and this route has a no headers route AND a sent_headers_route, then we need to reset the routing properties to the new route.
 		//now if UI request is FALSE and noheader is true AND we have a headers_sent_route in the route array then let's set UI_request to true because the no header route has a second func after headers have been sent.
-		if ( $this->_is_UI_request === FALSE && is_array( $this->_route) && ! empty( $this->_route['headers_sent_route'] ) ) {
-			$this->_reset_routing_properties( $this->_route['headers_sent_route'] );
+		if ($this->_is_UI_request === FALSE && is_array($this->_route) && ! empty($this->_route['headers_sent_route'])) {
+			$this->_reset_routing_properties($this->_route['headers_sent_route']);
 		}
 	}
 
@@ -932,7 +932,7 @@ 
 	 * @param  string    $new_route   New (non header) route to redirect to.
 	 * @return   void
 	 */
-	protected function _reset_routing_properties( $new_route ) {
+	protected function _reset_routing_properties($new_route) {
 		$this->_is_UI_request = TRUE;
 		//now we set the current route to whatever the headers_sent_route is set at
 		$this->_req_data['action'] = $new_route;
@@ -978,24 +978,24 @@ 
 	 * @param   bool    $exclude_nonce  If true, the the nonce will be excluded from the generated nonce.
 	 * 	@return string
 	 */
-	public static function add_query_args_and_nonce( $args = array(), $url = false, $sticky = false, $exclude_nonce = false ) {
+	public static function add_query_args_and_nonce($args = array(), $url = false, $sticky = false, $exclude_nonce = false) {
 		EE_Registry::instance()->load_helper('URL');
 
 		//if there is a _wp_http_referer include the values from the request but only if sticky = true
-		if ( $sticky ) {
+		if ($sticky) {
 			$request = $_REQUEST;
-			unset( $request['_wp_http_referer'] );
-			unset( $request['wp_referer'] );
-			foreach ( $request as $key => $value ) {
+			unset($request['_wp_http_referer']);
+			unset($request['wp_referer']);
+			foreach ($request as $key => $value) {
 				//do not add nonces
-				if ( strpos( $key, 'nonce' ) !== false ) {
+				if (strpos($key, 'nonce') !== false) {
 					continue;
 				}
-				$args['wp_referer[' . $key . ']'] = $value;
+				$args['wp_referer['.$key.']'] = $value;
 			}
 		}
 
-		return EEH_URL::add_query_args_and_nonce( $args, $url, $exclude_nonce );
+		return EEH_URL::add_query_args_and_nonce($args, $url, $exclude_nonce);
 	}
 
 
@@ -1011,8 +1011,8 @@ 
 	 * @uses EEH_Template::get_help_tab_link()
 	 * @return string              generated link
 	 */
-	protected function _get_help_tab_link( $help_tab_id, $icon_style = FALSE, $help_text = FALSE ) {
-		return EEH_Template::get_help_tab_link( $help_tab_id, $this->page_slug, $this->_req_action, $icon_style, $help_text );
+	protected function _get_help_tab_link($help_tab_id, $icon_style = FALSE, $help_text = FALSE) {
+		return EEH_Template::get_help_tab_link($help_tab_id, $this->page_slug, $this->_req_action, $icon_style, $help_text);
 	}
 
 
@@ -1029,30 +1029,30 @@ 
 	 */
 	protected function _add_help_tabs() {
 		$tour_buttons = '';
-		if ( isset( $this->_page_config[$this->_req_action] ) ) {
+		if (isset($this->_page_config[$this->_req_action])) {
 			$config = $this->_page_config[$this->_req_action];
 
 			//is there a help tour for the current route?  if there is let's setup the tour buttons
-			if ( isset( $this->_help_tour[$this->_req_action]) ) {
+			if (isset($this->_help_tour[$this->_req_action])) {
 				$tb = array();
 				$tour_buttons = '<div class="ee-abs-container"><div class="ee-help-tour-restart-buttons">';
-				foreach ( $this->_help_tour['tours'] as $tour ) {
+				foreach ($this->_help_tour['tours'] as $tour) {
 					//if this is the end tour then we don't need to setup a button
-					if ( $tour instanceof EE_Help_Tour_final_stop )
+					if ($tour instanceof EE_Help_Tour_final_stop)
 						continue;
-					$tb[] = '<button id="trigger-tour-' . $tour->get_slug() . '" class="button-primary trigger-ee-help-tour">' . $tour->get_label() . '</button>';
+					$tb[] = '<button id="trigger-tour-'.$tour->get_slug().'" class="button-primary trigger-ee-help-tour">'.$tour->get_label().'</button>';
 				}
 				$tour_buttons .= implode('<br />', $tb);
 				$tour_buttons .= '</div></div>';
 			}
 
 			// let's see if there is a help_sidebar set for the current route and we'll set that up for usage as well.
-			if ( is_array( $config ) && isset( $config['help_sidebar'] ) ) {
+			if (is_array($config) && isset($config['help_sidebar'])) {
 				//check that the callback given is valid
-				if ( !method_exists($this, $config['help_sidebar'] ) )
-					throw new EE_Error( sprintf( __('The _page_config array has a callback set for the "help_sidebar" option.  However the callback given (%s) is not a valid callback.  Doublecheck the spelling and make sure this method exists for the class %s', 'event_espresso'), $config['help_sidebar'], get_class($this) ) );
+				if ( ! method_exists($this, $config['help_sidebar']))
+					throw new EE_Error(sprintf(__('The _page_config array has a callback set for the "help_sidebar" option.  However the callback given (%s) is not a valid callback.  Doublecheck the spelling and make sure this method exists for the class %s', 'event_espresso'), $config['help_sidebar'], get_class($this)));
 
-				$content = apply_filters( 'FHEE__' . get_class($this) . '__add_help_tabs__help_sidebar', call_user_func( array( $this, $config['help_sidebar'] ) ) );
+				$content = apply_filters('FHEE__'.get_class($this).'__add_help_tabs__help_sidebar', call_user_func(array($this, $config['help_sidebar'])));
 
 				$content .= $tour_buttons; //add help tour buttons.
 
@@ -1061,49 +1061,49 @@ 
 			}
 
 			//if we DON'T have config help sidebar and there ARE toure buttons then we'll just add the tour buttons to the sidebar.
-			if ( !isset( $config['help_sidebar'] ) && !empty( $tour_buttons ) ) {
+			if ( ! isset($config['help_sidebar']) && ! empty($tour_buttons)) {
 				$this->_current_screen->set_help_sidebar($tour_buttons);
 			}
 
 			//handle if no help_tabs are set so the sidebar will still show for the help tour buttons
-			if ( !isset( $config['help_tabs'] ) && !empty($tour_buttons) ) {
+			if ( ! isset($config['help_tabs']) && ! empty($tour_buttons)) {
 				$_ht['id'] = $this->page_slug;
 				$_ht['title'] = __('Help Tours', 'event_espresso');
-				$_ht['content'] = '<p>' . __('The buttons to the right allow you to start/restart any help tours available for this page', 'event_espresso') . '</p>';
+				$_ht['content'] = '<p>'.__('The buttons to the right allow you to start/restart any help tours available for this page', 'event_espresso').'</p>';
 				$this->_current_screen->add_help_tab($_ht);
 				}/**/
 
 
-			if ( !isset( $config['help_tabs'] ) ) return; //no help tabs for this route
+			if ( ! isset($config['help_tabs'])) return; //no help tabs for this route
 
-			foreach ( (array) $config['help_tabs'] as $tab_id => $cfg ) {
+			foreach ((array) $config['help_tabs'] as $tab_id => $cfg) {
 				//we're here so there ARE help tabs!
 
 				//make sure we've got what we need
-				if ( !isset( $cfg['title'] ) )
-					throw new EE_Error( __('The _page_config array is not set up properly for help tabs.  It is missing a title', 'event_espresso') );
+				if ( ! isset($cfg['title']))
+					throw new EE_Error(__('The _page_config array is not set up properly for help tabs.  It is missing a title', 'event_espresso'));
 
 
-				if ( !isset($cfg['filename']) && !isset( $cfg['callback'] ) && !isset( $cfg['content'] ) )
-					throw new EE_Error( __('The _page_config array is not setup properly for help tabs. It is missing a either a filename reference, or a callback reference or a content reference so there is no way to know the content for the help tab', 'event_espresso') );
+				if ( ! isset($cfg['filename']) && ! isset($cfg['callback']) && ! isset($cfg['content']))
+					throw new EE_Error(__('The _page_config array is not setup properly for help tabs. It is missing a either a filename reference, or a callback reference or a content reference so there is no way to know the content for the help tab', 'event_espresso'));
 
 
 
 				//first priority goes to content.
-				if ( !empty($cfg['content'] ) ) {
-					$content = !empty($cfg['content']) ? $cfg['content'] : NULL;
+				if ( ! empty($cfg['content'])) {
+					$content = ! empty($cfg['content']) ? $cfg['content'] : NULL;
 
 				//second priority goes to filename
-				} else if ( !empty($cfg['filename'] ) ) {
-					$file_path = $this->_get_dir() . '/help_tabs/' . $cfg['filename'] . '.help_tab.php';
+				} else if ( ! empty($cfg['filename'])) {
+					$file_path = $this->_get_dir().'/help_tabs/'.$cfg['filename'].'.help_tab.php';
 
 
 					//it's possible that the file is located on decaf route (and above sets up for caf route, if this is the case then lets check decaf route too)
-					$file_path = !is_readable($file_path) ? EE_ADMIN_PAGES . basename($this->_get_dir()) . '/help_tabs/' . $cfg['filename'] . '.help_tab.php' : $file_path;
+					$file_path = ! is_readable($file_path) ? EE_ADMIN_PAGES . basename($this->_get_dir()).'/help_tabs/'.$cfg['filename'].'.help_tab.php' : $file_path;
 
 					//if file is STILL not readable then let's do a EE_Error so its more graceful than a fatal error.
-					if ( !is_readable($file_path) && !isset($cfg['callback']) ) {
-						EE_Error::add_error( sprintf( __('The filename given for the help tab %s is not a valid file and there is no other configuration for the tab content.  Please check that the string you set for the help tab on this route (%s) is the correct spelling.  The file should be in %s', 'event_espresso'), $tab_id, key($config), $file_path ), __FILE__, __FUNCTION__, __LINE__ );
+					if ( ! is_readable($file_path) && ! isset($cfg['callback'])) {
+						EE_Error::add_error(sprintf(__('The filename given for the help tab %s is not a valid file and there is no other configuration for the tab content.  Please check that the string you set for the help tab on this route (%s) is the correct spelling.  The file should be in %s', 'event_espresso'), $tab_id, key($config), $file_path), __FILE__, __FUNCTION__, __LINE__);
 						return;
 					}
 					$template_args['admin_page_obj'] = $this;
@@ -1114,21 +1114,21 @@ 
 
 
 				//check if callback is valid
-				if ( empty($content) && ( !isset($cfg['callback']) || !method_exists( $this, $cfg['callback'] ) ) ) {
-					EE_Error::add_error( sprintf( __('The callback given for a %s help tab on this page does not content OR a corresponding method for generating the content.  Check the spelling or make sure the method is present.', 'event_espresso'), $cfg['title'] ), __FILE__, __FUNCTION__, __LINE__ );
+				if (empty($content) && ( ! isset($cfg['callback']) || ! method_exists($this, $cfg['callback']))) {
+					EE_Error::add_error(sprintf(__('The callback given for a %s help tab on this page does not content OR a corresponding method for generating the content.  Check the spelling or make sure the method is present.', 'event_espresso'), $cfg['title']), __FILE__, __FUNCTION__, __LINE__);
 					return;
 				}
 
 				//setup config array for help tab method
-				$id = $this->page_slug . '-' . $this->_req_action . '-' . $tab_id;
+				$id = $this->page_slug.'-'.$this->_req_action.'-'.$tab_id;
 				$_ht = array(
 					'id' => $id,
 					'title' => $cfg['title'],
-					'callback' => isset( $cfg['callback'] ) && empty($content) ? array( $this, $cfg['callback'] ) : NULL,
+					'callback' => isset($cfg['callback']) && empty($content) ? array($this, $cfg['callback']) : NULL,
 					'content' => $content
 					);
 
-				$this->_current_screen->add_help_tab( $_ht );
+				$this->_current_screen->add_help_tab($_ht);
 			}
 		}
 	}
@@ -1148,49 +1148,49 @@ 
 		$this->_help_tour = array();
 
 		//exit early if help tours are turned off globally
-		if ( ! EE_Registry::instance()->CFG->admin->help_tour_activation || ( defined( 'EE_DISABLE_HELP_TOURS' ) && EE_DISABLE_HELP_TOURS ) )
+		if ( ! EE_Registry::instance()->CFG->admin->help_tour_activation || (defined('EE_DISABLE_HELP_TOURS') && EE_DISABLE_HELP_TOURS))
 			return;
 
 		//loop through _page_config to find any help_tour defined
-		foreach ( $this->_page_config as $route => $config ) {
+		foreach ($this->_page_config as $route => $config) {
 			//we're only going to set things up for this route
-			if ( $route !== $this->_req_action )
+			if ($route !== $this->_req_action)
 				continue;
 
-			if ( isset( $config['help_tour'] ) ) {
+			if (isset($config['help_tour'])) {
 
-				foreach( $config['help_tour'] as $tour ) {
-					$file_path = $this->_get_dir() . '/help_tours/' . $tour . '.class.php';
+				foreach ($config['help_tour'] as $tour) {
+					$file_path = $this->_get_dir().'/help_tours/'.$tour.'.class.php';
 					//let's see if we can get that file... if not its possible this is a decaf route not set in caffienated so lets try and get the caffeinated equivalent
-					$file_path = !is_readable($file_path) ? EE_ADMIN_PAGES . basename($this->_get_dir()) . '/help_tours/' . $tour . '.class.php' : $file_path;
+					$file_path = ! is_readable($file_path) ? EE_ADMIN_PAGES . basename($this->_get_dir()).'/help_tours/'.$tour.'.class.php' : $file_path;
 
 					//if file is STILL not readable then let's do a EE_Error so its more graceful than a fatal error.
-					if ( !is_readable($file_path) ) {
-						EE_Error::add_error( sprintf( __('The file path given for the help tour (%s) is not a valid path.  Please check that the string you set for the help tour on this route (%s) is the correct spelling', 'event_espresso'), $file_path, $tour ), __FILE__, __FUNCTION__, __LINE__ );
+					if ( ! is_readable($file_path)) {
+						EE_Error::add_error(sprintf(__('The file path given for the help tour (%s) is not a valid path.  Please check that the string you set for the help tour on this route (%s) is the correct spelling', 'event_espresso'), $file_path, $tour), __FILE__, __FUNCTION__, __LINE__);
 						return;
 					}
 
 					require_once $file_path;
-					if ( !class_exists( $tour ) ) {
-						$error_msg[] = sprintf( __('Something went wrong with loading the %s Help Tour Class.', 'event_espresso' ), $tour);
-						$error_msg[] = $error_msg[0] . "\r\n" . sprintf( __( 'There is no class in place for the %s help tour.%s Make sure you have <strong>%s</strong> defined in the "help_tour" array for the %s route of the % admin page.', 'event_espresso'), $tour, '<br />', $tour, $this->_req_action, get_class($this) );
-						throw new EE_Error( implode( '||', $error_msg ));
+					if ( ! class_exists($tour)) {
+						$error_msg[] = sprintf(__('Something went wrong with loading the %s Help Tour Class.', 'event_espresso'), $tour);
+						$error_msg[] = $error_msg[0]."\r\n".sprintf(__('There is no class in place for the %s help tour.%s Make sure you have <strong>%s</strong> defined in the "help_tour" array for the %s route of the % admin page.', 'event_espresso'), $tour, '<br />', $tour, $this->_req_action, get_class($this));
+						throw new EE_Error(implode('||', $error_msg));
 					}
 					$a = new ReflectionClass($tour);
 					$tour_obj = $a->newInstance($this->_is_caf);
 
 					$tours[] = $tour_obj;
-					$this->_help_tour[$route][] = EEH_Template::help_tour_stops_generator( $tour_obj );
+					$this->_help_tour[$route][] = EEH_Template::help_tour_stops_generator($tour_obj);
 				}
 
 				//let's inject the end tour stop element common to all pages... this will only get seen once per machine.
 				$end_stop_tour = new EE_Help_Tour_final_stop($this->_is_caf);
 				$tours[] = $end_stop_tour;
-				$this->_help_tour[$route][] = EEH_Template::help_tour_stops_generator( $end_stop_tour );
+				$this->_help_tour[$route][] = EEH_Template::help_tour_stops_generator($end_stop_tour);
 			}
 		}
 
-		if ( !empty( $tours ) )
+		if ( ! empty($tours))
 			$this->_help_tour['tours'] = $tours;
 
 		//thats it!  Now that the $_help_tours property is set (or not) the scripts and html should be taken care of automatically.
@@ -1206,13 +1206,13 @@ 
 	 * @return void
 	 */
 	protected function _add_qtips() {
-		if ( isset( $this->_route_config['qtips'] ) ) {
+		if (isset($this->_route_config['qtips'])) {
 			$qtips = (array) $this->_route_config['qtips'];
 			//load qtip loader
 			EE_Registry::instance()->load_helper('Qtip_Loader', array(), TRUE);
 			$path = array(
-				$this->_get_dir() . '/qtips/',
-				EE_ADMIN_PAGES . basename($this->_get_dir()) . '/qtips/'
+				$this->_get_dir().'/qtips/',
+				EE_ADMIN_PAGES.basename($this->_get_dir()).'/qtips/'
 				);
 			EEH_Qtip_Loader::instance()->register($qtips, $path);
 		}
@@ -1229,41 +1229,41 @@ 
 	 * @return void
 	 */
 	protected function _set_nav_tabs() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$i = 0;
-		foreach ( $this->_page_config as $slug => $config ) {
-			if ( !is_array( $config ) || ( is_array($config) && (isset($config['nav']) && !$config['nav'] ) || !isset($config['nav'] ) ) )
+		foreach ($this->_page_config as $slug => $config) {
+			if ( ! is_array($config) || (is_array($config) && (isset($config['nav']) && ! $config['nav']) || ! isset($config['nav'])))
 				continue; //no nav tab for this config
 
 			//check for persistent flag
-			if ( isset( $config['nav']['persistent']) && !$config['nav']['persistent'] && $slug !== $this->_req_action )
+			if (isset($config['nav']['persistent']) && ! $config['nav']['persistent'] && $slug !== $this->_req_action)
 				continue; //nav tab is only to appear when route requested.
 
-			if ( ! $this->check_user_access( $slug, TRUE ) )
+			if ( ! $this->check_user_access($slug, TRUE))
 				continue; //no nav tab becasue current user does not have access.
 
-			$css_class = isset( $config['css_class'] ) ? $config['css_class'] . ' ' : '';
+			$css_class = isset($config['css_class']) ? $config['css_class'].' ' : '';
 			$this->_nav_tabs[$slug] = array(
-				'url' => isset($config['nav']['url']) ? $config['nav']['url'] : self::add_query_args_and_nonce( array( 'action'=>$slug ), $this->_admin_base_url ),
-				'link_text' => isset( $config['nav']['label'] ) ? $config['nav']['label'] : ucwords(str_replace('_', ' ', $slug ) ),
-				'css_class' => $this->_req_action == $slug ? $css_class . 'nav-tab-active' : $css_class,
-				'order' => isset( $config['nav']['order'] ) ? $config['nav']['order'] : $i
+				'url' => isset($config['nav']['url']) ? $config['nav']['url'] : self::add_query_args_and_nonce(array('action'=>$slug), $this->_admin_base_url),
+				'link_text' => isset($config['nav']['label']) ? $config['nav']['label'] : ucwords(str_replace('_', ' ', $slug)),
+				'css_class' => $this->_req_action == $slug ? $css_class.'nav-tab-active' : $css_class,
+				'order' => isset($config['nav']['order']) ? $config['nav']['order'] : $i
 				);
 			$i++;
 		}
 
 		//if $this->_nav_tabs is empty then lets set the default
-		if ( empty( $this->_nav_tabs ) ) {
+		if (empty($this->_nav_tabs)) {
 			$this->_nav_tabs[$this->default_nav_tab_name] = array(
 				'url' => $this->admin_base_url,
-				'link_text' => ucwords( str_replace( '_', ' ', $this->default_nav_tab_name ) ),
+				'link_text' => ucwords(str_replace('_', ' ', $this->default_nav_tab_name)),
 				'css_class' => 'nav-tab-active',
 				'order' => 10
 				);
 		}
 
 		//now let's sort the tabs according to order
-		usort( $this->_nav_tabs, array($this, '_sort_nav_tabs' ));
+		usort($this->_nav_tabs, array($this, '_sort_nav_tabs'));
 
 	}
 
@@ -1279,10 +1279,10 @@ 
 	 * @return void
 	 */
 	private function _set_current_labels() {
-		if ( is_array($this->_route_config) && isset($this->_route_config['labels']) ) {
-			foreach ( $this->_route_config['labels'] as $label => $text ) {
-				if ( is_array($text) ) {
-					foreach ( $text as $sublabel => $subtext ) {
+		if (is_array($this->_route_config) && isset($this->_route_config['labels'])) {
+			foreach ($this->_route_config['labels'] as $label => $text) {
+				if (is_array($text)) {
+					foreach ($text as $sublabel => $subtext) {
 						$this->_labels[$label][$sublabel] = $subtext;
 					}
 				} else {
@@ -1303,24 +1303,24 @@ 
 	 * 		@param bool   $verify_only Default is FALSE which means if user check fails then wp_die().  Otherwise just return false if verify fail.
 	*		@return 		BOOL|wp_die()
 	*/
-	public function check_user_access( $route_to_check = '', $verify_only = FALSE ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$route_to_check = empty( $route_to_check ) ? $this->_req_action : $route_to_check;
-		$capability = ! empty( $route_to_check ) && isset( $this->_page_routes[$route_to_check] ) && is_array( $this->_page_routes[$route_to_check] ) && ! empty( $this->_page_routes[$route_to_check]['capability'] ) ? $this->_page_routes[$route_to_check]['capability'] : NULL;
+	public function check_user_access($route_to_check = '', $verify_only = FALSE) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$route_to_check = empty($route_to_check) ? $this->_req_action : $route_to_check;
+		$capability = ! empty($route_to_check) && isset($this->_page_routes[$route_to_check]) && is_array($this->_page_routes[$route_to_check]) && ! empty($this->_page_routes[$route_to_check]['capability']) ? $this->_page_routes[$route_to_check]['capability'] : NULL;
 
-		if ( empty( $capability ) && empty( $route_to_check )  ) {
-			$capability = is_array( $this->_route ) && empty( $this->_route['capability'] ) ? 'manage_options' : $this->_route['capability'];
+		if (empty($capability) && empty($route_to_check)) {
+			$capability = is_array($this->_route) && empty($this->_route['capability']) ? 'manage_options' : $this->_route['capability'];
 		} else {
-			$capability = empty( $capability ) ? 'manage_options' : $capability;
+			$capability = empty($capability) ? 'manage_options' : $capability;
 		}
 
-		$id = is_array( $this->_route ) && ! empty( $this->_route['obj_id'] ) ? $this->_route['obj_id'] : 0;
+		$id = is_array($this->_route) && ! empty($this->_route['obj_id']) ? $this->_route['obj_id'] : 0;
 
-		if (( ! function_exists( 'is_admin' ) || ! EE_Registry::instance()->CAP->current_user_can( $capability, $this->page_slug . '_' . $route_to_check, $id ) ) && ! defined( 'DOING_AJAX')) {
-			if ( $verify_only ) {
+		if (( ! function_exists('is_admin') || ! EE_Registry::instance()->CAP->current_user_can($capability, $this->page_slug.'_'.$route_to_check, $id)) && ! defined('DOING_AJAX')) {
+			if ($verify_only) {
 				return FALSE;
 			} else {
-				wp_die( __('You do not have access to this route.', 'event_espresso' ) );
+				wp_die(__('You do not have access to this route.', 'event_espresso'));
 			}
 		}
 		return TRUE;
@@ -1397,7 +1397,7 @@ 
 		$this->_add_admin_page_overlay();
 
 		//if metaboxes are present we need to add the nonce field
-		if ( ( isset($this->_route_config['metaboxes']) || ( isset($this->_route_config['has_metaboxes']) && $this->_route_config['has_metaboxes'] ) || isset($this->_route_config['list_table']) ) ) {
+		if ((isset($this->_route_config['metaboxes']) || (isset($this->_route_config['has_metaboxes']) && $this->_route_config['has_metaboxes']) || isset($this->_route_config['list_table']))) {
 			wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false);
 			wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false);
 		}
@@ -1416,20 +1416,20 @@ 
 	 */
 	public function admin_footer_global() {
 		//dialog container for dialog helper
-		$d_cont = '<div class="ee-admin-dialog-container auto-hide hidden">' . "\n";
+		$d_cont = '<div class="ee-admin-dialog-container auto-hide hidden">'."\n";
 		$d_cont .= '<div class="ee-notices"></div>';
 		$d_cont .= '<div class="ee-admin-dialog-container-inner-content"></div>';
 		$d_cont .= '</div>';
 		echo $d_cont;
 
 		//help tour stuff?
-		if ( isset( $this->_help_tour[$this->_req_action] ) ) {
+		if (isset($this->_help_tour[$this->_req_action])) {
 			echo implode('<br />', $this->_help_tour[$this->_req_action]);
 		}
 
 		//current set timezone for timezone js
 		EE_Registry::instance()->load_helper('DTT_Helper');
-		echo '<span id="current_timezone" class="hidden">' . EEH_DTT_Helper::get_timezone() . '</span>';
+		echo '<span id="current_timezone" class="hidden">'.EEH_DTT_Helper::get_timezone().'</span>';
 	}
 
 
@@ -1453,18 +1453,18 @@ 
 	 * @access protected
 	 * @return string content
 	 */
-	protected function _set_help_popup_content( $help_array = array(), $display = FALSE ) {
+	protected function _set_help_popup_content($help_array = array(), $display = FALSE) {
 		$content = '';
 
-		$help_array = empty( $help_array ) ? $this->_get_help_content() : $help_array;
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_help_popup.template.php';
+		$help_array = empty($help_array) ? $this->_get_help_content() : $help_array;
+		$template_path = EE_ADMIN_TEMPLATE.'admin_help_popup.template.php';
 
 
 		//loop through the array and setup content
-		foreach ( $help_array as $trigger => $help ) {
+		foreach ($help_array as $trigger => $help) {
 			//make sure the array is setup properly
-			if ( !isset($help['title']) || !isset($help['content'] ) ) {
-				throw new EE_Error( __('Does not look like the popup content array has been setup correctly.  Might want to double check that.  Read the comments for the _get_help_popup_content method found in "EE_Admin_Page" class', 'event_espresso') );
+			if ( ! isset($help['title']) || ! isset($help['content'])) {
+				throw new EE_Error(__('Does not look like the popup content array has been setup correctly.  Might want to double check that.  Read the comments for the _get_help_popup_content method found in "EE_Admin_Page" class', 'event_espresso'));
 			}
 
 			//we're good so let'd setup the template vars and then assign parsed template content to our content.
@@ -1474,10 +1474,10 @@ 
 				'help_popup_content' => $help['content']
 				);
 
-			$content .= EEH_Template::display_template( $template_path, $template_args, TRUE );
+			$content .= EEH_Template::display_template($template_path, $template_args, TRUE);
 		}
 
-		if ( $display )
+		if ($display)
 			echo $content;
 		else
 			return $content;
@@ -1494,18 +1494,18 @@ 
 	 */
 	private function _get_help_content() {
 		//what is the method we're looking for?
-		$method_name = '_help_popup_content_' . $this->_req_action;
+		$method_name = '_help_popup_content_'.$this->_req_action;
 
 		//if method doesn't exist let's get out.
-		if ( !method_exists( $this, $method_name ) )
+		if ( ! method_exists($this, $method_name))
 			return array();
 
 		//k we're good to go let's retrieve the help array
-		$help_array = call_user_func( array( $this, $method_name ) );
+		$help_array = call_user_func(array($this, $method_name));
 
 		//make sure we've got an array!
-		if ( !is_array($help_array) ) {
-			throw new EE_Error( __('Something went wrong with help popup content generation. Expecting an array and well, this ain\'t no array bub.', 'event_espresso' ) );
+		if ( ! is_array($help_array)) {
+			throw new EE_Error(__('Something went wrong with help popup content generation. Expecting an array and well, this ain\'t no array bub.', 'event_espresso'));
 		}
 
 		return $help_array;
@@ -1527,27 +1527,27 @@ 
 	 * @param array $dimensions an array of dimensions for the box (array(h,w))
 	 * @return string
 	 */
-	protected function _set_help_trigger( $trigger_id, $display = TRUE, $dimensions = array( '400', '640') ) {
+	protected function _set_help_trigger($trigger_id, $display = TRUE, $dimensions = array('400', '640')) {
 
-		if ( defined('DOING_AJAX') ) return;
+		if (defined('DOING_AJAX')) return;
 
 		//let's check and see if there is any content set for this popup.  If there isn't then we'll include a default title and content so that developers know something needs to be corrected
 		$help_array = $this->_get_help_content();
 		$help_content = '';
 
-		if ( empty( $help_array ) || !isset( $help_array[$trigger_id] ) ) {
+		if (empty($help_array) || ! isset($help_array[$trigger_id])) {
 			$help_array[$trigger_id] = array(
 				'title' => __('Missing Content', 'event_espresso'),
 				'content' => __('A trigger has been set that doesn\'t have any corresponding content. Make sure you have set the help content. (see the "_set_help_popup_content" method in the EE_Admin_Page for instructions.)', 'event_espresso')
 				);
-			$help_content = $this->_set_help_popup_content( $help_array, FALSE );
+			$help_content = $this->_set_help_popup_content($help_array, FALSE);
 		}
 
 		//let's setup the trigger
-		$content = '<a class="ee-dialog" href="?height='. $dimensions[0] . '&width=' . $dimensions[1] . '&inlineId=' . $trigger_id . '" target="_blank"><span class="question ee-help-popup-question"></span></a>';
-		$content = $content . $help_content;
+		$content = '<a class="ee-dialog" href="?height='.$dimensions[0].'&width='.$dimensions[1].'&inlineId='.$trigger_id.'" target="_blank"><span class="question ee-help-popup-question"></span></a>';
+		$content = $content.$help_content;
 
-		if ( $display )
+		if ($display)
 			echo $content;
 		else
 			return $content;
@@ -1604,15 +1604,15 @@ 
 	public function load_global_scripts_styles() {
 		/** STYLES **/
 		// add debugging styles
-		if ( WP_DEBUG ) {
-			add_action('admin_head', array( $this, 'add_xdebug_style' ));
+		if (WP_DEBUG) {
+			add_action('admin_head', array($this, 'add_xdebug_style'));
 		}
 
 		//register all styles
-		wp_register_style( 'espresso-ui-theme', EE_GLOBAL_ASSETS_URL . 'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css', array(),EVENT_ESPRESSO_VERSION );
-		wp_register_style('ee-admin-css', EE_ADMIN_URL . 'assets/ee-admin-page.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_register_style('espresso-ui-theme', EE_GLOBAL_ASSETS_URL.'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_register_style('ee-admin-css', EE_ADMIN_URL.'assets/ee-admin-page.css', array(), EVENT_ESPRESSO_VERSION);
 		//helpers styles
-		wp_register_style('ee-text-links', EE_PLUGIN_DIR_URL . 'core/helpers/assets/ee_text_list_helper.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_style('ee-text-links', EE_PLUGIN_DIR_URL.'core/helpers/assets/ee_text_list_helper.css', array(), EVENT_ESPRESSO_VERSION);
 		//enqueue global styles
 		wp_enqueue_style('ee-admin-css');
 
@@ -1620,66 +1620,66 @@ 
 		/** SCRIPTS **/
 
 		//register all scripts
-		wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_script('ee-dialog', EE_ADMIN_URL . 'assets/ee-dialog-helper.js', array('jquery', 'jquery-ui-draggable'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_script('ee_admin_js', EE_ADMIN_URL . 'assets/ee-admin-page.js', array( 'espresso_core', 'ee-parse-uri', 'ee-dialog'), EVENT_ESPRESSO_VERSION, true );
+		wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('ee-dialog', EE_ADMIN_URL.'assets/ee-dialog-helper.js', array('jquery', 'jquery-ui-draggable'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('ee_admin_js', EE_ADMIN_URL.'assets/ee-admin-page.js', array('espresso_core', 'ee-parse-uri', 'ee-dialog'), EVENT_ESPRESSO_VERSION, true);
 
-		wp_register_script('jquery-ui-timepicker-addon', EE_GLOBAL_ASSETS_URL . 'scripts/jquery-ui-timepicker-addon.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), EVENT_ESPRESSO_VERSION, true );
+		wp_register_script('jquery-ui-timepicker-addon', EE_GLOBAL_ASSETS_URL.'scripts/jquery-ui-timepicker-addon.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), EVENT_ESPRESSO_VERSION, true);
 		// register jQuery Validate - see /includes/functions/wp_hooks.php
-		add_filter( 'FHEE_load_jquery_validate', '__return_true' );
+		add_filter('FHEE_load_jquery_validate', '__return_true');
 		add_filter('FHEE_load_joyride', '__return_true');
 
 		//script for sorting tables
-		wp_register_script('espresso_ajax_table_sorting', EE_ADMIN_URL . "assets/espresso_ajax_table_sorting.js", array('ee_admin_js', 'jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('espresso_ajax_table_sorting', EE_ADMIN_URL."assets/espresso_ajax_table_sorting.js", array('ee_admin_js', 'jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE);
 		//script for parsing uri's
-		wp_register_script( 'ee-parse-uri', EE_GLOBAL_ASSETS_URL . 'scripts/parseuri.js', array(), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_register_script('ee-parse-uri', EE_GLOBAL_ASSETS_URL.'scripts/parseuri.js', array(), EVENT_ESPRESSO_VERSION, TRUE);
 		//and parsing associative serialized form elements
-		wp_register_script( 'ee-serialize-full-array', EE_GLOBAL_ASSETS_URL . 'scripts/jquery.serializefullarray.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_register_script('ee-serialize-full-array', EE_GLOBAL_ASSETS_URL.'scripts/jquery.serializefullarray.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
 		//helpers scripts
-		wp_register_script('ee-text-links', EE_PLUGIN_DIR_URL . 'core/helpers/assets/ee_text_list_helper.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_script( 'ee-moment-core', EE_THIRD_PARTY_URL . 'moment/moment-with-locales.min.js', array(), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_script( 'ee-moment', EE_THIRD_PARTY_URL . 'moment/moment-timezone-with-data.min.js', array('ee-moment-core'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_script( 'ee-datepicker', EE_ADMIN_URL . 'assets/ee-datepicker.js', array('jquery-ui-timepicker-addon','ee-moment'), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_register_script('ee-text-links', EE_PLUGIN_DIR_URL.'core/helpers/assets/ee_text_list_helper.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('ee-moment-core', EE_THIRD_PARTY_URL.'moment/moment-with-locales.min.js', array(), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('ee-moment', EE_THIRD_PARTY_URL.'moment/moment-timezone-with-data.min.js', array('ee-moment-core'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('ee-datepicker', EE_ADMIN_URL.'assets/ee-datepicker.js', array('jquery-ui-timepicker-addon', 'ee-moment'), EVENT_ESPRESSO_VERSION, TRUE);
 
 		//google charts
-		wp_register_script( 'google-charts', 'https://www.gstatic.com/charts/loader.js', array(), EVENT_ESPRESSO_VERSION, false );
+		wp_register_script('google-charts', 'https://www.gstatic.com/charts/loader.js', array(), EVENT_ESPRESSO_VERSION, false);
 
 		//enqueue global scripts
 
 		//taking care of metaboxes
-		if ( ( isset($this->_route_config['metaboxes'] ) || isset($this->_route_config['has_metaboxes']) ) && empty( $this->_cpt_route) ) {
+		if ((isset($this->_route_config['metaboxes']) || isset($this->_route_config['has_metaboxes'])) && empty($this->_cpt_route)) {
 			wp_enqueue_script('dashboard');
 		}
 
 		//enqueue thickbox for ee help popups.  default is to enqueue unless its explicitly set to false since we're assuming all EE pages will have popups
-		if ( ! isset( $this->_route_config['has_help_popups']) || ( isset( $this->_route_config['has_help_popups']) && $this->_route_config['has_help_popups'] ) ) {
+		if ( ! isset($this->_route_config['has_help_popups']) || (isset($this->_route_config['has_help_popups']) && $this->_route_config['has_help_popups'])) {
 			wp_enqueue_script('ee_admin_js');
 			wp_enqueue_style('ee-admin-css');
 		}
 
 
 		//localize script for ajax lazy loading
-		$lazy_loader_container_ids = apply_filters( 'FHEE__EE_Admin_Page_Core__load_global_scripts_styles__loader_containers', array('espresso_news_post_box_content') );
-		wp_localize_script( 'ee_admin_js', 'eeLazyLoadingContainers', $lazy_loader_container_ids);
+		$lazy_loader_container_ids = apply_filters('FHEE__EE_Admin_Page_Core__load_global_scripts_styles__loader_containers', array('espresso_news_post_box_content'));
+		wp_localize_script('ee_admin_js', 'eeLazyLoadingContainers', $lazy_loader_container_ids);
 
 
 		/**
 		 * help tour stuff
 		 */
-		if ( !empty( $this->_help_tour ) ) {
+		if ( ! empty($this->_help_tour)) {
 
 			//register the js for kicking things off
-			wp_enqueue_script('ee-help-tour', EE_ADMIN_URL . 'assets/ee-help-tour.js', array('jquery-joyride'), EVENT_ESPRESSO_VERSION, TRUE );
+			wp_enqueue_script('ee-help-tour', EE_ADMIN_URL.'assets/ee-help-tour.js', array('jquery-joyride'), EVENT_ESPRESSO_VERSION, TRUE);
 
 			//setup tours for the js tour object
-			foreach ( $this->_help_tour['tours'] as $tour ) {
+			foreach ($this->_help_tour['tours'] as $tour) {
 				$tours[] = array(
 					'id' => $tour->get_slug(),
 					'options' => $tour->get_options()
 					);
 			}
 
-			wp_localize_script('ee-help-tour', 'EE_HELP_TOUR', array('tours' => $tours ) );
+			wp_localize_script('ee-help-tour', 'EE_HELP_TOUR', array('tours' => $tours));
 
 			//admin_footer_global will take care of making sure our help_tour skeleton gets printed via the info stored in $this->_help_tour
 		}
@@ -1697,52 +1697,52 @@ 
 	public function admin_footer_scripts_eei18n_js_strings() {
 
 		EE_Registry::$i18n_js_strings['ajax_url'] = WP_AJAX_URL;
-		EE_Registry::$i18n_js_strings['confirm_delete'] = __( 'Are you absolutely sure you want to delete this item?\nThis action will delete ALL DATA associated with this item!!!\nThis can NOT be undone!!!', 'event_espresso' );
-
-		EE_Registry::$i18n_js_strings['January'] = __( 'January', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['February'] = __( 'February', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['March'] = __( 'March', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['April'] = __( 'April', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['May'] = __( 'May', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['June'] = __( 'June', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['July'] = __( 'July', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['August'] = __( 'August', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['September'] = __( 'September', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['October'] = __( 'October', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['November'] = __( 'November', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['December'] = __( 'December', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Jan'] = __( 'Jan', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Feb'] = __( 'Feb', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Mar'] = __( 'Mar', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Apr'] = __( 'Apr', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['May'] = __( 'May', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Jun'] = __( 'Jun', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Jul'] = __( 'Jul', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Aug'] = __( 'Aug', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Sep'] = __( 'Sep', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Oct'] = __( 'Oct', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Nov'] = __( 'Nov', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Dec'] = __( 'Dec', 'event_espresso' );
-
-		EE_Registry::$i18n_js_strings['Sunday'] = __( 'Sunday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Monday'] = __( 'Monday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Tuesday'] = __( 'Tuesday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Wednesday'] = __( 'Wednesday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Thursday'] = __( 'Thursday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Friday'] = __( 'Friday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Saturday'] = __( 'Saturday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Sun'] = __( 'Sun', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Mon'] = __( 'Mon', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Tue'] = __( 'Tue', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Wed'] = __( 'Wed', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Thu'] = __( 'Thu', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Fri'] = __( 'Fri', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Sat'] = __( 'Sat', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['confirm_delete'] = __('Are you absolutely sure you want to delete this item?\nThis action will delete ALL DATA associated with this item!!!\nThis can NOT be undone!!!', 'event_espresso');
+
+		EE_Registry::$i18n_js_strings['January'] = __('January', 'event_espresso');
+		EE_Registry::$i18n_js_strings['February'] = __('February', 'event_espresso');
+		EE_Registry::$i18n_js_strings['March'] = __('March', 'event_espresso');
+		EE_Registry::$i18n_js_strings['April'] = __('April', 'event_espresso');
+		EE_Registry::$i18n_js_strings['May'] = __('May', 'event_espresso');
+		EE_Registry::$i18n_js_strings['June'] = __('June', 'event_espresso');
+		EE_Registry::$i18n_js_strings['July'] = __('July', 'event_espresso');
+		EE_Registry::$i18n_js_strings['August'] = __('August', 'event_espresso');
+		EE_Registry::$i18n_js_strings['September'] = __('September', 'event_espresso');
+		EE_Registry::$i18n_js_strings['October'] = __('October', 'event_espresso');
+		EE_Registry::$i18n_js_strings['November'] = __('November', 'event_espresso');
+		EE_Registry::$i18n_js_strings['December'] = __('December', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Jan'] = __('Jan', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Feb'] = __('Feb', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Mar'] = __('Mar', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Apr'] = __('Apr', 'event_espresso');
+		EE_Registry::$i18n_js_strings['May'] = __('May', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Jun'] = __('Jun', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Jul'] = __('Jul', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Aug'] = __('Aug', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Sep'] = __('Sep', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Oct'] = __('Oct', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Nov'] = __('Nov', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Dec'] = __('Dec', 'event_espresso');
+
+		EE_Registry::$i18n_js_strings['Sunday'] = __('Sunday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Monday'] = __('Monday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Tuesday'] = __('Tuesday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Wednesday'] = __('Wednesday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Thursday'] = __('Thursday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Friday'] = __('Friday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Saturday'] = __('Saturday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Sun'] = __('Sun', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Mon'] = __('Mon', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Tue'] = __('Tue', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Wed'] = __('Wed', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Thu'] = __('Thu', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Fri'] = __('Fri', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Sat'] = __('Sat', 'event_espresso');
 
 		//setting on espresso_core instead of ee_admin_js because espresso_core is enqueued by the maintenance
 		//admin page when in maintenance mode and ee_admin_js is not loaded then.  This works everywhere else because
 		//espresso_core is listed as a dependency of ee_admin_js.
-		wp_localize_script( 'espresso_core', 'eei18n', EE_Registry::$i18n_js_strings );
+		wp_localize_script('espresso_core', 'eei18n', EE_Registry::$i18n_js_strings);
 
 	}
 
@@ -1776,23 +1776,23 @@ 
 	protected function _set_list_table() {
 
 		//first is this a list_table view?
-		if ( !isset($this->_route_config['list_table']) )
+		if ( ! isset($this->_route_config['list_table']))
 			return; //not a list_table view so get out.
 
 		//list table functions are per view specific (because some admin pages might have more than one listtable!)
 
-		if ( call_user_func( array( $this, '_set_list_table_views_' . $this->_req_action ) ) === FALSE ) {
+		if (call_user_func(array($this, '_set_list_table_views_'.$this->_req_action)) === FALSE) {
 			//user error msg
-			$error_msg = __('An error occurred. The requested list table views could not be found.', 'event_espresso' );
+			$error_msg = __('An error occurred. The requested list table views could not be found.', 'event_espresso');
 			//developer error msg
-			$error_msg .= '||' . sprintf( __('List table views for "%s" route could not be setup. Check that you have the corresponding method, "%s" set up for defining list_table_views for this route.', 'event_espresso' ), $this->_req_action, '_set_list_table_views_' . $this->_req_action );
-			throw new EE_Error( $error_msg );
+			$error_msg .= '||'.sprintf(__('List table views for "%s" route could not be setup. Check that you have the corresponding method, "%s" set up for defining list_table_views for this route.', 'event_espresso'), $this->_req_action, '_set_list_table_views_'.$this->_req_action);
+			throw new EE_Error($error_msg);
 		}
 
 		//let's provide the ability to filter the views per PAGE AND ROUTE, per PAGE, and globally
-		$this->_views = apply_filters( 'FHEE_list_table_views_' . $this->page_slug . '_' . $this->_req_action, $this->_views );
-		$this->_views = apply_filters( 'FHEE_list_table_views_' . $this->page_slug, $this->_views );
-		$this->_views = apply_filters( 'FHEE_list_table_views', $this->_views );
+		$this->_views = apply_filters('FHEE_list_table_views_'.$this->page_slug.'_'.$this->_req_action, $this->_views);
+		$this->_views = apply_filters('FHEE_list_table_views_'.$this->page_slug, $this->_views);
+		$this->_views = apply_filters('FHEE_list_table_views', $this->_views);
 
 		$this->_set_list_table_view();
 		$this->_set_list_table_object();
@@ -1814,14 +1814,14 @@ 
 	*		@return array
 	*/
 	protected function _set_list_table_view() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 
 		// looking at active items or dumpster diving ?
-		if ( ! isset( $this->_req_data['status'] ) || ! array_key_exists( $this->_req_data['status'], $this->_views )) {
-			$this->_view = isset( $this->_views['in_use'] ) ? 'in_use' : 'all';
+		if ( ! isset($this->_req_data['status']) || ! array_key_exists($this->_req_data['status'], $this->_views)) {
+			$this->_view = isset($this->_views['in_use']) ? 'in_use' : 'all';
 		} else {
-			$this->_view = sanitize_key( $this->_req_data['status'] );
+			$this->_view = sanitize_key($this->_req_data['status']);
 		}
 	}
 
@@ -1832,9 +1832,9 @@ 
 	 * WP_List_Table objects need to be loaded fairly early so automatic stuff WP does is taken care of.
 	 */
 	protected function _set_list_table_object() {
-		if ( isset($this->_route_config['list_table'] ) ) {
-			if ( !class_exists( $this->_route_config['list_table'] ) )
-				throw new EE_Error( sprintf( __('The %s class defined for the list table does not exist.  Please check the spelling of the class ref in the $_page_config property on %s.', 'event_espresso'), $this->_route_config['list_table'], get_class($this) ) );
+		if (isset($this->_route_config['list_table'])) {
+			if ( ! class_exists($this->_route_config['list_table']))
+				throw new EE_Error(sprintf(__('The %s class defined for the list table does not exist.  Please check the spelling of the class ref in the $_page_config property on %s.', 'event_espresso'), $this->_route_config['list_table'], get_class($this)));
 			$a = new ReflectionClass($this->_route_config['list_table']);
 			$this->_list_table_object = $a->newInstance($this);
 		}
@@ -1853,27 +1853,27 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_list_table_view_RLs( $extra_query_args = array() ) {
+	public function get_list_table_view_RLs($extra_query_args = array()) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		if ( empty( $this->_views )) {
+		if (empty($this->_views)) {
 			$this->_views = array();
 		}
 
 		// cycle thru views
-		foreach ( $this->_views as $key => $view ) {
+		foreach ($this->_views as $key => $view) {
 			$query_args = array();
 			// check for current view
-			$this->_views[ $key ]['class'] = $this->_view == $view['slug'] ? 'current' : '';
+			$this->_views[$key]['class'] = $this->_view == $view['slug'] ? 'current' : '';
 			$query_args['action'] = $this->_req_action;
-			$query_args[$this->_req_action.'_nonce'] = wp_create_nonce( $query_args['action'] . '_nonce' );
+			$query_args[$this->_req_action.'_nonce'] = wp_create_nonce($query_args['action'].'_nonce');
 			$query_args['status'] = $view['slug'];
 			//merge any other arguments sent in.
-			if ( isset( $extra_query_args[$view['slug']] ) ) {
-				$query_args = array_merge( $query_args, $extra_query_args[$view['slug']] );
+			if (isset($extra_query_args[$view['slug']])) {
+				$query_args = array_merge($query_args, $extra_query_args[$view['slug']]);
 			}
-			$this->_views[ $key ]['url'] = EE_Admin_Page::add_query_args_and_nonce( $query_args, $this->_admin_base_url );
+			$this->_views[$key]['url'] = EE_Admin_Page::add_query_args_and_nonce($query_args, $this->_admin_base_url);
 		}
 
 		return $this->_views;
@@ -1890,15 +1890,15 @@ 
 	 * @param int $max_entries total number of rows in the table
 	 * @return string
 	*/
-	protected function _entries_per_page_dropdown( $max_entries = FALSE ) {
+	protected function _entries_per_page_dropdown($max_entries = FALSE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$values = array( 10, 25, 50, 100 );
-		$per_page = ( ! empty( $this->_req_data['per_page'] )) ? absint( $this->_req_data['per_page'] ) : 10;
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$values = array(10, 25, 50, 100);
+		$per_page = ( ! empty($this->_req_data['per_page'])) ? absint($this->_req_data['per_page']) : 10;
 
-		if ( $max_entries ) {
+		if ($max_entries) {
 			$values[] = $max_entries;
-			sort( $values );
+			sort($values);
 		}
 
 		$entries_per_page_dropdown = '
@@ -1907,15 +1907,15 @@ 
 					Show
 					<select id="entries-per-page-slct" name="entries-per-page-slct">';
 
-		foreach ( $values as $value ) {
-			if ( $value < $max_entries ) {
-				$selected = $value == $per_page ?  ' selected="' . $per_page . '"' : '';
+		foreach ($values as $value) {
+			if ($value < $max_entries) {
+				$selected = $value == $per_page ? ' selected="'.$per_page.'"' : '';
 				$entries_per_page_dropdown .= '
 						<option value="'.$value.'"'.$selected.'>'.$value.'&nbsp;&nbsp;</option>';
 			}
 		}
 
-		$selected = $max_entries == $per_page ?  ' selected="' . $per_page . '"' : '';
+		$selected = $max_entries == $per_page ? ' selected="'.$per_page.'"' : '';
 		$entries_per_page_dropdown .= '
 						<option value="'.$max_entries.'"'.$selected.'>All&nbsp;&nbsp;</option>';
 
@@ -1938,8 +1938,8 @@ 
 	*		@return 		void
 	*/
 	public function _set_search_attributes() {
-		$this->_template_args['search']['btn_label'] = sprintf( __( 'Search %s', 'event_espresso' ), empty( $this->_search_btn_label ) ? $this->page_label : $this->_search_btn_label );
-		$this->_template_args['search']['callback'] = 'search_' . $this->page_slug;
+		$this->_template_args['search']['btn_label'] = sprintf(__('Search %s', 'event_espresso'), empty($this->_search_btn_label) ? $this->page_label : $this->_search_btn_label);
+		$this->_template_args['search']['callback'] = 'search_'.$this->page_slug;
 	}
 
 	/*** END LIST TABLE METHODS **/
@@ -1958,20 +1958,20 @@ 
 	 * @return void
 	*/
 	private function _add_registered_meta_boxes() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		//we only add meta boxes if the page_route calls for it
-		if ( is_array($this->_route_config) && isset( $this->_route_config['metaboxes'] ) && is_array($this->_route_config['metaboxes']) ) {
+		if (is_array($this->_route_config) && isset($this->_route_config['metaboxes']) && is_array($this->_route_config['metaboxes'])) {
 
 
 			//this simply loops through the callbacks provided and checks if there is a corresponding callback registered by the child - if there is then we go ahead and process the metabox loader.
-			foreach ( $this->_route_config['metaboxes'] as $metabox_callback ) {
-				if ( call_user_func( array($this, &$metabox_callback) ) === FALSE ) {
+			foreach ($this->_route_config['metaboxes'] as $metabox_callback) {
+				if (call_user_func(array($this, &$metabox_callback)) === FALSE) {
 					// user error msg
-				$error_msg =  __( 'An error occurred. The  requested metabox could not be found.', 'event_espresso' );
+				$error_msg = __('An error occurred. The  requested metabox could not be found.', 'event_espresso');
 				// developer error msg
-				$error_msg .= '||' . sprintf( __( 'The metabox with the string "%s" could not be called. Check that the spelling for method names and actions in the "_page_config[\'metaboxes\']" array are all correct.', 'event_espresso' ), $metabox_callback );
-				throw new EE_Error( $error_msg );
+				$error_msg .= '||'.sprintf(__('The metabox with the string "%s" could not be called. Check that the spelling for method names and actions in the "_page_config[\'metaboxes\']" array are all correct.', 'event_espresso'), $metabox_callback);
+				throw new EE_Error($error_msg);
 				}
 			}
 		}
@@ -1988,17 +1988,17 @@ 
 	 * @return void
 	 */
 	private function _add_screen_columns() {
-		if ( is_array($this->_route_config) && isset( $this->_route_config['columns'] ) && is_array($this->_route_config['columns']) && count( $this->_route_config['columns'] == 2 ) ) {
+		if (is_array($this->_route_config) && isset($this->_route_config['columns']) && is_array($this->_route_config['columns']) && count($this->_route_config['columns'] == 2)) {
 
-			add_screen_option('layout_columns', array('max' => (int) $this->_route_config['columns'][0], 'default' => (int) $this->_route_config['columns'][1] ) );
+			add_screen_option('layout_columns', array('max' => (int) $this->_route_config['columns'][0], 'default' => (int) $this->_route_config['columns'][1]));
 			$this->_template_args['num_columns'] = $this->_route_config['columns'][0];
 			$screen_id = $this->_current_screen->id;
 			$screen_columns = (int) get_user_option("screen_layout_$screen_id");
-			$total_columns = !empty($screen_columns) ? $screen_columns : $this->_route_config['columns'][1];
-			$this->_template_args['current_screen_widget_class'] = 'columns-' . $total_columns;
+			$total_columns = ! empty($screen_columns) ? $screen_columns : $this->_route_config['columns'][1];
+			$this->_template_args['current_screen_widget_class'] = 'columns-'.$total_columns;
 			$this->_template_args['current_page'] = $this->_wp_page_slug;
 			$this->_template_args['screen'] = $this->_current_screen;
-			$this->_column_template_path = EE_ADMIN_TEMPLATE . 'admin_details_metabox_column_wrapper.template.php';
+			$this->_column_template_path = EE_ADMIN_TEMPLATE.'admin_details_metabox_column_wrapper.template.php';
 
 			//finally if we don't have has_metaboxes set in the route config let's make sure it IS set other wise the necessary hidden fields for this won't be loaded.
 			$this->_route_config['has_metaboxes'] = TRUE;
@@ -2015,11 +2015,11 @@ 
 	 */
 
 	private function _espresso_news_post_box() {
-		$news_box_title = apply_filters( 'FHEE__EE_Admin_Page___espresso_news_post_box__news_box_title', __( 'New @ Event Espresso', 'event_espresso' ) );
-		add_meta_box( 'espresso_news_post_box', $news_box_title, array(
+		$news_box_title = apply_filters('FHEE__EE_Admin_Page___espresso_news_post_box__news_box_title', __('New @ Event Espresso', 'event_espresso'));
+		add_meta_box('espresso_news_post_box', $news_box_title, array(
 			$this,
 			'espresso_news_post_box'
-		), $this->_wp_page_slug, 'side' );
+		), $this->_wp_page_slug, 'side');
 	}
 
 
@@ -2027,14 +2027,14 @@ 
 	 * Code for setting up espresso ratings request metabox.
 	 */
 	protected function _espresso_ratings_request() {
-		if ( ! apply_filters( 'FHEE_show_ratings_request_meta_box', true ) ) {
+		if ( ! apply_filters('FHEE_show_ratings_request_meta_box', true)) {
 			return '';
 		}
-		$ratings_box_title = apply_filters( 'FHEE__EE_Admin_Page___espresso_news_post_box__news_box_title', __('Keep Event Espresso Decaf Free', 'event_espresso') );
-		add_meta_box( 'espresso_ratings_request', $ratings_box_title, array(
+		$ratings_box_title = apply_filters('FHEE__EE_Admin_Page___espresso_news_post_box__news_box_title', __('Keep Event Espresso Decaf Free', 'event_espresso'));
+		add_meta_box('espresso_ratings_request', $ratings_box_title, array(
 			$this,
 			'espresso_ratings_request'
-		), $this->_wp_page_slug, 'side' );
+		), $this->_wp_page_slug, 'side');
 	}
 
 
@@ -2042,35 +2042,35 @@ 
 	 * Code for setting up espresso ratings request metabox content.
 	 */
 	public function espresso_ratings_request() {
-		$template_path = EE_ADMIN_TEMPLATE . 'espresso_ratings_request_content.template.php';
-		EE_Registry::instance()->load_helper( 'Template' );
-		EEH_Template::display_template( $template_path, array() );
+		$template_path = EE_ADMIN_TEMPLATE.'espresso_ratings_request_content.template.php';
+		EE_Registry::instance()->load_helper('Template');
+		EEH_Template::display_template($template_path, array());
 	}
 
 
 
 
-	public static function cached_rss_display( $rss_id, $url ) {
-		$loading = '<p class="widget-loading hide-if-no-js">' . __( 'Loading&#8230;' ) . '</p><p class="hide-if-js">' . __( 'This widget requires JavaScript.' ) . '</p>';
-		$doing_ajax = ( defined( 'DOING_AJAX' ) && DOING_AJAX );
-		$pre = '<div class="espresso-rss-display">' . "\n\t";
-		$pre .= '<span id="' . $rss_id . '_url" class="hidden">' . $url . '</span>';
-		$post = '</div>' . "\n";
+	public static function cached_rss_display($rss_id, $url) {
+		$loading = '<p class="widget-loading hide-if-no-js">'.__('Loading&#8230;').'</p><p class="hide-if-js">'.__('This widget requires JavaScript.').'</p>';
+		$doing_ajax = (defined('DOING_AJAX') && DOING_AJAX);
+		$pre = '<div class="espresso-rss-display">'."\n\t";
+		$pre .= '<span id="'.$rss_id.'_url" class="hidden">'.$url.'</span>';
+		$post = '</div>'."\n";
 
-		$cache_key = 'ee_rss_' . md5( $rss_id );
-		if ( FALSE != ( $output = get_transient( $cache_key ) ) ) {
-			echo $pre . $output . $post;
+		$cache_key = 'ee_rss_'.md5($rss_id);
+		if (FALSE != ($output = get_transient($cache_key))) {
+			echo $pre.$output.$post;
 			return TRUE;
 		}
 
-		if ( ! $doing_ajax ) {
-			echo $pre . $loading . $post;
+		if ( ! $doing_ajax) {
+			echo $pre.$loading.$post;
 			return FALSE;
 		}
 
 		ob_start();
-		wp_widget_rss_output($url, array('show_date' => 0, 'items' => 5) );
-		set_transient( $cache_key, ob_get_flush(), 12 * HOUR_IN_SECONDS );
+		wp_widget_rss_output($url, array('show_date' => 0, 'items' => 5));
+		set_transient($cache_key, ob_get_flush(), 12 * HOUR_IN_SECONDS);
 		return TRUE;
 
 	}
@@ -2082,13 +2082,13 @@ 
 	  	<div id="espresso_news_post_box_content" class="infolinks">
 	  		<?php
 	  		// Get RSS Feed(s)
-	  		$feed_url = apply_filters( 'FHEE__EE_Admin_Page__espresso_news_post_box__feed_url', 'http://eventespresso.com/feed/' );
+	  		$feed_url = apply_filters('FHEE__EE_Admin_Page__espresso_news_post_box__feed_url', 'http://eventespresso.com/feed/');
 	  		$url = urlencode($feed_url);
-	  		self::cached_rss_display( 'espresso_news_post_box_content', $url );
+	  		self::cached_rss_display('espresso_news_post_box_content', $url);
 
 	  		?>
 	  	</div>
-	  	<?php do_action( 'AHEE__EE_Admin_Page__espresso_news_post_box__after_content'); ?>
+	  	<?php do_action('AHEE__EE_Admin_Page__espresso_news_post_box__after_content'); ?>
 	  </div>
 		<?php
 	}
@@ -2109,32 +2109,32 @@ 
 
 	protected function _espresso_sponsors_post_box() {
 
-		$show_sponsors = apply_filters( 'FHEE_show_sponsors_meta_box', TRUE );
-		if ( $show_sponsors )
-			add_meta_box('espresso_sponsors_post_box', __('Event Espresso Highlights', 'event_espresso'), array( $this, 'espresso_sponsors_post_box'), $this->_wp_page_slug, 'side');
+		$show_sponsors = apply_filters('FHEE_show_sponsors_meta_box', TRUE);
+		if ($show_sponsors)
+			add_meta_box('espresso_sponsors_post_box', __('Event Espresso Highlights', 'event_espresso'), array($this, 'espresso_sponsors_post_box'), $this->_wp_page_slug, 'side');
 	}
 
 
 	public function espresso_sponsors_post_box() {
-		$templatepath = EE_ADMIN_TEMPLATE . 'admin_general_metabox_contents_espresso_sponsors.template.php';
-		EEH_Template::display_template( $templatepath );
+		$templatepath = EE_ADMIN_TEMPLATE.'admin_general_metabox_contents_espresso_sponsors.template.php';
+		EEH_Template::display_template($templatepath);
 	}
 
 
 
 	private function _publish_post_box() {
-		$meta_box_ref = 'espresso_' . $this->page_slug . '_editor_overview';
+		$meta_box_ref = 'espresso_'.$this->page_slug.'_editor_overview';
 
 		//if there is a array('label' => array('publishbox' => 'some title') ) present in the _page_config array then we'll use that for the metabox label.  Otherwise we'll just use publish (publishbox itself could be an array of labels indexed by routes)
-		if ( !empty( $this->_labels['publishbox'] ) ) {
-			$box_label = is_array( $this->_labels['publishbox'] ) ? $this->_labels['publishbox'][$this->_req_action] : $this->_labels['publishbox'];
+		if ( ! empty($this->_labels['publishbox'])) {
+			$box_label = is_array($this->_labels['publishbox']) ? $this->_labels['publishbox'][$this->_req_action] : $this->_labels['publishbox'];
 		} else {
 			$box_label = __('Publish', 'event_espresso');
 		}
 
-		$box_label = apply_filters( 'FHEE__EE_Admin_Page___publish_post_box__box_label', $box_label, $this->_req_action, $this );
+		$box_label = apply_filters('FHEE__EE_Admin_Page___publish_post_box__box_label', $box_label, $this->_req_action, $this);
 
-		add_meta_box( $meta_box_ref, $box_label, array( $this, 'editor_overview' ), $this->_current_screen->id, 'side', 'high' );
+		add_meta_box($meta_box_ref, $box_label, array($this, 'editor_overview'), $this->_current_screen->id, 'side', 'high');
 
 	}
 
@@ -2142,9 +2142,9 @@ 
 
 	public function editor_overview() {
 		//if we have extra content set let's add it in if not make sure its empty
-		$this->_template_args['publish_box_extra_content'] = isset( $this->_template_args['publish_box_extra_content'] ) ? $this->_template_args['publish_box_extra_content'] : '';
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_details_publish_metabox.template.php';
-		echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$this->_template_args['publish_box_extra_content'] = isset($this->_template_args['publish_box_extra_content']) ? $this->_template_args['publish_box_extra_content'] : '';
+		$template_path = EE_ADMIN_TEMPLATE.'admin_details_publish_metabox.template.php';
+		echo EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 	}
 
 
@@ -2160,8 +2160,8 @@ 
 	 * @see $this->_set_publish_post_box_vars for param details
 	 * @since 4.6.0
 	 */
-	public function set_publish_post_box_vars( $name = null, $id = false, $delete = false, $save_close_redirect_URL = null, $both_btns = true ) {
-		$this->_set_publish_post_box_vars( $name, $id, $delete, $save_close_redirect_URL, $both_btns );
+	public function set_publish_post_box_vars($name = null, $id = false, $delete = false, $save_close_redirect_URL = null, $both_btns = true) {
+		$this->_set_publish_post_box_vars($name, $id, $delete, $save_close_redirect_URL, $both_btns);
 	}
 
 
@@ -2180,24 +2180,24 @@ 
 	 * @param	string	$post_save_redirect_URL	custom URL to redirect to after Save & Close has been completed
 	 * @param	boolean	$both_btns	whether to display BOTH the "Save & Close" and "Save" buttons or just the Save button
 	 */
-	protected function _set_publish_post_box_vars( $name = NULL, $id = FALSE, $delete = FALSE, $save_close_redirect_URL = NULL, $both_btns = TRUE ) {
+	protected function _set_publish_post_box_vars($name = NULL, $id = FALSE, $delete = FALSE, $save_close_redirect_URL = NULL, $both_btns = TRUE) {
 
 		// if Save & Close, use a custom redirect URL or default to the main page?
-		$save_close_redirect_URL = ! empty( $save_close_redirect_URL ) ? $save_close_redirect_URL : $this->_admin_base_url;
+		$save_close_redirect_URL = ! empty($save_close_redirect_URL) ? $save_close_redirect_URL : $this->_admin_base_url;
 		// create the Save & Close and Save buttons
-		$this->_set_save_buttons( $both_btns, array(), array(), $save_close_redirect_URL );
+		$this->_set_save_buttons($both_btns, array(), array(), $save_close_redirect_URL);
 		//if we have extra content set let's add it in if not make sure its empty
-		$this->_template_args['publish_box_extra_content'] = isset( $this->_template_args['publish_box_extra_content'] ) ? $this->_template_args['publish_box_extra_content'] : '';
+		$this->_template_args['publish_box_extra_content'] = isset($this->_template_args['publish_box_extra_content']) ? $this->_template_args['publish_box_extra_content'] : '';
 
 
-		if ( $delete && ! empty( $id )  ) {
+		if ($delete && ! empty($id)) {
 			$delete = is_bool($delete) ? 'delete' : $delete; //make sure we have a default if just true is sent.
-			$delete_link_args = array( $name => $id );
-			$delete = $this->get_action_link_or_button( $delete, $delete, $delete_link_args, 'submitdelete deletion');
+			$delete_link_args = array($name => $id);
+			$delete = $this->get_action_link_or_button($delete, $delete, $delete_link_args, 'submitdelete deletion');
 		}
 
-		$this->_template_args['publish_delete_link'] = !empty( $id ) ? $delete : '';
-		if ( ! empty( $name ) && ! empty( $id ) ) {
+		$this->_template_args['publish_delete_link'] = ! empty($id) ? $delete : '';
+		if ( ! empty($name) && ! empty($id)) {
 			$hidden_field_arr[$name] = array(
 				'type' => 'hidden',
 				'value' => $id
@@ -2207,7 +2207,7 @@ 
 			$hf = '';
 		}
 		// add hidden field
-		$this->_template_args['publish_hidden_fields'] = ! empty( $hf ) ? $hf[$name]['field'] : $hf;
+		$this->_template_args['publish_hidden_fields'] = ! empty($hf) ? $hf[$name]['field'] : $hf;
 
 	}
 
@@ -2224,8 +2224,8 @@ 
 		<noscript>
 			<div id="no-js-message" class="error">
 				<p style="font-size:1.3em;">
-					<span style="color:red;"><?php _e( 'Warning!', 'event_espresso' ); ?></span>
-					<?php _e( 'Javascript is currently turned off for your browser. Javascript must be enabled in order for all of the features on this page to function properly. Please turn your javascript back on.', 'event_espresso' ); ?>
+					<span style="color:red;"><?php _e('Warning!', 'event_espresso'); ?></span>
+					<?php _e('Javascript is currently turned off for your browser. Javascript must be enabled in order for all of the features on this page to function properly. Please turn your javascript back on.', 'event_espresso'); ?>
 				</p>
 			</div>
 		</noscript>
@@ -2245,7 +2245,7 @@ 
 	*		@return 		string
 	*/
 	private function _display_espresso_notices() {
-		$notices = $this->_get_transient( TRUE );
+		$notices = $this->_get_transient(TRUE);
 		echo stripslashes($notices);
 	}
 
@@ -2297,11 +2297,11 @@ 
 	 * @param string  $priority      give this metabox a priority (using accepted priorities for wp meta boxes)
 	 * @param boolean $create_func   default is true.  Basically we can say we don't WANT to have the runtime function created but just set our own callback for wp's add_meta_box.
 	 */
-	public function _add_admin_page_meta_box( $action, $title, $callback, $callback_args, $column = 'normal', $priority = 'high', $create_func = true ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, $callback );
+	public function _add_admin_page_meta_box($action, $title, $callback, $callback_args, $column = 'normal', $priority = 'high', $create_func = true) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, $callback);
 
 		//if we have empty callback args and we want to automatically create the metabox callback then we need to make sure the callback args are generated.
-		if ( empty( $callback_args ) && $create_func ) {
+		if (empty($callback_args) && $create_func) {
 			$callback_args = array(
 				'template_path' => $this->_template_path,
 				'template_args' => $this->_template_args,
@@ -2311,7 +2311,7 @@ 
 		//if $create_func is true (default) then we automatically create the function for displaying the actual meta box.  If false then we take the $callback reference passed through and use it instead (so callers can define their own callback function/method if they wish)
 		$call_back_func = $create_func ? create_function('$post, $metabox', 'do_action( "AHEE_log", __FILE__, __FUNCTION__, ""); echo EEH_Template::display_template( $metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE );') : $callback;
 
-		add_meta_box( str_replace( '_', '-', $action ) . '-mbox', $title, $call_back_func, $this->_wp_page_slug, $column, $priority, $callback_args );
+		add_meta_box(str_replace('_', '-', $action).'-mbox', $title, $call_back_func, $this->_wp_page_slug, $column, $priority, $callback_args);
 	}
 
 
@@ -2324,7 +2324,7 @@ 
 	 */
 	public function display_admin_page_with_metabox_columns() {
 		$this->_template_args['post_body_content'] = $this->_template_args['admin_page_content'];
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $this->_column_template_path, $this->_template_args, TRUE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_column_template_path, $this->_template_args, TRUE);
 
 		//the final wrapper
 		$this->admin_page_wrapper();
@@ -2367,7 +2367,7 @@ 
 	 * @return void
 	 */
 	public function display_about_admin_page() {
-		$this->_display_admin_page( FALSE, TRUE );
+		$this->_display_admin_page(FALSE, TRUE);
 	}
 
 
@@ -2383,26 +2383,26 @@ 
 	 * @return html           admin_page
 	 */
 	private function _display_admin_page($sidebar = false, $about = FALSE) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		//custom remove metaboxes hook to add or remove any metaboxes to/from Admin pages.
-		do_action( 'AHEE__EE_Admin_Page___display_admin_page__modify_metaboxes' );
+		do_action('AHEE__EE_Admin_Page___display_admin_page__modify_metaboxes');
 
 		// set current wp page slug - looks like: event-espresso_page_event_categories
 		// keep in mind "event-espresso" COULD be something else if the top level menu label has been translated.
 		$this->_template_args['current_page'] = $this->_wp_page_slug;
 
-		$template_path = $sidebar ?  EE_ADMIN_TEMPLATE . 'admin_details_wrapper.template.php' : EE_ADMIN_TEMPLATE . 'admin_details_wrapper_no_sidebar.template.php';
+		$template_path = $sidebar ?  EE_ADMIN_TEMPLATE . 'admin_details_wrapper.template.php' : EE_ADMIN_TEMPLATE.'admin_details_wrapper_no_sidebar.template.php';
 
-		if ( defined('DOING_AJAX' ) )
-			$template_path = EE_ADMIN_TEMPLATE . 'admin_details_wrapper_no_sidebar_ajax.template.php';
+		if (defined('DOING_AJAX'))
+			$template_path = EE_ADMIN_TEMPLATE.'admin_details_wrapper_no_sidebar_ajax.template.php';
 
-		$template_path = !empty($this->_column_template_path) ? $this->_column_template_path : $template_path;
+		$template_path = ! empty($this->_column_template_path) ? $this->_column_template_path : $template_path;
 
-		$this->_template_args['post_body_content'] = isset( $this->_template_args['admin_page_content'] ) ? $this->_template_args['admin_page_content'] : '';
+		$this->_template_args['post_body_content'] = isset($this->_template_args['admin_page_content']) ? $this->_template_args['admin_page_content'] : '';
 		$this->_template_args['before_admin_page_content'] = isset($this->_template_args['before_admin_page_content']) ? $this->_template_args['before_admin_page_content'] : '';
 		$this->_template_args['after_admin_page_content'] = isset($this->_template_args['after_admin_page_content']) ? $this->_template_args['after_admin_page_content'] : '';
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 
 		// the final template wrapper
@@ -2422,7 +2422,7 @@ 
 	 * @param bool   $display_sidebar whether to use the sidebar template or the full template for the page.  TRUE = SHOW sidebar, FALSE = no sidebar. Default no sidebar.
 	 * @return void
 	 */
-	public function display_admin_caf_preview_page( $utm_campaign_source = '', $display_sidebar = TRUE ) {
+	public function display_admin_caf_preview_page($utm_campaign_source = '', $display_sidebar = TRUE) {
 		//let's generate a default preview action button if there isn't one already present.
 		$this->_labels['buttons']['buy_now'] = __('Upgrade Now', 'event_espresso');
 		$buy_now_url = add_query_arg(
@@ -2435,10 +2435,10 @@ 
 			),
 		'http://eventespresso.com/pricing/'
 		);
-		$this->_template_args['preview_action_button'] = ! isset( $this->_template_args['preview_action_button'] ) ? $this->get_action_link_or_button( '', 'buy_now', array(), 'button-primary button-large', $buy_now_url, true ) : $this->_template_args['preview_action_button'];
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_caf_full_page_preview.template.php';
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
-		$this->_display_admin_page( $display_sidebar );
+		$this->_template_args['preview_action_button'] = ! isset($this->_template_args['preview_action_button']) ? $this->get_action_link_or_button('', 'buy_now', array(), 'button-primary button-large', $buy_now_url, true) : $this->_template_args['preview_action_button'];
+		$template_path = EE_ADMIN_TEMPLATE.'admin_caf_full_page_preview.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
+		$this->_display_admin_page($display_sidebar);
 	}
 
 
@@ -2472,41 +2472,41 @@ 
 	 * @param boolean $sidebar whether to display with sidebar or not.
 	 * @return html
 	 */
-	private function _display_admin_list_table_page( $sidebar = false ) {
+	private function _display_admin_list_table_page($sidebar = false) {
 		//setup search attributes
 		$this->_set_search_attributes();
 		$this->_template_args['current_page'] = $this->_wp_page_slug;
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_list_wrapper.template.php';
+		$template_path = EE_ADMIN_TEMPLATE.'admin_list_wrapper.template.php';
 
-		$this->_template_args['table_url'] = defined( 'DOING_AJAX') ? add_query_arg( array( 'noheader' => 'true', 'route' => $this->_req_action), $this->_admin_base_url ) : add_query_arg( array( 'route' => $this->_req_action), $this->_admin_base_url);
+		$this->_template_args['table_url'] = defined('DOING_AJAX') ? add_query_arg(array('noheader' => 'true', 'route' => $this->_req_action), $this->_admin_base_url) : add_query_arg(array('route' => $this->_req_action), $this->_admin_base_url);
 		$this->_template_args['list_table'] = $this->_list_table_object;
 		$this->_template_args['current_route'] = $this->_req_action;
-		$this->_template_args['list_table_class'] = get_class( $this->_list_table_object );
+		$this->_template_args['list_table_class'] = get_class($this->_list_table_object);
 
 		$ajax_sorting_callback = $this->_list_table_object->get_ajax_sorting_callback();
-		if( ! empty( $ajax_sorting_callback )) {
-			$sortable_list_table_form_fields = wp_nonce_field( $ajax_sorting_callback . '_nonce', $ajax_sorting_callback . '_nonce', FALSE, FALSE );
+		if ( ! empty($ajax_sorting_callback)) {
+			$sortable_list_table_form_fields = wp_nonce_field($ajax_sorting_callback.'_nonce', $ajax_sorting_callback.'_nonce', FALSE, FALSE);
 //			$reorder_action = 'espresso_' . $ajax_sorting_callback . '_nonce';
 //			$sortable_list_table_form_fields = wp_nonce_field( $reorder_action, 'ajax_table_sort_nonce', FALSE, FALSE );
-			$sortable_list_table_form_fields .= '<input type="hidden" id="ajax_table_sort_page" name="ajax_table_sort_page" value="' . $this->page_slug .'" />';
-			$sortable_list_table_form_fields .= '<input type="hidden" id="ajax_table_sort_action" name="ajax_table_sort_action" value="' . $ajax_sorting_callback . '" />';
+			$sortable_list_table_form_fields .= '<input type="hidden" id="ajax_table_sort_page" name="ajax_table_sort_page" value="'.$this->page_slug.'" />';
+			$sortable_list_table_form_fields .= '<input type="hidden" id="ajax_table_sort_action" name="ajax_table_sort_action" value="'.$ajax_sorting_callback.'" />';
 		} else {
 			$sortable_list_table_form_fields = '';
 		}
 
 		$this->_template_args['sortable_list_table_form_fields'] = $sortable_list_table_form_fields;
-		$hidden_form_fields = isset( $this->_template_args['list_table_hidden_fields'] ) ? $this->_template_args['list_table_hidden_fields'] : '';
-		$nonce_ref = $this->_req_action . '_nonce';
-		$hidden_form_fields .= '<input type="hidden" name="' . $nonce_ref . '" value="' . wp_create_nonce( $nonce_ref ) . '">';
+		$hidden_form_fields = isset($this->_template_args['list_table_hidden_fields']) ? $this->_template_args['list_table_hidden_fields'] : '';
+		$nonce_ref = $this->_req_action.'_nonce';
+		$hidden_form_fields .= '<input type="hidden" name="'.$nonce_ref.'" value="'.wp_create_nonce($nonce_ref).'">';
 		$this->_template_args['list_table_hidden_fields'] = $hidden_form_fields;
 
 		//display message about search results?
-		$this->_template_args['before_list_table'] .= apply_filters( 'FHEE__EE_Admin_Page___display_admin_list_table_page__before_list_table__template_arg', !empty( $this->_req_data['s'] ) ? '<p class="ee-search-results">' . sprintf( __('Displaying search results for the search string: <strong><em>%s</em></strong>', 'event_espresso'), trim($this->_req_data['s'], '%') ) . '</p>' : '', $this->page_slug, $this->_req_data, $this->_req_action );
+		$this->_template_args['before_list_table'] .= apply_filters('FHEE__EE_Admin_Page___display_admin_list_table_page__before_list_table__template_arg', ! empty($this->_req_data['s']) ? '<p class="ee-search-results">'.sprintf(__('Displaying search results for the search string: <strong><em>%s</em></strong>', 'event_espresso'), trim($this->_req_data['s'], '%')).'</p>' : '', $this->page_slug, $this->_req_data, $this->_req_action);
 
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 		// the final template wrapper
-		if ( $sidebar )
+		if ($sidebar)
 			$this->display_admin_page_with_sidebar();
 		else
 			$this->display_admin_page_with_no_sidebar();
@@ -2529,9 +2529,9 @@ 
 	 * @param  array $items  see above for format of array
 	 * @return string        html string of legend
 	 */
-	protected function _display_legend( $items ) {
-		$template_args['items'] = apply_filters( 'FHEE__EE_Admin_Page___display_legend__items', (array) $items, $this );
-		$legend_template = EE_ADMIN_TEMPLATE . 'admin_details_legend.template.php';
+	protected function _display_legend($items) {
+		$template_args['items'] = apply_filters('FHEE__EE_Admin_Page___display_legend__items', (array) $items, $this);
+		$legend_template = EE_ADMIN_TEMPLATE.'admin_details_legend.template.php';
 		return EEH_Template::display_template($legend_template, $template_args, TRUE);
 	}
 
@@ -2556,31 +2556,31 @@ 
 	 *
 	 * @return json object
 	 */
-	protected function _return_json( $sticky_notices = FALSE ) {
+	protected function _return_json($sticky_notices = FALSE) {
 
 		//make sure any EE_Error notices have been handled.
-		$this->_process_notices( array(), true, $sticky_notices );
+		$this->_process_notices(array(), true, $sticky_notices);
 
 
-		$data = isset( $this->_template_args['data'] ) ? $this->_template_args['data'] : array();
+		$data = isset($this->_template_args['data']) ? $this->_template_args['data'] : array();
 		unset($this->_template_args['data']);
 		$json = array(
-			'error' => isset( $this->_template_args['error'] ) ? $this->_template_args['error'] : FALSE,
-			'success' => isset( $this->_template_args['success'] ) ? $this->_template_args['success'] : FALSE,
+			'error' => isset($this->_template_args['error']) ? $this->_template_args['error'] : FALSE,
+			'success' => isset($this->_template_args['success']) ? $this->_template_args['success'] : FALSE,
 			'notices' => EE_Error::get_notices(),
-			'content' => isset( $this->_template_args['admin_page_content'] ) ? $this->_template_args['admin_page_content'] : '',
-			'data' => array_merge( $data, array('template_args' => $this->_template_args ) ),
+			'content' => isset($this->_template_args['admin_page_content']) ? $this->_template_args['admin_page_content'] : '',
+			'data' => array_merge($data, array('template_args' => $this->_template_args)),
 			'isEEajax' => TRUE //special flag so any ajax.Success methods in js can identify this return package as a EEajax package.
 			);
 
 
 		// make sure there are no php errors or headers_sent.  Then we can set correct json header.
-		if ( NULL === error_get_last() || ! headers_sent() )
+		if (NULL === error_get_last() || ! headers_sent())
 			header('Content-Type: application/json; charset=UTF-8');
-                if( function_exists( 'wp_json_encode' ) ) {
-                    echo wp_json_encode( $json );
+                if (function_exists('wp_json_encode')) {
+                    echo wp_json_encode($json);
                 } else {
-                    echo json_encode( $json );
+                    echo json_encode($json);
                 }
 		exit();
 	}
@@ -2592,11 +2592,11 @@ 
 	 * @return json_obj|EE_Error
 	 */
 	public function return_json() {
-		if ( defined('DOING_AJAX') && DOING_AJAX )
+		if (defined('DOING_AJAX') && DOING_AJAX)
 			$this->_return_json();
 
 		else {
-			throw new EE_Error( sprintf( __('The public %s method can only be called when DOING_AJAX = TRUE', 'event_espresso'), __FUNCTION__ ) );
+			throw new EE_Error(sprintf(__('The public %s method can only be called when DOING_AJAX = TRUE', 'event_espresso'), __FUNCTION__));
 		}
 	}
 
@@ -2611,7 +2611,7 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function set_hook_object( EE_Admin_Hooks $hook_obj ) {
+	public function set_hook_object(EE_Admin_Hooks $hook_obj) {
 		$this->_hook_obj = $hook_obj;
 	}
 
@@ -2627,33 +2627,33 @@ 
 	*/
 	public function admin_page_wrapper($about = FALSE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		$this->_nav_tabs = $this->_get_main_nav_tabs();
 
 		$this->_template_args['nav_tabs'] = $this->_nav_tabs;
 		$this->_template_args['admin_page_title'] = $this->_admin_page_title;
 
-		$this->_template_args['before_admin_page_content'] = apply_filters( 'FHEE_before_admin_page_content' . $this->_current_page . $this->_current_view, isset( $this->_template_args['before_admin_page_content'] ) ? $this->_template_args['before_admin_page_content'] : '');
-		$this->_template_args['after_admin_page_content'] = apply_filters( 'FHEE_after_admin_page_content' . $this->_current_page . $this->_current_view, isset( $this->_template_args['after_admin_page_content'] ) ? $this->_template_args['after_admin_page_content'] : '');
+		$this->_template_args['before_admin_page_content'] = apply_filters('FHEE_before_admin_page_content'.$this->_current_page.$this->_current_view, isset($this->_template_args['before_admin_page_content']) ? $this->_template_args['before_admin_page_content'] : '');
+		$this->_template_args['after_admin_page_content'] = apply_filters('FHEE_after_admin_page_content'.$this->_current_page.$this->_current_view, isset($this->_template_args['after_admin_page_content']) ? $this->_template_args['after_admin_page_content'] : '');
 
 		$this->_template_args['after_admin_page_content'] .= $this->_set_help_popup_content();
 
 
 
 		// load settings page wrapper template
-		$template_path = !defined( 'DOING_AJAX' ) ? EE_ADMIN_TEMPLATE . 'admin_wrapper.template.php' : EE_ADMIN_TEMPLATE . 'admin_wrapper_ajax.template.php';
+		$template_path = ! defined('DOING_AJAX') ? EE_ADMIN_TEMPLATE . 'admin_wrapper.template.php' : EE_ADMIN_TEMPLATE.'admin_wrapper_ajax.template.php';
 
 		//about page?
 		$template_path = $about ? EE_ADMIN_TEMPLATE . 'about_admin_wrapper.template.php' : $template_path;
 
 
-		if ( defined( 'DOING_AJAX' ) ) {
-			$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		if (defined('DOING_AJAX')) {
+			$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 			$this->_return_json();
 		} else {
-			EEH_Template::display_template( $template_path, $this->_template_args );
+			EEH_Template::display_template($template_path, $this->_template_args);
 		}
 
 	}
@@ -2666,7 +2666,7 @@ 
 	 */
 	protected function _get_main_nav_tabs() {
 		//let's generate the html using the EEH_Tabbed_Content helper.  We do this here so that it's possible for child classes to add in nav tabs dynamically at the last minute (rather than setting in the page_routes array)
-		EE_Registry::instance()->load_helper( 'Tabbed_Content' );
+		EE_Registry::instance()->load_helper('Tabbed_Content');
 		return EEH_Tabbed_Content::display_admin_nav_tabs($this->_nav_tabs);
 	}
 
@@ -2682,7 +2682,7 @@ 
 	*		@access public
 	*		@return void
 	*/
-	private function _sort_nav_tabs( $a, $b ) {
+	private function _sort_nav_tabs($a, $b) {
 		if ($a['order'] == $b['order']) {
 	        return 0;
 	    }
@@ -2703,8 +2703,8 @@ 
 	 * 	@uses EEH_Form_Fields::get_form_fields (/helper/EEH_Form_Fields.helper.php)
 	 * 	@uses EEH_Form_Fields::get_form_fields_array (/helper/EEH_Form_Fields.helper.php)
 	 */
-	protected function _generate_admin_form_fields( $input_vars = array(), $generator = 'string', $id = FALSE ) {
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
+	protected function _generate_admin_form_fields($input_vars = array(), $generator = 'string', $id = FALSE) {
+		EE_Registry::instance()->load_helper('Form_Fields');
 		$content = $generator == 'string' ? EEH_Form_Fields::get_form_fields($input_vars, $id) : EEH_Form_Fields::get_form_fields_array($input_vars);
 		return $content;
 	}
@@ -2726,25 +2726,25 @@ 
 	 * @param array $actions if included allows us to set the actions that each button will carry out (i.e. via the "name" value in the button).  We can also use this to just dump default actions by submitting some other value.
 	 * @param bool|string|null $referrer if false then we just do the default action on save and close.  Other wise it will use the $referrer string. IF null, then we don't do ANYTHING on save and close (normal form handling).
 	 */
-	protected function _set_save_buttons($both = TRUE, $text = array(), $actions = array(), $referrer = NULL ) {
+	protected function _set_save_buttons($both = TRUE, $text = array(), $actions = array(), $referrer = NULL) {
 		//make sure $text and $actions are in an array
 		$text = (array) $text;
 		$actions = (array) $actions;
 		$referrer_url = empty($referrer) ? '' : $referrer;
-		$referrer_url = !$referrer ? '<input type="hidden" id="save_and_close_referrer" name="save_and_close_referrer" value="' . $_SERVER['REQUEST_URI'] .'" />' : '<input type="hidden" id="save_and_close_referrer" name="save_and_close_referrer" value="' . $referrer .'" />';
+		$referrer_url = ! $referrer ? '<input type="hidden" id="save_and_close_referrer" name="save_and_close_referrer" value="'.$_SERVER['REQUEST_URI'].'" />' : '<input type="hidden" id="save_and_close_referrer" name="save_and_close_referrer" value="'.$referrer.'" />';
 
-		$button_text = !empty($text) ? $text : array( __('Save', 'event_espresso'), __('Save and Close', 'event_espresso') );
-		$default_names = array( 'save', 'save_and_close' );
+		$button_text = ! empty($text) ? $text : array(__('Save', 'event_espresso'), __('Save and Close', 'event_espresso'));
+		$default_names = array('save', 'save_and_close');
 
 		//add in a hidden index for the current page (so save and close redirects properly)
 		$this->_template_args['save_buttons'] = $referrer_url;
 
-		foreach ( $button_text as $key => $button ) {
+		foreach ($button_text as $key => $button) {
 			$ref = $default_names[$key];
-			$id = $this->_current_view . '_' . $ref;
-			$name = !empty($actions) ? $actions[$key] : $ref;
-			$this->_template_args['save_buttons'] .= '<input type="submit" class="button-primary ' . $ref . '" value="' . $button . '" name="' . $name . '" id="' . $id . '" />';
-			if ( !$both ) break;
+			$id = $this->_current_view.'_'.$ref;
+			$name = ! empty($actions) ? $actions[$key] : $ref;
+			$this->_template_args['save_buttons'] .= '<input type="submit" class="button-primary '.$ref.'" value="'.$button.'" name="'.$name.'" id="'.$id.'" />';
+			if ( ! $both) break;
 		}
 
 	}
@@ -2757,8 +2757,8 @@ 
 	 * @since 4.6.0
 	 *
 	 */
-	public function set_add_edit_form_tags( $route = '', $additional_hidden_fields = array() ) {
-		$this->_set_add_edit_form_tags( $route, $additional_hidden_fields );
+	public function set_add_edit_form_tags($route = '', $additional_hidden_fields = array()) {
+		$this->_set_add_edit_form_tags($route, $additional_hidden_fields);
 	}
 
 
@@ -2771,30 +2771,30 @@ 
 	 * @param array $additional_hidden_fields any additional hidden fields required in the form header
 	 * @return void
 	 */
-	protected function _set_add_edit_form_tags( $route = '', $additional_hidden_fields = array() ) {
+	protected function _set_add_edit_form_tags($route = '', $additional_hidden_fields = array()) {
 
-		if ( empty( $route )) {
+		if (empty($route)) {
 			$user_msg = __('An error occurred. No action was set for this page\'s form.', 'event_espresso');
-			$dev_msg = $user_msg . "\n" . sprintf( __('The $route argument is required for the %s->%s method.', 'event_espresso'), __FUNCTION__, __CLASS__ );
-			EE_Error::add_error( $user_msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__ );
+			$dev_msg = $user_msg."\n".sprintf(__('The $route argument is required for the %s->%s method.', 'event_espresso'), __FUNCTION__, __CLASS__);
+			EE_Error::add_error($user_msg.'||'.$dev_msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 		// open form
-		$this->_template_args['before_admin_page_content'] = '<form name="form" method="post" action="' . $this->_admin_base_url . '" id="' . $route . '_event_form" >';
+		$this->_template_args['before_admin_page_content'] = '<form name="form" method="post" action="'.$this->_admin_base_url.'" id="'.$route.'_event_form" >';
 		// add nonce
-		$nonce = wp_nonce_field( $route . '_nonce', $route . '_nonce', FALSE, FALSE );
+		$nonce = wp_nonce_field($route.'_nonce', $route.'_nonce', FALSE, FALSE);
 //		$nonce = wp_nonce_field( $route . '_nonce', '_wpnonce', FALSE, FALSE );
-		$this->_template_args['before_admin_page_content'] .= "\n\t" . $nonce;
+		$this->_template_args['before_admin_page_content'] .= "\n\t".$nonce;
 		// add REQUIRED form action
 		$hidden_fields = array(
-				'action' => array( 'type' => 'hidden', 'value' => $route ),
+				'action' => array('type' => 'hidden', 'value' => $route),
 			);
 		// merge arrays
-		$hidden_fields = is_array( $additional_hidden_fields) ? array_merge( $hidden_fields, $additional_hidden_fields ) : $hidden_fields;
+		$hidden_fields = is_array($additional_hidden_fields) ? array_merge($hidden_fields, $additional_hidden_fields) : $hidden_fields;
 		// generate form fields
-		$form_fields = $this->_generate_admin_form_fields( $hidden_fields, 'array' );
+		$form_fields = $this->_generate_admin_form_fields($hidden_fields, 'array');
 		// add fields to form
-		foreach ( $form_fields as $field_name => $form_field ) {
-			$this->_template_args['before_admin_page_content'] .= "\n\t" . $form_field['field'];
+		foreach ($form_fields as $field_name => $form_field) {
+			$this->_template_args['before_admin_page_content'] .= "\n\t".$form_field['field'];
 		}
 
 		// close form
@@ -2811,8 +2811,8 @@ 
 	 * @see EE_Admin_Page::_redirect_after_action() for params.
 	 * @since 4.5.0
 	 */
-	public function redirect_after_action( $success = FALSE, $what = 'item', $action_desc = 'processed', $query_args = array(), $override_overwrite = FALSE ) {
-		$this->_redirect_after_action( $success, $what, $action_desc, $query_args, $override_overwrite );
+	public function redirect_after_action($success = FALSE, $what = 'item', $action_desc = 'processed', $query_args = array(), $override_overwrite = FALSE) {
+		$this->_redirect_after_action($success, $what, $action_desc, $query_args, $override_overwrite);
 	}
 
 
@@ -2827,32 +2827,32 @@ 
 	 *	@access protected
 	 *	@return void
 	 */
-	protected function _redirect_after_action( $success = FALSE, $what = 'item', $action_desc = 'processed', $query_args = array(), $override_overwrite = FALSE ) {
+	protected function _redirect_after_action($success = FALSE, $what = 'item', $action_desc = 'processed', $query_args = array(), $override_overwrite = FALSE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		//class name for actions/filters.
 		$classname = get_class($this);
 
 		//set redirect url. Note if there is a "page" index in the $query_args then we go with vanilla admin.php route, otherwise we go with whatever is set as the _admin_base_url
-		$redirect_url = isset( $query_args['page'] ) ? admin_url('admin.php') : $this->_admin_base_url;
-		$notices = EE_Error::get_notices( FALSE );
+		$redirect_url = isset($query_args['page']) ? admin_url('admin.php') : $this->_admin_base_url;
+		$notices = EE_Error::get_notices(FALSE);
 
 		// overwrite default success messages //BUT ONLY if overwrite not overridden
-		if ( ! $override_overwrite || ! empty( $notices['errors'] )) {
+		if ( ! $override_overwrite || ! empty($notices['errors'])) {
 			EE_Error::overwrite_success();
 		}
 		// how many records affected ? more than one record ? or just one ?
-		if ( $success > 1 && empty( $notices['errors'] )) {
+		if ($success > 1 && empty($notices['errors'])) {
 			// set plural msg
-			EE_Error::add_success( sprintf( __('The "%s" have been successfully %s.', 'event_espresso'), $what, $action_desc ), __FILE__, __FUNCTION__, __LINE__);
-		} else if ( $success == 1 && empty( $notices['errors'] )) {
+			EE_Error::add_success(sprintf(__('The "%s" have been successfully %s.', 'event_espresso'), $what, $action_desc), __FILE__, __FUNCTION__, __LINE__);
+		} else if ($success == 1 && empty($notices['errors'])) {
 			// set singular msg
-			EE_Error::add_success( sprintf( __('The "%s" has been successfully %s.', 'event_espresso'), $what, $action_desc), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_success(sprintf(__('The "%s" has been successfully %s.', 'event_espresso'), $what, $action_desc), __FILE__, __FUNCTION__, __LINE__);
 		}
 
 		// check that $query_args isn't something crazy
-		if ( ! is_array( $query_args )) {
+		if ( ! is_array($query_args)) {
 			$query_args = array();
 		}
 
@@ -2865,36 +2865,36 @@ 
 		 * @param array $query_args   The original query_args array coming into the
 		 *                          		method.
 		 */
-		do_action( 'AHEE__' . $classname . '___redirect_after_action__before_redirect_modification_' . $this->_req_action, $query_args );
+		do_action('AHEE__'.$classname.'___redirect_after_action__before_redirect_modification_'.$this->_req_action, $query_args);
 
 		//calculate where we're going (if we have a "save and close" button pushed)
-		if ( isset($this->_req_data['save_and_close'] ) && isset($this->_req_data['save_and_close_referrer'] ) ) {
+		if (isset($this->_req_data['save_and_close']) && isset($this->_req_data['save_and_close_referrer'])) {
 			// even though we have the save_and_close referrer, we need to parse the url for the action in order to generate a nonce
-			$parsed_url = parse_url( $this->_req_data['save_and_close_referrer'] );
+			$parsed_url = parse_url($this->_req_data['save_and_close_referrer']);
 			// regenerate query args array from refferer URL
-			parse_str( $parsed_url['query'], $query_args );
+			parse_str($parsed_url['query'], $query_args);
 			// correct page and action will be in the query args now
-			$redirect_url = admin_url( 'admin.php' );
+			$redirect_url = admin_url('admin.php');
 		}
 
 		//merge any default query_args set in _default_route_query_args property
-		if ( ! empty( $this->_default_route_query_args ) && ! $this->_is_UI_request ) {
+		if ( ! empty($this->_default_route_query_args) && ! $this->_is_UI_request) {
 			$args_to_merge = array();
-			foreach ( $this->_default_route_query_args as $query_param => $query_value ) {
+			foreach ($this->_default_route_query_args as $query_param => $query_value) {
 				//is there a wp_referer array in our _default_route_query_args property?
-				if ( $query_param == 'wp_referer'  ) {
+				if ($query_param == 'wp_referer') {
 					$query_value = (array) $query_value;
-					foreach ( $query_value as $reference => $value ) {
-						if ( strpos( $reference, 'nonce' ) !== false ) {
+					foreach ($query_value as $reference => $value) {
+						if (strpos($reference, 'nonce') !== false) {
 							continue;
 						}
 
 						//finally we will override any arguments in the referer with
 						//what might be set on the _default_route_query_args array.
-						if ( isset( $this->_default_route_query_args[$reference] ) ) {
-							$args_to_merge[$reference] = urlencode( $this->_default_route_query_args[$reference] );
+						if (isset($this->_default_route_query_args[$reference])) {
+							$args_to_merge[$reference] = urlencode($this->_default_route_query_args[$reference]);
 						} else {
-							$args_to_merge[$reference] = urlencode( $value );
+							$args_to_merge[$reference] = urlencode($value);
 						}
 					}
 					continue;
@@ -2905,7 +2905,7 @@ 
 
 			//now let's merge these arguments but override with what was specifically sent in to the
 			//redirect.
-			$query_args = array_merge( $args_to_merge, $query_args );
+			$query_args = array_merge($args_to_merge, $query_args);
 		}
 
 		$this->_process_notices($query_args);
@@ -2914,19 +2914,19 @@ 
 		// generate redirect url
 
 		// if redirecting to anything other than the main page, add a nonce
-		if ( isset( $query_args['action'] )) {
+		if (isset($query_args['action'])) {
 			// manually generate wp_nonce and merge that with the query vars becuz the wp_nonce_url function wrecks havoc on some vars
-			$query_args['_wpnonce'] = wp_create_nonce( $query_args['action'] . '_nonce' );
+			$query_args['_wpnonce'] = wp_create_nonce($query_args['action'].'_nonce');
 		}
 
 		//we're adding some hooks and filters in here for processing any things just before redirects (example: an admin page has done an insert or update and we want to run something after that).
-		do_action( 'AHEE_redirect_' . $classname . $this->_req_action, $query_args );
+		do_action('AHEE_redirect_'.$classname.$this->_req_action, $query_args);
 
-		$redirect_url = apply_filters( 'FHEE_redirect_' . $classname . $this->_req_action, self::add_query_args_and_nonce( $query_args, $redirect_url ), $query_args );
+		$redirect_url = apply_filters('FHEE_redirect_'.$classname.$this->_req_action, self::add_query_args_and_nonce($query_args, $redirect_url), $query_args);
 
 
 		// check if we're doing ajax.  If we are then lets just return the results and js can handle how it wants.
-		if ( defined('DOING_AJAX' ) ) {
+		if (defined('DOING_AJAX')) {
 			$default_data = array(
 				'close' => TRUE,
 				'redirect_url' => $redirect_url,
@@ -2935,11 +2935,11 @@ 
 				);
 
 			$this->_template_args['success'] = $success;
-			$this->_template_args['data'] = !empty($this->_template_args['data']) ? array_merge($default_data, $this->_template_args['data'] ): $default_data;
+			$this->_template_args['data'] = ! empty($this->_template_args['data']) ? array_merge($default_data, $this->_template_args['data']) : $default_data;
 			$this->_return_json();
 		}
 
-		wp_safe_redirect( $redirect_url );
+		wp_safe_redirect($redirect_url);
 		exit();
 	}
 
@@ -2955,14 +2955,14 @@ 
 	 * @param bool    $sticky_notices      This is used to flag that regardless of whether this is doing_ajax or not, we still save a transient for the notice.
 	 * @return void
 	 */
-	protected function _process_notices( $query_args = array(), $skip_route_verify = FALSE , $sticky_notices = TRUE ) {
+	protected function _process_notices($query_args = array(), $skip_route_verify = FALSE, $sticky_notices = TRUE) {
 
 		$this->_template_args['notices'] = EE_Error::get_notices();
 
 		//IF this isn't ajax we need to create a transient for the notices using the route (however, overridden if $sticky_notices == true)
-		if ( ! defined( 'DOING_AJAX' ) || $sticky_notices ) {
-			$route = isset( $query_args['action'] ) ? $query_args['action'] : 'default';
-			$this->_add_transient( $route, $this->_template_args['notices'], TRUE, $skip_route_verify );
+		if ( ! defined('DOING_AJAX') || $sticky_notices) {
+			$route = isset($query_args['action']) ? $query_args['action'] : 'default';
+			$this->_add_transient($route, $this->_template_args['notices'], TRUE, $skip_route_verify);
 		}
 	}
 
@@ -2984,32 +2984,32 @@ 
 	 *
 	 * @return string html for button
 	 */
-	public function get_action_link_or_button($action, $type = 'add', $extra_request = array(), $class = 'button-primary', $base_url = FALSE, $exclude_nonce = false ) {
+	public function get_action_link_or_button($action, $type = 'add', $extra_request = array(), $class = 'button-primary', $base_url = FALSE, $exclude_nonce = false) {
 		//first let's validate the action (if $base_url is FALSE otherwise validation will happen further along)
-		if ( !isset($this->_page_routes[$action]) && !$base_url )
-			throw new EE_Error( sprintf( __('There is no page route for given action for the button.  This action was given: %s', 'event_espresso'), $action) );
+		if ( ! isset($this->_page_routes[$action]) && ! $base_url)
+			throw new EE_Error(sprintf(__('There is no page route for given action for the button.  This action was given: %s', 'event_espresso'), $action));
 
-		if ( !isset( $this->_labels['buttons'][$type] ) )
-			throw new EE_Error( sprintf( __('There is no label for the given button type (%s). Labels are set in the <code>_page_config</code> property.', 'event_espresso'), $type) );
+		if ( ! isset($this->_labels['buttons'][$type]))
+			throw new EE_Error(sprintf(__('There is no label for the given button type (%s). Labels are set in the <code>_page_config</code> property.', 'event_espresso'), $type));
 
 		//finally check user access for this button.
-		$has_access = $this->check_user_access( $action, TRUE );
-		if ( ! $has_access ) {
+		$has_access = $this->check_user_access($action, TRUE);
+		if ( ! $has_access) {
 			return '';
 		}
 
-		$_base_url = !$base_url ? $this->_admin_base_url : $base_url;
+		$_base_url = ! $base_url ? $this->_admin_base_url : $base_url;
 
 		$query_args = array(
 			'action' => $action  );
 
 		//merge extra_request args but make sure our original action takes precedence and doesn't get overwritten.
-		if ( !empty($extra_request) )
-			$query_args = array_merge( $extra_request, $query_args );
+		if ( ! empty($extra_request))
+			$query_args = array_merge($extra_request, $query_args);
 
-		$url = self::add_query_args_and_nonce( $query_args, $_base_url, false, $exclude_nonce );
+		$url = self::add_query_args_and_nonce($query_args, $_base_url, false, $exclude_nonce);
 
-		$button = EEH_Template::get_button_or_link( $url, $this->_labels['buttons'][$type], $class );
+		$button = EEH_Template::get_button_or_link($url, $this->_labels['buttons'][$type], $class);
 
 		return $button;
 	}
@@ -3029,11 +3029,11 @@ 
 		$args = array(
 			'label' => $this->_admin_page_title,
 			'default' => 10,
-			'option' => $this->_current_page . '_' . $this->_current_view . '_per_page'
+			'option' => $this->_current_page.'_'.$this->_current_view.'_per_page'
 			);
 		//ONLY add the screen option if the user has access to it.
-		if ( $this->check_user_access( $this->_current_view, true ) ) {
-			add_screen_option( $option, $args );
+		if ($this->check_user_access($this->_current_view, true)) {
+			add_screen_option($option, $args);
 		}
 	}
 
@@ -3049,36 +3049,36 @@ 
 	 * @return void
 	 */
 	private function _set_per_page_screen_options() {
-		if ( isset($_POST['wp_screen_options']) && is_array($_POST['wp_screen_options']) ) {
-			check_admin_referer( 'screen-options-nonce', 'screenoptionnonce' );
+		if (isset($_POST['wp_screen_options']) && is_array($_POST['wp_screen_options'])) {
+			check_admin_referer('screen-options-nonce', 'screenoptionnonce');
 
-			if ( !$user = wp_get_current_user() )
+			if ( ! $user = wp_get_current_user())
 			return;
 			$option = $_POST['wp_screen_options']['option'];
 			$value = $_POST['wp_screen_options']['value'];
 
-			if ( $option != sanitize_key( $option ) )
+			if ($option != sanitize_key($option))
 				return;
 
 			$map_option = $option;
 
 			$option = str_replace('-', '_', $option);
 
-			switch ( $map_option ) {
-				case $this->_current_page . '_' .  $this->_current_view . '_per_page':
+			switch ($map_option) {
+				case $this->_current_page.'_'.$this->_current_view.'_per_page':
 					$value = (int) $value;
-					if ( $value < 1 || $value > 999 )
+					if ($value < 1 || $value > 999)
 						return;
 					break;
 				default:
-					$value = apply_filters( 'FHEE__EE_Admin_Page___set_per_page_screen_options__value', false, $option, $value );
-					if ( false === $value )
+					$value = apply_filters('FHEE__EE_Admin_Page___set_per_page_screen_options__value', false, $option, $value);
+					if (false === $value)
 						return;
 					break;
 			}
 
 			update_user_meta($user->ID, $option, $value);
-			wp_safe_redirect( remove_query_arg( array('pagenum', 'apage', 'paged'), wp_get_referer() ) );
+			wp_safe_redirect(remove_query_arg(array('pagenum', 'apage', 'paged'), wp_get_referer()));
 			exit;
 		}
 	}
@@ -3089,8 +3089,8 @@ 
 	 * This just allows for setting the $_template_args property if it needs to be set outside the object
 	 * @param array $data array that will be assigned to template args.
 	 */
-	public function set_template_args( $data ) {
-		$this->_template_args = array_merge( $this->_template_args, (array) $data );
+	public function set_template_args($data) {
+		$this->_template_args = array_merge($this->_template_args, (array) $data);
 	}
 
 
@@ -3106,26 +3106,26 @@ 
 	 * @param bool $skip_route_verify Used to indicate we want to skip route verification.  This is usually ONLY used when we are adding a transient before page_routes have been defined.
 	 * @return void
 	 */
-	protected function _add_transient( $route, $data, $notices = FALSE, $skip_route_verify = FALSE ) {
+	protected function _add_transient($route, $data, $notices = FALSE, $skip_route_verify = FALSE) {
 		$user_id = get_current_user_id();
 
-		if ( !$skip_route_verify )
+		if ( ! $skip_route_verify)
 			$this->_verify_route($route);
 
 
 		//now let's set the string for what kind of transient we're setting
-		$transient = $notices ? 'ee_rte_n_tx_' . $route . '_' . $user_id : 'rte_tx_' . $route . '_' . $user_id;
-		$data = $notices ? array( 'notices' => $data ) : $data;
+		$transient = $notices ? 'ee_rte_n_tx_'.$route.'_'.$user_id : 'rte_tx_'.$route.'_'.$user_id;
+		$data = $notices ? array('notices' => $data) : $data;
 		//is there already a transient for this route?  If there is then let's ADD to that transient
-		$existing = is_multisite() && is_network_admin() ? get_site_transient( $transient ) : get_transient( $transient );
-		if ( $existing ) {
-			$data = array_merge( (array) $data, (array) $existing );
+		$existing = is_multisite() && is_network_admin() ? get_site_transient($transient) : get_transient($transient);
+		if ($existing) {
+			$data = array_merge((array) $data, (array) $existing);
 		}
 
-		if ( is_multisite() && is_network_admin() ) {
-			set_site_transient( $transient, $data, 8 );
+		if (is_multisite() && is_network_admin()) {
+			set_site_transient($transient, $data, 8);
 		} else {
-			set_transient( $transient, $data, 8 );
+			set_transient($transient, $data, 8);
 		}
 	}
 
@@ -3137,18 +3137,18 @@ 
 	 * @param bool $notices true we get notices transient. False we just return normal route transient
 	 * @return mixed data
 	 */
-	protected function _get_transient( $notices = FALSE, $route = FALSE ) {
+	protected function _get_transient($notices = FALSE, $route = FALSE) {
 		$user_id = get_current_user_id();
-		$route = !$route ? $this->_req_action : $route;
-		$transient = $notices ? 'ee_rte_n_tx_' . $route . '_' . $user_id : 'rte_tx_' . $route . '_' . $user_id;
-		$data = is_multisite() && is_network_admin() ? get_site_transient( $transient ) : get_transient( $transient );
+		$route = ! $route ? $this->_req_action : $route;
+		$transient = $notices ? 'ee_rte_n_tx_'.$route.'_'.$user_id : 'rte_tx_'.$route.'_'.$user_id;
+		$data = is_multisite() && is_network_admin() ? get_site_transient($transient) : get_transient($transient);
 		//delete transient after retrieval (just in case it hasn't expired);
-		if ( is_multisite() && is_network_admin() ) {
-			delete_site_transient( $transient );
+		if (is_multisite() && is_network_admin()) {
+			delete_site_transient($transient);
 		} else {
-			delete_transient( $transient );
+			delete_transient($transient);
 		}
-		return $notices && isset( $data['notices'] ) ? $data['notices'] : $data;
+		return $notices && isset($data['notices']) ? $data['notices'] : $data;
 	}
 
 
@@ -3165,12 +3165,12 @@ 
 
 		//retrieve all existing transients
 		$query = "SELECT option_name FROM $wpdb->options WHERE option_name LIKE '%rte_tx_%' OR option_name LIKE '%rte_n_tx_%'";
-		if ( $results = $wpdb->get_results( $query ) ) {
-			foreach ( $results as $result ) {
-				$transient = str_replace( '_transient_', '', $result->option_name );
-				get_transient( $transient );
-				if ( is_multisite() && is_network_admin() ) {
-					get_site_transient( $transient );
+		if ($results = $wpdb->get_results($query)) {
+			foreach ($results as $result) {
+				$transient = str_replace('_transient_', '', $result->option_name);
+				get_transient($transient);
+				if (is_multisite() && is_network_admin()) {
+					get_site_transient($transient);
 				}
 			}
 		}
@@ -3294,23 +3294,23 @@ 
 	 * @param string $line	line no where error occurred
 	 * @return boolean
 	 */
-	protected function _update_espresso_configuration( $tab, $config, $file = '', $func = '', $line = '' ) {
+	protected function _update_espresso_configuration($tab, $config, $file = '', $func = '', $line = '') {
 
 		//remove any options that are NOT going to be saved with the config settings.
-		if ( isset( $config->core->ee_ueip_optin ) ) {
+		if (isset($config->core->ee_ueip_optin)) {
 			$config->core->ee_ueip_has_notified = TRUE;
 			// TODO: remove the following two lines and make sure values are migrated from 3.1
-			update_option( 'ee_ueip_optin', $config->core->ee_ueip_optin);
-			update_option( 'ee_ueip_has_notified', TRUE );
+			update_option('ee_ueip_optin', $config->core->ee_ueip_optin);
+			update_option('ee_ueip_has_notified', TRUE);
 		}
 		// and save it (note we're also doing the network save here)
-		$net_saved = is_main_site() ? EE_Network_Config::instance()->update_config( FALSE, FALSE ) : TRUE;
-		$config_saved = EE_Config::instance()->update_espresso_config( FALSE, FALSE );
-		if ( $config_saved && $net_saved ) {
-			EE_Error::add_success( sprintf( __('"%s" have been successfully updated.', 'event_espresso'), $tab ));
+		$net_saved = is_main_site() ? EE_Network_Config::instance()->update_config(FALSE, FALSE) : TRUE;
+		$config_saved = EE_Config::instance()->update_espresso_config(FALSE, FALSE);
+		if ($config_saved && $net_saved) {
+			EE_Error::add_success(sprintf(__('"%s" have been successfully updated.', 'event_espresso'), $tab));
 			return TRUE;
 		} else {
-			EE_Error::add_error( sprintf( __('The "%s" were not updated.', 'event_espresso'), $tab ), $file, $func, $line  );
+			EE_Error::add_error(sprintf(__('The "%s" were not updated.', 'event_espresso'), $tab), $file, $func, $line);
 			return FALSE;
 		}
 	}
@@ -3323,7 +3323,7 @@ 
 	 * Returns an array to be used for EE_FOrm_Fields.helper.php's select_input as the $values argument.
 	 * @return array
 	 */
-	public function get_yes_no_values(){
+	public function get_yes_no_values() {
 		return $this->_yes_no_values;
 	}
 
@@ -3345,8 +3345,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function _next_link( $url, $class = 'dashicons dashicons-arrow-right' ) {
-		return '<a class="' . $class . '" href="' . $url . '"></a>';
+	protected function _next_link($url, $class = 'dashicons dashicons-arrow-right') {
+		return '<a class="'.$class.'" href="'.$url.'"></a>';
 	}
 
 
@@ -3360,8 +3360,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function _previous_link( $url, $class = 'dashicons dashicons-arrow-left' ) {
-		return '<a class="' . $class . '" href="' . $url . '"></a>';
+	protected function _previous_link($url, $class = 'dashicons dashicons-arrow-left') {
+		return '<a class="'.$class.'" href="'.$url.'"></a>';
 	}
 
 
@@ -3380,8 +3380,8 @@ 
 	 * @return bool success/fail
 	 */
 	protected function _process_resend_registration() {
-		$this->_template_args['success'] = EED_Messages::process_resend( $this->_req_data );
-		do_action( 'AHEE__EE_Admin_Page___process_resend_registration', $this->_template_args['success'], $this->_req_data );
+		$this->_template_args['success'] = EED_Messages::process_resend($this->_req_data);
+		do_action('AHEE__EE_Admin_Page___process_resend_registration', $this->_template_args['success'], $this->_req_data);
 		return $this->_template_args['success'];
 	}
 
@@ -3394,9 +3394,9 @@ 
 	 * @param \EE_Payment $payment
 	 * @return bool success/fail
 	 */
-	protected function _process_payment_notification( EE_Payment $payment ) {
-		add_filter( 'FHEE__EE_Payment_Processor__process_registration_payments__display_notifications', '__return_true' );
-		$success = apply_filters( 'FHEE__EE_Admin_Page___process_admin_payment_notification__success', FALSE, $payment );
+	protected function _process_payment_notification(EE_Payment $payment) {
+		add_filter('FHEE__EE_Payment_Processor__process_registration_payments__display_notifications', '__return_true');
+		$success = apply_filters('FHEE__EE_Admin_Page___process_admin_payment_notification__success', FALSE, $payment);
 		$this->_template_args['success'] = $success;
 		return $success;
 	}

core/admin/EE_Admin_Page_Menu_Map.core.php

Doc Comments +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
 	 *
 	 * @param  array $menu_args  An array of arguments used to setup the menu
 	 *                           		properties on construct.
-	 * @param  array $required   	An array of keys that should be in the $menu_args, this
+	 * @param  string[] $required   	An array of keys that should be in the $menu_args, this
 	 *                            		is used to validate that the items that should be defined
 	 *                            		are present.
 	 * @return void

Spacing +39 added lines, -39 removed lines

@@ -15,7 +15,7 @@ 
  * @package 		Event Espresso
  * @subpackage 	admin
  */
-abstract class EE_Admin_Page_Menu_Map  {
+abstract class EE_Admin_Page_Menu_Map {
 
 
 	/**
@@ -155,28 +155,28 @@ 
 	 *                            		are present.
 	 * @return void
 	 */
-	public function __construct( $menu_args, $required ) {
+	public function __construct($menu_args, $required) {
 		//filter all args before processing so plugins can manipulate various settings for menus.
-		$menu_args = apply_filters( 'FHEE__EE_Admin_Page_Menu_Map__construct__menu_args', $menu_args, $required, get_class( $this ) );
+		$menu_args = apply_filters('FHEE__EE_Admin_Page_Menu_Map__construct__menu_args', $menu_args, $required, get_class($this));
 
 
 		//verify that required keys are present in the incoming array.
-		$missing = array_diff( (array) $required, array_keys( (array) $menu_args ) );
+		$missing = array_diff((array) $required, array_keys((array) $menu_args));
 
-		if ( !empty( $missing ) ) {
-			throw new EE_Error( sprintf( __('%s is missing some expected keys in the argument array.  The following keys are missing: %s', 'event_espresso'), get_class( $this ), implode(', ', $missing ) ) );
+		if ( ! empty($missing)) {
+			throw new EE_Error(sprintf(__('%s is missing some expected keys in the argument array.  The following keys are missing: %s', 'event_espresso'), get_class($this), implode(', ', $missing)));
 		}
 
 		//made it here okay, so let's set the properties!
-		foreach ( $menu_args as $prop => $value ) {
+		foreach ($menu_args as $prop => $value) {
 
-			switch ( $prop ) {
+			switch ($prop) {
 				case 'show_on_menu' :
 					$value = (int) $value;
 					break;
 				case 'admin_init_page' :
-					if ( in_array( 'admin_init_page', $required ) && ! $value instanceof EE_Admin_Page_Init ) {
-						throw new EE_Error( sprintf( __('The value for the "admin_init_page" argument must be an instance of an EE_Admin_Page_Init object.  Instead %s was given as the value.', 'event_espresso'), print_r($value, TRUE) ) );
+					if (in_array('admin_init_page', $required) && ! $value instanceof EE_Admin_Page_Init) {
+						throw new EE_Error(sprintf(__('The value for the "admin_init_page" argument must be an instance of an EE_Admin_Page_Init object.  Instead %s was given as the value.', 'event_espresso'), print_r($value, TRUE)));
 					}
 					break;
 				case 'menu_callback' :
@@ -187,24 +187,24 @@ 
 					break;
 
 			}
-			if ( ! EEH_Class_Tools::has_property( $this, $prop ) )
-				throw new EE_Error( sprintf( __('The $menu_args coming into %s has a index key (%s) representing a property that is not defined by the class.  Perhaps there is a typo?', 'event_espresso'), get_class( $this ), $prop ) );
+			if ( ! EEH_Class_Tools::has_property($this, $prop))
+				throw new EE_Error(sprintf(__('The $menu_args coming into %s has a index key (%s) representing a property that is not defined by the class.  Perhaps there is a typo?', 'event_espresso'), get_class($this), $prop));
 			$this->{$prop} = $value;
 
 		}
 
 		//filter capabilities (both static and dynamic)
-		$this->capability = apply_filters( 'FHEE_management_capability', $this->capability, NULL );
-		$this->capability = apply_filters( 'FHEE_' . $this->menu_slug . '_capability', $this->capability, NULL );
+		$this->capability = apply_filters('FHEE_management_capability', $this->capability, NULL);
+		$this->capability = apply_filters('FHEE_'.$this->menu_slug.'_capability', $this->capability, NULL);
 
 		//Might need to change parent slug depending on maintenance mode.
-		if ( ! empty( $this->maintenance_mode_parent ) && EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance )  {
+		if ( ! empty($this->maintenance_mode_parent) && EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
 			$this->parent_slug = $this->maintenance_mode_parent;
 		}
 
 		//if empty menu_callback let's set default (but only if we have admin page init object)
-		if ( empty( $this->menu_callback ) && $this->admin_init_page instanceof EE_Admin_Page_Init )
-			$this->menu_callback = array( $this->admin_init_page, 'initialize_admin_page' );
+		if (empty($this->menu_callback) && $this->admin_init_page instanceof EE_Admin_Page_Init)
+			$this->menu_callback = array($this->admin_init_page, 'initialize_admin_page');
 
 	}
 
@@ -226,21 +226,21 @@ 
 	 * @param boolean $network_admin whether this is being added to the network admin page or not
 	 * @since  4.4.0
 	 */
-	public function add_menu_page( $network_admin = FALSE ) {
+	public function add_menu_page($network_admin = FALSE) {
 
 		$show_on_menu_int = (int) $this->show_on_menu;
-		if( ( $network_admin && in_array( $show_on_menu_int, array( self::BLOG_AND_NETWORK_ADMIN, self::NETWORK_ADMIN_ONLY ), TRUE ) )
+		if (($network_admin && in_array($show_on_menu_int, array(self::BLOG_AND_NETWORK_ADMIN, self::NETWORK_ADMIN_ONLY), TRUE))
 				||
-			( ! $network_admin && in_array( $show_on_menu_int, array( self::BLOG_AND_NETWORK_ADMIN, self::BLOG_ADMIN_ONLY ), TRUE )) ){
+			( ! $network_admin && in_array($show_on_menu_int, array(self::BLOG_AND_NETWORK_ADMIN, self::BLOG_ADMIN_ONLY), TRUE))) {
 			$wp_page_slug = $this->_add_menu_page();
-		}else{
+		} else {
 			$wp_page_slug = '';
 		}
 
-		if ( !empty( $wp_page_slug ) && $this->admin_init_page instanceof EE_Admin_Page_Init ) {
+		if ( ! empty($wp_page_slug) && $this->admin_init_page instanceof EE_Admin_Page_Init) {
 			try {
-				$this->admin_init_page->set_page_dependencies( $wp_page_slug );
-			} catch( EE_Error $e ) {
+				$this->admin_init_page->set_page_dependencies($wp_page_slug);
+			} catch (EE_Error $e) {
 				$e->get_error();
 			}
 		}
@@ -293,12 +293,12 @@ 
 	public $position;
 
 
-	public function __construct( $menu_args ) {
-		$required = array( 'menu_label', 'parent_slug', 'menu_slug', 'menu_group', 'menu_order', 'admin_init_page');
+	public function __construct($menu_args) {
+		$required = array('menu_label', 'parent_slug', 'menu_slug', 'menu_group', 'menu_order', 'admin_init_page');
 
-		parent::__construct( $menu_args, $required );
+		parent::__construct($menu_args, $required);
 
-		$this->position = ! empty( $this->position ) ? (int) $this->position : $this->position;
+		$this->position = ! empty($this->position) ? (int) $this->position : $this->position;
 	}
 
 
@@ -306,9 +306,9 @@ 
 	 * Uses the proper WP utility for registering a menu page for the main WP pages.
 	 */
 	protected function _add_menu_page() {
-		$main =  add_menu_page( $this->title, $this->menu_label, $this->capability, $this->parent_slug, $this->menu_callback, $this->icon_url, $this->position );
-		if ( ! empty( $this->subtitle ) ) {
-			add_submenu_page( $this->parent_slug, $this->subtitle, $this->subtitle, $this->capability, $this->menu_slug, $this->menu_callback );
+		$main = add_menu_page($this->title, $this->menu_label, $this->capability, $this->parent_slug, $this->menu_callback, $this->icon_url, $this->position);
+		if ( ! empty($this->subtitle)) {
+			add_submenu_page($this->parent_slug, $this->subtitle, $this->subtitle, $this->capability, $this->menu_slug, $this->menu_callback);
 		}
 		return $main;
 	}
@@ -325,13 +325,13 @@ 
  */
 class EE_Admin_Page_Sub_Menu extends EE_Admin_Page_Main_Menu {
 
-	public function __construct( $menu_args ) {
-		parent::__construct( $menu_args );
+	public function __construct($menu_args) {
+		parent::__construct($menu_args);
 	}
 
 
 	protected function _add_menu_page() {
-		return add_submenu_page( $this->parent_slug, $this->title, $this->menu_label, $this->capability, $this->menu_slug, $this->menu_callback );
+		return add_submenu_page($this->parent_slug, $this->title, $this->menu_label, $this->capability, $this->menu_slug, $this->menu_callback);
 	}
 
 } //end class EE_Admin_Page_Menu_Map
@@ -352,18 +352,18 @@ 
 
 
 
-	public function __construct( $menu_args = array() ) {
-		$required = array( 'menu_label', 'menu_slug', 'menu_order', 'parent_slug' );
-		parent::__construct( $menu_args, $required );
+	public function __construct($menu_args = array()) {
+		$required = array('menu_label', 'menu_slug', 'menu_order', 'parent_slug');
+		parent::__construct($menu_args, $required);
 	}
 
 
 	protected function _add_menu_page() {
-		return add_submenu_page( $this->parent_slug, $this->menu_label, $this->_group_link(), $this->capability, $this->menu_slug, '__return_false' );
+		return add_submenu_page($this->parent_slug, $this->menu_label, $this->_group_link(), $this->capability, $this->menu_slug, '__return_false');
 	}
 
 
 	private function _group_link() {
-		return '<span class="ee_menu_group"  onclick="return false;">' . $this->menu_label . '</span>';
+		return '<span class="ee_menu_group"  onclick="return false;">'.$this->menu_label.'</span>';
 	}
 } //end EE_Admin_Page_Menu_Group

Braces +7 added lines, -5 removed lines

@@ -187,8 +187,9 @@ 
 					break;
 
 			}
-			if ( ! EEH_Class_Tools::has_property( $this, $prop ) )
-				throw new EE_Error( sprintf( __('The $menu_args coming into %s has a index key (%s) representing a property that is not defined by the class.  Perhaps there is a typo?', 'event_espresso'), get_class( $this ), $prop ) );
+			if ( ! EEH_Class_Tools::has_property( $this, $prop ) ) {
+							throw new EE_Error( sprintf( __('The $menu_args coming into %s has a index key (%s) representing a property that is not defined by the class.  Perhaps there is a typo?', 'event_espresso'), get_class( $this ), $prop ) );
+			}
 			$this->{$prop} = $value;
 
 		}
@@ -203,8 +204,9 @@ 
 		}
 
 		//if empty menu_callback let's set default (but only if we have admin page init object)
-		if ( empty( $this->menu_callback ) && $this->admin_init_page instanceof EE_Admin_Page_Init )
-			$this->menu_callback = array( $this->admin_init_page, 'initialize_admin_page' );
+		if ( empty( $this->menu_callback ) && $this->admin_init_page instanceof EE_Admin_Page_Init ) {
+					$this->menu_callback = array( $this->admin_init_page, 'initialize_admin_page' );
+		}
 
 	}
 
@@ -233,7 +235,7 @@ 
 				||
 			( ! $network_admin && in_array( $show_on_menu_int, array( self::BLOG_AND_NETWORK_ADMIN, self::BLOG_ADMIN_ONLY ), TRUE )) ){
 			$wp_page_slug = $this->_add_menu_page();
-		}else{
+		} else{
 			$wp_page_slug = '';
 		}
 

core/admin/EE_Help_Tour.core.php

Doc Comments +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
 	 *
 	 * @access public
 	 * @param boolean $caf used to indicate if this tour is happening on caf install or not.
-	 * @return void
+	 * @return EE_Help_Tour
 	 */
 	public function __construct($caf = FALSE) {
 		$this->_is_caf = $caf;

Spacing +35 added lines, -35 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -115,7 +115,7 @@ 
 	 */
 	public function __construct($caf = FALSE) {
 		$this->_is_caf = $caf;
-		$this->_req_data = array_merge( $_GET, $_POST );
+		$this->_req_data = array_merge($_GET, $_POST);
 		$this->_set_tour_properties();
 		$this->_set_tour_stops();
 		$this->_set_tour_options();
@@ -158,36 +158,36 @@ 
 	 * @access protected
 	 * @return void
 	 */
-	protected function _set_tour_options( $options = array() ) {
+	protected function _set_tour_options($options = array()) {
 		$defaults = array(
-			'tipLocation' => 'bottom',         // 'top', 'bottom', 'right', 'left' in relation to parent
-		  	'nubPosition' => 'auto',           // override on a per tooltip bases. can be "auto", "right", "top", "bottom", "left"
-		  	'tipAdjustmentY' => 0, 			//allow for adjustment of tip
-		  	'tipAdjustmentX' => 0,			//allow for adjustment of tip
+			'tipLocation' => 'bottom', // 'top', 'bottom', 'right', 'left' in relation to parent
+		  	'nubPosition' => 'auto', // override on a per tooltip bases. can be "auto", "right", "top", "bottom", "left"
+		  	'tipAdjustmentY' => 0, //allow for adjustment of tip
+		  	'tipAdjustmentX' => 0, //allow for adjustment of tip
 		  	'scroll' => true, //whether to scrollTo the next step or not
-		  	'scrollSpeed' => 300,              // Page scrolling speed in ms
-		  	'timer' => 0,	                // 0 = off, all other numbers = time(ms)
-		  	'autoStart' => true,			// true or false - false tour starts when restart called
-		  	'startTimerOnClick' => true,       // true/false to start timer on first click
-		  	'nextButton' => true,              // true/false for next button visibility
+		  	'scrollSpeed' => 300, // Page scrolling speed in ms
+		  	'timer' => 0, // 0 = off, all other numbers = time(ms)
+		  	'autoStart' => true, // true or false - false tour starts when restart called
+		  	'startTimerOnClick' => true, // true/false to start timer on first click
+		  	'nextButton' => true, // true/false for next button visibility
 		  	'button_text' => __('Next', 'event_espresso'),
-		  	'tipAnimation' => 'fade',           // 'pop' or 'fade' in each tip
-		  	'pauseAfter' => array(),                // array of indexes where to pause the tour after
-		  	'tipAnimationFadeSpeed' => 300,    // if 'fade'- speed in ms of transition
-		  	'cookieMonster' => true,           // true/false for whether cookies are used
-		  	'cookieName' => $this->get_slug(),         // choose your own cookie name (setup will add the prefix for the specific page joyride)
-	  		'cookieDomain' => false,           // set to false or yoursite.com
+		  	'tipAnimation' => 'fade', // 'pop' or 'fade' in each tip
+		  	'pauseAfter' => array(), // array of indexes where to pause the tour after
+		  	'tipAnimationFadeSpeed' => 300, // if 'fade'- speed in ms of transition
+		  	'cookieMonster' => true, // true/false for whether cookies are used
+		  	'cookieName' => $this->get_slug(), // choose your own cookie name (setup will add the prefix for the specific page joyride)
+	  		'cookieDomain' => false, // set to false or yoursite.com
 		  	//'tipContainer' => 'body',            // Where the tip be attached if not inline
-		  	'modal' => false, 					// Whether to cover page with modal during the tour
-		  	'expose' => false,					// Whether to expose the elements at each step in the tour (requires modal:true),
-		  	'postExposeCallback' => 'EEHelpTour.postExposeCallback',    // A method to call after an element has been exposed
-		  	'preRideCallback' => 'EEHelpTour_preRideCallback',    // A method to call before the tour starts (passed index, tip, and cloned exposed element)
-		  	'postRideCallback' => 'EEHelpTour_postRideCallback',       // a method to call once the tour closes.  This will correspond to the name of a js method that will have to be defined in loaded js.
-		  	'preStepCallback' => 'EEHelpTour_preStepCallback',    // A method to call before each step
-		  	'postStepCallback' => 'EEHelpTour_postStepCallback',        // A method to call after each step (remember this will correspond with a js method that you will have to define in a js file BEFORE ee-help-tour.js loads, if the default methods do not exist, then ee-help-tour.js just substitues empty functions $.noop)/**/
+		  	'modal' => false, // Whether to cover page with modal during the tour
+		  	'expose' => false, // Whether to expose the elements at each step in the tour (requires modal:true),
+		  	'postExposeCallback' => 'EEHelpTour.postExposeCallback', // A method to call after an element has been exposed
+		  	'preRideCallback' => 'EEHelpTour_preRideCallback', // A method to call before the tour starts (passed index, tip, and cloned exposed element)
+		  	'postRideCallback' => 'EEHelpTour_postRideCallback', // a method to call once the tour closes.  This will correspond to the name of a js method that will have to be defined in loaded js.
+		  	'preStepCallback' => 'EEHelpTour_preStepCallback', // A method to call before each step
+		  	'postStepCallback' => 'EEHelpTour_postStepCallback', // A method to call after each step (remember this will correspond with a js method that you will have to define in a js file BEFORE ee-help-tour.js loads, if the default methods do not exist, then ee-help-tour.js just substitues empty functions $.noop)/**/
 			);
 
-		$options = !empty( $options ) && is_array($options)  ? array_merge( $defaults, $options ) : $defaults;
+		$options = ! empty($options) && is_array($options) ? array_merge($defaults, $options) : $defaults;
 		$this->_options = $options;
 	}
 
@@ -202,8 +202,8 @@ 
 	 * @return string slug for the tour
 	 */
 	public function get_slug() {
-		if ( empty( $this->_slug ) )
-			throw new EE_Error( sprintf(__('There is no slug set for the help tour class (%s). Make sure that the $_slug property is set in the class constructor', 'event_espresso'), get_class($this) ) );
+		if (empty($this->_slug))
+			throw new EE_Error(sprintf(__('There is no slug set for the help tour class (%s). Make sure that the $_slug property is set in the class constructor', 'event_espresso'), get_class($this)));
 		return $this->_slug;
 	}
 
@@ -215,8 +215,8 @@ 
 	 * @return string
 	 */
 	public function get_label() {
-		if ( empty( $this->_label ) )
-			throw new EE_Error( sprintf( __('There is no label set for the help tour class (%s). Make sure that the $_label property is set in the class constructor', 'event_espresso'), get_class($this) ) );
+		if (empty($this->_label))
+			throw new EE_Error(sprintf(__('There is no label set for the help tour class (%s). Make sure that the $_label property is set in the class constructor', 'event_espresso'), get_class($this)));
 		return $this->_label;
 	}
 
@@ -227,8 +227,8 @@ 
 	 * @return array
 	 */
 	public function get_stops() {
-		foreach( $this->_stops as $ind => $stop ) {
-			if ( ! isset( $stop['button_text'] ) ) {
+		foreach ($this->_stops as $ind => $stop) {
+			if ( ! isset($stop['button_text'])) {
 				$this->_stops[$ind]['button_text'] = $this->_options['button_text'];
 			}
 		}
@@ -243,12 +243,12 @@ 
 	 */
 	public function get_options() {
 		//let's make sure there are not pauses set
-		foreach ( $this->_stops as $ind => $stop ) {
-			if ( isset( $stop['pause_after'] ) && $stop['pause_after'] ) {
+		foreach ($this->_stops as $ind => $stop) {
+			if (isset($stop['pause_after']) && $stop['pause_after']) {
 				$this->_options['pauseAfter'][] = $ind;
 			}
 		}
-		return apply_filters( 'FHEE__' . get_class($this) . '__get_options', $this->_options, $this );
+		return apply_filters('FHEE__'.get_class($this).'__get_options', $this->_options, $this);
 	}
 
 }

Braces +8 added lines, -5 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -202,8 +203,9 @@ 
 	 * @return string slug for the tour
 	 */
 	public function get_slug() {
-		if ( empty( $this->_slug ) )
-			throw new EE_Error( sprintf(__('There is no slug set for the help tour class (%s). Make sure that the $_slug property is set in the class constructor', 'event_espresso'), get_class($this) ) );
+		if ( empty( $this->_slug ) ) {
+					throw new EE_Error( sprintf(__('There is no slug set for the help tour class (%s). Make sure that the $_slug property is set in the class constructor', 'event_espresso'), get_class($this) ) );
+		}
 		return $this->_slug;
 	}
 
@@ -215,8 +217,9 @@ 
 	 * @return string
 	 */
 	public function get_label() {
-		if ( empty( $this->_label ) )
-			throw new EE_Error( sprintf( __('There is no label set for the help tour class (%s). Make sure that the $_label property is set in the class constructor', 'event_espresso'), get_class($this) ) );
+		if ( empty( $this->_label ) ) {
+					throw new EE_Error( sprintf( __('There is no label set for the help tour class (%s). Make sure that the $_label property is set in the class constructor', 'event_espresso'), get_class($this) ) );
+		}
 		return $this->_label;
 	}
 

core/business/EE_Registration_Processor.class.php

Doc Comments +1 added lines

@@ -161,6 +161,7 @@
 	 *
 	 * @param int           $att_nmbr
 	 * @param EE_Line_Item | string $item
+	 * @param EE_Line_Item $item
 	 * @return string
 	 */
 	public function generate_reg_url_link( $att_nmbr, $item ) {

Braces +2 added lines, -2 removed lines

@@ -121,11 +121,11 @@
 		//ok now find this new registration's final price
 		if( isset( $this->_reg_final_price_per_tkt_line_item[ $line_item->ID() ] ) ) {
 			$final_price = $this->_reg_final_price_per_tkt_line_item[ $line_item->ID() ] ;
-		}else{
+		} else{
 			$message = sprintf( __( 'The ticket line item (ID:%1$d) had no entry in the reg_final_price_per_tkt_line_item array.', 'event_espresso' ), $line_item->ID() );
 			if( WP_DEBUG ){
 				throw new EE_Error( $message );
-			}else{
+			} else{
 				EE_Log::instance()->log(__CLASS__, __FUNCTION__, $message );
 			}
 			$final_price = $ticket->get_ticket_total_with_taxes();

Spacing +106 added lines, -106 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
-EE_Registry::instance()->load_class( 'Processor_Base' );
+EE_Registry::instance()->load_class('Processor_Base');
 
 /**
  * Class EE_Registration_Processor
@@ -60,7 +60,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Registration_Processor ) {
+		if ( ! self::$_instance instanceof EE_Registration_Processor) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -96,37 +96,37 @@ 
 	 * @return \EE_Registration | null
 	 * @throws \EE_Error
 	 */
-	public function generate_ONE_registration_from_line_item( EE_Line_Item $line_item, EE_Transaction $transaction, $att_nmbr = 1, $total_ticket_count = 1 ) {
+	public function generate_ONE_registration_from_line_item(EE_Line_Item $line_item, EE_Transaction $transaction, $att_nmbr = 1, $total_ticket_count = 1) {
 		// grab the related ticket object for this line_item
 		$ticket = $line_item->ticket();
-		if ( ! $ticket instanceof EE_Ticket ) {
-			EE_Error::add_error( sprintf( __( "Line item %s did not contain a valid ticket", "event_espresso" ), $line_item->ID() ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $ticket instanceof EE_Ticket) {
+			EE_Error::add_error(sprintf(__("Line item %s did not contain a valid ticket", "event_espresso"), $line_item->ID()), __FILE__, __FUNCTION__, __LINE__);
 			return null;
 		}
-		$first_datetime = $ticket->get_first_related( 'Datetime' );
-		if ( ! $first_datetime instanceof EE_Datetime ) {
-			EE_Error::add_error( sprintf( __( "The ticket (%s) is not associated with any valid datetimes.", "event_espresso" ), $ticket->name() ), __FILE__, __FUNCTION__, __LINE__ );
+		$first_datetime = $ticket->get_first_related('Datetime');
+		if ( ! $first_datetime instanceof EE_Datetime) {
+			EE_Error::add_error(sprintf(__("The ticket (%s) is not associated with any valid datetimes.", "event_espresso"), $ticket->name()), __FILE__, __FUNCTION__, __LINE__);
 			return null;
 		}
-		$event = $first_datetime->get_first_related( 'Event' );
-		if ( ! $event instanceof EE_Event ) {
-			EE_Error::add_error( sprintf( __( "The ticket (%s) is not associated with a valid event.", "event_espresso" ), $ticket->name() ), __FILE__, __FUNCTION__, __LINE__ );
+		$event = $first_datetime->get_first_related('Event');
+		if ( ! $event instanceof EE_Event) {
+			EE_Error::add_error(sprintf(__("The ticket (%s) is not associated with a valid event.", "event_espresso"), $ticket->name()), __FILE__, __FUNCTION__, __LINE__);
 			return null;
 		}
-		$reg_url_link = $this->generate_reg_url_link( $att_nmbr, $line_item );
+		$reg_url_link = $this->generate_reg_url_link($att_nmbr, $line_item);
 
-		if( $this->_reg_final_price_per_tkt_line_item === null ) {
-			$this->_reg_final_price_per_tkt_line_item = EEH_Line_Item::calculate_reg_final_prices_per_line_item( $transaction->total_line_item() );
+		if ($this->_reg_final_price_per_tkt_line_item === null) {
+			$this->_reg_final_price_per_tkt_line_item = EEH_Line_Item::calculate_reg_final_prices_per_line_item($transaction->total_line_item());
 		}
 		//ok now find this new registration's final price
-		if( isset( $this->_reg_final_price_per_tkt_line_item[ $line_item->ID() ] ) ) {
-			$final_price = $this->_reg_final_price_per_tkt_line_item[ $line_item->ID() ] ;
-		}else{
-			$message = sprintf( __( 'The ticket line item (ID:%1$d) had no entry in the reg_final_price_per_tkt_line_item array.', 'event_espresso' ), $line_item->ID() );
-			if( WP_DEBUG ){
-				throw new EE_Error( $message );
-			}else{
-				EE_Log::instance()->log(__CLASS__, __FUNCTION__, $message );
+		if (isset($this->_reg_final_price_per_tkt_line_item[$line_item->ID()])) {
+			$final_price = $this->_reg_final_price_per_tkt_line_item[$line_item->ID()];
+		} else {
+			$message = sprintf(__('The ticket line item (ID:%1$d) had no entry in the reg_final_price_per_tkt_line_item array.', 'event_espresso'), $line_item->ID());
+			if (WP_DEBUG) {
+				throw new EE_Error($message);
+			} else {
+				EE_Log::instance()->log(__CLASS__, __FUNCTION__, $message);
 			}
 			$final_price = $ticket->get_ticket_total_with_taxes();
 
@@ -146,11 +146,11 @@ 
 				'REG_url_link'    => $reg_url_link
 			)
 		);
-		$registration->set_reg_code( $this->generate_reg_code( $registration ) );
+		$registration->set_reg_code($this->generate_reg_code($registration));
 		$registration->save();
-		$registration->_add_relation_to( $event, 'Event', array(), $event->ID() );
-		$registration->_add_relation_to( $line_item->ticket(), 'Ticket', array(), $line_item->ticket()->ID() );
-		$transaction->_add_relation_to( $registration, 'Registration' );
+		$registration->_add_relation_to($event, 'Event', array(), $event->ID());
+		$registration->_add_relation_to($line_item->ticket(), 'Ticket', array(), $line_item->ticket()->ID());
+		$transaction->_add_relation_to($registration, 'Registration');
 		return $registration;
 	}
 
@@ -163,9 +163,9 @@ 
 	 * @param EE_Line_Item | string $item
 	 * @return string
 	 */
-	public function generate_reg_url_link( $att_nmbr, $item ) {
+	public function generate_reg_url_link($att_nmbr, $item) {
 		$reg_url_link = $item instanceof EE_Line_Item ? $item->code() : $item;
-		$reg_url_link = $att_nmbr . '-' . md5( $reg_url_link . microtime() );
+		$reg_url_link = $att_nmbr.'-'.md5($reg_url_link.microtime());
 		return $reg_url_link;
 	}
 
@@ -177,18 +177,18 @@ 
 	 * @param \EE_Registration $registration
 	 * @return string
 	 */
-	public function generate_reg_code( EE_Registration $registration ) {
+	public function generate_reg_code(EE_Registration $registration) {
 	// figure out where to start parsing the reg code
-		$chars = strpos( $registration->reg_url_link(), '-' ) + 5;
+		$chars = strpos($registration->reg_url_link(), '-') + 5;
 		// TXN_ID + TKT_ID + first 3 and last 3 chars of reg_url_link
 		$new_reg_code = array(
 			$registration->transaction_ID(),
 			$registration->ticket_ID(),
-			substr( $registration->reg_url_link(), 0, $chars )
+			substr($registration->reg_url_link(), 0, $chars)
 		);
 		// now put it all together
-		$new_reg_code = implode( '-', $new_reg_code );
-		return apply_filters( 'FHEE__EE_Registration_Processor___generate_reg_code__new_reg_code', $new_reg_code, $registration );
+		$new_reg_code = implode('-', $new_reg_code);
+		return apply_filters('FHEE__EE_Registration_Processor___generate_reg_code__new_reg_code', $new_reg_code, $registration);
 	}
 
 
@@ -197,8 +197,8 @@ 
 	 * @param int $REG_ID
 	 * @return string
 	 */
-	public function old_reg_status( $REG_ID ) {
-		return isset( $this->_old_reg_status[ $REG_ID ] ) ? $this->_old_reg_status[ $REG_ID ] : null;
+	public function old_reg_status($REG_ID) {
+		return isset($this->_old_reg_status[$REG_ID]) ? $this->_old_reg_status[$REG_ID] : null;
 	}
 
 
@@ -207,10 +207,10 @@ 
 	 * @param int $REG_ID
 	 * @param string $old_reg_status
 	 */
-	public function set_old_reg_status( $REG_ID, $old_reg_status ) {
+	public function set_old_reg_status($REG_ID, $old_reg_status) {
 		// only set the first time
-		if ( ! isset( $this->_old_reg_status[ $REG_ID ] ) ) {
-			$this->_old_reg_status[ $REG_ID ] = $old_reg_status;
+		if ( ! isset($this->_old_reg_status[$REG_ID])) {
+			$this->_old_reg_status[$REG_ID] = $old_reg_status;
 		}
 	}
 
@@ -220,8 +220,8 @@ 
 	 * @param int $REG_ID
 	 * @return string
 	 */
-	public function new_reg_status( $REG_ID ) {
-		return isset( $this->_new_reg_status[ $REG_ID ] ) ? $this->_new_reg_status[ $REG_ID ] : null;
+	public function new_reg_status($REG_ID) {
+		return isset($this->_new_reg_status[$REG_ID]) ? $this->_new_reg_status[$REG_ID] : null;
 	}
 
 
@@ -230,8 +230,8 @@ 
 	 * @param int $REG_ID
 	 * @param string $new_reg_status
 	 */
-	public function set_new_reg_status( $REG_ID, $new_reg_status ) {
-		$this->_new_reg_status[ $REG_ID ] = $new_reg_status;
+	public function set_new_reg_status($REG_ID, $new_reg_status) {
+		$this->_new_reg_status[$REG_ID] = $new_reg_status;
 	}
 
 
@@ -242,8 +242,8 @@ 
 	 * @param int $REG_ID
 	 * @return bool
 	 */
-	public function reg_status_updated( $REG_ID ) {
-		return $this->new_reg_status( $REG_ID ) !== $this->old_reg_status( $REG_ID ) ? true : false;
+	public function reg_status_updated($REG_ID) {
+		return $this->new_reg_status($REG_ID) !== $this->old_reg_status($REG_ID) ? true : false;
 	}
 
 
@@ -257,19 +257,19 @@ 
 	 * @param bool 	$save TRUE will save the registration if the status is updated, FALSE will leave that up to client code
 	 * 	@return boolean
 	 */
-	public function manually_update_registration_status( EE_Registration $registration, $new_reg_status = '', $save = true ) {
+	public function manually_update_registration_status(EE_Registration $registration, $new_reg_status = '', $save = true) {
 		// set initial REG_Status
-		$this->set_old_reg_status( $registration->ID(), $registration->status_ID() );
+		$this->set_old_reg_status($registration->ID(), $registration->status_ID());
 		// set incoming REG_Status
-		$this->set_new_reg_status( $registration->ID(), $new_reg_status );
+		$this->set_new_reg_status($registration->ID(), $new_reg_status);
 		// toggle reg status but only if it has changed and the user can do so
 		if (
-			$this->reg_status_updated( $registration->ID() ) &&
-			EE_Registry::instance()->CAP->current_user_can( 'ee_edit_registration', 'toggle_registration_status', $registration->ID() )
+			$this->reg_status_updated($registration->ID()) &&
+			EE_Registry::instance()->CAP->current_user_can('ee_edit_registration', 'toggle_registration_status', $registration->ID())
 		) {
 			// change status to new value
-			if ( $registration->set_status( $this->new_reg_status( $registration->ID() ) )) {
-				if ( $save ) {
+			if ($registration->set_status($this->new_reg_status($registration->ID()))) {
+				if ($save) {
 					$registration->save();
 				}
 			}
@@ -290,27 +290,27 @@ 
 	 * @param bool 	$save TRUE will save the registration if the status is updated, FALSE will leave that up to client code
 	 * @return void
 	 */
-	public function toggle_incomplete_registration_status_to_default( EE_Registration $registration, $save = TRUE ) {
+	public function toggle_incomplete_registration_status_to_default(EE_Registration $registration, $save = TRUE) {
 		// set initial REG_Status
-		$this->set_old_reg_status( $registration->ID(), $registration->status_ID() );
+		$this->set_old_reg_status($registration->ID(), $registration->status_ID());
 		// is the registration currently incomplete ?
-		if ( $registration->status_ID() === EEM_Registration::status_id_incomplete ) {
+		if ($registration->status_ID() === EEM_Registration::status_id_incomplete) {
 			// grab default reg status for the event, if set
 			$event_default_registration_status = $registration->event()->default_registration_status();
 			// if no default reg status is set for the event, then use the global value
-			$STS_ID = ! empty( $event_default_registration_status ) ? $event_default_registration_status : EE_Registry::instance()->CFG->registration->default_STS_ID;
+			$STS_ID = ! empty($event_default_registration_status) ? $event_default_registration_status : EE_Registry::instance()->CFG->registration->default_STS_ID;
 			// if the event default reg status is approved, then downgrade temporarily to payment pending to ensure that payments are triggered
 			$STS_ID = $STS_ID === EEM_Registration::status_id_approved ? EEM_Registration::status_id_pending_payment : $STS_ID;
 			// set incoming REG_Status
-			$this->set_new_reg_status( $registration->ID(), $STS_ID );
-			$registration->set_status( $STS_ID );
-			if ( $save ) {
+			$this->set_new_reg_status($registration->ID(), $STS_ID);
+			$registration->set_status($STS_ID);
+			if ($save) {
 				$registration->save();
 			}
 			// don't trigger notifications during IPNs because they will get triggered by EE_Payment_Processor
-			if ( ! EE_Processor_Base::$IPN ) {
+			if ( ! EE_Processor_Base::$IPN) {
 				// otherwise, send out notifications
-				add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10 );
+				add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10);
 			}
 			// DEBUG LOG
 			//$this->log(
@@ -334,25 +334,25 @@ 
 	 * @param bool 	$save TRUE will save the registration if the status is updated, FALSE will leave that up to client code
 	 * @return boolean
 	 */
-	public function toggle_registration_status_for_default_approved_events( EE_Registration $registration, $save = TRUE ) {
+	public function toggle_registration_status_for_default_approved_events(EE_Registration $registration, $save = TRUE) {
 		// set initial REG_Status
-		$this->set_old_reg_status( $registration->ID(), $registration->status_ID() );
+		$this->set_old_reg_status($registration->ID(), $registration->status_ID());
 		// if not already, toggle reg status to approved IF the event default reg status is approved
 		if (
 			$registration->status_ID() !== EEM_Registration::status_id_approved &&
 			$registration->event()->default_registration_status() == EEM_Registration::status_id_approved
 		) {
 			// set incoming REG_Status
-			$this->set_new_reg_status( $registration->ID(), EEM_Registration::status_id_approved );
+			$this->set_new_reg_status($registration->ID(), EEM_Registration::status_id_approved);
 			// toggle status to approved
-			$registration->set_status( EEM_Registration::status_id_approved );
-			if ( $save ) {
+			$registration->set_status(EEM_Registration::status_id_approved);
+			if ($save) {
 				$registration->save();
 			}
 			// don't trigger notifications during IPNs because they will get triggered by EE_Payment_Processor
-			if ( ! EE_Processor_Base::$IPN ) {
+			if ( ! EE_Processor_Base::$IPN) {
 				// otherwise, send out notifications
-				add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10 );
+				add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10);
 			}
 			// DEBUG LOG
 			//$this->log(
@@ -380,19 +380,19 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function toggle_registration_status_if_no_monies_owing( EE_Registration $registration, $save = TRUE, $additional_details = array() ) {
+	public function toggle_registration_status_if_no_monies_owing(EE_Registration $registration, $save = TRUE, $additional_details = array()) {
 		// set initial REG_Status
-		$this->set_old_reg_status( $registration->ID(), $registration->status_ID() );
+		$this->set_old_reg_status($registration->ID(), $registration->status_ID());
 		//EEH_Debug_Tools::printr( $additional_details, '$additional_details', __FILE__, __LINE__ );
 		// was a payment just made ?
 		if (
-			isset( $additional_details[ 'payment_updates' ], $additional_details[ 'last_payment' ] ) &&
-			$additional_details[ 'payment_updates' ] &&
-			$additional_details[ 'last_payment' ] instanceof EE_Payment
+			isset($additional_details['payment_updates'], $additional_details['last_payment']) &&
+			$additional_details['payment_updates'] &&
+			$additional_details['last_payment'] instanceof EE_Payment
 		) {
-			$payment = $additional_details[ 'last_payment' ];
+			$payment = $additional_details['last_payment'];
 			$total_paid = 0;
-			foreach ( self::$_amount_paid as $reg => $amount_paid ) {
+			foreach (self::$_amount_paid as $reg => $amount_paid) {
 				$total_paid += $amount_paid;
 			}
 		} else {
@@ -416,30 +416,30 @@ 
 					$registration->transaction()->is_completed() ||
 					$registration->transaction()->is_overpaid() ||
 					$registration->transaction()->is_free() ||
-					apply_filters( 'FHEE__EE_Registration_Processor__toggle_registration_status_if_no_monies_owing', false, $registration )
+					apply_filters('FHEE__EE_Registration_Processor__toggle_registration_status_if_no_monies_owing', false, $registration)
 				) || (
 					$payment instanceof EE_Payment &&
 					$payment->is_approved() &&
 					// this specific registration has not yet been paid for
-					! isset( self::$_amount_paid[ $registration->ID() ] ) &&
+					! isset(self::$_amount_paid[$registration->ID()]) &&
 					// payment amount, less what we have already attributed to other registrations, is greater than this reg's final price
 					$payment->amount() - $total_paid >= $registration->final_price()
 				)
 			)
 		) {
 			// mark as paid
-			self::$_amount_paid[ $registration->ID() ] = $registration->final_price();
+			self::$_amount_paid[$registration->ID()] = $registration->final_price();
 			// track new REG_Status
-			$this->set_new_reg_status( $registration->ID(), EEM_Registration::status_id_approved );
+			$this->set_new_reg_status($registration->ID(), EEM_Registration::status_id_approved);
 			// toggle status to approved
-			$registration->set_status( EEM_Registration::status_id_approved );
-			if ( $save ) {
+			$registration->set_status(EEM_Registration::status_id_approved);
+			if ($save) {
 				$registration->save();
 			}
 			// don't trigger notifications during IPNs because they will get triggered by EE_Payment_Processor
-			if ( ! EE_Processor_Base::$IPN ) {
+			if ( ! EE_Processor_Base::$IPN) {
 				// otherwise, send out notifications
-				add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10 );
+				add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10);
 			}
 			// DEBUG LOG
 			//$this->log(
@@ -465,20 +465,20 @@ 
 	 * @param array 	$additional_details
 	 * @return void
 	 */
-	public function trigger_registration_update_notifications( $registration, $additional_details = array() ) {
+	public function trigger_registration_update_notifications($registration, $additional_details = array()) {
 		try {
-			if ( ! $registration instanceof EE_Registration ) {
-				throw new EE_Error( __( 'An invalid registration was received.', 'event_espresso' ) );
+			if ( ! $registration instanceof EE_Registration) {
+				throw new EE_Error(__('An invalid registration was received.', 'event_espresso'));
 			}
-			EE_Registry::instance()->load_helper( 'Debug_Tools' );
-			EEH_Debug_Tools::log( __CLASS__, __FUNCTION__, __LINE__, array( $registration->transaction(), $additional_details ), false, 'EE_Transaction: ' . $registration->transaction()->ID() );
+			EE_Registry::instance()->load_helper('Debug_Tools');
+			EEH_Debug_Tools::log(__CLASS__, __FUNCTION__, __LINE__, array($registration->transaction(), $additional_details), false, 'EE_Transaction: '.$registration->transaction()->ID());
 			do_action(
 				'AHEE__EE_Registration_Processor__trigger_registration_update_notifications',
 				$registration,
 				$additional_details
 			);
-		} catch( Exception $e ) {
-			EE_Error::add_error( $e->getMessage(), $e->getFile(), 'unknown_function_from_exception', $e->getLine() );
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), $e->getFile(), 'unknown_function_from_exception', $e->getLine());
 		}
 	}
 
@@ -491,18 +491,18 @@ 
 	 * @param array 	$additional_details
 	 * @return bool
 	 */
-	public function update_registration_after_checkout_or_payment(  EE_Registration $registration, $additional_details = array() ) {
+	public function update_registration_after_checkout_or_payment(EE_Registration $registration, $additional_details = array()) {
 		// set initial REG_Status
-		$this->set_old_reg_status( $registration->ID(), $registration->status_ID() );
+		$this->set_old_reg_status($registration->ID(), $registration->status_ID());
 
 		// if the registration status gets updated, then save the registration
-		if ( $this->toggle_registration_status_for_default_approved_events( $registration, false ) || $this->toggle_registration_status_if_no_monies_owing( $registration, false, $additional_details )) {
+		if ($this->toggle_registration_status_for_default_approved_events($registration, false) || $this->toggle_registration_status_if_no_monies_owing($registration, false, $additional_details)) {
 			$registration->save();
 		}
 
 		// set new  REG_Status
-		$this->set_new_reg_status( $registration->ID(), $registration->status_ID() );
-		return $this->reg_status_updated( $registration->ID() ) && $this->new_reg_status( $registration->ID() ) == EEM_Registration::status_id_approved ? true : false;
+		$this->set_new_reg_status($registration->ID(), $registration->status_ID());
+		return $this->reg_status_updated($registration->ID()) && $this->new_reg_status($registration->ID()) == EEM_Registration::status_id_approved ? true : false;
 	}
 
 	/**
@@ -512,19 +512,19 @@ 
 	 * @param boolean $save_regs whether to immediately save registrations in this function or not
 	 * @return void
 	 */
-	public function update_registration_final_prices( $transaction, $save_regs = true ) {
-		$reg_final_price_per_ticket_line_item = EEH_Line_Item::calculate_reg_final_prices_per_line_item( $transaction->total_line_item() );
-		foreach( $transaction->registrations() as $registration ) {
-			$line_item = EEM_Line_Item::instance()->get_line_item_for_registration( $registration );
-			if( isset( $reg_final_price_per_ticket_line_item[ $line_item->ID() ] ) ) {
-				$registration->set_final_price( $reg_final_price_per_ticket_line_item[ $line_item->ID() ] );
-				if( $save_regs ) {
+	public function update_registration_final_prices($transaction, $save_regs = true) {
+		$reg_final_price_per_ticket_line_item = EEH_Line_Item::calculate_reg_final_prices_per_line_item($transaction->total_line_item());
+		foreach ($transaction->registrations() as $registration) {
+			$line_item = EEM_Line_Item::instance()->get_line_item_for_registration($registration);
+			if (isset($reg_final_price_per_ticket_line_item[$line_item->ID()])) {
+				$registration->set_final_price($reg_final_price_per_ticket_line_item[$line_item->ID()]);
+				if ($save_regs) {
 					$registration->save();
 				}
 			}
 		}
 		//and make sure there's no rounding problem
-		$this->fix_reg_final_price_rounding_issue( $transaction );
+		$this->fix_reg_final_price_rounding_issue($transaction);
 	}
 
 	/**
@@ -540,7 +540,7 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return boolean success verifying that there is NO difference after this method is done
 	 */
-	public function fix_reg_final_price_rounding_issue( $transaction ) {
+	public function fix_reg_final_price_rounding_issue($transaction) {
 		$reg_final_price_sum = EEM_Registration::instance()->sum(
 			array(
 				array(
@@ -549,9 +549,9 @@ 
 			),
 			'REG_final_price'
 		);
-		$diff =  $transaction->total() - floatval( $reg_final_price_sum );
+		$diff = $transaction->total() - floatval($reg_final_price_sum);
 		//ok then, just grab one of the registrations
-		if( $diff != 0 ) {
+		if ($diff != 0) {
 			$a_reg = EEM_Registration::instance()->get_one(
 					array(
 						array(
@@ -560,7 +560,7 @@ 
 					));
 			$success = $a_reg instanceof EE_Registration ? $a_reg->save(
 				array(
-					'REG_final_price' => ( $a_reg->final_price() + $diff )
+					'REG_final_price' => ($a_reg->final_price() + $diff)
 				)
 			) : false;
 			return $success ? true : false;

core/business/EE_Transaction_Payments.class.php

Doc Comments +1 added lines, -2 removed lines

@@ -120,7 +120,6 @@ 
 	 * then client code needs to take responsibility for saving the TXN
 	 * regardless of what happens within EE_Transaction_Payments;
 	 *
-	 * @param EE_Transaction/int $transaction_obj_or_id EE_Transaction or its ID
 	 * @param 	boolean $update_txn  	whether to save the TXN
 	 * @return 	boolean 	 	whether the TXN was saved
 	 */
@@ -158,7 +157,7 @@ 
 	 * 		@access		public
 	 * 		@param EE_Transaction $transaction
 	 *		@param	string $payment_status, one of EEM_Payment's statuses, like 'PAP' (Approved). By default, searches for approved payments
-	 *		@return 		mixed		float on success, false on fail
+	 *		@return 		double		float on success, false on fail
 	 */
 	public function recalculate_total_payments_for_transaction( EE_Transaction $transaction, $payment_status = EEM_Payment::status_id_approved ) {
 		// verify transaction

Spacing +56 added lines, -56 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
-EE_Registry::instance()->load_class( 'Processor_Base' );
+EE_Registry::instance()->load_class('Processor_Base');
 
 /**
  * Class EE_Transaction_Payments
@@ -44,7 +44,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Transaction_Payments ) {
+		if ( ! self::$_instance instanceof EE_Transaction_Payments) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -72,9 +72,9 @@ 
 	/**
 	 * @param string $old_txn_status
 	 */
-	public function set_old_txn_status( $old_txn_status ) {
+	public function set_old_txn_status($old_txn_status) {
 		// only set the first time
-		if ( $this->_old_txn_status === null ) {
+		if ($this->_old_txn_status === null) {
 			$this->_old_txn_status = $old_txn_status;
 		}
 	}
@@ -93,7 +93,7 @@ 
 	/**
 	 * @param string $new_txn_status
 	 */
-	public function set_new_txn_status( $new_txn_status ) {
+	public function set_new_txn_status($new_txn_status) {
 		$this->_new_txn_status = $new_txn_status;
 	}
 
@@ -105,7 +105,7 @@ 
 	 * @return bool
 	 */
 	public function txn_status_updated() {
-		return $this->_new_txn_status !== $this->_old_txn_status && $this->_old_txn_status !== null  ? true : false;
+		return $this->_new_txn_status !== $this->_old_txn_status && $this->_old_txn_status !== null ? true : false;
 	}
 
 
@@ -124,22 +124,22 @@ 
 	 * @param 	boolean $update_txn  	whether to save the TXN
 	 * @return 	boolean 	 	whether the TXN was saved
 	 */
-	public function calculate_total_payments_and_update_status( EE_Transaction $transaction, $update_txn = true ){
+	public function calculate_total_payments_and_update_status(EE_Transaction $transaction, $update_txn = true) {
 		// verify transaction
-		if ( ! $transaction instanceof EE_Transaction ) {
-			EE_Error::add_error( __( 'Please provide a valid EE_Transaction object.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $transaction instanceof EE_Transaction) {
+			EE_Error::add_error(__('Please provide a valid EE_Transaction object.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// set incoming TXN_Status
-		$this->set_old_txn_status( $transaction->status_ID() );
+		$this->set_old_txn_status($transaction->status_ID());
 		// calculate total paid
-		$total_paid = $this->recalculate_total_payments_for_transaction( $transaction );
+		$total_paid = $this->recalculate_total_payments_for_transaction($transaction);
 		// if total paid has changed
-		if ( $total_paid != $transaction->paid() ) {
-			$transaction->set_paid( $total_paid );
+		if ($total_paid != $transaction->paid()) {
+			$transaction->set_paid($total_paid);
 			// maybe update status, and make sure to save transaction if not done already
-			if ( ! $this->update_transaction_status_based_on_total_paid( $transaction, $update_txn )) {
-				if ( $update_txn ) {
+			if ( ! $this->update_transaction_status_based_on_total_paid($transaction, $update_txn)) {
+				if ($update_txn) {
 					return $transaction->save() ? true : false;
 				}
 			} else {
@@ -160,18 +160,18 @@ 
 	 *		@param	string $payment_status, one of EEM_Payment's statuses, like 'PAP' (Approved). By default, searches for approved payments
 	 *		@return 		mixed		float on success, false on fail
 	 */
-	public function recalculate_total_payments_for_transaction( EE_Transaction $transaction, $payment_status = EEM_Payment::status_id_approved ) {
+	public function recalculate_total_payments_for_transaction(EE_Transaction $transaction, $payment_status = EEM_Payment::status_id_approved) {
 		// verify transaction
-		if ( ! $transaction instanceof EE_Transaction ) {
-			EE_Error::add_error( __( 'Please provide a valid EE_Transaction object.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $transaction instanceof EE_Transaction) {
+			EE_Error::add_error(__('Please provide a valid EE_Transaction object.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// ensure Payment model is loaded
-		EE_Registry::instance()->load_model( 'Payment' );
+		EE_Registry::instance()->load_model('Payment');
 		// calls EEM_Base::sum()
 		return EEM_Payment::instance()->sum(
 			// query params
-			array( array( 'TXN_ID' => $transaction->ID(), 'STS_ID' => $payment_status )),
+			array(array('TXN_ID' => $transaction->ID(), 'STS_ID' => $payment_status)),
 			// field to sum
 			'PAY_amount'
 		);
@@ -187,37 +187,37 @@ 
 	 * @return 	boolean 	 	whether the TXN was saved
 	 * @throws \EE_Error
 	 */
-	public function update_transaction_status_based_on_total_paid( EE_Transaction $transaction, $update_txn = TRUE ) {
+	public function update_transaction_status_based_on_total_paid(EE_Transaction $transaction, $update_txn = TRUE) {
 		// verify transaction
-		if ( ! $transaction instanceof EE_Transaction ) {
+		if ( ! $transaction instanceof EE_Transaction) {
 			EE_Error::add_error(
-				__( 'Please provide a valid EE_Transaction object.', 'event_espresso' ),
+				__('Please provide a valid EE_Transaction object.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 			return FALSE;
 		}
-		EE_Registry::instance()->load_helper( 'Money' );
+		EE_Registry::instance()->load_helper('Money');
 		// set incoming TXN_Status
-		$this->set_old_txn_status( $transaction->status_ID() );
+		$this->set_old_txn_status($transaction->status_ID());
 		// set transaction status based on comparison of TXN_paid vs TXN_total
-		if ( EEH_Money::compare_floats( $transaction->paid(), $transaction->total(), '>' ) ){
+		if (EEH_Money::compare_floats($transaction->paid(), $transaction->total(), '>')) {
 			$new_txn_status = EEM_Transaction::overpaid_status_code;
-		} else if ( EEH_Money::compare_floats( $transaction->paid(), $transaction->total() ) ) {
+		} else if (EEH_Money::compare_floats($transaction->paid(), $transaction->total())) {
 			$new_txn_status = EEM_Transaction::complete_status_code;
-		} else if ( EEH_Money::compare_floats( $transaction->paid(), $transaction->total(), '<' ) ) {
+		} else if (EEH_Money::compare_floats($transaction->paid(), $transaction->total(), '<')) {
 			$new_txn_status = EEM_Transaction::incomplete_status_code;
 		} else {
 			EE_Error::add_error(
-				__( 'The total paid calculation for this transaction is inaccurate.', 'event_espresso' ),
+				__('The total paid calculation for this transaction is inaccurate.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 			return FALSE;
 		}
-		if ( $new_txn_status !== $transaction->status_ID() ) {
+		if ($new_txn_status !== $transaction->status_ID()) {
 			// set incoming TXN_Status
-			$this->set_new_txn_status( $new_txn_status );
-			$transaction->set_status( $new_txn_status );
-			if ( $update_txn ) {
+			$this->set_new_txn_status($new_txn_status);
+			$transaction->set_status($new_txn_status);
+			if ($update_txn) {
 				return $transaction->save() ? TRUE : FALSE;
 			}
 		}
@@ -236,17 +236,17 @@ 
 	 * @param EE_Payment $payment
 	 * @return boolean
 	 */
-	public function delete_payment_and_update_transaction( EE_Payment $payment ) {
+	public function delete_payment_and_update_transaction(EE_Payment $payment) {
 		// verify payment
-		if ( ! $payment instanceof EE_Payment ) {
-			EE_Error::add_error( __( 'A valid Payment object was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $payment instanceof EE_Payment) {
+			EE_Error::add_error(__('A valid Payment object was not received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		if ( ! $this->delete_registration_payments_and_update_registrations( $payment ) ) {
+		if ( ! $this->delete_registration_payments_and_update_registrations($payment)) {
 			return false;
 		}
-		if ( ! $payment->delete() ) {
-			EE_Error::add_error( __( 'The payment could not be deleted.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $payment->delete()) {
+			EE_Error::add_error(__('The payment could not be deleted.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
@@ -257,14 +257,14 @@ 
 			|| $transaction->status_ID() === EEM_Transaction::failed_status_code
 			|| $payment->amount() === 0
 		) {
-			EE_Error::add_success( __( 'The Payment was successfully deleted.', 'event_espresso' ) );
+			EE_Error::add_success(__('The Payment was successfully deleted.', 'event_espresso'));
 			return true;
 		}
 
 
 		//if this fails, that just means that the transaction didn't get its status changed and/or updated.
 		//however the payment was still deleted.
-		if ( ! $this->calculate_total_payments_and_update_status( $transaction ) ) {
+		if ( ! $this->calculate_total_payments_and_update_status($transaction)) {
 
 			EE_Error::add_attention(
 				__(
@@ -298,28 +298,28 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function delete_registration_payments_and_update_registrations( EE_Payment $payment, $reg_payment_query_params = array() ) {
+	public function delete_registration_payments_and_update_registrations(EE_Payment $payment, $reg_payment_query_params = array()) {
 		$save_payment = false;
-		$reg_payment_query_params = ! empty( $reg_payment_query_params ) ? $reg_payment_query_params : array( array( 'PAY_ID' => $payment->ID() ) );
-		$registration_payments = EEM_Registration_Payment::instance()->get_all( $reg_payment_query_params );
-		if ( ! empty( $registration_payments )) {
-			foreach ( $registration_payments as $registration_payment ) {
-				if ( $registration_payment instanceof EE_Registration_Payment ) {
+		$reg_payment_query_params = ! empty($reg_payment_query_params) ? $reg_payment_query_params : array(array('PAY_ID' => $payment->ID()));
+		$registration_payments = EEM_Registration_Payment::instance()->get_all($reg_payment_query_params);
+		if ( ! empty($registration_payments)) {
+			foreach ($registration_payments as $registration_payment) {
+				if ($registration_payment instanceof EE_Registration_Payment) {
 					$amount_paid = $registration_payment->amount();
 					$registration = $registration_payment->registration();
-					if ( $registration instanceof EE_Registration ) {
-						$registration->set_paid( $registration->paid() - $amount_paid );
-						if ( $registration->save() ) {
-							if ( $registration_payment->delete() ) {
-								$registration->_remove_relation_to( $payment, 'Payment' );
-								$payment->_remove_relation_to( $registration, 'Registration' );
+					if ($registration instanceof EE_Registration) {
+						$registration->set_paid($registration->paid() - $amount_paid);
+						if ($registration->save()) {
+							if ($registration_payment->delete()) {
+								$registration->_remove_relation_to($payment, 'Payment');
+								$payment->_remove_relation_to($registration, 'Registration');
 							}
 							$save_payment = true;
 						}
 					} else {
 						EE_Error::add_error(
 							sprintf(
-								__( 'An invalid Registration object was associated with Registration Payment ID# %1$d.', 'event_espresso' ),
+								__('An invalid Registration object was associated with Registration Payment ID# %1$d.', 'event_espresso'),
 								$registration_payment->ID()
 							),
 							__FILE__, __FUNCTION__, __LINE__
@@ -329,7 +329,7 @@ 
 				} else {
 					EE_Error::add_error(
 						sprintf(
-							__( 'An invalid Registration Payment object was associated with payment ID# %1$d.', 'event_espresso' ),
+							__('An invalid Registration Payment object was associated with payment ID# %1$d.', 'event_espresso'),
 							$payment->ID()
 						),
 						__FILE__, __FUNCTION__, __LINE__
@@ -338,7 +338,7 @@ 
 				}
 			}
 		}
-		if ( $save_payment ) {
+		if ($save_payment) {
 			$payment->save();
 		}
 		return true;