eventespresso / event-espresso-core

caffeinated/admin/new/tickets/Tickets_List_Table.class.php

Indentation +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
 				'TKT_taxable' => __('Taxable', 'event_espresso')
 			);
 
-        $this->_sortable_columns = array(
+		$this->_sortable_columns = array(
 				// TRUE means its already sorted
 				'TKT_name' => array( 'TKT_name', TRUE ),
 				'TKT_description' => array( 'TKT_description', FALSE ),
@@ -68,9 +68,9 @@ 
 				'TKT_min' => array( 'TKT_min', FALSE ),
 				'TKT_max' => array( 'TKT_max', FALSE ),
 				'TKT_price' => array( 'TKT_price', FALSE )
-	        	);
+				);
 
-        $this->_hidden_columns = array(
+		$this->_hidden_columns = array(
 			);
 
 	}

Spacing +24 added lines, -24 removed lines

@@ -31,9 +31,9 @@ 
 
 	protected function _setup_data() {
 		$trashed = $this->_admin_page->get_view() == 'trashed' ? TRUE : FALSE;
-		$this->_data = $this->_admin_page->get_default_tickets( $this->_per_page, FALSE, $trashed );
-		$this->_all_data_count = $this->_admin_page->get_default_tickets( $this->_per_page, TRUE, FALSE );
-		$this->_trashed_count = $this->_admin_page->get_default_tickets( $this->_per_page, TRUE, TRUE );
+		$this->_data = $this->_admin_page->get_default_tickets($this->_per_page, FALSE, $trashed);
+		$this->_all_data_count = $this->_admin_page->get_default_tickets($this->_per_page, TRUE, FALSE);
+		$this->_trashed_count = $this->_admin_page->get_default_tickets($this->_per_page, TRUE, TRUE);
 	}
 
 
@@ -61,13 +61,13 @@ 
 
         $this->_sortable_columns = array(
 				// TRUE means its already sorted
-				'TKT_name' => array( 'TKT_name', TRUE ),
-				'TKT_description' => array( 'TKT_description', FALSE ),
-				'TKT_qty' => array( 'TKT_qty', FALSE ),
-				'TKT_uses' => array( 'TKT_uses', FALSE ),
-				'TKT_min' => array( 'TKT_min', FALSE ),
-				'TKT_max' => array( 'TKT_max', FALSE ),
-				'TKT_price' => array( 'TKT_price', FALSE )
+				'TKT_name' => array('TKT_name', TRUE),
+				'TKT_description' => array('TKT_description', FALSE),
+				'TKT_qty' => array('TKT_qty', FALSE),
+				'TKT_uses' => array('TKT_uses', FALSE),
+				'TKT_min' => array('TKT_min', FALSE),
+				'TKT_max' => array('TKT_max', FALSE),
+				'TKT_price' => array('TKT_price', FALSE)
 	        	);
 
         $this->_hidden_columns = array(
@@ -87,14 +87,14 @@ 
 
 	protected function _add_view_counts() {
 		$this->_views['all']['count'] = $this->_all_data_count;
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_tickets', 'trash_ticket'))
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_tickets', 'trash_ticket'))
 		$this->_views['trashed']['count'] = $this->_trashed_count;
 	}
 
 
 
 	function column_cb($item) {
-		return $item->ID() === 1 ? '<span class="ee-lock-icon"></span>' : sprintf( '<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', /* $1%s */ $item->ID() );
+		return $item->ID() === 1 ? '<span class="ee-lock-icon"></span>' : sprintf('<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', /* $1%s */ $item->ID());
 
 	}
 
@@ -105,21 +105,21 @@ 
 		$actions = array();
 
 		//trash links
-		if ( $item->ID() !== 1 ) {
-			if ( $this->_view == 'all' ) {
-				$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'trash_ticket', 'TKT_ID' => $item->ID() ), TICKETS_ADMIN_URL );
-				$actions['trash'] = '<a href="' . $trash_lnk_url . '" title="' . esc_attr__('Move Ticket to trash', 'event_espresso') . '">' . __('Trash', 'event_espresso') . '</a>';
+		if ($item->ID() !== 1) {
+			if ($this->_view == 'all') {
+				$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'trash_ticket', 'TKT_ID' => $item->ID()), TICKETS_ADMIN_URL);
+				$actions['trash'] = '<a href="'.$trash_lnk_url.'" title="'.esc_attr__('Move Ticket to trash', 'event_espresso').'">'.__('Trash', 'event_espresso').'</a>';
 			} else {
 				// restore price link
-				$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'restore_ticket', 'TKT_ID'=>$item->ID() ), TICKETS_ADMIN_URL );
-				$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="' . esc_attr__( 'Restore Ticket', 'event_espresso' ) . '">' . __( 'Restore', 'event_espresso' ) . '</a>';
+				$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'restore_ticket', 'TKT_ID'=>$item->ID()), TICKETS_ADMIN_URL);
+				$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="'.esc_attr__('Restore Ticket', 'event_espresso').'">'.__('Restore', 'event_espresso').'</a>';
 				// delete price link
-				$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'delete_ticket', 'TKT_ID'=>$item->ID() ), TICKETS_ADMIN_URL );
-				$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="' . esc_attr__( 'Delete Ticket Permanently', 'event_espresso' ) . '">' . __( 'Delete Permanently', 'event_espresso' ) . '</a>';
+				$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'delete_ticket', 'TKT_ID'=>$item->ID()), TICKETS_ADMIN_URL);
+				$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="'.esc_attr__('Delete Ticket Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>';
 			}
 		}
 
-		return $item->get('TKT_name') . $this->row_actions( $actions );
+		return $item->get('TKT_name').$this->row_actions($actions);
 	}
 
 
@@ -132,13 +132,13 @@ 
 
 
 	function column_TKT_qty($item) {
-		return $item->get_pretty('TKT_qty','text');
+		return $item->get_pretty('TKT_qty', 'text');
 	}
 
 
 
 	function column_TKT_uses($item) {
-		return $item->get_pretty('TKT_uses','text');
+		return $item->get_pretty('TKT_uses', 'text');
 	}
 
 
@@ -149,7 +149,7 @@ 
 
 
 	function column_TKT_max($item) {
-		return $item->get_pretty('TKT_max','text');
+		return $item->get_pretty('TKT_max', 'text');
 	}
 
 

Braces +6 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -87,8 +89,9 @@ 
 
 	protected function _add_view_counts() {
 		$this->_views['all']['count'] = $this->_all_data_count;
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_tickets', 'trash_ticket'))
-		$this->_views['trashed']['count'] = $this->_trashed_count;
+		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_tickets', 'trash_ticket')) {
+				$this->_views['trashed']['count'] = $this->_trashed_count;
+		}
 	}
 
 

caffeinated/core/libraries/messages/defaults/default/email_newsletter_content.template.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
                         <tbody>
                             <tr>
                                 <td>
-                                    <h2><?php printf( __('Hello, %s:', 'event_espresso'), '[RECIPIENT_FNAME]' ); ?></h2>
+                                    <h2><?php printf(__('Hello, %s:', 'event_espresso'), '[RECIPIENT_FNAME]'); ?></h2>
                                     <p class="lead"><?php _e("We've got a few things we want to share with you!", 'event_espresso'); ?></p>
                                     <div>
                                         [NEWSLETTER_CONTENT]

caffeinated/core/libraries/messages/defaults/default/email_newsletter_subject.template.php

Spacing +1 added lines, -1 removed lines

@@ -1,1 +1,1 @@
-<?php printf( __('Message from %s', 'event_espresso'), EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) ); ?>
+<?php printf(__('Message from %s', 'event_espresso'), EE_Registry::instance()->CFG->organization->get_pretty('name')); ?>

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

Indentation +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 		//remove unwanted transaction shortcode
 		foreach ( $this->_valid_shortcodes as $context => $shortcodes ) {
 			if( ($key = array_search('transaction', $shortcodes) ) !== false) {
-			    unset($this->_valid_shortcodes[$context][$key]);
+				unset($this->_valid_shortcodes[$context][$key]);
 			}
 		}
 	}

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -78,8 +78,8 @@ 
 		parent::_set_valid_shortcodes();
 
 		//remove unwanted transaction shortcode
-		foreach ( $this->_valid_shortcodes as $context => $shortcodes ) {
-			if( ($key = array_search('transaction', $shortcodes) ) !== false) {
+		foreach ($this->_valid_shortcodes as $context => $shortcodes) {
+			if (($key = array_search('transaction', $shortcodes)) !== false) {
 			    unset($this->_valid_shortcodes[$context][$key]);
 			}
 		}

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

caffeinated/core/libraries/messages/message_type/newsletter/EE_Messages_Contacts_incoming_data.class.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');
+}
 
 /**
  * This prepares data for message types that send messages for multiple contacts and handles
@@ -30,8 +32,9 @@ 
 
         //validate that the first element in the array is an EE_Attendee object.  Note that the array may be indexed by REG_ID so we will just shift off the first element.
         $ctc_chk = reset( $data );
-        if ( ! $ctc_chk instanceof EE_Attendee )
-            throw new EE_Error(__('The EE_Message_Contacts_incoming_data class expects an array of EE_Attendee objects.', 'event_espresso') );
+        if ( ! $ctc_chk instanceof EE_Attendee ) {
+                    throw new EE_Error(__('The EE_Message_Contacts_incoming_data class expects an array of EE_Attendee objects.', 'event_espresso') );
+        }
 
         parent::__construct( $data );
     }

Indentation +97 added lines, -97 removed lines

@@ -19,101 +19,101 @@
 class EE_Messages_Contacts_incoming_data extends EE_Messages_incoming_data {
 
 
-    /**
-     * Constructor.
-     *
-     * @since    4.3.0
-     * @param  EE_Attendee[]     $data expecting an array of EE_Attendee objects.
-     * @throws EE_Error
-     * @access protected
-     */
-    public function __construct( $data = array() ) {
-
-        //validate that the first element in the array is an EE_Attendee object.  Note that the array may be indexed by REG_ID so we will just shift off the first element.
-        $ctc_chk = reset( $data );
-        if ( ! $ctc_chk instanceof EE_Attendee )
-            throw new EE_Error(__('The EE_Message_Contacts_incoming_data class expects an array of EE_Attendee objects.', 'event_espresso') );
-
-        parent::__construct( $data );
-    }
-
-
-    /**
-     * @see parent class for phpdocs.
-     * @param array $attendees
-     * @return array
-     */
-    public static function convert_data_for_persistent_storage( $attendees ) {
-        $attendee_ids = array_filter ( array_map(
-            function( $attendee ) {
-                if ( $attendee instanceof EE_Attendee ) {
-                    return $attendee->ID();
-                }
-            },
-            $attendees
-            ) );
-        return $attendee_ids;
-    }
-
-
-
-
-    /**
-     * @see parent class for phpdocs
-     * @param array $attendee_ids
-     * @return EE_Attendee[]
-     */
-    public static function convert_data_from_persistent_storage( $attendee_ids ) {
-        $attendee_ids = (array) $attendee_ids;
-        $attendees = EEM_Attendee::instance()->get_all(
-          array(
-              array( 'ATT_ID' => array( 'IN', $attendee_ids ) )
-          )
-        );
-        return $attendees;
-    }
-
-
-
-
-    /**
-     * setup the data.
-     *
-     * Sets up the expected data object for the messages prep using incoming registration objects.
-     *
-     * @since   4.3.0
-     *
-     * @return void
-     * @access protected
-     */
-    protected function _setup_data() {
-
-        //we'll loop through each contact and setup the data needed.  Note that many properties will just be set as empty because the contacts data handler is for a very specific set of data (i.e. just what's related to the contact).
-        $this->txn = NULL;
-        $this->taxes = NULL;
-        $this->grand_total_price_object = '';
-        $this->user_id = $this->ip_address = $this->user_agent = $this->init_access = '';
-        $this->payment = NULL;
-        $this->billing = array();
-        $this->reg_objs = array();
-        $this->attendees = $this->events = $this->tickets = $this->datetimes = $this->questions = $this->answer =  $this->registrations = array();
-        $this->total_ticket_count = 0;
-        $this->primary_attendee_data = array(
-            'registration_id' => 0,
-            'att_obj' => NULL,
-            'reg_obj' => NULL,
-            'primary_att_obj' => NULL,
-            'primary_reg_obj' => NULL
-            );
-
-        foreach ( $this->_data as $contact ) {
-            $id = $contact->ID();
-            $reg = $contact->get_first_related('Registration');
-            $this->attendees[$id]['att_obj'] = $contact;
-            $this->attendees[$id]['reg_objs'][$reg->ID()] = $reg;
-            $this->attendees[$id]['attendee_email'] = $contact->email();
-            $this->attendees[$id]['tkt_objs'] = array();
-            $this->attendees[$id]['evt_objs'] = array();
-        }
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @since    4.3.0
+	 * @param  EE_Attendee[]     $data expecting an array of EE_Attendee objects.
+	 * @throws EE_Error
+	 * @access protected
+	 */
+	public function __construct( $data = array() ) {
+
+		//validate that the first element in the array is an EE_Attendee object.  Note that the array may be indexed by REG_ID so we will just shift off the first element.
+		$ctc_chk = reset( $data );
+		if ( ! $ctc_chk instanceof EE_Attendee )
+			throw new EE_Error(__('The EE_Message_Contacts_incoming_data class expects an array of EE_Attendee objects.', 'event_espresso') );
+
+		parent::__construct( $data );
+	}
+
+
+	/**
+	 * @see parent class for phpdocs.
+	 * @param array $attendees
+	 * @return array
+	 */
+	public static function convert_data_for_persistent_storage( $attendees ) {
+		$attendee_ids = array_filter ( array_map(
+			function( $attendee ) {
+				if ( $attendee instanceof EE_Attendee ) {
+					return $attendee->ID();
+				}
+			},
+			$attendees
+			) );
+		return $attendee_ids;
+	}
+
+
+
+
+	/**
+	 * @see parent class for phpdocs
+	 * @param array $attendee_ids
+	 * @return EE_Attendee[]
+	 */
+	public static function convert_data_from_persistent_storage( $attendee_ids ) {
+		$attendee_ids = (array) $attendee_ids;
+		$attendees = EEM_Attendee::instance()->get_all(
+		  array(
+			  array( 'ATT_ID' => array( 'IN', $attendee_ids ) )
+		  )
+		);
+		return $attendees;
+	}
+
+
+
+
+	/**
+	 * setup the data.
+	 *
+	 * Sets up the expected data object for the messages prep using incoming registration objects.
+	 *
+	 * @since   4.3.0
+	 *
+	 * @return void
+	 * @access protected
+	 */
+	protected function _setup_data() {
+
+		//we'll loop through each contact and setup the data needed.  Note that many properties will just be set as empty because the contacts data handler is for a very specific set of data (i.e. just what's related to the contact).
+		$this->txn = NULL;
+		$this->taxes = NULL;
+		$this->grand_total_price_object = '';
+		$this->user_id = $this->ip_address = $this->user_agent = $this->init_access = '';
+		$this->payment = NULL;
+		$this->billing = array();
+		$this->reg_objs = array();
+		$this->attendees = $this->events = $this->tickets = $this->datetimes = $this->questions = $this->answer =  $this->registrations = array();
+		$this->total_ticket_count = 0;
+		$this->primary_attendee_data = array(
+			'registration_id' => 0,
+			'att_obj' => NULL,
+			'reg_obj' => NULL,
+			'primary_att_obj' => NULL,
+			'primary_reg_obj' => NULL
+			);
+
+		foreach ( $this->_data as $contact ) {
+			$id = $contact->ID();
+			$reg = $contact->get_first_related('Registration');
+			$this->attendees[$id]['att_obj'] = $contact;
+			$this->attendees[$id]['reg_objs'][$reg->ID()] = $reg;
+			$this->attendees[$id]['attendee_email'] = $contact->email();
+			$this->attendees[$id]['tkt_objs'] = array();
+			$this->attendees[$id]['evt_objs'] = array();
+		}
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -27,14 +27,14 @@ 
      * @throws EE_Error
      * @access protected
      */
-    public function __construct( $data = array() ) {
+    public function __construct($data = array()) {
 
         //validate that the first element in the array is an EE_Attendee object.  Note that the array may be indexed by REG_ID so we will just shift off the first element.
-        $ctc_chk = reset( $data );
-        if ( ! $ctc_chk instanceof EE_Attendee )
-            throw new EE_Error(__('The EE_Message_Contacts_incoming_data class expects an array of EE_Attendee objects.', 'event_espresso') );
+        $ctc_chk = reset($data);
+        if ( ! $ctc_chk instanceof EE_Attendee)
+            throw new EE_Error(__('The EE_Message_Contacts_incoming_data class expects an array of EE_Attendee objects.', 'event_espresso'));
 
-        parent::__construct( $data );
+        parent::__construct($data);
     }
 
 
@@ -43,15 +43,15 @@ 
      * @param array $attendees
      * @return array
      */
-    public static function convert_data_for_persistent_storage( $attendees ) {
-        $attendee_ids = array_filter ( array_map(
-            function( $attendee ) {
-                if ( $attendee instanceof EE_Attendee ) {
+    public static function convert_data_for_persistent_storage($attendees) {
+        $attendee_ids = array_filter(array_map(
+            function($attendee) {
+                if ($attendee instanceof EE_Attendee) {
                     return $attendee->ID();
                 }
             },
             $attendees
-            ) );
+            ));
         return $attendee_ids;
     }
 
@@ -63,11 +63,11 @@ 
      * @param array $attendee_ids
      * @return EE_Attendee[]
      */
-    public static function convert_data_from_persistent_storage( $attendee_ids ) {
+    public static function convert_data_from_persistent_storage($attendee_ids) {
         $attendee_ids = (array) $attendee_ids;
         $attendees = EEM_Attendee::instance()->get_all(
           array(
-              array( 'ATT_ID' => array( 'IN', $attendee_ids ) )
+              array('ATT_ID' => array('IN', $attendee_ids))
           )
         );
         return $attendees;
@@ -96,7 +96,7 @@ 
         $this->payment = NULL;
         $this->billing = array();
         $this->reg_objs = array();
-        $this->attendees = $this->events = $this->tickets = $this->datetimes = $this->questions = $this->answer =  $this->registrations = array();
+        $this->attendees = $this->events = $this->tickets = $this->datetimes = $this->questions = $this->answer = $this->registrations = array();
         $this->total_ticket_count = 0;
         $this->primary_attendee_data = array(
             'registration_id' => 0,
@@ -106,7 +106,7 @@ 
             'primary_reg_obj' => NULL
             );
 
-        foreach ( $this->_data as $contact ) {
+        foreach ($this->_data as $contact) {
             $id = $contact->ID();
             $reg = $contact->get_first_related('Registration');
             $this->attendees[$id]['att_obj'] = $contact;

caffeinated/core/libraries/messages/message_type/newsletter/EE_Messages_Email_Newsletter_Validator.class.php

Indentation +25 added lines, -25 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * This file contains the EE_Messages_Email_Newsletter_Validator class.
- * @package      Event Espresso
- * @subpackage helpers
- * @since           4.3.0
- */
+	 * This file contains the EE_Messages_Email_Newsletter_Validator class.
+	 * @package      Event Espresso
+	 * @subpackage helpers
+	 * @since           4.3.0
+	 */
 if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 
 /**
@@ -18,27 +18,27 @@ 
  * @author          Darren Ethier
  */
 class EE_Messages_Email_Newsletter_Validator extends EE_Messages_Validator {
-    public function __construct( $fields, $context ) {
-        $this->_m_name = 'email';
-        $this->_mt_name = 'newsletter';
+	public function __construct( $fields, $context ) {
+		$this->_m_name = 'email';
+		$this->_mt_name = 'newsletter';
 
-        parent::__construct( $fields, $context );
-    }
+		parent::__construct( $fields, $context );
+	}
 
-    /**
-     * custom validator (restricting what was originally set by the messenger)
-     */
-    protected function _modify_validator() {
-        if ( $this->_context == 'attendee' )
-            $this->_valid_shortcodes_modifier[$this->_context]['from'] = array('recipient_details', 'email', 'organization');
+	/**
+	 * custom validator (restricting what was originally set by the messenger)
+	 */
+	protected function _modify_validator() {
+		if ( $this->_context == 'attendee' )
+			$this->_valid_shortcodes_modifier[$this->_context]['from'] = array('recipient_details', 'email', 'organization');
 
-        //excluded shortcodes
-        $fields = array('to','from','subject','content','newsletter_content');
-        foreach ( $fields as $field ) {
-            $this->_specific_shortcode_excludes[$field] = array('[RECIPIENT_REGISTRATION_CODE]', '[RECIPIENT_EDIT_REGISTRATION_LINK]', '[EVENT_AUTHOR_FORMATTED_EMAIL]', '[EVENT_AUTHOR_EMAIL]');
-        }
-        $add_excludes = array( '[RECIPIENT_FNAME]', '[RECIPIENT_LNAME]', '[RECIPIENT_EMAIL]', '[COMPANY]', '[CO_ADD1]','[CO_ADD2]', '[CO_CITY]', '[CO_STATE]','[CO_ZIP]','[CO_LOGO]','[CO_PHONE]','[CO_LOGO_URL]','[CO_FACEBOOK_URL]','[CO_TWITTER_URL]','[CO_PINTEREST_URL]','[CO_GOOGLE_URL]','[CO_LINKEDIN_URL]','[CO_INSTAGRAM_URL]');
-        $this->_specific_shortcode_excludes['from'] = array_merge($this->_specific_shortcode_excludes['from'], $add_excludes);
-        $this->_specific_shortcode_excludes['content'] = array_merge( $this->_specific_shortcode_excludes['content'], array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]') );
-    }
+		//excluded shortcodes
+		$fields = array('to','from','subject','content','newsletter_content');
+		foreach ( $fields as $field ) {
+			$this->_specific_shortcode_excludes[$field] = array('[RECIPIENT_REGISTRATION_CODE]', '[RECIPIENT_EDIT_REGISTRATION_LINK]', '[EVENT_AUTHOR_FORMATTED_EMAIL]', '[EVENT_AUTHOR_EMAIL]');
+		}
+		$add_excludes = array( '[RECIPIENT_FNAME]', '[RECIPIENT_LNAME]', '[RECIPIENT_EMAIL]', '[COMPANY]', '[CO_ADD1]','[CO_ADD2]', '[CO_CITY]', '[CO_STATE]','[CO_ZIP]','[CO_LOGO]','[CO_PHONE]','[CO_LOGO_URL]','[CO_FACEBOOK_URL]','[CO_TWITTER_URL]','[CO_PINTEREST_URL]','[CO_GOOGLE_URL]','[CO_LINKEDIN_URL]','[CO_INSTAGRAM_URL]');
+		$this->_specific_shortcode_excludes['from'] = array_merge($this->_specific_shortcode_excludes['from'], $add_excludes);
+		$this->_specific_shortcode_excludes['content'] = array_merge( $this->_specific_shortcode_excludes['content'], array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]') );
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -18,27 +18,27 @@
  * @author          Darren Ethier
  */
 class EE_Messages_Email_Newsletter_Validator extends EE_Messages_Validator {
-    public function __construct( $fields, $context ) {
+    public function __construct($fields, $context) {
         $this->_m_name = 'email';
         $this->_mt_name = 'newsletter';
 
-        parent::__construct( $fields, $context );
+        parent::__construct($fields, $context);
     }
 
     /**
      * custom validator (restricting what was originally set by the messenger)
      */
     protected function _modify_validator() {
-        if ( $this->_context == 'attendee' )
+        if ($this->_context == 'attendee')
             $this->_valid_shortcodes_modifier[$this->_context]['from'] = array('recipient_details', 'email', 'organization');
 
         //excluded shortcodes
-        $fields = array('to','from','subject','content','newsletter_content');
-        foreach ( $fields as $field ) {
+        $fields = array('to', 'from', 'subject', 'content', 'newsletter_content');
+        foreach ($fields as $field) {
             $this->_specific_shortcode_excludes[$field] = array('[RECIPIENT_REGISTRATION_CODE]', '[RECIPIENT_EDIT_REGISTRATION_LINK]', '[EVENT_AUTHOR_FORMATTED_EMAIL]', '[EVENT_AUTHOR_EMAIL]');
         }
-        $add_excludes = array( '[RECIPIENT_FNAME]', '[RECIPIENT_LNAME]', '[RECIPIENT_EMAIL]', '[COMPANY]', '[CO_ADD1]','[CO_ADD2]', '[CO_CITY]', '[CO_STATE]','[CO_ZIP]','[CO_LOGO]','[CO_PHONE]','[CO_LOGO_URL]','[CO_FACEBOOK_URL]','[CO_TWITTER_URL]','[CO_PINTEREST_URL]','[CO_GOOGLE_URL]','[CO_LINKEDIN_URL]','[CO_INSTAGRAM_URL]');
+        $add_excludes = array('[RECIPIENT_FNAME]', '[RECIPIENT_LNAME]', '[RECIPIENT_EMAIL]', '[COMPANY]', '[CO_ADD1]', '[CO_ADD2]', '[CO_CITY]', '[CO_STATE]', '[CO_ZIP]', '[CO_LOGO]', '[CO_PHONE]', '[CO_LOGO_URL]', '[CO_FACEBOOK_URL]', '[CO_TWITTER_URL]', '[CO_PINTEREST_URL]', '[CO_GOOGLE_URL]', '[CO_LINKEDIN_URL]', '[CO_INSTAGRAM_URL]');
         $this->_specific_shortcode_excludes['from'] = array_merge($this->_specific_shortcode_excludes['from'], $add_excludes);
-        $this->_specific_shortcode_excludes['content'] = array_merge( $this->_specific_shortcode_excludes['content'], array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]') );
+        $this->_specific_shortcode_excludes['content'] = array_merge($this->_specific_shortcode_excludes['content'], array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]'));
     }
 }

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');
+}
 
 /**
  * Holds any special validation rules for template fields with Email messenger and Newsletter
@@ -29,8 +31,9 @@ 
      * custom validator (restricting what was originally set by the messenger)
      */
     protected function _modify_validator() {
-        if ( $this->_context == 'attendee' )
-            $this->_valid_shortcodes_modifier[$this->_context]['from'] = array('recipient_details', 'email', 'organization');
+        if ( $this->_context == 'attendee' ) {
+                    $this->_valid_shortcodes_modifier[$this->_context]['from'] = array('recipient_details', 'email', 'organization');
+        }
 
         //excluded shortcodes
         $fields = array('to','from','subject','content','newsletter_content');

caffeinated/core/libraries/shortcodes/EE_Newsletter_Shortcodes.lib.php

Braces +9 added lines, -5 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 is the library class for the "newsletter" group shortcodes.
@@ -54,8 +56,9 @@ 
      * @return  array                                             new validator config.
      */
     public static function messenger_validator_config( $validator_config, EE_messenger $messenger ) {
-        if ( $messenger->name !== 'email' )
-            return $validator_config;
+        if ( $messenger->name !== 'email' ) {
+                    return $validator_config;
+        }
 
         $validator_config['content']['shortcodes'][] = 'newsletter';
         $validator_config['newsletter_content'] = array(
@@ -82,8 +85,9 @@ 
      * @return  array                                           new/modified template fields array.
      */
     public static function messenger_template_fields( $template_fields, EE_messenger $messenger ) {
-        if ( $messenger->name !== 'email' )
-            return $template_fields;
+        if ( $messenger->name !== 'email' ) {
+                    return $template_fields;
+        }
 
         $template_fields['extra']['content']['newsletter_content'] = array(
             'input' => 'wp_editor',

Spacing +7 added lines, -7 removed lines

@@ -30,14 +30,14 @@ 
 
 
 
-    protected function _parser( $shortcode ) {
-        if ( $shortcode == '[NEWSLETTER_CONTENT]' ) {
+    protected function _parser($shortcode) {
+        if ($shortcode == '[NEWSLETTER_CONTENT]') {
             $this->_validate_list_requirements();
             $this->_set_shortcode_helper();
             $valid_shortcodes = array('recipient_details', 'organization');
             $template = $this->_data['template']['newsletter_content'];
             $data = $this->_data;
-            return $this->_shortcode_helper->parse_message_template( $template, $data['data'], $valid_shortcodes, $this->_message_type, $this->_messenger, $this->_message );
+            return $this->_shortcode_helper->parse_message_template($template, $data['data'], $valid_shortcodes, $this->_message_type, $this->_messenger, $this->_message);
         }
     }
 
@@ -53,8 +53,8 @@ 
      * @param  EE_messenger  $messenger
      * @return  array                                             new validator config.
      */
-    public static function messenger_validator_config( $validator_config, EE_messenger $messenger ) {
-        if ( $messenger->name !== 'email' )
+    public static function messenger_validator_config($validator_config, EE_messenger $messenger) {
+        if ($messenger->name !== 'email')
             return $validator_config;
 
         $validator_config['content']['shortcodes'][] = 'newsletter';
@@ -81,8 +81,8 @@ 
      * @param  EE_messenger  $messenger
      * @return  array                                           new/modified template fields array.
      */
-    public static function messenger_template_fields( $template_fields, EE_messenger $messenger ) {
-        if ( $messenger->name !== 'email' )
+    public static function messenger_template_fields($template_fields, EE_messenger $messenger) {
+        if ($messenger->name !== 'email')
             return $template_fields;
 
         $template_fields['extra']['content']['newsletter_content'] = array(

Indentation +65 added lines, -65 removed lines

@@ -20,81 +20,81 @@
  */
 class EE_Newsletter_Shortcodes extends EE_Shortcodes {
 
-    protected function _init_props() {
-        $this->label = __("Newsletter Shortcodes", 'event_espresso');
-        $this->description = __('All shortcodes used for the newsletter message type', 'event_espresso');
-        $this->_shortcodes = array(
-            '[NEWSLETTER_CONTENT]' => __('This will parse to whatever is found in the related [newsletter_content] field.  Note that when triggering a newsletter message, whatever is added for the custom message will be inserted where this shortcode is placed', 'event_espresso')
-            );
-    }
+	protected function _init_props() {
+		$this->label = __("Newsletter Shortcodes", 'event_espresso');
+		$this->description = __('All shortcodes used for the newsletter message type', 'event_espresso');
+		$this->_shortcodes = array(
+			'[NEWSLETTER_CONTENT]' => __('This will parse to whatever is found in the related [newsletter_content] field.  Note that when triggering a newsletter message, whatever is added for the custom message will be inserted where this shortcode is placed', 'event_espresso')
+			);
+	}
 
 
 
-    protected function _parser( $shortcode ) {
-        if ( $shortcode == '[NEWSLETTER_CONTENT]' ) {
-            $this->_validate_list_requirements();
-            $valid_shortcodes = array('recipient_details', 'organization');
-            $template = $this->_data['template']['newsletter_content'];
-            $data = $this->_data;
-            return $this->_shortcode_helper->parse_message_template( $template, $data['data'], $valid_shortcodes, $this->_message_type, $this->_messenger, $this->_message );
-        }
-    }
+	protected function _parser( $shortcode ) {
+		if ( $shortcode == '[NEWSLETTER_CONTENT]' ) {
+			$this->_validate_list_requirements();
+			$valid_shortcodes = array('recipient_details', 'organization');
+			$template = $this->_data['template']['newsletter_content'];
+			$data = $this->_data;
+			return $this->_shortcode_helper->parse_message_template( $template, $data['data'], $valid_shortcodes, $this->_message_type, $this->_messenger, $this->_message );
+		}
+	}
 
 
-    /**
-     * Callback set in args for EE_Register_Messages_Shortcode_Library::register for 'msgr_validator_callback'.
-     *
-     * EE_Register_Messages_Shortcode_Library::register registers this callback with the
-     * 'FHEE__EE_messenger__get_validator_config' filter.
-     *
-     * @since    4.3.0
-     * @param  array        $validator_config  current validator configuration array
-     * @param  EE_messenger $messenger
-     * @return  array                                             new validator config.
-     */
-    public static function messenger_validator_config( $validator_config, EE_messenger $messenger ) {
-        if ( $messenger->name !== 'email' )
-            return $validator_config;
+	/**
+	 * Callback set in args for EE_Register_Messages_Shortcode_Library::register for 'msgr_validator_callback'.
+	 *
+	 * EE_Register_Messages_Shortcode_Library::register registers this callback with the
+	 * 'FHEE__EE_messenger__get_validator_config' filter.
+	 *
+	 * @since    4.3.0
+	 * @param  array        $validator_config  current validator configuration array
+	 * @param  EE_messenger $messenger
+	 * @return  array                                             new validator config.
+	 */
+	public static function messenger_validator_config( $validator_config, EE_messenger $messenger ) {
+		if ( $messenger->name !== 'email' )
+			return $validator_config;
 
-        $validator_config['content']['shortcodes'][] = 'newsletter';
-        $validator_config['newsletter_content'] = array(
-            'shortcodes' => array('recipient_details', 'organization'),
-            'required' => array('[NEWSLETTER_CONTENT]')
-            );
-        return $validator_config;
-    }
+		$validator_config['content']['shortcodes'][] = 'newsletter';
+		$validator_config['newsletter_content'] = array(
+			'shortcodes' => array('recipient_details', 'organization'),
+			'required' => array('[NEWSLETTER_CONTENT]')
+			);
+		return $validator_config;
+	}
 
 
 
 
-    /**
-     * Callback set in args for EE_Register_Messages_Shortcode_Library::register for
-     * 'msgr_template_fields_callback'.
-     *
-     * EE_Register_Messages_Shortcode_Library::register registers this callback with the
-     * FHEE__EE_messenger__get_template_fields filter.
-     *
-     * @since    4.3.0
-     *
-     * @param  array        $template_fields current template fields setup array.
-     * @param  EE_messenger $messenger
-     * @return  array                                           new/modified template fields array.
-     */
-    public static function messenger_template_fields( $template_fields, EE_messenger $messenger ) {
-        if ( $messenger->name !== 'email' )
-            return $template_fields;
+	/**
+	 * Callback set in args for EE_Register_Messages_Shortcode_Library::register for
+	 * 'msgr_template_fields_callback'.
+	 *
+	 * EE_Register_Messages_Shortcode_Library::register registers this callback with the
+	 * FHEE__EE_messenger__get_template_fields filter.
+	 *
+	 * @since    4.3.0
+	 *
+	 * @param  array        $template_fields current template fields setup array.
+	 * @param  EE_messenger $messenger
+	 * @return  array                                           new/modified template fields array.
+	 */
+	public static function messenger_template_fields( $template_fields, EE_messenger $messenger ) {
+		if ( $messenger->name !== 'email' )
+			return $template_fields;
 
-        $template_fields['extra']['content']['newsletter_content'] = array(
-            'input' => 'wp_editor',
-            'label' => '[NEWSLETTER_CONTENT]',
-            'type' => 'string',
-            'required' => TRUE,
-            'validation' => TRUE,
-            'format' => '%s',
-            'rows' => '15',
-            'shortcodes_required' => array('[NEWSLETTER_CONTENT]')
-            );
-        return $template_fields;
-    }
+		$template_fields['extra']['content']['newsletter_content'] = array(
+			'input' => 'wp_editor',
+			'label' => '[NEWSLETTER_CONTENT]',
+			'type' => 'string',
+			'required' => TRUE,
+			'validation' => TRUE,
+			'format' => '%s',
+			'rows' => '15',
+			'shortcodes_required' => array('[NEWSLETTER_CONTENT]')
+			);
+		return $template_fields;
+	}
 
 } //end class EE_Newsletter_Shortcodes

caffeinated/core/libraries/shortcodes/EE_Question_Shortcodes.lib.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -57,39 +57,39 @@ 
 	 * @param string $shortcode the shortcode to be parsed.
 	 * @return string parsed shortcode
 	 */
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
-		if ( ! $this->_data instanceof EE_Answer || ! isset( $this->_extra_data['data'] ) || ! $this->_extra_data['data'] instanceof EE_Messages_Addressee ) {
+		if ( ! $this->_data instanceof EE_Answer || ! isset($this->_extra_data['data']) || ! $this->_extra_data['data'] instanceof EE_Messages_Addressee) {
 			return '';
 		}
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 
 			case '[QUESTION]' :
-				$question = isset( $this->_extra_data['data']->questions[$this->_data->ID()] ) ? $this->_extra_data['data']->questions[$this->_data->ID()] : $this->_data->question();
-				if ( ! $question instanceof EE_Question ) {
+				$question = isset($this->_extra_data['data']->questions[$this->_data->ID()]) ? $this->_extra_data['data']->questions[$this->_data->ID()] : $this->_data->question();
+				if ( ! $question instanceof EE_Question) {
 					return ''; //get out because we can't figure out what the question is.
 				}
-				return $question->get_pretty( 'QST_display_text', 'no_wpautop' );
+				return $question->get_pretty('QST_display_text', 'no_wpautop');
 				break;
 
 			case '[ANSWER]' :
 				//need to get the question to determine the type of question (some questions require translation of the answer).
-				$question = isset( $this->_extra_data['data']->questions[$this->_data->ID()] ) ? $this->_extra_data['data']->questions[$this->_data->ID()] : $this->_data->question();
-				if ( ! $question instanceof EE_Question ) {
+				$question = isset($this->_extra_data['data']->questions[$this->_data->ID()]) ? $this->_extra_data['data']->questions[$this->_data->ID()] : $this->_data->question();
+				if ( ! $question instanceof EE_Question) {
 					return ''; //get out cause we can't figure out what the question type is!
 				}
 
 				//what we show for the answer depends on the question type!
-				switch ( $question->get( 'QST_type' ) ) {
+				switch ($question->get('QST_type')) {
 
 					case 'STATE' :
-						$state = EEM_State::instance()->get_one_by_ID( $this->_data->get('ANS_value') );
+						$state = EEM_State::instance()->get_one_by_ID($this->_data->get('ANS_value'));
 						$answer = $state instanceof EE_State ? $state->name() : '';
 						break;
 
 					case 'COUNTRY' :
-						$country = EEM_Country::instance()->get_one_by_ID( $this->_data->get( 'ANS_value') );
+						$country = EEM_Country::instance()->get_one_by_ID($this->_data->get('ANS_value'));
 						$answer = $country instanceof EE_Country ? $country->name() : '';
 						break;
 

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

caffeinated/modules/events_archive_caff/EED_Events_Archive_Caff.module.php

Indentation +21 added lines, -21 removed lines

@@ -1,26 +1,26 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package			Event Espresso
- * @ author			Seth Shoultes
- * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
- * @ link					http://www.eventespresso.com
- * @ version		 	4.0
- *
- * ------------------------------------------------------------------------
- *
- * EED_Events_Archive_Caff
- *
- * @package		Event Espresso
- * @subpackage	/modules/events_archive_caff/
- * @author		Brent Christensen
- *
- * ------------------------------------------------------------------------
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package			Event Espresso
+	 * @ author			Seth Shoultes
+	 * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
+	 * @ link					http://www.eventespresso.com
+	 * @ version		 	4.0
+	 *
+	 * ------------------------------------------------------------------------
+	 *
+	 * EED_Events_Archive_Caff
+	 *
+	 * @package		Event Espresso
+	 * @subpackage	/modules/events_archive_caff/
+	 * @author		Brent Christensen
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 class EED_Events_Archive_Caff  extends EED_Events_Archive {
 
 

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

Doc Comments +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
 	 *  @access 	public
 	 *  @param    EE_Template_Config $CFG
 	 *  @param 	array $REQ
-	 *  @return    EE_Events_Archive_Config
+	 *  @return    EE_Template_Config
 	 */
 	public static function update_template_settings( $CFG, $REQ ) {
 		$config = new EE_Events_Archive_Config();

Spacing +53 added lines, -53 removed lines

@@ -28,7 +28,7 @@ 
 	 * @return EED_Events_Archive_Caff
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -49,13 +49,13 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks_admin() {
-		define( 'EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
-		define( 'EVENT_ARCHIVE_CAFF_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
-		add_action( 'AHEE__template_settings__template__before_settings_form', array( 'EED_Events_Archive_Caff', 'template_settings_form' ), 10 );
-		add_filter( 'FHEE__General_Settings_Admin_Page__update_template_settings__data', array( 'EED_Events_Archive_Caff', 'update_template_settings' ), 10, 2 );
+		define('EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
+		define('EVENT_ARCHIVE_CAFF_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
+		add_action('AHEE__template_settings__template__before_settings_form', array('EED_Events_Archive_Caff', 'template_settings_form'), 10);
+		add_filter('FHEE__General_Settings_Admin_Page__update_template_settings__data', array('EED_Events_Archive_Caff', 'update_template_settings'), 10, 2);
 		// AJAX
-		add_action( 'wp_ajax_espresso_update_event_archive_order', array( 'EED_Events_Archive_Caff', 'update_event_archive_order' ) );
-		add_action( 'wp_ajax_nopriv_espresso_update_event_archive_order', array( 'EED_Events_Archive_Caff', 'update_event_archive_order' ) );
+		add_action('wp_ajax_espresso_update_event_archive_order', array('EED_Events_Archive_Caff', 'update_event_archive_order'));
+		add_action('wp_ajax_nopriv_espresso_update_event_archive_order', array('EED_Events_Archive_Caff', 'update_event_archive_order'));
 	}
 
 
@@ -68,7 +68,7 @@ 
 	 * @param    WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 	}
 
 
@@ -83,33 +83,33 @@ 
 	 */
 	public static function template_settings_form() {
 		// grab general settings admin page and remove the existing hook callback
-		$gen_set_admin = EE_Registry::instance()->LIB->EE_Admin_Page_Loader->get_admin_page_object( 'general_settings' );
-		if ( $gen_set_admin instanceof General_Settings_Admin_Page ) {
-			remove_action( 'AHEE__template_settings__template__before_settings_form', array( $gen_set_admin, 'template_settings_caff_features' ), 100 );
+		$gen_set_admin = EE_Registry::instance()->LIB->EE_Admin_Page_Loader->get_admin_page_object('general_settings');
+		if ($gen_set_admin instanceof General_Settings_Admin_Page) {
+			remove_action('AHEE__template_settings__template__before_settings_form', array($gen_set_admin, 'template_settings_caff_features'), 100);
 		}
 		// first just grab the template settings
 		$config = EE_Registry::instance()->CFG->template_settings;
 		// then if the Event Archive config is valid, use that, else create a new one
-		$config = isset( $config->EED_Events_Archive ) && $config->EED_Events_Archive instanceof EE_Events_Archive_Config ? $config->EED_Events_Archive : new EE_Events_Archive_Config();
-		$config = apply_filters( 'FHEE__EED_Events_Archive__template_settings_form__event_list_config', $config );
-		$config->display_status_banner = isset( $config->display_status_banner ) ? $config->display_status_banner : 0;
-		$config->display_description = isset( $config->display_description ) ? $config->display_description : 1;
-		$config->display_ticket_selector = isset( $config->display_ticket_selector ) ? $config->display_ticket_selector : 0;
-		$config->display_datetimes = isset( $config->display_datetimes ) ? $config->display_datetimes : 1;
-		$config->display_venue = isset( $config->display_venue ) ? $config->display_venue : 0;
-		$config->display_expired_events = isset( $config->display_expired_events ) ? $config->display_expired_events : 0;
+		$config = isset($config->EED_Events_Archive) && $config->EED_Events_Archive instanceof EE_Events_Archive_Config ? $config->EED_Events_Archive : new EE_Events_Archive_Config();
+		$config = apply_filters('FHEE__EED_Events_Archive__template_settings_form__event_list_config', $config);
+		$config->display_status_banner = isset($config->display_status_banner) ? $config->display_status_banner : 0;
+		$config->display_description = isset($config->display_description) ? $config->display_description : 1;
+		$config->display_ticket_selector = isset($config->display_ticket_selector) ? $config->display_ticket_selector : 0;
+		$config->display_datetimes = isset($config->display_datetimes) ? $config->display_datetimes : 1;
+		$config->display_venue = isset($config->display_venue) ? $config->display_venue : 0;
+		$config->display_expired_events = isset($config->display_expired_events) ? $config->display_expired_events : 0;
 		// display order options
-		$config->use_sortable_display_order = isset( $config->use_sortable_display_order  )? $config->use_sortable_display_order : false;
-		$config->display_order_tickets = isset( $config->display_order_tickets  )? $config->display_order_tickets : 100;
-		$config->display_order_datetimes = isset( $config->display_order_datetimes  )? $config->display_order_datetimes : 110;
-		$config->display_order_event = isset( $config->display_order_event  )? $config->display_order_event : 120;
-		$config->display_order_venue = isset( $config->display_order_venue  )? $config->display_order_venue : 130;
+		$config->use_sortable_display_order = isset($config->use_sortable_display_order) ? $config->use_sortable_display_order : false;
+		$config->display_order_tickets = isset($config->display_order_tickets) ? $config->display_order_tickets : 100;
+		$config->display_order_datetimes = isset($config->display_order_datetimes) ? $config->display_order_datetimes : 110;
+		$config->display_order_event = isset($config->display_order_event) ? $config->display_order_event : 120;
+		$config->display_order_venue = isset($config->display_order_venue) ? $config->display_order_venue : 130;
 		// get template parts
-		$template_parts = EED_Events_Archive::instance()->initialize_template_parts( $config );
+		$template_parts = EED_Events_Archive::instance()->initialize_template_parts($config);
 		// convert to array so that we can add more properties
-		$config = get_object_vars( $config );
-		$config[ 'event_archive_display_order' ] = $template_parts->generate_sortable_list_of_template_parts( 'event-archive-sortable-js', '', 'archive-sortable-li archive-sortable-js' );
-		EEH_Template::display_template( EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH . 'admin-event-list-settings.template.php', $config );
+		$config = get_object_vars($config);
+		$config['event_archive_display_order'] = $template_parts->generate_sortable_list_of_template_parts('event-archive-sortable-js', '', 'archive-sortable-li archive-sortable-js');
+		EEH_Template::display_template(EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH.'admin-event-list-settings.template.php', $config);
 	}
 
 
@@ -125,24 +125,24 @@ 
 	 *  @param 	array $REQ
 	 *  @return    EE_Events_Archive_Config
 	 */
-	public static function update_template_settings( $CFG, $REQ ) {
+	public static function update_template_settings($CFG, $REQ) {
 		$config = new EE_Events_Archive_Config();
 		// unless we are resetting the config...
-		if ( ! isset( $REQ['EED_Events_Archive_reset_event_list_settings'] ) || absint( $REQ['EED_Events_Archive_reset_event_list_settings'] ) !== 1 ) {
-			$config->display_status_banner = isset( $REQ['EED_Events_Archive_display_status_banner'] ) ? absint( $REQ['EED_Events_Archive_display_status_banner'] ) : 0;
-			$config->display_description = isset( $REQ['EED_Events_Archive_display_description'] ) ? absint( $REQ['EED_Events_Archive_display_description'] ) : 1;
-			$config->display_ticket_selector = isset( $REQ['EED_Events_Archive_display_ticket_selector'] ) ? absint( $REQ['EED_Events_Archive_display_ticket_selector'] ) : 0;
-			$config->display_datetimes = isset( $REQ['EED_Events_Archive_display_datetimes'] ) ? absint( $REQ['EED_Events_Archive_display_datetimes'] ) : 1;
-			$config->display_venue = isset( $REQ['EED_Events_Archive_display_venue'] ) ? absint( $REQ['EED_Events_Archive_display_venue'] ) : 0;
-			$config->display_expired_events = isset( $REQ['EED_Events_Archive_display_expired_events'] ) ? absint( $REQ['EED_Events_Archive_display_expired_events'] ) : 0;
-			$config->use_sortable_display_order = isset( $REQ['EED_Events_Archive_use_sortable_display_order'] ) ? absint( $REQ['EED_Events_Archive_use_sortable_display_order'] ) : 0;
-			$config->display_order_tickets = isset( $CFG->EED_Events_Archive->display_order_tickets ) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_tickets : 100;
-			$config->display_order_datetimes = isset( $CFG->EED_Events_Archive->display_order_datetimes ) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_datetimes : 110;
-			$config->display_order_event = isset( $CFG->EED_Events_Archive->display_order_event ) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_event : 120;
-			$config->display_order_venue = isset( $CFG->EED_Events_Archive->display_order_venue ) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_venue : 130;
+		if ( ! isset($REQ['EED_Events_Archive_reset_event_list_settings']) || absint($REQ['EED_Events_Archive_reset_event_list_settings']) !== 1) {
+			$config->display_status_banner = isset($REQ['EED_Events_Archive_display_status_banner']) ? absint($REQ['EED_Events_Archive_display_status_banner']) : 0;
+			$config->display_description = isset($REQ['EED_Events_Archive_display_description']) ? absint($REQ['EED_Events_Archive_display_description']) : 1;
+			$config->display_ticket_selector = isset($REQ['EED_Events_Archive_display_ticket_selector']) ? absint($REQ['EED_Events_Archive_display_ticket_selector']) : 0;
+			$config->display_datetimes = isset($REQ['EED_Events_Archive_display_datetimes']) ? absint($REQ['EED_Events_Archive_display_datetimes']) : 1;
+			$config->display_venue = isset($REQ['EED_Events_Archive_display_venue']) ? absint($REQ['EED_Events_Archive_display_venue']) : 0;
+			$config->display_expired_events = isset($REQ['EED_Events_Archive_display_expired_events']) ? absint($REQ['EED_Events_Archive_display_expired_events']) : 0;
+			$config->use_sortable_display_order = isset($REQ['EED_Events_Archive_use_sortable_display_order']) ? absint($REQ['EED_Events_Archive_use_sortable_display_order']) : 0;
+			$config->display_order_tickets = isset($CFG->EED_Events_Archive->display_order_tickets) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_tickets : 100;
+			$config->display_order_datetimes = isset($CFG->EED_Events_Archive->display_order_datetimes) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_datetimes : 110;
+			$config->display_order_event = isset($CFG->EED_Events_Archive->display_order_event) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_event : 120;
+			$config->display_order_venue = isset($CFG->EED_Events_Archive->display_order_venue) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_venue : 130;
 		}
 		$CFG->EED_Events_Archive = $config;
-		do_action( 'AHEE__EED_Events_Archive__update_template_settings__after_update', $CFG, $REQ );
+		do_action('AHEE__EED_Events_Archive__update_template_settings__after_update', $CFG, $REQ);
 		return $CFG;
 	}
 
@@ -156,12 +156,12 @@ 
 	 */
 	public static function update_event_archive_order() {
 		$config_saved = false;
-		$template_parts = sanitize_text_field( $_POST[ 'elements' ] );
-		if ( ! empty( $template_parts ) ) {
-			$template_parts = explode( ',', trim( $template_parts, ',' ) );
-			foreach ( $template_parts as $key => $template_part ) {
+		$template_parts = sanitize_text_field($_POST['elements']);
+		if ( ! empty($template_parts)) {
+			$template_parts = explode(',', trim($template_parts, ','));
+			foreach ($template_parts as $key => $template_part) {
 				$template_part = "display_order_$template_part";
-				$priority = ( $key * 10 ) + 100;
+				$priority = ($key * 10) + 100;
 				if (
 					property_exists(
 						EE_Registry::instance()->CFG->template_settings->EED_Events_Archive,
@@ -170,16 +170,16 @@ 
 				) {
 					EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->$template_part = $priority;
 				}
-				do_action( "AHEE__EED_Events_Archive__update_event_archive_order__$template_part", $priority );
+				do_action("AHEE__EED_Events_Archive__update_event_archive_order__$template_part", $priority);
 			}
-			$config_saved = EE_Registry::instance()->CFG->update_espresso_config( false, false );
+			$config_saved = EE_Registry::instance()->CFG->update_espresso_config(false, false);
 		}
-		if ( $config_saved ) {
-			EE_Error::add_success( __( 'Display Order has been successfully updated.', 'event_espresso' ) );
+		if ($config_saved) {
+			EE_Error::add_success(__('Display Order has been successfully updated.', 'event_espresso'));
 		} else {
-			EE_Error::add_error( __( 'Display Order was not updated.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('Display Order was not updated.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
-		echo wp_json_encode( EE_Error::get_notices( false ) );
+		echo wp_json_encode(EE_Error::get_notices(false));
 		exit();
 	}