eventespresso / event-espresso-core

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

Spacing +6 added lines, -6 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 /**
  *
  * Class EE_Checkbox_Multi_Input
@@ -11,16 +11,16 @@ 
  * @since 				$VID:$
  *
  */
-class EE_Checkbox_Multi_Input extends EE_Form_Input_With_Options_Base{
+class EE_Checkbox_Multi_Input extends EE_Form_Input_With_Options_Base {
 
 	/**
 	 * @param array $input_settings
 	 * @param array | EE_Question_Option[] $answer_options
 	 */
-	public function __construct( $answer_options, $input_settings = array() ) {
-		$this->_set_display_strategy( new EE_Checkbox_Display_Strategy() );
-		$this->_add_validation_strategy( new EE_Many_Valued_Validation_Strategy( array( new EE_Enum_Validation_Strategy( isset( $input_settings[ 'validation_error_message' ] ) ? $input_settings[ 'validation_error_message' ] : NULL ) )));
+	public function __construct($answer_options, $input_settings = array()) {
+		$this->_set_display_strategy(new EE_Checkbox_Display_Strategy());
+		$this->_add_validation_strategy(new EE_Many_Valued_Validation_Strategy(array(new EE_Enum_Validation_Strategy(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : NULL))));
 		$this->_multiple_selections = TRUE;
-		parent::__construct( $answer_options, $input_settings );
+		parent::__construct($answer_options, $input_settings);
 	}
 }
\ No newline at end of file

core/libraries/form_sections/inputs/EE_Country_Select_Input.php

Spacing +12 added lines, -12 removed lines

@@ -1,4 +1,4 @@ 
-<?php  if ( ! defined( 'EVENT_ESPRESSO_VERSION' )) { exit( 'No direct script access allowed' ); }
+<?php  if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 /**
  * Class EE_Country_Select_Input
  *
@@ -11,20 +11,20 @@ 
  * @since 				$VID:$
  *
  */
-class EE_Country_Select_Input extends EE_Select_Input{
+class EE_Country_Select_Input extends EE_Select_Input {
 
 	/**
 	 * @param array $country_options
 	 * @param array $input_settings
 	 * @return EE_Country_Select_Input
 	 */
-	public function __construct( $country_options = NULL, $input_settings = array() ){
+	public function __construct($country_options = NULL, $input_settings = array()) {
 		$country_options = apply_filters(
 			'FHEE__EE_Country_Select_Input____construct__country_options',
-			$this->get_country_answer_options( $country_options ),
+			$this->get_country_answer_options($country_options),
 			$this
 		);
-		parent::__construct( $country_options, $input_settings );
+		parent::__construct($country_options, $input_settings);
 	}
 
 
@@ -35,16 +35,16 @@ 
 	 * @param array $country_options
 	 * @return array
 	 */
-	public function get_country_answer_options( $country_options = NULL ){
+	public function get_country_answer_options($country_options = NULL) {
 		// if passed something that is NOT an array
-		if ( ! is_array( $country_options )) {
+		if ( ! is_array($country_options)) {
 			// get possibly cached list of countries
 			$countries = EEM_Country::instance()->get_all_active_countries();
-			if ( ! empty( $countries )) {
-				$country_options[ '' ] = '';
-				foreach( $countries as $country ){
-					if ( $country instanceof EE_Country ) {
-						$country_options[ $country->ID() ] = $country->name();
+			if ( ! empty($countries)) {
+				$country_options[''] = '';
+				foreach ($countries as $country) {
+					if ($country instanceof EE_Country) {
+						$country_options[$country->ID()] = $country->name();
 					}
 				}
 			} else {

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

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -24,14 +24,14 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_Credit_Card_Month_Input extends EE_Month_Input{
+class EE_Credit_Card_Month_Input extends EE_Month_Input {
 
 	/**
 	 * @param bool  $leading_zero
 	 * @param array $input_settings
 	 */
-	function __construct( $leading_zero = false, $input_settings = array()){
-		$this->set_sensitive_data_removal_strategy( new EE_All_Sensitive_Data_Removal() );
-		parent::__construct($leading_zero,$input_settings);
+	function __construct($leading_zero = false, $input_settings = array()) {
+		$this->set_sensitive_data_removal_strategy(new EE_All_Sensitive_Data_Removal());
+		parent::__construct($leading_zero, $input_settings);
 	}
 }
\ No newline at end of file

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 
 /**
  * Event Espresso

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

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -9,7 +9,7 @@ 
  * @subpackage
  * @author				Mike Nelson
  */
-class EE_Credit_Card_Year_Input extends EE_Year_Input{
+class EE_Credit_Card_Year_Input extends EE_Year_Input {
 
 	/**
 	 * @param array $input_settings
@@ -17,8 +17,8 @@ 
 	 * @param int   $years_behind
 	 * @param int   $years_ahead
 	 */
-	function __construct( $input_settings = array(), $four_digit_year = true, $years_behind = 0, $years_ahead = 15 ){
-		$this->set_sensitive_data_removal_strategy( new EE_All_Sensitive_Data_Removal() );
-		parent::__construct( $input_settings, $four_digit_year, $years_behind, $years_ahead );
+	function __construct($input_settings = array(), $four_digit_year = true, $years_behind = 0, $years_ahead = 15) {
+		$this->set_sensitive_data_removal_strategy(new EE_All_Sensitive_Data_Removal());
+		parent::__construct($input_settings, $four_digit_year, $years_behind, $years_ahead);
 	}
 }

Braces +2 added lines, -1 removed lines

@@ -1,6 +1,7 @@
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 
 /**
  * EE_Credit_Card_Year_Input

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

Spacing +7 added lines, -7 removed lines

@@ -8,24 +8,24 @@
  * @author				Mike Nelson
  *
  */
-class EE_Currency_Input extends EE_Select_Input{
+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
 	 */
-	function __construct( $only_specific_currency_codes = array(), $input_settings = array()){
+	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);
+		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){
+		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);
+		parent::__construct($country_options, 'int', $input_settings);
 	}
 }
\ No newline at end of file

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

Spacing +4 added lines, -4 removed lines

@@ -6,16 +6,16 @@
  * @subpackage
  * @author				Mike Nelson
  */
-class EE_Email_Input extends EE_Form_Input_Base{
+class EE_Email_Input extends EE_Form_Input_Base {
 
 	/**
 	 * @param array $input_settings
 	 */
-	function __construct($input_settings = array()){
+	function __construct($input_settings = array()) {
 		$this->_set_display_strategy(new EE_Text_Input_Display_Strategy('email'));
 		$this->_set_normalization_strategy(new EE_Text_Normalization());
-		$this->_add_validation_strategy(new EE_Email_Validation_Strategy( isset( $input_settings[ 'validation_error_message' ] ) ? $input_settings[ 'validation_error_message' ] : NULL ) );
+		$this->_add_validation_strategy(new EE_Email_Validation_Strategy(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : NULL));
 		parent::__construct($input_settings);
-		$this->set_html_class( $this->html_class() . ' email' );
+		$this->set_html_class($this->html_class().' email');
 	}
 }
\ No newline at end of file

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

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
  * @subpackage
  * @author				Brent Christensen
  */
-class EE_Fixed_Hidden_Input extends EE_Hidden_Input{
+class EE_Fixed_Hidden_Input extends EE_Hidden_Input {
 
 
 	/**
@@ -17,7 +17,7 @@ 
 	 * @param array $req_data like $_POST
 	 * @return boolean whether or not there was an error
 	 */
-	protected function _normalize( $req_data ) {
+	protected function _normalize($req_data) {
 	}
 
 

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

Braces +10 added lines, -10 removed lines

@@ -200,7 +200,7 @@ 
 		if( ! $this->_html_name){
 			if( $this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper){
 				$this->_html_name = $this->_parent_section->html_name_prefix() . "[{$this->name()}]";
-			}else{
+			} else{
 				$this->_html_name = $this->name();
 			}
 		}
@@ -230,7 +230,7 @@ 
 	protected function _get_display_strategy(){
 		if( ! $this->_display_strategy || ! $this->_display_strategy instanceof EE_Display_Strategy_Base){
 			throw new EE_Error(sprintf(__("Cannot get display strategy for form input with name %s and id %s, because it has not been set in the constructor", "event_espresso"),$this->html_name(),$this->html_id()));
-		}else{
+		} else{
 			return $this->_display_strategy;
 		}
 	}
@@ -306,7 +306,7 @@ 
 	public function get_validation_strategies(){
 		if(is_array($this->_validation_strategies)){
 			return $this->_validation_strategies;
-		}else{
+		} else{
 			return array();
 		}
 
@@ -413,7 +413,7 @@ 
 				if ( $validation_strategy instanceof EE_Validation_Strategy_Base ) {
 					try{
 						$validation_strategy->validate($this->normalized_value());
-					}catch(EE_Validation_Error $e){
+					} catch(EE_Validation_Error $e){
 						$this->add_validation_error($e);
 					}
 				}
@@ -421,7 +421,7 @@ 
 		}
 		if( $this->get_validation_errors()){
 			return false;
-		}else{
+		} else{
 			return true;
 		}
 	}
@@ -602,7 +602,7 @@ 
 
 		if(! empty($jquery_validation_rules)){
 			$jquery_validation_js[ $this->html_id( TRUE ) ] = $jquery_validation_rules;
-		}else{
+		} else{
 			return array();
 		}
 		return $jquery_validation_js;
@@ -769,7 +769,7 @@ 
 		if( isset( $matches[ 1 ] ) && is_array( $matches[ 1 ] ) ){
 			$name_parts = $matches[ 1 ];
 			array_unshift($name_parts, $before_any_brackets);
-		}else{
+		} else{
 			$name_parts = array( $before_any_brackets );
 		}
 		// now get the value for the input
@@ -796,10 +796,10 @@ 
 		if( isset( $req_data[ $first_part_to_consider ] ) ){
 			if( empty($html_name_parts ) ){
 				return $req_data[ $first_part_to_consider ];
-			}else{
+			} else{
 				return $this->_find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data[ $first_part_to_consider ] );
 			}
-		}else{
+		} else{
 			return NULL;
 		}
 	}
@@ -818,7 +818,7 @@ 
 		$checked_value = $this->find_form_data_for_this_section( $req_data );
 		if( $checked_value !== null ){
 			return TRUE;
-		}else{
+		} else{
 			return FALSE;
 		}
 	}

Spacing +126 added lines, -126 removed lines

@@ -8,7 +8,7 @@ 
  * @subpackage
  * @author				Mike Nelson
  */
-abstract class EE_Form_Input_Base extends EE_Form_Section_Validatable{
+abstract class EE_Form_Input_Base extends EE_Form_Section_Validatable {
 
 	/**
 	 * the input's name attribute
@@ -141,7 +141,7 @@ 
 	 *		@type EE_Validation_Strategy_Base[] $validation_strategies
 	 * }
 	 */
-	public function __construct( $input_args = array() ){
+	public function __construct($input_args = array()) {
 		// the following properties must be cast as arrays
 		$set_as_array = array(
 			'display_strategy',
@@ -150,60 +150,60 @@ 
 			'validation_strategies'
 		);
 		// loop thru incoming options
-		foreach( $input_args as $key => $value ) {
+		foreach ($input_args as $key => $value) {
 			// add underscore to $key to match property names
-			$_key = '_' . $key;
-			if ( property_exists( $this, $_key )) {
+			$_key = '_'.$key;
+			if (property_exists($this, $_key)) {
 				// first check if this property needs to be set as an array
-				if ( isset( $set_as_array[ $key ] )) {
+				if (isset($set_as_array[$key])) {
 					// ensure value is an array
-					$value = is_array( $value ) ? $value : array( $value );
+					$value = is_array($value) ? $value : array($value);
 					// and merge with existing values
-					$this->$_key = array_merge( $this->$_key, $value );
+					$this->$_key = array_merge($this->$_key, $value);
 				} else {
 					$this->$_key = $value;
 				}
 			}
 		}
 		// ensure that "required" is set correctly
-		$this->set_required( $this->_required, isset( $input_args[ 'required_validation_error_message' ] ) ? $input_args[ 'required_validation_error_message' ] : NULL );
+		$this->set_required($this->_required, isset($input_args['required_validation_error_message']) ? $input_args['required_validation_error_message'] : NULL);
 
-		$this->_html_name_specified = isset( $input_args['html_name'] ) ? TRUE : FALSE;
+		$this->_html_name_specified = isset($input_args['html_name']) ? TRUE : FALSE;
 
 		$this->_display_strategy->_construct_finalize($this);
 
-		if ( $this->_validation_strategies ){
-			foreach( $this->_validation_strategies as $validation_strategy ){
+		if ($this->_validation_strategies) {
+			foreach ($this->_validation_strategies as $validation_strategy) {
 				$validation_strategy->_construct_finalize($this);
 			}
 		}
 
-		if( ! $this->_normalization_strategy){
+		if ( ! $this->_normalization_strategy) {
 			$this->_normalization_strategy = new EE_Text_Normalization();
 		}
 		$this->_normalization_strategy->_construct_finalize($this);
 
 		//at least we can use the normalization strategy to populate the default
-		if( isset( $input_args[ 'default' ] ) ) {
-			$this->set_default( $input_args[ 'default' ] );
+		if (isset($input_args['default'])) {
+			$this->set_default($input_args['default']);
 		}
 
-		if( ! $this->_sensitive_data_removal_strategy){
+		if ( ! $this->_sensitive_data_removal_strategy) {
 			$this->_sensitive_data_removal_strategy = new EE_No_Sensitive_Data_Removal();
 		}
 		$this->_sensitive_data_removal_strategy->_construct_finalize($this);
-		parent::__construct( $input_args );
+		parent::__construct($input_args);
 	}
 
 	/**
 	 * Sets the html_name to its default value, if none was specified in teh constructor.
 	 * Calculation involves using the name and the parent's html_name
 	 */
-	protected function _set_default_html_name_if_empty(){
-		if( ! $this->_html_name){
-			if( $this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper){
-				$this->_html_name = $this->_parent_section->html_name_prefix() . "[{$this->name()}]";
-			}else{
+	protected function _set_default_html_name_if_empty() {
+		if ( ! $this->_html_name) {
+			if ($this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper) {
+				$this->_html_name = $this->_parent_section->html_name_prefix()."[{$this->name()}]";
+			} else {
 				$this->_html_name = $this->name();
 			}
 		}
@@ -218,9 +218,9 @@ 
 	function _construct_finalize($parent_form_section, $name) {
 		parent::_construct_finalize($parent_form_section, $name);
 		$this->_set_default_html_name_if_empty();
-		if( ! $this->_html_label ){
-			if( ! $this->_html_label_text){
-				$this->_html_label_text = ucwords( str_replace("_"," ",$name));
+		if ( ! $this->_html_label) {
+			if ( ! $this->_html_label_text) {
+				$this->_html_label_text = ucwords(str_replace("_", " ", $name));
 			}
 		}
 	}
@@ -230,10 +230,10 @@ 
 	  * @return EE_Display_Strategy_Base
 	  * @throws EE_Error
 	  */
-	protected function _get_display_strategy(){
-		if( ! $this->_display_strategy || ! $this->_display_strategy instanceof EE_Display_Strategy_Base){
-			throw new EE_Error(sprintf(__("Cannot get display strategy for form input with name %s and id %s, because it has not been set in the constructor", "event_espresso"),$this->html_name(),$this->html_id()));
-		}else{
+	protected function _get_display_strategy() {
+		if ( ! $this->_display_strategy || ! $this->_display_strategy instanceof EE_Display_Strategy_Base) {
+			throw new EE_Error(sprintf(__("Cannot get display strategy for form input with name %s and id %s, because it has not been set in the constructor", "event_espresso"), $this->html_name(), $this->html_id()));
+		} else {
 			return $this->_display_strategy;
 		}
 	}
@@ -241,7 +241,7 @@ 
 	 * Sets the display strategy.
 	 * @param EE_Display_Strategy_Base $strategy
 	 */
-	protected function _set_display_strategy(EE_Display_Strategy_Base $strategy){
+	protected function _set_display_strategy(EE_Display_Strategy_Base $strategy) {
 		$this->_display_strategy = $strategy;
 	}
 
@@ -249,7 +249,7 @@ 
 	 * Sets the sanitization strategy
 	 * @param EE_Normalization_Strategy_Base $strategy
 	 */
-	protected function _set_normalization_strategy(EE_Normalization_Strategy_Base $strategy){
+	protected function _set_normalization_strategy(EE_Normalization_Strategy_Base $strategy) {
 		$this->_normalization_strategy = $strategy;
 	}
 
@@ -275,14 +275,14 @@ 
 	 * Gets the display strategy for this input
 	 * @return EE_Display_Strategy_Base
 	 */
-	public function get_display_strategy(){
+	public function get_display_strategy() {
 		return $this->_display_strategy;
 	}
 	/**
 	 * Overwrites the display strategy
 	 * @param EE_Display_Strategy_Base $display_strategy
 	 */
-	public function set_display_strategy($display_strategy){
+	public function set_display_strategy($display_strategy) {
 		$this->_display_strategy = $display_strategy;
 		$this->_display_strategy->_construct_finalize($this);
 	}
@@ -290,14 +290,14 @@ 
 	 * Gets the normalization strategy set on this input
 	 * @return EE_Normalization_Strategy_Base
 	 */
-	public function get_normalization_strategy(){
+	public function get_normalization_strategy() {
 		return $this->_normalization_strategy;
 	}
 	/**
 	 * Overwrites the normalization strategy
 	 * @param EE_Normalization_Strategy_Base $normalization_strategy
 	 */
-	public function set_normalization_strategy($normalization_strategy){
+	public function set_normalization_strategy($normalization_strategy) {
 		$this->_normalization_strategy = $normalization_strategy;
 		$this->_normalization_strategy->_construct_finalize($this);
 	}
@@ -306,10 +306,10 @@ 
 	 * Returns all teh validation strategies which apply to this field, numerically indexed
 	 * @return EE_Validation_Strategy_Base[]
 	 */
-	public function get_validation_strategies(){
-		if(is_array($this->_validation_strategies)){
+	public function get_validation_strategies() {
+		if (is_array($this->_validation_strategies)) {
 			return $this->_validation_strategies;
-		}else{
+		} else {
 			return array();
 		}
 
@@ -319,15 +319,15 @@ 
 	 * @param EE_Validation_Strategy_Base $validation_strategy
 	 * @return void
 	 */
-	protected function _add_validation_strategy( EE_Validation_Strategy_Base $validation_strategy ){
-		$this->_validation_strategies[ get_class($validation_strategy) ] = $validation_strategy;
+	protected function _add_validation_strategy(EE_Validation_Strategy_Base $validation_strategy) {
+		$this->_validation_strategies[get_class($validation_strategy)] = $validation_strategy;
 	}
 	/**
 	 * Gets the HTML, JS, and CSS necessary to display this field according
 	 * to the parent form's layout strategy
 	 * @return string
 	 */
-	public function get_html_and_js(){
+	public function get_html_and_js() {
 		return $this->_parent_section->get_html_for_input($this);
 	}
 	/**
@@ -336,7 +336,7 @@ 
 	 * Makes sure the JS and CSS are enqueued for it
 	 * @return string
 	 */
-	public function get_html_for_input(){
+	public function get_html_for_input() {
 		return  $this->_get_display_strategy()->display();
 	}
 
@@ -346,7 +346,7 @@ 
 	 * @return string
 	 */
 	public function html_other_attributes() {
-		return ! empty( $this->_html_other_attributes ) ? ' ' . $this->_html_other_attributes : '';
+		return ! empty($this->_html_other_attributes) ? ' '.$this->_html_other_attributes : '';
 	}
 
 
@@ -354,7 +354,7 @@ 
 	/**
 	 * @param string $html_other_attributes
 	 */
-	public function set_html_other_attributes( $html_other_attributes ) {
+	public function set_html_other_attributes($html_other_attributes) {
 		$this->_html_other_attributes = $html_other_attributes;
 	}
 
@@ -363,7 +363,7 @@ 
 	 * according to the form section's layout strategy
 	 * @return string
 	 */
-	public function get_html_for_label(){
+	public function get_html_for_label() {
 		return $this->_parent_section->get_layout_strategy()->display_label($this);
 	}
 	/**
@@ -371,7 +371,7 @@ 
 	 * according to the form section's layout strategy
 	 * @return string
 	 */
-	public function get_html_for_errors(){
+	public function get_html_for_errors() {
 		return $this->_parent_section->get_layout_strategy()->display_errors($this);
 	}
 	/**
@@ -379,7 +379,7 @@ 
 	 * according to the form section's layout strategy
 	 * @return string
 	 */
-	public function get_html_for_help(){
+	public function get_html_for_help() {
 		return $this->_parent_section->get_layout_strategy()->display_help_text($this);
 	}
 	/**
@@ -388,20 +388,20 @@ 
 	 * @return boolean
 	 */
 	protected function _validate() {
-		if(is_array($this->_validation_strategies)){
-			foreach($this->_validation_strategies as $validation_strategy){
-				if ( $validation_strategy instanceof EE_Validation_Strategy_Base ) {
-					try{
+		if (is_array($this->_validation_strategies)) {
+			foreach ($this->_validation_strategies as $validation_strategy) {
+				if ($validation_strategy instanceof EE_Validation_Strategy_Base) {
+					try {
 						$validation_strategy->validate($this->normalized_value());
-					}catch(EE_Validation_Error $e){
+					} catch (EE_Validation_Error $e) {
 						$this->add_validation_error($e);
 					}
 				}
 			}
 		}
-		if( $this->get_validation_errors()){
+		if ($this->get_validation_errors()) {
 			return false;
-		}else{
+		} else {
 			return true;
 		}
 	}
@@ -414,8 +414,8 @@ 
 	 * @param string $value
 	 * @return null|string
 	 */
-	private function _sanitize($value){
-		return $value !== NULL ?stripslashes(html_entity_decode($value)) : NULL;//don't sanitize_text_field
+	private function _sanitize($value) {
+		return $value !== NULL ?stripslashes(html_entity_decode($value)) : NULL; //don't sanitize_text_field
 	}
 
 
@@ -427,24 +427,24 @@ 
 	 * @param array $req_data like $_POST
 	 * @return boolean whether or not there was an error
 	 */
-	protected function _normalize( $req_data ) {
+	protected function _normalize($req_data) {
 		//any existing validation errors don't apply so clear them
 		$this->_validation_errors = array();
 		try {
-			$raw_input = $this->find_form_data_for_this_section( $req_data );
+			$raw_input = $this->find_form_data_for_this_section($req_data);
 			//super simple sanitization for now
-			if ( is_array( $raw_input )) {
+			if (is_array($raw_input)) {
 				$this->_raw_value = array();
-				foreach( $raw_input as $key => $value ) {
-					$this->_raw_value[ $key ] = $this->_sanitize( $value );
+				foreach ($raw_input as $key => $value) {
+					$this->_raw_value[$key] = $this->_sanitize($value);
 				}
 			} else {
-				$this->_raw_value = $this->_sanitize( $raw_input );
+				$this->_raw_value = $this->_sanitize($raw_input);
 			}
 			//we want ot mostly leave the input alone in case we need to re-display it to the user
-			$this->_normalized_value = $this->_normalization_strategy->normalize( $this->raw_value() );
-		} catch ( EE_Validation_Error $e ) {
-			$this->add_validation_error( $e );
+			$this->_normalized_value = $this->_normalization_strategy->normalize($this->raw_value());
+		} catch (EE_Validation_Error $e) {
+			$this->add_validation_error($e);
 		}
 	}
 
@@ -453,7 +453,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_name(){
+	public function html_name() {
 		return $this->_html_name;
 	}
 
@@ -462,8 +462,8 @@ 
 	/**
 	 * @return string
 	 */
-	function html_label_id(){
-		return ! empty( $this->_html_label_id ) ? $this->_html_label_id : $this->_html_id . '-lbl';
+	function html_label_id() {
+		return ! empty($this->_html_label_id) ? $this->_html_label_id : $this->_html_id.'-lbl';
 	}
 
 
@@ -471,7 +471,7 @@ 
 	/**
 	 * @return string
 	 */
-	function html_label_class(){
+	function html_label_class() {
 		return $this->_html_label_class;
 	}
 
@@ -480,7 +480,7 @@ 
 	/**
 	 * @return string
 	 */
-	function html_label_style(){
+	function html_label_style() {
 		return $this->_html_label_style;
 	}
 
@@ -489,7 +489,7 @@ 
 	/**
 	 * @return string
 	 */
-	function html_label_text(){
+	function html_label_text() {
 		return $this->_html_label_text;
 	}
 
@@ -498,7 +498,7 @@ 
 	/**
 	 * @return string
 	 */
-	function html_help_text(){
+	function html_help_text() {
 		return $this->_html_help_text;
 	}
 
@@ -507,7 +507,7 @@ 
 	/**
 	 * @return string
 	 */
-	function html_help_class(){
+	function html_help_class() {
 		return $this->_html_help_class;
 	}
 
@@ -516,7 +516,7 @@ 
 	/**
 	 * @return string
 	 */
-	function html_help_style(){
+	function html_help_style() {
 		return $this->_html_style;
 	}
 	/**
@@ -529,7 +529,7 @@ 
 	 * in which case, we would have stored the malicious content to our database.
 	 * @return string
 	 */
-	function raw_value(){
+	function raw_value() {
 		return $this->_raw_value;
 	}
 	/**
@@ -537,15 +537,15 @@ 
 	 * it escapes all html entities
 	 * @return string
 	 */
-	function raw_value_in_form(){
-		return htmlentities($this->raw_value(),ENT_QUOTES, 'UTF-8');
+	function raw_value_in_form() {
+		return htmlentities($this->raw_value(), ENT_QUOTES, 'UTF-8');
 	}
 	/**
 	 * returns the value after it's been sanitized, and then converted into it's proper type
 	 * in PHP. Eg, a string, an int, an array,
 	 * @return mixed
 	 */
-	function normalized_value(){
+	function normalized_value() {
 		return $this->_normalized_value;
 	}
 
@@ -555,7 +555,7 @@ 
 	 * the best thing to display
 	 * @return string
 	 */
-	function pretty_value(){
+	function pretty_value() {
 		return $this->_normalized_value;
 	}
 	/**
@@ -574,15 +574,15 @@ 
 		  }</code>
 	 * @return array
 	 */
-	function get_jquery_validation_rules(){
+	function get_jquery_validation_rules() {
 		$jquery_validation_rules = array();
-		foreach($this->get_validation_strategies() as $validation_strategy){
-			$jquery_validation_rules = array_replace_recursive( $jquery_validation_rules, $validation_strategy->get_jquery_validation_rule_array());
+		foreach ($this->get_validation_strategies() as $validation_strategy) {
+			$jquery_validation_rules = array_replace_recursive($jquery_validation_rules, $validation_strategy->get_jquery_validation_rule_array());
 		}
 
-		if(! empty($jquery_validation_rules)){
-			$jquery_validation_js[ $this->html_id( TRUE ) ] = $jquery_validation_rules;
-		}else{
+		if ( ! empty($jquery_validation_rules)) {
+			$jquery_validation_js[$this->html_id(TRUE)] = $jquery_validation_rules;
+		} else {
 			return array();
 		}
 		return $jquery_validation_js;
@@ -594,9 +594,9 @@ 
 	 * @param mixed $value
 	 * @return void
 	 */
-	function set_default($value){
+	function set_default($value) {
 		$this->_normalized_value = $value;
-		$this->_raw_value = $this->_normalization_strategy->unnormalize( $value );
+		$this->_raw_value = $this->_normalization_strategy->unnormalize($value);
 	}
 
 	/**
@@ -604,7 +604,7 @@ 
 	 * @param string $label
 	 * @return void
 	 */
-	function set_html_label_text($label){
+	function set_html_label_text($label) {
 		$this->_html_label_text = $label;
 	}
 
@@ -616,12 +616,12 @@ 
 	 * @param boolean $required
 	 * @param null    $required_text
 	 */
-	function set_required($required = true, $required_text = NULL ){
-		$required = filter_var( $required, FILTER_VALIDATE_BOOLEAN );
-		if ( $required ) {
-			$this->_add_validation_strategy( new EE_Required_Validation_Strategy( $required_text ) );
+	function set_required($required = true, $required_text = NULL) {
+		$required = filter_var($required, FILTER_VALIDATE_BOOLEAN);
+		if ($required) {
+			$this->_add_validation_strategy(new EE_Required_Validation_Strategy($required_text));
 		} else {
-			unset( $this->_validation_strategies[ get_class( new EE_Required_Validation_Strategy() ) ] );
+			unset($this->_validation_strategies[get_class(new EE_Required_Validation_Strategy())]);
 		}
 		$this->_required = $required;
 	}
@@ -629,7 +629,7 @@ 
 	 * Returns whether or not this field is required
 	 * @return boolean
 	 */
-	public function required(){
+	public function required() {
 		return $this->_required;
 	}
 
@@ -638,7 +638,7 @@ 
 	/**
 	 * @param string $required_css_class
 	 */
-	public function set_required_css_class( $required_css_class ) {
+	public function set_required_css_class($required_css_class) {
 		$this->_required_css_class = $required_css_class;
 	}
 
@@ -657,7 +657,7 @@ 
 	 * Sets the help text, in case
 	 * @param string $text
 	 */
-	public function set_html_help_text($text){
+	public function set_html_help_text($text) {
 		$this->_html_help_text = $text;
 	}
 	/**
@@ -669,8 +669,8 @@ 
 	public function clean_sensitive_data() {
 		//if we do ANY kind of sensitive data removal on this, then just clear out the raw value
 		//if we need more logic than this we'll make a strategy for it
-		if( $this->_sensitive_data_removal_strategy &&
-				! $this->_sensitive_data_removal_strategy instanceof EE_No_Sensitive_Data_Removal ){
+		if ($this->_sensitive_data_removal_strategy &&
+				! $this->_sensitive_data_removal_strategy instanceof EE_No_Sensitive_Data_Removal) {
 			$this->_raw_value = NULL;
 		}
 		//and clean the normalized value according to the appropriate strategy
@@ -684,10 +684,10 @@ 
 	 * @param string $button_size
 	 * @param string $other_attributes
 	 */
-	public function set_button_css_attributes( $primary = TRUE, $button_size = '', $other_attributes = '' ) {
+	public function set_button_css_attributes($primary = TRUE, $button_size = '', $other_attributes = '') {
 		$button_css_attributes = 'button';
 		$button_css_attributes .= $primary === TRUE ? ' button-primary' : ' button-secondary';
-		switch ( $button_size ) {
+		switch ($button_size) {
 			case 'xs' :
 			case 'extra-small' :
 				$button_css_attributes .= ' button-xs';
@@ -708,7 +708,7 @@ 
 			default :
 				$button_css_attributes .= '';
 		}
-		$this->_button_css_attributes .= ! empty( $other_attributes ) ? $button_css_attributes . ' ' . $other_attributes : $button_css_attributes;
+		$this->_button_css_attributes .= ! empty($other_attributes) ? $button_css_attributes.' '.$other_attributes : $button_css_attributes;
 	}
 
 
@@ -717,7 +717,7 @@ 
 	 * @return string
 	 */
 	public function button_css_attributes() {
-		if ( empty( $this->_button_css_attributes )) {
+		if (empty($this->_button_css_attributes)) {
 			$this->set_button_css_attributes();
 		}
 		return $this->_button_css_attributes;
@@ -737,27 +737,27 @@ 
 	 * @param array $req_data
 	 * @return mixed whatever the raw value of this form section is in the request data
 	 */
-	public function find_form_data_for_this_section( $req_data ){
+	public function find_form_data_for_this_section($req_data) {
 		// break up the html name by "[]"
-		if ( strpos( $this->html_name(), '[' ) !== FALSE ) {
-			$before_any_brackets = substr( $this->html_name(), 0, strpos($this->html_name(), '[') );
+		if (strpos($this->html_name(), '[') !== FALSE) {
+			$before_any_brackets = substr($this->html_name(), 0, strpos($this->html_name(), '['));
 		} else {
 			$before_any_brackets = $this->html_name();
 		}
 		// grab all of the segments
-		preg_match_all('~\[([^]]*)\]~',$this->html_name(), $matches);
-		if( isset( $matches[ 1 ] ) && is_array( $matches[ 1 ] ) ){
-			$name_parts = $matches[ 1 ];
+		preg_match_all('~\[([^]]*)\]~', $this->html_name(), $matches);
+		if (isset($matches[1]) && is_array($matches[1])) {
+			$name_parts = $matches[1];
 			array_unshift($name_parts, $before_any_brackets);
-		}else{
-			$name_parts = array( $before_any_brackets );
+		} else {
+			$name_parts = array($before_any_brackets);
 		}
 		// now get the value for the input
 		$value = $this->_find_form_data_for_this_section_using_name_parts($name_parts, $req_data);
-		if( $value === NULL ){
+		if ($value === NULL) {
 			//check if this thing's name is at the TOP level of the request data
-			if( isset( $req_data[ $this->name() ] ) ){
-				$value = $req_data[ $this->name() ];
+			if (isset($req_data[$this->name()])) {
+				$value = $req_data[$this->name()];
 			}
 		}
 		return $value;
@@ -771,15 +771,15 @@ 
 	 * @param array $req_data
 	 * @return array | NULL
 	 */
-	public function _find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data){
-		$first_part_to_consider = array_shift( $html_name_parts );
-		if( isset( $req_data[ $first_part_to_consider ] ) ){
-			if( empty($html_name_parts ) ){
-				return $req_data[ $first_part_to_consider ];
-			}else{
-				return $this->_find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data[ $first_part_to_consider ] );
+	public function _find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data) {
+		$first_part_to_consider = array_shift($html_name_parts);
+		if (isset($req_data[$first_part_to_consider])) {
+			if (empty($html_name_parts)) {
+				return $req_data[$first_part_to_consider];
+			} else {
+				return $this->_find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data[$first_part_to_consider]);
 			}
-		}else{
+		} else {
 			return NULL;
 		}
 	}
@@ -791,14 +791,14 @@ 
 	 * @param array $req_data like $_POST
 	 * @return boolean
 	 */
-	public function form_data_present_in($req_data = NULL){
-		if( $req_data === NULL ){
+	public function form_data_present_in($req_data = NULL) {
+		if ($req_data === NULL) {
 			$req_data = $_POST;
 		}
-		$checked_value = $this->find_form_data_for_this_section( $req_data );
-		if( $checked_value !== null ){
+		$checked_value = $this->find_form_data_for_this_section($req_data);
+		if ($checked_value !== null) {
 			return TRUE;
-		}else{
+		} else {
 			return FALSE;
 		}
 	}

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

Braces +2 added lines, -2 removed lines

@@ -107,7 +107,7 @@ 
 			}
 			if( $all_ints ){
 				$normalization = new EE_Int_Normalization();
-			}else{
+			} else{
 				$normalization = new EE_Text_Normalization();
 			}
 		}
@@ -258,7 +258,7 @@ 
 		foreach( $unnormalized_value_choices as $unnormalized_value_choice ){
 			if( isset( $options[ $unnormalized_value_choice ] ) ){
 				$pretty_strings[] =  $options[ $unnormalized_value_choice ];
-			}else{
+			} else{
 				$pretty_strings[] = $this->normalized_value();
 			}
 		}

Spacing +75 added lines, -75 removed lines

@@ -7,7 +7,7 @@ 
  * @subpackage
  * @author				Mike Nelson
  */
-class EE_Form_Input_With_Options_Base extends EE_Form_Input_Base{
+class EE_Form_Input_With_Options_Base extends EE_Form_Input_Base {
 
 	/**
 	 * array of available options to choose as an answer
@@ -53,18 +53,18 @@ 
 	 * @param array $answer_options
 	 * @param array $input_settings
 	 */
-	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'] ) {
+	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'] );
+		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 );
+		$this->set_select_options($answer_options);
+		parent::__construct($input_settings);
 	}
 
 
@@ -75,47 +75,47 @@ 
 	 * @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 );
+	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
-		if ( reset( $answer_options ) instanceof EE_Question_Option ) {
-			$this->_options = $this->_process_question_options( $answer_options );
+		if (reset($answer_options) instanceof EE_Question_Option) {
+			$this->_options = $this->_process_question_options($answer_options);
 		} else {
 			$this->_options = $answer_options;
 		}
 		//d( $this->_options );
-		$select_option_keys = array_keys( $this->_options );
+		$select_option_keys = array_keys($this->_options);
 		// attempt to determine data type for values in order to set normalization type
 		if (
-			count( $this->_options ) == 2
+			count($this->_options) == 2
 			&&
 			(
-				( in_array( TRUE, $select_option_keys ) && in_array( FALSE, $select_option_keys ))
-				|| ( in_array( 1, $select_option_keys ) && in_array( 0, $select_option_keys ))
+				(in_array(TRUE, $select_option_keys) && in_array(FALSE, $select_option_keys))
+				|| (in_array(1, $select_option_keys) && in_array(0, $select_option_keys))
 			)
-		){
+		) {
 			// values appear to be boolean, like TRUE, FALSE, 1, 0
 			$normalization = new EE_Boolean_Normalization();
-		} else{
+		} else {
 			//are ALL the options ints? If so use int validation
 			$all_ints = true;
-			foreach($select_option_keys as $value ){
-				if( ! is_int( $value ) ){
+			foreach ($select_option_keys as $value) {
+				if ( ! is_int($value)) {
 					$all_ints = false;
 					break;
 				}
 			}
-			if( $all_ints ){
+			if ($all_ints) {
 				$normalization = new EE_Int_Normalization();
-			}else{
+			} 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 ));
+		if ($this->_multiple_selections) {
+			$this->_set_normalization_strategy(new EE_Many_Valued_Normalization($normalization));
 		} else {
-			$this->_set_normalization_strategy( $normalization );
+			$this->_set_normalization_strategy($normalization);
 		}
 	}
 
@@ -124,7 +124,7 @@ 
 	/**
 	 * @return array
 	 */
-	public function options(){
+	public function options() {
 		return $this->_options;
 	}
 
@@ -134,7 +134,7 @@ 
 	 * Returns an array which is guaranteed to not be multidimensional
 	 * @return array
 	 */
-	public function flat_options(){
+	public function flat_options() {
 		return $this->_flatten_select_options($this->options());
 	}
 
@@ -145,20 +145,20 @@ 
 	 * @param array $arr
 	 * @return array
 	 */
-	protected function _flatten_select_options( $arr ){
+	protected function _flatten_select_options($arr) {
 		$flat_array = array();
 		EE_Registry::instance()->load_helper('Array');
-		if ( EEH_Array::is_multi_dimensional_array( $arr )) {
-			foreach( $arr as $sub_array ){
-				foreach( $sub_array as $key => $value ) {
-					$flat_array[ $key ] = $value;
-					$this->_set_label_size( $value );
+		if (EEH_Array::is_multi_dimensional_array($arr)) {
+			foreach ($arr as $sub_array) {
+				foreach ($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 );
+			foreach ($arr as $key => $value) {
+				$flat_array[$key] = $value;
+				$this->_set_label_size($value);
 			}
 		}
 		return $flat_array;
@@ -170,18 +170,18 @@ 
 	 * @param EE_Question_Option[] $question_options_array
 	 * @return array
 	 */
-	protected function _process_question_options( $question_options_array = 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 ) {
+		foreach ($question_options_array as $question_option) {
+			if ($question_option instanceof EE_Question_Option) {
 				$desc = '';
-				if ( $this->_use_desc_in_label ) {
+				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>' : '';
 				}
-				$flat_array[ $question_option->value() ] = $question_option->value() . $desc;
-			} elseif ( is_array( $question_option )) {
-				$non_question_option = $this->_flatten_select_options( $question_option );
+				$flat_array[$question_option->value()] = $question_option->value().$desc;
+			} elseif (is_array($question_option)) {
+				$non_question_option = $this->_flatten_select_options($question_option);
 				$flat_array = $flat_array + $non_question_option;
 			}
 		}
@@ -194,12 +194,12 @@ 
 	 *    set_label_sizes
 	 * @return void
 	 */
-	public function set_label_sizes(){
+	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 ) {
+		if ( ! $this->_enforce_label_size) {
+			foreach ($this->_options as $option) {
 				// calculate the strlen of the label
-				$this->_set_label_size( $option );
+				$this->_set_label_size($option);
 			}
 		}
 	}
@@ -211,9 +211,9 @@ 
 	 * @param int|string $value
 	 * @return void
 	 */
-	private function _set_label_size( $value = '' ){
+	private function _set_label_size($value = '') {
 		// determine length of option value
-		$val_size = is_int( $value ) ? $value : strlen( $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;
 	}
@@ -224,22 +224,22 @@ 
 	 * 	get_label_size_class
 	 * @return string
 	 */
-	function get_label_size_class(){
+	function get_label_size_class() {
 		// use maximum option value length to determine label size
-		if( $this->_label_size < 3 ) {
+		if ($this->_label_size < 3) {
 			$size = ' nano-lbl';
-		} else if ( $this->_label_size < 6 ) {
-			$size =  ' micro-lbl';
-		} else if ( $this->_label_size < 12 ) {
-			$size =  ' tiny-lbl';
-		} else if ( $this->_label_size < 25 ) {
-			$size =  ' small-lbl';
-		} else if ( $this->_label_size < 50 ) {
-			$size =  ' medium-lbl';
-		} else if ( $this->_label_size >= 100 ) {
-			$size =  ' big-lbl';
+		} else if ($this->_label_size < 6) {
+			$size = ' micro-lbl';
+		} else if ($this->_label_size < 12) {
+			$size = ' tiny-lbl';
+		} else if ($this->_label_size < 25) {
+			$size = ' small-lbl';
+		} else if ($this->_label_size < 50) {
+			$size = ' medium-lbl';
+		} else if ($this->_label_size >= 100) {
+			$size = ' big-lbl';
 		} else {
-			$size =  ' medium-lbl';
+			$size = ' medium-lbl';
 		}
 		return $size;
 	}
@@ -248,21 +248,21 @@ 
 	 * Returns the pretty value for the normalized value
 	 * @return string
 	 */
-	function pretty_value(){
+	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 );
+		$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( $unnormalized_value_choices as $unnormalized_value_choice ){
-			if( isset( $options[ $unnormalized_value_choice ] ) ){
-				$pretty_strings[] =  $options[ $unnormalized_value_choice ];
-			}else{
+		foreach ($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 implode(", ", $pretty_strings);
 	}
 
 
@@ -279,8 +279,8 @@ 
 	/**
 	 * @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 );
+	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);
 	}