eventespresso / event-espresso-core

core/db_classes/EE_Payment.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 	 * @param array  $props_n_values          incoming values
 	 * @param string $timezone                incoming timezone (if not set the timezone set for the website will be
 	 *                                        used.)
-	 * @param array  $date_formats            incoming date_formats in an array where the first value is the
+	 * @param string[]  $date_formats            incoming date_formats in an array where the first value is the
 	 *                                        date_format and the second value is the time format
 	 * @return EE_Payment
 	 * @throws \EE_Error
@@ -590,7 +590,7 @@ 
 	 * Gets all the extra meta info on this payment
 	 *
 	 * @param array $query_params like EEM_Base::get_all
-	 * @return EE_Extra_Meta
+	 * @return EE_Base_Class[]
 	 * @throws \EE_Error
 	 */
 	public function extra_meta( $query_params = array() ) {

Spacing +104 added lines, -104 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');
 }
 
 /**
@@ -20,9 +20,9 @@ 
 	 * @return EE_Payment
 	 * @throws \EE_Error
 	 */
-	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);
 	}
 
 
@@ -34,8 +34,8 @@ 
 	 * @return EE_Payment
 	 * @throws \EE_Error
 	 */
-	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);
 	}
 
 
@@ -47,8 +47,8 @@ 
 	 * @param int $TXN_ID
 	 * @throws \EE_Error
 	 */
-	public function set_transaction_id( $TXN_ID = 0 ) {
-		$this->set( 'TXN_ID', $TXN_ID );
+	public function set_transaction_id($TXN_ID = 0) {
+		$this->set('TXN_ID', $TXN_ID);
 	}
 
 
@@ -60,7 +60,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function transaction() {
-		return $this->get_first_related( 'Transaction' );
+		return $this->get_first_related('Transaction');
 	}
 
 
@@ -72,8 +72,8 @@ 
 	 * @param string $STS_ID
 	 * @throws \EE_Error
 	 */
-	public function set_status( $STS_ID = '' ) {
-		$this->set( 'STS_ID', $STS_ID );
+	public function set_status($STS_ID = '') {
+		$this->set('STS_ID', $STS_ID);
 	}
 
 
@@ -85,8 +85,8 @@ 
 	 * @param int $timestamp
 	 * @throws \EE_Error
 	 */
-	public function set_timestamp( $timestamp = 0 ) {
-		$this->set( 'PAY_timestamp', $timestamp );
+	public function set_timestamp($timestamp = 0) {
+		$this->set('PAY_timestamp', $timestamp);
 	}
 
 
@@ -98,8 +98,8 @@ 
 	 * @param string $PAY_source
 	 * @throws \EE_Error
 	 */
-	public function set_source( $PAY_source = '' ) {
-		$this->set( 'PAY_source', $PAY_source );
+	public function set_source($PAY_source = '') {
+		$this->set('PAY_source', $PAY_source);
 	}
 
 
@@ -111,8 +111,8 @@ 
 	 * @param float $amount
 	 * @throws \EE_Error
 	 */
-	public function set_amount( $amount = 0.00 ) {
-		$this->set( 'PAY_amount', (float)$amount );
+	public function set_amount($amount = 0.00) {
+		$this->set('PAY_amount', (float) $amount);
 	}
 
 
@@ -124,8 +124,8 @@ 
 	 * @param string $gateway_response
 	 * @throws \EE_Error
 	 */
-	public function set_gateway_response( $gateway_response = '' ) {
-		$this->set( 'PAY_gateway_response', $gateway_response );
+	public function set_gateway_response($gateway_response = '') {
+		$this->set('PAY_gateway_response', $gateway_response);
 	}
 
 
@@ -148,7 +148,7 @@ 
 			),
 			'4.6.0'
 		);
-		return $this->payment_method() ? $this->payment_method()->name() : __( 'Unknown', 'event_espresso' );
+		return $this->payment_method() ? $this->payment_method()->name() : __('Unknown', 'event_espresso');
 	}
 
 
@@ -160,8 +160,8 @@ 
 	 * @param string $txn_id_chq_nmbr
 	 * @throws \EE_Error
 	 */
-	public function set_txn_id_chq_nmbr( $txn_id_chq_nmbr = '' ) {
-		$this->set( 'PAY_txn_id_chq_nmbr', $txn_id_chq_nmbr );
+	public function set_txn_id_chq_nmbr($txn_id_chq_nmbr = '') {
+		$this->set('PAY_txn_id_chq_nmbr', $txn_id_chq_nmbr);
 	}
 
 
@@ -173,8 +173,8 @@ 
 	 * @param string $po_number
 	 * @throws \EE_Error
 	 */
-	public function set_po_number( $po_number = '' ) {
-		$this->set( 'PAY_po_number', $po_number );
+	public function set_po_number($po_number = '') {
+		$this->set('PAY_po_number', $po_number);
 	}
 
 
@@ -186,8 +186,8 @@ 
 	 * @param string $extra_accntng
 	 * @throws \EE_Error
 	 */
-	public function set_extra_accntng( $extra_accntng = '' ) {
-		$this->set( 'PAY_extra_accntng', $extra_accntng );
+	public function set_extra_accntng($extra_accntng = '') {
+		$this->set('PAY_extra_accntng', $extra_accntng);
 	}
 
 
@@ -199,11 +199,11 @@ 
 	 * @param bool $via_admin
 	 * @throws \EE_Error
 	 */
-	public function set_payment_made_via_admin( $via_admin = false ) {
-		if ( $via_admin ) {
-			$this->set( 'PAY_source', EEM_Payment_Method::scope_admin );
+	public function set_payment_made_via_admin($via_admin = false) {
+		if ($via_admin) {
+			$this->set('PAY_source', EEM_Payment_Method::scope_admin);
 		} else {
-			$this->set( 'PAY_source', EEM_Payment_Method::scope_cart );
+			$this->set('PAY_source', EEM_Payment_Method::scope_cart);
 		}
 	}
 
@@ -216,13 +216,13 @@ 
 	 * @param string|array $details
 	 * @throws \EE_Error
 	 */
-	public function set_details( $details = '' ) {
-		if ( is_array( $details ) ) {
-			array_walk_recursive( $details, array( $this, '_strip_all_tags_within_array' ) );
+	public function set_details($details = '') {
+		if (is_array($details)) {
+			array_walk_recursive($details, array($this, '_strip_all_tags_within_array'));
 		} else {
-			$details = wp_strip_all_tags( $details );
+			$details = wp_strip_all_tags($details);
 		}
-		$this->set( 'PAY_details', $details );
+		$this->set('PAY_details', $details);
 	}
 
 
@@ -233,8 +233,8 @@ 
 	 * @param string $redirect_url
 	 * @throws \EE_Error
 	 */
-	public function set_redirect_url( $redirect_url ) {
-		$this->set( 'PAY_redirect_url', $redirect_url );
+	public function set_redirect_url($redirect_url) {
+		$this->set('PAY_redirect_url', $redirect_url);
 	}
 
 
@@ -245,8 +245,8 @@ 
 	 * @param array $redirect_args
 	 * @throws \EE_Error
 	 */
-	public function set_redirect_args( $redirect_args ) {
-		$this->set( 'PAY_redirect_args', $redirect_args );
+	public function set_redirect_args($redirect_args) {
+		$this->set('PAY_redirect_args', $redirect_args);
 	}
 
 
@@ -258,7 +258,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function TXN_ID() {
-		return $this->get( 'TXN_ID' );
+		return $this->get('TXN_ID');
 	}
 
 
@@ -270,7 +270,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function status() {
-		return $this->get( 'STS_ID' );
+		return $this->get('STS_ID');
 	}
 
 
@@ -282,7 +282,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function STS_ID() {
-		return $this->get( 'STS_ID' );
+		return $this->get('STS_ID');
 	}
 
 
@@ -296,8 +296,8 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function timestamp( $dt_frmt = '', $tm_frmt = '' ) {
-		return $this->get_i18n_datetime( 'PAY_timestamp', trim( $dt_frmt . ' ' . $tm_frmt) );
+	public function timestamp($dt_frmt = '', $tm_frmt = '') {
+		return $this->get_i18n_datetime('PAY_timestamp', trim($dt_frmt.' '.$tm_frmt));
 	}
 
 
@@ -309,7 +309,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function source() {
-		return $this->get( 'PAY_source' );
+		return $this->get('PAY_source');
 	}
 
 
@@ -322,7 +322,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function amount() {
-		return (float)$this->get( 'PAY_amount' );
+		return (float) $this->get('PAY_amount');
 	}
 
 
@@ -332,7 +332,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function amount_no_code() {
-		return $this->get_pretty( 'PAY_amount', 'no_currency_code' );
+		return $this->get_pretty('PAY_amount', 'no_currency_code');
 	}
 
 
@@ -344,7 +344,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function gateway_response() {
-		return $this->get( 'PAY_gateway_response' );
+		return $this->get('PAY_gateway_response');
 	}
 
 
@@ -356,7 +356,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function txn_id_chq_nmbr() {
-		return $this->get( 'PAY_txn_id_chq_nmbr' );
+		return $this->get('PAY_txn_id_chq_nmbr');
 	}
 
 
@@ -368,7 +368,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function po_number() {
-		return $this->get( 'PAY_po_number' );
+		return $this->get('PAY_po_number');
 	}
 
 
@@ -380,7 +380,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function extra_accntng() {
-		return $this->get( 'PAY_extra_accntng' );
+		return $this->get('PAY_extra_accntng');
 	}
 
 
@@ -392,7 +392,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function payment_made_via_admin() {
-		return ( $this->get( 'PAY_source' ) === EEM_Payment_Method::scope_admin );
+		return ($this->get('PAY_source') === EEM_Payment_Method::scope_admin);
 	}
 
 
@@ -404,7 +404,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function details() {
-		return $this->get( 'PAY_details' );
+		return $this->get('PAY_details');
 	}
 
 
@@ -416,7 +416,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function redirect_url() {
-		return $this->get( 'PAY_redirect_url' );
+		return $this->get('PAY_redirect_url');
 	}
 
 
@@ -428,7 +428,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function redirect_args() {
-		return $this->get( 'PAY_redirect_args' );
+		return $this->get('PAY_redirect_args');
 	}
 
 
@@ -440,8 +440,8 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function e_pretty_status( $show_icons = false ) {
-		echo $this->pretty_status( $show_icons );
+	public function e_pretty_status($show_icons = false) {
+		echo $this->pretty_status($show_icons);
 	}
 
 
@@ -453,14 +453,14 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function pretty_status( $show_icons = false ) {
+	public function pretty_status($show_icons = false) {
 		$status = EEM_Status::instance()->localized_status(
-			array( $this->STS_ID() => __( 'unknown', 'event_espresso' ) ),
+			array($this->STS_ID() => __('unknown', 'event_espresso')),
 			false,
 			'sentence'
 		);
 		$icon = '';
-		switch ( $this->STS_ID() ) {
+		switch ($this->STS_ID()) {
 			case EEM_Payment::status_id_approved:
 				$icon = $show_icons
 					? '<span class="dashicons dashicons-yes ee-icon-size-24 green-text"></span>'
@@ -482,7 +482,7 @@ 
 					: '';
 				break;
 		}
-		return $icon . $status[ $this->STS_ID() ];
+		return $icon.$status[$this->STS_ID()];
 	}
 
 
@@ -494,7 +494,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function is_approved() {
-		return $this->status_is( EEM_Payment::status_id_approved );
+		return $this->status_is(EEM_Payment::status_id_approved);
 	}
 
 
@@ -508,7 +508,7 @@ 
 	 * @return boolean whether the status of this payment equals the status id
 	 * @throws \EE_Error
 	 */
-	protected function status_is( $STS_ID ) {
+	protected function status_is($STS_ID) {
 		return $STS_ID === $this->STS_ID() ? true : false;
 	}
 
@@ -521,7 +521,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function is_pending() {
-		return $this->status_is( EEM_Payment::status_id_pending );
+		return $this->status_is(EEM_Payment::status_id_pending);
 	}
 
 
@@ -533,7 +533,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function is_cancelled() {
-		return $this->status_is( EEM_Payment::status_id_cancelled );
+		return $this->status_is(EEM_Payment::status_id_cancelled);
 	}
 
 
@@ -545,7 +545,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function is_declined() {
-		return $this->status_is( EEM_Payment::status_id_declined );
+		return $this->status_is(EEM_Payment::status_id_declined);
 	}
 
 
@@ -557,7 +557,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function is_failed() {
-		return $this->status_is( EEM_Payment::status_id_failed );
+		return $this->status_is(EEM_Payment::status_id_failed);
 	}
 
 
@@ -581,7 +581,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function status_obj() {
-		return $this->get_first_related( 'Status' );
+		return $this->get_first_related('Status');
 	}
 
 
@@ -593,8 +593,8 @@ 
 	 * @return EE_Extra_Meta
 	 * @throws \EE_Error
 	 */
-	public function extra_meta( $query_params = array() ) {
-		return $this->get_many_related( 'Extra_Meta', $query_params );
+	public function extra_meta($query_params = array()) {
+		return $this->get_many_related('Extra_Meta', $query_params);
 	}
 
 
@@ -608,7 +608,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function payment_method() {
-		return $this->get_first_related( 'Payment_Method' );
+		return $this->get_first_related('Payment_Method');
 	}
 
 
@@ -626,18 +626,18 @@ 
 	 * @return string html
 	 * @throws \EE_Error
 	 */
-	public function redirect_form( $inside_form_html = null ) {
+	public function redirect_form($inside_form_html = null) {
 		$redirect_url = $this->redirect_url();
-		if ( ! empty( $redirect_url ) ) {
+		if ( ! empty($redirect_url)) {
 			// what ? no inner form content?
-			if ( $inside_form_html === null ) {
+			if ($inside_form_html === null) {
 				$inside_form_html = EEH_HTML::p(
 					sprintf(
 						__(
 							'If you are not automatically redirected to the payment website within 10 seconds... %1$s %2$s Click Here %3$s',
 							'event_espresso'
 						),
-						EEH_HTML::br( 2 ),
+						EEH_HTML::br(2),
 						'<input type="submit" value="',
 						'">'
 					),
@@ -653,22 +653,22 @@ 
 			);
 			//if it's a GET request, we need to remove all the GET params in the querystring
 			//and put them into the form instead
-			if ( $method === 'GET' ) {
-				$querystring = parse_url( $redirect_url, PHP_URL_QUERY );
+			if ($method === 'GET') {
+				$querystring = parse_url($redirect_url, PHP_URL_QUERY);
 				$get_params = null;
-				parse_str( $querystring, $get_params );
-				$inside_form_html .= $this->_args_as_inputs( $get_params );
-				$redirect_url = str_replace( '?' . $querystring, '', $redirect_url );
+				parse_str($querystring, $get_params);
+				$inside_form_html .= $this->_args_as_inputs($get_params);
+				$redirect_url = str_replace('?'.$querystring, '', $redirect_url);
 			}
-			$form = EEH_HTML::nl( 1 )
+			$form = EEH_HTML::nl(1)
 			        . '<form method="'
 			        . $method
 			        . '" name="gateway_form" action="'
 			        . $redirect_url
 			        . '">';
-			$form .= EEH_HTML::nl( 1 ) . $this->redirect_args_as_inputs();
+			$form .= EEH_HTML::nl(1).$this->redirect_args_as_inputs();
 			$form .= $inside_form_html;
-			$form .= EEH_HTML::nl( -1 ) . '</form>' . EEH_HTML::nl( -1 );
+			$form .= EEH_HTML::nl( -1 ).'</form>'.EEH_HTML::nl( -1 );
 			return $form;
 		} else {
 			return null;
@@ -685,7 +685,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function redirect_args_as_inputs() {
-		return $this->_args_as_inputs( $this->redirect_args() );
+		return $this->_args_as_inputs($this->redirect_args());
 	}
 
 
@@ -697,15 +697,15 @@ 
 	 * @param array $args key-value pairs
 	 * @return string
 	 */
-	protected function _args_as_inputs( $args ) {
+	protected function _args_as_inputs($args) {
 		$html = '';
-		if ( $args !== null && is_array( $args ) ) {
-			foreach ( $args as $name => $value ) {
-				$html .= EEH_HTML::nl( 0 )
+		if ($args !== null && is_array($args)) {
+			foreach ($args as $name => $value) {
+				$html .= EEH_HTML::nl(0)
 				         . '<input type="hidden" name="'
 				         . $name
 				         . '" value="'
-				         . esc_attr( $value )
+				         . esc_attr($value)
 				         . '"/>';
 			}
 		}
@@ -734,14 +734,14 @@ 
 	 * @access private
 	 * @param mixed $item
 	 */
-	private function _strip_all_tags_within_array( &$item ) {
-		if ( is_object( $item ) ) {
-			$item = (array)$item;
+	private function _strip_all_tags_within_array(&$item) {
+		if (is_object($item)) {
+			$item = (array) $item;
 		}
-		if ( is_array( $item ) ) {
-			array_walk_recursive( $item, array( $this, '_strip_all_tags_within_array' ) );
+		if (is_array($item)) {
+			array_walk_recursive($item, array($this, '_strip_all_tags_within_array'));
 		} else {
-			$item = wp_strip_all_tags( $item );
+			$item = wp_strip_all_tags($item);
 		}
 	}
 
@@ -758,7 +758,7 @@ 
 		$original_status = EEH_Array::is_set(
 			$this->_props_n_values_provided_in_constructor,
 			'STS_ID',
-			$this->get_model()->field_settings_for( 'STS_ID' )->get_default_value()
+			$this->get_model()->field_settings_for('STS_ID')->get_default_value()
 		);
 		$current_status = $this->status();
 		if (
@@ -784,11 +784,11 @@ 
 	 * @return mixed
 	 * @throws \EE_Error
 	 */
-	public function get_pretty( $field_name, $extra_cache_ref = null ) {
-		if ( $field_name === 'PAY_gateway' ) {
-			return $this->payment_method() ? $this->payment_method()->name() : __( 'Unknown', 'event_espresso' );
+	public function get_pretty($field_name, $extra_cache_ref = null) {
+		if ($field_name === 'PAY_gateway') {
+			return $this->payment_method() ? $this->payment_method()->name() : __('Unknown', 'event_espresso');
 		}
-		return $this->_get_cached_property( $field_name, true, $extra_cache_ref );
+		return $this->_get_cached_property($field_name, true, $extra_cache_ref);
 	}
 
 
@@ -800,8 +800,8 @@ 
 	 * @return EE_Registration_Payment[]
 	 * @throws \EE_Error
 	 */
-	public function registration_payments( $query_params = array() ) {
-		return $this->get_many_related( 'Registration_Payment', $query_params );
+	public function registration_payments($query_params = array()) {
+		return $this->get_many_related('Registration_Payment', $query_params);
 	}
 
 
@@ -862,7 +862,7 @@ 
     public function get_primary_attendee()
     {
         $primary_reg = $this->get_primary_registration();
-        if( $primary_reg instanceof EE_Registration) {
+        if ($primary_reg instanceof EE_Registration) {
             return $primary_reg->attendee();
         }
         return null;

Indentation +68 added lines, -68 removed lines

@@ -661,11 +661,11 @@ 
 				$redirect_url = str_replace( '?' . $querystring, '', $redirect_url );
 			}
 			$form = EEH_HTML::nl( 1 )
-			        . '<form method="'
-			        . $method
-			        . '" name="gateway_form" action="'
-			        . $redirect_url
-			        . '">';
+					. '<form method="'
+					. $method
+					. '" name="gateway_form" action="'
+					. $redirect_url
+					. '">';
 			$form .= EEH_HTML::nl( 1 ) . $this->redirect_args_as_inputs();
 			$form .= $inside_form_html;
 			$form .= EEH_HTML::nl( -1 ) . '</form>' . EEH_HTML::nl( -1 );
@@ -702,11 +702,11 @@ 
 		if ( $args !== null && is_array( $args ) ) {
 			foreach ( $args as $name => $value ) {
 				$html .= EEH_HTML::nl( 0 )
-				         . '<input type="hidden" name="'
-				         . $name
-				         . '" value="'
-				         . esc_attr( $value )
-				         . '"/>';
+						 . '<input type="hidden" name="'
+						 . $name
+						 . '" value="'
+						 . esc_attr( $value )
+						 . '"/>';
 			}
 		}
 		return $html;
@@ -806,64 +806,64 @@ 
 
 
 
-    /**
-     * Gets the first event for this payment (it's possible that it could be for multiple)
-     *
-     * @return EE_Event|null
-     */
-    public function get_first_event()
-    {
-        $transaction = $this->transaction();
-        if ($transaction instanceof EE_Transaction) {
-            $primary_registrant = $transaction->primary_registration();
-            if ($primary_registrant instanceof EE_Registration) {
-                return $primary_registrant->event_obj();
-            }
-        }
-        return null;
-    }
-
-
-
-    /**
-     * Gets the name of the first event for which is being paid
-     *
-     * @return string
-     */
-    public function get_first_event_name()
-    {
-        $event = $this->get_first_event();
-        return $event instanceof EE_Event ? $event->name() : __('Event', 'event_espresso');
-    }
-
-
-
-    /**
-     * Returns the payment's transaction's primary registration
-     * @return EE_Registration|null
-     */
-    public function get_primary_registration()
-    {
-        if ($this->transaction() instanceof EE_Transaction) {
-            return $this->transaction()->primary_registration();
-        }
-        return null;
-    }
-
-
-
-    /**
-     * Gets the payment's transaction's primary registration's attendee, or null
-     * @return EE_Attendee|null
-     */
-    public function get_primary_attendee()
-    {
-        $primary_reg = $this->get_primary_registration();
-        if( $primary_reg instanceof EE_Registration) {
-            return $primary_reg->attendee();
-        }
-        return null;
-    }
+	/**
+	 * Gets the first event for this payment (it's possible that it could be for multiple)
+	 *
+	 * @return EE_Event|null
+	 */
+	public function get_first_event()
+	{
+		$transaction = $this->transaction();
+		if ($transaction instanceof EE_Transaction) {
+			$primary_registrant = $transaction->primary_registration();
+			if ($primary_registrant instanceof EE_Registration) {
+				return $primary_registrant->event_obj();
+			}
+		}
+		return null;
+	}
+
+
+
+	/**
+	 * Gets the name of the first event for which is being paid
+	 *
+	 * @return string
+	 */
+	public function get_first_event_name()
+	{
+		$event = $this->get_first_event();
+		return $event instanceof EE_Event ? $event->name() : __('Event', 'event_espresso');
+	}
+
+
+
+	/**
+	 * Returns the payment's transaction's primary registration
+	 * @return EE_Registration|null
+	 */
+	public function get_primary_registration()
+	{
+		if ($this->transaction() instanceof EE_Transaction) {
+			return $this->transaction()->primary_registration();
+		}
+		return null;
+	}
+
+
+
+	/**
+	 * Gets the payment's transaction's primary registration's attendee, or null
+	 * @return EE_Attendee|null
+	 */
+	public function get_primary_attendee()
+	{
+		$primary_reg = $this->get_primary_registration();
+		if( $primary_reg instanceof EE_Registration) {
+			return $primary_reg->attendee();
+		}
+		return null;
+	}
 }
 /* End of file EE_Payment.class.php */
 /* Location: /includes/classes/EE_Payment.class.php */

core/db_classes/EE_Question.class.php

Doc Comments +2 added lines, -2 removed lines

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

Indentation +4 added lines, -4 removed lines

@@ -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
@@ -501,8 +501,8 @@ 
 		}
 		// has this question been answered ?
 		if ( $answer instanceof EE_Answer
-             && $answer->value() !== ''
-        ) {
+			 && $answer->value() !== ''
+		) {
 			//answer gets htmlspecialchars called on it, undo that please
 			//because the form input's display strategy may call esc_attr too
 			//which also does html special characters

Spacing +112 added lines, -112 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,29 +496,29 @@ 
 				),
 				$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->value() !== ''
         ) {
 			//answer gets htmlspecialchars called on it, undo that please
 			//because 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(
@@ -530,22 +530,22 @@ 
 		);
 
 		$result = null;
-		switch ( $this->type() ) {
+		switch ($this->type()) {
 			// Text
 			case EEM_Question::QST_type_text :
-				$result = new EE_Text_Input( $input_constructor_args );
+				$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 :
@@ -556,7 +556,7 @@ 
 					$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 :
@@ -567,49 +567,49 @@ 
 					$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();
-				$result =  new EE_Text_Area_Input( $input_constructor_args );
-				$result->remove_validation_strategy( 'EE_Plaintext_Validation_Strategy' );
+				$input_constructor_args['validation_strategies'][] = new EE_Simple_HTML_Validation_Strategy();
+				$result = new EE_Text_Area_Input($input_constructor_args);
+				$result->remove_validation_strategy('EE_Plaintext_Validation_Strategy');
 				break;
 			case EEM_Question::QST_type_email :
-				$result = new EE_Email_Input( $input_constructor_args );
+				$result = new EE_Email_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_us_phone :
-				$result = new EE_Phone_Input( $input_constructor_args );
+				$result = new EE_Phone_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_int :
-				$input_constructor_args[ 'validation_strategies' ][] = new EE_Int_Validation_Strategy();
-				$result = new EE_Text_Input( $input_constructor_args );
+				$input_constructor_args['validation_strategies'][] = new EE_Int_Validation_Strategy();
+				$result = new EE_Text_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_decimal :
-				$input_constructor_args[ 'validation_strategies' ][] = new EE_Float_Validation_Strategy();
-				$result = new EE_Text_Input( $input_constructor_args );
+				$input_constructor_args['validation_strategies'][] = new EE_Float_Validation_Strategy();
+				$result = new EE_Text_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_url :
-				$input_constructor_args[ 'validation_strategies' ][] = new EE_URL_Validation_Strategy();
-				$result = new EE_Text_Input( $input_constructor_args );
+				$input_constructor_args['validation_strategies'][] = new EE_URL_Validation_Strategy();
+				$result = new EE_Text_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_year :
 				$result = new EE_Year_Input(
 						$input_constructor_args,
-						apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__four_digit', true, $this ),
-						apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__early_range', 100, $this ),
-						apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__end_range', 100, $this )
+						apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__four_digit', true, $this),
+						apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__early_range', 100, $this),
+						apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__end_range', 100, $this)
 						);
 				break;
 			case EEM_Question::QST_type_multi_select :
-				$result = new EE_Select_Multiple_Input( $this->options(), $input_constructor_args );
+				$result = new EE_Select_Multiple_Input($this->options(), $input_constructor_args);
 				break;
 			// fallback
 			default :
@@ -620,12 +620,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_classes/EE_Venue.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 	 * @param array $props_n_values  incoming values from the database
 	 * @param string $timezone  incoming timezone as set by the model.  If not set the timezone for
 	 *                          		the website will be used.
-	 * @return EE_Attendee
+	 * @return EE_Venue
 	 */
 	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
 		return new self( $props_n_values, TRUE, $timezone );

Spacing +81 added lines, -81 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_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);
 	}
 
 
@@ -50,8 +50,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);
 	}
 
 
@@ -61,7 +61,7 @@ 
 	 * @return string
 	 */
 	function name() {
-		return $this->get( 'VNU_name' );
+		return $this->get('VNU_name');
 	}
 
 
@@ -70,7 +70,7 @@ 
 	 * @return string
 	 */
 	function phone() {
-		return $this->get( 'VNU_phone' );
+		return $this->get('VNU_phone');
 	}
 
 
@@ -80,7 +80,7 @@ 
 	 * @return string
 	 */
 	function venue_url() {
-		return $this->get( 'VNU_url' );
+		return $this->get('VNU_url');
 	}
 
 
@@ -89,7 +89,7 @@ 
 	 * @return string
 	 */
 	function description() {
-		return $this->get( 'VNU_desc' );
+		return $this->get('VNU_desc');
 	}
 
 
@@ -99,7 +99,7 @@ 
 	 * @return string
 	 */
 	function excerpt() {
-		return $this->get( 'VNU_short_desc' );
+		return $this->get('VNU_short_desc');
 	}
 
 
@@ -109,7 +109,7 @@ 
 	 * @return string
 	 */
 	function identifier() {
-		return $this->get( 'VNU_identifier' );
+		return $this->get('VNU_identifier');
 	}
 
 
@@ -119,7 +119,7 @@ 
 	 * @return string
 	 */
 	function address() {
-		return $this->get( 'VNU_address' );
+		return $this->get('VNU_address');
 	}
 
 
@@ -129,7 +129,7 @@ 
 	 * @return string
 	 */
 	function address2() {
-		return $this->get( 'VNU_address2' );
+		return $this->get('VNU_address2');
 	}
 
 
@@ -140,7 +140,7 @@ 
 	 * @return string
 	 */
 	function city() {
-		return $this->get( 'VNU_city' );
+		return $this->get('VNU_city');
 	}
 
 	/**
@@ -148,7 +148,7 @@ 
 	 * @return int
 	 */
 	function state_ID() {
-		return $this->get( 'STA_ID' );
+		return $this->get('STA_ID');
 	}
 
 
@@ -166,7 +166,7 @@ 
 	 * @return string
 	 */
 	public function state_name() {
-		return $this->state_obj() instanceof EE_State ? $this->state_obj()->name() :  '';
+		return $this->state_obj() instanceof EE_State ? $this->state_obj()->name() : '';
 	}
 
 
@@ -176,7 +176,7 @@ 
 	 * @return EE_State
 	 */
 	function state_obj() {
-		return $this->get_first_related( 'State' );
+		return $this->get_first_related('State');
 	}
 
 
@@ -188,7 +188,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();
@@ -202,7 +202,7 @@ 
 	 * @return string
 	 */
 	function country_ID() {
-		return $this->get( 'CNT_ISO' );
+		return $this->get('CNT_ISO');
 	}
 
 
@@ -211,7 +211,7 @@ 
 	 * @return string
 	 */
 	public function country_name() {
-		return $this->country_obj() instanceof EE_Country ? $this->country_obj()->name() :  '';
+		return $this->country_obj() instanceof EE_Country ? $this->country_obj()->name() : '';
 	}
 
 
@@ -221,7 +221,7 @@ 
 	 * @return EE_Country
 	 */
 	function country_obj() {
-		return $this->get_first_related( 'Country' );
+		return $this->get_first_related('Country');
 	}
 
 
@@ -233,7 +233,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();
@@ -247,7 +247,7 @@ 
 	 * @return string
 	 */
 	function zip() {
-		return $this->get( 'VNU_zip' );
+		return $this->get('VNU_zip');
 	}
 
 
@@ -257,7 +257,7 @@ 
 	 * @return int
 	 */
 	function capacity() {
-		return $this->get_pretty( 'VNU_capacity', 'symbol' );
+		return $this->get_pretty('VNU_capacity', 'symbol');
 	}
 
 
@@ -267,7 +267,7 @@ 
 	 * @return string
 	 */
 	function created() {
-		return $this->get( 'VNU_created' );
+		return $this->get('VNU_created');
 	}
 
 
@@ -277,7 +277,7 @@ 
 	 * @return string
 	 */
 	function modified() {
-		return $this->get( 'VNU_modified' );
+		return $this->get('VNU_modified');
 	}
 
 
@@ -287,7 +287,7 @@ 
 	 * @return int
 	 */
 	function order() {
-		return $this->get( 'VNU_order' );
+		return $this->get('VNU_order');
 	}
 
 
@@ -297,7 +297,7 @@ 
 	 * @return int
 	 */
 	function wp_user() {
-		return $this->get( 'VNU_wp_user' );
+		return $this->get('VNU_wp_user');
 	}
 
 
@@ -306,7 +306,7 @@ 
 	 * @return string
 	 */
 	function virtual_phone() {
-		return $this->get( 'VNU_virtual_phone' );
+		return $this->get('VNU_virtual_phone');
 	}
 
 
@@ -315,7 +315,7 @@ 
 	 * @return string
 	 */
 	function virtual_url() {
-		return $this->get( 'VNU_virtual_url' );
+		return $this->get('VNU_virtual_url');
 	}
 
 
@@ -324,7 +324,7 @@ 
 	 * @return bool
 	 */
 	function enable_for_gmap() {
-		return $this->get( 'VNU_enable_for_gmap' );
+		return $this->get('VNU_enable_for_gmap');
 	}
 
 
@@ -333,7 +333,7 @@ 
 	 * @return string
 	 */
 	function google_map_link() {
-		return $this->get( 'VNU_google_map_link' );
+		return $this->get('VNU_google_map_link');
 	}
 
 
@@ -345,16 +345,16 @@ 
 	 * @param bool  $upcoming
 	 * @return EE_Event[]
 	 */
-	function events( $query_params = array(), $upcoming = FALSE ) {
-		if ( $upcoming ) {
+	function events($query_params = array(), $upcoming = FALSE) {
+		if ($upcoming) {
 			$query_params = array(
 				array(
 					'status' => 'publish',
-					'Datetime.DTT_EVT_start' => array( '>',  EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_start' ) )
+					'Datetime.DTT_EVT_start' => array('>', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'))
 				)
 			);
 		}
-		return $this->get_many_related( 'Event', $query_params );
+		return $this->get_many_related('Event', $query_params);
 	}
 
 
@@ -372,8 +372,8 @@ 
 	/**
 	 * Sets address
 	 */
-	function set_address( $address = '' ) {
-		$this->set( 'VNU_address', $address );
+	function set_address($address = '') {
+		$this->set('VNU_address', $address);
 	}
 
 
@@ -381,8 +381,8 @@ 
 	/**
 	 * @param string $address2
 	 */
-	function set_address2( $address2 = '' ) {
-		$this->set( 'VNU_address2', $address2 );
+	function set_address2($address2 = '') {
+		$this->set('VNU_address2', $address2);
 	}
 
 
@@ -390,8 +390,8 @@ 
 	/**
 	 * @param string $city
 	 */
-	function set_city( $city = '' ) {
-		$this->set( 'VNU_city', $city );
+	function set_city($city = '') {
+		$this->set('VNU_city', $city);
 	}
 
 
@@ -399,8 +399,8 @@ 
 	/**
 	 * @param int $state
 	 */
-	function set_state_ID( $state = 0 ) {
-		$this->set( 'STA_ID', $state );
+	function set_state_ID($state = 0) {
+		$this->set('STA_ID', $state);
 	}
 
 
@@ -411,8 +411,8 @@ 
 	 * @param EE_State /int $state_id_or_obj
 	 * @return EE_State
 	 */
-	function set_state_obj( $state_id_or_obj ) {
-		return $this->_add_relation_to( $state_id_or_obj, 'State' );
+	function set_state_obj($state_id_or_obj) {
+		return $this->_add_relation_to($state_id_or_obj, 'State');
 	}
 
 
@@ -420,8 +420,8 @@ 
 	/**
 	 * @param int $country_ID
 	 */
-	function set_country_ID( $country_ID = 0 ) {
-		$this->set( 'CNT_ISO', $country_ID );
+	function set_country_ID($country_ID = 0) {
+		$this->set('CNT_ISO', $country_ID);
 	}
 
 
@@ -430,7 +430,7 @@ 
 	 * @param EE_Country /string $country_id_or_obj
 	 * @return EE_Country
 	 */
-	function set_country_obj( $country_id_or_obj ) {
+	function set_country_obj($country_id_or_obj) {
 		return $this->_add_relation_to($country_id_or_obj, 'Country');
 	}
 
@@ -439,8 +439,8 @@ 
 	/**
 	 * @param string $zip
 	 */
-	function set_zip( $zip = '' ) {
-		$this->set( 'VNU_zip', $zip );
+	function set_zip($zip = '') {
+		$this->set('VNU_zip', $zip);
 	}
 
 
@@ -448,8 +448,8 @@ 
 	/**
 	 * @param int $capacity
 	 */
-	function set_capacity( $capacity = 0 ) {
-		$this->set( 'VNU_capacity', $capacity );
+	function set_capacity($capacity = 0) {
+		$this->set('VNU_capacity', $capacity);
 	}
 
 
@@ -457,8 +457,8 @@ 
 	/**
 	 * @param string $created
 	 */
-	function set_created( $created = '' ) {
-		$this->set( 'VNU_created', $created );
+	function set_created($created = '') {
+		$this->set('VNU_created', $created);
 	}
 
 
@@ -466,8 +466,8 @@ 
 	/**
 	 * @param string $desc
 	 */
-	function set_description( $desc = '' ) {
-		$this->set( 'VNU_desc', $desc );
+	function set_description($desc = '') {
+		$this->set('VNU_desc', $desc);
 	}
 
 
@@ -475,8 +475,8 @@ 
 	/**
 	 * @param string $identifier
 	 */
-	function set_identifier( $identifier = '' ) {
-		$this->set( 'VNU_identifier', $identifier );
+	function set_identifier($identifier = '') {
+		$this->set('VNU_identifier', $identifier);
 	}
 
 
@@ -484,8 +484,8 @@ 
 	/**
 	 * @param string $modified
 	 */
-	function set_modified( $modified = '' ) {
-		$this->set( 'VNU_modified', $modified );
+	function set_modified($modified = '') {
+		$this->set('VNU_modified', $modified);
 	}
 
 
@@ -493,8 +493,8 @@ 
 	/**
 	 * @param string $name
 	 */
-	function set_name( $name = '' ) {
-		$this->set( 'VNU_name', $name );
+	function set_name($name = '') {
+		$this->set('VNU_name', $name);
 	}
 
 
@@ -502,8 +502,8 @@ 
 	/**
 	 * @param int $order
 	 */
-	function set_order( $order = 0 ) {
-		$this->set( 'VNU_order', $order );
+	function set_order($order = 0) {
+		$this->set('VNU_order', $order);
 	}
 
 
@@ -511,8 +511,8 @@ 
 	/**
 	 * @param string $phone
 	 */
-	function set_phone( $phone = '' ) {
-		$this->set( 'VNU_phone', $phone );
+	function set_phone($phone = '') {
+		$this->set('VNU_phone', $phone);
 	}
 
 
@@ -520,8 +520,8 @@ 
 	/**
 	 * @param int $wp_user
 	 */
-	function set_wp_user( $wp_user = 1 ) {
-		$this->set( 'VNU_wp_user', $wp_user );
+	function set_wp_user($wp_user = 1) {
+		$this->set('VNU_wp_user', $wp_user);
 	}
 
 
@@ -529,8 +529,8 @@ 
 	/**
 	 * @param string $url
 	 */
-	function set_venue_url( $url = '' ) {
-		$this->set( 'VNU_url', $url );
+	function set_venue_url($url = '') {
+		$this->set('VNU_url', $url);
 	}
 
 
@@ -538,8 +538,8 @@ 
 	/**
 	 * @param string $phone
 	 */
-	function set_virtual_phone( $phone = '' ) {
-		$this->set( 'VNU_virtual_phone', $phone );
+	function set_virtual_phone($phone = '') {
+		$this->set('VNU_virtual_phone', $phone);
 	}
 
 
@@ -547,8 +547,8 @@ 
 	/**
 	 * @param string $url
 	 */
-	function set_virtual_url( $url = '' ) {
-		$this->set( 'VNU_virtual_url', $url );
+	function set_virtual_url($url = '') {
+		$this->set('VNU_virtual_url', $url);
 	}
 
 
@@ -556,8 +556,8 @@ 
 	/**
 	 * @param string $enable
 	 */
-	function set_enable_for_gmap( $enable = '' ) {
-		$this->set( 'VNU_enable_for_gmap', $enable );
+	function set_enable_for_gmap($enable = '') {
+		$this->set('VNU_enable_for_gmap', $enable);
 	}
 
 
@@ -565,8 +565,8 @@ 
 	/**
 	 * @param string $google_map_link
 	 */
-	function set_google_map_link( $google_map_link = '' ) {
-		$this->set( 'VNU_google_map_link', $google_map_link );
+	function set_google_map_link($google_map_link = '') {
+		$this->set('VNU_google_map_link', $google_map_link);
 	}
 
 

payment_methods/Paypal_Standard/EE_PMT_Paypal_Standard.pm.php

Spacing +14 added lines, -14 removed lines

@@ -10,7 +10,7 @@ 
  * @since 				$VID:$
  *
  */
-class EE_PMT_Paypal_Standard extends EE_PMT_Base{
+class EE_PMT_Paypal_Standard extends EE_PMT_Base {
 
 	const shipping_info_none = 1;
 	const shipping_info_optional = 0;
@@ -46,7 +46,7 @@ 
 	 * @param \EE_Transaction $transaction
 	 * @return NULL
 	 */
-	public function generate_new_billing_form( EE_Transaction $transaction = NULL ) {
+	public function generate_new_billing_form(EE_Transaction $transaction = NULL) {
 		return NULL;
 	}
 
@@ -59,13 +59,13 @@ 
 	 * @throws \EE_Error
 	 */
 	public function generate_new_settings_form() {
-		require_once( $this->file_folder() . 'EE_Paypal_Standard_Form.form.php' );
-		$form =  new EE_Paypal_Standard_Form( $this );
-		$form->get_input( 'PMD_debug_mode' )->set_html_label_text(
-			sprintf( __( "Use PayPal Sandbox %s", 'event_espresso' ), $this->get_help_tab_link() )
+		require_once($this->file_folder().'EE_Paypal_Standard_Form.form.php');
+		$form = new EE_Paypal_Standard_Form($this);
+		$form->get_input('PMD_debug_mode')->set_html_label_text(
+			sprintf(__("Use PayPal Sandbox %s", 'event_espresso'), $this->get_help_tab_link())
 		);
-		$form->get_input( 'shipping_details' )->set_html_label_text(
-			sprintf( __( "Shipping Address Options %s", "event_espresso" ), $this->get_help_tab_link() )
+		$form->get_input('shipping_details')->set_html_label_text(
+			sprintf(__("Shipping Address Options %s", "event_espresso"), $this->get_help_tab_link())
 		);
 		return $form;
 	}
@@ -77,7 +77,7 @@ 
 	 * @see EE_PMT_Base::help_tabs_config()
 	 * @return array
 	 */
-	public function help_tabs_config(){
+	public function help_tabs_config() {
 		return array(
 			$this->get_help_tab_name() => array(
 				'title'=>  __("PayPal Standard Settings", 'event_espresso'),
@@ -99,13 +99,13 @@ 
 	 * @return EE_Payment
 	 * @throws \EE_Error
 	 */
-	public function finalize_payment_for($transaction){
+	public function finalize_payment_for($transaction) {
 		// PayPal standard actually sends the IPN info along with the user when they return to our site
 		// so in case the IPN is arriving later, let's try to process an IPN!
-		if( $_SERVER['REQUEST_METHOD'] === 'POST' ){
-			return $this->handle_ipn($_POST, $transaction );
-		}else{
-			return parent::finalize_payment_for( $transaction );
+		if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+			return $this->handle_ipn($_POST, $transaction);
+		} else {
+			return parent::finalize_payment_for($transaction);
 		}
 	}
 

Braces +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
 		// so in case the IPN is arriving later, let's try to process an IPN!
 		if( $_SERVER['REQUEST_METHOD'] === 'POST' ){
 			return $this->handle_ipn($_POST, $transaction );
-		}else{
+		} else{
 			return parent::finalize_payment_for( $transaction );
 		}
 	}

core/helpers/EEH_Formatter.helper.php

Doc Comments +1 added lines

@@ -74,6 +74,7 @@
 	 * [ee_tep_not_null description]
 	 *
 	 * @param  string | array $value [description]
+	 * @param string $value
 	 * @return bool       [description]
 	 */
 	static public function ee_tep_not_null( $value ) {

Spacing +17 added lines, -17 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,8 +26,8 @@ 
 	 * @param  string $content content to format
 	 * @return string          formatted content
 	 */
-	static public function admin_format_content( $content = '' ) {
-		return wpautop( stripslashes_deep( html_entity_decode( $content, ENT_QUOTES, "UTF-8" ) ) );
+	static public function admin_format_content($content = '') {
+		return wpautop(stripslashes_deep(html_entity_decode($content, ENT_QUOTES, "UTF-8")));
 	}
 
 
@@ -43,14 +43,14 @@ 
 	 * @param  boolean $protected true then we run htmlspecialchars and return
 	 * @return string
 	 */
-	static public function ee_tep_output_string( $string, $translate = false, $protected = false ) {
-		if ( $protected === true ) {
-			return htmlspecialchars( $string );
+	static public function ee_tep_output_string($string, $translate = false, $protected = false) {
+		if ($protected === true) {
+			return htmlspecialchars($string);
 		} else {
-			if ( $translate === false ) {
-				return self::ee_tep_parse_input_field_data( $string, array( '"' => '&quot;' ) );
+			if ($translate === false) {
+				return self::ee_tep_parse_input_field_data($string, array('"' => '&quot;'));
 			} else {
-				return self::ee_tep_parse_input_field_data( $string, $translate );
+				return self::ee_tep_parse_input_field_data($string, $translate);
 			}
 		}
 	}
@@ -64,8 +64,8 @@ 
 	 * @param         array ] $parse array in the form array( 'from' => 'to', ... )
 	 * @return string
 	 */
-	static public function ee_tep_parse_input_field_data( $data, $parse ) {
-		return strtr( trim( $data ), $parse );
+	static public function ee_tep_parse_input_field_data($data, $parse) {
+		return strtr(trim($data), $parse);
 	}
 
 
@@ -76,15 +76,15 @@ 
 	 * @param  string | array $value [description]
 	 * @return bool       [description]
 	 */
-	static public function ee_tep_not_null( $value ) {
-		if ( is_array( $value ) ) {
-			if ( count( $value ) > 0 ) {
+	static public function ee_tep_not_null($value) {
+		if (is_array($value)) {
+			if (count($value) > 0) {
 				return true;
 			} else {
 				return false;
 			}
 		} else {
-			if ( ( $value !== '' ) && ( strtolower( $value ) !== 'null' ) && ( strlen( trim( $value ) ) > 0 ) ) {
+			if (($value !== '') && (strtolower($value) !== 'null') && (strlen(trim($value)) > 0)) {
 				return true;
 			} else {
 				return false;
@@ -104,7 +104,7 @@ 
 	 * @return string
 	 * @deprecated v4.6.21
 	 */
-	static public function event_date_display( $date, $format = '' ) {
+	static public function event_date_display($date, $format = '') {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			__(

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

Spacing +12 added lines, -12 removed lines

@@ -1,9 +1,9 @@ 
 <?php
-add_filter( 'FHEE__EEH_Form_Fields__label_html', '__return_empty_string' );
+add_filter('FHEE__EEH_Form_Fields__label_html', '__return_empty_string');
 $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'))
 	)
 );
 ?>
@@ -22,27 +22,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>
@@ -58,7 +58,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 />'
@@ -70,11 +70,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>

caffeinated/modules/events_archive_caff/templates/admin-event-list-settings.template.php

Spacing +30 added lines, -30 removed lines

@@ -1,15 +1,15 @@ 
 <?php
-add_filter( 'FHEE__EEH_Form_Fields__label_html', '__return_empty_string' );
+add_filter('FHEE__EEH_Form_Fields__label_html', '__return_empty_string');
 
-$values = EEH_Form_Fields::prep_answer_options( array(
-	array( 'id' => 1, 'text' => __('Yes', 'event_espresso')),
-	array( 'id' => 0, 'text' => __('No', 'event_espresso'))
+$values = EEH_Form_Fields::prep_answer_options(array(
+	array('id' => 1, 'text' => __('Yes', 'event_espresso')),
+	array('id' => 0, 'text' => __('No', 'event_espresso'))
 ));
 
-$description = EEH_Form_Fields::prep_answer_options( array(
-	array( 'id' => 0, 'text' => __('none', 'event_espresso')),
-	array( 'id' => 1, 'text' => __('excerpt (short desc)', 'event_espresso')),
-	array( 'id' => 2, 'text' => __('full description', 'event_espresso'))
+$description = EEH_Form_Fields::prep_answer_options(array(
+	array('id' => 0, 'text' => __('none', 'event_espresso')),
+	array('id' => 1, 'text' => __('excerpt (short desc)', 'event_espresso')),
+	array('id' => 2, 'text' => __('full description', 'event_espresso'))
 ));
 
 ?>
@@ -27,7 +27,7 @@ 
 			<tr>
 				<th>
 					<label for="event_listings_url">
-						<?php _e('Event Listings URL', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('event_listings_url_info');?>
+						<?php _e('Event Listings URL', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('event_listings_url_info'); ?>
 					</label>
 				</th>
 				<td>
@@ -42,13 +42,13 @@ 
 					</label>
 				</th>
 				<td>
-					<p><?php echo site_url() . '/ ' . EEH_Form_Fields::text( 'not_used', EE_Registry::instance()->CFG->core->event_cpt_slug, 'event_cpt_slug', 'event_cpt_slug', 'regular' ); ?></p>
+					<p><?php echo site_url().'/ '.EEH_Form_Fields::text('not_used', EE_Registry::instance()->CFG->core->event_cpt_slug, 'event_cpt_slug', 'event_cpt_slug', 'regular'); ?></p>
 					<p class="description"><?php _e('This allows you to configure what slug is used for the url of all event pages.', 'event_espresso'); ?></p>
-					<?php if ( has_filter( 'FHEE__EE_Register_CPTs__register_CPT__rewrite' ) ) : ?>
+					<?php if (has_filter('FHEE__EE_Register_CPTs__register_CPT__rewrite')) : ?>
 						<p class="important-notice">
 							<?php
 							sprintf(
-								__( 'Usage of the %1$s FHEE__EE_Register_CPTs__register_CPT__rewrite %2$s filter has been detected.  Please be aware that while this filter is being used, this setting has no affect.', 'event_espresso' ),
+								__('Usage of the %1$s FHEE__EE_Register_CPTs__register_CPT__rewrite %2$s filter has been detected.  Please be aware that while this filter is being used, this setting has no affect.', 'event_espresso'),
 								'<code>',
 								'</code>'
 							);
@@ -65,7 +65,7 @@ 
 					</label>
 				</th>
 				<td>
-				<?php echo EEH_Form_Fields::select( 'display_status_banner', $display_status_banner, $values, 'EED_Events_Archive_display_status_banner', 'EED_Events_Archive_display_status_banner' );?>
+				<?php echo EEH_Form_Fields::select('display_status_banner', $display_status_banner, $values, 'EED_Events_Archive_display_status_banner', 'EED_Events_Archive_display_status_banner'); ?>
 					<p class="description"><?php _e('Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the events archive page.', 'event_espresso'); ?></p>
 				</td>
 			</tr>
@@ -73,55 +73,55 @@ 
 			<tr>
 				<th>
 					<label for="EED_Events_Archive_display_description">
-						<?php _e('Display Description', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_description_info');?>
+						<?php _e('Display Description', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_description_info'); ?>
 					</label>
 				</th>
 				<td>
-					<?php echo EEH_Form_Fields::select( 'description', $display_description, $description, 'EED_Events_Archive_display_description', 'EED_Events_Archive_display_description' );?>
+					<?php echo EEH_Form_Fields::select('description', $display_description, $description, 'EED_Events_Archive_display_description', 'EED_Events_Archive_display_description'); ?>
 				</td>
 			</tr>
 
 			<tr>
 				<th>
 					<label for="EED_Events_Archive_display_ticket_selector">
-						<?php _e('Display Ticket Selector', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_ticket_selector_info');?>
+						<?php _e('Display Ticket Selector', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_ticket_selector_info'); ?>
 					</label>
 				</th>
 				<td>
-					<?php echo EEH_Form_Fields::select( 'ticket_selector', $display_ticket_selector, $values, 'EED_Events_Archive_display_ticket_selector', 'EED_Events_Archive_display_ticket_selector' );?>
+					<?php echo EEH_Form_Fields::select('ticket_selector', $display_ticket_selector, $values, 'EED_Events_Archive_display_ticket_selector', 'EED_Events_Archive_display_ticket_selector'); ?>
 				</td>
 			</tr>
 
 			<tr>
 				<th>
 					<label for="EED_Events_Archive_display_datetimes">
-						<?php _e('Display Datetimes', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_datetimes_info');?>
+						<?php _e('Display Datetimes', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_datetimes_info'); ?>
 					</label>
 				</th>
 				<td>
-					<?php echo EEH_Form_Fields::select( 'venue_details', $display_datetimes, $values, 'EED_Events_Archive_display_datetimes', 'EED_Events_Archive_display_datetimes' );?>
+					<?php echo EEH_Form_Fields::select('venue_details', $display_datetimes, $values, 'EED_Events_Archive_display_datetimes', 'EED_Events_Archive_display_datetimes'); ?>
 				</td>
 			</tr>
 
 			<tr>
 				<th>
 					<label for="EED_Events_Archive_display_venue">
-						<?php _e('Display Venue Details', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_venue_details_info');?>
+						<?php _e('Display Venue Details', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_venue_details_info'); ?>
 					</label>
 				</th>
 				<td>
-					<?php echo EEH_Form_Fields::select( 'display_venue', $display_venue, $values, 'EED_Events_Archive_display_venue', 'EED_Events_Archive_display_venue' );?>
+					<?php echo EEH_Form_Fields::select('display_venue', $display_venue, $values, 'EED_Events_Archive_display_venue', 'EED_Events_Archive_display_venue'); ?>
 				</td>
 			</tr>
 
 			<tr>
 				<th>
 					<label for="EED_Events_Archive_display_expired_events">
-						<?php _e('Display Expired Events', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_expired_events_info');?>
+						<?php _e('Display Expired Events', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_expired_events_info'); ?>
 					</label>
 				</th>
 				<td>
-					<?php echo EEH_Form_Fields::select( 'expired_events', $display_expired_events, $values, 'EED_Events_Archive_display_expired_events', 'EED_Events_Archive_display_expired_events' );?>
+					<?php echo EEH_Form_Fields::select('expired_events', $display_expired_events, $values, 'EED_Events_Archive_display_expired_events', 'EED_Events_Archive_display_expired_events'); ?>
 				</td>
 			</tr>
 
@@ -132,11 +132,11 @@ 
 					</label>
 				</th>
 				<td>
-					<?php echo EEH_Form_Fields::select( 'use_sortable_display_order', $use_sortable_display_order, $values, 'EED_Events_Archive_use_sortable_display_order', 'EED_Events_Archive_use_sortable_display_order' );?>
+					<?php echo EEH_Form_Fields::select('use_sortable_display_order', $use_sortable_display_order, $values, 'EED_Events_Archive_use_sortable_display_order', 'EED_Events_Archive_use_sortable_display_order'); ?>
 					<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 Archive listings, 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 Archive listings, 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 />'
@@ -148,14 +148,14 @@ 
 
 			<tr>
 				<th>
-					<?php _e( 'Display Order', 'event_espresso' ); ?><?php //echo EEH_Template::get_help_tab_link( 'event_archive_order_info' ); ?>
+					<?php _e('Display Order', 'event_espresso'); ?><?php //echo EEH_Template::get_help_tab_link( 'event_archive_order_info' ); ?>
 				</th>
 				<td>
 
-					<?php wp_nonce_field( 'espresso_update_event_archive_order', 'espresso_update_event_archive_order_nonce', false ); ?>
+					<?php wp_nonce_field('espresso_update_event_archive_order', 'espresso_update_event_archive_order_nonce', false); ?>
 					<?php echo $event_archive_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 event archive page.', 'event_espresso' ); ?></p>
+					<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 event archive page.', 'event_espresso'); ?></p>
 
 				</td>
 			</tr>
@@ -163,11 +163,11 @@ 
 			<tr>
 				<th>
 					<label for="EED_Events_Archive_reset_event_list_settings">
-						<?php _e( 'Reset Event List Settings', 'event_espresso' ); ?>
+						<?php _e('Reset Event List Settings', 'event_espresso'); ?>
 					</label>
 				</th>
 				<td>
-					<?php echo EEH_Form_Fields::select( 'reset_event_list_settings', 0, $values, 'EED_Events_Archive_reset_event_list_settings', 'EED_Events_Archive_reset_event_list_settings' ); ?>
+					<?php echo EEH_Form_Fields::select('reset_event_list_settings', 0, $values, 'EED_Events_Archive_reset_event_list_settings', 'EED_Events_Archive_reset_event_list_settings'); ?>
 				</td>
 			</tr>
 

core/data_migration_scripts/4_6_0_stages/EE_DMS_4_6_0_invoice_settings.dmsstage.php

Spacing +6 added lines, -6 removed lines

@@ -27,7 +27,7 @@ 
 	 * Just initializes the status of the migration
 	 */
 	public function __construct() {
-		$this->_pretty_name = __( 'Update Invoice Settings', 'event_espresso' );
+		$this->_pretty_name = __('Update Invoice Settings', 'event_espresso');
 		parent::__construct();
 	}
 
@@ -54,13 +54,13 @@ 
 	 * @throws EE_Error
 	 * @return int number of items ACTUALLY migrated
 	 */
-	protected function _migration_step( $num_items = 1 ){
+	protected function _migration_step($num_items = 1) {
 
 		$templates_relative_path = 'modules/gateways/Invoice/lib/templates/';
-		$overridden_invoice_body = EEH_Template::locate_template( $templates_relative_path . 'invoice_body.template.php', NULL, FALSE, FALSE, TRUE );
-		$overridden_receipt_body= EEH_Template::locate_template( $templates_relative_path . 'receipt_body.template.php', NULL, FALSE, FALSE, TRUE );
-		if( $overridden_invoice_body || $overridden_receipt_body ) {
-			EE_Error::add_persistent_admin_notice( 'invoice_overriding_templates', sprintf( __( 'Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overriden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents (but this will be removed in an upcoming version). We recommend deleting your old Invoice/Receipt templates and using the new messages system. Then modify the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.')), TRUE );
+		$overridden_invoice_body = EEH_Template::locate_template($templates_relative_path.'invoice_body.template.php', NULL, FALSE, FALSE, TRUE);
+		$overridden_receipt_body = EEH_Template::locate_template($templates_relative_path.'receipt_body.template.php', NULL, FALSE, FALSE, TRUE);
+		if ($overridden_invoice_body || $overridden_receipt_body) {
+			EE_Error::add_persistent_admin_notice('invoice_overriding_templates', sprintf(__('Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overriden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents (but this will be removed in an upcoming version). We recommend deleting your old Invoice/Receipt templates and using the new messages system. Then modify the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.')), TRUE);
 		}
 
 		//regardless of whether it worked or not, we ought to continue the migration

core/libraries/form_sections/strategies/layout/EE_Template_Layout.strategy.php

Spacing +34 added lines, -34 removed lines

@@ -21,7 +21,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_Template_Layout extends EE_Div_Per_Section_Layout{
+class EE_Template_Layout extends EE_Div_Per_Section_Layout {
 
 	protected $_layout_template_file = NULL;
 	protected $_layout_begin_template_file = NULL;
@@ -42,12 +42,12 @@ 
 	 * 		@type array 	$_template_args
 	 * 	}
 	 */
-	public function __construct( $template_options = array() ) {
+	public function __construct($template_options = array()) {
 		// loop thru incoming options
-		foreach( $template_options as $key => $value ) {
+		foreach ($template_options as $key => $value) {
 			// add underscore to $key to match property names
-			$_key = '_' . $key;
-			if ( property_exists( $this, $_key )) {
+			$_key = '_'.$key;
+			if (property_exists($this, $_key)) {
 					$this->{$_key} = $value;
 			}
 		}
@@ -65,8 +65,8 @@ 
 	 * @return string
 	 */
 	public function layout_form() {
-		if ( $this->_layout_template_file ) {
-			return EEH_Template::locate_template( $this->_layout_template_file, $this->template_args(), TRUE, TRUE );
+		if ($this->_layout_template_file) {
+			return EEH_Template::locate_template($this->_layout_template_file, $this->template_args(), TRUE, TRUE);
 		} else {
 			return parent::layout_form();
 		}
@@ -79,9 +79,9 @@ 
 	 * @return string
 	 */
 	public function layout_form_begin() {
-		if($this->_layout_begin_template_file){
-			return EEH_Template::locate_template( $this->_layout_begin_template_file, $this->template_args(), TRUE, TRUE );
-		}else{
+		if ($this->_layout_begin_template_file) {
+			return EEH_Template::locate_template($this->_layout_begin_template_file, $this->template_args(), TRUE, TRUE);
+		} else {
 			return parent::layout_form_begin();
 		}
 	}
@@ -94,9 +94,9 @@ 
 	 * @param EE_Form_Input_Base $input
 	 * @return string
 	 */
-	public function layout_input( $input ) {
-		if($this->_input_template_file){
-			return EEH_Template::locate_template( $this->_input_template_file, array( 'input' => $input ), TRUE, TRUE );
+	public function layout_input($input) {
+		if ($this->_input_template_file) {
+			return EEH_Template::locate_template($this->_input_template_file, array('input' => $input), TRUE, TRUE);
 		}
 		return parent::layout_input($input);
 	}
@@ -109,11 +109,11 @@ 
 	 * @param EE_Form_Section_Proper $form_section
 	 * @return string
 	 */
-	public function layout_subsection( $form_section ) {
-		if($this->_subsection_template_file){
-			return EEH_Template::locate_template( $this->_subsection_template_file, $this->template_args(), TRUE, TRUE );
+	public function layout_subsection($form_section) {
+		if ($this->_subsection_template_file) {
+			return EEH_Template::locate_template($this->_subsection_template_file, $this->template_args(), TRUE, TRUE);
 		}
-		return parent::layout_subsection( $form_section );
+		return parent::layout_subsection($form_section);
 	}
 
 
@@ -123,9 +123,9 @@ 
 	 * @return string
 	 */
 	public function layout_form_end() {
-		if($this->_layout_end_template_file){
-			return EEH_Template::locate_template( $this->_layout_end_template_file, $this->template_args(), TRUE, TRUE);
-		}else{
+		if ($this->_layout_end_template_file) {
+			return EEH_Template::locate_template($this->_layout_end_template_file, $this->template_args(), TRUE, TRUE);
+		} else {
 			return parent::layout_form_end();
 		}
 	}
@@ -135,7 +135,7 @@ 
 	/**
 	 * @param array $template_args
 	 */
-	public function set_template_args( $template_args = array() ) {
+	public function set_template_args($template_args = array()) {
 		$this->_template_args = $template_args;
 	}
 
@@ -144,8 +144,8 @@ 
 	/**
 	 * @param array $template_args
 	 */
-	public function add_template_args( $template_args = array() ) {
-		$this->_template_args = array_merge_recursive( $this->_template_args, $template_args );
+	public function add_template_args($template_args = array()) {
+		$this->_template_args = array_merge_recursive($this->_template_args, $template_args);
 	}
 
 
@@ -154,13 +154,13 @@ 
 	 * @return array
 	 */
 	public function template_args() {
-		foreach ( $this->form_section()->subsections() as $subsection_name => $subsection ) {
-			$subsection_name = self::prep_form_subsection_key_name( $subsection_name );
-			if ( strpos( $subsection_name, '[' ) !== FALSE ) {
-				$sub_name = explode( '[', $subsection_name );
-				$this->_template_args[ $sub_name[0] ][ rtrim( $sub_name[1], ']' ) ] = $this->layout_subsection( $subsection );
+		foreach ($this->form_section()->subsections() as $subsection_name => $subsection) {
+			$subsection_name = self::prep_form_subsection_key_name($subsection_name);
+			if (strpos($subsection_name, '[') !== FALSE) {
+				$sub_name = explode('[', $subsection_name);
+				$this->_template_args[$sub_name[0]][rtrim($sub_name[1], ']')] = $this->layout_subsection($subsection);
 			} else {
-				$this->_template_args[ $subsection_name ] = $this->layout_subsection( $subsection );
+				$this->_template_args[$subsection_name] = $this->layout_subsection($subsection);
 			}
 		}
 //		d( $this->_template_args );
@@ -176,9 +176,9 @@ 
 	 * @param string $subsection_name
 	 * @return string
 	 */
-	public static function prep_form_subsection_key_name( $subsection_name = '' ) {
-		$subsection_name = str_replace( array( '-', ' ' ), array( '', '_' ), $subsection_name );
-		return is_numeric( substr( $subsection_name, 0, 1 )) ? 'form_' . $subsection_name : $subsection_name;
+	public static function prep_form_subsection_key_name($subsection_name = '') {
+		$subsection_name = str_replace(array('-', ' '), array('', '_'), $subsection_name);
+		return is_numeric(substr($subsection_name, 0, 1)) ? 'form_'.$subsection_name : $subsection_name;
 	}
 
 
@@ -190,8 +190,8 @@ 
 	 * @param string $subsection_name
 	 * @return string
 	 */
-	public static function get_subform_name( $subsection_name = '' ) {
-		return EE_Template_Layout::prep_form_subsection_key_name( $subsection_name );
+	public static function get_subform_name($subsection_name = '') {
+		return EE_Template_Layout::prep_form_subsection_key_name($subsection_name);
 	}
 
 

Braces +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
 	public function layout_form_begin() {
 		if($this->_layout_begin_template_file){
 			return EEH_Template::locate_template( $this->_layout_begin_template_file, $this->template_args(), TRUE, TRUE );
-		}else{
+		} else{
 			return parent::layout_form_begin();
 		}
 	}
@@ -125,7 +125,7 @@ 
 	public function layout_form_end() {
 		if($this->_layout_end_template_file){
 			return EEH_Template::locate_template( $this->_layout_end_template_file, $this->template_args(), TRUE, TRUE);
-		}else{
+		} else{
 			return parent::layout_form_end();
 		}
 	}