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/defaults/default/html_receipt_attendee_list.template.php

Spacing +2 added lines, -2 removed lines

@@ -6,11 +6,11 @@
 <li class="ticket-registration">
 	<table class="registration-details">
 		<tr class="odd">
-			<th><?php	_e('Attendee', 'event_espresso');?></th>
+			<th><?php	_e('Attendee', 'event_espresso'); ?></th>
 			<td>[FNAME] [LNAME] ([ATTENDEE_EMAIL])</td>
 		</tr>
 		<tr>
-			<th><?php _e("Registration Code:", "event_espresso");?></th>
+			<th><?php _e("Registration Code:", "event_espresso"); ?></th>
 			<td>[REGISTRATION_CODE] - <span class="[REGISTRATION_STATUS_ID]">[REGISTRATION_STATUS_LABEL]</span></td>
 		</tr>
 		<tr>

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

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

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

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');

Indentation +20 added lines, -20 removed lines

@@ -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]') );
+	}
 }

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

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * EE_Payment_Cancelled_message_type extends EE_message_type

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**

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

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * EE_Payment_Failed_message_type extends EE_message_type

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**