eventespresso / event-espresso-core

core/libraries/shortcodes/EE_Primary_Registration_Details_Shortcodes.lib.php

Spacing +5 added lines, -5 removed lines

@@ -99,14 +99,14 @@ 
         $primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && ! empty($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee
             ? $this->_extra_data['data'] : $primary_registration;
 
-        if (! $primary_registration instanceof EE_Messages_Addressee) {
+        if ( ! $primary_registration instanceof EE_Messages_Addressee) {
             return '';
         }
 
         $attendee = $primary_registration->primary_att_obj;
         $primary_reg = $primary_registration->primary_reg_obj;
 
-        if (! $attendee instanceof EE_Attendee || ! $primary_reg instanceof EE_Registration) {
+        if ( ! $attendee instanceof EE_Attendee || ! $primary_reg instanceof EE_Registration) {
             return '';
         }
 
@@ -162,7 +162,7 @@ 
                 break;
 
             case '[PRIMARY_REGISTRANT_REGISTRATION_DATE]':
-                if (! $primary_registration->primary_reg_obj instanceof EE_Registration) {
+                if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration) {
                     return '';
                 }
                 return $primary_registration->primary_reg_obj->get_i18n_datetime('REG_date', get_option('date_format'));
@@ -187,9 +187,9 @@ 
                 if (
                     $question instanceof EE_Question
                     && trim($question->get('QST_display_text')) === trim($shortcode)
-                    && isset($primary_registration->registrations[ $primary_reg->ID() ]['ans_objs'][ $ansid ])
+                    && isset($primary_registration->registrations[$primary_reg->ID()]['ans_objs'][$ansid])
                 ) {
-                    $primary_reg_ansid = $primary_registration->registrations[ $primary_reg->ID() ]['ans_objs'][ $ansid ];
+                    $primary_reg_ansid = $primary_registration->registrations[$primary_reg->ID()]['ans_objs'][$ansid];
 
                     // what we show for the answer depends on the question type!
                     switch ($question->get('QST_type')) {

Indentation +197 added lines, -197 removed lines

@@ -19,201 +19,201 @@
 {
 
 
-    protected function _init_props()
-    {
-        $this->label = esc_html__('Primary_Registration Details Shortcodes', 'event_espresso');
-        $this->description = esc_html__('All shortcodes specific primary registrant data', 'event_espresso');
-        $this->_shortcodes = array(
-            '[PRIMARY_REGISTRANT_FNAME]'                  => esc_html__(
-                'Parses to the first name of the primary registration for the transaction.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_LNAME]'                  => esc_html__(
-                'Parses to the last name of the primary registration for the transaction.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_EMAIL]'                  => esc_html__(
-                'Parses to the email address of the primary registration for the transaction.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_REGISTRATION_ID]'        => esc_html__(
-                'Parses to the registration ID of the primary registrant for the transaction.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_REGISTRATION_CODE]'      => esc_html__(
-                'Parses to the registration code of the primary registrant for the transaction.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_PHONE_NUMBER]'           => esc_html__(
-                'The Phone Number for the primary registrant for the transaction.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_ADDRESS]'                => esc_html__(
-                'The Address for the primary registrant for the transaction.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_ADDRESS2]'               => esc_html__(
-                'Whatever was in the address 2 field for the primary registrant for the transaction.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_CITY]'                   => esc_html__(
-                'The city for the primary registrant for the transaction.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_ZIP_PC]'                 => esc_html__(
-                'The ZIP (or Postal) Code for the primary registrant for the transaction.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_ADDRESS_STATE]'          => esc_html__(
-                'The state/province for the primary registrant for the transaction.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_COUNTRY]'                => esc_html__(
-                'The country for the primary registrant for the transaction.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_REGISTRATION_DATE]'      => esc_html__(
-                'The date the registration occured for the primary registration.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_FRONTEND_EDIT_REG_LINK]' => esc_html__(
-                'Generates a link for the given registration to edit this registration details on the frontend.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_ANSWER_*]'               => esc_html__(
-                'This is a special dynamic shortcode.  After the "*", add the exact text of an existing question, and if there is an answer for that question for this primary registrant, then it will be output in place of this shortcode.',
-                'event_espresso'
-            ),
-        );
-    }
-
-
-    protected function _parser($shortcode)
-    {
-        // make sure we end up with a copy of the EE_Messages_Addressee object
-        $primary_registration = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
-        $primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && is_array(
-            $this->_data
-        ) && isset($this->_data['data']) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data']
-            : $primary_registration;
-        $primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && ! empty($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee
-            ? $this->_extra_data['data'] : $primary_registration;
-
-        if (! $primary_registration instanceof EE_Messages_Addressee) {
-            return '';
-        }
-
-        $attendee = $primary_registration->primary_att_obj;
-        $primary_reg = $primary_registration->primary_reg_obj;
-
-        if (! $attendee instanceof EE_Attendee || ! $primary_reg instanceof EE_Registration) {
-            return '';
-        }
-
-        switch ($shortcode) {
-            case '[PRIMARY_REGISTRANT_FNAME]':
-                return $attendee->fname();
-                break;
-
-            case '[PRIMARY_REGISTRANT_LNAME]':
-                return $attendee->lname();
-                break;
-
-            case '[PRIMARY_REGISTRANT_EMAIL]':
-                return $attendee->email();
-                break;
-
-            case '[PRIMARY_REGISTRANT_REGISTRATION_ID]':
-                return $primary_reg->ID();
-                break;
-
-            case '[PRIMARY_REGISTRANT_REGISTRATION_CODE]':
-                return $primary_reg->reg_code();
-                break;
-
-            case '[PRIMARY_REGISTRANT_PHONE_NUMBER]':
-                return $attendee->phone();
-                break;
-
-            case '[PRIMARY_REGISTRANT_ADDRESS]':
-                return $attendee->address();
-                break;
-
-            case '[PRIMARY_REGISTRANT_ADDRESS2]':
-                return $attendee->address2();
-                break;
-
-            case '[PRIMARY_REGISTRANT_CITY]':
-                return $attendee->city();
-                break;
-
-            case '[PRIMARY_REGISTRANT_ZIP_PC]':
-                return $attendee->zip();
-                break;
-
-            case '[PRIMARY_REGISTRANT_ADDRESS_STATE]':
-                $state_obj = $attendee->state_obj();
-                return $state_obj instanceof EE_State ? $state_obj->name() : '';
-                break;
-
-            case '[PRIMARY_REGISTRANT_COUNTRY]':
-                $country_obj = $attendee->country_obj();
-                return $country_obj instanceof EE_Country ? $country_obj->name() : '';
-                break;
-
-            case '[PRIMARY_REGISTRANT_REGISTRATION_DATE]':
-                if (! $primary_registration->primary_reg_obj instanceof EE_Registration) {
-                    return '';
-                }
-                return $primary_registration->primary_reg_obj->get_i18n_datetime('REG_date', get_option('date_format'));
-                break;
-
-            case '[PRIMARY_REGISTRANT_FRONTEND_EDIT_REG_LINK]':
-                return $primary_reg->edit_attendee_information_url();
-                break;
-        }
-
-        if (strpos($shortcode, '[PRIMARY_REGISTRANT_ANSWER_*') !== false) {
-            $shortcode = str_replace('[PRIMARY_REGISTRANT_ANSWER_*', '', $shortcode);
-            $shortcode = trim(str_replace(']', '', $shortcode));
-
-
-            // now let's figure out what question has this text
-            if (empty($primary_registration->questions)) {
-                return '';
-            }
-
-            foreach ($primary_registration->questions as $ansid => $question) {
-                if (
-                    $question instanceof EE_Question
-                    && trim($question->get('QST_display_text')) === trim($shortcode)
-                    && isset($primary_registration->registrations[ $primary_reg->ID() ]['ans_objs'][ $ansid ])
-                ) {
-                    $primary_reg_ansid = $primary_registration->registrations[ $primary_reg->ID() ]['ans_objs'][ $ansid ];
-
-                    // what we show for the answer depends on the question type!
-                    switch ($question->get('QST_type')) {
-                        case EEM_Question::QST_type_state:
-                            $state = EEM_State::instance()->get_one_by_ID($primary_reg_ansid->get('ANS_value'));
-                            $answer = $state instanceof EE_State ? $state->name() : '';
-                            break;
-
-                        case EEM_Question::QST_type_country:
-                            $country = EEM_Country::instance()->get_one_by_ID($primary_reg_ansid->get('ANS_value'));
-                            $answer = $country instanceof EE_Country ? $country->name() : '';
-                            break;
-
-                        default:
-                            $answer = $primary_reg_ansid->get_pretty('ANS_value', 'no_wpautop');
-                            break;
-                    }
-
-                    return $answer;
-                    break;
-                }
-            }
-        }
-
-        return '';
-    }
+	protected function _init_props()
+	{
+		$this->label = esc_html__('Primary_Registration Details Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes specific primary registrant data', 'event_espresso');
+		$this->_shortcodes = array(
+			'[PRIMARY_REGISTRANT_FNAME]'                  => esc_html__(
+				'Parses to the first name of the primary registration for the transaction.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_LNAME]'                  => esc_html__(
+				'Parses to the last name of the primary registration for the transaction.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_EMAIL]'                  => esc_html__(
+				'Parses to the email address of the primary registration for the transaction.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_REGISTRATION_ID]'        => esc_html__(
+				'Parses to the registration ID of the primary registrant for the transaction.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_REGISTRATION_CODE]'      => esc_html__(
+				'Parses to the registration code of the primary registrant for the transaction.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_PHONE_NUMBER]'           => esc_html__(
+				'The Phone Number for the primary registrant for the transaction.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_ADDRESS]'                => esc_html__(
+				'The Address for the primary registrant for the transaction.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_ADDRESS2]'               => esc_html__(
+				'Whatever was in the address 2 field for the primary registrant for the transaction.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_CITY]'                   => esc_html__(
+				'The city for the primary registrant for the transaction.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_ZIP_PC]'                 => esc_html__(
+				'The ZIP (or Postal) Code for the primary registrant for the transaction.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_ADDRESS_STATE]'          => esc_html__(
+				'The state/province for the primary registrant for the transaction.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_COUNTRY]'                => esc_html__(
+				'The country for the primary registrant for the transaction.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_REGISTRATION_DATE]'      => esc_html__(
+				'The date the registration occured for the primary registration.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_FRONTEND_EDIT_REG_LINK]' => esc_html__(
+				'Generates a link for the given registration to edit this registration details on the frontend.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_ANSWER_*]'               => esc_html__(
+				'This is a special dynamic shortcode.  After the "*", add the exact text of an existing question, and if there is an answer for that question for this primary registrant, then it will be output in place of this shortcode.',
+				'event_espresso'
+			),
+		);
+	}
+
+
+	protected function _parser($shortcode)
+	{
+		// make sure we end up with a copy of the EE_Messages_Addressee object
+		$primary_registration = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
+		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && is_array(
+			$this->_data
+		) && isset($this->_data['data']) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data']
+			: $primary_registration;
+		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && ! empty($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee
+			? $this->_extra_data['data'] : $primary_registration;
+
+		if (! $primary_registration instanceof EE_Messages_Addressee) {
+			return '';
+		}
+
+		$attendee = $primary_registration->primary_att_obj;
+		$primary_reg = $primary_registration->primary_reg_obj;
+
+		if (! $attendee instanceof EE_Attendee || ! $primary_reg instanceof EE_Registration) {
+			return '';
+		}
+
+		switch ($shortcode) {
+			case '[PRIMARY_REGISTRANT_FNAME]':
+				return $attendee->fname();
+				break;
+
+			case '[PRIMARY_REGISTRANT_LNAME]':
+				return $attendee->lname();
+				break;
+
+			case '[PRIMARY_REGISTRANT_EMAIL]':
+				return $attendee->email();
+				break;
+
+			case '[PRIMARY_REGISTRANT_REGISTRATION_ID]':
+				return $primary_reg->ID();
+				break;
+
+			case '[PRIMARY_REGISTRANT_REGISTRATION_CODE]':
+				return $primary_reg->reg_code();
+				break;
+
+			case '[PRIMARY_REGISTRANT_PHONE_NUMBER]':
+				return $attendee->phone();
+				break;
+
+			case '[PRIMARY_REGISTRANT_ADDRESS]':
+				return $attendee->address();
+				break;
+
+			case '[PRIMARY_REGISTRANT_ADDRESS2]':
+				return $attendee->address2();
+				break;
+
+			case '[PRIMARY_REGISTRANT_CITY]':
+				return $attendee->city();
+				break;
+
+			case '[PRIMARY_REGISTRANT_ZIP_PC]':
+				return $attendee->zip();
+				break;
+
+			case '[PRIMARY_REGISTRANT_ADDRESS_STATE]':
+				$state_obj = $attendee->state_obj();
+				return $state_obj instanceof EE_State ? $state_obj->name() : '';
+				break;
+
+			case '[PRIMARY_REGISTRANT_COUNTRY]':
+				$country_obj = $attendee->country_obj();
+				return $country_obj instanceof EE_Country ? $country_obj->name() : '';
+				break;
+
+			case '[PRIMARY_REGISTRANT_REGISTRATION_DATE]':
+				if (! $primary_registration->primary_reg_obj instanceof EE_Registration) {
+					return '';
+				}
+				return $primary_registration->primary_reg_obj->get_i18n_datetime('REG_date', get_option('date_format'));
+				break;
+
+			case '[PRIMARY_REGISTRANT_FRONTEND_EDIT_REG_LINK]':
+				return $primary_reg->edit_attendee_information_url();
+				break;
+		}
+
+		if (strpos($shortcode, '[PRIMARY_REGISTRANT_ANSWER_*') !== false) {
+			$shortcode = str_replace('[PRIMARY_REGISTRANT_ANSWER_*', '', $shortcode);
+			$shortcode = trim(str_replace(']', '', $shortcode));
+
+
+			// now let's figure out what question has this text
+			if (empty($primary_registration->questions)) {
+				return '';
+			}
+
+			foreach ($primary_registration->questions as $ansid => $question) {
+				if (
+					$question instanceof EE_Question
+					&& trim($question->get('QST_display_text')) === trim($shortcode)
+					&& isset($primary_registration->registrations[ $primary_reg->ID() ]['ans_objs'][ $ansid ])
+				) {
+					$primary_reg_ansid = $primary_registration->registrations[ $primary_reg->ID() ]['ans_objs'][ $ansid ];
+
+					// what we show for the answer depends on the question type!
+					switch ($question->get('QST_type')) {
+						case EEM_Question::QST_type_state:
+							$state = EEM_State::instance()->get_one_by_ID($primary_reg_ansid->get('ANS_value'));
+							$answer = $state instanceof EE_State ? $state->name() : '';
+							break;
+
+						case EEM_Question::QST_type_country:
+							$country = EEM_Country::instance()->get_one_by_ID($primary_reg_ansid->get('ANS_value'));
+							$answer = $country instanceof EE_Country ? $country->name() : '';
+							break;
+
+						default:
+							$answer = $primary_reg_ansid->get_pretty('ANS_value', 'no_wpautop');
+							break;
+					}
+
+					return $answer;
+					break;
+				}
+			}
+		}
+
+		return '';
+	}
 }

core/libraries/form_sections/inputs/EE_Currency_Input.input.php

Indentation +19 added lines, -19 removed lines

@@ -12,23 +12,23 @@
 class EE_Currency_Input extends EE_Select_Input
 {
 
-    /**
-     *
-     * @param array $only_specific_currency_codes numerically-indexed array of allowed currency codes. By default, all are allowed
-     * @param array $input_settings
-     */
-    public function __construct($only_specific_currency_codes = array(), $input_settings = array())
-    {
-        $query_params = array('order_by' => array('CNT_name' => 'asc'));
-        if ($only_specific_currency_codes) {
-            $query_params[0]['CNT_cur_code'] = array('IN',$only_specific_currency_codes);
-        }
-        $all_countries = EEM_Country::instance()->get_all($query_params);
-        $country_options = array();
-        foreach ($all_countries as $country) {
-            /* @var $country EE_Country */
-            $country_options[ $country->currency_code() ] = $country->name() . ": " . $country->currency_name_single() . " (" . $country->currency_sign() . ")";
-        }
-        parent::__construct($country_options, 'int', $input_settings);
-    }
+	/**
+	 *
+	 * @param array $only_specific_currency_codes numerically-indexed array of allowed currency codes. By default, all are allowed
+	 * @param array $input_settings
+	 */
+	public function __construct($only_specific_currency_codes = array(), $input_settings = array())
+	{
+		$query_params = array('order_by' => array('CNT_name' => 'asc'));
+		if ($only_specific_currency_codes) {
+			$query_params[0]['CNT_cur_code'] = array('IN',$only_specific_currency_codes);
+		}
+		$all_countries = EEM_Country::instance()->get_all($query_params);
+		$country_options = array();
+		foreach ($all_countries as $country) {
+			/* @var $country EE_Country */
+			$country_options[ $country->currency_code() ] = $country->name() . ": " . $country->currency_name_single() . " (" . $country->currency_sign() . ")";
+		}
+		parent::__construct($country_options, 'int', $input_settings);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -21,13 +21,13 @@
     {
         $query_params = array('order_by' => array('CNT_name' => 'asc'));
         if ($only_specific_currency_codes) {
-            $query_params[0]['CNT_cur_code'] = array('IN',$only_specific_currency_codes);
+            $query_params[0]['CNT_cur_code'] = array('IN', $only_specific_currency_codes);
         }
         $all_countries = EEM_Country::instance()->get_all($query_params);
         $country_options = array();
         foreach ($all_countries as $country) {
             /* @var $country EE_Country */
-            $country_options[ $country->currency_code() ] = $country->name() . ": " . $country->currency_name_single() . " (" . $country->currency_sign() . ")";
+            $country_options[$country->currency_code()] = $country->name().": ".$country->currency_name_single()." (".$country->currency_sign().")";
         }
         parent::__construct($country_options, 'int', $input_settings);
     }

core/libraries/form_sections/inputs/EE_Select_Reveal_Input.input.php

Indentation +59 added lines, -59 removed lines

@@ -15,65 +15,65 @@
 class EE_Select_Reveal_Input extends EE_Select_Input
 {
 
-    /**
-     * @param array $answer_options Array keys which match a sibling section's name
-     *              will show/unhide that sibling subsection. Otherwise, siblings whose names
-     *              match array keys of $answer_options are hidden.
-     *              Note: internally each array key is considered a relative form input path
-     *              (see EE_Form_Section_Base::find_section_from_path) but relative
-     *              to THIS INPUT's PARENT section, not this input itself. ie,
-     *              a '../' is automatically added onto each each array key, to produce
-     *              the relative form input path.
-     *              Note however: array keys which are an EMPTY STRING are left as-is
-     *
-     * @param array $input_settings
-     */
-    public function __construct($answer_options, $input_settings = array())
-    {
-        parent::__construct($answer_options, $input_settings);
-    }
+	/**
+	 * @param array $answer_options Array keys which match a sibling section's name
+	 *              will show/unhide that sibling subsection. Otherwise, siblings whose names
+	 *              match array keys of $answer_options are hidden.
+	 *              Note: internally each array key is considered a relative form input path
+	 *              (see EE_Form_Section_Base::find_section_from_path) but relative
+	 *              to THIS INPUT's PARENT section, not this input itself. ie,
+	 *              a '../' is automatically added onto each each array key, to produce
+	 *              the relative form input path.
+	 *              Note however: array keys which are an EMPTY STRING are left as-is
+	 *
+	 * @param array $input_settings
+	 */
+	public function __construct($answer_options, $input_settings = array())
+	{
+		parent::__construct($answer_options, $input_settings);
+	}
 
-    /**
-     * Gets all the sibling sections controlled by this reveal select input
-     * @return \EE_Form_Section_Base[] keys are their form section paths
-     */
-    public function sibling_sections_controlled()
-    {
-        $sibling_sections = array();
-        foreach ($this->options() as $sibling_section_name => $sibling_section) {
-            // if it's an empty string just leave it alone
-            if (empty($sibling_section_name)) {
-                continue;
-            }
-            $sibling_section = $this->find_section_from_path('../' . $sibling_section_name);
-            if (
-                $sibling_section instanceof EE_Form_Section_Base
-                && ! empty($sibling_section_name)
-            ) {
-                $sibling_sections[ $sibling_section_name ] = $sibling_section;
-            }
-        }
-        return $sibling_sections;
-    }
+	/**
+	 * Gets all the sibling sections controlled by this reveal select input
+	 * @return \EE_Form_Section_Base[] keys are their form section paths
+	 */
+	public function sibling_sections_controlled()
+	{
+		$sibling_sections = array();
+		foreach ($this->options() as $sibling_section_name => $sibling_section) {
+			// if it's an empty string just leave it alone
+			if (empty($sibling_section_name)) {
+				continue;
+			}
+			$sibling_section = $this->find_section_from_path('../' . $sibling_section_name);
+			if (
+				$sibling_section instanceof EE_Form_Section_Base
+				&& ! empty($sibling_section_name)
+			) {
+				$sibling_sections[ $sibling_section_name ] = $sibling_section;
+			}
+		}
+		return $sibling_sections;
+	}
 
-    /**
-     * Adds an entry of 'select_reveal_inputs' to the js data, which is an array
-     * whose top-level keys are select reveal input html ids; values are arrays
-     * whose keys are select option values and values are the sections they reveal
-     * @param array $form_other_js_data
-     * @return array
-     */
-    public function get_other_js_data($form_other_js_data = array())
-    {
-        $form_other_js_data = parent::get_other_js_data($form_other_js_data);
-        if (! isset($form_other_js_data['select_reveal_inputs'])) {
-            $form_other_js_data['select_reveal_inputs'] = array();
-        }
-        $sibling_input_to_html_id_map = array();
-        foreach ($this->sibling_sections_controlled() as $sibling_section_path => $sibling_section) {
-            $sibling_input_to_html_id_map[ $sibling_section_path ] = $sibling_section->html_id();
-        }
-        $form_other_js_data['select_reveal_inputs'][ $this->html_id() ] = $sibling_input_to_html_id_map;
-        return $form_other_js_data;
-    }
+	/**
+	 * Adds an entry of 'select_reveal_inputs' to the js data, which is an array
+	 * whose top-level keys are select reveal input html ids; values are arrays
+	 * whose keys are select option values and values are the sections they reveal
+	 * @param array $form_other_js_data
+	 * @return array
+	 */
+	public function get_other_js_data($form_other_js_data = array())
+	{
+		$form_other_js_data = parent::get_other_js_data($form_other_js_data);
+		if (! isset($form_other_js_data['select_reveal_inputs'])) {
+			$form_other_js_data['select_reveal_inputs'] = array();
+		}
+		$sibling_input_to_html_id_map = array();
+		foreach ($this->sibling_sections_controlled() as $sibling_section_path => $sibling_section) {
+			$sibling_input_to_html_id_map[ $sibling_section_path ] = $sibling_section->html_id();
+		}
+		$form_other_js_data['select_reveal_inputs'][ $this->html_id() ] = $sibling_input_to_html_id_map;
+		return $form_other_js_data;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -45,12 +45,12 @@ 
             if (empty($sibling_section_name)) {
                 continue;
             }
-            $sibling_section = $this->find_section_from_path('../' . $sibling_section_name);
+            $sibling_section = $this->find_section_from_path('../'.$sibling_section_name);
             if (
                 $sibling_section instanceof EE_Form_Section_Base
                 && ! empty($sibling_section_name)
             ) {
-                $sibling_sections[ $sibling_section_name ] = $sibling_section;
+                $sibling_sections[$sibling_section_name] = $sibling_section;
             }
         }
         return $sibling_sections;
@@ -66,14 +66,14 @@ 
     public function get_other_js_data($form_other_js_data = array())
     {
         $form_other_js_data = parent::get_other_js_data($form_other_js_data);
-        if (! isset($form_other_js_data['select_reveal_inputs'])) {
+        if ( ! isset($form_other_js_data['select_reveal_inputs'])) {
             $form_other_js_data['select_reveal_inputs'] = array();
         }
         $sibling_input_to_html_id_map = array();
         foreach ($this->sibling_sections_controlled() as $sibling_section_path => $sibling_section) {
-            $sibling_input_to_html_id_map[ $sibling_section_path ] = $sibling_section->html_id();
+            $sibling_input_to_html_id_map[$sibling_section_path] = $sibling_section->html_id();
         }
-        $form_other_js_data['select_reveal_inputs'][ $this->html_id() ] = $sibling_input_to_html_id_map;
+        $form_other_js_data['select_reveal_inputs'][$this->html_id()] = $sibling_input_to_html_id_map;
         return $form_other_js_data;
     }
 }

core/libraries/form_sections/inputs/EE_Text_Area_Input.input.php

Indentation +57 added lines, -57 removed lines

@@ -13,68 +13,68 @@
 {
 
 
-    protected $_rows = 2;
-    protected $_cols = 20;
+	protected $_rows = 2;
+	protected $_cols = 20;
 
-    /**
-     * sets the rows property on this input
-     * @param int $rows
-     */
-    public function set_rows($rows)
-    {
-        $this->_rows = $rows;
-    }
-    /**
-     * sets the cols html property on this input
-     * @param int $cols
-     */
-    public function set_cols($cols)
-    {
-        $this->_cols = $cols;
-    }
-    /**
-     *
-     * @return int
-     */
-    public function get_rows()
-    {
-        return $this->_rows;
-    }
-    /**
-     *
-     * @return int
-     */
-    public function get_cols()
-    {
-        return $this->_cols;
-    }
+	/**
+	 * sets the rows property on this input
+	 * @param int $rows
+	 */
+	public function set_rows($rows)
+	{
+		$this->_rows = $rows;
+	}
+	/**
+	 * sets the cols html property on this input
+	 * @param int $cols
+	 */
+	public function set_cols($cols)
+	{
+		$this->_cols = $cols;
+	}
+	/**
+	 *
+	 * @return int
+	 */
+	public function get_rows()
+	{
+		return $this->_rows;
+	}
+	/**
+	 *
+	 * @return int
+	 */
+	public function get_cols()
+	{
+		return $this->_cols;
+	}
 
 
 
-    /**
-     * @param array $options_array
-     */
-    public function __construct($options_array = array())
-    {
-        $this->_set_display_strategy(new EE_Text_Area_Display_Strategy());
-        $this->_set_normalization_strategy(new EE_Text_Normalization());
+	/**
+	 * @param array $options_array
+	 */
+	public function __construct($options_array = array())
+	{
+		$this->_set_display_strategy(new EE_Text_Area_Display_Strategy());
+		$this->_set_normalization_strategy(new EE_Text_Normalization());
 
 
-        parent::__construct($options_array);
+		parent::__construct($options_array);
 
-        // if the input hasn't specifically mentioned a more lenient validation strategy,
-        // apply plaintext validation strategy
-        if (
-            ! $this->has_validation_strategy(
-                array(
-                    'EE_Full_HTML_Validation_Strategy',
-                    'EE_Simple_HTML_Validation_Strategy'
-                )
-            )
-        ) {
-            // by default we use the plaintext validation. If you want something else,
-            // just remove it after the input is constructed :P using EE_Form_Input_Base::remove_validation_strategy()
-            $this->_add_validation_strategy(new EE_Plaintext_Validation_Strategy());
-        }
-    }
+		// if the input hasn't specifically mentioned a more lenient validation strategy,
+		// apply plaintext validation strategy
+		if (
+			! $this->has_validation_strategy(
+				array(
+					'EE_Full_HTML_Validation_Strategy',
+					'EE_Simple_HTML_Validation_Strategy'
+				)
+			)
+		) {
+			// by default we use the plaintext validation. If you want something else,
+			// just remove it after the input is constructed :P using EE_Form_Input_Base::remove_validation_strategy()
+			$this->_add_validation_strategy(new EE_Plaintext_Validation_Strategy());
+		}
+	}
 }

core/libraries/form_sections/inputs/EE_CVV_Input.input.php

Indentation +39 added lines, -39 removed lines

@@ -12,43 +12,43 @@
 class EE_CVV_Input extends EE_Text_Input
 {
 
-    /**
-     * @param array $input_settings {
-     *  @type boolean $include_whats_this_link defaults to true
-     * }
-     */
-    public function __construct($input_settings = array())
-    {
-        $this->set_sensitive_data_removal_strategy(new EE_CCV_Sensitive_Data_Removal());
-        $this->_add_validation_strategy(
-            new EE_Text_Validation_Strategy(
-                isset($input_settings['validation_error_message'])
-                    ?  $input_settings['validation_error_message']
-                    : esc_html__(
-                        'The CVV is either a 3 digit number on the back of your card, or 4 digit number on the front',
-                        'event_espresso'
-                    ),
-                '~^\d{3,4}$~'
-            )
-        );
-        parent::__construct($input_settings);
-        if (
-            ! isset($input_settings['include_whats_this_link'])
-            || (
-                isset($input_settings['include_whats_this_link'])
-                 && $input_settings['include_whats_this_link'] === true
-            )
-        ) {
-            $this->_html_label_text = sprintf(
-                esc_html_x(
-                    '%1$s %2$s(What\'s this?)%3$s',
-                    'CVV (What\'s this?)',
-                    'event_espresso'
-                ),
-                $this->_html_label_text,
-                '<a href="https://www.cvvnumber.com/" target="_blank" rel="noopener noreferrer">',
-                '</a>'
-            );
-        }
-    }
+	/**
+	 * @param array $input_settings {
+	 *  @type boolean $include_whats_this_link defaults to true
+	 * }
+	 */
+	public function __construct($input_settings = array())
+	{
+		$this->set_sensitive_data_removal_strategy(new EE_CCV_Sensitive_Data_Removal());
+		$this->_add_validation_strategy(
+			new EE_Text_Validation_Strategy(
+				isset($input_settings['validation_error_message'])
+					?  $input_settings['validation_error_message']
+					: esc_html__(
+						'The CVV is either a 3 digit number on the back of your card, or 4 digit number on the front',
+						'event_espresso'
+					),
+				'~^\d{3,4}$~'
+			)
+		);
+		parent::__construct($input_settings);
+		if (
+			! isset($input_settings['include_whats_this_link'])
+			|| (
+				isset($input_settings['include_whats_this_link'])
+				 && $input_settings['include_whats_this_link'] === true
+			)
+		) {
+			$this->_html_label_text = sprintf(
+				esc_html_x(
+					'%1$s %2$s(What\'s this?)%3$s',
+					'CVV (What\'s this?)',
+					'event_espresso'
+				),
+				$this->_html_label_text,
+				'<a href="https://www.cvvnumber.com/" target="_blank" rel="noopener noreferrer">',
+				'</a>'
+			);
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
         $this->_add_validation_strategy(
             new EE_Text_Validation_Strategy(
                 isset($input_settings['validation_error_message'])
-                    ?  $input_settings['validation_error_message']
+                    ? $input_settings['validation_error_message']
                     : esc_html__(
                         'The CVV is either a 3 digit number on the back of your card, or 4 digit number on the front',
                         'event_espresso'

core/libraries/form_sections/inputs/EE_Text_Input.input.php

Indentation +23 added lines, -23 removed lines

@@ -13,27 +13,27 @@
 {
 
 
-    /**
-     * @param array $options
-     */
-    public function __construct($options = array())
-    {
-        $this->_set_display_strategy(new EE_Text_Input_Display_Strategy());
-        $this->_set_normalization_strategy(new EE_Text_Normalization());
-        parent::__construct($options);
-        // if the input hasn't specifically mentioned a more lenient validation strategy,
-        // apply plaintext validation strategy
-        if (
-            ! $this->has_validation_strategy(
-                array(
-                    'EE_Full_HTML_Validation_Strategy',
-                    'EE_Simple_HTML_Validation_Strategy'
-                )
-            )
-        ) {
-            // by default we use the plaintext validation. If you want something else,
-            // just remove it after the input is constructed :P using EE_Form_Input_Base::remove_validation_strategy()
-            $this->_add_validation_strategy(new EE_Plaintext_Validation_Strategy());
-        }
-    }
+	/**
+	 * @param array $options
+	 */
+	public function __construct($options = array())
+	{
+		$this->_set_display_strategy(new EE_Text_Input_Display_Strategy());
+		$this->_set_normalization_strategy(new EE_Text_Normalization());
+		parent::__construct($options);
+		// if the input hasn't specifically mentioned a more lenient validation strategy,
+		// apply plaintext validation strategy
+		if (
+			! $this->has_validation_strategy(
+				array(
+					'EE_Full_HTML_Validation_Strategy',
+					'EE_Simple_HTML_Validation_Strategy'
+				)
+			)
+		) {
+			// by default we use the plaintext validation. If you want something else,
+			// just remove it after the input is constructed :P using EE_Form_Input_Base::remove_validation_strategy()
+			$this->_add_validation_strategy(new EE_Plaintext_Validation_Strategy());
+		}
+	}
 }

core/libraries/form_sections/inputs/EE_Form_Input_With_Options_Base.input.php

Indentation +320 added lines, -320 removed lines

@@ -12,324 +12,324 @@
 class EE_Form_Input_With_Options_Base extends EE_Form_Input_Base
 {
 
-    /**
-     * array of available options to choose as an answer
-     *
-     * @var array
-     */
-    protected $_options = array();
-
-    /**
-     * whether to display the html_label_text above the checkbox/radio button options
-     *
-     * @var boolean
-     */
-    protected $_display_html_label_text = true;
-
-    /**
-     * whether to display an question option description as part of the input label
-     *
-     * @var boolean
-     */
-    protected $_use_desc_in_label = true;
-
-    /**
-     * strlen() result for the longest input value (what gets displayed in the label)
-     * this is used to apply a css class to the input label
-     *
-     * @var int
-     */
-    protected $_label_size = 0;
-
-    /**
-     * whether to enforce the label size value passed in the constructor
-     *
-     * @var boolean
-     */
-    protected $_enforce_label_size = false;
-
-    /**
-     * whether to allow multiple selections (ie, the value of this input should be an array)
-     * or not (ie, the value should be a simple int, string, etc)
-     *
-     * @var boolean
-     */
-    protected $_multiple_selections = false;
-
-
-
-    /**
-     * @param array     $answer_options
-     * @param array     $input_settings {
-     * @type int|string $label_size
-     * @type boolean    $display_html_label_text
-     *                                  }
-     *                                  And all the options accepted by EE_Form_Input_Base
-     */
-    public function __construct($answer_options = array(), $input_settings = array())
-    {
-        if (isset($input_settings['label_size'])) {
-            $this->_set_label_size($input_settings['label_size']);
-            if (isset($input_settings['enforce_label_size']) && $input_settings['enforce_label_size']) {
-                $this->_enforce_label_size = true;
-            }
-        }
-        if (isset($input_settings['display_html_label_text'])) {
-            $this->set_display_html_label_text($input_settings['display_html_label_text']);
-        }
-        $this->set_select_options($answer_options);
-        parent::__construct($input_settings);
-    }
-
-
-
-    /**
-     * Sets the allowed options for this input. Also has the side-effect of
-     * updating the normalization strategy to match the keys provided in the array
-     *
-     * @param array $answer_options
-     * @return void  just has the side-effect of setting the options for this input
-     */
-    public function set_select_options($answer_options = array())
-    {
-        $answer_options = is_array($answer_options) ? $answer_options : array($answer_options);
-        // get the first item in the select options and check it's type
-        $this->_options = reset($answer_options) instanceof EE_Question_Option
-            ? $this->_process_question_options($answer_options)
-            : $answer_options;
-        // d( $this->_options );
-        $select_option_keys = array_keys($this->_options);
-        // attempt to determine data type for values in order to set normalization type
-        // purposefully only
-        if (
-            count($this->_options) === 2
-            && (
-                (in_array(true, $select_option_keys, true) && in_array(false, $select_option_keys, true))
-                || (in_array(1, $select_option_keys, true) && in_array(0, $select_option_keys, true))
-            )
-        ) {
-            // values appear to be boolean, like TRUE, FALSE, 1, 0
-            $normalization = new EE_Boolean_Normalization();
-        } else {
-            // are ALL the options ints (even if we're using a multi-dimensional array)? If so use int validation
-            $all_ints = true;
-            array_walk_recursive(
-                $this->_options,
-                function ($value, $key) use (&$all_ints) {
-                    // is this a top-level key? ignore it
-                    if (
-                        ! is_array($value)
-                        && ! is_int($key)
-                        && $key !== ''
-                        && $key !== null
-                    ) {
-                        $all_ints = false;
-                    }
-                }
-            );
-            if ($all_ints) {
-                $normalization = new EE_Int_Normalization();
-            } else {
-                $normalization = new EE_Text_Normalization();
-            }
-        }
-        // does input type have multiple options ?
-        if ($this->_multiple_selections) {
-            $this->_set_normalization_strategy(new EE_Many_Valued_Normalization($normalization));
-        } else {
-            $this->_set_normalization_strategy($normalization);
-        }
-    }
-
-
-
-    /**
-     * @return array
-     */
-    public function options()
-    {
-        return $this->_options;
-    }
-
-
-
-    /**
-     * Returns an array which is guaranteed to not be multidimensional
-     *
-     * @return array
-     */
-    public function flat_options()
-    {
-        return $this->_flatten_select_options($this->options());
-    }
-
-
-
-    /**
-     * Makes sure $arr is a flat array, not a multidimensional one
-     *
-     * @param array $arr
-     * @return array
-     */
-    protected function _flatten_select_options($arr)
-    {
-        $flat_array = array();
-        if (EEH_Array::is_multi_dimensional_array($arr)) {
-            foreach ($arr as $sub_array) {
-                foreach ((array) $sub_array as $key => $value) {
-                    $flat_array[ $key ] = $value;
-                    $this->_set_label_size($value);
-                }
-            }
-        } else {
-            foreach ($arr as $key => $value) {
-                $flat_array[ $key ] = $value;
-                $this->_set_label_size($value);
-            }
-        }
-        return $flat_array;
-    }
-
-
-
-    /**
-     * @param EE_Question_Option[] $question_options_array
-     * @return array
-     */
-    protected function _process_question_options($question_options_array = array())
-    {
-        $flat_array = array();
-        foreach ($question_options_array as $question_option) {
-            if ($question_option instanceof EE_Question_Option) {
-                $desc = '';
-                if ($this->_use_desc_in_label) {
-                    $desc = $question_option->desc();
-                    $desc = ! empty($desc) ? '<span class="ee-question-option-desc">' . $desc . '</span>' : '';
-                }
-                $value = $question_option->value();
-                // add value even if it's empty
-                $flat_array[ $value ] = $value;
-                // if both value and desc are not empty, then separate with a dash
-                if (! empty($value) && ! empty($desc)) {
-                    $flat_array[ $value ] .= ' - ' . $desc;
-                } else {
-                    // otherwise, just add desc, since either or both of the vars is empty, and no dash is necessary
-                    $flat_array[ $value ] .= $desc;
-                }
-            } elseif (is_array($question_option)) {
-                $flat_array += $this->_flatten_select_options($question_option);
-            }
-        }
-        return $flat_array;
-    }
-
-
-
-    /**
-     *    set_label_sizes
-     *
-     * @return void
-     */
-    public function set_label_sizes()
-    {
-        // did the input settings specifically say to NOT set the label size dynamically ?
-        if (! $this->_enforce_label_size) {
-            foreach ($this->_options as $option) {
-                // calculate the strlen of the label
-                $this->_set_label_size($option);
-            }
-        }
-    }
-
-
-
-    /**
-     *    _set_label_size_class
-     *
-     * @param int|string $value
-     * @return void
-     */
-    private function _set_label_size($value = '')
-    {
-        // don't change label size if it has already been set and is being enforced
-        if ($this->_enforce_label_size && $this->_label_size >  0) {
-            return;
-        }
-        // determine length of option value
-        $val_size = is_int($value) ? $value : strlen($value);
-        // use new value if bigger than existing
-        $this->_label_size = $val_size > $this->_label_size ? $val_size : $this->_label_size;
-    }
-
-
-
-    /**
-     *    get_label_size_class
-     *
-     * @return string
-     */
-    public function get_label_size_class()
-    {
-        $size = ' medium-lbl';
-        // use maximum option value length to determine label size
-        if ($this->_label_size < 3) {
-            $size = ' nano-lbl';
-        } elseif ($this->_label_size < 6) {
-            $size = ' micro-lbl';
-        } elseif ($this->_label_size < 12) {
-            $size = ' tiny-lbl';
-        } elseif ($this->_label_size < 25) {
-            $size = ' small-lbl';
-        } elseif ($this->_label_size < 50) {
-            $size = ' medium-lbl';
-        } elseif ($this->_label_size >= 100) {
-            $size = ' big-lbl';
-        }
-        return $size;
-    }
-
-
-
-    /**
-     * Returns the pretty value for the normalized value
-     *
-     * @return string
-     */
-    public function pretty_value()
-    {
-        $options = $this->flat_options();
-        $unnormalized_value_choices = $this->get_normalization_strategy()->unnormalize($this->_normalized_value);
-        if (! $this->_multiple_selections) {
-            $unnormalized_value_choices = array($unnormalized_value_choices);
-        }
-        $pretty_strings = array();
-        foreach ((array) $unnormalized_value_choices as $unnormalized_value_choice) {
-            if (isset($options[ $unnormalized_value_choice ])) {
-                $pretty_strings[] = $options[ $unnormalized_value_choice ];
-            } else {
-                $pretty_strings[] = $this->normalized_value();
-            }
-        }
-        return implode(', ', $pretty_strings);
-    }
-
-
-
-    /**
-     * @return boolean
-     */
-    public function display_html_label_text()
-    {
-        return $this->_display_html_label_text;
-    }
-
-
-
-    /**
-     * @param boolean $display_html_label_text
-     */
-    public function set_display_html_label_text($display_html_label_text)
-    {
-        $this->_display_html_label_text = filter_var($display_html_label_text, FILTER_VALIDATE_BOOLEAN);
-    }
+	/**
+	 * array of available options to choose as an answer
+	 *
+	 * @var array
+	 */
+	protected $_options = array();
+
+	/**
+	 * whether to display the html_label_text above the checkbox/radio button options
+	 *
+	 * @var boolean
+	 */
+	protected $_display_html_label_text = true;
+
+	/**
+	 * whether to display an question option description as part of the input label
+	 *
+	 * @var boolean
+	 */
+	protected $_use_desc_in_label = true;
+
+	/**
+	 * strlen() result for the longest input value (what gets displayed in the label)
+	 * this is used to apply a css class to the input label
+	 *
+	 * @var int
+	 */
+	protected $_label_size = 0;
+
+	/**
+	 * whether to enforce the label size value passed in the constructor
+	 *
+	 * @var boolean
+	 */
+	protected $_enforce_label_size = false;
+
+	/**
+	 * whether to allow multiple selections (ie, the value of this input should be an array)
+	 * or not (ie, the value should be a simple int, string, etc)
+	 *
+	 * @var boolean
+	 */
+	protected $_multiple_selections = false;
+
+
+
+	/**
+	 * @param array     $answer_options
+	 * @param array     $input_settings {
+	 * @type int|string $label_size
+	 * @type boolean    $display_html_label_text
+	 *                                  }
+	 *                                  And all the options accepted by EE_Form_Input_Base
+	 */
+	public function __construct($answer_options = array(), $input_settings = array())
+	{
+		if (isset($input_settings['label_size'])) {
+			$this->_set_label_size($input_settings['label_size']);
+			if (isset($input_settings['enforce_label_size']) && $input_settings['enforce_label_size']) {
+				$this->_enforce_label_size = true;
+			}
+		}
+		if (isset($input_settings['display_html_label_text'])) {
+			$this->set_display_html_label_text($input_settings['display_html_label_text']);
+		}
+		$this->set_select_options($answer_options);
+		parent::__construct($input_settings);
+	}
+
+
+
+	/**
+	 * Sets the allowed options for this input. Also has the side-effect of
+	 * updating the normalization strategy to match the keys provided in the array
+	 *
+	 * @param array $answer_options
+	 * @return void  just has the side-effect of setting the options for this input
+	 */
+	public function set_select_options($answer_options = array())
+	{
+		$answer_options = is_array($answer_options) ? $answer_options : array($answer_options);
+		// get the first item in the select options and check it's type
+		$this->_options = reset($answer_options) instanceof EE_Question_Option
+			? $this->_process_question_options($answer_options)
+			: $answer_options;
+		// d( $this->_options );
+		$select_option_keys = array_keys($this->_options);
+		// attempt to determine data type for values in order to set normalization type
+		// purposefully only
+		if (
+			count($this->_options) === 2
+			&& (
+				(in_array(true, $select_option_keys, true) && in_array(false, $select_option_keys, true))
+				|| (in_array(1, $select_option_keys, true) && in_array(0, $select_option_keys, true))
+			)
+		) {
+			// values appear to be boolean, like TRUE, FALSE, 1, 0
+			$normalization = new EE_Boolean_Normalization();
+		} else {
+			// are ALL the options ints (even if we're using a multi-dimensional array)? If so use int validation
+			$all_ints = true;
+			array_walk_recursive(
+				$this->_options,
+				function ($value, $key) use (&$all_ints) {
+					// is this a top-level key? ignore it
+					if (
+						! is_array($value)
+						&& ! is_int($key)
+						&& $key !== ''
+						&& $key !== null
+					) {
+						$all_ints = false;
+					}
+				}
+			);
+			if ($all_ints) {
+				$normalization = new EE_Int_Normalization();
+			} else {
+				$normalization = new EE_Text_Normalization();
+			}
+		}
+		// does input type have multiple options ?
+		if ($this->_multiple_selections) {
+			$this->_set_normalization_strategy(new EE_Many_Valued_Normalization($normalization));
+		} else {
+			$this->_set_normalization_strategy($normalization);
+		}
+	}
+
+
+
+	/**
+	 * @return array
+	 */
+	public function options()
+	{
+		return $this->_options;
+	}
+
+
+
+	/**
+	 * Returns an array which is guaranteed to not be multidimensional
+	 *
+	 * @return array
+	 */
+	public function flat_options()
+	{
+		return $this->_flatten_select_options($this->options());
+	}
+
+
+
+	/**
+	 * Makes sure $arr is a flat array, not a multidimensional one
+	 *
+	 * @param array $arr
+	 * @return array
+	 */
+	protected function _flatten_select_options($arr)
+	{
+		$flat_array = array();
+		if (EEH_Array::is_multi_dimensional_array($arr)) {
+			foreach ($arr as $sub_array) {
+				foreach ((array) $sub_array as $key => $value) {
+					$flat_array[ $key ] = $value;
+					$this->_set_label_size($value);
+				}
+			}
+		} else {
+			foreach ($arr as $key => $value) {
+				$flat_array[ $key ] = $value;
+				$this->_set_label_size($value);
+			}
+		}
+		return $flat_array;
+	}
+
+
+
+	/**
+	 * @param EE_Question_Option[] $question_options_array
+	 * @return array
+	 */
+	protected function _process_question_options($question_options_array = array())
+	{
+		$flat_array = array();
+		foreach ($question_options_array as $question_option) {
+			if ($question_option instanceof EE_Question_Option) {
+				$desc = '';
+				if ($this->_use_desc_in_label) {
+					$desc = $question_option->desc();
+					$desc = ! empty($desc) ? '<span class="ee-question-option-desc">' . $desc . '</span>' : '';
+				}
+				$value = $question_option->value();
+				// add value even if it's empty
+				$flat_array[ $value ] = $value;
+				// if both value and desc are not empty, then separate with a dash
+				if (! empty($value) && ! empty($desc)) {
+					$flat_array[ $value ] .= ' - ' . $desc;
+				} else {
+					// otherwise, just add desc, since either or both of the vars is empty, and no dash is necessary
+					$flat_array[ $value ] .= $desc;
+				}
+			} elseif (is_array($question_option)) {
+				$flat_array += $this->_flatten_select_options($question_option);
+			}
+		}
+		return $flat_array;
+	}
+
+
+
+	/**
+	 *    set_label_sizes
+	 *
+	 * @return void
+	 */
+	public function set_label_sizes()
+	{
+		// did the input settings specifically say to NOT set the label size dynamically ?
+		if (! $this->_enforce_label_size) {
+			foreach ($this->_options as $option) {
+				// calculate the strlen of the label
+				$this->_set_label_size($option);
+			}
+		}
+	}
+
+
+
+	/**
+	 *    _set_label_size_class
+	 *
+	 * @param int|string $value
+	 * @return void
+	 */
+	private function _set_label_size($value = '')
+	{
+		// don't change label size if it has already been set and is being enforced
+		if ($this->_enforce_label_size && $this->_label_size >  0) {
+			return;
+		}
+		// determine length of option value
+		$val_size = is_int($value) ? $value : strlen($value);
+		// use new value if bigger than existing
+		$this->_label_size = $val_size > $this->_label_size ? $val_size : $this->_label_size;
+	}
+
+
+
+	/**
+	 *    get_label_size_class
+	 *
+	 * @return string
+	 */
+	public function get_label_size_class()
+	{
+		$size = ' medium-lbl';
+		// use maximum option value length to determine label size
+		if ($this->_label_size < 3) {
+			$size = ' nano-lbl';
+		} elseif ($this->_label_size < 6) {
+			$size = ' micro-lbl';
+		} elseif ($this->_label_size < 12) {
+			$size = ' tiny-lbl';
+		} elseif ($this->_label_size < 25) {
+			$size = ' small-lbl';
+		} elseif ($this->_label_size < 50) {
+			$size = ' medium-lbl';
+		} elseif ($this->_label_size >= 100) {
+			$size = ' big-lbl';
+		}
+		return $size;
+	}
+
+
+
+	/**
+	 * Returns the pretty value for the normalized value
+	 *
+	 * @return string
+	 */
+	public function pretty_value()
+	{
+		$options = $this->flat_options();
+		$unnormalized_value_choices = $this->get_normalization_strategy()->unnormalize($this->_normalized_value);
+		if (! $this->_multiple_selections) {
+			$unnormalized_value_choices = array($unnormalized_value_choices);
+		}
+		$pretty_strings = array();
+		foreach ((array) $unnormalized_value_choices as $unnormalized_value_choice) {
+			if (isset($options[ $unnormalized_value_choice ])) {
+				$pretty_strings[] = $options[ $unnormalized_value_choice ];
+			} else {
+				$pretty_strings[] = $this->normalized_value();
+			}
+		}
+		return implode(', ', $pretty_strings);
+	}
+
+
+
+	/**
+	 * @return boolean
+	 */
+	public function display_html_label_text()
+	{
+		return $this->_display_html_label_text;
+	}
+
+
+
+	/**
+	 * @param boolean $display_html_label_text
+	 */
+	public function set_display_html_label_text($display_html_label_text)
+	{
+		$this->_display_html_label_text = filter_var($display_html_label_text, FILTER_VALIDATE_BOOLEAN);
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -115,7 +115,7 @@ 
             $all_ints = true;
             array_walk_recursive(
                 $this->_options,
-                function ($value, $key) use (&$all_ints) {
+                function($value, $key) use (&$all_ints) {
                     // is this a top-level key? ignore it
                     if (
                         ! is_array($value)
@@ -177,13 +177,13 @@ 
         if (EEH_Array::is_multi_dimensional_array($arr)) {
             foreach ($arr as $sub_array) {
                 foreach ((array) $sub_array as $key => $value) {
-                    $flat_array[ $key ] = $value;
+                    $flat_array[$key] = $value;
                     $this->_set_label_size($value);
                 }
             }
         } else {
             foreach ($arr as $key => $value) {
-                $flat_array[ $key ] = $value;
+                $flat_array[$key] = $value;
                 $this->_set_label_size($value);
             }
         }
@@ -204,17 +204,17 @@ 
                 $desc = '';
                 if ($this->_use_desc_in_label) {
                     $desc = $question_option->desc();
-                    $desc = ! empty($desc) ? '<span class="ee-question-option-desc">' . $desc . '</span>' : '';
+                    $desc = ! empty($desc) ? '<span class="ee-question-option-desc">'.$desc.'</span>' : '';
                 }
                 $value = $question_option->value();
                 // add value even if it's empty
-                $flat_array[ $value ] = $value;
+                $flat_array[$value] = $value;
                 // if both value and desc are not empty, then separate with a dash
-                if (! empty($value) && ! empty($desc)) {
-                    $flat_array[ $value ] .= ' - ' . $desc;
+                if ( ! empty($value) && ! empty($desc)) {
+                    $flat_array[$value] .= ' - '.$desc;
                 } else {
                     // otherwise, just add desc, since either or both of the vars is empty, and no dash is necessary
-                    $flat_array[ $value ] .= $desc;
+                    $flat_array[$value] .= $desc;
                 }
             } elseif (is_array($question_option)) {
                 $flat_array += $this->_flatten_select_options($question_option);
@@ -233,7 +233,7 @@ 
     public function set_label_sizes()
     {
         // did the input settings specifically say to NOT set the label size dynamically ?
-        if (! $this->_enforce_label_size) {
+        if ( ! $this->_enforce_label_size) {
             foreach ($this->_options as $option) {
                 // calculate the strlen of the label
                 $this->_set_label_size($option);
@@ -252,7 +252,7 @@ 
     private function _set_label_size($value = '')
     {
         // don't change label size if it has already been set and is being enforced
-        if ($this->_enforce_label_size && $this->_label_size >  0) {
+        if ($this->_enforce_label_size && $this->_label_size > 0) {
             return;
         }
         // determine length of option value
@@ -299,13 +299,13 @@ 
     {
         $options = $this->flat_options();
         $unnormalized_value_choices = $this->get_normalization_strategy()->unnormalize($this->_normalized_value);
-        if (! $this->_multiple_selections) {
+        if ( ! $this->_multiple_selections) {
             $unnormalized_value_choices = array($unnormalized_value_choices);
         }
         $pretty_strings = array();
         foreach ((array) $unnormalized_value_choices as $unnormalized_value_choice) {
-            if (isset($options[ $unnormalized_value_choice ])) {
-                $pretty_strings[] = $options[ $unnormalized_value_choice ];
+            if (isset($options[$unnormalized_value_choice])) {
+                $pretty_strings[] = $options[$unnormalized_value_choice];
             } else {
                 $pretty_strings[] = $this->normalized_value();
             }

core/libraries/form_sections/strategies/display/EE_Text_Input_Display_Strategy.strategy.php

Indentation +46 added lines, -46 removed lines

@@ -14,59 +14,59 @@
  */
 class EE_Text_Input_Display_Strategy extends EE_Display_Strategy_Base
 {
-    /**
-     * The html "type" attribute value. default is "text"
-     * @var string
-     */
-    protected $_type;
+	/**
+	 * The html "type" attribute value. default is "text"
+	 * @var string
+	 */
+	protected $_type;
 
 
 
-    /**
-     * @param string $type
-     */
-    public function __construct($type = 'text')
-    {
-        $this->_type = $type;
-        parent::__construct();
-    }
+	/**
+	 * @param string $type
+	 */
+	public function __construct($type = 'text')
+	{
+		$this->_type = $type;
+		parent::__construct();
+	}
 
 
 
-    /**
-     * Gets the html "type" attribute's value
-     * @return string
-     */
-    public function get_type()
-    {
-        if (
-            $this->_type === 'email'
-            && ! apply_filters('FHEE__EE_Text_Input_Display_Strategy__use_html5_email', false)
-        ) {
-            return 'text';
-        }
-        return $this->_type;
-    }
+	/**
+	 * Gets the html "type" attribute's value
+	 * @return string
+	 */
+	public function get_type()
+	{
+		if (
+			$this->_type === 'email'
+			&& ! apply_filters('FHEE__EE_Text_Input_Display_Strategy__use_html5_email', false)
+		) {
+			return 'text';
+		}
+		return $this->_type;
+	}
 
 
 
-    /**
-     *
-     * @return string of html to display the field
-     */
-    public function display()
-    {
-        $input = '<input type="' . $this->get_type() . '"';
-        $input .= ' name="' . $this->_input->html_name() . '"';
-        $input .= ' id="' . $this->_input->html_id() . '"';
-        $class = $this->_input->required() ? $this->_input->required_css_class() . ' ' . $this->_input->html_class() : $this->_input->html_class();
-        $input .= ' class="' . $class . '"';
-        // add html5 required
-        $input .= $this->_input->required() ? ' required' : '';
-        $input .= ' value="' . $this->_input->raw_value_in_form() . '"';
-        $input .= ' style="' . $this->_input->html_style() . '"';
-        $input .= $this->_input->other_html_attributes();
-        $input .= '/>';
-        return $input;
-    }
+	/**
+	 *
+	 * @return string of html to display the field
+	 */
+	public function display()
+	{
+		$input = '<input type="' . $this->get_type() . '"';
+		$input .= ' name="' . $this->_input->html_name() . '"';
+		$input .= ' id="' . $this->_input->html_id() . '"';
+		$class = $this->_input->required() ? $this->_input->required_css_class() . ' ' . $this->_input->html_class() : $this->_input->html_class();
+		$input .= ' class="' . $class . '"';
+		// add html5 required
+		$input .= $this->_input->required() ? ' required' : '';
+		$input .= ' value="' . $this->_input->raw_value_in_form() . '"';
+		$input .= ' style="' . $this->_input->html_style() . '"';
+		$input .= $this->_input->other_html_attributes();
+		$input .= '/>';
+		return $input;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -56,15 +56,15 @@
      */
     public function display()
     {
-        $input = '<input type="' . $this->get_type() . '"';
-        $input .= ' name="' . $this->_input->html_name() . '"';
-        $input .= ' id="' . $this->_input->html_id() . '"';
-        $class = $this->_input->required() ? $this->_input->required_css_class() . ' ' . $this->_input->html_class() : $this->_input->html_class();
-        $input .= ' class="' . $class . '"';
+        $input = '<input type="'.$this->get_type().'"';
+        $input .= ' name="'.$this->_input->html_name().'"';
+        $input .= ' id="'.$this->_input->html_id().'"';
+        $class = $this->_input->required() ? $this->_input->required_css_class().' '.$this->_input->html_class() : $this->_input->html_class();
+        $input .= ' class="'.$class.'"';
         // add html5 required
         $input .= $this->_input->required() ? ' required' : '';
-        $input .= ' value="' . $this->_input->raw_value_in_form() . '"';
-        $input .= ' style="' . $this->_input->html_style() . '"';
+        $input .= ' value="'.$this->_input->raw_value_in_form().'"';
+        $input .= ' style="'.$this->_input->html_style().'"';
         $input .= $this->_input->other_html_attributes();
         $input .= '/>';
         return $input;

core/libraries/form_sections/strategies/sensitive_data_removal/EE_CCV_Sensitive_Data_Removal.strategy.php

Indentation +14 added lines, -14 removed lines

@@ -11,18 +11,18 @@
  */
 class EE_CCV_Sensitive_Data_Removal extends EE_Sensitive_Data_Removal_Base
 {
-    public function remove_sensitive_data($normalized_value)
-    {
-        // Get the ccv Length
-        $ccv_lenght = strlen($normalized_value);
-        // Replace all characters of credit card except the last four and dashes
-        for ($i = 0; $i < $ccv_lenght; $i++) {
-            if ($normalized_value[ $i ] == '-') {
-                continue;
-            }
-            $normalized_value[ $i ] = 'X';
-        }
-        // Return the masked Credit Card #
-        return $normalized_value;
-    }
+	public function remove_sensitive_data($normalized_value)
+	{
+		// Get the ccv Length
+		$ccv_lenght = strlen($normalized_value);
+		// Replace all characters of credit card except the last four and dashes
+		for ($i = 0; $i < $ccv_lenght; $i++) {
+			if ($normalized_value[ $i ] == '-') {
+				continue;
+			}
+			$normalized_value[ $i ] = 'X';
+		}
+		// Return the masked Credit Card #
+		return $normalized_value;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -17,10 +17,10 @@
         $ccv_lenght = strlen($normalized_value);
         // Replace all characters of credit card except the last four and dashes
         for ($i = 0; $i < $ccv_lenght; $i++) {
-            if ($normalized_value[ $i ] == '-') {
+            if ($normalized_value[$i] == '-') {
                 continue;
             }
-            $normalized_value[ $i ] = 'X';
+            $normalized_value[$i] = 'X';
         }
         // Return the masked Credit Card #
         return $normalized_value;