eventespresso / event-espresso-core

core/db_classes/EE_Term_Taxonomy.class.php

Spacing +14 added lines, -14 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
@@ -32,9 +32,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Term_Taxonomy
 	 */
-	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);
 	}
 
 
@@ -43,8 +43,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Term_Taxonomy
 	 */
-	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);
 	}
 
 
@@ -54,7 +54,7 @@ 
 	 * @return string
 	 */
 	function taxonomy() {
-		return $this->get( 'taxonomy' );
+		return $this->get('taxonomy');
 	}
 
 
@@ -64,8 +64,8 @@ 
 	 * @param string $taxonomy
 	 * @return boolean
 	 */
-	function set_taxonomy( $taxonomy ) {
-		$this->set( 'taxonomy', $taxonomy );
+	function set_taxonomy($taxonomy) {
+		$this->set('taxonomy', $taxonomy);
 	}
 
 
@@ -75,7 +75,7 @@ 
 	 * @return int
 	 */
 	function count() {
-		return $this->get( 'term_count' );
+		return $this->get('term_count');
 	}
 
 
@@ -85,8 +85,8 @@ 
 	 * @param int $term_count
 	 * @return boolean
 	 */
-	function set_count( $term_count ) {
-		$this->set( 'term_count', $term_count );
+	function set_count($term_count) {
+		$this->set('term_count', $term_count);
 	}
 
 
@@ -96,7 +96,7 @@ 
 	 * @return EE_Term
 	 */
 	function term() {
-		return $this->get_first_related( 'Term' );
+		return $this->get_first_related('Term');
 	}
 
 

Doc Comments +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
 	/**
 	 * Sets taxonomy
 	 * @param string $taxonomy
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_taxonomy( $taxonomy ) {
 		$this->set( 'taxonomy', $taxonomy );
@@ -83,7 +83,7 @@ 
 	/**
 	 * Sets term_count
 	 * @param int $term_count
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_count( $term_count ) {
 		$this->set( 'term_count', $term_count );

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_Transaction.class.php

Braces +2 added lines, -2 removed lines

@@ -742,11 +742,11 @@
 		$pm = $this->get_first_related('Payment_Method');
 		if( $pm instanceof EE_Payment_Method ){
 			return $pm;
-		}else{
+		} else{
 			$last_payment = $this->last_payment();
 			if( $last_payment instanceof EE_Payment && $last_payment->payment_method() ){
 				return $last_payment->payment_method();
-			}else{
+			} else{
 				return NULL;
 			}
 		}

Doc Comments +4 added lines, -4 removed lines

@@ -427,7 +427,7 @@ 
 	 * Gets all the attendees for this transaction (handy for use with EE_Attendee's get_registrations_for_event function
 	 * for getting attendees and how many registrations they each have for an event)
 	 *
-	 * @return mixed EE_Attendee[] by default, int if $output is set to 'COUNT'
+	 * @return EE_Base_Class[] EE_Attendee[] by default, int if $output is set to 'COUNT'
 	 * @throws \EE_Error
 	 */
 	public function attendees() {
@@ -464,7 +464,7 @@ 
 
     /**
      * Gets all payments which have not been approved
-     * @return \EEI_Payment[]
+     * @return EE_Base_Class[]
      * @throws EE_Error if a model is misconfigured somehow
      */
 	public function pending_payments()
@@ -709,7 +709,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() ) {
@@ -886,7 +886,7 @@ 
 	 * Sets PMD_ID
 	 *
 	 * @param int $PMD_ID
-	 * @return boolean
+	 * @return boolean|null
 	 * @throws \EE_Error
 	 */
 	public function set_payment_method_ID($PMD_ID) {

Indentation +36 added lines, -36 removed lines

@@ -462,29 +462,29 @@ 
 
 
 
-    /**
-     * Gets all payments which have not been approved
-     * @return \EEI_Payment[]
-     * @throws EE_Error if a model is misconfigured somehow
-     */
+	/**
+	 * Gets all payments which have not been approved
+	 * @return \EEI_Payment[]
+	 * @throws EE_Error if a model is misconfigured somehow
+	 */
 	public function pending_payments()
-    {
-        return $this->get_many_related(
-            'Payment',
-            array(
-                array(
-                    'STS_ID' => EEM_Payment::status_id_pending
-                ),
-                'order_by' => array(
-                    'PAY_timestamp' => 'DESC'
-                )
-            )
-        );
-    }
-
-
-
-    /**
+	{
+		return $this->get_many_related(
+			'Payment',
+			array(
+				array(
+					'STS_ID' => EEM_Payment::status_id_pending
+				),
+				'order_by' => array(
+					'PAY_timestamp' => 'DESC'
+				)
+			)
+		);
+	}
+
+
+
+	/**
 	 * echoes $this->pretty_status()
 	 *
 	 * @param bool $show_icons
@@ -645,20 +645,20 @@ 
 	 * @throws \EE_Error
 	 */
 	public function primary_registration() {
-        $registrations = (array) $this->get_many_related(
-            'Registration', array(array('REG_count' => EEM_Registration::PRIMARY_REGISTRANT_COUNT))
-        );
-        foreach ($registrations as $registration) {
-            // valid registration that is NOT cancelled or declined ?
-            if(
-                $registration instanceof EE_Registration
-                && ! in_array($registration->status_ID(), EEM_Registration::closed_reg_statuses(), true)
-            ) {
-                return $registration;
-            }
-        }
-        // nothing valid found, so just return first thing from array of results
-        return reset($registrations);
+		$registrations = (array) $this->get_many_related(
+			'Registration', array(array('REG_count' => EEM_Registration::PRIMARY_REGISTRANT_COUNT))
+		);
+		foreach ($registrations as $registration) {
+			// valid registration that is NOT cancelled or declined ?
+			if(
+				$registration instanceof EE_Registration
+				&& ! in_array($registration->status_ID(), EEM_Registration::closed_reg_statuses(), true)
+			) {
+				return $registration;
+			}
+		}
+		// nothing valid found, so just return first thing from array of results
+		return reset($registrations);
 	}
 
 

Spacing +157 added lines, -157 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_Transaction class
@@ -34,13 +34,13 @@ 
 	 * @return EE_Transaction
 	 * @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 );
+	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);
 		$txn = $has_object
 			? $has_object
-			: new self( $props_n_values, false, $timezone, $date_formats );
-		if ( ! $has_object ) {
-			$txn->set_old_txn_status( $txn->status_ID() );
+			: new self($props_n_values, false, $timezone, $date_formats);
+		if ( ! $has_object) {
+			$txn->set_old_txn_status($txn->status_ID());
 		}
 		return $txn;
 	}
@@ -54,9 +54,9 @@ 
 	 * @return EE_Transaction
 	 * @throws \EE_Error
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		$txn = new self( $props_n_values, TRUE, $timezone );
-		$txn->set_old_txn_status( $txn->status_ID() );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		$txn = new self($props_n_values, TRUE, $timezone);
+		$txn->set_old_txn_status($txn->status_ID());
 		return $txn;
 	}
 
@@ -73,16 +73,16 @@ 
 	 */
 	public function lock() {
 		// attempt to set lock, but if that fails...
-		if ( ! $this->add_extra_meta( 'lock', time(), true )  ) {
+		if ( ! $this->add_extra_meta('lock', time(), true)) {
 			// then attempt to remove the lock in case it is expired
-			if ( $this->_remove_expired_lock() ) {
+			if ($this->_remove_expired_lock()) {
 				// if removal was successful, then try setting lock again
 				$this->lock();
 			} else {
 				// but if the lock can not be removed, then throw an exception
 				throw new EE_Error(
 					sprintf(
-						__( 'Could not lock Transaction %1$d because it is already locked, meaning another part of the system is currently editing it. It should already be unlocked by the time you read this, so please refresh the page and try again.', 'event_espresso' ),
+						__('Could not lock Transaction %1$d because it is already locked, meaning another part of the system is currently editing it. It should already be unlocked by the time you read this, so please refresh the page and try again.', 'event_espresso'),
 						$this->ID()
 					)
 				);
@@ -101,7 +101,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function unlock() {
-		return $this->delete_extra_meta( 'lock' );
+		return $this->delete_extra_meta('lock');
 	}
 
 
@@ -122,7 +122,7 @@ 
 	 */
 	public function is_locked() {
 		// if TXN is not locked, then return false immediately
-		if ( ! $this->_get_lock() ) {
+		if ( ! $this->_get_lock()) {
 			return false;
 		}
 		// if not, then let's try and remove the lock in case it's expired...
@@ -143,7 +143,7 @@ 
 	 * @throws \EE_Error
 	 */
 	protected function _get_lock() {
-		return (int)$this->get_extra_meta( 'lock', true, 0 );
+		return (int) $this->get_extra_meta('lock', true, 0);
 	}
 
 
@@ -158,7 +158,7 @@ 
 	 */
 	protected function _remove_expired_lock() {
 		$locked = $this->_get_lock();
-		if ( $locked && time() - EE_Transaction::LOCK_EXPIRATION > $locked ) {
+		if ($locked && time() - EE_Transaction::LOCK_EXPIRATION > $locked) {
 			return $this->unlock();
 		}
 		return 0;
@@ -173,8 +173,8 @@ 
 	 * @param        float $total total value of transaction
 	 * @throws \EE_Error
 	 */
-	public function set_total( $total = 0.00 ) {
-		$this->set( 'TXN_total', (float)$total );
+	public function set_total($total = 0.00) {
+		$this->set('TXN_total', (float) $total);
 	}
 
 
@@ -186,8 +186,8 @@ 
 	 * @param        float $total_paid total amount paid to date (sum of all payments)
 	 * @throws \EE_Error
 	 */
-	public function set_paid( $total_paid = 0.00 ) {
-		$this->set( 'TXN_paid', (float)$total_paid );
+	public function set_paid($total_paid = 0.00) {
+		$this->set('TXN_paid', (float) $total_paid);
 	}
 
 
@@ -199,8 +199,8 @@ 
 	 * @param        string $status whether the transaction is open, declined, accepted, or any number of custom values that can be set
 	 * @throws \EE_Error
 	 */
-	public function set_status( $status = '' ) {
-		$this->set( 'STS_ID', $status );
+	public function set_status($status = '') {
+		$this->set('STS_ID', $status);
 	}
 
 
@@ -212,8 +212,8 @@ 
 	 * @param        string $hash_salt required for some payment gateways
 	 * @throws \EE_Error
 	 */
-	public function set_hash_salt( $hash_salt = '' ) {
-		$this->set( 'TXN_hash_salt', $hash_salt );
+	public function set_hash_salt($hash_salt = '') {
+		$this->set('TXN_hash_salt', $hash_salt);
 	}
 
 
@@ -224,8 +224,8 @@ 
 	 * @param array $txn_reg_steps
 	 * @throws \EE_Error
 	 */
-	public function set_reg_steps( array $txn_reg_steps ) {
-		$this->set( 'TXN_reg_steps', $txn_reg_steps );
+	public function set_reg_steps(array $txn_reg_steps) {
+		$this->set('TXN_reg_steps', $txn_reg_steps);
 	}
 
 
@@ -237,8 +237,8 @@ 
 	 * @throws \EE_Error
 	 */
 	public function reg_steps() {
-		$TXN_reg_steps = $this->get( 'TXN_reg_steps' );
-		return is_array( $TXN_reg_steps ) ? (array)$TXN_reg_steps : array();
+		$TXN_reg_steps = $this->get('TXN_reg_steps');
+		return is_array($TXN_reg_steps) ? (array) $TXN_reg_steps : array();
 	}
 
 
@@ -248,7 +248,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function pretty_total() {
-		return $this->get_pretty( 'TXN_total' );
+		return $this->get_pretty('TXN_total');
 	}
 
 
@@ -260,7 +260,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function pretty_paid() {
-		return $this->get_pretty( 'TXN_paid' );
+		return $this->get_pretty('TXN_paid');
 	}
 
 
@@ -273,7 +273,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function remaining() {
-		return (float)( $this->total() - $this->paid() );
+		return (float) ($this->total() - $this->paid());
 	}
 
 
@@ -286,7 +286,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function total() {
-		return (float)$this->get( 'TXN_total' );
+		return (float) $this->get('TXN_total');
 	}
 
 
@@ -299,7 +299,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function paid() {
-		return (float)$this->get( 'TXN_paid' );
+		return (float) $this->get('TXN_paid');
 	}
 
 
@@ -311,9 +311,9 @@ 
 	 * @throws \EE_Error
 	 */
 	public function get_cart_session() {
-		$session_data = (array)$this->get( 'TXN_session_data' );
-		return isset( $session_data[ 'cart' ] ) && $session_data[ 'cart' ] instanceof EE_Cart
-			? $session_data[ 'cart' ]
+		$session_data = (array) $this->get('TXN_session_data');
+		return isset($session_data['cart']) && $session_data['cart'] instanceof EE_Cart
+			? $session_data['cart']
 			: null;
 	}
 
@@ -326,8 +326,8 @@ 
 	 * @throws \EE_Error
 	 */
 	public function session_data() {
-		$session_data = $this->get( 'TXN_session_data' );
-		if ( empty( $session_data ) ) {
+		$session_data = $this->get('TXN_session_data');
+		if (empty($session_data)) {
 			$session_data = array(
 				'id'            => null,
 				'user_id'       => null,
@@ -350,11 +350,11 @@ 
 	 * @param        EE_Session|array $session_data
 	 * @throws \EE_Error
 	 */
-	public function set_txn_session_data( $session_data ) {
-		if ( $session_data instanceof EE_Session ) {
-			$this->set( 'TXN_session_data', $session_data->get_session_data( NULL, TRUE ));
+	public function set_txn_session_data($session_data) {
+		if ($session_data instanceof EE_Session) {
+			$this->set('TXN_session_data', $session_data->get_session_data(NULL, TRUE));
 		} else {
-			$this->set( 'TXN_session_data', $session_data );
+			$this->set('TXN_session_data', $session_data);
 		}
 	}
 
@@ -367,7 +367,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function hash_salt_() {
-		return $this->get( 'TXN_hash_salt' );
+		return $this->get('TXN_hash_salt');
 	}
 
 
@@ -387,13 +387,13 @@ 
 	 * @return    string | int
 	 * @throws \EE_Error
 	 */
-	public function datetime( $format = FALSE, $gmt = FALSE ) {
-		if ( $format ) {
-			return $this->get_pretty( 'TXN_timestamp' );
-		} else if ( $gmt ) {
-			return $this->get_raw( 'TXN_timestamp' );
+	public function datetime($format = FALSE, $gmt = FALSE) {
+		if ($format) {
+			return $this->get_pretty('TXN_timestamp');
+		} else if ($gmt) {
+			return $this->get_raw('TXN_timestamp');
 		} else {
-			return $this->get( 'TXN_timestamp' );
+			return $this->get('TXN_timestamp');
 		}
 	}
 
@@ -407,8 +407,8 @@ 
 	 * @return EE_Registration[]
 	 * @throws \EE_Error
 	 */
-	public function registrations( $query_params = array(), $get_cached = FALSE ) {
-		$query_params = ( empty( $query_params ) || ! is_array( $query_params ) )
+	public function registrations($query_params = array(), $get_cached = FALSE) {
+		$query_params = (empty($query_params) || ! is_array($query_params))
 			? array(
 				'order_by' => array(
 					'Event.EVT_name' => 'ASC',
@@ -418,7 +418,7 @@ 
 			)
 			: $query_params;
 		$query_params = $get_cached ? array() : $query_params;
-		return $this->get_many_related( 'Registration', $query_params );
+		return $this->get_many_related('Registration', $query_params);
 	}
 
 
@@ -431,7 +431,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function attendees() {
-		return $this->get_many_related( 'Attendee', array( array( 'Registration.Transaction.TXN_ID' => $this->ID() ) ) );
+		return $this->get_many_related('Attendee', array(array('Registration.Transaction.TXN_ID' => $this->ID())));
 	}
 
 
@@ -443,8 +443,8 @@ 
 	 * @return EE_Payment[]
 	 * @throws \EE_Error
 	 */
-	public function payments( $query_params = array() ) {
-		return $this->get_many_related( 'Payment', $query_params );
+	public function payments($query_params = array()) {
+		return $this->get_many_related('Payment', $query_params);
 	}
 
 
@@ -456,8 +456,8 @@ 
 	 * @throws \EE_Error
 	 */
 	public function approved_payments() {
-		EE_Registry::instance()->load_model( 'Payment' );
-		return $this->get_many_related( 'Payment', array( array( 'STS_ID' => EEM_Payment::status_id_approved ), 'order_by' => array( 'PAY_timestamp' => 'DESC' ) ) );
+		EE_Registry::instance()->load_model('Payment');
+		return $this->get_many_related('Payment', array(array('STS_ID' => EEM_Payment::status_id_approved), 'order_by' => array('PAY_timestamp' => 'DESC')));
 	}
 
 
@@ -491,8 +491,8 @@ 
 	 * @return string
 	 * @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);
 	}
 
 
@@ -504,10 +504,10 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function pretty_status( $show_icons = FALSE ) {
-		$status = EEM_Status::instance()->localized_status( array( $this->status_ID() => __( 'unknown', 'event_espresso' ) ), FALSE, 'sentence' );
+	public function pretty_status($show_icons = FALSE) {
+		$status = EEM_Status::instance()->localized_status(array($this->status_ID() => __('unknown', 'event_espresso')), FALSE, 'sentence');
 		$icon = '';
-		switch ( $this->status_ID() ) {
+		switch ($this->status_ID()) {
 			case EEM_Transaction::complete_status_code:
 				$icon = $show_icons ? '<span class="dashicons dashicons-yes ee-icon-size-24 green-text"></span>' : '';
 				break;
@@ -524,7 +524,7 @@ 
 				$icon = $show_icons ? '<span class="dashicons dashicons-plus ee-icon-size-16 orange-text"></span>' : '';
 				break;
 		}
-		return $icon . $status[ $this->status_ID() ];
+		return $icon.$status[$this->status_ID()];
 	}
 
 
@@ -536,7 +536,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function status_ID() {
-		return $this->get( 'STS_ID' );
+		return $this->get('STS_ID');
 	}
 
 
@@ -548,7 +548,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function is_free() {
-		return EEH_Money::compare_floats( $this->get( 'TXN_total' ), 0, '==' );
+		return EEH_Money::compare_floats($this->get('TXN_total'), 0, '==');
 	}
 
 
@@ -628,12 +628,12 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function invoice_url( $type = 'html' ) {
+	public function invoice_url($type = 'html') {
 		$REG = $this->primary_registration();
-		if ( ! $REG instanceof EE_Registration ) {
+		if ( ! $REG instanceof EE_Registration) {
 			return '';
 		}
-		return $REG->invoice_url( $type );
+		return $REG->invoice_url($type);
 	}
 
 
@@ -650,7 +650,7 @@ 
         );
         foreach ($registrations as $registration) {
             // valid registration that is NOT cancelled or declined ?
-            if(
+            if (
                 $registration instanceof EE_Registration
                 && ! in_array($registration->status_ID(), EEM_Registration::closed_reg_statuses(), true)
             ) {
@@ -670,12 +670,12 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function receipt_url( $type = 'html' ) {
+	public function receipt_url($type = 'html') {
 		$REG = $this->primary_registration();
-		if ( ! $REG instanceof EE_Registration ) {
+		if ( ! $REG instanceof EE_Registration) {
 			return '';
 		}
-		return $REG->receipt_url( $type );
+		return $REG->receipt_url($type);
 	}
 
 
@@ -700,7 +700,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function gateway_response_on_transaction() {
-		$payment = $this->get_first_related( 'Payment' );
+		$payment = $this->get_first_related('Payment');
 		return $payment instanceof EE_Payment ? $payment->gateway_response() : '';
 	}
 
@@ -713,7 +713,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function status_obj() {
-		return $this->get_first_related( 'Status' );
+		return $this->get_first_related('Status');
 	}
 
 
@@ -725,8 +725,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);
 	}
 
 
@@ -738,8 +738,8 @@ 
 	 * @return EE_Base_Class the relation was added to
 	 * @throws \EE_Error
 	 */
-	public function add_registration( EE_Registration $registration ) {
-		return $this->_add_relation_to( $registration, 'Registration' );
+	public function add_registration(EE_Registration $registration) {
+		return $this->_add_relation_to($registration, 'Registration');
 	}
 
 
@@ -752,8 +752,8 @@ 
 	 * @return EE_Base_Class that was removed from being related
 	 * @throws \EE_Error
 	 */
-	public function remove_registration_with_id( $registration_or_id ) {
-		return $this->_remove_relation_to( $registration_or_id, 'Registration' );
+	public function remove_registration_with_id($registration_or_id) {
+		return $this->_remove_relation_to($registration_or_id, 'Registration');
 	}
 
 
@@ -765,7 +765,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function items_purchased() {
-		return $this->line_items( array( array( 'LIN_type' => EEM_Line_Item::type_line_item ) ) );
+		return $this->line_items(array(array('LIN_type' => EEM_Line_Item::type_line_item)));
 	}
 
 
@@ -777,8 +777,8 @@ 
 	 * @return EE_Base_Class the relation was added to
 	 * @throws \EE_Error
 	 */
-	public function add_line_item( EE_Line_Item $line_item ) {
-		return $this->_add_relation_to( $line_item, 'Line_Item' );
+	public function add_line_item(EE_Line_Item $line_item) {
+		return $this->_add_relation_to($line_item, 'Line_Item');
 	}
 
 
@@ -790,8 +790,8 @@ 
 	 * @return EE_Line_Item[]
 	 * @throws \EE_Error
 	 */
-	public function line_items( $query_params = array() ) {
-		return $this->get_many_related( 'Line_Item', $query_params );
+	public function line_items($query_params = array()) {
+		return $this->get_many_related('Line_Item', $query_params);
 	}
 
 
@@ -803,7 +803,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function tax_items() {
-		return $this->line_items( array( array( 'LIN_type' => EEM_Line_Item::type_tax ) ) );
+		return $this->line_items(array(array('LIN_type' => EEM_Line_Item::type_tax)));
 	}
 
 
@@ -816,10 +816,10 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public function total_line_item( $create_if_not_found = true ) {
-		$item =  $this->get_first_related( 'Line_Item', array( array( 'LIN_type' => EEM_Line_Item::type_total ) ) );
-		if( ! $item && $create_if_not_found ){
-			$item = EEH_Line_Item::create_total_line_item( $this );
+	public function total_line_item($create_if_not_found = true) {
+		$item = $this->get_first_related('Line_Item', array(array('LIN_type' => EEM_Line_Item::type_total)));
+		if ( ! $item && $create_if_not_found) {
+			$item = EEH_Line_Item::create_total_line_item($this);
 		}
 		return $item;
 	}
@@ -835,10 +835,10 @@ 
 	 */
 	public function tax_total() {
 		$tax_line_item = $this->tax_total_line_item();
-		if ( $tax_line_item ) {
-			return (float)$tax_line_item->total();
+		if ($tax_line_item) {
+			return (float) $tax_line_item->total();
 		} else {
-			return (float)0;
+			return (float) 0;
 		}
 	}
 
@@ -851,7 +851,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function tax_total_line_item() {
-		return EEH_Line_Item::get_taxes_subtotal( $this->total_line_item() );
+		return EEH_Line_Item::get_taxes_subtotal($this->total_line_item());
 	}
 
 
@@ -862,20 +862,20 @@ 
 	 * @return EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	public function billing_info(){
+	public function billing_info() {
 		$payment_method = $this->payment_method();
-		if ( !$payment_method){
+		if ( ! $payment_method) {
 			EE_Error::add_error(__("Could not find billing info for transaction because no gateway has been used for it yet", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		$primary_reg = $this->primary_registration();
-		if ( ! $primary_reg ) {
-			EE_Error::add_error( __( "Cannot get billing info for gateway %s on transaction because no primary registration exists", "event_espresso" ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $primary_reg) {
+			EE_Error::add_error(__("Cannot get billing info for gateway %s on transaction because no primary registration exists", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		$attendee = $primary_reg->attendee();
-		if ( ! $attendee ) {
-			EE_Error::add_error( __( "Cannot get billing info for gateway %s on transaction because the primary registration has no attendee exists", "event_espresso" ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $attendee) {
+			EE_Error::add_error(__("Cannot get billing info for gateway %s on transaction because the primary registration has no attendee exists", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		return $attendee->billing_info_for_payment_method($payment_method);
@@ -916,15 +916,15 @@ 
 	 * @return EE_Payment_Method
 	 * @throws \EE_Error
 	 */
-	public function payment_method(){
+	public function payment_method() {
 		$pm = $this->get_first_related('Payment_Method');
-		if( $pm instanceof EE_Payment_Method ){
+		if ($pm instanceof EE_Payment_Method) {
 			return $pm;
-		}else{
+		} else {
 			$last_payment = $this->last_payment();
-			if( $last_payment instanceof EE_Payment && $last_payment->payment_method() ){
+			if ($last_payment instanceof EE_Payment && $last_payment->payment_method()) {
 				return $last_payment->payment_method();
-			}else{
+			} else {
 				return NULL;
 			}
 		}
@@ -939,7 +939,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function last_payment() {
-		return $this->get_first_related( 'Payment', array( 'order_by' => array( 'PAY_ID' => 'desc' ) ) );
+		return $this->get_first_related('Payment', array('order_by' => array('PAY_ID' => 'desc')));
 	}
 
 
@@ -950,8 +950,8 @@ 
 	 * @return EE_Line_Item[]
 	 * @throws \EE_Error
 	 */
-	public function non_ticket_line_items(){
-		return EEM_Line_Item::instance()->get_all_non_ticket_line_items_for_transaction( $this->ID() );
+	public function non_ticket_line_items() {
+		return EEM_Line_Item::instance()->get_all_non_ticket_line_items_for_transaction($this->ID());
 	}
 
 
@@ -999,7 +999,7 @@ 
 	public function update_based_on_payments()
 	{
 		EE_Error::doing_it_wrong(
-			__CLASS__ . '::' . __FUNCTION__,
+			__CLASS__.'::'.__FUNCTION__,
 			sprintf(__('This method is deprecated. Please use "%s" instead', 'event_espresso'),
 				'EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment()'),
 			'4.6.0'
@@ -1023,9 +1023,9 @@ 
 	/**
 	 * @param string $old_txn_status
 	 */
-	public function set_old_txn_status( $old_txn_status ) {
+	public function set_old_txn_status($old_txn_status) {
 		// only set the first time
-		if ( $this->_old_txn_status === null ) {
+		if ($this->_old_txn_status === null) {
 			$this->_old_txn_status = $old_txn_status;
 		}
 	}
@@ -1054,17 +1054,17 @@ 
 	 * @param bool           $check_all
 	 * @return boolean | int
 	 */
-	private function _reg_steps_completed( $reg_step_slug = '', $check_all = true ) {
+	private function _reg_steps_completed($reg_step_slug = '', $check_all = true) {
 		$reg_steps = $this->reg_steps();
-		if ( ! is_array( $reg_steps ) || empty( $reg_steps ) ) {
+		if ( ! is_array($reg_steps) || empty($reg_steps)) {
 			return false;
 		}
 		// loop thru reg steps array)
-		foreach ( $reg_steps as $slug => $reg_step_completed ) {
+		foreach ($reg_steps as $slug => $reg_step_completed) {
 			// if NOT checking ALL steps (only checking one step)
-			if ( ! $check_all ) {
+			if ( ! $check_all) {
 				// and this is the one
-				if ( $slug === $reg_step_slug ) {
+				if ($slug === $reg_step_slug) {
 					return $reg_step_completed;
 				} else {
 					// skip to next reg step in loop
@@ -1072,7 +1072,7 @@ 
 				}
 			}
 			// $check_all must be true, else we would never have gotten to this point
-			if ( $slug === $reg_step_slug ) {
+			if ($slug === $reg_step_slug) {
 				// if we reach this point, then we are testing either:
 				// all_reg_steps_completed_except() or
 				// all_reg_steps_completed_except_final_step(),
@@ -1081,7 +1081,7 @@ 
 				// ie: "is everything completed except the final step?"
 				// "that is correct... the final step is not completed, but all others are."
 				return $reg_step_completed !== true ? true : false;
-			} else if ( $reg_step_completed !== true ) {
+			} else if ($reg_step_completed !== true) {
 				// if any reg step is NOT completed, then ALL steps are not completed
 				return false;
 			}
@@ -1115,8 +1115,8 @@ 
 	 * @param string         $exception
 	 * @return boolean
 	 */
-	public function all_reg_steps_completed_except( $exception = '' ) {
-		return $this->_reg_steps_completed( $exception );
+	public function all_reg_steps_completed_except($exception = '') {
+		return $this->_reg_steps_completed($exception);
 	}
 
 
@@ -1131,7 +1131,7 @@ 
 	 * @return boolean
 	 */
 	public function all_reg_steps_completed_except_final_step() {
-		return $this->_reg_steps_completed( 'finalize_registration' );
+		return $this->_reg_steps_completed('finalize_registration');
 	}
 
 
@@ -1146,8 +1146,8 @@ 
 	 * @param string         $reg_step_slug
 	 * @return boolean | int
 	 */
-	public function reg_step_completed( $reg_step_slug ) {
-		return $this->_reg_steps_completed( $reg_step_slug, false );
+	public function reg_step_completed($reg_step_slug) {
+		return $this->_reg_steps_completed($reg_step_slug, false);
 	}
 
 
@@ -1162,7 +1162,7 @@ 
 	 * @return boolean | int
 	 */
 	public function final_reg_step_completed() {
-		return $this->_reg_steps_completed( 'finalize_registration', false );
+		return $this->_reg_steps_completed('finalize_registration', false);
 	}
 
 
@@ -1176,8 +1176,8 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function set_reg_step_initiated( $reg_step_slug ) {
-		return $this->_set_reg_step_completed_status( $reg_step_slug, time() );
+	public function set_reg_step_initiated($reg_step_slug) {
+		return $this->_set_reg_step_completed_status($reg_step_slug, time());
 	}
 
 
@@ -1191,8 +1191,8 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function set_reg_step_completed( $reg_step_slug ) {
-		return $this->_set_reg_step_completed_status( $reg_step_slug, true );
+	public function set_reg_step_completed($reg_step_slug) {
+		return $this->_set_reg_step_completed_status($reg_step_slug, true);
 	}
 
 
@@ -1206,8 +1206,8 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function set_reg_step_not_completed( $reg_step_slug ) {
-		return $this->_set_reg_step_completed_status( $reg_step_slug, false );
+	public function set_reg_step_not_completed($reg_step_slug) {
+		return $this->_set_reg_step_completed_status($reg_step_slug, false);
 	}
 
 
@@ -1222,37 +1222,37 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	private function _set_reg_step_completed_status( $reg_step_slug, $status ) {
+	private function _set_reg_step_completed_status($reg_step_slug, $status) {
 		// validate status
-		$status = is_bool( $status ) || is_int( $status ) ? $status : false;
+		$status = is_bool($status) || is_int($status) ? $status : false;
 		// get reg steps array
 		$txn_reg_steps = $this->reg_steps();
 		// if reg step does NOT exist
-		if ( ! isset( $txn_reg_steps[ $reg_step_slug ] ) ) {
+		if ( ! isset($txn_reg_steps[$reg_step_slug])) {
 			return false;
 		}
 		// if  we're trying to complete a step that is already completed
-		if ( $txn_reg_steps[ $reg_step_slug ] === true ) {
+		if ($txn_reg_steps[$reg_step_slug] === true) {
 			return true;
 		}
 		// if  we're trying to complete a step that hasn't even started
-		if ( $status === true && $txn_reg_steps[ $reg_step_slug ] === false ) {
+		if ($status === true && $txn_reg_steps[$reg_step_slug] === false) {
 			return false;
 		}
 		// if current status value matches the incoming value (no change)
 		// type casting as int means values should collapse to either 0, 1, or a timestamp like 1234567890
-		if ( (int) $txn_reg_steps[ $reg_step_slug ] === (int) $status ) {
+		if ((int) $txn_reg_steps[$reg_step_slug] === (int) $status) {
 			// this will happen in cases where multiple AJAX requests occur during the same step
 			return true;
 		}
 		// if we're trying to set a start time, but it has already been set...
-		if ( is_numeric( $status ) && is_numeric( $txn_reg_steps[ $reg_step_slug ] ) ) {
+		if (is_numeric($status) && is_numeric($txn_reg_steps[$reg_step_slug])) {
 			// skip the update below, but don't return FALSE so that errors won't be displayed
 			return true;
 		}
 		// update completed status
-		$txn_reg_steps[ $reg_step_slug ] = $status;
-		$this->set_reg_steps( $txn_reg_steps );
+		$txn_reg_steps[$reg_step_slug] = $status;
+		$this->set_reg_steps($txn_reg_steps);
 		$this->save();
 		return true;
 	}
@@ -1268,11 +1268,11 @@ 
 	 * @param string          $reg_step_slug
 	 * @return void
 	 */
-	public function remove_reg_step( $reg_step_slug ) {
+	public function remove_reg_step($reg_step_slug) {
 		// get reg steps array
 		$txn_reg_steps = $this->reg_steps();
-		unset( $txn_reg_steps[ $reg_step_slug ] );
-		$this->set_reg_steps( $txn_reg_steps );
+		unset($txn_reg_steps[$reg_step_slug]);
+		$this->set_reg_steps($txn_reg_steps);
 	}
 
 
@@ -1286,11 +1286,11 @@ 
 	 * @param bool $save
 	 * @return bool
 	 */
-	public function toggle_failed_transaction_status( $save = true ) {
+	public function toggle_failed_transaction_status($save = true) {
 		// if TXN status is still set as "failed"...
-		if ( $this->status_ID() === EEM_Transaction::failed_status_code ) {
-			$this->set_status( EEM_Transaction::abandoned_status_code );
-			if ( $save ) {
+		if ($this->status_ID() === EEM_Transaction::failed_status_code) {
+			$this->set_status(EEM_Transaction::abandoned_status_code);
+			if ($save) {
 				$this->save();
 			}
 			return true;
@@ -1319,10 +1319,10 @@ 
 				$this->primary_registration() instanceof EE_Registration
 				&& $this->primary_registration()->attendee() instanceof EE_Attendee
 			) {
-				$this->set_status( EEM_Transaction::incomplete_status_code );
+				$this->set_status(EEM_Transaction::incomplete_status_code);
 			} else {
 				// no contact record? yer abandoned!
-				$this->set_status( EEM_Transaction::abandoned_status_code );
+				$this->set_status(EEM_Transaction::abandoned_status_code);
 			}
 			return true;
 		}
@@ -1336,16 +1336,16 @@ 
 	 * updates the TXN status based on the amount paid
 	 */
 	public function verify_abandoned_transaction_status() {
-		if ( $this->status_ID() !== EEM_Transaction::abandoned_status_code ) {
+		if ($this->status_ID() !== EEM_Transaction::abandoned_status_code) {
 			return;
 		}
-		$payments = $this->get_many_related( 'Payment' );
-		if ( ! empty( $payments ) ) {
-			foreach ( $payments as $payment ) {
-				if ( $payment instanceof EE_Payment ) {
+		$payments = $this->get_many_related('Payment');
+		if ( ! empty($payments)) {
+			foreach ($payments as $payment) {
+				if ($payment instanceof EE_Payment) {
 					// kk this TXN should NOT be abandoned
 					$this->update_status_based_on_total_paid();
-					if ( is_admin() && ! ( defined('DOING_AJAX') && DOING_AJAX ) ) {
+					if (is_admin() && ! (defined('DOING_AJAX') && DOING_AJAX)) {
 						EE_Error::add_attention(
 							sprintf(
 								esc_html__(
@@ -1361,8 +1361,8 @@ 
 					$finalized = $this->final_reg_step_completed();
 					// if the 'finalize_registration' step has been initiated (has a timestamp)
 					// but has not yet been fully completed (TRUE)
-					if ( is_int( $finalized ) && $finalized !== false && $finalized !== true ) {
-						$this->set_reg_step_completed( 'finalize_registration' );
+					if (is_int($finalized) && $finalized !== false && $finalized !== true) {
+						$this->set_reg_step_completed('finalize_registration');
 						$this->save();
 					}
 				}

core/db_models/EEM_Country.model.php

Indentation +11 added lines, -11 removed lines

@@ -83,11 +83,11 @@ 
 
 
 	/**
-	*		_get_countries
-	*
-	* 		@access		public
-	*		@return 		array
-	*/
+	 *		_get_countries
+	 *
+	 * 		@access		public
+	 *		@return 		array
+	 */
 	public function get_all_countries() {
 		if ( ! self::$_all_countries ) {
 			self::$_all_countries = $this->get_all( array( 'order_by'=>array('CNT_name'=>'ASC'), 'limit'=> array( 0,99999 )));
@@ -96,12 +96,12 @@ 
 	}
 
 	/**
-	*		_get_countries
-	*		Gets and caches the list of active countries. If you know the list of active countries
-	*		has changed during this request, first use EEM_Country::reset() to flush the cache
-	* 		@access		public
-	*		@return 		array
-	*/
+	 *		_get_countries
+	 *		Gets and caches the list of active countries. If you know the list of active countries
+	 *		has changed during this request, first use EEM_Country::reset() to flush the cache
+	 * 		@access		public
+	 *		@return 		array
+	 */
 	public function get_all_active_countries() {
 		if ( ! self::$_active_countries ) {
 			self::$_active_countries =  $this->get_all( array( array( 'CNT_active' => TRUE ), 'order_by'=>array('CNT_name'=>'ASC'), 'limit'=>array( 0, 99999 )));

Spacing +34 added lines, -34 removed lines

@@ -36,15 +36,15 @@ 
 	 * Resets the country
 	 * @return EEM_Country
 	 */
-	public static function reset( $timezone = NULL ){
+	public static function reset($timezone = NULL) {
 		self::$_active_countries = NULL;
 		self::$_all_countries = NULL;
-		return parent::reset( $timezone );
+		return parent::reset($timezone);
 	}
 
-	protected function __construct( $timezone = NULL ){
-		$this->singular_item = __('Country','event_espresso');
-		$this->plural_item = __('Countries','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Country', 'event_espresso');
+		$this->plural_item = __('Countries', 'event_espresso');
 
 
 		$this->_tables = array(
@@ -52,21 +52,21 @@ 
 		);
 		$this->_fields = array(
 			'Country'=>array(
-				'CNT_active' => new EE_Boolean_Field('CNT_active', __('Country Appears in Dropdown Select Lists','event_espresso'), false, true),
-				'CNT_ISO'=> new EE_Primary_Key_String_Field('CNT_ISO', __('Country ISO Code','event_espresso')),
-				'CNT_ISO3'=>new EE_All_Caps_Text_Field('CNT_ISO3', __('Country ISO3 Code','event_espresso'), false,''),
-				'RGN_ID'=>new EE_Integer_Field('RGN_ID', __('Region ID','event_espresso'), false,0),//should be a foreign key, but no region table exists yet
-				'CNT_name'=>new EE_Plain_Text_Field('CNT_name', __('Country Name','event_espresso'), false,''),
-				'CNT_cur_code'=>new EE_All_Caps_Text_Field('CNT_cur_code', __('Country Currency Code','event_espresso'), false),
-				'CNT_cur_single' => new EE_Plain_Text_Field('CNT_cur_single', __('Currency Name Singular','event_espresso'), false),
-				'CNT_cur_plural' => new EE_Plain_Text_Field('CNT_cur_plural', __('Currency Name Plural','event_espresso'), false),
-				'CNT_cur_sign' => new EE_Plain_Text_Field('CNT_cur_sign', __('Currency Sign','event_espresso'), false),
-				'CNT_cur_sign_b4' => new EE_Boolean_Field('CNT_cur_sign_b4', __('Currency Sign Before Number','event_espresso'), false, true),
-				'CNT_cur_dec_plc' => new EE_Integer_Field('CNT_cur_dec_plc', __('Currency Decimal Places','event_espresso'), false, 2),
-				'CNT_cur_dec_mrk' => new EE_Plain_Text_Field('CNT_cur_dec_mrk', __('Currency Decimal Mark','event_espresso'), false, '.'),
-				'CNT_cur_thsnds' => new EE_Plain_Text_Field('CNT_cur_thsnds', __('Currency Thousands Seperator','event_espresso'), false, ','),
-				'CNT_tel_code' => new EE_Plain_Text_Field('CNT_tel_code', __('Country Telephone Code','event_espresso'), false, ''),
-				'CNT_is_EU' => new EE_Boolean_Field('CNT_is_EU', __('Country is Member of EU','event_espresso'), false, false)
+				'CNT_active' => new EE_Boolean_Field('CNT_active', __('Country Appears in Dropdown Select Lists', 'event_espresso'), false, true),
+				'CNT_ISO'=> new EE_Primary_Key_String_Field('CNT_ISO', __('Country ISO Code', 'event_espresso')),
+				'CNT_ISO3'=>new EE_All_Caps_Text_Field('CNT_ISO3', __('Country ISO3 Code', 'event_espresso'), false, ''),
+				'RGN_ID'=>new EE_Integer_Field('RGN_ID', __('Region ID', 'event_espresso'), false, 0), //should be a foreign key, but no region table exists yet
+				'CNT_name'=>new EE_Plain_Text_Field('CNT_name', __('Country Name', 'event_espresso'), false, ''),
+				'CNT_cur_code'=>new EE_All_Caps_Text_Field('CNT_cur_code', __('Country Currency Code', 'event_espresso'), false),
+				'CNT_cur_single' => new EE_Plain_Text_Field('CNT_cur_single', __('Currency Name Singular', 'event_espresso'), false),
+				'CNT_cur_plural' => new EE_Plain_Text_Field('CNT_cur_plural', __('Currency Name Plural', 'event_espresso'), false),
+				'CNT_cur_sign' => new EE_Plain_Text_Field('CNT_cur_sign', __('Currency Sign', 'event_espresso'), false),
+				'CNT_cur_sign_b4' => new EE_Boolean_Field('CNT_cur_sign_b4', __('Currency Sign Before Number', 'event_espresso'), false, true),
+				'CNT_cur_dec_plc' => new EE_Integer_Field('CNT_cur_dec_plc', __('Currency Decimal Places', 'event_espresso'), false, 2),
+				'CNT_cur_dec_mrk' => new EE_Plain_Text_Field('CNT_cur_dec_mrk', __('Currency Decimal Mark', 'event_espresso'), false, '.'),
+				'CNT_cur_thsnds' => new EE_Plain_Text_Field('CNT_cur_thsnds', __('Currency Thousands Seperator', 'event_espresso'), false, ','),
+				'CNT_tel_code' => new EE_Plain_Text_Field('CNT_tel_code', __('Country Telephone Code', 'event_espresso'), false, ''),
+				'CNT_is_EU' => new EE_Boolean_Field('CNT_is_EU', __('Country is Member of EU', 'event_espresso'), false, false)
 			));
 		$this->_model_relations = array(
 			'Attendee'=>new EE_Has_Many_Relation(),
@@ -74,9 +74,9 @@ 
 			'Venue'=>new EE_Has_Many_Relation(),
 		);
 		//only anyone to view, but only those with the default role can do anything
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -89,8 +89,8 @@ 
 	*		@return 		array
 	*/
 	public function get_all_countries() {
-		if ( ! self::$_all_countries ) {
-			self::$_all_countries = $this->get_all( array( 'order_by'=>array('CNT_name'=>'ASC'), 'limit'=> array( 0,99999 )));
+		if ( ! self::$_all_countries) {
+			self::$_all_countries = $this->get_all(array('order_by'=>array('CNT_name'=>'ASC'), 'limit'=> array(0, 99999)));
 		}
 		return self::$_all_countries;
 	}
@@ -103,8 +103,8 @@ 
 	*		@return 		array
 	*/
 	public function get_all_active_countries() {
-		if ( ! self::$_active_countries ) {
-			self::$_active_countries =  $this->get_all( array( array( 'CNT_active' => TRUE ), 'order_by'=>array('CNT_name'=>'ASC'), 'limit'=>array( 0, 99999 )));
+		if ( ! self::$_active_countries) {
+			self::$_active_countries = $this->get_all(array(array('CNT_active' => TRUE), 'order_by'=>array('CNT_name'=>'ASC'), 'limit'=>array(0, 99999)));
 		}
 		return self::$_active_countries;
 	}
@@ -114,15 +114,15 @@ 
 	 * @param string $country_ISO
 	 * @return string
 	 */
-	public function get_country_name_by_ISO( $country_ISO ){
-		if( isset( self::$_all_countries[ $country_ISO ] ) &&
-				self::$_all_countries[ $country_ISO ] instanceof EE_Country ){
-			return self::$_all_countries[ $country_ISO ]->name();
+	public function get_country_name_by_ISO($country_ISO) {
+		if (isset(self::$_all_countries[$country_ISO]) &&
+				self::$_all_countries[$country_ISO] instanceof EE_Country) {
+			return self::$_all_countries[$country_ISO]->name();
 		}
-		$names = $this->get_col( array( array( 'CNT_ISO' => $country_ISO ), 'limit' => 1), 'CNT_name' );
-		if( is_array( $names ) && ! empty( $names ) ){
-			return reset( $names );
-		}else{
+		$names = $this->get_col(array(array('CNT_ISO' => $country_ISO), 'limit' => 1), 'CNT_name');
+		if (is_array($names) && ! empty($names)) {
+			return reset($names);
+		} else {
 			return '';
 		}
 	}

Braces +4 added lines, -2 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
  *
@@ -122,7 +124,7 @@ 
 		$names = $this->get_col( array( array( 'CNT_ISO' => $country_ISO ), 'limit' => 1), 'CNT_name' );
 		if( is_array( $names ) && ! empty( $names ) ){
 			return reset( $names );
-		}else{
+		} else{
 			return '';
 		}
 	}

core/db_models/EEM_Currency.model.php

Braces +4 added lines, -3 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -75,12 +76,12 @@ 
 		if($payment_method_type instanceof EE_PMT_Base &&
 				$payment_method_type->get_gateway()){
 			$currencies_supported = $payment_method_type->get_gateway()->currencies_supported();
-		}else{
+		} else{
 			$currencies_supported = EE_Gateway::all_currencies_supported;
 		}
 		if($currencies_supported == EE_Gateway::all_currencies_supported || empty( $currencies_supported ) ) {
 			$currencies = $this->get_all_active();
-		}else{
+		} else{
 			$currencies = $this->get_all_active(array(array('CUR_code'=>array('IN',$currencies_supported))));
 		}
 		return $currencies;

Spacing +23 added lines, -23 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,32 +25,32 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EEM_Currency extends EEM_Base{
+class EEM_Currency extends EEM_Base {
 		// private instance of the Attendee object
 	protected static $_instance = NULL;
 
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Currency','event_espresso');
-		$this->plural_item = __('Currencies','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Currency', 'event_espresso');
+		$this->plural_item = __('Currencies', 'event_espresso');
 		$this->_tables = array(
 			'Currency'=> new EE_Primary_Table('esp_currency', 'CUR_code')
 		);
 		$this->_fields = array(
 			'Currency'=>array(
-				'CUR_code'=> new EE_Primary_Key_String_Field('CUR_code', __('Currency Code','event_espresso')),
-				'CUR_single' => new EE_Plain_Text_Field('CUR_single', __('Currency Name Singular','event_espresso'), false),
-				'CUR_plural' => new EE_Plain_Text_Field('CUR_plural', __('Currency Name Plural','event_espresso'), false),
-				'CUR_sign' => new EE_Plain_Text_Field('CUR_sign', __('Currency Sign','event_espresso'), false),
-				'CUR_dec_plc' => new EE_Integer_Field('CUR_dec_plc', __('Currency Decimal Places','event_espresso'), false, 2),
-				'CUR_active'=>new EE_Boolean_Field('CUR_active', __('Active?', 'event_espresso'), false,true),
+				'CUR_code'=> new EE_Primary_Key_String_Field('CUR_code', __('Currency Code', 'event_espresso')),
+				'CUR_single' => new EE_Plain_Text_Field('CUR_single', __('Currency Name Singular', 'event_espresso'), false),
+				'CUR_plural' => new EE_Plain_Text_Field('CUR_plural', __('Currency Name Plural', 'event_espresso'), false),
+				'CUR_sign' => new EE_Plain_Text_Field('CUR_sign', __('Currency Sign', 'event_espresso'), false),
+				'CUR_dec_plc' => new EE_Integer_Field('CUR_dec_plc', __('Currency Decimal Places', 'event_espresso'), false, 2),
+				'CUR_active'=>new EE_Boolean_Field('CUR_active', __('Active?', 'event_espresso'), false, true),
 			));
 		$this->_model_relations = array(
 			'Payment_Method'=>new EE_HABTM_Relation('Currency_Payment_Method'),
 		);
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 	/**
@@ -59,10 +59,10 @@ 
 	 * @param array $query_params see EEM_Base::get_all
 	 * @return EE_Currency[]
 	 */
-	public function get_all_active($query_params = array()){
+	public function get_all_active($query_params = array()) {
 		$query_params[0]['CUR_active'] = true;
-		if( ! isset($query_params['order_by'])){
-			$query_params['order_by'] = array('CUR_code'=>'ASC','CUR_single'=>'ASC');
+		if ( ! isset($query_params['order_by'])) {
+			$query_params['order_by'] = array('CUR_code'=>'ASC', 'CUR_single'=>'ASC');
 		}
 		return $this->get_all($query_params);
 	}
@@ -71,17 +71,17 @@ 
 	 * @param EE_PMT_Base $payment_method_type
 	 * @return EE_Currency[]
 	 */
-	public function get_all_currencies_usable_by($payment_method_type){
-		if($payment_method_type instanceof EE_PMT_Base &&
-				$payment_method_type->get_gateway()){
+	public function get_all_currencies_usable_by($payment_method_type) {
+		if ($payment_method_type instanceof EE_PMT_Base &&
+				$payment_method_type->get_gateway()) {
 			$currencies_supported = $payment_method_type->get_gateway()->currencies_supported();
-		}else{
+		} else {
 			$currencies_supported = EE_Gateway::all_currencies_supported;
 		}
-		if($currencies_supported == EE_Gateway::all_currencies_supported || empty( $currencies_supported ) ) {
+		if ($currencies_supported == EE_Gateway::all_currencies_supported || empty($currencies_supported)) {
 			$currencies = $this->get_all_active();
-		}else{
-			$currencies = $this->get_all_active(array(array('CUR_code'=>array('IN',$currencies_supported))));
+		} else {
+			$currencies = $this->get_all_active(array(array('CUR_code'=>array('IN', $currencies_supported))));
 		}
 		return $currencies;
 	}

core/db_models/EEM_Currency_Payment_Method.model.php

Spacing +11 added lines, -11 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,22 +25,22 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EEM_Currency_Payment_Method extends EEM_Base{
+class EEM_Currency_Payment_Method extends EEM_Base {
 	// private instance of the Attendee object
 	protected static $_instance = NULL;
 
 
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Currency Usable by Payment Method','event_espresso');
-		$this->plural_item = __('Currencies Usable by Payment Methods','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Currency Usable by Payment Method', 'event_espresso');
+		$this->plural_item = __('Currencies Usable by Payment Methods', 'event_espresso');
 		$this->_tables = array(
-			'Currency_Payment_Method'=>new EE_Primary_Table('esp_currency_payment_method','CPM_ID')
+			'Currency_Payment_Method'=>new EE_Primary_Table('esp_currency_payment_method', 'CPM_ID')
 		);
 		$this->_fields = array(
 			'Currency_Payment_Method'=>array(
-				'CPM_ID'=>new EE_Primary_Key_Int_Field('CPM_ID', __('Currency to Payment Method LInk ID','event_espresso')),
-				'CUR_code'=>new EE_Foreign_Key_String_Field('CUR_code', __('Currency Code','event_espresso'), false, 0, 'Currency'),
-				'PMD_ID'=>new EE_Foreign_Key_Int_Field('PMD_ID', __('Paymetn Method ID','event_espresso'), false, 0, 'Payment_Method')
+				'CPM_ID'=>new EE_Primary_Key_Int_Field('CPM_ID', __('Currency to Payment Method LInk ID', 'event_espresso')),
+				'CUR_code'=>new EE_Foreign_Key_String_Field('CUR_code', __('Currency Code', 'event_espresso'), false, 0, 'Currency'),
+				'PMD_ID'=>new EE_Foreign_Key_Int_Field('PMD_ID', __('Paymetn Method ID', 'event_espresso'), false, 0, 'Payment_Method')
 			)
 		);
 		$this->_model_relations = array(
@@ -48,9 +48,9 @@ 
 			'Payment_Method'=>new EE_Belongs_To_Relation()
 		);
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
 		$this->_caps_slug = 'payment_methods';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 }
 

Braces +2 added lines, -1 removed lines

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

core/db_models/EEM_Datetime_Ticket.model.php

Spacing +13 added lines, -13 removed lines

@@ -21,8 +21,8 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
-require_once ( EE_CLASSES . 'EE_Datetime_Ticket.class.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
+require_once (EE_CLASSES.'EE_Datetime_Ticket.class.php');
 
 class EEM_Datetime_Ticket extends EEM_Base {
 
@@ -37,28 +37,28 @@ 
 	 *		@param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
 	 *		@return void
 	 */
-	protected function __construct( $timezone ) {
-		$this->singular_item = __('Datetime Ticket','event_espresso');
-		$this->plural_item = __('Datetime Tickets','event_espresso');
+	protected function __construct($timezone) {
+		$this->singular_item = __('Datetime Ticket', 'event_espresso');
+		$this->plural_item = __('Datetime Tickets', 'event_espresso');
 
 		$this->_tables = array(
 			'Datetime_Ticket'=> new EE_Primary_Table('esp_datetime_ticket', 'DTK_ID')
 		);
 		$this->_fields = array(
 			'Datetime_Ticket'=>array(
-				'DTK_ID'=>new EE_Primary_Key_Int_Field('DTK_ID', __('Datetime Ticket ID','event_espresso')),
-				'DTT_ID'=>new EE_Foreign_Key_Int_Field('DTT_ID', __('The ID to the Datetime','event_espresso'), false, 0, 'Datetime' ),
-				'TKT_ID'=>new EE_Foreign_Key_Int_Field('TKT_ID', __('The ID to the Ticket','event_espresso'), false, 0, 'Ticket' )
+				'DTK_ID'=>new EE_Primary_Key_Int_Field('DTK_ID', __('Datetime Ticket ID', 'event_espresso')),
+				'DTT_ID'=>new EE_Foreign_Key_Int_Field('DTT_ID', __('The ID to the Datetime', 'event_espresso'), false, 0, 'Datetime'),
+				'TKT_ID'=>new EE_Foreign_Key_Int_Field('TKT_ID', __('The ID to the Ticket', 'event_espresso'), false, 0, 'Ticket')
 			));
 		$this->_model_relations = array(
 			'Ticket'=>new EE_Belongs_To_Relation(),
 			'Datetime'=>new EE_Belongs_To_Relation()
 		);
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Event_Related_Public( 'Datetime.Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Event_Related_Protected( 'Datetime.Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Event_Related_Protected( 'Datetime.Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Event_Related_Protected( 'Datetime.Event', EEM_Base::caps_edit );
-		parent::__construct( $timezone );
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Event_Related_Public('Datetime.Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Event_Related_Protected('Datetime.Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Event_Related_Protected('Datetime.Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Event_Related_Protected('Datetime.Event', EEM_Base::caps_edit);
+		parent::__construct($timezone);
 	}
 } //end EEM_Datetime_Ticket class
\ No newline at end of file

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
  *

core/db_models/EEM_Event_Message_Template.model.php

Indentation +10 added lines, -10 removed lines

@@ -7,16 +7,16 @@
  */
  if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
  /**
- *	EEM_Event_Message_Template
- *	Model for relation table between EEM_Message_Template_Group and EEM_Event
- *
- * @package		Event Espresso
- * @subpackage 	models
- * @since 			4.3.0
- * @author			 Darren Ethier
- *
- * ------------------------------------------------------------------------
- */
+  *	EEM_Event_Message_Template
+  *	Model for relation table between EEM_Message_Template_Group and EEM_Event
+  *
+  * @package		Event Espresso
+  * @subpackage 	models
+  * @since 			4.3.0
+  * @author			 Darren Ethier
+  *
+  * ------------------------------------------------------------------------
+  */
 require_once( EE_MODELS . 'EEM_Base.model.php' );
 
 class EEM_Event_Message_Template extends EEM_Base {

Spacing +23 added lines, -23 removed lines

@@ -17,7 +17,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once( EE_MODELS . 'EEM_Base.model.php' );
+require_once(EE_MODELS.'EEM_Base.model.php');
 
 class EEM_Event_Message_Template extends EEM_Base {
 
@@ -30,29 +30,29 @@ 
 	 * @access private
 	 * @return void
 	 */
-	protected function __construct( $timezone = NULL ) {
-		$this->singlular_item = __('Event Message Template','event_espresso');
-		$this->plural_item = __('Event Message Templates','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singlular_item = __('Event Message Template', 'event_espresso');
+		$this->plural_item = __('Event Message Templates', 'event_espresso');
 
 		$this->_tables = array(
 			'Event_Message_Template'=> new EE_Primary_Table('esp_event_message_template', 'EMT_ID')
 		);
 		$this->_fields = array(
 			'Event_Message_Template'=>array(
-				'EMT_ID'=>new EE_Primary_Key_Int_Field('EMT_ID', __('Event Message Template ID','event_espresso')),
-				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('The ID to the Event','event_espresso'), false, 0, 'Event' ),
-				'GRP_ID'=>new EE_Foreign_Key_Int_Field('GRP_ID', __('The ID to the Message Template Group','event_espresso'), false, 0, 'Message_Template_Group' )
+				'EMT_ID'=>new EE_Primary_Key_Int_Field('EMT_ID', __('Event Message Template ID', 'event_espresso')),
+				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('The ID to the Event', 'event_espresso'), false, 0, 'Event'),
+				'GRP_ID'=>new EE_Foreign_Key_Int_Field('GRP_ID', __('The ID to the Message Template Group', 'event_espresso'), false, 0, 'Message_Template_Group')
 			));
 		$this->_model_relations = array(
 			'Event'=>new EE_Belongs_To_Relation(),
 			'Message_Template_Group'=>new EE_Belongs_To_Relation()
 		);
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Event_Related_Public( 'Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Event_Related_Protected( 'Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Event_Related_Protected( 'Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Event_Related_Protected( 'Event', EEM_Base::caps_edit );
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Event_Related_Public('Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Event_Related_Protected('Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Event_Related_Protected('Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Event_Related_Protected('Event', EEM_Base::caps_edit);
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -66,9 +66,9 @@ 
 	 * @param  int    $GRP_ID The MTP group we want attached events for.
 	 * @return  array               An array of event ids.
 	 */
-	public function get_attached_event_ids( $GRP_ID ) {
-		$event_ids = $this->_get_all_wpdb_results( array( array( 'GRP_ID' => $GRP_ID ) ), ARRAY_N, 'EVT_ID' );
-		$event_ids = call_user_func_array( 'array_merge', $event_ids );
+	public function get_attached_event_ids($GRP_ID) {
+		$event_ids = $this->_get_all_wpdb_results(array(array('GRP_ID' => $GRP_ID)), ARRAY_N, 'EVT_ID');
+		$event_ids = call_user_func_array('array_merge', $event_ids);
 		return $event_ids;
 	}
 
@@ -81,17 +81,17 @@ 
 	 *                         	       GRPIDs.
 	 * @return int 		       How many rows were deleted.
 	 */
-	public function delete_event_group_relations( $GRP_IDs = array(), $EVT_IDs = array() ) {
-		if ( empty( $GRP_IDs ) && empty( $EVT_IDs ) )
-			throw new EE_Error( sprintf( __('%s requires either an array of GRP_IDs or EVT_IDs or both, but both cannot be empty.', 'event_espresso' ), __METHOD__ ) );
+	public function delete_event_group_relations($GRP_IDs = array(), $EVT_IDs = array()) {
+		if (empty($GRP_IDs) && empty($EVT_IDs))
+			throw new EE_Error(sprintf(__('%s requires either an array of GRP_IDs or EVT_IDs or both, but both cannot be empty.', 'event_espresso'), __METHOD__));
 
-		if ( !empty( $GRP_IDs ) )
-			$where['GRP_ID'] = array( 'IN', (array) $GRP_IDs );
+		if ( ! empty($GRP_IDs))
+			$where['GRP_ID'] = array('IN', (array) $GRP_IDs);
 
-		if ( !empty( $EVT_IDs ) )
-			$where['EVT_ID'] = array( 'IN', (array) $EVT_IDs );
+		if ( ! empty($EVT_IDs))
+			$where['EVT_ID'] = array('IN', (array) $EVT_IDs);
 
-		return $this->delete( array( $where ), FALSE );
+		return $this->delete(array($where), FALSE);
 	}
 
 } //end class EEM_Event_Message_Template

Braces +12 added lines, -7 removed lines

@@ -5,7 +5,9 @@ 
  * @subpackage 	models
  * @since 			4.3.0
  */
- if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+ if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+ 	exit('No direct script access allowed');
+ }
  /**
  *	EEM_Event_Message_Template
  *	Model for relation table between EEM_Message_Template_Group and EEM_Event
@@ -82,14 +84,17 @@ 
 	 * @return int 		       How many rows were deleted.
 	 */
 	public function delete_event_group_relations( $GRP_IDs = array(), $EVT_IDs = array() ) {
-		if ( empty( $GRP_IDs ) && empty( $EVT_IDs ) )
-			throw new EE_Error( sprintf( __('%s requires either an array of GRP_IDs or EVT_IDs or both, but both cannot be empty.', 'event_espresso' ), __METHOD__ ) );
+		if ( empty( $GRP_IDs ) && empty( $EVT_IDs ) ) {
+					throw new EE_Error( sprintf( __('%s requires either an array of GRP_IDs or EVT_IDs or both, but both cannot be empty.', 'event_espresso' ), __METHOD__ ) );
+		}
 
-		if ( !empty( $GRP_IDs ) )
-			$where['GRP_ID'] = array( 'IN', (array) $GRP_IDs );
+		if ( !empty( $GRP_IDs ) ) {
+					$where['GRP_ID'] = array( 'IN', (array) $GRP_IDs );
+		}
 
-		if ( !empty( $EVT_IDs ) )
-			$where['EVT_ID'] = array( 'IN', (array) $EVT_IDs );
+		if ( !empty( $EVT_IDs ) ) {
+					$where['EVT_ID'] = array( 'IN', (array) $EVT_IDs );
+		}
 
 		return $this->delete( array( $where ), FALSE );
 	}

core/db_models/EEM_Event_Question_Group.model.php

Spacing +15 added lines, -15 removed lines

@@ -5,24 +5,24 @@ 
  * You'll need to use each's EE_Has_Many_Relation relation to this model. Eg, when querying for question groups which apply to primary attendees,
  * you'd do a query like EEM_Question_Group::instance()->get_all(array(array('Event_Question_Group.EQG_primary'=>1)));
  */
-require_once( EE_CLASSES . 'EE_Event_Question_Group.class.php');
+require_once(EE_CLASSES.'EE_Event_Question_Group.class.php');
 
-class EEM_Event_Question_Group extends EEM_Base{
+class EEM_Event_Question_Group extends EEM_Base {
 	// private instance of the Attendee object
 	protected static $_instance = NULL;
 
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Event to Question Group Link','event_espresso');
-		$this->plural_item = __('Event to Question Group Links','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Event to Question Group Link', 'event_espresso');
+		$this->plural_item = __('Event to Question Group Links', 'event_espresso');
 		$this->_tables = array(
-			'Event_Question_Group'=>new EE_Primary_Table('esp_event_question_group','EQG_ID')
+			'Event_Question_Group'=>new EE_Primary_Table('esp_event_question_group', 'EQG_ID')
 		);
 		$this->_fields = array(
 			'Event_Question_Group'=>array(
-				'EQG_ID'=>new EE_Primary_Key_Int_Field('EQG_ID', __('Event to Question Group Link ID','event_espresso')),
-				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('Event ID','event_espresso'), false, 0, 'Event'),
-				'QSG_ID'=>new EE_Foreign_Key_Int_Field('QSG_ID', __('Question Group Id','event_espresso'), false, 0, 'Question_Group'),
-				'EQG_primary'=>new EE_Boolean_Field('EQG_primary', __('Flag indicating question is only for primary attendees','event_espresso'), false, false)
+				'EQG_ID'=>new EE_Primary_Key_Int_Field('EQG_ID', __('Event to Question Group Link ID', 'event_espresso')),
+				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('Event ID', 'event_espresso'), false, 0, 'Event'),
+				'QSG_ID'=>new EE_Foreign_Key_Int_Field('QSG_ID', __('Question Group Id', 'event_espresso'), false, 0, 'Question_Group'),
+				'EQG_primary'=>new EE_Boolean_Field('EQG_primary', __('Flag indicating question is only for primary attendees', 'event_espresso'), false, false)
 			)
 		);
 		$this->_model_relations = array(
@@ -30,11 +30,11 @@ 
 			'Question_Group'=>new EE_Belongs_To_Relation()
 		);
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Event_Related_Public( 'Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Event_Related_Protected( 'Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Event_Related_Protected( 'Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Event_Related_Protected( 'Event', EEM_Base::caps_edit );
-		parent::__construct( $timezone );
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Event_Related_Public('Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Event_Related_Protected('Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Event_Related_Protected('Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Event_Related_Protected('Event', EEM_Base::caps_edit);
+		parent::__construct($timezone);
 	}