eventespresso / event-espresso-core

core/interfaces/EEI_Repository.interface.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -30,7 +30,7 @@ 
 	 * @return bool | int
 	 * @throws \EE_Error
 	 */
-	public function persist( $persistence_callback = '', $persistence_arguments = array() );
+	public function persist($persistence_callback = '', $persistence_arguments = array());
 
 
 
@@ -43,7 +43,7 @@ 
 	 * @param string $persistence_callback name of method found on object that can be used for persisting it
 	 * @return bool | int
 	 */
-	public function persist_all( $persistence_callback = '' );
+	public function persist_all($persistence_callback = '');
 
 	}
 // End of file EEI_Repository.interface.php

core/interfaces/line_items/EEI_Line_Item.interface.php

Indentation +7 added lines, -7 removed lines

@@ -3,13 +3,13 @@
 	exit( 'No direct script access allowed' );
 }
 /**
- * Class EEI_Line_Item
- *
- * @package 			Event Espresso
- * @subpackage 	core
- * @author 				Mike Nelson / Brent Christensen
- *
- */
+	 * Class EEI_Line_Item
+	 *
+	 * @package 			Event Espresso
+	 * @subpackage 	core
+	 * @author 				Mike Nelson / Brent Christensen
+	 *
+	 */
 interface EEI_Line_Item {
 
 	/**

Spacing +10 added lines, -10 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Class EEI_Line_Item
@@ -18,7 +18,7 @@ 
 	 * @param    mixed  $field_value
 	 * @param bool      $use_default
 	 */
-	public function set( $field_name, $field_value, $use_default = false );
+	public function set($field_name, $field_value, $use_default = false);
 
 
 
@@ -56,7 +56,7 @@ 
 	 * Sets quantity
 	 * @param int $quantity
 	 */
-	function set_quantity( $quantity );
+	function set_quantity($quantity);
 
 
 
@@ -115,7 +115,7 @@ 
 	 * @param int $txn_id if none is provided, assumes $this->TXN_ID()
 	 * @return int count of items saved
 	 */
-	function save_this_and_descendants_to_txn( $txn_id = null );
+	function save_this_and_descendants_to_txn($txn_id = null);
 
 
 
@@ -142,7 +142,7 @@ 
 	 * @param bool         $set_order
 	 * @return bool true for success, false for fail
 	 */
-	function add_child_line_item( EEI_Line_Item $line_item, $set_order = true );
+	function add_child_line_item(EEI_Line_Item $line_item, $set_order = true);
 
 
 
@@ -197,14 +197,14 @@ 
 	 * @param float $total
 	 * @return boolean
 	 */
-	function set_total( $total );
+	function set_total($total);
 
 	/**
 	 * Sets unit_price
 	 * @param float $unit_price
 	 * @return boolean
 	 */
-	function set_unit_price( $unit_price );
+	function set_unit_price($unit_price);
 
 	/**
 	 * If this line item has been saved to the DB, deletes its child with LIN_code == $code. If this line
@@ -215,7 +215,7 @@ 
 	 * @param bool $stop_search_once_found
 	 * @return int count of items deleted (or simply removed from the line item's cache, if not has not been saved to the DB yet)
 	 */
-	function delete_child_line_item( $code, $stop_search_once_found = true );
+	function delete_child_line_item($code, $stop_search_once_found = true);
 
 	/**
 	 * Forgets the cached model of the given relation Name. So the next time we request it,
@@ -238,7 +238,7 @@ 
 	 * @param boolean $allow_persist
 	 * @return boolean
 	 */
-	function set_allow_persist( $allow_persist );
+	function set_allow_persist($allow_persist);
 
 
 }

core/interfaces/line_items/EEI_Line_Item_Filter.interface.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -26,7 +26,7 @@ 
 	 * @param \EEI_Line_Item $line_item
 	 * @return \EEI_Line_Item
 	 */
-	public function process( EEI_Line_Item $line_item );
+	public function process(EEI_Line_Item $line_item);
 
 
 

core/libraries/form_sections/EE_Sample_Form.form.php

Spacing +11 added lines, -11 removed lines

@@ -1,20 +1,20 @@ 
 <?php
-class EE_Sample_Form extends EE_Form_Section_Proper{
-	function __construct(){
+class EE_Sample_Form extends EE_Form_Section_Proper {
+	function __construct() {
 		$this->_subsections = array(
 			'h1'=>new EE_Form_Section_HTML('hello wordl'),
-			'name'=>new EE_Text_Input(array('required'=>true,'default'=>'your name here')),
+			'name'=>new EE_Text_Input(array('required'=>true, 'default'=>'your name here')),
 			'email'=>new EE_Email_Input(array('required'=>false)),
-			'shirt_size'=>new EE_Select_Input(array(''=>'Please select...', 's'=>  __("Small", "event_espresso"),'m'=>  __("Medium", "event_espresso"),'l'=>  __("Large", "event_espresso")),array('required'=>true,'default'=>'s')),
+			'shirt_size'=>new EE_Select_Input(array(''=>'Please select...', 's'=>  __("Small", "event_espresso"), 'm'=>  __("Medium", "event_espresso"), 'l'=>  __("Large", "event_espresso")), array('required'=>true, 'default'=>'s')),
 			'month_normal'=>new EE_Month_Input(),
 			'month_leading_zero'=>new EE_Month_Input(true),
 			'year_2'=>new EE_Year_Input(false, 1, 1),
-			'year_4'=>new EE_Year_Input(true, 0,10,array('default'=>'2017')),
+			'year_4'=>new EE_Year_Input(true, 0, 10, array('default'=>'2017')),
 			'yes_no'=>new EE_Yes_No_Input(array('html_label_text'=>  __("Yes or No", "event_espresso"))),
 			'credit_card'=>new EE_Credit_Card_Input(),
 			'image_1'=>new EE_Admin_File_Uploader_Input(),
 			'image_2'=>new EE_Admin_File_Uploader_Input(),
-			'skillz'=>new EE_Checkbox_Multi_Input(array('php'=>'PHP','mysql'=>'MYSQL'),array('default'=>array('php'))),
+			'skillz'=>new EE_Checkbox_Multi_Input(array('php'=>'PHP', 'mysql'=>'MYSQL'), array('default'=>array('php'))),
 			'float'=>new EE_Float_Input(),
 			'essay'=>new EE_Text_Area_Input(),
 			'amenities'=>new EE_Select_Multiple_Input(
@@ -40,16 +40,16 @@ 
 	 * Extra validation for the 'name' input.
 	 * @param EE_Text_Input $form_input
 	 */
-	function _validate_name($form_input){
-		if($form_input->raw_value() != 'Mike'){
+	function _validate_name($form_input) {
+		if ($form_input->raw_value() != 'Mike') {
 			$form_input->add_validation_error(__("You are not mike. You must be brent or darren. Thats ok, I guess", 'event_espresso'), 'not-mike');
 		}
 	}
 
-	function _validate(){
+	function _validate() {
 		parent::_validate();
-		if($this->_subsections['shirt_size']->normalized_value() =='s'
-				&& $this->_subsections['year_4']->normalized_value() < 2010){
+		if ($this->_subsections['shirt_size']->normalized_value() == 's'
+				&& $this->_subsections['year_4']->normalized_value() < 2010) {
 			$this->add_validation_error(__("If you want a small shirt, you should be born after 2010. Otherwise theyre just too big", 'event_espresso'), 'too-old');
 		}
 	}

core/libraries/form_sections/base/EE_Form_Section_HTML.form.php

Indentation +10 added lines, -10 removed lines

@@ -2,16 +2,16 @@
 if (!defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
- * EE_Form_Section_HTML
- * HTML to be laid out like a proper subsection
- *
- *
- * @package			Event Espresso
- * @subpackage
- * @author				Mike Nelson
- *
- * ------------------------------------------------------------------------
- */
+	 * EE_Form_Section_HTML
+	 * HTML to be laid out like a proper subsection
+	 *
+	 *
+	 * @package			Event Espresso
+	 * @subpackage
+	 * @author				Mike Nelson
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 class EE_Form_Section_HTML extends EE_Form_Section_Base{
 
 	protected $_html = '';

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
  * EE_Form_Section_HTML
@@ -12,7 +12,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_Form_Section_HTML extends EE_Form_Section_Base{
+class EE_Form_Section_HTML extends EE_Form_Section_Base {
 
 	protected $_html = '';
 
@@ -22,9 +22,9 @@ 
 	 * @param string $html
 	 * @param array $options_array
 	 */
-	public function __construct( $html = '', $options_array = array() ) {
+	public function __construct($html = '', $options_array = array()) {
 		$this->_html = $html;
-		parent::__construct( $options_array );
+		parent::__construct($options_array);
 	}
 
 

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/base/EE_Form_Section_Proper.form.php

Braces +5 added lines, -5 removed lines

@@ -209,7 +209,7 @@ 
 			if(isset($default_data[$subsection_name])){
 				if($subsection instanceof EE_Form_Input_Base){
 					$subsection->set_default($default_data[$subsection_name]);
-				}elseif($subsection instanceof EE_Form_Section_Proper){
+				} elseif($subsection instanceof EE_Form_Section_Proper){
 					$subsection->populate_defaults($default_data[$subsection_name]);
 				}
 			}
@@ -440,7 +440,7 @@ 
 		foreach($this->subsections() as $subsection){
 			if( $subsection instanceof EE_Form_Input_Base ){
 				$inputs[ $subsection->html_name() ] = $subsection;
-			}elseif($subsection instanceof EE_Form_Section_Proper ){
+			} elseif($subsection instanceof EE_Form_Section_Proper ){
 				$inputs += $subsection->inputs_in_subsections();
 			}
 		}
@@ -548,7 +548,7 @@ 
 		foreach($this->get_validatable_subsections() as $subsection){
 			try{
 				$subsection->_normalize($req_data);
-			}catch( EE_Validation_Error $e ){
+			} catch( EE_Validation_Error $e ){
 				$subsection->add_validation_error( $e );
 			}
 		}
@@ -866,7 +866,7 @@ 
 	public function html_name_prefix(){
 		if( $this->parent_section() instanceof EE_Form_Section_Proper ){
 			return $this->parent_section()->html_name_prefix() . '[' . $this->name() . ']';
-		}else{
+		} else{
 			return $this->name();
 		}
 	}
@@ -918,7 +918,7 @@ 
 				if( $subsection->form_data_present_in( $req_data ) ) {
 					return TRUE;
 				}
-			}elseif( $subsection instanceof EE_Form_Section_Proper ) {
+			} elseif( $subsection instanceof EE_Form_Section_Proper ) {
 				if( $subsection->form_data_present_in( $req_data ) ) {
 					return TRUE;
 				}

Doc Comments +1 added lines, -1 removed lines

@@ -225,7 +225,7 @@
 	 * leave this as TRUE so that the inputs will be properly configured. However,
 	 * some client code may be ok with construction finalize being called later
 	 * (realizing that the subsections' html names might not be set yet, etc.)
-	 * @return EE_Form_Section_Base
+	 * @return EE_Form_Section_Validatable|null
 	 */
 	public function get_subsection($name, $require_construction_to_be_finalized = TRUE ){
 		if( $require_construction_to_be_finalized ){

Spacing +161 added lines, -161 removed lines

@@ -7,7 +7,7 @@ 
  * before the hook wp_enqueue_scripts is called (so that the form section can enqueue its needed scripts).
  * However, you may output the form (usually by calling get_html_and_js) anywhere you like.
  */
-class EE_Form_Section_Proper extends EE_Form_Section_Validatable{
+class EE_Form_Section_Proper extends EE_Form_Section_Validatable {
 
 	/**
 	 * Subsections
@@ -68,37 +68,37 @@ 
 	 * } @see EE_Form_Section_Validatable::__construct()
 	 *
 	 */
-	public function __construct( $options_array = array() ){
-		$options_array = apply_filters( 'FHEE__EE_Form_Section_Proper___construct__options_array', $options_array, $this );
+	public function __construct($options_array = array()) {
+		$options_array = apply_filters('FHEE__EE_Form_Section_Proper___construct__options_array', $options_array, $this);
 		//call parent first, as it may be setting the name
 		parent::__construct($options_array);
 		//if they've included subsections in the constructor, add them now
-		if( isset( $options_array['include'] )){
+		if (isset($options_array['include'])) {
 			//we are going to make sure we ONLY have those subsections to include
 			//AND we are going to make sure they're in that specified order
 			$reordered_subsections = array();
-			foreach($options_array['include'] as $input_name){
-				if(isset($this->_subsections[$input_name])){
+			foreach ($options_array['include'] as $input_name) {
+				if (isset($this->_subsections[$input_name])) {
 					$reordered_subsections[$input_name] = $this->_subsections[$input_name];
 				}
 			}
 			$this->_subsections = $reordered_subsections;
 		}
-		if(isset($options_array['exclude'])){
+		if (isset($options_array['exclude'])) {
 			$exclude = $options_array['exclude'];
 			$this->_subsections = array_diff_key($this->_subsections, array_flip($exclude));
 		}
-		if(isset($options_array['layout_strategy'])){
+		if (isset($options_array['layout_strategy'])) {
 			$this->_layout_strategy = $options_array['layout_strategy'];
 		}
-		if( ! $this->_layout_strategy){
+		if ( ! $this->_layout_strategy) {
 			$this->_layout_strategy = new EE_Two_Column_Layout();
 		}
 		$this->_layout_strategy->_construct_finalize($this);
 
-		add_action( 'wp_enqueue_scripts', array( 'EE_Form_Section_Proper', 'wp_enqueue_scripts' ));
-		add_action( 'admin_enqueue_scripts', array( 'EE_Form_Section_Proper', 'wp_enqueue_scripts' ));
-		add_action( 'wp_footer', array( $this, 'ensure_scripts_localized' ), 1 );
+		add_action('wp_enqueue_scripts', array('EE_Form_Section_Proper', 'wp_enqueue_scripts'));
+		add_action('admin_enqueue_scripts', array('EE_Form_Section_Proper', 'wp_enqueue_scripts'));
+		add_action('wp_footer', array($this, 'ensure_scripts_localized'), 1);
 	}
 
 
@@ -110,25 +110,25 @@ 
 	 * @param string                 $name
 	 * @throws \EE_Error
 	 */
-	public function _construct_finalize( $parent_form_section, $name ) {
+	public function _construct_finalize($parent_form_section, $name) {
 		parent::_construct_finalize($parent_form_section, $name);
 		$this->_set_default_name_if_empty();
 		$this->_set_default_html_id_if_empty();
-		foreach( $this->_subsections as $subsection_name => $subsection ){
-			if ( $subsection instanceof EE_Form_Section_Base ) {
-				$subsection->_construct_finalize( $this, $subsection_name );
+		foreach ($this->_subsections as $subsection_name => $subsection) {
+			if ($subsection instanceof EE_Form_Section_Base) {
+				$subsection->_construct_finalize($this, $subsection_name);
 			} else {
 				throw new EE_Error(
 					sprintf(
-						__( 'Subsection "%s" is not an instanceof EE_Form_Section_Base on form "%s". It is a "%s"', 'event_espresso' ),
+						__('Subsection "%s" is not an instanceof EE_Form_Section_Base on form "%s". It is a "%s"', 'event_espresso'),
 						$subsection_name,
 						get_class($this),
-						$subsection ? get_class($subsection) : __( 'NULL', 'event_espresso' )
+						$subsection ? get_class($subsection) : __('NULL', 'event_espresso')
 					)
 				);
 			}
 		}
-		do_action( 'AHEE__EE_Form_Section_Proper___construct_finalize__end', $this, $parent_form_section, $name );
+		do_action('AHEE__EE_Form_Section_Proper___construct_finalize__end', $this, $parent_form_section, $name);
 	}
 
 
@@ -137,7 +137,7 @@ 
 	 * Gets the layout strategy for this form section
 	 * @return EE_Form_Section_Layout_Base
 	 */
-	public function get_layout_strategy(){
+	public function get_layout_strategy() {
 		return $this->_layout_strategy;
 	}
 
@@ -149,7 +149,7 @@ 
 	 * @param EE_Form_Input_Base $input
 	 * @return string
 	 */
-	public function get_html_for_input($input){
+	public function get_html_for_input($input) {
 		return $this->_layout_strategy->layout_input($input);
 	}
 
@@ -162,7 +162,7 @@ 
 	 * @param null $form_data
 	 * @return boolean
 	 */
-	public function was_submitted($form_data = NULL){
+	public function was_submitted($form_data = NULL) {
 		return $this->form_data_present_in($form_data);
 	}
 
@@ -187,16 +187,16 @@ 
 	 *                          (eg you validated the data then stored it in the DB) you may want to skip this step.
 	 * @return void
 	 */
-	public function receive_form_submission($req_data = NULL, $validate = TRUE){
-		$req_data = apply_filters( 'FHEE__EE_Form_Section_Proper__receive_form_submission__req_data', $req_data, $this, $validate );
-		if( $req_data === NULL){
-			$req_data = array_merge( $_GET, $_POST );
+	public function receive_form_submission($req_data = NULL, $validate = TRUE) {
+		$req_data = apply_filters('FHEE__EE_Form_Section_Proper__receive_form_submission__req_data', $req_data, $this, $validate);
+		if ($req_data === NULL) {
+			$req_data = array_merge($_GET, $_POST);
 		}
 		$this->_normalize($req_data);
-		if( $validate ){
+		if ($validate) {
 			$this->_validate();
 		}
-		do_action( 'AHEE__EE_Form_Section_Proper__receive_form_submission__end', $req_data, $this, $validate );
+		do_action('AHEE__EE_Form_Section_Proper__receive_form_submission__end', $req_data, $this, $validate);
 	}
 
 
@@ -209,12 +209,12 @@ 
 	 * the value being an array formatted in teh same way
 	 * @param array $default_data
 	 */
-	public function populate_defaults($default_data){
-		foreach($this->subsections() as $subsection_name => $subsection){
-			if(isset($default_data[$subsection_name])){
-				if($subsection instanceof EE_Form_Input_Base){
+	public function populate_defaults($default_data) {
+		foreach ($this->subsections() as $subsection_name => $subsection) {
+			if (isset($default_data[$subsection_name])) {
+				if ($subsection instanceof EE_Form_Input_Base) {
 					$subsection->set_default($default_data[$subsection_name]);
-				}elseif($subsection instanceof EE_Form_Section_Proper){
+				}elseif ($subsection instanceof EE_Form_Section_Proper) {
 					$subsection->populate_defaults($default_data[$subsection_name]);
 				}
 			}
@@ -232,8 +232,8 @@ 
 	 * (realizing that the subsections' html names might not be set yet, etc.)
 	 * @return EE_Form_Section_Base
 	 */
-	public function get_subsection($name, $require_construction_to_be_finalized = TRUE ){
-		if( $require_construction_to_be_finalized ){
+	public function get_subsection($name, $require_construction_to_be_finalized = TRUE) {
+		if ($require_construction_to_be_finalized) {
 			$this->ensure_construct_finalized_called();
 		}
 		return isset($this->_subsections[$name]) ? $this->_subsections[$name] : NULL;
@@ -245,10 +245,10 @@ 
 	 * Gets all the validatable subsections of this form section
 	 * @return EE_Form_Section_Validatable[]
 	 */
-	public function get_validatable_subsections(){
+	public function get_validatable_subsections() {
 		$validatable_subsections = array();
-		foreach($this->subsections() as $name=>$obj){
-			if($obj instanceof EE_Form_Section_Validatable){
+		foreach ($this->subsections() as $name=>$obj) {
+			if ($obj instanceof EE_Form_Section_Validatable) {
 				$validatable_subsections[$name] = $obj;
 			}
 		}
@@ -268,10 +268,10 @@ 
 	 * @return EE_Form_Input_Base
 	 * @throws EE_Error
 	 */
-	public function get_input($name, $require_construction_to_be_finalized = TRUE ){
+	public function get_input($name, $require_construction_to_be_finalized = TRUE) {
 		$subsection = $this->get_subsection($name, $require_construction_to_be_finalized);
-		if( ! $subsection instanceof EE_Form_Input_Base){
-			throw new EE_Error(sprintf(__("Subsection '%s' is not an instanceof EE_Form_Input_Base on form '%s'. It is a '%s'", 'event_espresso'),$name, get_class($this),$subsection ? get_class($subsection) : __("NULL", 'event_espresso')));
+		if ( ! $subsection instanceof EE_Form_Input_Base) {
+			throw new EE_Error(sprintf(__("Subsection '%s' is not an instanceof EE_Form_Input_Base on form '%s'. It is a '%s'", 'event_espresso'), $name, get_class($this), $subsection ? get_class($subsection) : __("NULL", 'event_espresso')));
 		}
 		return $subsection;
 	}
@@ -289,10 +289,10 @@ 
 	 * @return EE_Form_Section_Proper
 	 * @throws EE_Error
 	 */
-	public function get_proper_subsection($name, $require_construction_to_be_finalized = TRUE ){
-		$subsection = $this->get_subsection( $name, $require_construction_to_be_finalized );
-		if( ! $subsection instanceof EE_Form_Section_Proper){
-			throw new EE_Error(sprintf(__("Subsection '%'s is not an instanceof EE_Form_Section_Proper on form '%s'", 'event_espresso'),$name, get_class($this)));
+	public function get_proper_subsection($name, $require_construction_to_be_finalized = TRUE) {
+		$subsection = $this->get_subsection($name, $require_construction_to_be_finalized);
+		if ( ! $subsection instanceof EE_Form_Section_Proper) {
+			throw new EE_Error(sprintf(__("Subsection '%'s is not an instanceof EE_Form_Section_Proper on form '%s'", 'event_espresso'), $name, get_class($this)));
 		}
 		return $subsection;
 	}
@@ -305,7 +305,7 @@ 
 	 * @param string $name
 	 * @return mixed depending on the input's type and its normalization strategy
 	 */
-	public function get_input_value($name){
+	public function get_input_value($name) {
 		$input = $this->get_input($name);
 		return $input->normalized_value();
 	}
@@ -318,16 +318,16 @@ 
 	 * @return boolean
 	 */
 	public function is_valid() {
-		if( ! $this->has_received_submission()){
+		if ( ! $this->has_received_submission()) {
 			throw new EE_Error(sprintf(__("You cannot check if a form is valid before receiving the form submission using receive_form_submission", "event_espresso")));
 		}
-		if( ! parent::is_valid()){
+		if ( ! parent::is_valid()) {
 			return false;
 		}
 		//ok so no errors general to this entire form section. so let's check the subsections
-		foreach( $this->get_validatable_subsections() as $subsection ){
-			if( ! $subsection->is_valid() || $subsection->get_validation_error_string() != '' ){
-				$this->set_submission_error_message( $subsection->get_validation_error_string() );
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			if ( ! $subsection->is_valid() || $subsection->get_validation_error_string() != '') {
+				$this->set_submission_error_message($subsection->get_validation_error_string());
 				return false;
 			}
 		}
@@ -340,11 +340,11 @@ 
 	 * gets teh default name of this form section if none is specified
 	 * @return string
 	 */
-	protected function _set_default_name_if_empty(){
-		if( ! $this->_name ){
+	protected function _set_default_name_if_empty() {
+		if ( ! $this->_name) {
 			$classname = get_class($this);
 			$default_name = str_replace("EE_", "", $classname);
-			$this->_name =  $default_name;
+			$this->_name = $default_name;
 		}
 	}
 
@@ -355,7 +355,7 @@ 
 	 * Also returns the HTML for the form, except for the form opening and closing tags
 	 * (as the form section doesn't know where you necessarily want to send the information to), and except for a submit button.
 	 */
-	public function get_html_and_js(){
+	public function get_html_and_js() {
 		$this->enqueue_js();
 		return $this->get_html();
 	}
@@ -366,7 +366,7 @@ 
 	 * returns HTML for displaying this form section. recursively calls display_section() on all subsections
 	 * @return string
 	 */
-	public function get_html(){
+	public function get_html() {
 		$this->ensure_construct_finalized_called();
 		return $this->_layout_strategy->layout_form();
 	}
@@ -377,7 +377,7 @@ 
 	 * enqueues JS for the form
 	 * @return string
 	 */
-	public function enqueue_js(){
+	public function enqueue_js() {
 		$this->_enqueue_and_localize_form_js();
 	}
 
@@ -393,10 +393,10 @@ 
 	 * @param boolean $init_form_validation_automatically whether or not we want the form validation to be triggered automatically or not
 	 * @return void
 	 */
-	public static function wp_enqueue_scripts( $init_form_validation_automatically = false ){
-		add_filter( 'FHEE_load_jquery_validate', '__return_true' );
-		wp_register_script( 'ee_form_section_validation', EE_GLOBAL_ASSETS_URL . 'scripts' . DS . 'form_section_validation.js', array( 'jquery-validate', 'jquery-ui-datepicker', 'jquery-validate-extra-methods' ), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_localize_script( 'ee_form_section_validation', 'ee_form_section_validation_init', array( 'init' => $init_form_validation_automatically ) );
+	public static function wp_enqueue_scripts($init_form_validation_automatically = false) {
+		add_filter('FHEE_load_jquery_validate', '__return_true');
+		wp_register_script('ee_form_section_validation', EE_GLOBAL_ASSETS_URL.'scripts'.DS.'form_section_validation.js', array('jquery-validate', 'jquery-ui-datepicker', 'jquery-validate-extra-methods'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_localize_script('ee_form_section_validation', 'ee_form_section_validation_init', array('init' => $init_form_validation_automatically));
 	}
 
 
@@ -406,14 +406,14 @@ 
 	 * This needs to be called AFTER we've called $this->_enqueue_jquery_validate_script,
 	 * but before the wordpress hook wp_loaded
 	 */
-	public function _enqueue_and_localize_form_js(){
+	public function _enqueue_and_localize_form_js() {
 		$this->ensure_construct_finalized_called();
 		//actually, we don't want to localize just yet. There may be other forms on the page.
 		//so we need to add our form section data to a static variable accessible by all form sections
 		//and localize it just before the footer
 		$this->localize_validation_rules();
-		add_action( 'wp_footer', array( 'EE_Form_Section_Proper', 'localize_script_for_all_forms' ), 2 );
-		add_action( 'admin_footer', array( 'EE_Form_Section_Proper', 'localize_script_for_all_forms' ) );
+		add_action('wp_footer', array('EE_Form_Section_Proper', 'localize_script_for_all_forms'), 2);
+		add_action('admin_footer', array('EE_Form_Section_Proper', 'localize_script_for_all_forms'));
 	}
 
 
@@ -423,11 +423,11 @@ 
 	 * @param bool $return_for_subsection
 	 * @return void
 	 */
-	public function localize_validation_rules( $return_for_subsection = FALSE ){
+	public function localize_validation_rules($return_for_subsection = FALSE) {
 		// we only want to localize vars ONCE for the entire form, so if the form section doesn't have a parent, then it must be the top dog
-		if ( ! $this->parent_section() || $return_for_subsection ) {
-			EE_Form_Section_Proper::$_js_localization['form_data'][ $this->html_id() ] = array(
-				'form_section_id'=> $this->html_id( TRUE ),
+		if ( ! $this->parent_section() || $return_for_subsection) {
+			EE_Form_Section_Proper::$_js_localization['form_data'][$this->html_id()] = array(
+				'form_section_id'=> $this->html_id(TRUE),
 				'validation_rules'=> $this->get_jquery_validation_rules(),
 				'errors'=> $this->subsection_validation_errors_by_html_name()
 			);
@@ -442,12 +442,12 @@ 
 	 * Keys are their form names, and values are the inputs themselves
 	 * @return EE_Form_Input_Base
 	 */
-	public function inputs_in_subsections(){
+	public function inputs_in_subsections() {
 		$inputs = array();
-		foreach($this->subsections() as $subsection){
-			if( $subsection instanceof EE_Form_Input_Base ){
-				$inputs[ $subsection->html_name() ] = $subsection;
-			}elseif($subsection instanceof EE_Form_Section_Proper ){
+		foreach ($this->subsections() as $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				$inputs[$subsection->html_name()] = $subsection;
+			}elseif ($subsection instanceof EE_Form_Section_Proper) {
 				$inputs += $subsection->inputs_in_subsections();
 			}
 		}
@@ -460,12 +460,12 @@ 
 	 * and values are a string of all their validation errors
 	 * @return string[]
 	 */
-	public function subsection_validation_errors_by_html_name(){
+	public function subsection_validation_errors_by_html_name() {
 		$inputs = $this->inputs();
 		$errors = array();
-		foreach( $inputs as $form_input ){
-			if ( $form_input instanceof EE_Form_Input_Base && $form_input->get_validation_errors() ){
-				$errors[ $form_input->html_name() ] = $form_input->get_validation_error_string();
+		foreach ($inputs as $form_input) {
+			if ($form_input instanceof EE_Form_Input_Base && $form_input->get_validation_errors()) {
+				$errors[$form_input->html_name()] = $form_input->get_validation_error_string();
 			}
 		}
 		return $errors;
@@ -477,16 +477,16 @@ 
 	 * passes all the form data required by the JS to the JS, and enqueues the few required JS files.
 	 * Should be setup by each form during the _enqueues_and_localize_form_js
 	 */
-	public static function localize_script_for_all_forms(){
+	public static function localize_script_for_all_forms() {
 		//allow inputs and stuff to hook in their JS and stuff here
 		do_action('AHEE__EE_Form_Section_Proper__localize_script_for_all_forms__begin');
 		EE_Form_Section_Proper::$_js_localization['localized_error_messages'] = EE_Form_Section_Proper::_get_localized_error_messages();
-		$email_validation_level = isset( EE_Registry::instance()->CFG->registration->email_validation_level )
+		$email_validation_level = isset(EE_Registry::instance()->CFG->registration->email_validation_level)
 			? EE_Registry::instance()->CFG->registration->email_validation_level
 			: 'wp_default';
 		EE_Form_Section_Proper::$_js_localization['email_validation_level'] = $email_validation_level;
-		wp_enqueue_script( 'ee_form_section_validation' );
-		wp_localize_script( 'ee_form_section_validation', 'ee_form_section_vars', EE_Form_Section_Proper::$_js_localization );
+		wp_enqueue_script('ee_form_section_validation');
+		wp_localize_script('ee_form_section_validation', 'ee_form_section_vars', EE_Form_Section_Proper::$_js_localization);
 	}
 
 
@@ -494,8 +494,8 @@ 
 	/**
 	 * ensure_scripts_localized
 	 */
-	public function ensure_scripts_localized(){
-		if ( ! EE_Form_Section_Proper::$_scripts_localized ) {
+	public function ensure_scripts_localized() {
+		if ( ! EE_Form_Section_Proper::$_scripts_localized) {
 			$this->_enqueue_and_localize_form_js();
 		}
 	}
@@ -507,10 +507,10 @@ 
 	 * is that the key here should be the same as the custom validation rule put in the JS file
 	 * @return array keys are custom validation rules, and values are internationalized strings
 	 */
-	private static function _get_localized_error_messages(){
+	private static function _get_localized_error_messages() {
 		return array(
 			'validUrl'=>  __("This is not a valid absolute URL. Eg, http://domain.com/monkey.jpg", "event_espresso"),
-			'regex' => __( 'Please check your input', 'event_espresso' ),
+			'regex' => __('Please check your input', 'event_espresso'),
 		);
 	}
 
@@ -538,10 +538,10 @@ 
 	 * Gets the JS to put inside the jquery validation rules for subsection of this form section. See parent function for more...
 	 * @return array
 	 */
-	function get_jquery_validation_rules(){
+	function get_jquery_validation_rules() {
 		$jquery_validation_rules = array();
-		foreach($this->get_validatable_subsections() as $subsection){
-			$jquery_validation_rules = array_merge( $jquery_validation_rules,  $subsection->get_jquery_validation_rules() );
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			$jquery_validation_rules = array_merge($jquery_validation_rules, $subsection->get_jquery_validation_rules());
 		}
 		return $jquery_validation_rules;
 	}
@@ -556,11 +556,11 @@ 
 	protected function _normalize($req_data) {
 		$this->_received_submission = TRUE;
 		$this->_validation_errors = array();
-		foreach($this->get_validatable_subsections() as $subsection){
-			try{
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			try {
 				$subsection->_normalize($req_data);
-			}catch( EE_Validation_Error $e ){
-				$subsection->add_validation_error( $e );
+			} catch (EE_Validation_Error $e) {
+				$subsection->add_validation_error($e);
 			}
 		}
 	}
@@ -574,9 +574,9 @@ 
 	 * calling parent::_validate() first.
 	 */
 	protected function _validate() {
-		foreach($this->get_validatable_subsections() as $subsection_name => $subsection){
-			if(method_exists($this,'_validate_'.$subsection_name)){
-				call_user_func_array(array($this,'_validate_'.$subsection_name), array($subsection));
+		foreach ($this->get_validatable_subsections() as $subsection_name => $subsection) {
+			if (method_exists($this, '_validate_'.$subsection_name)) {
+				call_user_func_array(array($this, '_validate_'.$subsection_name), array($subsection));
 			}
 			$subsection->_validate();
 		}
@@ -588,13 +588,13 @@ 
 	 * Gets all the validated inputs for the form section
 	 * @return array
 	 */
-	public function valid_data(){
+	public function valid_data() {
 		$inputs = array();
-		foreach( $this->subsections() as $subsection_name =>$subsection ){
-			if ( $subsection instanceof EE_Form_Section_Proper ) {
-				$inputs[ $subsection_name ] = $subsection->valid_data();
-			} else if ( $subsection instanceof EE_Form_Input_Base ){
-				$inputs[ $subsection_name ] = $subsection->normalized_value();
+		foreach ($this->subsections() as $subsection_name =>$subsection) {
+			if ($subsection instanceof EE_Form_Section_Proper) {
+				$inputs[$subsection_name] = $subsection->valid_data();
+			} else if ($subsection instanceof EE_Form_Input_Base) {
+				$inputs[$subsection_name] = $subsection->normalized_value();
 			}
 		}
 		return $inputs;
@@ -606,11 +606,11 @@ 
 	 * Gets all the inputs on this form section
 	 * @return EE_Form_Input_Base[]
 	 */
-	public function inputs(){
+	public function inputs() {
 		$inputs = array();
-		foreach( $this->subsections() as $subsection_name =>$subsection ){
-			if ( $subsection instanceof EE_Form_Input_Base ){
-				$inputs[ $subsection_name ] = $subsection;
+		foreach ($this->subsections() as $subsection_name =>$subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				$inputs[$subsection_name] = $subsection;
 			}
 		}
 		return $inputs;
@@ -622,10 +622,10 @@ 
 	 * Gets all the subsections which are a proper form
 	 * @return EE_Form_Section_Proper[]
 	 */
-	public function subforms(){
+	public function subforms() {
 		$form_sections = array();
-		foreach($this->subsections() as $name=>$obj){
-			if($obj instanceof EE_Form_Section_Proper){
+		foreach ($this->subsections() as $name=>$obj) {
+			if ($obj instanceof EE_Form_Section_Proper) {
 				$form_sections[$name] = $obj;
 			}
 		}
@@ -640,7 +640,7 @@ 
 	 * if you only want form inputs or proper form sections.
 	 * @return EE_Form_Section_Proper[]
 	 */
-	public function subsections(){
+	public function subsections() {
 		$this->ensure_construct_finalized_called();
 		return $this->_subsections;
 	}
@@ -658,8 +658,8 @@ 
 	 * it can be a multidimensional array where keys are always subsection names and values are either the
 	 * input's normalized value, or an array like the top-level array
 	 */
-	public function input_values( $include_subform_inputs = false, $flatten = false ){
-		return $this->_input_values( false, $include_subform_inputs, $flatten );
+	public function input_values($include_subform_inputs = false, $flatten = false) {
+		return $this->_input_values(false, $include_subform_inputs, $flatten);
 	}
 
 	/**
@@ -675,8 +675,8 @@ 
 	 * it can be a multidimensional array where keys are always subsection names and values are either the
 	 * input's normalized value, or an array like the top-level array
 	 */
-	public function input_pretty_values(  $include_subform_inputs = false, $flatten = false ){
-		return $this->_input_values( true, $include_subform_inputs, $flatten );
+	public function input_pretty_values($include_subform_inputs = false, $flatten = false) {
+		return $this->_input_values(true, $include_subform_inputs, $flatten);
 	}
 
 	/**
@@ -689,17 +689,17 @@ 
 	 * it can be a multidimensional array where keys are always subsection names and values are either the
 	 * input's normalized value, or an array like the top-level array
 	 */
-	public function _input_values( $pretty = false, $include_subform_inputs = false, $flatten = false ) {
+	public function _input_values($pretty = false, $include_subform_inputs = false, $flatten = false) {
 		$input_values = array();
-		foreach( $this->subsections() as $subsection_name => $subsection ) {
-			if( $subsection instanceof EE_Form_Input_Base ) {
-				$input_values[ $subsection_name ] = $pretty ? $subsection->pretty_value() : $subsection->normalized_value();
-			} else if( $subsection instanceof EE_Form_Section_Proper && $include_subform_inputs ) {
-				$subform_input_values = $subsection->_input_values( $pretty, $include_subform_inputs, $flatten );
-				if( $flatten ) {
-					$input_values = array_merge( $input_values, $subform_input_values );
+		foreach ($this->subsections() as $subsection_name => $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				$input_values[$subsection_name] = $pretty ? $subsection->pretty_value() : $subsection->normalized_value();
+			} else if ($subsection instanceof EE_Form_Section_Proper && $include_subform_inputs) {
+				$subform_input_values = $subsection->_input_values($pretty, $include_subform_inputs, $flatten);
+				if ($flatten) {
+					$input_values = array_merge($input_values, $subform_input_values);
 				} else {
-					$input_values[ $subsection_name ] = $subform_input_values;
+					$input_values[$subsection_name] = $subform_input_values;
 				}
 			}
 		}
@@ -713,7 +713,7 @@ 
 	 * (ie, had receive_form_submission called on it yet)
 	 * @return boolean
 	 */
-	public function has_received_submission(){
+	public function has_received_submission() {
 		$this->ensure_construct_finalized_called();
 		return $this->_received_submission;
 	}
@@ -726,8 +726,8 @@ 
 	 * @param array $inputs_to_exclude values are the input names
 	 * @return void
 	 */
-	public function exclude($inputs_to_exclude = array()){
-		foreach($inputs_to_exclude as $input_to_exclude_name){
+	public function exclude($inputs_to_exclude = array()) {
+		foreach ($inputs_to_exclude as $input_to_exclude_name) {
 			unset($this->_subsections[$input_to_exclude_name]);
 		}
 	}
@@ -737,8 +737,8 @@ 
 	/**
 	 * @param array $inputs_to_hide
 	 */
-	public function hide($inputs_to_hide= array()){
-		foreach($inputs_to_hide as $input_to_hide){
+	public function hide($inputs_to_hide = array()) {
+		foreach ($inputs_to_hide as $input_to_hide) {
 			$input = $this->get_input($input_to_hide);
 
 			$input->set_display_strategy(new EE_Hidden_Display_Strategy());
@@ -763,13 +763,13 @@ 
 	 * 																								or if $subsection_name_to_target is null, before or after entire subsections array
 	 * @return void
 	 */
-	public function add_subsections( $new_subsections, $subsection_name_to_target = NULL, $add_before = true ){
-		foreach($new_subsections as $subsection_name => $subsection){
-			if( ! $subsection instanceof EE_Form_Section_Base){
+	public function add_subsections($new_subsections, $subsection_name_to_target = NULL, $add_before = true) {
+		foreach ($new_subsections as $subsection_name => $subsection) {
+			if ( ! $subsection instanceof EE_Form_Section_Base) {
 				EE_Error::add_error(
 					sprintf(
 						__("Trying to add a %s as a subsection (it was named '%s') to the form section '%s'. It was removed.", "event_espresso"),
-						get_class( $subsection ),
+						get_class($subsection),
 						$subsection_name,
 						$this->name()
 					)
@@ -778,7 +778,7 @@ 
 			}
 		}
 
-		$this->_subsections = EEH_Array::insert_into_array( $this->_subsections, $new_subsections, $subsection_name_to_target, $add_before );
+		$this->_subsections = EEH_Array::insert_into_array($this->_subsections, $new_subsections, $subsection_name_to_target, $add_before);
 
 		/*$subsections_before = array();
 		if( $subsection_name_to_target ){
@@ -809,8 +809,8 @@ 
 				$this->_subsections = $new_subsections;
 			}
 		}*/
-		if( $this->_construction_finalized ){
-			foreach($this->_subsections as $name => $subsection){
+		if ($this->_construction_finalized) {
+			foreach ($this->_subsections as $name => $subsection) {
 				$subsection->_construct_finalize($this, $name);
 			}
 		}
@@ -821,8 +821,8 @@ 
 	/**
 	 * Just gets all validatable subsections to clean their sensitive data
 	 */
-	public function clean_sensitive_data(){
-		foreach($this->get_validatable_subsections() as $subsection){
+	public function clean_sensitive_data() {
+		foreach ($this->get_validatable_subsections() as $subsection) {
 			$subsection->clean_sensitive_data();
 		}
 	}
@@ -832,8 +832,8 @@ 
 	/**
 	 * @param string $form_submission_error_message
 	 */
-	public function set_submission_error_message( $form_submission_error_message = '' ) {
-		$this->_form_submission_error_message .= ! empty( $form_submission_error_message ) ? $form_submission_error_message : __( 'Form submission failed due to errors', 'event_espresso' );
+	public function set_submission_error_message($form_submission_error_message = '') {
+		$this->_form_submission_error_message .= ! empty($form_submission_error_message) ? $form_submission_error_message : __('Form submission failed due to errors', 'event_espresso');
 	}
 
 
@@ -850,8 +850,8 @@ 
 	/**
 	 * @param string $form_submission_success_message
 	 */
-	public function set_submission_success_message( $form_submission_success_message ) {
-		$this->_form_submission_success_message .= ! empty( $form_submission_success_message ) ? $form_submission_success_message : __( 'Form submitted successfully', 'event_espresso' );
+	public function set_submission_success_message($form_submission_success_message) {
+		$this->_form_submission_success_message .= ! empty($form_submission_success_message) ? $form_submission_success_message : __('Form submitted successfully', 'event_espresso');
 	}
 
 
@@ -873,10 +873,10 @@ 
 	 * EE_Form_Input_Base::_set_default_html_name_if_empty
 	 * @return string
 	 */
-	public function html_name_prefix(){
-		if( $this->parent_section() instanceof EE_Form_Section_Proper ){
-			return $this->parent_section()->html_name_prefix() . '[' . $this->name() . ']';
-		}else{
+	public function html_name_prefix() {
+		if ($this->parent_section() instanceof EE_Form_Section_Proper) {
+			return $this->parent_section()->html_name_prefix().'['.$this->name().']';
+		} else {
 			return $this->name();
 		}
 	}
@@ -887,7 +887,7 @@ 
 	 * was set, which is probably nothing, or the classname)
 	 * @return string
 	 */
-	public function name(){
+	public function name() {
 		$this->ensure_construct_finalized_called();
 		return parent::name();
 	}
@@ -896,7 +896,7 @@ 
 	 *
 	 * @return EE_Form_Section_Proper
 	 */
-	public function parent_section(){
+	public function parent_section() {
 		$this->ensure_construct_finalized_called();
 		return parent::parent_section();
 	}
@@ -905,9 +905,9 @@ 
 	 * make sure construction finalized was called, otherwise children might not be ready
 	 * @return void
 	 */
-	public function ensure_construct_finalized_called(){
-		if( ! $this->_construction_finalized ){
-			$this->_construct_finalize($this->_parent_section, $this->_name );
+	public function ensure_construct_finalized_called() {
+		if ( ! $this->_construction_finalized) {
+			$this->_construct_finalize($this->_parent_section, $this->_name);
 		}
 	}
 
@@ -919,17 +919,17 @@ 
 	 * @param array $req_data
 	 * @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;
 		}
-		foreach( $this->subsections() as $subsection ) {
-			if($subsection instanceof EE_Form_Input_Base ) {
-				if( $subsection->form_data_present_in( $req_data ) ) {
+		foreach ($this->subsections() as $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				if ($subsection->form_data_present_in($req_data)) {
 					return TRUE;
 				}
-			}elseif( $subsection instanceof EE_Form_Section_Proper ) {
-				if( $subsection->form_data_present_in( $req_data ) ) {
+			}elseif ($subsection instanceof EE_Form_Section_Proper) {
+				if ($subsection->form_data_present_in($req_data)) {
 					return TRUE;
 				}
 			}
@@ -946,14 +946,14 @@ 
 	 */
 	public function get_validation_errors_accumulated() {
 		$validation_errors = $this->get_validation_errors();
-		foreach($this->get_validatable_subsections() as $subsection ) {
-			if( $subsection instanceof EE_Form_Section_Proper ) {
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			if ($subsection instanceof EE_Form_Section_Proper) {
 				$validation_errors_on_this_subsection = $subsection->get_validation_errors_accumulated();
 			} else {
-				$validation_errors_on_this_subsection =  $subsection->get_validation_errors();
+				$validation_errors_on_this_subsection = $subsection->get_validation_errors();
 			}
-			if( $validation_errors_on_this_subsection ){
-				$validation_errors = array_merge( $validation_errors, $validation_errors_on_this_subsection );
+			if ($validation_errors_on_this_subsection) {
+				$validation_errors = array_merge($validation_errors, $validation_errors_on_this_subsection);
 			}
 		}
 		return $validation_errors;

core/libraries/form_sections/base/EE_Form_Section_Validatable.form.php

Spacing +15 added lines, -15 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -34,7 +34,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-abstract class EE_Form_Section_Validatable extends EE_Form_Section_Base{
+abstract class EE_Form_Section_Validatable extends EE_Form_Section_Base {
 
 	/**
 	 * Array of validation errors in this section. Does not contain validation errors in subsections, however.
@@ -49,7 +49,7 @@ 
 	 * called get_validation_errors_accumulated
 	 * @return EE_Validation_Error[]
 	 */
-	public function get_validation_errors(){
+	public function get_validation_errors() {
 		return $this->_validation_errors;
 	}
 	/**
@@ -57,16 +57,16 @@ 
 	 * If we want this to be customizable, we may decide to create a strategy for displaying it.
 	 * @return string
 	 */
-	public function get_validation_error_string(){
+	public function get_validation_error_string() {
 		$validation_error_messages = array();
-		if($this->get_validation_errors()){
-			foreach($this->get_validation_errors() as $validation_error){
-				if ( $validation_error instanceof EE_Validation_Error ) {
-					$validation_error_messages[] =$validation_error->getMessage();
+		if ($this->get_validation_errors()) {
+			foreach ($this->get_validation_errors() as $validation_error) {
+				if ($validation_error instanceof EE_Validation_Error) {
+					$validation_error_messages[] = $validation_error->getMessage();
 				}
 			}
 		}
-		return implode(", ",$validation_error_messages);
+		return implode(", ", $validation_error_messages);
 	}
 
 
@@ -82,9 +82,9 @@ 
 	 * @return boolean
 	 */
 	public function is_valid() {
-		if(count($this->_validation_errors)){
+		if (count($this->_validation_errors)) {
 			return false;
-		}else{
+		} else {
 			return true;
 		}
 	}
@@ -109,11 +109,11 @@ 
 	 * @param Exception $previous_exception if there was an exception that caused the error, that exception
 	 * @return void
 	 */
-	function add_validation_error( $message_or_object, $error_code = NULL, $previous_exception = NULL ){
-		if($message_or_object instanceof EE_Validation_Error){
-			$validation_error= $message_or_object;
+	function add_validation_error($message_or_object, $error_code = NULL, $previous_exception = NULL) {
+		if ($message_or_object instanceof EE_Validation_Error) {
+			$validation_error = $message_or_object;
 			$validation_error->set_form_section($this);
-		}else{
+		} else {
 			$validation_error = new EE_Validation_Error($message_or_object, $error_code, $this, $previous_exception);
 		}
 		$this->_validation_errors[] = $validation_error;

Braces +4 added lines, -3 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -84,7 +85,7 @@ 
 	public function is_valid() {
 		if(count($this->_validation_errors)){
 			return false;
-		}else{
+		} else{
 			return true;
 		}
 	}
@@ -113,7 +114,7 @@ 
 		if($message_or_object instanceof EE_Validation_Error){
 			$validation_error= $message_or_object;
 			$validation_error->set_form_section($this);
-		}else{
+		} else{
 			$validation_error = new EE_Validation_Error($message_or_object, $error_code, $this, $previous_exception);
 		}
 		$this->_validation_errors[] = $validation_error;

core/libraries/form_sections/helpers/EE_Validation_Error.error.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-class EE_Validation_Error extends Exception{
+class EE_Validation_Error extends Exception {
 	/**
 	 * Form Section from which this error originated.
 	 * @var EE_Form_Section
@@ -20,7 +20,7 @@ 
 	 * @param EE_Form_Section_Validatable $form_section
 	 * @param Exception $previous if there was an exception that caused this exception
 	 */
-	function __construct( $message = null, $string_code = null,$form_section = null, $previous = null){
+	function __construct($message = null, $string_code = null, $form_section = null, $previous = null) {
 		$this->_form_section = $form_section;
 		$this->_string_code = $string_code;
 		parent::__construct($message, 500, $previous);
@@ -30,7 +30,7 @@ 
 	 * returns teh form section which caused the error.
 	 * @return EE_Form_Section_Validatable
 	 */
-	public function get_form_section(){
+	public function get_form_section() {
 		return $this->_form_section;
 	}
 	/**
@@ -38,7 +38,7 @@ 
 	 * @param EE_Form_Section_Validatable $form_section
 	 * @return void
 	 */
-	public function set_form_section($form_section){
+	public function set_form_section($form_section) {
 		$this->_form_section = $form_section;
 	}
 

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

Spacing +3 added lines, -3 removed lines

@@ -8,15 +8,15 @@
  * @since                4.6
  *
  */
-class EE_Admin_File_Uploader_Input extends EE_Form_Input_Base{
+class EE_Admin_File_Uploader_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_Admin_File_Uploader_Display_Strategy());
 		$this->_set_normalization_strategy(new EE_Text_Normalization());
-		$this->_add_validation_strategy(new EE_URL_Validation_Strategy( isset( $input_settings[ 'validation_error_message' ] ) ? $input_settings[ 'validation_error_message' ] : NULL ) );
+		$this->_add_validation_strategy(new EE_URL_Validation_Strategy(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : NULL));
 		parent::__construct($input_settings);
 	}
 }
\ No newline at end of file