eventespresso / event-espresso-core

core/db_classes/EE_Event_Venue.class.php

Spacing +6 added lines, -6 removed lines

@@ -2,15 +2,15 @@ 
 /**
  * Required  by EEM_Event_Question_Group in case someone queries for all its model objects
  */
-class EE_Event_Venue extends EE_Base_Class{
+class EE_Event_Venue extends EE_Base_Class {
 
 	/**
 	 * @param array $props_n_values
 	 * @return EE_Event_Venue|mixed
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values);
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -19,8 +19,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Event_Venue
 	 */
-	public static function new_instance_from_db ( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 }
\ No newline at end of file

core/db_classes/EE_Payment_Method.class.php

Spacing +45 added lines, -45 removed lines

@@ -1,5 +1,5 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 /**
  * Event Espresso
  *
@@ -23,7 +23,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_Payment_Method extends EE_Base_Class{
+class EE_Payment_Method extends EE_Base_Class {
 
 	/**
 	 * Payment Method type object, which has all the info about this type of payment method,
@@ -39,9 +39,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Payment_Method
 	 */
-	public static function new_instance( $props_n_values = array()) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values, FALSE );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values, FALSE);
 	}
 
 
@@ -51,8 +51,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Payment_Method
 	 */
-	public static function new_instance_from_db ( $props_n_values = array()) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 
@@ -81,7 +81,7 @@ 
 	 * @return boolean
 	 */
 	function active() {
-		return array_intersect(array_keys(EEM_Payment_Method::instance()->scopes()),$this->scope());
+		return array_intersect(array_keys(EEM_Payment_Method::instance()->scopes()), $this->scope());
 	}
 
 
@@ -90,10 +90,10 @@ 
 	 * Sets this PM as active by making it usable within the CART scope. Offline gateways
 	 * are also usable from the admin-scope as well. DOES NOT SAVE it
 	 */
-	function set_active(){
+	function set_active() {
 		$default_scopes = array(EEM_Payment_Method::scope_cart);
-		if($this->type_obj() &&
-			$this->type_obj()->payment_occurs() == EE_PMT_Base::offline){
+		if ($this->type_obj() &&
+			$this->type_obj()->payment_occurs() == EE_PMT_Base::offline) {
 			$default_scopes[] = EEM_Payment_Method::scope_admin;
 		}
 		$this->set_scope($default_scopes);
@@ -104,7 +104,7 @@ 
 	/**
 	 * Makes this payment method apply to NO scopes at all. DOES NOT SAVE it.
 	 */
-	function deactivate(){
+	function deactivate() {
 		$this->set_scope(array());
 	}
 
@@ -295,8 +295,8 @@ 
 	 * @param type $field_value
 	 * @param type $use_default
 	 */
-	function set( $field_name, $field_value, $use_default = FALSE ){
-		if( $field_name == 'PMD_type' ){
+	function set($field_name, $field_value, $use_default = FALSE) {
+		if ($field_name == 'PMD_type') {
 			//the type has probably changed, so forget about its old type object
 			$this->_type_obj = NULL;
 		}
@@ -370,26 +370,26 @@ 
 	 * @return EE_PMT_Base
 	 * @throws EE_Error
 	 */
-	public function type_obj(){
-		if( ! $this->_type_obj ) {
-			EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
-			if ( EE_Payment_Method_Manager::instance()->payment_method_type_exists( $this->type() )) {
-				$class_name = EE_Payment_Method_Manager::instance()->payment_method_class_from_type( $this->type() );
-				if ( ! class_exists( $class_name )) {
+	public function type_obj() {
+		if ( ! $this->_type_obj) {
+			EE_Registry::instance()->load_lib('Payment_Method_Manager');
+			if (EE_Payment_Method_Manager::instance()->payment_method_type_exists($this->type())) {
+				$class_name = EE_Payment_Method_Manager::instance()->payment_method_class_from_type($this->type());
+				if ( ! class_exists($class_name)) {
 					throw new EE_Error(
 						sprintf(
-							__( 'An attempt to use the "%1$s" payment method failed, so it was deactivated.%2$sWas the "%1$s" Plugin recently deactivated? It can be reactivated on the %3$sPlugins Admin Page%4$s', 'event_espresso' ),
+							__('An attempt to use the "%1$s" payment method failed, so it was deactivated.%2$sWas the "%1$s" Plugin recently deactivated? It can be reactivated on the %3$sPlugins Admin Page%4$s', 'event_espresso'),
 							$class_name,
 							'<br />',
-							'<a href="' . admin_url('plugins.php') . '">',
+							'<a href="'.admin_url('plugins.php').'">',
 							'</a>'
 						)
 					);
 				}
-				$r = new ReflectionClass( $class_name );
-					$this->_type_obj = $r->newInstanceArgs( array( $this ));
+				$r = new ReflectionClass($class_name);
+					$this->_type_obj = $r->newInstanceArgs(array($this));
 			} else {
-				throw new EE_Error( sprintf( __( 'A payment method of type "%1$s" does not exist. Only ones existing are: %2$s', 'event_espresso' ), $this->type(), implode(',', EE_Payment_Method_Manager::instance()->payment_method_type_names() ) ) );
+				throw new EE_Error(sprintf(__('A payment method of type "%1$s" does not exist. Only ones existing are: %2$s', 'event_espresso'), $this->type(), implode(',', EE_Payment_Method_Manager::instance()->payment_method_type_names())));
 			}
 		}
 		return $this->_type_obj;
@@ -402,18 +402,18 @@ 
 	 * and the extra meta. Mostly used for passing off ot gateways.	 *
 	 * @return array
 	 */
-	public function settings_array(){
+	public function settings_array() {
 		$fields = $this->model_field_array();
 		$extra_meta = $this->all_extra_meta_array();
 		//remove the model's prefix from the fields
 		$combined_settings_array = array();
-		foreach($fields as $key => $value){
-			if(strpos($key, 'PMD_')===0){
+		foreach ($fields as $key => $value) {
+			if (strpos($key, 'PMD_') === 0) {
 				$key_sans_model_prefix = str_replace('PMD_', '', $key);
 				$combined_settings_array [$key_sans_model_prefix] = $value;
 			}
 		}
-		$combined_settings_array = array_merge( $extra_meta,$combined_settings_array );
+		$combined_settings_array = array_merge($extra_meta, $combined_settings_array);
 		return $combined_settings_array;
 	}
 
@@ -425,12 +425,12 @@ 
 	 * @param string $css_class
 	 * @return string of HTML for displaying the button
 	 */
-	public function button_html( $url = '', $css_class = '' ){
+	public function button_html($url = '', $css_class = '') {
 		$payment_occurs = $this->type_obj()->payment_occurs();
 		return '
-		 <div id="' . $this->slug() . '-payment-option-dv" class="'. $payment_occurs .'-payment-gateway reg-page-payment-option-dv' . $css_class . '">
-			<a id="payment-gateway-button-' . $this->slug() . '" class="reg-page-payment-option-lnk" rel="' . $this->slug() . '" href="' . $url . '" >
-				<img src="' . $this->button_url() . '" alt="' . sprintf( esc_attr__( 'Pay using %s', 'event_espresso' ), $this->get_pretty('PMD_name','form_input') ) . '" />
+		 <div id="' . $this->slug().'-payment-option-dv" class="'.$payment_occurs.'-payment-gateway reg-page-payment-option-dv'.$css_class.'">
+			<a id="payment-gateway-button-' . $this->slug().'" class="reg-page-payment-option-lnk" rel="'.$this->slug().'" href="'.$url.'" >
+				<img src="' . $this->button_url().'" alt="'.sprintf(esc_attr__('Pay using %s', 'event_espresso'), $this->get_pretty('PMD_name', 'form_input')).'" />
 			</a>
 		</div>
 ';
@@ -443,7 +443,7 @@ 
 	 * (as defined by the gateway and the currently active currencies)
 	 * @return EE_Currency[]
 	 */
-	public function get_all_usable_currencies(){
+	public function get_all_usable_currencies() {
 		return EEM_Currency::instance()->get_all_currencies_usable_by($this->type_obj());
 	}
 
@@ -452,9 +452,9 @@ 
 	 * @param string $currency_code currency ID (code)
 	 * @return boolean
 	 */
-	public function usable_for_currency( $currency_code ) {
-		foreach( $this->get_all_usable_currencies() as $currency_obj ) {
-			if( $currency_obj->ID() == $currency_code ){
+	public function usable_for_currency($currency_code) {
+		foreach ($this->get_all_usable_currencies() as $currency_obj) {
+			if ($currency_obj->ID() == $currency_code) {
 				return TRUE;
 			}
 		}
@@ -467,7 +467,7 @@ 
 	 * Returns TRUE if this payment method's gateway is an instance of EE_Onsite_Gateway
 	 * @return bool
 	 */
-	public function is_on_site(){
+	public function is_on_site() {
 		return $this->type_obj()->payment_occurs() == EE_PMT_Base::onsite;
 	}
 
@@ -477,7 +477,7 @@ 
 	 * Returns TRUE if this payment method's gateway is an instance of EE_Offsite_Gateway
 	 * @return bool
 	 */
-	public function is_off_site(){
+	public function is_off_site() {
 		return $this->type_obj()->payment_occurs() == EE_PMT_Base::offsite;
 	}
 
@@ -487,7 +487,7 @@ 
 	 * Returns TRUE if this payment method does not utilize a gateway
 	 * @return bool
 	 */
-	public function is_off_line(){
+	public function is_off_line() {
 		return $this->type_obj()->payment_occurs() == EE_PMT_Base::offline;
 	}
 
@@ -497,10 +497,10 @@ 
 	 * to load the required classes, and don't need them at the time of unserialization
 	 * @return array
 	 */
-	public function __sleep(){
-		$properties =  get_object_vars( $this );
-		unset( $properties[ '_type_obj' ] );
-		return array_keys( $properties );
+	public function __sleep() {
+		$properties = get_object_vars($this);
+		unset($properties['_type_obj']);
+		return array_keys($properties);
 	}
 
 

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');
+}
 do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 /**
  * Event Espresso

Doc Comments +10 added lines, -10 removed lines

@@ -112,7 +112,7 @@ 
 
 	/**
 	 * Gets button_url
-	 * @return string
+	 * @return boolean
 	 */
 	function button_url() {
 		return $this->get('PMD_button_url');
@@ -152,7 +152,7 @@ 
 
 	/**
 	 * Gets description
-	 * @return string
+	 * @return boolean
 	 */
 	function description() {
 		return $this->get('PMD_desc');
@@ -172,7 +172,7 @@ 
 
 	/**
 	 * Gets name
-	 * @return string
+	 * @return boolean
 	 */
 	function name() {
 		return $this->get('PMD_name');
@@ -212,7 +212,7 @@ 
 
 	/**
 	 * Gets order
-	 * @return int
+	 * @return boolean
 	 */
 	function order() {
 		return $this->get('PMD_order');
@@ -232,7 +232,7 @@ 
 
 	/**
 	 * Gets slug
-	 * @return string
+	 * @return boolean
 	 */
 	function slug() {
 		return $this->get('PMD_slug');
@@ -252,7 +252,7 @@ 
 
 	/**
 	 * Gets type
-	 * @return string
+	 * @return boolean
 	 */
 	function type() {
 		return $this->get('PMD_type');
@@ -272,7 +272,7 @@ 
 
 	/**
 	 * Gets wp_user
-	 * @return int
+	 * @return boolean
 	 */
 	function wp_user() {
 		return $this->get('PMD_wp_user');
@@ -307,7 +307,7 @@ 
 
 	/**
 	 * Gets admin_name
-	 * @return string
+	 * @return boolean
 	 */
 	function admin_name() {
 		return $this->get('PMD_admin_name');
@@ -327,7 +327,7 @@ 
 
 	/**
 	 * Gets admin_desc
-	 * @return string
+	 * @return boolean
 	 */
 	function admin_desc() {
 		return $this->get('PMD_admin_desc');
@@ -347,7 +347,7 @@ 
 
 	/**
 	 * Gets scope
-	 * @return array
+	 * @return boolean
 	 */
 	function scope() {
 		return $this->get('PMD_scope');

core/db_classes/EE_Question_Group_Question.class.php

Spacing +6 added lines, -6 removed lines

@@ -2,15 +2,15 @@ 
 /**
  * Required  by EEM_Question_Group_Question in case someone queries for all its model objects
  */
-class EE_Question_Group_Question extends EE_Base_Class{
+class EE_Question_Group_Question extends EE_Base_Class {
 
 	/**
 	 * @param array $props_n_values
 	 * @return EE_Question_Group_Question|mixed
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -19,7 +19,7 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Question_Group_Question
 	 */
-	public static function new_instance_from_db ( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 }
\ No newline at end of file

core/db_classes/EE_Soft_Delete_Base_Class.class.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -33,7 +33,7 @@ 
 	 * @return boolean success
 	 */
 	public function delete() {
-		return $this->delete_or_restore( TRUE );
+		return $this->delete_or_restore(TRUE);
 	}
 
 
@@ -43,7 +43,7 @@ 
 	 * @return boolean success
 	 */
 	public function delete_permanently() {
-		return $this->get_model()->delete_permanently_by_ID( $this->ID() );
+		return $this->get_model()->delete_permanently_by_ID($this->ID());
 	}
 
 
@@ -53,9 +53,9 @@ 
 	 * @param bool $delete true=>delete, false=>restore
 	 * @return bool
 	 */
-	public function delete_or_restore( $delete = TRUE ) {
+	public function delete_or_restore($delete = TRUE) {
 		$model = $this->get_model();
-		return $model->delete_or_restore_by_ID( $delete, $this->ID() );
+		return $model->delete_or_restore_by_ID($delete, $this->ID());
 	}
 
 
@@ -65,6 +65,6 @@ 
 	 * @return boolean
 	 */
 	public function restore() {
-		return $this->delete_or_restore( FALSE );
+		return $this->delete_or_restore(FALSE);
 	}
 }
\ No newline at end of file

core/db_classes/EE_Taxes.class.php

Spacing +20 added lines, -20 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');
 }
 /**
  * Taxes class
@@ -32,20 +32,20 @@ 
 	 * @param  EE_Ticket $ticket incoming EE_Ticket
 	 * @return float             total taxes to apply to ticket.
 	 */
-	public static function get_total_taxes_for_admin( EE_Ticket $ticket ) {
+	public static function get_total_taxes_for_admin(EE_Ticket $ticket) {
 		$tax = 0;
 		$total_tax = 0;
 		//This first checks to see if the given ticket is taxable.
-		if ( ! $ticket->get( 'TKT_taxable' ) )
+		if ( ! $ticket->get('TKT_taxable'))
 			return $tax;
 		//get subtotal (notice we're only retrieving a subtotal if there isn't one given)
-		$subtotal = self::get_subtotal_for_admin( $ticket );
+		$subtotal = self::get_subtotal_for_admin($ticket);
 		//get taxes
 		$taxes = self::get_taxes_for_admin();
 		//apply taxes to subtotal
-		foreach ( $taxes as $tax ) {
+		foreach ($taxes as $tax) {
 			//assuming taxes are not cumulative
-			$total_tax += $subtotal * $tax->get( 'PRC_amount' ) / 100;
+			$total_tax += $subtotal * $tax->get('PRC_amount') / 100;
 		}
 		return $total_tax;
 	}
@@ -57,8 +57,8 @@ 
 	 */
 	public static function get_total_taxes_percentage() {
 		$total_tax_percent = 0;
-		foreach( self::get_taxes_for_admin() as $tax_price ) {
-			$total_tax_percent += $tax_price->get( 'PRC_amount' );
+		foreach (self::get_taxes_for_admin() as $tax_price) {
+			$total_tax_percent += $tax_price->get('PRC_amount');
 		}
 		return $total_tax_percent;
 	}
@@ -69,9 +69,9 @@ 
 	 * @param EE_Ticket $ticket
 	 * @return float
 	 */
-	public static function get_subtotal_for_admin( EE_Ticket $ticket ) {
+	public static function get_subtotal_for_admin(EE_Ticket $ticket) {
 		$TKT_ID = $ticket->ID();
-		return isset( self::$_subtotal[ $TKT_ID ] ) ? self::$_subtotal[ $TKT_ID ] : self::_get_subtotal_for_admin( $ticket );
+		return isset(self::$_subtotal[$TKT_ID]) ? self::$_subtotal[$TKT_ID] : self::_get_subtotal_for_admin($ticket);
 	}
 
 
@@ -81,26 +81,26 @@ 
 	 * @param  EE_Ticket $ticket
 	 * @return float     subtotal calculated from all EE_Price[] on Ticket.
 	 */
-	private static function _get_subtotal_for_admin( EE_Ticket $ticket ) {
+	private static function _get_subtotal_for_admin(EE_Ticket $ticket) {
 		$subtotal = 0;
 		//get all prices
-		$prices = $ticket->get_many_related( 'Price', array( 'default_where_conditions' => 'none', 'order_by' => array( 'PRC_order' => 'ASC' ) ) );
+		$prices = $ticket->get_many_related('Price', array('default_where_conditions' => 'none', 'order_by' => array('PRC_order' => 'ASC')));
 		//let's loop through them (base price is always the first item)
-		foreach ( $prices as $price ) {
-			if ( $price instanceof EE_Price ) {
-				switch ( $price->type_obj()->base_type() ) {
+		foreach ($prices as $price) {
+			if ($price instanceof EE_Price) {
+				switch ($price->type_obj()->base_type()) {
 					case 1: // base price
 					case 3: // surcharges
-						$subtotal += $price->is_percent() ? $subtotal * $price->get( 'PRC_amount' ) / 100 : $price->get( 'PRC_amount' );
+						$subtotal += $price->is_percent() ? $subtotal * $price->get('PRC_amount') / 100 : $price->get('PRC_amount');
 						break;
 					case 2: // discounts
-						$subtotal -= $price->is_percent() ? $subtotal * $price->get( 'PRC_amount' ) / 100 : $price->get( 'PRC_amount' );
+						$subtotal -= $price->is_percent() ? $subtotal * $price->get('PRC_amount') / 100 : $price->get('PRC_amount');
 						break;
 				}
 			}
 		}
 		$TKT_ID = $ticket->ID();
-		self::$_subtotal = array( $TKT_ID => $subtotal );
+		self::$_subtotal = array($TKT_ID => $subtotal);
 		return $subtotal;
 	}
 
@@ -111,7 +111,7 @@ 
 	 * @return EE_Price[] EE_Price objects that have PRT_ID == 4
 	 */
 	public static function get_taxes_for_admin() {
-		self::$_default_taxes = ! empty( self::$_default_taxes ) ? self::$_default_taxes : EE_Registry::instance()->load_model( 'Price' )->get_all( array( array( 'Price_Type.PBT_ID' => 4 ) ) );
+		self::$_default_taxes = ! empty(self::$_default_taxes) ? self::$_default_taxes : EE_Registry::instance()->load_model('Price')->get_all(array(array('Price_Type.PBT_ID' => 4)));
 		return self::$_default_taxes;
 	}
 

Braces +3 added lines, -2 removed lines

@@ -36,8 +36,9 @@
 		$tax = 0;
 		$total_tax = 0;
 		//This first checks to see if the given ticket is taxable.
-		if ( ! $ticket->get( 'TKT_taxable' ) )
-			return $tax;
+		if ( ! $ticket->get( 'TKT_taxable' ) ) {
+					return $tax;
+		}
 		//get subtotal (notice we're only retrieving a subtotal if there isn't one given)
 		$subtotal = self::get_subtotal_for_admin( $ticket );
 		//get taxes

core/db_classes/EE_Term_Relationship.class.php

Spacing +7 added lines, -7 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
@@ -30,9 +30,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Term_Relationship
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -41,8 +41,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Term_Relationship
 	 */
-	public static function new_instance_from_db( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 

core/db_classes/EE_Ticket_Template.class.php

Spacing +7 added lines, -7 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
@@ -35,9 +35,9 @@ 
 	 * @param string $timezone
 	 * @return EE_Ticket_Template|mixed
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = '' ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone );
-		return $has_object ? $has_object : new self( $props_n_values, FALSE, $timezone );
+	public static function new_instance($props_n_values = array(), $timezone = '') {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone);
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone);
 	}
 
 
@@ -47,8 +47,8 @@ 
 	 * @param string $timezone
 	 * @return EE_Ticket_Template
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = '' ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = '') {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 

core/db_classes/EE_WP_User.class.php

Spacing +9 added lines, -9 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * EE_WP_User class
@@ -22,9 +22,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_WP_User|mixed
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -33,8 +33,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_WP_User
 	 */
-	public static function new_instance_from_db( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 	/**
@@ -42,8 +42,8 @@ 
 	 * @return WP_User
 	 */
 	public function wp_user_obj() {
-		if( ! $this->_wp_user_obj ) {
-			$this->_wp_user_obj = get_user_by('ID', $this->ID() );
+		if ( ! $this->_wp_user_obj) {
+			$this->_wp_user_obj = get_user_by('ID', $this->ID());
 		}
 		return $this->_wp_user_obj;
 	}

core/db_models/EEM_Attendee.model.php

Indentation +26 added lines, -26 removed lines

@@ -105,13 +105,13 @@ 
 
 
 	/**
-	*		retrieve  a single attendee from db via their ID
-	*
-	* 		@access		public
-	* 		@param		$ATT_ID
-	*		@return 		mixed		array on success, FALSE on fail
+	 *		retrieve  a single attendee from db via their ID
+	 *
+	 * 		@access		public
+	 * 		@param		$ATT_ID
+	 *		@return 		mixed		array on success, FALSE on fail
 	 * 		@deprecated
-	*/
+	 */
 	public function get_attendee_by_ID( $ATT_ID = FALSE ) {
 		// retrieve a particular EE_Attendee
 		return $this->get_one_by_ID( $ATT_ID );
@@ -121,12 +121,12 @@ 
 
 
 	/**
-	*		retrieve  a single attendee from db via their ID
-	*
-	* 		@access		public
-	* 		@param		array $where_cols_n_values
-	*		@return 		mixed		array on success, FALSE on fail
-	*/
+	 *		retrieve  a single attendee from db via their ID
+	 *
+	 * 		@access		public
+	 * 		@param		array $where_cols_n_values
+	 *		@return 		mixed		array on success, FALSE on fail
+	 */
 	public function get_attendee( $where_cols_n_values = array() ) {
 
 		if ( empty( $where_cols_n_values )) {
@@ -174,20 +174,20 @@ 
 
 
 	/**
-             * Takes an incoming array of EE_Registration ids and sends back a list of corresponding non duplicate
-             * EE_Attendee objects.
-             *
-             * @since    4.3.0
-             * @param  array $ids array of EE_Registration ids
-             * @return  EE_Attendee[]
-             */
-            public function get_array_of_contacts_from_reg_ids( $ids ) {
-                $ids = (array) $ids;
-                $_where = array(
-                    'Registration.REG_ID' => array( 'in', $ids )
-                    );
-                return $this->get_all( array( $_where ) );
-            }
+	 * Takes an incoming array of EE_Registration ids and sends back a list of corresponding non duplicate
+	 * EE_Attendee objects.
+	 *
+	 * @since    4.3.0
+	 * @param  array $ids array of EE_Registration ids
+	 * @return  EE_Attendee[]
+	 */
+			public function get_array_of_contacts_from_reg_ids( $ids ) {
+				$ids = (array) $ids;
+				$_where = array(
+					'Registration.REG_ID' => array( 'in', $ids )
+					);
+				return $this->get_all( array( $_where ) );
+			}
 
 
 }

Doc Comments +1 added lines, -1 removed lines

@@ -256,7 +256,7 @@
 	* 		@param	int	$TXN_ID
 	* 		@param    int		$ATT_ID
 	* 		@param    int		$att_nmbr 	in case the ATT_ID is the same for multiple registrations (same details used) then the attendee number is required
-	*		@return 		mixed		array on success, FALSE on fail
+	*		@return 		EE_Soft_Delete_Base_Class|null		array on success, FALSE on fail
 	*/
 	public function get_registration_for_transaction_attendee( $TXN_ID = 0, $ATT_ID = 0, $att_nmbr = 0 ) {
 		return $this->get_one(array(

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 +52 added lines, -52 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
 
 /**
  *
@@ -21,60 +21,60 @@ 
 	 * Please instead use the EEM_Attendee::system_question_* constants
 	 * @deprecated
 	 */
-	const fname_question_id=1;
+	const fname_question_id = 1;
 
 	/**
 	 * @deprecated
 	 */
-	const lname_question_id=2;
+	const lname_question_id = 2;
 
 
 	/**
 	 * @deprecated
 	 */
-	const email_question_id=3;
+	const email_question_id = 3;
 
 
 	/**
 	 * @deprecated
 	 */
-	const address_question_id=4;
+	const address_question_id = 4;
 
 
 	/**
 	 * @deprecated
 	 */
-	const address2_question_id=5;
+	const address2_question_id = 5;
 
 
 	/**
 	 * @deprecated
 	 */
-	const city_question_id=6;
+	const city_question_id = 6;
 
 
 	/**
 	 * @deprecated
 	 */
-	const state_question_id=7;
+	const state_question_id = 7;
 
 
 	/**
 	 * @deprecated
 	 */
-	const country_question_id=8;
+	const country_question_id = 8;
 
 
 	/**
 	 * @deprecated
 	 */
-	const zip_question_id=9;
+	const zip_question_id = 9;
 
 
 	/**
 	 * @deprecated
 	 */
-	const phone_question_id=10;
+	const phone_question_id = 10;
 
 	/**
 	 * When looking for questions that correspond to attendee fields,
@@ -119,9 +119,9 @@ 
 	 * @access protected
 	 * @param null $timezone
 	 */
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Attendee','event_espresso');
-		$this->plural_item = __('Attendees','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Attendee', 'event_espresso');
+		$this->plural_item = __('Attendees', 'event_espresso');
 		$this->_tables = array(
 			'Attendee_CPT'=> new EE_Primary_Table('posts', 'ID'),
 			'Attendee_Meta'=>new EE_Secondary_Table('esp_attendee_meta', 'ATTM_ID', 'ATT_ID')
@@ -135,36 +135,36 @@ 
 				'ATT_created'=>new EE_Datetime_Field('post_date', __("Time Attendee Created", "event_espresso"), false, time()),
 				'ATT_short_bio'=>new EE_Simple_HTML_Field('post_excerpt', __("Attendee Short Biography", "event_espresso"), true, __("No Biography Provided", "event_espresso")),
 				'ATT_modified'=>new EE_Datetime_Field('post_modified', __("Time Attendee Last Modified", "event_espresso"), FALSE, time()),
-				'ATT_author'=>new EE_WP_User_Field('post_author', __("Creator ID of the first Event attended", "event_espresso"), false ),
+				'ATT_author'=>new EE_WP_User_Field('post_author', __("Creator ID of the first Event attended", "event_espresso"), false),
 				'ATT_parent'=>new EE_DB_Only_Int_Field('post_parent', __("Parent Attendee (unused)", "event_espresso"), false, 0),
-				'post_type'=>new EE_WP_Post_Type_Field('espresso_attendees'),// EE_DB_Only_Text_Field('post_type', __("Post Type of Attendee", "event_espresso"), false,'espresso_attendees'),
+				'post_type'=>new EE_WP_Post_Type_Field('espresso_attendees'), // EE_DB_Only_Text_Field('post_type', __("Post Type of Attendee", "event_espresso"), false,'espresso_attendees'),
 				'status' => new EE_WP_Post_Status_Field('post_status', __('Attendee Status', 'event_espresso'), false, 'publish')
 			),
 			'Attendee_Meta'=>array(
-				'ATTM_ID'=> new EE_DB_Only_Int_Field('ATTM_ID', __('Attendee Meta Row ID','event_espresso'), false),
+				'ATTM_ID'=> new EE_DB_Only_Int_Field('ATTM_ID', __('Attendee Meta Row ID', 'event_espresso'), false),
 				'ATT_ID_fk'=>new EE_DB_Only_Int_Field('ATT_ID', __("Foreign Key to Attendee in Post Table", "event_espresso"), false),
-				'ATT_fname'=>new EE_Plain_Text_Field('ATT_fname', __('First Name','event_espresso'), true, ''),
-				'ATT_lname'=>new EE_Plain_Text_Field('ATT_lname', __('Last Name','event_espresso'), true, ''),
-				'ATT_address'=>new EE_Plain_Text_Field('ATT_address', __('Address Part 1','event_espresso'), true, ''),
-				'ATT_address2'=>new EE_Plain_Text_Field('ATT_address2', __('Address Part 2','event_espresso'), true, ''),
-				'ATT_city'=>new EE_Plain_Text_Field('ATT_city', __('City','event_espresso'), true, ''),
-				'STA_ID'=>new EE_Foreign_Key_Int_Field('STA_ID', __('State','event_espresso'), true,0,'State'),
-				'CNT_ISO'=>new EE_Foreign_Key_String_Field('CNT_ISO', __('Country','event_espresso'), true,'','Country'),
-				'ATT_zip'=>new EE_Plain_Text_Field('ATT_zip', __('ZIP/Postal Code','event_espresso'), true, ''),
-				'ATT_email'=>new EE_Email_Field('ATT_email', __('Email Address','event_espresso'), true, ''),
-				'ATT_phone'=>new EE_Plain_Text_Field('ATT_phone', __('Phone','event_espresso'), true, '')
+				'ATT_fname'=>new EE_Plain_Text_Field('ATT_fname', __('First Name', 'event_espresso'), true, ''),
+				'ATT_lname'=>new EE_Plain_Text_Field('ATT_lname', __('Last Name', 'event_espresso'), true, ''),
+				'ATT_address'=>new EE_Plain_Text_Field('ATT_address', __('Address Part 1', 'event_espresso'), true, ''),
+				'ATT_address2'=>new EE_Plain_Text_Field('ATT_address2', __('Address Part 2', 'event_espresso'), true, ''),
+				'ATT_city'=>new EE_Plain_Text_Field('ATT_city', __('City', 'event_espresso'), true, ''),
+				'STA_ID'=>new EE_Foreign_Key_Int_Field('STA_ID', __('State', 'event_espresso'), true, 0, 'State'),
+				'CNT_ISO'=>new EE_Foreign_Key_String_Field('CNT_ISO', __('Country', 'event_espresso'), true, '', 'Country'),
+				'ATT_zip'=>new EE_Plain_Text_Field('ATT_zip', __('ZIP/Postal Code', 'event_espresso'), true, ''),
+				'ATT_email'=>new EE_Email_Field('ATT_email', __('Email Address', 'event_espresso'), true, ''),
+				'ATT_phone'=>new EE_Plain_Text_Field('ATT_phone', __('Phone', 'event_espresso'), true, '')
 			));
 		$this->_model_relations = array(
 			'Registration'=>new EE_Has_Many_Relation(),
 			'State'=>new EE_Belongs_To_Relation(),
 			'Country'=>new EE_Belongs_To_Relation(),
-			'Event'=>new EE_HABTM_Relation('Registration', FALSE ),
+			'Event'=>new EE_HABTM_Relation('Registration', FALSE),
 			'WP_User' => new EE_Belongs_To_Relation(),
 		);
 		require_once('strategies/EE_CPT_Where_Conditions.strategy.php');
 		$this->_default_where_conditions_strategy = new EE_CPT_Where_Conditions('espresso_attendees', 'ATTM_ID');
 		$this->_caps_slug = 'contacts';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 
 	}
 
@@ -174,8 +174,8 @@ 
 	 * @param string $system_question_string
 	 * @return string|null if not found
 	 */
-	public function get_attendee_field_for_system_question( $system_question_string ) {
-		return isset( $this->_system_question_to_attendee_field_name[ $system_question_string ] ) ? $this->_system_question_to_attendee_field_name[ $system_question_string ] : null;
+	public function get_attendee_field_for_system_question($system_question_string) {
+		return isset($this->_system_question_to_attendee_field_name[$system_question_string]) ? $this->_system_question_to_attendee_field_name[$system_question_string] : null;
 	}
 
 
@@ -186,8 +186,8 @@ 
 	 * @param EE_Transaction/int $transaction_id_or_obj EE_Transaction or its ID
 	 * @return EE_Attendee[]
 	 */
-	public function get_attendees_for_transaction( $transaction_id_or_obj ){
-		return $this->get_all( array( array(
+	public function get_attendees_for_transaction($transaction_id_or_obj) {
+		return $this->get_all(array(array(
 			  'Registration.Transaction.TXN_ID' => $transaction_id_or_obj instanceof EE_Transaction ? $transaction_id_or_obj->ID() : $transaction_id_or_obj
 		  )));
 	}
@@ -202,9 +202,9 @@ 
 	*		@return 		mixed		array on success, FALSE on fail
 	 * 		@deprecated
 	*/
-	public function get_attendee_by_ID( $ATT_ID = FALSE ) {
+	public function get_attendee_by_ID($ATT_ID = FALSE) {
 		// retrieve a particular EE_Attendee
-		return $this->get_one_by_ID( $ATT_ID );
+		return $this->get_one_by_ID($ATT_ID);
 	}
 
 
@@ -217,14 +217,14 @@ 
 	* 		@param		array $where_cols_n_values
 	*		@return 		mixed		array on success, FALSE on fail
 	*/
-	public function get_attendee( $where_cols_n_values = array() ) {
+	public function get_attendee($where_cols_n_values = array()) {
 
-		if ( empty( $where_cols_n_values )) {
+		if (empty($where_cols_n_values)) {
 			return FALSE;
 		}
-		$attendee = $this->get_all( array($where_cols_n_values ));
-		if ( ! empty( $attendee )) {
-			return array_shift( $attendee );
+		$attendee = $this->get_all(array($where_cols_n_values));
+		if ( ! empty($attendee)) {
+			return array_shift($attendee);
 		} else {
 			return FALSE;
 		}
@@ -240,20 +240,20 @@ 
 	 * @param array $where_cols_n_values
 	 * @return bool|mixed
 	 */
-	public function find_existing_attendee( $where_cols_n_values = NULL ) {
+	public function find_existing_attendee($where_cols_n_values = NULL) {
 		// search by combo of first and last names plus the email address
-		$attendee_data_keys = array( 'ATT_fname' => $this->_ATT_fname, 'ATT_lname' => $this->_ATT_lname, 'ATT_email' => $this->_ATT_email );
+		$attendee_data_keys = array('ATT_fname' => $this->_ATT_fname, 'ATT_lname' => $this->_ATT_lname, 'ATT_email' => $this->_ATT_email);
 		// no search params means attendee object already exists.
-		$where_cols_n_values = is_array( $where_cols_n_values ) && ! empty( $where_cols_n_values ) ? $where_cols_n_values : $attendee_data_keys;
+		$where_cols_n_values = is_array($where_cols_n_values) && ! empty($where_cols_n_values) ? $where_cols_n_values : $attendee_data_keys;
 		$valid_data = TRUE;
 		// check for required values
-		$valid_data = isset( $where_cols_n_values['ATT_fname'] ) && ! empty( $where_cols_n_values['ATT_fname'] ) ? $valid_data : FALSE;
-		$valid_data = isset( $where_cols_n_values['ATT_lname'] ) && ! empty( $where_cols_n_values['ATT_lname'] ) ? $valid_data : FALSE;
-		$valid_data = isset( $where_cols_n_values['ATT_email'] ) && ! empty( $where_cols_n_values['ATT_email'] ) ? $valid_data : FALSE;
+		$valid_data = isset($where_cols_n_values['ATT_fname']) && ! empty($where_cols_n_values['ATT_fname']) ? $valid_data : FALSE;
+		$valid_data = isset($where_cols_n_values['ATT_lname']) && ! empty($where_cols_n_values['ATT_lname']) ? $valid_data : FALSE;
+		$valid_data = isset($where_cols_n_values['ATT_email']) && ! empty($where_cols_n_values['ATT_email']) ? $valid_data : FALSE;
 
-		if ( $valid_data ) {
-			$attendee = $this->get_attendee( $where_cols_n_values );
-			if ( $attendee instanceof EE_Attendee ) {
+		if ($valid_data) {
+			$attendee = $this->get_attendee($where_cols_n_values);
+			if ($attendee instanceof EE_Attendee) {
 				return $attendee;
 			}
 		}
@@ -271,12 +271,12 @@ 
              * @param  array $ids array of EE_Registration ids
              * @return  EE_Attendee[]
              */
-            public function get_array_of_contacts_from_reg_ids( $ids ) {
+            public function get_array_of_contacts_from_reg_ids($ids) {
                 $ids = (array) $ids;
                 $_where = array(
-                    'Registration.REG_ID' => array( 'in', $ids )
+                    'Registration.REG_ID' => array('in', $ids)
                     );
-                return $this->get_all( array( $_where ) );
+                return $this->get_all(array($_where));
             }