eventespresso / event-espresso-core

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

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,11 +30,11 @@ 
 class EE_Messages_Email_Cancelled_Registration_Validator extends EE_Messages_Validator {
 
 
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		$this->_m_name = 'email';
 		$this->_mt_name = 'cancelled_registration';
 
-		parent::__construct( $fields, $context );
+		parent::__construct($fields, $context);
 	}
 
 	/**
@@ -46,9 +46,9 @@ 
 			'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 );
+		$this->_messenger->set_validator_config($new_config);
 
-		if ( $this->_context != 'admin' )
+		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]');

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

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,11 +30,11 @@ 
 class EE_Messages_Email_Payment_Reminder_Validator extends EE_Messages_Validator {
 
 
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		$this->_m_name = 'email';
 		$this->_mt_name = 'payment_reminder';
 
-		parent::__construct( $fields, $context );
+		parent::__construct($fields, $context);
 	}
 
 	/**
@@ -45,17 +45,17 @@ 
 
 		//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 );
+		$this->_messenger->set_validator_config($new_config);
 
-		if ( $this->_context != 'admin' )
+		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]');

caffeinated/core/libraries/messages/message_type/payment_declined/EE_Messages_Email_Payment_Declined_Validator.class.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,11 +30,11 @@ 
 class EE_Messages_Email_Payment_Reminder_Validator extends EE_Messages_Validator {
 
 
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		$this->_m_name = 'email';
 		$this->_mt_name = 'payment_reminder';
 
-		parent::__construct( $fields, $context );
+		parent::__construct($fields, $context);
 	}
 
 	/**
@@ -45,17 +45,17 @@ 
 
 		//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 );
+		$this->_messenger->set_validator_config($new_config);
 
-		if ( $this->_context != 'admin' )
+		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]');

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

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,11 +30,11 @@ 
 class EE_Messages_Email_Payment_Reminder_Validator extends EE_Messages_Validator {
 
 
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		$this->_m_name = 'email';
 		$this->_mt_name = 'payment_reminder';
 
-		parent::__construct( $fields, $context );
+		parent::__construct($fields, $context);
 	}
 
 	/**
@@ -45,17 +45,17 @@ 
 
 		//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 );
+		$this->_messenger->set_validator_config($new_config);
 
-		if ( $this->_context != 'admin' )
+		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]');

admin_pages/events/Events_Admin_List_Table.class.php

Spacing +79 added lines, -79 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -43,9 +43,9 @@ 
 	 *
 	 * @param EE_Admin_Page $admin_page
 	 */
-	public function __construct( $admin_page ) {
+	public function __construct($admin_page) {
 		parent::__construct($admin_page);
-		require_once( EE_HELPERS . 'EEH_DTT_Helper.helper.php' );
+		require_once(EE_HELPERS.'EEH_DTT_Helper.helper.php');
 	}
 
 
@@ -54,7 +54,7 @@ 
 	 */
 	protected function _setup_data() {
 		$this->_data = $this->_admin_page->get_events($this->_per_page, $this->_current_page);
- 		$this->_all_data_count = $this->_admin_page->get_events(0,0, TRUE);
+ 		$this->_all_data_count = $this->_admin_page->get_events(0, 0, TRUE);
 	}
 
 
@@ -85,17 +85,17 @@ 
 
 
 		$this->_sortable_columns = array(
-			'id' => array( 'EVT_ID' => true ),
-			'name' => array( 'EVT_name' => false ),
-			'author' => array( 'EVT_wp_user' => false ),
-			'venue' => array( 'Venue.VNU_name' => false ),
+			'id' => array('EVT_ID' => true),
+			'name' => array('EVT_name' => false),
+			'author' => array('EVT_wp_user' => false),
+			'venue' => array('Venue.VNU_name' => false),
 			'start_date_time' => array('Datetime.DTT_EVT_start' => false),
 			'reg_begins' => array('Datetime.Ticket.TKT_start_date' => false),
 			);
 
 		$this->_primary_column = 'id';
 
-		$this->_hidden_columns = array( 'author' );
+		$this->_hidden_columns = array('author');
 	}
 
 
@@ -113,7 +113,7 @@ 
 	protected function _add_view_counts() {
 		$this->_views['all']['count'] = $this->_admin_page->total_events();
 		$this->_views['draft']['count'] = $this->_admin_page->total_events_draft();
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_events', 'espresso_events_trash_events' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_events', 'espresso_events_trash_events')) {
 			$this->_views['trash']['count'] = $this->_admin_page->total_trashed_events();
 		}
 	}
@@ -124,11 +124,11 @@ 
 	 *
 	 * @return string
 	 */
-	protected function _get_row_class( $item ) {
-		$class = parent::_get_row_class( $item );
+	protected function _get_row_class($item) {
+		$class = parent::_get_row_class($item);
 		//add status class
-		$class .= $item instanceof EE_Event ? ' ee-status-strip event-status-' . $item->get_active_status() : '';
-		if ( $this->_has_checkbox_column ) {
+		$class .= $item instanceof EE_Event ? ' ee-status-strip event-status-'.$item->get_active_status() : '';
+		if ($this->_has_checkbox_column) {
 			$class .= ' has-checkbox-column';
 		}
 		return $class;
@@ -140,8 +140,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function column_status( EE_Event $item ) {
-		return '<span class="ee-status-strip ee-status-strip-td event-status-' . $item->get_active_status() . '"></span>';
+	public function column_status(EE_Event $item) {
+		return '<span class="ee-status-strip ee-status-strip-td event-status-'.$item->get_active_status().'"></span>';
 	}/**/
 
 
@@ -150,14 +150,14 @@ 
 	 *
 	 * @return string
 	 */
-	public function column_cb( $item ) {
-		if ( ! $item instanceof EE_Event ) {
+	public function column_cb($item) {
+		if ( ! $item instanceof EE_Event) {
 			return '';
 		}
 		$this->_dtt = $item->primary_datetime(); //set this for use in other columns
 
 		//does event have any attached registrations?
-		$regs = $item->count_related( 'Registration' );
+		$regs = $item->count_related('Registration');
 		return $regs > 0 && $this->_view == 'trash' ? '<span class="ee-lock-icon"></span>' : sprintf(
 			'<input type="checkbox" name="EVT_IDs[]" value="%s" />', $item->ID()
 		);
@@ -169,9 +169,9 @@ 
 	 *
 	 * @return mixed|string
 	 */
-	public function column_id( EE_Event $item ) {
+	public function column_id(EE_Event $item) {
 		$content = $item->ID();
-		$content .= '  <span class="show-on-mobile-view-only">' . $item->name() . '</span>';
+		$content .= '  <span class="show-on-mobile-view-only">'.$item->name().'</span>';
 		return $content;
 	}
 
@@ -181,16 +181,16 @@ 
 	 *
 	 * @return string
 	 */
-	public function column_name( EE_Event $item ) {
+	public function column_name(EE_Event $item) {
 		$edit_query_args = array(
 				'action' => 'edit',
 				'post' => $item->ID()
 			);
-		$edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EVENTS_ADMIN_URL );
-		$actions = $this->_column_name_action_setup( $item );
+		$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
+		$actions = $this->_column_name_action_setup($item);
 		$status = ''; //$item->status() !== 'publish' ? ' (' . $item->status() . ')' : '';
-		$content = '<strong><a class="row-title" href="' . $edit_link . '">' . $item->name() . '</a></strong>' . $status;
-		$content .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status( $item->get_active_status(), false, 'sentence' ) . '</span>';
+		$content = '<strong><a class="row-title" href="'.$edit_link.'">'.$item->name().'</a></strong>'.$status;
+		$content .= '<br><span class="ee-status-text-small">'.EEH_Template::pretty_status($item->get_active_status(), false, 'sentence').'</span>';
 		$content .= $this->row_actions($actions);
 		return $content;
 
@@ -207,72 +207,72 @@ 
 	 *
 	 * @return array array of actions
 	 */
-	protected function _column_name_action_setup( EE_Event $item ) {
+	protected function _column_name_action_setup(EE_Event $item) {
 		//todo: remove when attendees is active
-		if ( !defined('REG_ADMIN_URL') )
+		if ( ! defined('REG_ADMIN_URL'))
 			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
 
 		$actions = array();
 
-		if ( EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $item->ID())) {
 			$edit_query_args = array(
 					'action' => 'edit',
 					'post' => $item->ID()
 				);
-			$edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EVENTS_ADMIN_URL );
-			$actions['edit'] = '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Event', 'event_espresso') . '">' . __('Edit', 'event_espresso') . '</a>';
+			$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
+			$actions['edit'] = '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Event', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>';
 
 		}
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID())) {
 			$attendees_query_args = array(
 					'action' => 'default',
 					'event_id' => $item->ID()
 				);
-			$attendees_link = EE_Admin_Page::add_query_args_and_nonce( $attendees_query_args, REG_ADMIN_URL );
-			$actions['attendees'] = '<a href="' . $attendees_link . '" title="' . esc_attr__('View Registrations', 'event_espresso') . '">' . __('Registrations', 'event_espresso') . '</a>';
+			$attendees_link = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL);
+			$actions['attendees'] = '<a href="'.$attendees_link.'" title="'.esc_attr__('View Registrations', 'event_espresso').'">'.__('Registrations', 'event_espresso').'</a>';
 		}
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_trash_event', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_trash_event', $item->ID())) {
 			$trash_event_query_args = array(
 					'action' => 'trash_event',
 					'EVT_ID' => $item->ID()
 				);
-			$trash_event_link = EE_Admin_Page::add_query_args_and_nonce( $trash_event_query_args, EVENTS_ADMIN_URL );
+			$trash_event_link = EE_Admin_Page::add_query_args_and_nonce($trash_event_query_args, EVENTS_ADMIN_URL);
 		}
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_restore_event', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_restore_event', $item->ID())) {
 			$restore_event_query_args = array(
 					'action' => 'restore_event',
 					'EVT_ID' => $item->ID()
 				);
-			$restore_event_link = EE_Admin_Page::add_query_args_and_nonce( $restore_event_query_args, EVENTS_ADMIN_URL );
+			$restore_event_link = EE_Admin_Page::add_query_args_and_nonce($restore_event_query_args, EVENTS_ADMIN_URL);
 		}
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_delete_event', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_delete_event', $item->ID())) {
 			$delete_event_query_args = array(
 					'action' => 'delete_event',
 					'EVT_ID' => $item->ID()
 				);
-			$delete_event_link = EE_Admin_Page::add_query_args_and_nonce( $delete_event_query_args, EVENTS_ADMIN_URL );
+			$delete_event_link = EE_Admin_Page::add_query_args_and_nonce($delete_event_query_args, EVENTS_ADMIN_URL);
 		}
 
 		$view_link = get_permalink($item->ID());
 
-		$actions['view'] = '<a href="' . $view_link . '" title="' . esc_attr__('View Event', 'event_espresso') . '">' . __('View', 'event_espresso') . '</a>';
+		$actions['view'] = '<a href="'.$view_link.'" title="'.esc_attr__('View Event', 'event_espresso').'">'.__('View', 'event_espresso').'</a>';
 
-		switch ( $item->get( 'status' ) ) {
+		switch ($item->get('status')) {
 			case 'trash' :
-					if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_restore_event', $item->ID() ) ) {
-						$actions['restore_from_trash'] = '<a href="' . $restore_event_link . '" title="' . esc_attr__('Restore from Trash', 'event_espresso') . '">' . __('Restore from Trash', 'event_espresso') . '</a>';
+					if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_restore_event', $item->ID())) {
+						$actions['restore_from_trash'] = '<a href="'.$restore_event_link.'" title="'.esc_attr__('Restore from Trash', 'event_espresso').'">'.__('Restore from Trash', 'event_espresso').'</a>';
 					}
-					if ( $item->count_related('Registration') === 0 && EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_delete_event', $item->ID() ) ) {
-						$actions['delete'] = '<a href="' . $delete_event_link . '" title="' . esc_attr__('Delete Permanently', 'event_espresso') . '">' . __('Delete Permanently', 'event_espresso') . '</a>';
+					if ($item->count_related('Registration') === 0 && EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_delete_event', $item->ID())) {
+						$actions['delete'] = '<a href="'.$delete_event_link.'" title="'.esc_attr__('Delete Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>';
 					}
 				break;
 			default :
-					if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_trash_event', $item->ID() ) ) {
-						$actions['move to trash'] = '<a href="' . $trash_event_link . '" title="' . esc_attr__('Trash Event', 'event_espresso') . '">' . __('Trash', 'event_espresso') . '</a>';
+					if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_trash_event', $item->ID())) {
+						$actions['move to trash'] = '<a href="'.$trash_event_link.'" title="'.esc_attr__('Trash Event', 'event_espresso').'">'.__('Trash', 'event_espresso').'</a>';
 					}
 		}
 		return $actions;
@@ -284,17 +284,17 @@ 
 	 *
 	 * @return string
 	 */
-	public function column_author( EE_Event $item ) {
+	public function column_author(EE_Event $item) {
 		//user author info
-		$event_author = get_userdata( $item->wp_user() );
-		$gravatar = get_avatar( $item->wp_user(), '15' );
+		$event_author = get_userdata($item->wp_user());
+		$gravatar = get_avatar($item->wp_user(), '15');
 		//filter link
 		$query_args = array(
 			'action' => 'default',
 			'EVT_wp_user' => $item->wp_user()
 			);
-		$filter_url = EE_Admin_Page::add_query_args_and_nonce( $query_args, EVENTS_ADMIN_URL );
-		return $gravatar . '  <a href="' . $filter_url . '" title="' . esc_attr__('Click to filter events by this author.', 'event_espresso') . '">' . $event_author->display_name . '</a>';
+		$filter_url = EE_Admin_Page::add_query_args_and_nonce($query_args, EVENTS_ADMIN_URL);
+		return $gravatar.'  <a href="'.$filter_url.'" title="'.esc_attr__('Click to filter events by this author.', 'event_espresso').'">'.$event_author->display_name.'</a>';
 	}
 
 
@@ -303,9 +303,9 @@ 
 	 *
 	 * @return string
 	 */
-	public function column_venue( EE_Event $item ) {
-		$venue = $item->get_first_related( 'Venue' );
-		return !empty( $venue ) ? $venue->name() : '';
+	public function column_venue(EE_Event $item) {
+		$venue = $item->get_first_related('Venue');
+		return ! empty($venue) ? $venue->name() : '';
 	}
 
 
@@ -314,10 +314,10 @@ 
 	 *
 	 * @throws EE_Error
 	 */
-	public function column_start_date_time( EE_Event $item ) {
-		echo !empty( $this->_dtt ) ?  $this->_dtt->get_i18n_datetime('DTT_EVT_start') : __('No Date was saved for this Event', 'event_espresso');
+	public function column_start_date_time(EE_Event $item) {
+		echo ! empty($this->_dtt) ? $this->_dtt->get_i18n_datetime('DTT_EVT_start') : __('No Date was saved for this Event', 'event_espresso');
 		//display in user's timezone?
-		echo !empty( $this->_dtt ) ? $this->_dtt->display_in_my_timezone('DTT_EVT_start', 'get_i18n_datetime', '', 'My Timezone: ' ) : '';
+		echo ! empty($this->_dtt) ? $this->_dtt->display_in_my_timezone('DTT_EVT_start', 'get_i18n_datetime', '', 'My Timezone: ') : '';
 
 	}
 
@@ -327,11 +327,11 @@ 
 	 *
 	 * @throws EE_Error
 	 */
-	public function column_reg_begins( EE_Event $item ) {
+	public function column_reg_begins(EE_Event $item) {
 		$reg_start = $item->get_ticket_with_earliest_start_time();
-		echo !empty( $reg_start ) ? $reg_start->get_i18n_datetime('TKT_start_date') : __('No Tickets have been setup for this Event', 'event_espresso');
+		echo ! empty($reg_start) ? $reg_start->get_i18n_datetime('TKT_start_date') : __('No Tickets have been setup for this Event', 'event_espresso');
 		//display in user's timezone?
-		echo !empty( $reg_start ) ? $reg_start->display_in_my_timezone('TKT_start_date', 'get_i18n_datetime', '', 'My Timezone: ' ) : '';/**/
+		echo ! empty($reg_start) ? $reg_start->display_in_my_timezone('TKT_start_date', 'get_i18n_datetime', '', 'My Timezone: ') : ''; /**/
 	}
 
 
@@ -340,14 +340,14 @@ 
 	 *
 	 * @return int|string
 	 */
-	public function column_attendees( EE_Event $item ) {
+	public function column_attendees(EE_Event $item) {
 		$attendees_query_args = array(
 				'action' => 'default',
 				'event_id' => $item->ID()
 			);
-		$attendees_link = EE_Admin_Page::add_query_args_and_nonce( $attendees_query_args, REG_ADMIN_URL );
-		$registered_attendees = EEM_Registration::instance()->get_event_registration_count( $item->ID() );
-		return  EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $item->ID() ) ? '<a href="' . $attendees_link . '">' . $registered_attendees . '</a>' : $registered_attendees;
+		$attendees_link = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL);
+		$registered_attendees = EEM_Registration::instance()->get_event_registration_count($item->ID());
+		return  EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID()) ? '<a href="'.$attendees_link.'">'.$registered_attendees.'</a>' : $registered_attendees;
 	}
 
 
@@ -356,8 +356,8 @@ 
 	 *
 	 * @return float
 	 */
-	public function column_tkts_sold( EE_Event $item ) {
-		return EEM_Ticket::instance()->sum(array( array('Datetime.EVT_ID' => $item->ID() )), 'TKT_sold' );
+	public function column_tkts_sold(EE_Event $item) {
+		return EEM_Ticket::instance()->sum(array(array('Datetime.EVT_ID' => $item->ID())), 'TKT_sold');
 	}
 
 
@@ -366,38 +366,38 @@ 
 	 *
 	 * @return string
 	 */
-	public function column_actions( EE_Event $item ) {
+	public function column_actions(EE_Event $item) {
 		//todo: remove when attendees is active
-		if ( !defined('REG_ADMIN_URL') )
+		if ( ! defined('REG_ADMIN_URL'))
 			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
 		$actionlinks = array();
 
 		$view_link = get_permalink($item->ID());
 
-		$actionlinks[] = '<a href="' .  $view_link . '" title="' . esc_attr__('View Event', 'event_espresso') . '" target="_blank">';
+		$actionlinks[] = '<a href="'.$view_link.'" title="'.esc_attr__('View Event', 'event_espresso').'" target="_blank">';
 		$actionlinks[] = '<div class="dashicons dashicons-search"></div></a>';
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'espresso_events_edit', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $item->ID())) {
 			$edit_query_args = array(
 					'action' => 'edit',
 					'post' => $item->ID()
 				);
-			$edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EVENTS_ADMIN_URL );
-			$actionlinks[] = '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Event', 'event_espresso') . '"><div class="ee-icon ee-icon-calendar-edit"></div></a>';
+			$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
+			$actionlinks[] = '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Event', 'event_espresso').'"><div class="ee-icon ee-icon-calendar-edit"></div></a>';
 		}
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID())) {
 			$attendees_query_args = array(
 				'action' => 'default',
 				'event_id' => $item->ID()
 			);
-			$attendees_link = EE_Admin_Page::add_query_args_and_nonce( $attendees_query_args, REG_ADMIN_URL );
-			$actionlinks[] = '<a href="' . $attendees_link . '" title="' . esc_attr__('View Registrants', 'event_espresso') . '"><div class="dashicons dashicons-groups"></div></a>';
+			$attendees_link = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL);
+			$actionlinks[] = '<a href="'.$attendees_link.'" title="'.esc_attr__('View Registrants', 'event_espresso').'"><div class="dashicons dashicons-groups"></div></a>';
 		}
 
-		$actionlinks = apply_filters( 'FHEE__Events_Admin_List_Table__column_actions__action_links', $actionlinks, $item );
+		$actionlinks = apply_filters('FHEE__Events_Admin_List_Table__column_actions__action_links', $actionlinks, $item);
 
-		return $this->_action_string( implode( "\n\t", $actionlinks ), $item, 'div' );
+		return $this->_action_string(implode("\n\t", $actionlinks), $item, 'div');
 	}
 
 

admin_pages/messages/Messages_Admin_Page_Init.core.php

Spacing +13 added lines, -13 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION') )
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 /**
  * Event Espresso
@@ -24,7 +24,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class Messages_Admin_Page_Init extends EE_Admin_Page_Init  {
+class Messages_Admin_Page_Init extends EE_Admin_Page_Init {
 	/**
 	 *constructor
 	 *@Constructor
@@ -33,18 +33,18 @@ 
 	 */
 	public function __construct() {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		if ( ! defined( 'EE_MSG_PG_SLUG' ) ) {
+		if ( ! defined('EE_MSG_PG_SLUG')) {
 
-			define( 'EE_MSG_PG_SLUG', 'espresso_messages' );
-			define( 'EE_MSG_PG_NAME', ucwords( str_replace( '_', '', EE_MSG_PG_SLUG ) ) );
-			define( 'EE_MSG_ADMIN', EE_ADMIN_PAGES . 'messages' . DS );
-			define( 'EE_MSG_ADMIN_URL', admin_url( 'admin.php?page=' . EE_MSG_PG_SLUG ) );
-			define( 'EE_MSG_ASSETS_PATH', EE_MSG_ADMIN . 'assets' . DS );
-			define( 'EE_MSG_ASSETS_URL', EE_ADMIN_PAGES_URL . 'messages/assets/' );
-			define( 'EE_MSG_TEMPLATE_PATH', EE_MSG_ADMIN . 'templates' . DS );
-			define( 'EE_MSG_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'messages/templates/' );
+			define('EE_MSG_PG_SLUG', 'espresso_messages');
+			define('EE_MSG_PG_NAME', ucwords(str_replace('_', '', EE_MSG_PG_SLUG)));
+			define('EE_MSG_ADMIN', EE_ADMIN_PAGES.'messages'.DS);
+			define('EE_MSG_ADMIN_URL', admin_url('admin.php?page='.EE_MSG_PG_SLUG));
+			define('EE_MSG_ASSETS_PATH', EE_MSG_ADMIN.'assets'.DS);
+			define('EE_MSG_ASSETS_URL', EE_ADMIN_PAGES_URL.'messages/assets/');
+			define('EE_MSG_TEMPLATE_PATH', EE_MSG_ADMIN.'templates'.DS);
+			define('EE_MSG_TEMPLATE_URL', EE_ADMIN_PAGES_URL.'messages/templates/');
 		}
 
 		parent::__construct();
@@ -60,7 +60,7 @@ 
 
 
 	protected function _set_menu_map() {
-		$this->_menu_map = new EE_Admin_Page_Sub_Menu( array(
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(array(
 			'menu_group' => 'management',
 			'menu_order' => 10,
 			'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,

caffeinated/core/libraries/shortcodes/EE_Question_List_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');
 
 /**
@@ -47,10 +47,10 @@ 
 	}
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[QUESTION_LIST]' :
 				return $this->_get_question_list();
 				break;
@@ -64,12 +64,12 @@ 
 		$this->_validate_list_requirements();
 
 		//for when [QUESTION_LIST] is used in the [attendee_list] field.
-		if ( $this->_data['data'] instanceof EE_Registration ) {
+		if ($this->_data['data'] instanceof EE_Registration) {
 			return $this->_get_question_answer_list_for_attendee();
 		}
 		//for when [QUESTION_LIST] is used in the main content field.
-		else if ( $this->_data['data'] instanceof EE_Messages_Addressee && $this->_data['data']->reg_obj instanceof EE_Registration ) {
-			return $this->_get_question_answer_list_for_attendee( $this->_data['data']->reg_obj );
+		else if ($this->_data['data'] instanceof EE_Messages_Addressee && $this->_data['data']->reg_obj instanceof EE_Registration) {
+			return $this->_get_question_answer_list_for_attendee($this->_data['data']->reg_obj);
 		} else {
 			return '';
 		}
@@ -81,19 +81,19 @@ 
 	 * Note when we parse the "[question_list]" shortcode for attendees we're actually going to retrieve the list of answers for that attendee since that is what we really need (we can derive the questions from the answers);
 	 * @return string parsed template.
 	 */
-	private function _get_question_answer_list_for_attendee( $reg_obj = null ) {
+	private function _get_question_answer_list_for_attendee($reg_obj = null) {
 		$valid_shortcodes = array('question');
 		$reg_obj = $reg_obj instanceof EE_Registration ? $reg_obj : $this->_data['data'];
-		$template = is_array( $this->_data['template'] ) && isset( $this->_data['template']['question_list'] ) ? $this->_data['template']['question_list'] : '';
-		$template = empty( $template ) && isset( $this->_extra_data['template']['question_list'] ) ? $this->_extra_data['template']['question_list'] : $template;
+		$template = is_array($this->_data['template']) && isset($this->_data['template']['question_list']) ? $this->_data['template']['question_list'] : '';
+		$template = empty($template) && isset($this->_extra_data['template']['question_list']) ? $this->_extra_data['template']['question_list'] : $template;
 		$ans_result = '';
 		$answers = ! empty($this->_extra_data['data']->registrations[$reg_obj->ID()]['ans_objs']) ? $this->_extra_data['data']->registrations[$reg_obj->ID()]['ans_objs'] : array();
-		foreach ( $answers as $answer ) {
+		foreach ($answers as $answer) {
 			$question = $answer->question();
-			if ( $question instanceof EE_Question and $question->admin_only() ) {
+			if ($question instanceof EE_Question and $question->admin_only()) {
 						continue;
 					}
-			$ans_result .= $this->_shortcode_helper->parse_question_list_template( $template, $answer, $valid_shortcodes, $this->_extra_data);
+			$ans_result .= $this->_shortcode_helper->parse_question_list_template($template, $answer, $valid_shortcodes, $this->_extra_data);
 		}
 
 		return $ans_result;

core/db_classes/EE_Attendee.class.php

Spacing +101 added lines, -101 removed lines

@@ -1,5 +1,5 @@ 
-<?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
@@ -33,20 +33,20 @@ 
 	 * @param string $timezone
 	 * @param array $date_formats
 	 */
-	protected function __construct( $fieldValues = NULL, $bydb = FALSE, $timezone = NULL, $date_formats = array() ) {
-		if ( !isset( $fieldValues[ 'ATT_full_name' ] ) ) {
-			$fname = isset( $fieldValues[ 'ATT_fname' ] ) ? $fieldValues[ 'ATT_fname' ] . ' ' : '';
-			$lname = isset( $fieldValues[ 'ATT_lname' ] ) ? $fieldValues[ 'ATT_lname' ] : '';
-			$fieldValues[ 'ATT_full_name' ] = $fname . $lname;
+	protected function __construct($fieldValues = NULL, $bydb = FALSE, $timezone = NULL, $date_formats = array()) {
+		if ( ! isset($fieldValues['ATT_full_name'])) {
+			$fname = isset($fieldValues['ATT_fname']) ? $fieldValues['ATT_fname'].' ' : '';
+			$lname = isset($fieldValues['ATT_lname']) ? $fieldValues['ATT_lname'] : '';
+			$fieldValues['ATT_full_name'] = $fname.$lname;
 		}
-		if ( !isset( $fieldValues[ 'ATT_slug' ] ) ) {
+		if ( ! isset($fieldValues['ATT_slug'])) {
 			//			$fieldValues['ATT_slug'] = sanitize_key(wp_generate_password(20));
-			$fieldValues[ 'ATT_slug' ] = sanitize_title( $fieldValues[ 'ATT_full_name' ] );
+			$fieldValues['ATT_slug'] = sanitize_title($fieldValues['ATT_full_name']);
 		}
-		if ( !isset( $fieldValues[ 'ATT_short_bio' ] ) && isset( $fieldValues[ 'ATT_bio' ] ) ) {
-			$fieldValues[ 'ATT_short_bio' ] = substr( $fieldValues[ 'ATT_bio' ], 0, 50 );
+		if ( ! isset($fieldValues['ATT_short_bio']) && isset($fieldValues['ATT_bio'])) {
+			$fieldValues['ATT_short_bio'] = substr($fieldValues['ATT_bio'], 0, 50);
 		}
-		parent::__construct( $fieldValues, $bydb, $timezone, $date_formats );
+		parent::__construct($fieldValues, $bydb, $timezone, $date_formats);
 	}
 
 
@@ -60,9 +60,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Attendee
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -73,8 +73,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Attendee
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -85,8 +85,8 @@ 
 	 * @access        public
 	 * @param string $fname
 	 */
-	public function set_fname( $fname = '' ) {
-		$this->set( 'ATT_fname', $fname );
+	public function set_fname($fname = '') {
+		$this->set('ATT_fname', $fname);
 	}
 
 
@@ -97,8 +97,8 @@ 
 	 * @access        public
 	 * @param string $lname
 	 */
-	public function set_lname( $lname = '' ) {
-		$this->set( 'ATT_lname', $lname );
+	public function set_lname($lname = '') {
+		$this->set('ATT_lname', $lname);
 	}
 
 
@@ -109,8 +109,8 @@ 
 	 * @access        public
 	 * @param string $address
 	 */
-	public function set_address( $address = '' ) {
-		$this->set( 'ATT_address', $address );
+	public function set_address($address = '') {
+		$this->set('ATT_address', $address);
 	}
 
 
@@ -121,8 +121,8 @@ 
 	 * @access        public
 	 * @param        string $address2
 	 */
-	public function set_address2( $address2 = '' ) {
-		$this->set( 'ATT_address2', $address2 );
+	public function set_address2($address2 = '') {
+		$this->set('ATT_address2', $address2);
 	}
 
 
@@ -133,8 +133,8 @@ 
 	 * @access        public
 	 * @param        string $city
 	 */
-	public function set_city( $city = '' ) {
-		$this->set( 'ATT_city', $city );
+	public function set_city($city = '') {
+		$this->set('ATT_city', $city);
 	}
 
 
@@ -145,8 +145,8 @@ 
 	 * @access        public
 	 * @param        int $STA_ID
 	 */
-	public function set_state( $STA_ID = 0 ) {
-		$this->set( 'STA_ID', $STA_ID );
+	public function set_state($STA_ID = 0) {
+		$this->set('STA_ID', $STA_ID);
 	}
 
 
@@ -157,8 +157,8 @@ 
 	 * @access        public
 	 * @param        string $CNT_ISO
 	 */
-	public function set_country( $CNT_ISO = '' ) {
-		$this->set( 'CNT_ISO', $CNT_ISO );
+	public function set_country($CNT_ISO = '') {
+		$this->set('CNT_ISO', $CNT_ISO);
 	}
 
 
@@ -169,8 +169,8 @@ 
 	 * @access        public
 	 * @param        string $zip
 	 */
-	public function set_zip( $zip = '' ) {
-		$this->set( 'ATT_zip', $zip );
+	public function set_zip($zip = '') {
+		$this->set('ATT_zip', $zip);
 	}
 
 
@@ -181,8 +181,8 @@ 
 	 * @access        public
 	 * @param        string $email
 	 */
-	public function set_email( $email = '' ) {
-		$this->set( 'ATT_email', $email );
+	public function set_email($email = '') {
+		$this->set('ATT_email', $email);
 	}
 
 
@@ -193,8 +193,8 @@ 
 	 * @access        public
 	 * @param        string $phone
 	 */
-	public function set_phone( $phone = '' ) {
-		$this->set( 'ATT_phone', $phone );
+	public function set_phone($phone = '') {
+		$this->set('ATT_phone', $phone);
 	}
 
 
@@ -205,8 +205,8 @@ 
 	 * @access        public
 	 * @param        bool $ATT_deleted
 	 */
-	public function set_deleted( $ATT_deleted = FALSE ) {
-		$this->set( 'ATT_deleted', $ATT_deleted );
+	public function set_deleted($ATT_deleted = FALSE) {
+		$this->set('ATT_deleted', $ATT_deleted);
 	}
 
 
@@ -219,7 +219,7 @@ 
 	 * @return int
 	 */
 	public function wp_user() {
-		return $this->get( 'ATT_author' );
+		return $this->get('ATT_author');
 	}
 
 
@@ -230,7 +230,7 @@ 
 	 * @return string
 	 */
 	public function fname() {
-		return $this->get( 'ATT_fname' );
+		return $this->get('ATT_fname');
 	}
 
 
@@ -250,9 +250,9 @@ 
 	 * @param bool $apply_html_entities
 	 * @return string
 	 */
-	public function full_name( $apply_html_entities = FALSE ) {
-		$full_name = $this->fname() . ' ' . $this->lname();
-		return $apply_html_entities ? htmlentities( $full_name, ENT_QUOTES, 'UTF-8' ) : $full_name;
+	public function full_name($apply_html_entities = FALSE) {
+		$full_name = $this->fname().' '.$this->lname();
+		return $apply_html_entities ? htmlentities($full_name, ENT_QUOTES, 'UTF-8') : $full_name;
 	}
 
 
@@ -263,7 +263,7 @@ 
 	 * @return string
 	 */
 	public function lname() {
-		return $this->get( 'ATT_lname' );
+		return $this->get('ATT_lname');
 	}
 
 
@@ -277,26 +277,26 @@ 
 	 */
 	public function full_address_as_array() {
 		$full_address_array = array();
-		$initial_address_fields = array( 'ATT_address', 'ATT_address2', 'ATT_city', );
-		foreach ( $initial_address_fields as $address_field_name ) {
-			$address_fields_value = $this->get( $address_field_name );
-			if ( !empty( $address_fields_value ) ) {
-				$full_address_array[ ] = $address_fields_value;
+		$initial_address_fields = array('ATT_address', 'ATT_address2', 'ATT_city',);
+		foreach ($initial_address_fields as $address_field_name) {
+			$address_fields_value = $this->get($address_field_name);
+			if ( ! empty($address_fields_value)) {
+				$full_address_array[] = $address_fields_value;
 			}
 		}
 		//now handle state and country
 		$state_obj = $this->state_obj();
-		if ( !empty( $state_obj ) ) {
-			$full_address_array[ ] = $state_obj->name();
+		if ( ! empty($state_obj)) {
+			$full_address_array[] = $state_obj->name();
 		}
 		$country_obj = $this->country_obj();
-		if ( !empty( $country_obj ) ) {
-			$full_address_array[ ] = $country_obj->name();
+		if ( ! empty($country_obj)) {
+			$full_address_array[] = $country_obj->name();
 		}
 		//lastly get the xip
 		$zip_value = $this->zip();
-		if ( !empty( $zip_value ) ) {
-			$full_address_array[ ] = $zip_value;
+		if ( ! empty($zip_value)) {
+			$full_address_array[] = $zip_value;
 		}
 		return $full_address_array;
 	}
@@ -308,7 +308,7 @@ 
 	 * @return string
 	 */
 	public function address() {
-		return $this->get( 'ATT_address' );
+		return $this->get('ATT_address');
 	}
 
 
@@ -318,7 +318,7 @@ 
 	 * @return string
 	 */
 	public function address2() {
-		return $this->get( 'ATT_address2' );
+		return $this->get('ATT_address2');
 	}
 
 
@@ -328,7 +328,7 @@ 
 	 * @return string
 	 */
 	public function city() {
-		return $this->get( 'ATT_city' );
+		return $this->get('ATT_city');
 	}
 
 
@@ -338,7 +338,7 @@ 
 	 * @return string
 	 */
 	public function state_ID() {
-		return $this->get( 'STA_ID' );
+		return $this->get('STA_ID');
 	}
 
 
@@ -347,7 +347,7 @@ 
 	 * @return string
 	 */
 	public function state_abbrev() {
-		return $this->state_obj() instanceof EE_State ? $this->state_obj()->abbrev() : __( 'Unknown', 'event_espresso' );
+		return $this->state_obj() instanceof EE_State ? $this->state_obj()->abbrev() : __('Unknown', 'event_espresso');
 	}
 
 
@@ -357,18 +357,18 @@ 
 	 * @return EE_State
 	 */
 	public function state_obj() {
-		return $this->get_first_related( 'State' );
+		return $this->get_first_related('State');
 	}
 
 	/**
 	 * Returns the state's name, otherwise 'Unknown'
 	 * @return string
 	 */
-	public function state_name(){
-		if( $this->state_obj() ){
+	public function state_name() {
+		if ($this->state_obj()) {
 			return $this->state_obj()->name();
-		}else{
-			return __( 'Unknown', 'event_espresso' );
+		} else {
+			return __('Unknown', 'event_espresso');
 		}
 	}
 
@@ -381,7 +381,7 @@ 
 	 * @return string
 	 */
 	public function state() {
-		if ( apply_filters( 'FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj() ) ) {
+		if (apply_filters('FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj())) {
 			return $this->state_abbrev();
 		} else {
 			return $this->state_name();
@@ -395,7 +395,7 @@ 
 	 * @return string
 	 */
 	public function country_ID() {
-		return $this->get( 'CNT_ISO' );
+		return $this->get('CNT_ISO');
 	}
 
 
@@ -405,18 +405,18 @@ 
 	 * @return EE_Country
 	 */
 	public function country_obj() {
-		return $this->get_first_related( 'Country' );
+		return $this->get_first_related('Country');
 	}
 
 	/**
 	 * Returns the country's name if known, otherwise 'Unknown'
 	 * @return string
 	 */
-	public function country_name(){
-		if( $this->country_obj() ){
+	public function country_name() {
+		if ($this->country_obj()) {
 			return $this->country_obj()->name();
-		}else{
-			return __( 'Unknown', 'event_espresso' );
+		} else {
+			return __('Unknown', 'event_espresso');
 		}
 	}
 
@@ -429,7 +429,7 @@ 
 	 * @return string
 	 */
 	public function country() {
-		if ( apply_filters( 'FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj() ) ) {
+		if (apply_filters('FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj())) {
 			return $this->country_ID();
 		} else {
 			return $this->country_name();
@@ -443,7 +443,7 @@ 
 	 * @return string
 	 */
 	public function zip() {
-		return $this->get( 'ATT_zip' );
+		return $this->get('ATT_zip');
 	}
 
 
@@ -453,7 +453,7 @@ 
 	 * @return string
 	 */
 	public function email() {
-		return $this->get( 'ATT_email' );
+		return $this->get('ATT_email');
 	}
 
 
@@ -463,7 +463,7 @@ 
 	 * @return string
 	 */
 	public function phone() {
-		return $this->get( 'ATT_phone' );
+		return $this->get('ATT_phone');
 	}
 
 
@@ -473,7 +473,7 @@ 
 	 * @return        bool
 	 */
 	public function deleted() {
-		return $this->get( 'ATT_deleted' );
+		return $this->get('ATT_deleted');
 	}
 
 
@@ -483,8 +483,8 @@ 
 	 * @param array $query_params
 	 * @return EE_Registration[]
 	 */
-	public function get_registrations( $query_params = array() ) {
-		return $this->get_many_related( 'Registration', $query_params );
+	public function get_registrations($query_params = array()) {
+		return $this->get_many_related('Registration', $query_params);
 	}
 
 
@@ -494,7 +494,7 @@ 
 	 * @return EE_Registration
 	 */
 	public function get_most_recent_registration() {
-		return $this->get_first_related( 'Registration', array( 'order_by' => array( 'REG_date' => 'DESC' ) ) ); //null, 'REG_date', 'DESC', '=', 'OBJECT_K');
+		return $this->get_first_related('Registration', array('order_by' => array('REG_date' => 'DESC'))); //null, 'REG_date', 'DESC', '=', 'OBJECT_K');
 	}
 
 
@@ -504,8 +504,8 @@ 
 	 * @param int $event_id
 	 * @return EE_Registration
 	 */
-	public function get_most_recent_registration_for_event( $event_id ) {
-		return $this->get_first_related( 'Registration', array(array( 'EVT_ID' => $event_id ), 'order_by' => array('REG_date' => 'DESC')));//, '=', 'OBJECT_K' );
+	public function get_most_recent_registration_for_event($event_id) {
+		return $this->get_first_related('Registration', array(array('EVT_ID' => $event_id), 'order_by' => array('REG_date' => 'DESC'))); //, '=', 'OBJECT_K' );
 	}
 
 
@@ -515,7 +515,7 @@ 
 	 * @return array
 	 */
 	public function events() {
-		return $this->get_many_related( 'Event' );
+		return $this->get_many_related('Event');
 	}
 
 	/**
@@ -524,17 +524,17 @@ 
 	 * @param EE_Payment_Method $payment_method the _gateway_name property on the gateway class
 	 * @return EE_Form_Section_Proper
 	 */
-	public function billing_info_for_payment_method($payment_method){
+	public function billing_info_for_payment_method($payment_method) {
 		$pm_type = $payment_method->type_obj();
-		if( ! $pm_type instanceof EE_PMT_Base ){
+		if ( ! $pm_type instanceof EE_PMT_Base) {
 			return NULL;
 		}
-		$billing_info =  $this->get_post_meta( $this->get_billing_info_postmeta_name( $payment_method ), true );
-		if ( ! $billing_info){
+		$billing_info = $this->get_post_meta($this->get_billing_info_postmeta_name($payment_method), true);
+		if ( ! $billing_info) {
 			return NULL;
 		}
 		$billing_form = $pm_type->billing_form();
-		$billing_form->receive_form_submission( array( $billing_form->name() => $billing_info ), FALSE );
+		$billing_form->receive_form_submission(array($billing_form->name() => $billing_info), FALSE);
 		return $billing_form;
 	}
 
@@ -544,10 +544,10 @@ 
 	 * @param EE_Payment_Method $payment_method
 	 * @return string
 	 */
-	public function get_billing_info_postmeta_name($payment_method){
-		if( $payment_method->type_obj() instanceof EE_PMT_Base ){
-			return 'billing_info_' . $payment_method->type_obj()->system_name();
-		}else{
+	public function get_billing_info_postmeta_name($payment_method) {
+		if ($payment_method->type_obj() instanceof EE_PMT_Base) {
+			return 'billing_info_'.$payment_method->type_obj()->system_name();
+		} else {
 			return NULL;
 		}
 	}
@@ -558,13 +558,13 @@ 
 	 * @param EE_Payment_Method $payment_method
 	 * @return boolean
 	 */
-	public function save_and_clean_billing_info_for_payment_method($billing_form, $payment_method){
-		if( ! $billing_form instanceof EE_Billing_Attendee_Info_Form ){
-			EE_Error::add_error( __( 'Cannot save billing info because there is none.', 'event_espresso' ) );
+	public function save_and_clean_billing_info_for_payment_method($billing_form, $payment_method) {
+		if ( ! $billing_form instanceof EE_Billing_Attendee_Info_Form) {
+			EE_Error::add_error(__('Cannot save billing info because there is none.', 'event_espresso'));
 			return false;
 		}
 		$billing_form->clean_sensitive_data();
-		return update_post_meta($this->ID(), $this->get_billing_info_postmeta_name( $payment_method ), $billing_form->input_values( true ) );
+		return update_post_meta($this->ID(), $this->get_billing_info_postmeta_name($payment_method), $billing_form->input_values(true));
 	}
 
 	/**
@@ -580,14 +580,14 @@ 
 	 * @return string
 	 */
 	public function get_admin_edit_link() {
-		EE_Registry::instance()->load_helper( 'URL' );
+		EE_Registry::instance()->load_helper('URL');
 		return EEH_URL::add_query_args_and_nonce(
 			array(
 				'page' => 'espresso_registrations',
 				'action' => 'edit_attendee',
 				'post' => $this->ID()
 			),
-			admin_url( 'admin.php' )
+			admin_url('admin.php')
 		);
 	}
 
@@ -604,13 +604,13 @@ 
 	 * @return string
 	 */
 	public function get_admin_overview_link() {
-		EE_Registry::instance()->load_helper( 'URL' );
+		EE_Registry::instance()->load_helper('URL');
 		return EEH_URL::add_query_args_and_nonce(
 			array(
 				'page' => 'espresso_registrations',
 				'action' => 'contact_list'
 			),
-			admin_url( 'admin.php' )
+			admin_url('admin.php')
 		);
 	}
 

Doc Comments +2 added lines, -2 removed lines

@@ -512,7 +512,7 @@ 
 
 	/**
 	 * returns any events attached to this attendee ($_Event property);
-	 * @return array
+	 * @return EE_Base_Class[]
 	 */
 	public function events() {
 		return $this->get_many_related( 'Event' );
@@ -522,7 +522,7 @@ 
 	 * Gets the billing info array where keys match espresso_reg_page_billing_inputs(),
 	 * and keys are their cleaned values. @see EE_Attendee::save_and_clean_billing_info_for_payment_method() which was used to save the billing info
 	 * @param EE_Payment_Method $payment_method the _gateway_name property on the gateway class
-	 * @return EE_Form_Section_Proper
+	 * @return null|EE_Billing_Info_Form
 	 */
 	public function billing_info_for_payment_method($payment_method){
 		$pm_type = $payment_method->type_obj();

core/db_classes/EE_Message.class.php

Spacing +109 added lines, -109 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * EE_Message class
@@ -48,14 +48,14 @@ 
 	 * @param array $date_formats incoming date formats in an array.  First value is the date_format, second is time format.
 	 * @return EE_Message
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
 		//if object doesn't exist, let's generate a unique token on instantiation so that its available even before saving to db.
-		if ( ! $has_object ) {
-			EE_Registry::instance()->load_helper( 'URL' );
+		if ( ! $has_object) {
+			EE_Registry::instance()->load_helper('URL');
 			$props_n_values['MSG_token'] = EEH_URL::generate_unique_token();
 		}
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -66,8 +66,8 @@ 
 	 * @param string $timezone
 	 * @return EE_Message
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, true, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, true, $timezone);
 	}
 
 
@@ -78,7 +78,7 @@ 
 	 * @return int
 	 */
 	public function MSG_token() {
-		return $this->get( 'MSG_token' );
+		return $this->get('MSG_token');
 	}
 
 
@@ -88,8 +88,8 @@ 
 	 *
 	 * @param int $MSG_token
 	 */
-	public function set_MSG_token( $MSG_token) {
-		$this->set( 'MSG_token', $MSG_token );
+	public function set_MSG_token($MSG_token) {
+		$this->set('MSG_token', $MSG_token);
 	}
 
 
@@ -101,7 +101,7 @@ 
 	 * @return int
 	 */
 	public function GRP_ID() {
-		return $this->get( 'GRP_ID' );
+		return $this->get('GRP_ID');
 	}
 
 
@@ -111,8 +111,8 @@ 
 	 *
 	 * @param int $GRP_ID
 	 */
-	public function set_GRP_ID( $GRP_ID ) {
-		$this->set( 'GRP_ID', $GRP_ID );
+	public function set_GRP_ID($GRP_ID) {
+		$this->set('GRP_ID', $GRP_ID);
 	}
 
 
@@ -124,7 +124,7 @@ 
 	 * @return int
 	 */
 	public function TXN_ID() {
-		return $this->get( 'TXN_ID' );
+		return $this->get('TXN_ID');
 	}
 
 
@@ -134,8 +134,8 @@ 
 	 *
 	 * @param int $TXN_ID
 	 */
-	public function set_TXN_ID( $TXN_ID) {
-		$this->set( 'TXN_ID', $TXN_ID );
+	public function set_TXN_ID($TXN_ID) {
+		$this->set('TXN_ID', $TXN_ID);
 	}
 
 
@@ -147,7 +147,7 @@ 
 	 * @return string
 	 */
 	public function messenger() {
-		return $this->get( 'MSG_messenger' );
+		return $this->get('MSG_messenger');
 	}
 
 
@@ -157,8 +157,8 @@ 
 	 *
 	 * @param string $messenger
 	 */
-	public function set_messenger( $messenger ) {
-		$this->set( 'MSG_messenger', $messenger );
+	public function set_messenger($messenger) {
+		$this->set('MSG_messenger', $messenger);
 	}
 
 
@@ -179,7 +179,7 @@ 
 	 *
 	 * @param EE_messenger $messenger
 	 */
-	public function set_messenger_object( EE_messenger $messenger ) {
+	public function set_messenger_object(EE_messenger $messenger) {
 		$this->_messenger = $messenger;
 	}
 
@@ -192,11 +192,11 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function valid_messenger( $throw_exceptions = false ) {
-		if ( $this->_messenger instanceof EE_messenger ) {
+	public function valid_messenger($throw_exceptions = false) {
+		if ($this->_messenger instanceof EE_messenger) {
 			return true;
 		}
-		if ( $throw_exceptions ) {
+		if ($throw_exceptions) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -220,10 +220,10 @@ 
 	 * @param   bool    $plural whether to return the plural label or not.
 	 * @return string
 	 */
-	public function messenger_label( $plural = false ) {
+	public function messenger_label($plural = false) {
 		$label_type = $plural ? 'plural' : 'singular';
 		$messenger = $this->messenger_object();
-		return $messenger instanceof EE_messenger ? $messenger->label[ $label_type ] : $this->messenger();
+		return $messenger instanceof EE_messenger ? $messenger->label[$label_type] : $this->messenger();
 	}
 
 
@@ -234,7 +234,7 @@ 
 	 * @return string
 	 */
 	public function message_type() {
-		return $this->get( 'MSG_message_type' );
+		return $this->get('MSG_message_type');
 	}
 
 
@@ -244,8 +244,8 @@ 
 	 *
 	 * @param string $message_type
 	 */
-	public function set_message_type( $message_type ) {
-		$this->set( 'MSG_message_type', $message_type );
+	public function set_message_type($message_type) {
+		$this->set('MSG_message_type', $message_type);
 	}
 
 
@@ -268,10 +268,10 @@ 
 	 * @param bool            $set_priority   This indicates whether to set the priority to whatever the priority is on
 	 *                                        the message type or not.
 	 */
-	public function set_message_type_object( EE_message_type $message_type, $set_priority = false ) {
+	public function set_message_type_object(EE_message_type $message_type, $set_priority = false) {
 		$this->_message_type = $message_type;
-		if ( $set_priority ) {
-			$this->set_priority( $this->_message_type->get_priority() );
+		if ($set_priority) {
+			$this->set_priority($this->_message_type->get_priority());
 		}
 	}
 
@@ -284,11 +284,11 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function valid_message_type( $throw_exceptions = false ) {
-		if ( $this->_message_type instanceof EE_message_type ) {
+	public function valid_message_type($throw_exceptions = false) {
+		if ($this->_message_type instanceof EE_message_type) {
 			return true;
 		}
-		if ( $throw_exceptions ) {
+		if ($throw_exceptions) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -311,8 +311,8 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function is_valid( $throw_exceptions = false ) {
-		if ( $this->valid_messenger( $throw_exceptions ) && $this->valid_message_type( $throw_exceptions ) ) {
+	public function is_valid($throw_exceptions = false) {
+		if ($this->valid_messenger($throw_exceptions) && $this->valid_message_type($throw_exceptions)) {
 			return true;
 		}
 		return false;
@@ -333,16 +333,16 @@ 
 	 * @param bool $throw_exceptions
 	 * @return bool
 	 */
-	public function is_valid_for_sending_or_generation( $throw_exceptions = false ) {
+	public function is_valid_for_sending_or_generation($throw_exceptions = false) {
 		$valid = false;
-		if ( $this->is_valid( $throw_exceptions ) ) {
+		if ($this->is_valid($throw_exceptions)) {
 			/** @var EE_Message_Resource_Manager $message_resource_manager */
-			$message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
-			$valid = $message_resource_manager->is_message_type_active_for_messenger( $this->messenger(), $this->message_type() );
-			if ( ! $valid && $throw_exceptions ) {
+			$message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+			$valid = $message_resource_manager->is_message_type_active_for_messenger($this->messenger(), $this->message_type());
+			if ( ! $valid && $throw_exceptions) {
 				throw new EE_Error(
 					sprintf(
-						__( 'The %1$s message type is not a valid message type for the %2$s messenger so it will not be sent.', 'event_espresso' ),
+						__('The %1$s message type is not a valid message type for the %2$s messenger so it will not be sent.', 'event_espresso'),
 						$this->message_type(),
 						$this->messenger()
 					)
@@ -362,10 +362,10 @@ 
 	 * @param   bool    $plural whether to return the plural label or not.
 	 * @return string
 	 */
-	public function message_type_label( $plural = false ) {
+	public function message_type_label($plural = false) {
 		$label_type = $plural ? 'plural' : 'singular';
 		$message_type = $this->message_type_object();
-		return $message_type instanceof EE_message_type ? $message_type->label[ $label_type ] : $this->message_type();
+		return $message_type instanceof EE_message_type ? $message_type->label[$label_type] : $this->message_type();
 	}
 
 
@@ -376,7 +376,7 @@ 
 	 * @return string
 	 */
 	public function context() {
-		return $this->get( 'MSG_context' );
+		return $this->get('MSG_context');
 	}
 
 
@@ -390,9 +390,9 @@ 
 	 */
 	public function context_label() {
 		/** @type EE_Message_Resource_Manager $message_resource_manager */
-		$message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
+		$message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 		$contexts = $message_resource_manager->get_all_contexts();
-		return isset( $contexts[ $this->context() ] ) ? $contexts[ $this->context() ] : $this->context();
+		return isset($contexts[$this->context()]) ? $contexts[$this->context()] : $this->context();
 	}
 
 
@@ -402,8 +402,8 @@ 
 	 *
 	 * @param string $context
 	 */
-	public function set_context( $context ) {
-		$this->set( 'MSG_context', $context );
+	public function set_context($context) {
+		$this->set('MSG_context', $context);
 	}
 
 
@@ -414,7 +414,7 @@ 
 	 * @return int
 	 */
 	public function recipient_ID() {
-		return $this->get( 'MSG_recipient_ID' );
+		return $this->get('MSG_recipient_ID');
 	}
 
 
@@ -424,8 +424,8 @@ 
 	 *
 	 * @param string $recipient_ID
 	 */
-	public function set_recipient_ID( $recipient_ID ) {
-		$this->set( 'MSG_recipient_ID', $recipient_ID );
+	public function set_recipient_ID($recipient_ID) {
+		$this->set('MSG_recipient_ID', $recipient_ID);
 	}
 
 
@@ -436,7 +436,7 @@ 
 	 * @return string
 	 */
 	public function recipient_type() {
-		return $this->get( 'MSG_recipient_type' );
+		return $this->get('MSG_recipient_type');
 	}
 
 
@@ -448,11 +448,11 @@ 
 	 * @return EE_Base_Class | null
 	 */
 	public function recipient_object() {
-		if ( ! $this->recipient_type() || ! $this->recipient_ID() ) {
+		if ( ! $this->recipient_type() || ! $this->recipient_ID()) {
 			return null;
 		}
 
-		return $this->get_first_related( $this->recipient_type() );
+		return $this->get_first_related($this->recipient_type());
 	}
 
 
@@ -462,8 +462,8 @@ 
 	 *
 	 * @param string $recipient_type
 	 */
-	public function set_recipient_type( $recipient_type ) {
-		$this->set( 'MSG_recipient_type', $recipient_type );
+	public function set_recipient_type($recipient_type) {
+		$this->set('MSG_recipient_type', $recipient_type);
 	}
 
 
@@ -474,7 +474,7 @@ 
 	 * @return string
 	 */
 	public function content() {
-		return $this->get( 'MSG_content' );
+		return $this->get('MSG_content');
 	}
 
 
@@ -484,8 +484,8 @@ 
 	 *
 	 * @param string $content
 	 */
-	public function set_content( $content ) {
-		$this->set( 'MSG_content', $content );
+	public function set_content($content) {
+		$this->set('MSG_content', $content);
 	}
 
 
@@ -496,7 +496,7 @@ 
 	 * @return string
 	 */
 	public function subject() {
-		return $this->get( 'MSG_subject' );
+		return $this->get('MSG_subject');
 	}
 
 
@@ -506,8 +506,8 @@ 
 	 *
 	 * @param string $subject
 	 */
-	public function set_subject( $subject ) {
-		$this->set( 'MSG_subject', $subject );
+	public function set_subject($subject) {
+		$this->set('MSG_subject', $subject);
 	}
 
 
@@ -518,8 +518,8 @@ 
 	 * @return string
 	 */
 	public function to() {
-		$to = $this->get( 'MSG_to' );
-		return empty( $to ) ? __( 'No recipient', 'event_espresso' ) : $to;
+		$to = $this->get('MSG_to');
+		return empty($to) ? __('No recipient', 'event_espresso') : $to;
 	}
 
 
@@ -529,8 +529,8 @@ 
 	 *
 	 * @param string $to
 	 */
-	public function set_to( $to ) {
-		$this->set( 'MSG_to', $to );
+	public function set_to($to) {
+		$this->set('MSG_to', $to);
 	}
 
 
@@ -541,7 +541,7 @@ 
 	 * @return string
 	 */
 	public function from() {
-		return $this->get( 'MSG_from' );
+		return $this->get('MSG_from');
 	}
 
 
@@ -551,8 +551,8 @@ 
 	 *
 	 * @param string $from
 	 */
-	public function set_from( $from ) {
-		$this->set( 'MSG_from', $from );
+	public function set_from($from) {
+		$this->set('MSG_from', $from);
 	}
 
 
@@ -565,7 +565,7 @@ 
 	 * @return int
 	 */
 	public function priority() {
-		return $this->get( 'MSG_priority' );
+		return $this->get('MSG_priority');
 	}
 
 
@@ -578,9 +578,9 @@ 
 	 *
 	 * @param int $priority
 	 */
-	public function set_priority( $priority ) {
+	public function set_priority($priority) {
 		$priority = $this->send_now() ? EEM_Message::priority_high : $priority;
-		parent::set( 'MSG_priority', $priority );
+		parent::set('MSG_priority', $priority);
 	}
 
 
@@ -592,11 +592,11 @@ 
 	 * @param bool   $use_default
 	 * @throws EE_Error
 	 */
-	public function set( $field_name, $field_value, $use_default = false ) {
-		if ( $field_name === 'MSG_priority' ) {
-			$this->set_priority( $field_value );
+	public function set($field_name, $field_value, $use_default = false) {
+		if ($field_name === 'MSG_priority') {
+			$this->set_priority($field_value);
 		}
-		parent::set( $field_name, $field_value, $use_default );
+		parent::set($field_name, $field_value, $use_default);
 	}
 
 
@@ -618,7 +618,7 @@ 
 	 * @return string
 	 */
 	public function STS_ID() {
-		return $this->get( 'STS_ID' );
+		return $this->get('STS_ID');
 	}
 
 
@@ -628,8 +628,8 @@ 
 	 *
 	 * @param string $STS_ID
 	 */
-	public function set_STS_ID( $STS_ID ) {
-		$this->set( 'STS_ID', $STS_ID );
+	public function set_STS_ID($STS_ID) {
+		$this->set('STS_ID', $STS_ID);
 	}
 
 
@@ -640,7 +640,7 @@ 
 	 * @return string
 	 */
 	public function created() {
-		return $this->get( 'MSG_created' );
+		return $this->get('MSG_created');
 	}
 
 
@@ -650,8 +650,8 @@ 
 	 *
 	 * @param string $created
 	 */
-	public function set_created( $created ) {
-		$this->set( 'MSG_created', $created );
+	public function set_created($created) {
+		$this->set('MSG_created', $created);
 	}
 
 
@@ -662,7 +662,7 @@ 
 	 * @return string
 	 */
 	public function modified() {
-		return $this->get( 'MSG_modified' );
+		return $this->get('MSG_modified');
 	}
 
 
@@ -672,8 +672,8 @@ 
 	 *
 	 * @param string $modified
 	 */
-	public function set_modified( $modified ) {
-		$this->set( 'MSG_modified', $modified );
+	public function set_modified($modified) {
+		$this->set('MSG_modified', $modified);
 	}
 
 
@@ -683,8 +683,8 @@ 
 	 * Sets generation data for this message.
 	 * @param mixed $data
 	 */
-	public function set_generation_data( $data ) {
-		$this->set_field_or_extra_meta( 'MSG_generation_data', $data );
+	public function set_generation_data($data) {
+		$this->set_field_or_extra_meta('MSG_generation_data', $data);
 	}
 
 
@@ -696,7 +696,7 @@ 
 	 * @return mixed|null
 	 */
 	public function get_generation_data() {
-		return $this->get_field_or_extra_meta( 'MSG_generation_data' );
+		return $this->get_field_or_extra_meta('MSG_generation_data');
 	}
 
 
@@ -707,7 +707,7 @@ 
 	 * @return mixed|null
 	 */
 	public function error_message() {
-		return $this->get_field_or_extra_meta( 'MSG_error' );
+		return $this->get_field_or_extra_meta('MSG_error');
 	}
 
 
@@ -716,8 +716,8 @@ 
 	 * @param $message
 	 * @return bool|int
 	 */
-	public function set_error_message( $message ) {
-		return $this->set_field_or_extra_meta( 'MSG_error', $message );
+	public function set_error_message($message) {
+		return $this->set_field_or_extra_meta('MSG_error', $message);
 	}
 
 
@@ -731,13 +731,13 @@ 
 		/**
 		 * This is deprecated functionality that will be removed eventually but included here now for backward compat.
 		 */
-		if ( ! empty( $this->template_pack ) ) {
+		if ( ! empty($this->template_pack)) {
 			return $this->template_pack;
 		}
 		/** @type EE_Message_Template_Group $grp */
-		$grp = $this->get_first_related( 'Message_Template_Group' );
+		$grp = $this->get_first_related('Message_Template_Group');
 		//if no group then let's try to get the first related group by internal messenger and message type (will use global grp).
-		if ( ! $grp instanceof EE_Message_Template_Group ) {
+		if ( ! $grp instanceof EE_Message_Template_Group) {
 			$grp = EEM_Message_Template_Group::instance()->get_one(
 				array(
 					array(
@@ -763,15 +763,15 @@ 
 		/**
 		 * This is deprecated functionality that will be removed eventually but included here now for backward compat.
 		 */
-		if ( ! empty( $this->template_variation ) ) {
+		if ( ! empty($this->template_variation)) {
 			return $this->template_variation;
 		}
 
 		/** @type EE_Message_Template_Group $grp */
-		$grp = $this->get_first_related( 'Message_Template_Group' );
+		$grp = $this->get_first_related('Message_Template_Group');
 
 		//if no group then let's try to get the first related group by internal messenger and message type (will use global grp).
-		if ( ! $grp instanceof EE_Message_Template_Group ) {
+		if ( ! $grp instanceof EE_Message_Template_Group) {
 			$grp = EEM_Message_Template_Group::instance()->get_one(
 				array(
 					array(
@@ -791,15 +791,15 @@ 
 	 * @return string
 	 */
 	public function get_admin_details_link() {
-		EE_Registry::instance()->load_helper( 'URL' );
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
-		switch ( $this->STS_ID() ) {
+		EE_Registry::instance()->load_helper('URL');
+		EE_Registry::instance()->load_helper('MSG_Template');
+		switch ($this->STS_ID()) {
 			case EEM_Message::status_failed :
-				return EEH_MSG_Template::generate_error_display_trigger( $this );
+				return EEH_MSG_Template::generate_error_display_trigger($this);
 				break;
 
 			case EEM_Message::status_sent :
-				return EEH_MSG_Template::generate_browser_trigger( $this );
+				return EEH_MSG_Template::generate_browser_trigger($this);
 				break;
 
 			default :
@@ -820,13 +820,13 @@ 
 	 * @return string
 	 */
 	public function get_admin_settings_link() {
-		EE_Registry::instance()->load_helper( 'URL' );
+		EE_Registry::instance()->load_helper('URL');
 		return EEH_URL::add_query_args_and_nonce(
 			array(
 				'page' => 'espresso_messages',
 				'action' => 'settings',
 			),
-			admin_url( 'admin.php' )
+			admin_url('admin.php')
 		);
 	}
 
@@ -835,13 +835,13 @@ 
 	 * @return string
 	 */
 	public function get_admin_overview_link() {
-		EE_Registry::instance()->load_helper( 'URL' );
+		EE_Registry::instance()->load_helper('URL');
 		return EEH_URL::add_query_args_and_nonce(
 			array(
 				'page' => 'espresso_messages',
 				'action' => 'default',
 			),
-			admin_url( 'admin.php' )
+			admin_url('admin.php')
 		);
 	}
 

Doc Comments +1 added lines, -1 removed lines

@@ -704,7 +704,7 @@
 
 	/**
 	 * Gets any error message.
-	 * @return mixed|null
+	 * @return string
 	 */
 	public function error_message() {
 		return $this->get_field_or_extra_meta( 'MSG_error' );