eventespresso / event-espresso-core

core/db_classes/EE_Extra_Meta.class.php

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

Doc Comments +4 added lines, -4 removed lines

@@ -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 );
@@ -81,7 +81,7 @@ 
 	/**
 	 * Sets model
 	 * @param string $model
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_model( $model ) {
 		$this->set( 'EXM_model', $model );
@@ -102,7 +102,7 @@ 
 	/**
 	 * Sets key
 	 * @param string $key
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_key( $key ) {
 		$this->set( 'EXM_key', $key );
@@ -123,7 +123,7 @@ 
 	/**
 	 * Sets value
 	 * @param string $value
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_value( $value ) {
 		$this->set( 'EXM_value', $value );

core/db_classes/EE_Import.class.php

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();

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() {
 
@@ -272,8 +268,7 @@ 
       *
       * @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 on success, FALSE on fail
       * @throws \EE_Error
       */
 	public function save_csv_data_array_to_db( $csv_data_array, $model_name = FALSE ) {
@@ -370,7 +365,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
 	 */
@@ -487,7 +482,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 ) {
@@ -597,7 +591,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 +71 added lines, -71 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' ) {
 
@@ -242,40 +242,40 @@ 
 
 
 
-     /**
-      *    Given an array of data (usually from a CSV import) attempts to save that data to the db.
-      *    If $model_name ISN'T provided, assumes that this is a 3d array, with toplevel keys being model names,
-      *    next level being numeric indexes adn each value representing a model object, and the last layer down
-      *    being keys of model fields and their proposed values.
-      *    If $model_name IS provided, assumes a 2d array of the bottom two layers previously mentioned.
-      *    If the CSV data says (in the metadata row) that it's from the SAME database,
-      *    we treat the IDs in the CSV as the normal IDs, and try to update those records. However, if those
-      *    IDs DON'T exist in the database, they're treated as temporary IDs,
-      *    which can used elsewhere to refer to the same object. Once an item
-      *    with a temporary ID gets inserted, we record its mapping from temporary
-      *    ID to real ID, and use the real ID in place of the temporary ID
-      *    when that temporary ID was used as a foreign key.
-      *    If the CSV data says (in the metadata again) that it's from a DIFFERENT database,
-      *    we treat all the IDs in the CSV as temporary ID- eg, if the CSV specifies an event with
-      *    ID 1, and the database already has an event with ID 1, we assume that's just a coincidence,
-      *    and insert a new event, and map it's temporary ID of 1 over to its new real ID.
-      *    An important exception are non-auto-increment primary keys. If one entry in the
-      *    CSV file has the same ID as one in the DB, we assume they are meant to be
-      *    the same item, and instead update the item in the DB with that same ID.
-      *    Also note, we remember the mappings permanently. So the 2nd, 3rd, and 10000th
-      *    time you import a CSV from a different site, we remember their mappings, and
-      * will try to update the item in the DB instead of inserting another item (eg
-      * if we previously imported an event with temporary ID 1, and then it got a
-      * real ID of 123, we remember that. So the next time we import an event with
-      * temporary ID, from the same site, we know that it's real ID is 123, and will
-      * 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
-      * @throws \EE_Error
-      */
+	 /**
+	  *    Given an array of data (usually from a CSV import) attempts to save that data to the db.
+	  *    If $model_name ISN'T provided, assumes that this is a 3d array, with toplevel keys being model names,
+	  *    next level being numeric indexes adn each value representing a model object, and the last layer down
+	  *    being keys of model fields and their proposed values.
+	  *    If $model_name IS provided, assumes a 2d array of the bottom two layers previously mentioned.
+	  *    If the CSV data says (in the metadata row) that it's from the SAME database,
+	  *    we treat the IDs in the CSV as the normal IDs, and try to update those records. However, if those
+	  *    IDs DON'T exist in the database, they're treated as temporary IDs,
+	  *    which can used elsewhere to refer to the same object. Once an item
+	  *    with a temporary ID gets inserted, we record its mapping from temporary
+	  *    ID to real ID, and use the real ID in place of the temporary ID
+	  *    when that temporary ID was used as a foreign key.
+	  *    If the CSV data says (in the metadata again) that it's from a DIFFERENT database,
+	  *    we treat all the IDs in the CSV as temporary ID- eg, if the CSV specifies an event with
+	  *    ID 1, and the database already has an event with ID 1, we assume that's just a coincidence,
+	  *    and insert a new event, and map it's temporary ID of 1 over to its new real ID.
+	  *    An important exception are non-auto-increment primary keys. If one entry in the
+	  *    CSV file has the same ID as one in the DB, we assume they are meant to be
+	  *    the same item, and instead update the item in the DB with that same ID.
+	  *    Also note, we remember the mappings permanently. So the 2nd, 3rd, and 10000th
+	  *    time you import a CSV from a different site, we remember their mappings, and
+	  * will try to update the item in the DB instead of inserting another item (eg
+	  * if we previously imported an event with temporary ID 1, and then it got a
+	  * real ID of 123, we remember that. So the next time we import an event with
+	  * temporary ID, from the same site, we know that it's real ID is 123, and will
+	  * 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
+	  * @throws \EE_Error
+	  */
 	public function save_csv_data_array_to_db( $csv_data_array, $model_name = FALSE ) {
 
 
@@ -306,10 +306,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 +170 added lines, -170 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;
 				}
 
@@ -276,7 +276,7 @@ 
       * @return TRUE on success, FALSE on fail
       * @throws \EE_Error
       */
-	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;
@@ -286,22 +286,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]);
 		}
@@ -310,30 +310,30 @@ 
 		* 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;
 		}
 
@@ -342,7 +342,7 @@ 
 		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;
@@ -374,81 +374,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));
 				}
 			}
 		}
@@ -469,13 +469,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;
 		}
 	}
@@ -490,11 +490,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;
 		}
 	}
@@ -513,55 +513,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)
@@ -569,8 +569,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;
 	}
@@ -582,11 +582,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;
@@ -600,18 +600,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;
@@ -626,36 +626,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;
 	}
@@ -668,55 +668,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;
 	}
@@ -725,28 +725,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;
 	}
 

core/db_classes/EE_Message_Template.class.php

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

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

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

Doc Comments +2 added lines, -2 removed lines

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

core/db_classes/EE_Question_Group_Question.class.php

Spacing +6 added lines, -6 removed lines

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

core/db_classes/EE_State.class.php

Spacing +20 added lines, -20 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -32,9 +32,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_State|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_State
 	 */
-	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);
 	}
 
 
@@ -53,7 +53,7 @@ 
 	 * @return string
 	 */
 	public function country_iso() {
-		return $this->get( 'CNT_ISO' );
+		return $this->get('CNT_ISO');
 	}
 
 
@@ -62,7 +62,7 @@ 
 	 * @return string
 	 */
 	public function abbrev() {
-		return $this->get( 'STA_abbrev' );
+		return $this->get('STA_abbrev');
 	}
 
 
@@ -71,7 +71,7 @@ 
 	 * @return bool
 	 */
 	public function active() {
-		return $this->get( 'STA_active' );
+		return $this->get('STA_active');
 	}
 
 
@@ -80,7 +80,7 @@ 
 	 * @return string
 	 */
 	public function name() {
-		return $this->get( 'STA_name' );
+		return $this->get('STA_name');
 	}
 
 
@@ -89,7 +89,7 @@ 
 	 * @return EE_Country
 	 */
 	public function country() {
-		return $this->get_first_related( 'Country' );
+		return $this->get_first_related('Country');
 	}
 
 
@@ -97,8 +97,8 @@ 
 	/**
 	 * @param $iso
 	 */
-	public function set_country_iso( $iso ) {
-		$this->set( 'CNT_ISO', $iso );
+	public function set_country_iso($iso) {
+		$this->set('CNT_ISO', $iso);
 	}
 
 
@@ -106,8 +106,8 @@ 
 	/**
 	 * @param $abbrev
 	 */
-	public function set_abbrev( $abbrev ) {
-		$this->set( 'STA_abbrev', $abbrev );
+	public function set_abbrev($abbrev) {
+		$this->set('STA_abbrev', $abbrev);
 	}
 
 
@@ -115,8 +115,8 @@ 
 	/**
 	 * @param $active
 	 */
-	public function set_active( $active ) {
-		$this->set( 'STA_active', $active );
+	public function set_active($active) {
+		$this->set('STA_active', $active);
 	}
 
 
@@ -124,8 +124,8 @@ 
 	/**
 	 * @param $name
 	 */
-	public function set_name( $name ) {
-		$this->set( 'STA_name', $name );
+	public function set_name($name) {
+		$this->set('STA_name', $name);
 	}
 }
 

core/db_classes/EE_Status.class.php

Spacing +25 added lines, -25 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_Status
 	 */
-	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_Status
 	 */
-	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,10 +55,10 @@ 
 	 * @param string $schema
 	 * @return string
 	 */
-	function code( $plural = FALSE, $schema = 'upper' ) {
-		$id = $this->get( 'STS_ID' );
-		$code = EEM_Status::instance()->localized_status( array( $id => $this->get( 'STS_code' ) ), $plural, $schema );
-		return $code[ $id ];
+	function code($plural = FALSE, $schema = 'upper') {
+		$id = $this->get('STS_ID');
+		$code = EEM_Status::instance()->localized_status(array($id => $this->get('STS_code')), $plural, $schema);
+		return $code[$id];
 	}
 
 
@@ -68,8 +68,8 @@ 
 	 * @param string $code
 	 * @return boolean
 	 */
-	function set_code( $code ) {
-		$this->set( 'STS_code', $code );
+	function set_code($code) {
+		$this->set('STS_code', $code);
 	}
 
 
@@ -79,7 +79,7 @@ 
 	 * @return string
 	 */
 	function desc() {
-		return $this->get( 'STS_desc' );
+		return $this->get('STS_desc');
 	}
 
 
@@ -89,8 +89,8 @@ 
 	 * @param string $desc
 	 * @return boolean
 	 */
-	function set_desc( $desc ) {
-		$this->set( 'STS_desc', $desc );
+	function set_desc($desc) {
+		$this->set('STS_desc', $desc);
 	}
 
 
@@ -100,7 +100,7 @@ 
 	 * @return string
 	 */
 	function type() {
-		return $this->get( 'STS_type' );
+		return $this->get('STS_type');
 	}
 
 
@@ -110,8 +110,8 @@ 
 	 * @param string $type
 	 * @return boolean
 	 */
-	function set_type( $type ) {
-		$this->set( 'STS_type', $type );
+	function set_type($type) {
+		$this->set('STS_type', $type);
 	}
 
 
@@ -121,7 +121,7 @@ 
 	 * @return boolean
 	 */
 	function can_edit() {
-		return $this->get( 'STS_can_edit' );
+		return $this->get('STS_can_edit');
 	}
 
 
@@ -131,8 +131,8 @@ 
 	 * @param boolean $can_edit
 	 * @return boolean
 	 */
-	function set_can_edit( $can_edit ) {
-		$this->set( 'STS_can_edit', $can_edit );
+	function set_can_edit($can_edit) {
+		$this->set('STS_can_edit', $can_edit);
 	}
 
 
@@ -142,7 +142,7 @@ 
 	 * @return boolean
 	 */
 	function open() {
-		return $this->get( 'STS_open' );
+		return $this->get('STS_open');
 	}
 
 
@@ -152,8 +152,8 @@ 
 	 * @param boolean $open
 	 * @return boolean
 	 */
-	function set_open( $open ) {
-		$this->set( 'STS_open', $open );
+	function set_open($open) {
+		$this->set('STS_open', $open);
 	}
 }
 

Doc Comments +5 added lines, -5 removed lines

@@ -66,7 +66,7 @@ 
 	/**
 	 * Sets code
 	 * @param string $code
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_code( $code ) {
 		$this->set( 'STS_code', $code );
@@ -87,7 +87,7 @@ 
 	/**
 	 * Sets desc
 	 * @param string $desc
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_desc( $desc ) {
 		$this->set( 'STS_desc', $desc );
@@ -108,7 +108,7 @@ 
 	/**
 	 * Sets type
 	 * @param string $type
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_type( $type ) {
 		$this->set( 'STS_type', $type );
@@ -129,7 +129,7 @@ 
 	/**
 	 * Sets can_edit
 	 * @param boolean $can_edit
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_can_edit( $can_edit ) {
 		$this->set( 'STS_can_edit', $can_edit );
@@ -150,7 +150,7 @@ 
 	/**
 	 * Sets open
 	 * @param boolean $open
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_open( $open ) {
 		$this->set( 'STS_open', $open );

core/db_classes/EE_Term.class.php

Spacing +17 added lines, -17 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,11 +34,11 @@ 
 	 * @param bool $bydb
 	 * @param string $timezone
 	 */
-	protected function __construct( $fieldValues = array(), $bydb = FALSE, $timezone = '' ) {
-		if ( ! isset( $fieldValues[ 'slug' ] ) ) {
-			$fieldValues[ 'slug' ] = $fieldValues[ 'name' ];
+	protected function __construct($fieldValues = array(), $bydb = FALSE, $timezone = '') {
+		if ( ! isset($fieldValues['slug'])) {
+			$fieldValues['slug'] = $fieldValues['name'];
 		}
-		parent::__construct( $fieldValues, $bydb, $timezone );
+		parent::__construct($fieldValues, $bydb, $timezone);
 	}
 
 
@@ -47,9 +47,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Term|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);
 	}
 
 
@@ -58,8 +58,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Term
 	 */
-	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);
 	}
 
 
@@ -69,7 +69,7 @@ 
 	 * @return string
 	 */
 	function name() {
-		return $this->get( 'name' );
+		return $this->get('name');
 	}
 
 
@@ -79,8 +79,8 @@ 
 	 * @param string $name
 	 * @return boolean
 	 */
-	function set_name( $name ) {
-		$this->set( 'name', $name );
+	function set_name($name) {
+		$this->set('name', $name);
 	}
 
 
@@ -90,7 +90,7 @@ 
 	 * @return string
 	 */
 	function slug() {
-		return $this->get( 'slug' );
+		return $this->get('slug');
 	}
 
 
@@ -100,8 +100,8 @@ 
 	 * @param string $slug
 	 * @return boolean
 	 */
-	function set_slug( $slug ) {
-		$this->set( 'slug', $slug );
+	function set_slug($slug) {
+		$this->set('slug', $slug);
 	}
 }
 

Doc Comments +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
 	/**
 	 * Sets name
 	 * @param string $name
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_name( $name ) {
 		$this->set( 'name', $name );
@@ -100,7 +100,7 @@ 
 	/**
 	 * Sets slug
 	 * @param string $slug
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_slug( $slug ) {
 		$this->set( 'slug', $slug );