eventespresso / event-espresso-core

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

Spacing +16 added lines, -16 removed lines

@@ -8,7 +8,7 @@ 
  * @since                4.6
  *
  */
-class EE_Admin_File_Uploader_Display_Strategy extends EE_Display_Strategy_Base{
+class EE_Admin_File_Uploader_Display_Strategy extends EE_Display_Strategy_Base {
 
 	/**
 	 * return EE_Admin_File_Uploader_Display_Strategy
@@ -29,10 +29,10 @@ 
 	 * Besides that, no special consideration should be required to make the media uploader appear, besides having
 	 * this input displayed.
 	 */
-	static function enqueue_scripts(){
+	static function enqueue_scripts() {
 		wp_enqueue_media();
 		wp_enqueue_script('media-upload');
-		wp_enqueue_script('ee-payments',EE_GLOBAL_ASSETS_URL.'scripts/ee-media-uploader.js');
+		wp_enqueue_script('ee-payments', EE_GLOBAL_ASSETS_URL.'scripts/ee-media-uploader.js');
 	}
 
 
@@ -42,20 +42,20 @@ 
 	 * @return string of html to display the field
 	 */
 
-	function display(){
+	function display() {
 
-		EE_Registry::instance()->load_helper( 'HTML' );
+		EE_Registry::instance()->load_helper('HTML');
 		// the actual input
 		$input = '<input type="text" size="34" ';
-		$input .= 'name="' . $this->_input->html_name() . '" ';
-		$input .= $this->_input->html_class() != '' ? 'class="large-text ee_media_url ' . $this->_input->html_class() . '" ' : 'class="large-text ee_media_url" ';
-		$input .= 'value="' . $this->_input->raw_value_in_form() . '">';
+		$input .= 'name="'.$this->_input->html_name().'" ';
+		$input .= $this->_input->html_class() != '' ? 'class="large-text ee_media_url '.$this->_input->html_class().'" ' : 'class="large-text ee_media_url" ';
+		$input .= 'value="'.$this->_input->raw_value_in_form().'">';
 		// image uploader
-		$uploader = EEH_HTML::link( '#', '<img src="' . admin_url( 'images/media-button-image.gif' ) . '" >', __( 'click to add an image', 'event_espresso' ), '', 'ee_media_upload' );
+		$uploader = EEH_HTML::link('#', '<img src="'.admin_url('images/media-button-image.gif').'" >', __('click to add an image', 'event_espresso'), '', 'ee_media_upload');
 		//only attempt to show the image if it at least exists
-		$image = $this->src_exists( $this->_input->raw_value() ) ? EEH_HTML::br(2) . EEH_HTML::img( $this->_input->raw_value(), __( 'logo', 'event_espresso' ), '', 'ee_media_image' ) : '';
+		$image = $this->src_exists($this->_input->raw_value()) ? EEH_HTML::br(2).EEH_HTML::img($this->_input->raw_value(), __('logo', 'event_espresso'), '', 'ee_media_image') : '';
 		// html string
-		return EEH_HTML::div( $input . EEH_HTML::nbsp() . $uploader . $image, '', 'ee_media_uploader_area' );
+		return EEH_HTML::div($input.EEH_HTML::nbsp().$uploader.$image, '', 'ee_media_uploader_area');
 	}
 
 
@@ -66,11 +66,11 @@ 
 	 * @param string $src
 	 * @return boolean
 	 */
-	protected function src_exists( $src ){
-		$results = wp_remote_head( $src );
-		if( is_array( $results) && ! $results instanceof WP_Error){
-			return strpos($results['headers']['content-type'], "image" ) !== FALSE;
-		}else{
+	protected function src_exists($src) {
+		$results = wp_remote_head($src);
+		if (is_array($results) && ! $results instanceof WP_Error) {
+			return strpos($results['headers']['content-type'], "image") !== FALSE;
+		} else {
 			return FALSE;
 		}
 	}

Braces +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 		$results = wp_remote_head( $src );
 		if( is_array( $results) && ! $results instanceof WP_Error){
 			return strpos($results['headers']['content-type'], "image" ) !== FALSE;
-		}else{
+		} else{
 			return FALSE;
 		}
 	}

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

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
  * @since               	4.6
  *
  */
-abstract class EE_Display_Strategy_Base extends EE_Form_Input_Strategy_Base{
+abstract class EE_Display_Strategy_Base extends EE_Form_Input_Strategy_Base {
 	/**
 	 * returns HTML and javascript related to the displaying of this input
 	 * @return string
@@ -24,10 +24,10 @@ 
 	 * @param string $chars - exact string of characters to remove
 	 * @return string
 	 */
-	protected function _remove_chars( $string = '', $chars = '-' ) {
-		$char_length = strlen( $chars ) * -1;
+	protected function _remove_chars($string = '', $chars = '-') {
+		$char_length = strlen($chars) * -1;
 		// if last three characters of string is  " - ", then remove it
-		return substr( $string, $char_length ) == $chars ? substr( $string, 0, $char_length ) : $string;
+		return substr($string, $char_length) == $chars ? substr($string, 0, $char_length) : $string;
 	}
 
 
@@ -39,8 +39,8 @@ 
 	 * @param string $chars - exact string of characters to be added to end of string
 	 * @return string
 	 */
-	protected function _append_chars( $string = '', $chars = '-' ) {
-		return  $this->_remove_chars( $string, $chars ) . $chars;
+	protected function _append_chars($string = '', $chars = '-') {
+		return  $this->_remove_chars($string, $chars).$chars;
 	}
 
 

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

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,12 +25,12 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_Hidden_Display_Strategy extends EE_Display_Strategy_Base{
+class EE_Hidden_Display_Strategy extends EE_Display_Strategy_Base {
 	/**
 	 * 
 	 * @return string of html to display the HIDDEN field
 	 */
-	function display(){
+	function display() {
 		$input = $this->_input;		
 		return "<input type='hidden' id='{$input->html_id()}' name='{$input->html_name()}' class='{$input->html_class()}' style='{$input->html_style()}' value='{$input->raw_value_in_form()}'/>";
 	}

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/strategies/display/EE_Radio_Button_Display_Strategy.strategy.php

Spacing +20 added lines, -20 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_Radio_Button_Display_Strategy
@@ -11,43 +11,43 @@ 
  * @since 				$VID:$
  *
  */
-class EE_Radio_Button_Display_Strategy extends EE_Display_Strategy_Base{
+class EE_Radio_Button_Display_Strategy extends EE_Display_Strategy_Base {
 
 	/**
 	 *
 	 * @throws EE_Error
 	 * @return string of html to display the field
 	 */
-	function display(){
-		if ( ! $this->_input instanceof EE_Form_Input_With_Options_Base ){
-			throw new EE_Error(sprintf(__('Can not use Radio Button Display Strategy with an input that doesn\'t have options', 'event_espresso' )));
+	function display() {
+		if ( ! $this->_input instanceof EE_Form_Input_With_Options_Base) {
+			throw new EE_Error(sprintf(__('Can not use Radio Button Display Strategy with an input that doesn\'t have options', 'event_espresso')));
 		}
 
 		$this->_input->set_label_sizes();
 		$label_size_class = $this->_input->get_label_size_class();
 		$html = '';
-		foreach( $this->_input->options() as $value => $display_text ){
-			$value = $this->_input->get_normalization_strategy()->unnormalize( $value );
+		foreach ($this->_input->options() as $value => $display_text) {
+			$value = $this->_input->get_normalization_strategy()->unnormalize($value);
 
-			$html_id = $this->_append_chars( $this->_input->html_id(), '-' ) . sanitize_key( $value );
-			$html .= EEH_HTML::nl( 0, 'radio' );
-			$html .= '<label for="' . $html_id . '"';
-			$html .= ' id="' . $html_id . '-lbl"';
-			$html .= ' class="ee-radio-label-after' . $label_size_class . '">';
-			$html .= EEH_HTML::nl( 1, 'radio' );
-			$html .= '<input id="' . $html_id . '"';
-			$html .= ' name="' . $this->_input->html_name() . '"';
-			$html .= ' class="' . $this->_input->html_class() . '"';
-			$html .= ' style="' . $this->_input->html_style() . '"';
+			$html_id = $this->_append_chars($this->_input->html_id(), '-').sanitize_key($value);
+			$html .= EEH_HTML::nl(0, 'radio');
+			$html .= '<label for="'.$html_id.'"';
+			$html .= ' id="'.$html_id.'-lbl"';
+			$html .= ' class="ee-radio-label-after'.$label_size_class.'">';
+			$html .= EEH_HTML::nl(1, 'radio');
+			$html .= '<input id="'.$html_id.'"';
+			$html .= ' name="'.$this->_input->html_name().'"';
+			$html .= ' class="'.$this->_input->html_class().'"';
+			$html .= ' style="'.$this->_input->html_style().'"';
 			$html .= ' type="radio"';
-			$html .= ' value="' . esc_attr( $value ) . '"';
+			$html .= ' value="'.esc_attr($value).'"';
 			$html .= $this->_input->raw_value() === $value ? ' checked="checked"' : '';
 			$html .= '>&nbsp;';
 			$html .= $display_text;
-			$html .= EEH_HTML::nl( -1, 'radio' ) . '</label>';
+			$html .= EEH_HTML::nl( -1, 'radio' ).'</label>';
 
 		}
-		$html .= EEH_HTML::div( '', '', 'clear-float' );
+		$html .= EEH_HTML::div('', '', 'clear-float');
 		$html .= EEH_HTML::divx();
 		return $html;
 	}

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

Spacing +17 added lines, -17 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_Select_Multiple_Display_Strategy extends EE_Select_Display_Strategy{
+class EE_Select_Multiple_Display_Strategy extends EE_Select_Display_Strategy {
 
 	/**
 	 *
@@ -34,30 +34,30 @@ 
 	 */
 	public function display() {
 
-		if( ! $this->_input instanceof EE_Form_Input_With_Options_Base){
+		if ( ! $this->_input instanceof EE_Form_Input_With_Options_Base) {
 			throw new EE_Error(sprintf(__('Cannot use Select Multiple Display Strategy with an input that doesn\'t have options', "event_espresso")));
 		}
 
-		$html = EEH_HTML::nl( 0, 'select' );
+		$html = EEH_HTML::nl(0, 'select');
 		$html .= '<select multiple';
-		$html .= ' id="' . $this->_input->html_id() . '"';
-		$html .= ' name="' . $this->_input->html_name() . '[]"';
-		$class = $this->_input->required() ? $this->_input->required_css_class() . ' ' . $this->_input->html_class() : $this->_input->html_class();
-		$html .= ' class="' . $class . '"';
+		$html .= ' id="'.$this->_input->html_id().'"';
+		$html .= ' name="'.$this->_input->html_name().'[]"';
+		$class = $this->_input->required() ? $this->_input->required_css_class().' '.$this->_input->html_class() : $this->_input->html_class();
+		$html .= ' class="'.$class.'"';
 		// add html5 required
 		$html .= $this->_input->required() ? ' required' : '';
-		$html .= ' style="' . $this->_input->html_style() . '"';
+		$html .= ' style="'.$this->_input->html_style().'"';
 		$html .= '>';
 
 		EE_Registry::instance()->load_helper('Array');
-		EEH_HTML::indent( 1, 'select' );
-		if( EEH_Array::is_multi_dimensional_array( $this->_input->options() )){
+		EEH_HTML::indent(1, 'select');
+		if (EEH_Array::is_multi_dimensional_array($this->_input->options())) {
 			throw new EE_Error(sprintf(__("Select multiple display strategy does not allow for nested arrays of options.", "event_espresso")));
-		}else{
-			$html.=$this->_display_options( $this->_input->options() );
+		} else {
+			$html .= $this->_display_options($this->_input->options());
 		}
 
-		$html.= EEH_HTML::nl( -1, 'select' ) . "</select>";
+		$html .= EEH_HTML::nl( -1, 'select' )."</select>";
 		return $html;
 	}
 
@@ -68,12 +68,12 @@ 
 	 * @param string|int $value unnormalized value option (string)
 	 * @return boolean
 	 */
-	protected function _check_if_option_selected( $value ){
+	protected function _check_if_option_selected($value) {
 		$selected_options = $this->_input->raw_value();
-		if ( empty( $selected_options )){
+		if (empty($selected_options)) {
 			return FALSE;
 		}
-		return in_array( $value, $selected_options ) ? TRUE : FALSE;
+		return in_array($value, $selected_options) ? TRUE : FALSE;
 	}
 
 

Braces +3 added lines, -2 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
@@ -53,7 +54,7 @@ 
 		EEH_HTML::indent( 1, 'select' );
 		if( EEH_Array::is_multi_dimensional_array( $this->_input->options() )){
 			throw new EE_Error(sprintf(__("Select multiple display strategy does not allow for nested arrays of options.", "event_espresso")));
-		}else{
+		} else{
 			$html.=$this->_display_options( $this->_input->options() );
 		}
 

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

Spacing +6 added lines, -6 removed lines

@@ -1,15 +1,15 @@
 <?php
-class EE_Submit_Input_Display_Strategy extends EE_Display_Strategy_Base{
+class EE_Submit_Input_Display_Strategy extends EE_Display_Strategy_Base {
 	/**
 	 *
 	 * @return string of html to display the input
 	 */
-	function display(){
+	function display() {
 		$html = '<input type="submit" ';
-		$html .= 'value="' . $this->_input->raw_value_in_form() . '" ';
-		$html .= 'id="' . $this->_input->html_id() . '-submit" ';
-		$html .= 'class="' . $this->_input->html_class() . ' ' . $this->_input->button_css_attributes() . '" ';
-		$html .= 'style="' . $this->_input->html_style() . '" ';
+		$html .= 'value="'.$this->_input->raw_value_in_form().'" ';
+		$html .= 'id="'.$this->_input->html_id().'-submit" ';
+		$html .= 'class="'.$this->_input->html_class().' '.$this->_input->button_css_attributes().'" ';
+		$html .= 'style="'.$this->_input->html_style().'" ';
 		$html .= $this->_input->other_html_attributes();
 		$html .= '/>';
 		return $html;

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

Spacing +4 added lines, -4 removed lines

@@ -1,16 +1,16 @@
 <?php
-class EE_Text_Area_Display_Strategy extends EE_Display_Strategy_Base{
+class EE_Text_Area_Display_Strategy extends EE_Display_Strategy_Base {
 	/**
 	 *
 	 * @return string of html to display the field
 	 */
-	function display(){
+	function display() {
 		$input = $this->_input;
 		$raw_value = maybe_serialize($input->raw_value());
-		if( $input instanceof EE_Text_Area_Input ) {
+		if ($input instanceof EE_Text_Area_Input) {
 			$rows = $input->get_rows();
 			$cols = $input->get_cols();
-		}else{
+		} else {
 			$rows = 4;
 			$cols = 20;
 		}

Braces +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 		if( $input instanceof EE_Text_Area_Input ) {
 			$rows = $input->get_rows();
 			$cols = $input->get_cols();
-		}else{
+		} else{
 			$rows = 4;
 			$cols = 20;
 		}

core/libraries/form_sections/strategies/layout/EE_Admin_Two_Column_Layout.strategy.php

Spacing +16 added lines, -16 removed lines

@@ -13,9 +13,9 @@ 
 	 *
 	 * @return string
 	 */
-	public function layout_form_begin( $additional_args = array() ) {
+	public function layout_form_begin($additional_args = array()) {
 		$this->_form_section->set_html_class('form-table');
-		return parent::layout_form_begin( $additional_args );
+		return parent::layout_form_begin($additional_args);
 	}
 
 
@@ -25,10 +25,10 @@ 
 	 * @param EE_Form_Section_Proper $form_section
 	 * @return string
 	 */
-	public function layout_subsection( $form_section ){
-		if ( $form_section instanceof EE_Form_Section_Proper ) {
-			return EEH_HTML::no_row( $form_section->get_html_and_js(), 2 );
-		} else if ( $form_section instanceof EE_Form_Section_HTML ) {
+	public function layout_subsection($form_section) {
+		if ($form_section instanceof EE_Form_Section_Proper) {
+			return EEH_HTML::no_row($form_section->get_html_and_js(), 2);
+		} else if ($form_section instanceof EE_Form_Section_HTML) {
 			return $form_section->get_html_and_js();
 		}
 		return '';
@@ -41,30 +41,30 @@ 
 	 * @param EE_Form_Input_Base $input
 	 * @return string
 	 */
-	public function layout_input( $input ) {
+	public function layout_input($input) {
 
 		if (
 			$input->get_display_strategy() instanceof EE_Text_Area_Display_Strategy ||
 			$input->get_display_strategy() instanceof EE_Text_Input_Display_Strategy ||
 			$input->get_display_strategy() instanceof EE_Admin_File_Uploader_Display_Strategy
 		) {
-			$input->set_html_class( $input->html_class() . ' large-text' );
+			$input->set_html_class($input->html_class().' large-text');
 		}
-		if ( $input instanceof EE_Text_Area_Input ) {
-			$input->set_rows( 4 );
-			$input->set_cols( 60 );
+		if ($input instanceof EE_Text_Area_Input) {
+			$input->set_rows(4);
+			$input->set_cols(60);
 		}
 		$input_html = $input->get_html_for_input();
 		// maybe add errors and help text ?
-		$input_html .= $input->get_html_for_errors() != '' ? EEH_HTML::nl() . $input->get_html_for_errors() : '';
-		$input_html .= $input->get_html_for_help() != '' ? EEH_HTML::nl() . $input->get_html_for_help() : '';
+		$input_html .= $input->get_html_for_errors() != '' ? EEH_HTML::nl().$input->get_html_for_errors() : '';
+		$input_html .= $input->get_html_for_help() != '' ? EEH_HTML::nl().$input->get_html_for_help() : '';
 		//overriding parent to add wp admin specific things.
 		$html = '';
-		if ( $input instanceof EE_Hidden_Input ) {
-			$html .= EEH_HTML::no_row( $input->get_html_for_input(), 2 );
+		if ($input instanceof EE_Hidden_Input) {
+			$html .= EEH_HTML::no_row($input->get_html_for_input(), 2);
 		} else {
 			$html .= EEH_HTML::tr(
-				EEH_HTML::th( $input->get_html_for_label(), '', '',  '', 'scope="row"' ) . EEH_HTML::td( $input_html )
+				EEH_HTML::th($input->get_html_for_label(), '', '', '', 'scope="row"').EEH_HTML::td($input_html)
 			);
 		}
 		return $html;

core/libraries/form_sections/strategies/layout/EE_Div_Per_Section_Layout.strategy.php

Spacing +39 added lines, -39 removed lines

@@ -10,14 +10,14 @@ 
  * @since 				4.6.0
  *
  */
-class EE_Div_Per_Section_Layout extends EE_Form_Section_Layout_Base{
+class EE_Div_Per_Section_Layout extends EE_Form_Section_Layout_Base {
 
 	/**
 	 * opening div tag for a form
 	 * @return string
 	 */
 	public function layout_form_begin() {
-		return EEH_HTML::div( '', $this->_form_section->html_id(), $this->_form_section->html_class(), $this->_form_section->html_style() );
+		return EEH_HTML::div('', $this->_form_section->html_id(), $this->_form_section->html_class(), $this->_form_section->html_style());
 	}
 
 
@@ -26,38 +26,38 @@ 
 	 * @param EE_Form_Input_Base $input
 	 * @return string
 	 */
-	public function layout_input( $input ) {
+	public function layout_input($input) {
 		$html = '';
-		if ( $input instanceof EE_Hidden_Input  ) {
-			$html .= EEH_HTML::nl() . $input->get_html_for_input();
-		} else if ( $input instanceof EE_Submit_Input  ) {
-			$html .= EEH_HTML::div( $input->get_html_for_input(), $input->html_id() . '-submit-dv', $input->html_class() . '-submit-dv' );
-		} else if ( $input instanceof EE_Select_Input  ) {
+		if ($input instanceof EE_Hidden_Input) {
+			$html .= EEH_HTML::nl().$input->get_html_for_input();
+		} else if ($input instanceof EE_Submit_Input) {
+			$html .= EEH_HTML::div($input->get_html_for_input(), $input->html_id().'-submit-dv', $input->html_class().'-submit-dv');
+		} else if ($input instanceof EE_Select_Input) {
 			$html .= EEH_HTML::div(
-				EEH_HTML::nl(1) . $input->get_html_for_label() .
-				EEH_HTML::nl() . $input->get_html_for_errors() .
-				EEH_HTML::nl() . $input->get_html_for_input() .
-				EEH_HTML::nl() . $input->get_html_for_help(),
-				$input->html_id() . '-input-dv',
-				$input->html_class() . '-input-dv'
+				EEH_HTML::nl(1).$input->get_html_for_label().
+				EEH_HTML::nl().$input->get_html_for_errors().
+				EEH_HTML::nl().$input->get_html_for_input().
+				EEH_HTML::nl().$input->get_html_for_help(),
+				$input->html_id().'-input-dv',
+				$input->html_class().'-input-dv'
 			);
-		} else if ( $input instanceof EE_Form_Input_With_Options_Base  ) {
+		} else if ($input instanceof EE_Form_Input_With_Options_Base) {
 			$html .= EEH_HTML::div(
-				EEH_HTML::nl() . $this->_display_label_for_option_type_question( $input ) .
-				EEH_HTML::nl() . $input->get_html_for_errors() .
-				EEH_HTML::nl() . $input->get_html_for_input() .
-				EEH_HTML::nl() . $input->get_html_for_help(),
-				$input->html_id() . '-input-dv',
-				$input->html_class() . '-input-dv'
+				EEH_HTML::nl().$this->_display_label_for_option_type_question($input).
+				EEH_HTML::nl().$input->get_html_for_errors().
+				EEH_HTML::nl().$input->get_html_for_input().
+				EEH_HTML::nl().$input->get_html_for_help(),
+				$input->html_id().'-input-dv',
+				$input->html_class().'-input-dv'
 			);
 		} else {
 			$html .= EEH_HTML::div(
-				EEH_HTML::nl(1) . $input->get_html_for_label() .
-				EEH_HTML::nl() . $input->get_html_for_errors() .
-				EEH_HTML::nl() . $input->get_html_for_input() .
-				EEH_HTML::nl() . $input->get_html_for_help(),
-				$input->html_id() . '-input-dv',
-				$input->html_class() . '-input-dv'
+				EEH_HTML::nl(1).$input->get_html_for_label().
+				EEH_HTML::nl().$input->get_html_for_errors().
+				EEH_HTML::nl().$input->get_html_for_input().
+				EEH_HTML::nl().$input->get_html_for_help(),
+				$input->html_id().'-input-dv',
+				$input->html_class().'-input-dv'
 			);
 		}
 		return $html;
@@ -74,14 +74,14 @@ 
 	 * @param EE_Form_Input_With_Options_Base $input
 	 * @return string
 	 */
-	protected function _display_label_for_option_type_question( EE_Form_Input_With_Options_Base $input ){
-		if ( $input->display_html_label_text() != '' ) {
-			$class = $input->required() ? 'ee-required-label ' . $input->html_label_class() : $input->html_label_class();
-			$label_text = $input->required() ? $input->html_label_text() . '<span class="ee-asterisk">*</span>' : $input->html_label_text();
-			$html = '<div id="' . $input->html_label_id() . '"';
-			$html .= ' class="' . $class . '"';
-			$html .= ' style="' . $input->html_label_style() . '">';
-			$html .= $label_text . '</div>';
+	protected function _display_label_for_option_type_question(EE_Form_Input_With_Options_Base $input) {
+		if ($input->display_html_label_text() != '') {
+			$class = $input->required() ? 'ee-required-label '.$input->html_label_class() : $input->html_label_class();
+			$label_text = $input->required() ? $input->html_label_text().'<span class="ee-asterisk">*</span>' : $input->html_label_text();
+			$html = '<div id="'.$input->html_label_id().'"';
+			$html .= ' class="'.$class.'"';
+			$html .= ' style="'.$input->html_label_style().'">';
+			$html .= $label_text.'</div>';
 			return $html;
 		} else {
 			return '';
@@ -95,9 +95,9 @@ 
 	 * @param EE_Form_Section_Proper $form_section
 	 * @return string
 	 */
-	public function layout_subsection( $form_section ){
+	public function layout_subsection($form_section) {
 //		d( $form_section );
-		return EEH_HTML::nl(1) . $form_section->get_html_and_js() . EEH_HTML::nl(-1);
+		return EEH_HTML::nl(1).$form_section->get_html_and_js().EEH_HTML::nl(-1);
 	}
 
 
@@ -105,7 +105,7 @@ 
 	 * closing div tag for a form
 	 * @return string
 	 */
-	public function layout_form_end(){
-		return EEH_HTML::divx( $this->_form_section->html_id(), $this->_form_section->html_class() );
+	public function layout_form_end() {
+		return EEH_HTML::divx($this->_form_section->html_id(), $this->_form_section->html_class());
 	}
 }
\ No newline at end of file