eventespresso / event-espresso-core

core/data_migration_scripts/4_8_0_stages/EE_DMS_4_8_0_pretax_totals.dmsstage.php

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
@@ -13,7 +13,7 @@ 
  *
  * Migrates line items that used to have LIN_code="tickets" to "pre-tax-total"
  */
-class EE_DMS_4_8_0_pretax_totals extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_8_0_pretax_totals extends EE_Data_Migration_Script_Stage {
 
 	protected $_line_item_table_name;
 
@@ -53,10 +53,10 @@ 
 		global $wpdb;
 		$rows_updated = $wpdb->update(
 				$this->_line_item_table_name,
-				array( 'LIN_code' => 'pre-tax-subtotal' ),
-				array( 'LIN_code' => 'tickets' ),
-				array( '%s' ),
-				array( '%s' ) );
+				array('LIN_code' => 'pre-tax-subtotal'),
+				array('LIN_code' => 'tickets'),
+				array('%s'),
+				array('%s') );
 		$this->set_completed();
 		return 1;
 	}

core/data_migration_scripts/EE_Data_Migration_Script_Stage_Table.core.php

Indentation +6 added lines, -6 removed lines

@@ -21,12 +21,12 @@
 	protected $_old_table;
 
 /**
-	 * Set in the constructor to add this sql to both the counting query in
-	 * EE_Data_Migration_Script_Stage_Table::_count_records_to_migrate() and
-	 * EE_Data_Migration_Script_Stage_Table::_get_rows().
-	 * Eg "where column_name like '%some_value%'"
-	 * @var string
-	 */
+ * Set in the constructor to add this sql to both the counting query in
+ * EE_Data_Migration_Script_Stage_Table::_count_records_to_migrate() and
+ * EE_Data_Migration_Script_Stage_Table::_get_rows().
+ * Eg "where column_name like '%some_value%'"
+ * @var string
+ */
 	protected $_extra_where_sql;
 
 

Spacing +9 added lines, -9 removed lines

@@ -41,14 +41,14 @@ 
 	 * @param int $num_items
 	 * @return int number of items ACTUALLY migrated
 	 */
-	function _migration_step($num_items=50){
-		$rows = $this->_get_rows( $num_items );
+	function _migration_step($num_items = 50) {
+		$rows = $this->_get_rows($num_items);
 		$items_actually_migrated = 0;
-		foreach($rows as $old_row){
+		foreach ($rows as $old_row) {
 			$this->_migrate_old_row($old_row);
 			$items_actually_migrated++;
 		}
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
 			$this->set_completed();
 		}
 		return $items_actually_migrated;
@@ -60,11 +60,11 @@ 
 	 * @param int $limit
 	 * @return array of arrays like $wpdb->get_results($sql, ARRAY_A)
 	 */
-	protected function _get_rows( $limit ){
+	protected function _get_rows($limit) {
 		global $wpdb;
 		$start_at_record = $this->count_records_migrated();
-		$query = "SELECT * FROM {$this->_old_table} {$this->_extra_where_sql} " . $wpdb->prepare("LIMIT %d, %d",$start_at_record,$limit);
-		return $wpdb->get_results($query,ARRAY_A);
+		$query = "SELECT * FROM {$this->_old_table} {$this->_extra_where_sql} ".$wpdb->prepare("LIMIT %d, %d", $start_at_record, $limit);
+		return $wpdb->get_results($query, ARRAY_A);
 	}
 
 
@@ -75,8 +75,8 @@ 
 	 */
 	function _count_records_to_migrate() {
 		global $wpdb;
-		$query =  "SELECT COUNT(*) FROM {$this->_old_table} {$this->_extra_where_sql}";
-		$count = $wpdb->get_var( $query );
+		$query = "SELECT COUNT(*) FROM {$this->_old_table} {$this->_extra_where_sql}";
+		$count = $wpdb->get_var($query);
 		return $count;
 	}
 

core/db_classes/EE_Checkin.class.php

Braces +3 added lines, -1 removed lines

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

Spacing +3 added lines, -3 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 @@ 
  * @subpackage		includes/classes/EE_Checkin.class.php
  * @author				Darren Ethier
  */
-class EE_Checkin extends EE_Base_Class{
+class EE_Checkin extends EE_Base_Class {
 
 
 }

core/db_classes/EE_Datetime.class.php

Braces +2 added lines, -4 removed lines

@@ -708,12 +708,10 @@
 		if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) ) {
 			$display_date = $this->start_date( 'M j\, Y g:i a' ) . ' - ' . $this->end_date( 'M j\, Y g:i a' );
 			//next condition is if its the same month but different day
-		}
-		else {
+		} else {
 			if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) == date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) && date( 'd', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'd', $this->get_raw( 'DTT_EVT_end' ) ) ) {
 				$display_date = $this->start_date( 'M j\, g:i a' ) . ' - ' . $this->end_date( 'M j\, g:i a Y' );
-			}
-			else {
+			} else {
 				$display_date = $this->start_date( 'F j\, Y' ) . ' @ ' . $this->start_date( 'g:i a' ) . ' - ' . $this->end_date( 'g:i a' );
 			}
 		}

Doc Comments +4 added lines, -4 removed lines

@@ -253,7 +253,7 @@ 
 	 * increments reserved by amount passed by $qty
 	 *
 	 * @param int $qty
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	public function increase_reserved( $qty = 1 ) {
 		$reserved = $this->reserved() + absint( $qty );
@@ -266,7 +266,7 @@ 
 	 * decrements (subtracts) reserved by amount passed by $qty
 	 *
 	 * @param int $qty
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	public function decrease_reserved( $qty = 1 ) {
 		$reserved = $this->reserved() - absint( $qty );
@@ -411,7 +411,7 @@ 
 	 * @param string $dt_frmt     - string representation of date format defaults to WP settings
 	 * @param string $conjunction - conjunction junction what's your function ? this string joins the start date with
 	 *                            the end date ie: Jan 01 "to" Dec 31
-	 * @return mixed        string on success, FALSE on fail
+	 * @return string        string on success, FALSE on fail
 	 * @throws \EE_Error
 	 */
 	public function date_range( $dt_frmt = '', $conjunction = ' - ' ) {
@@ -483,7 +483,7 @@ 
 	 * @param string $tm_format   string representation of time format defaults to 'g:i a'
 	 * @param string $conjunction conjunction junction what's your function ?
 	 *                            this string joins the start date with the end date ie: Jan 01 "to" Dec 31
-	 * @return mixed              string on success, FALSE on fail
+	 * @return string              string on success, FALSE on fail
 	 * @throws \EE_Error
 	 */
 	public function time_range( $tm_format = '', $conjunction = ' - ' ) {

Indentation +51 added lines, -51 removed lines

@@ -358,13 +358,13 @@ 
 
 
 
-    /**
-     * get event start date.  Provide either the date format, or NULL to re-use the
-     * last-used format, or '' to use the default date format
-     *
-     * @param string $dt_frmt - string representation of date format defaults to 'F j, Y'
-     * @return        mixed        string on success, FALSE on fail
-     */
+	/**
+	 * get event start date.  Provide either the date format, or NULL to re-use the
+	 * last-used format, or '' to use the default date format
+	 *
+	 * @param string $dt_frmt - string representation of date format defaults to 'F j, Y'
+	 * @return        mixed        string on success, FALSE on fail
+	 */
 	public function start_date( $dt_frmt = '' ) {
 		return $this->_show_datetime( 'D', 'start', $dt_frmt );
 	}
@@ -381,13 +381,13 @@ 
 
 
 
-    /**
-     * get end date. Provide either the date format, or NULL to re-use the
-     * last-used format, or '' to use the default date format
-     *
-     * @param string $dt_frmt - string representation of date format defaults to 'F j, Y'
-     * @return        mixed        string on success, FALSE on fail
-     */
+	/**
+	 * get end date. Provide either the date format, or NULL to re-use the
+	 * last-used format, or '' to use the default date format
+	 *
+	 * @param string $dt_frmt - string representation of date format defaults to 'F j, Y'
+	 * @return        mixed        string on success, FALSE on fail
+	 */
 	public function end_date( $dt_frmt = '' ) {
 		return $this->_show_datetime( 'D', 'end', $dt_frmt );
 	}
@@ -509,23 +509,23 @@ 
 	/**
 	 * This returns a range representation of the date and times.
 	 * Output is dependent on the difference (or similarity) between DTT_EVT_start and DTT_EVT_end.
-     * Also, the return value is localized.
-     *
-     * @param string $dt_format
+	 * Also, the return value is localized.
+	 *
+	 * @param string $dt_format
 	 * @param string $tm_format
 	 * @param string $conjunction used between two different dates or times.
-     *                            ex: Dec 1{$conjunction}}Dec 6, or 2pm{$conjunction}3pm
-     * @param string $separator   used between the date and time formats.
-     *                            ex: Dec 1, 2016{$separator}2pm
+	 *                            ex: Dec 1{$conjunction}}Dec 6, or 2pm{$conjunction}3pm
+	 * @param string $separator   used between the date and time formats.
+	 *                            ex: Dec 1, 2016{$separator}2pm
 	 * @return string
 	 * @throws \EE_Error
 	 */
 	public function date_and_time_range(
-	    $dt_format = '',
-        $tm_format = '',
-        $conjunction = ' - ' ,
-        $separator = ' '
-    ) {
+		$dt_format = '',
+		$tm_format = '',
+		$conjunction = ' - ' ,
+		$separator = ' '
+	) {
 		$dt_format = ! empty( $dt_format ) ? $dt_format : $this->_dt_frmt;
 		$tm_format = ! empty( $tm_format ) ? $tm_format : $this->_tm_frmt;
 		$full_format = $dt_format . $separator . $tm_format;
@@ -539,14 +539,14 @@ 
 			//start and end date are the same but times are different
 			case ( $this->start_date() === $this->end_date() ) :
 				$output = $this->get_i18n_datetime( 'DTT_EVT_start', $full_format )
-				          . $conjunction
-				          . $this->get_i18n_datetime( 'DTT_EVT_end', $tm_format );
+						  . $conjunction
+						  . $this->get_i18n_datetime( 'DTT_EVT_end', $tm_format );
 				break;
 			//all other conditions
 			default :
 				$output = $this->get_i18n_datetime( 'DTT_EVT_start', $full_format )
-				          . $conjunction
-				          . $this->get_i18n_datetime( 'DTT_EVT_end', $full_format );
+						  . $conjunction
+						  . $this->get_i18n_datetime( 'DTT_EVT_end', $full_format );
 				break;
 		}
 		return $output;
@@ -630,13 +630,13 @@ 
 
 
 	/**
-     *        get end date and time
-     *
-     * @param string $dt_frmt   - string representation of date format defaults to 'F j, Y'
-     * @param string $tm_format - string representation of time format defaults to 'g:i a'
-     * @return    mixed                string on success, FALSE on fail
-     */
-    public function end_date_and_time($dt_frmt = '', $tm_format = '') {
+	 *        get end date and time
+	 *
+	 * @param string $dt_frmt   - string representation of date format defaults to 'F j, Y'
+	 * @param string $tm_format - string representation of time format defaults to 'g:i a'
+	 * @return    mixed                string on success, FALSE on fail
+	 */
+	public function end_date_and_time($dt_frmt = '', $tm_format = '') {
 		return $this->_show_datetime( '', 'end', $dt_frmt, $tm_format );
 	}
 
@@ -905,13 +905,13 @@ 
 
 
 
-    /**
-     * Updates the DTT_sold attribute (and saves) based on the number of registrations for this datetime (via the tickets).
-     * into account
-     *
-     * @return int
-     * @throws \EE_Error
-     */
+	/**
+	 * Updates the DTT_sold attribute (and saves) based on the number of registrations for this datetime (via the tickets).
+	 * into account
+	 *
+	 * @return int
+	 * @throws \EE_Error
+	 */
 	public function update_sold() {
 		$count_regs_for_this_datetime = EEM_Registration::instance()->count(
 			array( array(
@@ -920,14 +920,14 @@ 
 				'Ticket.Datetime.DTT_ID' 	=> $this->ID(),
 			) )
 		);
-        $sold = $this->sold();
-        if ($count_regs_for_this_datetime > $sold) {
-            $this->increase_sold($count_regs_for_this_datetime - $sold);
-            $this->save();
-        } else if ($count_regs_for_this_datetime < $sold) {
-            $this->decrease_sold($count_regs_for_this_datetime - $sold);
-            $this->save();
-        }
+		$sold = $this->sold();
+		if ($count_regs_for_this_datetime > $sold) {
+			$this->increase_sold($count_regs_for_this_datetime - $sold);
+			$this->save();
+		} else if ($count_regs_for_this_datetime < $sold) {
+			$this->decrease_sold($count_regs_for_this_datetime - $sold);
+			$this->save();
+		}
 		return $count_regs_for_this_datetime;
 	}
 }

Spacing +144 added lines, -144 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
@@ -68,8 +68,8 @@ 
 	/**
 	 * @param $name
 	 */
-	public function set_name( $name ) {
-		$this->set( 'DTT_name', $name );
+	public function set_name($name) {
+		$this->set('DTT_name', $name);
 	}
 
 
@@ -77,8 +77,8 @@ 
 	/**
 	 * @param $description
 	 */
-	public function set_description( $description ) {
-		$this->set( 'DTT_description', $description );
+	public function set_description($description) {
+		$this->set('DTT_description', $description);
 	}
 
 
@@ -90,8 +90,8 @@ 
 	 *
 	 * @param        string $date a string representation of the event's date ex:  Dec. 25, 2025 or 12-25-2025
 	 */
-	public function set_start_date( $date ) {
-		$this->_set_date_for( $date, 'DTT_EVT_start' );
+	public function set_start_date($date) {
+		$this->_set_date_for($date, 'DTT_EVT_start');
 	}
 
 
@@ -103,8 +103,8 @@ 
 	 *
 	 * @param        string $time a string representation of the event time ex:  9am  or  7:30 PM
 	 */
-	public function set_start_time( $time ) {
-		$this->_set_time_for( $time, 'DTT_EVT_start' );
+	public function set_start_time($time) {
+		$this->_set_time_for($time, 'DTT_EVT_start');
 	}
 
 
@@ -116,8 +116,8 @@ 
 	 *
 	 * @param        string $date a string representation of the event's date ex:  Dec. 25, 2025 or 12-25-2025
 	 */
-	public function set_end_date( $date ) {
-		$this->_set_date_for( $date, 'DTT_EVT_end' );
+	public function set_end_date($date) {
+		$this->_set_date_for($date, 'DTT_EVT_end');
 	}
 
 
@@ -129,8 +129,8 @@ 
 	 *
 	 * @param        string $time a string representation of the event time ex:  9am  or  7:30 PM
 	 */
-	public function set_end_time( $time ) {
-		$this->_set_time_for( $time, 'DTT_EVT_end' );
+	public function set_end_time($time) {
+		$this->_set_time_for($time, 'DTT_EVT_end');
 	}
 
 
@@ -142,8 +142,8 @@ 
 	 *
 	 * @param        int $reg_limit
 	 */
-	public function set_reg_limit( $reg_limit ) {
-		$this->set( 'DTT_reg_limit', $reg_limit );
+	public function set_reg_limit($reg_limit) {
+		$this->set('DTT_reg_limit', $reg_limit);
 	}
 
 
@@ -155,7 +155,7 @@ 
 	 * @return        mixed        int on success, FALSE on fail
 	 */
 	public function sold() {
-		return $this->get_raw( 'DTT_sold' );
+		return $this->get_raw('DTT_sold');
 	}
 
 
@@ -165,10 +165,10 @@ 
 	 *
 	 * @param        int $sold
 	 */
-	public function set_sold( $sold ) {
+	public function set_sold($sold) {
 		// sold can not go below zero
-		$sold = max( 0, $sold );
-		$this->set( 'DTT_sold', $sold );
+		$sold = max(0, $sold);
+		$this->set('DTT_sold', $sold);
 	}
 
 
@@ -177,11 +177,11 @@ 
 	 * increments sold by amount passed by $qty
 	 * @param int $qty
 	 */
-	public function increase_sold( $qty = 1 ) {
+	public function increase_sold($qty = 1) {
 		$sold = $this->sold() + $qty;
 		// remove ticket reservation
-		$this->decrease_reserved( $qty );
-		$this->set_sold( $sold );
+		$this->decrease_reserved($qty);
+		$this->set_sold($sold);
 	}
 
 
@@ -190,9 +190,9 @@ 
 	 * decrements (subtracts) sold amount passed by $qty
 	 * @param int $qty
 	 */
-	public function decrease_sold( $qty = 1 ) {
+	public function decrease_sold($qty = 1) {
 		$sold = $this->sold() - $qty;
-		$this->set_sold( $sold );
+		$this->set_sold($sold);
 	}
 
 
@@ -203,7 +203,7 @@ 
 	 * @return int
 	 */
 	public function reserved() {
-		return $this->get_raw( 'DTT_reserved' );
+		return $this->get_raw('DTT_reserved');
 	}
 
 
@@ -213,10 +213,10 @@ 
 	 *
 	 * @param int $reserved
 	 */
-	public function set_reserved( $reserved ) {
+	public function set_reserved($reserved) {
 		// reserved can not go below zero
-		$reserved = max( 0, (int) $reserved );
-		$this->set( 'DTT_reserved', $reserved );
+		$reserved = max(0, (int) $reserved);
+		$this->set('DTT_reserved', $reserved);
 	}
 
 
@@ -227,9 +227,9 @@ 
 	 * @param int $qty
 	 * @return boolean
 	 */
-	public function increase_reserved( $qty = 1 ) {
-		$reserved = $this->reserved() + absint( $qty );
-		return $this->set_reserved( $reserved );
+	public function increase_reserved($qty = 1) {
+		$reserved = $this->reserved() + absint($qty);
+		return $this->set_reserved($reserved);
 	}
 
 
@@ -240,9 +240,9 @@ 
 	 * @param int $qty
 	 * @return boolean
 	 */
-	public function decrease_reserved( $qty = 1 ) {
-		$reserved = $this->reserved() - absint( $qty );
-		return $this->set_reserved( $reserved );
+	public function decrease_reserved($qty = 1) {
+		$reserved = $this->reserved() - absint($qty);
+		return $this->set_reserved($reserved);
 	}
 
 
@@ -263,7 +263,7 @@ 
 	 * @return string
 	 */
 	public function name() {
-		return $this->get( 'DTT_name' );
+		return $this->get('DTT_name');
 	}
 
 
@@ -273,7 +273,7 @@ 
 	 * @return string
 	 */
 	public function description() {
-		return $this->get( 'DTT_description' );
+		return $this->get('DTT_description');
 	}
 
 
@@ -283,7 +283,7 @@ 
 	 * @return boolean          TRUE if is primary, FALSE if not.
 	 */
 	public function is_primary() {
-		return $this->get( 'DTT_is_primary' );
+		return $this->get('DTT_is_primary');
 	}
 
 
@@ -293,7 +293,7 @@ 
 	 * @return int         The order of the datetime for this event.
 	 */
 	public function order() {
-		return $this->get( 'DTT_order' );
+		return $this->get('DTT_order');
 	}
 
 
@@ -303,7 +303,7 @@ 
 	 * @return int
 	 */
 	public function parent() {
-		return $this->get( 'DTT_parent' );
+		return $this->get('DTT_parent');
 	}
 
 
@@ -319,10 +319,10 @@ 
 	 * @param    bool   $echo         - whether we echo or return (note echoing uses "pretty" formats, otherwise we use the standard formats)
 	 * @return    string|bool  string on success, FALSE on fail
 	 */
-	private function _show_datetime( $date_or_time = NULL, $start_or_end = 'start', $dt_frmt = '', $tm_frmt = '', $echo = FALSE ) {
+	private function _show_datetime($date_or_time = NULL, $start_or_end = 'start', $dt_frmt = '', $tm_frmt = '', $echo = FALSE) {
 		$field_name = "DTT_EVT_{$start_or_end}";
-		$dtt = $this->_get_datetime( $field_name, $dt_frmt, $tm_frmt, $date_or_time, $echo );
-		if ( ! $echo ) {
+		$dtt = $this->_get_datetime($field_name, $dt_frmt, $tm_frmt, $date_or_time, $echo);
+		if ( ! $echo) {
 			return $dtt;
 		}
 		return '';
@@ -337,8 +337,8 @@ 
      * @param string $dt_frmt - string representation of date format defaults to 'F j, Y'
      * @return        mixed        string on success, FALSE on fail
      */
-	public function start_date( $dt_frmt = '' ) {
-		return $this->_show_datetime( 'D', 'start', $dt_frmt );
+	public function start_date($dt_frmt = '') {
+		return $this->_show_datetime('D', 'start', $dt_frmt);
 	}
 
 
@@ -347,8 +347,8 @@ 
 	 * Echoes start_date()
 	 * @param string $dt_frmt
 	 */
-	public function e_start_date( $dt_frmt = '' ) {
-		$this->_show_datetime( 'D', 'start', $dt_frmt, NULL, TRUE );
+	public function e_start_date($dt_frmt = '') {
+		$this->_show_datetime('D', 'start', $dt_frmt, NULL, TRUE);
 	}
 
 
@@ -360,8 +360,8 @@ 
      * @param string $dt_frmt - string representation of date format defaults to 'F j, Y'
      * @return        mixed        string on success, FALSE on fail
      */
-	public function end_date( $dt_frmt = '' ) {
-		return $this->_show_datetime( 'D', 'end', $dt_frmt );
+	public function end_date($dt_frmt = '') {
+		return $this->_show_datetime('D', 'end', $dt_frmt);
 	}
 
 
@@ -370,8 +370,8 @@ 
 	 * Echoes the end date. See end_date()
 	 * @param string $dt_frmt
 	 */
-	public function e_end_date( $dt_frmt = '' ) {
-		$this->_show_datetime( 'D', 'end', $dt_frmt, NULL, TRUE );
+	public function e_end_date($dt_frmt = '') {
+		$this->_show_datetime('D', 'end', $dt_frmt, NULL, TRUE);
 	}
 
 
@@ -386,11 +386,11 @@ 
 	 * @return mixed        string on success, FALSE on fail
 	 * @throws \EE_Error
 	 */
-	public function date_range( $dt_frmt = '', $conjunction = ' - ' ) {
-		$dt_frmt = ! empty( $dt_frmt ) ? $dt_frmt : $this->_dt_frmt;
-		$start = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_start', $dt_frmt ) );
-		$end = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_end', $dt_frmt ) );
-		return $start !== $end ? $start . $conjunction . $end : $start;
+	public function date_range($dt_frmt = '', $conjunction = ' - ') {
+		$dt_frmt = ! empty($dt_frmt) ? $dt_frmt : $this->_dt_frmt;
+		$start = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_start', $dt_frmt));
+		$end = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_end', $dt_frmt));
+		return $start !== $end ? $start.$conjunction.$end : $start;
 	}
 
 
@@ -400,8 +400,8 @@ 
 	 * @param string $conjunction
 	 * @throws \EE_Error
 	 */
-	public function e_date_range( $dt_frmt = '', $conjunction = ' - ' ) {
-		echo $this->date_range( $dt_frmt, $conjunction );
+	public function e_date_range($dt_frmt = '', $conjunction = ' - ') {
+		echo $this->date_range($dt_frmt, $conjunction);
 	}
 
 
@@ -412,8 +412,8 @@ 
 	 * @param string $tm_format - string representation of time format defaults to 'g:i a'
 	 * @return mixed        string on success, FALSE on fail
 	 */
-	public function start_time( $tm_format = '' ) {
-		return $this->_show_datetime( 'T', 'start', NULL, $tm_format );
+	public function start_time($tm_format = '') {
+		return $this->_show_datetime('T', 'start', NULL, $tm_format);
 	}
 
 
@@ -421,8 +421,8 @@ 
 	/**
 	 * @param string $tm_format
 	 */
-	public function e_start_time( $tm_format = '' ) {
-		$this->_show_datetime( 'T', 'start', NULL, $tm_format, TRUE );
+	public function e_start_time($tm_format = '') {
+		$this->_show_datetime('T', 'start', NULL, $tm_format, TRUE);
 	}
 
 
@@ -433,8 +433,8 @@ 
 	 * @param string $tm_format - string representation of time format defaults to 'g:i a'
 	 * @return mixed        string on success, FALSE on fail
 	 */
-	public function end_time( $tm_format = '' ) {
-		return $this->_show_datetime( 'T', 'end', NULL, $tm_format );
+	public function end_time($tm_format = '') {
+		return $this->_show_datetime('T', 'end', NULL, $tm_format);
 	}
 
 
@@ -442,8 +442,8 @@ 
 	/**
 	 * @param string $tm_format
 	 */
-	public function e_end_time( $tm_format = '' ) {
-		$this->_show_datetime( 'T', 'end', NULL, $tm_format, TRUE );
+	public function e_end_time($tm_format = '') {
+		$this->_show_datetime('T', 'end', NULL, $tm_format, TRUE);
 	}
 
 
@@ -458,11 +458,11 @@ 
 	 * @return mixed              string on success, FALSE on fail
 	 * @throws \EE_Error
 	 */
-	public function time_range( $tm_format = '', $conjunction = ' - ' ) {
-		$tm_format = ! empty( $tm_format ) ? $tm_format : $this->_tm_frmt;
-		$start = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_start', $tm_format ) );
-		$end = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_end',  $tm_format ) );
-		return $start !== $end ? $start . $conjunction . $end : $start;
+	public function time_range($tm_format = '', $conjunction = ' - ') {
+		$tm_format = ! empty($tm_format) ? $tm_format : $this->_tm_frmt;
+		$start = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_start', $tm_format));
+		$end = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_end', $tm_format));
+		return $start !== $end ? $start.$conjunction.$end : $start;
 	}
 
 
@@ -472,8 +472,8 @@ 
 	 * @param string $conjunction
 	 * @throws \EE_Error
 	 */
-	public function e_time_range( $tm_format = '', $conjunction = ' - ' ) {
-		echo $this->time_range( $tm_format, $conjunction );
+	public function e_time_range($tm_format = '', $conjunction = ' - ') {
+		echo $this->time_range($tm_format, $conjunction);
 	}
 
 
@@ -495,30 +495,30 @@ 
 	public function date_and_time_range(
 	    $dt_format = '',
         $tm_format = '',
-        $conjunction = ' - ' ,
+        $conjunction = ' - ',
         $separator = ' '
     ) {
-		$dt_format = ! empty( $dt_format ) ? $dt_format : $this->_dt_frmt;
-		$tm_format = ! empty( $tm_format ) ? $tm_format : $this->_tm_frmt;
-		$full_format = $dt_format . $separator . $tm_format;
+		$dt_format = ! empty($dt_format) ? $dt_format : $this->_dt_frmt;
+		$tm_format = ! empty($tm_format) ? $tm_format : $this->_tm_frmt;
+		$full_format = $dt_format.$separator.$tm_format;
 
 		//the range output depends on various conditions
-		switch ( true ) {
+		switch (true) {
 			//start date timestamp and end date timestamp are the same.
-			case ( $this->get_raw( 'DTT_EVT_start' ) === $this->get_raw( 'DTT_EVT_end' ) ) :
-				$output = $this->get_i18n_datetime( 'DTT_EVT_start', $full_format );
+			case ($this->get_raw('DTT_EVT_start') === $this->get_raw('DTT_EVT_end')) :
+				$output = $this->get_i18n_datetime('DTT_EVT_start', $full_format);
 				break;
 			//start and end date are the same but times are different
-			case ( $this->start_date() === $this->end_date() ) :
-				$output = $this->get_i18n_datetime( 'DTT_EVT_start', $full_format )
+			case ($this->start_date() === $this->end_date()) :
+				$output = $this->get_i18n_datetime('DTT_EVT_start', $full_format)
 				          . $conjunction
-				          . $this->get_i18n_datetime( 'DTT_EVT_end', $tm_format );
+				          . $this->get_i18n_datetime('DTT_EVT_end', $tm_format);
 				break;
 			//all other conditions
 			default :
-				$output = $this->get_i18n_datetime( 'DTT_EVT_start', $full_format )
+				$output = $this->get_i18n_datetime('DTT_EVT_start', $full_format)
 				          . $conjunction
-				          . $this->get_i18n_datetime( 'DTT_EVT_end', $full_format );
+				          . $this->get_i18n_datetime('DTT_EVT_end', $full_format);
 				break;
 		}
 		return $output;
@@ -536,8 +536,8 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function e_date_and_time_range( $dt_format = '', $tm_format = '', $conjunction = ' - ' ) {
-		echo $this->date_and_time_range( $dt_format, $tm_format, $conjunction );
+	public function e_date_and_time_range($dt_format = '', $tm_format = '', $conjunction = ' - ') {
+		echo $this->date_and_time_range($dt_format, $tm_format, $conjunction);
 	}
 
 
@@ -549,8 +549,8 @@ 
 	 * @param 	string 	$tm_format - string representation of time format defaults to 'g:i a'
 	 * @return 	mixed 	string on success, FALSE on fail
 	 */
-	public function start_date_and_time( $dt_format = '', $tm_format = '' ) {
-		return $this->_show_datetime( '', 'start', $dt_format, $tm_format );
+	public function start_date_and_time($dt_format = '', $tm_format = '') {
+		return $this->_show_datetime('', 'start', $dt_format, $tm_format);
 	}
 
 
@@ -559,8 +559,8 @@ 
 	 * @param string $dt_frmt
 	 * @param string $tm_format
 	 */
-	public function e_start_date_and_time( $dt_frmt = '', $tm_format = '' ) {
-		$this->_show_datetime( '', 'start', $dt_frmt, $tm_format, TRUE );
+	public function e_start_date_and_time($dt_frmt = '', $tm_format = '') {
+		$this->_show_datetime('', 'start', $dt_frmt, $tm_format, TRUE);
 	}
 
 
@@ -574,11 +574,11 @@ 
 	 * @param bool   $round_up
 	 * @return float|int|mixed
 	 */
-	public function length( $units = 'seconds', $round_up = FALSE ) {
-		$start = $this->get_raw( 'DTT_EVT_start' );
-		$end = $this->get_raw( 'DTT_EVT_end' );
+	public function length($units = 'seconds', $round_up = FALSE) {
+		$start = $this->get_raw('DTT_EVT_start');
+		$end = $this->get_raw('DTT_EVT_end');
 		$length_in_units = $end - $start;
-		switch ( $units ) {
+		switch ($units) {
 			//NOTE: We purposefully don't use "break;" in order to chain the divisions
 			/** @noinspection PhpMissingBreakStatementInspection */
 			case 'days':
@@ -591,10 +591,10 @@ 
 				$length_in_units /= 60;
 			case 'seconds':
 			default:
-				$length_in_units = ceil( $length_in_units );
+				$length_in_units = ceil($length_in_units);
 		}
-		if ( $round_up ) {
-			$length_in_units = max( $length_in_units, 1 );
+		if ($round_up) {
+			$length_in_units = max($length_in_units, 1);
 		}
 		return $length_in_units;
 	}
@@ -609,7 +609,7 @@ 
      * @return    mixed                string on success, FALSE on fail
      */
     public function end_date_and_time($dt_frmt = '', $tm_format = '') {
-		return $this->_show_datetime( '', 'end', $dt_frmt, $tm_format );
+		return $this->_show_datetime('', 'end', $dt_frmt, $tm_format);
 	}
 
 
@@ -618,8 +618,8 @@ 
 	 * @param string $dt_frmt
 	 * @param string $tm_format
 	 */
-	public function e_end_date_and_time( $dt_frmt = '', $tm_format = '' ) {
-		$this->_show_datetime( '', 'end', $dt_frmt, $tm_format, TRUE );
+	public function e_end_date_and_time($dt_frmt = '', $tm_format = '') {
+		$this->_show_datetime('', 'end', $dt_frmt, $tm_format, TRUE);
 	}
 
 
@@ -630,7 +630,7 @@ 
 	 * @return        int
 	 */
 	public function start() {
-		return $this->get_raw( 'DTT_EVT_start' );
+		return $this->get_raw('DTT_EVT_start');
 	}
 
 
@@ -641,7 +641,7 @@ 
 	 * @return        int
 	 */
 	public function end() {
-		return $this->get_raw( 'DTT_EVT_end' );
+		return $this->get_raw('DTT_EVT_end');
 	}
 
 
@@ -652,7 +652,7 @@ 
 	 * @return        mixed        int on success, FALSE on fail
 	 */
 	public function reg_limit() {
-		return $this->get_raw( 'DTT_reg_limit' );
+		return $this->get_raw('DTT_reg_limit');
 	}
 
 
@@ -680,15 +680,15 @@ 
 	 * 																	the spaces remaining for this particular datetime, hence the flag.
 	 * @return 	int
 	 */
-	public function spaces_remaining( $consider_tickets = FALSE ) {
+	public function spaces_remaining($consider_tickets = FALSE) {
 		// tickets remaining available for purchase
 		//no need for special checks for infinite, because if DTT_reg_limit == EE_INF, then EE_INF - x = EE_INF
 		$dtt_remaining = $this->reg_limit() - $this->sold_and_reserved();
-		if ( ! $consider_tickets ) {
+		if ( ! $consider_tickets) {
 			return $dtt_remaining;
 		}
 		$tickets_remaining = $this->tickets_remaining();
-		return min( $dtt_remaining, $tickets_remaining );
+		return min($dtt_remaining, $tickets_remaining);
 	}
 
 
@@ -699,19 +699,19 @@ 
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @return int
 	 */
-	public function tickets_remaining( $query_params = array() ) {
+	public function tickets_remaining($query_params = array()) {
 		$sum = 0;
-		$tickets = $this->tickets( $query_params );
-		if ( ! empty( $tickets ) ) {
-			foreach ( $tickets as $ticket ) {
-				if ( $ticket instanceof EE_Ticket ) {
+		$tickets = $this->tickets($query_params);
+		if ( ! empty($tickets)) {
+			foreach ($tickets as $ticket) {
+				if ($ticket instanceof EE_Ticket) {
 					// get the actual amount of tickets that can be sold
-					$qty = $ticket->qty( 'saleable' );
-					if ( $qty === EE_INF ) {
+					$qty = $ticket->qty('saleable');
+					if ($qty === EE_INF) {
 						return EE_INF;
 					}
 					// no negative ticket quantities plz
-					if ( $qty > 0 ) {
+					if ($qty > 0) {
 						$sum += $qty;
 					}
 				}
@@ -728,8 +728,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @return int
 	 */
-	public function sum_tickets_initially_available( $query_params = array() ) {
-		return $this->sum_related( 'Ticket', $query_params, 'TKT_qty' );
+	public function sum_tickets_initially_available($query_params = array()) {
+		return $this->sum_related('Ticket', $query_params, 'TKT_qty');
 	}
 
 
@@ -741,7 +741,7 @@ 
 	 * @return int
 	 */
 	public function total_tickets_available_at_this_datetime() {
-		return $this->spaces_remaining( true );
+		return $this->spaces_remaining(true);
 	}
 
 
@@ -752,7 +752,7 @@ 
 	 * @return boolean
 	 */
 	public function is_upcoming() {
-		return ( $this->get_raw( 'DTT_EVT_start' ) > time() );
+		return ($this->get_raw('DTT_EVT_start') > time());
 	}
 
 
@@ -762,7 +762,7 @@ 
 	 * @return boolean
 	 */
 	public function is_active() {
-		return ( $this->get_raw( 'DTT_EVT_start' ) < time() && $this->get_raw( 'DTT_EVT_end' ) > time() );
+		return ($this->get_raw('DTT_EVT_start') < time() && $this->get_raw('DTT_EVT_end') > time());
 	}
 
 
@@ -772,7 +772,7 @@ 
 	 * @return boolean
 	 */
 	public function is_expired() {
-		return ( $this->get_raw( 'DTT_EVT_end' ) < time() );
+		return ($this->get_raw('DTT_EVT_end') < time());
 	}
 
 
@@ -783,16 +783,16 @@ 
 	 */
 	public function get_active_status() {
 		$total_tickets_for_this_dtt = $this->total_tickets_available_at_this_datetime();
-		if ( $total_tickets_for_this_dtt !== FALSE && $total_tickets_for_this_dtt < 1 ) {
+		if ($total_tickets_for_this_dtt !== FALSE && $total_tickets_for_this_dtt < 1) {
 			return EE_Datetime::sold_out;
 		}
-		if ( $this->is_expired() ) {
+		if ($this->is_expired()) {
 			return EE_Datetime::expired;
 		}
-		if ( $this->is_upcoming() ) {
+		if ($this->is_upcoming()) {
 			return EE_Datetime::upcoming;
 		}
-		if ( $this->is_active() ) {
+		if ($this->is_active()) {
 			return EE_Datetime::active;
 		}
 		return NULL;
@@ -806,24 +806,24 @@ 
 	 * @param  boolean $use_dtt_name if TRUE then we'll use DTT->name() if its not empty.
 	 * @return string
 	 */
-	public function get_dtt_display_name( $use_dtt_name = FALSE ) {
-		if ( $use_dtt_name ) {
+	public function get_dtt_display_name($use_dtt_name = FALSE) {
+		if ($use_dtt_name) {
 			$dtt_name = $this->name();
-			if ( !empty( $dtt_name ) ) {
+			if ( ! empty($dtt_name)) {
 				return $dtt_name;
 			}
 		}
 		//first condition is to see if the months are different
-		if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) ) {
-			$display_date = $this->start_date( 'M j\, Y g:i a' ) . ' - ' . $this->end_date( 'M j\, Y g:i a' );
+		if (date('m', $this->get_raw('DTT_EVT_start')) != date('m', $this->get_raw('DTT_EVT_end'))) {
+			$display_date = $this->start_date('M j\, Y g:i a').' - '.$this->end_date('M j\, Y g:i a');
 			//next condition is if its the same month but different day
 		}
 		else {
-			if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) == date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) && date( 'd', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'd', $this->get_raw( 'DTT_EVT_end' ) ) ) {
-				$display_date = $this->start_date( 'M j\, g:i a' ) . ' - ' . $this->end_date( 'M j\, g:i a Y' );
+			if (date('m', $this->get_raw('DTT_EVT_start')) == date('m', $this->get_raw('DTT_EVT_end')) && date('d', $this->get_raw('DTT_EVT_start')) != date('d', $this->get_raw('DTT_EVT_end'))) {
+				$display_date = $this->start_date('M j\, g:i a').' - '.$this->end_date('M j\, g:i a Y');
 			}
 			else {
-				$display_date = $this->start_date( 'F j\, Y' ) . ' @ ' . $this->start_date( 'g:i a' ) . ' - ' . $this->end_date( 'g:i a' );
+				$display_date = $this->start_date('F j\, Y').' @ '.$this->start_date('g:i a').' - '.$this->end_date('g:i a');
 			}
 		}
 		return $display_date;
@@ -837,8 +837,8 @@ 
 *@param array $query_params see EEM_Base::get_all()
 	 * @return EE_Ticket[]
 	 */
-	public function tickets( $query_params = array() ) {
-		return $this->get_many_related( 'Ticket', $query_params );
+	public function tickets($query_params = array()) {
+		return $this->get_many_related('Ticket', $query_params);
 	}
 
 
@@ -848,21 +848,21 @@ 
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @return EE_Ticket[]
 	 */
-	public function ticket_types_available_for_purchase( $query_params = array() ) {
+	public function ticket_types_available_for_purchase($query_params = array()) {
 		// first check if datetime is valid
-		if ( ! ( $this->is_upcoming() || $this->is_active() ) || $this->sold_out() ) {
+		if ( ! ($this->is_upcoming() || $this->is_active()) || $this->sold_out()) {
 			return array();
 		}
-		if ( empty( $query_params ) ) {
+		if (empty($query_params)) {
 			$query_params = array(
 				array(
-					'TKT_start_date' => array( '<=', EEM_Ticket::instance()->current_time_for_query( 'TKT_start_date' ) ),
-					'TKT_end_date'   => array( '>=', EEM_Ticket::instance()->current_time_for_query( 'TKT_end_date' ) ),
+					'TKT_start_date' => array('<=', EEM_Ticket::instance()->current_time_for_query('TKT_start_date')),
+					'TKT_end_date'   => array('>=', EEM_Ticket::instance()->current_time_for_query('TKT_end_date')),
 					'TKT_deleted'    => false
 				)
 			);
 		}
-		return $this->tickets( $query_params );
+		return $this->tickets($query_params);
 	}
 
 
@@ -872,7 +872,7 @@ 
 	 * @return EE_Event
 	 */
 	public function event() {
-		return $this->get_first_related( 'Event' );
+		return $this->get_first_related('Event');
 	}
 
 
@@ -886,11 +886,11 @@ 
      */
 	public function update_sold() {
 		$count_regs_for_this_datetime = EEM_Registration::instance()->count(
-			array( array(
+			array(array(
 				'STS_ID' 					=> EEM_Registration::status_id_approved,
 				'REG_deleted' 				=> 0,
 				'Ticket.Datetime.DTT_ID' 	=> $this->ID(),
-			) )
+			))
 		);
         $sold = $this->sold();
         if ($count_regs_for_this_datetime > $sold) {

core/db_classes/EE_Event_Message_Template.class.php

Braces +3 added lines, -1 removed lines

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

core/db_classes/EE_Question_Group.class.php

Braces +3 added lines, -2 removed lines

@@ -252,8 +252,9 @@
 		$has_answers = FALSE;
 		$questions = $this->get_many_related( 'Question' );
 		foreach ( $questions as $question ) {
-			if ( $question->count_related( 'Answer' ) > 0 )
-				$has_answers = TRUE;
+			if ( $question->count_related( 'Answer' ) > 0 ) {
+							$has_answers = TRUE;
+			}
 		}
 		return $has_answers;
 	}

Doc Comments +2 added lines, -2 removed lines

@@ -213,7 +213,7 @@ 
 	/**
 	 * Adds the question to this question group
 	 * @param EE_Question || int $question object or ID
-	 * @return boolean if successful
+	 * @return EE_Base_Class if successful
 	 */
 	public function add_question( $questionObjectOrID ) {
 		return $this->_add_relation_to( $questionObjectOrID, 'Question' );
@@ -224,7 +224,7 @@ 
 	/**
 	 * Removes the question from this question group
 	 * @param EE_Question || int $question object or ID
-	 * @return boolean of success
+	 * @return EE_Base_Class of success
 	 */
 	public function remove_question( $questionObjectOrID ) {
 		return $this->_remove_relation_to( $questionObjectOrID, 'Question' );

Spacing +35 added lines, -35 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,8 +35,8 @@ 
 	 * @param bool $pretty
 	 * @return string
 	 */
-	public function name( $pretty = FALSE ) {
-		return $pretty ? $this->get_pretty( 'QSG_name' ) : $this->get( 'QSG_name' );
+	public function name($pretty = FALSE) {
+		return $pretty ? $this->get_pretty('QSG_name') : $this->get('QSG_name');
 	}
 
 
@@ -48,7 +48,7 @@ 
 	 * @return string
 	 */
 	public function identifier() {
-		return $this->get( 'QSG_identifier' );
+		return $this->get('QSG_identifier');
 	}
 
 
@@ -59,8 +59,8 @@ 
 	 * @param bool $pretty
 	 * @return string
 	 */
-	public function desc( $pretty = FALSE ) {
-		return $pretty ? $this->get_pretty( 'QSG_desc' ) : $this->get( 'QSG_desc' );
+	public function desc($pretty = FALSE) {
+		return $pretty ? $this->get_pretty('QSG_desc') : $this->get('QSG_desc');
 	}
 
 
@@ -72,7 +72,7 @@ 
 	 * @return int
 	 */
 	public function order() {
-		return $this->get( 'QSG_order' );
+		return $this->get('QSG_order');
 	}
 
 
@@ -83,7 +83,7 @@ 
 	 * @return boolean
 	 */
 	public function show_group_name() {
-		return $this->get( 'QSG_show_group_name' );
+		return $this->get('QSG_show_group_name');
 	}
 
 
@@ -95,7 +95,7 @@ 
 	 * @return boolean
 	 */
 	public function show_group_desc() {
-		return $this->get( 'QSG_show_group_desc' );
+		return $this->get('QSG_show_group_desc');
 	}
 
 
@@ -108,7 +108,7 @@ 
 	 * @return boolean
 	 */
 	public function system_group() {
-		return $this->get( 'QSG_system' );
+		return $this->get('QSG_system');
 	}
 
 
@@ -133,7 +133,7 @@ 
 	 * @return boolean
 	 */
 	public function deleted() {
-		return $this->get( 'QST_deleted' );
+		return $this->get('QST_deleted');
 	}
 
 
@@ -144,8 +144,8 @@ 
 	 */
 	public function questions_in_and_not_in_group() {
 		$questions_in_group = $this->questions();
-		$exclude_question_ids = ! empty( $questions_in_group ) ? array_keys( $questions_in_group ) : array();
-		$questions_not_in_group = $this->questions_not_in_group( $exclude_question_ids );
+		$exclude_question_ids = ! empty($questions_in_group) ? array_keys($questions_in_group) : array();
+		$questions_not_in_group = $this->questions_not_in_group($exclude_question_ids);
 		return $questions_in_group + $questions_not_in_group;
 	}
 
@@ -156,9 +156,9 @@ 
 	 * @param array $query_params
 	 * @return EE_Question[]
 	 */
-	public function questions( $query_params = array() ) {
-		$query_params = ! empty( $query_params ) ? $query_params : array( 'order_by' => array( 'Question_Group_Question.QGQ_order' => 'ASC' ) );
-		return $this->ID() ? $this->get_many_related( 'Question', $query_params ) : array();
+	public function questions($query_params = array()) {
+		$query_params = ! empty($query_params) ? $query_params : array('order_by' => array('Question_Group_Question.QGQ_order' => 'ASC'));
+		return $this->ID() ? $this->get_many_related('Question', $query_params) : array();
 	}
 
 
@@ -168,14 +168,14 @@ 
 	 * @param  mixed $question_IDS_in_group if empty array then all questions returned.  if FALSE then we first get questions in this group and exclude them from questions get all. IF empty array then we just return all questions.
 	 * @return EE_Question[]
 	 */
-	public function questions_not_in_group( $question_IDS_in_group = FALSE ) {
-		if ( $question_IDS_in_group === FALSE ) {
+	public function questions_not_in_group($question_IDS_in_group = FALSE) {
+		if ($question_IDS_in_group === FALSE) {
 			$questions = $this->questions();
-			$question_IDS_in_group = ! empty( $questions ) ? array_keys( $questions ) : array();
+			$question_IDS_in_group = ! empty($questions) ? array_keys($questions) : array();
 		}
-		$_where = ! empty( $question_IDS_in_group ) ? array( 'QST_ID' => array( 'not_in', $question_IDS_in_group ) ) : array();
+		$_where = ! empty($question_IDS_in_group) ? array('QST_ID' => array('not_in', $question_IDS_in_group)) : array();
 
-		return EEM_Question::instance()->get_all( array( $_where, 'order_by' => array( 'QST_ID' => 'ASC' ) ) );
+		return EEM_Question::instance()->get_all(array($_where, 'order_by' => array('QST_ID' => 'ASC')));
 	}
 
 
@@ -185,7 +185,7 @@ 
 	 * @return EE_Event[]
 	 */
 	public function events() {
-		return $this->get_many_related( 'Event' );
+		return $this->get_many_related('Event');
 	}
 
 
@@ -195,8 +195,8 @@ 
 	 * @param EE_Question || int $question object or ID
 	 * @return boolean if successful
 	 */
-	public function add_question( $questionObjectOrID ) {
-		return $this->_add_relation_to( $questionObjectOrID, 'Question' );
+	public function add_question($questionObjectOrID) {
+		return $this->_add_relation_to($questionObjectOrID, 'Question');
 	}
 
 
@@ -206,8 +206,8 @@ 
 	 * @param EE_Question || int $question object or ID
 	 * @return boolean of success
 	 */
-	public function remove_question( $questionObjectOrID ) {
-		return $this->_remove_relation_to( $questionObjectOrID, 'Question' );
+	public function remove_question($questionObjectOrID) {
+		return $this->_remove_relation_to($questionObjectOrID, 'Question');
 	}
 
 
@@ -217,9 +217,9 @@ 
 	 * @param $qst_order
 	 * @return int
 	 */
-	public function update_question_order( $questionObjectOrID, $qst_order ) {
-		$qst_ID = $questionObjectOrID instanceof EE_Question ? $questionObjectOrID->ID() : (int)$questionObjectOrID;
-		return EEM_Question_Group_Question::instance()->update( array( 'QGQ_order' => $qst_order ), array( array( 'QST_ID' => $qst_ID, 'QSG_ID' => $this->ID() ) ) );
+	public function update_question_order($questionObjectOrID, $qst_order) {
+		$qst_ID = $questionObjectOrID instanceof EE_Question ? $questionObjectOrID->ID() : (int) $questionObjectOrID;
+		return EEM_Question_Group_Question::instance()->update(array('QGQ_order' => $qst_order), array(array('QST_ID' => $qst_ID, 'QSG_ID' => $this->ID())));
 	}
 
 
@@ -230,9 +230,9 @@ 
 	 */
 	public function has_questions_with_answers() {
 		$has_answers = FALSE;
-		$questions = $this->get_many_related( 'Question' );
-		foreach ( $questions as $question ) {
-			if ( $question->count_related( 'Answer' ) > 0 )
+		$questions = $this->get_many_related('Question');
+		foreach ($questions as $question) {
+			if ($question->count_related('Answer') > 0)
 				$has_answers = TRUE;
 		}
 		return $has_answers;
@@ -248,7 +248,7 @@ 
 	 */
 	public function set_order_to_latest() {
 		$latest_order = $this->get_model()->get_latest_question_group_order();
-		$latest_order ++;
-		$this->set( 'QSG_order', $latest_order );
+		$latest_order++;
+		$this->set('QSG_order', $latest_order);
 	}
 }

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 +152 added lines, -152 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
@@ -41,9 +41,9 @@ 
 	 * @throws \EE_Error
 	 * @throws \Exception
 	 */
-	public function __construct( array $fieldValues, $bydb, $timezone, array $date_formats ) {
-		parent::__construct( $fieldValues, $bydb, $timezone, $date_formats );
-		$this->set_old_txn_status( $this->status_ID() );
+	public function __construct(array $fieldValues, $bydb, $timezone, array $date_formats) {
+		parent::__construct($fieldValues, $bydb, $timezone, $date_formats);
+		$this->set_old_txn_status($this->status_ID());
 	}
 
 
@@ -59,16 +59,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()
 					)
 				);
@@ -87,7 +87,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function unlock() {
-		return $this->delete_extra_meta( 'lock' );
+		return $this->delete_extra_meta('lock');
 	}
 
 
@@ -108,7 +108,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...
@@ -129,7 +129,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);
 	}
 
 
@@ -144,7 +144,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;
@@ -159,8 +159,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);
 	}
 
 
@@ -172,8 +172,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);
 	}
 
 
@@ -185,8 +185,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);
 	}
 
 
@@ -198,8 +198,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);
 	}
 
 
@@ -210,8 +210,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);
 	}
 
 
@@ -223,8 +223,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();
 	}
 
 
@@ -234,7 +234,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function pretty_total() {
-		return $this->get_pretty( 'TXN_total' );
+		return $this->get_pretty('TXN_total');
 	}
 
 
@@ -246,7 +246,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function pretty_paid() {
-		return $this->get_pretty( 'TXN_paid' );
+		return $this->get_pretty('TXN_paid');
 	}
 
 
@@ -259,7 +259,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function remaining() {
-		return (float)( $this->total() - $this->paid() );
+		return (float) ($this->total() - $this->paid());
 	}
 
 
@@ -272,7 +272,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function total() {
-		return (float)$this->get( 'TXN_total' );
+		return (float) $this->get('TXN_total');
 	}
 
 
@@ -285,7 +285,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function paid() {
-		return (float)$this->get( 'TXN_paid' );
+		return (float) $this->get('TXN_paid');
 	}
 
 
@@ -297,9 +297,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;
 	}
 
@@ -312,8 +312,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,
@@ -336,11 +336,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);
 		}
 	}
 
@@ -353,7 +353,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function hash_salt_() {
-		return $this->get( 'TXN_hash_salt' );
+		return $this->get('TXN_hash_salt');
 	}
 
 
@@ -373,13 +373,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');
 		}
 	}
 
@@ -393,8 +393,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',
@@ -404,7 +404,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);
 	}
 
 
@@ -417,7 +417,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())));
 	}
 
 
@@ -429,8 +429,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);
 	}
 
 
@@ -442,8 +442,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')));
 	}
 
 
@@ -477,8 +477,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);
 	}
 
 
@@ -490,10 +490,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;
@@ -510,7 +510,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()];
 	}
 
 
@@ -522,7 +522,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function status_ID() {
-		return $this->get( 'STS_ID' );
+		return $this->get('STS_ID');
 	}
 
 
@@ -534,7 +534,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, '==');
 	}
 
 
@@ -614,12 +614,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);
 	}
 
 
@@ -636,7 +636,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)
             ) {
@@ -656,12 +656,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);
 	}
 
 
@@ -686,7 +686,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() : '';
 	}
 
@@ -699,7 +699,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function status_obj() {
-		return $this->get_first_related( 'Status' );
+		return $this->get_first_related('Status');
 	}
 
 
@@ -711,8 +711,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);
 	}
 
 
@@ -724,8 +724,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');
 	}
 
 
@@ -738,8 +738,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');
 	}
 
 
@@ -751,7 +751,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)));
 	}
 
 
@@ -763,8 +763,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');
 	}
 
 
@@ -776,8 +776,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);
 	}
 
 
@@ -789,7 +789,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)));
 	}
 
 
@@ -802,10 +802,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;
 	}
@@ -821,10 +821,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;
 		}
 	}
 
@@ -837,7 +837,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());
 	}
 
 
@@ -848,20 +848,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);
@@ -902,15 +902,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;
 			}
 		}
@@ -925,7 +925,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')));
 	}
 
 
@@ -936,8 +936,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());
 	}
 
 
@@ -985,7 +985,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'
@@ -1009,9 +1009,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;
 		}
 	}
@@ -1040,17 +1040,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
@@ -1058,7 +1058,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(),
@@ -1067,7 +1067,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;
 			}
@@ -1101,8 +1101,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);
 	}
 
 
@@ -1117,7 +1117,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');
 	}
 
 
@@ -1132,8 +1132,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);
 	}
 
 
@@ -1148,7 +1148,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);
 	}
 
 
@@ -1162,8 +1162,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());
 	}
 
 
@@ -1177,8 +1177,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);
 	}
 
 
@@ -1192,8 +1192,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);
 	}
 
 
@@ -1208,37 +1208,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;
 	}
@@ -1254,11 +1254,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);
 	}
 
 
@@ -1272,11 +1272,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;
@@ -1305,10 +1305,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;
 		}
@@ -1322,16 +1322,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__(
@@ -1347,8 +1347,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;
 	}