eventespresso / event-espresso-core

core/db_models/fields/EE_WP_Post_Status_Field.php

Spacing +16 added lines, -16 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-require_once( EE_MODELS . 'fields/EE_Enum_Text_Field.php' );
-class EE_WP_Post_Status_Field extends EE_Enum_Text_Field{
+require_once(EE_MODELS.'fields/EE_Enum_Text_Field.php');
+class EE_WP_Post_Status_Field extends EE_Enum_Text_Field {
 
 	protected $_wp_post_stati;
 
@@ -28,8 +28,8 @@ 
 	 * @link http://codex.wordpress.org/Function_Reference/register_post_status for more info
 	 * @param boolean $store_in_db_as_int By default, enums are stored as STRINGS in the DB. However, if this var is set to true, it will be stored as an INT
 	 */
-	function __construct($table_column, $nicename, $nullable, $default_value, $new_stati = array()){
-		$this->_register_new_stati( $new_stati );
+	function __construct($table_column, $nicename, $nullable, $default_value, $new_stati = array()) {
+		$this->_register_new_stati($new_stati);
 		$this->_set_allowed_enum_values();
 		parent::__construct($table_column, $nicename, $nullable, $default_value, $this->_allowed_enum_values);
 	}
@@ -46,18 +46,18 @@ 
 	 * @param  array $new_stati statuses
 	 * @return void
 	 */
-	protected function _register_new_stati( $new_stati ) {
+	protected function _register_new_stati($new_stati) {
 
-		foreach ( (array) $new_stati as $status_key => $status_args ) {
+		foreach ((array) $new_stati as $status_key => $status_args) {
 			$args = array(
-				'label' => isset( $status_args['label'] ) ? $status_args['label'] : $status_key,
-				'public' => isset( $status_args['public'] ) && is_bool( $status_args['public'] ) ? $status_args['public'] : TRUE,
-				'exclude_from_search' => isset( $status_args['exclude_from_search'] ) && is_bool($status_args['exclude_from_search'] ) ? $status_args['exclude_from_search'] : FALSE,
-				'show_in_admin_all_list' => isset( $status_args['show_in_admin_all_list'] ) && is_bool( $status_args['show_in_admin_all_list'] ) ? $status_args['show_in_admin_all_list'] : FALSE,
-				'show_in_admin_status_list' =>  isset( $status_args['show_in_admin_status_list'] ) && is_bool( $status_args['show_in_admin_status_list'] ) ? $status_args['show_in_admin_status_list'] : TRUE,
-				'label_count' => isset( $status_args['label_count'] ) ? $status_args['label_count'] : ''
+				'label' => isset($status_args['label']) ? $status_args['label'] : $status_key,
+				'public' => isset($status_args['public']) && is_bool($status_args['public']) ? $status_args['public'] : TRUE,
+				'exclude_from_search' => isset($status_args['exclude_from_search']) && is_bool($status_args['exclude_from_search']) ? $status_args['exclude_from_search'] : FALSE,
+				'show_in_admin_all_list' => isset($status_args['show_in_admin_all_list']) && is_bool($status_args['show_in_admin_all_list']) ? $status_args['show_in_admin_all_list'] : FALSE,
+				'show_in_admin_status_list' =>  isset($status_args['show_in_admin_status_list']) && is_bool($status_args['show_in_admin_status_list']) ? $status_args['show_in_admin_status_list'] : TRUE,
+				'label_count' => isset($status_args['label_count']) ? $status_args['label_count'] : ''
 				);
-			register_post_status( $status_key, $status_args );
+			register_post_status($status_key, $status_args);
 		}
 
 	}
@@ -78,7 +78,7 @@ 
 		global $wp_post_statuses;
 		$this->_wp_post_stati = $wp_post_statuses;
 
-		foreach( $this->_wp_post_stati  as $post_status => $args_object ) {
+		foreach ($this->_wp_post_stati  as $post_status => $args_object) {
 			$this->_allowed_enum_values[$post_status] = $args_object->label;
 		}
 
@@ -108,7 +108,7 @@ 
 	 * @param  string $status What status object you want
 	 * @return std_object         the status object or FALSE if it doesn't exist.
 	 */
-	public function get_status_object( $status ) {
-		return isset( $this->_wp_post_stati[$status] ) ? $this->_wp_post_stati[$status] : FALSE;
+	public function get_status_object($status) {
+		return isset($this->_wp_post_stati[$status]) ? $this->_wp_post_stati[$status] : FALSE;
 	}
 }
\ No newline at end of file

core/db_models/fields/EE_WP_Post_Type_Field.php.php

Spacing +2 added lines, -2 removed lines

@@ -2,13 +2,13 @@
 /**
  * For CPT models who have a post type field
  */
-class EE_WP_Post_Type_Field extends EE_DB_Only_Text_Field{
+class EE_WP_Post_Type_Field extends EE_DB_Only_Text_Field {
 	/**
 	 * 
 	 * @param string $post_type the exact string to be used for the post type
 	 * of all these post type model objects/rows
 	 */
-	function __construct($post_type){
+	function __construct($post_type) {
 		parent::__construct('post_type', __("Post Type", 'event_espresso'), false, $post_type);
 	}
 }
\ No newline at end of file

core/db_models/fields/EE_WP_User_Field.php

Spacing +7 added lines, -7 removed lines

@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_WP_User_Field extends EE_Foreign_Key_Int_Field{
+class EE_WP_User_Field extends EE_Foreign_Key_Int_Field {
 	/**
 	 * No need to provide a default or the model pointed to- the default is
 	 * always get_current_user_id() and the model pointed to is always WP_User
@@ -33,8 +33,8 @@ 
 	 * @param string $nicename should eb internationalized with __('blah','event_espresso')
 	 * @param boolean $nullable
 	 */
-	function __construct($table_column, $nicename, $nullable){
-		parent::__construct($table_column, $nicename, $nullable, null, 'WP_User' );
+	function __construct($table_column, $nicename, $nullable) {
+		parent::__construct($table_column, $nicename, $nullable, null, 'WP_User');
 	}
 
 	/**
@@ -42,11 +42,11 @@ 
 	 * constructing the model field because that's done before $current_user is set
 	 * @return mixed
 	 */
-	function get_default_value(){
-		if( did_action( 'init' ) ) {
+	function get_default_value() {
+		if (did_action('init')) {
 			return get_current_user_id();
-		}else{
-			EE_Error::doing_it_wrong('EE_WP_User_Field::get_default_value', __( 'You cant get a default value for a wp_User_Field because the "init" action is called, because current_user global hasnt yet been setup. Consider doing your business logic on the "init" hook or later.', 'event_espresso' ), '4.6.20' );
+		} else {
+			EE_Error::doing_it_wrong('EE_WP_User_Field::get_default_value', __('You cant get a default value for a wp_User_Field because the "init" action is called, because current_user global hasnt yet been setup. Consider doing your business logic on the "init" hook or later.', 'event_espresso'), '4.6.20');
 			return 1;
 		}
 	}

Braces +4 added lines, -2 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -45,7 +47,7 @@ 
 	function get_default_value(){
 		if( did_action( 'init' ) ) {
 			return get_current_user_id();
-		}else{
+		} else{
 			EE_Error::doing_it_wrong('EE_WP_User_Field::get_default_value', __( 'You cant get a default value for a wp_User_Field because the "init" action is called, because current_user global hasnt yet been setup. Consider doing your business logic on the "init" hook or later.', 'event_espresso' ), '4.6.20' );
 			return 1;
 		}

core/db_models/helpers/EE_Index.php

Spacing +9 added lines, -9 removed lines

@@ -4,18 +4,18 @@ 
  * Parent class for indicating indexes on models. As of writing this, it is only used
  * when deleting model objects that have no primary key, but clearly this can be expanded
  */
-class EE_Index{
+class EE_Index {
 	protected $_name;
 	protected $_field_names;
 	protected $_model_name;
-	public function __construct($fields){
+	public function __construct($fields) {
 		$this->_field_names = $fields;
 	}
-	public function _construct_finalize($name,$model_name){
+	public function _construct_finalize($name, $model_name) {
 		$this->_name = $name;
 		$this->_model_name = $model_name;
 	}
-	public function field_names(){
+	public function field_names() {
 		return $this->_field_names;
 	}
 	/**
@@ -23,19 +23,19 @@ 
 	 * @param string $model_name like Event, Question_Group, etc. omit the EEM_
 	 * @return EEM_Base
 	 */
-	protected function _get_model($model_name){
-		$modelInstance=call_user_func("EEM_".$model_name."::instance");
+	protected function _get_model($model_name) {
+		$modelInstance = call_user_func("EEM_".$model_name."::instance");
 		return $modelInstance;
 	}
 	/**
 	 * Gets all the fields for this index
 	 * @return EE_Model_Field_Base[]
 	 */
-	public function fields(){
+	public function fields() {
 		$fields = array();
 		$model = $this->_get_model($this->_model_name);
-		foreach($model->field_settings() as $field_name => $field_obj){
-			if(in_array($field_name,$this->field_names())){
+		foreach ($model->field_settings() as $field_name => $field_obj) {
+			if (in_array($field_name, $this->field_names())) {
 				$fields[$field_name] = $field_obj;
 			}
 		}

core/db_models/helpers/EE_Model_Parser.php

Indentation +6 added lines, -6 removed lines

@@ -1,12 +1,12 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
- * EE_Model_Parser
- *
- * @package			Event Espresso
- * @subpackage
- * @author				Mike Nelson
- */
+	 * EE_Model_Parser
+	 *
+	 * @package			Event Espresso
+	 * @subpackage
+	 * @author				Mike Nelson
+	 */
 class EE_Model_Parser {
 	const table_alias_model_relation_chain_separator = '__';
 	const table_alias_model_relation_chain_prefix_end = '___';

Spacing +21 added lines, -21 removed lines

@@ -20,7 +20,7 @@ 
 	 * @param string $string_to_pad
 	 * @return string
 	 */
-	public static function pad_with_periods($string_to_pad){
+	public static function pad_with_periods($string_to_pad) {
 		return ".".$string_to_pad.".";
 	}
 	/**
@@ -28,8 +28,8 @@ 
 	 * @param string $string_to_trim
 	 * @return string
 	 */
-	public static function trim_periods($string_to_trim){
-		return trim($string_to_trim,'.');
+	public static function trim_periods($string_to_trim) {
+		return trim($string_to_trim, '.');
 	}
 
 
@@ -40,22 +40,22 @@ 
 	 * @param        $this_model_name
 	 * @return string which can be added onto table aliases to make them unique
 	 */
-	public static function extract_table_alias_model_relation_chain_prefix($model_relation_chain,$this_model_name){
+	public static function extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this_model_name) {
 		//eg $model_relation_chain = 'Venue.Event_Venue.Event.Registration", and $this_model_name = 'Event'
 		$model_relation_chain = self::pad_with_periods($model_relation_chain);
 		$this_model_name = self::pad_with_periods($this_model_name);
 		//eg '.Venue.Event_Venue.Event.Registration." and '.Event.'
 		//remove this model name and everything afterwards
-		$pos_of_model_name = strpos($model_relation_chain,$this_model_name);
-		$model_relation_chain = substr($model_relation_chain,0,$pos_of_model_name);
+		$pos_of_model_name = strpos($model_relation_chain, $this_model_name);
+		$model_relation_chain = substr($model_relation_chain, 0, $pos_of_model_name);
 		//eg '.Venue.Event_Venue.'
 		//trim periods
 		$model_relation_chain = self::trim_periods($model_relation_chain);
 		//eg 'Venue.Event_Venue'
 		//replace periods with double-underscores
-		$model_relation_chain = str_replace(".",self::table_alias_model_relation_chain_separator,$model_relation_chain);
+		$model_relation_chain = str_replace(".", self::table_alias_model_relation_chain_separator, $model_relation_chain);
 		//eg 'Venue__Event_Venue'
-		if($model_relation_chain !=''){
+		if ($model_relation_chain != '') {
 			$model_relation_chain = $model_relation_chain.self::table_alias_model_relation_chain_prefix_end;
 		}
 		//eg 'Venue_Event_Venue___'
@@ -66,14 +66,14 @@ 
 	 * @param string $table_alias_with_model_relation_chain_prefix which CAN have a table alias model relation chain prefix (or not)
 	 * @return string
 	 */
-	public static function remove_table_alias_model_relation_chain_prefix($table_alias_with_model_relation_chain_prefix){
+	public static function remove_table_alias_model_relation_chain_prefix($table_alias_with_model_relation_chain_prefix) {
 		//does this actually have a table alias model relation chain prefix?
-		$pos = strpos($table_alias_with_model_relation_chain_prefix,self::table_alias_model_relation_chain_prefix_end);
-		if(  $pos !== FALSE){
+		$pos = strpos($table_alias_with_model_relation_chain_prefix, self::table_alias_model_relation_chain_prefix_end);
+		if ($pos !== FALSE) {
 			//yes
 			//find that triple underscore and remove it and everything before it
 			$table_alias = substr($table_alias_with_model_relation_chain_prefix, $pos + strlen(self::table_alias_model_relation_chain_prefix_end));
-		}else{
+		} else {
 			$table_alias = $table_alias_with_model_relation_chain_prefix;
 		}
 		return $table_alias;
@@ -83,14 +83,14 @@ 
 	 * @param string $table_alias_with_model_relation_chain_prefix
 	 * @return string
 	 */
-	public static function get_prefix_from_table_alias_with_model_relation_chain_prefix($table_alias_with_model_relation_chain_prefix){
+	public static function get_prefix_from_table_alias_with_model_relation_chain_prefix($table_alias_with_model_relation_chain_prefix) {
 		//does this actually have a table alias model relation chain prefix?
-		$pos = strpos($table_alias_with_model_relation_chain_prefix,self::table_alias_model_relation_chain_prefix_end);
-		if(  $pos !== FALSE){
+		$pos = strpos($table_alias_with_model_relation_chain_prefix, self::table_alias_model_relation_chain_prefix_end);
+		if ($pos !== FALSE) {
 			//yes
 			//find that triple underscore and remove it and everything before it
 			$prefix = substr($table_alias_with_model_relation_chain_prefix, 0, $pos + strlen(self::table_alias_model_relation_chain_prefix_end));
-		}else{
+		} else {
 			$prefix = '';
 		}
 		return $prefix;
@@ -105,7 +105,7 @@ 
 	 * @param string $original_query_param
 	 * @return string
 	 */
-	public static function extract_table_alias_model_relation_chain_from_query_param($model_name, $original_query_param){
+	public static function extract_table_alias_model_relation_chain_from_query_param($model_name, $original_query_param) {
 		$relation_chain = self::extract_model_relation_chain($model_name, $original_query_param);
 		$table_alias_with_model_relation_chain_prefix = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($relation_chain, $model_name);
 		return $table_alias_with_model_relation_chain_prefix;
@@ -119,7 +119,7 @@ 
 	 * @param string $original_query_param
 	 * @return string
 	 */
-	public static function extract_model_relation_chain($model_name,$original_query_param){
+	public static function extract_model_relation_chain($model_name, $original_query_param) {
 		//prefix and postfix both with a period, as this facilitates searching
 		$model_name = EE_Model_Parser::pad_with_periods($model_name);
 		$original_query_param = EE_Model_Parser::pad_with_periods($original_query_param);
@@ -127,7 +127,7 @@ 
 		//eg, if we're looking for the model relation chain from Event to Payment, the original query param is probably something like
 		//"Registration.Transaction.Payment.PAY_ID", $pos_of_model_string points to the 'P' or Payment. We want the string
 		//"Registration.Transaction.Payment"
-		$model_relation_chain = substr($original_query_param, 0,$pos_of_model_string+strlen($model_name));
+		$model_relation_chain = substr($original_query_param, 0, $pos_of_model_string + strlen($model_name));
 		return EE_Model_Parser::trim_periods($model_relation_chain);
 	}
 
@@ -142,11 +142,11 @@ 
 	 * @param string $model_relation_chain
 	 * @return string
 	 */
-	public static function replace_model_name_with_join_model_name_in_model_relation_chain($model_name,$join_model_name,$model_relation_chain){
+	public static function replace_model_name_with_join_model_name_in_model_relation_chain($model_name, $join_model_name, $model_relation_chain) {
 		$model_name = EE_Model_Parser::pad_with_periods($model_name);
 		$join_model_name = EE_Model_Parser::pad_with_periods($join_model_name);
 		$model_relation_chain = EE_Model_Parser::pad_with_periods($model_relation_chain);
-		$replaced_with_periods = str_replace($model_name,$join_model_name,$model_relation_chain);
+		$replaced_with_periods = str_replace($model_name, $join_model_name, $model_relation_chain);
 		return EE_Model_Parser::trim_periods($replaced_with_periods);
 	}
 }

Braces +4 added lines, -3 removed lines

@@ -1,5 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION'))
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 /**
  * EE_Model_Parser
  *
@@ -73,7 +74,7 @@ 
 			//yes
 			//find that triple underscore and remove it and everything before it
 			$table_alias = substr($table_alias_with_model_relation_chain_prefix, $pos + strlen(self::table_alias_model_relation_chain_prefix_end));
-		}else{
+		} else{
 			$table_alias = $table_alias_with_model_relation_chain_prefix;
 		}
 		return $table_alias;
@@ -90,7 +91,7 @@ 
 			//yes
 			//find that triple underscore and remove it and everything before it
 			$prefix = substr($table_alias_with_model_relation_chain_prefix, 0, $pos + strlen(self::table_alias_model_relation_chain_prefix_end));
-		}else{
+		} else{
 			$prefix = '';
 		}
 		return $prefix;

core/db_models/helpers/EE_Model_Query_Info_Carrier.php

Indentation +3 added lines, -3 removed lines

@@ -11,8 +11,8 @@ 
 */
 class EE_Model_Query_Info_Carrier extends EE_Base{
    /**
-	* @var string SQL for performing joins (Eg, "INNER JOIN blah ON blah=blah INNER JOIN FOO ON foo=foo...")
-	*/
+    * @var string SQL for performing joins (Eg, "INNER JOIN blah ON blah=blah INNER JOIN FOO ON foo=foo...")
+    */
    private $_join_sql;
    /**
     *
@@ -132,7 +132,7 @@ 
     * @return string
     */
   public function get_main_model_join_sql() {
-    return $this->_main_join_sql;
+	return $this->_main_join_sql;
   }
 
 

Spacing +23 added lines, -23 removed lines

@@ -9,7 +9,7 @@ 
 * We could have returned an array
 * with two keys 'join_sql' and 'data_types', but this better-defines the data being passed around
 */
-class EE_Model_Query_Info_Carrier extends EE_Base{
+class EE_Model_Query_Info_Carrier extends EE_Base {
    /**
 	* @var string SQL for performing joins (Eg, "INNER JOIN blah ON blah=blah INNER JOIN FOO ON foo=foo...")
 	*/
@@ -43,29 +43,29 @@ 
    
    private $_group_by_sql;
    
-   function set_limit_sql($limit_sql){
+   function set_limit_sql($limit_sql) {
 	   $this->_limit_sql = $limit_sql;
 	}
 	
-	function set_order_by_sql($order_by_sql){
+	function set_order_by_sql($order_by_sql) {
 		$this->_order_by_sql = $order_by_sql;
 	}
-	function set_group_by_sql($group_by_sql){
+	function set_group_by_sql($group_by_sql) {
 		$this->_group_by_sql = $group_by_sql;
 	}
-	function set_having_sql($having_sql){
+	function set_having_sql($having_sql) {
 		$this->_having_sql = $having_sql;
 	}
-	function get_limit_sql(){
+	function get_limit_sql() {
 		return $this->_limit_sql;
 	}
-	function get_order_by_sql(){
+	function get_order_by_sql() {
 		return $this->_order_by_sql;
 	}
-	function get_group_by_sql(){
+	function get_group_by_sql() {
 		return $this->_group_by_sql;
 	}
-	function get_having_sql(){
+	function get_having_sql() {
 		return $this->_having_sql;
 	}
    /**
@@ -74,7 +74,7 @@ 
     * @param type $join_sql
     * @param type $data_types
     */
-   public function __construct($model_included_name= array(), $join_sql = ''){
+   public function __construct($model_included_name = array(), $join_sql = '') {
 	   $this->_models_included = $model_included_name;
 	   $this->_join_sql = $join_sql;
    }
@@ -83,10 +83,10 @@ 
     * Merges info from the other EEM_Related_Model_Info_Carrier into this one.
     * @param EE_Model_Query_Info_Carrier $other_model_query_info_carrier
     */
-   public function merge( $other_model_query_info_carrier ){
-	   if( $other_model_query_info_carrier && ! $this->_have_already_included_one_of_these_models($other_model_query_info_carrier->get_model_names_included())){
-			$model_included_on_other_join_sql_and_data_types_carrier =  $other_model_query_info_carrier->get_model_names_included();
-			$this->_models_included = array_merge( $this->_models_included, $model_included_on_other_join_sql_and_data_types_carrier );
+   public function merge($other_model_query_info_carrier) {
+	   if ($other_model_query_info_carrier && ! $this->_have_already_included_one_of_these_models($other_model_query_info_carrier->get_model_names_included())) {
+			$model_included_on_other_join_sql_and_data_types_carrier = $other_model_query_info_carrier->get_model_names_included();
+			$this->_models_included = array_merge($this->_models_included, $model_included_on_other_join_sql_and_data_types_carrier);
 			$this->_join_sql .= $other_model_query_info_carrier->_join_sql;
 	   }
 	   //otherwise don't merge our data.
@@ -100,9 +100,9 @@ 
     * @param array $model_names just like EE_MOdel_QUery_Info_Carrier::_models_included: keys are model chain paths, values are the model names only
     * @return boolean
     */
-   protected function  _have_already_included_one_of_these_models($model_names){
-	   foreach($this->_models_included as $model_relation_path=>$model_included){
-		   if(array_key_exists($model_relation_path, $model_names)){
+   protected function  _have_already_included_one_of_these_models($model_names) {
+	   foreach ($this->_models_included as $model_relation_path=>$model_included) {
+		   if (array_key_exists($model_relation_path, $model_names)) {
 			   return true;
 		   }
 	   }
@@ -112,17 +112,17 @@ 
     * Array keys are model names, values are "model relation paths". See EE_Model_Query_Info_Carrier::_models_included for details
     * @return array like EE_Model_Query_Info_Carrier::_models_included
     */
-   public function get_model_names_included(){
+   public function get_model_names_included() {
 	   return $this->_models_included;
    }
    /**
     * sets the $where_sql for later use from client code
     * @param string $where_sql
     */
-   public function set_where_sql($where_sql){
+   public function set_where_sql($where_sql) {
 	   $this->_where_sql = $where_sql;
    }
-   public function get_where_sql(){
+   public function get_where_sql() {
 	   return $this->_where_sql;
    }
 
@@ -143,10 +143,10 @@ 
     * after the FROM and before the WHERE.)
     * @param string $join_sql
     */
-   public function set_main_model_join_sql($join_sql){
+   public function set_main_model_join_sql($join_sql) {
 	   $this->_main_join_sql = $join_sql;
    }
-   public function get_full_join_sql(){
-	   return $this->_main_join_sql . $this->_join_sql;
+   public function get_full_join_sql() {
+	   return $this->_main_join_sql.$this->_join_sql;
    }
 }
\ No newline at end of file

core/db_models/helpers/EE_Primary_Key_Index.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
  * Used to indicate  a primary key index - ie, a set of fields which, when used in combination,
  * also uniquely identify a model object in the database (in case there is no primary key field).
  */
-class EE_Primary_Key_Index extends EE_Unique_Index{
+class EE_Primary_Key_Index extends EE_Unique_Index {
 	//yep, actually the same as unique index right now
 	
 }

core/db_models/helpers/EE_Primary_Table.php

Spacing +5 added lines, -5 removed lines

@@ -4,8 +4,8 @@ 
  * For defining the main table of the model. This is the table with the model's primary key's field. So for CPT models, this will
  * probably be the wp_posts table (so the table name supplied will be 'posts', as the 'wp_' varies). For models only using one table, this will be that table.
  */
-require_once( EE_MODELS . 'helpers/EE_Table_Base.php');
-class EE_Primary_Table extends EE_Table_Base{
+require_once(EE_MODELS.'helpers/EE_Table_Base.php');
+class EE_Primary_Table extends EE_Table_Base {
 
 	/**
 	 *
@@ -15,14 +15,14 @@ 
 	 * @param boolean $global whether the table is "global" as in there is only 1 table on an entire multisite install,
 	 *					or whether each site on a multisite install has a copy of this table
 	 */
-	function __construct($table_name, $pk_column = null, $global = false){
-		parent::__construct($table_name, $pk_column, $global );
+	function __construct($table_name, $pk_column = null, $global = false) {
+		parent::__construct($table_name, $pk_column, $global);
 	}
 	/**
 	 * Gets SQL for this table and assigning it an alias. Eg " wp_esp_attendee AS Attendee "
 	 * @return string
 	 */
-	function get_table_sql(){
+	function get_table_sql() {
 		return " ".$this->get_table_name()." AS ".$this->get_table_alias()." ";
 	}
 

core/db_models/helpers/EE_Secondary_Table.php

Spacing +21 added lines, -21 removed lines

@@ -5,8 +5,8 @@ 
  * table's rows. Ie, it can't have many rows in the secondary table that point to
  * a single row in the primary table
  */
-require_once( EE_MODELS . 'helpers/EE_Table_Base.php');
-class EE_Secondary_Table extends EE_Table_Base{
+require_once(EE_MODELS.'helpers/EE_Table_Base.php');
+class EE_Secondary_Table extends EE_Table_Base {
 	protected $_extra_join_conditions;
 
 	/**
@@ -19,15 +19,15 @@ 
 	 * @param boolean $global whether the table is "global" as in there is only 1 table on an entire multisite install,
 	 *					or whether each site on a multisite install has a copy of this table
 	 */
-	function __construct($table_name, $pk_column,  $fk_column = null, $extra_join_conditions = null, $global = false ){
+	function __construct($table_name, $pk_column, $fk_column = null, $extra_join_conditions = null, $global = false) {
 		$this->_fk_on_table = $fk_column;
 		$this->_extra_join_conditions = $extra_join_conditions;
-		parent::__construct( $table_name, $pk_column, $global );
+		parent::__construct($table_name, $pk_column, $global);
 	}
-	function get_fk_on_table(){
+	function get_fk_on_table() {
 		return $this->_fk_on_table;
 	}
-	function _construct_finalize_set_table_to_join_with(EE_Table_Base $table){
+	function _construct_finalize_set_table_to_join_with(EE_Table_Base $table) {
 		$this->_table_to_join_with = $table;
 	}
 	/**
@@ -35,14 +35,14 @@ 
 	 * @return string of sql like "Event.post_type = 'event'", which gets added to
 	 * the end of the join statement with the primary table
 	 */
-	function get_extra_join_conditions(){
+	function get_extra_join_conditions() {
 		return $this->_extra_join_conditions;
 	}
 	/**
 	 *
 	 * @return EE_Primary_Table
 	 */
-	function get_table_to_join_with(){
+	function get_table_to_join_with() {
 		return $this->_table_to_join_with;
 	}
 	/**
@@ -52,15 +52,15 @@ 
 	 * @param string $table allows us to set special conditions on the $table_name portion of the join query (i.e. doing a subquery)
 	 * @return string of SQL
 	 */
-	function get_join_sql( $primary_table_alias_with_model_chain_prefix  ){
+	function get_join_sql($primary_table_alias_with_model_chain_prefix) {
 
 		$table_name = $this->get_table_name();
-		$secondary_table_alias = EE_Model_Parser::get_prefix_from_table_alias_with_model_relation_chain_prefix($primary_table_alias_with_model_chain_prefix) . $this->get_table_alias();
+		$secondary_table_alias = EE_Model_Parser::get_prefix_from_table_alias_with_model_relation_chain_prefix($primary_table_alias_with_model_chain_prefix).$this->get_table_alias();
 		$other_table_pk = $this->get_table_to_join_with()->get_pk_column();
 		$fk = $this->get_fk_on_table();
 		$join_sql = " LEFT JOIN $table_name AS $secondary_table_alias ON $primary_table_alias_with_model_chain_prefix.$other_table_pk = $secondary_table_alias.$fk ";
-		if($this->get_extra_join_conditions()){
-			$join_sql.="AND ".$this->get_extra_join_conditions();
+		if ($this->get_extra_join_conditions()) {
+			$join_sql .= "AND ".$this->get_extra_join_conditions();
 		}
 		return $join_sql;
 	}
@@ -74,14 +74,14 @@ 
 	 * This is useful if the secondary table is already included in the SQL, but the primary table is not yet.
 	 * @return string
 	 */
-	function get_inverse_join_sql($secondary_table_alias_with_model_chain_prefix){
-		$primary_table_name =$this->get_table_to_join_with()->get_table_name();
-		$primary_table_alias = EE_Model_Parser::get_prefix_from_table_alias_with_model_relation_chain_prefix($secondary_table_alias_with_model_chain_prefix) . $this->get_table_to_join_with()->get_table_alias();
-		$primary_table_pk = $this->get_table_to_join_with()->get_pk_column();//$this->get_pk_column();
+	function get_inverse_join_sql($secondary_table_alias_with_model_chain_prefix) {
+		$primary_table_name = $this->get_table_to_join_with()->get_table_name();
+		$primary_table_alias = EE_Model_Parser::get_prefix_from_table_alias_with_model_relation_chain_prefix($secondary_table_alias_with_model_chain_prefix).$this->get_table_to_join_with()->get_table_alias();
+		$primary_table_pk = $this->get_table_to_join_with()->get_pk_column(); //$this->get_pk_column();
 		$fk = $this->get_fk_on_table();
 		$join_sql = " LEFT JOIN $primary_table_name AS $primary_table_alias ON $primary_table_alias.$primary_table_pk = $secondary_table_alias_with_model_chain_prefix.$fk ";
-		if($this->get_extra_join_conditions()){
-			$join_sql.="AND ".$this->get_extra_join_conditions();
+		if ($this->get_extra_join_conditions()) {
+			$join_sql .= "AND ".$this->get_extra_join_conditions();
 		}
 		return $join_sql;
 	}
@@ -94,7 +94,7 @@ 
 	public function get_select_join_limit_join($limit) {
 		//first get the select
 		$select = $this->get_select_join_limit($limit);
-		$join_sql = $this->get_join_sql( $select );
+		$join_sql = $this->get_join_sql($select);
 		return $join_sql;
 	}
 
@@ -103,12 +103,12 @@ 
 	function get_fully_qualified_fk_column() {
 		$table_alias = $this->get_table_alias();
 		$fk = $this->get_fk_on_table();
-		return $table_alias . '.' . $fk;
+		return $table_alias.'.'.$fk;
 	}
 
 	function get_fully_qualified_pk_on_fk_table() {
 		$table_alias = $this->get_table_to_join_with()->get_table_alias();
 		$pk = $this->get_table_to_join_with()->get_pk_column();
-		return $table_alias . '.' . $pk;
+		return $table_alias.'.'.$pk;
 	}
 }
\ No newline at end of file