eventespresso / event-espresso-core

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

@@ -90,7 +90,7 @@
 		//so in case teh IPN is arriving later, let's try to process an IPN!
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
 			return $this->handle_ipn($_POST, $transaction );
-		}else{
+		} else{
 			return parent::finalize_payment_for( $transaction );
 		}
 	}

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;

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * Like the standard two-column formsection layout, but this one adds css classes
- * specific to the WP Admin
- */
+	 * Like the standard two-column formsection layout, but this one adds css classes
+	 * specific to the WP Admin
+	 */
 
 class EE_Admin_Two_Column_Layout extends EE_Two_Column_Layout {
 

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

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

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
  /**
- *
- * Class EE_Fieldset_Section_Layout
- *
- * Description
- *
- * @package         Event Espresso
- * @subpackage    core
- * @author				Brent Christensen
- * @since		 	   $VID:$
- *
- */
+  *
+  * Class EE_Fieldset_Section_Layout
+  *
+  * Description
+  *
+  * @package         Event Espresso
+  * @subpackage    core
+  * @author				Brent Christensen
+  * @since		 	   $VID:$
+  *
+  */
 class EE_Fieldset_Section_Layout extends EE_Div_Per_Section_Layout{
 
 	/**

Spacing +11 added lines, -11 removed lines

@@ -11,7 +11,7 @@ 
  * @since		 	   $VID:$
  *
  */
-class EE_Fieldset_Section_Layout extends EE_Div_Per_Section_Layout{
+class EE_Fieldset_Section_Layout extends EE_Div_Per_Section_Layout {
 
 	/**
 	 * legend_class
@@ -32,10 +32,10 @@ 
 	 *
 	 * @param array $options
 	 */
-	function __construct( $options = array() ){
-		foreach( $options as $key => $value ) {
-			$key = '_' . $key;
-			if ( property_exists( $this, $key )) {
+	function __construct($options = array()) {
+		foreach ($options as $key => $value) {
+			$key = '_'.$key;
+			if (property_exists($this, $key)) {
 				$this->$key = $value;
 			}
 		}
@@ -47,8 +47,8 @@ 
 	 * @return string
 	 */
 	public function layout_form_begin() {
-		$html = EEH_HTML::nl(1) . '<fieldset id="' . $this->_form_section->html_id() . '" class="' . $this->_form_section->html_class() . '" style="' . $this->_form_section->html_style() . '">';
-		$html .= '<legend class="' . $this->legend_class() . '">' . $this->legend_text() . '</legend>';
+		$html = EEH_HTML::nl(1).'<fieldset id="'.$this->_form_section->html_id().'" class="'.$this->_form_section->html_class().'" style="'.$this->_form_section->html_style().'">';
+		$html .= '<legend class="'.$this->legend_class().'">'.$this->legend_text().'</legend>';
 		return $html;
 	}
 
@@ -58,8 +58,8 @@ 
 	 * closing div tag for a form
 	 * @return string
 	 */
-	public function layout_form_end(){
-		return EEH_HTML::nl(-1) . '</fieldset>';
+	public function layout_form_end() {
+		return EEH_HTML::nl(-1).'</fieldset>';
 	}
 
 
@@ -67,7 +67,7 @@ 
 	/**
 	 * @param string $legend_class
 	 */
-	public function set_legend_class( $legend_class ) {
+	public function set_legend_class($legend_class) {
 		$this->_legend_class = $legend_class;
 	}
 
@@ -85,7 +85,7 @@ 
 	/**
 	 * @param string $legend_text
 	 */
-	public function set_legend_text( $legend_text ) {
+	public function set_legend_text($legend_text) {
 		$this->_legend_text = $legend_text;
 	}
 

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

Spacing +34 added lines, -34 removed lines

@@ -8,7 +8,7 @@ 
  * stating where the proper subsections should be placed (but usually leaving them to layout
  * their own headers and footers etc).
  */
-abstract class EE_Form_Section_Layout_Base{
+abstract class EE_Form_Section_Layout_Base {
 
 	/**
 	 * Form form section to lay out
@@ -21,7 +21,7 @@ 
 	/**
 	 * 	__construct
 	 */
-	function __construct(){
+	function __construct() {
 		EE_Registry::instance()->load_helper('HTML');
 	}
 
@@ -31,7 +31,7 @@ 
 	 * The form section on which this strategy is to perform
 	 * @param EE_Form_Section_Proper $form
 	 */
-	function _construct_finalize(EE_Form_Section_Proper $form){
+	function _construct_finalize(EE_Form_Section_Proper $form) {
 		$this->_form_section = $form;
 	}
 
@@ -54,28 +54,28 @@ 
 	 * Returns the HTML
 	 * @return string HTML for displaying
 	 */
-	function layout_form(){
+	function layout_form() {
 		$html = '';
 		// layout_form_begin
 		$html .= apply_filters(
-			'FHEE__EE_Form_Section_Layout_Base__layout_form__start__for_' . $this->_form_section->name(),
+			'FHEE__EE_Form_Section_Layout_Base__layout_form__start__for_'.$this->_form_section->name(),
 			$this->layout_form_begin(),
 			$this->_form_section
 		);
 		// layout_form_loop
 		$html .= apply_filters(
-			'FHEE__EE_Form_Section_Layout_Base__layout_form__loop__for_' . $this->_form_section->name(),
+			'FHEE__EE_Form_Section_Layout_Base__layout_form__loop__for_'.$this->_form_section->name(),
 			$this->layout_form_loop(),
 			$this->_form_section
 		);
 		// layout_form_end
 		$html .= apply_filters(
-			'FHEE__EE_Form_Section_Layout_Base__layout_form__end__for_' . $this->_form_section->name(),
+			'FHEE__EE_Form_Section_Layout_Base__layout_form__end__for_'.$this->_form_section->name(),
 			$this->layout_form_end(),
 			$this->_form_section
 		);
 
-		$html = $this->add_form_section_hooks_and_filters( $html );
+		$html = $this->add_form_section_hooks_and_filters($html);
 		return $html;
 	}
 
@@ -84,20 +84,20 @@ 
 	/**
 	 * @return string
 	 */
-	function layout_form_loop(){
+	function layout_form_loop() {
 		$html = '';
-		foreach( $this->_form_section->subsections() as $name => $subsection ){
-			if ( $subsection instanceof EE_Form_Input_Base ){
+		foreach ($this->_form_section->subsections() as $name => $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
 				$html .= apply_filters(
-					'FHEE__EE_Form_Section_Layout_Base__layout_form__loop_for_input_' . $name . '__in_' . $this->_form_section->name(),
-					$this->layout_input( $subsection ),
+					'FHEE__EE_Form_Section_Layout_Base__layout_form__loop_for_input_'.$name.'__in_'.$this->_form_section->name(),
+					$this->layout_input($subsection),
 					$this->_form_section,
 					$subsection
 				);
-			} elseif ( $subsection instanceof EE_Form_Section_Base ){
+			} elseif ($subsection instanceof EE_Form_Section_Base) {
 				$html .= apply_filters(
-					'FHEE__EE_Form_Section_Layout_Base__layout_form__loop_for_non_input_' . $name . '__in_' . $this->_form_section->name(),
-					$this->layout_subsection( $subsection ),
+					'FHEE__EE_Form_Section_Layout_Base__layout_form__loop_for_non_input_'.$name.'__in_'.$this->_form_section->name(),
+					$this->layout_subsection($subsection),
 					$this->_form_section,
 					$subsection
 				);
@@ -145,7 +145,7 @@ 
 	 * @param EE_Form_Section_Base $subsection
 	 * @return string html
 	 */
-	abstract function layout_subsection( $subsection );
+	abstract function layout_subsection($subsection);
 
 
 
@@ -154,10 +154,10 @@ 
 	 * @param EE_Form_Input_Base $input
 	 * @return string
 	 */
-	public function display_label($input){
-		$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();
-		return '<label id="' . $input->html_label_id() . '" class="' . $class . '" style="' . $input->html_label_style() . '" for="' . $input->html_name() . '">' .  $label_text . '</label>';
+	public function display_label($input) {
+		$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();
+		return '<label id="'.$input->html_label_id().'" class="'.$class.'" style="'.$input->html_label_style().'" for="'.$input->html_name().'">'.$label_text.'</label>';
 	}
 
 
@@ -170,10 +170,10 @@ 
 	 * @param EE_Form_Input_Base $input
 	 * @return string
 	 */
-	public function display_errors($input){
-		if( $input->get_validation_errors() ){
-			return  "<span  id='" . $input->html_id() . "-error' class='ee-error-label red ee-red' for='{$input->html_name()}'>" . $input->get_validation_error_string() . "</span>";
-		}else{
+	public function display_errors($input) {
+		if ($input->get_validation_errors()) {
+			return  "<span  id='".$input->html_id()."-error' class='ee-error-label red ee-red' for='{$input->html_name()}'>".$input->get_validation_error_string()."</span>";
+		} else {
 			return '';
 		}
 	}
@@ -183,10 +183,10 @@ 
 	 * @param EE_Form_Input_Base $input
 	 * @return string
 	 */
-	public function display_help_text( $input ){
-		if ( $input->html_help_text() != '' ) {
+	public function display_help_text($input) {
+		if ($input->html_help_text() != '') {
 			$tag = is_admin() ? 'p' : 'span';
-			return '<' . $tag . ' id="' . $input->html_id() . '-help" class="' . $input->html_help_class() . '" style="' . $input->html_help_style() . '">' . $input->html_help_text() . '</' . $tag . '>';
+			return '<'.$tag.' id="'.$input->html_id().'-help" class="'.$input->html_help_class().'" style="'.$input->html_help_style().'">'.$input->html_help_text().'</'.$tag.'>';
 		}
 		return '';
 	}
@@ -198,13 +198,13 @@ 
 	 * @param string $html
 	 * @return string
 	 */
-	public function add_form_section_hooks_and_filters( $html ){
+	public function add_form_section_hooks_and_filters($html) {
 		// replace dashes and spaces with underscores
-		$hook_name = str_replace( array( '-', ' ' ), '_', $this->_form_section->html_id() );
-		do_action( 'AHEE__Form_Section_Layout__' . $hook_name, $this->_form_section );
-		$html = apply_filters( 'AFEE__Form_Section_Layout__' . $hook_name . '__html', $html, $this->_form_section );
-		$html .= EEH_HTML::nl() . '<!-- AHEE__Form_Section_Layout__' . $hook_name . '__html -->';
-		$html .= EEH_HTML::nl() . '<!-- AFEE__Form_Section_Layout__' . $hook_name . ' -->';
+		$hook_name = str_replace(array('-', ' '), '_', $this->_form_section->html_id());
+		do_action('AHEE__Form_Section_Layout__'.$hook_name, $this->_form_section);
+		$html = apply_filters('AFEE__Form_Section_Layout__'.$hook_name.'__html', $html, $this->_form_section);
+		$html .= EEH_HTML::nl().'<!-- AHEE__Form_Section_Layout__'.$hook_name.'__html -->';
+		$html .= EEH_HTML::nl().'<!-- AFEE__Form_Section_Layout__'.$hook_name.' -->';
 		return $html;
 	}
 

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		//so in case teh IPN is arriving later, let's try to process an IPN!
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
 			return $this->handle_ipn($_POST, $transaction );
-		}else{
+		} else{
 			return parent::finalize_payment_for( $transaction );
 		}
 	}

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

Spacing +20 added lines, -20 removed lines

@@ -26,31 +26,31 @@ 
 	 * @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  ) {
+		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::br();
 			$html .= $input->get_html_for_input();
-		} else if ( $input instanceof EE_Select_Input  ) {
+		} else if ($input instanceof EE_Select_Input) {
 			$html .= EEH_HTML::br();
-			$html .= EEH_HTML::nl(1) . $input->get_html_for_label();
-			$html .= EEH_HTML::nl() . $input->get_html_for_errors();
-			$html .= EEH_HTML::nl() . $input->get_html_for_input();
-			$html .= EEH_HTML::nl() . $input->get_html_for_help();
+			$html .= EEH_HTML::nl(1).$input->get_html_for_label();
+			$html .= EEH_HTML::nl().$input->get_html_for_errors();
+			$html .= EEH_HTML::nl().$input->get_html_for_input();
+			$html .= EEH_HTML::nl().$input->get_html_for_help();
 			$html .= EEH_HTML::br();
-		} else if ( $input instanceof EE_Form_Input_With_Options_Base  ) {
+		} else if ($input instanceof EE_Form_Input_With_Options_Base) {
 			$html .= EEH_HTML::br();
-			$html .= EEH_HTML::nl() . $input->get_html_for_errors();
-			$html .= EEH_HTML::nl() . $input->get_html_for_input();
-			$html .= EEH_HTML::nl() . $input->get_html_for_help();
+			$html .= EEH_HTML::nl().$input->get_html_for_errors();
+			$html .= EEH_HTML::nl().$input->get_html_for_input();
+			$html .= EEH_HTML::nl().$input->get_html_for_help();
 		} else {
 			$html .= EEH_HTML::br();
-			$html .= EEH_HTML::nl(1) . $input->get_html_for_label();
-			$html .= EEH_HTML::nl() . $input->get_html_for_errors();
-			$html .= EEH_HTML::nl() . $input->get_html_for_input();
-			$html .= EEH_HTML::nl() . $input->get_html_for_help();
+			$html .= EEH_HTML::nl(1).$input->get_html_for_label();
+			$html .= EEH_HTML::nl().$input->get_html_for_errors();
+			$html .= EEH_HTML::nl().$input->get_html_for_input();
+			$html .= EEH_HTML::nl().$input->get_html_for_help();
 		}
 		$html .= EEH_HTML::nl(-1);
 		return $html;
@@ -63,9 +63,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);
 	}
 
 
@@ -73,7 +73,7 @@ 
 	 * closing div tag for a form
 	 * @return string
 	 */
-	public function layout_form_end(){
+	public function layout_form_end() {
 		return EEH_HTML::nl(-1);
 	}
 }
\ No newline at end of file

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

Indentation +21 added lines, -21 removed lines

@@ -1,26 +1,26 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 /**
- * EE_Template_Layout
- *
- * For very customized layouts, where you provide this class with the location of
- * a template file to use for laying out the form section. Inherits from EE_Div_per_Section
- * in case you call layout_input() or layout_subsection(), or get_html_for_label(),
- * get_html_for_input(), or get_html_for_errors() on one if the form section's inputs.
- * When would you want to use this instead of just laying out the form's subsections manually
- * in a template file? When you want a very customized layout, but that layout is essential
- * to the form; so that if you were to use the same form on two different pages (eg a contact form,
- * one on the website's frontend for contacting the site admin, and then again on the backend for
- * contacting the plugin's developer), you would still use this exact same template layout strategy.
- * (Eg, if you wanted to add a button to that same form for automatically adding "@gmail.com" or "@yahoo.com"
- * onto the 'from' input. The input is important to the form section on either page, but isn't an input so it's best
- * added as a part of the template layout.)
- *
- * @package			Event Espresso
- * @subpackage
- * @author				Mike Nelson
- *
- * ------------------------------------------------------------------------
- */
+	 * EE_Template_Layout
+	 *
+	 * For very customized layouts, where you provide this class with the location of
+	 * a template file to use for laying out the form section. Inherits from EE_Div_per_Section
+	 * in case you call layout_input() or layout_subsection(), or get_html_for_label(),
+	 * get_html_for_input(), or get_html_for_errors() on one if the form section's inputs.
+	 * When would you want to use this instead of just laying out the form's subsections manually
+	 * in a template file? When you want a very customized layout, but that layout is essential
+	 * to the form; so that if you were to use the same form on two different pages (eg a contact form,
+	 * one on the website's frontend for contacting the site admin, and then again on the backend for
+	 * contacting the plugin's developer), you would still use this exact same template layout strategy.
+	 * (Eg, if you wanted to add a button to that same form for automatically adding "@gmail.com" or "@yahoo.com"
+	 * onto the 'from' input. The input is important to the form section on either page, but isn't an input so it's best
+	 * added as a part of the template layout.)
+	 *
+	 * @package			Event Espresso
+	 * @subpackage
+	 * @author				Mike Nelson
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 class EE_Template_Layout extends EE_Div_Per_Section_Layout{
 
 	protected $_layout_template_file = NULL;

Spacing +35 added lines, -35 removed lines

@@ -21,7 +21,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_Template_Layout extends EE_Div_Per_Section_Layout{
+class EE_Template_Layout extends EE_Div_Per_Section_Layout {
 
 	protected $_layout_template_file = NULL;
 	protected $_layout_begin_template_file = NULL;
@@ -42,12 +42,12 @@ 
 	 * 		@type array 	$_template_args
 	 * 	}
 	 */
-	public function __construct( $template_options = array() ) {
+	public function __construct($template_options = array()) {
 		// loop thru incoming options
-		foreach( $template_options as $key => $value ) {
+		foreach ($template_options 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)) {
 					$this->$_key = $value;
 			}
 		}
@@ -65,9 +65,9 @@ 
 	 * @return string
 	 */
 	public function layout_form() {
-		if ( $this->_layout_template_file ) {
-			EE_Registry::instance()->load_helper( 'Template' );
-			return EEH_Template::locate_template( $this->_layout_template_file, $this->template_args(), TRUE, TRUE );
+		if ($this->_layout_template_file) {
+			EE_Registry::instance()->load_helper('Template');
+			return EEH_Template::locate_template($this->_layout_template_file, $this->template_args(), TRUE, TRUE);
 		} else {
 			return parent::layout_form();
 		}
@@ -80,10 +80,10 @@ 
 	 * @return string
 	 */
 	public function layout_form_begin() {
-		if($this->_layout_begin_template_file){
+		if ($this->_layout_begin_template_file) {
 			EE_Registry::instance()->load_helper('Template');
-			return EEH_Template::locate_template( $this->_layout_begin_template_file, $this->template_args(), TRUE, TRUE );
-		}else{
+			return EEH_Template::locate_template($this->_layout_begin_template_file, $this->template_args(), TRUE, TRUE);
+		} else {
 			return parent::layout_form_begin();
 		}
 	}
@@ -96,10 +96,10 @@ 
 	 * @param EE_Form_Input_Base $input
 	 * @return string
 	 */
-	public function layout_input( $input ) {
-		if($this->_input_template_file){
+	public function layout_input($input) {
+		if ($this->_input_template_file) {
 			EE_Registry::instance()->load_helper('Template');
-			return EEH_Template::locate_template( $this->_input_template_file, array( 'input' => $input ), TRUE, TRUE );
+			return EEH_Template::locate_template($this->_input_template_file, array('input' => $input), TRUE, TRUE);
 		}
 		return parent::layout_input($input);
 	}
@@ -112,12 +112,12 @@ 
 	 * @param EE_Form_Section_Proper $form_section
 	 * @return string
 	 */
-	public function layout_subsection( $form_section ) {
-		if($this->_subsection_template_file){
+	public function layout_subsection($form_section) {
+		if ($this->_subsection_template_file) {
 			EE_Registry::instance()->load_helper('Template');
-			return EEH_Template::locate_template( $this->_subsection_template_file, $this->template_args(), TRUE, TRUE );
+			return EEH_Template::locate_template($this->_subsection_template_file, $this->template_args(), TRUE, TRUE);
 		}
-		return parent::layout_subsection( $form_section );
+		return parent::layout_subsection($form_section);
 	}
 
 
@@ -127,10 +127,10 @@ 
 	 * @return string
 	 */
 	public function layout_form_end() {
-		if($this->_layout_end_template_file){
+		if ($this->_layout_end_template_file) {
 			EE_Registry::instance()->load_helper('Template');
-			return EEH_Template::locate_template( $this->_layout_end_template_file, $this->template_args(), TRUE, TRUE);
-		}else{
+			return EEH_Template::locate_template($this->_layout_end_template_file, $this->template_args(), TRUE, TRUE);
+		} else {
 			return parent::layout_form_end();
 		}
 	}
@@ -140,7 +140,7 @@ 
 	/**
 	 * @param array $template_args
 	 */
-	public function set_template_args( $template_args = array() ) {
+	public function set_template_args($template_args = array()) {
 		$this->_template_args = $template_args;
 	}
 
@@ -149,8 +149,8 @@ 
 	/**
 	 * @param array $template_args
 	 */
-	public function add_template_args( $template_args = array() ) {
-		$this->_template_args = array_merge_recursive( $this->_template_args, $template_args );
+	public function add_template_args($template_args = array()) {
+		$this->_template_args = array_merge_recursive($this->_template_args, $template_args);
 	}
 
 
@@ -159,13 +159,13 @@ 
 	 * @return array
 	 */
 	public function template_args() {
-		foreach ( $this->form_section()->subsections() as $subsection_name => $subsection ) {
-			$subsection_name = self::prep_form_subsection_key_name( $subsection_name );
-			if ( strpos( $subsection_name, '[' ) !== FALSE ) {
-				$sub_name = explode( '[', $subsection_name );
-				$this->_template_args[ $sub_name[0] ][ rtrim( $sub_name[1], ']' ) ] = $this->layout_subsection( $subsection );
+		foreach ($this->form_section()->subsections() as $subsection_name => $subsection) {
+			$subsection_name = self::prep_form_subsection_key_name($subsection_name);
+			if (strpos($subsection_name, '[') !== FALSE) {
+				$sub_name = explode('[', $subsection_name);
+				$this->_template_args[$sub_name[0]][rtrim($sub_name[1], ']')] = $this->layout_subsection($subsection);
 			} else {
-				$this->_template_args[ $subsection_name ] = $this->layout_subsection( $subsection );
+				$this->_template_args[$subsection_name] = $this->layout_subsection($subsection);
 			}
 		}
 //		d( $this->_template_args );
@@ -181,9 +181,9 @@ 
 	 * @param string $subsection_name
 	 * @return string
 	 */
-	public static function prep_form_subsection_key_name( $subsection_name = '' ) {
-		$subsection_name = str_replace( array( '-', ' ' ), array( '', '_' ), $subsection_name );
-		return is_numeric( substr( $subsection_name, 0, 1 )) ? 'form_' . $subsection_name : $subsection_name;
+	public static function prep_form_subsection_key_name($subsection_name = '') {
+		$subsection_name = str_replace(array('-', ' '), array('', '_'), $subsection_name);
+		return is_numeric(substr($subsection_name, 0, 1)) ? 'form_'.$subsection_name : $subsection_name;
 	}
 
 
@@ -195,8 +195,8 @@ 
 	 * @param string $subsection_name
 	 * @return string
 	 */
-	public static function get_subform_name( $subsection_name = '' ) {
-		return EE_Template_Layout::prep_form_subsection_key_name( $subsection_name );
+	public static function get_subform_name($subsection_name = '') {
+		return EE_Template_Layout::prep_form_subsection_key_name($subsection_name);
 	}
 
 

Braces +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 				$validation_error_message = $default_validation_strategy->get_validation_error_message();
 			}
 			throw new EE_Validation_Error( $validation_error_message, 'float_only' );
-		}else{
+		} else{
 			return floatval($normalized_value);
 		}
 	}
@@ -55,7 +55,7 @@ 
 	public function unnormalize($normalized_value) {
 		if( empty( $normalized_value ) ){
 			return '0.00';
-		}else{
+		} else{
 			return "$normalized_value";
 		}
 	}

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

Spacing +14 added lines, -14 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 
-class EE_Two_Column_Layout extends EE_Form_Section_Layout_Base{
+class EE_Two_Column_Layout extends EE_Form_Section_Layout_Base {
 
 	/**
 	 * Should be used to start teh form section (Eg a table tag, or a div tag, etc.)
 	 * @param array $additional_args
 	 * @return string
 	 */
-	public function layout_form_begin( $additional_args = array() ) {
-		return EEH_HTML::table( '', $this->_form_section->html_id(), $this->_form_section->html_class(), $this->_form_section->html_style()  ) . EEH_HTML::tbody();
+	public function layout_form_begin($additional_args = array()) {
+		return EEH_HTML::table('', $this->_form_section->html_id(), $this->_form_section->html_class(), $this->_form_section->html_style()).EEH_HTML::tbody();
 	}
 
 
@@ -18,8 +18,8 @@ 
 	 * @param array $additional_args
 	 * @return string
 	 */
-	public function layout_form_end( $additional_args = array() ) {
-		return EEH_HTML::tbodyx() . EEH_HTML::tablex( $this->_form_section->html_id() );
+	public function layout_form_end($additional_args = array()) {
+		return EEH_HTML::tbodyx().EEH_HTML::tablex($this->_form_section->html_id());
 	}
 
 
@@ -29,17 +29,17 @@ 
 	 * @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 ) {
+		if ($input instanceof EE_Hidden_Input) {
 			$html .= $input->get_html_for_input();
 		} else {
 			$html_for_input = $input->get_html_for_input();
-			$html_for_input .= $input->get_html_for_errors() != '' ? EEH_HTML::nl() . $input->get_html_for_errors() : '';
-			$html_for_input .= $input->get_html_for_help() != '' ? EEH_HTML::nl() . $input->get_html_for_help() : '';
+			$html_for_input .= $input->get_html_for_errors() != '' ? EEH_HTML::nl().$input->get_html_for_errors() : '';
+			$html_for_input .= $input->get_html_for_help() != '' ? EEH_HTML::nl().$input->get_html_for_help() : '';
 			$html .= EEH_HTML::tr(
-				EEH_HTML::th(  $input->get_html_for_label()  ) .
-				EEH_HTML::td( $html_for_input )
+				EEH_HTML::th($input->get_html_for_label()).
+				EEH_HTML::td($html_for_input)
 			);
 		}
 		return $html;
@@ -52,13 +52,13 @@ 
 	 * @param EE_Form_Section_Proper $form_section
 	 * @return string
 	 */
-	public function layout_subsection( $form_section ){
+	public function layout_subsection($form_section) {
 		$html = '';
-		if ( $form_section instanceof EE_Form_Section_HTML ) {
+		if ($form_section instanceof EE_Form_Section_HTML) {
 			$html .= $form_section->get_html_and_js();
 		} else {
 			$html .= EEH_HTML::tr(
-				EEH_HTML::td( $form_section->get_html_and_js(), '', '', '', 'colspan="2"' )
+				EEH_HTML::td($form_section->get_html_and_js(), '', '', '', 'colspan="2"')
 			);
 		}
 		return $html;

core/libraries/form_sections/strategies/normalization/EE_All_Caps_Normalization.strategy.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
  * @subpackage
  * @author				Mike Nelson
  */
-class EE_All_Caps_Normalization extends EE_Normalization_Strategy_Base{
+class EE_All_Caps_Normalization extends EE_Normalization_Strategy_Base {
 
 	/**
 	 * @param string $value_to_normalize
@@ -24,7 +24,7 @@ 
 	 * @param string $normalized_value
 	 * @return string
 	 */
-	public function unnormalize( $normalized_value ) {
+	public function unnormalize($normalized_value) {
 		return $normalized_value;
 	}
 

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 /**
- * EE_All_Caps_Normalization
- * Just makes sure the string is all upper case. If the user didn't provide an all
- * upper case input, we just correct it for them
- *
- * @package			Event Espresso
- * @subpackage
- * @author				Mike Nelson
- */
+	 * EE_All_Caps_Normalization
+	 * Just makes sure the string is all upper case. If the user didn't provide an all
+	 * upper case input, we just correct it for them
+	 *
+	 * @package			Event Espresso
+	 * @subpackage
+	 * @author				Mike Nelson
+	 */
 class EE_All_Caps_Normalization extends EE_Normalization_Strategy_Base{
 
 	/**