eventespresso / event-espresso-core

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

Spacing +25 added lines, -25 removed lines

@@ -9,7 +9,7 @@ 
  * @author				Mike Nelson
  */
 use EventEspresso\core\libraries\rest_api\Model_Data_Translator;
-class EE_Select_Ajax_Model_Rest_Input extends EE_Form_Input_With_Options_Base{
+class EE_Select_Ajax_Model_Rest_Input extends EE_Form_Input_With_Options_Base {
 
 	/**
 	 * @var string $_model_name
@@ -43,7 +43,7 @@ 
 	 *                                  And the arguments accepted by EE_Form_Input_With_Options_Base
 	 * @throws \EE_Error
 	 */
-	public function __construct( $input_settings = array() ) {
+	public function __construct($input_settings = array()) {
 		//needed input settings:
 		//select2_args
 		$this->_model_name = EEH_Array::is_set(
@@ -55,7 +55,7 @@ 
 		$query_params = EEH_Array::is_set(
 			$input_settings,
 			'query_params',
-			array( 'limit' => 10, 'caps' => EEM_Base::caps_read_admin )
+			array('limit' => 10, 'caps' => EEM_Base::caps_read_admin)
 		);
 		$this->_value_field_name = EEH_Array::is_set(
 			$input_settings,
@@ -65,7 +65,7 @@ 
 		$this->_display_field_name = EEH_Array::is_set(
 			$input_settings,
 			'display_field_name',
-			$model->get_a_field_of_type( 'EE_Text_Field_Base' )->get_name()
+			$model->get_a_field_of_type('EE_Text_Field_Base')->get_name()
 		);
 		$this->_add_validation_strategy(
 			new EE_Model_Matching_Query_Validation_Strategy(
@@ -77,8 +77,8 @@ 
 		);
 		//get resource endpoint
 		$rest_controller = new EventEspresso\core\libraries\rest_api\controllers\model\Read();
-		$rest_controller->set_requested_version( EED_Core_Rest_Api::latest_rest_api_version() );
-		$url = $rest_controller->get_versioned_link_to( EEH_Inflector::pluralize_and_lower( $this->_model_name ) );
+		$rest_controller->set_requested_version(EED_Core_Rest_Api::latest_rest_api_version());
+		$url = $rest_controller->get_versioned_link_to(EEH_Inflector::pluralize_and_lower($this->_model_name));
 		$default_select2_args = array(
 			'ajax' => array(
 				'url' => $url,
@@ -86,13 +86,13 @@ 
 				'delay' => '250',
 				'data_interface' => 'EE_Select2_REST_API_Interface',
 				'data_interface_args' => array(
-					'default_query_params' => (object)Model_Data_Translator::prepare_query_params_for_rest_api( 
+					'default_query_params' => (object) Model_Data_Translator::prepare_query_params_for_rest_api( 
 						$query_params,
 						$model 
 					),
 					'display_field' => $this->_display_field_name,
 					'value_field' => $this->_value_field_name,
-					'nonce' => wp_create_nonce( 'wp_rest' )
+					'nonce' => wp_create_nonce('wp_rest')
 				),
 			),
 			'cache' => true,
@@ -100,10 +100,10 @@ 
 		);
 		$select2_args = array_replace_recursive(
 			$default_select2_args,
-			(array)EEH_Array::is_set( $input_settings, 'select2_args', array() )
+			(array) EEH_Array::is_set($input_settings, 'select2_args', array())
 		);
-		$this->set_display_strategy( new EE_Select2_Display_Strategy( $select2_args ) );
-		parent::__construct( array(), $input_settings );
+		$this->set_display_strategy(new EE_Select2_Display_Strategy($select2_args));
+		parent::__construct(array(), $input_settings);
 	}
 
 
@@ -116,33 +116,33 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function set_default( $value ) {
+	public function set_default($value) {
 
-		$values_for_options = (array)$value;
-		$value_field = $this->_get_model()->field_settings_for( $this->_value_field_name );
-		$display_field = $this->_get_model()->field_settings_for( $this->_display_field_name );
+		$values_for_options = (array) $value;
+		$value_field = $this->_get_model()->field_settings_for($this->_value_field_name);
+		$display_field = $this->_get_model()->field_settings_for($this->_display_field_name);
 		$display_values = $this->_get_model()->get_all_wpdb_results(
 			array(
 				array(
-					$this->_value_field_name => array( 'IN', $values_for_options )
+					$this->_value_field_name => array('IN', $values_for_options)
 				)
 			),
 			ARRAY_A,
 			implode(
 				',',
 				array(
-					$value_field->get_qualified_column() . ' AS ' . $this->_value_field_name,
-					$display_field->get_qualified_column() . ' AS ' . $this->_display_field_name
+					$value_field->get_qualified_column().' AS '.$this->_value_field_name,
+					$display_field->get_qualified_column().' AS '.$this->_display_field_name
 				)
 			)
 		);
 		$select_options = array();
-		foreach( $display_values as $db_rows ) {
-			$db_rows = (array)$db_rows;
-			$select_options[ $db_rows[ $this->_value_field_name ] ] = $db_rows[ $this->_display_field_name ];
+		foreach ($display_values as $db_rows) {
+			$db_rows = (array) $db_rows;
+			$select_options[$db_rows[$this->_value_field_name]] = $db_rows[$this->_display_field_name];
 		}
-		$this->set_select_options( $select_options );
-		parent::set_default( $value );
+		$this->set_select_options($select_options);
+		parent::set_default($value);
 	}
 
 	/**
@@ -151,7 +151,7 @@ 
 	 * @throws EE_Error
 	 */
 	protected function _get_model() {
-		if( ! EE_Registry::instance()->is_model_name(  $this->_model_name ) ) {
+		if ( ! EE_Registry::instance()->is_model_name($this->_model_name)) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -162,7 +162,7 @@ 
 				)
 			);
 		} else {
-			return EE_Registry::instance()->load_model( $this->_model_name );
+			return EE_Registry::instance()->load_model($this->_model_name);
 		}
 	}
 

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

Spacing +9 added lines, -9 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,16 +39,16 @@ 
 	 * @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;
 	}
 	
 	/**
 	 * Gets the HTML IDs of all the inputs
 	 * @return array
 	 */
-	public function get_html_input_ids( $add_pound_sign = false ) {
-		return array( $this->get_input()->html_id( $add_pound_sign ) );
+	public function get_html_input_ids($add_pound_sign = false) {
+		return array($this->get_input()->html_id($add_pound_sign));
 	}
 
 
@@ -60,7 +60,7 @@ 
 	 * @param array $other_js_data
 	 * @return array
 	 */
-	public function get_other_js_data( $other_js_data = array() ) {
+	public function get_other_js_data($other_js_data = array()) {
 		return $other_js_data;
 	}
 

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

Spacing +75 added lines, -75 removed lines

@@ -7,7 +7,7 @@ 
  * @subpackage
  * @author				Mike Nelson
  */
-class EE_Form_Input_With_Options_Base extends EE_Form_Input_Base{
+class EE_Form_Input_With_Options_Base extends EE_Form_Input_Base {
 
 	/**
 	 * array of available options to choose as an answer
@@ -57,18 +57,18 @@ 
 	 * }
 	 * And all the options accepted by EE_Form_Input_Base
 	 */
-	public function __construct( $answer_options = array(), $input_settings = array() ) {
-		if ( isset( $input_settings['label_size'] )) {
-			$this->_set_label_size( $input_settings['label_size'] );
-			if ( isset( $input_settings['enforce_label_size'] ) && $input_settings['enforce_label_size'] ) {
+	public function __construct($answer_options = array(), $input_settings = array()) {
+		if (isset($input_settings['label_size'])) {
+			$this->_set_label_size($input_settings['label_size']);
+			if (isset($input_settings['enforce_label_size']) && $input_settings['enforce_label_size']) {
 				$this->_enforce_label_size = TRUE;
 			}
 		}
-		if ( isset( $input_settings['display_html_label_text'] )) {
-			$this->set_display_html_label_text( $input_settings['display_html_label_text'] );
+		if (isset($input_settings['display_html_label_text'])) {
+			$this->set_display_html_label_text($input_settings['display_html_label_text']);
 		}
-		$this->set_select_options( $answer_options );
-		parent::__construct( $input_settings );
+		$this->set_select_options($answer_options);
+		parent::__construct($input_settings);
 	}
 
 
@@ -79,47 +79,47 @@ 
 	 * @param array $answer_options
 	 * @return void  just has the side-effect of setting the options for this input
 	 */
-	public function set_select_options( $answer_options = array() ){
-		$answer_options = is_array( $answer_options ) ? $answer_options : array( $answer_options );
+	public function set_select_options($answer_options = array()) {
+		$answer_options = is_array($answer_options) ? $answer_options : array($answer_options);
 		//get the first item in the select options and check it's type
-		if ( reset( $answer_options ) instanceof EE_Question_Option ) {
-			$this->_options = $this->_process_question_options( $answer_options );
+		if (reset($answer_options) instanceof EE_Question_Option) {
+			$this->_options = $this->_process_question_options($answer_options);
 		} else {
 			$this->_options = $answer_options;
 		}
 		//d( $this->_options );
-		$select_option_keys = array_keys( $this->_options );
+		$select_option_keys = array_keys($this->_options);
 		// attempt to determine data type for values in order to set normalization type
 		if (
-			count( $this->_options ) == 2
+			count($this->_options) == 2
 			&&
 			(
-				( in_array( TRUE, $select_option_keys, true ) && in_array( FALSE, $select_option_keys, true ))
-				|| ( in_array( 1, $select_option_keys, true ) && in_array( 0, $select_option_keys, true ))
+				(in_array(TRUE, $select_option_keys, true) && in_array(FALSE, $select_option_keys, true))
+				|| (in_array(1, $select_option_keys, true) && in_array(0, $select_option_keys, true))
 			)
-		){
+		) {
 			// values appear to be boolean, like TRUE, FALSE, 1, 0
 			$normalization = new EE_Boolean_Normalization();
-		} else{
+		} else {
 			//are ALL the options ints? If so use int validation
 			$all_ints = true;
-			foreach($select_option_keys as $value ){
-				if( ! is_int( $value ) ){
+			foreach ($select_option_keys as $value) {
+				if ( ! is_int($value)) {
 					$all_ints = false;
 					break;
 				}
 			}
-			if( $all_ints ){
+			if ($all_ints) {
 				$normalization = new EE_Int_Normalization();
-			}else{
+			} else {
 				$normalization = new EE_Text_Normalization();
 			}
 		}
 		// does input type have multiple options ?
-		if ( $this->_multiple_selections ) {
-			$this->_set_normalization_strategy( new EE_Many_Valued_Normalization( $normalization ));
+		if ($this->_multiple_selections) {
+			$this->_set_normalization_strategy(new EE_Many_Valued_Normalization($normalization));
 		} else {
-			$this->_set_normalization_strategy( $normalization );
+			$this->_set_normalization_strategy($normalization);
 		}
 	}
 
@@ -128,7 +128,7 @@ 
 	/**
 	 * @return array
 	 */
-	public function options(){
+	public function options() {
 		return $this->_options;
 	}
 
@@ -138,7 +138,7 @@ 
 	 * Returns an array which is guaranteed to not be multidimensional
 	 * @return array
 	 */
-	public function flat_options(){
+	public function flat_options() {
 		return $this->_flatten_select_options($this->options());
 	}
 
@@ -149,19 +149,19 @@ 
 	 * @param array $arr
 	 * @return array
 	 */
-	protected function _flatten_select_options( $arr ){
+	protected function _flatten_select_options($arr) {
 		$flat_array = array();
-		if ( EEH_Array::is_multi_dimensional_array( $arr )) {
-			foreach( $arr as $sub_array ){
-				foreach( $sub_array as $key => $value ) {
-					$flat_array[ $key ] = $value;
-					$this->_set_label_size( $value );
+		if (EEH_Array::is_multi_dimensional_array($arr)) {
+			foreach ($arr as $sub_array) {
+				foreach ($sub_array as $key => $value) {
+					$flat_array[$key] = $value;
+					$this->_set_label_size($value);
 				}
 			}
 		} else {
-			foreach( $arr as $key => $value ) {
-				$flat_array[ $key ] = $value;
-				$this->_set_label_size( $value );
+			foreach ($arr as $key => $value) {
+				$flat_array[$key] = $value;
+				$this->_set_label_size($value);
 			}
 		}
 		return $flat_array;
@@ -173,18 +173,18 @@ 
 	 * @param EE_Question_Option[] $question_options_array
 	 * @return array
 	 */
-	protected function _process_question_options( $question_options_array = array() ) {
+	protected function _process_question_options($question_options_array = array()) {
 		$flat_array = array();
-		foreach( $question_options_array as $question_option ) {
-			if ( $question_option instanceof EE_Question_Option ) {
+		foreach ($question_options_array as $question_option) {
+			if ($question_option instanceof EE_Question_Option) {
 				$desc = '';
-				if ( $this->_use_desc_in_label ) {
+				if ($this->_use_desc_in_label) {
 					$desc = $question_option->desc();
-					$desc = ! empty( $desc ) ? '<span class="ee-question-option-desc"> - ' . $desc . '</span>' : '';
+					$desc = ! empty($desc) ? '<span class="ee-question-option-desc"> - '.$desc.'</span>' : '';
 				}
-				$flat_array[ $question_option->value() ] = $question_option->value() . $desc;
-			} elseif ( is_array( $question_option )) {
-				$non_question_option = $this->_flatten_select_options( $question_option );
+				$flat_array[$question_option->value()] = $question_option->value().$desc;
+			} elseif (is_array($question_option)) {
+				$non_question_option = $this->_flatten_select_options($question_option);
 				$flat_array = $flat_array + $non_question_option;
 			}
 		}
@@ -197,12 +197,12 @@ 
 	 *    set_label_sizes
 	 * @return void
 	 */
-	public function set_label_sizes(){
+	public function set_label_sizes() {
 		// did the input settings specifically say to NOT set the label size dynamically ?
-		if ( ! $this->_enforce_label_size ) {
-			foreach( $this->_options as $option ) {
+		if ( ! $this->_enforce_label_size) {
+			foreach ($this->_options as $option) {
 				// calculate the strlen of the label
-				$this->_set_label_size( $option );
+				$this->_set_label_size($option);
 			}
 		}
 	}
@@ -214,9 +214,9 @@ 
 	 * @param int|string $value
 	 * @return void
 	 */
-	private function _set_label_size( $value = '' ){
+	private function _set_label_size($value = '') {
 		// determine length of option value
-		$val_size = is_int( $value ) ? $value : strlen( $value );
+		$val_size = is_int($value) ? $value : strlen($value);
 		// use new value if bigger than existing
 		$this->_label_size = $val_size > $this->_label_size ? $val_size : $this->_label_size;
 	}
@@ -227,22 +227,22 @@ 
 	 * 	get_label_size_class
 	 * @return string
 	 */
-	function get_label_size_class(){
+	function get_label_size_class() {
 		// use maximum option value length to determine label size
-		if( $this->_label_size < 3 ) {
+		if ($this->_label_size < 3) {
 			$size = ' nano-lbl';
-		} else if ( $this->_label_size < 6 ) {
-			$size =  ' micro-lbl';
-		} else if ( $this->_label_size < 12 ) {
-			$size =  ' tiny-lbl';
-		} else if ( $this->_label_size < 25 ) {
-			$size =  ' small-lbl';
-		} else if ( $this->_label_size < 50 ) {
-			$size =  ' medium-lbl';
-		} else if ( $this->_label_size >= 100 ) {
-			$size =  ' big-lbl';
+		} else if ($this->_label_size < 6) {
+			$size = ' micro-lbl';
+		} else if ($this->_label_size < 12) {
+			$size = ' tiny-lbl';
+		} else if ($this->_label_size < 25) {
+			$size = ' small-lbl';
+		} else if ($this->_label_size < 50) {
+			$size = ' medium-lbl';
+		} else if ($this->_label_size >= 100) {
+			$size = ' big-lbl';
 		} else {
-			$size =  ' medium-lbl';
+			$size = ' medium-lbl';
 		}
 		return $size;
 	}
@@ -251,21 +251,21 @@ 
 	 * Returns the pretty value for the normalized value
 	 * @return string
 	 */
-	function pretty_value(){
+	function pretty_value() {
 		$options = $this->flat_options();
-		$unnormalized_value_choices = $this->get_normalization_strategy()->unnormalize( $this->_normalized_value );
-		if( ! $this->_multiple_selections ){
-			$unnormalized_value_choices = array( $unnormalized_value_choices );
+		$unnormalized_value_choices = $this->get_normalization_strategy()->unnormalize($this->_normalized_value);
+		if ( ! $this->_multiple_selections) {
+			$unnormalized_value_choices = array($unnormalized_value_choices);
 		}
 		$pretty_strings = array();
-		foreach( $unnormalized_value_choices as $unnormalized_value_choice ){
-			if( isset( $options[ $unnormalized_value_choice ] ) ){
-				$pretty_strings[] =  $options[ $unnormalized_value_choice ];
-			}else{
+		foreach ($unnormalized_value_choices as $unnormalized_value_choice) {
+			if (isset($options[$unnormalized_value_choice])) {
+				$pretty_strings[] = $options[$unnormalized_value_choice];
+			} else {
 				$pretty_strings[] = $this->normalized_value();
 			}
 		}
-		return implode(", ", $pretty_strings );
+		return implode(", ", $pretty_strings);
 	}
 
 
@@ -282,8 +282,8 @@ 
 	/**
 	 * @param boolean $display_html_label_text
 	 */
-	public function set_display_html_label_text( $display_html_label_text ) {
-		$this->_display_html_label_text = filter_var( $display_html_label_text, FILTER_VALIDATE_BOOLEAN );
+	public function set_display_html_label_text($display_html_label_text) {
+		$this->_display_html_label_text = filter_var($display_html_label_text, FILTER_VALIDATE_BOOLEAN);
 	}
 
 

core/libraries/form_sections/strategies/validation/EE_Model_Matching_Query_Validation_Strategy.strategy.php

Spacing +12 added lines, -12 removed lines

@@ -10,7 +10,7 @@ 
  * @subpackage	Expression package is undefined on line 19, column 19 in Templates/Scripting/PHPClass.php.
  * @author				Mike Nelson
  */
-class EE_Model_Matching_Query_Validation_Strategy extends EE_Validation_Strategy_Base{
+class EE_Model_Matching_Query_Validation_Strategy extends EE_Validation_Strategy_Base {
 
 	/**
 	 *
@@ -29,17 +29,17 @@ 
 	 * @param string $input_field_name the input will be treated as this field's value
 	 * @throws \EE_Error
 	 */
-	public function __construct( $validation_error_message = NULL, $model_name = '', $query_params = array(), $input_field_name = '' ) {
-		if( ! EE_Registry::instance()->is_model_name( $model_name ) ) {
-			throw new EE_Error( sprintf( __( 'You must provide a valid model object ', 'event_espresso'), $model_name ) );
+	public function __construct($validation_error_message = NULL, $model_name = '', $query_params = array(), $input_field_name = '') {
+		if ( ! EE_Registry::instance()->is_model_name($model_name)) {
+			throw new EE_Error(sprintf(__('You must provide a valid model object ', 'event_espresso'), $model_name));
 		}
-		$this->_model = EE_Registry::instance()->load_model( $model_name );
+		$this->_model = EE_Registry::instance()->load_model($model_name);
 		$this->_query_params = $query_params;
-		if( empty( $input_field_name ) ) {
+		if (empty($input_field_name)) {
 			$input_field_name = $this->_model->primary_key_name();
 		}
 		$this->_input_field_name = $input_field_name;
-		parent::__construct( $validation_error_message );
+		parent::__construct($validation_error_message);
 	}
 
 
@@ -51,13 +51,13 @@ 
 	 * @throws \EE_Validation_Error
 	 */
 	public function validate($normalized_value) {
-		if( empty( $normalized_value ) ) {
+		if (empty($normalized_value)) {
 			return true;
 		}
 		$combined_query_params = $this->get_query_params();
-		$combined_query_params[0][ $this->treat_input_as_field() ] = $normalized_value;
-		if( ! $this->get_model()->exists( $combined_query_params ) ) {
-			throw new EE_Validation_Error( $this->get_validation_error_message(), 'no_matching_model_object' );
+		$combined_query_params[0][$this->treat_input_as_field()] = $normalized_value;
+		if ( ! $this->get_model()->exists($combined_query_params)) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'no_matching_model_object');
 		}
 	}
 
@@ -74,7 +74,7 @@ 
 	 * @return array
 	 */
 	public function get_query_params() {
-		return (array)$this->_query_params;
+		return (array) $this->_query_params;
 	}
 
 	/**

core/libraries/form_sections/strategies/validation/EE_Text_Validation_Strategy.strategy.php

Spacing +12 added lines, -12 removed lines

@@ -7,7 +7,7 @@ 
  * @subpackage	Expression package is undefined on line 19, column 19 in Templates/Scripting/PHPClass.php.
  * @author				Mike Nelson
  */
-class EE_Text_Validation_Strategy extends EE_Validation_Strategy_Base{
+class EE_Text_Validation_Strategy extends EE_Validation_Strategy_Base {
 
 	protected $_regex = null;
 	/**
@@ -15,18 +15,18 @@ 
 	 * @param string $validation_error_message
 	 * @param string $regex a PHP regex; the javascript regex will be derived from this
 	 */
-	public function __construct( $validation_error_message = NULL, $regex = null ) {
+	public function __construct($validation_error_message = NULL, $regex = null) {
 		$this->_regex = $regex;
-		parent::__construct( $validation_error_message );
+		parent::__construct($validation_error_message);
 	}
 
 	/**
 	 * @param $normalized_value
 	 */
 	public function validate($normalized_value) {
-		if( $this->_regex && $normalized_value) {
-			if( ! preg_match( $this->_regex, $normalized_value ) ) {
-				throw new EE_Validation_Error( $this->get_validation_error_message(), 'regex' );
+		if ($this->_regex && $normalized_value) {
+			if ( ! preg_match($this->_regex, $normalized_value)) {
+				throw new EE_Validation_Error($this->get_validation_error_message(), 'regex');
 			}
 		}
 	}
@@ -34,10 +34,10 @@ 
 	/**
 	 * @return array
 	 */
-	function get_jquery_validation_rule_array(){
-		if( $this->_regex !== null ){
-			return array( 'regex'=> $this->regex_js(), 'messages' => array( 'regex' => $this->get_validation_error_message() ) );
-		}else{
+	function get_jquery_validation_rule_array() {
+		if ($this->_regex !== null) {
+			return array('regex'=> $this->regex_js(), 'messages' => array('regex' => $this->get_validation_error_message()));
+		} else {
 			return array();
 		}
 
@@ -51,8 +51,8 @@ 
 	function regex_js() {
 		//first character must be the delimiter
 		$delimeter = $this->_regex[0];
-		$last_occurence_of_delimieter = strrpos($this->_regex, $delimeter );
-		return substr( $this->_regex, 1, $last_occurence_of_delimieter - 1 );
+		$last_occurence_of_delimieter = strrpos($this->_regex, $delimeter);
+		return substr($this->_regex, 1, $last_occurence_of_delimieter - 1);
 	}
 }
 

core/libraries/form_sections/strategies/validation/EE_Validation_Strategy_Base.strategy.php

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -22,9 +22,9 @@ 
 	/**
 	 * @param null $validation_error_message
 	 */
-	public function __construct( $validation_error_message = null ) {
+	public function __construct($validation_error_message = null) {
 		$this->_validation_error_message = $validation_error_message === null
-			? __( 'Input invalid', 'event_espresso' )
+			? __('Input invalid', 'event_espresso')
 			: $validation_error_message;
 		parent::__construct();
 	}
@@ -41,7 +41,7 @@ 
 	 *                                this validation strategy is the 'required' validation strategy,
 	 *                                most should be OK with a null, empty string, etc)
 	 */
-	public function validate( $normalized_value ) {
+	public function validate($normalized_value) {
 		//by default, the validation strategy does no validation. this should be implemented
 	}
 
@@ -92,7 +92,7 @@ 
 	 * @param array $other_js_data
 	 * @return array
 	 */
-	public function get_other_js_data( $other_js_data = array() ) {
+	public function get_other_js_data($other_js_data = array()) {
 		return $other_js_data;
 	}
 	

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

Braces +1 added lines, -1 removed lines

@@ -173,7 +173,7 @@
 		if( ! $this->_html_id ){
 			if( $this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper ){
 				$this->_html_id = $this->_parent_section->html_id() . '-' . $this->_prep_name_for_html_id( $this->name() );
-			}else{
+			} else{
 				$this->_html_id = $this->_prep_name_for_html_id( $this->name() );
 			}
 		}

Spacing +53 added lines, -53 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION')){
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 /**
@@ -79,12 +79,12 @@ 
 	 *	@type $name string the name for this form section, if you want to explicitly define it
 	 * }
 	 */
-	public function __construct( $options_array = array() ) {
+	public function __construct($options_array = array()) {
 		// used by display strategies
 		// assign incoming values to properties
-		foreach( $options_array as $key => $value ) {
-			$key = '_' . $key;
-			if ( property_exists( $this, $key ) && empty( $this->{$key} )) {
+		foreach ($options_array as $key => $value) {
+			$key = '_'.$key;
+			if (property_exists($this, $key) && empty($this->{$key} )) {
 				$this->{$key} = $value;
 			}
 		}
@@ -97,7 +97,7 @@ 
 	 * @param $name
 	 * @throws \EE_Error
 	 */
-	protected function _construct_finalize( $parent_form_section, $name ){
+	protected function _construct_finalize($parent_form_section, $name) {
 		$this->_construction_finalized = TRUE;
 		$this->_parent_section = $parent_form_section;
 		$this->_name = $name;
@@ -118,7 +118,7 @@ 
 	/**
 	 * @param string $action
 	 */
-	public function set_action( $action ) {
+	public function set_action($action) {
 		$this->_action = $action;
 	}
 
@@ -128,7 +128,7 @@ 
 	 * @return string
 	 */
 	public function method() {
-		return ! empty( $this->_method ) ? $this->_method : 'POST';
+		return ! empty($this->_method) ? $this->_method : 'POST';
 	}
 
 
@@ -136,8 +136,8 @@ 
 	/**
 	 * @param string $method
 	 */
-	public function set_method( $method ) {
-		switch ( $method ) {
+	public function set_method($method) {
+		switch ($method) {
 			case 'get' :
 			case 'GET' :
 				$this->_method = 'GET';
@@ -156,12 +156,12 @@ 
 	 *
 	 * @throws \EE_Error
 	 */
-	protected function _set_default_html_id_if_empty(){
-		if( ! $this->_html_id ){
-			if( $this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper ){
-				$this->_html_id = $this->_parent_section->html_id() . '-' . $this->_prep_name_for_html_id( $this->name() );
-			}else{
-				$this->_html_id = $this->_prep_name_for_html_id( $this->name() );
+	protected function _set_default_html_id_if_empty() {
+		if ( ! $this->_html_id) {
+			if ($this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper) {
+				$this->_html_id = $this->_parent_section->html_id().'-'.$this->_prep_name_for_html_id($this->name());
+			} else {
+				$this->_html_id = $this->_prep_name_for_html_id($this->name());
 			}
 		}
 	}
@@ -173,8 +173,8 @@ 
 	 * @param $name
 	 * @return string
 	 */
-	private function _prep_name_for_html_id( $name ) {
-		return sanitize_key( str_replace( array( '&nbsp;', ' ', '_' ), '-', $name ));
+	private function _prep_name_for_html_id($name) {
+		return sanitize_key(str_replace(array('&nbsp;', ' ', '_'), '-', $name));
 	}
 
 
@@ -188,7 +188,7 @@ 
 	 * and so might stop working anytime.
 	 * @return string
 	 */
-	public function get_html_and_js(){
+	public function get_html_and_js() {
 		return $this->get_html();
 	}
 	
@@ -204,8 +204,8 @@ 
 	 * @param bool $add_pound_sign
 	 * @return string
 	 */
-	public function html_id( $add_pound_sign = FALSE ){
-		return $add_pound_sign ? '#' . $this->_html_id : $this->_html_id;
+	public function html_id($add_pound_sign = FALSE) {
+		return $add_pound_sign ? '#'.$this->_html_id : $this->_html_id;
 	}
 
 
@@ -213,7 +213,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_class(){
+	public function html_class() {
 		return $this->_html_class;
 	}
 
@@ -222,7 +222,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_style(){
+	public function html_style() {
 		return $this->_html_style;
 	}
 
@@ -231,7 +231,7 @@ 
 	/**
 	 * @param mixed $html_class
 	 */
-	public function set_html_class( $html_class ) {
+	public function set_html_class($html_class) {
 		$this->_html_class = $html_class;
 	}
 
@@ -240,7 +240,7 @@ 
 	/**
 	 * @param mixed $html_id
 	 */
-	public function set_html_id( $html_id ) {
+	public function set_html_id($html_id) {
 		$this->_html_id = $html_id;
 	}
 
@@ -249,7 +249,7 @@ 
 	/**
 	 * @param mixed $html_style
 	 */
-	public function set_html_style( $html_style ) {
+	public function set_html_style($html_style) {
 		$this->_html_style = $html_style;
 	}
 
@@ -258,7 +258,7 @@ 
 	/**
 	 * @param string $other_html_attributes
 	 */
-	public function set_other_html_attributes( $other_html_attributes ) {
+	public function set_other_html_attributes($other_html_attributes) {
 		$this->_other_html_attributes = $other_html_attributes;
 	}
 
@@ -278,9 +278,9 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	public function name(){
-		if( ! $this->_construction_finalized ){
-			throw new EE_Error(sprintf( __( 'You cannot use the form section\s name until _construct_finalize has been called on it (when we set the name). It was called on a form section of type \'s\'', 'event_espresso' ), get_class($this) ) );
+	public function name() {
+		if ( ! $this->_construction_finalized) {
+			throw new EE_Error(sprintf(__('You cannot use the form section\s name until _construct_finalize has been called on it (when we set the name). It was called on a form section of type \'s\'', 'event_espresso'), get_class($this)));
 		}
 		return $this->_name;
 	}
@@ -291,7 +291,7 @@ 
 	 * Gets the parent section
 	 * @return EE_Form_Section_Proper
 	 */
-	public function parent_section(){
+	public function parent_section() {
 		return $this->_parent_section;
 	}
 
@@ -304,18 +304,18 @@ 
 	 * @param string $other_attributes anything else added to the form open tag, MUST BE VALID HTML
 	 * @return string
 	 */
-	public function form_open( $action = '', $method = '', $other_attributes = '' ) {
-		if ( ! empty( $action )) {
-			$this->set_action( $action );
+	public function form_open($action = '', $method = '', $other_attributes = '') {
+		if ( ! empty($action)) {
+			$this->set_action($action);
 		}
-		if ( ! empty( $method )) {
-			$this->set_method( $method );
+		if ( ! empty($method)) {
+			$this->set_method($method);
 		}
-		$html = EEH_HTML::nl( 1, 'form' ) . '<form';
-		$html .= $this->html_id() !== '' ? ' id="' . $this->html_id() . '"' : '';
-		$html .= ' action="' . $this->action() . '"';
-		$html .= ' method="' . $this->method() . '"';
-		$html .= $other_attributes . '>';
+		$html = EEH_HTML::nl(1, 'form').'<form';
+		$html .= $this->html_id() !== '' ? ' id="'.$this->html_id().'"' : '';
+		$html .= ' action="'.$this->action().'"';
+		$html .= ' method="'.$this->method().'"';
+		$html .= $other_attributes.'>';
 		return $html;
 	}
 
@@ -326,7 +326,7 @@ 
 	 * @return string
 	 */
 	public function form_close() {
-		return EEH_HTML::nl( -1, 'form' ) . '</form>' . EEH_HTML::nl() . '<!-- end of ee-' . $this->html_id() . '-form -->' . EEH_HTML::nl();
+		return EEH_HTML::nl( -1, 'form' ).'</form>'.EEH_HTML::nl().'<!-- end of ee-'.$this->html_id().'-form -->'.EEH_HTML::nl();
 	}
 	
 	/**
@@ -335,7 +335,7 @@ 
 	 * Default does nothing, but child classes can override
 	 * @return void
 	 */
-	public function enqueue_js(){
+	public function enqueue_js() {
 		//defaults to enqueue NO js or css
 	}
 
@@ -351,7 +351,7 @@ 
 	 * @param array $form_other_js_data
 	 * @return array
 	 */
-	public function get_other_js_data( $form_other_js_data = array() ) {
+	public function get_other_js_data($form_other_js_data = array()) {
 		return $form_other_js_data;
 	}
 
@@ -369,20 +369,20 @@ 
 	 * @param string|false $form_section_path we accept false also because substr( '../', '../' ) = false
 	 * @return EE_Form_Section_Base
 	 */
-	public function find_section_from_path( $form_section_path ) {		
-		if( strpos( $form_section_path, '/' ) === 0 ) {
-			$form_section_path = substr( $form_section_path, strlen( '/' ) );
+	public function find_section_from_path($form_section_path) {		
+		if (strpos($form_section_path, '/') === 0) {
+			$form_section_path = substr($form_section_path, strlen('/'));
 		}
-		if( empty( $form_section_path ) ) {
+		if (empty($form_section_path)) {
 			return $this;
 		}
-		if( strpos( $form_section_path, '../' ) === 0 ) {
+		if (strpos($form_section_path, '../') === 0) {
 			$parent = $this->parent_section();
 			
-			$form_section_path = substr( $form_section_path, strlen( '../' ) );
-			if( $parent instanceof EE_Form_Section_Base ) {
-				return $parent->find_section_from_path( $form_section_path );
-			} elseif( empty( $form_section_path ) ) {
+			$form_section_path = substr($form_section_path, strlen('../'));
+			if ($parent instanceof EE_Form_Section_Base) {
+				return $parent->find_section_from_path($form_section_path);
+			} elseif (empty($form_section_path)) {
 				return $this;
 			}
 		}

core/libraries/payment_methods/EE_Offsite_Gateway.lib.php

Spacing +7 added lines, -7 removed lines

@@ -24,7 +24,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-abstract class EE_Offsite_Gateway extends EE_Gateway{
+abstract class EE_Offsite_Gateway extends EE_Gateway {
 
 	/**
 	 * whether or not the gateway uses an IPN
@@ -61,7 +61,7 @@ 
 	 * @param string     $cancel_url URL to send the user to after a cancelled payment attempt on teh payment provider's website
 	 * @return EE_Payment
 	 */
-	public abstract function set_redirection_info( $payment, $billing_info = array(), $return_url = NULL, $notify_url = NULL, $cancel_url = NULL);
+	public abstract function set_redirection_info($payment, $billing_info = array(), $return_url = NULL, $notify_url = NULL, $cancel_url = NULL);
 
 
 
@@ -74,7 +74,7 @@ 
 	 * @param EEI_Transaction $transaction
 	 * @return EEI_Payment updated
 	 */
-	public abstract function handle_payment_update($update_info,$transaction);
+	public abstract function handle_payment_update($update_info, $transaction);
 
 
 
@@ -101,8 +101,8 @@ 
 	 * @access protected
 	 * @param boolean $uses_separate_IPN_request
 	 */
-	protected function set_uses_separate_IPN_request( $uses_separate_IPN_request ) {
-		$this->_uses_separate_IPN_request = filter_var( $uses_separate_IPN_request, FILTER_VALIDATE_BOOLEAN );
+	protected function set_uses_separate_IPN_request($uses_separate_IPN_request) {
+		$this->_uses_separate_IPN_request = filter_var($uses_separate_IPN_request, FILTER_VALIDATE_BOOLEAN);
 	}
 
 	/**
@@ -119,8 +119,8 @@ 
 	 * @param boolean $separate_IPN_request
 	 * @return boolean
 	 */
-	public function handle_IPN_in_this_request( $request_data, $separate_IPN_request ) {
-		if( $separate_IPN_request ) {
+	public function handle_IPN_in_this_request($request_data, $separate_IPN_request) {
+		if ($separate_IPN_request) {
 			// payment data being sent in a request separate from the user
 			// it is this other request that will update the TXN and payment info
 			return $this->_uses_separate_IPN_request;

core/db_models/EEM_Status.model.php

Spacing +23 added lines, -23 removed lines

@@ -13,7 +13,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
 /**
  *
  * Class EEM_Status
@@ -32,32 +32,32 @@ 
 	/**
 	 * @return EEM_Status
 	 */
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Status','event_espresso');
-		$this->plural_item = __('Stati','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Status', 'event_espresso');
+		$this->plural_item = __('Stati', 'event_espresso');
 		$this->_tables = array(
 			'StatusTable'=> new EE_Primary_Table('esp_status', 'STS_ID')
 		);
 		$this->_fields = array(
 			'StatusTable'=>array(
-				'STS_ID'=> new EE_Primary_Key_String_Field('STS_ID', __('Status ID','event_espresso')),
-				'STS_code'=>new EE_Plain_Text_Field('STS_code',__('Status Code','event_espresso'),false, ''),
+				'STS_ID'=> new EE_Primary_Key_String_Field('STS_ID', __('Status ID', 'event_espresso')),
+				'STS_code'=>new EE_Plain_Text_Field('STS_code', __('Status Code', 'event_espresso'), false, ''),
 				'STS_type'=>new EE_Enum_Text_Field(
 					'STS_type',
 					__("Type", "event_espresso"),
 					false,
 					'event',
 						array(
-							'event'=> __("Event", "event_espresso"),//deprecated
+							'event'=> __("Event", "event_espresso"), //deprecated
 							'registration'=>  __("Registration", "event_espresso"),
 							'transaction'=>  __("Transaction", "event_espresso"),
 							'payment'=>  __("Payment", "event_espresso"),
 							'email'=>  __("Email", "event_espresso"),
 							'message' => __("Message", "event_espresso")
 						)),
-				'STS_can_edit'=>new EE_Boolean_Field('STS_can_edit', __('Editable?','event_espresso'), false),
+				'STS_can_edit'=>new EE_Boolean_Field('STS_can_edit', __('Editable?', 'event_espresso'), false),
 				'STS_desc'=>new EE_Simple_HTML_Field('STS_desc', __("Description", "event_espresso"), false, ''),
-				'STS_open'=>new EE_Boolean_Field('STS_open', __("Open?", "event_espresso"), false,false)
+				'STS_open'=>new EE_Boolean_Field('STS_open', __("Open?", "event_espresso"), false, false)
 			));
 		$this->_model_relations = array(
 			'Registration'=>new EE_Has_Many_Relation(),
@@ -65,9 +65,9 @@ 
 			'Payment'=>new EE_Has_Many_Relation()
 		);
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -80,7 +80,7 @@ 
 	 * @throws EE_Error
 	 * @return array             an array of translated strings for the incoming status id.
 	 */
-	public function localized_status(  $statuses, $plural = FALSE, $schema = 'upper' ) {
+	public function localized_status($statuses, $plural = FALSE, $schema = 'upper') {
 		//note these are all in lower case because ucwords() on upper case will NOT convert.
 		$translation_array = array(
 	     	EEM_Registration::status_id_pending_payment => array(
@@ -222,8 +222,8 @@ 
 		        __('failed', 'event_espresso'),
 	        ),
 			EEM_Message::status_debug_only => array(
-				__( 'debug only', 'event_espresso' ),
-				__( 'debug only', 'event_espresso' )
+				__('debug only', 'event_espresso'),
+				__('debug only', 'event_espresso')
 			),
 	        EEM_Message::status_resend => array(
 		        __('queued for resending', 'event_espresso'),
@@ -263,30 +263,30 @@ 
   			),
 	    );
 
-		$translation_array = apply_filters( 'FHEE__EEM_Status__localized_status__translation_array', $translation_array );
+		$translation_array = apply_filters('FHEE__EEM_Status__localized_status__translation_array', $translation_array);
 
-		if ( !is_array($statuses) )
-			throw new EE_Error( __('The incoming statuses argument must be an array with keys as the $status_id and values as the $status_code', 'event_espresso') );
+		if ( ! is_array($statuses))
+			throw new EE_Error(__('The incoming statuses argument must be an array with keys as the $status_id and values as the $status_code', 'event_espresso'));
 
 	    $translation = array();
 
-	    foreach ( $statuses as $id => $code ) {
-	    	if ( isset( $translation_array[$id] ) ) {
+	    foreach ($statuses as $id => $code) {
+	    	if (isset($translation_array[$id])) {
 	    		$translation[$id] = $plural ? $translation_array[$id][1] : $translation_array[$id][0];
 	    	} else {
 	    		$translation[$id] = $code;
 	    	}
 
 	    	//schema
-	    	switch ( $schema ) {
+	    	switch ($schema) {
 	    		case 'lower' :
-	    			$translation[$id] = strtolower( $translation[$id] ); //even though these start in lower case, this will catch any statuses added via filter.
+	    			$translation[$id] = strtolower($translation[$id]); //even though these start in lower case, this will catch any statuses added via filter.
 	    			break;
 	    		case 'sentence' :
-	    			$translation[$id] = ucwords( $translation[$id] );
+	    			$translation[$id] = ucwords($translation[$id]);
 	    			break;
 	    		case 'upper' :
-	    			$translation[$id] = strtoupper( $translation[$id] );
+	    			$translation[$id] = strtoupper($translation[$id]);
 	    			break;
 	    	}
 	    }