eventespresso / event-espresso-core

shortcodes/espresso_ticket_selector/EES_Espresso_Ticket_Selector.shortcode.php

Spacing +9 added lines, -9 removed lines

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

admin_pages/payments/Payments_Admin_Page_Init.core.php

Spacing +26 added lines, -26 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 use EventEspresso\core\services\database\TableAnalysis;
-if (!defined('EVENT_ESPRESSO_VERSION') ){
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('NO direct script access allowed');
 }
 /**
@@ -27,18 +27,18 @@ 
 	 */
 	public function __construct() {
 		//define some page related constants
-		define( 'EE_PAYMENTS_PG_SLUG', 'espresso_payment_settings' );
-		define( 'EE_PAYMENTS_ADMIN_URL', admin_url( 'admin.php?page=' . EE_PAYMENTS_PG_SLUG ));
-		define( 'EE_PAYMENTS_ADMIN', EE_ADMIN_PAGES . 'payments' . DS );
-		define( 'EE_PAYMENTS_TEMPLATE_PATH', EE_PAYMENTS_ADMIN . 'templates' . DS );
-		define( 'EE_PAYMENTS_ASSETS_URL', EE_ADMIN_PAGES_URL . 'payments/assets/' );
-		$this->_table_analysis = EE_Registry::instance()->create( 'TableAnalysis', array(), true );
+		define('EE_PAYMENTS_PG_SLUG', 'espresso_payment_settings');
+		define('EE_PAYMENTS_ADMIN_URL', admin_url('admin.php?page='.EE_PAYMENTS_PG_SLUG));
+		define('EE_PAYMENTS_ADMIN', EE_ADMIN_PAGES.'payments'.DS);
+		define('EE_PAYMENTS_TEMPLATE_PATH', EE_PAYMENTS_ADMIN.'templates'.DS);
+		define('EE_PAYMENTS_ASSETS_URL', EE_ADMIN_PAGES_URL.'payments/assets/');
+		$this->_table_analysis = EE_Registry::instance()->create('TableAnalysis', array(), true);
 		//check that there are active gateways on all admin page loads. but dont do it just yet
 //		echo "constructing payments admin page";die;
-		add_action('admin_notices',array($this,'check_payment_gateway_setup'));
+		add_action('admin_notices', array($this, 'check_payment_gateway_setup'));
 
 		// Show/hide PP Standard along side PP Express.
-		add_filter( 'FHEE__Payments_Admin_Page___payment_methods_list__payment_methods', array( $this, 'unset_pp_standard' ) );
+		add_filter('FHEE__Payments_Admin_Page___payment_methods_list__payment_methods', array($this, 'unset_pp_standard'));
 
 		parent::__construct();
 	}
@@ -62,7 +62,7 @@ 
 				'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
 				'parent_slug'     => 'espresso_events',
 				'menu_slug'       => EE_PAYMENTS_PG_SLUG,
-				'menu_label'      => __( 'Payment Methods', 'event_espresso' ),
+				'menu_label'      => __('Payment Methods', 'event_espresso'),
 				'capability'      => 'ee_manage_gateways',
 				'admin_init_page' => $this,
 			)
@@ -76,25 +76,25 @@ 
 	 *
 	 * @throws \EE_Error
 	 */
-	public function check_payment_gateway_setup(){
+	public function check_payment_gateway_setup() {
 		//ONLY do this check if models can query
 		//and avoid a bug where when we nuke EE4's data that this causes a fatal error
 		//because the tables are deleted just before this request runs. see https://events.codebasehq.com/projects/event-espresso/tickets/7539
 		if (
 			! EE_Maintenance_Mode::instance()->models_can_query()
-			|| ! $this->_get_table_analysis()->tableExists( EEM_Payment_Method::instance()->table() )
+			|| ! $this->_get_table_analysis()->tableExists(EEM_Payment_Method::instance()->table())
 		) {
 			return;
 		}
 
 
 		// ensure Payment_Method model is loaded
-		EE_Registry::instance()->load_model( 'Payment_Method' );
-		$actives = EEM_Payment_Method::instance()->count_active( EEM_Payment_Method::scope_cart );
-		if( $actives  < 1 ){
+		EE_Registry::instance()->load_model('Payment_Method');
+		$actives = EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart);
+		if ($actives < 1) {
 			$url = EE_Admin_Page::add_query_args_and_nonce(array(), EE_PAYMENTS_ADMIN_URL);
 			echo '<div class="error">
-				 <p>'.  sprintf(__("There are no Active Payment Methods setup for Event Espresso. Please %s activate at least one.%s", "event_espresso"),"<a href='$url'>","</a>").'</p>
+				 <p>'.  sprintf(__("There are no Active Payment Methods setup for Event Espresso. Please %s activate at least one.%s", "event_espresso"), "<a href='$url'>", "</a>").'</p>
 			 </div>';
 		}
 	}
@@ -105,13 +105,13 @@ 
 	 * @throws \EE_Error
 	 */
 	protected function _get_table_analysis() {
-		if( $this->_table_analysis instanceof TableAnalysis ) {
+		if ($this->_table_analysis instanceof TableAnalysis) {
 			return $this->_table_analysis;
 		} else {
 			throw new \EE_Error( 
 				sprintf( 
-					__( 'Table analysis class on class %1$s is not set properly.', 'event_espresso'), 
-					get_class( $this ) 
+					__('Table analysis class on class %1$s is not set properly.', 'event_espresso'), 
+					get_class($this) 
 				) 
 			);
 		}
@@ -122,20 +122,20 @@ 
 	/**
 	 * Hide PayPal Standard for "new" users.
 	 */
-	public static function unset_pp_standard( $payment_method_types ) {
-		$pps = EEM_Payment_Method::instance()->get_one_of_type( 'Paypal_Standard' );
-		$ppstandard_active = ( ! empty($pps) ) ? $pps->active() : false;
+	public static function unset_pp_standard($payment_method_types) {
+		$pps = EEM_Payment_Method::instance()->get_one_of_type('Paypal_Standard');
+		$ppstandard_active = ( ! empty($pps)) ? $pps->active() : false;
 		$ppstandard_active_before = false;
-		if ( $pps ) {
+		if ($pps) {
 			// PP Standard used before ?
-			$paypal_id = $pps->get_extra_meta( 'paypal_id', TRUE );
-			if ( $paypal_id && ! empty($paypal_id) ) {
+			$paypal_id = $pps->get_extra_meta('paypal_id', TRUE);
+			if ($paypal_id && ! empty($paypal_id)) {
 				$ppstandard_active_before = true;
 			}
 		}
 
 		// Not using PP Standard? Then display only PayPal Express, do not show PayPal Standard.
-		if ( apply_filters( 'FHEE__EE_PMT_Paypal_Express__register_payment_methods__hide_paypal_standard', ! $ppstandard_active && ! $ppstandard_active_before ) ) {
+		if (apply_filters('FHEE__EE_PMT_Paypal_Express__register_payment_methods__hide_paypal_standard', ! $ppstandard_active && ! $ppstandard_active_before)) {
 			unset($payment_method_types['paypal_standard']);
 		}
 		return $payment_method_types;

caffeinated/payment_methods/Paypal_Pro/EEG_Paypal_Pro.gateway.php

Spacing +52 added lines, -52 removed lines

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

caffeinated/modules/ticket_selector_caff/EED_Ticket_Selector_Caff.module.php

Spacing +27 added lines, -27 removed lines

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

core/admin/templates/admin_details_wrapper_no_sidebar.template.php

Spacing +2 added lines, -2 removed lines

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

core/libraries/form_sections/base/EE_Model_Form_Section.form.php

Spacing +77 added lines, -77 removed lines

@@ -11,7 +11,7 @@ 
  * @since                4.5.0
  *
  */
-class EE_Model_Form_Section extends EE_Form_Section_Proper{
+class EE_Model_Form_Section extends EE_Form_Section_Proper {
 
 	/**
 	 *
@@ -36,36 +36,36 @@ 
 	 * }
 	 * @throws EE_Error
 	 */
-	public function __construct($options_array = array()){
-		if(isset($options_array['model']) && $options_array['model'] instanceof EEM_Base){
+	public function __construct($options_array = array()) {
+		if (isset($options_array['model']) && $options_array['model'] instanceof EEM_Base) {
 			$this->_model = $options_array['model'];
 		}
-		if( ! $this->_model || ! $this->_model instanceof EEM_Base ){
+		if ( ! $this->_model || ! $this->_model instanceof EEM_Base) {
 			throw new EE_Error(sprintf(__("Model Form Sections must first specify the _model property to be a subclass of EEM_Base", "event_espresso")));
 		}
 
-		if(isset($options_array['subsection_args'])){
+		if (isset($options_array['subsection_args'])) {
 			$subsection_args = $options_array['subsection_args'];
-		}else{
+		} else {
 			$subsection_args = array();
 		}
 
 		//gather fields and relations to convert to inputs
 		//but if they're just going to exclude a field anyways, don't bother converting it to an input
 		$exclude = $this->_subsections;
-		if(isset($options_array['exclude'])){
-			$exclude = array_merge($exclude,array_flip($options_array['exclude']));
+		if (isset($options_array['exclude'])) {
+			$exclude = array_merge($exclude, array_flip($options_array['exclude']));
 		}
 		$model_fields = array_diff_key($this->_model->field_settings(), $exclude);
 		$model_relations = array_diff_key($this->_model->relation_settings(), $exclude);
 		//convert fields and relations to inputs
 		$this->_subsections = array_merge(
 			$this->_convert_model_fields_to_inputs($model_fields),
-			$this->_convert_model_relations_to_inputs($model_relations,$subsection_args),
+			$this->_convert_model_relations_to_inputs($model_relations, $subsection_args),
 			$this->_subsections
 		);
 		parent::__construct($options_array);
-		if(isset($options_array['model_object']) && $options_array['model_object'] instanceof EE_Base_Class){
+		if (isset($options_array['model_object']) && $options_array['model_object'] instanceof EE_Base_Class) {
 			$this->populate_model_obj($options_array['model_object']);
 		}
 
@@ -83,9 +83,9 @@ 
 	 * 	}
 	 * @return array
 	 */
-	protected function _convert_model_relations_to_inputs($relations,$subsection_args = array()){
+	protected function _convert_model_relations_to_inputs($relations, $subsection_args = array()) {
 		$inputs = array();
-		foreach( $relations as $relation_name => $relation_obj ) {
+		foreach ($relations as $relation_name => $relation_obj) {
 			$input_constructor_args = array(
 				array_merge(
 					array(
@@ -96,19 +96,19 @@ 
 				)
 			);
 			$input = NULL;
-			switch(get_class($relation_obj)){
+			switch (get_class($relation_obj)) {
 				case 'EE_HABTM_Relation':
-					if(isset($subsection_args[$relation_name]) &&
-							isset($subsection_args[$relation_name]['model_objects'])){
+					if (isset($subsection_args[$relation_name]) &&
+							isset($subsection_args[$relation_name]['model_objects'])) {
 						$model_objects = $subsection_args[$relation_name]['model_objects'];
-					}else{
+					} else {
 						$model_objects = $relation_obj->get_other_model()->get_all();
 					}
-					$input = new EE_Select_Multi_Model_Input($model_objects,$input_constructor_args);
+					$input = new EE_Select_Multi_Model_Input($model_objects, $input_constructor_args);
 					break;
 				default:
 			}
-			if($input){
+			if ($input) {
 				$inputs[$relation_name] = $input;
 			}
 		}
@@ -123,10 +123,10 @@ 
 	 * @throws EE_Error
 	 * @return EE_Form_Input_Base[]
 	 */
-	protected function _convert_model_fields_to_inputs( $model_fields = array() ){
+	protected function _convert_model_fields_to_inputs($model_fields = array()) {
 		$inputs = array();
-		foreach( $model_fields as $field_name=>$model_field ){
-			if ( $model_field instanceof EE_Model_Field_Base ) {
+		foreach ($model_fields as $field_name=>$model_field) {
+			if ($model_field instanceof EE_Model_Field_Base) {
 				$input_constructor_args = array(
 					array(
 						'required'=> ! $model_field->is_nullable() && $model_field->get_default_value() === NULL,
@@ -134,7 +134,7 @@ 
 						'default'=>$model_field->get_default_value(),
 					)
 				);
-				switch(get_class($model_field)){
+				switch (get_class($model_field)) {
 					case 'EE_All_Caps_Text_Field':
 					case 'EE_Any_Foreign_Model_Name_Field':
 						$input_class = 'EE_Text_Input';
@@ -143,16 +143,16 @@ 
 						$input_class = 'EE_Yes_No_Input';
 						break;
 					case 'EE_Datetime_Field':
-						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field)));
+						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field)));
 						break;
 					case 'EE_Email_Field':
 						$input_class = 'EE_Email_Input';
 						break;
 					case 'EE_Enum_Integer_Field':
-						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field)));
+						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field)));
 						break;
 					case 'EE_Enum_Text_Field':
-						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field)));
+						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field)));
 						break;
 					case 'EE_Float_Field':
 						$input_class = 'EE_Float_Input';
@@ -161,15 +161,15 @@ 
 					case 'EE_Foreign_Key_String_Field':
 					case 'EE_WP_User_Field':
 						$models_pointed_to = $model_field instanceof EE_Field_With_Model_Name ? $model_field->get_model_class_names_pointed_to() : array();
-						if(true || is_array($models_pointed_to) && count($models_pointed_to) > 1){
+						if (true || is_array($models_pointed_to) && count($models_pointed_to) > 1) {
 							$input_class = 'EE_Text_Input';
-						}else{
+						} else {
 							//so its just one model
 							$model_name = is_array($models_pointed_to) ? reset($models_pointed_to) : $models_pointed_to;
 							$model = EE_Registry::instance()->load_model($model_name);
 							$model_names = $model->get_all_names(array('limit'=>10));
-							if($model_field->is_nullable()){
-								array_unshift( $model_names, __( "Please Select", 'event_espresso' ));
+							if ($model_field->is_nullable()) {
+								array_unshift($model_names, __("Please Select", 'event_espresso'));
 							}
 							$input_constructor_args[1] = $input_constructor_args[0];
 							$input_constructor_args[0] = $model_names;
@@ -178,10 +178,10 @@ 
 						break;
 					case 'EE_Full_HTML_Field':
 						$input_class = 'EE_Text_Area_Input';
-						$input_constructor_args[ 0 ]['validation_strategies'] = array( new EE_Full_HTML_Validation_Strategy() );
+						$input_constructor_args[0]['validation_strategies'] = array(new EE_Full_HTML_Validation_Strategy());
 						break;
 					case 'EE_Infinite_Integer':
-						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field)));
+						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field)));
 						break;
 					case 'EE_Integer_Field':
 						$input_class = 'EE_Text_Input';
@@ -190,11 +190,11 @@ 
 						$input_class = 'EE_Text_Area_Input';
 						break;
 					case 'EE_Money_Field':
-						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field)));
+						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field)));
 						break;
 					case 'EE_Post_Content_Field':
 						$input_class = 'EE_Text_Area_Input';
-						$input_constructor_args[ 0 ][ 'validation_strategies' ] = array( new EE_Full_HTML_Validation_Strategy() );
+						$input_constructor_args[0]['validation_strategies'] = array(new EE_Full_HTML_Validation_Strategy());
 						break;
 					case 'EE_Plain_Text_Field':
 						$input_class = 'EE_Text_Input';
@@ -211,7 +211,7 @@ 
 						break;
 					case 'EE_Simple_HTML_Field':
 						$input_class = 'EE_Text_Area_Input';
-						$input_constructor_args[ 0 ][ 'validation_strategies' ] = array( new EE_Simple_HTML_Validation_Strategy() );
+						$input_constructor_args[0]['validation_strategies'] = array(new EE_Simple_HTML_Validation_Strategy());
 						break;
 					case 'EE_Slug_Field':
 						$input_class = 'EE_Text_Input';
@@ -220,13 +220,13 @@ 
 						$input_class = 'EE_Yes_No_Input';
 						break;
 					case 'EE_WP_Post_Status_Field':
-						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field)));
+						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field)));
 						break;
 					case 'EE_WP_Post_Type_Field':
-						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field)));
+						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field)));
 						break;
 					default:
-						throw new EE_Error(sprintf(__("Model field of type '%s' does not convert to any known Form Input. Please add a case to EE_Model_Form_section's _convert_model_fields_to_inputs switch statement", "event_espresso"),get_class($model_field)));
+						throw new EE_Error(sprintf(__("Model field of type '%s' does not convert to any known Form Input. Please add a case to EE_Model_Form_section's _convert_model_fields_to_inputs switch statement", "event_espresso"), get_class($model_field)));
 				}
 				$reflection = new ReflectionClass($input_class);
 				$input = $reflection->newInstanceArgs($input_constructor_args);
@@ -245,21 +245,21 @@ 
 	 * @param EE_Base_Class $model_obj
 	 * @return void
 	 */
-	public function populate_model_obj($model_obj){
+	public function populate_model_obj($model_obj) {
 		$model_obj = $this->_model->ensure_is_obj($model_obj);
 		$this->_model_object = $model_obj;
 		$defaults = $model_obj->model_field_array();
-		foreach($this->_model->relation_settings() as $relation_name => $relation_obj){
+		foreach ($this->_model->relation_settings() as $relation_name => $relation_obj) {
 			$form_inputs = $this->inputs();
-			if(isset($form_inputs[$relation_name])){
-				if($relation_obj instanceof EE_Belongs_To_Relation){
+			if (isset($form_inputs[$relation_name])) {
+				if ($relation_obj instanceof EE_Belongs_To_Relation) {
 					//then we only expect there to be one
 					$related_item = $this->_model_object->get_first_related($relation_name);
 					$defaults[$relation_name] = $related_item->ID();
-				}else{
+				} else {
 					$related_items = $this->_model_object->get_many_related($relation_name);
 					$ids = array();
-					foreach($related_items as $related_item){
+					foreach ($related_items as $related_item) {
 						$ids[] = $related_item->ID();
 					}
 					$defaults[$relation_name] = $ids;
@@ -281,8 +281,8 @@ 
 	 * values are their normalized values
 	 * @return array
 	 */
-	public function inputs_values_corresponding_to_model_fields(){
-		return array_intersect_key($this->input_values(),$this->_model->field_settings());
+	public function inputs_values_corresponding_to_model_fields() {
+		return array_intersect_key($this->input_values(), $this->_model->field_settings());
 	}
 
 
@@ -293,17 +293,17 @@ 
 	 * @param array $req_data should usually be $_REQUEST (the default).
 	 * @return void
 	 */	
-	public function _normalize( $req_data ) {
-		parent::_normalize( $req_data );
+	public function _normalize($req_data) {
+		parent::_normalize($req_data);
 		//create or set the model object, if it isn't already
-		if( ! $this->_model_object ){
+		if ( ! $this->_model_object) {
 			//check to see if the form indicates a PK, in which case we want to only retrieve it and update it
 			$pk_name = $this->_model->primary_key_name();
 			$model_obj = $this->_model->get_one_by_ID($this->get_input_value($pk_name));
-			if($model_obj){
+			if ($model_obj) {
 				$this->_model_object = $model_obj;
-			}else{
-				$this->_model_object = EE_Registry::instance()->load_class($this->_model->get_this_model_name() );
+			} else {
+				$this->_model_object = EE_Registry::instance()->load_class($this->_model->get_this_model_name());
 			}
 		}
 	}
@@ -318,24 +318,24 @@ 
 	 * @return int, 1 on a successful update, the ID of
 	 *                    the new entry on insert; 0 on failure
 	 */
-	public function save(){
-		if( ! $this->_model_object){
-			throw new EE_Error(sprintf(__("Cannot save the model form's model object (model is '%s') because there is no model object set. You must either set it, or call receive_form_submission where it is set automatically", "event_espresso"),get_class($this->_model)));
+	public function save() {
+		if ( ! $this->_model_object) {
+			throw new EE_Error(sprintf(__("Cannot save the model form's model object (model is '%s') because there is no model object set. You must either set it, or call receive_form_submission where it is set automatically", "event_espresso"), get_class($this->_model)));
 		}
 		//ok so the model object is set. Just set it with the submitted form data
-		foreach($this->inputs_values_corresponding_to_model_fields() as $field_name=>$field_value){
+		foreach ($this->inputs_values_corresponding_to_model_fields() as $field_name=>$field_value) {
 			//only set the non-primary key
-			if($field_name != $this->_model->primary_key_name()){
-				$this->_model_object->set($field_name,$field_value);
+			if ($field_name != $this->_model->primary_key_name()) {
+				$this->_model_object->set($field_name, $field_value);
 			}
 		}
-		$success =  $this->_model_object->save();
-		foreach($this->_model->relation_settings() as $relation_name => $relation_obj){
-			if(isset($this->_subsections[$relation_name])){
+		$success = $this->_model_object->save();
+		foreach ($this->_model->relation_settings() as $relation_name => $relation_obj) {
+			if (isset($this->_subsections[$relation_name])) {
 				$success = $this->_save_related_info($relation_name);
 			}
 		}
-		do_action( 'AHEE__EE_Model_Form_Section__save__done', $this, $success );
+		do_action('AHEE__EE_Model_Form_Section__save__done', $this, $success);
 		return $success;
 	}
 
@@ -348,29 +348,29 @@ 
 	 * @return bool
 	 * @throws EE_Error
 	 */
-	protected function _save_related_info($relation_name){
+	protected function _save_related_info($relation_name) {
 		$relation_obj = $this->_model->related_settings_for($relation_name);
-		if($relation_obj instanceof EE_Belongs_To_Relation){
+		if ($relation_obj instanceof EE_Belongs_To_Relation) {
 			//there is just a foreign key on this model pointing to that one
 			$this->_model_object->_add_relation_to($this->get_input_value($relation_name), $relation_name);
-		}elseif($relation_obj instanceof EE_Has_Many_Relation){
+		}elseif ($relation_obj instanceof EE_Has_Many_Relation) {
 			//then we want to consider all of its currently-related things.
 			//if they're in this list, keep them
 			//if they're not in this list, remove them
 			//and lastly add all the new items
 			throw new EE_Error(sprintf(__('Automatic saving of related info across a "has many" relation is not yet supported', "event_espresso")));
-		}elseif($relation_obj instanceof EE_HABTM_Relation){
+		}elseif ($relation_obj instanceof EE_HABTM_Relation) {
 			//delete everything NOT in this list
 			$normalized_input_value = $this->get_input_value($relation_name);
-			if($normalized_input_value && is_array($normalized_input_value)){
+			if ($normalized_input_value && is_array($normalized_input_value)) {
 				$where_query_params = array(
-					$relation_obj->get_other_model()->primary_key_name() => array('NOT_IN',$normalized_input_value));
-			}else{
+					$relation_obj->get_other_model()->primary_key_name() => array('NOT_IN', $normalized_input_value));
+			} else {
 				$where_query_params = array();
 			}
-			$this->_model_object->_remove_relations( $relation_name, $where_query_params );
-			foreach($normalized_input_value as $id){
-				$this->_model_object->_add_relation_to( $id, $relation_name );
+			$this->_model_object->_remove_relations($relation_name, $where_query_params);
+			foreach ($normalized_input_value as $id) {
+				$this->_model_object->_add_relation_to($id, $relation_name);
 			}
 		}
 		return TRUE;
@@ -382,7 +382,7 @@ 
 	 * Gets the model of this model form
 	 * @return EEM_Base
 	 */
-	public function get_model(){
+	public function get_model() {
 		return $this->_model;
 	}
 
@@ -395,7 +395,7 @@ 
 	 * when receive_form_submission($req_data) was called.
 	 * @return EE_Base_Class
 	 */
-	public function get_model_object(){
+	public function get_model_object() {
 		return $this->_model_object;
 	}
 
@@ -405,10 +405,10 @@ 
 	 * gets teh default name of this form section if none is specified
 	 * @return string
 	 */
-	protected function _set_default_name_if_empty(){
-		if( ! $this->_name ){
-			$default_name = str_replace("EEM_", "", get_class($this->_model)) . "_Model_Form";
-			$this->_name =  $default_name;
+	protected function _set_default_name_if_empty() {
+		if ( ! $this->_name) {
+			$default_name = str_replace("EEM_", "", get_class($this->_model))."_Model_Form";
+			$this->_name = $default_name;
 		}
 	}
 

admin_pages/payments/Payments_Admin_Page.core.php

Spacing +173 added lines, -173 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -44,8 +44,8 @@ 
 	 * @param bool $routing indicate whether we want to just load the object and handle routing or just load the object.
 	 * @return \Payments_Admin_Page
 	 */
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
 	}
 
 
@@ -130,19 +130,19 @@ 
 	protected function _set_page_config() {
 		$payment_method_list_config = array(
 			'nav'           => array(
-				'label' => __( 'Payment Methods', 'event_espresso' ),
+				'label' => __('Payment Methods', 'event_espresso'),
 				'order' => 10
 			),
 			'metaboxes'     => $this->_default_espresso_metaboxes,
 			'help_tabs'     => array_merge(
 				array(
 					'payment_methods_overview_help_tab' => array(
-						'title'    => __( 'Payment Methods Overview', 'event_espresso' ),
+						'title'    => __('Payment Methods Overview', 'event_espresso'),
 						'filename' => 'payment_methods_overview'
 					)
 				),
 				$this->_add_payment_method_help_tabs() ),
-			'help_tour'     => array( 'Payment_Methods_Selection_Help_Tour' ),
+			'help_tour'     => array('Payment_Methods_Selection_Help_Tour'),
 			'require_nonce' => false
 		);
 
@@ -160,7 +160,7 @@ 
 					)
 				),
 				//'help_tour' => array( 'Payment_Methods_Settings_Help_Tour' ),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'require_nonce' => FALSE
 			),
 			'payment_log'=>array(
@@ -179,17 +179,17 @@ 
 	/**
 	 * @return array
 	 */
-	protected function _add_payment_method_help_tabs(){
+	protected function _add_payment_method_help_tabs() {
 		EE_Registry::instance()->load_lib('Payment_Method_Manager');
 		$payment_method_types = EE_Payment_Method_Manager::instance()->payment_method_types();
 		$all_pmt_help_tabs_config = array();
-		foreach( $payment_method_types as $payment_method_type ){
-			if ( ! EE_Registry::instance()->CAP->current_user_can( $payment_method_type->cap_name(), 'specific_payment_method_type_access' ) ) {
+		foreach ($payment_method_types as $payment_method_type) {
+			if ( ! EE_Registry::instance()->CAP->current_user_can($payment_method_type->cap_name(), 'specific_payment_method_type_access')) {
 				continue;
 			}
-			foreach( $payment_method_type->help_tabs_config() as $help_tab_name => $config ){
-				$template_args = isset( $config[ 'template_args' ] ) ? $config[ 'template_args' ] : array();
-				$template_args[ 'admin_page_obj' ] = $this;
+			foreach ($payment_method_type->help_tabs_config() as $help_tab_name => $config) {
+				$template_args = isset($config['template_args']) ? $config['template_args'] : array();
+				$template_args['admin_page_obj'] = $this;
 				$all_pmt_help_tabs_config[$help_tab_name] = array(
 					'title'=>$config['title'],
 					'content'=>EEH_Template::display_template(
@@ -216,9 +216,9 @@ 
 
 
 	public function load_scripts_styles() {
-		wp_enqueue_script( 'ee_admin_js' );
-		wp_enqueue_script( 'ee-text-links' );
-		wp_enqueue_script( 'espresso_payments', EE_PAYMENTS_ASSETS_URL . 'espresso_payments_admin.js', array( 'espresso-ui-theme', 'ee-datepicker' ), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_enqueue_script('ee_admin_js');
+		wp_enqueue_script('ee-text-links');
+		wp_enqueue_script('espresso_payments', EE_PAYMENTS_ASSETS_URL.'espresso_payments_admin.js', array('espresso-ui-theme', 'ee-datepicker'), EVENT_ESPRESSO_VERSION, TRUE);
 	}
 
 
@@ -227,9 +227,9 @@ 
 
 	public function load_scripts_styles_default() {
 		//styles
-		wp_register_style( 'espresso_payments', EE_PAYMENTS_ASSETS_URL . 'ee-payments.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_style( 'espresso_payments' );
-		wp_enqueue_style( 'ee-text-links' );
+		wp_register_style('espresso_payments', EE_PAYMENTS_ASSETS_URL.'ee-payments.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('espresso_payments');
+		wp_enqueue_style('ee-text-links');
 		//scripts
 	}
 
@@ -243,44 +243,44 @@ 
 		 * to the loading process.  However, people MUST setup the details for the payment method so its safe to do a
 		 * recheck here.
 		 */
-		EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
+		EE_Registry::instance()->load_lib('Payment_Method_Manager');
 		EEM_Payment_Method::instance()->verify_button_urls();
 		//setup tabs, one for each payment method type
 		$tabs = array();
 		$payment_methods = array();
-		foreach( EE_Payment_Method_Manager::instance()->payment_method_types() as $pmt_obj ) {
+		foreach (EE_Payment_Method_Manager::instance()->payment_method_types() as $pmt_obj) {
 			// we don't want to show admin-only PMTs for now
-			if ( $pmt_obj instanceof EE_PMT_Admin_Only ) {
+			if ($pmt_obj instanceof EE_PMT_Admin_Only) {
 				continue;
 			}
 			//check access
-			if ( ! EE_Registry::instance()->CAP->current_user_can( $pmt_obj->cap_name(), 'specific_payment_method_type_access' ) ) {
+			if ( ! EE_Registry::instance()->CAP->current_user_can($pmt_obj->cap_name(), 'specific_payment_method_type_access')) {
 				continue;
 			}
 			//check for any active pms of that type
-			$payment_method = EEM_Payment_Method::instance()->get_one_of_type( $pmt_obj->system_name() );
-			if ( ! $payment_method instanceof EE_Payment_Method ) {
+			$payment_method = EEM_Payment_Method::instance()->get_one_of_type($pmt_obj->system_name());
+			if ( ! $payment_method instanceof EE_Payment_Method) {
 				$payment_method = EE_Payment_Method::new_instance(
 					array(
-						'PMD_slug'					=>sanitize_key( $pmt_obj->system_name() ),
+						'PMD_slug'					=>sanitize_key($pmt_obj->system_name()),
 						'PMD_type'					=>$pmt_obj->system_name(),
 						'PMD_name'				=>$pmt_obj->pretty_name(),
 						'PMD_admin_name'	=>$pmt_obj->pretty_name()
 					)
 				);
 			}
-			$payment_methods[ $payment_method->slug() ] = $payment_method;
+			$payment_methods[$payment_method->slug()] = $payment_method;
 		}
-		$payment_methods = apply_filters( 'FHEE__Payments_Admin_Page___payment_methods_list__payment_methods', $payment_methods );
-		foreach( $payment_methods as $payment_method ) {
-			if ( $payment_method instanceof EE_Payment_Method ) {
+		$payment_methods = apply_filters('FHEE__Payments_Admin_Page___payment_methods_list__payment_methods', $payment_methods);
+		foreach ($payment_methods as $payment_method) {
+			if ($payment_method instanceof EE_Payment_Method) {
 				add_meta_box(
 					//html id
-					'espresso_' . $payment_method->slug() . '_payment_settings',
+					'espresso_'.$payment_method->slug().'_payment_settings',
 					//title
-					sprintf( __( '%s Settings', 'event_espresso' ), $payment_method->admin_name() ),
+					sprintf(__('%s Settings', 'event_espresso'), $payment_method->admin_name()),
 					//callback
-					array( $this, 'payment_method_settings_meta_box' ),
+					array($this, 'payment_method_settings_meta_box'),
 					//post type
 					null,
 					//context
@@ -288,19 +288,19 @@ 
 					//priority
 					'default',
 					//callback args
-					array( 'payment_method' => $payment_method )
+					array('payment_method' => $payment_method)
 				);
 				//setup for tabbed content
-				$tabs[ $payment_method->slug() ] = array(
+				$tabs[$payment_method->slug()] = array(
 					'label' => $payment_method->admin_name(),
 					'class' => $payment_method->active() ? 'gateway-active' : '',
-					'href'  => 'espresso_' . $payment_method->slug() . '_payment_settings',
-					'title' => __( 'Modify this Payment Method', 'event_espresso' ),
+					'href'  => 'espresso_'.$payment_method->slug().'_payment_settings',
+					'title' => __('Modify this Payment Method', 'event_espresso'),
 					'slug'  => $payment_method->slug()
 				);
 			}
 		}
-		$this->_template_args['admin_page_header'] = EEH_Tabbed_Content::tab_text_links( $tabs, 'payment_method_links', '|', $this->_get_active_payment_method_slug() );
+		$this->_template_args['admin_page_header'] = EEH_Tabbed_Content::tab_text_links($tabs, 'payment_method_links', '|', $this->_get_active_payment_method_slug());
 		$this->display_admin_page_with_sidebar();
 
 	}
@@ -311,20 +311,20 @@ 
 	 *   _get_active_payment_method_slug
 	 * 	@return string
 	 */
-	protected function _get_active_payment_method_slug(){
+	protected function _get_active_payment_method_slug() {
 		$payment_method_slug = FALSE;
 		//decide which payment method tab to open first, as dictated by the request's 'payment_method'
-		if ( isset( $this->_req_data['payment_method'] )) {
+		if (isset($this->_req_data['payment_method'])) {
 			// if they provided the current payment method, use it
-			$payment_method_slug = sanitize_key( $this->_req_data['payment_method'] );
+			$payment_method_slug = sanitize_key($this->_req_data['payment_method']);
 		}
-		$payment_method = EEM_Payment_Method::instance()->get_one( array( array( 'PMD_slug' => $payment_method_slug )));
+		$payment_method = EEM_Payment_Method::instance()->get_one(array(array('PMD_slug' => $payment_method_slug)));
 		// if that didn't work or wasn't provided, find another way to select the current pm
-		if ( ! $this->_verify_payment_method( $payment_method )) {
+		if ( ! $this->_verify_payment_method($payment_method)) {
 			// like, looking for an active one
-			$payment_method = EEM_Payment_Method::instance()->get_one_active( 'CART' );
+			$payment_method = EEM_Payment_Method::instance()->get_one_active('CART');
 			// test that one as well
-			if ( $this->_verify_payment_method( $payment_method )) {
+			if ($this->_verify_payment_method($payment_method)) {
 				$payment_method_slug = $payment_method->slug();
 			} else {
 				$payment_method_slug = 'paypal_standard';
@@ -342,11 +342,11 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return boolean
 	 */
-	protected function _verify_payment_method( $payment_method ){
+	protected function _verify_payment_method($payment_method) {
 		if (
 			$payment_method instanceof EE_Payment_Method &&
 			$payment_method->type_obj() instanceof EE_PMT_Base &&
-			EE_Registry::instance()->CAP->current_user_can( $payment_method->type_obj()->cap_name(), 'specific_payment_method_type_access' )
+			EE_Registry::instance()->CAP->current_user_can($payment_method->type_obj()->cap_name(), 'specific_payment_method_type_access')
 		) {
 			return TRUE;
 		}
@@ -363,21 +363,21 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	public function payment_method_settings_meta_box( $post_obj_which_is_null, $metabox ){
-		$payment_method = isset( $metabox['args'], $metabox['args']['payment_method'] ) ? $metabox['args']['payment_method'] : NULL;
-		if ( ! $payment_method instanceof EE_Payment_Method ){
-			throw new EE_Error( sprintf( __( 'Payment method metabox setup incorrectly. No Payment method object was supplied', 'event_espresso' )));
+	public function payment_method_settings_meta_box($post_obj_which_is_null, $metabox) {
+		$payment_method = isset($metabox['args'], $metabox['args']['payment_method']) ? $metabox['args']['payment_method'] : NULL;
+		if ( ! $payment_method instanceof EE_Payment_Method) {
+			throw new EE_Error(sprintf(__('Payment method metabox setup incorrectly. No Payment method object was supplied', 'event_espresso')));
 		}
 		$payment_method_scopes = $payment_method->active();
 		// if the payment method really exists show its form, otherwise the activation template
-		if ( $payment_method->ID() && ! empty( $payment_method_scopes )) {
-				$form = $this->_generate_payment_method_settings_form( $payment_method );
-				if ( $form->form_data_present_in( $this->_req_data )) {
-					$form->receive_form_submission( $this->_req_data );
+		if ($payment_method->ID() && ! empty($payment_method_scopes)) {
+				$form = $this->_generate_payment_method_settings_form($payment_method);
+				if ($form->form_data_present_in($this->_req_data)) {
+					$form->receive_form_submission($this->_req_data);
 				}
-				echo $form->form_open() . $form->get_html_and_js() . $form->form_close();
+				echo $form->form_open().$form->get_html_and_js().$form->form_close();
 		} else {
-			echo $this->_activate_payment_method_button( $payment_method )->get_html_and_js();
+			echo $this->_activate_payment_method_button($payment_method)->get_html_and_js();
 		}
 	}
 
@@ -390,14 +390,14 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _generate_payment_method_settings_form( EE_Payment_Method $payment_method ) {
-		if ( ! $payment_method instanceof EE_Payment_Method ){
+	protected function _generate_payment_method_settings_form(EE_Payment_Method $payment_method) {
+		if ( ! $payment_method instanceof EE_Payment_Method) {
 			return new EE_Form_Section_Proper();
 		}
 		return new EE_Form_Section_Proper(
 			array(
-				'name' 	=> $payment_method->slug() . '_settings_form',
-				'html_id' 	=> $payment_method->slug() . '_settings_form',
+				'name' 	=> $payment_method->slug().'_settings_form',
+				'html_id' 	=> $payment_method->slug().'_settings_form',
 				'action' 	=> EE_Admin_Page::add_query_args_and_nonce(
 					array(
 						'action' 						=> 'update_payment_method',
@@ -409,12 +409,12 @@ 
 				'subsections' 			=> apply_filters(
 					'FHEE__Payments_Admin_Page___generate_payment_method_settings_form__form_subsections',
 					array(
-						'pci_dss_compliance_' . $payment_method->slug() 				=> $this->_pci_dss_compliance( $payment_method ),
-						'currency_support_' . $payment_method->slug()					=> $this->_currency_support( $payment_method ),
-						'payment_method_settings_' . $payment_method->slug() 	=> $this->_payment_method_settings( $payment_method ),
-						'update_' . $payment_method->slug()										=> $this->_update_payment_method_button( $payment_method ),
-						'deactivate_' . $payment_method->slug()								=> $this->_deactivate_payment_method_button( $payment_method ),
-						'fine_print_' . $payment_method->slug()									=> $this->_fine_print()
+						'pci_dss_compliance_'.$payment_method->slug() 				=> $this->_pci_dss_compliance($payment_method),
+						'currency_support_'.$payment_method->slug()					=> $this->_currency_support($payment_method),
+						'payment_method_settings_'.$payment_method->slug() 	=> $this->_payment_method_settings($payment_method),
+						'update_'.$payment_method->slug()										=> $this->_update_payment_method_button($payment_method),
+						'deactivate_'.$payment_method->slug()								=> $this->_deactivate_payment_method_button($payment_method),
+						'fine_print_'.$payment_method->slug()									=> $this->_fine_print()
 					),
 					$payment_method
 				)
@@ -431,19 +431,19 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _pci_dss_compliance( EE_Payment_Method $payment_method ) {
-		if ( $payment_method->type_obj()->requires_https() ) {
+	protected function _pci_dss_compliance(EE_Payment_Method $payment_method) {
+		if ($payment_method->type_obj()->requires_https()) {
 			return new EE_Form_Section_HTML(
 				EEH_HTML::tr(
 					EEH_HTML::th(
 						EEH_HTML::label(
-							EEH_HTML::strong( __( 'IMPORTANT', 'event_espresso' ), '', 'important-notice' )
+							EEH_HTML::strong(__('IMPORTANT', 'event_espresso'), '', 'important-notice')
 						)
-					) .
+					).
 					EEH_HTML::td(
-						EEH_HTML::strong( __( 'You are responsible for your own website security and Payment Card Industry Data Security Standards (PCI DSS) compliance.', 'event_espresso' )) .
-						EEH_HTML::br() .
-						__( 'Learn more about ', 'event_espresso' ) . EEH_HTML::link( 'https://www.pcisecuritystandards.org/merchants/index.php', __( 'PCI DSS compliance', 'event_espresso' ))
+						EEH_HTML::strong(__('You are responsible for your own website security and Payment Card Industry Data Security Standards (PCI DSS) compliance.', 'event_espresso')).
+						EEH_HTML::br().
+						__('Learn more about ', 'event_espresso').EEH_HTML::link('https://www.pcisecuritystandards.org/merchants/index.php', __('PCI DSS compliance', 'event_espresso'))
 					)
 				)
 			);
@@ -461,19 +461,19 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _currency_support( EE_Payment_Method $payment_method ) {
-		if ( ! $payment_method->usable_for_currency( EE_Config::instance()->currency->code )) {
+	protected function _currency_support(EE_Payment_Method $payment_method) {
+		if ( ! $payment_method->usable_for_currency(EE_Config::instance()->currency->code)) {
 			return new EE_Form_Section_HTML(
 				EEH_HTML::tr(
 					EEH_HTML::th(
 						EEH_HTML::label(
-							EEH_HTML::strong( __( 'IMPORTANT', 'event_espresso' ), '', 'important-notice' )
+							EEH_HTML::strong(__('IMPORTANT', 'event_espresso'), '', 'important-notice')
 						)
-					) .
+					).
 					EEH_HTML::td(
 						EEH_HTML::strong(
 							sprintf(
-								__( 'This payment method does not support the currency set on your site (%1$s) and so will not appear as a payment option to registrants. Please activate a different payment method or change your site\'s country and associated currency.', 'event_espresso'),
+								__('This payment method does not support the currency set on your site (%1$s) and so will not appear as a payment option to registrants. Please activate a different payment method or change your site\'s country and associated currency.', 'event_espresso'),
 								EE_Config::instance()->currency->code
 							)
 						)
@@ -493,9 +493,9 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_HTML
 	 */
-	protected function _payment_method_settings( EE_Payment_Method $payment_method ) {
+	protected function _payment_method_settings(EE_Payment_Method $payment_method) {
 		//modify the form so we only have/show fields that will be implemented for this version
-		return $this->_simplify_form( $payment_method->type_obj()->settings_form(), $payment_method->name() );
+		return $this->_simplify_form($payment_method->type_obj()->settings_form(), $payment_method->name());
 	}
 
 
@@ -508,8 +508,8 @@ 
 	 * @return \EE_Payment_Method_Form
 	 * @throws \EE_Error
 	 */
-	protected function _simplify_form( $form_section, $payment_method_name = '' ){
-		if ( $form_section instanceof EE_Payment_Method_Form ) {
+	protected function _simplify_form($form_section, $payment_method_name = '') {
+		if ($form_section instanceof EE_Payment_Method_Form) {
 			$form_section->exclude(
 				array(
 					'PMD_type', //dont want them changing the type
@@ -520,7 +520,7 @@ 
 			);
 			return $form_section;
 		} else {
-			throw new EE_Error( sprintf( __( 'The EE_Payment_Method_Form for the "%1$s" payment method is missing or invalid.', 'event_espresso' ), $payment_method_name ));
+			throw new EE_Error(sprintf(__('The EE_Payment_Method_Form for the "%1$s" payment method is missing or invalid.', 'event_espresso'), $payment_method_name));
 		}
 	}
 
@@ -533,19 +533,19 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_HTML
 	 */
-	protected function _update_payment_method_button( EE_Payment_Method $payment_method ) {
+	protected function _update_payment_method_button(EE_Payment_Method $payment_method) {
 		$update_button = new EE_Submit_Input(
 			array(
 				'name' => 'submit',
-				'html_id' 		=> 'save_' . $payment_method->slug() . '_settings',
-				'default' 		=> sprintf( __( 'Update %s Payment Settings', 'event_espresso' ), $payment_method->admin_name() ),
+				'html_id' 		=> 'save_'.$payment_method->slug().'_settings',
+				'default' 		=> sprintf(__('Update %s Payment Settings', 'event_espresso'), $payment_method->admin_name()),
 				'html_label' => EEH_HTML::nbsp()
 			)
 		);
 		return new EE_Form_Section_HTML(
-			EEH_HTML::no_row( EEH_HTML::br(2) ) .
+			EEH_HTML::no_row(EEH_HTML::br(2)).
 			EEH_HTML::tr(
-				EEH_HTML::th( __( 'Update Settings', 'event_espresso') ) .
+				EEH_HTML::th(__('Update Settings', 'event_espresso')).
 				EEH_HTML::td(
 					$update_button->get_html_for_input()
 				)
@@ -562,11 +562,11 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _deactivate_payment_method_button( EE_Payment_Method $payment_method ) {
-		$link_text_and_title = sprintf( __( 'Deactivate %1$s Payments?', 'event_espresso'), $payment_method->admin_name() );
+	protected function _deactivate_payment_method_button(EE_Payment_Method $payment_method) {
+		$link_text_and_title = sprintf(__('Deactivate %1$s Payments?', 'event_espresso'), $payment_method->admin_name());
 		return new EE_Form_Section_HTML(
 			EEH_HTML::tr(
-				EEH_HTML::th( __( 'Deactivate Payment Method', 'event_espresso') ) .
+				EEH_HTML::th(__('Deactivate Payment Method', 'event_espresso')).
 				EEH_HTML::td(
 					EEH_HTML::link(
 						EE_Admin_Page::add_query_args_and_nonce(
@@ -578,7 +578,7 @@ 
 						),
 						$link_text_and_title,
 						$link_text_and_title,
-						'deactivate_' . $payment_method->slug(),
+						'deactivate_'.$payment_method->slug(),
 						'espresso-button button-secondary'
 					)
 				)
@@ -594,12 +594,12 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _activate_payment_method_button( EE_Payment_Method $payment_method ) {
-		$link_text_and_title = sprintf( __( 'Activate %1$s Payment Method?', 'event_espresso'), $payment_method->admin_name() );
+	protected function _activate_payment_method_button(EE_Payment_Method $payment_method) {
+		$link_text_and_title = sprintf(__('Activate %1$s Payment Method?', 'event_espresso'), $payment_method->admin_name());
 		return new EE_Form_Section_Proper(
 			array(
-				'name' 	=> 'activate_' . $payment_method->slug() . '_settings_form',
-				'html_id' 	=> 'activate_' . $payment_method->slug() . '_settings_form',
+				'name' 	=> 'activate_'.$payment_method->slug().'_settings_form',
+				'html_id' 	=> 'activate_'.$payment_method->slug().'_settings_form',
 				'action' 	=> '#',
 				'layout_strategy'		=> new EE_Admin_Two_Column_Layout(),
 				'subsections' 			=> apply_filters(
@@ -607,17 +607,17 @@ 
 					array(
 						new EE_Form_Section_HTML(
 							EEH_HTML::tr(
-								EEH_HTML::td( $payment_method->type_obj()->introductory_html(),
+								EEH_HTML::td($payment_method->type_obj()->introductory_html(),
 									'',
 									'',
 									'',
 									'colspan="2"' 
 								)
-							) . 
+							). 
 							EEH_HTML::tr(
 								EEH_HTML::th(
-									EEH_HTML::label( __( 'Click to Activate ', 'event_espresso' ))
-								) .
+									EEH_HTML::label(__('Click to Activate ', 'event_espresso'))
+								).
 								EEH_HTML::td(
 									EEH_HTML::link(
 										EE_Admin_Page::add_query_args_and_nonce(
@@ -629,7 +629,7 @@ 
 										),
 										$link_text_and_title,
 										$link_text_and_title,
-										'activate_' . $payment_method->slug(),
+										'activate_'.$payment_method->slug(),
 										'espresso-button-green button-primary'
 									)
 								)
@@ -651,9 +651,9 @@ 
 	protected function _fine_print() {
 		return new EE_Form_Section_HTML(
 			EEH_HTML::tr(
-				EEH_HTML::th() .
+				EEH_HTML::th().
 				EEH_HTML::td(
-					EEH_HTML::p( __( 'All fields marked with a * are required fields', 'event_espresso' ), '', 'grey-text' )
+					EEH_HTML::p(__('All fields marked with a * are required fields', 'event_espresso'), '', 'grey-text')
 				)
 			)
 		);
@@ -665,15 +665,15 @@ 
 	 * Activates a payment method of that type. Mostly assuming there is only 1 of that type (or none so far)
 	 * @global WP_User $current_user
 	 */
-	protected function _activate_payment_method(){
-		if(isset($this->_req_data['payment_method_type'])){
+	protected function _activate_payment_method() {
+		if (isset($this->_req_data['payment_method_type'])) {
 			$payment_method_type = sanitize_text_field($this->_req_data['payment_method_type']);
 			//see if one exists
-			EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
-			$payment_method = EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type( $payment_method_type );
+			EE_Registry::instance()->load_lib('Payment_Method_Manager');
+			$payment_method = EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type($payment_method_type);
 
-			$this->_redirect_after_action(1, 'Payment Method', 'activated', array('action' => 'default','payment_method'=>$payment_method->slug()));
-		}else{
+			$this->_redirect_after_action(1, 'Payment Method', 'activated', array('action' => 'default', 'payment_method'=>$payment_method->slug()));
+		} else {
 			$this->_redirect_after_action(FALSE, 'Payment Method', 'activated', array('action' => 'default'));
 		}
 	}
@@ -681,14 +681,14 @@ 
 	/**
 	 * Deactivates the payment method with the specified slug, and redirects.
 	 */
-	protected function _deactivate_payment_method(){
-		if(isset($this->_req_data['payment_method'])){
+	protected function _deactivate_payment_method() {
+		if (isset($this->_req_data['payment_method'])) {
 			$payment_method_slug = sanitize_key($this->_req_data['payment_method']);
 			//deactivate it
 			EE_Registry::instance()->load_lib('Payment_Method_Manager');
-			$count_updated = EE_Payment_Method_Manager::instance()->deactivate_payment_method( $payment_method_slug );
-			$this->_redirect_after_action($count_updated, 'Payment Method', 'deactivated', array('action' => 'default','payment_method'=>$payment_method_slug));
-		}else{
+			$count_updated = EE_Payment_Method_Manager::instance()->deactivate_payment_method($payment_method_slug);
+			$this->_redirect_after_action($count_updated, 'Payment Method', 'deactivated', array('action' => 'default', 'payment_method'=>$payment_method_slug));
+		} else {
 			$this->_redirect_after_action(FALSE, 'Payment Method', 'deactivated', array('action' => 'default'));
 		}
 	}
@@ -702,46 +702,46 @@ 
 	 * subsequently called 'headers_sent_func' which is _payment_methods_list)
 	 * @return void
 	 */
-	protected function _update_payment_method(){
-		if( $_SERVER['REQUEST_METHOD'] == 'POST'){
+	protected function _update_payment_method() {
+		if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 			//ok let's find which gateway form to use based on the form input
 			EE_Registry::instance()->load_lib('Payment_Method_Manager');
 			/** @var $correct_pmt_form_to_use EE_Payment_Method_Form */
 			$correct_pmt_form_to_use = NULL;
 			$payment_method = NULL;
-			foreach( EEM_Payment_Method::instance()->get_all() as $payment_method){
+			foreach (EEM_Payment_Method::instance()->get_all() as $payment_method) {
 				//get the form and simplify it, like what we do when we display it
-				$pmt_form = $this->_generate_payment_method_settings_form( $payment_method );
-				if($pmt_form->form_data_present_in($this->_req_data)){
+				$pmt_form = $this->_generate_payment_method_settings_form($payment_method);
+				if ($pmt_form->form_data_present_in($this->_req_data)) {
 					$correct_pmt_form_to_use = $pmt_form;
 					break;
 				}
 			}
 			//if we couldn't find the correct payment method type...
-			if( ! $correct_pmt_form_to_use ){
+			if ( ! $correct_pmt_form_to_use) {
 				EE_Error::add_error(__("We could not find which payment method type your form submission related to. Please contact support", 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				$this->_redirect_after_action(FALSE, 'Payment Method', 'activated', array('action' => 'default'));
 			}
 			$correct_pmt_form_to_use->receive_form_submission($this->_req_data);
-			if($correct_pmt_form_to_use->is_valid()){
-				$subsection_name = 'payment_method_settings_' . $payment_method->slug();
-				$payment_settings_subform = $correct_pmt_form_to_use->get_subsection( $subsection_name );
-				if( ! $payment_settings_subform instanceof EE_Payment_Method_Form ) {
+			if ($correct_pmt_form_to_use->is_valid()) {
+				$subsection_name = 'payment_method_settings_'.$payment_method->slug();
+				$payment_settings_subform = $correct_pmt_form_to_use->get_subsection($subsection_name);
+				if ( ! $payment_settings_subform instanceof EE_Payment_Method_Form) {
 					throw new EE_Error( 
 						sprintf(
-							__( 'The payment method could not be saved because the form sections were misnamed. We expected to find %1$s, but did not.','event_espresso' ),
+							__('The payment method could not be saved because the form sections were misnamed. We expected to find %1$s, but did not.', 'event_espresso'),
 							$subsection_name
 						)
 					);
 				}
 				$payment_settings_subform->save();
 				/** @var $pm EE_Payment_Method */
-				$this->_redirect_after_action(TRUE, 'Payment Method', 'updated', array('action' => 'default','payment_method'=>$payment_method->slug()));
-			}else{
+				$this->_redirect_after_action(TRUE, 'Payment Method', 'updated', array('action' => 'default', 'payment_method'=>$payment_method->slug()));
+			} else {
 				EE_Error::add_error(
 					sprintf(
 						__('Payment method of type %s was not saved because there were validation errors. They have been marked in the form', 'event_espresso'),
-						$payment_method instanceof EE_PMT_Base ? $payment_method->pretty_name() : __( '"(unknown)"', 'event_espresso' )
+						$payment_method instanceof EE_PMT_Base ? $payment_method->pretty_name() : __('"(unknown)"', 'event_espresso')
 					),
 					__FILE__,
 					__FUNCTION__,
@@ -758,11 +758,11 @@ 
 	protected function _payment_settings() {
 
 		$this->_template_args['values'] = $this->_yes_no_values;
-		$this->_template_args['show_pending_payment_options'] = isset( EE_Registry::instance()->CFG->registration->show_pending_payment_options ) ? absint( EE_Registry::instance()->CFG->registration->show_pending_payment_options ) : FALSE;
+		$this->_template_args['show_pending_payment_options'] = isset(EE_Registry::instance()->CFG->registration->show_pending_payment_options) ? absint(EE_Registry::instance()->CFG->registration->show_pending_payment_options) : FALSE;
 
-		$this->_set_add_edit_form_tags( 'update_payment_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( EE_PAYMENTS_TEMPLATE_PATH . 'payment_settings.template.php', $this->_template_args, TRUE );
+		$this->_set_add_edit_form_tags('update_payment_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(EE_PAYMENTS_TEMPLATE_PATH.'payment_settings.template.php', $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
 
 	}
@@ -776,8 +776,8 @@ 
 	*		@return array
 	*/
 	protected function _update_payment_settings() {
-		EE_Registry::instance()->CFG->registration->show_pending_payment_options = isset( $this->_req_data['show_pending_payment_options'] ) ? $this->_req_data['show_pending_payment_options'] : FALSE;
-		EE_Registry::instance()->CFG = apply_filters( 'FHEE__Payments_Admin_Page___update_payment_settings__CFG', EE_Registry::instance()->CFG );
+		EE_Registry::instance()->CFG->registration->show_pending_payment_options = isset($this->_req_data['show_pending_payment_options']) ? $this->_req_data['show_pending_payment_options'] : FALSE;
+		EE_Registry::instance()->CFG = apply_filters('FHEE__Payments_Admin_Page___update_payment_settings__CFG', EE_Registry::instance()->CFG);
 
 //		 $superform = new EE_Form_Section_Proper(
 //		 	array(
@@ -797,9 +797,9 @@ 
 //		 	$this->_redirect_after_action( 0, 'settings', 'updated', array( 'action' => 'payment_settings' ) );
 //		 }
 
-		$what = __('Payment Settings','event_espresso');
-		$success = $this->_update_espresso_configuration( $what, EE_Registry::instance()->CFG, __FILE__, __FUNCTION__, __LINE__ );
-		$this->_redirect_after_action( $success, $what, __('updated','event_espresso'), array( 'action' => 'payment_settings' ) );
+		$what = __('Payment Settings', 'event_espresso');
+		$success = $this->_update_espresso_configuration($what, EE_Registry::instance()->CFG, __FILE__, __FUNCTION__, __LINE__);
+		$this->_redirect_after_action($success, $what, __('updated', 'event_espresso'), array('action' => 'payment_settings'));
 
 	}
 	protected function _payment_log_overview_list_table() {
@@ -825,18 +825,18 @@ 
 	 * @param bool $count
 	 * @return array
 	 */
-	public function get_payment_logs($per_page = 50, $current_page = 0, $count = false){
-		EE_Registry::instance()->load_model( 'Change_Log' );
+	public function get_payment_logs($per_page = 50, $current_page = 0, $count = false) {
+		EE_Registry::instance()->load_model('Change_Log');
 		//we may need to do multiple queries (joining differently), so we actually wan tan array of query params
-		$query_params =  array(array('LOG_type'=>  EEM_Change_Log::type_gateway));
+		$query_params = array(array('LOG_type'=>  EEM_Change_Log::type_gateway));
 		//check if they've selected a specific payment method
-		if( isset($this->_req_data['_payment_method']) && $this->_req_data['_payment_method'] !== 'all'){
+		if (isset($this->_req_data['_payment_method']) && $this->_req_data['_payment_method'] !== 'all') {
 			$query_params[0]['OR*pm_or_pay_pm'] = array('Payment.Payment_Method.PMD_ID'=>$this->_req_data['_payment_method'],
 				'Payment_Method.PMD_ID'=>$this->_req_data['_payment_method']);
 		}
 		//take into account search
-		if(isset($this->_req_data['s']) && $this->_req_data['s']){
-			$similarity_string = array('LIKE','%'.str_replace("","%",$this->_req_data['s']) .'%');
+		if (isset($this->_req_data['s']) && $this->_req_data['s']) {
+			$similarity_string = array('LIKE', '%'.str_replace("", "%", $this->_req_data['s']).'%');
 			$query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_fname'] = $similarity_string;
 			$query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_lname'] = $similarity_string;
 			$query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_email'] = $similarity_string;
@@ -851,48 +851,48 @@ 
 			$query_params[0]['OR*s']['LOG_message'] = $similarity_string;
 
 		}
-		if(isset( $this->_req_data['payment-filter-start-date'] ) && isset( $this->_req_data['payment-filter-end-date'] )){
+		if (isset($this->_req_data['payment-filter-start-date']) && isset($this->_req_data['payment-filter-end-date'])) {
 			//add date
-			$start_date =wp_strip_all_tags( $this->_req_data['payment-filter-start-date'] );
-			$end_date = wp_strip_all_tags( $this->_req_data['payment-filter-end-date'] );
+			$start_date = wp_strip_all_tags($this->_req_data['payment-filter-start-date']);
+			$end_date = wp_strip_all_tags($this->_req_data['payment-filter-end-date']);
 			//make sure our timestamps start and end right at the boundaries for each day
-			$start_date = date( 'Y-m-d', strtotime( $start_date ) ) . ' 00:00:00';
-			$end_date = date( 'Y-m-d', strtotime( $end_date ) ) . ' 23:59:59';
+			$start_date = date('Y-m-d', strtotime($start_date)).' 00:00:00';
+			$end_date = date('Y-m-d', strtotime($end_date)).' 23:59:59';
 
 			//convert to timestamps
-			$start_date = strtotime( $start_date );
-			$end_date = strtotime( $end_date );
+			$start_date = strtotime($start_date);
+			$end_date = strtotime($end_date);
 
 			//makes sure start date is the lowest value and vice versa
-			$start_date = min( $start_date, $end_date );
-			$end_date = max( $start_date, $end_date );
+			$start_date = min($start_date, $end_date);
+			$end_date = max($start_date, $end_date);
 
 			//convert for query
-			$start_date = EEM_Change_Log::instance()->convert_datetime_for_query( 'LOG_time', date( 'Y-m-d H:i:s', $start_date ), 'Y-m-d H:i:s' );
-			$end_date = EEM_Change_Log::instance()->convert_datetime_for_query( 'LOG_time', date( 'Y-m-d H:i:s', $end_date ), 'Y-m-d H:i:s' );
+			$start_date = EEM_Change_Log::instance()->convert_datetime_for_query('LOG_time', date('Y-m-d H:i:s', $start_date), 'Y-m-d H:i:s');
+			$end_date = EEM_Change_Log::instance()->convert_datetime_for_query('LOG_time', date('Y-m-d H:i:s', $end_date), 'Y-m-d H:i:s');
 
-			$query_params[0]['LOG_time'] = array('BETWEEN',array($start_date,$end_date));
+			$query_params[0]['LOG_time'] = array('BETWEEN', array($start_date, $end_date));
 
 		}
-		if($count){
+		if ($count) {
 			return EEM_Change_Log::instance()->count($query_params);
 		}
-		if(isset($this->_req_data['order'])){
-			$sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'DESC';
+		if (isset($this->_req_data['order'])) {
+			$sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'DESC';
 			$query_params['order_by'] = array('LOG_time' => $sort);
-		}else{
+		} else {
 				$query_params['order_by'] = array('LOG_time' => 'DESC');
 		}
-		$offset = ($current_page-1)*$per_page;
+		$offset = ($current_page - 1) * $per_page;
 
-		if( ! isset($this->_req_data['download_results'])){
-			$query_params['limit'] = array( $offset, $per_page );
+		if ( ! isset($this->_req_data['download_results'])) {
+			$query_params['limit'] = array($offset, $per_page);
 		}
 
 
 
 		//now they've requested to instead just download the file instead of viewing it.
-		if(isset($this->_req_data['download_results'])){
+		if (isset($this->_req_data['download_results'])) {
 			$wpdb_results = EEM_Change_Log::instance()->get_all_efficiently($query_params);
 			header('Content-Disposition: attachment');
 			header("Content-Disposition: attachment; filename=ee_payment_logs_for_".sanitize_key(site_url()));
@@ -914,36 +914,36 @@ 
 	 * @param EE_Change_Log $logB
 	 * @return int
 	 */
-	protected function _sort_logs_again($logA,$logB){
+	protected function _sort_logs_again($logA, $logB) {
 		$timeA = $logA->get_raw('LOG_time');
 		$timeB = $logB->get_raw('LOG_time');
-		if($timeA == $timeB){
+		if ($timeA == $timeB) {
 			return 0;
 		}
 		$comparison = $timeA < $timeB ? -1 : 1;
-		if(strtoupper($this->_sort_logs_again_direction) == 'DESC'){
+		if (strtoupper($this->_sort_logs_again_direction) == 'DESC') {
 			return $comparison * -1;
-		}else{
+		} else {
 			return $comparison;
 		}
 	}
 
 	protected function _payment_log_details() {
-		EE_Registry::instance()->load_model( 'Change_Log' );
+		EE_Registry::instance()->load_model('Change_Log');
 		/** @var $payment_log EE_Change_Log */
 		$payment_log = EEM_Change_Log::instance()->get_one_by_ID($this->_req_data['ID']);
 		$payment_method = NULL;
 		$transaction = NULL;
-		if( $payment_log instanceof EE_Change_Log ){
-			if( $payment_log->object() instanceof EE_Payment ){
+		if ($payment_log instanceof EE_Change_Log) {
+			if ($payment_log->object() instanceof EE_Payment) {
 				$payment_method = $payment_log->object()->payment_method();
 				$transaction = $payment_log->object()->transaction();
-			}elseif($payment_log->object() instanceof EE_Payment_Method){
+			}elseif ($payment_log->object() instanceof EE_Payment_Method) {
 				$payment_method = $payment_log->object();
 			}
 		}
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
-			EE_PAYMENTS_TEMPLATE_PATH . 'payment_log_details.template.php',
+			EE_PAYMENTS_TEMPLATE_PATH.'payment_log_details.template.php',
 			array(
 				'payment_log'=>$payment_log,
 				'payment_method'=>$payment_method,

payment_methods/Paypal_Express/help_tabs/payment_methods_overview_paypal_express.help_tab.php

Spacing +12 added lines, -12 removed lines

@@ -1,11 +1,11 @@ 
 <p>
-	<strong><?php _e( 'PayPal Express Checkout', 'event_espresso' ); ?></strong>
+	<strong><?php _e('PayPal Express Checkout', 'event_espresso'); ?></strong>
 </p>
 <p>
 	<?php _e('Please be sure to update the settings for the PayPal Express Checkout payment method.', 'event_espresso'); ?>
 </p>
 <p>
-	<?php printf( __('For more information on how to get your API credentials, please view the %1$sPayPal Documentation%2$s.', 'event_espresso'), '<a target="_blank" href="https://developer.paypal.com/docs/classic/api/apiCredentials/#create-an-api-signature">', '</a>' ); ?>
+	<?php printf(__('For more information on how to get your API credentials, please view the %1$sPayPal Documentation%2$s.', 'event_espresso'), '<a target="_blank" href="https://developer.paypal.com/docs/classic/api/apiCredentials/#create-an-api-signature">', '</a>'); ?>
 </p>
 
 
@@ -14,25 +14,25 @@ 
 </p>
 <ul>
 	<li>
-		<strong><?php _e( 'API Username', 'event_espresso' ); ?></strong><br/>
-		<?php _e( 'Your PayPal API Username.'); ?>
+		<strong><?php _e('API Username', 'event_espresso'); ?></strong><br/>
+		<?php _e('Your PayPal API Username.'); ?>
 	</li>
 	<li>
-		<strong><?php _e( 'API Password', 'event_espresso' ); ?></strong><br/>
-		<?php _e( 'Your PayPal API Password.' ); ?>
+		<strong><?php _e('API Password', 'event_espresso'); ?></strong><br/>
+		<?php _e('Your PayPal API Password.'); ?>
 	</li>
 	<li>
-		<strong><?php _e( 'API Signature', 'event_espresso' ); ?></strong><br/>
-		<?php _e( 'Your PayPal Account Signature.' ); ?>
+		<strong><?php _e('API Signature', 'event_espresso'); ?></strong><br/>
+		<?php _e('Your PayPal Account Signature.'); ?>
 	</li>
 	<li>
-		<strong><?php _e( 'Request Shipping Address', 'event_espresso' ); ?></strong><br/>
-		<?php _e( 'Indicates whether or not you require the buyer\'s shipping address on file with PayPal be a confirmed address.' ); ?>
+		<strong><?php _e('Request Shipping Address', 'event_espresso'); ?></strong><br/>
+		<?php _e('Indicates whether or not you require the buyer\'s shipping address on file with PayPal be a confirmed address.'); ?>
 	</li>
 </ul>
 <p>
-	<?php printf( __('For testing please use a %1$s PaypPal Sandbox account%2$s.', 'event_espresso'), '<a target="_blank" href="https://developer.paypal.com">', '</a>' ); ?>
+	<?php printf(__('For testing please use a %1$s PaypPal Sandbox account%2$s.', 'event_espresso'), '<a target="_blank" href="https://developer.paypal.com">', '</a>'); ?>
 </p>
 <p>
-	<?php printf( __('Don\'t have PayPal? %1$sSign up for an account%2$s to get start right away.', 'event_espresso'), '<a target="_blank" href="hhttps://eventespresso.com/go/paypalstandard/">', '</a>' ); ?>
+	<?php printf(__('Don\'t have PayPal? %1$sSign up for an account%2$s to get start right away.', 'event_espresso'), '<a target="_blank" href="hhttps://eventespresso.com/go/paypalstandard/">', '</a>'); ?>
 </p>
\ No newline at end of file

core/admin/PostShortcodeTracking.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +445 added lines, -445 removed lines

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

Spacing +98 added lines, -98 removed lines

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