eventespresso / event-espresso-core

core/helpers/EEH_URL.helper.php

Doc Comments -1 removed lines

@@ -49,7 +49,6 @@
 	 * Returns whether not the remote file exists.
 	 * Checking via GET because HEAD requests are blocked on some server configurations.
 	 * @param string $url
-	 * @param boolean $sslverify whether we care if the SSL certificate for the requested site is setup properly
 	 * @return boolean
 	 */
 	public static function remote_file_exists( $url, $args = array() ){

Braces +4 added lines, -2 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * EEH_URL helper
  * Helper class for URL-related PHP functions
@@ -62,7 +64,7 @@ 
 				isset($results['response']['code']) &&
 				$results['response']['code'] == '200'){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}

Spacing +56 added lines, -56 removed lines

@@ -9,7 +9,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EEH_URL{
+class EEH_URL {
 
 	/**
 	 * _add_query_arg
@@ -21,30 +21,30 @@ 
 	 * @param bool  $exclude_nonce  If true then the nonce will be excluded from the generated url.
 	 * @return string
 	 */
-	public static function add_query_args_and_nonce( $args = array(), $url = '', $exclude_nonce = false ) {
-		if ( empty( $url ) ) {
-			$user_msg = __('An error occurred. A URL is a required parameter for the add_query_args_and_nonce method.', 'event_espresso' );
-			$dev_msg = $user_msg . "\n" . sprintf(
-					__('In order to dynamically generate nonces for your actions, you need to supply a valid URL as a second parameter for the %s::add_query_args_and_nonce method.', 'event_espresso' ),
+	public static function add_query_args_and_nonce($args = array(), $url = '', $exclude_nonce = false) {
+		if (empty($url)) {
+			$user_msg = __('An error occurred. A URL is a required parameter for the add_query_args_and_nonce method.', 'event_espresso');
+			$dev_msg = $user_msg."\n".sprintf(
+					__('In order to dynamically generate nonces for your actions, you need to supply a valid URL as a second parameter for the %s::add_query_args_and_nonce method.', 'event_espresso'),
 					__CLASS__
 				);
-			EE_Error::add_error( $user_msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($user_msg.'||'.$dev_msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 		// check that an action exists and add nonce
-		if ( ! $exclude_nonce ) {
-			if ( isset( $args['action'] ) && ! empty( $args['action'] ) ) {
-				$args = array_merge( $args, array( $args['action'] . '_nonce' => wp_create_nonce( $args['action'] . '_nonce' ) ) );
+		if ( ! $exclude_nonce) {
+			if (isset($args['action']) && ! empty($args['action'])) {
+				$args = array_merge($args, array($args['action'].'_nonce' => wp_create_nonce($args['action'].'_nonce')));
 			} else {
-				$args = array_merge( $args, array( 'action' => 'default', 'default_nonce' => wp_create_nonce( 'default_nonce' ) ) );
+				$args = array_merge($args, array('action' => 'default', 'default_nonce' => wp_create_nonce('default_nonce')));
 			}
 		}
 
 		//finally, let's always add a return address (if present) :)
-		$args = ! empty( $_REQUEST['action'] ) && ! isset( $_REQUEST[ 'return' ] )
-			? array_merge( $args, array( 'return' => $_REQUEST['action'] ) )
+		$args = ! empty($_REQUEST['action']) && ! isset($_REQUEST['return'])
+			? array_merge($args, array('return' => $_REQUEST['action']))
 			: $args;
 
-		return add_query_arg( $args, $url );
+		return add_query_arg($args, $url);
 
 	}
 
@@ -57,17 +57,17 @@ 
 	 * @param boolean $sslverify whether we care if the SSL certificate for the requested site is setup properly
 	 * @return boolean
 	 */
-	public static function remote_file_exists( $url, $args = array() ){
-		$results = wp_remote_request($url,array_merge( array(
+	public static function remote_file_exists($url, $args = array()) {
+		$results = wp_remote_request($url, array_merge(array(
 			'method'=>'GET',
 			'redirection'=>1
-		), $args ) );
-		if( ! $results instanceof WP_Error &&
+		), $args));
+		if ( ! $results instanceof WP_Error &&
 				isset($results['response']) &&
 				isset($results['response']['code']) &&
-				$results['response']['code'] == '200'){
+				$results['response']['code'] == '200') {
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -83,29 +83,29 @@ 
 	 * @param bool   $base_url_only - TRUE will only return the scheme and host with no other parameters
 	 * @return string
 	 */
-	public static function refactor_url( $url = '', $remove_query = TRUE, $base_url_only = FALSE ) {
+	public static function refactor_url($url = '', $remove_query = TRUE, $base_url_only = FALSE) {
 		// break apart incoming URL
-		$url_bits = parse_url( $url );
+		$url_bits = parse_url($url);
 		// HTTP or HTTPS ?
-		$scheme = isset( $url_bits[ 'scheme' ] ) ? $url_bits[ 'scheme' ] . '://' : 'http://';
+		$scheme = isset($url_bits['scheme']) ? $url_bits['scheme'].'://' : 'http://';
 		// domain
-		$host = isset( $url_bits[ 'host' ] ) ? $url_bits[ 'host' ] : '';
+		$host = isset($url_bits['host']) ? $url_bits['host'] : '';
 		// if only the base URL is requested, then return that now
-		if ( $base_url_only ) {
-			return $scheme . $host;
+		if ($base_url_only) {
+			return $scheme.$host;
 		}
-		$port = isset( $url_bits[ 'port' ] ) ? ':' . $url_bits[ 'port' ] : '';
-		$user = isset( $url_bits[ 'user' ] ) ? $url_bits[ 'user' ] : '';
-		$pass = isset( $url_bits[ 'pass' ] ) ? ':' . $url_bits[ 'pass' ] : '';
-		$pass = ( $user || $pass ) ? $pass . '@' : '';
-		$path = isset( $url_bits[ 'path' ] ) ? $url_bits[ 'path' ] : '';
+		$port = isset($url_bits['port']) ? ':'.$url_bits['port'] : '';
+		$user = isset($url_bits['user']) ? $url_bits['user'] : '';
+		$pass = isset($url_bits['pass']) ? ':'.$url_bits['pass'] : '';
+		$pass = ($user || $pass) ? $pass.'@' : '';
+		$path = isset($url_bits['path']) ? $url_bits['path'] : '';
 		// if the query string is not required, then return what we have so far
-		if ( $remove_query ) {
-			return $scheme . $user . $pass . $host . $port . $path;
+		if ($remove_query) {
+			return $scheme.$user.$pass.$host.$port.$path;
 		}
-		$query = isset( $url_bits[ 'query' ] ) ? '?' . $url_bits[ 'query' ] : '';
-		$fragment = isset( $url_bits[ 'fragment' ] ) ? '#' . $url_bits[ 'fragment' ] : '';
-		return $scheme . $user . $pass . $host . $port . $path . $query . $fragment;
+		$query = isset($url_bits['query']) ? '?'.$url_bits['query'] : '';
+		$fragment = isset($url_bits['fragment']) ? '#'.$url_bits['fragment'] : '';
+		return $scheme.$user.$pass.$host.$port.$path.$query.$fragment;
 	}
 
 
@@ -118,29 +118,29 @@ 
 	 * @param bool   $as_array TRUE (default) will return query params as an array of key value pairs, FALSE will simply return the query string
 	 * @return string|array
 	 */
-	public static function get_query_string( $url = '', $as_array = TRUE ) {
+	public static function get_query_string($url = '', $as_array = TRUE) {
 		// break apart incoming URL
-		$url_bits = parse_url( $url );
+		$url_bits = parse_url($url);
 		// grab query string from URL
-		$query = isset( $url_bits[ 'query' ] ) ? $url_bits[ 'query' ] : '';
+		$query = isset($url_bits['query']) ? $url_bits['query'] : '';
 		// if we don't want the query string formatted into an array of key => value pairs, then just return it as is
-		if ( ! $as_array ) {
+		if ( ! $as_array) {
 			return $query;
 		}
 		// if no query string exists then just return an empty array now
-		if ( empty( $query )) {
+		if (empty($query)) {
 			return array();
 		}
 		// empty array to hold results
 		$query_params = array();
 		// now break apart the query string into separate params
-		$query = explode( '&', $query );
+		$query = explode('&', $query);
 		// loop thru our query params
-		foreach ( $query as $query_args ) {
+		foreach ($query as $query_args) {
 			// break apart the key value pairs
-			$query_args = explode( '=', $query_args );
+			$query_args = explode('=', $query_args);
 			// and add to our results array
-			$query_params[ $query_args[0] ] = $query_args[1];
+			$query_params[$query_args[0]] = $query_args[1];
 		}
 		return $query_params;
 	}
@@ -151,7 +151,7 @@ 
 	 * prevent_prefetching
 	 * @return void
 	 */
-	public static function prevent_prefetching(){
+	public static function prevent_prefetching() {
 		// prevent browsers from prefetching of the rel='next' link, because it may contain content that interferes with the registration process
 		remove_action('wp_head', 'adjacent_posts_rel_link_wp_head');
 	}
@@ -166,9 +166,9 @@ 
 	 * @param   string $prefix Use this to prefix the string with something.
 	 * @return string
 	 */
-	public static function generate_unique_token( $prefix = '' ) {
-		$token =  md5( uniqid() . mt_rand() );
-		return $prefix ? $prefix . '_' . $token : $token;
+	public static function generate_unique_token($prefix = '') {
+		$token = md5(uniqid().mt_rand());
+		return $prefix ? $prefix.'_'.$token : $token;
 	}
 
 
@@ -177,7 +177,7 @@ 
 	 * add_nocache_headers
 	 * @return void
 	 */
-	public static function add_nocache_headers(){
+	public static function add_nocache_headers() {
 		// add no cache headers
 //		add_action( 'wp_head' , array( 'EED_Single_Page_Checkout', 'nocache_headers' ), 10 );
 		// plus a little extra for nginx
@@ -194,19 +194,19 @@ 
 	 * @param string $server_variable
 	 * @return string
 	 */
-	public static function filter_input_server_url( $server_variable = 'REQUEST_URI' ){
+	public static function filter_input_server_url($server_variable = 'REQUEST_URI') {
 		$URL = '';
 		$server_variables = array(
 			'REQUEST_URI' => 1,
 			'HTTP_HOST' => 1,
 			'PHP_SELF' => 1,
 		);
-		$server_variable = strtoupper( $server_variable );
+		$server_variable = strtoupper($server_variable);
 		// whitelist INPUT_SERVER var
-		if ( isset( $server_variables[ $server_variable ] ) ) {
-			$URL = filter_input( INPUT_SERVER, $server_variable, FILTER_SANITIZE_URL, FILTER_NULL_ON_FAILURE );
-			if ( empty( $URL ) ) {
-				$URL = esc_url( $_SERVER[ $server_variable ] );
+		if (isset($server_variables[$server_variable])) {
+			$URL = filter_input(INPUT_SERVER, $server_variable, FILTER_SANITIZE_URL, FILTER_NULL_ON_FAILURE);
+			if (empty($URL)) {
+				$URL = esc_url($_SERVER[$server_variable]);
 			}
 		}
 		return $URL;

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

Doc Comments +2 added lines, -2 removed lines

@@ -185,7 +185,7 @@ 
 
 	/**
 	 * _prep_name_for_html_id
-	 * @param $name
+	 * @param string $name
 	 * @return string
 	 */
 	private function _prep_name_for_html_id( $name ) {
@@ -231,7 +231,7 @@ 
 
 
 	/**
-	 * @param mixed $html_class
+	 * @param string $html_class
 	 */
 	public function set_html_class( $html_class ) {
 		$this->_html_class = $html_class;

Braces +3 added lines, -2 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -69,7 +70,7 @@ 
 				$default_address .=  $state ? $state->name() . '<br />' : '';
 				$default_address .= $country ? $country->name(). '<br />' : '';
 				$default_address .= $organization->zip != '' ? $organization->get_pretty( 'zip' ) : '';
-			}else{
+			} else{
 				$default_address = 'unknown';
 				$organization_name = 'unknown';
 			}

Spacing +41 added lines, -41 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -95,13 +95,13 @@ 
 	 *	@type $name string the name for this form section, if you want to explicitly define it
 	 * }
 	 */
-	function __construct( $options_array = array() ) {
+	function __construct($options_array = array()) {
 		// used by display strategies
 		EE_Registry::instance()->load_helper('HTML');
 		// 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;
 			}
 		}
@@ -113,7 +113,7 @@ 
 	 * @param $parent_form_section
 	 * @param $name
 	 */
-	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;
@@ -134,7 +134,7 @@ 
 	/**
 	 * @param string $action
 	 */
-	public function set_action( $action ) {
+	public function set_action($action) {
 		$this->_action = $action;
 	}
 
@@ -144,7 +144,7 @@ 
 	 * @return string
 	 */
 	public function method() {
-		return ! empty( $this->_method ) ? $this->_method : 'POST';
+		return ! empty($this->_method) ? $this->_method : 'POST';
 	}
 
 
@@ -152,8 +152,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';
@@ -171,12 +171,12 @@ 
 	 * Calculation involves using the name and the parent's html id
 	 * return void
 	 */
-	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());
 			}
 		}
 	}
@@ -188,8 +188,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));
 	}
 
 
@@ -206,8 +206,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;
 	}
 
 
@@ -215,7 +215,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_class(){
+	public function html_class() {
 		return $this->_html_class;
 	}
 
@@ -224,7 +224,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_style(){
+	public function html_style() {
 		return $this->_html_style;
 	}
 
@@ -233,7 +233,7 @@ 
 	/**
 	 * @param mixed $html_class
 	 */
-	public function set_html_class( $html_class ) {
+	public function set_html_class($html_class) {
 		$this->_html_class = $html_class;
 	}
 
@@ -242,7 +242,7 @@ 
 	/**
 	 * @param mixed $html_id
 	 */
-	public function set_html_id( $html_id ) {
+	public function set_html_id($html_id) {
 		$this->_html_id = $html_id;
 	}
 
@@ -251,7 +251,7 @@ 
 	/**
 	 * @param mixed $html_style
 	 */
-	public function set_html_style( $html_style ) {
+	public function set_html_style($html_style) {
 		$this->_html_style = $html_style;
 	}
 
@@ -260,7 +260,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;
 	}
 
@@ -280,9 +280,9 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	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) ) );
+	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;
 	}
@@ -293,7 +293,7 @@ 
 	 * Gets the parent section
 	 * @return EE_Form_Section_Proper
 	 */
-	function parent_section(){
+	function parent_section() {
 		return $this->_parent_section;
 	}
 
@@ -306,18 +306,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;
 	}
 
@@ -328,7 +328,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();
 	}
 
 

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

Doc Comments +1 added lines

@@ -348,6 +348,7 @@
 	 * Automatically finds the related model info from the form, if present, and
 	 * save the relations indicated
 	 * @type string $relation_name
+	 * @param integer $relation_name
 	 * @return bool
 	 * @throws EE_Error
 	 */

Spacing +74 added lines, -74 removed lines

@@ -11,7 +11,7 @@ 
  * @since                4.5.0
  *
  */
-class EE_Model_Form_Section extends EE_Form_Section_Proper{
+class EE_Model_Form_Section extends EE_Form_Section_Proper {
 
 	/**
 	 *
@@ -36,36 +36,36 @@ 
 	 * }
 	 * @throws EE_Error
 	 */
-	public function __construct($options_array = array()){
-		if(isset($options_array['model']) && $options_array['model'] instanceof EEM_Base){
+	public function __construct($options_array = array()) {
+		if (isset($options_array['model']) && $options_array['model'] instanceof EEM_Base) {
 			$this->_model = $options_array['model'];
 		}
-		if( ! $this->_model || ! $this->_model instanceof EEM_Base ){
+		if ( ! $this->_model || ! $this->_model instanceof EEM_Base) {
 			throw new EE_Error(sprintf(__("Model Form Sections must first specify the _model property to be a subclass of EEM_Base", "event_espresso")));
 		}
 
-		if(isset($options_array['subsection_args'])){
+		if (isset($options_array['subsection_args'])) {
 			$subsection_args = $options_array['subsection_args'];
-		}else{
+		} else {
 			$subsection_args = array();
 		}
 
 		//gather fields and relations to convert to inputs
 		//but if they're just going to exclude a field anyways, don't bother converting it to an input
 		$exclude = $this->_subsections;
-		if(isset($options_array['exclude'])){
-			$exclude = array_merge($exclude,array_flip($options_array['exclude']));
+		if (isset($options_array['exclude'])) {
+			$exclude = array_merge($exclude, array_flip($options_array['exclude']));
 		}
 		$model_fields = array_diff_key($this->_model->field_settings(), $exclude);
 		$model_relations = array_diff_key($this->_model->relation_settings(), $exclude);
 		//convert fields and relations to inputs
 		$this->_subsections = array_merge(
 			$this->_convert_model_fields_to_inputs($model_fields),
-			$this->_convert_model_relations_to_inputs($model_relations,$subsection_args),
+			$this->_convert_model_relations_to_inputs($model_relations, $subsection_args),
 			$this->_subsections
 		);
 		parent::__construct($options_array);
-		if(isset($options_array['model_object']) && $options_array['model_object'] instanceof EE_Base_Class){
+		if (isset($options_array['model_object']) && $options_array['model_object'] instanceof EE_Base_Class) {
 			$this->populate_model_obj($options_array['model_object']);
 		}
 
@@ -83,9 +83,9 @@ 
 	 * 	}
 	 * @return array
 	 */
-	protected function _convert_model_relations_to_inputs($relations,$subsection_args = array()){
+	protected function _convert_model_relations_to_inputs($relations, $subsection_args = array()) {
 		$inputs = array();
-		foreach( $relations as $relation_name => $relation_obj ) {
+		foreach ($relations as $relation_name => $relation_obj) {
 			$input_constructor_args = array(
 				array_merge(
 					array(
@@ -96,19 +96,19 @@ 
 				)
 			);
 			$input = NULL;
-			switch(get_class($relation_obj)){
+			switch (get_class($relation_obj)) {
 				case 'EE_HABTM_Relation':
-					if(isset($subsection_args[$relation_name]) &&
-							isset($subsection_args[$relation_name]['model_objects'])){
+					if (isset($subsection_args[$relation_name]) &&
+							isset($subsection_args[$relation_name]['model_objects'])) {
 						$model_objects = $subsection_args[$relation_name]['model_objects'];
-					}else{
+					} else {
 						$model_objects = $relation_obj->get_other_model()->get_all();
 					}
-					$input = new EE_Select_Multi_Model_Input($model_objects,$input_constructor_args);
+					$input = new EE_Select_Multi_Model_Input($model_objects, $input_constructor_args);
 					break;
 				default:
 			}
-			if($input){
+			if ($input) {
 				$inputs[$relation_name] = $input;
 			}
 		}
@@ -123,10 +123,10 @@ 
 	 * @throws EE_Error
 	 * @return EE_Form_Input_Base[]
 	 */
-	protected function _convert_model_fields_to_inputs( $model_fields = array() ){
+	protected function _convert_model_fields_to_inputs($model_fields = array()) {
 		$inputs = array();
-		foreach( $model_fields as $field_name=>$model_field ){
-			if ( $model_field instanceof EE_Model_Field_Base ) {
+		foreach ($model_fields as $field_name=>$model_field) {
+			if ($model_field instanceof EE_Model_Field_Base) {
 				$input_constructor_args = array(
 					array(
 						'required'=> ! $model_field->is_nullable() && $model_field->get_default_value() === NULL,
@@ -134,7 +134,7 @@ 
 						'default'=>$model_field->get_default_value(),
 					)
 				);
-				switch(get_class($model_field)){
+				switch (get_class($model_field)) {
 					case 'EE_All_Caps_Text_Field':
 					case 'EE_Any_Foreign_Model_Name_Field':
 						$input_class = 'EE_Text_Input';
@@ -143,16 +143,16 @@ 
 						$input_class = 'EE_Yes_No_Input';
 						break;
 					case 'EE_Datetime_Field':
-						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field)));
+						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field)));
 						break;
 					case 'EE_Email_Field':
 						$input_class = 'EE_Email_Input';
 						break;
 					case 'EE_Enum_Integer_Field':
-						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field)));
+						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field)));
 						break;
 					case 'EE_Enum_Text_Field':
-						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field)));
+						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field)));
 						break;
 					case 'EE_Float_Field':
 						$input_class = 'EE_Float_Input';
@@ -161,15 +161,15 @@ 
 					case 'EE_Foreign_Key_String_Field':
 					case 'EE_WP_User_Field':
 						$models_pointed_to = $model_field instanceof EE_Field_With_Model_Name ? $model_field->get_model_class_names_pointed_to() : array();
-						if(true || is_array($models_pointed_to) && count($models_pointed_to) > 1){
+						if (true || is_array($models_pointed_to) && count($models_pointed_to) > 1) {
 							$input_class = 'EE_Text_Input';
-						}else{
+						} else {
 							//so its just one model
 							$model_name = is_array($models_pointed_to) ? reset($models_pointed_to) : $models_pointed_to;
 							$model = EE_Registry::instance()->load_model($model_name);
 							$model_names = $model->get_all_names(array('limit'=>10));
-							if($model_field->is_nullable()){
-								array_unshift( $model_names, __( "Please Select", 'event_espresso' ));
+							if ($model_field->is_nullable()) {
+								array_unshift($model_names, __("Please Select", 'event_espresso'));
 							}
 							$input_constructor_args[1] = $input_constructor_args[0];
 							$input_constructor_args[0] = $model_names;
@@ -178,10 +178,10 @@ 
 						break;
 					case 'EE_Full_HTML_Field':
 						$input_class = 'EE_Text_Area_Input';
-						$input_constructor_args[ 0 ]['validation_strategies'] = array( new EE_Full_HTML_Validation_Strategy() );
+						$input_constructor_args[0]['validation_strategies'] = array(new EE_Full_HTML_Validation_Strategy());
 						break;
 					case 'EE_Infinite_Integer':
-						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field)));
+						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field)));
 						break;
 					case 'EE_Integer_Field':
 						$input_class = 'EE_Text_Input';
@@ -190,11 +190,11 @@ 
 						$input_class = 'EE_Text_Area_Input';
 						break;
 					case 'EE_Money_Field':
-						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field)));
+						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field)));
 						break;
 					case 'EE_Post_Content_Field':
 						$input_class = 'EE_Text_Area_Input';
-						$input_constructor_args[ 0 ][ 'validation_strategies' ] = array( new EE_Full_HTML_Validation_Strategy() );
+						$input_constructor_args[0]['validation_strategies'] = array(new EE_Full_HTML_Validation_Strategy());
 						break;
 					case 'EE_Plain_Text_Field':
 						$input_class = 'EE_Text_Input';
@@ -211,7 +211,7 @@ 
 						break;
 					case 'EE_Simple_HTML_Field':
 						$input_class = 'EE_Text_Area_Input';
-						$input_constructor_args[ 0 ][ 'validation_strategies' ] = array( new EE_Simple_HTML_Validation_Strategy() );
+						$input_constructor_args[0]['validation_strategies'] = array(new EE_Simple_HTML_Validation_Strategy());
 						break;
 					case 'EE_Slug_Field':
 						$input_class = 'EE_Text_Input';
@@ -220,13 +220,13 @@ 
 						$input_class = 'EE_Yes_No_Input';
 						break;
 					case 'EE_WP_Post_Status_Field':
-						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field)));
+						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field)));
 						break;
 					case 'EE_WP_Post_Type_Field':
-						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field)));
+						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field)));
 						break;
 					default:
-						throw new EE_Error(sprintf(__("Model field of type '%s' does not convert to any known Form Input. Please add a case to EE_Model_Form_section's _convert_model_fields_to_inputs switch statement", "event_espresso"),get_class($model_field)));
+						throw new EE_Error(sprintf(__("Model field of type '%s' does not convert to any known Form Input. Please add a case to EE_Model_Form_section's _convert_model_fields_to_inputs switch statement", "event_espresso"), get_class($model_field)));
 				}
 				$reflection = new ReflectionClass($input_class);
 				$input = $reflection->newInstanceArgs($input_constructor_args);
@@ -244,21 +244,21 @@ 
 	 * @param EE_Base_Class $model_obj
 	 * @return void
 	 */
-	public function populate_model_obj($model_obj){
+	public function populate_model_obj($model_obj) {
 		$model_obj = $this->_model->ensure_is_obj($model_obj);
 		$this->_model_object = $model_obj;
 		$defaults = $model_obj->model_field_array();
-		foreach($this->_model->relation_settings() as $relation_name => $relation_obj){
+		foreach ($this->_model->relation_settings() as $relation_name => $relation_obj) {
 			$form_inputs = $this->inputs();
-			if(isset($form_inputs[$relation_name])){
-				if($relation_obj instanceof EE_Belongs_To_Relation){
+			if (isset($form_inputs[$relation_name])) {
+				if ($relation_obj instanceof EE_Belongs_To_Relation) {
 					//then we only expect there to be one
 					$related_item = $this->_model_object->get_first_related($relation_name);
 					$defaults[$relation_name] = $related_item->ID();
-				}else{
+				} else {
 					$related_items = $this->_model_object->get_many_related($relation_name);
 					$ids = array();
-					foreach($related_items as $related_item){
+					foreach ($related_items as $related_item) {
 						$ids[] = $related_item->ID();
 					}
 					$defaults[$relation_name] = $ids;
@@ -275,8 +275,8 @@ 
 	 * values are their normalized values
 	 * @return array
 	 */
-	public function inputs_values_corresponding_to_model_fields(){
-		return array_intersect_key($this->input_values(),$this->_model->field_settings());
+	public function inputs_values_corresponding_to_model_fields() {
+		return array_intersect_key($this->input_values(), $this->_model->field_settings());
 	}
 
 
@@ -299,21 +299,21 @@ 
 	public function receive_form_submission($req_data = NULL, $validate = TRUE) {
 		parent::receive_form_submission($req_data, $validate);
 		//create or set the model object, if it isn't already
-		if( ! $this->_model_object ){
+		if ( ! $this->_model_object) {
 			//check to see if the form indicates a PK, in which case we want to only retrieve it and update it
 			$pk_name = $this->_model->primary_key_name();
 			$model_obj = $this->_model->get_one_by_ID($this->get_input_value($pk_name));
-			if($model_obj){
+			if ($model_obj) {
 				$this->_model_object = $model_obj;
-			}else{
-				$this->_model_object = EE_Registry::instance()->load_class($this->_model->get_this_model_name() );
+			} else {
+				$this->_model_object = EE_Registry::instance()->load_class($this->_model->get_this_model_name());
 			}
 		}
 		//ok so the model object is set. Just set it with the submitted form data (don't save yet though)
-		foreach($this->inputs_values_corresponding_to_model_fields() as $field_name=>$field_value){
+		foreach ($this->inputs_values_corresponding_to_model_fields() as $field_name=>$field_value) {
 			//only set the non-primary key
-			if($field_name != $this->_model->primary_key_name()){
-				$this->_model_object->set($field_name,$field_value);
+			if ($field_name != $this->_model->primary_key_name()) {
+				$this->_model_object->set($field_name, $field_value);
 			}
 		}
 
@@ -329,13 +329,13 @@ 
 	 * @return int, 1 on a successful update, the ID of
 	 *                    the new entry on insert; 0 on failure
 	 */
-	public function save(){
-		if( ! $this->_model_object){
-			throw new EE_Error(sprintf(__("Cannot save the model form's model object (model is '%s') because there is no model object set. You must either set it, or call receive_form_submission where it is set automatically", "event_espresso"),get_class($this->_model)));
+	public function save() {
+		if ( ! $this->_model_object) {
+			throw new EE_Error(sprintf(__("Cannot save the model form's model object (model is '%s') because there is no model object set. You must either set it, or call receive_form_submission where it is set automatically", "event_espresso"), get_class($this->_model)));
 		}
-		$success =  $this->_model_object->save();
-		foreach($this->_model->relation_settings() as $relation_name => $relation_obj){
-			if(isset($this->_subsections[$relation_name])){
+		$success = $this->_model_object->save();
+		foreach ($this->_model->relation_settings() as $relation_name => $relation_obj) {
+			if (isset($this->_subsections[$relation_name])) {
 				$success = $this->_save_related_info($relation_name);
 			}
 		}
@@ -351,29 +351,29 @@ 
 	 * @return bool
 	 * @throws EE_Error
 	 */
-	protected function _save_related_info($relation_name){
+	protected function _save_related_info($relation_name) {
 		$relation_obj = $this->_model->related_settings_for($relation_name);
-		if($relation_obj instanceof EE_Belongs_To_Relation){
+		if ($relation_obj instanceof EE_Belongs_To_Relation) {
 			//there is just a foreign key on this model pointing to that one
 			$this->_model_object->_add_relation_to($this->get_input_value($relation_name), $relation_name);
-		}elseif($relation_obj instanceof EE_Has_Many_Relation){
+		}elseif ($relation_obj instanceof EE_Has_Many_Relation) {
 			//then we want to consider all of its currently-related things.
 			//if they're in this list, keep them
 			//if they're not in this list, remove them
 			//and lastly add all the new items
 			throw new EE_Error(sprintf(__('Automatic saving of related info across a "has many" relation is not yet supported', "event_espresso")));
-		}elseif($relation_obj instanceof EE_HABTM_Relation){
+		}elseif ($relation_obj instanceof EE_HABTM_Relation) {
 			//delete everything NOT in this list
 			$normalized_input_value = $this->get_input_value($relation_name);
-			if($normalized_input_value && is_array($normalized_input_value)){
+			if ($normalized_input_value && is_array($normalized_input_value)) {
 				$where_query_params = array(
-					$relation_obj->get_other_model()->primary_key_name() => array('NOT_IN',$normalized_input_value));
-			}else{
+					$relation_obj->get_other_model()->primary_key_name() => array('NOT_IN', $normalized_input_value));
+			} else {
 				$where_query_params = array();
 			}
-			$this->_model_object->_remove_relations( $relation_name, $where_query_params );
-			foreach($normalized_input_value as $id){
-				$this->_model_object->_add_relation_to( $id, $relation_name );
+			$this->_model_object->_remove_relations($relation_name, $where_query_params);
+			foreach ($normalized_input_value as $id) {
+				$this->_model_object->_add_relation_to($id, $relation_name);
 			}
 		}
 		return TRUE;
@@ -385,7 +385,7 @@ 
 	 * Gets the model of this model form
 	 * @return EEM_Base
 	 */
-	public function get_model(){
+	public function get_model() {
 		return $this->_model;
 	}
 
@@ -398,7 +398,7 @@ 
 	 * when receive_form_submission($req_data) was called.
 	 * @return EE_Base_Class
 	 */
-	public function get_model_object(){
+	public function get_model_object() {
 		return $this->_model_object;
 	}
 
@@ -408,10 +408,10 @@ 
 	 * gets teh default name of this form section if none is specified
 	 * @return string
 	 */
-	protected function _set_default_name_if_empty(){
-		if( ! $this->_name ){
-			$default_name = str_replace("EEM_", "", get_class($this->_model)) . "_Model_Form";
-			$this->_name =  $default_name;
+	protected function _set_default_name_if_empty() {
+		if ( ! $this->_name) {
+			$default_name = str_replace("EEM_", "", get_class($this->_model))."_Model_Form";
+			$this->_name = $default_name;
 		}
 	}
 

Braces +8 added lines, -8 removed lines

@@ -46,7 +46,7 @@ 
 
 		if(isset($options_array['subsection_args'])){
 			$subsection_args = $options_array['subsection_args'];
-		}else{
+		} else{
 			$subsection_args = array();
 		}
 
@@ -101,7 +101,7 @@ 
 					if(isset($subsection_args[$relation_name]) &&
 							isset($subsection_args[$relation_name]['model_objects'])){
 						$model_objects = $subsection_args[$relation_name]['model_objects'];
-					}else{
+					} else{
 						$model_objects = $relation_obj->get_other_model()->get_all();
 					}
 					$input = new EE_Select_Multi_Model_Input($model_objects,$input_constructor_args);
@@ -163,7 +163,7 @@ 
 						$models_pointed_to = $model_field instanceof EE_Field_With_Model_Name ? $model_field->get_model_class_names_pointed_to() : array();
 						if(true || is_array($models_pointed_to) && count($models_pointed_to) > 1){
 							$input_class = 'EE_Text_Input';
-						}else{
+						} else{
 							//so its just one model
 							$model_name = is_array($models_pointed_to) ? reset($models_pointed_to) : $models_pointed_to;
 							$model = EE_Registry::instance()->load_model($model_name);
@@ -255,7 +255,7 @@ 
 					//then we only expect there to be one
 					$related_item = $this->_model_object->get_first_related($relation_name);
 					$defaults[$relation_name] = $related_item->ID();
-				}else{
+				} else{
 					$related_items = $this->_model_object->get_many_related($relation_name);
 					$ids = array();
 					foreach($related_items as $related_item){
@@ -305,7 +305,7 @@ 
 			$model_obj = $this->_model->get_one_by_ID($this->get_input_value($pk_name));
 			if($model_obj){
 				$this->_model_object = $model_obj;
-			}else{
+			} else{
 				$this->_model_object = EE_Registry::instance()->load_class($this->_model->get_this_model_name() );
 			}
 		}
@@ -356,19 +356,19 @@ 
 		if($relation_obj instanceof EE_Belongs_To_Relation){
 			//there is just a foreign key on this model pointing to that one
 			$this->_model_object->_add_relation_to($this->get_input_value($relation_name), $relation_name);
-		}elseif($relation_obj instanceof EE_Has_Many_Relation){
+		} elseif($relation_obj instanceof EE_Has_Many_Relation){
 			//then we want to consider all of its currently-related things.
 			//if they're in this list, keep them
 			//if they're not in this list, remove them
 			//and lastly add all the new items
 			throw new EE_Error(sprintf(__('Automatic saving of related info across a "has many" relation is not yet supported', "event_espresso")));
-		}elseif($relation_obj instanceof EE_HABTM_Relation){
+		} elseif($relation_obj instanceof EE_HABTM_Relation){
 			//delete everything NOT in this list
 			$normalized_input_value = $this->get_input_value($relation_name);
 			if($normalized_input_value && is_array($normalized_input_value)){
 				$where_query_params = array(
 					$relation_obj->get_other_model()->primary_key_name() => array('NOT_IN',$normalized_input_value));
-			}else{
+			} else{
 				$where_query_params = array();
 			}
 			$this->_model_object->_remove_relations( $relation_name, $where_query_params );

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

Doc Comments +2 added lines, -2 removed lines

@@ -261,7 +261,7 @@ 
 	/**
 	 * Sets sensitive_data_removal_strategy
 	 * @param EE_Sensitive_Data_Removal_Base $sensitive_data_removal_strategy
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	public function set_sensitive_data_removal_strategy($sensitive_data_removal_strategy) {
 		$this->_sensitive_data_removal_strategy = $sensitive_data_removal_strategy;
@@ -445,7 +445,7 @@ 
 	 * Returns whether or not any validation errors occurred
 	 *
 	 * @param array $req_data like $_POST
-	 * @return boolean whether or not there was an error
+	 * @return boolean|null whether or not there was an error
 	 */
 	protected function _normalize( $req_data ) {
 		//any existing validation errors don't apply so clear them

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 /**
- * EE_Form_Input_Base
- * For representing a single form input. Extends EE_Form_Section_Base because
- * it is a part of a form and shares a surprisingly large amount of functionality
- *
- * @package			Event Espresso
- * @subpackage
- * @author				Mike Nelson
- */
+	 * EE_Form_Input_Base
+	 * For representing a single form input. Extends EE_Form_Section_Base because
+	 * it is a part of a form and shares a surprisingly large amount of functionality
+	 *
+	 * @package			Event Espresso
+	 * @subpackage
+	 * @author				Mike Nelson
+	 */
 abstract class EE_Form_Input_Base extends EE_Form_Section_Validatable{
 
 	/**

Braces +10 added lines, -10 removed lines

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

Spacing +135 added lines, -135 removed lines

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

core/libraries/form_sections/payment_methods/EE_Payment_Method_Form.form.php

Doc Comments +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
 
 
 	/**
-	 * @param $payment_method_type
+	 * @param EE_PMT_Base $payment_method_type
 	 * @throws EE_Error
 	 */
 	public function set_payment_method_type( $payment_method_type ){

Spacing +32 added lines, -32 removed lines

@@ -4,7 +4,7 @@ 
  * Specialized form for payment methods, allowing for easy setting and retrieving of meta fields.
  * Uses EEM_Payment_Method as the model
  */
-class EE_Payment_Method_Form extends EE_Model_Form_Section{
+class EE_Payment_Method_Form extends EE_Model_Form_Section {
 
 	/**
 	 * All the subsection inputs that correspond ot extra meta rows
@@ -39,37 +39,37 @@ 
 	 *	@see EE_Model_Form_Section::__construct() for more
 	 * }
 	 */
-	public function __construct($options_array = array()){
+	public function __construct($options_array = array()) {
 		$this->_model = EEM_Payment_Method::instance();
 		$this->_options_array = $options_array;
-		if(isset($options_array['payment_method_type'])){
+		if (isset($options_array['payment_method_type'])) {
 			$this->_payment_method_type = $options_array['payment_method_type'];
 		}
 		$options_array = $this->_options_array;
-		if(isset($options_array['extra_meta_inputs'])){
-			$this->_extra_meta_inputs = array_merge($this->_extra_meta_inputs,$options_array['extra_meta_inputs']);
+		if (isset($options_array['extra_meta_inputs'])) {
+			$this->_extra_meta_inputs = array_merge($this->_extra_meta_inputs, $options_array['extra_meta_inputs']);
 		}
-		if($this->_extra_meta_inputs){
-			$this->_subsections = array_merge($this->_subsections,$this->_extra_meta_inputs);
+		if ($this->_extra_meta_inputs) {
+			$this->_subsections = array_merge($this->_subsections, $this->_extra_meta_inputs);
 		}
 		$this->_subsections['PMD_button_url'] = new EE_Admin_File_Uploader_Input(
-			array( 'html_label_text'=>  __( 'Button URL', 'event_espresso' ))
+			array('html_label_text'=>  __('Button URL', 'event_espresso'))
 		);
 		$this->_subsections['PMD_scope'] = new EE_Checkbox_Multi_Input(
 			EEM_Payment_Method::instance()->scopes(),
-			array( 'html_label_text' => $this->_model->field_settings_for('PMD_scope')->get_nicename() . EEH_Template::get_help_tab_link( 'payment_methods_overview' ))
+			array('html_label_text' => $this->_model->field_settings_for('PMD_scope')->get_nicename().EEH_Template::get_help_tab_link('payment_methods_overview'))
 		);
 		//setup the currency options
 		$this->_subsections['Currency'] = new EE_Select_Multi_Model_Input(
-			EEM_Currency::instance()->get_all_currencies_usable_by( $this->_payment_method_type ),
+			EEM_Currency::instance()->get_all_currencies_usable_by($this->_payment_method_type),
 			array(
-				'html_label_text'=>  __( 'Currencies Supported', 'event_espresso' ),
+				'html_label_text'=>  __('Currencies Supported', 'event_espresso'),
 				'required'=>TRUE
 			)
 		);
-		$this->_subsections['PMD_order'] = new EE_Text_Input( array(
-			'html_label_text' => __( 'Order', 'event_espresso' ),
-			'html_help_text' => __( 'Lowest numbers will be shown first', 'event_espresso' ),
+		$this->_subsections['PMD_order'] = new EE_Text_Input(array(
+			'html_label_text' => __('Order', 'event_espresso'),
+			'html_help_text' => __('Lowest numbers will be shown first', 'event_espresso'),
 			'normalization_strategy' => new EE_Int_Normalization(),
 			'validation_strategies' => array(
 				new EE_Int_Validation_Strategy()
@@ -88,15 +88,15 @@ 
 	 * @param string 	$name
 	 * @throws EE_Error
 	 */
-	public function _construct_finalize( $parent_form_section, $name ) {
-		if( ! $this->_payment_method_type instanceof EE_PMT_Base ){
-			throw new EE_Error( sprintf( __( 'Payment Method forms must have set their payment method type BEFORE calling _construct_finalize', 'event_espresso' )));
+	public function _construct_finalize($parent_form_section, $name) {
+		if ( ! $this->_payment_method_type instanceof EE_PMT_Base) {
+			throw new EE_Error(sprintf(__('Payment Method forms must have set their payment method type BEFORE calling _construct_finalize', 'event_espresso')));
 		}
 		//set the name of this form based on the payment method type
-		if( ! $this->_name && ! $name ){
-			$name = str_replace(" ","_",ucwords(str_replace("_"," ",($this->_payment_method_type->system_name()))))."_Settings_Form";
+		if ( ! $this->_name && ! $name) {
+			$name = str_replace(" ", "_", ucwords(str_replace("_", " ", ($this->_payment_method_type->system_name()))))."_Settings_Form";
 		}
-		parent::_construct_finalize( $parent_form_section, $name );
+		parent::_construct_finalize($parent_form_section, $name);
 	}
 
 
@@ -105,8 +105,8 @@ 
 	 * @param $payment_method_type
 	 * @throws EE_Error
 	 */
-	public function set_payment_method_type( $payment_method_type ){
-		if( ! $payment_method_type instanceof EE_PMT_Base){
+	public function set_payment_method_type($payment_method_type) {
+		if ( ! $payment_method_type instanceof EE_PMT_Base) {
 			throw new EE_Error(sprintf(__("Payment Method forms MUST set a payment method type by using _set_payment_method_type", "event_espresso")));
 		}
 		$this->_payment_method_type = $payment_method_type;
@@ -118,10 +118,10 @@ 
 	 * extends the model form section's save method to also save the extra meta field values
 	 * @return int ID of the payment method inserted, or true on update
 	 */
-	public function save(){
+	public function save() {
 		$parent_save_val = parent::save();
-		if( $this->_model_object && $this->_model_object->ID()){
-			foreach($this->_extra_meta_inputs as $input_name => $input){
+		if ($this->_model_object && $this->_model_object->ID()) {
+			foreach ($this->_extra_meta_inputs as $input_name => $input) {
 				$this->_model_object->update_extra_meta($input_name, $input->normalized_value());
 			}
 		}
@@ -138,8 +138,8 @@ 
 		$model_obj = $this->_model->ensure_is_obj($model_obj);
 		parent::populate_model_obj($model_obj);
 		$extra_meta = $model_obj->all_extra_meta_array();
-		foreach($this->_extra_meta_inputs as $input_name => $extra_meta_input){
-			if(isset($extra_meta[$input_name])){
+		foreach ($this->_extra_meta_inputs as $input_name => $extra_meta_input) {
+			if (isset($extra_meta[$input_name])) {
 				$extra_meta_input->set_default($extra_meta[$input_name]);
 			}
 		}
@@ -151,10 +151,10 @@ 
 	 * gets the default name of this form section if none is specified
 	 * @return string
 	 */
-	protected function _set_default_name_if_empty(){
-		if( ! $this->_name ){
-			$default_name = str_replace("EEM_", "", get_class($this->_model)) . "_Model_Form";
-			$this->_name =  $default_name;
+	protected function _set_default_name_if_empty() {
+		if ( ! $this->_name) {
+			$default_name = str_replace("EEM_", "", get_class($this->_model))."_Model_Form";
+			$this->_name = $default_name;
 		}
 	}
 
@@ -164,7 +164,7 @@ 
 	 * Gets all the extra meta inputs in this form
 	 * @return EE_Form_Input_Base[]
 	 */
-	public function extra_meta_inputs(){
+	public function extra_meta_inputs() {
 		return $this->_extra_meta_inputs;
 	}
 }

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

Doc Comments +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 	/**
 	 * Checks if that value is the one selected
 	 * @param string|int $value unnormalized value option (string)
-	 * @return string
+	 * @return boolean
 	 */
 	protected function _check_if_option_selected( $value ){
 		return $this->_input->raw_value() == $value ? TRUE : FALSE;

Spacing +26 added lines, -26 removed lines

@@ -11,47 +11,47 @@ 
  * @since 				$VID:$
  *
  */
-class EE_Select_Display_Strategy extends EE_Display_Strategy_Base{
+class EE_Select_Display_Strategy extends EE_Display_Strategy_Base {
 
 	/**
 	 *
 	 * @throws EE_Error
 	 * @return string of html to display the field
 	 */
-	function display(){
-		if( ! $this->_input instanceof EE_Form_Input_With_Options_Base){
-			throw new EE_Error( sprintf( __( 'Cannot use Select Display Strategy with an input that doesn\'t have options', 'event_espresso' )));
+	function display() {
+		if ( ! $this->_input instanceof EE_Form_Input_With_Options_Base) {
+			throw new EE_Error(sprintf(__('Cannot use Select Display Strategy with an input that doesn\'t have options', 'event_espresso')));
 		}
 		EE_Registry::instance()->load_helper('Array');
 
-		$html = EEH_HTML::nl( 0, 'select' );
+		$html = EEH_HTML::nl(0, 'select');
 		$html .= '<select';
-		$html .= ' id="' . $this->_input->html_id() . '"';
-		$html .= ' name="' . $this->_input->html_name() . '"';
-		$class = $this->_input->required() ? $this->_input->required_css_class() . ' ' . $this->_input->html_class() : $this->_input->html_class();
-		$html .= ' class="' . $class . '"';
+		$html .= ' id="'.$this->_input->html_id().'"';
+		$html .= ' name="'.$this->_input->html_name().'"';
+		$class = $this->_input->required() ? $this->_input->required_css_class().' '.$this->_input->html_class() : $this->_input->html_class();
+		$html .= ' class="'.$class.'"';
 		// add html5 required
 
 		$html .= $this->_input->required() ? ' required' : '';
-		$html .= ' style="' . $this->_input->html_style() . '"';
+		$html .= ' style="'.$this->_input->html_style().'"';
 		$html .= '>';
 
 //		EEH_HTML::indent( 1, 'select' );
-		if ( EEH_Array::is_multi_dimensional_array( $this->_input->options() )) {
-			EEH_HTML::indent( 1, 'optgroup' );
-			foreach( $this->_input->options() as $opt_group_label => $opt_group ){
-				$html .= EEH_HTML::nl( 0, 'optgroup' ) . '<optgroup label="' . esc_attr( $opt_group_label ) . '">';
-				EEH_HTML::indent( 1, 'option' );
-				$html .= $this->_display_options( $opt_group );
+		if (EEH_Array::is_multi_dimensional_array($this->_input->options())) {
+			EEH_HTML::indent(1, 'optgroup');
+			foreach ($this->_input->options() as $opt_group_label => $opt_group) {
+				$html .= EEH_HTML::nl(0, 'optgroup').'<optgroup label="'.esc_attr($opt_group_label).'">';
+				EEH_HTML::indent(1, 'option');
+				$html .= $this->_display_options($opt_group);
 				$html .= EEH_HTML::indent( -1, 'option' );
-				$html .= EEH_HTML::nl( 0, 'optgroup' ) . '</optgroup>';
+				$html .= EEH_HTML::nl(0, 'optgroup').'</optgroup>';
 			}
 			EEH_HTML::indent( -1, 'optgroup' );
 		} else {
-			$html.=$this->_display_options( $this->_input->options() );
+			$html .= $this->_display_options($this->_input->options());
 		}
 
-		$html.= EEH_HTML::nl( 0, 'select' ) . '</select>';
+		$html .= EEH_HTML::nl(0, 'select').'</select>';
 //		$html.= EEH_HTML::nl( -1, 'select' ) . '</select>';
 		return $html;
 	}
@@ -63,13 +63,13 @@ 
 	 * @param array $options
 	 * @return string
 	 */
-	protected function _display_options($options){
+	protected function _display_options($options) {
 		$html = '';
-		EEH_HTML::indent( 1, 'option' );
-		foreach( $options as $value => $display_text ){
-			$unnormalized_value = $this->_input->get_normalization_strategy()->unnormalize_one( $value );
-			$selected = $this->_check_if_option_selected( $unnormalized_value ) ? ' selected="selected"' : '';
-			$html.= EEH_HTML::nl( 0, 'option' ) . '<option value="' . esc_attr( $unnormalized_value ) . '"' . $selected . '>' . $display_text . '</option>';
+		EEH_HTML::indent(1, 'option');
+		foreach ($options as $value => $display_text) {
+			$unnormalized_value = $this->_input->get_normalization_strategy()->unnormalize_one($value);
+			$selected = $this->_check_if_option_selected($unnormalized_value) ? ' selected="selected"' : '';
+			$html .= EEH_HTML::nl(0, 'option').'<option value="'.esc_attr($unnormalized_value).'"'.$selected.'>'.$display_text.'</option>';
 		}
 		EEH_HTML::indent( -1, 'option' );
 		return $html;
@@ -82,7 +82,7 @@ 
 	 * @param string|int $value unnormalized value option (string)
 	 * @return string
 	 */
-	protected function _check_if_option_selected( $value ){
+	protected function _check_if_option_selected($value) {
 		return $this->_input->raw_value() == $value ? TRUE : FALSE;
 	}
 

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
- *
- * Class EE_Select_Display_Strategy
- *
- * displays either simple arrays as selected, or if a 2d array is provided, separates them into optgroups
- *
- * @package 			Event Espresso
- * @subpackage 	core
- * @author 				Mike Nelson
- * @since 				$VID:$
- *
- */
+	 *
+	 * Class EE_Select_Display_Strategy
+	 *
+	 * displays either simple arrays as selected, or if a 2d array is provided, separates them into optgroups
+	 *
+	 * @package 			Event Espresso
+	 * @subpackage 	core
+	 * @author 				Mike Nelson
+	 * @since 				$VID:$
+	 *
+	 */
 class EE_Select_Display_Strategy extends EE_Display_Strategy_Base{
 
 	/**

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

Doc Comments +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 
 	/**
 	 * @param string $value_to_normalize
-	 * @return int|mixed|string
+	 * @return integer
 	 * @throws \EE_Validation_Error
 	 */
 	public function normalize($value_to_normalize) {

Spacing +15 added lines, -15 removed lines

@@ -7,7 +7,7 @@ 
  * @subpackage
  * @author				Mike Nelson
  */
-class EE_Int_Normalization extends EE_Normalization_Strategy_Base{
+class EE_Int_Normalization extends EE_Normalization_Strategy_Base {
 
 	/**
 	 * @param string $value_to_normalize
@@ -15,33 +15,33 @@ 
 	 * @throws \EE_Validation_Error
 	 */
 	public function normalize($value_to_normalize) {
-		if( is_int( $value_to_normalize ) ){
+		if (is_int($value_to_normalize)) {
 			return $value_to_normalize;
 		}
-		if( ! is_string( $value_to_normalize )){
-			throw new EE_Validation_Error( sprintf( __( 'The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso' ), print_r( $value_to_normalize, TRUE), gettype( $value_to_normalize ) ) );
+		if ( ! is_string($value_to_normalize)) {
+			throw new EE_Validation_Error(sprintf(__('The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso'), print_r($value_to_normalize, TRUE), gettype($value_to_normalize)));
 		}
 		$thousands_separator = EE_Config::instance()->currency->thsnds;
-		$value_to_normalize = str_replace( $thousands_separator, "", $value_to_normalize );
-		$value_to_normalize = str_replace( array(" ","\t"), '', $value_to_normalize );
-		if ( preg_match( '/^\d+$/', $value_to_normalize )) {
-			return intval( $value_to_normalize );
+		$value_to_normalize = str_replace($thousands_separator, "", $value_to_normalize);
+		$value_to_normalize = str_replace(array(" ", "\t"), '', $value_to_normalize);
+		if (preg_match('/^\d+$/', $value_to_normalize)) {
+			return intval($value_to_normalize);
 		} else {
 			//find if this input has a int validation strategy
 			//in which case, use its message
 			$validation_error_message = NULL;
-			foreach( $this->_input->get_validation_strategies() as $validation_strategy ){
-				if( $validation_strategy instanceof EE_Int_Validation_Strategy ){
+			foreach ($this->_input->get_validation_strategies() as $validation_strategy) {
+				if ($validation_strategy instanceof EE_Int_Validation_Strategy) {
 					$validation_error_message = $validation_strategy->get_validation_error_message();
 				}
 			}
 			//this really shouldn't ever happen because fields with a int normalization strategy
 			//should also have a int validation strategy, but in case it doesnt use the default
-			if( ! $validation_error_message ){
+			if ( ! $validation_error_message) {
 				$default_validation_strategy = new EE_Int_Validation_Strategy();
 				$validation_error_message = $default_validation_strategy->get_validation_error_message();
 			}
-			throw new EE_Validation_Error( $validation_error_message, 'numeric_only' );
+			throw new EE_Validation_Error($validation_error_message, 'numeric_only');
 		}
 	}
 
@@ -50,10 +50,10 @@ 
 	 * @param int $normalized_value
 	 * @return string
 	 */
-	public function unnormalize( $normalized_value ) {
-		if( empty( $normalized_value ) ){
+	public function unnormalize($normalized_value) {
+		if (empty($normalized_value)) {
 			return '0';
-		}else{
+		} else {
 			return "$normalized_value";
 		}
 	}

Braces +1 added lines, -1 removed lines

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

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

Doc Comments +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     * just checks the field isn't blank
     *
     * @param $normalized_value
-    * @return bool
+    * @return boolean|null
     * @throws \EE_Validation_Error
     */
 	function validate($normalized_value) {

Indentation +50 added lines, -50 removed lines

@@ -11,8 +11,8 @@ 
 class EE_Email_Validation_Strategy extends EE_Text_Validation_Strategy{
 
 	/**
-     * @param null $validation_error_message
-     */
+	 * @param null $validation_error_message
+	 */
    public function __construct( $validation_error_message = NULL ) {
 		if( ! $validation_error_message ){
 			$validation_error_message = __("Please enter a valid email address.", "event_espresso");
@@ -38,8 +38,8 @@ 
 
 
 	/**
-     * @return array
-     */
+	 * @return array
+	 */
    function get_jquery_validation_rule_array(){
 		return array( 'email'=>true, 'messages' => array( 'email' => $this->get_validation_error_message() ) );
 	}
@@ -59,56 +59,56 @@ 
    $atIndex = strrpos($email, "@");
    if (is_bool($atIndex) && !$atIndex)
    {
-      $isValid = false;
+	  $isValid = false;
    }
    else
    {
-      $domain = substr($email, $atIndex+1);
-      $local = substr($email, 0, $atIndex);
-      $localLen = strlen($local);
-      $domainLen = strlen($domain);
-      if ($localLen < 1 || $localLen > 64)
-      {
-         // local part length exceeded
-         $isValid = false;
-      }
-      else if ($domainLen < 1 || $domainLen > 255)
-      {
-         // domain part length exceeded
-         $isValid = false;
-      }
-      else if ($local[0] == '.' || $local[$localLen-1] == '.')
-      {
-         // local part starts or ends with '.'
-         $isValid = false;
-      }
-      else if (preg_match('/\\.\\./', $local))
-      {
-         // local part has two consecutive dots
-         $isValid = false;
-      }
-      else if (!preg_match('/^[A-Za-z0-9\\-\\.]+$/', $domain))
-      {
-         // character not valid in domain part
-         $isValid = false;
-      }
-      else if (preg_match('/\\.\\./', $domain))
-      {
-         // domain part has two consecutive dots
-         $isValid = false;
-      }
-      else if
+	  $domain = substr($email, $atIndex+1);
+	  $local = substr($email, 0, $atIndex);
+	  $localLen = strlen($local);
+	  $domainLen = strlen($domain);
+	  if ($localLen < 1 || $localLen > 64)
+	  {
+		 // local part length exceeded
+		 $isValid = false;
+	  }
+	  else if ($domainLen < 1 || $domainLen > 255)
+	  {
+		 // domain part length exceeded
+		 $isValid = false;
+	  }
+	  else if ($local[0] == '.' || $local[$localLen-1] == '.')
+	  {
+		 // local part starts or ends with '.'
+		 $isValid = false;
+	  }
+	  else if (preg_match('/\\.\\./', $local))
+	  {
+		 // local part has two consecutive dots
+		 $isValid = false;
+	  }
+	  else if (!preg_match('/^[A-Za-z0-9\\-\\.]+$/', $domain))
+	  {
+		 // character not valid in domain part
+		 $isValid = false;
+	  }
+	  else if (preg_match('/\\.\\./', $domain))
+	  {
+		 // domain part has two consecutive dots
+		 $isValid = false;
+	  }
+	  else if
 (!preg_match('/^(\\\\.|[A-Za-z0-9!#%&`_=\\/$\'*+?^{}|~.-])+$/',
-                 str_replace("\\\\","",$local)))
-      {
-         // character not valid in local part unless
-         // local part is quoted
-         if (!preg_match('/^"(\\\\"|[^"])+"$/',
-             str_replace("\\\\","",$local)))
-         {
-            $isValid = false;
-         }
-      }
+				 str_replace("\\\\","",$local)))
+	  {
+		 // character not valid in local part unless
+		 // local part is quoted
+		 if (!preg_match('/^"(\\\\"|[^"])+"$/',
+			 str_replace("\\\\","",$local)))
+		 {
+			$isValid = false;
+		 }
+	  }
 	  //don't check the DNS records... just personal preference
 //      if ($isValid && !(checkdnsrr($domain,"MX") || checkdnsrr($domain,"A")))
 //      {

Spacing +16 added lines, -17 removed lines

@@ -8,16 +8,16 @@ 
  * @since 				4.6
  *
  */
-class EE_Email_Validation_Strategy extends EE_Text_Validation_Strategy{
+class EE_Email_Validation_Strategy extends EE_Text_Validation_Strategy {
 
 	/**
      * @param null $validation_error_message
      */
-   public function __construct( $validation_error_message = NULL ) {
-		if( ! $validation_error_message ){
+   public function __construct($validation_error_message = NULL) {
+		if ( ! $validation_error_message) {
 			$validation_error_message = __("Please enter a valid email address.", "event_espresso");
 		}
-		parent::__construct( $validation_error_message );
+		parent::__construct($validation_error_message);
 	}
 
 
@@ -30,8 +30,8 @@ 
     * @throws \EE_Validation_Error
     */
 	function validate($normalized_value) {
-		if( $normalized_value && ! $this->_validate_email($normalized_value) ){
-			throw new EE_Validation_Error( $this->get_validation_error_message(), 'required');
+		if ($normalized_value && ! $this->_validate_email($normalized_value)) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'required');
 		}
 	}
 
@@ -40,8 +40,8 @@ 
 	/**
      * @return array
      */
-   function get_jquery_validation_rule_array(){
-		return array( 'email'=>true, 'messages' => array( 'email' => $this->get_validation_error_message() ) );
+   function get_jquery_validation_rule_array() {
+		return array('email'=>true, 'messages' => array('email' => $this->get_validation_error_message()));
 	}
 
 
@@ -57,13 +57,13 @@ 
 {
    $isValid = true;
    $atIndex = strrpos($email, "@");
-   if (is_bool($atIndex) && !$atIndex)
+   if (is_bool($atIndex) && ! $atIndex)
    {
       $isValid = false;
    }
    else
    {
-      $domain = substr($email, $atIndex+1);
+      $domain = substr($email, $atIndex + 1);
       $local = substr($email, 0, $atIndex);
       $localLen = strlen($local);
       $domainLen = strlen($domain);
@@ -77,7 +77,7 @@ 
          // domain part length exceeded
          $isValid = false;
       }
-      else if ($local[0] == '.' || $local[$localLen-1] == '.')
+      else if ($local[0] == '.' || $local[$localLen - 1] == '.')
       {
          // local part starts or ends with '.'
          $isValid = false;
@@ -87,7 +87,7 @@ 
          // local part has two consecutive dots
          $isValid = false;
       }
-      else if (!preg_match('/^[A-Za-z0-9\\-\\.]+$/', $domain))
+      else if ( ! preg_match('/^[A-Za-z0-9\\-\\.]+$/', $domain))
       {
          // character not valid in domain part
          $isValid = false;
@@ -97,14 +97,13 @@ 
          // domain part has two consecutive dots
          $isValid = false;
       }
-      else if
-(!preg_match('/^(\\\\.|[A-Za-z0-9!#%&`_=\\/$\'*+?^{}|~.-])+$/',
-                 str_replace("\\\\","",$local)))
+      else if ( ! preg_match('/^(\\\\.|[A-Za-z0-9!#%&`_=\\/$\'*+?^{}|~.-])+$/',
+                 str_replace("\\\\", "", $local)))
       {
          // character not valid in local part unless
          // local part is quoted
-         if (!preg_match('/^"(\\\\"|[^"])+"$/',
-             str_replace("\\\\","",$local)))
+         if ( ! preg_match('/^"(\\\\"|[^"])+"$/',
+             str_replace("\\\\", "", $local)))
          {
             $isValid = false;
          }

Braces +7 added lines, -14 removed lines

@@ -60,8 +60,7 @@ 
    if (is_bool($atIndex) && !$atIndex)
    {
       $isValid = false;
-   }
-   else
+   } else
    {
       $domain = substr($email, $atIndex+1);
       $local = substr($email, 0, $atIndex);
@@ -71,33 +70,27 @@ 
       {
          // local part length exceeded
          $isValid = false;
-      }
-      else if ($domainLen < 1 || $domainLen > 255)
+      } else if ($domainLen < 1 || $domainLen > 255)
       {
          // domain part length exceeded
          $isValid = false;
-      }
-      else if ($local[0] == '.' || $local[$localLen-1] == '.')
+      } else if ($local[0] == '.' || $local[$localLen-1] == '.')
       {
          // local part starts or ends with '.'
          $isValid = false;
-      }
-      else if (preg_match('/\\.\\./', $local))
+      } else if (preg_match('/\\.\\./', $local))
       {
          // local part has two consecutive dots
          $isValid = false;
-      }
-      else if (!preg_match('/^[A-Za-z0-9\\-\\.]+$/', $domain))
+      } else if (!preg_match('/^[A-Za-z0-9\\-\\.]+$/', $domain))
       {
          // character not valid in domain part
          $isValid = false;
-      }
-      else if (preg_match('/\\.\\./', $domain))
+      } else if (preg_match('/\\.\\./', $domain))
       {
          // domain part has two consecutive dots
          $isValid = false;
-      }
-      else if
+      } else if
 (!preg_match('/^(\\\\.|[A-Za-z0-9!#%&`_=\\/$\'*+?^{}|~.-])+$/',
                  str_replace("\\\\","",$local)))
       {

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

Doc Comments +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	/**
 	 * Applies all teh individual item validation strategies on each item in the array
 	 * @param array $normalized_value
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function validate($normalized_value) {
 		if( is_array($normalized_value)){

Spacing +9 added lines, -9 removed lines

@@ -11,14 +11,14 @@ 
  * @since 				4.6
  *
  */
-class EE_Many_Valued_Validation_Strategy extends EE_Validation_Strategy_Base{
+class EE_Many_Valued_Validation_Strategy extends EE_Validation_Strategy_Base {
 	protected $_individual_item_validation_strategies = array();
 	/**
 	 *
 	 * @param EE_Validation_Strategy_Base[] $individual_item_validation_strategies (or a single EE_Validation_Strategy_Base)
 	 */
 	public function __construct($individual_item_validation_strategies) {
-		if( ! is_array($individual_item_validation_strategies)){
+		if ( ! is_array($individual_item_validation_strategies)) {
 			$individual_item_validation_strategies = array($individual_item_validation_strategies);
 		}
 		$this->_individual_item_validation_strategies = $individual_item_validation_strategies;
@@ -30,14 +30,14 @@ 
 	 * @return boolean
 	 */
 	function validate($normalized_value) {
-		if( is_array($normalized_value)){
+		if (is_array($normalized_value)) {
 			$items_to_validate = $normalized_value;
-		}else{
+		} else {
 			$items_to_validate = array($normalized_value);
 		}
-		foreach($items_to_validate as $individual_item){
-			foreach($this->_individual_item_validation_strategies as $validation_strategy){
-				if ( $validation_strategy instanceof EE_Validation_Strategy_Base ) {
+		foreach ($items_to_validate as $individual_item) {
+			foreach ($this->_individual_item_validation_strategies as $validation_strategy) {
+				if ($validation_strategy instanceof EE_Validation_Strategy_Base) {
 					$validation_strategy->validate($individual_item);
 				}
 			}
@@ -50,8 +50,8 @@ 
 	 */
 	function _construct_finalize(\EE_Form_Input_Base $form_input) {
 		parent::_construct_finalize($form_input);
-		foreach($this->_individual_item_validation_strategies as $item_validation_strategy){
-			if ( $item_validation_strategy instanceof EE_Validation_Strategy_Base ) {
+		foreach ($this->_individual_item_validation_strategies as $item_validation_strategy) {
+			if ($item_validation_strategy instanceof EE_Validation_Strategy_Base) {
 				$item_validation_strategy->_construct_finalize($form_input);
 			}
 		}

Braces +1 added lines, -1 removed lines

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