eventespresso / event-espresso-core

core/libraries/payment_methods/EE_Gateway.lib.php

Braces +1 added lines, -1 removed lines

@@ -214,7 +214,7 @@
 		if($payment instanceof EEI_Payment){
 			$type='Payment';
 			$id = $payment->ID();
-		}else{
+		} else{
 			$type = 'Payment_Method';
 			$id = $this->_ID;
 		}

Indentation +86 added lines, -86 removed lines

@@ -74,15 +74,15 @@ 
 	 */
 	protected $_line_item;
 
-    /**
-     * @var GatewayDataFormatterInterface
-     */
-    protected $_gateway_data_formatter;
+	/**
+	 * @var GatewayDataFormatterInterface
+	 */
+	protected $_gateway_data_formatter;
 
-    /**
-     * @var FormatterInterface
-     */
-    protected $_unsupported_character_remover;
+	/**
+	 * @var FormatterInterface
+	 */
+	protected $_unsupported_character_remover;
 
 	/**
 	 * The ID of the payment method using this gateway
@@ -211,75 +211,75 @@ 
 
 
 
-    /**
-     * Sets the gateway data formatter helper
-     * @param GatewayDataFormatterInterface $gateway_data_formatter
-     * @throws InvalidEntityException if it's not set properly
-     */
+	/**
+	 * Sets the gateway data formatter helper
+	 * @param GatewayDataFormatterInterface $gateway_data_formatter
+	 * @throws InvalidEntityException if it's not set properly
+	 */
 	public function set_gateway_data_formatter( GatewayDataFormatterInterface $gateway_data_formatter){
-        if( ! $gateway_data_formatter instanceof GatewayDataFormatterInterface){
-            throw new InvalidEntityException(
-                is_object($gateway_data_formatter)
-                    ? get_class($gateway_data_formatter)
-                    : esc_html__('Not an object','event_espresso'),
-                '\\EventEspresso\\core\\services\\payment_methods\\gateways\\GatewayDataFormatterInterface'
-            );
-        }
-        $this->_gateway_data_formatter = $gateway_data_formatter;
-    }
-
-    /**
-     * Gets the gateway data formatter
-     * @return GatewayDataFormatterInterface
-     * @throws InvalidEntityException if it's not set properly
-     */
-    protected function _get_gateway_formatter(){
-        if( ! $this->_gateway_data_formatter instanceof GatewayDataFormatterInterface){
-            throw new InvalidEntityException(
-                is_object($this->_gateway_data_formatter)
-                    ? get_class($this->_gateway_data_formatter)
-                    : esc_html__('Not an object','event_espresso'),
-                '\\EventEspresso\\core\\services\\payment_methods\\gateways\\GatewayDataFormatterInterface'
-            );
-        }
-        return $this->_gateway_data_formatter;
-    }
-
-
-
-    /**
-     * Sets the helper which will remove unsupported characters for most gateways
-     * @param FormatterInterface $formatter
-     * @return FormatterInterface
-     * @throws InvalidEntityException
-     */
-    public function set_unsupported_character_remover( FormatterInterface $formatter){
-        if( ! $formatter instanceof FormatterInterface){
-            throw new InvalidEntityException(
-                is_object($formatter)
-                    ? get_class($formatter)
-                    : esc_html__('Not an object','event_espresso'),
-                '\\EventEspresso\\core\\services\\formatters\\FormatterInterface'
-            );
-        }
-       $this->_unsupported_character_remover = $formatter;
-    }
-    /**
-     * Gets the helper which removes characters which gateways might not support, like emojis etc.
-     * @return FormatterInterface
-     * @throws InvalidEntityException
-     */
-    protected function _get_unsupported_character_remover(){
-        if( ! $this->_unsupported_character_remover instanceof FormatterInterface){
-            throw new InvalidEntityException(
-                is_object($this->_unsupported_character_remover)
-                    ? get_class($this->_unsupported_character_remover)
-                    : esc_html__('Not an object','event_espresso'),
-                '\\EventEspresso\\core\\services\\formatters\\FormatterInterface'
-            );
-        }
-        return $this->_unsupported_character_remover;
-    }
+		if( ! $gateway_data_formatter instanceof GatewayDataFormatterInterface){
+			throw new InvalidEntityException(
+				is_object($gateway_data_formatter)
+					? get_class($gateway_data_formatter)
+					: esc_html__('Not an object','event_espresso'),
+				'\\EventEspresso\\core\\services\\payment_methods\\gateways\\GatewayDataFormatterInterface'
+			);
+		}
+		$this->_gateway_data_formatter = $gateway_data_formatter;
+	}
+
+	/**
+	 * Gets the gateway data formatter
+	 * @return GatewayDataFormatterInterface
+	 * @throws InvalidEntityException if it's not set properly
+	 */
+	protected function _get_gateway_formatter(){
+		if( ! $this->_gateway_data_formatter instanceof GatewayDataFormatterInterface){
+			throw new InvalidEntityException(
+				is_object($this->_gateway_data_formatter)
+					? get_class($this->_gateway_data_formatter)
+					: esc_html__('Not an object','event_espresso'),
+				'\\EventEspresso\\core\\services\\payment_methods\\gateways\\GatewayDataFormatterInterface'
+			);
+		}
+		return $this->_gateway_data_formatter;
+	}
+
+
+
+	/**
+	 * Sets the helper which will remove unsupported characters for most gateways
+	 * @param FormatterInterface $formatter
+	 * @return FormatterInterface
+	 * @throws InvalidEntityException
+	 */
+	public function set_unsupported_character_remover( FormatterInterface $formatter){
+		if( ! $formatter instanceof FormatterInterface){
+			throw new InvalidEntityException(
+				is_object($formatter)
+					? get_class($formatter)
+					: esc_html__('Not an object','event_espresso'),
+				'\\EventEspresso\\core\\services\\formatters\\FormatterInterface'
+			);
+		}
+	   $this->_unsupported_character_remover = $formatter;
+	}
+	/**
+	 * Gets the helper which removes characters which gateways might not support, like emojis etc.
+	 * @return FormatterInterface
+	 * @throws InvalidEntityException
+	 */
+	protected function _get_unsupported_character_remover(){
+		if( ! $this->_unsupported_character_remover instanceof FormatterInterface){
+			throw new InvalidEntityException(
+				is_object($this->_unsupported_character_remover)
+					? get_class($this->_unsupported_character_remover)
+					: esc_html__('Not an object','event_espresso'),
+				'\\EventEspresso\\core\\services\\formatters\\FormatterInterface'
+			);
+		}
+		return $this->_unsupported_character_remover;
+	}
 
 
 	/**
@@ -300,7 +300,7 @@ 
 	 * Formats the amount so it can generally be sent to gateways
 	 * @param float $amount
 	 * @return string
-     * @deprecated since 4.9.31 insetad use EventEspresso\core\services\payment_methods\gateways\GatewayDataFormatter::format_currency()
+	 * @deprecated since 4.9.31 insetad use EventEspresso\core\services\payment_methods\gateways\GatewayDataFormatter::format_currency()
 	 */
 	public function format_currency($amount){
 		return $this->_get_gateway_formatter()->formatCurrency($amount);
@@ -370,7 +370,7 @@ 
 	 * Gets the first event for this payment (it's possible that it could be for multiple)
 	 * @param EEI_Payment $payment
 	 * @return EEI_Event|null
-     * @deprecated since 4.9.31 instead use EEI_Payment::get_first_event()
+	 * @deprecated since 4.9.31 instead use EEI_Payment::get_first_event()
 	 */
 	protected function _get_first_event_for_payment( EEI_Payment $payment ) {
 		return $payment->get_first_event();
@@ -380,14 +380,14 @@ 
 	 * Gets the name of the first event for which is being paid
 	 * @param EEI_Payment $payment
 	 * @return string
-     * @deprecated since 4.9.31 instead use EEI_Payment::get_first_event_name()
+	 * @deprecated since 4.9.31 instead use EEI_Payment::get_first_event_name()
 	 */
 	protected function _get_first_event_name_for_payment( EEI_Payment $payment ) {
 		return $payment->get_first_event_name();
 	}
 	/**
 	 * Gets the text to use for a gateway's line item name when this is a partial payment
-     * @deprecated since 4.9.31 instead use $this->_get_gateway_formatter()->formatPartialPaymentLineItemName($payment)
+	 * @deprecated since 4.9.31 instead use $this->_get_gateway_formatter()->formatPartialPaymentLineItemName($payment)
 	 * @param EE_Payment $payment
 	 * @return string
 	 */
@@ -396,7 +396,7 @@ 
 	}
 	/**
 	 * Gets the text to use for a gateway's line item description when this is a partial payment
-     * @deprecated since 4.9.31 instead use $this->_get_gateway_formatter()->formatPartialPaymentLineItemDesc()
+	 * @deprecated since 4.9.31 instead use $this->_get_gateway_formatter()->formatPartialPaymentLineItemDesc()
 	 * @param EEI_Payment $payment
 	 * @return string
 	 */
@@ -405,9 +405,9 @@ 
 	}
 	
 	/**
-     * Gets the name to use for a line item when sending line items to the gateway
-     * @deprecated since 4.9.31 instead use $this->_get_gateway_formatter()->formatLineItemName($line_item,$payment)
-     * @param EEI_Line_Item $line_item
+	 * Gets the name to use for a line item when sending line items to the gateway
+	 * @deprecated since 4.9.31 instead use $this->_get_gateway_formatter()->formatLineItemName($line_item,$payment)
+	 * @param EEI_Line_Item $line_item
 	 * @param EEI_Payment $payment
 	 * @return string
 	 */
@@ -417,7 +417,7 @@ 
 	
 	/**
 	 * Gets the description to use for a line item when sending line items to the gateway
-     * @deprecated since 4.9.31 instead use $this->_get_gateway_formatter()->formatLineItemDesc($line_item, $payment))
+	 * @deprecated since 4.9.31 instead use $this->_get_gateway_formatter()->formatLineItemDesc($line_item, $payment))
 	 * @param EEI_Line_Item $line_item
 	 * @param EEI_Payment $payment
 	 * @return string
@@ -428,7 +428,7 @@ 
 	
 	/**
 	 * Gets the order description that should generlly be sent to gateways
-     * @deprecated since 4.9.31 instead use $this->_get_gateway_formatter()->formatOrderDescription($payment)
+	 * @deprecated since 4.9.31 instead use $this->_get_gateway_formatter()->formatOrderDescription($payment)
 	 * @param EEI_Payment $payment
 	 * @return type
 	 */

Spacing +49 added lines, -49 removed lines

@@ -20,7 +20,7 @@ 
  * @subpackage		core/libraries/payment_methods
  * @author			Mike Nelson
  */
-abstract class EE_Gateway{
+abstract class EE_Gateway {
 	/**
 	 * a constant used as a possible value for $_currencies_supported to indicate
 	 * that ALL currencies are supported by this gateway
@@ -108,7 +108,7 @@ 
 	/**
 	 * @return EE_Gateway
 	 */
-	public function __construct(){
+	public function __construct() {
 	}
 
 	/**
@@ -120,9 +120,9 @@ 
 	 * beginning again)
 	 * @return array
 	 */
-	public function __sleep(){
+	public function __sleep() {
 		$properties = get_object_vars($this);
-		unset( $properties[ '_pay_model' ], $properties[ '_pay_log' ] );
+		unset($properties['_pay_model'], $properties['_pay_log']);
 		return array_keys($properties);
 	}
 	/**
@@ -130,7 +130,7 @@ 
 	 * see $_supports_sending_refunds
 	 * @return boolean
 	 */
-	public function supports_sending_refunds(){
+	public function supports_sending_refunds() {
 		return $this->_supports_sending_refunds;
 	}
 	/**
@@ -138,7 +138,7 @@ 
 	 * see $_supports_receiving_refunds
 	 * @return boolean
 	 */
-	public function supports_receiving_refunds(){
+	public function supports_receiving_refunds() {
 		return $this->_supports_receiving_refunds;
 	}
 
@@ -153,7 +153,7 @@ 
 	 * @return EE_Payment for the refund
 	 * @throws EE_Error
 	 */
-	public function do_direct_refund( EE_Payment $payment, $refund_info = null ) {
+	public function do_direct_refund(EE_Payment $payment, $refund_info = null) {
 		return NULL;
 	}
 
@@ -164,8 +164,8 @@ 
 	 * etc
 	 * @param array $settings_array
 	 */
-	public function set_settings($settings_array){
-		foreach($settings_array as $name => $value){
+	public function set_settings($settings_array) {
+		foreach ($settings_array as $name => $value) {
 			$property_name = "_".$name;
 			$this->{$property_name} = $value;
 		}
@@ -174,14 +174,14 @@ 
 	 * See this class description
 	 * @param EEMI_Payment $payment_model
 	 */
-	public function set_payment_model($payment_model){
+	public function set_payment_model($payment_model) {
 		$this->_pay_model = $payment_model;
 	}
 	/**
 	 * See this class description
 	 * @param EEMI_Payment_Log $payment_log_model
 	 */
-	public function set_payment_log($payment_log_model){
+	public function set_payment_log($payment_log_model) {
 		$this->_pay_log = $payment_log_model;
 	}
 
@@ -189,7 +189,7 @@ 
 	 * See this class description
 	 * @param EEHI_Template $template_helper
 	 */
-	public function set_template_helper($template_helper){
+	public function set_template_helper($template_helper) {
 		$this->_template = $template_helper;
 	}
 
@@ -197,7 +197,7 @@ 
 	 * See this class description
 	 * @param EEHI_Line_Item $line_item_helper
 	 */
-	public function set_line_item_helper( $line_item_helper ){
+	public function set_line_item_helper($line_item_helper) {
 		$this->_line_item = $line_item_helper;
 	}
 
@@ -205,7 +205,7 @@ 
 	 * See this class description
 	 * @param EEHI_Money $money_helper
 	 */
-	public function set_money_helper( $money_helper ){
+	public function set_money_helper($money_helper) {
 		$this->_money = $money_helper;
 	}
 
@@ -216,12 +216,12 @@ 
      * @param GatewayDataFormatterInterface $gateway_data_formatter
      * @throws InvalidEntityException if it's not set properly
      */
-	public function set_gateway_data_formatter( GatewayDataFormatterInterface $gateway_data_formatter){
-        if( ! $gateway_data_formatter instanceof GatewayDataFormatterInterface){
+	public function set_gateway_data_formatter(GatewayDataFormatterInterface $gateway_data_formatter) {
+        if ( ! $gateway_data_formatter instanceof GatewayDataFormatterInterface) {
             throw new InvalidEntityException(
                 is_object($gateway_data_formatter)
                     ? get_class($gateway_data_formatter)
-                    : esc_html__('Not an object','event_espresso'),
+                    : esc_html__('Not an object', 'event_espresso'),
                 '\\EventEspresso\\core\\services\\payment_methods\\gateways\\GatewayDataFormatterInterface'
             );
         }
@@ -233,12 +233,12 @@ 
      * @return GatewayDataFormatterInterface
      * @throws InvalidEntityException if it's not set properly
      */
-    protected function _get_gateway_formatter(){
-        if( ! $this->_gateway_data_formatter instanceof GatewayDataFormatterInterface){
+    protected function _get_gateway_formatter() {
+        if ( ! $this->_gateway_data_formatter instanceof GatewayDataFormatterInterface) {
             throw new InvalidEntityException(
                 is_object($this->_gateway_data_formatter)
                     ? get_class($this->_gateway_data_formatter)
-                    : esc_html__('Not an object','event_espresso'),
+                    : esc_html__('Not an object', 'event_espresso'),
                 '\\EventEspresso\\core\\services\\payment_methods\\gateways\\GatewayDataFormatterInterface'
             );
         }
@@ -253,12 +253,12 @@ 
      * @return FormatterInterface
      * @throws InvalidEntityException
      */
-    public function set_unsupported_character_remover( FormatterInterface $formatter){
-        if( ! $formatter instanceof FormatterInterface){
+    public function set_unsupported_character_remover(FormatterInterface $formatter) {
+        if ( ! $formatter instanceof FormatterInterface) {
             throw new InvalidEntityException(
                 is_object($formatter)
                     ? get_class($formatter)
-                    : esc_html__('Not an object','event_espresso'),
+                    : esc_html__('Not an object', 'event_espresso'),
                 '\\EventEspresso\\core\\services\\formatters\\FormatterInterface'
             );
         }
@@ -269,12 +269,12 @@ 
      * @return FormatterInterface
      * @throws InvalidEntityException
      */
-    protected function _get_unsupported_character_remover(){
-        if( ! $this->_unsupported_character_remover instanceof FormatterInterface){
+    protected function _get_unsupported_character_remover() {
+        if ( ! $this->_unsupported_character_remover instanceof FormatterInterface) {
             throw new InvalidEntityException(
                 is_object($this->_unsupported_character_remover)
                     ? get_class($this->_unsupported_character_remover)
-                    : esc_html__('Not an object','event_espresso'),
+                    : esc_html__('Not an object', 'event_espresso'),
                 '\\EventEspresso\\core\\services\\formatters\\FormatterInterface'
             );
         }
@@ -286,15 +286,15 @@ 
 	 * @param $message
 	 * @param $payment
 	 */
-	public function log($message,$payment){
-		if($payment instanceof EEI_Payment){
-			$type='Payment';
+	public function log($message, $payment) {
+		if ($payment instanceof EEI_Payment) {
+			$type = 'Payment';
 			$id = $payment->ID();
-		}else{
+		} else {
 			$type = 'Payment_Method';
 			$id = $this->_ID;
 		}
-		$this->_pay_log->gateway_log($message,$id,$type);
+		$this->_pay_log->gateway_log($message, $id, $type);
 	}
 	/**
 	 * Formats the amount so it can generally be sent to gateways
@@ -302,7 +302,7 @@ 
 	 * @return string
      * @deprecated since 4.9.31 insetad use EventEspresso\core\services\payment_methods\gateways\GatewayDataFormatter::format_currency()
 	 */
-	public function format_currency($amount){
+	public function format_currency($amount) {
 		return $this->_get_gateway_formatter()->formatCurrency($amount);
 	}
 
@@ -311,7 +311,7 @@ 
 	 * or a string indicating they're all supported (EE_gateway::all_currencies_supported)
 	 * @return mixed array or string
 	 */
-	public function currencies_supported(){
+	public function currencies_supported() {
 		return $this->_currencies_supported;
 	}
 
@@ -323,14 +323,14 @@ 
 	 * @param EE_Transaction  $transaction
 	 * @return float
 	 */
-	protected function _sum_items_and_taxes( EE_Transaction  $transaction){
+	protected function _sum_items_and_taxes(EE_Transaction  $transaction) {
 		$total_line_item = $transaction->total_line_item();
 		$total = 0;
-		foreach($total_line_item->get_items() as $item_line_item ){
-			$total += max( $item_line_item->total(), 0 );
+		foreach ($total_line_item->get_items() as $item_line_item) {
+			$total += max($item_line_item->total(), 0);
 		}
-		foreach($total_line_item->tax_descendants() as $tax_line_item ){
-			$total += max( $tax_line_item->total(), 0 );
+		foreach ($total_line_item->tax_descendants() as $tax_line_item) {
+			$total += max($tax_line_item->total(), 0);
 		}
 		return $total;
 	}
@@ -341,9 +341,9 @@ 
 	 * @param EEI_Payment $payment
 	 * @return boolean
 	 */
-	protected function _can_easily_itemize_transaction_for( EEI_Payment $payment ){
+	protected function _can_easily_itemize_transaction_for(EEI_Payment $payment) {
 		return  $this->_money->compare_floats(
-					$this->_sum_items_and_taxes( $payment->transaction() ),
+					$this->_sum_items_and_taxes($payment->transaction()),
 					$payment->transaction()->total() ) &&
 				$this->_money->compare_floats(
 					$payment->amount(),
@@ -361,7 +361,7 @@ 
 	 * @param EE_Payment $payment
 	 * @return void
 	 */
-	public function update_txn_based_on_payment( $payment ){
+	public function update_txn_based_on_payment($payment) {
 		//maybe update the transaction or line items or registrations
 		//but most gateways don't need to do this, because they only update the payment
 	}
@@ -372,7 +372,7 @@ 
 	 * @return EEI_Event|null
      * @deprecated since 4.9.31 instead use EEI_Payment::get_first_event()
 	 */
-	protected function _get_first_event_for_payment( EEI_Payment $payment ) {
+	protected function _get_first_event_for_payment(EEI_Payment $payment) {
 		return $payment->get_first_event();
 	}
 	
@@ -382,7 +382,7 @@ 
 	 * @return string
      * @deprecated since 4.9.31 instead use EEI_Payment::get_first_event_name()
 	 */
-	protected function _get_first_event_name_for_payment( EEI_Payment $payment ) {
+	protected function _get_first_event_name_for_payment(EEI_Payment $payment) {
 		return $payment->get_first_event_name();
 	}
 	/**
@@ -391,7 +391,7 @@ 
 	 * @param EE_Payment $payment
 	 * @return string
 	 */
-	protected function _format_partial_payment_line_item_name( EEI_Payment $payment ){
+	protected function _format_partial_payment_line_item_name(EEI_Payment $payment) {
 		return $this->_get_gateway_formatter()->formatPartialPaymentLineItemName($payment);
 	}
 	/**
@@ -400,7 +400,7 @@ 
 	 * @param EEI_Payment $payment
 	 * @return string
 	 */
-	protected function _format_partial_payment_line_item_desc( EEI_Payment $payment ) {
+	protected function _format_partial_payment_line_item_desc(EEI_Payment $payment) {
 		return $this->_get_gateway_formatter()->formatPartialPaymentLineItemDesc($payment);
 	}
 	
@@ -411,8 +411,8 @@ 
 	 * @param EEI_Payment $payment
 	 * @return string
 	 */
-	protected function _format_line_item_name( EEI_Line_Item $line_item, EEI_Payment $payment ) {
-		return $this->_get_gateway_formatter()->formatLineItemName($line_item,$payment);
+	protected function _format_line_item_name(EEI_Line_Item $line_item, EEI_Payment $payment) {
+		return $this->_get_gateway_formatter()->formatLineItemName($line_item, $payment);
 	}
 	
 	/**
@@ -422,7 +422,7 @@ 
 	 * @param EEI_Payment $payment
 	 * @return string
 	 */
-	protected function _format_line_item_desc( EEI_Line_Item $line_item, EEI_Payment $payment ) {
+	protected function _format_line_item_desc(EEI_Line_Item $line_item, EEI_Payment $payment) {
 		return $this->_get_gateway_formatter()->formatLineItemDesc($line_item, $payment);
 	}
 	
@@ -432,7 +432,7 @@ 
 	 * @param EEI_Payment $payment
 	 * @return type
 	 */
-	protected function _format_order_description( EEI_Payment $payment ) {
+	protected function _format_order_description(EEI_Payment $payment) {
 		return $this->_get_gateway_formatter()->formatOrderDescription($payment);
 	}
 }
\ No newline at end of file

Doc Comments +1 added lines, -1 removed lines

@@ -430,7 +430,7 @@
 	 * Gets the order description that should generlly be sent to gateways
      * @deprecated since 4.9.31 instead use $this->_get_gateway_formatter()->formatOrderDescription($payment)
 	 * @param EEI_Payment $payment
-	 * @return type
+	 * @return string
 	 */
 	protected function _format_order_description( EEI_Payment $payment ) {
 		return $this->_get_gateway_formatter()->formatOrderDescription($payment);

core/libraries/payment_methods/EE_Onsite_Gateway.lib.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-abstract class EE_Onsite_Gateway extends EE_Gateway{
+abstract class EE_Onsite_Gateway extends EE_Gateway {
 
 	/**
 	 * @return EE_Onsite_Gateway
@@ -53,5 +53,5 @@ 
 	 * } unless a child class specifies these array keys are NOT present
 	 * @return EE_Payment updated
 	 */
-	public abstract function do_direct_payment($payment,$billing_info = null);
+	public abstract function do_direct_payment($payment, $billing_info = null);
 }

core/libraries/payment_methods/templates/payment_details_content.template.php

Indentation +4 added lines, -4 removed lines

@@ -2,10 +2,10 @@
 if (!defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
- * payment_details_content
- * @var EE_Payment $payment
- * @var EE_Payment_Method $payment_method
- */
+	 * payment_details_content
+	 * @var EE_Payment $payment
+	 * @var EE_Payment_Method $payment_method
+	 */
 $gateway_response = $payment->gateway_response();
 if ( ! empty( $gateway_response )) {
 	echo '<span class="error payment-problem">' . $gateway_response . '</span>';

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
  * payment_details_content
@@ -7,7 +7,7 @@ 
  * @var EE_Payment_Method $payment_method
  */
 $gateway_response = $payment->gateway_response();
-if ( ! empty( $gateway_response )) {
-	echo '<span class="error payment-problem">' . $gateway_response . '</span>';
+if ( ! empty($gateway_response)) {
+	echo '<span class="error payment-problem">'.$gateway_response.'</span>';
 }
 // End of file payment_details_content.template.php
\ No newline at end of file

Braces +2 added lines, -1 removed lines

@@ -1,6 +1,7 @@
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 /**
  * payment_details_content
  * @var EE_Payment $payment

core/libraries/plugin_api/EEI_Plugin_API.lib.php

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
 	 * @param array  $setup_args  an array of key value pairs of info for registering the component
 	 * @return void
 	 */
-	public static function register( $ID = NULL, $setup_args = array() );
+	public static function register($ID = NULL, $setup_args = array());
 
 
 
@@ -45,5 +45,5 @@ 
 	 * @param string $ID a unique name or ID for the component being registered
 	 * @return void
 	 */
-	public static function deregister( $ID = NULL );
+	public static function deregister($ID = NULL);
 }

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  * @subpackage helpers
  * @since           4.3.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * This interface is used to define the common methods shared by all "plugin api" classes.

core/libraries/plugin_api/EE_Register_Admin_Page.lib.php

Indentation +45 added lines, -45 removed lines

@@ -18,30 +18,30 @@ 
 class EE_Register_Admin_Page implements EEI_Plugin_API {
 
 
-    /**
-     * Holds registered EE_Admin_Pages
-     * @var array
-     */
-    protected static $_ee_admin_page_registry = array();
+	/**
+	 * Holds registered EE_Admin_Pages
+	 * @var array
+	 */
+	protected static $_ee_admin_page_registry = array();
 
 
 
 
-    /**
-     * The purpose of this method is to provide an easy way for addons to register their admin pages (using the EE Admin Page loader system).
-     *
-     * @since 4.3.0
-     *
+	/**
+	 * The purpose of this method is to provide an easy way for addons to register their admin pages (using the EE Admin Page loader system).
+	 *
+	 * @since 4.3.0
+	 *
 	 * @param  string $page_basename 	This string represents the basename of the Admin Page init.
 	 *                                                        		The init file must use this basename in its name and class (i.e. {page_basename}_Admin_Page_Init.core.php).
-     * @param  array  $config  {              An array of configuration options that will be used in different circumstances
+	 * @param  array  $config  {              An array of configuration options that will be used in different circumstances
 	 *
 	 *		@type  string $page_path             This is the path where the registered admin pages reside ( used to setup autoloaders).
 	 *
 	 * 	}
-     * @return void
-     */
-    public static function register( $page_basename = NULL, $config = array() ) {
+	 * @return void
+	 */
+	public static function register( $page_basename = NULL, $config = array() ) {
 
 		// check that an admin_page has not already been registered with that name
 		if ( isset(self::$_ee_admin_page_registry[ $page_basename ] )) {
@@ -59,7 +59,7 @@ 
 		}
 
 		if ( ! did_action( 'AHEE__EE_System__load_espresso_addons' ) || did_action( 'AHEE__EE_Admin__loaded' )) {
-            EE_Error::doing_it_wrong(
+			EE_Error::doing_it_wrong(
 				__METHOD__,
 				sprintf(
 					__('An attempt was made to register "%s" as an EE Admin page has failed because it was not registered at the correct time.  Please use the "AHEE__EE_Admin__loaded" hook to register Admin pages.','event_espresso'),
@@ -67,36 +67,36 @@ 
 				),
 				'4.3'
 			);
-        }
+		}
 
-        //add incoming stuff to our registry property
-        self::$_ee_admin_page_registry[ $page_basename ] = array(
-            'page_path' => $config['page_path'],
-            'config' => $config
-            );
+		//add incoming stuff to our registry property
+		self::$_ee_admin_page_registry[ $page_basename ] = array(
+			'page_path' => $config['page_path'],
+			'config' => $config
+			);
 
-       //add filters
+	   //add filters
 
-       add_filter('FHEE__EE_Admin_Page_Loader___get_installed_pages__installed_refs', array( 'EE_Register_Admin_Page', 'set_page_basename' ), 10 );
-       add_filter('FHEE__EEH_Autoloader__load_admin_core', array( 'EE_Register_Admin_Page', 'set_page_path' ), 10 );
+	   add_filter('FHEE__EE_Admin_Page_Loader___get_installed_pages__installed_refs', array( 'EE_Register_Admin_Page', 'set_page_basename' ), 10 );
+	   add_filter('FHEE__EEH_Autoloader__load_admin_core', array( 'EE_Register_Admin_Page', 'set_page_path' ), 10 );
 
-    }
+	}
 
 
 
-    /**
-     * This deregisters a EE_Admin page that is already registered.  Note, this MUST be loaded after the
-     * page being deregistered is loaded.
-     *
-     * @since    4.3.0
-     *
-     * @param  string $page_basename Use whatever string was used to register the admin page.
-     * @return  void
-     */
-    public static function deregister( $page_basename = NULL ) {
-    	if ( !empty( self::$_ee_admin_page_registry[$page_basename] ) )
-    		unset( self::$_ee_admin_page_registry[$page_basename] );
-    }
+	/**
+	 * This deregisters a EE_Admin page that is already registered.  Note, this MUST be loaded after the
+	 * page being deregistered is loaded.
+	 *
+	 * @since    4.3.0
+	 *
+	 * @param  string $page_basename Use whatever string was used to register the admin page.
+	 * @return  void
+	 */
+	public static function deregister( $page_basename = NULL ) {
+		if ( !empty( self::$_ee_admin_page_registry[$page_basename] ) )
+			unset( self::$_ee_admin_page_registry[$page_basename] );
+	}
 
 
 
@@ -112,8 +112,8 @@ 
 				$installed_refs[ $basename ] = $args['page_path'];
 			}
 		}
-        return $installed_refs;
-    }
+		return $installed_refs;
+	}
 
 
 
@@ -124,9 +124,9 @@ 
 	 * @return mixed
 	 */
 	public static function set_page_path( $paths ) {
-        foreach ( self::$_ee_admin_page_registry as $basename => $args ) {
-            $paths[ $basename ] = $args['page_path'];
-        }
-        return $paths;
-    }
+		foreach ( self::$_ee_admin_page_registry as $basename => $args ) {
+			$paths[ $basename ] = $args['page_path'];
+		}
+		return $paths;
+	}
 }

Spacing +21 added lines, -21 removed lines

@@ -41,28 +41,28 @@ 
 	 * 	}
      * @return void
      */
-    public static function register( $page_basename = NULL, $config = array() ) {
+    public static function register($page_basename = NULL, $config = array()) {
 
 		// check that an admin_page has not already been registered with that name
-		if ( isset(self::$_ee_admin_page_registry[ $page_basename ] )) {
-			throw new EE_Error( sprintf( __( 'An Admin Page with the name "%s" has already been registered and each Admin Page requires a unique name.', 'event_espresso' ), $page_basename ));
+		if (isset(self::$_ee_admin_page_registry[$page_basename])) {
+			throw new EE_Error(sprintf(__('An Admin Page with the name "%s" has already been registered and each Admin Page requires a unique name.', 'event_espresso'), $page_basename));
 		}
 
 		// required fields MUST be present, so let's make sure they are.
-		if ( empty( $page_basename ) || ! is_array( $config ) || empty( $config['page_path'] )) {
-			throw new EE_Error( __( 'In order to register an Admin Page with EE_Register_Admin_Page::register(), you must include the "page_basename" (the class name of the page), and an array containing the following keys: "page_path" (the path where the registered admin pages reside)', 'event_espresso' ));
+		if (empty($page_basename) || ! is_array($config) || empty($config['page_path'])) {
+			throw new EE_Error(__('In order to register an Admin Page with EE_Register_Admin_Page::register(), you must include the "page_basename" (the class name of the page), and an array containing the following keys: "page_path" (the path where the registered admin pages reside)', 'event_espresso'));
 		}
 
 		//make sure we don't register twice
-		if( isset( self::$_ee_admin_page_registry[ $page_basename ] ) ){
+		if (isset(self::$_ee_admin_page_registry[$page_basename])) {
 			return;
 		}
 
-		if ( ! did_action( 'AHEE__EE_System__load_espresso_addons' ) || did_action( 'AHEE__EE_Admin__loaded' )) {
+		if ( ! did_action('AHEE__EE_System__load_espresso_addons') || did_action('AHEE__EE_Admin__loaded')) {
             EE_Error::doing_it_wrong(
 				__METHOD__,
 				sprintf(
-					__('An attempt was made to register "%s" as an EE Admin page has failed because it was not registered at the correct time.  Please use the "AHEE__EE_Admin__loaded" hook to register Admin pages.','event_espresso'),
+					__('An attempt was made to register "%s" as an EE Admin page has failed because it was not registered at the correct time.  Please use the "AHEE__EE_Admin__loaded" hook to register Admin pages.', 'event_espresso'),
 					$page_basename
 				),
 				'4.3'
@@ -70,15 +70,15 @@ 
         }
 
         //add incoming stuff to our registry property
-        self::$_ee_admin_page_registry[ $page_basename ] = array(
+        self::$_ee_admin_page_registry[$page_basename] = array(
             'page_path' => $config['page_path'],
             'config' => $config
             );
 
        //add filters
 
-       add_filter('FHEE__EE_Admin_Page_Loader___get_installed_pages__installed_refs', array( 'EE_Register_Admin_Page', 'set_page_basename' ), 10 );
-       add_filter('FHEE__EEH_Autoloader__load_admin_core', array( 'EE_Register_Admin_Page', 'set_page_path' ), 10 );
+       add_filter('FHEE__EE_Admin_Page_Loader___get_installed_pages__installed_refs', array('EE_Register_Admin_Page', 'set_page_basename'), 10);
+       add_filter('FHEE__EEH_Autoloader__load_admin_core', array('EE_Register_Admin_Page', 'set_page_path'), 10);
 
     }
 
@@ -93,9 +93,9 @@ 
      * @param  string $page_basename Use whatever string was used to register the admin page.
      * @return  void
      */
-    public static function deregister( $page_basename = NULL ) {
-    	if ( !empty( self::$_ee_admin_page_registry[$page_basename] ) )
-    		unset( self::$_ee_admin_page_registry[$page_basename] );
+    public static function deregister($page_basename = NULL) {
+    	if ( ! empty(self::$_ee_admin_page_registry[$page_basename]))
+    		unset(self::$_ee_admin_page_registry[$page_basename]);
     }
 
 
@@ -106,10 +106,10 @@ 
 	 * @param $installed_refs
 	 * @return mixed
 	 */
-	public static function set_page_basename( $installed_refs ) {
-		if ( ! empty( self::$_ee_admin_page_registry )) {
-			foreach ( self::$_ee_admin_page_registry as $basename => $args ) {
-				$installed_refs[ $basename ] = $args['page_path'];
+	public static function set_page_basename($installed_refs) {
+		if ( ! empty(self::$_ee_admin_page_registry)) {
+			foreach (self::$_ee_admin_page_registry as $basename => $args) {
+				$installed_refs[$basename] = $args['page_path'];
 			}
 		}
         return $installed_refs;
@@ -123,9 +123,9 @@ 
 	 * @param $paths
 	 * @return mixed
 	 */
-	public static function set_page_path( $paths ) {
-        foreach ( self::$_ee_admin_page_registry as $basename => $args ) {
-            $paths[ $basename ] = $args['page_path'];
+	public static function set_page_path($paths) {
+        foreach (self::$_ee_admin_page_registry as $basename => $args) {
+            $paths[$basename] = $args['page_path'];
         }
         return $paths;
     }

Braces +6 added lines, -3 removed lines

@@ -5,7 +5,9 @@ 
  * @subpackage helpers
  * @since           4.3.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Use this to register or deregister an EE Admin Page.
@@ -94,8 +96,9 @@ 
      * @return  void
      */
     public static function deregister( $page_basename = NULL ) {
-    	if ( !empty( self::$_ee_admin_page_registry[$page_basename] ) )
-    		unset( self::$_ee_admin_page_registry[$page_basename] );
+    	if ( !empty( self::$_ee_admin_page_registry[$page_basename] ) ) {
+    	    		unset( self::$_ee_admin_page_registry[$page_basename] );
+    	}
     }
 
 

core/libraries/plugin_api/EE_Register_Config.lib.php

Braces +6 added lines, -3 removed lines

@@ -5,7 +5,9 @@ 
  * @subpackage helpers
  * @since           4.3.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Use this to register or deregister a new config with the EE_Registry::instance->CFG property.
@@ -111,7 +113,8 @@ 
 	 * @param mixed $config_class_name
 	 */
 	public static function deregister( $config_class_name = NULL ) {
-		if ( ! empty( self::$_ee_config_registry[ $config_class_name ] ))
-    			unset( self::$_ee_config_registry[ $config_class_name ] );
+		if ( ! empty( self::$_ee_config_registry[ $config_class_name ] )) {
+		    			unset( self::$_ee_config_registry[ $config_class_name ] );
+		}
 	}
 }

Spacing +18 added lines, -18 removed lines

@@ -42,24 +42,24 @@ 
 	 *                       		}
 	 * @return void
 	 */
-	public static function register( $config_class = NULL, $setup_args = array() ) {
+	public static function register($config_class = NULL, $setup_args = array()) {
 
-		$setup_args['config_name'] = isset( $setup_args['config_name'] ) && ! empty( $setup_args['config_name'] ) ? $setup_args['config_name'] : $config_class;
-		$setup_args['config_section'] = isset( $setup_args['config_section'] ) && ! empty( $setup_args['config_section'] ) ? $setup_args['config_section'] : 'addons';
+		$setup_args['config_name'] = isset($setup_args['config_name']) && ! empty($setup_args['config_name']) ? $setup_args['config_name'] : $config_class;
+		$setup_args['config_section'] = isset($setup_args['config_section']) && ! empty($setup_args['config_section']) ? $setup_args['config_section'] : 'addons';
 
 		//required fields MUST be present, so let's make sure they are.
-		if ( empty( $config_class ) || ! is_array( $setup_args ) || empty( $setup_args['config_name'] )) {
-			throw new EE_Error( __( 'In order to register a Config Class with EE_Register_Config::register(), you must include a "config_class" (the actual class name for this config class). As well, you can supply an array containing the following keys: "config_section" the main section of the config object the settings will be saved under (by default the new config will be registered under EE_Config::instance()->modules or EE_Config::instance()->addons depending on what type of class is calling this), "config_name" (by default the new config will be registered to EE_Config::instance()->{config_section}->{config_class}, but supplying a "config_name" will set the property name that this variable is accessible by. ie: EE_Config::instance()->{config_section}->{config_name})', 'event_espresso' ));
+		if (empty($config_class) || ! is_array($setup_args) || empty($setup_args['config_name'])) {
+			throw new EE_Error(__('In order to register a Config Class with EE_Register_Config::register(), you must include a "config_class" (the actual class name for this config class). As well, you can supply an array containing the following keys: "config_section" the main section of the config object the settings will be saved under (by default the new config will be registered under EE_Config::instance()->modules or EE_Config::instance()->addons depending on what type of class is calling this), "config_name" (by default the new config will be registered to EE_Config::instance()->{config_section}->{config_class}, but supplying a "config_name" will set the property name that this variable is accessible by. ie: EE_Config::instance()->{config_section}->{config_name})', 'event_espresso'));
 		}
 
 		//make sure we don't register twice
-		if( isset( self::$_ee_config_registry[ $config_class ] ) ){
+		if (isset(self::$_ee_config_registry[$config_class])) {
 			return;
 		}
 
 
 		//first find out if this happened too late.
-		if ( did_action( 'AHEE__EE_System__load_core_configuration__begin' ) ) {
+		if (did_action('AHEE__EE_System__load_core_configuration__begin')) {
 			EE_Error::doing_it_wrong(
 				__METHOD__,
 				sprintf(
@@ -70,13 +70,13 @@ 
 				);
 		}
 		//add incoming stuff to our registry property
-		self::$_ee_config_registry[ $config_class ] = array(
+		self::$_ee_config_registry[$config_class] = array(
 			'section' => $setup_args['config_section'],
 			'name' => $setup_args['config_name']
 		);
 
-		add_action( 'AHEE__EE_Config___load_core_config__end', array( 'EE_Register_Config', 'set_config' ), 15, 1 );
-		add_action( 'AHEE__EE_Config__update_espresso_config__end', array( 'EE_Register_Config', 'set_config' ), 15, 1 );
+		add_action('AHEE__EE_Config___load_core_config__end', array('EE_Register_Config', 'set_config'), 15, 1);
+		add_action('AHEE__EE_Config__update_espresso_config__end', array('EE_Register_Config', 'set_config'), 15, 1);
 	}
 
 
@@ -90,18 +90,18 @@ 
 	 * @param \EE_Config $EE_Config
 	 * @return \StdClass
 	 */
-	public static function set_config( EE_Config $EE_Config ) {
-		foreach ( self::$_ee_config_registry as $config_class => $settings ) {
+	public static function set_config(EE_Config $EE_Config) {
+		foreach (self::$_ee_config_registry as $config_class => $settings) {
 			//first some validation of our incoming class_name.  We'll throw an error early if its' not registered correctly
-			if ( ! class_exists( $config_class )) {
+			if ( ! class_exists($config_class)) {
 				throw new EE_Error(
 					sprintf(
-						__( 'The "%s" config class can not be registered with EE_Config because it does not exist.  Verify that an autoloader has been set for this class', 'event_espresso' ),
+						__('The "%s" config class can not be registered with EE_Config because it does not exist.  Verify that an autoloader has been set for this class', 'event_espresso'),
 						$config_class
 					)
 				 );
 			}
-			$EE_Config->get_config( $settings['section'], $settings['name'], $config_class );
+			$EE_Config->get_config($settings['section'], $settings['name'], $config_class);
 		}
 	}
 
@@ -111,8 +111,8 @@ 
 	/**
 	 * @param mixed $config_class_name
 	 */
-	public static function deregister( $config_class_name = NULL ) {
-		if ( ! empty( self::$_ee_config_registry[ $config_class_name ] ))
-    			unset( self::$_ee_config_registry[ $config_class_name ] );
+	public static function deregister($config_class_name = NULL) {
+		if ( ! empty(self::$_ee_config_registry[$config_class_name]))
+    			unset(self::$_ee_config_registry[$config_class_name]);
 	}
 }

Indentation +1 added lines, -1 removed lines

@@ -113,6 +113,6 @@
 	 */
 	public static function deregister( $config_class_name = NULL ) {
 		if ( ! empty( self::$_ee_config_registry[ $config_class_name ] ))
-    			unset( self::$_ee_config_registry[ $config_class_name ] );
+				unset( self::$_ee_config_registry[ $config_class_name ] );
 	}
 }

core/libraries/plugin_api/EE_Register_Messages_Shortcode_Library.lib.php

Spacing +29 added lines, -29 removed lines

@@ -62,44 +62,44 @@ 
      * }
      * @return void
      */
-    public static function register( $name = NULL, $setup_args = array() ) {
+    public static function register($name = NULL, $setup_args = array()) {
 
         //required fields MUST be present, so let's make sure they are.
-        if ( empty( $name ) || ! is_array( $setup_args ) || empty( $setup_args['autoloadpaths'] ) ) {
-            throw new EE_Error( __( 'In order to register a messages shortcode library with EE_Register_Messages_Shortcode_Library::register, you must include a "name" (a unique identifier for this set of message shortcodes), and an array containing the following keys: : "autoload_paths"', 'event_espresso' ) );
+        if (empty($name) || ! is_array($setup_args) || empty($setup_args['autoloadpaths'])) {
+            throw new EE_Error(__('In order to register a messages shortcode library with EE_Register_Messages_Shortcode_Library::register, you must include a "name" (a unique identifier for this set of message shortcodes), and an array containing the following keys: : "autoload_paths"', 'event_espresso'));
         }
 
 		//make sure we don't register twice
-		if( isset( self::$_ee_messages_shortcode_registry[ $name ] ) ){
+		if (isset(self::$_ee_messages_shortcode_registry[$name])) {
 			return;
 		}
 
 		//make sure this was called in the right place!
-		if ( ! did_action( 'EE_Brewing_Regular___messages_caf' ) || did_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations' )) {
-			EE_Error::doing_it_wrong(__METHOD__, sprintf( __('Should be only called on the "EE_Brewing_Regular___messages_caf" hook (Trying to register a library named %s).','event_espresso'), $name ), '4.3.0' );
+		if ( ! did_action('EE_Brewing_Regular___messages_caf') || did_action('AHEE__EE_System__perform_activations_upgrades_and_migrations')) {
+			EE_Error::doing_it_wrong(__METHOD__, sprintf(__('Should be only called on the "EE_Brewing_Regular___messages_caf" hook (Trying to register a library named %s).', 'event_espresso'), $name), '4.3.0');
 		}
 
         $name = (string) $name;
         self::$_ee_messages_shortcode_registry[$name] = array(
             'autoloadpaths' => (array) $setup_args['autoloadpaths'],
-            'list_type_shortcodes' => !empty( $setup_args['list_type_shortcodes'] ) ? (array) $setup_args['list_type_shortcodes'] : array()
+            'list_type_shortcodes' => ! empty($setup_args['list_type_shortcodes']) ? (array) $setup_args['list_type_shortcodes'] : array()
             );
 
          //add filters
-         add_filter( 'FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array( 'EE_Register_Messages_Shortcode_Library', 'register_msgs_autoload_paths'), 10 );
+         add_filter('FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array('EE_Register_Messages_Shortcode_Library', 'register_msgs_autoload_paths'), 10);
 
         //add below filters if the required callback is provided.
-        if ( !empty( $setup_args['msgr_validator_callback'] ) )
-            add_filter( 'FHEE__EE_messenger__get_validator_config', $setup_args['msgr_validator_callback'], 10, 2 );
+        if ( ! empty($setup_args['msgr_validator_callback']))
+            add_filter('FHEE__EE_messenger__get_validator_config', $setup_args['msgr_validator_callback'], 10, 2);
 
-        if ( !empty( $setup_args['msgr_template_fields_callback'] ) )
-            add_filter( 'FHEE__EE_messenger__get_template_fields', $setup_args['msgr_template_fields_callback'], 10, 2 );
+        if ( ! empty($setup_args['msgr_template_fields_callback']))
+            add_filter('FHEE__EE_messenger__get_template_fields', $setup_args['msgr_template_fields_callback'], 10, 2);
 
-        if ( !empty( $setup_args['valid_shortcodes_callback'] ) )
-            add_filter( 'FHEE__EE_Messages_Base__get_valid_shortcodes', $setup_args['valid_shortcodes_callback'], 10, 2 );
+        if ( ! empty($setup_args['valid_shortcodes_callback']))
+            add_filter('FHEE__EE_Messages_Base__get_valid_shortcodes', $setup_args['valid_shortcodes_callback'], 10, 2);
 
-        if ( !empty( $setup_args['list_type_shortcodes'] ) )
-            add_filter( 'FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes', array( 'EE_Register_Messages_Shortcode_Library', 'register_list_type_shortcodes'), 10 );
+        if ( ! empty($setup_args['list_type_shortcodes']))
+            add_filter('FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes', array('EE_Register_Messages_Shortcode_Library', 'register_list_type_shortcodes'), 10);
     }
 
 
@@ -112,9 +112,9 @@ 
      * @param  string $name name used to register the shortcode library.
      * @return  void
      */
-    public static function deregister( $name = NULL ) {
-    	if ( !empty( self::$_ee_messages_shortcode_registry[$name] ) )
-    		unset( self::$_ee_messages_shortcode_registry[$name] );
+    public static function deregister($name = NULL) {
+    	if ( ! empty(self::$_ee_messages_shortcode_registry[$name]))
+    		unset(self::$_ee_messages_shortcode_registry[$name]);
     }
 
 
@@ -127,13 +127,13 @@ 
      * @param array $paths array of paths to be checked by EE_messages autoloader.
      * @return array
      */
-    public static function register_msgs_autoload_paths( $paths  ) {
+    public static function register_msgs_autoload_paths($paths) {
 
-        if ( !empty( self::$_ee_messages_shortcode_registry ) ) {
-             foreach ( self::$_ee_messages_shortcode_registry as $st_reg ) {
-                if ( empty( $st_reg['autoloadpaths'] ) )
+        if ( ! empty(self::$_ee_messages_shortcode_registry)) {
+             foreach (self::$_ee_messages_shortcode_registry as $st_reg) {
+                if (empty($st_reg['autoloadpaths']))
                     continue;
-                $paths = array_merge( $paths, $st_reg['autoloadpaths'] );
+                $paths = array_merge($paths, $st_reg['autoloadpaths']);
             }
         }
 
@@ -151,13 +151,13 @@ 
      * @param  array $original_shortcodes
      * @return  array                                   Modifications to original shortcodes.
      */
-    public static function register_list_type_shortcodes( $original_shortcodes ) {
-        if ( empty( self::$_ee_messages_shortcode_registry ) )
+    public static function register_list_type_shortcodes($original_shortcodes) {
+        if (empty(self::$_ee_messages_shortcode_registry))
             return $original_shortcodes;
 
-        foreach ( self::$_ee_messages_shortcode_registry as $sc_reg ) {
-            if ( !empty( $sc_reg['list_type_shortcodes'] ) )
-                $original_shortcodes = array_merge( $original_shortcodes, $sc_reg['list_type_shortcodes'] );
+        foreach (self::$_ee_messages_shortcode_registry as $sc_reg) {
+            if ( ! empty($sc_reg['list_type_shortcodes']))
+                $original_shortcodes = array_merge($original_shortcodes, $sc_reg['list_type_shortcodes']);
         }
 
         return $original_shortcodes;

Braces +27 added lines, -17 removed lines

@@ -5,7 +5,9 @@ 
  * @subpackage plugin api, messages
  * @since           4.3.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Use this to register or deregister a new shortcode library for the EE messages system.
@@ -89,17 +91,21 @@ 
          add_filter( 'FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array( 'EE_Register_Messages_Shortcode_Library', 'register_msgs_autoload_paths'), 10 );
 
         //add below filters if the required callback is provided.
-        if ( !empty( $setup_args['msgr_validator_callback'] ) )
-            add_filter( 'FHEE__EE_messenger__get_validator_config', $setup_args['msgr_validator_callback'], 10, 2 );
+        if ( !empty( $setup_args['msgr_validator_callback'] ) ) {
+                    add_filter( 'FHEE__EE_messenger__get_validator_config', $setup_args['msgr_validator_callback'], 10, 2 );
+        }
 
-        if ( !empty( $setup_args['msgr_template_fields_callback'] ) )
-            add_filter( 'FHEE__EE_messenger__get_template_fields', $setup_args['msgr_template_fields_callback'], 10, 2 );
+        if ( !empty( $setup_args['msgr_template_fields_callback'] ) ) {
+                    add_filter( 'FHEE__EE_messenger__get_template_fields', $setup_args['msgr_template_fields_callback'], 10, 2 );
+        }
 
-        if ( !empty( $setup_args['valid_shortcodes_callback'] ) )
-            add_filter( 'FHEE__EE_Messages_Base__get_valid_shortcodes', $setup_args['valid_shortcodes_callback'], 10, 2 );
+        if ( !empty( $setup_args['valid_shortcodes_callback'] ) ) {
+                    add_filter( 'FHEE__EE_Messages_Base__get_valid_shortcodes', $setup_args['valid_shortcodes_callback'], 10, 2 );
+        }
 
-        if ( !empty( $setup_args['list_type_shortcodes'] ) )
-            add_filter( 'FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes', array( 'EE_Register_Messages_Shortcode_Library', 'register_list_type_shortcodes'), 10 );
+        if ( !empty( $setup_args['list_type_shortcodes'] ) ) {
+                    add_filter( 'FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes', array( 'EE_Register_Messages_Shortcode_Library', 'register_list_type_shortcodes'), 10 );
+        }
     }
 
 
@@ -113,8 +119,9 @@ 
      * @return  void
      */
     public static function deregister( $name = NULL ) {
-    	if ( !empty( self::$_ee_messages_shortcode_registry[$name] ) )
-    		unset( self::$_ee_messages_shortcode_registry[$name] );
+    	if ( !empty( self::$_ee_messages_shortcode_registry[$name] ) ) {
+    	    		unset( self::$_ee_messages_shortcode_registry[$name] );
+    	}
     }
 
 
@@ -131,8 +138,9 @@ 
 
         if ( !empty( self::$_ee_messages_shortcode_registry ) ) {
              foreach ( self::$_ee_messages_shortcode_registry as $st_reg ) {
-                if ( empty( $st_reg['autoloadpaths'] ) )
-                    continue;
+                if ( empty( $st_reg['autoloadpaths'] ) ) {
+                                    continue;
+                }
                 $paths = array_merge( $paths, $st_reg['autoloadpaths'] );
             }
         }
@@ -152,12 +160,14 @@ 
      * @return  array                                   Modifications to original shortcodes.
      */
     public static function register_list_type_shortcodes( $original_shortcodes ) {
-        if ( empty( self::$_ee_messages_shortcode_registry ) )
-            return $original_shortcodes;
+        if ( empty( self::$_ee_messages_shortcode_registry ) ) {
+                    return $original_shortcodes;
+        }
 
         foreach ( self::$_ee_messages_shortcode_registry as $sc_reg ) {
-            if ( !empty( $sc_reg['list_type_shortcodes'] ) )
-                $original_shortcodes = array_merge( $original_shortcodes, $sc_reg['list_type_shortcodes'] );
+            if ( !empty( $sc_reg['list_type_shortcodes'] ) ) {
+                            $original_shortcodes = array_merge( $original_shortcodes, $sc_reg['list_type_shortcodes'] );
+            }
         }
 
         return $original_shortcodes;

Indentation +133 added lines, -133 removed lines

@@ -18,56 +18,56 @@ 
 class EE_Register_Messages_Shortcode_Library implements EEI_Plugin_API {
 
 
-    /**
-     * holds values for registered messages shortcode libraries
-     * @var array
-     */
-    protected static $_ee_messages_shortcode_registry = array();
-
-
-
-
-    /**
-     * Helper method for registring a new shortcodes library class for the messages system.
-     *
-     * Note this is not used for adding shortcodes to existing libraries.  It's for registering anything
-     * related to registering a new EE_{shortcode_library_name}_Shortcodes.lib.php class.
-     *
-     * @since    4.3.0
-     *
-     * @param  array  $setup_args {
-     *       An array of arguments provided for registering the new messages shortcode library.
-     *
-     *       @type string $name                                         What is the name of this shortcode library
-     *                                                                              (e.g. 'question_list');
-     *       @type array  $autoloadpaths                          An array of paths to add to the messages
-     *                                                                              autoloader for the new shortcode library
-     *                                                                              class file.
-     *       @type string $msgr_validator_callback            Callback for a method that will register the
-     *                                                                              library with the messenger
-     *                                                                              _validator_config. Optional.
-     *       @type string $msgr_template_fields_callback  Callback for changing adding the
-     *                                                                              _template_fields property for messenger.
-     *                                                                              For example, the shortcode library may add
-     *                                                                              a new field to the message templates.
-     *                                                                              Optional.
-     *       @type string $valid_shortcodes_callback         Callback for message types
-     *                                                                              _valid_shortcodes array setup. Optional.
-     *       @type array  $list_type_shortcodes                 If there are any specific shortcodes with this
-     *                                                                             message shortcode library that should be
-     *                                                                             considered "list type" then include them in an
-     *                                                                             array.  List Type shortcodes are shortcodes that
-     *                                                                             have a corresponding field that indicates how
-     *                                                                             they are parsed. Optional.
-     * }
-     * @return void
-     */
-    public static function register( $name = NULL, $setup_args = array() ) {
-
-        //required fields MUST be present, so let's make sure they are.
-        if ( empty( $name ) || ! is_array( $setup_args ) || empty( $setup_args['autoloadpaths'] ) ) {
-            throw new EE_Error( __( 'In order to register a messages shortcode library with EE_Register_Messages_Shortcode_Library::register, you must include a "name" (a unique identifier for this set of message shortcodes), and an array containing the following keys: : "autoload_paths"', 'event_espresso' ) );
-        }
+	/**
+	 * holds values for registered messages shortcode libraries
+	 * @var array
+	 */
+	protected static $_ee_messages_shortcode_registry = array();
+
+
+
+
+	/**
+	 * Helper method for registring a new shortcodes library class for the messages system.
+	 *
+	 * Note this is not used for adding shortcodes to existing libraries.  It's for registering anything
+	 * related to registering a new EE_{shortcode_library_name}_Shortcodes.lib.php class.
+	 *
+	 * @since    4.3.0
+	 *
+	 * @param  array  $setup_args {
+	 *       An array of arguments provided for registering the new messages shortcode library.
+	 *
+	 *       @type string $name                                         What is the name of this shortcode library
+	 *                                                                              (e.g. 'question_list');
+	 *       @type array  $autoloadpaths                          An array of paths to add to the messages
+	 *                                                                              autoloader for the new shortcode library
+	 *                                                                              class file.
+	 *       @type string $msgr_validator_callback            Callback for a method that will register the
+	 *                                                                              library with the messenger
+	 *                                                                              _validator_config. Optional.
+	 *       @type string $msgr_template_fields_callback  Callback for changing adding the
+	 *                                                                              _template_fields property for messenger.
+	 *                                                                              For example, the shortcode library may add
+	 *                                                                              a new field to the message templates.
+	 *                                                                              Optional.
+	 *       @type string $valid_shortcodes_callback         Callback for message types
+	 *                                                                              _valid_shortcodes array setup. Optional.
+	 *       @type array  $list_type_shortcodes                 If there are any specific shortcodes with this
+	 *                                                                             message shortcode library that should be
+	 *                                                                             considered "list type" then include them in an
+	 *                                                                             array.  List Type shortcodes are shortcodes that
+	 *                                                                             have a corresponding field that indicates how
+	 *                                                                             they are parsed. Optional.
+	 * }
+	 * @return void
+	 */
+	public static function register( $name = NULL, $setup_args = array() ) {
+
+		//required fields MUST be present, so let's make sure they are.
+		if ( empty( $name ) || ! is_array( $setup_args ) || empty( $setup_args['autoloadpaths'] ) ) {
+			throw new EE_Error( __( 'In order to register a messages shortcode library with EE_Register_Messages_Shortcode_Library::register, you must include a "name" (a unique identifier for this set of message shortcodes), and an array containing the following keys: : "autoload_paths"', 'event_espresso' ) );
+		}
 
 		//make sure we don't register twice
 		if( isset( self::$_ee_messages_shortcode_registry[ $name ] ) ){
@@ -79,88 +79,88 @@ 
 			EE_Error::doing_it_wrong(__METHOD__, sprintf( __('Should be only called on the "EE_Brewing_Regular___messages_caf" hook (Trying to register a library named %s).','event_espresso'), $name ), '4.3.0' );
 		}
 
-        $name = (string) $name;
-        self::$_ee_messages_shortcode_registry[$name] = array(
-            'autoloadpaths' => (array) $setup_args['autoloadpaths'],
-            'list_type_shortcodes' => !empty( $setup_args['list_type_shortcodes'] ) ? (array) $setup_args['list_type_shortcodes'] : array()
-            );
-
-         //add filters
-         add_filter( 'FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array( 'EE_Register_Messages_Shortcode_Library', 'register_msgs_autoload_paths'), 10 );
-
-        //add below filters if the required callback is provided.
-        if ( !empty( $setup_args['msgr_validator_callback'] ) )
-            add_filter( 'FHEE__EE_messenger__get_validator_config', $setup_args['msgr_validator_callback'], 10, 2 );
-
-        if ( !empty( $setup_args['msgr_template_fields_callback'] ) )
-            add_filter( 'FHEE__EE_messenger__get_template_fields', $setup_args['msgr_template_fields_callback'], 10, 2 );
-
-        if ( !empty( $setup_args['valid_shortcodes_callback'] ) )
-            add_filter( 'FHEE__EE_Messages_Base__get_valid_shortcodes', $setup_args['valid_shortcodes_callback'], 10, 2 );
-
-        if ( !empty( $setup_args['list_type_shortcodes'] ) )
-            add_filter( 'FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes', array( 'EE_Register_Messages_Shortcode_Library', 'register_list_type_shortcodes'), 10 );
-    }
-
-
-
-
-    /**
-     * This deregisters any messages shortcode library previously registered with the given name.
-     *
-     * @since    4.3.0
-     * @param  string $name name used to register the shortcode library.
-     * @return  void
-     */
-    public static function deregister( $name = NULL ) {
-    	if ( !empty( self::$_ee_messages_shortcode_registry[$name] ) )
-    		unset( self::$_ee_messages_shortcode_registry[$name] );
-    }
-
-
-
-     /**
-     * callback for FHEE__EED_Messages___set_messages_paths___MSG_PATHS filter.
-     *
-     * @since    4.3.0
-     *
-     * @param array $paths array of paths to be checked by EE_messages autoloader.
-     * @return array
-     */
-    public static function register_msgs_autoload_paths( $paths  ) {
-
-        if ( !empty( self::$_ee_messages_shortcode_registry ) ) {
-             foreach ( self::$_ee_messages_shortcode_registry as $st_reg ) {
-                if ( empty( $st_reg['autoloadpaths'] ) )
-                    continue;
-                $paths = array_merge( $paths, $st_reg['autoloadpaths'] );
-            }
-        }
-
-        return $paths;
-    }
-
-
-
-    /**
-     * This is the callback for the FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes
-     * filter which is used to add additional list type shortcodes.
-     *
-     * @since 4.3.0
-     *
-     * @param  array $original_shortcodes
-     * @return  array                                   Modifications to original shortcodes.
-     */
-    public static function register_list_type_shortcodes( $original_shortcodes ) {
-        if ( empty( self::$_ee_messages_shortcode_registry ) )
-            return $original_shortcodes;
-
-        foreach ( self::$_ee_messages_shortcode_registry as $sc_reg ) {
-            if ( !empty( $sc_reg['list_type_shortcodes'] ) )
-                $original_shortcodes = array_merge( $original_shortcodes, $sc_reg['list_type_shortcodes'] );
-        }
-
-        return $original_shortcodes;
-    }
+		$name = (string) $name;
+		self::$_ee_messages_shortcode_registry[$name] = array(
+			'autoloadpaths' => (array) $setup_args['autoloadpaths'],
+			'list_type_shortcodes' => !empty( $setup_args['list_type_shortcodes'] ) ? (array) $setup_args['list_type_shortcodes'] : array()
+			);
+
+		 //add filters
+		 add_filter( 'FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array( 'EE_Register_Messages_Shortcode_Library', 'register_msgs_autoload_paths'), 10 );
+
+		//add below filters if the required callback is provided.
+		if ( !empty( $setup_args['msgr_validator_callback'] ) )
+			add_filter( 'FHEE__EE_messenger__get_validator_config', $setup_args['msgr_validator_callback'], 10, 2 );
+
+		if ( !empty( $setup_args['msgr_template_fields_callback'] ) )
+			add_filter( 'FHEE__EE_messenger__get_template_fields', $setup_args['msgr_template_fields_callback'], 10, 2 );
+
+		if ( !empty( $setup_args['valid_shortcodes_callback'] ) )
+			add_filter( 'FHEE__EE_Messages_Base__get_valid_shortcodes', $setup_args['valid_shortcodes_callback'], 10, 2 );
+
+		if ( !empty( $setup_args['list_type_shortcodes'] ) )
+			add_filter( 'FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes', array( 'EE_Register_Messages_Shortcode_Library', 'register_list_type_shortcodes'), 10 );
+	}
+
+
+
+
+	/**
+	 * This deregisters any messages shortcode library previously registered with the given name.
+	 *
+	 * @since    4.3.0
+	 * @param  string $name name used to register the shortcode library.
+	 * @return  void
+	 */
+	public static function deregister( $name = NULL ) {
+		if ( !empty( self::$_ee_messages_shortcode_registry[$name] ) )
+			unset( self::$_ee_messages_shortcode_registry[$name] );
+	}
+
+
+
+	 /**
+	  * callback for FHEE__EED_Messages___set_messages_paths___MSG_PATHS filter.
+	  *
+	  * @since    4.3.0
+	  *
+	  * @param array $paths array of paths to be checked by EE_messages autoloader.
+	  * @return array
+	  */
+	public static function register_msgs_autoload_paths( $paths  ) {
+
+		if ( !empty( self::$_ee_messages_shortcode_registry ) ) {
+			 foreach ( self::$_ee_messages_shortcode_registry as $st_reg ) {
+				if ( empty( $st_reg['autoloadpaths'] ) )
+					continue;
+				$paths = array_merge( $paths, $st_reg['autoloadpaths'] );
+			}
+		}
+
+		return $paths;
+	}
+
+
+
+	/**
+	 * This is the callback for the FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes
+	 * filter which is used to add additional list type shortcodes.
+	 *
+	 * @since 4.3.0
+	 *
+	 * @param  array $original_shortcodes
+	 * @return  array                                   Modifications to original shortcodes.
+	 */
+	public static function register_list_type_shortcodes( $original_shortcodes ) {
+		if ( empty( self::$_ee_messages_shortcode_registry ) )
+			return $original_shortcodes;
+
+		foreach ( self::$_ee_messages_shortcode_registry as $sc_reg ) {
+			if ( !empty( $sc_reg['list_type_shortcodes'] ) )
+				$original_shortcodes = array_merge( $original_shortcodes, $sc_reg['list_type_shortcodes'] );
+		}
+
+		return $original_shortcodes;
+	}
 
 }

core/libraries/plugin_api/EE_Register_Messages_Template_Pack.lib.php

Indentation +2 added lines, -2 removed lines

@@ -185,7 +185,7 @@
 	 */
 	public static function deregister( $variation_ref = NULL ) {
 		if ( !empty( self::$_registry[$variation_ref] ) ) {
-    			unset( self::$_registry[$variation_ref] );
-    		}
+				unset( self::$_registry[$variation_ref] );
+			}
 	}
 }

Spacing +24 added lines, -24 removed lines

@@ -54,39 +54,39 @@ 
 	 *
 	 * @return void
 	 */
-	public static function register( $ref = NULL, $setup_args = array() ) {
+	public static function register($ref = NULL, $setup_args = array()) {
 
 		//check for required params
-		if ( empty( $ref ) || empty( $setup_args['path'] ) || empty( $setup_args['classname'] ) ) {
+		if (empty($ref) || empty($setup_args['path']) || empty($setup_args['classname'])) {
 			throw new EE_Error(
 				__('In order to register a new template pack for the EE Messages system, you must include a value to reference the template pack being registered and the setup_args must have the path for the new template pack class as well as the classname for the new Template Pack Class. ', 'event_espresso')
 				);
 		}
 
 		//make sure we don't register twice
-		if( isset( self::$_registry[ $ref ] ) ){
+		if (isset(self::$_registry[$ref])) {
 			return;
 		}
 
 		//check that incoming $ref doesn't already exist. If it does then we'll create a unique reference for this template pack.
-		if ( isset( self::$_registry[$ref] ) ) {
-			$ref = uniqid() . '_' . $ref;
+		if (isset(self::$_registry[$ref])) {
+			$ref = uniqid().'_'.$ref;
 		}
 
 
 		//make sure this was called in the right place!
-		 if ( ! did_action( 'EE_Brewing_Regular___messages_caf' ) || did_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations' )) {
+		 if ( ! did_action('EE_Brewing_Regular___messages_caf') || did_action('AHEE__EE_System__perform_activations_upgrades_and_migrations')) {
 			EE_Error::doing_it_wrong(
 				__METHOD__,
 				sprintf(
-					__('A EE Messages Template Pack given the reference "%s" has been attempted to be registered with the EE Messages System.  It may or may not work because it should be only called on the "EE_Brewing_Regular__messages_caf" hook.','event_espresso'),
+					__('A EE Messages Template Pack given the reference "%s" has been attempted to be registered with the EE Messages System.  It may or may not work because it should be only called on the "EE_Brewing_Regular__messages_caf" hook.', 'event_espresso'),
 					$ref
 				),
 				'4.5.0'
 			);
 		}
 
-		if ( self::_verify_class_not_exist( $setup_args['classname'] ) ) {
+		if (self::_verify_class_not_exist($setup_args['classname'])) {
 			self::$_registry[$ref] = array(
 				'path' => (string) $setup_args['path'],
 				'classname' => (string) $setup_args['classname']
@@ -94,8 +94,8 @@ 
 		}
 
 		//hook into the system
-		add_filter( 'FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array( 'EE_Register_Messages_Template_Pack', 'set_template_pack_path'), 10 );
-		add_filter( 'FHEE__EED_Messages__get_template_packs__template_packs', array( 'EE_Register_Messages_Template_Pack', 'set_template_pack' ), 10 );
+		add_filter('FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array('EE_Register_Messages_Template_Pack', 'set_template_pack_path'), 10);
+		add_filter('FHEE__EED_Messages__get_template_packs__template_packs', array('EE_Register_Messages_Template_Pack', 'set_template_pack'), 10);
 
 	}
 
@@ -112,8 +112,8 @@ 
 	 *
 	 * @return array
 	 */
-	public static function set_template_pack_path( $paths ) {
-		foreach( self::$_registry as $ref => $args ) {
+	public static function set_template_pack_path($paths) {
+		foreach (self::$_registry as $ref => $args) {
 			$paths[] = $args['path'];
 		}
 		return $paths;
@@ -130,15 +130,15 @@ 
 	 * @param EE_Messages_Template_Pack[] $template_packs
 	 * @return EE_Messages_Template_Pack[]
 	 */
-	public static function set_template_pack( $template_packs ) {
-		foreach( self::$_registry as $ref => $args ) {
+	public static function set_template_pack($template_packs) {
+		foreach (self::$_registry as $ref => $args) {
 			//verify class_exists
-			if ( ! class_exists( $args['classname'] ) ) {
-				require_once( $args['path'] . '/' . $args['classname'] . '.class.php' );
+			if ( ! class_exists($args['classname'])) {
+				require_once($args['path'].'/'.$args['classname'].'.class.php');
 			}
 
 			//check again!
-			if ( class_exists( $args['classname'] ) ) {
+			if (class_exists($args['classname'])) {
 				$template_pack = new $args['classname'];
 				$template_packs[$template_pack->dbref] = $template_pack;
 			}
@@ -159,12 +159,12 @@ 
 	 *
 	 * @return bool
 	 */
-	private static function _verify_class_not_exist( $classname ) {
+	private static function _verify_class_not_exist($classname) {
 
 		//loop through the existing registry and see if the classname is already present.
-		foreach ( self::$_registry as $ref => $args ) {
-			if ( $args['classname'] == $classname ) {
-				EE_Error::add_error( sprintf( __('The %s template pack that you just activated cannot be registered with the messages system because there is already a template pack active using the same classname.  Contact the author of this template pack to let them know of the conflict.  To stop seeing this message you will need to deactivate this template pack.', 'event_espresso' ), (string) $setup_args['classname'] ), __FILE__, __LINE__, __FUNCTION__ );
+		foreach (self::$_registry as $ref => $args) {
+			if ($args['classname'] == $classname) {
+				EE_Error::add_error(sprintf(__('The %s template pack that you just activated cannot be registered with the messages system because there is already a template pack active using the same classname.  Contact the author of this template pack to let them know of the conflict.  To stop seeing this message you will need to deactivate this template pack.', 'event_espresso'), (string) $setup_args['classname']), __FILE__, __LINE__, __FUNCTION__);
 				return false;
 			}
 		}
@@ -183,9 +183,9 @@ 
 	 *
 	 * @return void
 	 */
-	public static function deregister( $variation_ref = NULL ) {
-		if ( !empty( self::$_registry[$variation_ref] ) ) {
-    			unset( self::$_registry[$variation_ref] );
+	public static function deregister($variation_ref = NULL) {
+		if ( ! empty(self::$_registry[$variation_ref])) {
+    			unset(self::$_registry[$variation_ref]);
     		}
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  * @subpackage plugin api, messages
  * @since           4.5.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Use this to register or deregister a new message template pack for the EE messages system.

core/libraries/plugin_api/EE_Register_Messages_Template_Variations.lib.php

Spacing +41 added lines, -41 removed lines

@@ -68,38 +68,38 @@ 
 	 * @throws EE_Error
 	 * @return void
 	 */
-	public static function register( $variation_ref = NULL,  $setup_args = array() ) {
+	public static function register($variation_ref = NULL, $setup_args = array()) {
 
 		//check for required params
-		if ( empty( $variation_ref ) ) {
+		if (empty($variation_ref)) {
 			throw new EE_Error(
 				__('In order to register variations for a EE_Message_Template_Pack, you must include a value to reference the variations being registered', 'event_espresso')
 				);
 		}
 
-		if ( ! is_array( $setup_args ) || empty( $setup_args['variations'] ) || empty( $setup_args['base_path'] ) || empty( $setup_args['base_url'] ) ) {
+		if ( ! is_array($setup_args) || empty($setup_args['variations']) || empty($setup_args['base_path']) || empty($setup_args['base_url'])) {
 			throw new EE_Error(
 				__('In order to register variations for a EE_Message_Template_Pack, you must include an array containing the following keys: "variations", "base_path", "base_url", "extension"', 'event_espresso')
 				);
 		}
 
 		//make sure we don't register twice
-		if( isset( self::$_registry[ $variation_ref ] ) ){
+		if (isset(self::$_registry[$variation_ref])) {
 			return;
 		}
 
 		//make sure variation ref is unique.
-		if ( isset( self::$_registry[$variation_ref] ) ) {
-			$variation_ref = uniqid() . '_' . $variation_ref;
+		if (isset(self::$_registry[$variation_ref])) {
+			$variation_ref = uniqid().'_'.$variation_ref;
 		}
 
 
 		//make sure this was called in the right place!
-		 if ( ! did_action( 'EE_Brewing_Regular___messages_caf' ) || did_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations' )) {
+		 if ( ! did_action('EE_Brewing_Regular___messages_caf') || did_action('AHEE__EE_System__perform_activations_upgrades_and_migrations')) {
 			EE_Error::doing_it_wrong(
 				__METHOD__,
 				sprintf(
-					__('Messages Templates Variations given the reference "%s" has been attempted to be registered with the EE Messages Template Pack System.  It may or may not work because it should be only called on the "EE_Brewing_Regular__messages_caf" hook.','event_espresso'),
+					__('Messages Templates Variations given the reference "%s" has been attempted to be registered with the EE Messages Template Pack System.  It may or may not work because it should be only called on the "EE_Brewing_Regular__messages_caf" hook.', 'event_espresso'),
 					$variation_ref
 				),
 				'4.5.0'
@@ -115,11 +115,11 @@ 
 
 
 		//check that no reserved variation names are in use and also checks if there are already existing variation names for a given template pack.  The former will throw an error.  The latter will remove the conflicting variation name but still register the others and will add EE_Error notice.
-		$validated = self::_verify_variations( $variation_ref, $validated );
+		$validated = self::_verify_variations($variation_ref, $validated);
 		self::$_registry[$variation_ref] = $validated;
 
-		add_filter( 'FHEE__EE_Messages_Template_Pack__get_variations', array( 'EE_Register_Messages_Template_Variations', 'get_variations' ), 10, 4 );
-		add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( 'EE_Register_Messages_Template_Variations', 'get_variation' ), 10, 8 );
+		add_filter('FHEE__EE_Messages_Template_Pack__get_variations', array('EE_Register_Messages_Template_Variations', 'get_variations'), 10, 4);
+		add_filter('FHEE__EE_Messages_Template_Pack__get_variation', array('EE_Register_Messages_Template_Variations', 'get_variation'), 10, 8);
 	}
 
 
@@ -136,13 +136,13 @@ 
 	 * @throws EE_Error
 	 * @return bool
 	 */
-	private static function _verify_variations( $variation_ref, $validated_variations ) {
-		foreach ( self::$_registry as $variation_ref => $settings ) {
-			foreach ( $settings['variations'] as $template_pack => $messenger ) {
-				foreach ( $messenger as $all_variations ) {
-					if ( isset( $all_variations['default'] ) ) {
+	private static function _verify_variations($variation_ref, $validated_variations) {
+		foreach (self::$_registry as $variation_ref => $settings) {
+			foreach ($settings['variations'] as $template_pack => $messenger) {
+				foreach ($messenger as $all_variations) {
+					if (isset($all_variations['default'])) {
 						throw new EE_Error(
-							sprintf( __('Variations registered through the EE_Register_Messages_Template_Variations api cannot override the default variation for the default template.  Please check the code registering variations with this reference, "%s" and modify.', 'event_espresso' ), $variation_ref )
+							sprintf(__('Variations registered through the EE_Register_Messages_Template_Variations api cannot override the default variation for the default template.  Please check the code registering variations with this reference, "%s" and modify.', 'event_espresso'), $variation_ref)
 							);
 					}
 				}
@@ -150,13 +150,13 @@ 
 		}
 
 		//is there already a variation registered with a given variation slug?
-		foreach ( $validated_variations['variations'] as $template_pack => $messenger  ) {
-			foreach ( $messenger as $message_type => $variations ) {
-				foreach( $variations as $slug => $label ) {
-					foreach ( self::$_registry as $registered_var => $reg_settings ) {
-						if ( isset( $reg_settings['variations'][$template_pack][$messenger][$message_type][$slug] ) ) {
-							unset( $validated_variations['variations'][$template_pack][$messenger][$message_type][$slug] );
-							EE_Error::add_error( sprintf( __('Unable to register the %s variation for the %s template pack with the %s messenger and %s message_type because a variation with this slug was already registered for this template pack and messenger and message type by an addon using this key %s.', 'event_espresso' ), $label, $template_pack, $messenger, $message_type, $registered_var  ) );
+		foreach ($validated_variations['variations'] as $template_pack => $messenger) {
+			foreach ($messenger as $message_type => $variations) {
+				foreach ($variations as $slug => $label) {
+					foreach (self::$_registry as $registered_var => $reg_settings) {
+						if (isset($reg_settings['variations'][$template_pack][$messenger][$message_type][$slug])) {
+							unset($validated_variations['variations'][$template_pack][$messenger][$message_type][$slug]);
+							EE_Error::add_error(sprintf(__('Unable to register the %s variation for the %s template pack with the %s messenger and %s message_type because a variation with this slug was already registered for this template pack and messenger and message type by an addon using this key %s.', 'event_espresso'), $label, $template_pack, $messenger, $message_type, $registered_var));
 						}
 					}
 				}
@@ -185,15 +185,15 @@ 
 	 *
 	 * @return string                    The path to the requested variation.
 	 */
-	public static function get_variation( $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack ) {
+	public static function get_variation($variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack) {
 
 		//so let's loop through our registered variations and then pull any details matching the request.
-		foreach ( self::$_registry as $registry_slug => $registry_settings ) {
+		foreach (self::$_registry as $registry_slug => $registry_settings) {
 			$base = $url ? $registry_settings['base_url'] : $registry_settings['base_path'];
-			$file_string = $messenger . '_' . $type. '_' . $variation . $file_extension;
+			$file_string = $messenger.'_'.$type.'_'.$variation.$file_extension;
 			//see if this file exists
-			if ( is_readable( $registry_settings['base_path'] . $file_string ) ) {
-				return $base . $file_string;
+			if (is_readable($registry_settings['base_path'].$file_string)) {
+				return $base.$file_string;
 			}
 		}
 
@@ -217,21 +217,21 @@ 
 	 *
 	 * @return array                   new variations array (or existing one if nothing registered)
 	 */
-	public static function get_variations( $variations, $messenger,  $message_type, EE_Messages_Template_Pack $template_pack ) {
+	public static function get_variations($variations, $messenger, $message_type, EE_Messages_Template_Pack $template_pack) {
 		//first let's check if we even have registered variations and get out early.
-		if ( empty( self::$_registry ) ) {
+		if (empty(self::$_registry)) {
 			return $variations;
 		}
 
 		//do we have any new variations for the given messenger, $message_type, and template packs
-		foreach ( self::$_registry as $registry_slug => $registry_settings ) {
+		foreach (self::$_registry as $registry_slug => $registry_settings) {
 			//allow for different conditions.
-			if ( empty( $messenger) ) {
-				$variations =  array_merge( $registry_settings['variations'], $variations );
-			} else if ( ! empty( $messenger ) && empty( $message_type ) && ! empty( $registry_settings['variations'][$template_pack->dbref][$messenger] ) ) {
-				$variations =  array_merge( $registry_settings['variations'][$template_pack->dbref][$messenger], $variations );
-			} else if ( ! empty( $messenger ) && ! empty( $message_type ) && ! empty( $registry_settings['variations'][$template_pack->dbref][$messenger][$message_type] ) ) {
-				$variations = array_merge( $registry_settings['variations'][$template_pack->dbref][$messenger][$message_type], $variations );
+			if (empty($messenger)) {
+				$variations = array_merge($registry_settings['variations'], $variations);
+			} else if ( ! empty($messenger) && empty($message_type) && ! empty($registry_settings['variations'][$template_pack->dbref][$messenger])) {
+				$variations = array_merge($registry_settings['variations'][$template_pack->dbref][$messenger], $variations);
+			} else if ( ! empty($messenger) && ! empty($message_type) && ! empty($registry_settings['variations'][$template_pack->dbref][$messenger][$message_type])) {
+				$variations = array_merge($registry_settings['variations'][$template_pack->dbref][$messenger][$message_type], $variations);
 			}
 		}
 		return $variations;
@@ -250,9 +250,9 @@ 
 	 *
 	 * @return void
 	 */
-	public static function deregister( $variation_ref = NULL ) {
-		if ( !empty( self::$_registry[$variation_ref] ) ) {
-    			unset( self::$_registry[$variation_ref] );
+	public static function deregister($variation_ref = NULL) {
+		if ( ! empty(self::$_registry[$variation_ref])) {
+    			unset(self::$_registry[$variation_ref]);
     		}
 	}
 

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  * @subpackage plugin api, messages
  * @since           4.5.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Use this to register or deregister a new message template pack variation for the EE messages system.

Indentation +2 added lines, -2 removed lines

@@ -185,7 +185,7 @@
 	 */
 	public static function deregister( $variation_ref = NULL ) {
 		if ( !empty( self::$_registry[$variation_ref] ) ) {
-    			unset( self::$_registry[$variation_ref] );
-    		}
+				unset( self::$_registry[$variation_ref] );
+			}
 	}
 }