eventespresso / event-espresso-core

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

core/db_models/strategies/EE_Default_Where_Conditions.strategy.php

Spacing +22 added lines, -22 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  *
@@ -15,7 +15,7 @@ 
  * @since		 	    4.6.0
  *
  */
-class EE_Default_Where_Conditions{
+class EE_Default_Where_Conditions {
 
 	/**
 	 * This const can be used in EE_Default_Where_Conditions values, and at the time of querying it will be
@@ -48,7 +48,7 @@ 
 	 * onto any field names
 	 * @param array $custom_where_conditions
 	 */
-	public function __construct( $custom_where_conditions = array() ) {
+	public function __construct($custom_where_conditions = array()) {
 		$this->_where_conditions_provided = $custom_where_conditions;
 	}
 
@@ -59,7 +59,7 @@ 
 	 * for querying of the model.
 	 * @param EEM_Base $model
 	 */
-	function _finalize_construct(EEM_Base $model){
+	function _finalize_construct(EEM_Base $model) {
 		$this->_model = $model;
 	}
 
@@ -80,8 +80,8 @@ 
 	 * @param string $model_relation_chain
 	 * @return array like what's expected in EEM_Base::get_all()'s $query_params[0]
 	 */
-	function get_default_where_conditions( $model_relation_chain = '' ){
-		return $this->prepare_where_conditions_for_querying( array_merge( $this->_get_default_where_conditions(), $this->get_where_conditions_provided() ), $model_relation_chain );
+	function get_default_where_conditions($model_relation_chain = '') {
+		return $this->prepare_where_conditions_for_querying(array_merge($this->_get_default_where_conditions(), $this->get_where_conditions_provided()), $model_relation_chain);
 	}
 
 
@@ -91,7 +91,7 @@ 
 	 * Adding model relation chains is handled by the public method get_default_where_conditions
 	 * @return array
 	 */
-	protected function _get_default_where_conditions(){
+	protected function _get_default_where_conditions() {
 		return array();
 	}
 
@@ -105,36 +105,36 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	public function prepare_where_conditions_for_querying( $where_conditions, $model_relation_chain ) {
+	public function prepare_where_conditions_for_querying($where_conditions, $model_relation_chain) {
 		$where_conditions_with_model_relation_chain_prefixes = array();
-		if ( ! is_array( $where_conditions ) ) {
+		if ( ! is_array($where_conditions)) {
 			$where_conditions = array();
 		}
-		foreach ( $where_conditions as $key => $value ) {
+		foreach ($where_conditions as $key => $value) {
 			if (
-				in_array( $key, array( 'OR', 'AND', 'NOT' ) )
-				|| strpos( $key, 'OR*' ) !== false
-				|| strpos( $key, 'AND*' ) !== false
-				|| strpos( $key, 'NOT*' ) !== false
+				in_array($key, array('OR', 'AND', 'NOT'))
+				|| strpos($key, 'OR*') !== false
+				|| strpos($key, 'AND*') !== false
+				|| strpos($key, 'NOT*') !== false
 			) {
-				$where_conditions_with_model_relation_chain_prefixes[ $key ] = $this->prepare_where_conditions_for_querying(
+				$where_conditions_with_model_relation_chain_prefixes[$key] = $this->prepare_where_conditions_for_querying(
 					$value,
 					$model_relation_chain
 				);
 			} else {
 				if (
 					$model_relation_chain != ''
-					&& $model_relation_chain[ strlen( $model_relation_chain ) - 1 ] != '.'
+					&& $model_relation_chain[strlen($model_relation_chain) - 1] != '.'
 				) {
-					$model_relation_chain = $model_relation_chain . ".";
+					$model_relation_chain = $model_relation_chain.".";
 				}
 				//check for the current user id place holder, and if present change it
-				if ( $value === self::current_user_placeholder ) {
+				if ($value === self::current_user_placeholder) {
 					$value = get_current_user_id();
 				}
 				//check for user field placeholder
-				if ( $key == self::user_field_name_placeholder ) {
-					if ( ! $this->_model->wp_user_field_name() ) {
+				if ($key == self::user_field_name_placeholder) {
+					if ( ! $this->_model->wp_user_field_name()) {
 						throw new EE_Error(
 							sprintf(
 								__(
@@ -147,7 +147,7 @@ 
 					}
 					$key = $this->_model->wp_user_field_name();
 				}
-				$where_conditions_with_model_relation_chain_prefixes[ $model_relation_chain . $key ] = $value;
+				$where_conditions_with_model_relation_chain_prefixes[$model_relation_chain.$key] = $value;
 			}
 		}
 		return $where_conditions_with_model_relation_chain_prefixes;

Indentation +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 /**
  *
  * Class EE_Default_Where_Conditions
-  *
+ *
  * Strategy to be used for getting default where conditions for EEM_Base children.
  * Should be initialized and set on construction of model
  *

core/libraries/messages/EE_Message_Generated_From_Token.php

Spacing +12 added lines, -12 removed lines

@@ -36,9 +36,9 @@ 
 	 *                                                This is then used to populate the properties in here.
 	 * @param   EE_Message_Resource_Manager $message_resource_manager
 	 */
-	public function __construct( $token, $sending_messenger_slug = 'html', EE_Message_Resource_Manager $message_resource_manager ) {
+	public function __construct($token, $sending_messenger_slug = 'html', EE_Message_Resource_Manager $message_resource_manager) {
 		$this->token = $token;
-		$this->_sending_messenger = $this->_set_sending_messenger( $sending_messenger_slug, $message_resource_manager );
+		$this->_sending_messenger = $this->_set_sending_messenger($sending_messenger_slug, $message_resource_manager);
 		$this->_message = $this->_generate_message();
 		//set params for parent from the message object
 		parent::__construct(
@@ -61,7 +61,7 @@ 
 		$sending_messenger_slug,
 		EE_Message_Resource_Manager $message_resource_manager
 	) {
-		$sending_messenger = $message_resource_manager->get_active_messenger( $sending_messenger_slug );
+		$sending_messenger = $message_resource_manager->get_active_messenger($sending_messenger_slug);
 		return $sending_messenger instanceof EE_messenger ? $sending_messenger : $sending_messenger_slug;
 	}
 
@@ -83,27 +83,27 @@ 
 	 * @return EE_Message
 	 * @throws \EE_Error
 	 */
-	protected function _generate_message( $properties = array() ) {
+	protected function _generate_message($properties = array()) {
 		// a message was generated immediately but the parent class will call this again
-		if ( $this->_message instanceof EE_Message ) {
+		if ($this->_message instanceof EE_Message) {
 			return $this->_message;
 		}
-		$message = EEM_Message::instance()->get_one_by_token( $this->token );
-		if ( ! $message instanceof EE_Message ) {
+		$message = EEM_Message::instance()->get_one_by_token($this->token);
+		if ( ! $message instanceof EE_Message) {
 			throw new EE_Error(
 				sprintf(
-					__( 'Unable to retrieve generated message from DB using given token: "%1$s"', 'event_espresso' ),
+					__('Unable to retrieve generated message from DB using given token: "%1$s"', 'event_espresso'),
 					$this->token
 				)
 			);
 		}
-		$message->set_STS_ID( EEM_Message::status_idle );
+		$message->set_STS_ID(EEM_Message::status_idle);
 
-		if ( ! $this->_sending_messenger instanceof EE_messenger ) {
-			$message->set_STS_ID( EEM_Message::status_failed );
+		if ( ! $this->_sending_messenger instanceof EE_messenger) {
+			$message->set_STS_ID(EEM_Message::status_failed);
 			$message->set_error_message(
 				sprintf(
-					__( 'Unable to send message because the "%1$s" messenger is not active or not installed', 'event_espresso' ),
+					__('Unable to send message because the "%1$s" messenger is not active or not installed', 'event_espresso'),
 					$this->_sending_messenger
 				)
 			);

core/libraries/messages/EE_Message_Repository.lib.php

Spacing +40 added lines, -40 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 
@@ -32,13 +32,13 @@ 
 	 *
 	 * @return bool
 	 */
-	public function add( $message, $info = null ) {
-		$attached = parent::add( $message );
+	public function add($message, $info = null) {
+		$attached = parent::add($message);
 		//ensure $info is an array if not already
 		$info = $info === null ? $info = array() : (array) $info;
-		$data = $this->_init_data( $info, $attached, $message );
-		if ( $attached ) {
-			$this->set_info( $message, $data );
+		$data = $this->_init_data($info, $attached, $message);
+		if ($attached) {
+			$this->set_info($message, $data);
 		}
 		return $attached;
 	}
@@ -51,7 +51,7 @@ 
 	 * @param EE_Message $message
 	 * @return array
 	 */
-	protected function _init_data( $info, $attached, $message ) {
+	protected function _init_data($info, $attached, $message) {
 		$data = array(
 			'test_send' => false,
 			'preview' => false,
@@ -60,20 +60,20 @@ 
 				'MSG_generation_data' => array()
 			)
 		);
-		if ( isset( $info['preview'] ) ) {
+		if (isset($info['preview'])) {
 			$data['preview'] = $info['preview'];
-			unset( $info['preview'] );
+			unset($info['preview']);
 		}
-		if ( isset( $info['test_send'] ) ) {
+		if (isset($info['test_send'])) {
 			$data['test_send'] = $info['test_send'];
-			unset( $info['test_send'] );
+			unset($info['test_send']);
 		}
-		if ( isset( $info['data_handler_class_name'] ) ) {
+		if (isset($info['data_handler_class_name'])) {
 			$data['data_handler_class_name'] = $info['data_handler_class_name'];
-			unset( $info['data_handler_class_name'] );
+			unset($info['data_handler_class_name']);
 		}
-		if ( $attached && $message->STS_ID() === EEM_Message::status_incomplete ) {
-			$generation_data = isset( $info['MSG_generation_data'] ) ? $info['MSG_generation_data'] : array();
+		if ($attached && $message->STS_ID() === EEM_Message::status_incomplete) {
+			$generation_data = isset($info['MSG_generation_data']) ? $info['MSG_generation_data'] : array();
 			//if data isn't in $info...let's see if its available via the message object
 			$generation_data = ! $generation_data ? $message->get_generation_data() : $generation_data;
 			//still empty then let's just use info
@@ -96,19 +96,19 @@ 
 	 */
 	public function saveAll() {
 		$this->rewind();
-		$save_tracking = array( 'updated' => 0, 'notupdated' => 0, 'errors' => array() );
+		$save_tracking = array('updated' => 0, 'notupdated' => 0, 'errors' => array());
 
 		//exit early if there is nothing to save.
-		if ( ! $this->count() > 0 ) {
+		if ( ! $this->count() > 0) {
 			return $save_tracking;
 		}
 
-		while( $this->valid() ) {
+		while ($this->valid()) {
 
 			$saved = $this->current()->save();
-			if ( $saved === false ) {
+			if ($saved === false) {
 				$save_tracking['errors'][] = $this->current()->MSG_token();
-			} elseif ( $saved ) {
+			} elseif ($saved) {
 				$save_tracking['updated']++;
 			} else {
 				$save_tracking['notupdated']++;
@@ -132,10 +132,10 @@ 
 	 * @param string   $token   Token.
 	 * @return EE_Message | null
 	 */
-	public function getMessageByToken( $token ) {
+	public function getMessageByToken($token) {
 		$this->rewind();
-		while( $this->valid() ) {
-			if ( $this->current()->MSG_token() === $token ) {
+		while ($this->valid()) {
+			if ($this->current()->MSG_token() === $token) {
 				$message = $this->current();
 				$this->rewind();
 				return $message;
@@ -156,11 +156,11 @@ 
 	 */
 	public function get_generation_data() {
 		//first verify we're at a valid iterator point.
-		if ( ! $this->valid() ) {
+		if ( ! $this->valid()) {
 			return array();
 		}
 		$info = $this->getInfo();
-		return isset( $info['data'] ) && isset( $info['data']['MSG_generation_data'] ) ? $info['data']['MSG_generation_data'] : array();
+		return isset($info['data']) && isset($info['data']['MSG_generation_data']) ? $info['data']['MSG_generation_data'] : array();
 	}
 
 
@@ -171,11 +171,11 @@ 
 	 * @return string
 	 */
 	public function get_data_handler() {
-		if ( ! $this->valid() ) {
+		if ( ! $this->valid()) {
 			return '';
 		}
 		$info = $this->getInfo();
-		return isset( $info['data_handler_class_name'] ) ? $info['data_handler_class_name'] : '';
+		return isset($info['data_handler_class_name']) ? $info['data_handler_class_name'] : '';
 	}
 
 
@@ -185,7 +185,7 @@ 
 	 * @return bool
 	 */
 	public function is_preview() {
-		if ( ! $this->valid() ) {
+		if ( ! $this->valid()) {
 			return false;
 		}
 		$info = $this->getInfo();
@@ -198,7 +198,7 @@ 
 	 * @return bool
 	 */
 	public function is_test_send() {
-		if ( ! $this->valid() ) {
+		if ( ! $this->valid()) {
 			return false;
 		}
 		$info = $this->getInfo();
@@ -213,16 +213,16 @@ 
 	 *  data is attached for later retrieval (batch generation).
 	 */
 	protected function _maybe_persist_attached_data() {
-		if ( ! $this->valid() ) {
+		if ( ! $this->valid()) {
 			return;
 		}
 
 		$info = $this->getInfo();
-		$data_handler_class_name = isset( $info['data_handler_class_name'] ) ? $info['data_handler_class_name'] : '';
-		$data = isset( $info['data'] ) && isset( $info['data']['MSG_generation_data'] ) ? $info['data']['MSG_generation_data'] : array();
-		if ( $data && $this->current()->STS_ID() === EEM_Message::status_incomplete ) {
-			$this->current()->set_generation_data( $data );
-			$this->current()->set_field_or_extra_meta( 'data_handler_class_name', $data_handler_class_name );
+		$data_handler_class_name = isset($info['data_handler_class_name']) ? $info['data_handler_class_name'] : '';
+		$data = isset($info['data']) && isset($info['data']['MSG_generation_data']) ? $info['data']['MSG_generation_data'] : array();
+		if ($data && $this->current()->STS_ID() === EEM_Message::status_incomplete) {
+			$this->current()->set_generation_data($data);
+			$this->current()->set_field_or_extra_meta('data_handler_class_name', $data_handler_class_name);
 		}
 	}
 
@@ -235,15 +235,15 @@ 
 	 * @param array $status the optional status(es) that will also be filtered by when priority matches.
 	 * @return int  count of messages in the queue matching the conditions.
 	 */
-	public function count_by_priority_and_status( $priority, $status = array() ) {
-		if ( ! empty( $status ) ) {
-			$status = is_array( $status ) ? $status : array( $status );
+	public function count_by_priority_and_status($priority, $status = array()) {
+		if ( ! empty($status)) {
+			$status = is_array($status) ? $status : array($status);
 		}
 
 		$count = 0;
 		$this->rewind();
-		while ( $this->valid() ) {
-			if ( $this->current()->priority() === $priority && ( ( $status && in_array( $this->current()->STS_ID(), $status ) ) || ! $status ) ) {
+		while ($this->valid()) {
+			if ($this->current()->priority() === $priority && (($status && in_array($this->current()->STS_ID(), $status)) || ! $status)) {
 				$count++;
 			}
 			$this->next();

core/libraries/messages/EE_Message_Template_Group_Collection.lib.php

Spacing +14 added lines, -14 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -28,14 +28,14 @@ 
 	 *                       indexing the template by key.
 	 * @return bool
 	 */
-	public function add( $message_template_group, $EVT_ID = null ) {
-		if ( $message_template_group instanceof $this->interface ) {
-			$data[ 'key' ] = $this->get_key(
+	public function add($message_template_group, $EVT_ID = null) {
+		if ($message_template_group instanceof $this->interface) {
+			$data['key'] = $this->get_key(
 				$message_template_group->messenger(),
 				$message_template_group->message_type(),
 				$EVT_ID
 			);
-			return parent::add( $message_template_group, $data );
+			return parent::add($message_template_group, $data);
 		}
 		return false;
 	}
@@ -48,10 +48,10 @@ 
 	 * @param $GRP_ID
 	 * @return EE_Message_Template_Group | null
 	 */
-	public function get_by_ID( $GRP_ID ) {
+	public function get_by_ID($GRP_ID) {
 		$this->rewind();
-		while ( $this->valid() ) {
-			if ( $this->current()->ID() === $GRP_ID ) {
+		while ($this->valid()) {
+			if ($this->current()->ID() === $GRP_ID) {
 				$grp = $this->current();
 				$this->rewind();
 				return $grp;
@@ -73,8 +73,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function get_key( $messenger, $message_type, $EVT_ID = 0 ) {
-		return md5( $messenger.$message_type.$EVT_ID );
+	public function get_key($messenger, $message_type, $EVT_ID = 0) {
+		return md5($messenger.$message_type.$EVT_ID);
 	}
 
 
@@ -86,11 +86,11 @@ 
 	 *
 	 * @return null|EE_Message_Template_Group
 	 */
-	public function get_by_key( $key ) {
+	public function get_by_key($key) {
 		$this->rewind();
-		while ( $this->valid() ) {
+		while ($this->valid()) {
 			$data = $this->getInfo();
-			if ( isset( $data['key'] ) && $data['key'] === $key ) {
+			if (isset($data['key']) && $data['key'] === $key) {
 				$handler = $this->current();
 				$this->rewind();
 				return $handler;

Doc Comments +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 
 	/**
 	 * This retrieves any EE_Message_Template_Group in the repo by its ID.
-	 * @param $GRP_ID
+	 * @param integer $GRP_ID
 	 * @return EE_Message_Template_Group | null
 	 */
 	public function get_by_ID( $GRP_ID ) {

core/libraries/messages/EE_Message_To_Generate_From_Queue.php

Spacing +9 added lines, -9 removed lines

@@ -25,12 +25,12 @@ 
 	 * @param EE_Messages_Queue $queue
 	 * @param string            $custom_subject  Used if a custom subject is desired for the generated aggregate EE_Message object
 	 */
-	public function __construct( $messenger_name, $message_type_name, EE_Messages_Queue $queue, $custom_subject = '' ) {
+	public function __construct($messenger_name, $message_type_name, EE_Messages_Queue $queue, $custom_subject = '') {
 		$this->queue = $queue;
-		parent::__construct( $messenger_name, $message_type_name, array(), '', false, EEM_Message::status_idle );
-		if ( $this->valid() ) {
-			$this->_message->set_content( $this->_get_content() );
-			$this->_message->set_subject( $this->_get_subject( $custom_subject ) );
+		parent::__construct($messenger_name, $message_type_name, array(), '', false, EEM_Message::status_idle);
+		if ($this->valid()) {
+			$this->_message->set_content($this->_get_content());
+			$this->_message->set_subject($this->_get_subject($custom_subject));
 		}
 	}
 
@@ -44,7 +44,7 @@ 
 	protected function _get_content() {
 		$content = '';
 		$this->queue->get_queue()->rewind();
-		while ( $this->queue->get_queue()->valid() ) {
+		while ($this->queue->get_queue()->valid()) {
 			$content .= $this->queue->get_queue()->current()->content();
 			$this->queue->get_queue()->next();
 		}
@@ -58,15 +58,15 @@ 
 	 *
 	 * @return string
 	 */
-	protected function _get_subject( $custom_subject = '' ) {
-		if ( ! empty( $custom_subject ) ) {
+	protected function _get_subject($custom_subject = '') {
+		if ( ! empty($custom_subject)) {
 			return $custom_subject;
 		}
 		$this->queue->get_queue()->rewind();
 		$count_of_items = $this->queue->get_queue()->count();
 
 		//if $count of items in queue == 1, then let's just return the subject for that item.
-		if ( $count_of_items === 1 ) {
+		if ($count_of_items === 1) {
 			return $this->queue->get_queue()->current()->subject();
 		}
 

core/libraries/messages/EE_Message_Type_Collection_Loader.lib.php

Spacing +19 added lines, -19 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -31,8 +31,8 @@ 
 	 *
 	 * @param EE_Message_Type_Collection $message_types
 	 */
-	public function __construct( EE_Message_Type_Collection $message_types ) {
-		$this->set_message_type_collection( $message_types );
+	public function __construct(EE_Message_Type_Collection $message_types) {
+		$this->set_message_type_collection($message_types);
 	}
 
 
@@ -49,7 +49,7 @@ 
 	/**
 	 * @param mixed $message_types
 	 */
-	public function set_message_type_collection( EE_Message_Type_Collection $message_types ) {
+	public function set_message_type_collection(EE_Message_Type_Collection $message_types) {
 		$this->_message_type_collection = $message_types;
 	}
 
@@ -62,41 +62,41 @@ 
 	 * @param  string $folder
 	 * @throws \EE_Error
 	 */
-	public function load_message_types_from_folder( $folder = '' ) {
+	public function load_message_types_from_folder($folder = '') {
 		//make sure autoloaders are set (fail-safe)
 		EED_Messages::set_autoloaders();
-		$folder = ! empty( $folder ) ? $folder : EE_LIBRARIES . 'messages' . DS . 'message_type';
-		$folder .= $folder[ strlen( $folder ) - 1 ] != DS ? DS : '';
+		$folder = ! empty($folder) ? $folder : EE_LIBRARIES.'messages'.DS.'message_type';
+		$folder .= $folder[strlen($folder) - 1] != DS ? DS : '';
 		// get all the files in that folder that end in ".class.php
 		$filepaths = apply_filters(
 			'FHEE__EE_messages__get_installed__messagetype_files',
-			glob( $folder . '*.class.php' )
+			glob($folder.'*.class.php')
 		);
-		if ( empty( $filepaths ) ) {
+		if (empty($filepaths)) {
 			return;
 		}
-		foreach ( (array) $filepaths as $file_path ) {
+		foreach ((array) $filepaths as $file_path) {
 			// extract filename from path
-			$file_path = basename( $file_path );
+			$file_path = basename($file_path);
 			// now remove any file extensions
-			$message_type_class_name = substr( $file_path, 0, strpos( $file_path, '.' ) );
+			$message_type_class_name = substr($file_path, 0, strpos($file_path, '.'));
 
 			//if this class name doesn't represent a message type class, then we just skip.
-			if ( strpos( strtolower( $message_type_class_name ), 'message_type' ) === false ) {
+			if (strpos(strtolower($message_type_class_name), 'message_type') === false) {
 				continue;
 			}
 
-			if ( ! class_exists( $message_type_class_name ) ) {
+			if ( ! class_exists($message_type_class_name)) {
 				throw new EE_Error(
 					sprintf(
-						__( 'The "%1$s" message type class can\'t be loaded from %2$s. Likely there is a typo in the class name or the file name.', 'event_espresso' ),
+						__('The "%1$s" message type class can\'t be loaded from %2$s. Likely there is a typo in the class name or the file name.', 'event_espresso'),
 						$message_type_class_name,
 						$file_path
 					)
 				);
 			}
 
-			$this->_load_message_type( new $message_type_class_name );
+			$this->_load_message_type(new $message_type_class_name);
 		}
 	}
 
@@ -106,8 +106,8 @@ 
 	 * @param EE_message_type $message_type
 	 * @return bool
 	 */
-	protected function _load_message_type( EE_message_type $message_type ) {
-		if ( $this->message_type_collection()->has_by_name( $message_type->name ) ) {
+	protected function _load_message_type(EE_message_type $message_type) {
+		if ($this->message_type_collection()->has_by_name($message_type->name)) {
 			return true;
 		}
 		return $this->message_type_collection()->add(

Doc Comments +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 
 
 	/**
-	 * @param mixed $message_types
+	 * @param EE_Message_Type_Collection $message_types
 	 */
 	public function set_message_type_collection( EE_Message_Type_Collection $message_types ) {
 		$this->_message_type_collection = $message_types;

core/libraries/messages/EE_Messages_Base.lib.php

Spacing +21 added lines, -21 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -184,9 +184,9 @@ 
 	 * @access protected
 	 * @param string $messenger
 	 */
-	protected function _set_existing_admin_settings( $messenger = '' ) {
+	protected function _set_existing_admin_settings($messenger = '') {
 		/** @var 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');
 		$active_messengers = $Message_Resource_Manager->get_active_messengers_option();
 		$settings_to_use = $active_messengers;
 
@@ -194,14 +194,14 @@ 
 		 * This determines what will be used for the getting the settings.
 		 */
 		if (
-			! empty( $messenger )
-			&& $Message_Resource_Manager->is_message_type_active_for_messenger( $messenger, $this->name )
+			! empty($messenger)
+			&& $Message_Resource_Manager->is_message_type_active_for_messenger($messenger, $this->name)
 		) {
-			$settings_to_use = $active_messengers[ $messenger ]['settings'][ $messenger . '-message_types' ];
+			$settings_to_use = $active_messengers[$messenger]['settings'][$messenger.'-message_types'];
 		}
 
-		$this->_existing_admin_settings = isset( $settings_to_use[ $this->name ]['settings'] )
-			? $settings_to_use[ $this->name ]['settings']
+		$this->_existing_admin_settings = isset($settings_to_use[$this->name]['settings'])
+			? $settings_to_use[$this->name]['settings']
 			: null;
 	}
 
@@ -218,12 +218,12 @@ 
 	 * @param string $messenger
 	 * @return array          settings
 	 */
-	public function get_existing_admin_settings( $messenger = '' ) {
+	public function get_existing_admin_settings($messenger = '') {
 		// if admin_settings property empty lets try setting it.
-		if ( method_exists($this, '_set_existing_admin_settings') && empty( $this->_existing_admin_settings ) ) {
-			$this->_set_existing_admin_settings( $messenger );
+		if (method_exists($this, '_set_existing_admin_settings') && empty($this->_existing_admin_settings)) {
+			$this->_set_existing_admin_settings($messenger);
 		}
-		return property_exists( $this, '_existing_admin_settings' )
+		return property_exists($this, '_existing_admin_settings')
 			? $this->_existing_admin_settings
 			: null;
 	}
@@ -239,12 +239,12 @@ 
 	 */
 	public function get_valid_shortcodes() {
 		$valid_shortcodes = apply_filters(
-			'FHEE__' . get_class( $this ) . '__get_valid_shortcodes',
+			'FHEE__'.get_class($this).'__get_valid_shortcodes',
 			$this->_valid_shortcodes,
 			$this
 		);
 		//The below filter applies to ALL messengers and message types so use with care!
-		$valid_shortcodes = apply_filters( 'FHEE__EE_Messages_Base__get_valid_shortcodes', $valid_shortcodes, $this );
+		$valid_shortcodes = apply_filters('FHEE__EE_Messages_Base__get_valid_shortcodes', $valid_shortcodes, $this);
 		return $valid_shortcodes;
 	}
 
@@ -278,23 +278,23 @@ 
 	 * @access protected
 	 * @return string $content for page.
 	 */
-	protected function _get_admin_page_content( $page, $action, $extra, $actives ) {
+	protected function _get_admin_page_content($page, $action, $extra, $actives) {
 		//we can also further refine the context by action (if present).
-		if ( !empty($action) ) {
-			$page = $page . '_' . $action;
+		if ( ! empty($action)) {
+			$page = $page.'_'.$action;
 		}
 
-		if ( !isset( $this->admin_registered_pages[$page]) ){
+		if ( ! isset($this->admin_registered_pages[$page])) {
 			// todo: a place to throw an exception?
 			// We need to indicate there is no registered page so this function is not being called correctly.
 			return false;
 		}
 		//k made it here so let's call the method
 		$content = call_user_func_array(
-			array( $this, '_get_admin_content_' . $page ),
-			array( $actives, $extra )
+			array($this, '_get_admin_content_'.$page),
+			array($actives, $extra)
 		);
-		if ( $content === false ) {
+		if ($content === false) {
 			// todo this needs to be an exception once we've got exceptions in place.
 			return false;
 		}