eventespresso / event-espresso-core

core/db_classes/EE_Extra_Meta.class.php

Doc Comments +8 added lines, -8 removed lines

@@ -49,7 +49,7 @@ 
 
 	/**
 	 * Gets FK_ID
-	 * @return int
+	 * @return boolean
 	 */
 	function FK_ID() {
 		return $this->get( 'FK_ID' );
@@ -60,7 +60,7 @@ 
 	/**
 	 * Sets FK_ID
 	 * @param int $FK_ID
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_FK_ID( $FK_ID ) {
 		$this->set( 'FK_ID', $FK_ID );
@@ -70,7 +70,7 @@ 
 
 	/**
 	 * Gets model
-	 * @return string
+	 * @return boolean
 	 */
 	function model() {
 		return $this->get( 'EXM_model' );
@@ -81,7 +81,7 @@ 
 	/**
 	 * Sets model
 	 * @param string $model
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_model( $model ) {
 		$this->set( 'EXM_model', $model );
@@ -91,7 +91,7 @@ 
 
 	/**
 	 * Gets key
-	 * @return string
+	 * @return boolean
 	 */
 	function key() {
 		return $this->get( 'EXM_key' );
@@ -102,7 +102,7 @@ 
 	/**
 	 * Sets key
 	 * @param string $key
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_key( $key ) {
 		$this->set( 'EXM_key', $key );
@@ -112,7 +112,7 @@ 
 
 	/**
 	 * Gets value
-	 * @return string
+	 * @return boolean
 	 */
 	function value() {
 		return $this->get( 'EXM_value' );
@@ -123,7 +123,7 @@ 
 	/**
 	 * Sets value
 	 * @param string $value
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_value( $value ) {
 		$this->set( 'EXM_value', $value );

Spacing +19 added lines, -19 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_Extra_Meta|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_Extra_Meta
 	 */
-	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);
 	}
 
 
@@ -52,7 +52,7 @@ 
 	 * @return int
 	 */
 	function FK_ID() {
-		return $this->get( 'FK_ID' );
+		return $this->get('FK_ID');
 	}
 
 
@@ -62,8 +62,8 @@ 
 	 * @param int $FK_ID
 	 * @return boolean
 	 */
-	function set_FK_ID( $FK_ID ) {
-		$this->set( 'FK_ID', $FK_ID );
+	function set_FK_ID($FK_ID) {
+		$this->set('FK_ID', $FK_ID);
 	}
 
 
@@ -73,7 +73,7 @@ 
 	 * @return string
 	 */
 	function model() {
-		return $this->get( 'EXM_model' );
+		return $this->get('EXM_model');
 	}
 
 
@@ -83,8 +83,8 @@ 
 	 * @param string $model
 	 * @return boolean
 	 */
-	function set_model( $model ) {
-		$this->set( 'EXM_model', $model );
+	function set_model($model) {
+		$this->set('EXM_model', $model);
 	}
 
 
@@ -94,7 +94,7 @@ 
 	 * @return string
 	 */
 	function key() {
-		return $this->get( 'EXM_key' );
+		return $this->get('EXM_key');
 	}
 
 
@@ -104,8 +104,8 @@ 
 	 * @param string $key
 	 * @return boolean
 	 */
-	function set_key( $key ) {
-		$this->set( 'EXM_key', $key );
+	function set_key($key) {
+		$this->set('EXM_key', $key);
 	}
 
 
@@ -115,7 +115,7 @@ 
 	 * @return string
 	 */
 	function value() {
-		return $this->get( 'EXM_value' );
+		return $this->get('EXM_value');
 	}
 
 
@@ -125,8 +125,8 @@ 
 	 * @param string $value
 	 * @return boolean
 	 */
-	function set_value( $value ) {
-		$this->set( 'EXM_value', $value );
+	function set_value($value) {
+		$this->set('EXM_value', $value);
 	}
 
 

core/db_classes/EE_Import.class.php

Doc Comments +4 added lines, -10 removed lines

@@ -79,10 +79,6 @@ 
 	 *	@ access 	public
 	 * 	@param 	string 		$title - heading for the form
 	 * 	@param 	string 		$intro - additional text explaing what to do
-	 * 	@param 	string 		$page - EE Admin page to direct form to - in the form "espresso_{pageslug}"
-	 * 	@param 	string 		$action - EE Admin page route array "action" that form will direct to
-	 * 	@param 	string 		$type - type of file to import
-	 *	@ return 	string
 	 */
 	public function upload_form ( $title, $intro, $form_url, $action, $type  ) {
 
@@ -121,7 +117,7 @@ 
 	/**
 	 *	@Import Event Espresso data - some code "borrowed" from event espresso csv_import.php
 	 *	@access public
-	 *	@return boolean success
+	 *	@return boolean|null success
 	 */
 	public function import() {
 
@@ -269,8 +265,7 @@ 
 	 * update that event, instead of adding a new event).
 	 *		  @access public
 	 *			@param array $csv_data_array - the array containing the csv data produced from EE_CSV::import_csv_to_model_data_array()
-	 *			@param array $fields_to_save - an array containing the csv column names as keys with the corresponding db table fields they will be saved to
-	 *			@return TRUE on success, FALSE on fail
+	 * @return boolean
 	 */
 	public function save_csv_data_array_to_db( $csv_data_array, $model_name = FALSE ) {
 
@@ -367,7 +362,7 @@ 
 	 * we need to insert a new row for that ID, and then map from the non-existent ID
 	 * to the newly-inserted real ID.
 	 * @param type $csv_data_array
-	 * @param type $export_from_site_a_to_b
+	 * @param boolean $export_from_site_a_to_b
 	 * @param type $old_db_to_new_db_mapping
 	 * @return array updated $old_db_to_new_db_mapping
 	 */
@@ -484,7 +479,6 @@ 
 	 * @param type $id_in_csv
 	 * @param type $model_object_data
 	 * @param EEM_Base $model
-	 * @param type $old_db_to_new_db_mapping
 	 * @return
 	 */
 	protected function _decide_whether_to_insert_or_update_given_data_from_same_db( $id_in_csv, $model_object_data, $model ) {
@@ -594,7 +588,7 @@ 
 	 * @param type $object_id
 	 * @param string $model_name
 	 * @param array $old_db_to_new_db_mapping
-	 * @param type $export_from_site_a_to_b
+	 * @param boolean $export_from_site_a_to_b
 	 * @return int
 	 */
 	protected function _find_mapping_in( $object_id, $model_name, $old_db_to_new_db_mapping, $export_from_site_a_to_b) {

Indentation +37 added lines, -37 removed lines

@@ -131,43 +131,43 @@ 
 		if ( isset( $_REQUEST['import'] )) {
 			if( isset( $_POST['csv_submitted'] )) {
 
-			    switch ( $_FILES['file']['error'][0] ) {
-			        case UPLOAD_ERR_OK:
-			            $error_msg = FALSE;
-			            break;
-			        case UPLOAD_ERR_INI_SIZE:
-			            $error_msg = __("'The uploaded file exceeds the upload_max_filesize directive in php.ini.'", "event_espresso");
-			            break;
-			        case UPLOAD_ERR_FORM_SIZE:
-			            $error_msg = __('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.', "event_espresso");
-			            break;
-			        case UPLOAD_ERR_PARTIAL:
-			            $error_msg = __('The uploaded file was only partially uploaded.', "event_espresso");
-			            break;
-			        case UPLOAD_ERR_NO_FILE:
-			            $error_msg = __('No file was uploaded.', "event_espresso");
-			            break;
-			        case UPLOAD_ERR_NO_TMP_DIR:
-			            $error_msg = __('Missing a temporary folder.', "event_espresso");
-			            break;
-			        case UPLOAD_ERR_CANT_WRITE:
-			            $error_msg = __('Failed to write file to disk.', "event_espresso");
-			            break;
-			        case UPLOAD_ERR_EXTENSION:
-			            $error_msg = __('File upload stopped by extension.', "event_espresso");
-			            break;
-			        default:
-			            $error_msg = __('An unknown error occurred and the file could not be uploaded', "event_espresso");
-			            break;
-			    }
+				switch ( $_FILES['file']['error'][0] ) {
+					case UPLOAD_ERR_OK:
+						$error_msg = FALSE;
+						break;
+					case UPLOAD_ERR_INI_SIZE:
+						$error_msg = __("'The uploaded file exceeds the upload_max_filesize directive in php.ini.'", "event_espresso");
+						break;
+					case UPLOAD_ERR_FORM_SIZE:
+						$error_msg = __('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.', "event_espresso");
+						break;
+					case UPLOAD_ERR_PARTIAL:
+						$error_msg = __('The uploaded file was only partially uploaded.', "event_espresso");
+						break;
+					case UPLOAD_ERR_NO_FILE:
+						$error_msg = __('No file was uploaded.', "event_espresso");
+						break;
+					case UPLOAD_ERR_NO_TMP_DIR:
+						$error_msg = __('Missing a temporary folder.', "event_espresso");
+						break;
+					case UPLOAD_ERR_CANT_WRITE:
+						$error_msg = __('Failed to write file to disk.', "event_espresso");
+						break;
+					case UPLOAD_ERR_EXTENSION:
+						$error_msg = __('File upload stopped by extension.', "event_espresso");
+						break;
+					default:
+						$error_msg = __('An unknown error occurred and the file could not be uploaded', "event_espresso");
+						break;
+				}
 
 				if ( ! $error_msg ) {
 
-				    $filename	= $_FILES['file']['name'][0];
+					$filename	= $_FILES['file']['name'][0];
 					$file_ext 		= substr( strrchr( $filename, '.' ), 1 );
-				    $file_type 	= $_FILES['file']['type'][0];
-				    $temp_file	= $_FILES['file']['tmp_name'][0];
-				    $filesize    	= $_FILES['file']['size'][0] / 1024;//convert from bytes to KB
+					$file_type 	= $_FILES['file']['type'][0];
+					$temp_file	= $_FILES['file']['tmp_name'][0];
+					$filesize    	= $_FILES['file']['size'][0] / 1024;//convert from bytes to KB
 
 					if ( $file_ext=='csv' ) {
 
@@ -302,10 +302,10 @@ 
 			unset($csv_data_array[EE_CSV::metadata_header]);
 		}
 		/**
-		* @var $old_db_to_new_db_mapping 2d array: toplevel keys being model names, bottom-level keys being the original key, and
-		* the value will be the newly-inserted ID.
-		* If we have already imported data from the same website via CSV, it shoudl be kept in this wp option
-		*/
+		 * @var $old_db_to_new_db_mapping 2d array: toplevel keys being model names, bottom-level keys being the original key, and
+		 * the value will be the newly-inserted ID.
+		 * If we have already imported data from the same website via CSV, it shoudl be kept in this wp option
+		 */
 	   $old_db_to_new_db_mapping = get_option('ee_id_mapping_from'.sanitize_title($old_site_url),array());
 	   if( $old_db_to_new_db_mapping){
 		   EE_Error::add_attention(sprintf(__("We noticed you have imported data via CSV from %s before. Because of this, IDs in your CSV have been mapped to their new IDs in %s", "event_espresso"),$old_site_url,site_url()));

Spacing +171 added lines, -171 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__, '');
 /**
  * EE_Import class
  *
@@ -56,7 +56,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_Import )) {
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_Import)) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -66,7 +66,7 @@ 
 	 * Resets the importer
 	 * @return EE_Import
 	 */
-	public static function reset(){
+	public static function reset() {
 		self::$_instance = null;
 		return self::instance();
 	}
@@ -84,27 +84,27 @@ 
 	 * 	@param 	string 		$type - type of file to import
 	 *	@ return 	string
 	 */
-	public function upload_form ( $title, $intro, $form_url, $action, $type  ) {
+	public function upload_form($title, $intro, $form_url, $action, $type) {
 
-		$form_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => $action ), $form_url );
+		$form_url = EE_Admin_Page::add_query_args_and_nonce(array('action' => $action), $form_url);
 
 		ob_start();
 ?>
 	<div class="ee-upload-form-dv">
-		<h3><?php echo $title;?></h3>
-		<p><?php echo $intro;?></p>
+		<h3><?php echo $title; ?></h3>
+		<p><?php echo $intro; ?></p>
 
 		<form action="<?php echo $form_url?>" method="post" enctype="multipart/form-data">
-			<input type="hidden" name="csv_submitted" value="TRUE" id="<?php echo time();?>">
-			<input name="import" type="hidden" value="<?php echo $type;?>" />
+			<input type="hidden" name="csv_submitted" value="TRUE" id="<?php echo time(); ?>">
+			<input name="import" type="hidden" value="<?php echo $type; ?>" />
 			<input type="file" name="file[]" size="90" >
-			<input class="button-primary" type="submit" value="<?php _e( 'Upload File', 'event_espresso' );?>">
+			<input class="button-primary" type="submit" value="<?php _e('Upload File', 'event_espresso'); ?>">
 		</form>
 
 		<p class="ee-attention">
-			<b><?php _e( 'Attention', 'event_espresso' );?></b><br/>
-			<?php echo sprintf( __( 'Accepts .%s file types only.', 'event_espresso' ), $type ) ;?>
-			<?php echo __( 'Please only import CSV files exported from Event Espresso, or compatible 3rd-party software.', 'event_espresso' );?>
+			<b><?php _e('Attention', 'event_espresso'); ?></b><br/>
+			<?php echo sprintf(__('Accepts .%s file types only.', 'event_espresso'), $type); ?>
+			<?php echo __('Please only import CSV files exported from Event Espresso, or compatible 3rd-party software.', 'event_espresso'); ?>
 		</p>
 
 	</div>
@@ -125,13 +125,13 @@ 
 	 */
 	public function import() {
 
-		require_once( EE_CLASSES . 'EE_CSV.class.php' );
+		require_once(EE_CLASSES.'EE_CSV.class.php');
 		$this->EE_CSV = EE_CSV::instance();
 
-		if ( isset( $_REQUEST['import'] )) {
-			if( isset( $_POST['csv_submitted'] )) {
+		if (isset($_REQUEST['import'])) {
+			if (isset($_POST['csv_submitted'])) {
 
-			    switch ( $_FILES['file']['error'][0] ) {
+			    switch ($_FILES['file']['error'][0]) {
 			        case UPLOAD_ERR_OK:
 			            $error_msg = FALSE;
 			            break;
@@ -161,32 +161,32 @@ 
 			            break;
 			    }
 
-				if ( ! $error_msg ) {
+				if ( ! $error_msg) {
 
-				    $filename	= $_FILES['file']['name'][0];
-					$file_ext 		= substr( strrchr( $filename, '.' ), 1 );
-				    $file_type 	= $_FILES['file']['type'][0];
-				    $temp_file	= $_FILES['file']['tmp_name'][0];
-				    $filesize    	= $_FILES['file']['size'][0] / 1024;//convert from bytes to KB
+				    $filename = $_FILES['file']['name'][0];
+					$file_ext = substr(strrchr($filename, '.'), 1);
+				    $file_type = $_FILES['file']['type'][0];
+				    $temp_file = $_FILES['file']['tmp_name'][0];
+				    $filesize = $_FILES['file']['size'][0] / 1024; //convert from bytes to KB
 
-					if ( $file_ext=='csv' ) {
+					if ($file_ext == 'csv') {
 
-						$max_upload = $this->EE_CSV->get_max_upload_size();//max upload size in KB
-						if ( $filesize < $max_upload || true) {
+						$max_upload = $this->EE_CSV->get_max_upload_size(); //max upload size in KB
+						if ($filesize < $max_upload || true) {
 
-							$wp_upload_dir = str_replace( array( '\\', '/' ), DS, wp_upload_dir());
-							$path_to_file = $wp_upload_dir['basedir'] . DS . 'espresso' . DS . $filename;
+							$wp_upload_dir = str_replace(array('\\', '/'), DS, wp_upload_dir());
+							$path_to_file = $wp_upload_dir['basedir'].DS.'espresso'.DS.$filename;
 
-							if( move_uploaded_file( $temp_file, $path_to_file )) {
+							if (move_uploaded_file($temp_file, $path_to_file)) {
 
 								// convert csv to array
-								$this->csv_array = $this->EE_CSV->import_csv_to_model_data_array( $path_to_file );
+								$this->csv_array = $this->EE_CSV->import_csv_to_model_data_array($path_to_file);
 
 								// was data successfully stored in an array?
-								if ( is_array( $this->csv_array ) ) {
+								if (is_array($this->csv_array)) {
 
-									$import_what = str_replace( 'csv_import_', '', $_REQUEST['action'] );
-									$import_what = str_replace( '_', ' ', ucwords( $import_what ));
+									$import_what = str_replace('csv_import_', '', $_REQUEST['action']);
+									$import_what = str_replace('_', ' ', ucwords($import_what));
 									$processed_data = $this->csv_array;
 									$this->columns_to_save = FALSE;
 
@@ -205,33 +205,33 @@ 
 
 									}
 									// save processed codes to db
-									if ( $this->save_csv_data_array_to_db( $processed_data, $this->columns_to_save ) ) {
+									if ($this->save_csv_data_array_to_db($processed_data, $this->columns_to_save)) {
 										return TRUE;
 
 									}
 								} else {
 									// no array? must be an error
-									EE_Error::add_error(sprintf(__("No file seems to have been uploaded", "event_espresso")), __FILE__, __FUNCTION__, __LINE__ );
+									EE_Error::add_error(sprintf(__("No file seems to have been uploaded", "event_espresso")), __FILE__, __FUNCTION__, __LINE__);
 									return FALSE;
 								}
 
 							} else {
-								EE_Error::add_error(sprintf(__("%s was not successfully uploaded", "event_espresso"),$filename), __FILE__, __FUNCTION__, __LINE__ );
+								EE_Error::add_error(sprintf(__("%s was not successfully uploaded", "event_espresso"), $filename), __FILE__, __FUNCTION__, __LINE__);
 								return FALSE;
 							}
 
 						} else {
-							EE_Error::add_error( sprintf(__("%s was too large of a file and could not be uploaded. The max filesize is %s' KB.", "event_espresso"),$filename,$max_upload), __FILE__, __FUNCTION__, __LINE__ );
+							EE_Error::add_error(sprintf(__("%s was too large of a file and could not be uploaded. The max filesize is %s' KB.", "event_espresso"), $filename, $max_upload), __FILE__, __FUNCTION__, __LINE__);
 							return FALSE;
 						}
 
 					} else {
-						EE_Error::add_error( sprintf(__("%s  had an invalid file extension, not uploaded", "event_espresso"),$filename), __FILE__, __FUNCTION__, __LINE__ );
+						EE_Error::add_error(sprintf(__("%s  had an invalid file extension, not uploaded", "event_espresso"), $filename), __FILE__, __FUNCTION__, __LINE__);
 						return FALSE;
 					}
 
 				} else {
-					EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
 					return FALSE;
 				}
 
@@ -272,7 +272,7 @@ 
 	 *			@param array $fields_to_save - an array containing the csv column names as keys with the corresponding db table fields they will be saved to
 	 *			@return TRUE on success, FALSE on fail
 	 */
-	public function save_csv_data_array_to_db( $csv_data_array, $model_name = FALSE ) {
+	public function save_csv_data_array_to_db($csv_data_array, $model_name = FALSE) {
 
 
 		$success = FALSE;
@@ -282,22 +282,22 @@ 
 		$export_from_site_a_to_b = true;
 		// first level of array is not table information but a table name was passed to the function
 		// array is only two levels deep, so let's fix that by adding a level, else the next steps will fail
-		if($model_name){
+		if ($model_name) {
 			$csv_data_array = array($csv_data_array);
 		}
 		// begin looking through the $csv_data_array, expecting the toplevel key to be the model's name...
 		$old_site_url = 'none-specified';
 
 		//hanlde metadata
-		if(isset($csv_data_array[EE_CSV::metadata_header]) ){
+		if (isset($csv_data_array[EE_CSV::metadata_header])) {
 			$csv_metadata = array_shift($csv_data_array[EE_CSV::metadata_header]);
 			//ok so its metadata, dont try to save it to ehte db obviously...
-			if(isset($csv_metadata['site_url']) && $csv_metadata['site_url'] == site_url()){
+			if (isset($csv_metadata['site_url']) && $csv_metadata['site_url'] == site_url()) {
 				EE_Error::add_attention(sprintf(__("CSV Data appears to be from the same database, so attempting to update data", "event_espresso")));
 				$export_from_site_a_to_b = false;
-			}else{
-				$old_site_url = isset( $csv_metadata['site_url']) ? $csv_metadata['site_url'] : $old_site_url;
-				EE_Error::add_attention(sprintf(__("CSV Data appears to be from a different database (%s instead of %s), so we assume IDs in the CSV data DO NOT correspond to IDs in this database", "event_espresso"),$old_site_url,site_url()));
+			} else {
+				$old_site_url = isset($csv_metadata['site_url']) ? $csv_metadata['site_url'] : $old_site_url;
+				EE_Error::add_attention(sprintf(__("CSV Data appears to be from a different database (%s instead of %s), so we assume IDs in the CSV data DO NOT correspond to IDs in this database", "event_espresso"), $old_site_url, site_url()));
 			};
 			unset($csv_data_array[EE_CSV::metadata_header]);
 		}
@@ -306,40 +306,40 @@ 
 		* the value will be the newly-inserted ID.
 		* If we have already imported data from the same website via CSV, it shoudl be kept in this wp option
 		*/
-	   $old_db_to_new_db_mapping = get_option('ee_id_mapping_from'.sanitize_title($old_site_url),array());
-	   if( $old_db_to_new_db_mapping){
-		   EE_Error::add_attention(sprintf(__("We noticed you have imported data via CSV from %s before. Because of this, IDs in your CSV have been mapped to their new IDs in %s", "event_espresso"),$old_site_url,site_url()));
+	   $old_db_to_new_db_mapping = get_option('ee_id_mapping_from'.sanitize_title($old_site_url), array());
+	   if ($old_db_to_new_db_mapping) {
+		   EE_Error::add_attention(sprintf(__("We noticed you have imported data via CSV from %s before. Because of this, IDs in your CSV have been mapped to their new IDs in %s", "event_espresso"), $old_site_url, site_url()));
 	   }
 	   $old_db_to_new_db_mapping = $this->save_data_rows_to_db($csv_data_array, $export_from_site_a_to_b, $old_db_to_new_db_mapping);
 
 		//save the mapping from old db to new db in case they try re-importing the same data from the same website again
-		update_option('ee_id_mapping_from'.sanitize_title($old_site_url),$old_db_to_new_db_mapping);
+		update_option('ee_id_mapping_from'.sanitize_title($old_site_url), $old_db_to_new_db_mapping);
 
-		if ( $this->_total_updates > 0 ) {
-			EE_Error::add_success( sprintf(__("%s existing records in the database were updated.", "event_espresso"),$this->_total_updates));
+		if ($this->_total_updates > 0) {
+			EE_Error::add_success(sprintf(__("%s existing records in the database were updated.", "event_espresso"), $this->_total_updates));
 			$success = true;
 		}
-		if ( $this->_total_inserts > 0 ) {
-			EE_Error::add_success(sprintf(__("%s new records were added to the database.", "event_espresso"),$this->_total_inserts));
+		if ($this->_total_inserts > 0) {
+			EE_Error::add_success(sprintf(__("%s new records were added to the database.", "event_espresso"), $this->_total_inserts));
 			$success = true;
 		}
 
-		if ( $this->_total_update_errors > 0 ) {
-			EE_Error::add_error(sprintf(__("'One or more errors occurred, and a total of %s existing records in the database were <strong>not</strong> updated.'", "event_espresso"),$this->_total_update_errors), __FILE__, __FUNCTION__, __LINE__ );
+		if ($this->_total_update_errors > 0) {
+			EE_Error::add_error(sprintf(__("'One or more errors occurred, and a total of %s existing records in the database were <strong>not</strong> updated.'", "event_espresso"), $this->_total_update_errors), __FILE__, __FUNCTION__, __LINE__);
 			$error = true;
 		}
-		if ( $this->_total_insert_errors > 0 ) {
-			EE_Error::add_error(sprintf(__("One or more errors occurred, and a total of %s new records were <strong>not</strong> added to the database.'", "event_espresso"),$this->_total_insert_errors), __FILE__, __FUNCTION__, __LINE__ );
+		if ($this->_total_insert_errors > 0) {
+			EE_Error::add_error(sprintf(__("One or more errors occurred, and a total of %s new records were <strong>not</strong> added to the database.'", "event_espresso"), $this->_total_insert_errors), __FILE__, __FUNCTION__, __LINE__);
 			$error = true;
 		}
 
 		//lastly, we need to update the datetime and ticket sold amounts
 		//as those may ahve been affected by this
-		EEM_Datetime::instance()->update_sold( EEM_Datetime::instance()->get_all() );
+		EEM_Datetime::instance()->update_sold(EEM_Datetime::instance()->get_all());
 		EEM_Ticket::instance()->update_tickets_sold(EEM_Ticket::instance()->get_all());
 
 		// if there was at least one success and absolutely no errors
-		if ( $success && ! $error ) {
+		if ($success && ! $error) {
 			return TRUE;
 		} else {
 			return FALSE;
@@ -371,81 +371,81 @@ 
 	 * @param type $old_db_to_new_db_mapping
 	 * @return array updated $old_db_to_new_db_mapping
 	 */
-	public function save_data_rows_to_db( $csv_data_array, $export_from_site_a_to_b, $old_db_to_new_db_mapping ) {
-		foreach ( $csv_data_array as $model_name_in_csv_data => $model_data_from_import ) {
+	public function save_data_rows_to_db($csv_data_array, $export_from_site_a_to_b, $old_db_to_new_db_mapping) {
+		foreach ($csv_data_array as $model_name_in_csv_data => $model_data_from_import) {
 			//now check that assumption was correct. If
-			if ( EE_Registry::instance()->is_model_name($model_name_in_csv_data)) {
+			if (EE_Registry::instance()->is_model_name($model_name_in_csv_data)) {
 				$model_name = $model_name_in_csv_data;
-			}else {
+			} else {
 				// no table info in the array and no table name passed to the function?? FAIL
-				EE_Error::add_error( __('No table information was specified and/or found, therefore the import could not be completed','event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(__('No table information was specified and/or found, therefore the import could not be completed', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return FALSE;
 			}
 			/* @var $model EEM_Base */
 			$model = EE_Registry::instance()->load_model($model_name);
 
 			//so without further ado, scanning all the data provided for primary keys and their inital values
-			foreach ( $model_data_from_import as $model_object_data ) {
+			foreach ($model_data_from_import as $model_object_data) {
 				//before we do ANYTHING, make sure the csv row wasn't just completely blank
 				$row_is_completely_empty = true;
-				foreach($model_object_data as $field){
-					if($field){
+				foreach ($model_object_data as $field) {
+					if ($field) {
 						$row_is_completely_empty = false;
 					}
 				}
-				if($row_is_completely_empty){
+				if ($row_is_completely_empty) {
 					continue;
 				}
 				//find the PK in the row of data (or a combined key if
 				//there is no primary key)
-				if($model->has_primary_key_field()){
-					$id_in_csv =  $model_object_data[$model->primary_key_name()];
-				}else{
+				if ($model->has_primary_key_field()) {
+					$id_in_csv = $model_object_data[$model->primary_key_name()];
+				} else {
 					$id_in_csv = $model->get_index_primary_key_string($model_object_data);
 				}
 
 
-				$model_object_data = $this->_replace_temp_ids_with_mappings( $model_object_data, $model, $old_db_to_new_db_mapping, $export_from_site_a_to_b );
+				$model_object_data = $this->_replace_temp_ids_with_mappings($model_object_data, $model, $old_db_to_new_db_mapping, $export_from_site_a_to_b);
 				//now we need to decide if we're going to add a new model object given the $model_object_data,
 				//or just update.
-				if($export_from_site_a_to_b){
-					$what_to_do = $this->_decide_whether_to_insert_or_update_given_data_from_other_db( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping );
-				}else{//this is just a re-import
-					$what_to_do = $this->_decide_whether_to_insert_or_update_given_data_from_same_db( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping );
+				if ($export_from_site_a_to_b) {
+					$what_to_do = $this->_decide_whether_to_insert_or_update_given_data_from_other_db($id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping);
+				} else {//this is just a re-import
+					$what_to_do = $this->_decide_whether_to_insert_or_update_given_data_from_same_db($id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping);
 				}
-				if( $what_to_do == self::do_nothing ) {
+				if ($what_to_do == self::do_nothing) {
 					continue;
 				}
 
 				//double-check we actually want to insert, if that's what we're planning
 				//based on whether this item would be unique in the DB or not
-				if( $what_to_do == self::do_insert ) {
+				if ($what_to_do == self::do_insert) {
 					//we're supposed to be inserting. But wait, will this thing
 					//be acceptable if inserted?
-					$conflicting = $model->get_one_conflicting( $model_object_data, false );
-					if($conflicting){
+					$conflicting = $model->get_one_conflicting($model_object_data, false);
+					if ($conflicting) {
 						//ok, this item would conflict if inserted. Just update the item that it conflicts with.
 						$what_to_do = self::do_update;
 						//and if this model has a primary key, remember its mapping
-						if($model->has_primary_key_field()){
+						if ($model->has_primary_key_field()) {
 							$old_db_to_new_db_mapping[$model_name][$id_in_csv] = $conflicting->ID();
 							$model_object_data[$model->primary_key_name()] = $conflicting->ID();
-						}else{
+						} else {
 							//we want to update this conflicting item, instead of inserting a conflicting item
 							//so we need to make sure they match entirely (its possible that they only conflicted on one field, but we need them to match on other fields
 							//for the WHERE conditions in the update). At the time of this comment, there were no models like this
-							foreach($model->get_combined_primary_key_fields() as $key_field){
+							foreach ($model->get_combined_primary_key_fields() as $key_field) {
 								$model_object_data[$key_field->get_name()] = $conflicting->get($key_field->get_name());
 							}
 						}
 					}
 				}
-				if( $what_to_do == self::do_insert ) {
-					$old_db_to_new_db_mapping = $this->_insert_from_data_array( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping );
-				}elseif( $what_to_do == self::do_update ) {
-					$old_db_to_new_db_mapping = $this->_update_from_data_array( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping );
-				}else{
-					throw new EE_Error( sprintf( __( 'Programming error. We shoudl be inserting or updating, but instead we are being told to "%s", whifh is invalid', 'event_espresso' ), $what_to_do ) );
+				if ($what_to_do == self::do_insert) {
+					$old_db_to_new_db_mapping = $this->_insert_from_data_array($id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping);
+				}elseif ($what_to_do == self::do_update) {
+					$old_db_to_new_db_mapping = $this->_update_from_data_array($id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping);
+				} else {
+					throw new EE_Error(sprintf(__('Programming error. We shoudl be inserting or updating, but instead we are being told to "%s", whifh is invalid', 'event_espresso'), $what_to_do));
 				}
 			}
 		}
@@ -466,13 +466,13 @@ 
 	 * @param array $old_db_to_new_db_mapping by reference so it can be modified
 	 * @return string one of the consts on this class that starts with do_*
 	 */
-	protected function _decide_whether_to_insert_or_update_given_data_from_other_db( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping ) {
+	protected function _decide_whether_to_insert_or_update_given_data_from_other_db($id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping) {
 		$model_name = $model->get_this_model_name();
 		//if it's a site-to-site export-and-import, see if this modelobject's id
 		//in the old data that we know of
-		if( isset($old_db_to_new_db_mapping[$model_name][$id_in_csv]) ){
+		if (isset($old_db_to_new_db_mapping[$model_name][$id_in_csv])) {
 			return self::do_update;
-		}else{
+		} else {
 			return self::do_insert;
 		}
 	}
@@ -487,11 +487,11 @@ 
 	 * @param type $old_db_to_new_db_mapping
 	 * @return
 	 */
-	protected function _decide_whether_to_insert_or_update_given_data_from_same_db( $id_in_csv, $model_object_data, $model ) {
+	protected function _decide_whether_to_insert_or_update_given_data_from_same_db($id_in_csv, $model_object_data, $model) {
 		//in this case, check if this thing ACTUALLY exists in the database
-		if( $model->get_one_conflicting( $model_object_data ) ){
+		if ($model->get_one_conflicting($model_object_data)) {
 			return self::do_update;
-		}else{
+		} else {
 			return self::do_insert;
 		}
 	}
@@ -510,55 +510,55 @@ 
 	 * @param boolean $export_from_site_a_to_b
 	 * @return array updated model object data with temp IDs removed
 	 */
-	protected function _replace_temp_ids_with_mappings( $model_object_data, $model, $old_db_to_new_db_mapping, $export_from_site_a_to_b ) {
+	protected function _replace_temp_ids_with_mappings($model_object_data, $model, $old_db_to_new_db_mapping, $export_from_site_a_to_b) {
 		//if this model object's primary key is in the mapping, replace it
-		if( $model->has_primary_key_field() &&
+		if ($model->has_primary_key_field() &&
 				$model->get_primary_key_field()->is_auto_increment() &&
-				isset( $old_db_to_new_db_mapping[ $model->get_this_model_name() ] ) &&
-				isset( $old_db_to_new_db_mapping[ $model->get_this_model_name() ][ $model_object_data[ $model->primary_key_name() ] ] ) ) {
-			$model_object_data[ $model->primary_key_name() ] = $old_db_to_new_db_mapping[ $model->get_this_model_name() ][ $model_object_data[ $model->primary_key_name() ] ];
+				isset($old_db_to_new_db_mapping[$model->get_this_model_name()]) &&
+				isset($old_db_to_new_db_mapping[$model->get_this_model_name()][$model_object_data[$model->primary_key_name()]])) {
+			$model_object_data[$model->primary_key_name()] = $old_db_to_new_db_mapping[$model->get_this_model_name()][$model_object_data[$model->primary_key_name()]];
 		}
 
-		try{
+		try {
 			$model_name_field = $model->get_field_containing_related_model_name();
 			$models_pointed_to_by_model_name_field = $model_name_field->get_model_names_pointed_to();
-		}catch( EE_Error $e ){
+		} catch (EE_Error $e) {
 			$model_name_field = NULL;
 			$models_pointed_to_by_model_name_field = array();
 		}
-		foreach( $model->field_settings( true )  as $field_obj ){
-			if( $field_obj instanceof EE_Foreign_Key_Int_Field ) {
+		foreach ($model->field_settings(true)  as $field_obj) {
+			if ($field_obj instanceof EE_Foreign_Key_Int_Field) {
 				$models_pointed_to = $field_obj->get_model_names_pointed_to();
 				$found_a_mapping = false;
-				foreach( $models_pointed_to as $model_pointed_to_by_fk ) {
+				foreach ($models_pointed_to as $model_pointed_to_by_fk) {
 
-					if( $model_name_field ){
-						$value_of_model_name_field = $model_object_data[ $model_name_field->get_name() ];
-						if( $value_of_model_name_field == $model_pointed_to_by_fk ) {
-							$model_object_data[ $field_obj->get_name() ] = $this->_find_mapping_in(
-									$model_object_data[ $field_obj->get_name() ],
+					if ($model_name_field) {
+						$value_of_model_name_field = $model_object_data[$model_name_field->get_name()];
+						if ($value_of_model_name_field == $model_pointed_to_by_fk) {
+							$model_object_data[$field_obj->get_name()] = $this->_find_mapping_in(
+									$model_object_data[$field_obj->get_name()],
 									$model_pointed_to_by_fk,
 									$old_db_to_new_db_mapping,
 									$export_from_site_a_to_b );
 								$found_a_mapping = true;
 								break;
 						}
-					}else{
-						$model_object_data[ $field_obj->get_name() ] = $this->_find_mapping_in(
-								$model_object_data[ $field_obj->get_name() ],
+					} else {
+						$model_object_data[$field_obj->get_name()] = $this->_find_mapping_in(
+								$model_object_data[$field_obj->get_name()],
 								$model_pointed_to_by_fk,
 								$old_db_to_new_db_mapping,
 								$export_from_site_a_to_b );
 						$found_a_mapping = true;
 					}
 					//once we've found a mapping for this field no need to continue
-					if( $found_a_mapping ) {
+					if ($found_a_mapping) {
 						break;
 					}
 
 
 				}
-			}else{
+			} else {
 				//it's a string foreign key (which we leave alone, because those are things
 				//like country names, which we'd really rather not make 2 USAs etc (we'd actually
 				//prefer to just update one)
@@ -566,8 +566,8 @@ 
 			}
 		}
 		//
-		if( $model instanceof EEM_Term_Taxonomy ){
-			$model_object_data = $this->_handle_split_term_ids( $model_object_data );
+		if ($model instanceof EEM_Term_Taxonomy) {
+			$model_object_data = $this->_handle_split_term_ids($model_object_data);
 		}
 		return $model_object_data;
 	}
@@ -579,11 +579,11 @@ 
 	 * @param type $model_object_data
 	 * @return array new model object data
 	 */
-	protected function _handle_split_term_ids( $model_object_data ){
-		if( isset( $model_object_data['term_id'] ) && isset( $model_object_data[ 'taxonomy' ]) && apply_filters( 'FHEE__EE_Import__handle_split_term_ids__function_exists', function_exists( 'wp_get_split_term' ), $model_object_data ) ) {
-			$new_term_id = wp_get_split_term( $model_object_data[ 'term_id' ], $model_object_data[ 'taxonomy' ] );
-			if( $new_term_id ){
-				$model_object_data[ 'term_id' ] = $new_term_id;
+	protected function _handle_split_term_ids($model_object_data) {
+		if (isset($model_object_data['term_id']) && isset($model_object_data['taxonomy']) && apply_filters('FHEE__EE_Import__handle_split_term_ids__function_exists', function_exists('wp_get_split_term'), $model_object_data)) {
+			$new_term_id = wp_get_split_term($model_object_data['term_id'], $model_object_data['taxonomy']);
+			if ($new_term_id) {
+				$model_object_data['term_id'] = $new_term_id;
 			}
 		}
 		return $model_object_data;
@@ -597,18 +597,18 @@ 
 	 * @param type $export_from_site_a_to_b
 	 * @return int
 	 */
-	protected function _find_mapping_in( $object_id, $model_name, $old_db_to_new_db_mapping, $export_from_site_a_to_b) {
-		if(	isset( $old_db_to_new_db_mapping[ $model_name ][ $object_id ] ) ){
+	protected function _find_mapping_in($object_id, $model_name, $old_db_to_new_db_mapping, $export_from_site_a_to_b) {
+		if (isset($old_db_to_new_db_mapping[$model_name][$object_id])) {
 
-				return $old_db_to_new_db_mapping[ $model_name ][ $object_id ];
-			}elseif( $object_id == '0' || $object_id == '' ) {
+				return $old_db_to_new_db_mapping[$model_name][$object_id];
+			}elseif ($object_id == '0' || $object_id == '') {
 				//leave as-is
 				return $object_id;
-			}elseif( $export_from_site_a_to_b ){
+			}elseif ($export_from_site_a_to_b) {
 				//we couldn't find a mapping for this, and it's from a different site,
 				//so blank it out
 				return NULL;
-			}elseif( ! $export_from_site_a_to_b ) {
+			}elseif ( ! $export_from_site_a_to_b) {
 				//we coudln't find a mapping for this, but it's from thsi DB anyway
 				//so let's just leave it as-is
 				return $object_id;
@@ -623,36 +623,36 @@ 
 	 * @param type $old_db_to_new_db_mapping
 	 * @return array updated $old_db_to_new_db_mapping
 	 */
-	protected function _insert_from_data_array( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping ) {
+	protected function _insert_from_data_array($id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping) {
 		//remove the primary key, if there is one (we don't want it for inserts OR updates)
 		//we'll put it back in if we need it
-		if($model->has_primary_key_field() && $model->get_primary_key_field()->is_auto_increment()){
+		if ($model->has_primary_key_field() && $model->get_primary_key_field()->is_auto_increment()) {
 			$effective_id = $model_object_data[$model->primary_key_name()];
 			unset($model_object_data[$model->primary_key_name()]);
-		}else{
-			$effective_id = $model->get_index_primary_key_string( $model_object_data );
+		} else {
+			$effective_id = $model->get_index_primary_key_string($model_object_data);
 		}
 		//the model takes care of validating the CSV's input
-		try{
+		try {
 			$new_id = $model->insert($model_object_data);
-			if( $new_id ){
+			if ($new_id) {
 				$old_db_to_new_db_mapping[$model->get_this_model_name()][$id_in_csv] = $new_id;
 				$this->_total_inserts++;
-				EE_Error::add_success( sprintf(__("Successfully added new %s (with id %s) with csv data %s", "event_espresso"),$model->get_this_model_name(),$new_id, implode(",",$model_object_data)));
-			}else{
+				EE_Error::add_success(sprintf(__("Successfully added new %s (with id %s) with csv data %s", "event_espresso"), $model->get_this_model_name(), $new_id, implode(",", $model_object_data)));
+			} else {
 				$this->_total_insert_errors++;
 				//put the ID used back in there for the error message
-				if($model->has_primary_key_field()){
+				if ($model->has_primary_key_field()) {
 					$model_object_data[$model->primary_key_name()] = $effective_id;
 				}
-				EE_Error::add_error( sprintf(__("Could not insert new %s with the csv data: %s", "event_espresso"),$model->get_this_model_name(),http_build_query($model_object_data)), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(sprintf(__("Could not insert new %s with the csv data: %s", "event_espresso"), $model->get_this_model_name(), http_build_query($model_object_data)), __FILE__, __FUNCTION__, __LINE__);
 			}
-		}catch(EE_Error $e){
+		} catch (EE_Error $e) {
 			$this->_total_insert_errors++;
-			if($model->has_primary_key_field()){
+			if ($model->has_primary_key_field()) {
 				$model_object_data[$model->primary_key_name()] = $effective_id;
 			}
-			EE_Error::add_error( sprintf(__("Could not insert new %s with the csv data: %s because %s", "event_espresso"),$model->get_this_model_name(),implode(",",$model_object_data),$e->getMessage()), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(sprintf(__("Could not insert new %s with the csv data: %s because %s", "event_espresso"), $model->get_this_model_name(), implode(",", $model_object_data), $e->getMessage()), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return $old_db_to_new_db_mapping;
 	}
@@ -665,55 +665,55 @@ 
 	 * @param array $old_db_to_new_db_mapping
 	 * @return array updated $old_db_to_new_db_mapping
 	 */
-	protected function _update_from_data_array( $id_in_csv,  $model_object_data, $model, $old_db_to_new_db_mapping ) {
-		try{
+	protected function _update_from_data_array($id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping) {
+		try {
 			//let's keep two copies of the model object data:
 			//one for performing an update, one for everthing else
 			$model_object_data_for_update = $model_object_data;
-			if($model->has_primary_key_field()){
+			if ($model->has_primary_key_field()) {
 				$conditions = array($model->primary_key_name() => $model_object_data[$model->primary_key_name()]);
 				//remove the primary key because we shouldn't use it for updating
 				unset($model_object_data_for_update[$model->primary_key_name()]);
-			}elseif($model->get_combined_primary_key_fields() > 1 ){
+			}elseif ($model->get_combined_primary_key_fields() > 1) {
 				$conditions = array();
-				foreach($model->get_combined_primary_key_fields() as $key_field){
+				foreach ($model->get_combined_primary_key_fields() as $key_field) {
 					$conditions[$key_field->get_name()] = $model_object_data[$key_field->get_name()];
 				}
-			}else{
-				$model->primary_key_name();//this shoudl just throw an exception, explaining that we dont have a primary key (or a combine dkey)
+			} else {
+				$model->primary_key_name(); //this shoudl just throw an exception, explaining that we dont have a primary key (or a combine dkey)
 			}
 
-			$success = $model->update($model_object_data_for_update,array($conditions));
-			if($success){
+			$success = $model->update($model_object_data_for_update, array($conditions));
+			if ($success) {
 				$this->_total_updates++;
-				EE_Error::add_success( sprintf(__("Successfully updated %s with csv data %s", "event_espresso"),$model->get_this_model_name(),implode(",",$model_object_data_for_update)));
+				EE_Error::add_success(sprintf(__("Successfully updated %s with csv data %s", "event_espresso"), $model->get_this_model_name(), implode(",", $model_object_data_for_update)));
 				//we should still record the mapping even though it was an update
 				//because if we were going to insert somethign but it was going to conflict
 				//we would have last-minute decided to update. So we'd like to know what we updated
 				//and so we record what record ended up being updated using the mapping
-				if( $model->has_primary_key_field() ){
-					$new_key_for_mapping = $model_object_data[ $model->primary_key_name() ];
-				}else{
+				if ($model->has_primary_key_field()) {
+					$new_key_for_mapping = $model_object_data[$model->primary_key_name()];
+				} else {
 					//no primary key just a combined key
-					$new_key_for_mapping = $model->get_index_primary_key_string( $model_object_data );
+					$new_key_for_mapping = $model->get_index_primary_key_string($model_object_data);
 				}
-				$old_db_to_new_db_mapping[ $model->get_this_model_name() ][ $id_in_csv ] = $new_key_for_mapping;
-			}else{
+				$old_db_to_new_db_mapping[$model->get_this_model_name()][$id_in_csv] = $new_key_for_mapping;
+			} else {
 				$matched_items = $model->get_all(array($conditions));
-				if( ! $matched_items){
+				if ( ! $matched_items) {
 					//no items were matched (so we shouldn't have updated)... but then we should have inserted? what the heck?
 					$this->_total_update_errors++;
-					EE_Error::add_error( sprintf(__("Could not update %s with the csv data: '%s' for an unknown reason (using WHERE conditions %s)", "event_espresso"),$model->get_this_model_name(),http_build_query($model_object_data),http_build_query($conditions)), __FILE__, __FUNCTION__, __LINE__ );
-				}else{
+					EE_Error::add_error(sprintf(__("Could not update %s with the csv data: '%s' for an unknown reason (using WHERE conditions %s)", "event_espresso"), $model->get_this_model_name(), http_build_query($model_object_data), http_build_query($conditions)), __FILE__, __FUNCTION__, __LINE__);
+				} else {
 					$this->_total_updates++;
-					EE_Error::add_success( sprintf(__("%s with csv data '%s' was found in the database and didn't need updating because all the data is identical.", "event_espresso"),$model->get_this_model_name(),implode(",",$model_object_data)));
+					EE_Error::add_success(sprintf(__("%s with csv data '%s' was found in the database and didn't need updating because all the data is identical.", "event_espresso"), $model->get_this_model_name(), implode(",", $model_object_data)));
 				}
 			}
-		}catch(EE_Error $e){
+		} catch (EE_Error $e) {
 			$this->_total_update_errors++;
-			$basic_message = sprintf(__("Could not update %s with the csv data: %s because %s", "event_espresso"),$model->get_this_model_name(),implode(",",$model_object_data),$e->getMessage());
-			$debug_message = $basic_message . ' Stack trace: ' . $e->getTraceAsString();
-			EE_Error::add_error( "$basic_message | $debug_message", __FILE__, __FUNCTION__, __LINE__ );
+			$basic_message = sprintf(__("Could not update %s with the csv data: %s because %s", "event_espresso"), $model->get_this_model_name(), implode(",", $model_object_data), $e->getMessage());
+			$debug_message = $basic_message.' Stack trace: '.$e->getTraceAsString();
+			EE_Error::add_error("$basic_message | $debug_message", __FILE__, __FUNCTION__, __LINE__);
 		}
 		return $old_db_to_new_db_mapping;
 	}
@@ -722,28 +722,28 @@ 
 	 * Gets the number of inserts performed since importer was instantiated or reset
 	 * @return int
 	 */
-	public function get_total_inserts(){
+	public function get_total_inserts() {
 		return $this->_total_inserts;
 	}
 	/**
 	 *  Gets the number of insert errors since importer was instantiated or reset
 	 * @return int
 	 */
-	public function get_total_insert_errors(){
+	public function get_total_insert_errors() {
 		return $this->_total_insert_errors;
 	}
 	/**
 	 *  Gets the number of updates performed since importer was instantiated or reset
 	 * @return int
 	 */
-	public function get_total_updates(){
+	public function get_total_updates() {
 		return $this->_total_updates;
 	}
 	/**
 	 *  Gets the number of update errors since importer was instantiated or reset
 	 * @return int
 	 */
-	public function get_total_update_errors(){
+	public function get_total_update_errors() {
 		return $this->_total_update_errors;
 	}
 

Braces +27 added lines, -25 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__, '' );
 /**
  * EE_Import class
@@ -295,7 +297,7 @@ 
 			if(isset($csv_metadata['site_url']) && $csv_metadata['site_url'] == site_url()){
 				EE_Error::add_attention(sprintf(__("CSV Data appears to be from the same database, so attempting to update data", "event_espresso")));
 				$export_from_site_a_to_b = false;
-			}else{
+			} else{
 				$old_site_url = isset( $csv_metadata['site_url']) ? $csv_metadata['site_url'] : $old_site_url;
 				EE_Error::add_attention(sprintf(__("CSV Data appears to be from a different database (%s instead of %s), so we assume IDs in the CSV data DO NOT correspond to IDs in this database", "event_espresso"),$old_site_url,site_url()));
 			};
@@ -376,7 +378,7 @@ 
 			//now check that assumption was correct. If
 			if ( EE_Registry::instance()->is_model_name($model_name_in_csv_data)) {
 				$model_name = $model_name_in_csv_data;
-			}else {
+			} else {
 				// no table info in the array and no table name passed to the function?? FAIL
 				EE_Error::add_error( __('No table information was specified and/or found, therefore the import could not be completed','event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
 				return FALSE;
@@ -400,7 +402,7 @@ 
 				//there is no primary key)
 				if($model->has_primary_key_field()){
 					$id_in_csv =  $model_object_data[$model->primary_key_name()];
-				}else{
+				} else{
 					$id_in_csv = $model->get_index_primary_key_string($model_object_data);
 				}
 
@@ -410,7 +412,7 @@ 
 				//or just update.
 				if($export_from_site_a_to_b){
 					$what_to_do = $this->_decide_whether_to_insert_or_update_given_data_from_other_db( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping );
-				}else{//this is just a re-import
+				} else{//this is just a re-import
 					$what_to_do = $this->_decide_whether_to_insert_or_update_given_data_from_same_db( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping );
 				}
 				if( $what_to_do == self::do_nothing ) {
@@ -430,7 +432,7 @@ 
 						if($model->has_primary_key_field()){
 							$old_db_to_new_db_mapping[$model_name][$id_in_csv] = $conflicting->ID();
 							$model_object_data[$model->primary_key_name()] = $conflicting->ID();
-						}else{
+						} else{
 							//we want to update this conflicting item, instead of inserting a conflicting item
 							//so we need to make sure they match entirely (its possible that they only conflicted on one field, but we need them to match on other fields
 							//for the WHERE conditions in the update). At the time of this comment, there were no models like this
@@ -442,9 +444,9 @@ 
 				}
 				if( $what_to_do == self::do_insert ) {
 					$old_db_to_new_db_mapping = $this->_insert_from_data_array( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping );
-				}elseif( $what_to_do == self::do_update ) {
+				} elseif( $what_to_do == self::do_update ) {
 					$old_db_to_new_db_mapping = $this->_update_from_data_array( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping );
-				}else{
+				} else{
 					throw new EE_Error( sprintf( __( 'Programming error. We shoudl be inserting or updating, but instead we are being told to "%s", whifh is invalid', 'event_espresso' ), $what_to_do ) );
 				}
 			}
@@ -472,7 +474,7 @@ 
 		//in the old data that we know of
 		if( isset($old_db_to_new_db_mapping[$model_name][$id_in_csv]) ){
 			return self::do_update;
-		}else{
+		} else{
 			return self::do_insert;
 		}
 	}
@@ -491,7 +493,7 @@ 
 		//in this case, check if this thing ACTUALLY exists in the database
 		if( $model->get_one_conflicting( $model_object_data ) ){
 			return self::do_update;
-		}else{
+		} else{
 			return self::do_insert;
 		}
 	}
@@ -522,7 +524,7 @@ 
 		try{
 			$model_name_field = $model->get_field_containing_related_model_name();
 			$models_pointed_to_by_model_name_field = $model_name_field->get_model_names_pointed_to();
-		}catch( EE_Error $e ){
+		} catch( EE_Error $e ){
 			$model_name_field = NULL;
 			$models_pointed_to_by_model_name_field = array();
 		}
@@ -543,7 +545,7 @@ 
 								$found_a_mapping = true;
 								break;
 						}
-					}else{
+					} else{
 						$model_object_data[ $field_obj->get_name() ] = $this->_find_mapping_in(
 								$model_object_data[ $field_obj->get_name() ],
 								$model_pointed_to_by_fk,
@@ -558,7 +560,7 @@ 
 
 
 				}
-			}else{
+			} else{
 				//it's a string foreign key (which we leave alone, because those are things
 				//like country names, which we'd really rather not make 2 USAs etc (we'd actually
 				//prefer to just update one)
@@ -601,14 +603,14 @@ 
 		if(	isset( $old_db_to_new_db_mapping[ $model_name ][ $object_id ] ) ){
 
 				return $old_db_to_new_db_mapping[ $model_name ][ $object_id ];
-			}elseif( $object_id == '0' || $object_id == '' ) {
+			} elseif( $object_id == '0' || $object_id == '' ) {
 				//leave as-is
 				return $object_id;
-			}elseif( $export_from_site_a_to_b ){
+			} elseif( $export_from_site_a_to_b ){
 				//we couldn't find a mapping for this, and it's from a different site,
 				//so blank it out
 				return NULL;
-			}elseif( ! $export_from_site_a_to_b ) {
+			} elseif( ! $export_from_site_a_to_b ) {
 				//we coudln't find a mapping for this, but it's from thsi DB anyway
 				//so let's just leave it as-is
 				return $object_id;
@@ -629,7 +631,7 @@ 
 		if($model->has_primary_key_field() && $model->get_primary_key_field()->is_auto_increment()){
 			$effective_id = $model_object_data[$model->primary_key_name()];
 			unset($model_object_data[$model->primary_key_name()]);
-		}else{
+		} else{
 			$effective_id = $model->get_index_primary_key_string( $model_object_data );
 		}
 		//the model takes care of validating the CSV's input
@@ -639,7 +641,7 @@ 
 				$old_db_to_new_db_mapping[$model->get_this_model_name()][$id_in_csv] = $new_id;
 				$this->_total_inserts++;
 				EE_Error::add_success( sprintf(__("Successfully added new %s (with id %s) with csv data %s", "event_espresso"),$model->get_this_model_name(),$new_id, implode(",",$model_object_data)));
-			}else{
+			} else{
 				$this->_total_insert_errors++;
 				//put the ID used back in there for the error message
 				if($model->has_primary_key_field()){
@@ -647,7 +649,7 @@ 
 				}
 				EE_Error::add_error( sprintf(__("Could not insert new %s with the csv data: %s", "event_espresso"),$model->get_this_model_name(),http_build_query($model_object_data)), __FILE__, __FUNCTION__, __LINE__ );
 			}
-		}catch(EE_Error $e){
+		} catch(EE_Error $e){
 			$this->_total_insert_errors++;
 			if($model->has_primary_key_field()){
 				$model_object_data[$model->primary_key_name()] = $effective_id;
@@ -674,12 +676,12 @@ 
 				$conditions = array($model->primary_key_name() => $model_object_data[$model->primary_key_name()]);
 				//remove the primary key because we shouldn't use it for updating
 				unset($model_object_data_for_update[$model->primary_key_name()]);
-			}elseif($model->get_combined_primary_key_fields() > 1 ){
+			} elseif($model->get_combined_primary_key_fields() > 1 ){
 				$conditions = array();
 				foreach($model->get_combined_primary_key_fields() as $key_field){
 					$conditions[$key_field->get_name()] = $model_object_data[$key_field->get_name()];
 				}
-			}else{
+			} else{
 				$model->primary_key_name();//this shoudl just throw an exception, explaining that we dont have a primary key (or a combine dkey)
 			}
 
@@ -693,23 +695,23 @@ 
 				//and so we record what record ended up being updated using the mapping
 				if( $model->has_primary_key_field() ){
 					$new_key_for_mapping = $model_object_data[ $model->primary_key_name() ];
-				}else{
+				} else{
 					//no primary key just a combined key
 					$new_key_for_mapping = $model->get_index_primary_key_string( $model_object_data );
 				}
 				$old_db_to_new_db_mapping[ $model->get_this_model_name() ][ $id_in_csv ] = $new_key_for_mapping;
-			}else{
+			} else{
 				$matched_items = $model->get_all(array($conditions));
 				if( ! $matched_items){
 					//no items were matched (so we shouldn't have updated)... but then we should have inserted? what the heck?
 					$this->_total_update_errors++;
 					EE_Error::add_error( sprintf(__("Could not update %s with the csv data: '%s' for an unknown reason (using WHERE conditions %s)", "event_espresso"),$model->get_this_model_name(),http_build_query($model_object_data),http_build_query($conditions)), __FILE__, __FUNCTION__, __LINE__ );
-				}else{
+				} else{
 					$this->_total_updates++;
 					EE_Error::add_success( sprintf(__("%s with csv data '%s' was found in the database and didn't need updating because all the data is identical.", "event_espresso"),$model->get_this_model_name(),implode(",",$model_object_data)));
 				}
 			}
-		}catch(EE_Error $e){
+		} catch(EE_Error $e){
 			$this->_total_update_errors++;
 			$basic_message = sprintf(__("Could not update %s with the csv data: %s because %s", "event_espresso"),$model->get_this_model_name(),implode(",",$model_object_data),$e->getMessage());
 			$debug_message = $basic_message . ' Stack trace: ' . $e->getTraceAsString();

core/db_classes/EE_Line_Item.class.php

Doc Comments +26 added lines, -26 removed lines

@@ -86,7 +86,7 @@ 
 
 	/**
 	 * Gets ID
-	 * @return int
+	 * @return boolean
 	 */
 	function ID() {
 		return $this->get( 'LIN_ID' );
@@ -96,7 +96,7 @@ 
 
 	/**
 	 * Gets TXN_ID
-	 * @return int
+	 * @return boolean
 	 */
 	function TXN_ID() {
 		return $this->get( 'TXN_ID' );
@@ -107,7 +107,7 @@ 
 	/**
 	 * Sets TXN_ID
 	 * @param int $TXN_ID
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_TXN_ID( $TXN_ID ) {
 		$this->set( 'TXN_ID', $TXN_ID );
@@ -132,7 +132,7 @@ 
 	/**
 	 * Sets name
 	 * @param string $name
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_name( $name ) {
 		$this->set( 'LIN_name', $name );
@@ -142,7 +142,7 @@ 
 
 	/**
 	 * Gets desc
-	 * @return string
+	 * @return boolean
 	 */
 	function desc() {
 		return $this->get( 'LIN_desc' );
@@ -153,7 +153,7 @@ 
 	/**
 	 * Sets desc
 	 * @param string $desc
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_desc( $desc ) {
 		$this->set( 'LIN_desc', $desc );
@@ -163,7 +163,7 @@ 
 
 	/**
 	 * Gets quantity
-	 * @return int
+	 * @return boolean
 	 */
 	function quantity() {
 		return $this->get( 'LIN_quantity' );
@@ -174,7 +174,7 @@ 
 	/**
 	 * Sets quantity
 	 * @param int $quantity
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_quantity( $quantity ) {
 		$this->set( 'LIN_quantity', $quantity );
@@ -184,7 +184,7 @@ 
 
 	/**
 	 * Gets item_id
-	 * @return string
+	 * @return boolean
 	 */
 	function OBJ_ID() {
 		return $this->get( 'OBJ_ID' );
@@ -195,7 +195,7 @@ 
 	/**
 	 * Sets item_id
 	 * @param string $item_id
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_OBJ_ID( $item_id ) {
 		$this->set( 'OBJ_ID', $item_id );
@@ -205,7 +205,7 @@ 
 
 	/**
 	 * Gets item_type
-	 * @return string
+	 * @return boolean
 	 */
 	function OBJ_type() {
 		return $this->get( 'OBJ_type' );
@@ -216,7 +216,7 @@ 
 	/**
 	 * Sets item_type
 	 * @param string $OBJ_type
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_OBJ_type( $OBJ_type ) {
 		$this->set( 'OBJ_type', $OBJ_type );
@@ -226,7 +226,7 @@ 
 
 	/**
 	 * Gets unit_price
-	 * @return float
+	 * @return boolean
 	 */
 	function unit_price() {
 		return $this->get( 'LIN_unit_price' );
@@ -237,7 +237,7 @@ 
 	/**
 	 * Sets unit_price
 	 * @param float $unit_price
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_unit_price( $unit_price ) {
 		$this->set( 'LIN_unit_price', $unit_price );
@@ -274,7 +274,7 @@ 
 
 	/**
 	 * Gets percent (between 100-.001)
-	 * @return float
+	 * @return boolean
 	 */
 	function percent() {
 		return $this->get( 'LIN_percent' );
@@ -285,7 +285,7 @@ 
 	/**
 	 * Sets percent (between 100-0.01)
 	 * @param float $percent
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_percent( $percent ) {
 		$this->set( 'LIN_percent', $percent );
@@ -295,7 +295,7 @@ 
 
 	/**
 	 * Gets total
-	 * @return float
+	 * @return boolean
 	 */
 	function total() {
 		return $this->get( 'LIN_total' );
@@ -306,7 +306,7 @@ 
 	/**
 	 * Sets total
 	 * @param float $total
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_total( $total ) {
 		$this->set( 'LIN_total', $total );
@@ -316,7 +316,7 @@ 
 
 	/**
 	 * Gets order
-	 * @return int
+	 * @return boolean
 	 */
 	function order() {
 		return $this->get( 'LIN_order' );
@@ -336,7 +336,7 @@ 
 
 	/**
 	 * Gets parent
-	 * @return int
+	 * @return boolean
 	 */
 	function parent_ID() {
 		return $this->get( 'LIN_parent' );
@@ -347,7 +347,7 @@ 
 	/**
 	 * Sets parent
 	 * @param int $parent
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_parent_ID( $parent ) {
 		$this->set( 'LIN_parent', $parent );
@@ -357,7 +357,7 @@ 
 
 	/**
 	 * Gets type
-	 * @return string
+	 * @return boolean
 	 */
 	function type() {
 		return $this->get( 'LIN_type' );
@@ -368,7 +368,7 @@ 
 	/**
 	 * Sets type
 	 * @param string $type
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_type( $type ) {
 		$this->set( 'LIN_type', $type );
@@ -415,7 +415,7 @@ 
 
 	/**
 	 * Gets code
-	 * @return string
+	 * @return boolean
 	 */
 	function code() {
 		return $this->get( 'LIN_code' );
@@ -426,7 +426,7 @@ 
 	/**
 	 * Sets code
 	 * @param string $code
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_code( $code ) {
 		$this->set( 'LIN_code', $code );
@@ -447,7 +447,7 @@ 
 	/**
 	 * Sets is_taxable
 	 * @param boolean $is_taxable
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_is_taxable( $is_taxable ) {
 		$this->set( 'LIN_is_taxable', $is_taxable );

Braces +3 added lines, -3 removed lines

@@ -670,7 +670,7 @@ 
 			if( isset( $this->_children[ $code ] ) ) {
 				unset( $this->_children[ $code ] );
 				return 1;
-			}else{
+			} else{
 				return 0;
 			}
 		}
@@ -1007,10 +1007,10 @@ 
 					//that's taxable too (the taxable total so far)
 					if( $child_line_item->is_percent() ) {
 						$total = $total + ( $total * $child_line_item->percent() / 100 );
-					}else{
+					} else{
 						$total += $child_line_item->total();
 					}
-				}elseif( $child_line_item->type() == EEM_Line_Item::type_sub_total ){
+				} elseif( $child_line_item->type() == EEM_Line_Item::type_sub_total ){
 					$total += $child_line_item->taxable_total();
 				}
 			}

Spacing +215 added lines, -215 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
@@ -50,9 +50,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Line_Item
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -63,8 +63,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Line_Item
 	 */
-	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);
 	}
 
 
@@ -75,10 +75,10 @@ 
 	 * @param bool   $bydb
 	 * @param string $timezone
 	 */
-	protected function __construct( $fieldValues = array(), $bydb = FALSE, $timezone = '' ) {
-		parent::__construct( $fieldValues, $bydb, $timezone );
-		if ( ! $this->get( 'LIN_code' ) ) {
-			$this->set_code( $this->generate_code() );
+	protected function __construct($fieldValues = array(), $bydb = FALSE, $timezone = '') {
+		parent::__construct($fieldValues, $bydb, $timezone);
+		if ( ! $this->get('LIN_code')) {
+			$this->set_code($this->generate_code());
 		}
 	}
 
@@ -89,7 +89,7 @@ 
 	 * @return int
 	 */
 	function ID() {
-		return $this->get( 'LIN_ID' );
+		return $this->get('LIN_ID');
 	}
 
 
@@ -99,7 +99,7 @@ 
 	 * @return int
 	 */
 	function TXN_ID() {
-		return $this->get( 'TXN_ID' );
+		return $this->get('TXN_ID');
 	}
 
 
@@ -109,8 +109,8 @@ 
 	 * @param int $TXN_ID
 	 * @return boolean
 	 */
-	function set_TXN_ID( $TXN_ID ) {
-		$this->set( 'TXN_ID', $TXN_ID );
+	function set_TXN_ID($TXN_ID) {
+		$this->set('TXN_ID', $TXN_ID);
 	}
 
 
@@ -120,9 +120,9 @@ 
 	 * @return string
 	 */
 	function name() {
-		$name =  $this->get( 'LIN_name' );
-		if( ! $name ){
-			$name = ucwords( str_replace( '-', ' ', $this->type() ) );
+		$name = $this->get('LIN_name');
+		if ( ! $name) {
+			$name = ucwords(str_replace('-', ' ', $this->type()));
 		}
 		return $name;
 	}
@@ -134,8 +134,8 @@ 
 	 * @param string $name
 	 * @return boolean
 	 */
-	function set_name( $name ) {
-		$this->set( 'LIN_name', $name );
+	function set_name($name) {
+		$this->set('LIN_name', $name);
 	}
 
 
@@ -145,7 +145,7 @@ 
 	 * @return string
 	 */
 	function desc() {
-		return $this->get( 'LIN_desc' );
+		return $this->get('LIN_desc');
 	}
 
 
@@ -155,8 +155,8 @@ 
 	 * @param string $desc
 	 * @return boolean
 	 */
-	function set_desc( $desc ) {
-		$this->set( 'LIN_desc', $desc );
+	function set_desc($desc) {
+		$this->set('LIN_desc', $desc);
 	}
 
 
@@ -166,7 +166,7 @@ 
 	 * @return int
 	 */
 	function quantity() {
-		return $this->get( 'LIN_quantity' );
+		return $this->get('LIN_quantity');
 	}
 
 
@@ -176,8 +176,8 @@ 
 	 * @param int $quantity
 	 * @return boolean
 	 */
-	function set_quantity( $quantity ) {
-		$this->set( 'LIN_quantity', $quantity );
+	function set_quantity($quantity) {
+		$this->set('LIN_quantity', $quantity);
 	}
 
 
@@ -187,7 +187,7 @@ 
 	 * @return string
 	 */
 	function OBJ_ID() {
-		return $this->get( 'OBJ_ID' );
+		return $this->get('OBJ_ID');
 	}
 
 
@@ -197,8 +197,8 @@ 
 	 * @param string $item_id
 	 * @return boolean
 	 */
-	function set_OBJ_ID( $item_id ) {
-		$this->set( 'OBJ_ID', $item_id );
+	function set_OBJ_ID($item_id) {
+		$this->set('OBJ_ID', $item_id);
 	}
 
 
@@ -208,7 +208,7 @@ 
 	 * @return string
 	 */
 	function OBJ_type() {
-		return $this->get( 'OBJ_type' );
+		return $this->get('OBJ_type');
 	}
 
 
@@ -218,8 +218,8 @@ 
 	 * @param string $OBJ_type
 	 * @return boolean
 	 */
-	function set_OBJ_type( $OBJ_type ) {
-		$this->set( 'OBJ_type', $OBJ_type );
+	function set_OBJ_type($OBJ_type) {
+		$this->set('OBJ_type', $OBJ_type);
 	}
 
 
@@ -229,7 +229,7 @@ 
 	 * @return float
 	 */
 	function unit_price() {
-		return $this->get( 'LIN_unit_price' );
+		return $this->get('LIN_unit_price');
 	}
 
 
@@ -239,8 +239,8 @@ 
 	 * @param float $unit_price
 	 * @return boolean
 	 */
-	function set_unit_price( $unit_price ) {
-		$this->set( 'LIN_unit_price', $unit_price );
+	function set_unit_price($unit_price) {
+		$this->set('LIN_unit_price', $unit_price);
 	}
 
 
@@ -251,19 +251,19 @@ 
 	 * @return boolean
 	 */
 	function is_percent() {
-		if( $this->is_tax_sub_total() ) {
+		if ($this->is_tax_sub_total()) {
 			//tax subtotals HAVE a percent on them, that percentage only applies
 			//to taxable items, so its' an exception. Treat it like a flat line item
 			return false;
 		}
-		$unit_price = abs( $this->get( 'LIN_unit_price' ) );
-		$percent = abs( $this->get( 'LIN_percent' ) );
-		if ( $unit_price < .001 && $percent ) {
+		$unit_price = abs($this->get('LIN_unit_price'));
+		$percent = abs($this->get('LIN_percent'));
+		if ($unit_price < .001 && $percent) {
 			return TRUE;
-		} elseif ( $unit_price >= .001 && !$percent ) {
+		} elseif ($unit_price >= .001 && ! $percent) {
 			return FALSE;
-		} elseif ( $unit_price >= .001 && $percent ) {
-			throw new EE_Error( sprintf( __( "A Line Item can not have a unit price of (%s) AND a percent (%s)!", "event_espresso" ), $unit_price, $percent ) );
+		} elseif ($unit_price >= .001 && $percent) {
+			throw new EE_Error(sprintf(__("A Line Item can not have a unit price of (%s) AND a percent (%s)!", "event_espresso"), $unit_price, $percent));
 		} else {
 			// if they're both 0, assume its not a percent item
 			return FALSE;
@@ -277,7 +277,7 @@ 
 	 * @return float
 	 */
 	function percent() {
-		return $this->get( 'LIN_percent' );
+		return $this->get('LIN_percent');
 	}
 
 
@@ -287,8 +287,8 @@ 
 	 * @param float $percent
 	 * @return boolean
 	 */
-	function set_percent( $percent ) {
-		$this->set( 'LIN_percent', $percent );
+	function set_percent($percent) {
+		$this->set('LIN_percent', $percent);
 	}
 
 
@@ -298,7 +298,7 @@ 
 	 * @return float
 	 */
 	function total() {
-		return $this->get( 'LIN_total' );
+		return $this->get('LIN_total');
 	}
 
 
@@ -308,8 +308,8 @@ 
 	 * @param float $total
 	 * @return boolean
 	 */
-	function set_total( $total ) {
-		$this->set( 'LIN_total', $total );
+	function set_total($total) {
+		$this->set('LIN_total', $total);
 	}
 
 
@@ -319,7 +319,7 @@ 
 	 * @return int
 	 */
 	function order() {
-		return $this->get( 'LIN_order' );
+		return $this->get('LIN_order');
 	}
 
 
@@ -328,8 +328,8 @@ 
 	 * Sets order
 	 * @param int $order
 	 */
-	function set_order( $order ) {
-		$this->set( 'LIN_order', $order );
+	function set_order($order) {
+		$this->set('LIN_order', $order);
 	}
 
 
@@ -339,7 +339,7 @@ 
 	 * @return int
 	 */
 	function parent_ID() {
-		return $this->get( 'LIN_parent' );
+		return $this->get('LIN_parent');
 	}
 
 
@@ -349,8 +349,8 @@ 
 	 * @param int $parent
 	 * @return boolean
 	 */
-	function set_parent_ID( $parent ) {
-		$this->set( 'LIN_parent', $parent );
+	function set_parent_ID($parent) {
+		$this->set('LIN_parent', $parent);
 	}
 
 
@@ -360,7 +360,7 @@ 
 	 * @return string
 	 */
 	function type() {
-		return $this->get( 'LIN_type' );
+		return $this->get('LIN_type');
 	}
 
 
@@ -370,8 +370,8 @@ 
 	 * @param string $type
 	 * @return boolean
 	 */
-	function set_type( $type ) {
-		$this->set( 'LIN_type', $type );
+	function set_type($type) {
+		$this->set('LIN_type', $type);
 	}
 
 
@@ -384,8 +384,8 @@ 
 	 * @return EE_Line_Item
 	 */
 	public function parent() {
-		if( $this->ID() ) {
-			return $this->get_model()->get_one_by_ID( $this->parent_ID() );
+		if ($this->ID()) {
+			return $this->get_model()->get_one_by_ID($this->parent_ID());
 		} else {
 			return $this->_parent;
 		}
@@ -398,13 +398,13 @@ 
 	 * @return EE_Line_Item[]
 	 */
 	public function children() {
-		if ( $this->ID() ) {
+		if ($this->ID()) {
 			return $this->get_model()->get_all(
 					array(
-						array( 'LIN_parent' => $this->ID() ),
-						'order_by' => array( 'LIN_order' => 'ASC' ) ) );
+						array('LIN_parent' => $this->ID()),
+						'order_by' => array('LIN_order' => 'ASC') ) );
 		} else {
-			if ( ! is_array( $this->_children ) ) {
+			if ( ! is_array($this->_children)) {
 				$this->_children = array();
 			}
 			return $this->_children;
@@ -418,7 +418,7 @@ 
 	 * @return string
 	 */
 	function code() {
-		return $this->get( 'LIN_code' );
+		return $this->get('LIN_code');
 	}
 
 
@@ -428,8 +428,8 @@ 
 	 * @param string $code
 	 * @return boolean
 	 */
-	function set_code( $code ) {
-		$this->set( 'LIN_code', $code );
+	function set_code($code) {
+		$this->set('LIN_code', $code);
 	}
 
 
@@ -439,7 +439,7 @@ 
 	 * @return boolean
 	 */
 	function is_taxable() {
-		return $this->get( 'LIN_is_taxable' );
+		return $this->get('LIN_is_taxable');
 	}
 
 
@@ -449,8 +449,8 @@ 
 	 * @param boolean $is_taxable
 	 * @return boolean
 	 */
-	function set_is_taxable( $is_taxable ) {
-		$this->set( 'LIN_is_taxable', $is_taxable );
+	function set_is_taxable($is_taxable) {
+		$this->set('LIN_is_taxable', $is_taxable);
 	}
 
 
@@ -465,7 +465,7 @@ 
 	 */
 	function get_object() {
 		$model_name_of_related_obj = $this->OBJ_type();
-		return $this->get_model()->has_relation(  $model_name_of_related_obj ) ? $this->get_first_related( $model_name_of_related_obj ) : NULL;
+		return $this->get_model()->has_relation($model_name_of_related_obj) ? $this->get_first_related($model_name_of_related_obj) : NULL;
 	}
 
 
@@ -476,11 +476,11 @@ 
 	 * @param array $query_params
 	 * @return EE_Ticket
 	 */
-	function ticket( $query_params = array() ) {
+	function ticket($query_params = array()) {
 		//we're going to assume that when this method is called we always want to receive the attached ticket EVEN if that ticket is archived.  This can be overridden via the incoming $query_params argument
-		$remove_defaults = array( 'default_where_conditions' => 'none' );
-		$query_params = array_merge( $remove_defaults, $query_params );
-		return $this->get_first_related( 'Ticket', $query_params );
+		$remove_defaults = array('default_where_conditions' => 'none');
+		$query_params = array_merge($remove_defaults, $query_params);
+		return $this->get_first_related('Ticket', $query_params);
 	}
 
 
@@ -490,11 +490,11 @@ 
 	 * @return EE_Datetime | NULL
 	 */
 	function get_ticket_datetime() {
-		if ( $this->OBJ_type() === 'Ticket' ) {
+		if ($this->OBJ_type() === 'Ticket') {
 			$ticket = $this->ticket();
-			if ( $ticket instanceof EE_Ticket ) {
+			if ($ticket instanceof EE_Ticket) {
 				$datetime = $ticket->first_datetime();
-				if ( $datetime instanceof EE_Datetime ) {
+				if ($datetime instanceof EE_Datetime) {
 					return $datetime;
 				}
 			}
@@ -510,9 +510,9 @@ 
 	 * @return string
 	 */
 	function ticket_event_name() {
-		$event_name = __( "Unknown", "event_espresso" );
+		$event_name = __("Unknown", "event_espresso");
 		$event = $this->ticket_event();
-		if ( $event instanceof EE_Event ) {
+		if ($event instanceof EE_Event) {
 			$event_name = $event->name();
 		}
 		return $event_name;
@@ -526,9 +526,9 @@ 
 	function ticket_event() {
 		$event = null;
 		$ticket = $this->ticket();
-		if ( $ticket instanceof EE_Ticket ) {
+		if ($ticket instanceof EE_Ticket) {
 			$datetime = $ticket->first_datetime();
-			if ( $datetime instanceof EE_Datetime ) {
+			if ($datetime instanceof EE_Datetime) {
 				$event = $datetime->event();
 			}
 		}
@@ -543,11 +543,11 @@ 
 	 * @param string $time_format
 	 * @return string
 	 */
-	function ticket_datetime_start( $date_format = '', $time_format = '' ) {
-		$first_datetime_string = __( "Unknown", "event_espresso" );
+	function ticket_datetime_start($date_format = '', $time_format = '') {
+		$first_datetime_string = __("Unknown", "event_espresso");
 		$datetime = $this->get_ticket_datetime();
-		if ( $datetime ) {
-			$first_datetime_string = $datetime->start_date_and_time( $date_format, $time_format );
+		if ($datetime) {
+			$first_datetime_string = $datetime->start_date_and_time($date_format, $time_format);
 		}
 		return $first_datetime_string;
 	}
@@ -562,26 +562,26 @@ 
 	 * @return bool success
 	 * @throws \EE_Error
 	 */
-	function add_child_line_item( EEI_Line_Item $line_item, $set_order = true ) {
+	function add_child_line_item(EEI_Line_Item $line_item, $set_order = true) {
 		// should we calculate the LIN_order for this line item ?
-		if ( $set_order || $line_item->order() === null ) {
-			$line_item->set_order( count( $this->children() ) );
+		if ($set_order || $line_item->order() === null) {
+			$line_item->set_order(count($this->children()));
 		}
-		if ( $this->ID() ) {
+		if ($this->ID()) {
 			//check for any duplicate line items (with the same code), if so, this replaces it
-			$line_item_with_same_code = $this->get_child_line_item(  $line_item->code() );
-			if( $line_item_with_same_code instanceof EE_Line_Item && $line_item_with_same_code !== $line_item ) {
-				$this->delete_child_line_item( $line_item_with_same_code->code() );
+			$line_item_with_same_code = $this->get_child_line_item($line_item->code());
+			if ($line_item_with_same_code instanceof EE_Line_Item && $line_item_with_same_code !== $line_item) {
+				$this->delete_child_line_item($line_item_with_same_code->code());
 			}
-			$line_item->set_parent_ID( $this->ID() );
-			if( $this->TXN_ID() ){
-				$line_item->set_TXN_ID( $this->TXN_ID() );
+			$line_item->set_parent_ID($this->ID());
+			if ($this->TXN_ID()) {
+				$line_item->set_TXN_ID($this->TXN_ID());
 			}
 			return $line_item->save();
 		} else {
-			$this->_children[ $line_item->code() ] = $line_item;
-			if( $line_item->parent() != $this ) {
-				$line_item->set_parent( $this );
+			$this->_children[$line_item->code()] = $line_item;
+			if ($line_item->parent() != $this) {
+				$line_item->set_parent($this);
 			}
 			return TRUE;
 		}
@@ -595,16 +595,16 @@ 
 	 * @param EE_Line_Item $line_item
 	 *
 	 */
-	public function set_parent( $line_item ) {
-		if ( $this->ID() ) {
-			if( ! $line_item->ID() ) {
+	public function set_parent($line_item) {
+		if ($this->ID()) {
+			if ( ! $line_item->ID()) {
 				$line_item->save();
 			}
-			$this->set_parent_ID( $line_item->ID() );
+			$this->set_parent_ID($line_item->ID());
 			$this->save();
 		} else {
 			$this->_parent = $line_item;
-			$this->set_parent_ID( $line_item->ID() );
+			$this->set_parent_ID($line_item->ID());
 		}
 	}
 
@@ -617,11 +617,11 @@ 
 	 * @param string $code
 	 * @return EE_Line_Item
 	 */
-	function get_child_line_item( $code ) {
-		if ( $this->ID() ) {
-			return $this->get_model()->get_one( array( array( 'LIN_parent' => $this->ID(), 'LIN_code' => $code ) ) );
+	function get_child_line_item($code) {
+		if ($this->ID()) {
+			return $this->get_model()->get_one(array(array('LIN_parent' => $this->ID(), 'LIN_code' => $code)));
 		} else {
-			return isset( $this->_children[ $code ] ) ? $this->_children[ $code ] : null;
+			return isset($this->_children[$code]) ? $this->_children[$code] : null;
 		}
 	}
 
@@ -632,10 +632,10 @@ 
 	 * @return int
 	 */
 	function delete_children_line_items() {
-		if ( $this->ID() ) {
-			return $this->get_model()->delete( array( array( 'LIN_parent' => $this->ID() ) ) );
+		if ($this->ID()) {
+			return $this->get_model()->delete(array(array('LIN_parent' => $this->ID())));
 		} else {
-			$count = count( $this->_children );
+			$count = count($this->_children);
 			$this->_children = array();
 			return $count;
 		}
@@ -652,25 +652,25 @@ 
 	 * @param bool $stop_search_once_found
 	 * @return int count of items deleted (or simply removed from the line item's cache, if not has not been saved to the DB yet)
 	 */
-	function delete_child_line_item( $code, $stop_search_once_found = true ) {
-		if ( $this->ID() ) {
+	function delete_child_line_item($code, $stop_search_once_found = true) {
+		if ($this->ID()) {
 			$items_deleted = 0;
-			if( $this->code() == $code ) {
-				$items_deleted += EEH_Line_Item::delete_all_child_items( $this );
-				$items_deleted += intval( $this->delete() );
-				if( $stop_search_once_found ){
+			if ($this->code() == $code) {
+				$items_deleted += EEH_Line_Item::delete_all_child_items($this);
+				$items_deleted += intval($this->delete());
+				if ($stop_search_once_found) {
 					return $items_deleted;
 				}
 			}
-			foreach( $this->children() as $child_line_item ) {
-				$items_deleted += $child_line_item->delete_child_line_item( $code, $stop_search_once_found );
+			foreach ($this->children() as $child_line_item) {
+				$items_deleted += $child_line_item->delete_child_line_item($code, $stop_search_once_found);
 			}
 			return $items_deleted;
 		} else {
-			if( isset( $this->_children[ $code ] ) ) {
-				unset( $this->_children[ $code ] );
+			if (isset($this->_children[$code])) {
+				unset($this->_children[$code]);
 				return 1;
-			}else{
+			} else {
 				return 0;
 			}
 		}
@@ -683,9 +683,9 @@ 
 	 * @return boolean
 	 */
 	public function delete_if_childless_subtotal() {
-		if( $this->ID() &&
+		if ($this->ID() &&
 				$this->type() == EEM_Line_Item::type_sub_total &&
-				! $this->children() ) {
+				! $this->children()) {
 			return $this->delete();
 		} else {
 			return false;
@@ -700,7 +700,7 @@ 
 	 */
 	function generate_code() {
 		// each line item in the cart requires a unique identifier
-		return md5( $this->get( 'OBJ_type' ) . $this->get( 'OBJ_ID' ) . microtime() );
+		return md5($this->get('OBJ_type').$this->get('OBJ_ID').microtime());
 	}
 
 
@@ -764,7 +764,7 @@ 
 	 * @return string like '2, 004.00', formatted according to the localized currency
 	 */
 	function unit_price_no_code() {
-		return $this->get_pretty( 'LIN_unit_price', 'no_currency_code' );
+		return $this->get_pretty('LIN_unit_price', 'no_currency_code');
 	}
 
 
@@ -774,7 +774,7 @@ 
 	 * @return string like '2, 004.00', formatted according to the localized currency
 	 */
 	function total_no_code() {
-		return $this->get_pretty( 'LIN_total', 'no_currency_code' );
+		return $this->get_pretty('LIN_total', 'no_currency_code');
 	}
 
 
@@ -793,17 +793,17 @@ 
 
 		$total = $pre_tax_total + $tax_total;
 		// no negative totals plz
-		$total = max( $total, 0 );
-		$this->set_total( $total );
+		$total = max($total, 0);
+		$this->set_total($total);
 		//only update the related transaction's total
 		//if we intend to save this line item and its a grand total
-		if(
+		if (
 			$this->allow_persist() &&
 			$this->type() == EEM_Line_Item::type_total &&
 			$this->transaction() instanceof EE_Transaction
-		){
-			$this->transaction()->set_total( $total );
-			if ( $this->transaction()->ID() ) {
+		) {
+			$this->transaction()->set_total($total);
+			if ($this->transaction()->ID()) {
 				$this->transaction()->save();
 			}
 		}
@@ -824,42 +824,42 @@ 
 		$total = 0;
 		$my_children = $this->children();
 		//completely ignore tax and tax sub-totals when calculating the pre-tax-total
-		if ( $this->is_tax_sub_total() || $this->is_tax() ) {
+		if ($this->is_tax_sub_total() || $this->is_tax()) {
 			return 0;
 		} elseif (
-			( $this->is_sub_line_item() || $this->is_line_item() )
-			&& empty( $my_children )
+			($this->is_sub_line_item() || $this->is_line_item())
+			&& empty($my_children)
 		) {
 			$total = $this->unit_price() * $this->quantity();
-		} elseif( $this->is_sub_total() || $this->is_total() ) {
-			$total = $this->_recalculate_pretax_total_for_subtotal( $total, $my_children );
-		} elseif (  $this->is_line_item() && ! empty( $my_children ) ) {
-			$total = $this->_recalculate_pretax_total_for_line_item( $total, $my_children );
+		} elseif ($this->is_sub_total() || $this->is_total()) {
+			$total = $this->_recalculate_pretax_total_for_subtotal($total, $my_children);
+		} elseif ($this->is_line_item() && ! empty($my_children)) {
+			$total = $this->_recalculate_pretax_total_for_line_item($total, $my_children);
 		}
 		//ensure all non-line items and non-sub-line-items have a quantity of 1
-		if( ! $this->is_line_item() && ! $this->is_sub_line_item() ) {
-			$this->set_quantity( 1 );
-			if( ! $this->is_percent() ) {
-				$this->set_unit_price( $this->total() );
+		if ( ! $this->is_line_item() && ! $this->is_sub_line_item()) {
+			$this->set_quantity(1);
+			if ( ! $this->is_percent()) {
+				$this->set_unit_price($this->total());
 			}
 		}
 
 		//we don't want to bother saving grand totals, because that needs to factor in taxes anyways
 		//so it ought to be
-		if( ! $this->is_total() ) {
-			$this->set_total( $total );
+		if ( ! $this->is_total()) {
+			$this->set_total($total);
 			//if not a percent line item, make sure we keep the unit price in sync
-			if(
+			if (
 				$this->is_line_item() &&
-				! empty( $my_children ) &&
+				! empty($my_children) &&
 				! $this->is_percent()
 			) {
-				if( $this->quantity() === 0 ){
+				if ($this->quantity() === 0) {
 					$new_unit_price = 0;
 				} else {
 					$new_unit_price = $this->total() / $this->quantity();
 				}
-				$this->set_unit_price( $new_unit_price );
+				$this->set_unit_price($new_unit_price);
 			}
 			$this->maybe_save();
 		}
@@ -875,14 +875,14 @@ 
 	 * @param EE_Line_Item[] $my_children
 	 * @return float
 	 */
-	protected function _recalculate_pretax_total_for_subtotal( $calculated_total_so_far, $my_children = null ) {
-		if( $my_children === null ) {
+	protected function _recalculate_pretax_total_for_subtotal($calculated_total_so_far, $my_children = null) {
+		if ($my_children === null) {
 			$my_children = $this->children();
 		}
 		//get the total of all its children
-		foreach ( $my_children as $child_line_item ) {
-			if ( $child_line_item instanceof EE_Line_Item ) {
-				if ( $child_line_item->is_percent() ) {
+		foreach ($my_children as $child_line_item) {
+			if ($child_line_item instanceof EE_Line_Item) {
+				if ($child_line_item->is_percent()) {
 					
 					//round as we go so that the line items add up ok
 					$percent_total = round(
@@ -890,25 +890,25 @@ 
 						EE_Registry::instance()->CFG->currency->dec_plc
 					);
 					
-					$child_line_item->set_total( $percent_total );
+					$child_line_item->set_total($percent_total);
 					//so far all percent line items should have a quantity of 1
 					//(ie, no double percent discounts. Although that might be requested someday)
-					$child_line_item->set_quantity( 1 );
+					$child_line_item->set_quantity(1);
 					$child_line_item->maybe_save();
 					$calculated_total_so_far += $percent_total;
 				} else {
 					//verify flat sub-line-item quantities match their parent
-					if( $child_line_item->is_sub_line_item() ) {
-						$child_line_item->set_quantity( $this->quantity() );
+					if ($child_line_item->is_sub_line_item()) {
+						$child_line_item->set_quantity($this->quantity());
 					}
 					$calculated_total_so_far += $child_line_item->recalculate_pre_tax_total();
 				}
 			}
 		}
 
-		if( $this->is_sub_total() ){
+		if ($this->is_sub_total()) {
 			// no negative totals plz
-			$calculated_total_so_far = max( $calculated_total_so_far, 0 );
+			$calculated_total_so_far = max($calculated_total_so_far, 0);
 		}
 		return $calculated_total_so_far;
 	}
@@ -922,8 +922,8 @@ 
 	 * @param EE_Line_Item[] $my_children
 	 * @return float
 	 */
-	protected function _recalculate_pretax_total_for_line_item( $calculated_total_so_far, $my_children = null ) {
-		if( $my_children === null ) {
+	protected function _recalculate_pretax_total_for_line_item($calculated_total_so_far, $my_children = null) {
+		if ($my_children === null) {
 			$my_children = $this->children();
 		}
 		//we need to keep track of the running total for a single item,
@@ -931,9 +931,9 @@ 
 		$unit_price_for_total = 0;
 		$quantity_for_total = 1;
 		//get the total of all its children
-		foreach ( $my_children as $child_line_item ) {
-			if ( $child_line_item instanceof EE_Line_Item ) {
-				if ( $child_line_item->is_percent() ) {
+		foreach ($my_children as $child_line_item) {
+			if ($child_line_item instanceof EE_Line_Item) {
+				if ($child_line_item->is_percent()) {
 					//it should be the unit-price-so-far multiplied by teh percent multiplied by the quantity
 					//not total multiplied by percent, because that ignores rounding along-the-way
 					$percent_unit_price = round(
@@ -941,17 +941,17 @@ 
 						EE_Registry::instance()->CFG->currency->dec_plc
 					);
 					$percent_total = $percent_unit_price * $quantity_for_total;
-					$child_line_item->set_total( $percent_total );
+					$child_line_item->set_total($percent_total);
 					//so far all percent line items should have a quantity of 1
 					//(ie, no double percent discounts. Although that might be requested someday)
-					$child_line_item->set_quantity( 1 );
+					$child_line_item->set_quantity(1);
 					$child_line_item->maybe_save();
 					$calculated_total_so_far += $percent_total;
 					$unit_price_for_total += $percent_unit_price;
 				} else {
 					//verify flat sub-line-item quantities match their parent
-					if( $child_line_item->is_sub_line_item() ) {
-						$child_line_item->set_quantity( $this->quantity() );
+					if ($child_line_item->is_sub_line_item()) {
+						$child_line_item->set_quantity($this->quantity());
 					}
 					$quantity_for_total = $child_line_item->quantity();
 					$calculated_total_so_far += $child_line_item->recalculate_pre_tax_total();
@@ -975,10 +975,10 @@ 
 		//calculate the pretax total
 		$taxable_total = $this->taxable_total();
 		$tax_total = 0;
-		foreach ( $taxes as $tax ) {
+		foreach ($taxes as $tax) {
 			$total_on_this_tax = $taxable_total * $tax->percent() / 100;
 			//remember the total on this line item
-			$tax->set_total( $total_on_this_tax );
+			$tax->set_total($total_on_this_tax);
 			$tax_total += $tax->total();
 		}
 		$this->_recalculate_tax_sub_total();
@@ -992,21 +992,21 @@ 
 	 * @return void
 	 */
 	private function _recalculate_tax_sub_total() {
-		if ( $this->is_tax_sub_total() ) {
+		if ($this->is_tax_sub_total()) {
 			$total = 0;
 			$total_percent = 0;
 			//simply loop through all its children (which should be taxes) and sum their total
-			foreach ( $this->children() as $child_tax ) {
-				if ( $child_tax instanceof EE_Line_Item ) {
+			foreach ($this->children() as $child_tax) {
+				if ($child_tax instanceof EE_Line_Item) {
 					$total += $child_tax->total();
 					$total_percent += $child_tax->percent();
 				}
 			}
-			$this->set_total( $total );
-			$this->set_percent( $total_percent );
-		} elseif ( $this->is_total() ) {
-			foreach ( $this->children() as $maybe_tax_subtotal ) {
-				if ( $maybe_tax_subtotal instanceof EE_Line_Item ) {
+			$this->set_total($total);
+			$this->set_percent($total_percent);
+		} elseif ($this->is_total()) {
+			foreach ($this->children() as $maybe_tax_subtotal) {
+				if ($maybe_tax_subtotal instanceof EE_Line_Item) {
 					$maybe_tax_subtotal->_recalculate_tax_sub_total();
 				}
 			}
@@ -1022,8 +1022,8 @@ 
 	public function get_total_tax() {
 		$this->_recalculate_tax_sub_total();
 		$total = 0;
-		foreach ( $this->tax_descendants() as $tax_line_item ) {
-			if ( $tax_line_item instanceof EE_Line_Item ) {
+		foreach ($this->tax_descendants() as $tax_line_item) {
+			if ($tax_line_item instanceof EE_Line_Item) {
 				$total += $tax_line_item->total();
 			}
 		}
@@ -1037,15 +1037,15 @@ 
 	 */
 	public function get_items_total() {
 		//by default, let's make sure we're consistent with the existing line item
-		if( $this->is_total() ) {
-			$pretax_subtotal_li = EEH_Line_Item::get_pre_tax_subtotal( $this );
-			if( $pretax_subtotal_li instanceof EE_Line_Item ) {
+		if ($this->is_total()) {
+			$pretax_subtotal_li = EEH_Line_Item::get_pre_tax_subtotal($this);
+			if ($pretax_subtotal_li instanceof EE_Line_Item) {
 				return $pretax_subtotal_li->total();
 			}
 		}
 		$total = 0;
-		foreach ( $this->get_items() as $item ) {
-			if ( $item instanceof EE_Line_Item ) {
+		foreach ($this->get_items() as $item) {
+			if ($item instanceof EE_Line_Item) {
 				$total += $item->total();
 			}
 		}
@@ -1060,8 +1060,8 @@ 
 	 * @return EE_Line_Item[]
 	 */
 	function tax_descendants() {
-		EE_Registry::instance()->load_helper( 'Line_Item' );
-		return EEH_Line_Item::get_tax_descendants( $this );
+		EE_Registry::instance()->load_helper('Line_Item');
+		return EEH_Line_Item::get_tax_descendants($this);
 	}
 
 
@@ -1071,8 +1071,8 @@ 
 	 * @return EE_Line_Item[]
 	 */
 	function get_items() {
-		EE_Registry::instance()->load_helper( 'Line_Item' );
-		return EEH_Line_Item::get_line_item_descendants( $this );
+		EE_Registry::instance()->load_helper('Line_Item');
+		return EEH_Line_Item::get_line_item_descendants($this);
 	}
 
 
@@ -1086,22 +1086,22 @@ 
 	 */
 	function taxable_total() {
 		$total = 0;
-		if ( $this->children() ) {
-			foreach ( $this->children() as $child_line_item ) {
-				if ( $child_line_item->type() == EEM_Line_Item::type_line_item && $child_line_item->is_taxable()) {
+		if ($this->children()) {
+			foreach ($this->children() as $child_line_item) {
+				if ($child_line_item->type() == EEM_Line_Item::type_line_item && $child_line_item->is_taxable()) {
 					//if it's a percent item, only take into account the percent
 					//that's taxable too (the taxable total so far)
-					if( $child_line_item->is_percent() ) {
-						$total = $total + ( $total * $child_line_item->percent() / 100 );
-					}else{
+					if ($child_line_item->is_percent()) {
+						$total = $total + ($total * $child_line_item->percent() / 100);
+					} else {
 						$total += $child_line_item->total();
 					}
-				}elseif( $child_line_item->type() == EEM_Line_Item::type_sub_total ){
+				}elseif ($child_line_item->type() == EEM_Line_Item::type_sub_total) {
 					$total += $child_line_item->taxable_total();
 				}
 			}
 		}
-		return max( $total, 0 );
+		return max($total, 0);
 	}
 
 
@@ -1111,7 +1111,7 @@ 
 	 * @return EE_Transaction
 	 */
 	public function transaction() {
-		return $this->get_first_related( 'Transaction' );
+		return $this->get_first_related('Transaction');
 	}
 
 
@@ -1124,17 +1124,17 @@ 
 	 * @param int $txn_id if none is provided, assumes $this->TXN_ID()
 	 * @return int count of items saved
 	 */
-	public function save_this_and_descendants_to_txn( $txn_id = NULL ) {
-		if ( ! $txn_id ) {
+	public function save_this_and_descendants_to_txn($txn_id = NULL) {
+		if ( ! $txn_id) {
 			$txn_id = $this->TXN_ID();
 		}
-		$this->set_TXN_ID( $txn_id );
+		$this->set_TXN_ID($txn_id);
 		$children = $this->children();
 		$this->save();
-		foreach ( $children as $child_line_item ) {
-			if ( $child_line_item instanceof EE_Line_Item ) {
-				$child_line_item->set_parent_ID( $this->ID() );
-				$child_line_item->save_this_and_descendants_to_txn( $txn_id );
+		foreach ($children as $child_line_item) {
+			if ($child_line_item instanceof EE_Line_Item) {
+				$child_line_item->set_parent_ID($this->ID());
+				$child_line_item->save_this_and_descendants_to_txn($txn_id);
 			}
 		}
 	}
@@ -1146,10 +1146,10 @@ 
 	 * @param string $type one of the constants on EEM_Line_Item
 	 * @return EE_Line_Item[]
 	 */
-	protected function _get_descendants_of_type( $type ) {
-		EE_Error::doing_it_wrong( 'EE_Line_Item::_get_descendants_of_type()', __('Method replaced with EEH_Line_Item::get_descendants_of_type()', 'event_espresso'), '4.6.0' );
-		EE_Registry::instance()->load_helper( 'Line_Item' );
-		return EEH_Line_Item::get_descendants_of_type( $this, $type );
+	protected function _get_descendants_of_type($type) {
+		EE_Error::doing_it_wrong('EE_Line_Item::_get_descendants_of_type()', __('Method replaced with EEH_Line_Item::get_descendants_of_type()', 'event_espresso'), '4.6.0');
+		EE_Registry::instance()->load_helper('Line_Item');
+		return EEH_Line_Item::get_descendants_of_type($this, $type);
 	}
 
 
@@ -1159,10 +1159,10 @@ 
 	 * @param string $type like one of the EEM_Line_Item::type_*
 	 * @return EE_Line_Item
 	 */
-	public function get_nearest_descendant_of_type( $type ) {
-		EE_Error::doing_it_wrong( 'EE_Line_Item::get_nearest_descendant_of_type()', __('Method replaced with EEH_Line_Item::get_nearest_descendant_of_type()', 'event_espresso'), '4.6.0' );
-		EE_Registry::instance()->load_helper( 'Line_Item' );
-		return EEH_Line_Item::get_nearest_descendant_of_type( $this, $type );
+	public function get_nearest_descendant_of_type($type) {
+		EE_Error::doing_it_wrong('EE_Line_Item::get_nearest_descendant_of_type()', __('Method replaced with EEH_Line_Item::get_nearest_descendant_of_type()', 'event_espresso'), '4.6.0');
+		EE_Registry::instance()->load_helper('Line_Item');
+		return EEH_Line_Item::get_nearest_descendant_of_type($this, $type);
 	}
 
 
@@ -1173,7 +1173,7 @@ 
 	 * @return int count of items saved
 	 */
 	public function maybe_save() {
-		if ( $this->ID() ) {
+		if ($this->ID()) {
 			return $this->save();
 		}
 		return false;

core/db_classes/EE_Message_Template.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
 	/**
 	 * get Group ID
 	 * @access public
-	 * @return int
+	 * @return boolean
 	 */
 	public function GRP_ID() {
 		return $this->get( 'GRP_ID' );
@@ -79,7 +79,7 @@ 
 	/**
 	 * get User ID
 	 * @access public
-	 * @return int
+	 * @return boolean
 	 */
 	public function user() {
 		return $this->get_first_related( 'Message_Template_Group' )->get( 'MTP_user_id' );

Spacing +23 added lines, -23 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
@@ -34,9 +34,9 @@ 
 	 * @param string $timezone
 	 * @return EE_Message_Template|mixed
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = '' ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone );
-		return $has_object ? $has_object : new self( $props_n_values, FALSE, $timezone );
+	public static function new_instance($props_n_values = array(), $timezone = '') {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone);
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone);
 	}
 
 
@@ -46,8 +46,8 @@ 
 	 * @param string $timezone
 	 * @return EE_Message_Template
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = '' ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = '') {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -56,11 +56,11 @@ 
 	 * @param bool $GRP_ID
 	 * @throws EE_Error
 	 */
-	public function set_group_template_id( $GRP_ID = FALSE ) {
-		if ( ! $GRP_ID ) {
-			throw new EE_Error( __( 'Missing required value for the message template group id', 'event_espresso' ) );
+	public function set_group_template_id($GRP_ID = FALSE) {
+		if ( ! $GRP_ID) {
+			throw new EE_Error(__('Missing required value for the message template group id', 'event_espresso'));
 		}
-		$this->set( 'GRP_ID', $GRP_ID );
+		$this->set('GRP_ID', $GRP_ID);
 	}
 
 
@@ -71,7 +71,7 @@ 
 	 * @return int
 	 */
 	public function GRP_ID() {
-		return $this->get( 'GRP_ID' );
+		return $this->get('GRP_ID');
 	}
 
 
@@ -82,7 +82,7 @@ 
 	 * @return int
 	 */
 	public function user() {
-		return $this->get_first_related( 'Message_Template_Group' )->get( 'MTP_user_id' );
+		return $this->get_first_related('Message_Template_Group')->get('MTP_user_id');
 	}
 
 
@@ -93,7 +93,7 @@ 
 	 * @return string
 	 */
 	public function messenger() {
-		return $this->get_first_related( 'Message_Template_Group' )->messenger();
+		return $this->get_first_related('Message_Template_Group')->messenger();
 	}
 
 
@@ -105,7 +105,7 @@ 
 	 * @return object Messenger Object for the given messenger
 	 */
 	public function messenger_obj() {
-		return $this->get_first_related( 'Message_Template_Group' )->messenger_obj();
+		return $this->get_first_related('Message_Template_Group')->messenger_obj();
 	}
 
 
@@ -117,7 +117,7 @@ 
 	 * @return string
 	 */
 	public function message_type() {
-		return $this->get_first_related( 'Message_Template_Group' )->message_type();
+		return $this->get_first_related('Message_Template_Group')->message_type();
 	}
 
 
@@ -129,7 +129,7 @@ 
 	 * @return object  Message Type object for the given message type
 	 */
 	public function message_type_obj() {
-		return $this->get_first_related( 'Message_Template_Group' )->message_type_obj();
+		return $this->get_first_related('Message_Template_Group')->message_type_obj();
 	}
 
 
@@ -141,7 +141,7 @@ 
 	 * @return array array of contexts and their configuration.
 	 */
 	public function contexts_config() {
-		return $this->get_first_related( 'Message_Template_Group' )->contexts_config();
+		return $this->get_first_related('Message_Template_Group')->contexts_config();
 	}
 
 
@@ -153,7 +153,7 @@ 
 	 * @return string label for "context"
 	 */
 	public function context_label() {
-		return $this->get_first_related( 'Message_Template_Group' )->context_label();
+		return $this->get_first_related('Message_Template_Group')->context_label();
 	}
 
 
@@ -163,7 +163,7 @@ 
 	 * @return boolean true if it is, false if it isn't
 	 */
 	public function is_global() {
-		return $this->get_first_related( 'Message_Template_Group' )->is_global();
+		return $this->get_first_related('Message_Template_Group')->is_global();
 	}
 
 
@@ -173,7 +173,7 @@ 
 	 * @return boolean true if it is, false if it isn't
 	 */
 	public function is_active() {
-		return $this->get_first_related( 'Message_Template_Group' )->is_active();
+		return $this->get_first_related('Message_Template_Group')->is_active();
 	}
 
 
@@ -186,7 +186,7 @@ 
 	 * @param array  $fields  what fields we're returning valid shortcodes for.  If empty then we assume all fields are to be merged and returned.
 	 * @return mixed (array|bool) an array of shortcodes in the format array( '[shortcode] => 'label') OR FALSE if no shortcodes found.
 	 */
-	public function get_shortcodes( $context, $fields = array() ) {
-		return $this->get_first_related( 'Message_Template_Group' )->get_shortcodes( $context, $fields );
+	public function get_shortcodes($context, $fields = array()) {
+		return $this->get_first_related('Message_Template_Group')->get_shortcodes($context, $fields);
 	}
 }

core/db_classes/EE_Message_Template_Group.class.php

Doc Comments +6 added lines, -6 removed lines

@@ -94,7 +94,7 @@ 
 	/**
 	 * get Group ID
 	 * @access public
-	 * @return int
+	 * @return boolean
 	 */
 	public function GRP_ID() {
 		return $this->get( 'GRP_ID' );
@@ -139,7 +139,7 @@ 
 
 	/**
 	 * returns the name saved in the db for this template
-	 * @return string
+	 * @return boolean
 	 */
 	public function name() {
 		return $this->get( 'MTP_name' );
@@ -149,7 +149,7 @@ 
 
 	/**
 	 * Returns the description saved in the db for this template group
-	 * @return string
+	 * @return boolean
 	 */
 	public function description() {
 		return $this->get( 'MTP_description' );
@@ -171,7 +171,7 @@ 
 	/**
 	 * get Message Messenger
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function messenger() {
 		return $this->get( 'MTP_messenger' );
@@ -208,7 +208,7 @@ 
 	 * get Message Type
 	 *
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function message_type() {
 		return $this->get( 'MTP_message_type' );
@@ -224,7 +224,7 @@ 
 	 * appropriately.
 	 *
 	 * @throws EE_Error
-	 * @return EE_message_type|false if exception thrown.
+	 * @return null|EE_message_type if exception thrown.
 	 */
 	public function message_type_obj() {
 		$message_type = $this->message_type();

Spacing +54 added lines, -54 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_Message_Template_Group class
@@ -18,9 +18,9 @@ 
 	 * @param string $timezone
 	 * @return EE_Message_Template_Group|mixed
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = '' ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone );
-		return $has_object ? $has_object : new self( $props_n_values, FALSE, $timezone );
+	public static function new_instance($props_n_values = array(), $timezone = '') {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone);
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone);
 	}
 
 
@@ -30,8 +30,8 @@ 
 	 * @param string $timezone
 	 * @return EE_Message_Template_Group
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = '' ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = '') {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -40,11 +40,11 @@ 
 	 * @param bool $message_type
 	 * @throws EE_Error
 	 */
-	public function set_message_type( $message_type = FALSE ) {
-		if ( ! $message_type ) {
-			throw new EE_Error( __( 'Missing required value for the message_type parameter', 'event_espresso' ) );
+	public function set_message_type($message_type = FALSE) {
+		if ( ! $message_type) {
+			throw new EE_Error(__('Missing required value for the message_type parameter', 'event_espresso'));
 		}
-		$this->set( 'MTP_message_type', $message_type );
+		$this->set('MTP_message_type', $message_type);
 	}
 
 
@@ -53,11 +53,11 @@ 
 	 * @param bool $messenger
 	 * @throws EE_Error
 	 */
-	public function set_messenger( $messenger = FALSE ) {
-		if ( ! $messenger ) {
-			throw new EE_Error( __( 'Missing required value for the messenger parameter', 'event_espresso' ) );
+	public function set_messenger($messenger = FALSE) {
+		if ( ! $messenger) {
+			throw new EE_Error(__('Missing required value for the messenger parameter', 'event_espresso'));
 		}
-		$this->set( 'MTP_messenger', $messenger );
+		$this->set('MTP_messenger', $messenger);
 	}
 
 
@@ -66,11 +66,11 @@ 
 	 * @param bool $GRP_ID
 	 * @throws EE_Error
 	 */
-	public function set_group_template_id( $GRP_ID = FALSE ) {
-		if ( ! $GRP_ID ) {
-			throw new EE_Error( __( 'Missing required value for the message template group id', 'event_espresso' ) );
+	public function set_group_template_id($GRP_ID = FALSE) {
+		if ( ! $GRP_ID) {
+			throw new EE_Error(__('Missing required value for the message template group id', 'event_espresso'));
 		}
-		$this->set( 'GRP_ID', $GRP_ID );
+		$this->set('GRP_ID', $GRP_ID);
 	}
 
 
@@ -81,7 +81,7 @@ 
 	 * @return int
 	 */
 	public function GRP_ID() {
-		return $this->get( 'GRP_ID' );
+		return $this->get('GRP_ID');
 	}
 
 
@@ -92,8 +92,8 @@ 
 	 * @return int
 	 */
 	public function user() {
-		$user_id = $this->get( 'MTP_user_id' );
-		return empty( $user_id ) ? get_current_user_id() : $user_id;
+		$user_id = $this->get('MTP_user_id');
+		return empty($user_id) ? get_current_user_id() : $user_id;
 	}
 
 
@@ -116,7 +116,7 @@ 
 	 * @return int
 	 */
 	public function count_events() {
-		return $this->count_related( 'Event' );
+		return $this->count_related('Event');
 	}
 
 
@@ -126,7 +126,7 @@ 
 	 * @return string
 	 */
 	public function name() {
-		return $this->get( 'MTP_name' );
+		return $this->get('MTP_name');
 	}
 
 
@@ -136,7 +136,7 @@ 
 	 * @return string
 	 */
 	public function description() {
-		return $this->get( 'MTP_description' );
+		return $this->get('MTP_description');
 	}
 
 
@@ -146,8 +146,8 @@ 
 	 * @param  array $query_params like EEM_Base::get_all()
 	 * @return EE_Message_Template[]
 	 */
-	public function message_templates( $query_params = array() ) {
-		return $this->get_many_related( 'Message_Template', $query_params );
+	public function message_templates($query_params = array()) {
+		return $this->get_many_related('Message_Template', $query_params);
 	}
 
 
@@ -158,7 +158,7 @@ 
 	 * @return string
 	 */
 	public function messenger() {
-		return $this->get( 'MTP_messenger' );
+		return $this->get('MTP_messenger');
 	}
 
 
@@ -174,12 +174,12 @@ 
 	 */
 	public function messenger_obj() {
 		$messenger = $this->messenger();
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+		EE_Registry::instance()->load_helper('MSG_Template');
 		try {
-			$messenger = EEH_MSG_Template::messenger_obj( $messenger );
-		} catch( EE_Error $e ) {
+			$messenger = EEH_MSG_Template::messenger_obj($messenger);
+		} catch (EE_Error $e) {
 			//if an exception was thrown then let's deactivate this message template group because it means there is no class for this messenger in this group.
-			$this->set( 'MTP_is_active', false );
+			$this->set('MTP_is_active', false);
 			$this->save();
 			return null;
 		}
@@ -195,7 +195,7 @@ 
 	 * @return string
 	 */
 	public function message_type() {
-		return $this->get( 'MTP_message_type' );
+		return $this->get('MTP_message_type');
 	}
 
 
@@ -212,12 +212,12 @@ 
 	 */
 	public function message_type_obj() {
 		$message_type = $this->message_type();
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+		EE_Registry::instance()->load_helper('MSG_Template');
 		try {
-			$message_type = EEH_MSG_Template::message_type_obj( $message_type );
-		} catch(EE_Error $e) {
+			$message_type = EEH_MSG_Template::message_type_obj($message_type);
+		} catch (EE_Error $e) {
 			//if an exception was thrown then let's deactivate this message template group because it means there is no class for the message type in this group.
-			$this->set( 'MTP_is_active', false );
+			$this->set('MTP_is_active', false);
 			$this->save();
 			return null;
 		}
@@ -254,13 +254,13 @@ 
 	 */
 	public function context_templates() {
 		$mtps_arr = array();
-		$mtps = $this->get_many_related( 'Message_Template' );
-		if ( empty( $mtps ) ) {
+		$mtps = $this->get_many_related('Message_Template');
+		if (empty($mtps)) {
 			return array();
 		}
 		//note contexts could have CHECKBOX fields per context. So we return the objects indexed by context AND field.
-		foreach ( $mtps as $mtp ) {
-			$mtps_arr[ $mtp->get( 'MTP_context' ) ][ $mtp->get( 'MTP_template_field' ) ] = $mtp;
+		foreach ($mtps as $mtp) {
+			$mtps_arr[$mtp->get('MTP_context')][$mtp->get('MTP_template_field')] = $mtp;
 		}
 		return $mtps_arr;
 	}
@@ -272,7 +272,7 @@ 
 	 * @return boolean true if it is, false if it isn't
 	 */
 	public function is_global() {
-		return $this->get( 'MTP_is_global' );
+		return $this->get('MTP_is_global');
 	}
 
 
@@ -282,7 +282,7 @@ 
 	 * @return boolean true if it is, false if it isn't
 	 */
 	public function is_active() {
-		return $this->get( 'MTP_is_active' );
+		return $this->get('MTP_is_active');
 	}
 
 
@@ -298,11 +298,11 @@ 
 	 * @param bool   $merged  If TRUE then we don't return shortcodes indexed by field but instead an array of the unique shortcodes for all the given (or all) fields.
 	 * @return mixed (array|bool) an array of shortcodes in the format array( '[shortcode] => 'label') OR FALSE if no shortcodes found.
 	 */
-	public function get_shortcodes( $context, $fields = array(), $merged = FALSE ) {
+	public function get_shortcodes($context, $fields = array(), $merged = FALSE) {
 		$messenger = $this->messenger();
 		$message_type = $this->message_type();
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
-		return EEH_MSG_Template::get_shortcodes( $message_type, $messenger, $fields, $context, $merged );
+		EE_Registry::instance()->load_helper('MSG_Template');
+		return EEH_MSG_Template::get_shortcodes($message_type, $messenger, $fields, $context, $merged);
 	}
 
 
@@ -343,7 +343,7 @@ 
 	 * @return string
 	 */
 	public function get_template_pack_name() {
-		return $this->get_extra_meta( 'MTP_template_pack', TRUE, 'default' );
+		return $this->get_extra_meta('MTP_template_pack', TRUE, 'default');
 	}
 
 
@@ -358,8 +358,8 @@ 
 	 */
 	public function get_template_pack() {
 		$pack_name = $this->get_template_pack_name();
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
-		return EEH_MSG_Template::get_template_pack( $pack_name );
+		EE_Registry::instance()->load_helper('MSG_Template');
+		return EEH_MSG_Template::get_template_pack($pack_name);
 	}
 
 
@@ -372,7 +372,7 @@ 
 	 * @return string
 	 */
 	public function get_template_pack_variation() {
-		return $this->get_extra_meta( 'MTP_variation', TRUE, 'default' );
+		return $this->get_extra_meta('MTP_variation', TRUE, 'default');
 	}
 
 
@@ -384,8 +384,8 @@ 
 	 * @param string $template_pack_name What message template pack is assigned.
 	 * @return int
 	 */
-	public function set_template_pack_name( $template_pack_name ) {
-		return $this->update_extra_meta( 'MTP_template_pack', $template_pack_name );
+	public function set_template_pack_name($template_pack_name) {
+		return $this->update_extra_meta('MTP_template_pack', $template_pack_name);
 	}
 
 
@@ -397,8 +397,8 @@ 
 	 * @param string $variation What variation is being set on the message template group.
 	 * @return int
 	 */
-	public function set_template_pack_variation( $variation ) {
-		return $this->update_extra_meta( 'MTP_variation', $variation );
+	public function set_template_pack_variation($variation) {
+		return $this->update_extra_meta('MTP_variation', $variation);
 	}
 }
 //end EE_Message_Template_Group class

core/db_classes/EE_Price.class.php

Doc Comments +8 added lines, -8 removed lines

@@ -46,7 +46,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_Price
 	 */
 	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
 		return new self( $props_n_values, TRUE, $timezone );
@@ -129,7 +129,7 @@ 
 	/**
 	 *    get Price type
 	 * @access        public
-	 * @return        int
+	 * @return        boolean
 	 */
 	public function type() {
 		return $this->get( 'PRT_ID' );
@@ -140,7 +140,7 @@ 
 	/**
 	 *    get Price Amount
 	 * @access        public
-	 * @return        float
+	 * @return        boolean
 	 */
 	public function amount() {
 		return $this->get( 'PRC_amount' );
@@ -151,7 +151,7 @@ 
 	/**
 	 *    get Price Name
 	 * @access        public
-	 * @return        string
+	 * @return        boolean
 	 */
 	public function name() {
 		return $this->get( 'PRC_name' );
@@ -162,7 +162,7 @@ 
 	/**
 	 *    get Price description
 	 * @access        public
-	 * @return        string
+	 * @return        boolean
 	 */
 	public function desc() {
 		return $this->get( 'PRC_desc' );
@@ -173,7 +173,7 @@ 
 	/**
 	 *    get overrides
 	 * @access        public
-	 * @return        int
+	 * @return        boolean
 	 */
 	public function overrides() {
 		return $this->get( 'PRC_overrides' );
@@ -184,7 +184,7 @@ 
 	/**
 	 *    get order
 	 * @access        public
-	 * @return        int
+	 * @return        boolean
 	 */
 	public function order() {
 		return $this->get( 'PRC_order' );
@@ -197,7 +197,7 @@ 
 	 *
 	 * @since 4.5.0
 	 *
-	 * @return int
+	 * @return boolean
 	 */
 	public function wp_user() {
 		return $this->get('PRC_wp_user');

Spacing +32 added lines, -32 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -35,9 +35,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Attendee
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -48,8 +48,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);
 	}
 
 
@@ -60,8 +60,8 @@ 
 	 * @access        public
 	 * @param        int $PRT_ID
 	 */
-	public function set_type( $PRT_ID = 0 ) {
-		$this->set( 'PRT_ID', $PRT_ID );
+	public function set_type($PRT_ID = 0) {
+		$this->set('PRT_ID', $PRT_ID);
 	}
 
 
@@ -72,8 +72,8 @@ 
 	 * @access        public
 	 * @param        float $PRC_amount
 	 */
-	public function set_amount( $PRC_amount = 0.00 ) {
-		$this->set( 'PRC_amount', $PRC_amount );
+	public function set_amount($PRC_amount = 0.00) {
+		$this->set('PRC_amount', $PRC_amount);
 	}
 
 
@@ -84,8 +84,8 @@ 
 	 * @access        public
 	 * @param        string $PRC_name
 	 */
-	public function set_name( $PRC_name = '' ) {
-		$this->set( 'PRC_name', $PRC_name );
+	public function set_name($PRC_name = '') {
+		$this->set('PRC_name', $PRC_name);
 	}
 
 
@@ -96,8 +96,8 @@ 
 	 * @access        public
 	 * @param        string $PRC_desc
 	 */
-	public function set_description( $PRC_desc = '' ) {
-		$this->Set( 'PRC_desc', $PRC_desc );
+	public function set_description($PRC_desc = '') {
+		$this->Set('PRC_desc', $PRC_desc);
 	}
 
 
@@ -108,8 +108,8 @@ 
 	* 		@access		public
 	*		@param		bool		$PRC_is_default
 	*/
-	public function set_is_default( $PRC_is_default = FALSE ) {
-		$this->set( 'PRC_is_default', $PRC_is_default );
+	public function set_is_default($PRC_is_default = FALSE) {
+		$this->set('PRC_is_default', $PRC_is_default);
 	}
 
 
@@ -120,8 +120,8 @@ 
 	* 		@access		public
 	*		@param		bool		$PRC_deleted
 	*/
-	public function set_deleted( $PRC_deleted = NULL ) {
-		$this->set( 'PRC_deleted', $PRC_deleted );
+	public function set_deleted($PRC_deleted = NULL) {
+		$this->set('PRC_deleted', $PRC_deleted);
 	}
 
 
@@ -132,7 +132,7 @@ 
 	 * @return        int
 	 */
 	public function type() {
-		return $this->get( 'PRT_ID' );
+		return $this->get('PRT_ID');
 	}
 
 
@@ -143,7 +143,7 @@ 
 	 * @return        float
 	 */
 	public function amount() {
-		return $this->get( 'PRC_amount' );
+		return $this->get('PRC_amount');
 	}
 
 
@@ -154,7 +154,7 @@ 
 	 * @return        string
 	 */
 	public function name() {
-		return $this->get( 'PRC_name' );
+		return $this->get('PRC_name');
 	}
 
 
@@ -165,7 +165,7 @@ 
 	 * @return        string
 	 */
 	public function desc() {
-		return $this->get( 'PRC_desc' );
+		return $this->get('PRC_desc');
 	}
 
 
@@ -176,7 +176,7 @@ 
 	 * @return        int
 	 */
 	public function overrides() {
-		return $this->get( 'PRC_overrides' );
+		return $this->get('PRC_overrides');
 	}
 
 
@@ -187,7 +187,7 @@ 
 	 * @return        int
 	 */
 	public function order() {
-		return $this->get( 'PRC_order' );
+		return $this->get('PRC_order');
 	}
 
 
@@ -211,7 +211,7 @@ 
 	 * @return        bool
 	 */
 	public function is_default() {
-		return $this->get( 'PRC_is_default' );
+		return $this->get('PRC_is_default');
 	}
 
 
@@ -222,7 +222,7 @@ 
 	 * @return        bool
 	 */
 	public function deleted() {
-		return $this->get( 'PRC_deleted' );
+		return $this->get('PRC_deleted');
 	}
 
 
@@ -231,7 +231,7 @@ 
 	 * @return bool
 	 */
 	public function parent() {
-		return $this->get( 'PRC_parent' );
+		return $this->get('PRC_parent');
 	}
 
 
@@ -253,7 +253,7 @@ 
 	 * @return EE_Price_Type
 	 */
 	public function type_obj() {
-		return $this->get_first_related( 'Price_Type' );
+		return $this->get_first_related('Price_Type');
 	}
 
 
@@ -275,7 +275,7 @@ 
 	 */
 	public function is_percent() {
 		$price_type = $this->type_obj();
-		return $price_type->get( 'PRT_is_percent' );
+		return $price_type->get('PRT_is_percent');
 	}
 
 
@@ -287,7 +287,7 @@ 
 	 * @return string
 	 */
 	public function pretty_price() {
-		return ! $this->is_percent() ? $this->get_pretty('PRC_amount') : $this->get('PRC_amount') . '%';
+		return ! $this->is_percent() ? $this->get_pretty('PRC_amount') : $this->get('PRC_amount').'%';
 	}
 
 
@@ -296,7 +296,7 @@ 
 	 * @return mixed
 	 */
 	public function get_price_without_currency_symbol() {
-		return str_replace( EE_Registry::instance()->CFG->currency->sign, '', $this->get_pretty( 'PRC_amount' ) );
+		return str_replace(EE_Registry::instance()->CFG->currency->sign, '', $this->get_pretty('PRC_amount'));
 	}
 }
 

Indentation +10 added lines, -10 removed lines

@@ -103,11 +103,11 @@ 
 
 
 	/**
-	*		set is_default
-	*
-	* 		@access		public
-	*		@param		bool		$PRC_is_default
-	*/
+	 *		set is_default
+	 *
+	 * 		@access		public
+	 *		@param		bool		$PRC_is_default
+	 */
 	public function set_is_default( $PRC_is_default = FALSE ) {
 		$this->set( 'PRC_is_default', $PRC_is_default );
 	}
@@ -115,11 +115,11 @@ 
 
 
 	/**
-	*		set deleted
-	*
-	* 		@access		public
-	*		@param		bool		$PRC_deleted
-	*/
+	 *		set deleted
+	 *
+	 * 		@access		public
+	 *		@param		bool		$PRC_deleted
+	 */
 	public function set_deleted( $PRC_deleted = NULL ) {
 		$this->set( 'PRC_deleted', $PRC_deleted );
 	}

core/db_classes/EE_Price_Type.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -156,7 +156,7 @@
 	 *
 	 * @since 4.5.0
 	 *
-	 * @return int
+	 * @return boolean
 	 */
 	public function wp_user() {
 		return $this->get('PRT_wp_user');

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
@@ -32,9 +32,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Price_Type
 	 */
-	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_Price_Type
 	 */
-	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        string $PRT_name
 	 */
-	public function set_name( $PRT_name = '' ) {
-		$this->set( 'PRT_name', $PRT_name );
+	public function set_name($PRT_name = '') {
+		$this->set('PRT_name', $PRT_name);
 	}
 
 
@@ -67,8 +67,8 @@ 
 	 * @access        public
 	 * @param        bool $PRT_is_percent
 	 */
-	public function set_is_percent( $PRT_is_percent = FALSE ) {
-		$this->set( 'PRT_is_percent', $PRT_is_percent );
+	public function set_is_percent($PRT_is_percent = FALSE) {
+		$this->set('PRT_is_percent', $PRT_is_percent);
 	}
 
 
@@ -79,8 +79,8 @@ 
 	 * @access        public
 	 * @param        int $PRT_order
 	 */
-	public function set_order( $PRT_order = 0 ) {
-		$this->set( 'PRT_order', $PRT_order );
+	public function set_order($PRT_order = 0) {
+		$this->set('PRT_order', $PRT_order);
 	}
 
 
@@ -89,7 +89,7 @@ 
 	 *
 	 */
 	public function move_to_trash() {
-		$this->set( 'PRT_deleted', TRUE );
+		$this->set('PRT_deleted', TRUE);
 	}
 
 
@@ -98,7 +98,7 @@ 
 	 *
 	 */
 	public function restore_from_trash() {
-		$this->set( 'PRT_deleted', FALSE );
+		$this->set('PRT_deleted', FALSE);
 	}
 
 
@@ -108,7 +108,7 @@ 
 	 * @access        public
 	 */
 	public function name() {
-		return $this->get( 'PRT_name' );
+		return $this->get('PRT_name');
 	}
 
 
@@ -118,7 +118,7 @@ 
 	 * @access        public
 	 */
 	public function base_type() {
-		return $this->get( 'PBT_ID' );
+		return $this->get('PBT_ID');
 	}
 
 
@@ -127,7 +127,7 @@ 
 	 * @return mixed
 	 */
 	public function base_type_name() {
-		return $this->get_pretty( 'PBT_ID' );
+		return $this->get_pretty('PBT_ID');
 	}
 
 
@@ -137,7 +137,7 @@ 
 	 * @access        public
 	 */
 	public function is_percent() {
-		return $this->get( 'PRT_is_percent' );
+		return $this->get('PRT_is_percent');
 	}
 
 
@@ -146,7 +146,7 @@ 
 	 * @return bool
 	 */
 	public function is_discount() {
-		return $this->get( 'PBT_ID' ) == 2 ? TRUE : FALSE;
+		return $this->get('PBT_ID') == 2 ? TRUE : FALSE;
 	}
 
 
@@ -169,7 +169,7 @@ 
 	 * @access        public
 	 */
 	public function order() {
-		return $this->get( 'PRT_order' );
+		return $this->get('PRT_order');
 	}
 
 
@@ -179,7 +179,7 @@ 
 	 * @access        public
 	 */
 	public function deleted() {
-		return $this->get( 'PRT_deleted' );
+		return $this->get('PRT_deleted');
 	}
 }
 

core/db_classes/EE_Question_Form_Input.class.php

Doc Comments +5 added lines, -5 removed lines

@@ -226,7 +226,7 @@ 
 	 *        generate_question_form_inputs_for_object
 	 *
 	 * @access    protected
-	 * @param bool|object $object $object
+	 * @param EE_Base_Class|null $object $object
 	 * @param    array    $input_types
 	 * @return        array
 	 */
@@ -324,7 +324,7 @@ 
 	 *    add_temp_option
 	 * @access public
 	 * @param \EE_Question_Option $QSO EE_Question_Option
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	public function add_temp_option( EE_Question_Option $QSO ) {
 		$this->_QST->add_temp_option( $QSO );
@@ -336,8 +336,8 @@ 
 	 * set property values for question form input
 	 * @access public
 	 * @param    string $property
-	 * @param    mixed  $value
-	 * @return mixed
+	 * @param    boolean  $value
+	 * @return boolean|null
 	 */
 	public function set( $property = NULL, $value = NULL ) {
 		if ( ! empty( $property ) ) {
@@ -376,7 +376,7 @@ 
 	/**
 	 *    get_meta
 	 * @access public
-	 * @param mixed $key
+	 * @param string $key
 	 * @return mixed
 	 */
 	public function get_meta( $key = FALSE ) {

Spacing +76 added lines, -76 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
@@ -82,14 +82,14 @@ 
 	 * @access public
 	 * @return \EE_Question_Form_Input
 	 */
-	public function __construct( EE_Question $QST = NULL, EE_Answer $ANS = NULL, $q_meta = array() ) {
-		if ( empty( $QST ) || empty( $ANS ) ) {
-			EE_Error::add_error( __( 'An error occurred. A valid EE_Question or EE_Answer object was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+	public function __construct(EE_Question $QST = NULL, EE_Answer $ANS = NULL, $q_meta = array()) {
+		if (empty($QST) || empty($ANS)) {
+			EE_Error::add_error(__('An error occurred. A valid EE_Question or EE_Answer object was not received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return NULL;
 		}
 		$this->_QST = $QST;
 		$this->_ANS = $ANS;
-		$this->set_question_form_input_meta( $q_meta );
+		$this->set_question_form_input_meta($q_meta);
 		$this->set_question_form_input_init();
 	}
 
@@ -101,9 +101,9 @@ 
 	 * @param array $q_meta
 	 * @return void
 	 */
-	public function set_question_form_input_meta( $q_meta = array() ) {
-		$default_q_meta = array( 'att_nmbr' => 1, 'ticket_id' => '', 'date' => '', 'time' => '', 'input_name' => '', 'input_id' => '', 'input_class' => '', 'input_prefix' => 'qstn', 'append_qstn_id' => TRUE, 'htmlentities' => TRUE, 'allow_null' => FALSE );
-		$this->_QST_meta = array_merge( $default_q_meta, $q_meta );
+	public function set_question_form_input_meta($q_meta = array()) {
+		$default_q_meta = array('att_nmbr' => 1, 'ticket_id' => '', 'date' => '', 'time' => '', 'input_name' => '', 'input_id' => '', 'input_class' => '', 'input_prefix' => 'qstn', 'append_qstn_id' => TRUE, 'htmlentities' => TRUE, 'allow_null' => FALSE);
+		$this->_QST_meta = array_merge($default_q_meta, $q_meta);
 	}
 
 
@@ -115,10 +115,10 @@ 
 	 */
 	public function set_question_form_input_init() {
 		$qstn_id = $this->_QST->system_ID() ? $this->_QST->system_ID() : $this->_QST->ID();
-		$this->_set_input_name( $qstn_id );
-		$this->_set_input_id( $qstn_id );
-		$this->_set_input_class( $qstn_id );
-		$this->set_question_form_input_answer( $qstn_id );
+		$this->_set_input_name($qstn_id);
+		$this->_set_input_id($qstn_id);
+		$this->_set_input_class($qstn_id);
+		$this->set_question_form_input_answer($qstn_id);
 	}
 
 
@@ -129,12 +129,12 @@ 
 	 * @param $qstn_id
 	 * @return void
 	 */
-	private function _set_input_name( $qstn_id ) {
-		if ( ! empty( $qstn_id ) ) {
-			$ANS_ID = $this->get( 'ANS_ID' );
-			$qstn_id = ! empty( $ANS_ID ) ? '[' . $qstn_id . '][' . $ANS_ID . ']' : '[' . $qstn_id . ']';
+	private function _set_input_name($qstn_id) {
+		if ( ! empty($qstn_id)) {
+			$ANS_ID = $this->get('ANS_ID');
+			$qstn_id = ! empty($ANS_ID) ? '['.$qstn_id.']['.$ANS_ID.']' : '['.$qstn_id.']';
 		}
-		$this->QST_input_name = $this->_QST_meta[ 'append_qstn_id' ] && ! empty( $qstn_id ) ? $this->_QST_meta[ 'input_prefix' ] . $this->_QST_meta[ 'input_name' ] . $qstn_id : $this->_QST_meta[ 'input_prefix' ] . $this->_QST_meta[ 'input_name' ];
+		$this->QST_input_name = $this->_QST_meta['append_qstn_id'] && ! empty($qstn_id) ? $this->_QST_meta['input_prefix'].$this->_QST_meta['input_name'].$qstn_id : $this->_QST_meta['input_prefix'].$this->_QST_meta['input_name'];
 	}
 
 
@@ -145,13 +145,13 @@ 
 	 * @param    string $property
 	 * @return mixed
 	 */
-	public function get( $property = NULL ) {
-		if ( ! empty( $property ) ) {
-			if ( EEM_Question::instance()->has_field( $property ) ) {
-				return $this->_QST->get( $property );
-			} else if ( EEM_Answer::instance()->has_field( $property ) ) {
-				return $this->_ANS->get( $property );
-			} else if ( $this->_question_form_input_property_exists( __CLASS__, $property ) ) {
+	public function get($property = NULL) {
+		if ( ! empty($property)) {
+			if (EEM_Question::instance()->has_field($property)) {
+				return $this->_QST->get($property);
+			} else if (EEM_Answer::instance()->has_field($property)) {
+				return $this->_ANS->get($property);
+			} else if ($this->_question_form_input_property_exists(__CLASS__, $property)) {
 				return $this->{$property};
 			}
 		}
@@ -167,13 +167,13 @@ 
 	 * @param    string $property
 	 * @return boolean
 	 */
-	private function _question_form_input_property_exists( $classname, $property ) {
+	private function _question_form_input_property_exists($classname, $property) {
 		// first try regular property exists method which works as expected in PHP 5.3+
-		$prop = EEH_Class_Tools::has_property( $classname, $property );
-		if ( ! $prop ) {
+		$prop = EEH_Class_Tools::has_property($classname, $property);
+		if ( ! $prop) {
 			// use reflection for < PHP 5.3 as a double check when property is not found, possible due to access restriction
-			$reflector = new ReflectionClass( $classname );
-			$prop = $reflector->hasProperty( $property );
+			$reflector = new ReflectionClass($classname);
+			$prop = $reflector->hasProperty($property);
 		}
 		return $prop;
 	}
@@ -186,9 +186,9 @@ 
 	 * @param $qstn_id
 	 * @return void
 	 */
-	private function _set_input_id( $qstn_id ) {
-		$input_id = isset( $this->_QST_meta[ 'input_id' ] ) && ! empty( $this->_QST_meta[ 'input_id' ] ) ? $this->_QST_meta[ 'input_id' ] : sanitize_key( strip_tags( $this->_QST->get( 'QST_display_text' ) ) );
-		$this->QST_input_id = $this->_QST_meta[ 'append_qstn_id' ] && ! empty( $qstn_id ) ? $input_id . '-' . $qstn_id : $input_id;
+	private function _set_input_id($qstn_id) {
+		$input_id = isset($this->_QST_meta['input_id']) && ! empty($this->_QST_meta['input_id']) ? $this->_QST_meta['input_id'] : sanitize_key(strip_tags($this->_QST->get('QST_display_text')));
+		$this->QST_input_id = $this->_QST_meta['append_qstn_id'] && ! empty($qstn_id) ? $input_id.'-'.$qstn_id : $input_id;
 	}
 
 
@@ -199,7 +199,7 @@ 
 	 * @return void
 	 */
 	private function _set_input_class() {
-		$this->QST_input_class = isset( $this->_QST_meta[ 'input_class' ] ) ? $this->_QST_meta[ 'input_class' ] : '';
+		$this->QST_input_class = isset($this->_QST_meta['input_class']) ? $this->_QST_meta['input_class'] : '';
 	}
 
 
@@ -210,12 +210,12 @@ 
 	 * @param mixed    int | string    $qstn_id
 	 * @return void
 	 */
-	public function set_question_form_input_answer( $qstn_id ) {
+	public function set_question_form_input_answer($qstn_id) {
 		// check for answer in $_REQUEST in case we are reprocessing a form after an error
-		if ( isset( $this->_QST_meta[ 'EVT_ID' ] ) && isset( $this->_QST_meta[ 'att_nmbr' ] ) && isset( $this->_QST_meta[ 'date' ] ) && isset( $this->_QST_meta[ 'time' ] ) && isset( $this->_QST_meta[ 'price_id' ] ) ) {
-			if ( isset( $_REQUEST[ 'qstn' ][ $this->_QST_meta[ 'EVT_ID' ] ][ $this->_QST_meta[ 'att_nmbr' ] ][ $this->_QST_meta[ 'date' ] ][ $this->_QST_meta[ 'time' ] ][ $this->_QST_meta[ 'price_id' ] ][ $qstn_id ] ) ) {
-				$answer = $_REQUEST[ 'qstn' ][ $this->_QST_meta[ 'EVT_ID' ] ][ $this->_QST_meta[ 'att_nmbr' ] ][ $this->_QST_meta[ 'date' ] ][ $this->_QST_meta[ 'time' ] ][ $this->_QST_meta[ 'price_id' ] ][ $qstn_id ];
-				$this->_ANS->set( 'ANS_value', $answer );
+		if (isset($this->_QST_meta['EVT_ID']) && isset($this->_QST_meta['att_nmbr']) && isset($this->_QST_meta['date']) && isset($this->_QST_meta['time']) && isset($this->_QST_meta['price_id'])) {
+			if (isset($_REQUEST['qstn'][$this->_QST_meta['EVT_ID']][$this->_QST_meta['att_nmbr']][$this->_QST_meta['date']][$this->_QST_meta['time']][$this->_QST_meta['price_id']][$qstn_id])) {
+				$answer = $_REQUEST['qstn'][$this->_QST_meta['EVT_ID']][$this->_QST_meta['att_nmbr']][$this->_QST_meta['date']][$this->_QST_meta['time']][$this->_QST_meta['price_id']][$qstn_id];
+				$this->_ANS->set('ANS_value', $answer);
 			}
 		}
 	}
@@ -230,40 +230,40 @@ 
 	 * @param    array    $input_types
 	 * @return        array
 	 */
-	static function generate_question_form_inputs_for_object( $object = FALSE, $input_types = array() ) {
-		if ( ! is_object( $object ) ) {
+	static function generate_question_form_inputs_for_object($object = FALSE, $input_types = array()) {
+		if ( ! is_object($object)) {
 			return FALSE;
 		}
 		$inputs = array();
-		$fields = $object->get_model()->field_settings( FALSE );
+		$fields = $object->get_model()->field_settings(FALSE);
 		//		$pk = $object->ID(); <<< NO!
 		//		EEH_Debug_Tools::printr( $object, get_class( $object ) . '<br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 		//		EEH_Debug_Tools::printr( $fields, '$fields  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 		//		EEH_Debug_Tools::printr( $input_types, '$input_types  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		foreach ( $fields as $field_ID => $field ) {
-			if ( $field instanceof EE_Model_Field_Base ) {
+		foreach ($fields as $field_ID => $field) {
+			if ($field instanceof EE_Model_Field_Base) {
 				//			echo '<h4>$field_ID : ' . $field_ID . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 				//			EEH_Debug_Tools::printr( $field, '$field  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-				if ( isset( $input_types[ $field_ID ] ) ) {
+				if (isset($input_types[$field_ID])) {
 					// get saved value for field
-					$value = $object->get( $field_ID );
+					$value = $object->get($field_ID);
 					//				echo '<h4>$value : ' . $value . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 					// if no saved value, then use default
 					$value = $value !== NULL ? $value : $field->get_default_value();
 					//			if ( $field_ID == 'CNT_active' )
 					//				echo '<h4>$value : ' . $value . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 					// determine question type
-					$type = isset( $input_types[ $field_ID ] ) ? $input_types[ $field_ID ][ 'type' ] : 'TEXT';
+					$type = isset($input_types[$field_ID]) ? $input_types[$field_ID]['type'] : 'TEXT';
 					// input name
-					$input_name = isset( $input_types[ $field_ID ] ) && isset( $input_types[ $field_ID ][ 'input_name' ] ) ? $input_types[ $field_ID ][ 'input_name' ] . '[' . $field_ID . ']' : $field_ID;
+					$input_name = isset($input_types[$field_ID]) && isset($input_types[$field_ID]['input_name']) ? $input_types[$field_ID]['input_name'].'['.$field_ID.']' : $field_ID;
 					// css class for input
-					$class = isset( $input_types[ $field_ID ][ 'class' ] ) && ! empty( $input_types[ $field_ID ][ 'class' ] ) ? ' ' . $input_types[ $field_ID ][ 'class' ] : '';
+					$class = isset($input_types[$field_ID]['class']) && ! empty($input_types[$field_ID]['class']) ? ' '.$input_types[$field_ID]['class'] : '';
 					// whether to apply htmlentities to answer
-					$htmlentities = isset( $input_types[ $field_ID ][ 'htmlentities' ] ) ? $input_types[ $field_ID ][ 'htmlentities' ] : TRUE;
+					$htmlentities = isset($input_types[$field_ID]['htmlentities']) ? $input_types[$field_ID]['htmlentities'] : TRUE;
 					// whether to apply htmlentities to answer
-					$label_b4 = isset( $input_types[ $field_ID ][ 'label_b4' ] ) ? $input_types[ $field_ID ][ 'label_b4' ] : FALSE;
+					$label_b4 = isset($input_types[$field_ID]['label_b4']) ? $input_types[$field_ID]['label_b4'] : FALSE;
 					// whether to apply htmlentities to answer
-					$use_desc_4_label = isset( $input_types[ $field_ID ][ 'use_desc_4_label' ] ) ? $input_types[ $field_ID ][ 'use_desc_4_label' ] : FALSE;
+					$use_desc_4_label = isset($input_types[$field_ID]['use_desc_4_label']) ? $input_types[$field_ID]['use_desc_4_label'] : FALSE;
 
 					// create EE_Question_Form_Input object
 					$QFI = new EE_Question_Form_Input(
@@ -283,9 +283,9 @@ 
 							)
 						),
 						array(
-							'input_id' => $field_ID . '-' . $object->ID(),
+							'input_id' => $field_ID.'-'.$object->ID(),
 							'input_name' => $input_name,
-							'input_class' => $field_ID . $class,
+							'input_class' => $field_ID.$class,
 							'input_prefix' => '',
 							'append_qstn_id' => FALSE,
 							'htmlentities' => $htmlentities,
@@ -294,21 +294,21 @@ 
 						)
 					);
 					// does question type have options ?
-					if ( in_array( $type, array( 'DROPDOWN', 'RADIO_BTN', 'CHECKBOX' ) ) && isset ( $input_types[ $field_ID ] ) && isset ( $input_types[ $field_ID ][ 'options' ] ) ) {
-						foreach ( $input_types[ $field_ID ][ 'options' ] as $option ) {
-							$option = stripslashes_deep( $option );
-							$option_id = ! empty( $option[ 'id' ] ) ? $option[ 'id' ] : 0;
-							$QSO = EE_Question_Option::new_instance( array( 'QSO_value' => (string)$option_id, 'QSO_desc' => $option[ 'text' ], 'QSO_deleted' => FALSE ) );
+					if (in_array($type, array('DROPDOWN', 'RADIO_BTN', 'CHECKBOX')) && isset ($input_types[$field_ID]) && isset ($input_types[$field_ID]['options'])) {
+						foreach ($input_types[$field_ID]['options'] as $option) {
+							$option = stripslashes_deep($option);
+							$option_id = ! empty($option['id']) ? $option['id'] : 0;
+							$QSO = EE_Question_Option::new_instance(array('QSO_value' => (string) $option_id, 'QSO_desc' => $option['text'], 'QSO_deleted' => FALSE));
 							// all QST (and ANS) properties can be accessed indirectly thru QFI
-							$QFI->add_temp_option( $QSO );
+							$QFI->add_temp_option($QSO);
 						}
 					}
 					// we don't want ppl manually changing primary keys cuz that would just lead to total craziness man
-					if ( $field_ID == $object->get_model()->primary_key_name() ) {
-						$QFI->set( 'QST_disabled', TRUE );
+					if ($field_ID == $object->get_model()->primary_key_name()) {
+						$QFI->set('QST_disabled', TRUE);
 					}
 					//EEH_Debug_Tools::printr( $QFI, '$QFI  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-					$inputs[ $field_ID ] = $QFI;
+					$inputs[$field_ID] = $QFI;
 					//			if ( $field_ID == 'CNT_active' ) {
 					//				EEH_Debug_Tools::printr( $QFI, '$QFI  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 					//			}
@@ -326,8 +326,8 @@ 
 	 * @param \EE_Question_Option $QSO EE_Question_Option
 	 * @return boolean
 	 */
-	public function add_temp_option( EE_Question_Option $QSO ) {
-		$this->_QST->add_temp_option( $QSO );
+	public function add_temp_option(EE_Question_Option $QSO) {
+		$this->_QST->add_temp_option($QSO);
 	}
 
 
@@ -339,13 +339,13 @@ 
 	 * @param    mixed  $value
 	 * @return mixed
 	 */
-	public function set( $property = NULL, $value = NULL ) {
-		if ( ! empty( $property ) ) {
-			if ( EEM_Question::instance()->has_field( $property ) ) {
-				$this->_QST->set( $property, $value );
-			} else if ( EEM_Answer::instance()->has_field( $property ) ) {
-				$this->_ANS->set( $property, $value );
-			} else if ( $this->_question_form_input_property_exists( __CLASS__, $property ) ) {
+	public function set($property = NULL, $value = NULL) {
+		if ( ! empty($property)) {
+			if (EEM_Question::instance()->has_field($property)) {
+				$this->_QST->set($property, $value);
+			} else if (EEM_Answer::instance()->has_field($property)) {
+				$this->_ANS->set($property, $value);
+			} else if ($this->_question_form_input_property_exists(__CLASS__, $property)) {
 				echo "<hr>$property is a prop of QFI";
 				$this->{$property} = $value;
 				return TRUE;
@@ -366,9 +366,9 @@ 
 	 *                                                       whether it was trashed or not.
 	 * @return EE_Question_Option
 	 */
-	public function options( $notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL ) {
+	public function options($notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL) {
 		$temp_options = $this->_QST->temp_options();
-		return ! empty( $temp_options ) ? $temp_options : $this->_QST->options( $notDeletedOptionsOnly, $selected_value_to_always_include );
+		return ! empty($temp_options) ? $temp_options : $this->_QST->options($notDeletedOptionsOnly, $selected_value_to_always_include);
 	}
 
 
@@ -379,8 +379,8 @@ 
 	 * @param mixed $key
 	 * @return mixed
 	 */
-	public function get_meta( $key = FALSE ) {
-		return $key && isset( $this->_QST_meta[ $key ] ) ? $this->_QST_meta[ $key ] : FALSE;
+	public function get_meta($key = FALSE) {
+		return $key && isset($this->_QST_meta[$key]) ? $this->_QST_meta[$key] : FALSE;
 	}
 
 

core/db_classes/EE_Question_Group.class.php

Doc Comments +5 added lines, -5 removed lines

@@ -65,7 +65,7 @@ 
 	/**
 	 * Gets the question group's internal name
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function identifier() {
 		return $this->get( 'QSG_identifier' );
@@ -89,7 +89,7 @@ 
 	 * Gets the question group's order number in a sequence
 	 * of other question groups
 	 * @access public
-	 * @return int
+	 * @return boolean
 	 */
 	public function order() {
 		return $this->get( 'QSG_order' );
@@ -138,7 +138,7 @@ 
 	 *
 	 * @since 4.5.0
 	 *
-	 * @return int
+	 * @return boolean
 	 */
 	public function wp_user() {
 		return $this->get('QSG_wp_user');
@@ -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 +40 added lines, -40 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -32,9 +32,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Question_Group|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);
 	}
 
 
@@ -43,8 +43,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Question_Group
 	 */
-	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 @@ 
 	 * @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');
 	}
 
 
@@ -68,7 +68,7 @@ 
 	 * @return string
 	 */
 	public function identifier() {
-		return $this->get( 'QSG_identifier' );
+		return $this->get('QSG_identifier');
 	}
 
 
@@ -79,8 +79,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');
 	}
 
 
@@ -92,7 +92,7 @@ 
 	 * @return int
 	 */
 	public function order() {
-		return $this->get( 'QSG_order' );
+		return $this->get('QSG_order');
 	}
 
 
@@ -103,7 +103,7 @@ 
 	 * @return boolean
 	 */
 	public function show_group_name() {
-		return $this->get( 'QSG_show_group_name' );
+		return $this->get('QSG_show_group_name');
 	}
 
 
@@ -115,7 +115,7 @@ 
 	 * @return boolean
 	 */
 	public function show_group_desc() {
-		return $this->get( 'QSG_show_group_desc' );
+		return $this->get('QSG_show_group_desc');
 	}
 
 
@@ -128,7 +128,7 @@ 
 	 * @return boolean
 	 */
 	public function system_group() {
-		return $this->get( 'QSG_system' );
+		return $this->get('QSG_system');
 	}
 
 
@@ -153,7 +153,7 @@ 
 	 * @return boolean
 	 */
 	public function deleted() {
-		return $this->get( 'QST_deleted' );
+		return $this->get('QST_deleted');
 	}
 
 
@@ -164,8 +164,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;
 	}
 
@@ -176,9 +176,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();
 	}
 
 
@@ -188,14 +188,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')));
 	}
 
 
@@ -205,7 +205,7 @@ 
 	 * @return EE_Event[]
 	 */
 	public function events() {
-		return $this->get_many_related( 'Event' );
+		return $this->get_many_related('Event');
 	}
 
 
@@ -215,8 +215,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');
 	}
 
 
@@ -226,8 +226,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');
 	}
 
 
@@ -237,9 +237,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())));
 	}
 
 
@@ -250,9 +250,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;
@@ -268,7 +268,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);
 	}
 }

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;
 	}