eventespresso / event-espresso-core

core/helpers/EEH_Formatter.helper.php

Doc Comments +5 added lines, -2 removed lines

@@ -88,6 +88,7 @@ 
 	/**
 	 * [ee_tep_not_null description]
 	 * @param  string | array $value [description]
+	 * @param string $value
 	 * @return bool       [description]
 	 */
 	static public function ee_tep_not_null($value) {
@@ -573,6 +574,8 @@ 
 	 * @param EE_State | string $state
 	 * @param EE_Country | string $country
 	 * @param string $zip
+	 * @param integer $state
+	 * @param string $country
 	 * @return EE_Generic_Address
 	 */
 	public function __construct( $address, $address2, $city, $state, $country, $zip ) {
@@ -660,7 +663,7 @@ 
 
 
 	/**
-	 * @return \EE_State
+	 * @return string
 	 */
 	public function state_obj() {
 		return $this->_state_obj;
@@ -709,7 +712,7 @@ 
 
 
 	/**
-	 * @return \EE_Country
+	 * @return string
 	 */
 	public function country_obj() {
 		return $this->_country_obj;

Indentation +87 added lines, -87 removed lines

@@ -297,12 +297,12 @@ 
 
 
 	/**
-	* 	_get_formatter - obtain the requester formatter class
-	*
-	* 	@access private
-	* 	@param string $type how the address is formatted. for example: 'multiline' or 'inline'
-	* 	@return EEI_Address_Formatter
-	*/
+	 * 	_get_formatter - obtain the requester formatter class
+	 *
+	 * 	@access private
+	 * 	@param string $type how the address is formatted. for example: 'multiline' or 'inline'
+	 * 	@return EEI_Address_Formatter
+	 */
 	private static function _get_formatter( $type ) {
 		switch( $type ) {
 
@@ -348,14 +348,14 @@ 
 
 
 	/**
-	* 	_schema_formatting
-	* 	adds schema.org formatting to an address
-	*
-	* 	@access private
-	* 	@param object EEI_Address_Formatter $formatter
-	* 	@param object EEI_Address $obj_with_address
-	* 	@return string
-	*/
+	 * 	_schema_formatting
+	 * 	adds schema.org formatting to an address
+	 *
+	 * 	@access private
+	 * 	@param object EEI_Address_Formatter $formatter
+	 * 	@param object EEI_Address $obj_with_address
+	 * 	@return string
+	 */
 	private static function _schema_formatting( EEI_Address_Formatter $formatter, EEI_Address $obj_with_address ){
 		$formatted_address = '<div itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">';
 		$formatted_address .= $formatter->format(
@@ -396,50 +396,50 @@ 
 
 
 	/**
-	* 	location
-	* 	The location of the event, organization or action.
-	* 	Should include the Venue name AND schema formatted address info
-	*
-	* 	@access public
-	* 	@param string $location
-	* 	@return string
-	*/
+	 * 	location
+	 * 	The location of the event, organization or action.
+	 * 	Should include the Venue name AND schema formatted address info
+	 *
+	 * 	@access public
+	 * 	@param string $location
+	 * 	@return string
+	 */
 	public static function location ( $location = NULL ) {
 		return ! empty( $location ) ? '<div itemprop="location" itemscope itemtype="http://schema.org/Place">' . $location . '</div>' : '';
 	}
 
 	/**
-	* 	name
-	* 	The name of the Event or Venue.
-	*
-	* 	@access public
-	* 	@param string $name
-	* 	@return string
-	*/
+	 * 	name
+	 * 	The name of the Event or Venue.
+	 *
+	 * 	@access public
+	 * 	@param string $name
+	 * 	@return string
+	 */
 	public static function name ( $name = NULL ) {
 		return ! empty( $name ) ? '<span itemprop="name">' . $name . '</span>' : '';
 	}
 
 	/**
-	* 	streetAddress
-	* 	The street address. For example, 1600 Amphitheatre Pkwy.
-	*
-	* 	@access public
-	* 	@param EEI_Address $obj_with_address
-	* 	@return string
-	*/
+	 * 	streetAddress
+	 * 	The street address. For example, 1600 Amphitheatre Pkwy.
+	 *
+	 * 	@access public
+	 * 	@param EEI_Address $obj_with_address
+	 * 	@return string
+	 */
 	public static function streetAddress ( EEI_Address $obj_with_address = NULL ) {
 		return $obj_with_address->address() !== NULL && $obj_with_address->address() !== '' ? '<span itemprop="streetAddress">' . $obj_with_address->address() . '</span>' : '';
 	}
 
 	/**
-	* 	postOfficeBoxNumber
-	* 	The post office box number for PO box addresses.
-	*
-	* 	@access public
-	* 	@param EEI_Address $obj_with_address
-	* 	@return string
-	*/
+	 * 	postOfficeBoxNumber
+	 * 	The post office box number for PO box addresses.
+	 *
+	 * 	@access public
+	 * 	@param EEI_Address $obj_with_address
+	 * 	@return string
+	 */
 	public static function postOfficeBoxNumber ( EEI_Address $obj_with_address = NULL ) {
 		// regex check for some form of PO Box or P.O. Box, etc, etc, etc
 		if ( preg_match("/^\s*((P(OST)?.?\s*(O(FF(ICE)?)?)?.?\s+(B(IN|OX))?)|B(IN|OX))/i", $obj_with_address->address2() )) {
@@ -450,25 +450,25 @@ 
 	}
 
 	/**
-	* 	addressLocality
-	* 	The locality (city, town, etc). For example, Mountain View.
-	*
-	* 	@access public
-	* 	@param EEI_Address $obj_with_address
-	* 	@return string
-	*/
+	 * 	addressLocality
+	 * 	The locality (city, town, etc). For example, Mountain View.
+	 *
+	 * 	@access public
+	 * 	@param EEI_Address $obj_with_address
+	 * 	@return string
+	 */
 	public static function addressLocality ( EEI_Address $obj_with_address = NULL ) {
 		return $obj_with_address->city() !== NULL && $obj_with_address->city() !== '' ? '<span itemprop="addressLocality">' . $obj_with_address->city() . '</span>' : '';
 	}
 
 	/**
-	* 	addressRegion
-	* 	The region (state, province, etc). For example, CA.
-	*
-	* 	@access public
-	* 	@param EEI_Address $obj_with_address
-	* 	@return string
-	*/
+	 * 	addressRegion
+	 * 	The region (state, province, etc). For example, CA.
+	 *
+	 * 	@access public
+	 * 	@param EEI_Address $obj_with_address
+	 * 	@return string
+	 */
 	public static function addressRegion ( EEI_Address $obj_with_address = NULL ) {
 		$state = $obj_with_address->state();
 		if ( ! empty( $state ) ) {
@@ -479,13 +479,13 @@ 
 	}
 
 	/**
-	* 	addressCountry
-	* 	The country. For example, USA. You can also provide the two-letter ISO 3166-1 alpha-2 country code.
-	*
-	* 	@access public
-	* 	@param EEI_Address $obj_with_address
-	* 	@return string
-	*/
+	 * 	addressCountry
+	 * 	The country. For example, USA. You can also provide the two-letter ISO 3166-1 alpha-2 country code.
+	 *
+	 * 	@access public
+	 * 	@param EEI_Address $obj_with_address
+	 * 	@return string
+	 */
 	public static function addressCountry ( EEI_Address $obj_with_address = NULL ) {
 		$country = $obj_with_address->country();
 		if ( ! empty( $country ) ) {
@@ -496,39 +496,39 @@ 
 	}
 
 	/**
-	* 	postalCode
-	* 	The postal code. For example, 94043.
-	*
-	* 	@access public
-	* 	@param EEI_Address $obj_with_address
-	* 	@return string
-	*/
+	 * 	postalCode
+	 * 	The postal code. For example, 94043.
+	 *
+	 * 	@access public
+	 * 	@param EEI_Address $obj_with_address
+	 * 	@return string
+	 */
 	public static function postalCode ( EEI_Address $obj_with_address = NULL ) {
 		return $obj_with_address->zip() !== NULL && $obj_with_address->zip() !== ''  ? '<span itemprop="postalCode">' . $obj_with_address->zip() . '</span>' : '';
 	}
 
 	/**
-	* 	telephone
-	* 	The telephone number.
-	*
-	* 	@access public
-	* 	@param string $phone_nmbr
-	* 	@return string
-	*/
+	 * 	telephone
+	 * 	The telephone number.
+	 *
+	 * 	@access public
+	 * 	@param string $phone_nmbr
+	 * 	@return string
+	 */
 	public static function telephone ( $phone_nmbr = NULL ) {
 		return $phone_nmbr !== NULL && $phone_nmbr !== ''  ? '<span itemprop="telephone">' . $phone_nmbr . '</span>' : '';
 	}
 
 	/**
-	* 	URL
-	* 	URL of the item as a clickable link
-	*
-	* 	@access public
-	* 	@param string $url - the URL that the link will resolve to
-	* 	@param string $text - the text that will be used for the visible link
-	* 	@param array $attributes - array of additional link attributes in  attribute_name => value pairs. ie: array( 'title' => 'click here', 'class' => 'link-class' )
-	* 	@return string (link)
-	*/
+	 * 	URL
+	 * 	URL of the item as a clickable link
+	 *
+	 * 	@access public
+	 * 	@param string $url - the URL that the link will resolve to
+	 * 	@param string $text - the text that will be used for the visible link
+	 * 	@param array $attributes - array of additional link attributes in  attribute_name => value pairs. ie: array( 'title' => 'click here', 'class' => 'link-class' )
+	 * 	@return string (link)
+	 */
 	public static function url ( $url = NULL, $text = NULL, $attributes = array() ) {
 		$atts = '';
 		foreach ( $attributes as $attribute => $value ) {

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

Spacing +79 added lines, -79 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -39,7 +39,7 @@ 
 	 * @param  string $content content to format
 	 * @return string          formatted content
 	 */
-	static public function admin_format_content($content='') {
+	static public function admin_format_content($content = '') {
 		return wpautop(stripslashes_deep(html_entity_decode($content, ENT_QUOTES, "UTF-8")));
 	}
 
@@ -79,7 +79,7 @@ 
 	 * @return string
 	 */
 	static public	function ee_tep_parse_input_field_data($data, $parse) {
-		return strtr( trim($data), $parse);
+		return strtr(trim($data), $parse);
 	}
 
 
@@ -116,17 +116,17 @@ 
 	 * @return string
 	 * @deprecated v4.6.21
 	 */
-	static public function event_date_display( $date, $format = '' ) {
+	static public function event_date_display($date, $format = '') {
 		EE_Error::doing_it_wrong(
 			'EEH_Formatter::event_date_display()',
-			__( 'This method is deprecated. If you wish to display an Event date in a theme template, then there are better alternatives such as EEH_Event_View::the_event_date() which can be found in \core\helpers\EEH_Event_View.helper.php', 'event_espresso' ),
+			__('This method is deprecated. If you wish to display an Event date in a theme template, then there are better alternatives such as EEH_Event_View::the_event_date() which can be found in \core\helpers\EEH_Event_View.helper.php', 'event_espresso'),
 			'4.6.21'
 		);
-		if ( empty( $date )) {
+		if (empty($date)) {
 			return '';
 		} else {
 			$format = $format == '' ? get_option('date_format') : $format;
-			return date_i18n( $format, strtotime( $date ));
+			return date_i18n($format, strtotime($date));
 		}
 	}
 
@@ -163,14 +163,14 @@ 
 	 * @param string $zip
 	 * @return string
 	 */
-	public function format( $address, $address2, $city, $state, $country, $zip ) {
+	public function format($address, $address2, $city, $state, $country, $zip) {
 		$formatted_address = $address;
-		$formatted_address .= ! empty( $address2 ) ? '<br/>' . $address2 : '';
-		$formatted_address .= ! empty( $city ) ? '<br/>' . $city : '';
-		$formatted_address .=  ! empty( $city ) && ! empty( $state ) ? ', ' : '';
-		$formatted_address .= ! empty( $state ) ? $state : '';
-		$formatted_address .= ! empty( $zip ) ? '<br/>' . $zip : '';
-		$formatted_address .= ! empty( $country ) ? '<br/>' . $country : '';
+		$formatted_address .= ! empty($address2) ? '<br/>'.$address2 : '';
+		$formatted_address .= ! empty($city) ? '<br/>'.$city : '';
+		$formatted_address .= ! empty($city) && ! empty($state) ? ', ' : '';
+		$formatted_address .= ! empty($state) ? $state : '';
+		$formatted_address .= ! empty($zip) ? '<br/>'.$zip : '';
+		$formatted_address .= ! empty($country) ? '<br/>'.$country : '';
 		return $formatted_address;
 	}
 }
@@ -202,18 +202,18 @@ 
 	 * @param string $zip
 	 * @return string
 	 */
-	public function format( $address, $address2, $city, $state, $country, $zip ) {
+	public function format($address, $address2, $city, $state, $country, $zip) {
 		$formatted_address = $address;
-		$formatted_address .= substr( $formatted_address, -2 ) != ', ' ? ', ' : '';
-		$formatted_address .= ! empty( $address2 ) ? $address2 : '';
-		$formatted_address .= substr( $formatted_address, -2 ) != ', ' ? ', ' : '';
-		$formatted_address .= ! empty( $city ) ? $city : '';
-		$formatted_address .= substr( $formatted_address, -2 ) != ', ' ? ', ' : '';
-		$formatted_address .= ! empty( $state ) ? $state : '';
-		$formatted_address .= substr( $formatted_address, -2 ) != ', ' ? ', ' : '';
-		$formatted_address .= ! empty( $country ) ? $country : '';
-		$formatted_address .= substr( $formatted_address, -2 ) != ', ' ? ', ' : '';
-		$formatted_address .= ! empty( $zip ) ? $zip : '';
+		$formatted_address .= substr($formatted_address, -2) != ', ' ? ', ' : '';
+		$formatted_address .= ! empty($address2) ? $address2 : '';
+		$formatted_address .= substr($formatted_address, -2) != ', ' ? ', ' : '';
+		$formatted_address .= ! empty($city) ? $city : '';
+		$formatted_address .= substr($formatted_address, -2) != ', ' ? ', ' : '';
+		$formatted_address .= ! empty($state) ? $state : '';
+		$formatted_address .= substr($formatted_address, -2) != ', ' ? ', ' : '';
+		$formatted_address .= ! empty($country) ? $country : '';
+		$formatted_address .= substr($formatted_address, -2) != ', ' ? ', ' : '';
+		$formatted_address .= ! empty($zip) ? $zip : '';
 		return $formatted_address;
 	}
 }
@@ -246,7 +246,7 @@ 
 	 * @param string $zip
 	 * @return string
 	 */
-	public function format( $address, $address2, $city, $state, $country, $zip ) {
+	public function format($address, $address2, $city, $state, $country, $zip) {
 		return NULL;
 	}
 }
@@ -282,20 +282,20 @@ 
 	 * @param bool    $add_wrapper
 	 * @return string
 	 */
-	public static function format ( $obj_with_address = null, $type = 'multiline', $use_schema = true, $add_wrapper = true ) {
+	public static function format($obj_with_address = null, $type = 'multiline', $use_schema = true, $add_wrapper = true) {
 		// check that incoming object implements the EEI_Address interface
-		if ( ! $obj_with_address instanceof EEI_Address ) {
-			$msg = __( 'The address could not be formatted.', 'event_espresso' );
-			$dev_msg = __( 'The EE_Address_Formatter requires passed objects to implement the EEI_Address interface.', 'event_espresso' );
-			EE_Error::add_error( $msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $obj_with_address instanceof EEI_Address) {
+			$msg = __('The address could not be formatted.', 'event_espresso');
+			$dev_msg = __('The EE_Address_Formatter requires passed objects to implement the EEI_Address interface.', 'event_espresso');
+			EE_Error::add_error($msg.'||'.$dev_msg, __FILE__, __FUNCTION__, __LINE__);
 			return null;
 		}
 		// obtain an address formatter
-		$formatter = EEH_Address::_get_formatter( $type );
+		$formatter = EEH_Address::_get_formatter($type);
 		// apply schema.org formatting ?
 		$use_schema = ! is_admin() ? $use_schema : false;
-		$formatted_address = $use_schema ? EEH_Address::_schema_formatting( $formatter, $obj_with_address ) : EEH_Address::_regular_formatting( $formatter, $obj_with_address, $add_wrapper ) ;
-		$formatted_address = $add_wrapper && ! $use_schema ? '<div class="espresso-address-dv">' . $formatted_address . '</div>' : $formatted_address;
+		$formatted_address = $use_schema ? EEH_Address::_schema_formatting($formatter, $obj_with_address) : EEH_Address::_regular_formatting($formatter, $obj_with_address, $add_wrapper);
+		$formatted_address = $add_wrapper && ! $use_schema ? '<div class="espresso-address-dv">'.$formatted_address.'</div>' : $formatted_address;
 		// return the formatted address
 		return $formatted_address;
 	}
@@ -309,8 +309,8 @@ 
 	* 	@param string $type how the address is formatted. for example: 'multiline' or 'inline'
 	* 	@return EEI_Address_Formatter
 	*/
-	private static function _get_formatter( $type ) {
-		switch( $type ) {
+	private static function _get_formatter($type) {
+		switch ($type) {
 
 			case 'multiline' :
 				return new EE_MultiLine_Address_Formatter();
@@ -336,7 +336,7 @@ 
 	 * @param bool $add_wrapper
 	 * @return string
 	 */
-	private static function _regular_formatting( EEI_Address_Formatter $formatter, EEI_Address $obj_with_address, $add_wrapper = TRUE ){
+	private static function _regular_formatting(EEI_Address_Formatter $formatter, EEI_Address $obj_with_address, $add_wrapper = TRUE) {
 		$formatted_address = $add_wrapper ? '<div>' : '';
 		$formatted_address .= $formatter->format(
 			$obj_with_address->address(),
@@ -362,15 +362,15 @@ 
 	* 	@param object EEI_Address $obj_with_address
 	* 	@return string
 	*/
-	private static function _schema_formatting( EEI_Address_Formatter $formatter, EEI_Address $obj_with_address ){
+	private static function _schema_formatting(EEI_Address_Formatter $formatter, EEI_Address $obj_with_address) {
 		$formatted_address = '<div itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">';
 		$formatted_address .= $formatter->format(
-			EEH_Schema::streetAddress( $obj_with_address ),
-			EEH_Schema::postOfficeBoxNumber( $obj_with_address ),
-			EEH_Schema::addressLocality( $obj_with_address ),
-			EEH_Schema::addressRegion( $obj_with_address ),
-			EEH_Schema::addressCountry( $obj_with_address ),
-			EEH_Schema::postalCode( $obj_with_address )
+			EEH_Schema::streetAddress($obj_with_address),
+			EEH_Schema::postOfficeBoxNumber($obj_with_address),
+			EEH_Schema::addressLocality($obj_with_address),
+			EEH_Schema::addressRegion($obj_with_address),
+			EEH_Schema::addressCountry($obj_with_address),
+			EEH_Schema::postalCode($obj_with_address)
 		);
 		$formatted_address .= '</div>';
 		// return the formatted address
@@ -410,8 +410,8 @@ 
 	* 	@param string $location
 	* 	@return string
 	*/
-	public static function location ( $location = NULL ) {
-		return ! empty( $location ) ? '<div itemprop="location" itemscope itemtype="http://schema.org/Place">' . $location . '</div>' : '';
+	public static function location($location = NULL) {
+		return ! empty($location) ? '<div itemprop="location" itemscope itemtype="http://schema.org/Place">'.$location.'</div>' : '';
 	}
 
 	/**
@@ -422,8 +422,8 @@ 
 	* 	@param string $name
 	* 	@return string
 	*/
-	public static function name ( $name = NULL ) {
-		return ! empty( $name ) ? '<span itemprop="name">' . $name . '</span>' : '';
+	public static function name($name = NULL) {
+		return ! empty($name) ? '<span itemprop="name">'.$name.'</span>' : '';
 	}
 
 	/**
@@ -434,8 +434,8 @@ 
 	* 	@param EEI_Address $obj_with_address
 	* 	@return string
 	*/
-	public static function streetAddress ( EEI_Address $obj_with_address = NULL ) {
-		return $obj_with_address->address() !== NULL && $obj_with_address->address() !== '' ? '<span itemprop="streetAddress">' . $obj_with_address->address() . '</span>' : '';
+	public static function streetAddress(EEI_Address $obj_with_address = NULL) {
+		return $obj_with_address->address() !== NULL && $obj_with_address->address() !== '' ? '<span itemprop="streetAddress">'.$obj_with_address->address().'</span>' : '';
 	}
 
 	/**
@@ -446,10 +446,10 @@ 
 	* 	@param EEI_Address $obj_with_address
 	* 	@return string
 	*/
-	public static function postOfficeBoxNumber ( EEI_Address $obj_with_address = NULL ) {
+	public static function postOfficeBoxNumber(EEI_Address $obj_with_address = NULL) {
 		// regex check for some form of PO Box or P.O. Box, etc, etc, etc
-		if ( preg_match("/^\s*((P(OST)?.?\s*(O(FF(ICE)?)?)?.?\s+(B(IN|OX))?)|B(IN|OX))/i", $obj_with_address->address2() )) {
-			return $obj_with_address->address2() !== NULL && $obj_with_address->address2() !== '' ? '<span itemprop="postOfficeBoxNumber">' . $obj_with_address->address2() . '</span>' : '';
+		if (preg_match("/^\s*((P(OST)?.?\s*(O(FF(ICE)?)?)?.?\s+(B(IN|OX))?)|B(IN|OX))/i", $obj_with_address->address2())) {
+			return $obj_with_address->address2() !== NULL && $obj_with_address->address2() !== '' ? '<span itemprop="postOfficeBoxNumber">'.$obj_with_address->address2().'</span>' : '';
 		} else {
 			return $obj_with_address->address2();
 		}
@@ -463,8 +463,8 @@ 
 	* 	@param EEI_Address $obj_with_address
 	* 	@return string
 	*/
-	public static function addressLocality ( EEI_Address $obj_with_address = NULL ) {
-		return $obj_with_address->city() !== NULL && $obj_with_address->city() !== '' ? '<span itemprop="addressLocality">' . $obj_with_address->city() . '</span>' : '';
+	public static function addressLocality(EEI_Address $obj_with_address = NULL) {
+		return $obj_with_address->city() !== NULL && $obj_with_address->city() !== '' ? '<span itemprop="addressLocality">'.$obj_with_address->city().'</span>' : '';
 	}
 
 	/**
@@ -475,10 +475,10 @@ 
 	* 	@param EEI_Address $obj_with_address
 	* 	@return string
 	*/
-	public static function addressRegion ( EEI_Address $obj_with_address = NULL ) {
+	public static function addressRegion(EEI_Address $obj_with_address = NULL) {
 		$state = $obj_with_address->state();
-		if ( ! empty( $state ) ) {
-			return '<span itemprop="addressRegion">' . $state . '</span>';
+		if ( ! empty($state)) {
+			return '<span itemprop="addressRegion">'.$state.'</span>';
 		} else {
 			return '';
 		}
@@ -492,10 +492,10 @@ 
 	* 	@param EEI_Address $obj_with_address
 	* 	@return string
 	*/
-	public static function addressCountry ( EEI_Address $obj_with_address = NULL ) {
+	public static function addressCountry(EEI_Address $obj_with_address = NULL) {
 		$country = $obj_with_address->country();
-		if ( ! empty( $country ) ) {
-			return '<span itemprop="addressCountry">' . $country . '</span>';
+		if ( ! empty($country)) {
+			return '<span itemprop="addressCountry">'.$country.'</span>';
 		} else {
 			return '';
 		}
@@ -509,8 +509,8 @@ 
 	* 	@param EEI_Address $obj_with_address
 	* 	@return string
 	*/
-	public static function postalCode ( EEI_Address $obj_with_address = NULL ) {
-		return $obj_with_address->zip() !== NULL && $obj_with_address->zip() !== ''  ? '<span itemprop="postalCode">' . $obj_with_address->zip() . '</span>' : '';
+	public static function postalCode(EEI_Address $obj_with_address = NULL) {
+		return $obj_with_address->zip() !== NULL && $obj_with_address->zip() !== '' ? '<span itemprop="postalCode">'.$obj_with_address->zip().'</span>' : '';
 	}
 
 	/**
@@ -521,8 +521,8 @@ 
 	* 	@param string $phone_nmbr
 	* 	@return string
 	*/
-	public static function telephone ( $phone_nmbr = NULL ) {
-		return $phone_nmbr !== NULL && $phone_nmbr !== ''  ? '<span itemprop="telephone">' . $phone_nmbr . '</span>' : '';
+	public static function telephone($phone_nmbr = NULL) {
+		return $phone_nmbr !== NULL && $phone_nmbr !== '' ? '<span itemprop="telephone">'.$phone_nmbr.'</span>' : '';
 	}
 
 	/**
@@ -535,13 +535,13 @@ 
 	* 	@param array $attributes - array of additional link attributes in  attribute_name => value pairs. ie: array( 'title' => 'click here', 'class' => 'link-class' )
 	* 	@return string (link)
 	*/
-	public static function url ( $url = NULL, $text = NULL, $attributes = array() ) {
+	public static function url($url = NULL, $text = NULL, $attributes = array()) {
 		$atts = '';
-		foreach ( $attributes as $attribute => $value ) {
-			$atts .= ' ' . $attribute . '="' . $value . '"';
+		foreach ($attributes as $attribute => $value) {
+			$atts .= ' '.$attribute.'="'.$value.'"';
 		}
 		$text = $text !== NULL && $text !== '' ? $text : $url;
-		return $url !== NULL && $url !== '' ? '<a itemprop="url" href="' . $url . '"' . $atts . '>' . $text . '</a>' : '';
+		return $url !== NULL && $url !== '' ? '<a itemprop="url" href="'.$url.'"'.$atts.'>'.$text.'</a>' : '';
 	}
 
 
@@ -581,17 +581,17 @@ 
 	 * @param string $zip
 	 * @return EE_Generic_Address
 	 */
-	public function __construct( $address, $address2, $city, $state, $country, $zip ) {
+	public function __construct($address, $address2, $city, $state, $country, $zip) {
 		$this->_address = $address;
 		$this->_address2 = $address2;
 		$this->_city = $city;
-		if ( $state instanceof EE_State ) {
+		if ($state instanceof EE_State) {
 			$this->_state_obj = $state;
 		} else {
 			$this->_state_ID = $state;
 			$this->_state_obj = $this->_get_state_obj();
 		}
-		if ( $country instanceof EE_Country ) {
+		if ($country instanceof EE_Country) {
 			$this->_country_obj = $country;
 		} else {
 			$this->_country_ID = $country;
@@ -633,7 +633,7 @@ 
 	 * @return \EE_State
 	 */
 	private function _get_state_obj() {
-		return $this->_state_obj instanceof EE_State ? $this->_state_obj : EE_Registry::instance()->load_model( 'State' )->get_one_by_ID( $this->_state_ID );
+		return $this->_state_obj instanceof EE_State ? $this->_state_obj : EE_Registry::instance()->load_model('State')->get_one_by_ID($this->_state_ID);
 	}
 
 
@@ -651,7 +651,7 @@ 
 	 * @return string
 	 */
 	public function state_abbrev() {
-		return $this->state_obj() instanceof EE_State ? $this->state_obj()->abbrev() : __( 'Unknown', 'event_espresso' );
+		return $this->state_obj() instanceof EE_State ? $this->state_obj()->abbrev() : __('Unknown', 'event_espresso');
 	}
 
 
@@ -660,7 +660,7 @@ 
 	 * @return string
 	 */
 	public function state_name() {
-		return $this->state_obj() instanceof EE_State ? $this->state_obj()->name() :  __( 'Unknown', 'event_espresso' );
+		return $this->state_obj() instanceof EE_State ? $this->state_obj()->name() : __('Unknown', 'event_espresso');
 	}
 
 
@@ -678,7 +678,7 @@ 
 	 * @return string
 	 */
 	public function state() {
-		if ( apply_filters( 'FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj() ) ) {
+		if (apply_filters('FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj())) {
 			return $this->state_obj()->abbrev();
 		} else {
 			return $this->state_name();
@@ -691,7 +691,7 @@ 
 	 * @return EE_Country
 	 */
 	private function _get_country_obj() {
-		return $this->_country_obj instanceof EE_Country ? $this->_country_obj : EE_Registry::instance()->load_model( 'Country' )->get_one_by_ID( $this->_country_ID );
+		return $this->_country_obj instanceof EE_Country ? $this->_country_obj : EE_Registry::instance()->load_model('Country')->get_one_by_ID($this->_country_ID);
 	}
 
 
@@ -709,7 +709,7 @@ 
 	 * @return string
 	 */
 	public function country_name() {
-		return $this->country_obj() instanceof EE_Country ? $this->country_obj()->name() :  __( 'Unknown', 'event_espresso' );
+		return $this->country_obj() instanceof EE_Country ? $this->country_obj()->name() : __('Unknown', 'event_espresso');
 	}
 
 
@@ -727,7 +727,7 @@ 
 	 * @return string
 	 */
 	public function country() {
-		if ( apply_filters( 'FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj() ) ) {
+		if (apply_filters('FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj())) {
 			return $this->country_ID();
 		} else {
 			return $this->country_name();

core/helpers/EEH_Maps.helper.php

Doc Comments -2 removed lines

@@ -31,7 +31,6 @@ 
 
 	/**
 	 * google_map - creates a Google Map Link
-	 * @param  array $atts aray of attributes required for the map link generation
 	 * @return string (link to map!)
 	 */
 	public static function google_map( $ee_gmaps_opts ){
@@ -116,7 +115,6 @@ 
 
 	/**
 	 * creates a Google Map Link
-	 * @param  array $atts aray of attributes required for the map link generation
 	 * @return string (link to map!)
 	 */
 	public static function espresso_google_map_js() {

Spacing +27 added lines, -27 removed lines

@@ -34,20 +34,20 @@ 
 	 * @param  array $atts aray of attributes required for the map link generation
 	 * @return string (link to map!)
 	 */
-	public static function google_map( $ee_gmaps_opts ){
+	public static function google_map($ee_gmaps_opts) {
 
 		//d( $ee_gmaps_opts );
 
-		$ee_map_width = isset( $ee_gmaps_opts['ee_map_width'] ) && ! empty( $ee_gmaps_opts['ee_map_width'] ) ? $ee_gmaps_opts['ee_map_width'] : '300';
-		$ee_map_height = isset( $ee_gmaps_opts['ee_map_height'] ) && ! empty( $ee_gmaps_opts['ee_map_height'] ) ? $ee_gmaps_opts['ee_map_height'] : '185';
-		$ee_map_zoom = isset( $ee_gmaps_opts['ee_map_zoom'] ) && ! empty( $ee_gmaps_opts['ee_map_zoom'] ) ? $ee_gmaps_opts['ee_map_zoom'] : '12';
-		$ee_map_nav_display = isset( $ee_gmaps_opts['ee_map_nav_display'] ) && ! empty( $ee_gmaps_opts['ee_map_nav_display'] ) ? 'true' : 'false';
-		$ee_map_nav_size =  isset( $ee_gmaps_opts['ee_map_nav_size'] ) && ! empty( $ee_gmaps_opts['ee_map_nav_size'] )? $ee_gmaps_opts['ee_map_nav_size'] : 'default';
-		$ee_map_type_control =  isset( $ee_gmaps_opts['ee_map_type_control'] ) && ! empty( $ee_gmaps_opts['ee_map_type_control'] )? $ee_gmaps_opts['ee_map_type_control'] : 'default';
-		$static_url =  isset( $ee_gmaps_opts['ee_static_url'] ) && ! empty( $ee_gmaps_opts['ee_static_url'] )? $ee_gmaps_opts['ee_static_url'] : FALSE;
+		$ee_map_width = isset($ee_gmaps_opts['ee_map_width']) && ! empty($ee_gmaps_opts['ee_map_width']) ? $ee_gmaps_opts['ee_map_width'] : '300';
+		$ee_map_height = isset($ee_gmaps_opts['ee_map_height']) && ! empty($ee_gmaps_opts['ee_map_height']) ? $ee_gmaps_opts['ee_map_height'] : '185';
+		$ee_map_zoom = isset($ee_gmaps_opts['ee_map_zoom']) && ! empty($ee_gmaps_opts['ee_map_zoom']) ? $ee_gmaps_opts['ee_map_zoom'] : '12';
+		$ee_map_nav_display = isset($ee_gmaps_opts['ee_map_nav_display']) && ! empty($ee_gmaps_opts['ee_map_nav_display']) ? 'true' : 'false';
+		$ee_map_nav_size = isset($ee_gmaps_opts['ee_map_nav_size']) && ! empty($ee_gmaps_opts['ee_map_nav_size']) ? $ee_gmaps_opts['ee_map_nav_size'] : 'default';
+		$ee_map_type_control = isset($ee_gmaps_opts['ee_map_type_control']) && ! empty($ee_gmaps_opts['ee_map_type_control']) ? $ee_gmaps_opts['ee_map_type_control'] : 'default';
+		$static_url = isset($ee_gmaps_opts['ee_static_url']) && ! empty($ee_gmaps_opts['ee_static_url']) ? $ee_gmaps_opts['ee_static_url'] : FALSE;
 
-		if( isset( $ee_gmaps_opts['ee_map_align'] ) && ! empty( $ee_gmaps_opts['ee_map_align'] )){
-			switch( $ee_gmaps_opts['ee_map_align'] ){
+		if (isset($ee_gmaps_opts['ee_map_align']) && ! empty($ee_gmaps_opts['ee_map_align'])) {
+			switch ($ee_gmaps_opts['ee_map_align']) {
 				case "left":
 					$map_align = 'ee-gmap-align-left left';
 					break;
@@ -68,18 +68,18 @@ 
 
 		// Determine whether user has set a hardoded url to use and
 		// if so display a Google static iframe map else run V3 api
-		if( $static_url ) {
+		if ($static_url) {
 
-			$html = '<div class="ee-gmap-iframewrap ee-gmap-wrapper ' . $map_align . '">';
-			$html .= '<iframe src="' . $static_url . '&output=embed" style="width: ' . $ee_map_width  .'px; height: ' . $ee_map_height . 'px;" frameborder="0" scrolling="no">';
+			$html = '<div class="ee-gmap-iframewrap ee-gmap-wrapper '.$map_align.'">';
+			$html .= '<iframe src="'.$static_url.'&output=embed" style="width: '.$ee_map_width.'px; height: '.$ee_map_height.'px;" frameborder="0" scrolling="no">';
 			$html .= '</iframe>';
-			$html .= '<a href="' . $static_url . '">View Large map</a>';
+			$html .= '<a href="'.$static_url.'">View Large map</a>';
 			$html .= '</div>';
 			return $html;
 
 		 } else {
 
-			EEH_Maps::$gmap_vars[ $ee_gmaps_opts['map_ID'] ] = array(
+			EEH_Maps::$gmap_vars[$ee_gmaps_opts['map_ID']] = array(
 				'map_ID' => $ee_gmaps_opts['map_ID'],
 				'ee_map_zoom' => $ee_map_zoom,
 				'ee_map_nav_display' => $ee_map_nav_display,
@@ -89,12 +89,12 @@ 
 			);
 
 			$html = '<div class="ee-gmap-wrapper '.$map_align.';">';
-			$html .= '<div class="ee-gmap" id="map_canvas_' . $ee_gmaps_opts['map_ID'] .'" style="width: '.$ee_map_width.'px; height: '.$ee_map_height.'px;"></div>';  //
+			$html .= '<div class="ee-gmap" id="map_canvas_'.$ee_gmaps_opts['map_ID'].'" style="width: '.$ee_map_width.'px; height: '.$ee_map_height.'px;"></div>'; //
 			$html .= '</div>';
 
-			wp_enqueue_script( 'gmap_api' );
-			wp_enqueue_script( 'ee_gmap' );
-			add_action( 'wp_footer', array( 'EEH_Maps', 'footer_enqueue_script' ));
+			wp_enqueue_script('gmap_api');
+			wp_enqueue_script('ee_gmap');
+			add_action('wp_footer', array('EEH_Maps', 'footer_enqueue_script'));
 
 			return $html;
 
@@ -109,7 +109,7 @@ 
 	 * @return void
 	 */
 	public static function footer_enqueue_script() {
-		wp_localize_script( 'ee_gmap', 'ee_gmap_vars', EEH_Maps::$gmap_vars );
+		wp_localize_script('ee_gmap', 'ee_gmap_vars', EEH_Maps::$gmap_vars);
 	}
 
 
@@ -121,8 +121,8 @@ 
 	 */
 	public static function espresso_google_map_js() {
 		$scheme = is_ssl() ? 'https://' : 'http://';
-		wp_register_script( 'gmap_api', $scheme . 'maps.google.com/maps/api/js?sensor=false', array('jquery'), NULL, TRUE );
-		wp_register_script( 'ee_gmap', plugin_dir_url(__FILE__) . 'assets/ee_gmap.js', array('gmap_api'), '1.0', TRUE );
+		wp_register_script('gmap_api', $scheme.'maps.google.com/maps/api/js?sensor=false', array('jquery'), NULL, TRUE);
+		wp_register_script('ee_gmap', plugin_dir_url(__FILE__).'assets/ee_gmap.js', array('gmap_api'), '1.0', TRUE);
 	}
 
 	/**
@@ -131,7 +131,7 @@ 
 	 * @return string (link to map!)
 	 */
 	public static function google_map_link($atts) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		extract($atts);
 
 		$address = "{$address}";
@@ -146,9 +146,9 @@ 
 		$id = isset($id) ? $id : 'not_set';
 		$map_image_class = isset($map_image_class) ? $map_image_class : 'ee_google_map_view';
 
-		$address_string = ($address != '' ? $address : '') . ($city != '' ? ',' . $city : '') . ($state != '' ? ',' . $state : '') . ($zip != '' ? ',' . $zip : '') . ($country != '' ? ',' . $country : '');
+		$address_string = ($address != '' ? $address : '').($city != '' ? ','.$city : '').($state != '' ? ','.$state : '').($zip != '' ? ','.$zip : '').($country != '' ? ','.$country : '');
 
-		$google_map = htmlentities2('http://maps.google.com/maps?q=' . urlencode( $address_string ));
+		$google_map = htmlentities2('http://maps.google.com/maps?q='.urlencode($address_string));
 
 		switch ($type) {
 			case 'text':
@@ -162,10 +162,10 @@ 
 
 			case 'map':
 				$scheme = is_ssl() ? 'https://' : 'http://';
-				return '<a class="a_map_image_link" href="' . $google_map . '" target="_blank">' . '<img class="map_image_link" id="venue_map_' . $id . '" ' . $map_image_class . ' src="' . htmlentities2( $scheme . 'maps.googleapis.com/maps/api/staticmap?center=' . urlencode( $address_string ) . '&amp;zoom=14&amp;size=' . $map_w . 'x' . $map_h . '&amp;markers=color:green|label:|' . urlencode( $address_string ) . '&amp;sensor=false' ) . '" /></a>';
+				return '<a class="a_map_image_link" href="'.$google_map.'" target="_blank">'.'<img class="map_image_link" id="venue_map_'.$id.'" '.$map_image_class.' src="'.htmlentities2($scheme.'maps.googleapis.com/maps/api/staticmap?center='.urlencode($address_string).'&amp;zoom=14&amp;size='.$map_w.'x'.$map_h.'&amp;markers=color:green|label:|'.urlencode($address_string).'&amp;sensor=false').'" /></a>';
 		}
 
-		return '<a href="' . $google_map . '" target="_blank">' . $text . '</a>';
+		return '<a href="'.$google_map.'" target="_blank">'.$text.'</a>';
 	}
 
 

core/helpers/EEH_Qtip_Loader.helper.php

Doc Comments +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
 	 * - registers and enqueues the qtip scripts and styles.
 	 *
 	 * @access public
-	 * @param  array  $paths      Array of paths to check for the EE_Qtip class. If present we check these path(s) first.  If not present (empty array), then it's assumed it's either in core/libraries/qtips OR the file is already loaded.
+	 * @param  string[]  $paths      Array of paths to check for the EE_Qtip class. If present we check these path(s) first.  If not present (empty array), then it's assumed it's either in core/libraries/qtips OR the file is already loaded.
 	 * @param  string|array $configname name of the Qtip class (full class name is expected and will be used for looking for file, Qtip config classes must extend EE_Qtip_Config) [if this is an array, then we loop through the array to instantiate and setup the qtips]
 	 * @return void
 	 */

Spacing +44 added lines, -44 removed lines

@@ -32,7 +32,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EEH_Qtip_Loader )) {
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EEH_Qtip_Loader)) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -48,8 +48,8 @@ 
 	 */
 	private function __construct() {
 		//let's just make sure this is instantiated in the right place.
-		if ( did_action( 'wp_print_styles' ) || did_action( 'admin_head' )) {
-			EE_Error::doing_it_wrong( 'EEH_Qtip_Loader', __('This helper must be instantiated before or within a callback for the WordPress wp_enqueue_scripts hook action hook.', 'event_espresso' ), '4.1' );
+		if (did_action('wp_print_styles') || did_action('admin_head')) {
+			EE_Error::doing_it_wrong('EEH_Qtip_Loader', __('This helper must be instantiated before or within a callback for the WordPress wp_enqueue_scripts hook action hook.', 'event_espresso'), '4.1');
 		}
 	}
 
@@ -61,27 +61,27 @@ 
 	 * @return void
 	 */
 	public function register_and_enqueue() {
-		$qtips_js = !defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.js' : EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.js';
-		$qtip_images_loaded = EE_THIRD_PARTY_URL . 'qtip/imagesloaded.pkg.min.js';
-		$qtip_map = EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.map';
-		$qtipcss = !defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.css' : EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.css';
+		$qtips_js = ! defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL.'qtip/jquery.qtip.min.js' : EE_THIRD_PARTY_URL.'qtip/jquery.qtip.js';
+		$qtip_images_loaded = EE_THIRD_PARTY_URL.'qtip/imagesloaded.pkg.min.js';
+		$qtip_map = EE_THIRD_PARTY_URL.'qtip/jquery.qtip.min.map';
+		$qtipcss = ! defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL.'qtip/jquery.qtip.min.css' : EE_THIRD_PARTY_URL.'qtip/jquery.qtip.css';
 
-		wp_register_script('qtip-map', $qtip_map, array(), '3', TRUE );
-		wp_register_script('qtip-images-loaded', $qtip_images_loaded, array(), '2.2.0', TRUE );
-		wp_register_script('qtip', $qtips_js, array('jquery'), '2.2.0', TRUE );
-		wp_register_script('ee-qtip-helper', EE_HELPERS_ASSETS . 'ee-qtip-helper.js', array('qtip', 'jquery-cookie'), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_register_script('qtip-map', $qtip_map, array(), '3', TRUE);
+		wp_register_script('qtip-images-loaded', $qtip_images_loaded, array(), '2.2.0', TRUE);
+		wp_register_script('qtip', $qtips_js, array('jquery'), '2.2.0', TRUE);
+		wp_register_script('ee-qtip-helper', EE_HELPERS_ASSETS.'ee-qtip-helper.js', array('qtip', 'jquery-cookie'), EVENT_ESPRESSO_VERSION, TRUE);
 
-		wp_register_style('qtip-css', $qtipcss, array(), '2.2' );
+		wp_register_style('qtip-css', $qtipcss, array(), '2.2');
 
 		//k now let's see if there are any registered qtips.  If there are, then we need to setup the localized script for ee-qtip-helper.js (and enqueue ee-qtip-helper.js of course!)
-		if ( !empty( $this->_qtips ) ) {
+		if ( ! empty($this->_qtips)) {
 			wp_enqueue_script('ee-qtip-helper');
 			wp_enqueue_style('qtip-css');
 			$qtips = array();
-			foreach ( $this->_qtips as $qtip ) {
+			foreach ($this->_qtips as $qtip) {
 				$qts = $qtip->get_tips();
-				foreach ( $qts as $qt ) {
-					if ( ! $qt instanceof EE_Qtip )
+				foreach ($qts as $qt) {
+					if ( ! $qt instanceof EE_Qtip)
 						continue;
 					$qtips[] = array(
 						'content_id' => $qt->content_id,
@@ -90,8 +90,8 @@ 
 						);
 				}
 			}
-			if ( !empty($qtips) )
-				wp_localize_script('ee-qtip-helper', 'EE_QTIP_HELPER', array( 'qtips' => $qtips ) );
+			if ( ! empty($qtips))
+				wp_localize_script('ee-qtip-helper', 'EE_QTIP_HELPER', array('qtips' => $qtips));
 
 		} else {
 			//qtips has been requested without any registration (so assuming its just directly used in the admin).
@@ -113,24 +113,24 @@ 
 	 * @param  string|array $configname name of the Qtip class (full class name is expected and will be used for looking for file, Qtip config classes must extend EE_Qtip_Config) [if this is an array, then we loop through the array to instantiate and setup the qtips]
 	 * @return void
 	 */
-	public function register( $configname, $paths = array() ) {
+	public function register($configname, $paths = array()) {
 
 		//let's just make sure this is instantiated in the right place.
-		if ( did_action('wp_enqueue_scripts') || did_action('admin_enqueue_scripts') ) {
-			EE_Error::doing_it_wrong( 'EEH_Qtip_Loader->register()', __('EE_Qtip_Config objects must be registered before wp_enqueue_scripts is called.', 'event_espresso' ), '4.1' );
+		if (did_action('wp_enqueue_scripts') || did_action('admin_enqueue_scripts')) {
+			EE_Error::doing_it_wrong('EEH_Qtip_Loader->register()', __('EE_Qtip_Config objects must be registered before wp_enqueue_scripts is called.', 'event_espresso'), '4.1');
 		}
 
 		$configname = (array) $configname; //typecast to array
-		foreach ( $configname as $config ) {
-			$this->_register( $config, $paths );
+		foreach ($configname as $config) {
+			$this->_register($config, $paths);
 		}
 
 		//hook into appropriate footer
 		$footer_action = is_admin() ? 'admin_footer' : 'wp_footer';
-		add_action($footer_action, array($this, 'setup_qtip'), 10 );
+		add_action($footer_action, array($this, 'setup_qtip'), 10);
 
 		//make sure we "turn on" qtip js.
-		add_filter('FHEE_load_qtip', '__return_true' );
+		add_filter('FHEE_load_qtip', '__return_true');
 	}
 
 
@@ -144,15 +144,15 @@ 
 	 * @throws EE_Error
 	 * @return void
 	 */
-	private function _register( $config, $paths ) {
+	private function _register($config, $paths) {
 		//before doing anything we have to make sure that EE_Qtip_Config parent is required.
-		EE_Registry::instance()->load_lib( 'Qtip_Config', array(), TRUE );
+		EE_Registry::instance()->load_lib('Qtip_Config', array(), TRUE);
 
-		if ( !empty( $paths ) ) {
+		if ( ! empty($paths)) {
 			$paths = (array) $paths;
-			foreach ( $paths as $path ) {
-				$path = $path . $config . '.lib.php';
-				if ( !is_readable($path ) ) {
+			foreach ($paths as $path) {
+				$path = $path.$config.'.lib.php';
+				if ( ! is_readable($path)) {
 					continue;
 				} else {
 					require_once $path;
@@ -161,26 +161,26 @@ 
 		}
 
 		//does class exist at this point?  If it does then let's instantiate.  If it doesn't then let's continue with other paths.
-		if ( !class_exists($config) ) {
-			$path = EE_LIBRARIES . 'qtips/' . $config . '.lib.php';
-			if ( !is_readable($path ) ) {
-				throw new EE_Error( sprintf( __('Unable to load the Qtip Config registered for this page (%s) because none of the file paths attempted are readable.  Please check the spelling of the paths you\'ve used in the registration', 'event_espresso'), $config ) );
+		if ( ! class_exists($config)) {
+			$path = EE_LIBRARIES.'qtips/'.$config.'.lib.php';
+			if ( ! is_readable($path)) {
+				throw new EE_Error(sprintf(__('Unable to load the Qtip Config registered for this page (%s) because none of the file paths attempted are readable.  Please check the spelling of the paths you\'ve used in the registration', 'event_espresso'), $config));
 			} else {
 				require_once $path;
 			}
 		}
 
 		//now we attempt a class_exists one more time.
-		if ( !class_exists( $config ) )
-			throw new EE_Error( sprintf( __('The Qtip_Config class being registered (%s) does not exist, please check the spelling.', 'event_espresso'), $config ) );
+		if ( ! class_exists($config))
+			throw new EE_Error(sprintf(__('The Qtip_Config class being registered (%s) does not exist, please check the spelling.', 'event_espresso'), $config));
 
 		//made it HERE?  FINALLY, let's get things setup.
 		$a = new ReflectionClass($config);
 		$qtip = $a->newInstance();
 
 		//verify that $qtip is a valid object
-		if ( ! $qtip instanceof EE_Qtip_Config )
-			throw new EE_Error( sprintf( __( 'The class given for the Qtip loader (%s) is not a child of the <strong>EE_Qtip_Config</strong> class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config ) );
+		if ( ! $qtip instanceof EE_Qtip_Config)
+			throw new EE_Error(sprintf(__('The class given for the Qtip loader (%s) is not a child of the <strong>EE_Qtip_Config</strong> class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config));
 
 		$this->_qtips[] = $a->newInstance();
 
@@ -196,12 +196,12 @@ 
 	 * @return void
 	 */
 	public function setup_qtip() {
-		if ( empty( $this->_qtips ) )
+		if (empty($this->_qtips))
 			return; //no qtips!
 
 		$content = array();
 
-		foreach ( $this->_qtips as $qtip ) {
+		foreach ($this->_qtips as $qtip) {
 			$content[] = $this->_generate_content_container($qtip);
 		}
 
@@ -218,10 +218,10 @@ 
 	private function _generate_content_container($qtip) {
 		$qts = $qtip->get_tips();
 		$content = array();
-		foreach ( $qts as $qt ) {
-			if ( ! $qt instanceof EE_Qtip )
+		foreach ($qts as $qt) {
+			if ( ! $qt instanceof EE_Qtip)
 				continue;
-			$content[] = '<div class="ee-qtip-helper-content hidden" id="' . $qt->content_id . '">' . $qt->content . '</div>';
+			$content[] = '<div class="ee-qtip-helper-content hidden" id="'.$qt->content_id.'">'.$qt->content.'</div>';
 		}
 
 		return implode('<br />', $content);

Braces +19 added lines, -12 removed lines

@@ -81,8 +81,9 @@ 
 			foreach ( $this->_qtips as $qtip ) {
 				$qts = $qtip->get_tips();
 				foreach ( $qts as $qt ) {
-					if ( ! $qt instanceof EE_Qtip )
-						continue;
+					if ( ! $qt instanceof EE_Qtip ) {
+											continue;
+					}
 					$qtips[] = array(
 						'content_id' => $qt->content_id,
 						'options' => $qt->options,
@@ -90,8 +91,9 @@ 
 						);
 				}
 			}
-			if ( !empty($qtips) )
-				wp_localize_script('ee-qtip-helper', 'EE_QTIP_HELPER', array( 'qtips' => $qtips ) );
+			if ( !empty($qtips) ) {
+							wp_localize_script('ee-qtip-helper', 'EE_QTIP_HELPER', array( 'qtips' => $qtips ) );
+			}
 
 		} else {
 			//qtips has been requested without any registration (so assuming its just directly used in the admin).
@@ -171,16 +173,18 @@ 
 		}
 
 		//now we attempt a class_exists one more time.
-		if ( !class_exists( $config ) )
-			throw new EE_Error( sprintf( __('The Qtip_Config class being registered (%s) does not exist, please check the spelling.', 'event_espresso'), $config ) );
+		if ( !class_exists( $config ) ) {
+					throw new EE_Error( sprintf( __('The Qtip_Config class being registered (%s) does not exist, please check the spelling.', 'event_espresso'), $config ) );
+		}
 
 		//made it HERE?  FINALLY, let's get things setup.
 		$a = new ReflectionClass($config);
 		$qtip = $a->newInstance();
 
 		//verify that $qtip is a valid object
-		if ( ! $qtip instanceof EE_Qtip_Config )
-			throw new EE_Error( sprintf( __( 'The class given for the Qtip loader (%s) is not a child of the <strong>EE_Qtip_Config</strong> class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config ) );
+		if ( ! $qtip instanceof EE_Qtip_Config ) {
+					throw new EE_Error( sprintf( __( 'The class given for the Qtip loader (%s) is not a child of the <strong>EE_Qtip_Config</strong> class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config ) );
+		}
 
 		$this->_qtips[] = $a->newInstance();
 
@@ -196,8 +200,10 @@ 
 	 * @return void
 	 */
 	public function setup_qtip() {
-		if ( empty( $this->_qtips ) )
-			return; //no qtips!
+		if ( empty( $this->_qtips ) ) {
+					return;
+		}
+		//no qtips!
 
 		$content = array();
 
@@ -219,8 +225,9 @@ 
 		$qts = $qtip->get_tips();
 		$content = array();
 		foreach ( $qts as $qt ) {
-			if ( ! $qt instanceof EE_Qtip )
-				continue;
+			if ( ! $qt instanceof EE_Qtip ) {
+							continue;
+			}
 			$content[] = '<div class="ee-qtip-helper-content hidden" id="' . $qt->content_id . '">' . $qt->content . '</div>';
 		}
 

core/helpers/EEH_Tabbed_Content.helper.php

Doc Comments +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
 	/**
 	 * this just returns the properly formatted tab content for our tab box.
 	 * @param  string $name    name of tab (used for selector)
-	 * @param  string $content content of tab
+	 * @param  string $tab_content content of tab
 	 * @return string          html for content area
 	 */
 	private static function tab_content($name, $tab_content, $active = false) {

Spacing +35 added lines, -35 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -43,22 +43,22 @@ 
 	 * @param  array $tabs_content an array of the content for each tab [required]
 	 * @return string               the assembled html string containing the tabbed content for display.
 	 */
-	public static function display($tabs_contents, $tabs_names = array(), $small_tabs = true, $tabs_content = TRUE ) {
+	public static function display($tabs_contents, $tabs_names = array(), $small_tabs = true, $tabs_content = TRUE) {
 
 		//first check if $tabs_names is not empty then the count must match the count of $tabs_content otherwise we've got a problem houston
-		if ( !empty( $tabs_names) && ( count( (array) $tabs_names) != count( (array) $tabs_content) ) ) {
-			throw new EE_Error( __('The count for $tabs_names and $tabs_content does not match.', 'event_espresso') );
+		if ( ! empty($tabs_names) && (count((array) $tabs_names) != count((array) $tabs_content))) {
+			throw new EE_Error(__('The count for $tabs_names and $tabs_content does not match.', 'event_espresso'));
 		}
 
 		//make sure we've got incoming data setup properly
-		$tabs = !empty( $tabs_names ) ? (array) $tabs_names : array_keys( (array) $tabs_contents );
-		$tabs_content = !empty( $tabs_names ) ? array_combine( (array) $tabs_names, (array) $tabs_content ) : $tabs_contents;
+		$tabs = ! empty($tabs_names) ? (array) $tabs_names : array_keys((array) $tabs_contents);
+		$tabs_content = ! empty($tabs_names) ? array_combine((array) $tabs_names, (array) $tabs_content) : $tabs_contents;
 
-		$all_tabs = '<h2 class="nav-tab-wrapper">' . "\n";
+		$all_tabs = '<h2 class="nav-tab-wrapper">'."\n";
 		$all_tabs_content = '';
 
 		$index = 0;
-		foreach ( $tabs as $tab ) {
+		foreach ($tabs as $tab) {
 			$active = $index === 0 ? true : false;
 			$all_tabs .= self::tab($tab, $active);
 			$all_tabs_content .= self::tab_content($tab, $tabs_content[$tab], $active);
@@ -75,7 +75,7 @@ 
 
 		$tab_container_class = $small_tabs ? 'ee-nav-tabs ee-nav-tabs-small' : 'ee-nav-tabs';
 
-		return '<div class="'. $tab_container_class . '">' . "\n\t" . $all_tabs . $all_tabs_content . "\n" . '</div>';
+		return '<div class="'.$tab_container_class.'">'."\n\t".$all_tabs.$all_tabs_content."\n".'</div>';
 	}
 
 
@@ -98,11 +98,11 @@ 
 	 * @param array $nav_tabs tab array for nav tabs
 	 */
 	public static function display_admin_nav_tabs($nav_tabs = array()) {
-		if ( empty($nav_tabs) )
-			throw new EE_Error( __('Nav Tabs cannot be generated because the tab array is missing', 'event_espresso' ) );
+		if (empty($nav_tabs))
+			throw new EE_Error(__('Nav Tabs cannot be generated because the tab array is missing', 'event_espresso'));
 
-		$all_tabs = '<h2 class="nav-tab-wrapper">' . "\n";
-		foreach ( $nav_tabs as $slug => $tab ) {
+		$all_tabs = '<h2 class="nav-tab-wrapper">'."\n";
+		foreach ($nav_tabs as $slug => $tab) {
 			$all_tabs .= self::tab($slug, false, $tab['link_text'], $tab['url'], $tab['css_class']);
 		}
 		$all_tabs .= '</h2>';
@@ -118,13 +118,13 @@ 
 	 * @param bool|string $css If string given then the generated tab will include that as the class.
 	 * @return string          html for tab
 	 */
-	private static function tab($name, $active = false, $nice_name = FALSE, $url = FALSE, $css = FALSE ) {
+	private static function tab($name, $active = false, $nice_name = FALSE, $url = FALSE, $css = FALSE) {
 		$name = str_replace(' ', '-', $name);
 		$class = $active ? 'nav-tab nav-tab-active' : 'nav-tab';
-		$class = $css ? $class . ' ' . $css : $class;
-		$nice_name = $nice_name ? $nice_name : ucwords( preg_replace('/(-|_)/', ' ', $name) );
-		$url = $url ? $url : '#' . $name;
-		$tab = '<a class="' . $class . '" rel="ee-tab-' . $name . '" href="' . $url . '">' . $nice_name . '</a>' . "\n\t";
+		$class = $css ? $class.' '.$css : $class;
+		$nice_name = $nice_name ? $nice_name : ucwords(preg_replace('/(-|_)/', ' ', $name));
+		$url = $url ? $url : '#'.$name;
+		$tab = '<a class="'.$class.'" rel="ee-tab-'.$name.'" href="'.$url.'">'.$nice_name.'</a>'."\n\t";
 		return $tab;
 	}
 
@@ -136,9 +136,9 @@ 
 	 */
 	private static function tab_content($name, $tab_content, $active = false) {
 		$class = $active ? 'nav-tab-content' : 'nav-tab-content hidden';
-		$name = str_replace( ' ', '-', $name);
-		$content = "\t" . '<div class="'. $class . '" id="ee-tab-' . $name . '">' . "\n";
-		$content .= "\t" . $tab_content . "\n";
+		$name = str_replace(' ', '-', $name);
+		$content = "\t".'<div class="'.$class.'" id="ee-tab-'.$name.'">'."\n";
+		$content .= "\t".$tab_content."\n";
 		$content .= '<div style="clear:both"></div></div>';
 		return $content;
 	}
@@ -164,8 +164,8 @@ 
 	 * @param string $default 			You can include a string for the item that will receive the "item_display" class for the js.
 	 * @return string                  a html snippet of of all the formatted link elements.
 	 */
-	public static function tab_text_links( $item_array, $container_class = '', $sep = '|', $default = '' ) {
-		if ( !is_array($item_array) || empty( $item_array ) )
+	public static function tab_text_links($item_array, $container_class = '', $sep = '|', $default = '') {
+		if ( ! is_array($item_array) || empty($item_array))
 			return false; //get out we don't have even the basic thing we need!
 
 
@@ -176,15 +176,15 @@ 
 			'title' => esc_attr__('Link for Item', 'event_espresso'),
 			'slug' => 'item_slug'
 		);
-		$container_class = !empty($container_class) ? 'ee-text-links ' . $container_class : 'ee-text-links';
-		$list = '<ul class="' . $container_class . '">';
+		$container_class = ! empty($container_class) ? 'ee-text-links '.$container_class : 'ee-text-links';
+		$list = '<ul class="'.$container_class.'">';
 
 		$ci = 1;
-		foreach ( $item_array as $item ) {
-			$item = wp_parse_args( $item, $defaults );
-			$item['class'] = !empty($default) && $default == $item['slug'] ? 'item_display ' . $item['class'] : $item['class'];
+		foreach ($item_array as $item) {
+			$item = wp_parse_args($item, $defaults);
+			$item['class'] = ! empty($default) && $default == $item['slug'] ? 'item_display '.$item['class'] : $item['class'];
 			$list .= self::_text_link_item($item);
-			if ( !empty($sep) && $ci != count($item_array) )
+			if ( ! empty($sep) && $ci != count($item_array))
 				$list .= self::_text_link_item($sep);
 			$ci++;
 		}
@@ -195,9 +195,9 @@ 
 
 
 
-	private static function _text_link_item( $item ) {
+	private static function _text_link_item($item) {
 		//if this isn't an array then we're doing a separator
-		if ( !is_array( $item ) ) {
+		if ( ! is_array($item)) {
 			$label = $item;
 			$class = 'ee-text-link-sep';
 			$href = '';
@@ -206,12 +206,12 @@ 
 			extract($item);
 		}
 
-		$class = $class != 'ee-text-link-sep'  ? 'class="ee-text-link-li ' . $class . '"' : 'class="ee-text-link-sep"';
+		$class = $class != 'ee-text-link-sep' ? 'class="ee-text-link-li '.$class.'"' : 'class="ee-text-link-sep"';
 
-		$content = '<li ' . $class . '>';
-		$content .= !empty($href) ? '<a class="ee-text-link" href="#' . $href . '" title="' . $title . '">' : '';
+		$content = '<li '.$class.'>';
+		$content .= ! empty($href) ? '<a class="ee-text-link" href="#'.$href.'" title="'.$title.'">' : '';
 		$content .= $label;
-		$content .= !empty($href) ? '</a>' : '';
+		$content .= ! empty($href) ? '</a>' : '';
 		$content .= '</li>';
 		return $content;
 	}

Braces +12 added lines, -7 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -98,8 +99,9 @@ 
 	 * @param array $nav_tabs tab array for nav tabs
 	 */
 	public static function display_admin_nav_tabs($nav_tabs = array()) {
-		if ( empty($nav_tabs) )
-			throw new EE_Error( __('Nav Tabs cannot be generated because the tab array is missing', 'event_espresso' ) );
+		if ( empty($nav_tabs) ) {
+					throw new EE_Error( __('Nav Tabs cannot be generated because the tab array is missing', 'event_espresso' ) );
+		}
 
 		$all_tabs = '<h2 class="nav-tab-wrapper">' . "\n";
 		foreach ( $nav_tabs as $slug => $tab ) {
@@ -165,8 +167,10 @@ 
 	 * @return string                  a html snippet of of all the formatted link elements.
 	 */
 	public static function tab_text_links( $item_array, $container_class = '', $sep = '|', $default = '' ) {
-		if ( !is_array($item_array) || empty( $item_array ) )
-			return false; //get out we don't have even the basic thing we need!
+		if ( !is_array($item_array) || empty( $item_array ) ) {
+					return false;
+		}
+		//get out we don't have even the basic thing we need!
 
 
 		$defaults = array(
@@ -184,8 +188,9 @@ 
 			$item = wp_parse_args( $item, $defaults );
 			$item['class'] = !empty($default) && $default == $item['slug'] ? 'item_display ' . $item['class'] : $item['class'];
 			$list .= self::_text_link_item($item);
-			if ( !empty($sep) && $ci != count($item_array) )
-				$list .= self::_text_link_item($sep);
+			if ( !empty($sep) && $ci != count($item_array) ) {
+							$list .= self::_text_link_item($sep);
+			}
 			$ci++;
 		}
 

core/helpers/EEH_Template.helper.php

Doc Comments +1 added lines, -1 removed lines

@@ -248,7 +248,7 @@
 	 * @param bool|string $template_path server path to the file to be loaded, including file name and extension
 	 * @param  array      $template_args an array of arguments to be extracted for use in the template
 	 * @param  boolean    $return_string whether to send output immediately to screen, or capture and return as a string
-	 * @return mixed string
+	 * @return string string
 	 */
 	public static function display_template( $template_path = FALSE, $template_args = array(), $return_string = FALSE ) {
 		//require the template validator for verifying variables are set according to how the template requires

Indentation +2 added lines, -2 removed lines

@@ -99,7 +99,7 @@ 
 				return array();
 			}
 			if (( $key = array_search( 'global_assets', $espresso_themes )) !== FALSE ) {
-			    unset( $espresso_themes[ $key ] );
+				unset( $espresso_themes[ $key ] );
 			}
 			EEH_Template::$_espresso_themes = array();
 			foreach ( $espresso_themes as $espresso_theme ) {
@@ -226,7 +226,7 @@ 
 			foreach ( (array)$full_template_paths as $full_template_path ) {
 				if ( is_readable( $full_template_path )) {
 					$template_path = str_replace( array( '\\', '/' ), DIRECTORY_SEPARATOR, $full_template_path );
-				    break;
+					break;
 				}
 			}
 		}

Spacing +172 added lines, -172 removed lines

@@ -15,7 +15,7 @@ 
 
 
 
-if ( ! function_exists( 'espresso_get_template_part' )) {
+if ( ! function_exists('espresso_get_template_part')) {
 	/**
 	 * espresso_get_template_part
 	 * basically a copy of the WordPress get_template_part() function but uses EEH_Template::locate_template() instead, and doesn't add base versions of files
@@ -25,14 +25,14 @@ 
 	 * @param string $name The name of the specialised template.
 	 * @return string        the html output for the formatted money value
 	 */
-	function espresso_get_template_part( $slug = NULL, $name = NULL ) {
-		EEH_Template::get_template_part( $slug, $name );
+	function espresso_get_template_part($slug = NULL, $name = NULL) {
+		EEH_Template::get_template_part($slug, $name);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_get_object_css_class' )) {
+if ( ! function_exists('espresso_get_object_css_class')) {
 	/**
 	 * espresso_get_object_css_class - attempts to generate a css class based on the type of EE object passed
 	 *
@@ -42,8 +42,8 @@ 
 	 * @param  string $suffix added to the end of the generated class
 	 * @return string
 	 */
-	function espresso_get_object_css_class( $object = NULL, $prefix = '', $suffix = '' ) {
-		return EEH_Template::get_object_css_class( $object, $prefix, $suffix );
+	function espresso_get_object_css_class($object = NULL, $prefix = '', $suffix = '') {
+		return EEH_Template::get_object_css_class($object, $prefix, $suffix);
 	}
 }
 
@@ -70,7 +70,7 @@ 
 	 * 	@return boolean
 	 */
 	public static function is_espresso_theme() {
-		return wp_get_theme()->get( 'TextDomain' ) == 'event_espresso' ? TRUE : FALSE;
+		return wp_get_theme()->get('TextDomain') == 'event_espresso' ? TRUE : FALSE;
 	}
 
 	/**
@@ -79,9 +79,9 @@ 
 	 * 	@return void
 	 */
 	public static function load_espresso_theme_functions() {
-		if ( ! defined( 'EE_THEME_FUNCTIONS_LOADED' )) {
-			if ( is_readable( EE_PUBLIC . EE_Config::get_current_theme() . DS . 'functions.php' )) {
-				require_once( EE_PUBLIC . EE_Config::get_current_theme() . DS . 'functions.php' );
+		if ( ! defined('EE_THEME_FUNCTIONS_LOADED')) {
+			if (is_readable(EE_PUBLIC.EE_Config::get_current_theme().DS.'functions.php')) {
+				require_once(EE_PUBLIC.EE_Config::get_current_theme().DS.'functions.php');
 			}
 		}
 	}
@@ -93,17 +93,17 @@ 
 	 * 	@return array
 	 */
 	public static function get_espresso_themes() {
-		if ( empty( EEH_Template::$_espresso_themes )) {
-			$espresso_themes =  glob( EE_PUBLIC . '*', GLOB_ONLYDIR );
-			if ( empty( $espresso_themes ) ) {
+		if (empty(EEH_Template::$_espresso_themes)) {
+			$espresso_themes = glob(EE_PUBLIC.'*', GLOB_ONLYDIR);
+			if (empty($espresso_themes)) {
 				return array();
 			}
-			if (( $key = array_search( 'global_assets', $espresso_themes )) !== FALSE ) {
-			    unset( $espresso_themes[ $key ] );
+			if (($key = array_search('global_assets', $espresso_themes)) !== FALSE) {
+			    unset($espresso_themes[$key]);
 			}
 			EEH_Template::$_espresso_themes = array();
-			foreach ( $espresso_themes as $espresso_theme ) {
-				EEH_Template::$_espresso_themes[ basename( $espresso_theme ) ] = $espresso_theme;
+			foreach ($espresso_themes as $espresso_theme) {
+				EEH_Template::$_espresso_themes[basename($espresso_theme)] = $espresso_theme;
 			}
 		}
 		return EEH_Template::$_espresso_themes;
@@ -122,16 +122,16 @@ 
 	 * @param bool   $return_string
 	 * @return string        the html output for the formatted money value
 	 */
-	public static function get_template_part( $slug = NULL, $name = NULL, $template_args = array(), $return_string = FALSE  ) {
-		do_action( "get_template_part_{$slug}-{$name}", $slug, $name );
+	public static function get_template_part($slug = NULL, $name = NULL, $template_args = array(), $return_string = FALSE) {
+		do_action("get_template_part_{$slug}-{$name}", $slug, $name);
 		$templates = array();
 		$name = (string) $name;
-		if ( $name != '' ) {
+		if ($name != '') {
 			$templates[] = "{$slug}-{$name}.php";
 		}
 		// allow template parts to be turned off via something like: add_filter( 'FHEE__content_espresso_events_tickets_template__display_datetimes', '__return_false' );
-		if ( apply_filters( "FHEE__EEH_Template__get_template_part__display__{$slug}_{$name}", TRUE )) {
-			EEH_Template::locate_template( $templates, $template_args, TRUE, $return_string );
+		if (apply_filters("FHEE__EEH_Template__get_template_part__display__{$slug}_{$name}", TRUE)) {
+			EEH_Template::locate_template($templates, $template_args, TRUE, $return_string);
 		}
 	}
 
@@ -156,26 +156,26 @@ 
 	 * 				Used in places where you don't actually load the template, you just want to know if there's a custom version of it.
 	 * @return mixed
 	 */
-	public static function locate_template( $templates = array(), $template_args = array(), $load = TRUE, $return_string = TRUE, $check_if_custom = FALSE ) {
+	public static function locate_template($templates = array(), $template_args = array(), $load = TRUE, $return_string = TRUE, $check_if_custom = FALSE) {
 		// first use WP locate_template to check for template in the current theme folder
-		$template_path = locate_template( $templates );
+		$template_path = locate_template($templates);
 
-		if ( $check_if_custom && !empty( $template_path ) )
+		if ($check_if_custom && ! empty($template_path))
 			return TRUE;
 
 		// not in the theme
-		if ( empty( $template_path )) {
+		if (empty($template_path)) {
 			// not even a template to look for ?
-			if ( empty( $templates )) {
+			if (empty($templates)) {
 				// get post_type
-				$post_type = EE_Registry::instance()->REQ->get( 'post_type' );
+				$post_type = EE_Registry::instance()->REQ->get('post_type');
 				// get array of EE Custom Post Types
 				$EE_CPTs = EE_Register_CPTs::get_CPTs();
 				// build template name based on request
-				if ( isset( $EE_CPTs[ $post_type ] )) {
-					$archive_or_single =  is_archive() ? 'archive' : '';
-					$archive_or_single =  is_single() ? 'single' : $archive_or_single;
-					$templates = $archive_or_single . '-' . $post_type . '.php';
+				if (isset($EE_CPTs[$post_type])) {
+					$archive_or_single = is_archive() ? 'archive' : '';
+					$archive_or_single = is_single() ? 'single' : $archive_or_single;
+					$templates = $archive_or_single.'-'.$post_type.'.php';
 				}
 			}
 			// currently active EE template theme
@@ -184,61 +184,61 @@ 
 			// array of paths to folders that may contain templates
 			$template_folder_paths = array(
 				// first check the /wp-content/uploads/espresso/templates/(current EE theme)/  folder for an EE theme template file
-				EVENT_ESPRESSO_TEMPLATE_DIR . $current_theme,
+				EVENT_ESPRESSO_TEMPLATE_DIR.$current_theme,
 				// then in the root of the /wp-content/uploads/espresso/templates/ folder
 				EVENT_ESPRESSO_TEMPLATE_DIR
 			);
 
 			//add core plugin folders for checking only if we're not $check_if_custom
-			if ( ! $check_if_custom ) {
+			if ( ! $check_if_custom) {
 				$core_paths = array(
 					// in the  /wp-content/plugins/(EE4 folder)/public/(current EE theme)/ folder within the plugin
-					EE_PUBLIC . $current_theme,
+					EE_PUBLIC.$current_theme,
 					// in the  /wp-content/plugins/(EE4 folder)/core/templates/(current EE theme)/ folder within the plugin
-					EE_TEMPLATES . $current_theme,
+					EE_TEMPLATES.$current_theme,
 					// or maybe relative from the plugin root: /wp-content/plugins/(EE4 folder)/
 					EE_PLUGIN_DIR_PATH
 					);
-				$template_folder_paths = array_merge( $template_folder_paths, $core_paths );
+				$template_folder_paths = array_merge($template_folder_paths, $core_paths);
 			}
 
 			// now filter that array
-			$template_folder_paths = apply_filters( 'FHEE__EEH_Template__locate_template__template_folder_paths', $template_folder_paths );
+			$template_folder_paths = apply_filters('FHEE__EEH_Template__locate_template__template_folder_paths', $template_folder_paths);
 
 			// array to hold all possible template paths
 			$full_template_paths = array();
 
 			// loop through $templates
-			foreach ( (array)$templates as $template ) {
+			foreach ((array) $templates as $template) {
 				// while looping through all template folder paths
-				foreach ( (array)$template_folder_paths as $template_folder_path ) {
+				foreach ((array) $template_folder_paths as $template_folder_path) {
 					// build up our template locations array by combining our template folder paths with our templates
-					$full_template_paths[] = rtrim( $template_folder_path, DS ) . DS . $template;
+					$full_template_paths[] = rtrim($template_folder_path, DS).DS.$template;
 				}
 				// if $template is an absolute path, then we'll tack it onto the start of our array so that it gets searched first
-				array_unshift( $full_template_paths, $template );
+				array_unshift($full_template_paths, $template);
 			}
 			// filter final array of full template paths
-			$full_template_paths = apply_filters( 'FHEE__EEH_Template__locate_template__full_template_paths', $full_template_paths );
+			$full_template_paths = apply_filters('FHEE__EEH_Template__locate_template__full_template_paths', $full_template_paths);
 
 
 			// now loop through our final array of template location paths and check each location
-			foreach ( (array)$full_template_paths as $full_template_path ) {
-				if ( is_readable( $full_template_path )) {
-					$template_path = str_replace( array( '\\', '/' ), DIRECTORY_SEPARATOR, $full_template_path );
+			foreach ((array) $full_template_paths as $full_template_path) {
+				if (is_readable($full_template_path)) {
+					$template_path = str_replace(array('\\', '/'), DIRECTORY_SEPARATOR, $full_template_path);
 				    break;
 				}
 			}
 		}
 		// if we got it and you want to see it...
-		if ( $template_path && $load && ! $check_if_custom  ) {
-			if ( $return_string ) {
-				return EEH_Template::display_template( $template_path, $template_args, TRUE );
+		if ($template_path && $load && ! $check_if_custom) {
+			if ($return_string) {
+				return EEH_Template::display_template($template_path, $template_args, TRUE);
 			} else {
-				EEH_Template::display_template( $template_path, $template_args, FALSE );
+				EEH_Template::display_template($template_path, $template_args, FALSE);
 			}
 		}
-		return $check_if_custom && ! empty( $template_path ) ? TRUE : $template_path;
+		return $check_if_custom && ! empty($template_path) ? TRUE : $template_path;
 	}
 
 
@@ -250,9 +250,9 @@ 
 	 * @param  boolean    $return_string whether to send output immediately to screen, or capture and return as a string
 	 * @return mixed string
 	 */
-	public static function display_template( $template_path = FALSE, $template_args = array(), $return_string = FALSE ) {
+	public static function display_template($template_path = FALSE, $template_args = array(), $return_string = FALSE) {
 		//require the template validator for verifying variables are set according to how the template requires
-		EE_Registry::instance()->load_helper( 'Template_Validator' );
+		EE_Registry::instance()->load_helper('Template_Validator');
 
 		/**
 		 * These two filters are intended for last minute changes to templates being loaded and/or template arg
@@ -263,26 +263,26 @@ 
 		 *
 		 * @since 4.6.0
 		 */
-		$template_path = apply_filters( 'FHEE__EEH_Template__display_template__template_path', $template_path );
-		$template_args = apply_filters( 'FHEE__EEH_Template__display_template__template_args', $template_args );
+		$template_path = apply_filters('FHEE__EEH_Template__display_template__template_path', $template_path);
+		$template_args = apply_filters('FHEE__EEH_Template__display_template__template_args', $template_args);
 
 		// you gimme nuttin - YOU GET NUTTIN !!
-		if ( ! $template_path || ! is_readable( $template_path )) {
+		if ( ! $template_path || ! is_readable($template_path)) {
 			return '';
 		}
 		// if $template_args are not in an array, then make it so
-		if ( ! is_array( $template_args ) && ! is_object( $template_args )) {
-			$template_args = array( $template_args );
+		if ( ! is_array($template_args) && ! is_object($template_args)) {
+			$template_args = array($template_args);
 		}
-		extract( (array) $template_args);
+		extract((array) $template_args);
 
-		if ( $return_string ) {
+		if ($return_string) {
 			// because we want to return a string, we are going to capture the output
 			ob_start();
-			include( $template_path );
+			include($template_path);
 			return ob_get_clean();
 		} else {
-			include( $template_path );
+			include($template_path);
 		}
 		return '';
 	}
@@ -300,27 +300,27 @@ 
 	 * @param  string $suffix added to the end of the generated class
 	 * @return string
 	 */
-	public static function get_object_css_class( $object = NULL, $prefix = '', $suffix = '' ) {
+	public static function get_object_css_class($object = NULL, $prefix = '', $suffix = '') {
 		// in the beginning...
-		$prefix = ! empty( $prefix ) ? rtrim( $prefix, '-' ) . '-' : '';
+		$prefix = ! empty($prefix) ? rtrim($prefix, '-').'-' : '';
 		// da muddle
 		$class = '';
 		// the end
-		$suffix = ! empty( $suffix ) ? '-' . ltrim( $suffix, '-' ) : '';
+		$suffix = ! empty($suffix) ? '-'.ltrim($suffix, '-') : '';
 		// is the passed object an EE object ?
-		if ( $object instanceof EE_Base_Class ) {
+		if ($object instanceof EE_Base_Class) {
 			// grab the exact type of object
-			$obj_class = get_class( $object );
+			$obj_class = get_class($object);
 			// depending on the type of object...
-			switch ( $obj_class ) {
+			switch ($obj_class) {
 				// no specifics just yet...
 				default :
-					$class = strtolower( str_replace( '_', '-', $obj_class ));
-					$class .= method_exists( $obj_class, 'name' ) ? '-' . sanitize_title( $object->name() ) : '';
+					$class = strtolower(str_replace('_', '-', $obj_class));
+					$class .= method_exists($obj_class, 'name') ? '-'.sanitize_title($object->name()) : '';
 
 			}
 		}
-		return $prefix . $class . $suffix;
+		return $prefix.$class.$suffix;
 	}
 
 
@@ -336,50 +336,50 @@ 
 	 * @param string      $cur_code_span_class
 	 * @return string        the html output for the formatted money value
 	 */
-	public static function format_currency( $amount = NULL, $return_raw = FALSE, $display_code = TRUE, $CNT_ISO = '', $cur_code_span_class = 'currency-code' ) {
+	public static function format_currency($amount = NULL, $return_raw = FALSE, $display_code = TRUE, $CNT_ISO = '', $cur_code_span_class = 'currency-code') {
 		// ensure amount was received
-		if ( is_null( $amount ) ) {
-			$msg = __( 'In order to format currency, an amount needs to be passed.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (is_null($amount)) {
+			$msg = __('In order to format currency, an amount needs to be passed.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return '';
 		}
 		//ensure amount is float
 		$amount = (float) $amount;
 		// filter raw amount (allows 0.00 to be changed to "free" for example)
-		$amount_formatted = apply_filters( 'FHEE__EEH_Template__format_currency__amount', $amount, $return_raw );
+		$amount_formatted = apply_filters('FHEE__EEH_Template__format_currency__amount', $amount, $return_raw);
 		// still a number or was amount converted to a string like "free" ?
-		if ( is_float( $amount_formatted )) {
+		if (is_float($amount_formatted)) {
 			// was a country ISO code passed ? if so generate currency config object for that country
-			$mny = $CNT_ISO !== '' ? new EE_Currency_Config( $CNT_ISO ) : NULL;
+			$mny = $CNT_ISO !== '' ? new EE_Currency_Config($CNT_ISO) : NULL;
 			// verify results
-			if ( ! $mny instanceof EE_Currency_Config ) {
+			if ( ! $mny instanceof EE_Currency_Config) {
 				// set default config country currency settings
 				$mny = EE_Registry::instance()->CFG->currency instanceof EE_Currency_Config ? EE_Registry::instance()->CFG->currency : new EE_Currency_Config();
 			}
 			// format float
-			$amount_formatted = number_format( $amount, $mny->dec_plc, $mny->dec_mrk, $mny->thsnds );
+			$amount_formatted = number_format($amount, $mny->dec_plc, $mny->dec_mrk, $mny->thsnds);
 			// add formatting ?
-			if ( ! $return_raw ) {
+			if ( ! $return_raw) {
 				// add currency sign
-				if( $mny->sign_b4 ){
-					if( $amount >= 0 ){
-						$amount_formatted = $mny->sign . $amount_formatted;
-					}else{
-						$amount_formatted = '-' . $mny->sign . str_replace( '-', '', $amount_formatted );
+				if ($mny->sign_b4) {
+					if ($amount >= 0) {
+						$amount_formatted = $mny->sign.$amount_formatted;
+					} else {
+						$amount_formatted = '-'.$mny->sign.str_replace('-', '', $amount_formatted);
 					}
 
-				}else{
-					$amount_formatted =  $amount_formatted . $mny->sign;
+				} else {
+					$amount_formatted = $amount_formatted.$mny->sign;
 				}
 
 				// add currency code ?
-				$amount_formatted = $display_code ? $amount_formatted . ' <span class="' . $cur_code_span_class . '">(' . $mny->code . ')</span>' : $amount_formatted;
+				$amount_formatted = $display_code ? $amount_formatted.' <span class="'.$cur_code_span_class.'">('.$mny->code.')</span>' : $amount_formatted;
 			}
 			// filter results
-			$amount_formatted = apply_filters( 'FHEE__EEH_Template__format_currency__amount_formatted', $amount_formatted, $mny, $return_raw );
+			$amount_formatted = apply_filters('FHEE__EEH_Template__format_currency__amount_formatted', $amount_formatted, $mny, $return_raw);
 		}
 		// clean up vars
-		unset( $mny );
+		unset($mny);
 		// return formatted currency amount
 		return $amount_formatted;
 	}
@@ -394,11 +394,11 @@ 
 	 * @param  string  $schema    'UPPER', 'lower', or 'Sentence'
 	 * @return string             The localized label for the status id.
 	 */
-	public static function pretty_status( $status_id, $plural = FALSE, $schema = 'upper' ) {
+	public static function pretty_status($status_id, $plural = FALSE, $schema = 'upper') {
 		/** @type EEM_Status $EEM_Status */
-		$EEM_Status = EE_Registry::instance()->load_model( 'Status' );
-		$status = $EEM_Status->localized_status( array( $status_id => __( 'unknown', 'event_espresso' )), $plural, $schema );
-		return $status[ $status_id ];
+		$EEM_Status = EE_Registry::instance()->load_model('Status');
+		$status = $EEM_Status->localized_status(array($status_id => __('unknown', 'event_espresso')), $plural, $schema);
+		return $status[$status_id];
 	}
 
 
@@ -411,9 +411,9 @@ 
 	 * @param string  $icon
 	 * @return string 	the html output for the button
 	 */
-	public static function get_button_or_link( $url, $label, $class = 'button-primary', $icon = '' ) {
-		$label = ! empty( $icon ) ? '<span class="' . $icon . '"></span>' . $label : $label;
-		$button = '<a id="' . sanitize_title_with_dashes($label) . '" href="' . $url . '" class="' . $class . '">' . $label . '</a>';
+	public static function get_button_or_link($url, $label, $class = 'button-primary', $icon = '') {
+		$label = ! empty($icon) ? '<span class="'.$icon.'"></span>'.$label : $label;
+		$button = '<a id="'.sanitize_title_with_dashes($label).'" href="'.$url.'" class="'.$class.'">'.$label.'</a>';
 		return $button;
 	}
 
@@ -430,21 +430,21 @@ 
 	 * @param bool|string $help_text   (optional) send help text you want to use for the link if default not to be used
 	 * @return string              generated link
 	 */
-	public static function get_help_tab_link( $help_tab_id, $page = FALSE, $action = FALSE, $icon_style = FALSE, $help_text = FALSE ) {
+	public static function get_help_tab_link($help_tab_id, $page = FALSE, $action = FALSE, $icon_style = FALSE, $help_text = FALSE) {
 
-		if ( ! $page )
-			$page = isset( $_REQUEST['page'] ) && ! empty( $_REQUEST['page'] ) ? sanitize_key( $_REQUEST['page'] ) : $page;
+		if ( ! $page)
+			$page = isset($_REQUEST['page']) && ! empty($_REQUEST['page']) ? sanitize_key($_REQUEST['page']) : $page;
 
-		if ( ! $action )
-			$action = isset( $_REQUEST['action'] ) && ! empty( $_REQUEST['action'] ) ? sanitize_key( $_REQUEST['action'] ) : $action;
+		if ( ! $action)
+			$action = isset($_REQUEST['action']) && ! empty($_REQUEST['action']) ? sanitize_key($_REQUEST['action']) : $action;
 
 		$action = empty($action) ? 'default' : $action;
 
 
-		$help_tab_lnk = $page . '-' . $action . '-' . $help_tab_id;
-		$icon = !$icon_style ? ' dashicons-editor-help' : $icon_style;
-		$help_text = !$help_text ? '' : $help_text;
-		return '<a id="' . $help_tab_lnk . '" class="ee-clickable dashicons espresso-help-tab-lnk ee-icon-size-22' . $icon . '" title="' . esc_attr__('Click to open the \'Help\' tab for more information about this feature.', 'event_espresso') . '" > ' . $help_text . ' </a>';
+		$help_tab_lnk = $page.'-'.$action.'-'.$help_tab_id;
+		$icon = ! $icon_style ? ' dashicons-editor-help' : $icon_style;
+		$help_text = ! $help_text ? '' : $help_text;
+		return '<a id="'.$help_tab_lnk.'" class="ee-clickable dashicons espresso-help-tab-lnk ee-icon-size-22'.$icon.'" title="'.esc_attr__('Click to open the \'Help\' tab for more information about this feature.', 'event_espresso').'" > '.$help_text.' </a>';
 	}
 
 
@@ -456,31 +456,31 @@ 
 	 * @param EE_Help_Tour
 	 * @return string         html
 	 */
-	public static function help_tour_stops_generator( EE_Help_Tour $tour ) {
+	public static function help_tour_stops_generator(EE_Help_Tour $tour) {
 		$id = $tour->get_slug();
 		$stops = $tour->get_stops();
 
-		$content = '<ol style="display:none" id="' . $id . '">';
+		$content = '<ol style="display:none" id="'.$id.'">';
 
-		foreach ( $stops as $stop ) {
-			$data_id = !empty( $stop['id'] ) ? ' data-id="' . $stop['id'] . '"' : '';
-			$data_class = empty( $data_id ) && !empty( $stop['class'] ) ? ' data-class="' . $stop['class'] . '"' : '';
+		foreach ($stops as $stop) {
+			$data_id = ! empty($stop['id']) ? ' data-id="'.$stop['id'].'"' : '';
+			$data_class = empty($data_id) && ! empty($stop['class']) ? ' data-class="'.$stop['class'].'"' : '';
 
 			//if container is set to modal then let's make sure we set the options accordingly
-			if ( empty( $data_id ) && empty( $data_class ) ) {
+			if (empty($data_id) && empty($data_class)) {
 				$stop['options']['modal'] = true;
 				$stop['options']['expose'] = true;
 			}
 
-			$custom_class = !empty( $stop['custom_class'] ) ? ' class="' . $stop['custom_class'] . '"' : '';
-			$button_text = !empty( $stop['button_text'] ) ? ' data-button="' . $stop['button_text'] . '"' : '';
+			$custom_class = ! empty($stop['custom_class']) ? ' class="'.$stop['custom_class'].'"' : '';
+			$button_text = ! empty($stop['button_text']) ? ' data-button="'.$stop['button_text'].'"' : '';
 			$inner_content = isset($stop['content']) ? $stop['content'] : '';
 
 			//options
-			if ( isset( $stop['options'] ) && is_array( $stop['options'] ) ) {
+			if (isset($stop['options']) && is_array($stop['options'])) {
 				$options = ' data-options="';
-				foreach ( $stop['options'] as $option => $value ) {
-					$options .= $option . ':' . $value . ';';
+				foreach ($stop['options'] as $option => $value) {
+					$options .= $option.':'.$value.';';
 				}
 				$options .= '"';
 			} else {
@@ -488,7 +488,7 @@ 
 			}
 
 			//let's put all together
-			$content .= '<li' . $data_id . $data_class . $custom_class . $button_text . $options . '>' . $inner_content . '</li>';
+			$content .= '<li'.$data_id.$data_class.$custom_class.$button_text.$options.'>'.$inner_content.'</li>';
 		}
 
 		$content .= '</ol>';
@@ -509,31 +509,31 @@ 
 	 * @throws EE_Error
 	 * @return string               html structure for status.
 	 */
-	public static function status_legend( $status_array, $active_status = '' ) {
-		if ( !is_array( $status_array ) )
-			throw new EE_Error( __('The EEH_Template::status_legend helper required the incoming status_array argument to be an array!', 'event_espresso') );
+	public static function status_legend($status_array, $active_status = '') {
+		if ( ! is_array($status_array))
+			throw new EE_Error(__('The EEH_Template::status_legend helper required the incoming status_array argument to be an array!', 'event_espresso'));
 
 		$setup_array = array();
-		foreach ( $status_array as $item => $status ) {
+		foreach ($status_array as $item => $status) {
 			$setup_array[$item] = array(
-					'class' => 'ee-status-legend ee-status-legend-' . $status,
-					'desc' => EEH_Template::pretty_status( $status, FALSE, 'sentence' ),
+					'class' => 'ee-status-legend ee-status-legend-'.$status,
+					'desc' => EEH_Template::pretty_status($status, FALSE, 'sentence'),
 					'status' => $status
 				);
 		}
 
-		$content = '<div class="ee-list-table-legend-container">' . "\n";
-		$content .= '<h4>' . __('Status Legend', 'event_espresso') . '</h4>' . "\n";
-		$content .= '<dl class="ee-list-table-legend">' . "\n\t";
-		foreach ( $setup_array as $item => $details ) {
+		$content = '<div class="ee-list-table-legend-container">'."\n";
+		$content .= '<h4>'.__('Status Legend', 'event_espresso').'</h4>'."\n";
+		$content .= '<dl class="ee-list-table-legend">'."\n\t";
+		foreach ($setup_array as $item => $details) {
 			$active_class = $active_status == $details['status'] ? ' class="ee-is-active-status"' : '';
-			$content .= '<dt id="ee-legend-item-tooltip-' . $item . '"' . $active_class . '>' . "\n\t\t";
-			$content .= '<span class="' . $details['class'] . '"></span>' . "\n\t\t";
-			$content .= '<span class="ee-legend-description">' . $details['desc'] . '</span>' . "\n\t";
-			$content .= '</dt>' . "\n";
+			$content .= '<dt id="ee-legend-item-tooltip-'.$item.'"'.$active_class.'>'."\n\t\t";
+			$content .= '<span class="'.$details['class'].'"></span>'."\n\t\t";
+			$content .= '<span class="ee-legend-description">'.$details['desc'].'</span>'."\n\t";
+			$content .= '</dt>'."\n";
 		}
-		$content .= '</dl>' . "\n";
-		$content .= '</div>' . "\n";
+		$content .= '</dl>'."\n";
+		$content .= '</div>'."\n";
 		return $content;
 	}
 
@@ -546,8 +546,8 @@ 
 	 * @return string
 	 */
 	public static function layout_array_as_table($data) {
-	if (is_object($data) || $data instanceof __PHP_Incomplete_Class ) {
-		$data = (array)$data;
+	if (is_object($data) || $data instanceof __PHP_Incomplete_Class) {
+		$data = (array) $data;
 	}
 	EE_Registry::instance()->load_helper('Array');
 	ob_start();
@@ -561,10 +561,10 @@ 
 						?>
 						<tr>
 							<td>
-								<?php echo $data_key;?>
+								<?php echo $data_key; ?>
 							</td>
 							<td>
-								<?php echo self::layout_array_as_table($data_values);?>
+								<?php echo self::layout_array_as_table($data_values); ?>
 							</td>
 						</tr>
 						<?php
@@ -578,7 +578,7 @@ 
 			<ul>
 				<?php
 				foreach ($data as $datum) {
-					echo "<li>"; echo self::layout_array_as_table($datum);echo "</li>";
+					echo "<li>"; echo self::layout_array_as_table($datum); echo "</li>";
 				}?>
 			</ul>
 			<?php
@@ -604,8 +604,8 @@ 
 	 * @param      $url
 	 * @param bool $show_num_field
 	 */
-	public static function paging_html( $total_items, $current, $per_page, $url, $show_num_field = TRUE ) {
-		echo self::get_paging_html( $total_items, $current, $per_page, $url, $show_num_field );
+	public static function paging_html($total_items, $current, $per_page, $url, $show_num_field = TRUE) {
+		echo self::get_paging_html($total_items, $current, $per_page, $url, $show_num_field);
 	}
 
 
@@ -623,69 +623,69 @@ 
 	 * @param  boolean $show_num_field  Whether to show the input for changing page number.
 	 * @return  string
 	 */
-	public static function get_paging_html( $total_items, $current, $per_page, $url, $show_num_field = TRUE ) {
+	public static function get_paging_html($total_items, $current, $per_page, $url, $show_num_field = TRUE) {
 		$page_links = array();
 		$disable_first = $disable_last = '';
 		$total_items = (int) $total_items;
 		$per_page = (int) $per_page;
 		$current = (int) $current;
 
-		$total_pages = round( ceil( $total_items ) / $per_page );
+		$total_pages = round(ceil($total_items) / $per_page);
 
-		if ( $total_pages <= 1)
+		if ($total_pages <= 1)
 			return '';
 
-		$output = '<span class="displaying-num">' . sprintf( _n( '1 item', '%s items', $total_items ), number_format_i18n( $total_items ) ) . '</span>';
+		$output = '<span class="displaying-num">'.sprintf(_n('1 item', '%s items', $total_items), number_format_i18n($total_items)).'</span>';
 
-		if ( $current == 1 )
+		if ($current == 1)
 			$disable_first = ' disabled';
-		if ( $current == $total_pages )
+		if ($current == $total_pages)
 			$disable_last = ' disabled';
 
-		$page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
-			'first-page' . $disable_first,
-			esc_attr__( 'Go to the first page' ),
-			esc_url( remove_query_arg( 'paged', $url ) ),
+		$page_links[] = sprintf("<a class='%s' title='%s' href='%s'>%s</a>",
+			'first-page'.$disable_first,
+			esc_attr__('Go to the first page'),
+			esc_url(remove_query_arg('paged', $url)),
 			'&laquo;'
 		);
 
-		$page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
-			'prev-page' . $disable_first,
-			esc_attr__( 'Go to the previous page' ),
-			esc_url( add_query_arg( 'paged', max( 1, $current-1 ), $url ) ),
+		$page_links[] = sprintf("<a class='%s' title='%s' href='%s'>%s</a>",
+			'prev-page'.$disable_first,
+			esc_attr__('Go to the previous page'),
+			esc_url(add_query_arg('paged', max(1, $current - 1), $url)),
 			'&lsaquo;'
 		);
 
-		if ( ! $show_num_field )
+		if ( ! $show_num_field)
 			$html_current_page = $current;
 		else
-			$html_current_page = sprintf( "<input class='current-page' title='%s' type='text' name='paged' value='%s' size='%d' />",
-				esc_attr__( 'Current page' ),
+			$html_current_page = sprintf("<input class='current-page' title='%s' type='text' name='paged' value='%s' size='%d' />",
+				esc_attr__('Current page'),
 				$current,
-				strlen( $total_pages )
+				strlen($total_pages)
 			);
 
-		$html_total_pages = sprintf( "<span class='total-pages'>%s</span>", number_format_i18n( $total_pages ) );
-		$page_links[] = '<span class="paging-input">' . sprintf( _x( '%1$s of %2$s', 'paging' ), $html_current_page, $html_total_pages ) . '</span>';
+		$html_total_pages = sprintf("<span class='total-pages'>%s</span>", number_format_i18n($total_pages));
+		$page_links[] = '<span class="paging-input">'.sprintf(_x('%1$s of %2$s', 'paging'), $html_current_page, $html_total_pages).'</span>';
 
-		$page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
-			'next-page' . $disable_last,
-			esc_attr__( 'Go to the next page' ),
-			esc_url( add_query_arg( 'paged', min( $total_pages, $current+1 ), $url ) ),
+		$page_links[] = sprintf("<a class='%s' title='%s' href='%s'>%s</a>",
+			'next-page'.$disable_last,
+			esc_attr__('Go to the next page'),
+			esc_url(add_query_arg('paged', min($total_pages, $current + 1), $url)),
 			'&rsaquo;'
 		);
 
-		$page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
-			'last-page' . $disable_last,
-			esc_attr__( 'Go to the last page' ),
-			esc_url( add_query_arg( 'paged', $total_pages, $url ) ),
+		$page_links[] = sprintf("<a class='%s' title='%s' href='%s'>%s</a>",
+			'last-page'.$disable_last,
+			esc_attr__('Go to the last page'),
+			esc_url(add_query_arg('paged', $total_pages, $url)),
 			'&raquo;'
 		);
 
 		$pagination_links_class = 'pagination-links';
-		$output .= "\n<span class='$pagination_links_class'>" . join( "\n", $page_links ) . '</span>';
+		$output .= "\n<span class='$pagination_links_class'>".join("\n", $page_links).'</span>';
 
-		if ( $total_pages )
+		if ($total_pages)
 			$page_class = $total_pages < 2 ? ' one-page' : '';
 		else
 			$page_class = ' no-pages';

Braces +35 added lines, -28 removed lines

@@ -160,8 +160,9 @@ 
 		// first use WP locate_template to check for template in the current theme folder
 		$template_path = locate_template( $templates );
 
-		if ( $check_if_custom && !empty( $template_path ) )
-			return TRUE;
+		if ( $check_if_custom && !empty( $template_path ) ) {
+					return TRUE;
+		}
 
 		// not in the theme
 		if ( empty( $template_path )) {
@@ -364,11 +365,11 @@ 
 				if( $mny->sign_b4 ){
 					if( $amount >= 0 ){
 						$amount_formatted = $mny->sign . $amount_formatted;
-					}else{
+					} else{
 						$amount_formatted = '-' . $mny->sign . str_replace( '-', '', $amount_formatted );
 					}
 
-				}else{
+				} else{
 					$amount_formatted =  $amount_formatted . $mny->sign;
 				}
 
@@ -432,11 +433,13 @@ 
 	 */
 	public static function get_help_tab_link( $help_tab_id, $page = FALSE, $action = FALSE, $icon_style = FALSE, $help_text = FALSE ) {
 
-		if ( ! $page )
-			$page = isset( $_REQUEST['page'] ) && ! empty( $_REQUEST['page'] ) ? sanitize_key( $_REQUEST['page'] ) : $page;
+		if ( ! $page ) {
+					$page = isset( $_REQUEST['page'] ) && ! empty( $_REQUEST['page'] ) ? sanitize_key( $_REQUEST['page'] ) : $page;
+		}
 
-		if ( ! $action )
-			$action = isset( $_REQUEST['action'] ) && ! empty( $_REQUEST['action'] ) ? sanitize_key( $_REQUEST['action'] ) : $action;
+		if ( ! $action ) {
+					$action = isset( $_REQUEST['action'] ) && ! empty( $_REQUEST['action'] ) ? sanitize_key( $_REQUEST['action'] ) : $action;
+		}
 
 		$action = empty($action) ? 'default' : $action;
 
@@ -510,8 +513,9 @@ 
 	 * @return string               html structure for status.
 	 */
 	public static function status_legend( $status_array, $active_status = '' ) {
-		if ( !is_array( $status_array ) )
-			throw new EE_Error( __('The EEH_Template::status_legend helper required the incoming status_array argument to be an array!', 'event_espresso') );
+		if ( !is_array( $status_array ) ) {
+					throw new EE_Error( __('The EEH_Template::status_legend helper required the incoming status_array argument to be an array!', 'event_espresso') );
+		}
 
 		$setup_array = array();
 		foreach ( $status_array as $item => $status ) {
@@ -572,8 +576,7 @@ 
 				</tbody>
 			</table>
 			<?php
-		}
-		else {
+		} else {
 			?>
 			<ul>
 				<?php
@@ -583,8 +586,7 @@ 
 			</ul>
 			<?php
 		}
-	}
-	else {
+	} else {
 		//simple value
 		echo $data;
 	}
@@ -632,15 +634,18 @@ 
 
 		$total_pages = round( ceil( $total_items ) / $per_page );
 
-		if ( $total_pages <= 1)
-			return '';
+		if ( $total_pages <= 1) {
+					return '';
+		}
 
 		$output = '<span class="displaying-num">' . sprintf( _n( '1 item', '%s items', $total_items ), number_format_i18n( $total_items ) ) . '</span>';
 
-		if ( $current == 1 )
-			$disable_first = ' disabled';
-		if ( $current == $total_pages )
-			$disable_last = ' disabled';
+		if ( $current == 1 ) {
+					$disable_first = ' disabled';
+		}
+		if ( $current == $total_pages ) {
+					$disable_last = ' disabled';
+		}
 
 		$page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
 			'first-page' . $disable_first,
@@ -656,14 +661,15 @@ 
 			'&lsaquo;'
 		);
 
-		if ( ! $show_num_field )
-			$html_current_page = $current;
-		else
-			$html_current_page = sprintf( "<input class='current-page' title='%s' type='text' name='paged' value='%s' size='%d' />",
+		if ( ! $show_num_field ) {
+					$html_current_page = $current;
+		} else {
+					$html_current_page = sprintf( "<input class='current-page' title='%s' type='text' name='paged' value='%s' size='%d' />",
 				esc_attr__( 'Current page' ),
 				$current,
 				strlen( $total_pages )
 			);
+		}
 
 		$html_total_pages = sprintf( "<span class='total-pages'>%s</span>", number_format_i18n( $total_pages ) );
 		$page_links[] = '<span class="paging-input">' . sprintf( _x( '%1$s of %2$s', 'paging' ), $html_current_page, $html_total_pages ) . '</span>';
@@ -685,10 +691,11 @@ 
 		$pagination_links_class = 'pagination-links';
 		$output .= "\n<span class='$pagination_links_class'>" . join( "\n", $page_links ) . '</span>';
 
-		if ( $total_pages )
-			$page_class = $total_pages < 2 ? ' one-page' : '';
-		else
-			$page_class = ' no-pages';
+		if ( $total_pages ) {
+					$page_class = $total_pages < 2 ? ' one-page' : '';
+		} else {
+					$page_class = ' no-pages';
+		}
 
 		return "<div class='tablenav-pages{$page_class}'>$output</div>";
 	}

core/helpers/EEH_Template_Validator.helper.php

Doc Comments +2 added lines, -2 removed lines

@@ -131,7 +131,7 @@ 
 	/**
 	 * For verifying that a variable is indeed an array, else throw an EE_Error
 	 * @param type $variable_to_test
-	 * @param type $variable_name
+	 * @param string $variable_name
 	 * @param type $allow_empty one of 'allow_empty' or 'do_not_allow_empty'
 	 * @return void
 	 * @throws EE_Error
@@ -159,7 +159,7 @@ 
 	 * for verifying that a variable is one of the string optiosn supplied
 	 * @param mixed $variable_to_test
 	 * @param mixed $variable_name the name you've given the variable. Eg, '$foo'. THis helps in producing better error messages
-	 * @param array $string_options an array of acceptable values
+	 * @param string[] $string_options an array of acceptable values
 	 * @return void
 	 * @throws EE_Error
 	 */

Spacing +39 added lines, -39 removed lines

@@ -50,14 +50,14 @@ 
 	 * @return void
 	 * @throws EE_Error (indirectly)
 	 */
-	static function verify_is_array_of($variable_to_test,$name_of_variable,$class_name,$allow_null='allow_null'){
-		if(!WP_DEBUG)return;
-		self::verify_argument_is_one_of($allow_null, 'allow_null', array('allow_null','do_not_allow_null'));
-		if('allow_null' == $allow_null && is_null($variable_to_test)){
+	static function verify_is_array_of($variable_to_test, $name_of_variable, $class_name, $allow_null = 'allow_null') {
+		if ( ! WP_DEBUG)return;
+		self::verify_argument_is_one_of($allow_null, 'allow_null', array('allow_null', 'do_not_allow_null'));
+		if ('allow_null' == $allow_null && is_null($variable_to_test)) {
 			return;
 		}
 		self::verify_is_array($variable_to_test, $name_of_variable);
-		foreach($variable_to_test as $key=>$array_element){
+		foreach ($variable_to_test as $key=>$array_element) {
 			self::verify_instanceof($array_element, $key, $class_name);
 		}
 	}
@@ -73,12 +73,12 @@ 
 	 * @return void
 	 * @throws EE_Error
 	 */
-	static function verify_isnt_null($variable_to_test,$name_of_variable){
-		if(!WP_DEBUG)return;
-		if($variable_to_test==null && $variable_to_test!=0 && $variable_to_test!=FALSE){
-			$error[]=__('Variable named %s is null.','event_espresso');
-			$error[]=__("Consider looking at the stack trace to see why it wasn't set.",'event_espresso');
-			throw new EE_Error(sprintf(implode(",",$error),$name_of_variable,$name_of_variable));
+	static function verify_isnt_null($variable_to_test, $name_of_variable) {
+		if ( ! WP_DEBUG)return;
+		if ($variable_to_test == null && $variable_to_test != 0 && $variable_to_test != FALSE) {
+			$error[] = __('Variable named %s is null.', 'event_espresso');
+			$error[] = __("Consider looking at the stack trace to see why it wasn't set.", 'event_espresso');
+			throw new EE_Error(sprintf(implode(",", $error), $name_of_variable, $name_of_variable));
 		}
 	}
 	
@@ -90,12 +90,12 @@ 
 	 * @return void
 	 * @throws EE_Error
 	 */
-	static function verify_is_true($expression_to_test,$expression_string_representation){
-		if(!WP_DEBUG)return;
-		if(!$expression_to_test){
-			$error[]=__('Template error.','event_espresso');
-			$error[]=__("%s evaluated to false, but it must be true!",'event_espresso');
-			throw new EE_Error(sprintf(implode(",",$error),$expression_string_representation));
+	static function verify_is_true($expression_to_test, $expression_string_representation) {
+		if ( ! WP_DEBUG)return;
+		if ( ! $expression_to_test) {
+			$error[] = __('Template error.', 'event_espresso');
+			$error[] = __("%s evaluated to false, but it must be true!", 'event_espresso');
+			throw new EE_Error(sprintf(implode(",", $error), $expression_string_representation));
 		}
 	}
 	
@@ -111,16 +111,16 @@ 
 	 * @return void
 	 * @throws EE_Error
 	 */
-	static function verify_instanceof($variable_to_test,$name_of_variable,$class_name, $allow_null = 'do_not_allow_null'){
-		if(!WP_DEBUG)return;
-		self::verify_argument_is_one_of($allow_null, 'allow_null', array('allow_null','do_not_allow_null'));
-		if($allow_null == 'allow_null' && is_null($variable_to_test)){
+	static function verify_instanceof($variable_to_test, $name_of_variable, $class_name, $allow_null = 'do_not_allow_null') {
+		if ( ! WP_DEBUG)return;
+		self::verify_argument_is_one_of($allow_null, 'allow_null', array('allow_null', 'do_not_allow_null'));
+		if ($allow_null == 'allow_null' && is_null($variable_to_test)) {
 			return;
 		}
-		if( $variable_to_test == NULL ||  ! ( $variable_to_test instanceof $class_name )){
-			$msg[]=__('Variable %s is not of the correct type.','event_espresso');
-			$msg[]=__("It should be of type %s",'event_espresso');
-			throw new EE_Error(sprintf(implode(",",$msg),$name_of_variable,$name_of_variable,$class_name));
+		if ($variable_to_test == NULL || ! ($variable_to_test instanceof $class_name)) {
+			$msg[] = __('Variable %s is not of the correct type.', 'event_espresso');
+			$msg[] = __("It should be of type %s", 'event_espresso');
+			throw new EE_Error(sprintf(implode(",", $msg), $name_of_variable, $name_of_variable, $class_name));
 		}
 	}
 	
@@ -136,16 +136,16 @@ 
 	 * @return void
 	 * @throws EE_Error
 	 */
-	static function verify_is_array($variable_to_test,$variable_name,$allow_empty='allow_empty'){
-		if(!WP_DEBUG)return;
-		self::verify_argument_is_one_of($allow_empty, $variable_name, array('allow_empty','do_not_allow_empty'));
-		if(empty($variable_to_test) && 'allow_empty'==$allow_empty){
+	static function verify_is_array($variable_to_test, $variable_name, $allow_empty = 'allow_empty') {
+		if ( ! WP_DEBUG)return;
+		self::verify_argument_is_one_of($allow_empty, $variable_name, array('allow_empty', 'do_not_allow_empty'));
+		if (empty($variable_to_test) && 'allow_empty' == $allow_empty) {
 			return;
 		}
-		if(!is_array($variable_to_test)){
-			$error[]=__('Variable %s should be an array, but it is not.');
-			$error[]=__("Its value is, instead '%s'",'event_espresso');
-			throw new EE_Error(sprintf(implode(",",$error),$variable_name,$variable_name,$variable_to_test));
+		if ( ! is_array($variable_to_test)) {
+			$error[] = __('Variable %s should be an array, but it is not.');
+			$error[] = __("Its value is, instead '%s'", 'event_espresso');
+			throw new EE_Error(sprintf(implode(",", $error), $variable_name, $variable_name, $variable_to_test));
 		}
 	}
 	
@@ -163,12 +163,12 @@ 
 	 * @return void
 	 * @throws EE_Error
 	 */
-	static function verify_argument_is_one_of($variable_to_test,$variable_name,$string_options){
-		if(!WP_DEBUG)return;
-		if(!in_array($variable_to_test,$string_options)){
-			$msg[0]=__('Malconfigured template.','event_espresso');
-			$msg[1]=__("Variable named '%s' was set to '%s'. It can only be one of '%s'",'event_espresso');
-			throw new EE_Error(sprintf(implode("||",$msg),$variable_name,$variable_to_test, implode("', '",$string_options)));
+	static function verify_argument_is_one_of($variable_to_test, $variable_name, $string_options) {
+		if ( ! WP_DEBUG)return;
+		if ( ! in_array($variable_to_test, $string_options)) {
+			$msg[0] = __('Malconfigured template.', 'event_espresso');
+			$msg[1] = __("Variable named '%s' was set to '%s'. It can only be one of '%s'", 'event_espresso');
+			throw new EE_Error(sprintf(implode("||", $msg), $variable_name, $variable_to_test, implode("', '", $string_options)));
 		}
 	}
 

Braces +21 added lines, -7 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');
+}
 
 /**
  * Event Espresso
@@ -51,7 +53,9 @@ 
 	 * @throws EE_Error (indirectly)
 	 */
 	static function verify_is_array_of($variable_to_test,$name_of_variable,$class_name,$allow_null='allow_null'){
-		if(!WP_DEBUG)return;
+		if(!WP_DEBUG) {
+			return;
+		}
 		self::verify_argument_is_one_of($allow_null, 'allow_null', array('allow_null','do_not_allow_null'));
 		if('allow_null' == $allow_null && is_null($variable_to_test)){
 			return;
@@ -74,7 +78,9 @@ 
 	 * @throws EE_Error
 	 */
 	static function verify_isnt_null($variable_to_test,$name_of_variable){
-		if(!WP_DEBUG)return;
+		if(!WP_DEBUG) {
+			return;
+		}
 		if($variable_to_test==null && $variable_to_test!=0 && $variable_to_test!=FALSE){
 			$error[]=__('Variable named %s is null.','event_espresso');
 			$error[]=__("Consider looking at the stack trace to see why it wasn't set.",'event_espresso');
@@ -91,7 +97,9 @@ 
 	 * @throws EE_Error
 	 */
 	static function verify_is_true($expression_to_test,$expression_string_representation){
-		if(!WP_DEBUG)return;
+		if(!WP_DEBUG) {
+			return;
+		}
 		if(!$expression_to_test){
 			$error[]=__('Template error.','event_espresso');
 			$error[]=__("%s evaluated to false, but it must be true!",'event_espresso');
@@ -112,7 +120,9 @@ 
 	 * @throws EE_Error
 	 */
 	static function verify_instanceof($variable_to_test,$name_of_variable,$class_name, $allow_null = 'do_not_allow_null'){
-		if(!WP_DEBUG)return;
+		if(!WP_DEBUG) {
+			return;
+		}
 		self::verify_argument_is_one_of($allow_null, 'allow_null', array('allow_null','do_not_allow_null'));
 		if($allow_null == 'allow_null' && is_null($variable_to_test)){
 			return;
@@ -137,7 +147,9 @@ 
 	 * @throws EE_Error
 	 */
 	static function verify_is_array($variable_to_test,$variable_name,$allow_empty='allow_empty'){
-		if(!WP_DEBUG)return;
+		if(!WP_DEBUG) {
+			return;
+		}
 		self::verify_argument_is_one_of($allow_empty, $variable_name, array('allow_empty','do_not_allow_empty'));
 		if(empty($variable_to_test) && 'allow_empty'==$allow_empty){
 			return;
@@ -164,7 +176,9 @@ 
 	 * @throws EE_Error
 	 */
 	static function verify_argument_is_one_of($variable_to_test,$variable_name,$string_options){
-		if(!WP_DEBUG)return;
+		if(!WP_DEBUG) {
+			return;
+		}
 		if(!in_array($variable_to_test,$string_options)){
 			$msg[0]=__('Malconfigured template.','event_espresso');
 			$msg[1]=__("Variable named '%s' was set to '%s'. It can only be one of '%s'",'event_espresso');

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;

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();
 	}
 
 

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';
 			}

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

Doc Comments +2 added lines, -2 removed lines

@@ -225,7 +225,7 @@ 
 	 * leave this as TRUE so that the inputs will be properly configured. However,
 	 * some client code may be ok with construction finalize being called later
 	 * (realizing that the subsections' html names might not be set yet, etc.)
-	 * @return EE_Form_Section_Base
+	 * @return EE_Form_Section_Validatable|null
 	 */
 	public function get_subsection($name, $require_construction_to_be_finalized = TRUE ){
 		if( $require_construction_to_be_finalized ){
@@ -712,7 +712,7 @@ 
 	/**
 	 * Equivalent to passing 'exclude' in the constructor's options array.
 	 * Removes the listed inputs from the form
-	 * @param array $inputs_to_exclude values are the input names
+	 * @param string[] $inputs_to_exclude values are the input names
 	 * @return void
 	 */
 	public function exclude($inputs_to_exclude = array()){

Braces +6 added lines, -6 removed lines

@@ -209,7 +209,7 @@ 
 			if(isset($default_data[$subsection_name])){
 				if($subsection instanceof EE_Form_Input_Base){
 					$subsection->set_default($default_data[$subsection_name]);
-				}elseif($subsection instanceof EE_Form_Section_Proper){
+				} elseif($subsection instanceof EE_Form_Section_Proper){
 					$subsection->populate_defaults($default_data[$subsection_name]);
 				}
 			}
@@ -440,7 +440,7 @@ 
 		foreach($this->subsections() as $subsection){
 			if( $subsection instanceof EE_Form_Input_Base ){
 				$inputs[ $subsection->html_name() ] = $subsection;
-			}elseif($subsection instanceof EE_Form_Section_Proper ){
+			} elseif($subsection instanceof EE_Form_Section_Proper ){
 				$inputs += $subsection->inputs_in_subsections();
 			}
 		}
@@ -548,7 +548,7 @@ 
 		foreach($this->get_validatable_subsections() as $subsection){
 			try{
 				$subsection->_normalize($req_data);
-			}catch( EE_Validation_Error $e ){
+			} catch( EE_Validation_Error $e ){
 				$subsection->add_validation_error( $e );
 			}
 		}
@@ -767,7 +767,7 @@ 
 			}
 			$subsections_after = array_diff_key($this->_subsections, $subsections_before);
 			$this->_subsections = array_merge($subsections_before,$subsections,$subsections_after);
-		}else{
+		} else{
 			//don't use array_merge because keys might be numeric and we want to preserve their keys
 			foreach( $subsections as $key => $subsection ){
 				$this->_subsections[ $key ] = $subsection;
@@ -840,7 +840,7 @@ 
 	public function html_name_prefix(){
 		if( $this->parent_section() instanceof EE_Form_Section_Proper ){
 			return $this->parent_section()->html_name_prefix() . '[' . $this->name() . ']';
-		}else{
+		} else{
 			return $this->name();
 		}
 	}
@@ -892,7 +892,7 @@ 
 				if( $subsection->form_data_present_in( $req_data ) ) {
 					return TRUE;
 				}
-			}elseif( $subsection instanceof EE_Form_Section_Proper ) {
+			} elseif( $subsection instanceof EE_Form_Section_Proper ) {
 				if( $subsection->form_data_present_in( $req_data ) ) {
 					return TRUE;
 				}

Spacing +160 added lines, -160 removed lines

@@ -7,7 +7,7 @@ 
  * before the hook wp_enqueue_scripts is called (so that the form section can enqueue its needed scripts).
  * However, you may output the form (usually by calling get_html_and_js) anywhere you like.
  */
-class EE_Form_Section_Proper extends EE_Form_Section_Validatable{
+class EE_Form_Section_Proper extends EE_Form_Section_Validatable {
 
 	/**
 	 * Subsections
@@ -68,37 +68,37 @@ 
 	 * } @see EE_Form_Section_Validatable::__construct()
 	 *
 	 */
-	public function __construct( $options_array = array() ){
+	public function __construct($options_array = array()) {
 		EE_Registry::instance()->load_helper('Formatter');
 		//call parent first, as it may be setting the name
 		parent::__construct($options_array);
 		//if they've included subsections in the constructor, add them now
-		if( isset( $options_array['include'] )){
+		if (isset($options_array['include'])) {
 			//we are going to make sure we ONLY have those subsections to include
 			//AND we are going to make sure they're in that specified order
 			$reordered_subsections = array();
-			foreach($options_array['include'] as $input_name){
-				if(isset($this->_subsections[$input_name])){
+			foreach ($options_array['include'] as $input_name) {
+				if (isset($this->_subsections[$input_name])) {
 					$reordered_subsections[$input_name] = $this->_subsections[$input_name];
 				}
 			}
 			$this->_subsections = $reordered_subsections;
 		}
-		if(isset($options_array['exclude'])){
+		if (isset($options_array['exclude'])) {
 			$exclude = $options_array['exclude'];
 			$this->_subsections = array_diff_key($this->_subsections, array_flip($exclude));
 		}
-		if(isset($options_array['layout_strategy'])){
+		if (isset($options_array['layout_strategy'])) {
 			$this->_layout_strategy = $options_array['layout_strategy'];
 		}
-		if( ! $this->_layout_strategy){
+		if ( ! $this->_layout_strategy) {
 			$this->_layout_strategy = new EE_Two_Column_Layout();
 		}
 		$this->_layout_strategy->_construct_finalize($this);
 
-		add_action( 'wp_enqueue_scripts', array( 'EE_Form_Section_Proper', 'wp_enqueue_scripts' ));
-		add_action( 'admin_enqueue_scripts', array( 'EE_Form_Section_Proper', 'wp_enqueue_scripts' ));
-		add_action( 'wp_footer', array( $this, 'ensure_scripts_localized' ), 1 );
+		add_action('wp_enqueue_scripts', array('EE_Form_Section_Proper', 'wp_enqueue_scripts'));
+		add_action('admin_enqueue_scripts', array('EE_Form_Section_Proper', 'wp_enqueue_scripts'));
+		add_action('wp_footer', array($this, 'ensure_scripts_localized'), 1);
 
 
 	}
@@ -112,20 +112,20 @@ 
 	 * @param string                 $name
 	 * @throws \EE_Error
 	 */
-	public function _construct_finalize( $parent_form_section, $name ) {
+	public function _construct_finalize($parent_form_section, $name) {
 		parent::_construct_finalize($parent_form_section, $name);
 		$this->_set_default_name_if_empty();
 		$this->_set_default_html_id_if_empty();
-		foreach( $this->_subsections as $subsection_name => $subsection ){
-			if ( $subsection instanceof EE_Form_Section_Base ) {
-				$subsection->_construct_finalize( $this, $subsection_name );
+		foreach ($this->_subsections as $subsection_name => $subsection) {
+			if ($subsection instanceof EE_Form_Section_Base) {
+				$subsection->_construct_finalize($this, $subsection_name);
 			} else {
 				throw new EE_Error(
 					sprintf(
-						__( 'Subsection "%s" is not an instanceof EE_Form_Section_Base on form "%s". It is a "%s"', 'event_espresso' ),
+						__('Subsection "%s" is not an instanceof EE_Form_Section_Base on form "%s". It is a "%s"', 'event_espresso'),
 						$subsection_name,
 						get_class($this),
-						$subsection ? get_class($subsection) : __( 'NULL', 'event_espresso' )
+						$subsection ? get_class($subsection) : __('NULL', 'event_espresso')
 					)
 				);
 			}
@@ -138,7 +138,7 @@ 
 	 * Gets the layout strategy for this form section
 	 * @return EE_Form_Section_Layout_Base
 	 */
-	public function get_layout_strategy(){
+	public function get_layout_strategy() {
 		return $this->_layout_strategy;
 	}
 
@@ -150,7 +150,7 @@ 
 	 * @param EE_Form_Input_Base $input
 	 * @return string
 	 */
-	public function get_html_for_input($input){
+	public function get_html_for_input($input) {
 		return $this->_layout_strategy->layout_input($input);
 	}
 
@@ -163,7 +163,7 @@ 
 	 * @param null $form_data
 	 * @return boolean
 	 */
-	public function was_submitted($form_data = NULL){
+	public function was_submitted($form_data = NULL) {
 		return $this->form_data_present_in($form_data);
 	}
 
@@ -184,12 +184,12 @@ 
 	 * to skip this step.
 	 * @return void
 	 */
-	public function receive_form_submission($req_data = NULL, $validate = TRUE){
-		if( $req_data === NULL){
+	public function receive_form_submission($req_data = NULL, $validate = TRUE) {
+		if ($req_data === NULL) {
 			$req_data = $_REQUEST;
 		}
 		$this->_normalize($req_data);
-		if( $validate ){
+		if ($validate) {
 			$this->_validate();
 		}
 	}
@@ -204,12 +204,12 @@ 
 	 * the value being an array formatted in teh same way
 	 * @param array $default_data
 	 */
-	public function populate_defaults($default_data){
-		foreach($this->subsections() as $subsection_name => $subsection){
-			if(isset($default_data[$subsection_name])){
-				if($subsection instanceof EE_Form_Input_Base){
+	public function populate_defaults($default_data) {
+		foreach ($this->subsections() as $subsection_name => $subsection) {
+			if (isset($default_data[$subsection_name])) {
+				if ($subsection instanceof EE_Form_Input_Base) {
 					$subsection->set_default($default_data[$subsection_name]);
-				}elseif($subsection instanceof EE_Form_Section_Proper){
+				}elseif ($subsection instanceof EE_Form_Section_Proper) {
 					$subsection->populate_defaults($default_data[$subsection_name]);
 				}
 			}
@@ -227,8 +227,8 @@ 
 	 * (realizing that the subsections' html names might not be set yet, etc.)
 	 * @return EE_Form_Section_Base
 	 */
-	public function get_subsection($name, $require_construction_to_be_finalized = TRUE ){
-		if( $require_construction_to_be_finalized ){
+	public function get_subsection($name, $require_construction_to_be_finalized = TRUE) {
+		if ($require_construction_to_be_finalized) {
 			$this->ensure_construct_finalized_called();
 		}
 		return isset($this->_subsections[$name]) ? $this->_subsections[$name] : NULL;
@@ -240,10 +240,10 @@ 
 	 * Gets all the validatable subsections of this form section
 	 * @return EE_Form_Section_Validatable[]
 	 */
-	public function get_validatable_subsections(){
+	public function get_validatable_subsections() {
 		$validatable_subsections = array();
-		foreach($this->subsections() as $name=>$obj){
-			if($obj instanceof EE_Form_Section_Validatable){
+		foreach ($this->subsections() as $name=>$obj) {
+			if ($obj instanceof EE_Form_Section_Validatable) {
 				$validatable_subsections[$name] = $obj;
 			}
 		}
@@ -263,10 +263,10 @@ 
 	 * @return EE_Form_Input_Base
 	 * @throws EE_Error
 	 */
-	public function get_input($name, $require_construction_to_be_finalized = TRUE ){
+	public function get_input($name, $require_construction_to_be_finalized = TRUE) {
 		$subsection = $this->get_subsection($name, $require_construction_to_be_finalized);
-		if( ! $subsection instanceof EE_Form_Input_Base){
-			throw new EE_Error(sprintf(__("Subsection '%s' is not an instanceof EE_Form_Input_Base on form '%s'. It is a '%s'", 'event_espresso'),$name, get_class($this),$subsection ? get_class($subsection) : __("NULL", 'event_espresso')));
+		if ( ! $subsection instanceof EE_Form_Input_Base) {
+			throw new EE_Error(sprintf(__("Subsection '%s' is not an instanceof EE_Form_Input_Base on form '%s'. It is a '%s'", 'event_espresso'), $name, get_class($this), $subsection ? get_class($subsection) : __("NULL", 'event_espresso')));
 		}
 		return $subsection;
 	}
@@ -284,10 +284,10 @@ 
 	 * @return EE_Form_Section_Proper
 	 * @throws EE_Error
 	 */
-	public function get_proper_subsection($name, $require_construction_to_be_finalized = TRUE ){
-		$subsection = $this->get_subsection( $name, $require_construction_to_be_finalized );
-		if( ! $subsection instanceof EE_Form_Section_Proper){
-			throw new EE_Error(sprintf(__("Subsection '%'s is not an instanceof EE_Form_Section_Proper on form '%s'", 'event_espresso'),$name, get_class($this)));
+	public function get_proper_subsection($name, $require_construction_to_be_finalized = TRUE) {
+		$subsection = $this->get_subsection($name, $require_construction_to_be_finalized);
+		if ( ! $subsection instanceof EE_Form_Section_Proper) {
+			throw new EE_Error(sprintf(__("Subsection '%'s is not an instanceof EE_Form_Section_Proper on form '%s'", 'event_espresso'), $name, get_class($this)));
 		}
 		return $subsection;
 	}
@@ -300,7 +300,7 @@ 
 	 * @param string $name
 	 * @return mixed depending on the input's type and its normalization strategy
 	 */
-	public function get_input_value($name){
+	public function get_input_value($name) {
 		$input = $this->get_input($name);
 		return $input->normalized_value();
 	}
@@ -313,16 +313,16 @@ 
 	 * @return boolean
 	 */
 	public function is_valid() {
-		if( ! $this->has_received_submission()){
+		if ( ! $this->has_received_submission()) {
 			throw new EE_Error(sprintf(__("You cannot check if a form is valid before receiving the form submission using receive_form_submission", "event_espresso")));
 		}
-		if( ! parent::is_valid()){
+		if ( ! parent::is_valid()) {
 			return false;
 		}
 		//ok so no errors general to this entire form section. so let's check the subsections
-		foreach( $this->get_validatable_subsections() as $subsection ){
-			if( ! $subsection->is_valid() || $subsection->get_validation_error_string() != '' ){
-				$this->set_submission_error_message( $subsection->get_validation_error_string() );
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			if ( ! $subsection->is_valid() || $subsection->get_validation_error_string() != '') {
+				$this->set_submission_error_message($subsection->get_validation_error_string());
 				return false;
 			}
 		}
@@ -335,11 +335,11 @@ 
 	 * gets teh default name of this form section if none is specified
 	 * @return string
 	 */
-	protected function _set_default_name_if_empty(){
-		if( ! $this->_name ){
+	protected function _set_default_name_if_empty() {
+		if ( ! $this->_name) {
 			$classname = get_class($this);
 			$default_name = str_replace("EE_", "", $classname);
-			$this->_name =  $default_name;
+			$this->_name = $default_name;
 		}
 	}
 
@@ -350,7 +350,7 @@ 
 	 * Also returns the HTML for the form, except for the form opening and closing tags
 	 * (as the form section doesn't know where you necessarily want to send the information to), and except for a submit button.
 	 */
-	public function get_html_and_js(){
+	public function get_html_and_js() {
 		$this->enqueue_js();
 		return $this->get_html();
 	}
@@ -361,7 +361,7 @@ 
 	 * returns HTML for displaying this form section. recursively calls display_section() on all subsections
 	 * @return string
 	 */
-	public function get_html(){
+	public function get_html() {
 		$this->ensure_construct_finalized_called();
 		return $this->_layout_strategy->layout_form();
 	}
@@ -372,7 +372,7 @@ 
 	 * enqueues JS for the form
 	 * @return string
 	 */
-	public function enqueue_js(){
+	public function enqueue_js() {
 		$this->_enqueue_and_localize_form_js();
 	}
 
@@ -387,9 +387,9 @@ 
 	 * could change until it's actually outputted)
 	 * @return void
 	 */
-	public static function wp_enqueue_scripts(){
-		add_filter( 'FHEE_load_jquery_validate', '__return_true' );
-		wp_register_script( 'ee_form_section_validation', EE_GLOBAL_ASSETS_URL . 'scripts' . DS . 'form_section_validation.js', array( 'jquery-validate', 'jquery-ui-datepicker' ), EVENT_ESPRESSO_VERSION, TRUE );
+	public static function wp_enqueue_scripts() {
+		add_filter('FHEE_load_jquery_validate', '__return_true');
+		wp_register_script('ee_form_section_validation', EE_GLOBAL_ASSETS_URL.'scripts'.DS.'form_section_validation.js', array('jquery-validate', 'jquery-ui-datepicker'), EVENT_ESPRESSO_VERSION, TRUE);
 	}
 
 
@@ -399,14 +399,14 @@ 
 	 * This needs to be called AFTER we've called $this->_enqueue_jquery_validate_script,
 	 * but before the wordpress hook wp_loaded
 	 */
-	public function _enqueue_and_localize_form_js(){
+	public function _enqueue_and_localize_form_js() {
 		$this->ensure_construct_finalized_called();
 		//actually, we don't want to localize just yet. There may be other forms on the page.
 		//so we need to add our form section data to a static variable accessible by all form sections
 		//and localize it just before the footer
 		$this->localize_validation_rules();
-		add_action( 'wp_footer', array( 'EE_Form_Section_Proper', 'localize_script_for_all_forms' ), 2 );
-		add_action( 'admin_footer', array( 'EE_Form_Section_Proper', 'localize_script_for_all_forms' ) );
+		add_action('wp_footer', array('EE_Form_Section_Proper', 'localize_script_for_all_forms'), 2);
+		add_action('admin_footer', array('EE_Form_Section_Proper', 'localize_script_for_all_forms'));
 	}
 
 
@@ -415,11 +415,11 @@ 
 	 * add our form section data to a static variable accessible by all form sections
 	 * @return void
 	 */
-	public function localize_validation_rules(){
+	public function localize_validation_rules() {
 		// we only want to localize vars ONCE for the entire form, so if the form section doesn't have a parent, then it must be the top dog
-		if ( ! $this->parent_section() ) {
-			EE_Form_Section_Proper::$_js_localization['form_data'][ $this->html_id() ] = array(
-				'form_section_id'=> $this->html_id( TRUE ),
+		if ( ! $this->parent_section()) {
+			EE_Form_Section_Proper::$_js_localization['form_data'][$this->html_id()] = array(
+				'form_section_id'=> $this->html_id(TRUE),
 				'validation_rules'=> $this->get_jquery_validation_rules(),
 				'errors'=> $this->subsection_validation_errors_by_html_name()
 			);
@@ -434,12 +434,12 @@ 
 	 * Keys are their form names, and values are the inputs themselves
 	 * @return EE_Form_Input_Base
 	 */
-	public function inputs_in_subsections(){
+	public function inputs_in_subsections() {
 		$inputs = array();
-		foreach($this->subsections() as $subsection){
-			if( $subsection instanceof EE_Form_Input_Base ){
-				$inputs[ $subsection->html_name() ] = $subsection;
-			}elseif($subsection instanceof EE_Form_Section_Proper ){
+		foreach ($this->subsections() as $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				$inputs[$subsection->html_name()] = $subsection;
+			}elseif ($subsection instanceof EE_Form_Section_Proper) {
 				$inputs += $subsection->inputs_in_subsections();
 			}
 		}
@@ -452,12 +452,12 @@ 
 	 * and values are a string of all their validation errors
 	 * @return string[]
 	 */
-	public function subsection_validation_errors_by_html_name(){
+	public function subsection_validation_errors_by_html_name() {
 		$inputs = $this->inputs();
 		$errors = array();
-		foreach( $inputs as $form_input ){
-			if ( $form_input instanceof EE_Form_Input_Base && $form_input->get_validation_errors() ){
-				$errors[ $form_input->html_name() ] = $form_input->get_validation_error_string();
+		foreach ($inputs as $form_input) {
+			if ($form_input instanceof EE_Form_Input_Base && $form_input->get_validation_errors()) {
+				$errors[$form_input->html_name()] = $form_input->get_validation_error_string();
 			}
 		}
 		return $errors;
@@ -469,12 +469,12 @@ 
 	 * passes all the form data required by the JS to the JS, and enqueues the few required JS files.
 	 * Should be setup by each form during the _enqueues_and_localize_form_js
 	 */
-	public static function localize_script_for_all_forms(){
+	public static function localize_script_for_all_forms() {
 		//allow inputs and stuff to hook in their JS and stuff here
 		do_action('AHEE__EE_Form_Section_Proper__localize_script_for_all_forms__begin');
 		EE_Form_Section_Proper::$_js_localization['localized_error_messages'] = EE_Form_Section_Proper::_get_localized_error_messages();
-		wp_enqueue_script( 'ee_form_section_validation' );
-		wp_localize_script( 'ee_form_section_validation', 'ee_form_section_vars', EE_Form_Section_Proper::$_js_localization );
+		wp_enqueue_script('ee_form_section_validation');
+		wp_localize_script('ee_form_section_validation', 'ee_form_section_vars', EE_Form_Section_Proper::$_js_localization);
 	}
 
 
@@ -482,8 +482,8 @@ 
 	/**
 	 * ensure_scripts_localized
 	 */
-	public function ensure_scripts_localized(){
-		if ( ! EE_Form_Section_Proper::$_scripts_localized ) {
+	public function ensure_scripts_localized() {
+		if ( ! EE_Form_Section_Proper::$_scripts_localized) {
 			$this->_enqueue_and_localize_form_js();
 		}
 	}
@@ -495,10 +495,10 @@ 
 	 * is that the key here should be the same as the custom validation rule put in the JS file
 	 * @return array keys are custom validation rules, and values are internationalized strings
 	 */
-	private static function _get_localized_error_messages(){
+	private static function _get_localized_error_messages() {
 		return array(
 			'validUrl'=>  __("This is not a valid absolute URL. Eg, http://domain.com/monkey.jpg", "event_espresso"),
-			'regex' => __( 'Please check your input', 'event_espresso' ),
+			'regex' => __('Please check your input', 'event_espresso'),
 		);
 	}
 
@@ -526,10 +526,10 @@ 
 	 * Gets the JS to put inside the jquery validation rules for subsection of this form section. See parent function for more...
 	 * @return array
 	 */
-	function get_jquery_validation_rules(){
+	function get_jquery_validation_rules() {
 		$jquery_validation_rules = array();
-		foreach($this->get_validatable_subsections() as $subsection){
-			$jquery_validation_rules = array_merge( $jquery_validation_rules,  $subsection->get_jquery_validation_rules() );
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			$jquery_validation_rules = array_merge($jquery_validation_rules, $subsection->get_jquery_validation_rules());
 		}
 		return $jquery_validation_rules;
 	}
@@ -544,11 +544,11 @@ 
 	protected function _normalize($req_data) {
 		$this->_received_submission = TRUE;
 		$this->_validation_errors = array();
-		foreach($this->get_validatable_subsections() as $subsection){
-			try{
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			try {
 				$subsection->_normalize($req_data);
-			}catch( EE_Validation_Error $e ){
-				$subsection->add_validation_error( $e );
+			} catch (EE_Validation_Error $e) {
+				$subsection->add_validation_error($e);
 			}
 		}
 	}
@@ -562,9 +562,9 @@ 
 	 * calling parent::_validate() first.
 	 */
 	protected function _validate() {
-		foreach($this->get_validatable_subsections() as $subsection_name => $subsection){
-			if(method_exists($this,'_validate_'.$subsection_name)){
-				call_user_func_array(array($this,'_validate_'.$subsection_name), array($subsection));
+		foreach ($this->get_validatable_subsections() as $subsection_name => $subsection) {
+			if (method_exists($this, '_validate_'.$subsection_name)) {
+				call_user_func_array(array($this, '_validate_'.$subsection_name), array($subsection));
 			}
 			$subsection->_validate();
 		}
@@ -576,13 +576,13 @@ 
 	 * Gets all the validated inputs for the form section
 	 * @return array
 	 */
-	public function valid_data(){
+	public function valid_data() {
 		$inputs = array();
-		foreach( $this->subsections() as $subsection_name =>$subsection ){
-			if ( $subsection instanceof EE_Form_Section_Proper ) {
-				$inputs[ $subsection_name ] = $subsection->valid_data();
-			} else if ( $subsection instanceof EE_Form_Input_Base ){
-				$inputs[ $subsection_name ] = $subsection->normalized_value();
+		foreach ($this->subsections() as $subsection_name =>$subsection) {
+			if ($subsection instanceof EE_Form_Section_Proper) {
+				$inputs[$subsection_name] = $subsection->valid_data();
+			} else if ($subsection instanceof EE_Form_Input_Base) {
+				$inputs[$subsection_name] = $subsection->normalized_value();
 			}
 		}
 		return $inputs;
@@ -594,11 +594,11 @@ 
 	 * Gets all the inputs on this form section
 	 * @return EE_Form_Input_Base[]
 	 */
-	public function inputs(){
+	public function inputs() {
 		$inputs = array();
-		foreach( $this->subsections() as $subsection_name =>$subsection ){
-			if ( $subsection instanceof EE_Form_Input_Base ){
-				$inputs[ $subsection_name ] = $subsection;
+		foreach ($this->subsections() as $subsection_name =>$subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				$inputs[$subsection_name] = $subsection;
 			}
 		}
 		return $inputs;
@@ -610,10 +610,10 @@ 
 	 * Gets all the subsections which are a proper form
 	 * @return EE_Form_Section_Proper[]
 	 */
-	public function subforms(){
+	public function subforms() {
 		$form_sections = array();
-		foreach($this->subsections() as $name=>$obj){
-			if($obj instanceof EE_Form_Section_Proper){
+		foreach ($this->subsections() as $name=>$obj) {
+			if ($obj instanceof EE_Form_Section_Proper) {
 				$form_sections[$name] = $obj;
 			}
 		}
@@ -628,7 +628,7 @@ 
 	 * if you only want form inputs or proper form sections.
 	 * @return EE_Form_Section_Proper[]
 	 */
-	public function subsections(){
+	public function subsections() {
 		$this->ensure_construct_finalized_called();
 		return $this->_subsections;
 	}
@@ -646,8 +646,8 @@ 
 	 * it can be a multidimensional array where keys are always subsection names and values are either the
 	 * input's normalized value, or an array like the top-level array
 	 */
-	public function input_values( $include_subform_inputs = false, $flatten = false ){
-		return $this->_input_values( false, $include_subform_inputs, $flatten );
+	public function input_values($include_subform_inputs = false, $flatten = false) {
+		return $this->_input_values(false, $include_subform_inputs, $flatten);
 	}
 
 	/**
@@ -663,8 +663,8 @@ 
 	 * it can be a multidimensional array where keys are always subsection names and values are either the
 	 * input's normalized value, or an array like the top-level array
 	 */
-	public function input_pretty_values(  $include_subform_inputs = false, $flatten = false ){
-		return $this->_input_values( true, $include_subform_inputs, $flatten );
+	public function input_pretty_values($include_subform_inputs = false, $flatten = false) {
+		return $this->_input_values(true, $include_subform_inputs, $flatten);
 	}
 
 	/**
@@ -677,17 +677,17 @@ 
 	 * it can be a multidimensional array where keys are always subsection names and values are either the
 	 * input's normalized value, or an array like the top-level array
 	 */
-	public function _input_values( $pretty = false, $include_subform_inputs = false, $flatten = false ) {
+	public function _input_values($pretty = false, $include_subform_inputs = false, $flatten = false) {
 		$input_values = array();
-		foreach( $this->subsections() as $subsection_name => $subsection ) {
-			if( $subsection instanceof EE_Form_Input_Base ) {
-				$input_values[ $subsection_name ] = $pretty ? $subsection->pretty_value() : $subsection->normalized_value();
-			} else if( $subsection instanceof EE_Form_Section_Proper && $include_subform_inputs ) {
-				$subform_input_values = $subsection->_input_values( $pretty, $include_subform_inputs, $flatten );
-				if( $flatten ) {
-					$input_values = array_merge( $input_values, $subform_input_values );
+		foreach ($this->subsections() as $subsection_name => $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				$input_values[$subsection_name] = $pretty ? $subsection->pretty_value() : $subsection->normalized_value();
+			} else if ($subsection instanceof EE_Form_Section_Proper && $include_subform_inputs) {
+				$subform_input_values = $subsection->_input_values($pretty, $include_subform_inputs, $flatten);
+				if ($flatten) {
+					$input_values = array_merge($input_values, $subform_input_values);
 				} else {
-					$input_values[ $subsection_name ] = $subform_input_values;
+					$input_values[$subsection_name] = $subform_input_values;
 				}
 			}
 		}
@@ -701,7 +701,7 @@ 
 	 * (ie, had receive_form_submission called on it yet)
 	 * @return boolean
 	 */
-	public function has_received_submission(){
+	public function has_received_submission() {
 		$this->ensure_construct_finalized_called();
 		return $this->_received_submission;
 	}
@@ -714,8 +714,8 @@ 
 	 * @param array $inputs_to_exclude values are the input names
 	 * @return void
 	 */
-	public function exclude($inputs_to_exclude = array()){
-		foreach($inputs_to_exclude as $input_to_exclude_name){
+	public function exclude($inputs_to_exclude = array()) {
+		foreach ($inputs_to_exclude as $input_to_exclude_name) {
 			unset($this->_subsections[$input_to_exclude_name]);
 		}
 	}
@@ -725,8 +725,8 @@ 
 	/**
 	 * @param array $inputs_to_hide
 	 */
-	public function hide($inputs_to_hide= array()){
-		foreach($inputs_to_hide as $input_to_hide){
+	public function hide($inputs_to_hide = array()) {
+		foreach ($inputs_to_hide as $input_to_hide) {
 			$input = $this->get_input($input_to_hide);
 
 			$input->set_display_strategy(new EE_Hidden_Display_Strategy());
@@ -742,13 +742,13 @@ 
 	 * @param string $subsection_name_to_add_before name of the section to add these subsections in front of, or null to add at the very end
 	 * @return void
 	 */
-	public function add_subsections($subsections,$subsection_name_to_add_before = NULL){
-		foreach($subsections as $subsection_name => $subsection){
-			if( ! $subsection instanceof EE_Form_Section_Base){
+	public function add_subsections($subsections, $subsection_name_to_add_before = NULL) {
+		foreach ($subsections as $subsection_name => $subsection) {
+			if ( ! $subsection instanceof EE_Form_Section_Base) {
 				EE_Error::add_error(
 					sprintf(
 						__("Trying to add a %s as a subsection (it was named '%s') to the form section '%s'. It was removed.", "event_espresso"),
-						get_class( $subsection ),
+						get_class($subsection),
 						$subsection_name,
 						$this->name()
 					)
@@ -757,23 +757,23 @@ 
 			}
 		}
 		$subsections_before = array();
-		if( $subsection_name_to_add_before ){
-			foreach( $this->_subsections as $subsection_name => $subsection ) {
-				if ( $subsection_name == $subsection_name_to_add_before ) {
+		if ($subsection_name_to_add_before) {
+			foreach ($this->_subsections as $subsection_name => $subsection) {
+				if ($subsection_name == $subsection_name_to_add_before) {
 					break;
 				}
 				$subsections_before[$subsection_name] = $subsection;
 			}
 			$subsections_after = array_diff_key($this->_subsections, $subsections_before);
-			$this->_subsections = array_merge($subsections_before,$subsections,$subsections_after);
-		}else{
+			$this->_subsections = array_merge($subsections_before, $subsections, $subsections_after);
+		} else {
 			//don't use array_merge because keys might be numeric and we want to preserve their keys
-			foreach( $subsections as $key => $subsection ){
-				$this->_subsections[ $key ] = $subsection;
+			foreach ($subsections as $key => $subsection) {
+				$this->_subsections[$key] = $subsection;
 			}
 		}
-		if( $this->_construction_finalized ){
-			foreach($this->_subsections as $name => $subsection){
+		if ($this->_construction_finalized) {
+			foreach ($this->_subsections as $name => $subsection) {
 				$subsection->_construct_finalize($this, $name);
 			}
 		}
@@ -784,8 +784,8 @@ 
 	/**
 	 * Just gets all validatable subsections to clean their sensitive data
 	 */
-	public function clean_sensitive_data(){
-		foreach($this->get_validatable_subsections() as $subsection){
+	public function clean_sensitive_data() {
+		foreach ($this->get_validatable_subsections() as $subsection) {
 			$subsection->clean_sensitive_data();
 		}
 	}
@@ -795,8 +795,8 @@ 
 	/**
 	 * @param string $form_submission_error_message
 	 */
-	public function set_submission_error_message( $form_submission_error_message = '' ) {
-		$this->_form_submission_error_message .= ! empty( $form_submission_error_message ) ? $form_submission_error_message : __( 'Form submission failed due to errors', 'event_espresso' );
+	public function set_submission_error_message($form_submission_error_message = '') {
+		$this->_form_submission_error_message .= ! empty($form_submission_error_message) ? $form_submission_error_message : __('Form submission failed due to errors', 'event_espresso');
 	}
 
 
@@ -813,8 +813,8 @@ 
 	/**
 	 * @param string $form_submission_success_message
 	 */
-	public function set_submission_success_message( $form_submission_success_message ) {
-		$this->_form_submission_success_message .= ! empty( $form_submission_success_message ) ? $form_submission_success_message : __( 'Form submitted successfully', 'event_espresso' );
+	public function set_submission_success_message($form_submission_success_message) {
+		$this->_form_submission_success_message .= ! empty($form_submission_success_message) ? $form_submission_success_message : __('Form submitted successfully', 'event_espresso');
 	}
 
 
@@ -836,10 +836,10 @@ 
 	 * EE_Form_Input_Base::_set_default_html_name_if_empty
 	 * @return string
 	 */
-	public function html_name_prefix(){
-		if( $this->parent_section() instanceof EE_Form_Section_Proper ){
-			return $this->parent_section()->html_name_prefix() . '[' . $this->name() . ']';
-		}else{
+	public function html_name_prefix() {
+		if ($this->parent_section() instanceof EE_Form_Section_Proper) {
+			return $this->parent_section()->html_name_prefix().'['.$this->name().']';
+		} else {
 			return $this->name();
 		}
 	}
@@ -850,7 +850,7 @@ 
 	 * was set, which is probably nothing, or the classname)
 	 * @return string
 	 */
-	public function name(){
+	public function name() {
 		$this->ensure_construct_finalized_called();
 		return parent::name();
 	}
@@ -859,7 +859,7 @@ 
 	 *
 	 * @return EE_Form_Section_Proper
 	 */
-	public function parent_section(){
+	public function parent_section() {
 		$this->ensure_construct_finalized_called();
 		return parent::parent_section();
 	}
@@ -868,9 +868,9 @@ 
 	 * make sure construction finalized was called, otherwise children might not be ready
 	 * @return void
 	 */
-	public function ensure_construct_finalized_called(){
-		if( ! $this->_construction_finalized ){
-			$this->_construct_finalize($this->_parent_section, $this->_name );
+	public function ensure_construct_finalized_called() {
+		if ( ! $this->_construction_finalized) {
+			$this->_construct_finalize($this->_parent_section, $this->_name);
 		}
 	}
 
@@ -882,17 +882,17 @@ 
 	 * @param array $req_data
 	 * @return boolean
 	 */
-	public function form_data_present_in( $req_data = NULL ) {
-		if( $req_data === NULL){
+	public function form_data_present_in($req_data = NULL) {
+		if ($req_data === NULL) {
 			$req_data = $_POST;
 		}
-		foreach( $this->subsections() as $subsection ) {
-			if($subsection instanceof EE_Form_Input_Base ) {
-				if( $subsection->form_data_present_in( $req_data ) ) {
+		foreach ($this->subsections() as $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				if ($subsection->form_data_present_in($req_data)) {
 					return TRUE;
 				}
-			}elseif( $subsection instanceof EE_Form_Section_Proper ) {
-				if( $subsection->form_data_present_in( $req_data ) ) {
+			}elseif ($subsection instanceof EE_Form_Section_Proper) {
+				if ($subsection->form_data_present_in($req_data)) {
 					return TRUE;
 				}
 			}
@@ -909,14 +909,14 @@ 
 	 */
 	public function get_validation_errors_accumulated() {
 		$validation_errors = $this->get_validation_errors();
-		foreach($this->get_validatable_subsections() as $subsection ) {
-			if( $subsection instanceof EE_Form_Section_Proper ) {
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			if ($subsection instanceof EE_Form_Section_Proper) {
 				$validation_errors_on_this_subsection = $subsection->get_validation_errors_accumulated();
 			} else {
-				$validation_errors_on_this_subsection =  $subsection->get_validation_errors();
+				$validation_errors_on_this_subsection = $subsection->get_validation_errors();
 			}
-			if( $validation_errors_on_this_subsection ){
-				$validation_errors = array_merge( $validation_errors, $validation_errors_on_this_subsection );
+			if ($validation_errors_on_this_subsection) {
+				$validation_errors = array_merge($validation_errors, $validation_errors_on_this_subsection);
 			}
 		}
 		return $validation_errors;

core/libraries/form_sections/base/EE_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
 	 */

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 );

Spacing +71 added lines, -71 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,16 +123,16 @@ 
 	 * @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,
 					'html_label_text'=>$model_field->get_nicename(),
 					'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';
@@ -141,16 +141,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';
@@ -159,15 +159,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,7 +178,7 @@ 
 						$input_class = 'EE_Text_Area_Input';
 						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';
@@ -187,7 +187,7 @@ 
 						$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';
@@ -215,13 +215,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);
@@ -239,21 +239,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;
@@ -270,8 +270,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());
 	}
 
 
@@ -294,21 +294,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);
 			}
 		}
 
@@ -324,13 +324,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);
 			}
 		}
@@ -346,29 +346,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;
@@ -380,7 +380,7 @@ 
 	 * Gets the model of this model form
 	 * @return EEM_Base
 	 */
-	public function get_model(){
+	public function get_model() {
 		return $this->_model;
 	}
 
@@ -393,7 +393,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;
 	}
 
@@ -403,10 +403,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;
 		}
 	}