eventespresso / event-espresso-core

core/db_models/strategies/EE_CPT_Where_Conditions.strategy.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
         return array_merge(
             parent::_get_default_where_conditions(),
             array(
-                $status_field->get_name() => array('NOT IN',array('auto-draft','trash') )
+                $status_field->get_name() => array('NOT IN', array('auto-draft', 'trash'))
             )
         );
     }

Indentation +16 added lines, -16 removed lines

@@ -3,7 +3,7 @@ 
 /**
  *
  * Class EE_Default_Where_Conditions
-  *
+ *
  * Strategy specifically for adding where conditions specific to CPT models.
  *
  * @package         Event Espresso
@@ -14,19 +14,19 @@ 
  */
 class EE_CPT_Where_Conditions extends EE_CPT_Minimum_Where_Conditions
 {
-    /**
-     * Gets the where default where conditions for a custom post type model
-     * @param string $model_relation_path. Eg, from Event to Payment, this should be "Registration.Transaction.Payment"
-     * @return array @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md#0-where-conditions
-     */
-    protected function _get_default_where_conditions()
-    {
-        $status_field = $this->_get_field_on_column('post_status');
-        return array_merge(
-            parent::_get_default_where_conditions(),
-            array(
-                $status_field->get_name() => array('NOT IN',array('auto-draft','trash') )
-            )
-        );
-    }
+	/**
+	 * Gets the where default where conditions for a custom post type model
+	 * @param string $model_relation_path. Eg, from Event to Payment, this should be "Registration.Transaction.Payment"
+	 * @return array @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md#0-where-conditions
+	 */
+	protected function _get_default_where_conditions()
+	{
+		$status_field = $this->_get_field_on_column('post_status');
+		return array_merge(
+			parent::_get_default_where_conditions(),
+			array(
+				$status_field->get_name() => array('NOT IN',array('auto-draft','trash') )
+			)
+		);
+	}
 }

core/db_models/strategies/EE_Restriction_Generator_Taxonomy_Protected.strategy.php

Indentation +35 added lines, -35 removed lines

@@ -13,40 +13,40 @@
 class EE_Restriction_Generator_Taxonomy_Protected extends EE_Restriction_Generator_Base
 {
 
-    /**
-     * Model chain/path to taxonomy model, including the term_taxonomy model itself
-     * @var string
-     */
-    protected $_path_to_taxonomy_model;
-    /**
-     *
-     * @param string $path_to_taxonomy_model Model chain/path to taxonomy model, including the term_taxonomy model itself
-     */
-    public function __construct($path_to_taxonomy_model)
-    {
-        if ($path_to_taxonomy_model !== '' && substr($path_to_taxonomy_model, -1, 1) != '.') {
-            $path_to_taxonomy_model .= '.';
-        }
-        $this->_path_to_taxonomy_model = $path_to_taxonomy_model;
-    }
-    protected function _generate_restrictions()
-    {
-        // if there are no standard caps for this model, then for allow full access
-        if (! $this->model()->cap_slug()) {
-            return array(
-            );
-        }
+	/**
+	 * Model chain/path to taxonomy model, including the term_taxonomy model itself
+	 * @var string
+	 */
+	protected $_path_to_taxonomy_model;
+	/**
+	 *
+	 * @param string $path_to_taxonomy_model Model chain/path to taxonomy model, including the term_taxonomy model itself
+	 */
+	public function __construct($path_to_taxonomy_model)
+	{
+		if ($path_to_taxonomy_model !== '' && substr($path_to_taxonomy_model, -1, 1) != '.') {
+			$path_to_taxonomy_model .= '.';
+		}
+		$this->_path_to_taxonomy_model = $path_to_taxonomy_model;
+	}
+	protected function _generate_restrictions()
+	{
+		// if there are no standard caps for this model, then for allow full access
+		if (! $this->model()->cap_slug()) {
+			return array(
+			);
+		}
 
-        return array(
-            'ee_manage_event_categories' => new EE_Default_Where_Conditions(array(
-                $this->_path_to_taxonomy_model . 'taxonomy*no_ee_manage_event_categories' => array( '!=', 'espresso_event_categories' )
-            )),
-            'ee_manage_venue_categories' => new EE_Default_Where_Conditions(array(
-                $this->_path_to_taxonomy_model . 'taxonomy*no_ee_manage_venue_categories' => array( '!=', 'espresso_venue_categories' )
-            )),
-            'ee_manage_event_types' => new EE_Default_Where_Conditions(array(
-                $this->_path_to_taxonomy_model . 'taxonomy*ee_manage_event_types' => array( '!=', 'espresso_event_types' )
-            )),
-        );
-    }
+		return array(
+			'ee_manage_event_categories' => new EE_Default_Where_Conditions(array(
+				$this->_path_to_taxonomy_model . 'taxonomy*no_ee_manage_event_categories' => array( '!=', 'espresso_event_categories' )
+			)),
+			'ee_manage_venue_categories' => new EE_Default_Where_Conditions(array(
+				$this->_path_to_taxonomy_model . 'taxonomy*no_ee_manage_venue_categories' => array( '!=', 'espresso_venue_categories' )
+			)),
+			'ee_manage_event_types' => new EE_Default_Where_Conditions(array(
+				$this->_path_to_taxonomy_model . 'taxonomy*ee_manage_event_types' => array( '!=', 'espresso_event_types' )
+			)),
+		);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -32,20 +32,20 @@
     protected function _generate_restrictions()
     {
         // if there are no standard caps for this model, then for allow full access
-        if (! $this->model()->cap_slug()) {
+        if ( ! $this->model()->cap_slug()) {
             return array(
             );
         }
 
         return array(
             'ee_manage_event_categories' => new EE_Default_Where_Conditions(array(
-                $this->_path_to_taxonomy_model . 'taxonomy*no_ee_manage_event_categories' => array( '!=', 'espresso_event_categories' )
+                $this->_path_to_taxonomy_model.'taxonomy*no_ee_manage_event_categories' => array('!=', 'espresso_event_categories')
             )),
             'ee_manage_venue_categories' => new EE_Default_Where_Conditions(array(
-                $this->_path_to_taxonomy_model . 'taxonomy*no_ee_manage_venue_categories' => array( '!=', 'espresso_venue_categories' )
+                $this->_path_to_taxonomy_model.'taxonomy*no_ee_manage_venue_categories' => array('!=', 'espresso_venue_categories')
             )),
             'ee_manage_event_types' => new EE_Default_Where_Conditions(array(
-                $this->_path_to_taxonomy_model . 'taxonomy*ee_manage_event_types' => array( '!=', 'espresso_event_types' )
+                $this->_path_to_taxonomy_model.'taxonomy*ee_manage_event_types' => array('!=', 'espresso_event_types')
             )),
         );
     }

core/db_models/strategies/EE_Return_None_Where_Conditions.strategy.php

Indentation +9 added lines, -9 removed lines

@@ -12,13 +12,13 @@
  */
 class EE_Return_None_Where_Conditions extends EE_Default_Where_Conditions
 {
-    protected function _get_default_where_conditions()
-    {
-        if ($this->_model->has_primary_key_field()) {
-            return array( $this->_model->primary_key_name() => array('<', 0 ) );
-        } else {
-            $fk_field = $this->_model->get_a_field_of_type('EE_Foreign_Key_Field_Base');
-            return array( 'AND*impossible' => array( $fk_field->get_name() => array('IS_NULL'), $fk_field->get_name() => 'IS_NOT_NULL' ) );
-        }
-    }
+	protected function _get_default_where_conditions()
+	{
+		if ($this->_model->has_primary_key_field()) {
+			return array( $this->_model->primary_key_name() => array('<', 0 ) );
+		} else {
+			$fk_field = $this->_model->get_a_field_of_type('EE_Foreign_Key_Field_Base');
+			return array( 'AND*impossible' => array( $fk_field->get_name() => array('IS_NULL'), $fk_field->get_name() => 'IS_NOT_NULL' ) );
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -15,10 +15,10 @@
     protected function _get_default_where_conditions()
     {
         if ($this->_model->has_primary_key_field()) {
-            return array( $this->_model->primary_key_name() => array('<', 0 ) );
+            return array($this->_model->primary_key_name() => array('<', 0));
         } else {
             $fk_field = $this->_model->get_a_field_of_type('EE_Foreign_Key_Field_Base');
-            return array( 'AND*impossible' => array( $fk_field->get_name() => array('IS_NULL'), $fk_field->get_name() => 'IS_NOT_NULL' ) );
+            return array('AND*impossible' => array($fk_field->get_name() => array('IS_NULL'), $fk_field->get_name() => 'IS_NOT_NULL'));
         }
     }
 }

core/db_models/strategies/EE_Restriction_Generator_WP_User.strategy.php

Indentation +12 added lines, -12 removed lines

@@ -15,18 +15,18 @@
 class EE_Restriction_Generator_WP_User extends EE_Restriction_Generator_Base
 {
 
-    /**
-     * @return \EE_Default_Where_Conditions
-     */
-    protected function _generate_restrictions()
-    {
+	/**
+	 * @return \EE_Default_Where_Conditions
+	 */
+	protected function _generate_restrictions()
+	{
 
-        return array(
-            // if they can't access users, they can still access themselves
-            EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) => new EE_Default_Where_Conditions(array(
-                EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder
-            )),
+		return array(
+			// if they can't access users, they can still access themselves
+			EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) => new EE_Default_Where_Conditions(array(
+				EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder
+			)),
 
-        );
-    }
+		);
+	}
 }

core/db_models/EEM_Question_Option.model.php

Spacing +4 added lines, -4 removed lines

@@ -39,10 +39,10 @@
 
         $this->_model_chain_to_wp_user = 'Question';
         // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('QSO_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('QSO_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('QSO_system');
+        $this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+        $this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Reg_Form('QSO_system');
+        $this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Reg_Form('QSO_system');
+        $this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Reg_Form('QSO_system');
         $this->_caps_slug = 'questions';
         parent::__construct($timezone);
     }

Indentation +32 added lines, -32 removed lines

@@ -12,39 +12,39 @@
 class EEM_Question_Option extends EEM_Soft_Delete_Base
 {
 
-    // private instance of the Attendee object
-    protected static $_instance = null;
+	// private instance of the Attendee object
+	protected static $_instance = null;
 
-    protected function __construct($timezone = null)
-    {
-        $this->singular_item = esc_html__('Question Option', 'event_espresso');
-        $this->plural_item = esc_html__('Question Options', 'event_espresso');
+	protected function __construct($timezone = null)
+	{
+		$this->singular_item = esc_html__('Question Option', 'event_espresso');
+		$this->plural_item = esc_html__('Question Options', 'event_espresso');
 
-        $this->_tables = array(
-            'Question_Option' => new EE_Primary_Table('esp_question_option', 'QSO_ID')
-        );
-        $this->_fields = array(
-            'Question_Option' => array(
-                    'QSO_ID' => new EE_Primary_Key_Int_Field('QSO_ID', esc_html__('Question Option ID', 'event_espresso')),
-                    'QST_ID' => new EE_Foreign_Key_Int_Field('QST_ID', esc_html__('Question ID', 'event_espresso'), false, 0, 'Question'),
-                    'QSO_value' => new EE_Plain_Text_Field('QSO_value', esc_html__("Question Option Value", "event_espresso"), false, ''),
-                    'QSO_desc' => new EE_Post_Content_Field('QSO_desc', esc_html__('Question Option Description', 'event_espresso'), false, ''),
-                    'QSO_order' => new EE_Integer_Field('QSO_order', esc_html__('Question Option Order', 'event_espresso'), false, 0),
-                    'QSO_system' => new EE_Plain_Text_Field('QSO_system', esc_html__('Internal string ID for question option', 'event_espresso'), true, null),
-                    'QSO_deleted' => new EE_Trashed_Flag_Field('QSO_deleted', esc_html__('Flag indicating Option was trashed', 'event_espresso'), false, false)
-                )
-        );
-        $this->_model_relations = array(
-            'Question' => new EE_Belongs_To_Relation()
-        );
+		$this->_tables = array(
+			'Question_Option' => new EE_Primary_Table('esp_question_option', 'QSO_ID')
+		);
+		$this->_fields = array(
+			'Question_Option' => array(
+					'QSO_ID' => new EE_Primary_Key_Int_Field('QSO_ID', esc_html__('Question Option ID', 'event_espresso')),
+					'QST_ID' => new EE_Foreign_Key_Int_Field('QST_ID', esc_html__('Question ID', 'event_espresso'), false, 0, 'Question'),
+					'QSO_value' => new EE_Plain_Text_Field('QSO_value', esc_html__("Question Option Value", "event_espresso"), false, ''),
+					'QSO_desc' => new EE_Post_Content_Field('QSO_desc', esc_html__('Question Option Description', 'event_espresso'), false, ''),
+					'QSO_order' => new EE_Integer_Field('QSO_order', esc_html__('Question Option Order', 'event_espresso'), false, 0),
+					'QSO_system' => new EE_Plain_Text_Field('QSO_system', esc_html__('Internal string ID for question option', 'event_espresso'), true, null),
+					'QSO_deleted' => new EE_Trashed_Flag_Field('QSO_deleted', esc_html__('Flag indicating Option was trashed', 'event_espresso'), false, false)
+				)
+		);
+		$this->_model_relations = array(
+			'Question' => new EE_Belongs_To_Relation()
+		);
 
-        $this->_model_chain_to_wp_user = 'Question';
-        // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('QSO_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('QSO_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('QSO_system');
-        $this->_caps_slug = 'questions';
-        parent::__construct($timezone);
-    }
+		$this->_model_chain_to_wp_user = 'Question';
+		// this model is generally available for reading
+		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('QSO_system');
+		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('QSO_system');
+		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('QSO_system');
+		$this->_caps_slug = 'questions';
+		parent::__construct($timezone);
+	}
 }

core/db_models/EEM_Message_Template.model.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
             );
         $this->_model_chain_to_wp_user = 'Message_Template_Group';
         foreach ($this->_cap_contexts_to_cap_action_map as $context => $action) {
-            $this->_cap_restriction_generators[ $context ] = new EE_Restriction_Generator_Global('Message_Template_Group.MTP_is_global');
+            $this->_cap_restriction_generators[$context] = new EE_Restriction_Generator_Global('Message_Template_Group.MTP_is_global');
         }
         $this->_caps_slug = 'messages';
         parent::__construct($timezone);

Indentation +36 added lines, -36 removed lines

@@ -14,45 +14,45 @@
  */
 class EEM_Message_Template extends EEM_Base
 {
-    // private instance of the EEM_Message_Template object
-    protected static $_instance = null;
+	// private instance of the EEM_Message_Template object
+	protected static $_instance = null;
 
 
 
-    /**
-     * private constructor to prevent direct creation
-     *
-     * @Constructor
-     * @access protected
-     * @param string $timezone
-     * @throws \EE_Error
-     */
-    protected function __construct($timezone = null)
-    {
-        $this->singular_item = esc_html__('Message Template', 'event_espresso');
-        $this->plural_item = esc_html__('Message Templates', 'event_espresso');
+	/**
+	 * private constructor to prevent direct creation
+	 *
+	 * @Constructor
+	 * @access protected
+	 * @param string $timezone
+	 * @throws \EE_Error
+	 */
+	protected function __construct($timezone = null)
+	{
+		$this->singular_item = esc_html__('Message Template', 'event_espresso');
+		$this->plural_item = esc_html__('Message Templates', 'event_espresso');
 
-        $this->_tables = array(
-            'Message_Template' => new EE_Primary_Table('esp_message_template', 'MTP_ID')
-        );
-        $this->_fields = array(
-            'Message_Template' => array(
-                'MTP_ID' => new EE_Primary_Key_Int_Field('MTP_ID', esc_html__('Message Template ID', 'event_espresso')),
-                'GRP_ID' => new EE_Foreign_Key_Int_Field('GRP_ID', esc_html__('Message Template Group ID', 'event_espresso'), false, 0, 'Message_Template_Group'),
-                'MTP_template_field' => new EE_Plain_Text_Field('MTP_template_field', esc_html__('Field Name for this Template', 'event_espresso'), false, 'default'),
-                'MTP_context' => new EE_Plain_Text_Field('MTP_context', esc_html__('Message Type Context for this field', 'event_espresso'), false, 'admin'),
-                'MTP_content' => new EE_Serialized_Text_Field('MTP_content', esc_html__('The field content for the template', 'event_espresso'), false, ''),
-            )
-        );
+		$this->_tables = array(
+			'Message_Template' => new EE_Primary_Table('esp_message_template', 'MTP_ID')
+		);
+		$this->_fields = array(
+			'Message_Template' => array(
+				'MTP_ID' => new EE_Primary_Key_Int_Field('MTP_ID', esc_html__('Message Template ID', 'event_espresso')),
+				'GRP_ID' => new EE_Foreign_Key_Int_Field('GRP_ID', esc_html__('Message Template Group ID', 'event_espresso'), false, 0, 'Message_Template_Group'),
+				'MTP_template_field' => new EE_Plain_Text_Field('MTP_template_field', esc_html__('Field Name for this Template', 'event_espresso'), false, 'default'),
+				'MTP_context' => new EE_Plain_Text_Field('MTP_context', esc_html__('Message Type Context for this field', 'event_espresso'), false, 'admin'),
+				'MTP_content' => new EE_Serialized_Text_Field('MTP_content', esc_html__('The field content for the template', 'event_espresso'), false, ''),
+			)
+		);
 
-        $this->_model_relations = array(
-            'Message_Template_Group' => new EE_Belongs_To_Relation()
-            );
-        $this->_model_chain_to_wp_user = 'Message_Template_Group';
-        foreach ($this->_cap_contexts_to_cap_action_map as $context => $action) {
-            $this->_cap_restriction_generators[ $context ] = new EE_Restriction_Generator_Global('Message_Template_Group.MTP_is_global');
-        }
-        $this->_caps_slug = 'messages';
-        parent::__construct($timezone);
-    }
+		$this->_model_relations = array(
+			'Message_Template_Group' => new EE_Belongs_To_Relation()
+			);
+		$this->_model_chain_to_wp_user = 'Message_Template_Group';
+		foreach ($this->_cap_contexts_to_cap_action_map as $context => $action) {
+			$this->_cap_restriction_generators[ $context ] = new EE_Restriction_Generator_Global('Message_Template_Group.MTP_is_global');
+		}
+		$this->_caps_slug = 'messages';
+		parent::__construct($timezone);
+	}
 }

core/db_models/EEM_Question_Group_Question.model.php

Spacing +4 added lines, -4 removed lines

@@ -42,10 +42,10 @@
 
         $this->_model_chain_to_wp_user = 'Question_Group';
         // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('Question_Group.QSG_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('Question_Group.QSG_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('Question_Group.QSG_system');
+        $this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+        $this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Reg_Form('Question_Group.QSG_system');
+        $this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Reg_Form('Question_Group.QSG_system');
+        $this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Reg_Form('Question_Group.QSG_system');
         // use the caps for question groups
         $this->_caps_slug = 'question_groups';
         parent::__construct($timezone);

Indentation +31 added lines, -31 removed lines

@@ -17,38 +17,38 @@
 class EEM_Question_Group_Question extends EEM_Base
 {
 
-    // private instance of the Attendee object
-    protected static $_instance = null;
+	// private instance of the Attendee object
+	protected static $_instance = null;
 
 
-    protected function __construct($timezone = null)
-    {
-        $this->singular_item = esc_html__('Question Group to Question Link', 'event_espresso');
-        $this->plural_item = esc_html__('Question Group to Question Links', 'event_espresso');
-        $this->_tables = array(
-            'Question_Group_Question' => new EE_Primary_Table('esp_question_group_question', 'QGQ_ID')
-        );
-        $this->_fields = array(
-            'Question_Group_Question' => array(
-                'QGQ_ID' => new EE_Primary_Key_Int_Field('QGQ_ID', esc_html__('Question Group to Question Link ID', 'event_espresso')),
-                'QSG_ID' => new EE_Foreign_Key_Int_Field('QSG_ID', esc_html__('Question Group ID', 'event_espresso'), false, 0, 'Question_Group'),
-                'QST_ID' => new EE_Foreign_Key_Int_Field('QST_ID', esc_html__('Question Id', 'event_espresso'), false, 0, 'Question'),
-                'QGQ_order' => new EE_Integer_Field('QGQ_order', esc_html__('Question Group Question Order', 'event_espresso'), false, 0)
-            )
-        );
-        $this->_model_relations = array(
-            'Question_Group' => new EE_Belongs_To_Relation(),
-            'Question' => new EE_Belongs_To_Relation()
-        );
+	protected function __construct($timezone = null)
+	{
+		$this->singular_item = esc_html__('Question Group to Question Link', 'event_espresso');
+		$this->plural_item = esc_html__('Question Group to Question Links', 'event_espresso');
+		$this->_tables = array(
+			'Question_Group_Question' => new EE_Primary_Table('esp_question_group_question', 'QGQ_ID')
+		);
+		$this->_fields = array(
+			'Question_Group_Question' => array(
+				'QGQ_ID' => new EE_Primary_Key_Int_Field('QGQ_ID', esc_html__('Question Group to Question Link ID', 'event_espresso')),
+				'QSG_ID' => new EE_Foreign_Key_Int_Field('QSG_ID', esc_html__('Question Group ID', 'event_espresso'), false, 0, 'Question_Group'),
+				'QST_ID' => new EE_Foreign_Key_Int_Field('QST_ID', esc_html__('Question Id', 'event_espresso'), false, 0, 'Question'),
+				'QGQ_order' => new EE_Integer_Field('QGQ_order', esc_html__('Question Group Question Order', 'event_espresso'), false, 0)
+			)
+		);
+		$this->_model_relations = array(
+			'Question_Group' => new EE_Belongs_To_Relation(),
+			'Question' => new EE_Belongs_To_Relation()
+		);
 
-        $this->_model_chain_to_wp_user = 'Question_Group';
-        // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('Question_Group.QSG_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('Question_Group.QSG_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('Question_Group.QSG_system');
-        // use the caps for question groups
-        $this->_caps_slug = 'question_groups';
-        parent::__construct($timezone);
-    }
+		$this->_model_chain_to_wp_user = 'Question_Group';
+		// this model is generally available for reading
+		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('Question_Group.QSG_system');
+		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('Question_Group.QSG_system');
+		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('Question_Group.QSG_system');
+		// use the caps for question groups
+		$this->_caps_slug = 'question_groups';
+		parent::__construct($timezone);
+	}
 }

core/db_models/EEM_Question.model.php

Spacing +10 added lines, -10 removed lines

@@ -213,10 +213,10 @@ 
             'Question_Group_Question' => new EE_Has_Many_Relation()
         );
         // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('QST_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('QST_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('QST_system');
+        $this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+        $this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Reg_Form('QST_system');
+        $this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Reg_Form('QST_system');
+        $this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Reg_Form('QST_system');
         parent::__construct($timezone);
     }
 
@@ -256,10 +256,10 @@ 
      */
     public function question_type_is_in_category($question_type, $category)
     {
-        if (!isset($this->_question_type_categories[ $category ])) {
+        if ( ! isset($this->_question_type_categories[$category])) {
             return false;
         }
-        return in_array($question_type, $this->_question_type_categories[ $category ]);
+        return in_array($question_type, $this->_question_type_categories[$category]);
     }
 
 
@@ -270,8 +270,8 @@ 
      */
     public function question_types_in_category($category)
     {
-        if (isset($this->_question_type_categories[ $category ])) {
-            return $this->_question_type_categories[ $category ];
+        if (isset($this->_question_type_categories[$category])) {
+            return $this->_question_type_categories[$category];
         }
         return array();
     }
@@ -410,8 +410,8 @@ 
     public function absolute_max_for_system_question($system_question_value)
     {
         $maxes = $this->system_question_maxes();
-        if (isset($maxes[ $system_question_value ])) {
-            return $maxes[ $system_question_value ];
+        if (isset($maxes[$system_question_value])) {
+            return $maxes[$system_question_value];
         } else {
             return EE_INF;
         }

Indentation +432 added lines, -432 removed lines

@@ -11,437 +11,437 @@
 class EEM_Question extends EEM_Soft_Delete_Base
 {
 
-    // constant used to indicate that the question type is COUNTRY
-    const QST_type_country = 'COUNTRY';
+	// constant used to indicate that the question type is COUNTRY
+	const QST_type_country = 'COUNTRY';
 
-    // constant used to indicate that the question type is DATE
-    const QST_type_date = 'DATE';
-
-    // constant used to indicate that the question type is DROPDOWN
-    const QST_type_dropdown = 'DROPDOWN';
-
-    // constant used to indicate that the question type is CHECKBOX
-    const QST_type_checkbox = 'CHECKBOX';
-
-    // constant used to indicate that the question type is RADIO_BTN
-    const QST_type_radio = 'RADIO_BTN';
-
-    // constant used to indicate that the question type is STATE
-    const QST_type_state = 'STATE';
-
-    // constant used to indicate that the question type is TEXT
-    const QST_type_text = 'TEXT';
-
-    // constant used to indicate that the question type is TEXTAREA
-    const QST_type_textarea = 'TEXTAREA';
-
-    // constant used to indicate that the question type is a TEXTAREA that allows simple html
-    const QST_type_html_textarea = 'HTML_TEXTAREA';
-
-    // constant used to indicate that the question type is an email input
-    const QST_type_email = 'EMAIL';
-
-    // constant used to indicate that the question type is an email input
-    const QST_type_email_confirm = 'EMAIL_CONFIRM';
-
-    // constant used to indicate that the question type is a US-formatted phone number
-    const QST_type_us_phone = 'US_PHONE';
-
-    // constant used to indicate that the question type is an integer (whole number)
-    const QST_type_int = 'INTEGER';
-
-    // constant used to indicate that the question type is a decimal (float)
-    const QST_type_decimal = 'DECIMAL';
-
-    // constant used to indicate that the question type is a valid URL
-    const QST_type_url = 'URL';
-
-    // constant used to indicate that the question type is a YEAR
-    const QST_type_year = 'YEAR';
-
-    // constant used to indicate that the question type is a multi-select
-    const QST_type_multi_select = 'MULTI_SELECT';
-
-    /**
-     * Question types that are interchangeable, even after answers have been provided for them.
-     * Top-level keys are category slugs, next level is an array of question types. If question types
-     * aren't in this array, it is assumed they AREN'T interchangeable with any other question types.
-     *
-     * @access protected
-     * @var array $_question_type_categories {
-     * @type string $text
-     * @type string $single -answer-enum
-     * @type string $multi -answer-enum
-     *                    }
-     */
-    protected $_question_type_categories = array();
-
-    /**
-     * lists all the question types which should be allowed. Ideally, this will be extensible.
-     *
-     * @access protected
-     * @var array $_allowed_question_types
-     */
-    protected $_allowed_question_types = array();
-
-    /**
-     * brief descriptions for all the question types
-     *
-     * @access protected
-     * @var EEM_Question $_instance
-     */
-    protected $_question_descriptions;
-
-
-    /**
-     * Question types that should have an admin-defined max input length
-     * @var array
-     */
-    protected $question_types_with_max_lengh;
-
-
-    // private instance of the Attendee object
-    protected static $_instance = null;
-
-
-    /**
-     * EEM_Question constructor.
-     *
-     * @param null $timezone
-     */
-    protected function __construct($timezone = null)
-    {
-        $this->singular_item = esc_html__('Question', 'event_espresso');
-        $this->plural_item = esc_html__('Questions', 'event_espresso');
-        $this->_allowed_question_types = apply_filters(
-            'FHEE__EEM_Question__construct__allowed_question_types',
-            array(
-                EEM_Question::QST_type_text => esc_html__('Text', 'event_espresso'),
-                EEM_Question::QST_type_textarea => esc_html__('Textarea', 'event_espresso'),
-                EEM_Question::QST_type_checkbox => esc_html__('Checkboxes', 'event_espresso'),
-                EEM_Question::QST_type_radio => esc_html__('Radio Buttons', 'event_espresso'),
-                EEM_Question::QST_type_dropdown => esc_html__('Dropdown', 'event_espresso'),
-                EEM_Question::QST_type_state => esc_html__('State/Province Dropdown', 'event_espresso'),
-                EEM_Question::QST_type_country => esc_html__('Country Dropdown', 'event_espresso'),
-                EEM_Question::QST_type_date => esc_html__('Date Picker', 'event_espresso'),
-                EEM_Question::QST_type_html_textarea => esc_html__('HTML Textarea', 'event_espresso'),
-                EEM_Question::QST_type_email => esc_html__('Email', 'event_espresso'),
-                EEM_Question::QST_type_email_confirm => esc_html__('Confirm Email', 'event_espresso'),
-                EEM_Question::QST_type_us_phone => esc_html__('USA - Format Phone', 'event_espresso'),
-                EEM_Question::QST_type_decimal => esc_html__('Number', 'event_espresso'),
-                EEM_Question::QST_type_int => esc_html__('Whole Number', 'event_espresso'),
-                EEM_Question::QST_type_url => esc_html__('URL', 'event_espresso'),
-                EEM_Question::QST_type_year => esc_html__('Year', 'event_espresso'),
-                EEM_Question::QST_type_multi_select => esc_html__('Multi Select', 'event_espresso')
-            )
-        );
-        $this->_question_descriptions = apply_filters(
-            'FHEE__EEM_Question__construct__question_descriptions',
-            array(
-                EEM_Question::QST_type_text => esc_html__('A single line text input field', 'event_espresso'),
-                EEM_Question::QST_type_textarea => esc_html__('A multi line text input field', 'event_espresso'),
-                EEM_Question::QST_type_checkbox => esc_html__('Allows multiple preset options to be selected', 'event_espresso'),
-                EEM_Question::QST_type_radio => esc_html__('Allows a single preset option to be selected', 'event_espresso'),
-                EEM_Question::QST_type_dropdown => esc_html__('A dropdown that allows a single selection', 'event_espresso'),
-                EEM_Question::QST_type_state => esc_html__('A dropdown that lists states/provinces', 'event_espresso'),
-                EEM_Question::QST_type_country => esc_html__('A dropdown that lists countries', 'event_espresso'),
-                EEM_Question::QST_type_date => esc_html__('A popup calendar that allows date selections', 'event_espresso'),
-                EEM_Question::QST_type_html_textarea => esc_html__('A multi line text input field that allows HTML', 'event_espresso'),
-                EEM_Question::QST_type_email => esc_html__('A text field that must contain a valid Email address', 'event_espresso'),
-                EEM_Question::QST_type_email_confirm => esc_html__('A text field that must contain a valid Email address and be equal to Email field', 'event_espresso'),
-                EEM_Question::QST_type_us_phone => esc_html__('A text field that must contain a valid US phone number', 'event_espresso'),
-                EEM_Question::QST_type_decimal => esc_html__('A text field that allows number values with decimals', 'event_espresso'),
-                EEM_Question::QST_type_int => esc_html__('A text field that only allows whole numbers (no decimals)', 'event_espresso'),
-                EEM_Question::QST_type_url => esc_html__('A text field that must contain a valid URL', 'event_espresso'),
-                EEM_Question::QST_type_year => esc_html__('A dropdown that lists the last 100 years', 'event_espresso'),
-                EEM_Question::QST_type_multi_select => esc_html__('A dropdown that allows multiple selections', 'event_espresso')
-            )
-        );
-        $this->_question_type_categories = (array) apply_filters(
-            'FHEE__EEM_Question__construct__question_type_categories',
-            array(
-                'text' => array(
-                    EEM_Question::QST_type_text,
-                    EEM_Question::QST_type_textarea,
-                    EEM_Question::QST_type_date,
-                    EEM_Question::QST_type_html_textarea,
-                    EEM_Question::QST_type_email,
-                    EEM_Question::QST_type_email_confirm,
-                    EEM_Question::QST_type_us_phone,
-                    EEM_Question::QST_type_decimal,
-                    EEM_Question::QST_type_int,
-                    EEM_Question::QST_type_url,
-                    EEM_Question::QST_type_year
-                ),
-                'single-answer-enum' => array(
-                    EEM_Question::QST_type_radio,
-                    EEM_Question::QST_type_dropdown
-                ),
-                'multi-answer-enum' => array(
-                    EEM_Question::QST_type_checkbox,
-                    EEM_Question::QST_type_multi_select
-                )
-            )
-        );
-        $this->question_types_with_max_lengh = apply_filters(
-            'FHEE__EEM_Question___construct__question_types_with_max_length',
-            array(
-                EEM_Question::QST_type_text,
-                EEM_Question::QST_type_textarea,
-                EEM_Question::QST_type_html_textarea
-            )
-        );
-
-        $this->_tables = array(
-            'Question' => new EE_Primary_Table('esp_question', 'QST_ID')
-        );
-        $this->_fields = array(
-            'Question' => array(
-                'QST_ID' => new EE_Primary_Key_Int_Field('QST_ID', esc_html__('Question ID', 'event_espresso')),
-                'QST_display_text' => new EE_Post_Content_Field('QST_display_text', esc_html__('Question Text', 'event_espresso'), true, ''),
-                'QST_admin_label' => new EE_Plain_Text_Field('QST_admin_label', esc_html__('Question Label (admin-only)', 'event_espresso'), true, ''),
-                'QST_system' => new EE_Plain_Text_Field('QST_system', esc_html__('Internal string ID for question', 'event_espresso'), false, ''),
-                'QST_type' => new EE_Enum_Text_Field('QST_type', esc_html__('Question Type', 'event_espresso'), false, 'TEXT', $this->_allowed_question_types),
-                'QST_required' => new EE_Boolean_Field('QST_required', esc_html__('Required Question?', 'event_espresso'), false, false),
-                'QST_required_text' => new EE_Simple_HTML_Field('QST_required_text', esc_html__('Text to Display if Not Provided', 'event_espresso'), true, ''),
-                'QST_order' => new EE_Integer_Field('QST_order', esc_html__('Question Order', 'event_espresso'), false, 0),
-                'QST_admin_only' => new EE_Boolean_Field('QST_admin_only', esc_html__('Admin-Only Question?', 'event_espresso'), false, false),
-                'QST_max' => new EE_Infinite_Integer_Field('QST_max', esc_html__('Max Size', 'event_espresso'), false, EE_INF),
-                'QST_wp_user' => new EE_WP_User_Field('QST_wp_user', esc_html__('Question Creator ID', 'event_espresso'), false),
-                'QST_deleted' => new EE_Trashed_Flag_Field('QST_deleted', esc_html__('Flag Indicating question was deleted', 'event_espresso'), false, false)
-            )
-        );
-        $this->_model_relations = array(
-            'Question_Group' => new EE_HABTM_Relation('Question_Group_Question'),
-            'Question_Option' => new EE_Has_Many_Relation(),
-            'Answer' => new EE_Has_Many_Relation(),
-            'WP_User' => new EE_Belongs_To_Relation(),
-            // for QST_order column
-            'Question_Group_Question' => new EE_Has_Many_Relation()
-        );
-        // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('QST_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('QST_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('QST_system');
-        parent::__construct($timezone);
-    }
-
-    /**
-     * Returns the list of allowed question types, which are normally: 'TEXT','TEXTAREA','RADIO_BTN','DROPDOWN','CHECKBOX','DATE'
-     * but they can be extended
-     * @return string[]
-     */
-    public function allowed_question_types()
-    {
-        return $this->_allowed_question_types;
-    }
-
-    /**
-     * Gets all the question types in the same category
-     * @param string $question_type one of EEM_Question::allowed_question_types(
-     * @return string[] like EEM_Question::allowed_question_types()
-     */
-    public function question_types_in_same_category($question_type)
-    {
-        $question_types = array($question_type);
-        foreach ($this->_question_type_categories as $category => $question_types_in_category) {
-            if (in_array($question_type, $question_types_in_category)) {
-                $question_types = $question_types_in_category;
-                break;
-            }
-        }
-
-        return array_intersect_key($this->allowed_question_types(), array_flip($question_types));
-    }
-
-    /**
-     * Determines if the given question type is in the given question type category
-     * @param string $question_type one of EEM_Question::allowed_question_types()
-     * @param string $category one of the top-level keys of EEM_Question::question_type_categories()
-     * @return boolean
-     */
-    public function question_type_is_in_category($question_type, $category)
-    {
-        if (!isset($this->_question_type_categories[ $category ])) {
-            return false;
-        }
-        return in_array($question_type, $this->_question_type_categories[ $category ]);
-    }
-
-
-    /**
-     * Returns all the question types in the given category
-     * @param string $category
-     * @return array|mixed
-     */
-    public function question_types_in_category($category)
-    {
-        if (isset($this->_question_type_categories[ $category ])) {
-            return $this->_question_type_categories[ $category ];
-        }
-        return array();
-    }
-
-
-    /**
-     * Returns all the question types that should have question options
-     * @return array
-     */
-    public function question_types_with_options()
-    {
-        return array_merge(
-            $this->question_types_in_category('single-answer-enum'),
-            $this->question_types_in_category('multi-answer-enum')
-        );
-    }
-
-    /**
-     * Returns the question type categories 2d array
-     * @return array see EEM_Question::_question_type_categories
-     */
-    public function question_type_categories()
-    {
-        return $this->_question_type_categories;
-    }
-
-    /**
-     * Returns an array of all the QST_system values that can be allowed in the system question group
-     * identified by $system_question_group_id
-     * @param string $system_question_group_id QSG_system
-     * @return array of system question names (QST_system)
-     */
-    public function allowed_system_questions_in_system_question_group($system_question_group_id)
-    {
-        $question_system_ids = array();
-        switch ($system_question_group_id) {
-            case EEM_Question_Group::system_personal:
-                $question_system_ids = array(
-                    EEM_Attendee::system_question_fname,
-                    EEM_Attendee::system_question_lname,
-                    EEM_Attendee::system_question_email,
-                    EEM_Attendee::system_question_email_confirm,
-                    EEM_Attendee::system_question_phone
-                );
-                break;
-            case EEM_Question_Group::system_address:
-                $question_system_ids = array(
-                    EEM_Attendee::system_question_address,
-                    EEM_Attendee::system_question_address2,
-                    EEM_Attendee::system_question_city,
-                    EEM_Attendee::system_question_state,
-                    EEM_Attendee::system_question_country,
-                    EEM_Attendee::system_question_zip,
-                    EEM_Attendee::system_question_phone
-                );
-                break;
-        }
-        return apply_filters('FHEE__EEM_Question__system_questions_allowed_in_system_question_group__return', $question_system_ids, $system_question_group_id);
-    }
-
-    /**
-     * Returns an array of all the QST_system values that are required in the system question group
-     * identified by $system_question_group_id
-     * @param string $system_question_group_id QSG_system
-     * @return array of system question names (QST_system)
-     */
-    public function required_system_questions_in_system_question_group($system_question_group_id)
-    {
-        $question_system_ids = null;
-        switch ($system_question_group_id) {
-            case EEM_Question_Group::system_personal:
-                $question_system_ids = array(
-                    EEM_Attendee::system_question_fname,
-                    EEM_Attendee::system_question_email,
-                );
-                break;
-            default:
-                $question_system_ids = array();
-        }
-        return apply_filters('FHEE__EEM_Question__system_questions_required_in_system_question_group', $question_system_ids, $system_question_group_id);
-    }
-
-
-    /**
-     * Gets an array for converting between QST_system and QST_IDs for system questions. Eg, if you want to know
-     * which system question QST_ID corresponds to the QST_system 'city', use EEM_Question::instance()->get_Question_ID_from_system_string('city');
-     * @param $QST_system
-     * @return int of QST_ID for the question that corresponds to that QST_system
-     */
-    public function get_Question_ID_from_system_string($QST_system)
-    {
-        return $this->get_var(array(array('QST_system' => $QST_system)));
-    }
-
-
-    /**
-     * searches the db for the question with the latest question order and returns that value.
-     * @access public
-     * @return int
-     */
-    public function get_latest_question_order()
-    {
-        $columns_to_select = array(
-            'max_order' => array("MAX(QST_order)", "%d")
-        );
-        $max = $this->_get_all_wpdb_results(array(), ARRAY_A, $columns_to_select);
-        return isset($max[0], $max[0]['max_order']) ? $max[0]['max_order'] : 0;
-    }
-
-    /**
-     * Returns an array where keys are system question QST_system values,
-     * and values are the highest question max the admin can set on the question
-     * (aka the "max max"; eg, a site admin can change the zip question to have a max
-     * of 5, but no larger than 12)
-     * @return array
-     */
-    public function system_question_maxes()
-    {
-        return array(
-            'fname' => 45,
-            'lname' => 45,
-            'address' => 255,
-            'address2' => 255,
-            'city' => 45,
-            'zip' => 12,
-            'email' => 255,
-            'email_confirm' => 255,
-            'phone' => 45,
-        );
-    }
-
-    /**
-     * Given a QST_system value, gets the question's largest allowable max input.
-     * @see Registration_Form_Admin_Page::system_question_maxes()
-     * @param string $system_question_value
-     * @return int|float
-     */
-    public function absolute_max_for_system_question($system_question_value)
-    {
-        $maxes = $this->system_question_maxes();
-        if (isset($maxes[ $system_question_value ])) {
-            return $maxes[ $system_question_value ];
-        } else {
-            return EE_INF;
-        }
-    }
-
-
-    /**
-     * @return array
-     */
-    public function question_descriptions()
-    {
-        return $this->_question_descriptions;
-    }
-
-
-    /**
-     * Returns all the question types that should have an admin-defined max input length
-     * @return array
-     */
-    public function questionTypesWithMaxLength()
-    {
-        return (array) $this->question_types_with_max_lengh;
-    }
+	// constant used to indicate that the question type is DATE
+	const QST_type_date = 'DATE';
+
+	// constant used to indicate that the question type is DROPDOWN
+	const QST_type_dropdown = 'DROPDOWN';
+
+	// constant used to indicate that the question type is CHECKBOX
+	const QST_type_checkbox = 'CHECKBOX';
+
+	// constant used to indicate that the question type is RADIO_BTN
+	const QST_type_radio = 'RADIO_BTN';
+
+	// constant used to indicate that the question type is STATE
+	const QST_type_state = 'STATE';
+
+	// constant used to indicate that the question type is TEXT
+	const QST_type_text = 'TEXT';
+
+	// constant used to indicate that the question type is TEXTAREA
+	const QST_type_textarea = 'TEXTAREA';
+
+	// constant used to indicate that the question type is a TEXTAREA that allows simple html
+	const QST_type_html_textarea = 'HTML_TEXTAREA';
+
+	// constant used to indicate that the question type is an email input
+	const QST_type_email = 'EMAIL';
+
+	// constant used to indicate that the question type is an email input
+	const QST_type_email_confirm = 'EMAIL_CONFIRM';
+
+	// constant used to indicate that the question type is a US-formatted phone number
+	const QST_type_us_phone = 'US_PHONE';
+
+	// constant used to indicate that the question type is an integer (whole number)
+	const QST_type_int = 'INTEGER';
+
+	// constant used to indicate that the question type is a decimal (float)
+	const QST_type_decimal = 'DECIMAL';
+
+	// constant used to indicate that the question type is a valid URL
+	const QST_type_url = 'URL';
+
+	// constant used to indicate that the question type is a YEAR
+	const QST_type_year = 'YEAR';
+
+	// constant used to indicate that the question type is a multi-select
+	const QST_type_multi_select = 'MULTI_SELECT';
+
+	/**
+	 * Question types that are interchangeable, even after answers have been provided for them.
+	 * Top-level keys are category slugs, next level is an array of question types. If question types
+	 * aren't in this array, it is assumed they AREN'T interchangeable with any other question types.
+	 *
+	 * @access protected
+	 * @var array $_question_type_categories {
+	 * @type string $text
+	 * @type string $single -answer-enum
+	 * @type string $multi -answer-enum
+	 *                    }
+	 */
+	protected $_question_type_categories = array();
+
+	/**
+	 * lists all the question types which should be allowed. Ideally, this will be extensible.
+	 *
+	 * @access protected
+	 * @var array $_allowed_question_types
+	 */
+	protected $_allowed_question_types = array();
+
+	/**
+	 * brief descriptions for all the question types
+	 *
+	 * @access protected
+	 * @var EEM_Question $_instance
+	 */
+	protected $_question_descriptions;
+
+
+	/**
+	 * Question types that should have an admin-defined max input length
+	 * @var array
+	 */
+	protected $question_types_with_max_lengh;
+
+
+	// private instance of the Attendee object
+	protected static $_instance = null;
+
+
+	/**
+	 * EEM_Question constructor.
+	 *
+	 * @param null $timezone
+	 */
+	protected function __construct($timezone = null)
+	{
+		$this->singular_item = esc_html__('Question', 'event_espresso');
+		$this->plural_item = esc_html__('Questions', 'event_espresso');
+		$this->_allowed_question_types = apply_filters(
+			'FHEE__EEM_Question__construct__allowed_question_types',
+			array(
+				EEM_Question::QST_type_text => esc_html__('Text', 'event_espresso'),
+				EEM_Question::QST_type_textarea => esc_html__('Textarea', 'event_espresso'),
+				EEM_Question::QST_type_checkbox => esc_html__('Checkboxes', 'event_espresso'),
+				EEM_Question::QST_type_radio => esc_html__('Radio Buttons', 'event_espresso'),
+				EEM_Question::QST_type_dropdown => esc_html__('Dropdown', 'event_espresso'),
+				EEM_Question::QST_type_state => esc_html__('State/Province Dropdown', 'event_espresso'),
+				EEM_Question::QST_type_country => esc_html__('Country Dropdown', 'event_espresso'),
+				EEM_Question::QST_type_date => esc_html__('Date Picker', 'event_espresso'),
+				EEM_Question::QST_type_html_textarea => esc_html__('HTML Textarea', 'event_espresso'),
+				EEM_Question::QST_type_email => esc_html__('Email', 'event_espresso'),
+				EEM_Question::QST_type_email_confirm => esc_html__('Confirm Email', 'event_espresso'),
+				EEM_Question::QST_type_us_phone => esc_html__('USA - Format Phone', 'event_espresso'),
+				EEM_Question::QST_type_decimal => esc_html__('Number', 'event_espresso'),
+				EEM_Question::QST_type_int => esc_html__('Whole Number', 'event_espresso'),
+				EEM_Question::QST_type_url => esc_html__('URL', 'event_espresso'),
+				EEM_Question::QST_type_year => esc_html__('Year', 'event_espresso'),
+				EEM_Question::QST_type_multi_select => esc_html__('Multi Select', 'event_espresso')
+			)
+		);
+		$this->_question_descriptions = apply_filters(
+			'FHEE__EEM_Question__construct__question_descriptions',
+			array(
+				EEM_Question::QST_type_text => esc_html__('A single line text input field', 'event_espresso'),
+				EEM_Question::QST_type_textarea => esc_html__('A multi line text input field', 'event_espresso'),
+				EEM_Question::QST_type_checkbox => esc_html__('Allows multiple preset options to be selected', 'event_espresso'),
+				EEM_Question::QST_type_radio => esc_html__('Allows a single preset option to be selected', 'event_espresso'),
+				EEM_Question::QST_type_dropdown => esc_html__('A dropdown that allows a single selection', 'event_espresso'),
+				EEM_Question::QST_type_state => esc_html__('A dropdown that lists states/provinces', 'event_espresso'),
+				EEM_Question::QST_type_country => esc_html__('A dropdown that lists countries', 'event_espresso'),
+				EEM_Question::QST_type_date => esc_html__('A popup calendar that allows date selections', 'event_espresso'),
+				EEM_Question::QST_type_html_textarea => esc_html__('A multi line text input field that allows HTML', 'event_espresso'),
+				EEM_Question::QST_type_email => esc_html__('A text field that must contain a valid Email address', 'event_espresso'),
+				EEM_Question::QST_type_email_confirm => esc_html__('A text field that must contain a valid Email address and be equal to Email field', 'event_espresso'),
+				EEM_Question::QST_type_us_phone => esc_html__('A text field that must contain a valid US phone number', 'event_espresso'),
+				EEM_Question::QST_type_decimal => esc_html__('A text field that allows number values with decimals', 'event_espresso'),
+				EEM_Question::QST_type_int => esc_html__('A text field that only allows whole numbers (no decimals)', 'event_espresso'),
+				EEM_Question::QST_type_url => esc_html__('A text field that must contain a valid URL', 'event_espresso'),
+				EEM_Question::QST_type_year => esc_html__('A dropdown that lists the last 100 years', 'event_espresso'),
+				EEM_Question::QST_type_multi_select => esc_html__('A dropdown that allows multiple selections', 'event_espresso')
+			)
+		);
+		$this->_question_type_categories = (array) apply_filters(
+			'FHEE__EEM_Question__construct__question_type_categories',
+			array(
+				'text' => array(
+					EEM_Question::QST_type_text,
+					EEM_Question::QST_type_textarea,
+					EEM_Question::QST_type_date,
+					EEM_Question::QST_type_html_textarea,
+					EEM_Question::QST_type_email,
+					EEM_Question::QST_type_email_confirm,
+					EEM_Question::QST_type_us_phone,
+					EEM_Question::QST_type_decimal,
+					EEM_Question::QST_type_int,
+					EEM_Question::QST_type_url,
+					EEM_Question::QST_type_year
+				),
+				'single-answer-enum' => array(
+					EEM_Question::QST_type_radio,
+					EEM_Question::QST_type_dropdown
+				),
+				'multi-answer-enum' => array(
+					EEM_Question::QST_type_checkbox,
+					EEM_Question::QST_type_multi_select
+				)
+			)
+		);
+		$this->question_types_with_max_lengh = apply_filters(
+			'FHEE__EEM_Question___construct__question_types_with_max_length',
+			array(
+				EEM_Question::QST_type_text,
+				EEM_Question::QST_type_textarea,
+				EEM_Question::QST_type_html_textarea
+			)
+		);
+
+		$this->_tables = array(
+			'Question' => new EE_Primary_Table('esp_question', 'QST_ID')
+		);
+		$this->_fields = array(
+			'Question' => array(
+				'QST_ID' => new EE_Primary_Key_Int_Field('QST_ID', esc_html__('Question ID', 'event_espresso')),
+				'QST_display_text' => new EE_Post_Content_Field('QST_display_text', esc_html__('Question Text', 'event_espresso'), true, ''),
+				'QST_admin_label' => new EE_Plain_Text_Field('QST_admin_label', esc_html__('Question Label (admin-only)', 'event_espresso'), true, ''),
+				'QST_system' => new EE_Plain_Text_Field('QST_system', esc_html__('Internal string ID for question', 'event_espresso'), false, ''),
+				'QST_type' => new EE_Enum_Text_Field('QST_type', esc_html__('Question Type', 'event_espresso'), false, 'TEXT', $this->_allowed_question_types),
+				'QST_required' => new EE_Boolean_Field('QST_required', esc_html__('Required Question?', 'event_espresso'), false, false),
+				'QST_required_text' => new EE_Simple_HTML_Field('QST_required_text', esc_html__('Text to Display if Not Provided', 'event_espresso'), true, ''),
+				'QST_order' => new EE_Integer_Field('QST_order', esc_html__('Question Order', 'event_espresso'), false, 0),
+				'QST_admin_only' => new EE_Boolean_Field('QST_admin_only', esc_html__('Admin-Only Question?', 'event_espresso'), false, false),
+				'QST_max' => new EE_Infinite_Integer_Field('QST_max', esc_html__('Max Size', 'event_espresso'), false, EE_INF),
+				'QST_wp_user' => new EE_WP_User_Field('QST_wp_user', esc_html__('Question Creator ID', 'event_espresso'), false),
+				'QST_deleted' => new EE_Trashed_Flag_Field('QST_deleted', esc_html__('Flag Indicating question was deleted', 'event_espresso'), false, false)
+			)
+		);
+		$this->_model_relations = array(
+			'Question_Group' => new EE_HABTM_Relation('Question_Group_Question'),
+			'Question_Option' => new EE_Has_Many_Relation(),
+			'Answer' => new EE_Has_Many_Relation(),
+			'WP_User' => new EE_Belongs_To_Relation(),
+			// for QST_order column
+			'Question_Group_Question' => new EE_Has_Many_Relation()
+		);
+		// this model is generally available for reading
+		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('QST_system');
+		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('QST_system');
+		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('QST_system');
+		parent::__construct($timezone);
+	}
+
+	/**
+	 * Returns the list of allowed question types, which are normally: 'TEXT','TEXTAREA','RADIO_BTN','DROPDOWN','CHECKBOX','DATE'
+	 * but they can be extended
+	 * @return string[]
+	 */
+	public function allowed_question_types()
+	{
+		return $this->_allowed_question_types;
+	}
+
+	/**
+	 * Gets all the question types in the same category
+	 * @param string $question_type one of EEM_Question::allowed_question_types(
+	 * @return string[] like EEM_Question::allowed_question_types()
+	 */
+	public function question_types_in_same_category($question_type)
+	{
+		$question_types = array($question_type);
+		foreach ($this->_question_type_categories as $category => $question_types_in_category) {
+			if (in_array($question_type, $question_types_in_category)) {
+				$question_types = $question_types_in_category;
+				break;
+			}
+		}
+
+		return array_intersect_key($this->allowed_question_types(), array_flip($question_types));
+	}
+
+	/**
+	 * Determines if the given question type is in the given question type category
+	 * @param string $question_type one of EEM_Question::allowed_question_types()
+	 * @param string $category one of the top-level keys of EEM_Question::question_type_categories()
+	 * @return boolean
+	 */
+	public function question_type_is_in_category($question_type, $category)
+	{
+		if (!isset($this->_question_type_categories[ $category ])) {
+			return false;
+		}
+		return in_array($question_type, $this->_question_type_categories[ $category ]);
+	}
+
+
+	/**
+	 * Returns all the question types in the given category
+	 * @param string $category
+	 * @return array|mixed
+	 */
+	public function question_types_in_category($category)
+	{
+		if (isset($this->_question_type_categories[ $category ])) {
+			return $this->_question_type_categories[ $category ];
+		}
+		return array();
+	}
+
+
+	/**
+	 * Returns all the question types that should have question options
+	 * @return array
+	 */
+	public function question_types_with_options()
+	{
+		return array_merge(
+			$this->question_types_in_category('single-answer-enum'),
+			$this->question_types_in_category('multi-answer-enum')
+		);
+	}
+
+	/**
+	 * Returns the question type categories 2d array
+	 * @return array see EEM_Question::_question_type_categories
+	 */
+	public function question_type_categories()
+	{
+		return $this->_question_type_categories;
+	}
+
+	/**
+	 * Returns an array of all the QST_system values that can be allowed in the system question group
+	 * identified by $system_question_group_id
+	 * @param string $system_question_group_id QSG_system
+	 * @return array of system question names (QST_system)
+	 */
+	public function allowed_system_questions_in_system_question_group($system_question_group_id)
+	{
+		$question_system_ids = array();
+		switch ($system_question_group_id) {
+			case EEM_Question_Group::system_personal:
+				$question_system_ids = array(
+					EEM_Attendee::system_question_fname,
+					EEM_Attendee::system_question_lname,
+					EEM_Attendee::system_question_email,
+					EEM_Attendee::system_question_email_confirm,
+					EEM_Attendee::system_question_phone
+				);
+				break;
+			case EEM_Question_Group::system_address:
+				$question_system_ids = array(
+					EEM_Attendee::system_question_address,
+					EEM_Attendee::system_question_address2,
+					EEM_Attendee::system_question_city,
+					EEM_Attendee::system_question_state,
+					EEM_Attendee::system_question_country,
+					EEM_Attendee::system_question_zip,
+					EEM_Attendee::system_question_phone
+				);
+				break;
+		}
+		return apply_filters('FHEE__EEM_Question__system_questions_allowed_in_system_question_group__return', $question_system_ids, $system_question_group_id);
+	}
+
+	/**
+	 * Returns an array of all the QST_system values that are required in the system question group
+	 * identified by $system_question_group_id
+	 * @param string $system_question_group_id QSG_system
+	 * @return array of system question names (QST_system)
+	 */
+	public function required_system_questions_in_system_question_group($system_question_group_id)
+	{
+		$question_system_ids = null;
+		switch ($system_question_group_id) {
+			case EEM_Question_Group::system_personal:
+				$question_system_ids = array(
+					EEM_Attendee::system_question_fname,
+					EEM_Attendee::system_question_email,
+				);
+				break;
+			default:
+				$question_system_ids = array();
+		}
+		return apply_filters('FHEE__EEM_Question__system_questions_required_in_system_question_group', $question_system_ids, $system_question_group_id);
+	}
+
+
+	/**
+	 * Gets an array for converting between QST_system and QST_IDs for system questions. Eg, if you want to know
+	 * which system question QST_ID corresponds to the QST_system 'city', use EEM_Question::instance()->get_Question_ID_from_system_string('city');
+	 * @param $QST_system
+	 * @return int of QST_ID for the question that corresponds to that QST_system
+	 */
+	public function get_Question_ID_from_system_string($QST_system)
+	{
+		return $this->get_var(array(array('QST_system' => $QST_system)));
+	}
+
+
+	/**
+	 * searches the db for the question with the latest question order and returns that value.
+	 * @access public
+	 * @return int
+	 */
+	public function get_latest_question_order()
+	{
+		$columns_to_select = array(
+			'max_order' => array("MAX(QST_order)", "%d")
+		);
+		$max = $this->_get_all_wpdb_results(array(), ARRAY_A, $columns_to_select);
+		return isset($max[0], $max[0]['max_order']) ? $max[0]['max_order'] : 0;
+	}
+
+	/**
+	 * Returns an array where keys are system question QST_system values,
+	 * and values are the highest question max the admin can set on the question
+	 * (aka the "max max"; eg, a site admin can change the zip question to have a max
+	 * of 5, but no larger than 12)
+	 * @return array
+	 */
+	public function system_question_maxes()
+	{
+		return array(
+			'fname' => 45,
+			'lname' => 45,
+			'address' => 255,
+			'address2' => 255,
+			'city' => 45,
+			'zip' => 12,
+			'email' => 255,
+			'email_confirm' => 255,
+			'phone' => 45,
+		);
+	}
+
+	/**
+	 * Given a QST_system value, gets the question's largest allowable max input.
+	 * @see Registration_Form_Admin_Page::system_question_maxes()
+	 * @param string $system_question_value
+	 * @return int|float
+	 */
+	public function absolute_max_for_system_question($system_question_value)
+	{
+		$maxes = $this->system_question_maxes();
+		if (isset($maxes[ $system_question_value ])) {
+			return $maxes[ $system_question_value ];
+		} else {
+			return EE_INF;
+		}
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function question_descriptions()
+	{
+		return $this->_question_descriptions;
+	}
+
+
+	/**
+	 * Returns all the question types that should have an admin-defined max input length
+	 * @return array
+	 */
+	public function questionTypesWithMaxLength()
+	{
+		return (array) $this->question_types_with_max_lengh;
+	}
 }

core/db_models/relations/EE_Belongs_To_Any_Relation.php

Indentation +84 added lines, -84 removed lines

@@ -16,94 +16,94 @@
 {
 
 
-    /**
-     * get_join_statement
-     *
-     * @param string $model_relation_chain
-     * @return string
-     * @throws \EE_Error
-     */
-    public function get_join_statement($model_relation_chain)
-    {
-        // create the sql string like
-        $this_table_fk_field = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
-        // ALSO, need to get the field with the model name
-        $field_with_model_name = $this->get_this_model()->get_field_containing_related_model_name();
+	/**
+	 * get_join_statement
+	 *
+	 * @param string $model_relation_chain
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function get_join_statement($model_relation_chain)
+	{
+		// create the sql string like
+		$this_table_fk_field = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
+		// ALSO, need to get the field with the model name
+		$field_with_model_name = $this->get_this_model()->get_field_containing_related_model_name();
 
 
-        $other_table_pk_field = $this->get_other_model()->get_primary_key_field();
-        $this_table_alias     = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix(
-            $model_relation_chain,
-            $this->get_this_model()->get_this_model_name()
-        ) . $this_table_fk_field->get_table_alias();
-        $other_table_alias    = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix(
-            $model_relation_chain,
-            $this->get_other_model()->get_this_model_name()
-        ) . $other_table_pk_field->get_table_alias();
-        $other_table          = $this->get_other_model()->get_table_for_alias($other_table_alias);
-        return $this->_left_join(
-            $other_table,
-            $other_table_alias,
-            $other_table_pk_field->get_table_column(),
-            $this_table_alias,
-            $this_table_fk_field->get_table_column(),
-            $field_with_model_name->get_qualified_column() . "='" . $this->get_other_model()->get_this_model_name() . "'"
-        )
-               . $this->get_other_model()->_construct_internal_join_to_table_with_alias($other_table_alias);
-    }
+		$other_table_pk_field = $this->get_other_model()->get_primary_key_field();
+		$this_table_alias     = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix(
+			$model_relation_chain,
+			$this->get_this_model()->get_this_model_name()
+		) . $this_table_fk_field->get_table_alias();
+		$other_table_alias    = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix(
+			$model_relation_chain,
+			$this->get_other_model()->get_this_model_name()
+		) . $other_table_pk_field->get_table_alias();
+		$other_table          = $this->get_other_model()->get_table_for_alias($other_table_alias);
+		return $this->_left_join(
+			$other_table,
+			$other_table_alias,
+			$other_table_pk_field->get_table_column(),
+			$this_table_alias,
+			$this_table_fk_field->get_table_column(),
+			$field_with_model_name->get_qualified_column() . "='" . $this->get_other_model()->get_this_model_name() . "'"
+		)
+			   . $this->get_other_model()->_construct_internal_join_to_table_with_alias($other_table_alias);
+	}
 
 
-    /**
-     * Sets this model object's foreign key to the other model object's primary key. Feel free to do this manually if
-     * you like.
-     *
-     * @param EE_Base_Class|int $this_obj_or_id
-     * @param EE_Base_Class|int $other_obj_or_id
-     * @param array             $extra_join_model_fields_n_values
-     * @return \EE_Base_Class
-     * @throws \EE_Error
-     */
-    public function add_relation_to($this_obj_or_id, $other_obj_or_id, $extra_join_model_fields_n_values = array())
-    {
-        $this_model_obj  = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
-        $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
-        // find the field on THIS model which a foreign key to the other model
-        $fk_on_this_model = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
-        // set that field on the other model to this model's ID
-        $this_model_obj->set($fk_on_this_model->get_name(), $other_model_obj->ID());
-        // and make sure this model's field with the foreign model name is set to the correct value
-        $this_model_obj->set(
-            $this->get_this_model()->get_field_containing_related_model_name()->get_name(),
-            $this->get_other_model()->get_this_model_name()
-        );
-        $this_model_obj->save();
-        return $other_model_obj;
-    }
+	/**
+	 * Sets this model object's foreign key to the other model object's primary key. Feel free to do this manually if
+	 * you like.
+	 *
+	 * @param EE_Base_Class|int $this_obj_or_id
+	 * @param EE_Base_Class|int $other_obj_or_id
+	 * @param array             $extra_join_model_fields_n_values
+	 * @return \EE_Base_Class
+	 * @throws \EE_Error
+	 */
+	public function add_relation_to($this_obj_or_id, $other_obj_or_id, $extra_join_model_fields_n_values = array())
+	{
+		$this_model_obj  = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
+		$other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
+		// find the field on THIS model which a foreign key to the other model
+		$fk_on_this_model = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
+		// set that field on the other model to this model's ID
+		$this_model_obj->set($fk_on_this_model->get_name(), $other_model_obj->ID());
+		// and make sure this model's field with the foreign model name is set to the correct value
+		$this_model_obj->set(
+			$this->get_this_model()->get_field_containing_related_model_name()->get_name(),
+			$this->get_other_model()->get_this_model_name()
+		);
+		$this_model_obj->save();
+		return $other_model_obj;
+	}
 
 
-    /**
-     * Sets the this model object's foreign key to its default, instead of pointing to the other model object
-     *
-     * @param EE_Base_Class|int $this_obj_or_id
-     * @param EE_Base_Class|int $other_obj_or_id
-     * @param array             $where_query
-     * @return \EE_Base_Class
-     * @throws \EE_Error
-     */
-    public function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array())
-    {
-        $this_model_obj  = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
-        $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id);
-        // find the field on the other model which is a foreign key to this model
-        $fk_on_this_model = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
-        // set that field on the other model to this model's ID
-        $this_model_obj->set($fk_on_this_model->get_name(), null, true);
-        $this_model_obj->set(
-            $this->get_this_model()->get_field_containing_related_model_name()->get_name(),
-            null,
-            true
-        );
-        $this_model_obj->save();
-        return $other_model_obj;
-    }
+	/**
+	 * Sets the this model object's foreign key to its default, instead of pointing to the other model object
+	 *
+	 * @param EE_Base_Class|int $this_obj_or_id
+	 * @param EE_Base_Class|int $other_obj_or_id
+	 * @param array             $where_query
+	 * @return \EE_Base_Class
+	 * @throws \EE_Error
+	 */
+	public function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array())
+	{
+		$this_model_obj  = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
+		$other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id);
+		// find the field on the other model which is a foreign key to this model
+		$fk_on_this_model = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
+		// set that field on the other model to this model's ID
+		$this_model_obj->set($fk_on_this_model->get_name(), null, true);
+		$this_model_obj->set(
+			$this->get_this_model()->get_field_containing_related_model_name()->get_name(),
+			null,
+			true
+		);
+		$this_model_obj->save();
+		return $other_model_obj;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -35,19 +35,19 @@
         $this_table_alias     = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix(
             $model_relation_chain,
             $this->get_this_model()->get_this_model_name()
-        ) . $this_table_fk_field->get_table_alias();
-        $other_table_alias    = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix(
+        ).$this_table_fk_field->get_table_alias();
+        $other_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix(
             $model_relation_chain,
             $this->get_other_model()->get_this_model_name()
-        ) . $other_table_pk_field->get_table_alias();
-        $other_table          = $this->get_other_model()->get_table_for_alias($other_table_alias);
+        ).$other_table_pk_field->get_table_alias();
+        $other_table = $this->get_other_model()->get_table_for_alias($other_table_alias);
         return $this->_left_join(
             $other_table,
             $other_table_alias,
             $other_table_pk_field->get_table_column(),
             $this_table_alias,
             $this_table_fk_field->get_table_column(),
-            $field_with_model_name->get_qualified_column() . "='" . $this->get_other_model()->get_this_model_name() . "'"
+            $field_with_model_name->get_qualified_column()."='".$this->get_other_model()->get_this_model_name()."'"
         )
                . $this->get_other_model()->_construct_internal_join_to_table_with_alias($other_table_alias);
     }