eventespresso / event-espresso-core

caffeinated/core/libraries/messages/message_type/payment_cancelled/EE_Messages_Email_Payment_Cancelled_Validator.class.php

Spacing +3 added lines, -3 removed lines

@@ -32,18 +32,18 @@
 
         // modify just event_list
         $new_config['event_list'] = array(
-            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
+            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
             );
         $new_config['ticket_list'] = array(
             'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
             );
         $new_config['content'] = array(
-            'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
+            'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
             );
         $this->_messenger->set_validator_config($new_config);
 
         if ($this->_context != 'admin') {
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+            $this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
         }
 
         $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Indentation +28 added lines, -28 removed lines

@@ -14,37 +14,37 @@
  */
 class EE_Messages_Email_Payment_Cancelled_Validator extends EE_Messages_Validator
 {
-    public function __construct($fields, $context)
-    {
-        $this->_m_name = 'email';
-        $this->_mt_name = 'payment_cancelled';
+	public function __construct($fields, $context)
+	{
+		$this->_m_name = 'email';
+		$this->_mt_name = 'payment_cancelled';
 
-        parent::__construct($fields, $context);
-    }
+		parent::__construct($fields, $context);
+	}
 
-    /**
-     * at this point no custom validation needed for this messenger/message_type combo.
-     */
-    protected function _modify_validator()
-    {
-        $new_config = $this->_messenger->get_validator_config();
+	/**
+	 * at this point no custom validation needed for this messenger/message_type combo.
+	 */
+	protected function _modify_validator()
+	{
+		$new_config = $this->_messenger->get_validator_config();
 
-        // modify just event_list
-        $new_config['event_list'] = array(
-            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
-            );
-        $new_config['ticket_list'] = array(
-            'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
-            );
-        $new_config['content'] = array(
-            'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
-            );
-        $this->_messenger->set_validator_config($new_config);
+		// modify just event_list
+		$new_config['event_list'] = array(
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
+			);
+		$new_config['ticket_list'] = array(
+			'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
+			);
+		$new_config['content'] = array(
+			'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
+			);
+		$this->_messenger->set_validator_config($new_config);
 
-        if ($this->_context != 'admin') {
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
-        }
+		if ($this->_context != 'admin') {
+			$this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
-        $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
-    }
+		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
+	}
 }

caffeinated/core/libraries/messages/message_type/payment_failed/EE_Messages_Email_Payment_Failed_Validator.class.php

Spacing +3 added lines, -3 removed lines

@@ -32,18 +32,18 @@
 
         // modify just event_list
         $new_config['event_list'] = array(
-            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
+            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
             );
         $new_config['ticket_list'] = array(
             'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
             );
         $new_config['content'] = array(
-            'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
+            'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
             );
         $this->_messenger->set_validator_config($new_config);
 
         if ($this->_context != 'admin') {
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+            $this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
         }
 
         $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Indentation +28 added lines, -28 removed lines

@@ -14,37 +14,37 @@
  */
 class EE_Messages_Email_Payment_Failed_Validator extends EE_Messages_Validator
 {
-    public function __construct($fields, $context)
-    {
-        $this->_m_name = 'email';
-        $this->_mt_name = 'payment_failed';
+	public function __construct($fields, $context)
+	{
+		$this->_m_name = 'email';
+		$this->_mt_name = 'payment_failed';
 
-        parent::__construct($fields, $context);
-    }
+		parent::__construct($fields, $context);
+	}
 
-    /**
-     * at this point no custom validation needed for this messenger/message_type combo.
-     */
-    protected function _modify_validator()
-    {
-        $new_config = $this->_messenger->get_validator_config();
+	/**
+	 * at this point no custom validation needed for this messenger/message_type combo.
+	 */
+	protected function _modify_validator()
+	{
+		$new_config = $this->_messenger->get_validator_config();
 
-        // modify just event_list
-        $new_config['event_list'] = array(
-            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
-            );
-        $new_config['ticket_list'] = array(
-            'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
-            );
-        $new_config['content'] = array(
-            'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
-            );
-        $this->_messenger->set_validator_config($new_config);
+		// modify just event_list
+		$new_config['event_list'] = array(
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
+			);
+		$new_config['ticket_list'] = array(
+			'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
+			);
+		$new_config['content'] = array(
+			'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
+			);
+		$this->_messenger->set_validator_config($new_config);
 
-        if ($this->_context != 'admin') {
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
-        }
+		if ($this->_context != 'admin') {
+			$this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
-        $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
-    }
+		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
+	}
 }

caffeinated/core/libraries/messages/message_type/cancelled_registration/EE_Messages_Email_Cancelled_Registration_Validator.class.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
         $this->_messenger->set_validator_config($new_config);
 
         if ($this->_context != 'admin') {
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+            $this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
         }
 
         $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Indentation +22 added lines, -22 removed lines

@@ -13,30 +13,30 @@
  */
 class EE_Messages_Email_Cancelled_Registration_Validator extends EE_Messages_Validator
 {
-    public function __construct($fields, $context)
-    {
-        $this->_m_name = 'email';
-        $this->_mt_name = 'cancelled_registration';
+	public function __construct($fields, $context)
+	{
+		$this->_m_name = 'email';
+		$this->_mt_name = 'cancelled_registration';
 
-        parent::__construct($fields, $context);
-    }
+		parent::__construct($fields, $context);
+	}
 
-    /**
-     * custom validator (will override what was originally set by the message_type and messenger)
-     */
-    protected function _modify_validator()
-    {
-        $new_config = $this->_messenger->get_validator_config();
-        $new_config['event_list'] = array(
-            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list'),
-            'required' => array('[EVENT_LIST]')
-            );
-        $this->_messenger->set_validator_config($new_config);
+	/**
+	 * custom validator (will override what was originally set by the message_type and messenger)
+	 */
+	protected function _modify_validator()
+	{
+		$new_config = $this->_messenger->get_validator_config();
+		$new_config['event_list'] = array(
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list'),
+			'required' => array('[EVENT_LIST]')
+			);
+		$this->_messenger->set_validator_config($new_config);
 
-        if ($this->_context != 'admin') {
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
-        }
+		if ($this->_context != 'admin') {
+			$this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
-        $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
-    }
+		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
+	}
 }

caffeinated/core/libraries/messages/message_type/declined_registration/EE_Messages_Email_Declined_Registration_Validator.class.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
         $this->_messenger->set_validator_config($new_config);
 
         if ($this->_context != 'admin') {
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+            $this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
         }
 
         $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Indentation +23 added lines, -23 removed lines

@@ -13,31 +13,31 @@
  */
 class EE_Messages_Email_Declined_Registration_Validator extends EE_Messages_Validator
 {
-    public function __construct($fields, $context)
-    {
-        $this->_m_name = 'email';
-        $this->_mt_name = 'declined_registration';
+	public function __construct($fields, $context)
+	{
+		$this->_m_name = 'email';
+		$this->_mt_name = 'declined_registration';
 
-        parent::__construct($fields, $context);
-    }
+		parent::__construct($fields, $context);
+	}
 
-    /**
-     * custom validator (restricting what was originally set by the messenger)
-     */
-    protected function _modify_validator()
-    {
-        $new_config = $this->_messenger->get_validator_config();
-        // modify just event_list
-        $new_config['event_list'] = array(
-            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list'),
-            'required' => array('[EVENT_LIST]')
-            );
-        $this->_messenger->set_validator_config($new_config);
+	/**
+	 * custom validator (restricting what was originally set by the messenger)
+	 */
+	protected function _modify_validator()
+	{
+		$new_config = $this->_messenger->get_validator_config();
+		// modify just event_list
+		$new_config['event_list'] = array(
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list'),
+			'required' => array('[EVENT_LIST]')
+			);
+		$this->_messenger->set_validator_config($new_config);
 
-        if ($this->_context != 'admin') {
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
-        }
+		if ($this->_context != 'admin') {
+			$this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
-        $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
-    }
+		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
+	}
 }

core/libraries/messages/validators/email/EE_Messages_Email_Not_Approved_Registration_Validator.class.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
         $this->_messenger->set_validator_config($new_config);
 
         if ($this->_context != 'admin') {
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+            $this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
         }
 
         $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Indentation +22 added lines, -22 removed lines

@@ -13,30 +13,30 @@
  */
 class EE_Messages_Email_Not_Approved_Registration_Validator extends EE_Messages_Validator
 {
-    public function __construct($fields, $context)
-    {
-        $this->_m_name = 'email';
-        $this->_mt_name = 'not_approved_registration';
+	public function __construct($fields, $context)
+	{
+		$this->_m_name = 'email';
+		$this->_mt_name = 'not_approved_registration';
 
-        parent::__construct($fields, $context);
-    }
+		parent::__construct($fields, $context);
+	}
 
-    /**
-     * custom validator (restricting what was originally set by the messenger)
-     */
-    protected function _modify_validator()
-    {
-        $new_config = $this->_messenger->get_validator_config();
-        $new_config['event_list'] = array(
-            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list'),
-            'required' => array('[EVENT_LIST]')
-            );
-        $this->_messenger->set_validator_config($new_config);
+	/**
+	 * custom validator (restricting what was originally set by the messenger)
+	 */
+	protected function _modify_validator()
+	{
+		$new_config = $this->_messenger->get_validator_config();
+		$new_config['event_list'] = array(
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list'),
+			'required' => array('[EVENT_LIST]')
+			);
+		$this->_messenger->set_validator_config($new_config);
 
-        if ($this->_context != 'admin') {
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
-        }
+		if ($this->_context != 'admin') {
+			$this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
-        $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
-    }
+		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
+	}
 }

core/libraries/messages/validators/email/EE_Messages_Email_Pending_Approval_Validator.class.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
         $this->_messenger->set_validator_config($new_config);
 
         if ($this->_context != 'admin') {
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+            $this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
         }
 
         $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Indentation +23 added lines, -23 removed lines

@@ -13,31 +13,31 @@
  */
 class EE_Messages_Email_Pending_Approval_Validator extends EE_Messages_Validator
 {
-    public function __construct($fields, $context)
-    {
-        $this->_m_name = 'email';
-        $this->_mt_name = 'pending_approval';
+	public function __construct($fields, $context)
+	{
+		$this->_m_name = 'email';
+		$this->_mt_name = 'pending_approval';
 
-        parent::__construct($fields, $context);
-    }
+		parent::__construct($fields, $context);
+	}
 
-    /**
-     * custom validator (restricting what was originally set by the messenger)
-     */
-    protected function _modify_validator()
-    {
-        $new_config = $this->_messenger->get_validator_config();
-        // modify just event_list
-        $new_config['event_list'] = array(
-            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list'),
-            'required' => array('[EVENT_LIST]')
-            );
-        $this->_messenger->set_validator_config($new_config);
+	/**
+	 * custom validator (restricting what was originally set by the messenger)
+	 */
+	protected function _modify_validator()
+	{
+		$new_config = $this->_messenger->get_validator_config();
+		// modify just event_list
+		$new_config['event_list'] = array(
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list'),
+			'required' => array('[EVENT_LIST]')
+			);
+		$this->_messenger->set_validator_config($new_config);
 
-        if ($this->_context != 'admin') {
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
-        }
+		if ($this->_context != 'admin') {
+			$this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
-        $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
-    }
+		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
+	}
 }

core/libraries/messages/validators/email/EE_Messages_Email_Payment_Validator.class.php

Spacing +3 added lines, -3 removed lines

@@ -32,18 +32,18 @@
 
         // modify just event_list
         $new_config['event_list'] = array(
-            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
+            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
             );
         $new_config['ticket_list'] = array(
             'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
             );
         $new_config['content'] = array(
-            'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
+            'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
             );
         $this->_messenger->set_validator_config($new_config);
 
         if ($this->_context != 'admin') {
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+            $this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
         }
 
         $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Indentation +28 added lines, -28 removed lines

@@ -13,37 +13,37 @@
  */
 class EE_Messages_Email_Payment_Validator extends EE_Messages_Validator
 {
-    public function __construct($fields, $context)
-    {
-        $this->_m_name = 'email';
-        $this->_mt_name = 'payment';
+	public function __construct($fields, $context)
+	{
+		$this->_m_name = 'email';
+		$this->_mt_name = 'payment';
 
-        parent::__construct($fields, $context);
-    }
+		parent::__construct($fields, $context);
+	}
 
-    /**
-     * at this point no custom validation needed for this messenger/message_type combo.
-     */
-    protected function _modify_validator()
-    {
-        $new_config = $this->_messenger->get_validator_config();
+	/**
+	 * at this point no custom validation needed for this messenger/message_type combo.
+	 */
+	protected function _modify_validator()
+	{
+		$new_config = $this->_messenger->get_validator_config();
 
-        // modify just event_list
-        $new_config['event_list'] = array(
-            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
-            );
-        $new_config['ticket_list'] = array(
-            'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
-            );
-        $new_config['content'] = array(
-            'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
-            );
-        $this->_messenger->set_validator_config($new_config);
+		// modify just event_list
+		$new_config['event_list'] = array(
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
+			);
+		$new_config['ticket_list'] = array(
+			'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
+			);
+		$new_config['content'] = array(
+			'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
+			);
+		$this->_messenger->set_validator_config($new_config);
 
-        if ($this->_context != 'admin') {
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
-        }
+		if ($this->_context != 'admin') {
+			$this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
-        $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
-    }
+		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
+	}
 }

core/libraries/messages/validators/email/EE_Messages_Email_Registration_Validator.class.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
         $this->_messenger->set_validator_config($new_config);
 
         if ($this->_context != 'admin') {
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+            $this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
         }
 
         $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Indentation +23 added lines, -23 removed lines

@@ -13,31 +13,31 @@
  */
 class EE_Messages_Email_Registration_Validator extends EE_Messages_Validator
 {
-    public function __construct($fields, $context)
-    {
-        $this->_m_name = 'email';
-        $this->_mt_name = 'registration';
+	public function __construct($fields, $context)
+	{
+		$this->_m_name = 'email';
+		$this->_mt_name = 'registration';
 
-        parent::__construct($fields, $context);
-    }
+		parent::__construct($fields, $context);
+	}
 
-    /**
-     * custom validator (restricting what was originally set by the messenger)
-     */
-    protected function _modify_validator()
-    {
-        $new_config = $this->_messenger->get_validator_config();
-        // modify just event_list
-        $new_config['event_list'] = array(
-            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list'),
-            'required' => array('[EVENT_LIST]')
-            );
-        $this->_messenger->set_validator_config($new_config);
+	/**
+	 * custom validator (restricting what was originally set by the messenger)
+	 */
+	protected function _modify_validator()
+	{
+		$new_config = $this->_messenger->get_validator_config();
+		// modify just event_list
+		$new_config['event_list'] = array(
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list'),
+			'required' => array('[EVENT_LIST]')
+			);
+		$this->_messenger->set_validator_config($new_config);
 
-        if ($this->_context != 'admin') {
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
-        }
+		if ($this->_context != 'admin') {
+			$this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
-        $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
-    }
+		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
+	}
 }

core/db_models/fields/EE_Enum_Text_Field.php

Spacing +2 added lines, -2 removed lines

@@ -89,8 +89,8 @@
     public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
     {
         $options = $this->_allowed_enum_values();
-        if (isset($options[ $value_on_field_to_be_outputted ])) {
-            return $options[ $value_on_field_to_be_outputted ];
+        if (isset($options[$value_on_field_to_be_outputted])) {
+            return $options[$value_on_field_to_be_outputted];
         } else {
             return $value_on_field_to_be_outputted;
         }

Indentation +113 added lines, -113 removed lines

@@ -10,131 +10,131 @@
  */
 class EE_Enum_Text_Field extends EE_Text_Field_Base
 {
-    /**
-     * @var array $_allowed_enum_values
-     */
-    public $_allowed_enum_values;
+	/**
+	 * @var array $_allowed_enum_values
+	 */
+	public $_allowed_enum_values;
 
-    /**
-     * @param string  $table_column
-     * @param string  $nice_name
-     * @param boolean $nullable
-     * @param mixed   $default_value
-     * @param array   $allowed_enum_values keys are values to be used in the DB, values are how they should be displayed
-     */
-    public function __construct($table_column, $nice_name, $nullable, $default_value, $allowed_enum_values)
-    {
-        $this->_allowed_enum_values = $allowed_enum_values;
-        parent::__construct($table_column, $nice_name, $nullable, $default_value);
-        $this->setSchemaType('object');
-    }
+	/**
+	 * @param string  $table_column
+	 * @param string  $nice_name
+	 * @param boolean $nullable
+	 * @param mixed   $default_value
+	 * @param array   $allowed_enum_values keys are values to be used in the DB, values are how they should be displayed
+	 */
+	public function __construct($table_column, $nice_name, $nullable, $default_value, $allowed_enum_values)
+	{
+		$this->_allowed_enum_values = $allowed_enum_values;
+		parent::__construct($table_column, $nice_name, $nullable, $default_value);
+		$this->setSchemaType('object');
+	}
 
 
 
-    /**
-     * Returns the list of allowed enum options, but filterable.
-     * This is used internally
-     *
-     * @return array
-     */
-    protected function _allowed_enum_values()
-    {
-        return apply_filters(
-            'FHEE__EE_Enum_Text_Field___allowed_enum_options',
-            $this->_allowed_enum_values,
-            $this
-        );
-    }
+	/**
+	 * Returns the list of allowed enum options, but filterable.
+	 * This is used internally
+	 *
+	 * @return array
+	 */
+	protected function _allowed_enum_values()
+	{
+		return apply_filters(
+			'FHEE__EE_Enum_Text_Field___allowed_enum_options',
+			$this->_allowed_enum_values,
+			$this
+		);
+	}
 
 
 
-    /**
-     * When setting, just verify that the value being used matches what we've defined as allowable enum values.
-     * If not, throw an error (but if WP_DEBUG is false, just set the value to default).
-     *
-     * @param string $value_inputted_for_field_on_model_object
-     * @return string
-     * @throws EE_Error
-     */
-    public function prepare_for_set($value_inputted_for_field_on_model_object)
-    {
-        if (
-            $value_inputted_for_field_on_model_object !== null
-            && ! array_key_exists($value_inputted_for_field_on_model_object, $this->_allowed_enum_values())
-        ) {
-            if (defined('WP_DEBUG') && WP_DEBUG) {
-                $msg = sprintf(
-                    esc_html__('System is assigning incompatible value "%1$s" to field "%2$s"', 'event_espresso'),
-                    $value_inputted_for_field_on_model_object,
-                    $this->_name
-                );
-                $msg2 = sprintf(
-                    esc_html__('Allowed values for "%1$s" are "%2$s". You provided: "%3$s"', 'event_espresso'),
-                    $this->_name,
-                    implode(', ', array_keys($this->_allowed_enum_values())),
-                    $value_inputted_for_field_on_model_object
-                );
-                EE_Error::add_error("{$msg}||{$msg2}", __FILE__, __FUNCTION__, __LINE__);
-            }
-            return $this->get_default_value();
-        }
-        return $value_inputted_for_field_on_model_object;
-    }
+	/**
+	 * When setting, just verify that the value being used matches what we've defined as allowable enum values.
+	 * If not, throw an error (but if WP_DEBUG is false, just set the value to default).
+	 *
+	 * @param string $value_inputted_for_field_on_model_object
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function prepare_for_set($value_inputted_for_field_on_model_object)
+	{
+		if (
+			$value_inputted_for_field_on_model_object !== null
+			&& ! array_key_exists($value_inputted_for_field_on_model_object, $this->_allowed_enum_values())
+		) {
+			if (defined('WP_DEBUG') && WP_DEBUG) {
+				$msg = sprintf(
+					esc_html__('System is assigning incompatible value "%1$s" to field "%2$s"', 'event_espresso'),
+					$value_inputted_for_field_on_model_object,
+					$this->_name
+				);
+				$msg2 = sprintf(
+					esc_html__('Allowed values for "%1$s" are "%2$s". You provided: "%3$s"', 'event_espresso'),
+					$this->_name,
+					implode(', ', array_keys($this->_allowed_enum_values())),
+					$value_inputted_for_field_on_model_object
+				);
+				EE_Error::add_error("{$msg}||{$msg2}", __FILE__, __FUNCTION__, __LINE__);
+			}
+			return $this->get_default_value();
+		}
+		return $value_inputted_for_field_on_model_object;
+	}
 
 
-    /**
-     * Gets the pretty version of the enum's value.
-     *
-     * @param     int |string $value_on_field_to_be_outputted
-     * @param    null         $schema
-     * @return    string
-     */
-    public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
-    {
-        $options = $this->_allowed_enum_values();
-        if (isset($options[ $value_on_field_to_be_outputted ])) {
-            return $options[ $value_on_field_to_be_outputted ];
-        } else {
-            return $value_on_field_to_be_outputted;
-        }
-    }
+	/**
+	 * Gets the pretty version of the enum's value.
+	 *
+	 * @param     int |string $value_on_field_to_be_outputted
+	 * @param    null         $schema
+	 * @return    string
+	 */
+	public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
+	{
+		$options = $this->_allowed_enum_values();
+		if (isset($options[ $value_on_field_to_be_outputted ])) {
+			return $options[ $value_on_field_to_be_outputted ];
+		} else {
+			return $value_on_field_to_be_outputted;
+		}
+	}
 
 
 
-    /**
-     * When retrieving something from the DB, don't enforce the enum's options. If it's in the DB, we just have to live
-     * with that. Note also: when we're saving to the DB again, we also don't enforce the enum options. It's ONLY
-     * when we're receiving USER input from prepare_for_set() that we enforce the enum options.
-     *
-     * @param mixed $value_in_db
-     * @return mixed
-     */
-    public function prepare_for_set_from_db($value_in_db)
-    {
-        return $value_in_db;
-    }
+	/**
+	 * When retrieving something from the DB, don't enforce the enum's options. If it's in the DB, we just have to live
+	 * with that. Note also: when we're saving to the DB again, we also don't enforce the enum options. It's ONLY
+	 * when we're receiving USER input from prepare_for_set() that we enforce the enum options.
+	 *
+	 * @param mixed $value_in_db
+	 * @return mixed
+	 */
+	public function prepare_for_set_from_db($value_in_db)
+	{
+		return $value_in_db;
+	}
 
 
-    public function getSchemaProperties()
-    {
-        return array(
-            'raw' => array(
-                'description' =>  sprintf(
-                    esc_html__('%s - the value in the database.', 'event_espresso'),
-                    $this->get_nicename()
-                ),
-                'type' => 'string',
-                'enum' => array_keys($this->_allowed_enum_values)
-            ),
-            'pretty' => array(
-                'description' =>  sprintf(
-                    esc_html__('%s - the value for display.', 'event_espresso'),
-                    $this->get_nicename()
-                ),
-                'type' => 'string',
-                'enum' => array_values($this->_allowed_enum_values),
-                'read_only' => true
-            )
-        );
-    }
+	public function getSchemaProperties()
+	{
+		return array(
+			'raw' => array(
+				'description' =>  sprintf(
+					esc_html__('%s - the value in the database.', 'event_espresso'),
+					$this->get_nicename()
+				),
+				'type' => 'string',
+				'enum' => array_keys($this->_allowed_enum_values)
+			),
+			'pretty' => array(
+				'description' =>  sprintf(
+					esc_html__('%s - the value for display.', 'event_espresso'),
+					$this->get_nicename()
+				),
+				'type' => 'string',
+				'enum' => array_values($this->_allowed_enum_values),
+				'read_only' => true
+			)
+		);
+	}
 }