eventespresso / event-espresso-core

core/db_classes/EE_Answer.class.php

Doc Comments +4 added lines, -4 removed lines

@@ -77,7 +77,7 @@ 
 	 *    Set Answer value
 	 *
 	 * @access        public
-	 * @param mixed $ANS_value
+	 * @param string $ANS_value
 	 */
 	public function set_value( $ANS_value = '' ) {
 		$this->set( 'ANS_value', $ANS_value );
@@ -89,7 +89,7 @@ 
 	 *    get Attendee First Name
 	 *
 	 * @access        public
-	 * @return        int
+	 * @return        boolean
 	 */
 	public function registration_ID() {
 		return $this->get( 'REG_ID' );
@@ -101,7 +101,7 @@ 
 	 *    get Attendee Last Name
 	 *
 	 * @access        public
-	 * @return        int
+	 * @return        boolean
 	 */
 	public function question_ID() {
 		return $this->get( 'QST_ID' );
@@ -113,7 +113,7 @@ 
 	 *    get Attendee Address
 	 *
 	 * @access        public
-	 * @return        string
+	 * @return        boolean
 	 */
 	public function value() {
 		return $this->get( 'ANS_value' );

Spacing +22 added lines, -22 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
@@ -31,9 +31,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Answer
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -43,8 +43,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Answer
 	 */
-	public static function new_instance_from_db( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 
@@ -55,8 +55,8 @@ 
 	 * @access        public
 	 * @param int $QST_ID
 	 */
-	public function set_question( $QST_ID = 0 ) {
-		$this->set( 'QST_ID', $QST_ID );
+	public function set_question($QST_ID = 0) {
+		$this->set('QST_ID', $QST_ID);
 	}
 
 
@@ -67,8 +67,8 @@ 
 	 * @access        public
 	 * @param int $REG_ID
 	 */
-	public function set_registration( $REG_ID = 0 ) {
-		$this->set( 'REG_ID', $REG_ID );
+	public function set_registration($REG_ID = 0) {
+		$this->set('REG_ID', $REG_ID);
 	}
 
 
@@ -79,8 +79,8 @@ 
 	 * @access        public
 	 * @param mixed $ANS_value
 	 */
-	public function set_value( $ANS_value = '' ) {
-		$this->set( 'ANS_value', $ANS_value );
+	public function set_value($ANS_value = '') {
+		$this->set('ANS_value', $ANS_value);
 	}
 
 
@@ -92,7 +92,7 @@ 
 	 * @return        int
 	 */
 	public function registration_ID() {
-		return $this->get( 'REG_ID' );
+		return $this->get('REG_ID');
 	}
 
 
@@ -104,7 +104,7 @@ 
 	 * @return        int
 	 */
 	public function question_ID() {
-		return $this->get( 'QST_ID' );
+		return $this->get('QST_ID');
 	}
 
 
@@ -116,7 +116,7 @@ 
 	 * @return        string
 	 */
 	public function value() {
-		return $this->get( 'ANS_value' );
+		return $this->get('ANS_value');
 	}
 
 
@@ -126,8 +126,8 @@ 
 	 * @param null $schema
 	 * @return string
 	 */
-	public function pretty_value( $schema = NULL ) {
-		return $this->get_pretty( 'ANS_value', $schema );
+	public function pretty_value($schema = NULL) {
+		return $this->get_pretty('ANS_value', $schema);
 	}
 
 
@@ -136,8 +136,8 @@ 
 	 * Echoes out a pretty value (even for multi-choice options)
 	 * @param string $schema
 	 */
-	public function e_value( $schema = NULL ) {
-		$this->e( 'ANS_value', $schema );
+	public function e_value($schema = NULL) {
+		$this->e('ANS_value', $schema);
 	}
 
 
@@ -147,7 +147,7 @@ 
 	 * @return EE_Question
 	 */
 	public function question() {
-		return $this->get_first_related( 'Question' );
+		return $this->get_first_related('Question');
 	}
 
 
@@ -157,7 +157,7 @@ 
 	 * @return EE_Registration
 	 */
 	public function registration() {
-		return $this->get_first_related( 'Registration' );
+		return $this->get_first_related('Registration');
 	}
 }
 

core/db_classes/EE_Attendee.class.php

Doc Comments +13 added lines, -13 removed lines

@@ -216,7 +216,7 @@ 
 	 *
 	 * @since 4.5.0
 	 *
-	 * @return int
+	 * @return boolean
 	 */
 	public function wp_user() {
 		return $this->get( 'ATT_author' );
@@ -227,7 +227,7 @@ 
 	/**
 	 *        get Attendee First Name
 	 * @access        public
-	 * @return string
+	 * @return boolean
 	 */
 	public function fname() {
 		return $this->get( 'ATT_fname' );
@@ -260,7 +260,7 @@ 
 	/**
 	 *        get Attendee Last Name
 	 * @access        public
-	 * @return string
+	 * @return boolean
 	 */
 	public function lname() {
 		return $this->get( 'ATT_lname' );
@@ -305,7 +305,7 @@ 
 
 	/**
 	 *        get Attendee Address
-	 * @return string
+	 * @return boolean
 	 */
 	public function address() {
 		return $this->get( 'ATT_address' );
@@ -315,7 +315,7 @@ 
 
 	/**
 	 *        get Attendee Address2
-	 * @return string
+	 * @return boolean
 	 */
 	public function address2() {
 		return $this->get( 'ATT_address2' );
@@ -325,7 +325,7 @@ 
 
 	/**
 	 *        get Attendee City
-	 * @return string
+	 * @return boolean
 	 */
 	public function city() {
 		return $this->get( 'ATT_city' );
@@ -335,7 +335,7 @@ 
 
 	/**
 	 *        get Attendee State ID
-	 * @return string
+	 * @return boolean
 	 */
 	public function state_ID() {
 		return $this->get( 'STA_ID' );
@@ -392,7 +392,7 @@ 
 
 	/**
 	 *    get Attendee Country ISO Code
-	 * @return string
+	 * @return boolean
 	 */
 	public function country_ID() {
 		return $this->get( 'CNT_ISO' );
@@ -440,7 +440,7 @@ 
 
 	/**
 	 *        get Attendee Zip/Postal Code
-	 * @return string
+	 * @return boolean
 	 */
 	public function zip() {
 		return $this->get( 'ATT_zip' );
@@ -450,7 +450,7 @@ 
 
 	/**
 	 *        get Attendee Email Address
-	 * @return string
+	 * @return boolean
 	 */
 	public function email() {
 		return $this->get( 'ATT_email' );
@@ -460,7 +460,7 @@ 
 
 	/**
 	 *        get Attendee Phone #
-	 * @return string
+	 * @return boolean
 	 */
 	public function phone() {
 		return $this->get( 'ATT_phone' );
@@ -512,7 +512,7 @@ 
 
 	/**
 	 * returns any events attached to this attendee ($_Event property);
-	 * @return array
+	 * @return EE_Base_Class[]
 	 */
 	public function events() {
 		return $this->get_many_related( 'Event' );
@@ -522,7 +522,7 @@ 
 	 * Gets the billing info array where keys match espresso_reg_page_billing_inputs(),
 	 * and keys are their cleaned values. @see EE_Attendee::save_and_clean_billing_info_for_payment_method() which was used to save the billing info
 	 * @param EE_Payment_Method $payment_method the _gateway_name property on the gateway class
-	 * @return EE_Form_Section_Proper
+	 * @return null|EE_Billing_Info_Form
 	 */
 	public function billing_info_for_payment_method($payment_method){
 		$pm_type = $payment_method->type_obj();

Spacing +97 added lines, -97 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -33,20 +33,20 @@ 
 	 * @param string $timezone
 	 * @param array $date_formats
 	 */
-	protected function __construct( $fieldValues = NULL, $bydb = FALSE, $timezone = NULL, $date_formats = array() ) {
-		if ( !isset( $fieldValues[ 'ATT_full_name' ] ) ) {
-			$fname = isset( $fieldValues[ 'ATT_fname' ] ) ? $fieldValues[ 'ATT_fname' ] . ' ' : '';
-			$lname = isset( $fieldValues[ 'ATT_lname' ] ) ? $fieldValues[ 'ATT_lname' ] : '';
-			$fieldValues[ 'ATT_full_name' ] = $fname . $lname;
+	protected function __construct($fieldValues = NULL, $bydb = FALSE, $timezone = NULL, $date_formats = array()) {
+		if ( ! isset($fieldValues['ATT_full_name'])) {
+			$fname = isset($fieldValues['ATT_fname']) ? $fieldValues['ATT_fname'].' ' : '';
+			$lname = isset($fieldValues['ATT_lname']) ? $fieldValues['ATT_lname'] : '';
+			$fieldValues['ATT_full_name'] = $fname.$lname;
 		}
-		if ( !isset( $fieldValues[ 'ATT_slug' ] ) ) {
+		if ( ! isset($fieldValues['ATT_slug'])) {
 			//			$fieldValues['ATT_slug'] = sanitize_key(wp_generate_password(20));
-			$fieldValues[ 'ATT_slug' ] = sanitize_title( $fieldValues[ 'ATT_full_name' ] );
+			$fieldValues['ATT_slug'] = sanitize_title($fieldValues['ATT_full_name']);
 		}
-		if ( !isset( $fieldValues[ 'ATT_short_bio' ] ) && isset( $fieldValues[ 'ATT_bio' ] ) ) {
-			$fieldValues[ 'ATT_short_bio' ] = substr( $fieldValues[ 'ATT_bio' ], 0, 50 );
+		if ( ! isset($fieldValues['ATT_short_bio']) && isset($fieldValues['ATT_bio'])) {
+			$fieldValues['ATT_short_bio'] = substr($fieldValues['ATT_bio'], 0, 50);
 		}
-		parent::__construct( $fieldValues, $bydb, $timezone, $date_formats );
+		parent::__construct($fieldValues, $bydb, $timezone, $date_formats);
 	}
 
 
@@ -60,9 +60,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Attendee
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -73,8 +73,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Attendee
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -85,8 +85,8 @@ 
 	 * @access        public
 	 * @param string $fname
 	 */
-	public function set_fname( $fname = '' ) {
-		$this->set( 'ATT_fname', $fname );
+	public function set_fname($fname = '') {
+		$this->set('ATT_fname', $fname);
 	}
 
 
@@ -97,8 +97,8 @@ 
 	 * @access        public
 	 * @param string $lname
 	 */
-	public function set_lname( $lname = '' ) {
-		$this->set( 'ATT_lname', $lname );
+	public function set_lname($lname = '') {
+		$this->set('ATT_lname', $lname);
 	}
 
 
@@ -109,8 +109,8 @@ 
 	 * @access        public
 	 * @param string $address
 	 */
-	public function set_address( $address = '' ) {
-		$this->set( 'ATT_address', $address );
+	public function set_address($address = '') {
+		$this->set('ATT_address', $address);
 	}
 
 
@@ -121,8 +121,8 @@ 
 	 * @access        public
 	 * @param        string $address2
 	 */
-	public function set_address2( $address2 = '' ) {
-		$this->set( 'ATT_address2', $address2 );
+	public function set_address2($address2 = '') {
+		$this->set('ATT_address2', $address2);
 	}
 
 
@@ -133,8 +133,8 @@ 
 	 * @access        public
 	 * @param        string $city
 	 */
-	public function set_city( $city = '' ) {
-		$this->set( 'ATT_city', $city );
+	public function set_city($city = '') {
+		$this->set('ATT_city', $city);
 	}
 
 
@@ -145,8 +145,8 @@ 
 	 * @access        public
 	 * @param        int $STA_ID
 	 */
-	public function set_state( $STA_ID = 0 ) {
-		$this->set( 'STA_ID', $STA_ID );
+	public function set_state($STA_ID = 0) {
+		$this->set('STA_ID', $STA_ID);
 	}
 
 
@@ -157,8 +157,8 @@ 
 	 * @access        public
 	 * @param        string $CNT_ISO
 	 */
-	public function set_country( $CNT_ISO = '' ) {
-		$this->set( 'CNT_ISO', $CNT_ISO );
+	public function set_country($CNT_ISO = '') {
+		$this->set('CNT_ISO', $CNT_ISO);
 	}
 
 
@@ -169,8 +169,8 @@ 
 	 * @access        public
 	 * @param        string $zip
 	 */
-	public function set_zip( $zip = '' ) {
-		$this->set( 'ATT_zip', $zip );
+	public function set_zip($zip = '') {
+		$this->set('ATT_zip', $zip);
 	}
 
 
@@ -181,8 +181,8 @@ 
 	 * @access        public
 	 * @param        string $email
 	 */
-	public function set_email( $email = '' ) {
-		$this->set( 'ATT_email', $email );
+	public function set_email($email = '') {
+		$this->set('ATT_email', $email);
 	}
 
 
@@ -193,8 +193,8 @@ 
 	 * @access        public
 	 * @param        string $phone
 	 */
-	public function set_phone( $phone = '' ) {
-		$this->set( 'ATT_phone', $phone );
+	public function set_phone($phone = '') {
+		$this->set('ATT_phone', $phone);
 	}
 
 
@@ -205,8 +205,8 @@ 
 	 * @access        public
 	 * @param        bool $ATT_deleted
 	 */
-	public function set_deleted( $ATT_deleted = FALSE ) {
-		$this->set( 'ATT_deleted', $ATT_deleted );
+	public function set_deleted($ATT_deleted = FALSE) {
+		$this->set('ATT_deleted', $ATT_deleted);
 	}
 
 
@@ -219,7 +219,7 @@ 
 	 * @return int
 	 */
 	public function wp_user() {
-		return $this->get( 'ATT_author' );
+		return $this->get('ATT_author');
 	}
 
 
@@ -230,7 +230,7 @@ 
 	 * @return string
 	 */
 	public function fname() {
-		return $this->get( 'ATT_fname' );
+		return $this->get('ATT_fname');
 	}
 
 
@@ -250,9 +250,9 @@ 
 	 * @param bool $apply_html_entities
 	 * @return string
 	 */
-	public function full_name( $apply_html_entities = FALSE ) {
-		$full_name = $this->fname() . ' ' . $this->lname();
-		return $apply_html_entities ? htmlentities( $full_name, ENT_QUOTES, 'UTF-8' ) : $full_name;
+	public function full_name($apply_html_entities = FALSE) {
+		$full_name = $this->fname().' '.$this->lname();
+		return $apply_html_entities ? htmlentities($full_name, ENT_QUOTES, 'UTF-8') : $full_name;
 	}
 
 
@@ -263,7 +263,7 @@ 
 	 * @return string
 	 */
 	public function lname() {
-		return $this->get( 'ATT_lname' );
+		return $this->get('ATT_lname');
 	}
 
 
@@ -277,26 +277,26 @@ 
 	 */
 	public function full_address_as_array() {
 		$full_address_array = array();
-		$initial_address_fields = array( 'ATT_address', 'ATT_address2', 'ATT_city', );
-		foreach ( $initial_address_fields as $address_field_name ) {
-			$address_fields_value = $this->get( $address_field_name );
-			if ( !empty( $address_fields_value ) ) {
-				$full_address_array[ ] = $address_fields_value;
+		$initial_address_fields = array('ATT_address', 'ATT_address2', 'ATT_city',);
+		foreach ($initial_address_fields as $address_field_name) {
+			$address_fields_value = $this->get($address_field_name);
+			if ( ! empty($address_fields_value)) {
+				$full_address_array[] = $address_fields_value;
 			}
 		}
 		//now handle state and country
 		$state_obj = $this->state_obj();
-		if ( !empty( $state_obj ) ) {
-			$full_address_array[ ] = $state_obj->name();
+		if ( ! empty($state_obj)) {
+			$full_address_array[] = $state_obj->name();
 		}
 		$country_obj = $this->country_obj();
-		if ( !empty( $country_obj ) ) {
-			$full_address_array[ ] = $country_obj->name();
+		if ( ! empty($country_obj)) {
+			$full_address_array[] = $country_obj->name();
 		}
 		//lastly get the xip
 		$zip_value = $this->zip();
-		if ( !empty( $zip_value ) ) {
-			$full_address_array[ ] = $zip_value;
+		if ( ! empty($zip_value)) {
+			$full_address_array[] = $zip_value;
 		}
 		return $full_address_array;
 	}
@@ -308,7 +308,7 @@ 
 	 * @return string
 	 */
 	public function address() {
-		return $this->get( 'ATT_address' );
+		return $this->get('ATT_address');
 	}
 
 
@@ -318,7 +318,7 @@ 
 	 * @return string
 	 */
 	public function address2() {
-		return $this->get( 'ATT_address2' );
+		return $this->get('ATT_address2');
 	}
 
 
@@ -328,7 +328,7 @@ 
 	 * @return string
 	 */
 	public function city() {
-		return $this->get( 'ATT_city' );
+		return $this->get('ATT_city');
 	}
 
 
@@ -338,7 +338,7 @@ 
 	 * @return string
 	 */
 	public function state_ID() {
-		return $this->get( 'STA_ID' );
+		return $this->get('STA_ID');
 	}
 
 
@@ -347,7 +347,7 @@ 
 	 * @return string
 	 */
 	public function state_abbrev() {
-		return $this->state_obj() instanceof EE_State ? $this->state_obj()->abbrev() : __( 'Unknown', 'event_espresso' );
+		return $this->state_obj() instanceof EE_State ? $this->state_obj()->abbrev() : __('Unknown', 'event_espresso');
 	}
 
 
@@ -357,18 +357,18 @@ 
 	 * @return EE_State
 	 */
 	public function state_obj() {
-		return $this->get_first_related( 'State' );
+		return $this->get_first_related('State');
 	}
 
 	/**
 	 * Returns the state's name, otherwise 'Unknown'
 	 * @return string
 	 */
-	public function state_name(){
-		if( $this->state_obj() ){
+	public function state_name() {
+		if ($this->state_obj()) {
 			return $this->state_obj()->name();
-		}else{
-			return __( 'Unknown', 'event_espresso' );
+		} else {
+			return __('Unknown', 'event_espresso');
 		}
 	}
 
@@ -381,7 +381,7 @@ 
 	 * @return string
 	 */
 	public function state() {
-		if ( apply_filters( 'FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj() ) ) {
+		if (apply_filters('FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj())) {
 			return $this->state_abbrev();
 		} else {
 			return $this->state_name();
@@ -395,7 +395,7 @@ 
 	 * @return string
 	 */
 	public function country_ID() {
-		return $this->get( 'CNT_ISO' );
+		return $this->get('CNT_ISO');
 	}
 
 
@@ -405,18 +405,18 @@ 
 	 * @return EE_Country
 	 */
 	public function country_obj() {
-		return $this->get_first_related( 'Country' );
+		return $this->get_first_related('Country');
 	}
 
 	/**
 	 * Returns the country's name if known, otherwise 'Unknown'
 	 * @return string
 	 */
-	public function country_name(){
-		if( $this->country_obj() ){
+	public function country_name() {
+		if ($this->country_obj()) {
 			return $this->country_obj()->name();
-		}else{
-			return __( 'Unknown', 'event_espresso' );
+		} else {
+			return __('Unknown', 'event_espresso');
 		}
 	}
 
@@ -429,7 +429,7 @@ 
 	 * @return string
 	 */
 	public function country() {
-		if ( apply_filters( 'FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj() ) ) {
+		if (apply_filters('FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj())) {
 			return $this->country_ID();
 		} else {
 			return $this->country_name();
@@ -443,7 +443,7 @@ 
 	 * @return string
 	 */
 	public function zip() {
-		return $this->get( 'ATT_zip' );
+		return $this->get('ATT_zip');
 	}
 
 
@@ -453,7 +453,7 @@ 
 	 * @return string
 	 */
 	public function email() {
-		return $this->get( 'ATT_email' );
+		return $this->get('ATT_email');
 	}
 
 
@@ -463,7 +463,7 @@ 
 	 * @return string
 	 */
 	public function phone() {
-		return $this->get( 'ATT_phone' );
+		return $this->get('ATT_phone');
 	}
 
 
@@ -473,7 +473,7 @@ 
 	 * @return        bool
 	 */
 	public function deleted() {
-		return $this->get( 'ATT_deleted' );
+		return $this->get('ATT_deleted');
 	}
 
 
@@ -483,8 +483,8 @@ 
 	 * @param array $query_params
 	 * @return EE_Registration[]
 	 */
-	public function get_registrations( $query_params = array() ) {
-		return $this->get_many_related( 'Registration', $query_params );
+	public function get_registrations($query_params = array()) {
+		return $this->get_many_related('Registration', $query_params);
 	}
 
 
@@ -494,7 +494,7 @@ 
 	 * @return EE_Registration
 	 */
 	public function get_most_recent_registration() {
-		return $this->get_first_related( 'Registration', array( 'order_by' => array( 'REG_date' => 'DESC' ) ) ); //null, 'REG_date', 'DESC', '=', 'OBJECT_K');
+		return $this->get_first_related('Registration', array('order_by' => array('REG_date' => 'DESC'))); //null, 'REG_date', 'DESC', '=', 'OBJECT_K');
 	}
 
 
@@ -504,8 +504,8 @@ 
 	 * @param int $event_id
 	 * @return EE_Registration
 	 */
-	public function get_most_recent_registration_for_event( $event_id ) {
-		return $this->get_first_related( 'Registration', array(array( 'EVT_ID' => $event_id ), 'order_by' => array('REG_date' => 'DESC')));//, '=', 'OBJECT_K' );
+	public function get_most_recent_registration_for_event($event_id) {
+		return $this->get_first_related('Registration', array(array('EVT_ID' => $event_id), 'order_by' => array('REG_date' => 'DESC'))); //, '=', 'OBJECT_K' );
 	}
 
 
@@ -515,7 +515,7 @@ 
 	 * @return array
 	 */
 	public function events() {
-		return $this->get_many_related( 'Event' );
+		return $this->get_many_related('Event');
 	}
 
 	/**
@@ -524,17 +524,17 @@ 
 	 * @param EE_Payment_Method $payment_method the _gateway_name property on the gateway class
 	 * @return EE_Form_Section_Proper
 	 */
-	public function billing_info_for_payment_method($payment_method){
+	public function billing_info_for_payment_method($payment_method) {
 		$pm_type = $payment_method->type_obj();
-		if( ! $pm_type instanceof EE_PMT_Base ){
+		if ( ! $pm_type instanceof EE_PMT_Base) {
 			return NULL;
 		}
-		$billing_info =  $this->get_post_meta( $this->get_billing_info_postmeta_name( $payment_method ), true );
-		if ( ! $billing_info){
+		$billing_info = $this->get_post_meta($this->get_billing_info_postmeta_name($payment_method), true);
+		if ( ! $billing_info) {
 			return NULL;
 		}
 		$billing_form = $pm_type->billing_form();
-		$billing_form->receive_form_submission( array( $billing_form->name() => $billing_info ), FALSE );
+		$billing_form->receive_form_submission(array($billing_form->name() => $billing_info), FALSE);
 		return $billing_form;
 	}
 
@@ -544,10 +544,10 @@ 
 	 * @param EE_Payment_Method $payment_method
 	 * @return string
 	 */
-	public function get_billing_info_postmeta_name($payment_method){
-		if( $payment_method->type_obj() instanceof EE_PMT_Base ){
-			return 'billing_info_' . $payment_method->type_obj()->system_name();
-		}else{
+	public function get_billing_info_postmeta_name($payment_method) {
+		if ($payment_method->type_obj() instanceof EE_PMT_Base) {
+			return 'billing_info_'.$payment_method->type_obj()->system_name();
+		} else {
 			return NULL;
 		}
 	}
@@ -558,13 +558,13 @@ 
 	 * @param EE_Payment_Method $payment_method
 	 * @return boolean
 	 */
-	public function save_and_clean_billing_info_for_payment_method($billing_form, $payment_method){
-		if( ! $billing_form instanceof EE_Billing_Attendee_Info_Form ){
-			EE_Error::add_error( __( 'Cannot save billing info because there is none.', 'event_espresso' ) );
+	public function save_and_clean_billing_info_for_payment_method($billing_form, $payment_method) {
+		if ( ! $billing_form instanceof EE_Billing_Attendee_Info_Form) {
+			EE_Error::add_error(__('Cannot save billing info because there is none.', 'event_espresso'));
 			return false;
 		}
 		$billing_form->clean_sensitive_data();
-		return update_post_meta($this->ID(), $this->get_billing_info_postmeta_name( $payment_method ), $billing_form->input_values( true ) );
+		return update_post_meta($this->ID(), $this->get_billing_info_postmeta_name($payment_method), $billing_form->input_values(true));
 	}
 
 }

Braces +3 added lines, -3 removed lines

@@ -92,7 +92,7 @@ 
 	public function construction_finalized(){
 		if( $this->_model instanceof EEM_Base  && $this->_action ){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -125,7 +125,7 @@ 
 	public function has_generated_cap_restrictions(){
 		if( $this->_cap_restrictions_generated === false ){
 			return false;
-		}else{
+		} else{
 			return true;
 		}
 	}
@@ -153,7 +153,7 @@ 
 		$caps_for_admin = EE_Registry::instance()->CAP->get_ee_capabilities( 'administrator' );
 		if( in_array( self::get_cap_name( $model, $action ), $caps_for_admin ) ) {
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}

core/db_classes/EE_Change_Log.class.php

Doc Comments +7 added lines, -7 removed lines

@@ -47,14 +47,14 @@ 
 	 * @param array $props_n_values  incoming values from the database
 	 * @param string $timezone  incoming timezone as set by the model.  If not set the timezone for
 	 *                          		the website will be used.
-	 * @return EE_Attendee
+	 * @return EE_Change_Log
 	 */
 	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
 		return new self( $props_n_values, TRUE, $timezone );
 	}
 	/**
 	 * Gets message
-	 * @return mixed
+	 * @return boolean
 	 */
 	function message() {
 		return $this->get('LOG_message');
@@ -69,7 +69,7 @@ 
 	}
 	/**
 	 * Gets time
-	 * @return string
+	 * @return boolean
 	 */
 	function time() {
 		return $this->get('LOG_time');
@@ -84,7 +84,7 @@ 
 	}
 	/**
 	 * Gets log_type
-	 * @return string
+	 * @return boolean
 	 */
 	function log_type() {
 		return $this->get('LOG_log_type');
@@ -99,7 +99,7 @@ 
 	}
 	/**
 	 * Gets type of the model object related to this log
-	 * @return string
+	 * @return boolean
 	 */
 	function OBJ_type() {
 		return $this->get('OBJ_type');
@@ -114,7 +114,7 @@ 
 	}
 	/**
 	 * Gets OBJ_ID (the ID of the item related to this log)
-	 * @return mixed
+	 * @return boolean
 	 */
 	function OBJ_ID() {
 		return $this->get('OBJ_ID');
@@ -129,7 +129,7 @@ 
 	}
 	/**
 	 * Gets wp_user
-	 * @return int
+	 * @return boolean
 	 */
 	function wp_user() {
 		return $this->get('LOG_wp_user');

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_Change_Log extends EE_Base_Class{
+class EE_Change_Log extends EE_Base_Class {
 
 	/**
 	 *
@@ -36,9 +36,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Attendee
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -49,8 +49,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Attendee
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 	/**
 	 * Gets message
@@ -147,12 +147,12 @@ 
 	 * Gets the model object attached to this log
 	 * @return EE_Base_Class
 	 */
-	function object(){
+	function object() {
 		$model_name_of_related_obj = $this->OBJ_type();
 		$is_model_name = EE_Registry::instance()->is_model_name($model_name_of_related_obj);
-		if( ! $is_model_name ){
+		if ( ! $is_model_name) {
 			return null;
-		}else{
+		} else {
 			return $this->get_first_related($model_name_of_related_obj);
 		}
 	}
@@ -165,17 +165,17 @@ 
 	 * @param boolean $save
 	 * @return boolean if $save=true, NULL is $save=false
 	 */
-	function set_object($object, $save = TRUE ) {
-		if($object instanceof EE_Base_Class){
+	function set_object($object, $save = TRUE) {
+		if ($object instanceof EE_Base_Class) {
 			$this->set_OBJ_type($object->get_model()->get_this_model_name());
 			$this->set_OBJ_ID($object->ID());
-		}else{
+		} else {
 			$this->set_OBJ_type(NULL);
 			$this->set_OBJ_ID(NULL);
 		}
-		if($save){
+		if ($save) {
 			return $this->save();
-		}else{
+		} else {
 			return NULL;
 		}
 	}

Braces +5 added lines, -4 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
@@ -152,7 +153,7 @@ 
 		$is_model_name = EE_Registry::instance()->is_model_name($model_name_of_related_obj);
 		if( ! $is_model_name ){
 			return null;
-		}else{
+		} else{
 			return $this->get_first_related($model_name_of_related_obj);
 		}
 	}
@@ -169,13 +170,13 @@ 
 		if($object instanceof EE_Base_Class){
 			$this->set_OBJ_type($object->get_model()->get_this_model_name());
 			$this->set_OBJ_ID($object->ID());
-		}else{
+		} else{
 			$this->set_OBJ_type(NULL);
 			$this->set_OBJ_ID(NULL);
 		}
 		if($save){
 			return $this->save();
-		}else{
+		} else{
 			return NULL;
 		}
 	}

core/db_classes/EE_Checkin.class.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +8 added lines, -8 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 {
 
 	/**
 	 *
@@ -34,9 +34,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Attendee
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -47,8 +47,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Attendee
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 

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

core/db_classes/EE_Country.class.php

Doc Comments +7 added lines, -7 removed lines

@@ -51,7 +51,7 @@ 
 
 	/**
 	 * Gets the country name
-	 * @return string
+	 * @return boolean
 	 */
 	public function name() {
 		return $this->get( 'CNT_name' );
@@ -61,7 +61,7 @@ 
 
 	/**
 	 * gets the country's currency code
-	 * @return string
+	 * @return boolean
 	 */
 	public function currency_code() {
 		return $this->get( 'CNT_cur_code' );
@@ -82,7 +82,7 @@ 
 
 	/**
 	 * Currency name singular
-	 * @return string
+	 * @return boolean
 	 */
 	public function currency_name_single() {
 		return $this->get( 'CNT_cur_single' );
@@ -92,7 +92,7 @@ 
 
 	/**
 	 * Currency name plural
-	 * @return string
+	 * @return boolean
 	 */
 	public function currency_name_plural() {
 		return $this->get( 'CNT_cur_plural' );
@@ -112,7 +112,7 @@ 
 
 	/**
 	 * currency_decimal_places : 2 = 0.00   3 = 0.000
-	 * @return integer
+	 * @return boolean
 	 */
 	public function currency_decimal_places() {
 		return $this->get( 'CNT_cur_dec_plc' );
@@ -122,7 +122,7 @@ 
 
 	/**
 	 * currency_decimal_mark :   (comma) ',' = 0,01   or   (decimal) '.' = 0.01
-	 * @return string
+	 * @return boolean
 	 */
 	public function currency_decimal_mark() {
 		return $this->get( 'CNT_cur_dec_mrk' );
@@ -132,7 +132,7 @@ 
 
 	/**
 	 * currency thousands separator:   (comma) ',' = 1,000   or   (decimal) '.' = 1.000
-	 * @return string
+	 * @return boolean
 	 */
 	public function currency_thousands_separator() {
 		return $this->get( 'CNT_cur_thsnds' );

Spacing +16 added lines, -16 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -30,9 +30,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Country|mixed
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -41,8 +41,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Country
 	 */
-	public static function new_instance_from_db( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 
@@ -54,7 +54,7 @@ 
 	 * @return string
 	 */
 	public function name() {
-		return $this->get( 'CNT_name' );
+		return $this->get('CNT_name');
 	}
 
 
@@ -64,7 +64,7 @@ 
 	 * @return string
 	 */
 	public function currency_code() {
-		return $this->get( 'CNT_cur_code' );
+		return $this->get('CNT_cur_code');
 	}
 
 
@@ -74,7 +74,7 @@ 
 	 * @return string
 	 */
 	public function currency_sign() {
-		$CNT_cur_sign = $this->get( 'CNT_cur_sign' );
+		$CNT_cur_sign = $this->get('CNT_cur_sign');
 		return $CNT_cur_sign ? $CNT_cur_sign : '&#164;';
 	}
 
@@ -85,7 +85,7 @@ 
 	 * @return string
 	 */
 	public function currency_name_single() {
-		return $this->get( 'CNT_cur_single' );
+		return $this->get('CNT_cur_single');
 	}
 
 
@@ -95,7 +95,7 @@ 
 	 * @return string
 	 */
 	public function currency_name_plural() {
-		return $this->get( 'CNT_cur_plural' );
+		return $this->get('CNT_cur_plural');
 	}
 
 
@@ -105,7 +105,7 @@ 
 	 * @return boolean
 	 */
 	public function currency_sign_before() {
-		return $this->get( 'CNT_cur_sign_b4' );
+		return $this->get('CNT_cur_sign_b4');
 	}
 
 
@@ -115,7 +115,7 @@ 
 	 * @return integer
 	 */
 	public function currency_decimal_places() {
-		return $this->get( 'CNT_cur_dec_plc' );
+		return $this->get('CNT_cur_dec_plc');
 	}
 
 
@@ -125,7 +125,7 @@ 
 	 * @return string
 	 */
 	public function currency_decimal_mark() {
-		return $this->get( 'CNT_cur_dec_mrk' );
+		return $this->get('CNT_cur_dec_mrk');
 	}
 
 
@@ -135,7 +135,7 @@ 
 	 * @return string
 	 */
 	public function currency_thousands_separator() {
-		return $this->get( 'CNT_cur_thsnds' );
+		return $this->get('CNT_cur_thsnds');
 	}
 }
 /* End of file EE_Country.class.php */

core/db_classes/EE_CPT_Base.class.php

Doc Comments +6 added lines, -6 removed lines

@@ -98,7 +98,7 @@ 
 	 * The main purpose of this method is to return the parent for the model object
 	 *
 	 * @access public
-	 * @return int
+	 * @return boolean
 	 */
 	public function parent() {
 		return $this->get( 'parent' );
@@ -108,7 +108,7 @@ 
 
 	/**
 	 * return the _status property
-	 * @return string
+	 * @return boolean
 	 */
 	public function status() {
 		return $this->get( 'status' );
@@ -130,7 +130,7 @@ 
 	 *
 	 * @link   http://codex.wordpress.org/Function_Reference/get_the_post_thumbnail
 	 * @access protected
-	 * @param string|array $size (optional) Image size. Defaults to 'post-thumbnail' but can also be a 2-item array representing width and height in pixels (i.e. array(32,32) ).
+	 * @param string $size (optional) Image size. Defaults to 'post-thumbnail' but can also be a 2-item array representing width and height in pixels (i.e. array(32,32) ).
 	 * @param string|array $attr Optional. Query string or array of attributes.
 	 * @return string HTML image element
 	 */
@@ -158,7 +158,7 @@ 
 
 	/**
 	 * This uses the wp "wp_get_attachment_image_src()" function to return the feature image for the current class using the given size params.
-	 * @param  string|array $size can either be a string: 'thumbnail', 'medium', 'large', 'full' OR 2-item array representing width and height in pixels eg. array(32,32).
+	 * @param  integer[] $size can either be a string: 'thumbnail', 'medium', 'large', 'full' OR 2-item array representing width and height in pixels eg. array(32,32).
 	 * @return string|boolean          the url of the image or false if not found
 	 */
 	public function feature_image_url( $size = 'thumbnail' ) {
@@ -218,7 +218,7 @@ 
 	 * Wrapper for get_post_meta, http://codex.wordpress.org/Function_Reference/get_post_meta
 	 * @param string  $meta_key
 	 * @param boolean $single
-	 * @return mixed <ul><li>If only $id is set it will return all meta values in an associative array.</li>
+	 * @return string|null <ul><li>If only $id is set it will return all meta values in an associative array.</li>
 	 * <li>If $single is set to false, or left blank, the function returns an array containing all values of the specified key.</li>
 	 * <li>If $single is set to true, the function returns the first value of the specified key (not in an array</li></ul>
 	 */
@@ -275,7 +275,7 @@ 
 	/**
 	 * Gets all the term-taxonomies for this CPT
 	 * @param array $query_params
-	 * @return EE_Term_Taxonomy
+	 * @return EE_Base_Class[]
 	 */
 	public function term_taxonomies( $query_params = array() ) {
 		return $this->get_many_related( 'Term_Taxonomy', $query_params );

Spacing +56 added lines, -56 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
@@ -47,8 +47,8 @@ 
 	 * @param int    $parent_term_taxonomy_id optional
 	 * @return EE_Term_Taxonomy
 	 */
-	function add_event_category( $category_name, $category_description = NULL, $parent_term_taxonomy_id = NULL ) {
-		return $this->get_model()->add_event_category( $this, $category_name, $category_description, $parent_term_taxonomy_id );
+	function add_event_category($category_name, $category_description = NULL, $parent_term_taxonomy_id = NULL) {
+		return $this->get_model()->add_event_category($this, $category_name, $category_description, $parent_term_taxonomy_id);
 	}
 
 
@@ -58,8 +58,8 @@ 
 	 * @param string $category_name
 	 * @return bool
 	 */
-	function remove_event_category( $category_name ) {
-		return $this->get_model()->remove_event_category( $this, $category_name );
+	function remove_event_category($category_name) {
+		return $this->get_model()->remove_event_category($this, $category_name);
 	}
 
 
@@ -70,14 +70,14 @@ 
 	 * @param EE_Term_Taxonomy $term_taxonomy
 	 * @return EE_Base_Class the relation was removed from
 	 */
-	function remove_relation_to_term_taxonomy( $term_taxonomy ) {
-		if ( !$term_taxonomy ) {
-			EE_Error::add_error( sprintf( __( "No Term_Taxonomy provided which to remove from model object of type %s and id %d", "event_espresso" ), get_class( $this ), $this->ID() ), __FILE__, __FUNCTION__, __LINE__ );
+	function remove_relation_to_term_taxonomy($term_taxonomy) {
+		if ( ! $term_taxonomy) {
+			EE_Error::add_error(sprintf(__("No Term_Taxonomy provided which to remove from model object of type %s and id %d", "event_espresso"), get_class($this), $this->ID()), __FILE__, __FUNCTION__, __LINE__);
 			return NULL;
 		}
-		$term_taxonomy->set_count( $term_taxonomy->count() - 1 );
+		$term_taxonomy->set_count($term_taxonomy->count() - 1);
 		$term_taxonomy->save();
-		return $this->_remove_relation_to( $term_taxonomy, 'Term_Taxonomy' );
+		return $this->_remove_relation_to($term_taxonomy, 'Term_Taxonomy');
 	}
 
 
@@ -101,7 +101,7 @@ 
 	 * @return int
 	 */
 	public function parent() {
-		return $this->get( 'parent' );
+		return $this->get('parent');
 	}
 
 
@@ -111,7 +111,7 @@ 
 	 * @return string
 	 */
 	public function status() {
-		return $this->get( 'status' );
+		return $this->get('status');
 	}
 
 
@@ -119,8 +119,8 @@ 
 	/**
 	 * @param string $status
 	 */
-	public function set_status( $status ) {
-		$this->set( 'status', $status );
+	public function set_status($status) {
+		$this->set('status', $status);
 	}
 
 
@@ -134,12 +134,12 @@ 
 	 * @param string|array $attr Optional. Query string or array of attributes.
 	 * @return string HTML image element
 	 */
-	protected function _get_feature_image( $size, $attr ) {
+	protected function _get_feature_image($size, $attr) {
 		//first let's see if we already have the _feature_image property set AND if it has a cached element on it FOR the given size
-		$attr_key = is_array( $attr ) ? implode( '_', $attr ) : $attr;
-		$cache_key = is_array( $size ) ? implode( '_', $size ) . $attr_key : $size . $attr_key;
-		$this->_feature_image[ $cache_key ] = isset( $this->_feature_image[ $cache_key ] ) ? $this->_feature_image[ $cache_key ] : $this->get_model()->get_feature_image( $this->ID(), $size, $attr );
-		return $this->_feature_image[ $cache_key ];
+		$attr_key = is_array($attr) ? implode('_', $attr) : $attr;
+		$cache_key = is_array($size) ? implode('_', $size).$attr_key : $size.$attr_key;
+		$this->_feature_image[$cache_key] = isset($this->_feature_image[$cache_key]) ? $this->_feature_image[$cache_key] : $this->get_model()->get_feature_image($this->ID(), $size, $attr);
+		return $this->_feature_image[$cache_key];
 	}
 
 
@@ -150,8 +150,8 @@ 
 	 * @param string|array $attr
 	 * @return string of html
 	 */
-	public function feature_image( $size = 'thumbnail', $attr = '' ) {
-		return $this->_get_feature_image( $size, $attr );
+	public function feature_image($size = 'thumbnail', $attr = '') {
+		return $this->_get_feature_image($size, $attr);
 	}
 
 
@@ -161,9 +161,9 @@ 
 	 * @param  string|array $size can either be a string: 'thumbnail', 'medium', 'large', 'full' OR 2-item array representing width and height in pixels eg. array(32,32).
 	 * @return string|boolean          the url of the image or false if not found
 	 */
-	public function feature_image_url( $size = 'thumbnail' ) {
-		$attachment = wp_get_attachment_image_src( get_post_thumbnail_id( $this->ID() ), $size );
-		return !empty( $attachment ) ? $attachment[ 0 ] : FALSE;
+	public function feature_image_url($size = 'thumbnail') {
+		$attachment = wp_get_attachment_image_src(get_post_thumbnail_id($this->ID()), $size);
+		return ! empty($attachment) ? $attachment[0] : FALSE;
 	}
 
 
@@ -176,37 +176,37 @@ 
 	 * @internal param array|string $related_obj_names if included this will be used to restore for related obj if not included then we just do restore on the meta.  We will accept an array of related_obj_names for restoration here.
 	 * @return void
 	 */
-	public function restore_revision( $revision_id, $related_obj_names = array(), $where_query = array() ) {
+	public function restore_revision($revision_id, $related_obj_names = array(), $where_query = array()) {
 		//get revision object
-		$revision_obj = $this->get_model()->get_one_by_ID( $revision_id );
-		if ( $revision_obj instanceof EE_CPT_Base ) {
+		$revision_obj = $this->get_model()->get_one_by_ID($revision_id);
+		if ($revision_obj instanceof EE_CPT_Base) {
 			//no related_obj_name so we assume we're saving a revision on this object.
-			if ( empty( $related_obj_names ) ) {
+			if (empty($related_obj_names)) {
 				$fields = $this->get_model()->get_meta_table_fields();
-				foreach ( $fields as $field ) {
-					$this->set( $field, $revision_obj->get( $field ) );
+				foreach ($fields as $field) {
+					$this->set($field, $revision_obj->get($field));
 				}
 				$this->save();
 			}
-			$related_obj_names = (array)$related_obj_names;
-			foreach ( $related_obj_names as $related_name ) {
+			$related_obj_names = (array) $related_obj_names;
+			foreach ($related_obj_names as $related_name) {
 				//related_obj_name so we're saving a revision on an object related to this object
 				//do we have $where_query params for this related object?  If we do then we include that.
-				$cols_n_values = isset( $where_query[ $related_name ] ) ? $where_query[ $related_name ] : array();
-				$where_params = !empty( $cols_n_values ) ? array( $cols_n_values ) : array();
-				$related_objs = $this->get_many_related( $related_name, $where_params );
-				$revision_related_objs = $revision_obj->get_many_related( $related_name, $where_params );
+				$cols_n_values = isset($where_query[$related_name]) ? $where_query[$related_name] : array();
+				$where_params = ! empty($cols_n_values) ? array($cols_n_values) : array();
+				$related_objs = $this->get_many_related($related_name, $where_params);
+				$revision_related_objs = $revision_obj->get_many_related($related_name, $where_params);
 				//load helper
-				EE_Registry::instance()->load_helper( 'Array' );
+				EE_Registry::instance()->load_helper('Array');
 				//remove related objs from this object that are not in revision
 				//array_diff *should* work cause I think objects are indexed by ID?
-				$related_to_remove = EEH_Array::object_array_diff( $related_objs, $revision_related_objs );
-				foreach ( $related_to_remove as $rr ) {
-					$this->_remove_relation_to( $rr, $related_name, $cols_n_values );
+				$related_to_remove = EEH_Array::object_array_diff($related_objs, $revision_related_objs);
+				foreach ($related_to_remove as $rr) {
+					$this->_remove_relation_to($rr, $related_name, $cols_n_values);
 				}
 				//add all related objs attached to revision to this object
-				foreach ( $revision_related_objs as $r_obj ) {
-					$this->_add_relation_to( $r_obj, $related_name, $cols_n_values );
+				foreach ($revision_related_objs as $r_obj) {
+					$this->_add_relation_to($r_obj, $related_name, $cols_n_values);
 				}
 			}
 		}
@@ -222,8 +222,8 @@ 
 	 * <li>If $single is set to false, or left blank, the function returns an array containing all values of the specified key.</li>
 	 * <li>If $single is set to true, the function returns the first value of the specified key (not in an array</li></ul>
 	 */
-	public function get_post_meta( $meta_key = NULL, $single = FALSE ) {
-		return get_post_meta( $this->ID(), $meta_key, $single );
+	public function get_post_meta($meta_key = NULL, $single = FALSE) {
+		return get_post_meta($this->ID(), $meta_key, $single);
 	}
 
 
@@ -236,11 +236,11 @@ 
 	 * @throws EE_Error
 	 * @return mixed Returns meta_id if the meta doesn't exist, otherwise returns true on success and false on failure. NOTE: If the meta_value passed to this function is the same as the value that is already in the database, this function returns false.
 	 */
-	public function update_post_meta( $meta_key, $meta_value, $prev_value = NULL ) {
-		if ( !$this->ID() ) {
-			throw new EE_Error( sprintf( __( "You must save this custom post type before adding or updating a post meta field", "event_espresso" ) ) );
+	public function update_post_meta($meta_key, $meta_value, $prev_value = NULL) {
+		if ( ! $this->ID()) {
+			throw new EE_Error(sprintf(__("You must save this custom post type before adding or updating a post meta field", "event_espresso")));
 		}
-		return update_post_meta( $this->ID(), $meta_key, $meta_value, $prev_value );
+		return update_post_meta($this->ID(), $meta_key, $meta_value, $prev_value);
 	}
 
 
@@ -253,11 +253,11 @@ 
 	 * @throws EE_Error
 	 * @return boolean Boolean true, except if the $unique argument was set to true and a custom field with the given key already exists, in which case false is returned.
 	 */
-	public function add_post_meta( $meta_key, $meta_value, $unique = FALSE ) {
-		if ( !$this->ID() ) {
-			throw new EE_Error( sprintf( __( "You must save this custom post type before adding or updating a post meta field", "event_espresso" ) ) );
+	public function add_post_meta($meta_key, $meta_value, $unique = FALSE) {
+		if ( ! $this->ID()) {
+			throw new EE_Error(sprintf(__("You must save this custom post type before adding or updating a post meta field", "event_espresso")));
 		}
-		return add_post_meta( $this->ID(), $meta_key, $meta_value, $unique );
+		return add_post_meta($this->ID(), $meta_key, $meta_value, $unique);
 	}
 
 
@@ -267,7 +267,7 @@ 
 	 * @return string
 	 */
 	public function get_permalink() {
-		return get_permalink( $this->ID() );
+		return get_permalink($this->ID());
 	}
 
 
@@ -277,8 +277,8 @@ 
 	 * @param array $query_params
 	 * @return EE_Term_Taxonomy
 	 */
-	public function term_taxonomies( $query_params = array() ) {
-		return $this->get_many_related( 'Term_Taxonomy', $query_params );
+	public function term_taxonomies($query_params = array()) {
+		return $this->get_many_related('Term_Taxonomy', $query_params);
 	}
 
 

core/db_classes/EE_CSV.class.php

Doc Comments +6 added lines, -8 removed lines

@@ -287,7 +287,7 @@ 
 	 * Sends HTTP headers to indicate that the browser should download a file,
 	 * and starts writing the file to PHP's output. Returns the file handle so other functions can
 	 * also write to it
-	 * @param string $new_filename the name of the file that the user will download
+	 * @param string|false $filename the name of the file that the user will download
 	 * @return resource, like the results of fopen(), which can be used for fwrite, fputcsv2, etc.
 	 */
 	public function begin_sending_csv($filename){
@@ -343,9 +343,7 @@ 
 	/**
 	 * Writes $data to the csv file open in $filehandle. uses the array indices of $data for column headers
 	 * @param array $data 2D array, first numerically-indexed, and next-level-down preferably indexed by string
-	 * @param boolean $add_csv_column_names whether or not we should add the keys in the bottom-most array as a row for headers in the CSV.
-	 * Eg, if $data looked like array(0=>array('EVT_ID'=>1,'EVT_name'=>'monkey'...), 1=>array(...),...))
-	 * then the first row we'd write to the CSV would be "EVT_ID,EVT_name,..."
+	 * @param resource $filehandle
 	 * @return boolean if we successfully wrote to the CSV or not. If there's no $data, we consider that a success (because we wrote everything there was...nothing)
 	 */
 	public function write_data_array_to_csv($filehandle, $data){
@@ -427,7 +425,7 @@ 
 	 * @param array $model_data_array is assumed to be a 3d array: 1st layer has keys of model names (eg 'Event'),
 	 * next layer is numerically indexed to represent each model object (eg, each individual event), and the last layer
 	 * has all the attributes o fthat model object (eg, the event's id, name, etc)
-	 * @return boolean success
+	 * @return boolean|null success
 	 */
 	public function write_model_data_to_csv($filehandle,$model_data_array){
 		$this->write_metadata_to_csv($filehandle);
@@ -456,8 +454,8 @@ 
 	 * Writes the CSV file to the output buffer, with rows corresponding to $model_data_array,
 	 * and dies (in order to avoid other plugins from messing up the csv output)
 	 * @param string $filename the filename you want to give the file
-	 * @param array $model_data_array 3d array, as described in EE_CSV::write_model_data_to_csv()
-	 * @return bool | void writes CSV file to output and dies
+	 * @param boolean $model_data_array 3d array, as described in EE_CSV::write_model_data_to_csv()
+	 * @return boolean|null | void writes CSV file to output and dies
 	 */
 	public function export_multiple_model_data_to_csv($filename,$model_data_array){
 		$filehandle = $this->begin_sending_csv($filename);
@@ -469,7 +467,7 @@ 
 	 *		  @access public
 	 *			@param array $data - the array of data to be converted to csv and exported
 	 *			@param string $filename - name for newly created csv file
-	 *			@return TRUE on success, FALSE on fail
+	 *			@return false|null on success, FALSE on fail
 	 */
 	public function export_array_to_csv( $data = FALSE, $filename = FALSE  ) {
 

Braces +12 added lines, -9 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');
+}
 /**
  * CSV Import Export class
  *
@@ -105,8 +107,9 @@ 
 			  $fc = $fc . $c;
 			}
 		}
-		if ((ord(substr($fc,0,1)) == 255) && (ord(substr($fc,1,1)) == 254))
-		$fc = substr($fc,2);
+		if ((ord(substr($fc,0,1)) == 255) && (ord(substr($fc,1,1)) == 254)) {
+				$fc = substr($fc,2);
+		}
 		return ($fc);
 }
 
@@ -144,7 +147,7 @@ 
 				while(($data = fgetcsv($file_handle, 0, ',', '"' )) !== FALSE){
 					$csvarray[]= $data;
 				}
-			}else{
+			} else{
 				// loop through each row of the file
 				while (( $data = fgetcsv( $file_handle, 0, ',', '"', '\\' )) !== FALSE ) {
 					$csvarray[]=$data;
@@ -153,7 +156,7 @@ 
 			# Close the File.
 			fclose($file_handle);
 			return $csvarray;
-		}else{
+		} else{
 			EE_Error::add_error( sprintf(__("An error occurred - the file: %s could not opened.", "event_espresso"),$path_to_file), __FILE__, __FUNCTION__, __LINE__ );
 			return false;
 		}
@@ -234,7 +237,7 @@ 
 						$matches = array();
 						if($model_name == EE_CSV::metadata_header){
 							$headers[$i] = $column_name;
-						}else{
+						} else{
 							//now get the db table name from it (the part between square brackets)
 							$success = preg_match('~(.*)\[(.*)\]~', $column_name,$matches);
 							if (!$success){
@@ -244,7 +247,7 @@ 
 							$headers[$i] = $matches[2];
 						}
 
-					}else{
+					} else{
 						// no column names means our final array will just use counters for keys
 						$model_entry[$headers[$i]] = $data[$i];
 						$headers[$i] = $i;
@@ -371,7 +374,7 @@ 
 				echo $this->fputcsv2($filehandle, $data_row);
 			}
 			return true;
-		}else{
+		} else{
 			//no data TO write... so we can assume that's a success
 			return true;
 		}
@@ -438,7 +441,7 @@ 
 
 			if( ! empty($model_instance_arrays) ){
 				$this->write_data_array_to_csv($filehandle, $model_instance_arrays);
-			}else{
+			} else{
 //				echo "no data to write... so just write the headers";
 				//so there's actually NO model objects for that model.
 				//probably still want to show the columns

Spacing +114 added lines, -114 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
  * CSV Import Export class
  *
@@ -41,31 +41,31 @@ 
 		global $wpdb;
 
 		$this->_primary_keys = array(
-				$wpdb->prefix . 'esp_answer' => array( 'ANS_ID' ),
-				$wpdb->prefix . 'esp_attendee' => array( 'ATT_ID' ),
-				$wpdb->prefix . 'esp_datetime'	=> array( 'DTT_ID' ),
-				$wpdb->prefix . 'esp_event_question_group'	=> array( 'EQG_ID' ),
-				$wpdb->prefix . 'esp_message_template'	=> array( 'MTP_ID' ),
-				$wpdb->prefix . 'esp_payment'	=> array( 'PAY_ID' ),
-				$wpdb->prefix . 'esp_price'	=> array( 'PRC_ID' ),
-				$wpdb->prefix . 'esp_price_type'	=> array( 'PRT_ID' ),
-				$wpdb->prefix . 'esp_question'	=> array( 'QST_ID' ),
-				$wpdb->prefix . 'esp_question_group'	=> array( 'QSG_ID' ),
-				$wpdb->prefix . 'esp_question_group_question'	=> array( 'QGQ_ID' ),
-				$wpdb->prefix . 'esp_question_option'	=> array( 'QSO_ID' ),
-				$wpdb->prefix . 'esp_registration'	=> array( 'REG_ID' ),
-				$wpdb->prefix . 'esp_status'	=> array( 'STS_ID' ),
-				$wpdb->prefix . 'esp_transaction'	=> array( 'TXN_ID' ),
-				$wpdb->prefix . 'esp_transaction'	=> array( 'TXN_ID' ),
-				$wpdb->prefix . 'events_detail'	=> array( 'id' ),
-				$wpdb->prefix . 'events_category_detail'	=> array( 'id' ),
-				$wpdb->prefix . 'events_category_rel'	=> array( 'id' ),
-				$wpdb->prefix . 'events_venue'	=> array( 'id' ),
-				$wpdb->prefix . 'events_venue_rel' =>  array( 'emeta_id' ),
-				$wpdb->prefix . 'events_locale'	=> array( 'id' ),
-				$wpdb->prefix . 'events_locale_rel'	=> array( 'id' ),
-				$wpdb->prefix . 'events_personnel' =>  array( 'id' ),
-				$wpdb->prefix . 'events_personnel_rel' =>  array( 'id' ),
+				$wpdb->prefix.'esp_answer' => array('ANS_ID'),
+				$wpdb->prefix.'esp_attendee' => array('ATT_ID'),
+				$wpdb->prefix.'esp_datetime'	=> array('DTT_ID'),
+				$wpdb->prefix.'esp_event_question_group'	=> array('EQG_ID'),
+				$wpdb->prefix.'esp_message_template'	=> array('MTP_ID'),
+				$wpdb->prefix.'esp_payment'	=> array('PAY_ID'),
+				$wpdb->prefix.'esp_price'	=> array('PRC_ID'),
+				$wpdb->prefix.'esp_price_type'	=> array('PRT_ID'),
+				$wpdb->prefix.'esp_question'	=> array('QST_ID'),
+				$wpdb->prefix.'esp_question_group'	=> array('QSG_ID'),
+				$wpdb->prefix.'esp_question_group_question'	=> array('QGQ_ID'),
+				$wpdb->prefix.'esp_question_option'	=> array('QSO_ID'),
+				$wpdb->prefix.'esp_registration'	=> array('REG_ID'),
+				$wpdb->prefix.'esp_status'	=> array('STS_ID'),
+				$wpdb->prefix.'esp_transaction'	=> array('TXN_ID'),
+				$wpdb->prefix.'esp_transaction'	=> array('TXN_ID'),
+				$wpdb->prefix.'events_detail'	=> array('id'),
+				$wpdb->prefix.'events_category_detail'	=> array('id'),
+				$wpdb->prefix.'events_category_rel'	=> array('id'),
+				$wpdb->prefix.'events_venue'	=> array('id'),
+				$wpdb->prefix.'events_venue_rel' =>  array('emeta_id'),
+				$wpdb->prefix.'events_locale'	=> array('id'),
+				$wpdb->prefix.'events_locale_rel'	=> array('id'),
+				$wpdb->prefix.'events_personnel' =>  array('id'),
+				$wpdb->prefix.'events_personnel_rel' =>  array('id'),
 			);
 
 	}
@@ -77,9 +77,9 @@ 
 	 *		@ access public
 	 *		@return EE_CSV
 	 */
-	public static function instance ( ) {
+	public static function instance( ) {
 		// check if class object is instantiated
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_CSV )) {
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_CSV)) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -91,22 +91,22 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	private function read_unicode_file($file_path){
+	private function read_unicode_file($file_path) {
 		$fc = "";
-		$fh = fopen($file_path,"rb");
-		if( ! $fh ){
-			throw new EE_Error( sprintf( __("Cannot open file for read: %s<br>\n", 'event_espresso'), $file_path ) );
+		$fh = fopen($file_path, "rb");
+		if ( ! $fh) {
+			throw new EE_Error(sprintf(__("Cannot open file for read: %s<br>\n", 'event_espresso'), $file_path));
 		}
 		$flen = filesize($file_path);
 		$bc = fread($fh, $flen);
-		for ($i=0; $i<$flen; $i++){
-			$c = substr($bc,$i,1);
-			if ((ord($c) != 0) && (ord($c) != 13)){
-			  $fc = $fc . $c;
+		for ($i = 0; $i < $flen; $i++) {
+			$c = substr($bc, $i, 1);
+			if ((ord($c) != 0) && (ord($c) != 13)) {
+			  $fc = $fc.$c;
 			}
 		}
-		if ((ord(substr($fc,0,1)) == 255) && (ord(substr($fc,1,1)) == 254))
-		$fc = substr($fc,2);
+		if ((ord(substr($fc, 0, 1)) == 255) && (ord(substr($fc, 1, 1)) == 254))
+		$fc = substr($fc, 2);
 		return ($fc);
 }
 
@@ -118,15 +118,15 @@ 
 	 * @param string $path_to_file
 	 * @return array of arrays. Top-level array has rows, second-level array has each item
 	 */
-	public function import_csv_to_multi_dimensional_array($path_to_file){
+	public function import_csv_to_multi_dimensional_array($path_to_file) {
 		// needed to deal with Mac line endings
-		ini_set('auto_detect_line_endings',TRUE);
+		ini_set('auto_detect_line_endings', TRUE);
 
 		// because fgetcsv does not correctly deal with backslashed quotes such as \"
 		// we'll read the file into a string
-		$file_contents = $this->read_unicode_file( $path_to_file );
+		$file_contents = $this->read_unicode_file($path_to_file);
 		// replace backslashed quotes with CSV enclosures
-		$file_contents = str_replace ( '\\"', '"""', $file_contents );
+		$file_contents = str_replace('\\"', '"""', $file_contents);
 		// HEY YOU! PUT THAT FILE BACK!!!
 		file_put_contents($path_to_file, $file_contents);
 
@@ -136,25 +136,25 @@ 
 			$csvarray = array();
 
 			// in PHP 5.3 fgetcsv accepts a 5th parameter, but the pre 5.3 versions of fgetcsv choke if passed more than 4 - is that crazy or what?
-			if ( version_compare( PHP_VERSION, '5.3.0' ) < 0 ) {
+			if (version_compare(PHP_VERSION, '5.3.0') < 0) {
 
 				//  PHP 5.2- version
 
 				// loop through each row of the file
-				while(($data = fgetcsv($file_handle, 0, ',', '"' )) !== FALSE){
-					$csvarray[]= $data;
+				while (($data = fgetcsv($file_handle, 0, ',', '"')) !== FALSE) {
+					$csvarray[] = $data;
 				}
-			}else{
+			} else {
 				// loop through each row of the file
-				while (( $data = fgetcsv( $file_handle, 0, ',', '"', '\\' )) !== FALSE ) {
-					$csvarray[]=$data;
+				while (($data = fgetcsv($file_handle, 0, ',', '"', '\\')) !== FALSE) {
+					$csvarray[] = $data;
 				}
 			}
 			# Close the File.
 			fclose($file_handle);
 			return $csvarray;
-		}else{
-			EE_Error::add_error( sprintf(__("An error occurred - the file: %s could not opened.", "event_espresso"),$path_to_file), __FILE__, __FUNCTION__, __LINE__ );
+		} else {
+			EE_Error::add_error(sprintf(__("An error occurred - the file: %s could not opened.", "event_espresso"), $path_to_file), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 	}
@@ -184,9 +184,9 @@ 
 	 *						...
 	 *						)
 	 */
-	public function import_csv_to_model_data_array( $path_to_file, $model_name = FALSE, $first_row_is_headers = TRUE ) {
+	public function import_csv_to_model_data_array($path_to_file, $model_name = FALSE, $first_row_is_headers = TRUE) {
 		$multi_dimensional_array = $this->import_csv_to_multi_dimensional_array($path_to_file);
-		if( ! $multi_dimensional_array ){
+		if ( ! $multi_dimensional_array) {
 			return false;
 		}
 		// gotta start somewhere
@@ -195,9 +195,9 @@ 
 		$ee_formatted_data = array();
 		// array to store headers (column names)
 		$headers = array();
-		foreach($multi_dimensional_array as $data){
+		foreach ($multi_dimensional_array as $data) {
 			// if first cell is MODEL, then second cell is the MODEL name
-			if ( $data[0]	== 'MODEL' ) {
+			if ($data[0] == 'MODEL') {
 				$model_name = $data[1];
 				//don't bother looking for model data in this row. The rest of this
 				//row should be blank
@@ -207,7 +207,7 @@ 
 				$headers = array();
 				continue;
 			}
-			if( strpos( $data[0], EE_CSV::metadata_header ) !==FALSE ){
+			if (strpos($data[0], EE_CSV::metadata_header) !== FALSE) {
 				$model_name = EE_CSV::metadata_header;
 				//store like model data, we just won't try importing it etc.
 				$row = 1;
@@ -220,31 +220,31 @@ 
 
 			$model_entry = array();
 			// loop through each column
-			for ( $i=0; $i < $columns; $i++ ) {
+			for ($i = 0; $i < $columns; $i++) {
 
 				//replace csv_enclosures with backslashed quotes
-				$data[$i] = str_replace ( '"""', '\\"', $data[$i] );
+				$data[$i] = str_replace('"""', '\\"', $data[$i]);
 				// do we need to grab the column names?
-				if ( $row === 1){
-					if( $first_row_is_headers ) {
+				if ($row === 1) {
+					if ($first_row_is_headers) {
 						// store the column names to use for keys
 						$column_name = $data[$i];
 						//check it's not blank... sometimes CSV editign programs adda bunch of empty columns onto the end...
-						if(!$column_name){continue;}
+						if ( ! $column_name) {continue; }
 						$matches = array();
-						if($model_name == EE_CSV::metadata_header){
+						if ($model_name == EE_CSV::metadata_header) {
 							$headers[$i] = $column_name;
-						}else{
+						} else {
 							//now get the db table name from it (the part between square brackets)
-							$success = preg_match('~(.*)\[(.*)\]~', $column_name,$matches);
-							if (!$success){
-								EE_Error::add_error( sprintf(__("The column titled %s is invalid for importing. It must be be in the format of 'Nice Name[model_field_name]' in row %s", "event_espresso"),$column_name,implode(",",$data)), __FILE__, __FUNCTION__, __LINE__ );
+							$success = preg_match('~(.*)\[(.*)\]~', $column_name, $matches);
+							if ( ! $success) {
+								EE_Error::add_error(sprintf(__("The column titled %s is invalid for importing. It must be be in the format of 'Nice Name[model_field_name]' in row %s", "event_espresso"), $column_name, implode(",", $data)), __FILE__, __FUNCTION__, __LINE__);
 								return false;
 							}
 							$headers[$i] = $matches[2];
 						}
 
-					}else{
+					} else {
 						// no column names means our final array will just use counters for keys
 						$model_entry[$headers[$i]] = $data[$i];
 						$headers[$i] = $i;
@@ -252,14 +252,14 @@ 
 					// and we need to store csv data
 				} else {
 					// this column isn' ta header, store it if there is a header for it
-					if(isset($headers[$i])){
+					if (isset($headers[$i])) {
 						$model_entry[$headers[$i]] = $data[$i];
 					}
 				}
 
 			}
 			//save the row's data IF it's a non-header-row
-			if( ! $first_row_is_headers || ($first_row_is_headers && $row > 1)){
+			if ( ! $first_row_is_headers || ($first_row_is_headers && $row > 1)) {
 				$ee_formatted_data[$model_name][] = $model_entry;
 			}
 			// advance to next row
@@ -278,9 +278,9 @@ 
 	}
 
 
-	public function save_csv_to_db( $csv_data_array, $model_name = FALSE ) {
-		EE_Error::doing_it_wrong('save_csv_to_db', __( 'Function moved to EE_Import and renamed to save_csv_data_array_to_db', 'event_espresso' ), '4.6.7' );
-		return EE_Import::instance()->save_csv_data_array_to_db( $csv_data_array, $model_name );
+	public function save_csv_to_db($csv_data_array, $model_name = FALSE) {
+		EE_Error::doing_it_wrong('save_csv_to_db', __('Function moved to EE_Import and renamed to save_csv_data_array_to_db', 'event_espresso'), '4.6.7');
+		return EE_Import::instance()->save_csv_data_array_to_db($csv_data_array, $model_name);
 	}
 
 	/**
@@ -290,11 +290,11 @@ 
 	 * @param string $new_filename the name of the file that the user will download
 	 * @return resource, like the results of fopen(), which can be used for fwrite, fputcsv2, etc.
 	 */
-	public function begin_sending_csv($filename){
+	public function begin_sending_csv($filename) {
 		// grab file extension
 		$ext = substr(strrchr($filename, '.'), 1);
-		if ( $ext == '.csv' or  $ext == '.xls' ) {
-			str_replace( $ext, '', $filename );
+		if ($ext == '.csv' or $ext == '.xls') {
+			str_replace($ext, '', $filename);
 		}
 		$filename .= '.csv';
 
@@ -315,8 +315,8 @@ 
 //		header("Content-Type: application/download");
 		header('Content-disposition: attachment; filename='.$filename);
 		header("Content-Type: text/csv; charset=utf-8");
-                do_action( 'AHEE__EE_CSV__begin_sending_csv__headers' );
-		echo apply_filters('FHEE__EE_CSV__begin_sending_csv__start_writing', "\xEF\xBB\xBF" ); // makes excel open it as UTF-8. UTF-8 BOM, see http://stackoverflow.com/a/4440143/2773835
+                do_action('AHEE__EE_CSV__begin_sending_csv__headers');
+		echo apply_filters('FHEE__EE_CSV__begin_sending_csv__start_writing', "\xEF\xBB\xBF"); // makes excel open it as UTF-8. UTF-8 BOM, see http://stackoverflow.com/a/4440143/2773835
 		$fh = fopen('php://output', 'w');
 		return $fh;
 	}
@@ -326,12 +326,12 @@ 
 	 * mentioning the version and timezone
 	 * @param resource $filehandle
 	 */
-	public function write_metadata_to_csv($filehandle){
+	public function write_metadata_to_csv($filehandle) {
 		EE_Registry::instance()->load_helper('DTT_Helper');
-		$data_row = array(EE_CSV::metadata_header);//do NOT translate because this exact string is used when importing
+		$data_row = array(EE_CSV::metadata_header); //do NOT translate because this exact string is used when importing
 		$this->fputcsv2($filehandle, $data_row);
 		EE_Registry::instance()->load_helper('DTT_Helper');
-		$meta_data = array( 0=> array(
+		$meta_data = array(0=> array(
 			'version'=>espresso_version(),
 			'timezone'=>  EEH_DTT_Helper::get_timezone(),
 			'time_of_export'=>current_time('mysql'),
@@ -349,30 +349,30 @@ 
 	 * then the first row we'd write to the CSV would be "EVT_ID,EVT_name,..."
 	 * @return boolean if we successfully wrote to the CSV or not. If there's no $data, we consider that a success (because we wrote everything there was...nothing)
 	 */
-	public function write_data_array_to_csv($filehandle, $data){
+	public function write_data_array_to_csv($filehandle, $data) {
 		EE_Registry::instance()->load_helper('Array');
 
 
 		//determine if $data is actually a 2d array
-		if ( $data && is_array($data) && is_array(EEH_Array::get_one_item_from_array($data))){
+		if ($data && is_array($data) && is_array(EEH_Array::get_one_item_from_array($data))) {
 			//make sure top level is numerically indexed,
 
-			if( EEH_Array::is_associative_array($data)){
-				throw new EE_Error(sprintf(__("top-level array must be numerically indexed. Does these look like numbers to you? %s","event_espresso"),implode(",",array_keys($data))));
+			if (EEH_Array::is_associative_array($data)) {
+				throw new EE_Error(sprintf(__("top-level array must be numerically indexed. Does these look like numbers to you? %s", "event_espresso"), implode(",", array_keys($data))));
 			}
 			$item_in_top_level_array = EEH_Array::get_one_item_from_array($data);
 			//now, is the last item in the top-level array of $data an associative or numeric array?
-			if(EEH_Array::is_associative_array($item_in_top_level_array)){
+			if (EEH_Array::is_associative_array($item_in_top_level_array)) {
 				//its associative, so we want to output its keys as column headers
 				$keys = array_keys($item_in_top_level_array);
 				echo $this->fputcsv2($filehandle, $keys);
 			}
 			//start writing data
-			foreach($data as $data_row){
+			foreach ($data as $data_row) {
 				echo $this->fputcsv2($filehandle, $data_row);
 			}
 			return true;
-		}else{
+		} else {
 			//no data TO write... so we can assume that's a success
 			return true;
 		}
@@ -417,7 +417,7 @@ 
 	 * Calls exit to prevent polluting the CSV file with other junk
 	 * @param resource $fh filehandle where we're writing the CSV to
 	 */
-	public function end_sending_csv($fh){
+	public function end_sending_csv($fh) {
 		fclose($fh);
 		exit(0);
 	}
@@ -430,23 +430,23 @@ 
 	 * has all the attributes o fthat model object (eg, the event's id, name, etc)
 	 * @return boolean success
 	 */
-	public function write_model_data_to_csv($filehandle,$model_data_array){
+	public function write_model_data_to_csv($filehandle, $model_data_array) {
 		$this->write_metadata_to_csv($filehandle);
-		foreach($model_data_array as $model_name => $model_instance_arrays){
+		foreach ($model_data_array as $model_name => $model_instance_arrays) {
 			//first: output a special row stating the model
-			echo $this->fputcsv2($filehandle,array('MODEL',$model_name));
+			echo $this->fputcsv2($filehandle, array('MODEL', $model_name));
 			//if we have items to put in the CSV, do it normally
 
-			if( ! empty($model_instance_arrays) ){
+			if ( ! empty($model_instance_arrays)) {
 				$this->write_data_array_to_csv($filehandle, $model_instance_arrays);
-			}else{
+			} else {
 //				echo "no data to write... so just write the headers";
 				//so there's actually NO model objects for that model.
 				//probably still want to show the columns
 				$model = EE_Registry::instance()->load_model($model_name);
 				$column_names = array();
-				foreach($model->field_settings() as $field){
-					$column_names[$field->get_nicename()."[".$field->get_name()."]"] = null ;
+				foreach ($model->field_settings() as $field) {
+					$column_names[$field->get_nicename()."[".$field->get_name()."]"] = null;
 				}
 				$this->write_data_array_to_csv($filehandle, array($column_names));
 			}
@@ -460,7 +460,7 @@ 
 	 * @param array $model_data_array 3d array, as described in EE_CSV::write_model_data_to_csv()
 	 * @return bool | void writes CSV file to output and dies
 	 */
-	public function export_multiple_model_data_to_csv($filename,$model_data_array){
+	public function export_multiple_model_data_to_csv($filename, $model_data_array) {
 		$filehandle = $this->begin_sending_csv($filename);
 		$this->write_model_data_to_csv($filehandle, $model_data_array);
 		$this->end_sending_csv($filehandle);
@@ -472,15 +472,15 @@ 
 	 *			@param string $filename - name for newly created csv file
 	 *			@return TRUE on success, FALSE on fail
 	 */
-	public function export_array_to_csv( $data = FALSE, $filename = FALSE  ) {
+	public function export_array_to_csv($data = FALSE, $filename = FALSE) {
 
 		// no data file?? get outta here
-		if ( ! $data or ! is_array( $data ) or empty( $data ) ) {
+		if ( ! $data or ! is_array($data) or empty($data)) {
 			return FALSE;
 		}
 
 		// no filename?? get outta here
-		if ( ! $filename ) {
+		if ( ! $filename) {
 			return FALSE;
 		}
 
@@ -506,11 +506,11 @@ 
 	 *			@param int $percent_of_max - desired percentage of the max upload_mb
 	 *			@return int KB
 	 */
-	public function get_max_upload_size ( $percent_of_max = FALSE ) {
+	public function get_max_upload_size($percent_of_max = FALSE) {
 
-		$max_upload = (int)(ini_get('upload_max_filesize'));
-		$max_post = (int)(ini_get('post_max_size'));
-		$memory_limit = (int)(ini_get('memory_limit'));
+		$max_upload = (int) (ini_get('upload_max_filesize'));
+		$max_post = (int) (ini_get('post_max_size'));
+		$memory_limit = (int) (ini_get('memory_limit'));
 
 		// determine the smallest of the three values from above
 		$upload_mb = min($max_upload, $max_post, $memory_limit);
@@ -519,9 +519,9 @@ 
 		$upload_mb = $upload_mb * 1024;
 
 		// don't want the full monty? then reduce the max uplaod size
-		if ( $percent_of_max ) {
+		if ($percent_of_max) {
 			// is percent_of_max like this -> 50 or like this -> 0.50 ?
-			if ( $percent_of_max > 1 ) {
+			if ($percent_of_max > 1) {
 				// chnages 50 to 0.50
 				$percent_of_max = $percent_of_max / 100;
 			}
@@ -543,17 +543,17 @@ 
 	 *			@param string $mysql_null - allows php NULL to be overridden with MySQl's insertable NULL value
 	 *			@return void
 	 */
-	private function fputcsv2 ($fh, array $row, $delimiter = ',', $enclosure = '"', $mysql_null = FALSE) {
+	private function fputcsv2($fh, array $row, $delimiter = ',', $enclosure = '"', $mysql_null = FALSE) {
 		//Allow user to filter the csv delimiter and enclosure for other countries csv standards
-		$delimiter = apply_filters( 'FHEE__EE_CSV__fputcsv2__delimiter', $delimiter );
-		$enclosure = apply_filters( 'FHEE__EE_CSV__fputcsv2__enclosure', $enclosure );
+		$delimiter = apply_filters('FHEE__EE_CSV__fputcsv2__delimiter', $delimiter);
+		$enclosure = apply_filters('FHEE__EE_CSV__fputcsv2__enclosure', $enclosure);
 
 		$delimiter_esc = preg_quote($delimiter, '/');
 		$enclosure_esc = preg_quote($enclosure, '/');
 
 		$output = array();
 		foreach ($row as $field_value) {
-			if(is_object($field_value) || is_array($field_value)){
+			if (is_object($field_value) || is_array($field_value)) {
 				$field_value = serialize($field_value);
 			}
 			if ($field_value === null && $mysql_null) {
@@ -562,10 +562,10 @@ 
 			}
 
 			$output[] = preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field_value) ?
-				( $enclosure . str_replace($enclosure, $enclosure . $enclosure, $field_value) . $enclosure ) : $field_value;
+				($enclosure.str_replace($enclosure, $enclosure.$enclosure, $field_value).$enclosure) : $field_value;
 		}
 
-		fwrite($fh, join($delimiter, $output) . PHP_EOL);
+		fwrite($fh, join($delimiter, $output).PHP_EOL);
 	}
 
 
@@ -603,8 +603,8 @@ 
 	 * @param string $current_format
 	 * @return string
 	 */
-	public function get_date_format_for_csv( $current_format = null ) {
-		return apply_filters( 'FHEE__EE_CSV__get_date_format_for_csv__format', 'Y-m-d', $current_format );
+	public function get_date_format_for_csv($current_format = null) {
+		return apply_filters('FHEE__EE_CSV__get_date_format_for_csv__format', 'Y-m-d', $current_format);
 	}
 
 	/**
@@ -612,8 +612,8 @@ 
 	 * @param string $current_format
 	 * @return string
 	 */
-	public function get_time_format_for_csv( $current_format = null ) {
-		return apply_filters( 'FHEE__EE_CSV__get_time_format_for_csv__format', 'H:i:s', $current_format );
+	public function get_time_format_for_csv($current_format = null) {
+		return apply_filters('FHEE__EE_CSV__get_time_format_for_csv__format', 'H:i:s', $current_format);
 	}
 
 

Indentation +1 added lines, -1 removed lines

@@ -315,7 +315,7 @@
 //		header("Content-Type: application/download");
 		header('Content-disposition: attachment; filename='.$filename);
 		header("Content-Type: text/csv; charset=utf-8");
-                do_action( 'AHEE__EE_CSV__begin_sending_csv__headers' );
+				do_action( 'AHEE__EE_CSV__begin_sending_csv__headers' );
 		echo apply_filters('FHEE__EE_CSV__begin_sending_csv__start_writing', "\xEF\xBB\xBF" ); // makes excel open it as UTF-8. UTF-8 BOM, see http://stackoverflow.com/a/4440143/2773835
 		$fh = fopen('php://output', 'w');
 		return $fh;

core/db_classes/EE_Currency.class.php

Doc Comments +12 added lines, -12 removed lines

@@ -54,14 +54,14 @@ 
 	 * @param array $props_n_values  incoming values from the database
 	 * @param string $timezone  incoming timezone as set by the model.  If not set the timezone for
 	 *                          		the website will be used.
-	 * @return EE_Attendee
+	 * @return EE_Currency
 	 */
 	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
 		return new self( $props_n_values, TRUE, $timezone );
 	}
 	/**
 	 * Gets code
-	 * @return string
+	 * @return boolean
 	 */
 	function code() {
 		return $this->get('CUR_code');
@@ -70,7 +70,7 @@ 
 	/**
 	 * Sets code
 	 * @param string $code
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_code($code) {
 		return $this->set('CUR_code', $code);
@@ -86,14 +86,14 @@ 
 	/**
 	 * Sets active
 	 * @param boolean $active
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_active($active) {
 		return $this->set('CUR_active', $active);
 	}
 	/**
 	 * Gets dec_plc
-	 * @return int
+	 * @return boolean
 	 */
 	function dec_plc() {
 		return $this->get('CUR_dec_plc');
@@ -102,14 +102,14 @@ 
 	/**
 	 * Sets dec_plc
 	 * @param int $dec_plc
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_dec_plc($dec_plc) {
 		return $this->set('CUR_dec_plc', $dec_plc);
 	}
 	/**
 	 * Gets plural
-	 * @return string
+	 * @return boolean
 	 */
 	function plural_name() {
 		return $this->get('CUR_plural');
@@ -118,14 +118,14 @@ 
 	/**
 	 * Sets plural
 	 * @param string $plural
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_plural_name($plural) {
 		return $this->set('CUR_plural', $plural);
 	}
 	/**
 	 * Gets sign
-	 * @return string
+	 * @return boolean
 	 */
 	function sign() {
 		return $this->get('CUR_sign');
@@ -134,14 +134,14 @@ 
 	/**
 	 * Sets sign
 	 * @param string $sign
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_sign($sign) {
 		return $this->set('CUR_sign', $sign);
 	}
 	/**
 	 * Gets single
-	 * @return string
+	 * @return boolean
 	 */
 	function singular_name() {
 		return $this->get('CUR_single');
@@ -150,7 +150,7 @@ 
 	/**
 	 * Sets single
 	 * @param string $single
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_singular_name($single) {
 		return $this->set('CUR_single', $single);

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_Currency extends EE_Base_Class{
+class EE_Currency extends EE_Base_Class {
 
 		/** Currency COde @var CUR_code*/ protected $_CUR_code = NULL;
 		/** Currency Name Singular @var CUR_single*/ protected $_CUR_single = NULL;
@@ -43,9 +43,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Attendee
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -56,8 +56,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Attendee
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 	/**
 	 * Gets code
@@ -159,8 +159,8 @@ 
 	 * Gets a prettier name
 	 * @return string
 	 */
-	function name(){
-		return sprintf(__("%s (%s)", "event_espresso"),$this->code(),$this->plural_name());
+	function name() {
+		return sprintf(__("%s (%s)", "event_espresso"), $this->code(), $this->plural_name());
 	}
 
 }

Braces +2 added lines, -1 removed lines

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

core/db_classes/EE_Currency_Payment_Method.class.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -26,7 +26,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_Currency_Payment_Method extends EE_Base_Class{
+class EE_Currency_Payment_Method extends EE_Base_Class {
 
 	/** Currency to Payment Method Link ID @var CPM_ID*/
 	protected $_CPM_ID = NULL;
@@ -48,9 +48,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Attendee
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -61,8 +61,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Attendee
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 }

Braces +2 added lines, -1 removed lines

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