eventespresso / event-espresso-core

caffeinated/payment_methods/Mijireh/templates/mijireh_settings_after_form.template.php

Indentation +6 added lines, -6 removed lines

@@ -1,12 +1,12 @@
 <?php if (!defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
- * mijireh_settings_after_form
- *
- * @package			Event Espresso
- * @subpackage
- * @author				Mike Nelson
- */
+	 * mijireh_settings_after_form
+	 *
+	 * @package			Event Espresso
+	 * @subpackage
+	 * @author				Mike Nelson
+	 */
 do_action('AHEE__EE_Mijireh__settings_end');
 ?><br/><?php
 // End of file mijireh_settings_after_form.template.php
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

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

Braces +2 added lines, -1 removed lines

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

core/EE_Cron_Tasks.core.php

Indentation +1 added lines, -1 removed lines

@@ -156,7 +156,7 @@
 	 * @param int $PAY_ID
 	 */
 	public static function setup_update_for_transaction_with_payment( $TXN_ID = 0, $PAY_ID = 0 ) {
-            do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID' );
+			do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID' );
 		if ( absint( $TXN_ID )) {
 			self::$_update_transactions_with_payment[ $TXN_ID ] = $PAY_ID;
 			add_action(

Spacing +63 added lines, -63 removed lines

@@ -28,7 +28,7 @@ 
 	 * @return EE_Cron_Tasks
 	 */
 	public static function instance() {
-		if ( ! self::$_instance instanceof EE_Cron_Tasks ) {
+		if ( ! self::$_instance instanceof EE_Cron_Tasks) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -41,28 +41,28 @@ 
 	 * @return EE_Cron_Tasks
 	 */
 	private function __construct() {
-		do_action( 'AHEE_log', __CLASS__, __FUNCTION__ );
+		do_action('AHEE_log', __CLASS__, __FUNCTION__);
 		// UPDATE TRANSACTION WITH PAYMENT
 		add_action(
 			'AHEE__EE_Cron_Tasks__update_transaction_with_payment_2',
-			array( 'EE_Cron_Tasks', 'setup_update_for_transaction_with_payment' ),
+			array('EE_Cron_Tasks', 'setup_update_for_transaction_with_payment'),
 			10, 2
 		);
 		// FINALIZE ABANDONED TRANSACTIONS
 		add_action(
 			'AHEE__EE_Cron_Tasks__finalize_abandoned_transactions',
-			array( 'EE_Cron_Tasks', 'check_for_abandoned_transactions' ),
+			array('EE_Cron_Tasks', 'check_for_abandoned_transactions'),
 			10, 1
 		);
 		// CLEAN OUT JUNK TRANSACTIONS AND RELATED DATA
 		add_action(
 				'AHEE__EE_Cron_Tasks__clean_up_junk_transactions',
-				array( 'EE_Cron_Tasks', 'clean_out_junk_transactions' )
+				array('EE_Cron_Tasks', 'clean_out_junk_transactions')
 		);
 		// logging
 		add_action(
 			'AHEE__EE_System__load_core_configuration__complete',
-			array( 'EE_Cron_Tasks', 'log_scheduled_ee_crons' )
+			array('EE_Cron_Tasks', 'log_scheduled_ee_crons')
 		);
 	}
 
@@ -78,17 +78,17 @@ 
 			'AHEE__EE_Cron_Tasks__finalize_abandoned_transactions',
 			'AHEE__EE_Cron_Tasks__clean_up_junk_transactions',
 		);
-		$crons = get_option( 'cron' );
-		if ( ! is_array( $crons ) ) {
+		$crons = get_option('cron');
+		if ( ! is_array($crons)) {
 			return;
 		}
-		foreach ( $crons as $timestamp => $cron ) {
-			foreach ( $ee_crons as $ee_cron ) {
-				if ( isset( $cron[ $ee_cron ] ) ) {
-					foreach ( $cron[ $ee_cron ] as $ee_cron_details ) {
-						do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $ee_cron, 'scheduled EE cron' );
-						if ( ! empty( $ee_cron_details[ 'args' ] )) {
-							do_action( 'AHEE_log', __CLASS__, __FUNCTION__, print_r( $ee_cron_details[ 'args' ], true ), "$ee_cron args" );
+		foreach ($crons as $timestamp => $cron) {
+			foreach ($ee_crons as $ee_cron) {
+				if (isset($cron[$ee_cron])) {
+					foreach ($cron[$ee_cron] as $ee_cron_details) {
+						do_action('AHEE_log', __CLASS__, __FUNCTION__, $ee_cron, 'scheduled EE cron');
+						if ( ! empty($ee_cron_details['args'])) {
+							do_action('AHEE_log', __CLASS__, __FUNCTION__, print_r($ee_cron_details['args'], true), "$ee_cron args");
 						}
 					}
 				}
@@ -125,15 +125,15 @@ 
 		$TXN_ID,
 		$PAY_ID
 	) {
-		do_action( 'AHEE_log', __CLASS__, __FUNCTION__ );
+		do_action('AHEE_log', __CLASS__, __FUNCTION__);
 		// validate $TXN_ID and $timestamp
-		$TXN_ID = absint( $TXN_ID );
-		$timestamp = absint( $timestamp );
-		if ( $TXN_ID && $timestamp ) {
+		$TXN_ID = absint($TXN_ID);
+		$timestamp = absint($timestamp);
+		if ($TXN_ID && $timestamp) {
 			wp_schedule_single_event(
 				$timestamp,
 				'AHEE__EE_Cron_Tasks__update_transaction_with_payment_2',
-				array( $TXN_ID, $PAY_ID )
+				array($TXN_ID, $PAY_ID)
 			);
 		}
 	}
@@ -155,13 +155,13 @@ 
 	 * @param int  $TXN_ID
 	 * @param int $PAY_ID
 	 */
-	public static function setup_update_for_transaction_with_payment( $TXN_ID = 0, $PAY_ID = 0 ) {
-            do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID' );
-		if ( absint( $TXN_ID )) {
-			self::$_update_transactions_with_payment[ $TXN_ID ] = $PAY_ID;
+	public static function setup_update_for_transaction_with_payment($TXN_ID = 0, $PAY_ID = 0) {
+            do_action('AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID');
+		if (absint($TXN_ID)) {
+			self::$_update_transactions_with_payment[$TXN_ID] = $PAY_ID;
 			add_action(
 				'shutdown',
-				array( 'EE_Cron_Tasks', 'update_transaction_with_payment' ),
+				array('EE_Cron_Tasks', 'update_transaction_with_payment'),
 				5
 			);
 		}
@@ -178,18 +178,18 @@ 
 	 * returning from an off-site payment gateway
 	 */
 	public static function update_transaction_with_payment() {
-		do_action( 'AHEE_log', __CLASS__, __FUNCTION__ );
+		do_action('AHEE_log', __CLASS__, __FUNCTION__);
 		// are there any TXNs that need cleaning up ?
-		if ( ! empty( self::$_update_transactions_with_payment ) ) {
+		if ( ! empty(self::$_update_transactions_with_payment)) {
 			/** @type EE_Payment_Processor $payment_processor */
-			$payment_processor = EE_Registry::instance()->load_core( 'Payment_Processor' );
+			$payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
 			// set revisit flag for payment processor
-			$payment_processor->set_revisit( false );
+			$payment_processor->set_revisit(false);
 			// load EEM_Transaction
-			EE_Registry::instance()->load_model( 'Transaction' );
-			foreach ( self::$_update_transactions_with_payment as $TXN_ID => $PAY_ID ) {
+			EE_Registry::instance()->load_model('Transaction');
+			foreach (self::$_update_transactions_with_payment as $TXN_ID => $PAY_ID) {
 				// reschedule the cron if we can't hit the db right now
-				if ( ! EE_Maintenance_Mode::instance()->models_can_query() ) {
+				if ( ! EE_Maintenance_Mode::instance()->models_can_query()) {
 					// reset cron job for updating the TXN
 					EE_Cron_Tasks::schedule_update_transaction_with_payment(
 						time() + EE_Cron_Tasks::reschedule_timeout,
@@ -198,15 +198,15 @@ 
 					);
 					continue;
 				}
-				$transaction = EEM_Transaction::instance()->get_one_by_ID( $TXN_ID );
-				$payment = EEM_Payment::instance()->get_one_by_ID( $PAY_ID );
+				$transaction = EEM_Transaction::instance()->get_one_by_ID($TXN_ID);
+				$payment = EEM_Payment::instance()->get_one_by_ID($PAY_ID);
 				// verify transaction
-				if ( $transaction instanceof EE_Transaction &&
-						$payment instanceof EE_Payment ) {
+				if ($transaction instanceof EE_Transaction &&
+						$payment instanceof EE_Payment) {
 					// now try to update the TXN with any payments
-					$payment_processor->update_txn_based_on_payment( $transaction, $payment, true, true );
+					$payment_processor->update_txn_based_on_payment($transaction, $payment, true, true);
 				}
-				unset( self::$_update_transactions_with_payment[ $TXN_ID ] );
+				unset(self::$_update_transactions_with_payment[$TXN_ID]);
 			}
 		}
 	}
@@ -243,14 +243,14 @@ 
 		$TXN_ID
 	) {
 		// validate $TXN_ID and $timestamp
-		$TXN_ID = absint( $TXN_ID );
-		$timestamp = absint( $timestamp );
-		do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID' );
-		if ( $TXN_ID && $timestamp ) {
+		$TXN_ID = absint($TXN_ID);
+		$timestamp = absint($timestamp);
+		do_action('AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID');
+		if ($TXN_ID && $timestamp) {
 			wp_schedule_single_event(
 				$timestamp,
 				'AHEE__EE_Cron_Tasks__finalize_abandoned_transactions',
-				array( $TXN_ID )
+				array($TXN_ID)
 			);
 		}
 	}
@@ -272,13 +272,13 @@ 
 	 *
 	 * @param int $TXN_ID
 	 */
-	public static function check_for_abandoned_transactions(	$TXN_ID = 0 ) {
-		do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID' );
-		if ( absint( $TXN_ID )) {
-			self::$_abandoned_transactions[]  = $TXN_ID;
+	public static function check_for_abandoned_transactions($TXN_ID = 0) {
+		do_action('AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID');
+		if (absint($TXN_ID)) {
+			self::$_abandoned_transactions[] = $TXN_ID;
 			add_action(
 				'shutdown',
-				array( 'EE_Cron_Tasks', 'finalize_abandoned_transactions' ),
+				array('EE_Cron_Tasks', 'finalize_abandoned_transactions'),
 				5
 			);
 		}
@@ -295,21 +295,21 @@ 
 	 * returning from an off-site payment gateway
 	 */
 	public static function finalize_abandoned_transactions() {
-		do_action( 'AHEE_log', __CLASS__, __FUNCTION__ );
+		do_action('AHEE_log', __CLASS__, __FUNCTION__);
 		// are there any TXNs that need cleaning up ?
-		if ( ! empty( self::$_abandoned_transactions ) ) {
+		if ( ! empty(self::$_abandoned_transactions)) {
 			/** @type EE_Transaction_Processor $transaction_processor */
-			$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+			$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 			// set revisit flag for txn processor
-			$transaction_processor->set_revisit( false );
+			$transaction_processor->set_revisit(false);
 			/** @type EE_Payment_Processor $payment_processor */
-			$payment_processor = EE_Registry::instance()->load_core( 'Payment_Processor' );
+			$payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
 			// load EEM_Transaction
-			EE_Registry::instance()->load_model( 'Transaction' );
-			foreach ( self::$_abandoned_transactions as $TXN_ID ) {
-				do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID' );
+			EE_Registry::instance()->load_model('Transaction');
+			foreach (self::$_abandoned_transactions as $TXN_ID) {
+				do_action('AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID');
 				// reschedule the cron if we can't hit the db right now
-				if ( ! EE_Maintenance_Mode::instance()->models_can_query() ) {
+				if ( ! EE_Maintenance_Mode::instance()->models_can_query()) {
 					// reset cron job for finalizing the TXN
 					EE_Cron_Tasks::schedule_finalize_abandoned_transactions_check(
 						time() + EE_Cron_Tasks::reschedule_timeout,
@@ -317,17 +317,17 @@ 
 					);
 					continue;
 				}
-				$transaction = EEM_Transaction::instance()->get_one_by_ID( $TXN_ID );
+				$transaction = EEM_Transaction::instance()->get_one_by_ID($TXN_ID);
 				// verify transaction
-				if ( $transaction instanceof EE_Transaction ) {
+				if ($transaction instanceof EE_Transaction) {
 					// don't finalize the TXN if it has already been completed
-					if ( $transaction_processor->all_reg_steps_completed( $transaction ) === true ) {
+					if ($transaction_processor->all_reg_steps_completed($transaction) === true) {
 						continue;
 					}
 					// let's simulate an IPN here which will trigger any notifications that need to go out
-					$payment_processor->update_txn_based_on_payment( $transaction, $transaction->last_payment(), true, true );
+					$payment_processor->update_txn_based_on_payment($transaction, $transaction->last_payment(), true, true);
 				}
-				unset( self::$_abandoned_transactions[ $TXN_ID ] );
+				unset(self::$_abandoned_transactions[$TXN_ID]);
 			}
 		}
 	}
@@ -343,7 +343,7 @@ 
 	//when a transaction is initially made, schedule this check.
 	//if it has NO REG data by the time it has expired, forget about it
 	public static function clean_out_junk_transactions() {
-		if( EE_Maintenance_Mode::instance()->models_can_query() ) {
+		if (EE_Maintenance_Mode::instance()->models_can_query()) {
 			EEM_Transaction::instance('')->delete_junk_transactions();
 			EEM_Registration::instance('')->delete_registrations_with_no_transaction();
 			EEM_Line_Item::instance('')->delete_line_items_with_no_transaction();

core/db_classes/EE_Question.class.php

Indentation +14 added lines, -14 removed lines

@@ -2,18 +2,18 @@ 
 	exit( 'No direct script access allowed' );
 }
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package 		Event Espresso
- * @ author 		Event Espresso
- * @ copyright 	(c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license 		{@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
- * @ link 				{@link http://www.eventespresso.com}
- * @ since 			4.0
- *
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package 		Event Espresso
+	 * @ author 		Event Espresso
+	 * @ copyright 	(c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license 		{@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
+	 * @ link 				{@link http://www.eventespresso.com}
+	 * @ since 			4.0
+	 *
+	 */
 
 
 
@@ -445,8 +445,8 @@ 
 		$new_question->set_admin_label( sprintf( __( '%s **Duplicate**', 'event_espresso' ), $this->admin_label() ) );
 		$new_question->set_system_ID( null );
 		$new_question->set_wp_user( get_current_user_id() );
-                //if we're duplicating a trashed question, assume we don't want the new one to be trashed
-                $new_question->set_deleted( false );
+				//if we're duplicating a trashed question, assume we don't want the new one to be trashed
+				$new_question->set_deleted( false );
 		$success = $new_question->save();
 		if( $success ) {
 			//we don't totally want to duplicate the question options, because we want them to be for the NEW question

Doc Comments +10 added lines, -10 removed lines

@@ -184,7 +184,7 @@ 
 	/**
 	 * returns the text for displaying the question to users
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function display_text() {
 		return $this->get( 'QST_display_text' );
@@ -195,7 +195,7 @@ 
 	/**
 	 * returns the text for the administrative label
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function admin_label() {
 		return $this->get( 'QST_admin_label' );
@@ -206,7 +206,7 @@ 
 	/**
 	 * returns the attendee column name for this question
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function system_ID() {
 		return $this->get( 'QST_system' );
@@ -229,7 +229,7 @@ 
 	 * returns the text which should be displayed when a user
 	 * doesn't answer this question in a form
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function required_text() {
 		return $this->get( 'QST_required_text' );
@@ -240,7 +240,7 @@ 
 	/**
 	 * returns the type of this question
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function type() {
 		return $this->get( 'QST_type' );
@@ -252,7 +252,7 @@ 
 	 * returns an integer showing where this question should
 	 * be placed in a sequence of questions
 	 * @access public
-	 * @return int
+	 * @return boolean
 	 */
 	public function order() {
 		return $this->get( 'QST_order' );
@@ -275,7 +275,7 @@ 
 	/**
 	 * returns the id the wordpress user who created this question
 	 * @access public
-	 * @return int
+	 * @return boolean
 	 */
 	public function wp_user() {
 		return $this->get( 'QST_wp_user' );
@@ -369,7 +369,7 @@ 
 	 * Adds an option for this question. Note: if the option were previously associated with a different
 	 * Question, that relationship will be overwritten.
 	 * @param EE_Question_Option $option
-	 * @return boolean success
+	 * @return EE_Base_Class success
 	 */
 	public function add_option( EE_Question_Option $option ) {
 		return $this->_add_relation_to( $option, 'Question_Option' );
@@ -392,7 +392,7 @@ 
 	/**
 	 * Marks the option as deleted.
 	 * @param EE_Question_Option $option
-	 * @return boolean success
+	 * @return EE_Base_Class success
 	 */
 	public function remove_option( EE_Question_Option $option ) {
 		return $this->_remove_relation_to( $option, 'Question_Option' );
@@ -461,7 +461,7 @@ 
 	
 	/**
 	 * Returns the question's maximum allowed response size
-	 * @return int|float
+	 * @return boolean
 	 */
 	public function max() {
 		return $this->get( 'QST_max' );

Braces +1 added lines, -1 removed lines

@@ -459,7 +459,7 @@
 				//must be explicit because schema could equal true.
 				if( $schema === 'no_html' ){
 					$timezone_string = ' (' . $DateTime->format( 'T' )  . ')';
-				}else{
+				} else{
 					$timezone_string = ' <span class="ee_dtt_timezone_string">(' . $DateTime->format( 'T' ) . ')</span>';
 				}
 			} else {

Spacing +103 added lines, -103 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
@@ -37,9 +37,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Question
 	 */
-	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);
 	}
 
 
@@ -50,8 +50,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Question
 	 */
-	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);
 	}
 
 
@@ -62,8 +62,8 @@ 
 	 * @access        public
 	 * @param string $QST_display_text
 	 */
-	public function set_display_text( $QST_display_text = '' ) {
-		$this->set( 'QST_display_text', $QST_display_text );
+	public function set_display_text($QST_display_text = '') {
+		$this->set('QST_display_text', $QST_display_text);
 	}
 
 
@@ -74,8 +74,8 @@ 
 	 * @access        public
 	 * @param        string $QST_admin_label
 	 */
-	public function set_admin_label( $QST_admin_label = '' ) {
-		$this->set( 'QST_admin_label', $QST_admin_label );
+	public function set_admin_label($QST_admin_label = '') {
+		$this->set('QST_admin_label', $QST_admin_label);
 	}
 
 
@@ -86,8 +86,8 @@ 
 	 * @access        public
 	 * @param        mixed $QST_system
 	 */
-	public function set_system_ID( $QST_system = '' ) {
-		$this->set( 'QST_system', $QST_system );
+	public function set_system_ID($QST_system = '') {
+		$this->set('QST_system', $QST_system);
 	}
 
 
@@ -98,8 +98,8 @@ 
 	 * @access        public
 	 * @param        string $QST_type
 	 */
-	public function set_question_type( $QST_type = '' ) {
-		$this->set( 'QST_type', $QST_type );
+	public function set_question_type($QST_type = '') {
+		$this->set('QST_type', $QST_type);
 	}
 
 
@@ -110,8 +110,8 @@ 
 	 * @access        public
 	 * @param        bool $QST_required
 	 */
-	public function set_required( $QST_required = FALSE ) {
-		$this->set( 'QST_required', $QST_required );
+	public function set_required($QST_required = FALSE) {
+		$this->set('QST_required', $QST_required);
 	}
 
 
@@ -122,8 +122,8 @@ 
 	 * @access        public
 	 * @param        string $QST_required_text
 	 */
-	public function set_required_text( $QST_required_text = '' ) {
-		$this->set( 'QST_required_text', $QST_required_text );
+	public function set_required_text($QST_required_text = '') {
+		$this->set('QST_required_text', $QST_required_text);
 	}
 
 
@@ -134,8 +134,8 @@ 
 	 * @access        public
 	 * @param        int $QST_order
 	 */
-	public function set_order( $QST_order = 0 ) {
-		$this->set( 'QST_order', $QST_order );
+	public function set_order($QST_order = 0) {
+		$this->set('QST_order', $QST_order);
 	}
 
 
@@ -146,8 +146,8 @@ 
 	 * @access        public
 	 * @param        bool $QST_admin_only
 	 */
-	public function set_admin_only( $QST_admin_only = FALSE ) {
-		$this->set( 'QST_admin_only', $QST_admin_only );
+	public function set_admin_only($QST_admin_only = FALSE) {
+		$this->set('QST_admin_only', $QST_admin_only);
 	}
 
 
@@ -158,8 +158,8 @@ 
 	 * @access        public
 	 * @param        int $QST_wp_user
 	 */
-	public function set_wp_user( $QST_wp_user = 1 ) {
-		$this->set( 'QST_wp_user', $QST_wp_user );
+	public function set_wp_user($QST_wp_user = 1) {
+		$this->set('QST_wp_user', $QST_wp_user);
 	}
 
 
@@ -175,8 +175,8 @@ 
 	 * @access        public
 	 * @param 	bool $QST_deleted
 	 */
-	public function set_deleted( $QST_deleted = FALSE ) {
-		$this->set( 'QST_deleted', $QST_deleted );
+	public function set_deleted($QST_deleted = FALSE) {
+		$this->set('QST_deleted', $QST_deleted);
 	}
 
 
@@ -187,7 +187,7 @@ 
 	 * @return string
 	 */
 	public function display_text() {
-		return $this->get( 'QST_display_text' );
+		return $this->get('QST_display_text');
 	}
 
 
@@ -198,7 +198,7 @@ 
 	 * @return string
 	 */
 	public function admin_label() {
-		return $this->get( 'QST_admin_label' );
+		return $this->get('QST_admin_label');
 	}
 
 
@@ -209,7 +209,7 @@ 
 	 * @return string
 	 */
 	public function system_ID() {
-		return $this->get( 'QST_system' );
+		return $this->get('QST_system');
 	}
 
 
@@ -220,7 +220,7 @@ 
 	 * @return boolean
 	 */
 	public function required() {
-		return $this->get( 'QST_required' );
+		return $this->get('QST_required');
 	}
 
 
@@ -232,7 +232,7 @@ 
 	 * @return string
 	 */
 	public function required_text() {
-		return $this->get( 'QST_required_text' );
+		return $this->get('QST_required_text');
 	}
 
 
@@ -243,7 +243,7 @@ 
 	 * @return string
 	 */
 	public function type() {
-		return $this->get( 'QST_type' );
+		return $this->get('QST_type');
 	}
 
 
@@ -255,7 +255,7 @@ 
 	 * @return int
 	 */
 	public function order() {
-		return $this->get( 'QST_order' );
+		return $this->get('QST_order');
 	}
 
 
@@ -267,7 +267,7 @@ 
 	 * @return boolean
 	 */
 	public function admin_only() {
-		return $this->get( 'QST_admin_only' );
+		return $this->get('QST_admin_only');
 	}
 
 
@@ -278,7 +278,7 @@ 
 	 * @return int
 	 */
 	public function wp_user() {
-		return $this->get( 'QST_wp_user' );
+		return $this->get('QST_wp_user');
 	}
 
 
@@ -289,7 +289,7 @@ 
 	 * @return boolean
 	 */
 	public function deleted() {
-		return $this->get( 'QST_deleted' );
+		return $this->get('QST_deleted');
 	}
 
 
@@ -299,7 +299,7 @@ 
 	 * @return EE_Answer[]
 	 */
 	public function answers() {
-		return $this->get_many_related( 'Answer' );
+		return $this->get_many_related('Answer');
 	}
 
 
@@ -309,7 +309,7 @@ 
 	 * @return boolean true = has answers, false = no answers.
 	 */
 	public function has_answers() {
-		return $this->count_related( 'Answer' ) > 0 ? TRUE : FALSE;
+		return $this->count_related('Answer') > 0 ? TRUE : FALSE;
 	}
 
 
@@ -319,7 +319,7 @@ 
 	 * @return EE_Question_Group[]
 	 */
 	public function question_groups() {
-		return $this->get_many_related( 'Question_Group' );
+		return $this->get_many_related('Question_Group');
 	}
 
 
@@ -333,24 +333,24 @@ 
 	 *                                                       whether it was trashed or not.
 	 * @return EE_Question_Option[]
 	 */
-	public function options( $notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL ) {
-		if ( ! $this->ID() ) {
+	public function options($notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL) {
+		if ( ! $this->ID()) {
 			return array();
 		}
 		$query_params = array();
-		if ( $selected_value_to_always_include ) {
-			if ( is_array( $selected_value_to_always_include ) ) {
-				$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_value' ] = array( 'IN', $selected_value_to_always_include );
+		if ($selected_value_to_always_include) {
+			if (is_array($selected_value_to_always_include)) {
+				$query_params[0]['OR*options-query']['QSO_value'] = array('IN', $selected_value_to_always_include);
 			} else {
-				$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_value' ] = $selected_value_to_always_include;
+				$query_params[0]['OR*options-query']['QSO_value'] = $selected_value_to_always_include;
 			}
 		}
-		if ( $notDeletedOptionsOnly ) {
-			$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_deleted' ] = FALSE;
+		if ($notDeletedOptionsOnly) {
+			$query_params[0]['OR*options-query']['QSO_deleted'] = FALSE;
 		}
 		//order by QSO_order
-		$query_params[ 'order_by' ] = array( 'QSO_order' => 'ASC' );
-		return $this->get_many_related( 'Question_Option', $query_params );
+		$query_params['order_by'] = array('QSO_order' => 'ASC');
+		return $this->get_many_related('Question_Option', $query_params);
 	}
 
 
@@ -360,7 +360,7 @@ 
 	 * @return \EE_Question_Option[]
 	 */
 	public function temp_options() {
-		return $this->_model_relations[ 'Question_Option' ];
+		return $this->_model_relations['Question_Option'];
 	}
 
 
@@ -371,8 +371,8 @@ 
 	 * @param EE_Question_Option $option
 	 * @return boolean success
 	 */
-	public function add_option( EE_Question_Option $option ) {
-		return $this->_add_relation_to( $option, 'Question_Option' );
+	public function add_option(EE_Question_Option $option) {
+		return $this->_add_relation_to($option, 'Question_Option');
 	}
 
 
@@ -382,8 +382,8 @@ 
 	 * @param EE_Question_Option $option
 	 * @return boolean success
 	 */
-	public function add_temp_option( EE_Question_Option $option ) {
-		$this->_model_relations[ 'Question_Option' ][ ] = $option;
+	public function add_temp_option(EE_Question_Option $option) {
+		$this->_model_relations['Question_Option'][] = $option;
 		return TRUE;
 	}
 
@@ -394,8 +394,8 @@ 
 	 * @param EE_Question_Option $option
 	 * @return boolean success
 	 */
-	public function remove_option( EE_Question_Option $option ) {
-		return $this->_remove_relation_to( $option, 'Question_Option' );
+	public function remove_option(EE_Question_Option $option) {
+		return $this->_remove_relation_to($option, 'Question_Option');
 	}
 
 
@@ -404,8 +404,8 @@ 
 	 * @return bool
 	 */
 	public function is_system_question() {
-		$system_ID = $this->get( 'QST_system' );
-		return ! empty( $system_ID ) ? TRUE : FALSE;
+		$system_ID = $this->get('QST_system');
+		return ! empty($system_ID) ? TRUE : FALSE;
 	}
 
 
@@ -418,8 +418,8 @@ 
 	 */
 	public function set_order_to_latest() {
 		$latest_order = $this->get_model()->get_latest_question_order();
-		$latest_order ++;
-		$this->set( 'QST_order', $latest_order );
+		$latest_order++;
+		$this->set('QST_order', $latest_order);
 	}
 
 
@@ -438,20 +438,20 @@ 
 	 * Duplicates this question and its question options
 	 * @return \EE_Question
 	 */
-	public function duplicate( $options = array() ) {
+	public function duplicate($options = array()) {
 		$new_question = clone $this;
-		$new_question->set( 'QST_ID', null );
-		$new_question->set_display_text( sprintf( __( '%s **Duplicate**', 'event_espresso' ), $this->display_text() ) );
-		$new_question->set_admin_label( sprintf( __( '%s **Duplicate**', 'event_espresso' ), $this->admin_label() ) );
-		$new_question->set_system_ID( null );
-		$new_question->set_wp_user( get_current_user_id() );
+		$new_question->set('QST_ID', null);
+		$new_question->set_display_text(sprintf(__('%s **Duplicate**', 'event_espresso'), $this->display_text()));
+		$new_question->set_admin_label(sprintf(__('%s **Duplicate**', 'event_espresso'), $this->admin_label()));
+		$new_question->set_system_ID(null);
+		$new_question->set_wp_user(get_current_user_id());
                 //if we're duplicating a trashed question, assume we don't want the new one to be trashed
-                $new_question->set_deleted( false );
+                $new_question->set_deleted(false);
 		$success = $new_question->save();
-		if( $success ) {
+		if ($success) {
 			//we don't totally want to duplicate the question options, because we want them to be for the NEW question
-			foreach( $this->options() as $question_option ) {
-				$question_option->duplicate( array( 'QST_ID' => $new_question->ID() ) );
+			foreach ($this->options() as $question_option) {
+				$question_option->duplicate(array('QST_ID' => $new_question->ID()));
 			}
 			return $new_question;
 		} else {
@@ -464,7 +464,7 @@ 
 	 * @return int|float
 	 */
 	public function max() {
-		return $this->get( 'QST_max' );
+		return $this->get('QST_max');
 	}
 
 	/**
@@ -472,8 +472,8 @@ 
 	 * @param int|float $new_max
 	 * @return void
 	 */
-	public function set_max( $new_max ) {
-		$this->set( 'QST_max', $new_max );
+	public function set_max($new_max) {
+		$this->set('QST_max', $new_max);
 	}
 
 
@@ -485,7 +485,7 @@ 
 	 * @param array $input_constructor_args
 	 * @return EE_Form_Input_Base
 	 */
-	public function generate_form_input( $registration = null, $answer = null, $input_constructor_args = array() ) {
+	public function generate_form_input($registration = null, $answer = null, $input_constructor_args = array()) {
 		$identifier = $this->is_system_question() ? $this->system_ID() : $this->ID();
 
 		$input_constructor_args = array_merge( 
@@ -496,27 +496,27 @@ 
 				),
 				$input_constructor_args
 			);
-		if( ! $answer instanceof EE_Answer && $registration instanceof EE_Registration ) {
-			$answer = EEM_Answer::instance()->get_registration_question_answer_object( $registration, $this->ID() );
+		if ( ! $answer instanceof EE_Answer && $registration instanceof EE_Registration) {
+			$answer = EEM_Answer::instance()->get_registration_question_answer_object($registration, $this->ID());
 		}
 		// has this question been answered ?
-		if ( $answer instanceof EE_Answer ) {
+		if ($answer instanceof EE_Answer) {
 			//answer gets htmlspecialchars called on it, undo that please
 			//beceause the form input's display strategy may call esc_attr too
 			//which also does html special characters
 			$values_with_html_special_chars = $answer->value();
-			if( is_array( $values_with_html_special_chars ) ) {
-				$default_value = array_map( 'htmlspecialchars_decode', $values_with_html_special_chars );
+			if (is_array($values_with_html_special_chars)) {
+				$default_value = array_map('htmlspecialchars_decode', $values_with_html_special_chars);
 			} else {
-				$default_value = htmlspecialchars_decode( $values_with_html_special_chars );
+				$default_value = htmlspecialchars_decode($values_with_html_special_chars);
 			}
 			$input_constructor_args['default'] = $default_value;
 		}
-		$max_max_for_question = EEM_Question::instance()->absolute_max_for_system_question( $this->system_ID() );
-		if( EEM_Question::instance()->question_type_is_in_category(  $this->type(), 'text' ) ) {
-			$input_constructor_args[ 'validation_strategies' ][] = new EE_Max_Length_Validation_Strategy(
+		$max_max_for_question = EEM_Question::instance()->absolute_max_for_system_question($this->system_ID());
+		if (EEM_Question::instance()->question_type_is_in_category($this->type(), 'text')) {
+			$input_constructor_args['validation_strategies'][] = new EE_Max_Length_Validation_Strategy(
 				null,
-				min( $max_max_for_question, $this->max() )
+				min($max_max_for_question, $this->max())
 			);
 		}
 		$input_constructor_args = apply_filters(
@@ -528,26 +528,26 @@ 
 		);
 
 		$result = null;
-		switch ( $this->type() ) {
+		switch ($this->type()) {
 			// Text
 			case EEM_Question::QST_type_text :
-				if( $identifier == 'email' ){
-					$result = new EE_Email_Input( $input_constructor_args );
-				}else{
-					$result = new EE_Text_Input( $input_constructor_args );
+				if ($identifier == 'email') {
+					$result = new EE_Email_Input($input_constructor_args);
+				} else {
+					$result = new EE_Text_Input($input_constructor_args);
 				}
 				break;
 			// Textarea
 			case EEM_Question::QST_type_textarea :
-				$result = new EE_Text_Area_Input( $input_constructor_args );
+				$result = new EE_Text_Area_Input($input_constructor_args);
 				break;
 			// Radio Buttons
 			case EEM_Question::QST_type_radio :
-				$result = new EE_Radio_Button_Input( $this->options(), $input_constructor_args );
+				$result = new EE_Radio_Button_Input($this->options(), $input_constructor_args);
 				break;
 			// Dropdown
 			case EEM_Question::QST_type_dropdown :
-				$result = new EE_Select_Input( $this->options(), $input_constructor_args );
+				$result = new EE_Select_Input($this->options(), $input_constructor_args);
 				break;
 			// State Dropdown
 			case EEM_Question::QST_type_state :
@@ -557,7 +557,7 @@ 
 					$this,
 					$registration,
 					$answer
-				);				$result = new EE_State_Select_Input( $state_options, $input_constructor_args );
+				); $result = new EE_State_Select_Input($state_options, $input_constructor_args);
 				break;
 			// Country Dropdown
 			case EEM_Question::QST_type_country :
@@ -568,20 +568,20 @@ 
 					$registration,
 					$answer
 				);
-				$result = new EE_Country_Select_Input( $country_options, $input_constructor_args );
+				$result = new EE_Country_Select_Input($country_options, $input_constructor_args);
 				break;
 			// Checkboxes
 			case EEM_Question::QST_type_checkbox :
-				$result = new EE_Checkbox_Multi_Input( $this->options(), $input_constructor_args );
+				$result = new EE_Checkbox_Multi_Input($this->options(), $input_constructor_args);
 				break;
 			// Date
 			case EEM_Question::QST_type_date :
-				$result = new EE_Datepicker_Input( $input_constructor_args );
+				$result = new EE_Datepicker_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_html_textarea :
-				$input_constructor_args[ 'validation_strategies' ][] = new EE_Simple_HTML_Validation_Strategy();
-				$input =  new EE_Text_Area_Input( $input_constructor_args );
-				$input->remove_validation_strategy( 'EE_Plaintext_Validation_Strategy' );
+				$input_constructor_args['validation_strategies'][] = new EE_Simple_HTML_Validation_Strategy();
+				$input = new EE_Text_Area_Input($input_constructor_args);
+				$input->remove_validation_strategy('EE_Plaintext_Validation_Strategy');
 				$result = $input;
 				break;
 			// fallback
@@ -593,12 +593,12 @@ 
 					$this,
 					$input_constructor_args
 				);
-				if( ! $default_input ){
-					$default_input = new EE_Text_Input( $input_constructor_args );
+				if ( ! $default_input) {
+					$default_input = new EE_Text_Input($input_constructor_args);
 				}
 				$result = $default_input;
 		}
-		return apply_filters( 'FHEE__EE_Question__generate_form_input__return', $result, $registration, $this, $answer );
+		return apply_filters('FHEE__EE_Question__generate_form_input__return', $result, $registration, $this, $answer);
 	}
 
 

core/db_models/EEM_Answer.model.php

Indentation +8 added lines, -8 removed lines

@@ -125,14 +125,14 @@
 	public function get_attendee_property_answer_value( EE_Registration $registration, $question_system_id = NULL, $pretty_answer = FALSE ){
 		$field_name = NULL;
 		$value = NULL;
-                //backward compat: we still want to find the question's ID
-                if( is_numeric( $question_system_id ) ) {
-                    //find this question's QST_system value
-                    $question_id = $question_system_id;
-                    $question_system_id = EEM_Question::instance()->get_var( array( array( 'QST_ID' => $question_system_id ) ), 'QST_system' );
-                } else {
-                    $question_id = intval( EEM_Question::instance()->get_var( array( array( 'QST_system' => $question_system_id ) ), 'QST_ID' ) );
-                }
+				//backward compat: we still want to find the question's ID
+				if( is_numeric( $question_system_id ) ) {
+					//find this question's QST_system value
+					$question_id = $question_system_id;
+					$question_system_id = EEM_Question::instance()->get_var( array( array( 'QST_ID' => $question_system_id ) ), 'QST_system' );
+				} else {
+					$question_id = intval( EEM_Question::instance()->get_var( array( array( 'QST_system' => $question_system_id ) ), 'QST_ID' ) );
+				}
 		//only bother checking if the registration has an attendee
 		if( $registration->attendee() instanceof EE_Attendee ) {
 			$field_name = EEM_Attendee::instance()->get_attendee_field_for_system_question( $question_system_id );

Spacing +35 added lines, -35 removed lines

@@ -51,18 +51,18 @@ 
 	/**
 	 * 	constructor
 	 */
-	protected function __construct( $timezone = NULL ){
-		$this->singular_item = __('Answer','event_espresso');
-		$this->plural_item = __('Answers','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Answer', 'event_espresso');
+		$this->plural_item = __('Answers', 'event_espresso');
 		$this->_tables = array(
 			'Answer'=> new EE_Primary_Table('esp_answer', 'ANS_ID')
 		);
 		$this->_fields = array(
 			'Answer'=>array(
-				'ANS_ID'=> new EE_Primary_Key_Int_Field('ANS_ID', __('Answer ID','event_espresso')),
-				'REG_ID'=>new EE_Foreign_Key_Int_Field('REG_ID', __('Registration ID','event_espresso'), false, 0, 'Registration'),
-				'QST_ID'=>new EE_Foreign_Key_Int_Field('QST_ID', __('Question ID','event_espresso'), false, 0, 'Question'),
-				'ANS_value'=>new EE_Maybe_Serialized_Simple_HTML_Field('ANS_value', __('Answer Value','event_espresso'), false, '')
+				'ANS_ID'=> new EE_Primary_Key_Int_Field('ANS_ID', __('Answer ID', 'event_espresso')),
+				'REG_ID'=>new EE_Foreign_Key_Int_Field('REG_ID', __('Registration ID', 'event_espresso'), false, 0, 'Registration'),
+				'QST_ID'=>new EE_Foreign_Key_Int_Field('QST_ID', __('Question ID', 'event_espresso'), false, 0, 'Question'),
+				'ANS_value'=>new EE_Maybe_Serialized_Simple_HTML_Field('ANS_value', __('Answer Value', 'event_espresso'), false, '')
 			));
 		$this->_model_relations = array(
 			'Registration'=>new EE_Belongs_To_Relation(),
@@ -70,7 +70,7 @@ 
 		);
 		$this->_model_chain_to_wp_user = 'Registration.Event';
 		$this->_caps_slug = 'registrations';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -83,19 +83,19 @@ 
 	 * @param boolean $pretty_answer whether to call 'pretty_value' or just 'value'
 	 * @return string
 	 */
-	public function get_answer_value_to_question( EE_Registration $registration, $question_id = NULL,$pretty_answer = FALSE ){
-		$value = $this->get_attendee_property_answer_value( $registration, $question_id, $pretty_answer );
-		if (  $value === NULL ){
-			$answer_obj = $this->get_registration_question_answer_object( $registration, $question_id, $pretty_answer );
-			if( $answer_obj instanceof EE_Answer ){
-				if($pretty_answer){
+	public function get_answer_value_to_question(EE_Registration $registration, $question_id = NULL, $pretty_answer = FALSE) {
+		$value = $this->get_attendee_property_answer_value($registration, $question_id, $pretty_answer);
+		if ($value === NULL) {
+			$answer_obj = $this->get_registration_question_answer_object($registration, $question_id, $pretty_answer);
+			if ($answer_obj instanceof EE_Answer) {
+				if ($pretty_answer) {
 					$value = $answer_obj->pretty_value();
-				}else{
+				} else {
 					$value = $answer_obj->value();
 				}
 			}
 		}
-		return apply_filters( 'FHEE__EEM_Answer__get_answer_value_to_question__answer_value', $value, $registration, $question_id );
+		return apply_filters('FHEE__EEM_Answer__get_answer_value_to_question__answer_value', $value, $registration, $question_id);
 	}
 
 
@@ -106,9 +106,9 @@ 
 	 * @param int $question_id
 	 * @return EE_Answer
 	 */
-	public function get_registration_question_answer_object( EE_Registration $registration, $question_id = NULL){
-		$answer_obj = $this->get_one( array( array( 'QST_ID'=>$question_id, 'REG_ID'=>$registration->ID() )));
-		return apply_filters( 'FHEE__EEM_Answer__get_registration_question_answer_object__answer_obj', $answer_obj, $registration, $question_id );
+	public function get_registration_question_answer_object(EE_Registration $registration, $question_id = NULL) {
+		$answer_obj = $this->get_one(array(array('QST_ID'=>$question_id, 'REG_ID'=>$registration->ID())));
+		return apply_filters('FHEE__EEM_Answer__get_registration_question_answer_object__answer_obj', $answer_obj, $registration, $question_id);
 	}
 
 
@@ -122,39 +122,39 @@ 
 	 * @return string|null (if the registration has no attendee, or the question_system_id is not a QST_ID or QST_system for 
 	 * a question corresponding to an attendee field, returns null)
 	 */
-	public function get_attendee_property_answer_value( EE_Registration $registration, $question_system_id = NULL, $pretty_answer = FALSE ){
+	public function get_attendee_property_answer_value(EE_Registration $registration, $question_system_id = NULL, $pretty_answer = FALSE) {
 		$field_name = NULL;
 		$value = NULL;
                 //backward compat: we still want to find the question's ID
-                if( is_numeric( $question_system_id ) ) {
+                if (is_numeric($question_system_id)) {
                     //find this question's QST_system value
                     $question_id = $question_system_id;
-                    $question_system_id = EEM_Question::instance()->get_var( array( array( 'QST_ID' => $question_system_id ) ), 'QST_system' );
+                    $question_system_id = EEM_Question::instance()->get_var(array(array('QST_ID' => $question_system_id)), 'QST_system');
                 } else {
-                    $question_id = intval( EEM_Question::instance()->get_var( array( array( 'QST_system' => $question_system_id ) ), 'QST_ID' ) );
+                    $question_id = intval(EEM_Question::instance()->get_var(array(array('QST_system' => $question_system_id)), 'QST_ID'));
                 }
 		//only bother checking if the registration has an attendee
-		if( $registration->attendee() instanceof EE_Attendee ) {
-			$field_name = EEM_Attendee::instance()->get_attendee_field_for_system_question( $question_system_id );
-			if( $field_name ) {
-				if( $pretty_answer ) {
-					if( $field_name == 'STA_ID' ) {
+		if ($registration->attendee() instanceof EE_Attendee) {
+			$field_name = EEM_Attendee::instance()->get_attendee_field_for_system_question($question_system_id);
+			if ($field_name) {
+				if ($pretty_answer) {
+					if ($field_name == 'STA_ID') {
 						$state = $registration->attendee()->state_obj();
-						$value = $state instanceof EE_State ? $state->name() : sprintf( __('Unknown State (%s)', 'event_espresso'), $registration->attendee()->state_ID() );
-					} else if($field_name == 'CNT_ISO') {
+						$value = $state instanceof EE_State ? $state->name() : sprintf(__('Unknown State (%s)', 'event_espresso'), $registration->attendee()->state_ID());
+					} else if ($field_name == 'CNT_ISO') {
 						$country = $registration->attendee()->country_obj();
-						$value = $country instanceof EE_Country ? $country->name() : sprintf(__('Unknown Country (%s)', "event_espresso"),$registration->attendee()->country_ID());
+						$value = $country instanceof EE_Country ? $country->name() : sprintf(__('Unknown Country (%s)', "event_espresso"), $registration->attendee()->country_ID());
 					} else {
-						$value = $registration->attendee()->get_pretty( $field_name );
+						$value = $registration->attendee()->get_pretty($field_name);
 					}
 					//if field name is blank, leave the value as null too
-				}else{
-					$value = $registration->attendee()->get( $field_name );
+				} else {
+					$value = $registration->attendee()->get($field_name);
 				}
 			}
 			//if no field was found, leave value blank
 		}
-		return apply_filters( 'FHEE__EEM_Answer__get_attendee_question_answer_value__answer_value', $value, $registration, $question_id, $question_system_id );
+		return apply_filters('FHEE__EEM_Answer__get_attendee_question_answer_value__answer_value', $value, $registration, $question_id, $question_system_id);
 	}
 
 

Braces +5 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -90,7 +92,7 @@ 
 			if( $answer_obj instanceof EE_Answer ){
 				if($pretty_answer){
 					$value = $answer_obj->pretty_value();
-				}else{
+				} else{
 					$value = $answer_obj->value();
 				}
 			}
@@ -148,7 +150,7 @@ 
 						$value = $registration->attendee()->get_pretty( $field_name );
 					}
 					//if field name is blank, leave the value as null too
-				}else{
+				} else{
 					$value = $registration->attendee()->get( $field_name );
 				}
 			}

core/db_models/EEM_Ticket.model.php

Braces +3 added lines, -1 removed lines

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

Spacing +36 added lines, -36 removed lines

@@ -21,8 +21,8 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
-require_once ( EE_CLASSES . 'EE_Ticket.class.php' );
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
+require_once (EE_CLASSES.'EE_Ticket.class.php');
 
 class EEM_Ticket extends EEM_Soft_Delete_Base {
 
@@ -35,35 +35,35 @@ 
 	 *		@access private
 	 *		@param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
 	 */
-	protected function __construct( $timezone ) {
-		$this->singular_item = __('Ticket','event_espresso');
-		$this->plural_item = __('Tickets','event_espresso');
+	protected function __construct($timezone) {
+		$this->singular_item = __('Ticket', 'event_espresso');
+		$this->plural_item = __('Tickets', 'event_espresso');
 
 		$this->_tables = array(
 			'Ticket'=> new EE_Primary_Table('esp_ticket', 'TKT_ID')
 		);
 		$this->_fields = array(
 			'Ticket'=>array(
-				'TKT_ID'=> new EE_Primary_Key_Int_Field('TKT_ID', __('Ticket ID','event_espresso')),
-				'TTM_ID'=>new EE_Foreign_Key_Int_Field('TTM_ID', __('Ticket Template ID','event_espresso'), false, 0, 'Ticket_Template'),
+				'TKT_ID'=> new EE_Primary_Key_Int_Field('TKT_ID', __('Ticket ID', 'event_espresso')),
+				'TTM_ID'=>new EE_Foreign_Key_Int_Field('TTM_ID', __('Ticket Template ID', 'event_espresso'), false, 0, 'Ticket_Template'),
 				'TKT_name'=>new EE_Plain_Text_Field('TKT_name', __('Ticket Name', 'event_espresso'), false, ''),
-				'TKT_description'=>new EE_Full_HTML_Field('TKT_description', __('Description of Ticket', 'event_espresso'), false, '' ),
-				'TKT_start_date'=>new EE_Datetime_Field('TKT_start_date', __('Start time/date of Ticket','event_espresso'), false, time(), $timezone ),
-				'TKT_end_date'=>new EE_Datetime_Field('TKT_end_date', __('End time/date of Ticket','event_espresso'), false, time(), $timezone ),
-				'TKT_min'=>new EE_Integer_Field('TKT_min', __('Minimum quantity of this ticket that must be purchased', 'event_espresso'), false, 0 ),
-				'TKT_max'=>new EE_Infinite_Integer_Field('TKT_max', __('Maximum quantity of this ticket that can be purchased in one transaction', 'event_espresso'), false, EE_INF ),
+				'TKT_description'=>new EE_Full_HTML_Field('TKT_description', __('Description of Ticket', 'event_espresso'), false, ''),
+				'TKT_start_date'=>new EE_Datetime_Field('TKT_start_date', __('Start time/date of Ticket', 'event_espresso'), false, time(), $timezone),
+				'TKT_end_date'=>new EE_Datetime_Field('TKT_end_date', __('End time/date of Ticket', 'event_espresso'), false, time(), $timezone),
+				'TKT_min'=>new EE_Integer_Field('TKT_min', __('Minimum quantity of this ticket that must be purchased', 'event_espresso'), false, 0),
+				'TKT_max'=>new EE_Infinite_Integer_Field('TKT_max', __('Maximum quantity of this ticket that can be purchased in one transaction', 'event_espresso'), false, EE_INF),
 				'TKT_price'=> new EE_Money_Field('TKT_price', 'Final calculated price for ticket', false, 0),
 				'TKT_sold' => new EE_Integer_Field('TKT_sold', __('Number of this ticket sold', 'event_espresso'), false, 0),
-				'TKT_qty'=>new EE_Infinite_Integer_Field('TKT_qty', __('Quantity of this ticket that is available','event_espresso'), false, EE_INF),
-				'TKT_uses'=>new EE_Infinite_Integer_Field('TKT_uses', __('Number of datetimes this ticket can be used at', 'event_espresso'), false, EE_INF ),
-				'TKT_required'=>new EE_Boolean_Field('TKT_required', __("Flag indicating whether this ticket must be purchased with a transaction", "event_espresso"), false, false ),
-				'TKT_taxable'=>new EE_Boolean_Field('TKT_taxable', __("Flag indicating whether there is tax applied on this ticket", "event_espresso"), false,false),
-				'TKT_is_default'=>new EE_Boolean_Field('TKT_is_default', __('Flag indicating that this ticket is a default ticket', 'event_espresso'), false, false ),
+				'TKT_qty'=>new EE_Infinite_Integer_Field('TKT_qty', __('Quantity of this ticket that is available', 'event_espresso'), false, EE_INF),
+				'TKT_uses'=>new EE_Infinite_Integer_Field('TKT_uses', __('Number of datetimes this ticket can be used at', 'event_espresso'), false, EE_INF),
+				'TKT_required'=>new EE_Boolean_Field('TKT_required', __("Flag indicating whether this ticket must be purchased with a transaction", "event_espresso"), false, false),
+				'TKT_taxable'=>new EE_Boolean_Field('TKT_taxable', __("Flag indicating whether there is tax applied on this ticket", "event_espresso"), false, false),
+				'TKT_is_default'=>new EE_Boolean_Field('TKT_is_default', __('Flag indicating that this ticket is a default ticket', 'event_espresso'), false, false),
 				'TKT_order' => new EE_Integer_Field('TKT_order', __('The order in which the Ticket is displayed in the editor (used for autosaves when the form doesn\'t have the ticket ID yet)', 'event_espresso'), false, 0),
-				'TKT_row' => new EE_Integer_Field('TKT_row', __('How tickets are displayed in the ui', 'event_espresso'), false, 0 ),
+				'TKT_row' => new EE_Integer_Field('TKT_row', __('How tickets are displayed in the ui', 'event_espresso'), false, 0),
 				'TKT_deleted' => new EE_Trashed_Flag_Field('TKT_deleted', __('Flag indicating if this has been archived or not', 'event_espresso'), false, false),
-				'TKT_wp_user' => new EE_WP_User_Field('TKT_wp_user', __('Ticket Creator ID', 'event_espresso'), FALSE ),
-				'TKT_parent' => new EE_Integer_Field('TKT_parent', __('Indicates what TKT_ID is the parent of this TKT_ID (used in autosaves/revisions)'), true, 0 )
+				'TKT_wp_user' => new EE_WP_User_Field('TKT_wp_user', __('Ticket Creator ID', 'event_espresso'), FALSE),
+				'TKT_parent' => new EE_Integer_Field('TKT_parent', __('Indicates what TKT_ID is the parent of this TKT_ID (used in autosaves/revisions)'), true, 0)
 			));
 		$this->_model_relations = array(
 			'Datetime'=>new EE_HABTM_Relation('Datetime_Ticket'),
@@ -75,12 +75,12 @@ 
 		);
 
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Default_Public('TKT_is_default', 'Datetime.Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Default_Public('TKT_is_default', 'Datetime.Event');
 		//account for default tickets in the caps
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Default_Protected( 'TKT_is_default', 'Datetime.Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Default_Protected( 'TKT_is_default', 'Datetime.Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Default_Protected( 'TKT_is_default', 'Datetime.Event' );
-		parent::__construct( $timezone );
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Default_Protected('TKT_is_default', 'Datetime.Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Default_Protected('TKT_is_default', 'Datetime.Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Default_Protected('TKT_is_default', 'Datetime.Event');
+		parent::__construct($timezone);
 	}
 
 
@@ -91,9 +91,9 @@ 
 	 */
 	public function get_all_default_tickets() {
 		/** @type EE_Ticket[] $tickets */
-		$tickets = $this->get_all( array( array('TKT_is_default' => 1), 'order_by' => array('TKT_ID' => 'ASC')) );
+		$tickets = $this->get_all(array(array('TKT_is_default' => 1), 'order_by' => array('TKT_ID' => 'ASC')));
 		//we need to set the start date and end date to today's date and the start of the default dtt
-		return $this->_set_default_dates( $tickets );
+		return $this->_set_default_dates($tickets);
 	}
 
 
@@ -103,11 +103,11 @@ 
 	 * @param EE_Ticket[] $tickets
 	 * @return EE_Ticket[]
 	 */
-	private function _set_default_dates( $tickets ) {
-		foreach ( $tickets as $ticket ) {
-			$ticket->set('TKT_start_date', $this->current_time_for_query('TKT_start_date', true) );
-			$ticket->set('TKT_end_date', $this->current_time_for_query( 'TKT_end_date', true ) + (60 * 60 * 24 * 30 ) );
-			$ticket->set_end_time( $this->convert_datetime_for_query( 'TKT_end_date', '11:59 pm', 'g:i a', $this->_timezone ) );
+	private function _set_default_dates($tickets) {
+		foreach ($tickets as $ticket) {
+			$ticket->set('TKT_start_date', $this->current_time_for_query('TKT_start_date', true));
+			$ticket->set('TKT_end_date', $this->current_time_for_query('TKT_end_date', true) + (60 * 60 * 24 * 30));
+			$ticket->set_end_time($this->convert_datetime_for_query('TKT_end_date', '11:59 pm', 'g:i a', $this->_timezone));
 		}
 
 		return $tickets;
@@ -122,8 +122,8 @@ 
 	 * @param array $query_params
 	 * @return int
 	 */
-	public function sum_tickets_currently_available_at_datetime($DTT_ID, $query_params = array()){
-		return EEM_Datetime::instance()->sum_tickets_currently_available_at_datetime( $DTT_ID, $query_params );
+	public function sum_tickets_currently_available_at_datetime($DTT_ID, $query_params = array()) {
+		return EEM_Datetime::instance()->sum_tickets_currently_available_at_datetime($DTT_ID, $query_params);
 	}
 
 
@@ -133,8 +133,8 @@ 
 	 * @param EE_Ticket[] $tickets
 	 * @return void
 	 */
-	public function update_tickets_sold($tickets){
-		foreach($tickets as $ticket){
+	public function update_tickets_sold($tickets) {
+		foreach ($tickets as $ticket) {
 			/* @var  $ticket EE_Ticket */
 			$ticket->update_tickets_sold();
 		}

core/interfaces/EEI_Duplicatable.interface.php

Spacing +3 added lines, -3 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');
 }
 
 /**
@@ -26,7 +26,7 @@ 
 	 *	with the exception of a particular attribute
 	 * @return object of the same class as what was called on
 	 */
-	public function duplicate( $options = array() );
+	public function duplicate($options = array());
 
 
 

core/libraries/form_sections/payment_methods/EE_Billing_Attendee_Info_Form.form.php

Spacing +52 added lines, -52 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');
 }
 
 /**
@@ -14,31 +14,31 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_Billing_Attendee_Info_Form extends EE_Billing_Info_Form{
+class EE_Billing_Attendee_Info_Form extends EE_Billing_Info_Form {
 
 	/**
 	 *
 	 * @param EE_Payment_Method $payment_method
 	 * @param array $options_array @see EE_Form_Section_Proper::__construct()
 	 */
-	public function __construct( EE_Payment_Method $payment_method, $options_array= array()){
+	public function __construct(EE_Payment_Method $payment_method, $options_array = array()) {
 		$options_array['subsections'] = array_merge(
 			array(
-				'first_name' 	=> new EE_Text_Input( array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-fname', 'html_label_text' => __( 'First Name', 'event_espresso' ) ) ),
-				'last_name'		=> new EE_Text_Input( array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-lname', 'html_label_text' => __( 'Last Name', 'event_espresso' ) ) ),
-				'email'				=> new EE_Email_Input( array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-email', 'html_label_text' => __( 'Email', 'event_espresso' ) ) ),
-				'address'			=> new EE_Text_Input( array( 'html_label_text'=>  __( 'Address', 'event_espresso'), 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-address' )),
-				'address2'		=> new EE_Text_Input( array( 'html_label_text'=> __( 'Address 2', 'event_espresso'), 'html_class' => 'ee-billing-qstn ee-billing-qstn-address2' )),
-				'city'					=> new EE_Text_Input( array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-city', 'html_label_text' => __( 'City', 'event_espresso' ) ) ),
-				'state' 				=> apply_filters( 'FHEE__EE_Billing_Attendee_Info_Form__state_field', new EE_State_Select_Input( NULL, array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-state', 'html_label_text' => __( 'State', 'event_espresso' ) ) ) ),
-				'country' 			=> apply_filters( 'FHEE__EE_Billing_Attendee_Info_Form__country_field', new EE_Country_Select_Input( NULL, array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-country', 'html_label_text' => __( 'Country', 'event_espresso' ) ) ) ),
-				'zip'					=> new EE_Text_Input( array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-zip', 'html_label_text' => __( 'Zip', 'event_espresso' ) ) ),
-				'phone'			=> new EE_Text_Input( array( 'html_class' => 'ee-billing-qstn ee-billing-qstn-phone', 'html_label_text' => __( 'Phone', 'event_espresso' ) )),
+				'first_name' 	=> new EE_Text_Input(array('required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-fname', 'html_label_text' => __('First Name', 'event_espresso'))),
+				'last_name'		=> new EE_Text_Input(array('required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-lname', 'html_label_text' => __('Last Name', 'event_espresso'))),
+				'email'				=> new EE_Email_Input(array('required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-email', 'html_label_text' => __('Email', 'event_espresso'))),
+				'address'			=> new EE_Text_Input(array('html_label_text'=>  __('Address', 'event_espresso'), 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-address')),
+				'address2'		=> new EE_Text_Input(array('html_label_text'=> __('Address 2', 'event_espresso'), 'html_class' => 'ee-billing-qstn ee-billing-qstn-address2')),
+				'city'					=> new EE_Text_Input(array('required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-city', 'html_label_text' => __('City', 'event_espresso'))),
+				'state' 				=> apply_filters('FHEE__EE_Billing_Attendee_Info_Form__state_field', new EE_State_Select_Input(NULL, array('required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-state', 'html_label_text' => __('State', 'event_espresso')))),
+				'country' 			=> apply_filters('FHEE__EE_Billing_Attendee_Info_Form__country_field', new EE_Country_Select_Input(NULL, array('required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-country', 'html_label_text' => __('Country', 'event_espresso')))),
+				'zip'					=> new EE_Text_Input(array('required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-zip', 'html_label_text' => __('Zip', 'event_espresso'))),
+				'phone'			=> new EE_Text_Input(array('html_class' => 'ee-billing-qstn ee-billing-qstn-phone', 'html_label_text' => __('Phone', 'event_espresso'))),
 			),
-			isset( $options_array['subsections'] ) ? $options_array['subsections'] : array()
+			isset($options_array['subsections']) ? $options_array['subsections'] : array()
 		);
 
-		parent::__construct( $payment_method, $options_array );
+		parent::__construct($payment_method, $options_array);
 
 	}
 
@@ -46,11 +46,11 @@ 
 	 * Sets the defaults for the billing form according to the attendee's details
 	 * @param EE_Attendee $attendee
 	 */
-	public function populate_from_attendee( $attendee ){
+	public function populate_from_attendee($attendee) {
 		$attendee = EEM_Attendee::instance()->ensure_is_obj($attendee);
 		/** @var $attendee EE_Attendee */
 		$this->populate_defaults( 
-				apply_filters( 'FHEE__EE_Billing_Attendee_Info_Form__populate_from_attendee',
+				apply_filters('FHEE__EE_Billing_Attendee_Info_Form__populate_from_attendee',
 					array(
 						'first_name'=>$attendee->fname(),
 						'last_name'=>$attendee->lname(),
@@ -63,7 +63,7 @@ 
 						'zip'=>$attendee->zip(),
 						'phone'=>$attendee->phone(),
 					),
-					$attendee )
+					$attendee)
 				
 				);
 	}
@@ -76,48 +76,48 @@ 
 	 * @param \EE_Attendee $attendee - the attendee object to copy details to
 	 * @return \EE_Attendee
 	 */
-	public function copy_billing_form_data_to_attendee( EE_Attendee $attendee ){
+	public function copy_billing_form_data_to_attendee(EE_Attendee $attendee) {
 		// grab billing form data
 		$data = $this->valid_data();
 		// copy first_name
-		if ( ! empty( $data['first_name'] )) {
-			$attendee->set_fname( $data['first_name'] );
+		if ( ! empty($data['first_name'])) {
+			$attendee->set_fname($data['first_name']);
 		}
 		// copy last_name
-		if ( ! empty( $data['last_name'] )) {
-			$attendee->set_lname( $data['last_name'] );
+		if ( ! empty($data['last_name'])) {
+			$attendee->set_lname($data['last_name']);
 		}
 		// copy email
-		if ( ! empty( $data['email'] )) {
-			$attendee->set_email( $data['email'] );
+		if ( ! empty($data['email'])) {
+			$attendee->set_email($data['email']);
 		}
 		// copy address
-		if ( ! empty( $data['address'] )) {
-			$attendee->set_address( $data['address'] );
+		if ( ! empty($data['address'])) {
+			$attendee->set_address($data['address']);
 		}
 		// copy address2
-		if ( ! empty( $data['address2'] )) {
-			$attendee->set_address2( $data['address2'] );
+		if ( ! empty($data['address2'])) {
+			$attendee->set_address2($data['address2']);
 		}
 		// copy city
-		if ( ! empty( $data['city'] )) {
-			$attendee->set_city( $data['city'] );
+		if ( ! empty($data['city'])) {
+			$attendee->set_city($data['city']);
 		}
 		// copy state
-		if ( ! empty( $data['state'] )) {
-			$attendee->set_state( $data['state'] );
+		if ( ! empty($data['state'])) {
+			$attendee->set_state($data['state']);
 		}
 		// copy country
-		if ( ! empty( $data['country'] )) {
-			$attendee->set_country( $data['country'] );
+		if ( ! empty($data['country'])) {
+			$attendee->set_country($data['country']);
 		}
 		// copy zip
-		if ( ! empty( $data['zip'] )) {
-			$attendee->set_zip( $data['zip'] );
+		if ( ! empty($data['zip'])) {
+			$attendee->set_zip($data['zip']);
 		}
 		// copy phone
-		if ( ! empty( $data['phone'] )) {
-			$attendee->set_phone( $data['phone'] );
+		if ( ! empty($data['phone'])) {
+			$attendee->set_phone($data['phone']);
 		}
 		return $attendee;
 	}
@@ -128,20 +128,20 @@ 
 	 * uses info from the billing form to create a new attendee
 	 * @return \EE_Attendee
 	 */
-	public function create_attendee_from_billing_form_data(){
+	public function create_attendee_from_billing_form_data() {
 		// grab billing form data
 		$data = $this->valid_data();
-		return EE_Attendee::new_instance( array(
-			'ATT_fname' 		=> ! empty( $data['first_name'] ) ? $data['first_name'] : '',
-			'ATT_lname' 		=> ! empty( $data['last_name'] ) ? $data['last_name'] : '',
-			'ATT_email' 		=> ! empty( $data['email'] ) ? $data['email'] : '',
-			'ATT_address' 		=> ! empty( $data['address'] ) ? $data['address'] : '',
-			'ATT_address2' 	=> ! empty( $data['address2'] ) ? $data['address2'] : '',
-			'ATT_city' 			=> ! empty( $data['city'] ) ? $data['city'] : '',
-			'STA_ID' 				=> ! empty( $data['state'] ) ? $data['state'] : '',
-			'CNT_ISO' 			=> ! empty( $data['country'] ) ? $data['country'] : '',
-			'ATT_zip' 				=> ! empty( $data['zip'] ) ? $data['zip'] : '',
-			'ATT_phone' 		=> ! empty( $data['phone'] ) ? $data['phone'] : '',
+		return EE_Attendee::new_instance(array(
+			'ATT_fname' 		=> ! empty($data['first_name']) ? $data['first_name'] : '',
+			'ATT_lname' 		=> ! empty($data['last_name']) ? $data['last_name'] : '',
+			'ATT_email' 		=> ! empty($data['email']) ? $data['email'] : '',
+			'ATT_address' 		=> ! empty($data['address']) ? $data['address'] : '',
+			'ATT_address2' 	=> ! empty($data['address2']) ? $data['address2'] : '',
+			'ATT_city' 			=> ! empty($data['city']) ? $data['city'] : '',
+			'STA_ID' 				=> ! empty($data['state']) ? $data['state'] : '',
+			'CNT_ISO' 			=> ! empty($data['country']) ? $data['country'] : '',
+			'ATT_zip' 				=> ! empty($data['zip']) ? $data['zip'] : '',
+			'ATT_phone' 		=> ! empty($data['phone']) ? $data['phone'] : '',
 		));
 	}
 }

core/libraries/messages/defaults/default/email_main_wrapper.template.php

Spacing +5 added lines, -5 removed lines

@@ -7,13 +7,13 @@
 	<!-- Facebook sharing information tags -->
 	<meta property="og:title" content="<?php echo $subject; ?>" />
 	<title><?php echo $subject; ?></title>
-	<?php do_action( 'AHEE__EE_Email_Messenger_main_wrapper_template_head', $message_type, $subject, $from, $main_body ); ?>
+	<?php do_action('AHEE__EE_Email_Messenger_main_wrapper_template_head', $message_type, $subject, $from, $main_body); ?>
 </head>
-<?php do_action( 'AHEE__EE_Email_Messenger_main_wrapper_template_header', $message_type, $subject, $from, $main_body ); ?>
+<?php do_action('AHEE__EE_Email_Messenger_main_wrapper_template_header', $message_type, $subject, $from, $main_body); ?>
 <body bgcolor="#FFFFFF" topmargin="0" leftmargin="0" marginheight="0" marginwidth="0">
-<?php do_action( 'AHEE__EE_Email_Messenger_main_wrapper_template_before_main_body', $message_type, $subject, $from, $main_body ); ?>
+<?php do_action('AHEE__EE_Email_Messenger_main_wrapper_template_before_main_body', $message_type, $subject, $from, $main_body); ?>
 <?php echo $main_body; ?>
-<?php do_action( 'AHEE__EE_Email_Messenger_main_wrapper_template_after_main_body', $message_type, $subject, $from, $main_body ); ?>
+<?php do_action('AHEE__EE_Email_Messenger_main_wrapper_template_after_main_body', $message_type, $subject, $from, $main_body); ?>
 </body>
-<?php do_action( 'AHEE__EE_Email_Messenger_main_wrapper_template_footer', $message_type, $subject, $from, $main_body ); ?>
+<?php do_action('AHEE__EE_Email_Messenger_main_wrapper_template_footer', $message_type, $subject, $from, $main_body); ?>
 </html>
\ No newline at end of file

caffeinated/modules/event_single_caff/templates/admin-event-single-settings.template.php

Spacing +14 added lines, -14 removed lines

@@ -1,11 +1,11 @@ 
 <?php
-add_filter( 'FHEE__EEH_Form_Fields__label_html', '__return_empty_string' );
-EE_Registry::instance()->load_helper( 'Event_View' );
-EE_Registry::instance()->load_helper( 'Form_Fields' );
+add_filter('FHEE__EEH_Form_Fields__label_html', '__return_empty_string');
+EE_Registry::instance()->load_helper('Event_View');
+EE_Registry::instance()->load_helper('Form_Fields');
 $values = EEH_Form_Fields::prep_answer_options(
 	array(
-		array( 'id' => 1, 'text' => __( 'Yes', 'event_espresso' ) ),
-		array( 'id' => 0, 'text' => __( 'No', 'event_espresso' ) )
+		array('id' => 1, 'text' => __('Yes', 'event_espresso')),
+		array('id' => 0, 'text' => __('No', 'event_espresso'))
 	)
 );
 ?>
@@ -24,27 +24,27 @@ 
 					</label>
 				</th>
 				<td>
-					<?php echo EEH_Form_Fields::select( 'display_status_banner_single', $display_status_banner_single, $values, 'display_status_banner_single', 'display_status_banner_single' ); ?>
-					<p class="description"><?php _e( 'Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the single event page.', 'event_espresso' ); ?></p>
+					<?php echo EEH_Form_Fields::select('display_status_banner_single', $display_status_banner_single, $values, 'display_status_banner_single', 'display_status_banner_single'); ?>
+					<p class="description"><?php _e('Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the single event page.', 'event_espresso'); ?></p>
 				</td>
 			</tr>
 
 			<tr>
 				<th>
 					<label for="display_venue">
-						<?php _e( 'Display Venue Details', 'event_espresso' ); ?><?php echo EEH_Template::get_help_tab_link('display_addresses_in_reg_form_info');?>
+						<?php _e('Display Venue Details', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link('display_addresses_in_reg_form_info'); ?>
 					</label>
 				</th>
 				<td>
-					<?php echo EEH_Form_Fields::select( 'display_venue', $display_venue, $values, 'display_venue', 'display_venue' ); ?>
-					<p class="description"><?php _e( 'Do not use this if you are using the venue shortcodes in your event description.', 'event_espresso' ); ?></p>
+					<?php echo EEH_Form_Fields::select('display_venue', $display_venue, $values, 'display_venue', 'display_venue'); ?>
+					<p class="description"><?php _e('Do not use this if you are using the venue shortcodes in your event description.', 'event_espresso'); ?></p>
 				</td>
 			</tr>
 
 			<tr>
 				<th>
 					<label for="EED_Events_Single_use_sortable_display_order">
-						<?php _e( 'Use Custom Display Order?', 'event_espresso' ); ?>
+						<?php _e('Use Custom Display Order?', 'event_espresso'); ?>
 					</label>
 				</th>
 				<td>
@@ -60,7 +60,7 @@ 
 					<p class="description ">
 						<?php
 						echo sprintf(
-							__( '%1$sPlease Note:%2$s%3$sIf you are currently using filters to customize the display order for elements within the Event Single page display, then you do NOT activate this feature until those filters have been removed or disabled. If this feature is activated while still using such filters, duplicate event content such as the ticket selector, datetimes, or venue information could be displayed on the frontend of the site. Please verify that this is not the case after activating this feature.', 'event_espresso' ),
+							__('%1$sPlease Note:%2$s%3$sIf you are currently using filters to customize the display order for elements within the Event Single page display, then you do NOT activate this feature until those filters have been removed or disabled. If this feature is activated while still using such filters, duplicate event content such as the ticket selector, datetimes, or venue information could be displayed on the frontend of the site. Please verify that this is not the case after activating this feature.', 'event_espresso'),
 							'<span class="important-notice">',
 							'</span>',
 							'<br />'
@@ -72,11 +72,11 @@ 
 
 			<tr>
 				<th>
-					<?php _e('Display Order', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link('display_addresses_in_reg_form_info');?>
+					<?php _e('Display Order', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link('display_addresses_in_reg_form_info'); ?>
 				</th>
 				<td>
 
-					<?php wp_nonce_field( 'espresso_update_event_single_order', 'espresso_update_event_single_order_nonce', false ); ?>
+					<?php wp_nonce_field('espresso_update_event_single_order', 'espresso_update_event_single_order_nonce', false); ?>
 					<?php echo $event_single_display_order; ?>
 
 					<p class="description"><?php _e('Drag and Drop the above to determine the display order of the Event Description, Date and Times, Ticket Selector, and Venue Information on the single event page.', 'event_espresso'); ?></p>