eventespresso / event-espresso-core

core/helpers/EEH_Venue_View.helper.php

Spacing +110 added lines, -110 removed lines

@@ -45,16 +45,16 @@ 
 	 * @param bool $password_check
 	 * @return \EE_Venue|null
 	 */
-	public static function get_venue( $VNU_ID = 0, $look_in_event = TRUE, $privacy_check = true, $password_check = true ) {
-		$VNU_ID = absint( $VNU_ID );
+	public static function get_venue($VNU_ID = 0, $look_in_event = TRUE, $privacy_check = true, $password_check = true) {
+		$VNU_ID = absint($VNU_ID);
 		// do we already have the Venue you are looking for?
-		if ( EEH_Venue_View::$_venue instanceof EE_Venue && EEH_Venue_View::$_venue->ID() == $VNU_ID ) {
-			return EEH_Venue_View::_get_venue( $privacy_check );
+		if (EEH_Venue_View::$_venue instanceof EE_Venue && EEH_Venue_View::$_venue->ID() == $VNU_ID) {
+			return EEH_Venue_View::_get_venue($privacy_check);
 		}
 		// international newspaper?
 		global $post;
-		if ( $post instanceof WP_Post ) {
-			switch ( $post->post_type ) {
+		if ($post instanceof WP_Post) {
+			switch ($post->post_type) {
 				// if this is being called from an EE_Venue post,
 				// and the EE_Venue post corresponds to the EE_Venue that is being asked for,
 				// then we can try to just grab the attached EE_Venue object
@@ -62,31 +62,31 @@ 
 					// the post already contains the related EE_Venue object AND one of the following is TRUE:
 					// the requested Venue ID matches the post ID OR...
 					// there was no specific Venue ID requested
-					if ( isset( $post->EE_Venue ) && ( $VNU_ID == $post->ID || ! $VNU_ID )) {
+					if (isset($post->EE_Venue) && ($VNU_ID == $post->ID || ! $VNU_ID)) {
 						// use existing related EE_Venue object
-						EEH_Venue_View::$_venue =  $post->EE_Venue;
-					} else if ( $VNU_ID ) {
+						EEH_Venue_View::$_venue = $post->EE_Venue;
+					} else if ($VNU_ID) {
 						// there WAS a specific Venue ID requested, but it's NOT the current post object
-						EEH_Venue_View::$_venue = EEM_Venue::instance()->get_one_by_ID( $VNU_ID );
+						EEH_Venue_View::$_venue = EEM_Venue::instance()->get_one_by_ID($VNU_ID);
 					} else {
 						// no specific Venue ID requested, so use post ID to generate EE_Venue object
-						EEH_Venue_View::$_venue = EEM_Venue::instance()->get_one_by_ID( $post->ID );
+						EEH_Venue_View::$_venue = EEM_Venue::instance()->get_one_by_ID($post->ID);
 					}
 				break;
 
 				case 'espresso_events':
-					if ( $look_in_event ) {
+					if ($look_in_event) {
 						// grab the events related venues
 						$venues = EEH_Venue_View::get_event_venues();
 						// make sure the result is an array
-						$venues = is_array( $venues ) ? $venues : array();
+						$venues = is_array($venues) ? $venues : array();
 						// do we have an ID for a specific venue?
-						if ( $VNU_ID ) {
+						if ($VNU_ID) {
 							// loop thru the related venues
-							foreach( $venues as $venue ) {
-								if ( $venue instanceof EE_Venue ) {
+							foreach ($venues as $venue) {
+								if ($venue instanceof EE_Venue) {
 									// until we find the venue we're looking for
-									if ( $venue->ID() == $VNU_ID ) {
+									if ($venue->ID() == $VNU_ID) {
 										EEH_Venue_View::$_venue = $venue;
 										break;
 									}
@@ -98,7 +98,7 @@ 
 							// then the global post is an events post and this function was called with no argument
 						} else {
 							// just grab the first related event venue
-							EEH_Venue_View::$_venue = reset( $venues );
+							EEH_Venue_View::$_venue = reset($venues);
 						}
 					}
 				break;
@@ -106,11 +106,11 @@ 
 			}
 		}
 		// now if we STILL do NOT have an EE_Venue model object, BUT we have a Venue ID...
-		if ( ! EEH_Venue_View::$_venue instanceof EE_Venue && $VNU_ID ) {
+		if ( ! EEH_Venue_View::$_venue instanceof EE_Venue && $VNU_ID) {
 			// sigh... pull it from the db
-			EEH_Venue_View::$_venue = EEM_Venue::instance()->get_one_by_ID( $VNU_ID );
+			EEH_Venue_View::$_venue = EEM_Venue::instance()->get_one_by_ID($VNU_ID);
 		}
-		return EEH_Venue_View::_get_venue( $privacy_check, $password_check );
+		return EEH_Venue_View::_get_venue($privacy_check, $password_check);
 	}
 
 
@@ -123,13 +123,13 @@ 
 	 * @param bool $password_check
 	 * @return 	EE_Venue
 	 */
-	protected static function _get_venue( $privacy_check = true, $password_check = true ) {
+	protected static function _get_venue($privacy_check = true, $password_check = true) {
 		// check for private venues.
 		if (
 			EEH_Venue_View::$_venue instanceof EE_Venue
 			&& EEH_Venue_View::$_venue->status() == 'private'
 			&& $privacy_check
-			&& ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_private_venues', 'get_venues' )
+			&& ! EE_Registry::instance()->CAP->current_user_can('ee_read_private_venues', 'get_venues')
 		) {
 			return null;
 		}
@@ -137,7 +137,7 @@ 
 		if (
 			EEH_Venue_View::$_venue instanceof EE_Venue
 			&& $password_check
-			&& post_password_required( EEH_Venue_View::$_venue->ID() )
+			&& post_password_required(EEH_Venue_View::$_venue->ID())
 		) {
 			return null;
 		}
@@ -154,8 +154,8 @@ 
 	 */
 	public static function get_event_venues() {
 		global $post;
-		if ( $post->post_type == 'espresso_events' ) {
-			if ( isset( $post->EE_Event ) && $post->EE_Event instanceof EE_Event ) {
+		if ($post->post_type == 'espresso_events') {
+			if (isset($post->EE_Event) && $post->EE_Event instanceof EE_Event) {
 				return $post->EE_Event->venues();
 			}
 		}
@@ -175,9 +175,9 @@ 
 	 *
 	 * @return bool|null
 	 */
-	public static function is_venue_private( $VNU_ID = false ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID, true, true );
-		if ( ! $venue instanceof EE_Venue ) {
+	public static function is_venue_private($VNU_ID = false) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID, true, true);
+		if ( ! $venue instanceof EE_Venue) {
 			return null;
 		}
 
@@ -192,11 +192,11 @@ 
 	 * @param bool $VNU_ID venue to check (optional). If not included will use internally derived venue object.
 	 * @return bool
 	 */
-	public static function is_venue_password_protected( $VNU_ID = false ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID, true, true, false );
+	public static function is_venue_password_protected($VNU_ID = false) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID, true, true, false);
 		if (
 			$venue instanceof EE_Venue
-			&& post_password_required( $venue->ID() )
+			&& post_password_required($venue->ID())
 		) {
 			return true;
 		}
@@ -213,13 +213,13 @@ 
 	 *
 	 * @return string
 	 */
-	public static function password_protected_venue_form( $VNU_ID = false ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID, true, true, false );
+	public static function password_protected_venue_form($VNU_ID = false) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID, true, true, false);
 		if (
 			$venue instanceof EE_Venue
-			&& post_password_required( $venue->ID() )
+			&& post_password_required($venue->ID())
 		) {
-			return get_the_password_form( $venue->ID() );
+			return get_the_password_form($venue->ID());
 		}
 		return '';
 	}
@@ -233,9 +233,9 @@ 
 	 * @param int $VNU_ID
 	 * @return string
 	 */
-	public static function venue_description( $VNU_ID = 0 ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
+	public static function venue_description($VNU_ID = 0) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
 			return$venue->description();
 		}
 		return '';
@@ -250,12 +250,12 @@ 
 	 * @param int $VNU_ID
 	 * @return string
 	 */
-	public static function venue_excerpt( $VNU_ID = 0 ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
+	public static function venue_excerpt($VNU_ID = 0) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
 			$excerpt = $venue->excerpt() != NULL && $venue->excerpt() ? $venue->excerpt() : $venue->description();
-			$venue_link = ' ' . EEH_Venue_View::venue_details_link( $venue->ID(), __( 'more', 'event_espresso' ) . '…' );
-			return ! empty( $excerpt ) ? wp_trim_words( $excerpt, 25, '' ) . $venue_link : '';
+			$venue_link = ' '.EEH_Venue_View::venue_details_link($venue->ID(), __('more', 'event_espresso').'…');
+			return ! empty($excerpt) ? wp_trim_words($excerpt, 25, '').$venue_link : '';
 		}
 		return '';
 	}
@@ -270,22 +270,22 @@ 
 	 * @param bool $hide_uncategorized
 	 * @return string
 	 */
-	public static function venue_categories( $VNU_ID = 0, $hide_uncategorized = TRUE ) {
+	public static function venue_categories($VNU_ID = 0, $hide_uncategorized = TRUE) {
 		$category_links = array();
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
 			// get category terms
-			if ( $venue_categories = get_the_terms( $venue->ID(), 'espresso_venue_categories' )) {
+			if ($venue_categories = get_the_terms($venue->ID(), 'espresso_venue_categories')) {
 				// loop thru terms and create links
-				foreach ( $venue_categories as $term ) {
-					$url = get_term_link( $term, 'espresso_venue_categories' );
-					if ( ! is_wp_error( $url ) && (( $hide_uncategorized && strtolower( $term->name ) != __( 'uncategorized', 'event_espresso' )) || ! $hide_uncategorized )) {
-						$category_links[] = '<a href="' . esc_url( $url ) . '" rel="tag">' . $term->name . '</a> ';
+				foreach ($venue_categories as $term) {
+					$url = get_term_link($term, 'espresso_venue_categories');
+					if ( ! is_wp_error($url) && (($hide_uncategorized && strtolower($term->name) != __('uncategorized', 'event_espresso')) || ! $hide_uncategorized)) {
+						$category_links[] = '<a href="'.esc_url($url).'" rel="tag">'.$term->name.'</a> ';
 					}
 				}
 			}
 		}
-		return implode( ', ', $category_links );
+		return implode(', ', $category_links);
 	}
 
 
@@ -300,10 +300,10 @@ 
 	 * @param bool $add_wrapper
 	 * @return string
 	 */
-	public static function venue_address( $type = 'multiline', $VNU_ID = 0, $use_schema = true, $add_wrapper = true ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
-			return EEH_Address::format( $venue, $type, $use_schema, $add_wrapper );
+	public static function venue_address($type = 'multiline', $VNU_ID = 0, $use_schema = true, $add_wrapper = true) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
+			return EEH_Address::format($venue, $type, $use_schema, $add_wrapper);
 		}
 		return '';
 	}
@@ -317,10 +317,10 @@ 
 	 * @param int $VNU_ID
 	 * @return bool|string
 	 */
-	public static function venue_has_address( $VNU_ID = 0 ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
-			return EEH_Address::format( $venue, 'inline', FALSE, FALSE );
+	public static function venue_has_address($VNU_ID = 0) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
+			return EEH_Address::format($venue, 'inline', FALSE, FALSE);
 		}
 		return false;
 	}
@@ -335,30 +335,30 @@ 
 	 * @param int $VNU_ID
 	 * @return string
 	 */
-	public static function venue_name( $link_to = 'details', $VNU_ID = 0 ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
+	public static function venue_name($link_to = 'details', $VNU_ID = 0) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
 			$venue_name = apply_filters(
 				'FHEE__EEH_Venue__venue_name__append_private_venue_name',
 				EEH_Venue_View::is_venue_private()
-					? EEH_Venue_View::$_venue->name() . "&nbsp;" . __( '(Private)', 'event_espresso' )
+					? EEH_Venue_View::$_venue->name()."&nbsp;".__('(Private)', 'event_espresso')
 					: EEH_Venue_View::$_venue->name(),
 				EEH_Venue_View::$_venue
 			);
-			$venue_name = EEH_Schema::name( $venue_name );
+			$venue_name = EEH_Schema::name($venue_name);
 
 			//if venue is trashed then ignore the "link to" setting because the venue is trashed.
-			if ( $venue->get('status') == 'trash' ) {
+			if ($venue->get('status') == 'trash') {
 				$link_to = '';
 			}
-			switch( $link_to ) {
+			switch ($link_to) {
 
 				case 'details' :
-					return EEH_Venue_View::venue_details_link( $venue->ID(), $venue_name );
+					return EEH_Venue_View::venue_details_link($venue->ID(), $venue_name);
 				break;
 
 				case 'website' :
-					return EEH_Venue_View::venue_website_link( $venue->ID(), $venue_name );
+					return EEH_Venue_View::venue_website_link($venue->ID(), $venue_name);
 				break;
 
 				default :
@@ -378,10 +378,10 @@ 
 	 * @param    string $text
 	 * @return string
 	 */
-	public static function venue_details_link( $VNU_ID = 0, $text = '' ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
-			return EEH_Schema::url( get_permalink( $venue->ID() ), $text );
+	public static function venue_details_link($VNU_ID = 0, $text = '') {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
+			return EEH_Schema::url(get_permalink($venue->ID()), $text);
 		}
 		return '';
 	}
@@ -396,12 +396,12 @@ 
 	 * @param    string $text
 	 * @return string
 	 */
-	public static function venue_website_link( $VNU_ID = 0, $text = '' ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
+	public static function venue_website_link($VNU_ID = 0, $text = '') {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
 			$url = $venue->venue_url();
-			$text = ! empty( $text ) ? $text : $url;
-			return ! empty( $url ) ? EEH_Schema::url( $url, $text ) : '';
+			$text = ! empty($text) ? $text : $url;
+			return ! empty($url) ? EEH_Schema::url($url, $text) : '';
 		}
 		return '';
 	}
@@ -415,10 +415,10 @@ 
 	 * @param int $VNU_ID
 	 * @return string
 	 */
-	public static function venue_phone( $VNU_ID = 0) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
-			return EEH_Schema::telephone( $venue->phone() );
+	public static function venue_phone($VNU_ID = 0) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
+			return EEH_Schema::telephone($venue->phone());
 		}
 		return '';
 	}
@@ -434,48 +434,48 @@ 
 	 * @param    array $gmap map options
 	 * @return string
 	 */
-	public static function venue_gmap( $VNU_ID = 0, $map_ID = FALSE, $gmap = array() ) {
+	public static function venue_gmap($VNU_ID = 0, $map_ID = FALSE, $gmap = array()) {
 
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
 			// check for global espresso_events post and use it's ID if no map_ID is set
 			global $post;
-			$map_ID = empty( $map_ID ) && $post->post_type == 'espresso_events' ? $post->ID : $map_ID;
+			$map_ID = empty($map_ID) && $post->post_type == 'espresso_events' ? $post->ID : $map_ID;
 			// grab map settings
 			$map_cfg = EE_Registry::instance()->CFG->map_settings;
 			// are maps enabled ?
-			if ( $map_cfg->use_google_maps && $venue->enable_for_gmap() ) {
+			if ($map_cfg->use_google_maps && $venue->enable_for_gmap()) {
 
 				$details_page = is_single();
 				$options = array();
-				$options['map_ID'] = $map_ID && $map_ID != $venue->ID() ? $map_ID . '-' . $venue->ID()/* . '-' . $static_map_id*/ : $venue->ID()/* . '-' . $static_map_id*/;
+				$options['map_ID'] = $map_ID && $map_ID != $venue->ID() ? $map_ID.'-'.$venue->ID()/* . '-' . $static_map_id*/ : $venue->ID()/* . '-' . $static_map_id*/;
 
-				$options['location'] = EEH_Address::format( $venue, 'inline', FALSE, FALSE );
+				$options['location'] = EEH_Address::format($venue, 'inline', FALSE, FALSE);
 
 				$options['ee_map_width'] = $details_page ? $map_cfg->event_details_map_width : $map_cfg->event_list_map_width;
-				$options['ee_map_width'] = isset( $gmap['ee_map_width'] ) && ! empty( $gmap['ee_map_width'] ) ? $gmap['ee_map_width'] : $options['ee_map_width'];
+				$options['ee_map_width'] = isset($gmap['ee_map_width']) && ! empty($gmap['ee_map_width']) ? $gmap['ee_map_width'] : $options['ee_map_width'];
 
 				$options['ee_map_height'] = $details_page ? $map_cfg->event_details_map_height : $map_cfg->event_list_map_height;
-				$options['ee_map_height'] = isset( $gmap['ee_map_height'] ) && ! empty( $gmap['ee_map_height'] ) ? $gmap['ee_map_height'] : $options['ee_map_height'];
+				$options['ee_map_height'] = isset($gmap['ee_map_height']) && ! empty($gmap['ee_map_height']) ? $gmap['ee_map_height'] : $options['ee_map_height'];
 
 				$options['ee_map_zoom'] = $details_page ? $map_cfg->event_details_map_zoom : $map_cfg->event_list_map_zoom;
-				$options['ee_map_zoom'] = isset( $gmap['ee_map_zoom'] ) && ! empty( $gmap['ee_map_zoom'] ) ? $gmap['ee_map_zoom'] : $options['ee_map_zoom'];
+				$options['ee_map_zoom'] = isset($gmap['ee_map_zoom']) && ! empty($gmap['ee_map_zoom']) ? $gmap['ee_map_zoom'] : $options['ee_map_zoom'];
 
 				$options['ee_map_nav_display'] = $details_page ? $map_cfg->event_details_display_nav : $map_cfg->event_list_display_nav;
-				$options['ee_map_nav_display'] = isset( $gmap['ee_map_nav_display'] ) && ! empty( $gmap['ee_map_nav_display'] ) ? 'true' : $options['ee_map_nav_display'];;
+				$options['ee_map_nav_display'] = isset($gmap['ee_map_nav_display']) && ! empty($gmap['ee_map_nav_display']) ? 'true' : $options['ee_map_nav_display']; ;
 
 				$options['ee_map_nav_size'] = $details_page ? $map_cfg->event_details_nav_size : $map_cfg->event_list_nav_size;
-				$options['ee_map_nav_size'] =  isset( $gmap['ee_map_nav_size'] ) && ! empty( $gmap['ee_map_nav_size'] )? $gmap['ee_map_nav_size'] : $options['ee_map_nav_size'];
+				$options['ee_map_nav_size'] = isset($gmap['ee_map_nav_size']) && ! empty($gmap['ee_map_nav_size']) ? $gmap['ee_map_nav_size'] : $options['ee_map_nav_size'];
 
 				$options['ee_map_type_control'] = $details_page ? $map_cfg->event_details_control_type : $map_cfg->event_list_control_type;
-				$options['ee_map_type_control'] =  isset( $gmap['ee_map_type_control'] ) && ! empty( $gmap['ee_map_type_control'] )? $gmap['ee_map_type_control'] : $options['ee_map_type_control'];
+				$options['ee_map_type_control'] = isset($gmap['ee_map_type_control']) && ! empty($gmap['ee_map_type_control']) ? $gmap['ee_map_type_control'] : $options['ee_map_type_control'];
 
 				$options['ee_map_align'] = $details_page ? $map_cfg->event_details_map_align : $map_cfg->event_list_map_align;
-				$options['ee_map_align'] =  isset( $gmap['ee_map_align'] ) && ! empty( $gmap['ee_map_align'] )? $gmap['ee_map_align'] : $options['ee_map_align'];
+				$options['ee_map_align'] = isset($gmap['ee_map_align']) && ! empty($gmap['ee_map_align']) ? $gmap['ee_map_align'] : $options['ee_map_align'];
 
-				$options['ee_static_url'] =  isset( $gmap['ee_static_url'] ) && ! empty( $gmap['ee_static_url'] ) ? (bool)absint( $gmap['ee_static_url'] ) : $venue->google_map_link();
+				$options['ee_static_url'] = isset($gmap['ee_static_url']) && ! empty($gmap['ee_static_url']) ? (bool) absint($gmap['ee_static_url']) : $venue->google_map_link();
 
-				return EEH_Maps::google_map( $options );
+				return EEH_Maps::google_map($options);
 
 			}
 		}
@@ -490,7 +490,7 @@ 
 	 * @param array $atts like EEH_Maps::google_map_link
 	 * @return string
 	 */
-	public static function espresso_google_static_map( EE_Venue $venue, $atts = array() ){
+	public static function espresso_google_static_map(EE_Venue $venue, $atts = array()) {
 		$state = $venue->state_obj();
 		$country = $venue->country_obj();
 		$atts = shortcode_atts(
@@ -521,23 +521,23 @@ 
 	 * @param string $after
 	 * @return string
 	 */
-	public static function edit_venue_link( $VNU_ID = 0, $link = '', $before = '<p class="edit-venue-lnk small-txt">', $after = '</p>' ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
+	public static function edit_venue_link($VNU_ID = 0, $link = '', $before = '<p class="edit-venue-lnk small-txt">', $after = '</p>') {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
 			// can the user edit this post ?
-			if ( current_user_can( 'edit_post', $venue->ID() )) {
+			if (current_user_can('edit_post', $venue->ID())) {
 				// set link text
-				$link = ! empty( $link ) ? $link : __('edit this venue');
+				$link = ! empty($link) ? $link : __('edit this venue');
 				// generate nonce
-				$nonce = wp_create_nonce( 'edit_nonce' );
+				$nonce = wp_create_nonce('edit_nonce');
 				// generate url to venue editor for this venue
-				$url = add_query_arg( array( 'page' => 'espresso_venues', 'action' => 'edit', 'post' => $venue->ID(), 'edit_nonce' => $nonce ), admin_url( 'admin.php' ) );
+				$url = add_query_arg(array('page' => 'espresso_venues', 'action' => 'edit', 'post' => $venue->ID(), 'edit_nonce' => $nonce), admin_url('admin.php'));
 				// get edit CPT text
-				$post_type_obj = get_post_type_object( 'espresso_venues' );
+				$post_type_obj = get_post_type_object('espresso_venues');
 				// build final link html
-				$link = '<a class="post-edit-link" href="' . $url . '" title="' . esc_attr( $post_type_obj->labels->edit_item ) . '">' . $link . '</a>';
+				$link = '<a class="post-edit-link" href="'.$url.'" title="'.esc_attr($post_type_obj->labels->edit_item).'">'.$link.'</a>';
 				// put it all together
-				return $before . apply_filters( 'edit_post_link', $link, $venue->ID() ) . $after;
+				return $before.apply_filters('edit_post_link', $link, $venue->ID()).$after;
 			}
 		}
 		return '';

Indentation -1 removed lines

@@ -208,7 +208,6 @@
 	/**
 	 * If a venue is password protected, this will return the password form for gaining access
 	 * returns an empty string otherwise
-
 	 * @param bool $VNU_ID venue to check (optional). If not included will use internally derived venue object.
 	 *
 	 * @return string

Braces +3 added lines, -1 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
  *

modules/venue_single/EED_Venue_Single.module.php

Spacing +27 added lines, -27 removed lines

@@ -27,7 +27,7 @@ 
 	 * @return EED_Venue_Single
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 	/**
@@ -37,7 +37,7 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-		EE_Config::register_route( 'venue', 'Venue_Single', 'run' );
+		EE_Config::register_route('venue', 'Venue_Single', 'run');
 //		EE_Config::register_view( 'venue', 0, EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'single-espresso_venues.php' );
 	}
 
@@ -58,10 +58,10 @@ 
 	 * @access    public
 	 * @param \WP $WP
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 		// check what template is loaded
-		add_filter( 'template_include',  array( $this, 'template_include' ), 999, 1 );
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 10 );
+		add_filter('template_include', array($this, 'template_include'), 999, 1);
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
 	}
 
 
@@ -73,15 +73,15 @@ 
 	 * @param  string $template
 	 * @return string
 	 */
-	public function template_include( $template ) {
+	public function template_include($template) {
 		// not a custom template?
-		if ( EE_Registry::instance()->load_core( 'Front_Controller', array(), false, true )->get_selected_template() != 'single-espresso_venues.php' ) {
+		if (EE_Registry::instance()->load_core('Front_Controller', array(), false, true)->get_selected_template() != 'single-espresso_venues.php') {
 			EEH_Template::load_espresso_theme_functions();
 			// then add extra event data via hooks
-			add_filter( 'the_title', array( $this, 'the_title' ), 100, 1 );
-			add_filter( 'the_content', array( $this, 'venue_details' ), 100 );
+			add_filter('the_title', array($this, 'the_title'), 100, 1);
+			add_filter('the_content', array($this, 'venue_details'), 100);
 			// don't display entry meta because the existing theme will take car of that
-			add_filter( 'FHEE__content_espresso_venues_details_template__display_entry_meta', '__return_false' );
+			add_filter('FHEE__content_espresso_venues_details_template__display_entry_meta', '__return_false');
 		}
 		return $template;
 	}
@@ -95,7 +95,7 @@ 
 	 * @param  string $title
 	 * @return string
 	 */
-	public function the_title( $title = '' ) {
+	public function the_title($title = '') {
 		return $title;
 	}
 
@@ -107,7 +107,7 @@ 
 	 * @param  string $content
 	 * @return string
 	 */
-	public function venue_details( $content ) {
+	public function venue_details($content) {
 		global $post;
 		if (
 			$post->post_type == 'espresso_venues'
@@ -117,16 +117,16 @@ 
 			// it uses the_content() for displaying the $post->post_content
 			// so in order to load a template that uses the_content() from within a callback being used to filter the_content(),
 			// we need to first remove this callback from being applied to the_content() (otherwise it will recurse and blow up the interweb)
-			remove_filter( 'the_content', array( $this, 'venue_details' ), 100 );
+			remove_filter('the_content', array($this, 'venue_details'), 100);
 			// add filters we want
-			add_filter( 'the_content', array( $this, 'venue_location' ), 110 );
+			add_filter('the_content', array($this, 'venue_location'), 110);
 			// now load our template
-			$template = EEH_Template::locate_template( 'content-espresso_venues-details.php' );
+			$template = EEH_Template::locate_template('content-espresso_venues-details.php');
 			// remove other filters we added so they won't get applied to the next post
-			remove_filter( 'the_content', array( $this, 'venue_location' ), 110 );
+			remove_filter('the_content', array($this, 'venue_location'), 110);
 		}
 		// we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
-		return ! empty( $template ) ? $template : $content;
+		return ! empty($template) ? $template : $content;
 	}
 
 
@@ -138,8 +138,8 @@ 
 	 * @param  string $content
 	 * @return string
 	 */
-	public function venue_location( $content ) {
-		return $content . EEH_Template::locate_template( 'content-espresso_venues-location.php' );
+	public function venue_location($content) {
+		return $content.EEH_Template::locate_template('content-espresso_venues-location.php');
 	}
 
 
@@ -152,16 +152,16 @@ 
 	 */
 	public function wp_enqueue_scripts() {
 		// get some style
-		if ( apply_filters( 'FHEE_enable_default_espresso_css', TRUE ) && is_single() ) {
+		if (apply_filters('FHEE_enable_default_espresso_css', TRUE) && is_single()) {
 			// first check theme folder
-			if ( is_readable( get_stylesheet_directory() . $this->theme . DS . 'style.css' )) {
-				wp_register_style( $this->theme, get_stylesheet_directory_uri() . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ) );
-			} else if ( is_readable( EE_TEMPLATES . $this->theme . DS . 'style.css' )) {
-				wp_register_style( $this->theme, EE_TEMPLATES_URL . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ) );
+			if (is_readable(get_stylesheet_directory().$this->theme.DS.'style.css')) {
+				wp_register_style($this->theme, get_stylesheet_directory_uri().$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
+			} else if (is_readable(EE_TEMPLATES.$this->theme.DS.'style.css')) {
+				wp_register_style($this->theme, EE_TEMPLATES_URL.$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
 			}
-			wp_enqueue_style( $this->theme );
-			if ( EE_Registry::instance()->CFG->map_settings->use_google_maps ) {
-				add_action('wp_enqueue_scripts', array( 'EEH_Maps', 'espresso_google_map_js' ), 11 );
+			wp_enqueue_style($this->theme);
+			if (EE_Registry::instance()->CFG->map_settings->use_google_maps) {
+				add_action('wp_enqueue_scripts', array('EEH_Maps', 'espresso_google_map_js'), 11);
 			}
 		}
 	}

Braces +3 added lines, -1 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
  *

modules/venues_archive/EED_Venues_Archive.module.php

Spacing +31 added lines, -31 removed lines

@@ -27,7 +27,7 @@ 
 	 * @return EED_Venues_Archive
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 	/**
@@ -37,7 +37,7 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-		EE_Config::register_route( 'venues', 'Venues_Archive', 'run' );
+		EE_Config::register_route('venues', 'Venues_Archive', 'run');
 //		EE_Config::register_view( 'venues', 0, EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_venues.php' );
 	}
 
@@ -58,10 +58,10 @@ 
 	 * @access    public
 	 * @param \WP $WP
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 		// check what template is loaded
-		add_filter( 'template_include',  array( $this, 'template_include' ), 999, 1 );
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 10 );
+		add_filter('template_include', array($this, 'template_include'), 999, 1);
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
 	}
 
 
@@ -73,18 +73,18 @@ 
 	 * @param  string $template
 	 * @return string
 	 */
-	public function template_include( $template ) {
+	public function template_include($template) {
 		// not a custom template?
-		if ( EE_Registry::instance()->load_core( 'Front_Controller', array(), false, true )->get_selected_template() != 'archive-espresso_venues.php' ) {
+		if (EE_Registry::instance()->load_core('Front_Controller', array(), false, true)->get_selected_template() != 'archive-espresso_venues.php') {
 			EEH_Template::load_espresso_theme_functions();
 			// then add extra event data via hooks
-			add_filter( 'the_title', array( $this, 'the_title' ), 100, 1 );
+			add_filter('the_title', array($this, 'the_title'), 100, 1);
 			// don't know if theme uses the_excerpt
-			add_filter( 'the_excerpt', array( $this, 'venue_details' ), 100 );
+			add_filter('the_excerpt', array($this, 'venue_details'), 100);
 			// or the_content
-			add_filter( 'the_content', array( $this, 'venue_details' ), 100 );
+			add_filter('the_content', array($this, 'venue_details'), 100);
 			// don't display entry meta because the existing theme will take care of that
-			add_filter( 'FHEE__content_espresso_venues_details_template__display_entry_meta', '__return_false' );
+			add_filter('FHEE__content_espresso_venues_details_template__display_entry_meta', '__return_false');
 		}
 		return $template;
 	}
@@ -98,7 +98,7 @@ 
 	 * @param  string $title
 	 * @return string
 	 */
-	public function the_title( $title = '' ) {
+	public function the_title($title = '') {
 		return $title;
 	}
 
@@ -110,7 +110,7 @@ 
 	 * @param  string $content
 	 * @return string
 	 */
-	public function venue_details( $content ) {
+	public function venue_details($content) {
 		global $post;
 		if (
 			$post->post_type == 'espresso_venues'
@@ -120,22 +120,22 @@ 
 			// it uses the_content() for displaying the $post->post_content
 			// so in order to load a template that uses the_content() from within a callback being used to filter the_content(),
 			// we need to first remove this callback from being applied to the_content() (otherwise it will recurse and blow up the interweb)
-			remove_filter( 'the_excerpt', array( $this, 'venue_details' ), 100 );
-			remove_filter( 'the_content', array( $this, 'venue_details' ), 100 );
+			remove_filter('the_excerpt', array($this, 'venue_details'), 100);
+			remove_filter('the_content', array($this, 'venue_details'), 100);
 			// add filters we want
-			add_filter( 'the_content', array( $this, 'venue_location' ), 110 );
-			add_filter( 'the_excerpt', array( $this, 'venue_location' ), 110 );
+			add_filter('the_content', array($this, 'venue_location'), 110);
+			add_filter('the_excerpt', array($this, 'venue_location'), 110);
 			// now load our template
-			$template = EEH_Template::locate_template( 'content-espresso_venues-details.php' );
+			$template = EEH_Template::locate_template('content-espresso_venues-details.php');
 			//now add our filter back in, plus some others
-			add_filter( 'the_excerpt', array( $this, 'venue_details' ), 100 );
-			add_filter( 'the_content', array( $this, 'venue_details' ), 100 );
+			add_filter('the_excerpt', array($this, 'venue_details'), 100);
+			add_filter('the_content', array($this, 'venue_details'), 100);
 			// remove other filters we added so they won't get applied to the next post
-			remove_filter( 'the_content', array( $this, 'venue_location' ), 110 );
-			remove_filter( 'the_excerpt', array( $this, 'venue_location' ), 110 );
+			remove_filter('the_content', array($this, 'venue_location'), 110);
+			remove_filter('the_excerpt', array($this, 'venue_location'), 110);
 			// we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
 		}
-		return ! empty( $template ) ? $template : $content;
+		return ! empty($template) ? $template : $content;
 	}
 
 
@@ -147,8 +147,8 @@ 
 	 * @param  string $content
 	 * @return string
 	 */
-	public function venue_location( $content ) {
-		return $content . EEH_Template::locate_template( 'content-espresso_venues-location.php' );
+	public function venue_location($content) {
+		return $content.EEH_Template::locate_template('content-espresso_venues-location.php');
 	}
 
 
@@ -162,14 +162,14 @@ 
 	 */
 	public function wp_enqueue_scripts() {
 		// get some style
-		if ( apply_filters( 'FHEE_enable_default_espresso_css', TRUE ) && is_archive() ) {
+		if (apply_filters('FHEE_enable_default_espresso_css', TRUE) && is_archive()) {
 			// first check theme folder
-			if ( is_readable( get_stylesheet_directory() . $this->theme . DS . 'style.css' )) {
-				wp_register_style( $this->theme, get_stylesheet_directory_uri() . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ) );
-			} else if ( is_readable( EE_TEMPLATES . $this->theme . DS . 'style.css' )) {
-				wp_register_style( $this->theme, EE_TEMPLATES_URL . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ) );
+			if (is_readable(get_stylesheet_directory().$this->theme.DS.'style.css')) {
+				wp_register_style($this->theme, get_stylesheet_directory_uri().$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
+			} else if (is_readable(EE_TEMPLATES.$this->theme.DS.'style.css')) {
+				wp_register_style($this->theme, EE_TEMPLATES_URL.$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
 			}
-			wp_enqueue_style( $this->theme );
+			wp_enqueue_style($this->theme);
 		}
 	}
 

Braces +3 added lines, -1 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
  *

caffeinated/payment_methods/Aim/help_tabs/payment_methods_overview_aim.help_tab.php

Spacing +5 added lines, -5 removed lines

@@ -3,7 +3,7 @@ 
 <?php _e('Adjust the settings for the Authorize.net AIM payment gateway.', 'event_espresso'); ?>
 </p>
 <p>
-<?php printf( __( 'See %1$shere%2$s for list of currencies supported by Authorize.net AIM.', 'event_espresso' ), "<a href='http://www.authorize.net/international/'  target='_blank'>","</a>" ); ?>
+<?php printf(__('See %1$shere%2$s for list of currencies supported by Authorize.net AIM.', 'event_espresso'), "<a href='http://www.authorize.net/international/'  target='_blank'>", "</a>"); ?>
 </p>
 <p><strong><?php _e('Authorize.net AIM Settings', 'event_espresso'); ?></strong></p>
 <ul>
@@ -28,16 +28,16 @@ 
 <?php _e('By logging into Authorize.net, you can change which payment fields are required by Authorize.net when processing payments. These settings affect both the Advanced Integration Method (AIM, this) and the Simple Integration Method (SIM, different). The payment method settings "Excluded Payment Form Fields" and "Required Payment Form Fields" allow you to change the billing form in Event Espresso to reflect your payment form settings in Authorize.net.', 'event_espresso'); ?>
 <br>
 <?php printf( 
-		__( 'To change your payment form settings in Authorize.net, %1$slog in to authorize.net%2$s, go to %3$sAccount then Payment Form%2$s, then %4$sForm Fields%2$s. It will look similar to %5$sthis%2$s. If you make a field required in Authorize.net, you should also make it required in Event Espresso. If it isn\'t required in Authorize.net, and you want to simplify the billing form in Event Espresso, you can exclude it from the Event Espresso Form too.'),
+		__('To change your payment form settings in Authorize.net, %1$slog in to authorize.net%2$s, go to %3$sAccount then Payment Form%2$s, then %4$sForm Fields%2$s. It will look similar to %5$sthis%2$s. If you make a field required in Authorize.net, you should also make it required in Event Espresso. If it isn\'t required in Authorize.net, and you want to simplify the billing form in Event Espresso, you can exclude it from the Event Espresso Form too.'),
 		'<a href="http://authorize.net" target="_blank">',
 		'</a>',
 		'<a href="https://monosnap.com/file/nebVteOkEXcdDIos88SojStWOifP23" target="_blank">',
 		'<a href="https://monosnap.com/file/WyxGJtev87TcDmdGBEZ2oi1xaBIQAm" target="_blank">',
-		'<a href="https://monosnap.com/image/DbCJNfEesWXeSNUs1wLIpGYODFw52m" target="_blank">');?>
+		'<a href="https://monosnap.com/image/DbCJNfEesWXeSNUs1wLIpGYODFw52m" target="_blank">'); ?>
 </li>
 <li>
-	<strong><?php _e( 'Server', 'event_espresso');?></strong>
-	<?php _e( 'Use this setting to change the server where Authorize.net AIM requests are sent. Change this to "Authorize.net/Akamai" before June 30th 2016 to verify your server wil work with Authorize.net\'s servers which will be in use after that date.', 'event_espresso' );?>
+	<strong><?php _e('Server', 'event_espresso'); ?></strong>
+	<?php _e('Use this setting to change the server where Authorize.net AIM requests are sent. Change this to "Authorize.net/Akamai" before June 30th 2016 to verify your server wil work with Authorize.net\'s servers which will be in use after that date.', 'event_espresso'); ?>
 </li>
 <li>
 <strong><?php _e('Button Image URL', 'event_espresso'); ?></strong><br />

core/CPTs/EE_CPT_Default_Strategy.core.php

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -35,8 +35,8 @@ 
 	 * @param    array $arguments
 	 * @return    \EE_CPT_Default_Strategy
 	 */
-	public function __construct( $arguments = array() ) {
-		$this->CPT = isset( $arguments['CPT'] ) ? $arguments['CPT'] : null;
+	public function __construct($arguments = array()) {
+		$this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : null;
 		// $WP_Query = isset( $arguments['WP_Query'] ) ? $arguments['WP_Query'] : null;
 		//EEH_Debug_Tools::printr( $this->CPT, '$this->CPT  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 //		add_filter( 'pre_get_posts', array( $this, 'pre_get_posts' ), 999 );
@@ -52,9 +52,9 @@ 
 	 * @param    \WP_Query $WP_Query
 	 * @return    \WP_Query
 	 */
-	public function pre_get_posts( WP_Query $WP_Query ) {
+	public function pre_get_posts(WP_Query $WP_Query) {
 		//EEH_Debug_Tools::printr( $WP_Query, '$WP_Query  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		if ( ! $WP_Query->is_main_query() && ! $WP_Query->is_archive() ) {
+		if ( ! $WP_Query->is_main_query() && ! $WP_Query->is_archive()) {
 			return $WP_Query;
 		}
 //		$WP_Query->set( 'post_type', array( $this->CPT['post_type'] ));
@@ -72,7 +72,7 @@ 
 	 * @param    \WP_Query  $WP_Query
 	 * @return    \WP_Post[]
 	 */
-	public function the_posts( $posts, WP_Query $WP_Query ) {
+	public function the_posts($posts, WP_Query $WP_Query) {
 		return $posts;
 	}
 
@@ -88,7 +88,7 @@ 
 	 * @param    string $single
 	 * @return    mixed
 	 */
-	public function get_EE_post_type_metadata( $meta_value = null, $post_id, $meta_key, $single ) {
+	public function get_EE_post_type_metadata($meta_value = null, $post_id, $meta_key, $single) {
 		return $meta_value;
 	}
 

core/CPTs/CptQueryModifier.php

Indentation +8 added lines, -8 removed lines

@@ -447,14 +447,14 @@
 			global $wpdb;
 			// adds something like " LEFT JOIN wp_esp_event_meta ON ( wp_esp_event_meta.EVT_ID = wp_posts.ID ) " to WP Query JOIN statement
 			$SQL .= ' LEFT JOIN '
-			        . $this->meta_table->get_table_name()
-			        . ' ON ( '
-			        . $this->meta_table->get_table_name()
-			        . '.'
-			        . $this->meta_table->get_fk_on_table()
-			        . ' = '
-			        . $wpdb->posts
-			        . '.ID ) ';
+					. $this->meta_table->get_table_name()
+					. ' ON ( '
+					. $this->meta_table->get_table_name()
+					. '.'
+					. $this->meta_table->get_fk_on_table()
+					. ' = '
+					. $wpdb->posts
+					. '.ID ) ';
 		}
 		remove_filter( 'posts_join', array( $this, 'postsJoin' ) );
 		return $SQL;

Spacing +81 added lines, -81 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\CPTs;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -80,10 +80,10 @@ 
 		\WP_Query $WP_Query,
 		\EE_Request_Handler $request
 	) {
-		$this->setRequest( $request );
-		$this->setWpQuery( $WP_Query );
-		$this->setPostType( $post_type );
-		$this->setCptDetails( $cpt_details );
+		$this->setRequest($request);
+		$this->setWpQuery($WP_Query);
+		$this->setPostType($post_type);
+		$this->setCptDetails($cpt_details);
 		$this->init();
 	}
 
@@ -101,7 +101,7 @@ 
 	/**
 	 * @param string $post_type
 	 */
-	protected function setPostType( $post_type ) {
+	protected function setPostType($post_type) {
 		$this->post_type = $post_type;
 	}
 
@@ -119,7 +119,7 @@ 
 	/**
 	 * @param array $cpt_details
 	 */
-	protected function setCptDetails( $cpt_details ) {
+	protected function setCptDetails($cpt_details) {
 		$this->cpt_details = $cpt_details;
 	}
 
@@ -137,7 +137,7 @@ 
 	/**
 	 * @param \EE_Table_Base[] $model_tables
 	 */
-	protected function setModelTables( $model_tables ) {
+	protected function setModelTables($model_tables) {
 		$this->model_tables = $model_tables;
 	}
 
@@ -147,7 +147,7 @@ 
 	 * @return array
 	 */
 	public function taxonomies() {
-		if ( empty( $this->taxonomies ) ) {
+		if (empty($this->taxonomies)) {
 			$this->initializeTaxonomies();
 		}
 		return $this->taxonomies;
@@ -158,7 +158,7 @@ 
 	/**
 	 * @param array $taxonomies
 	 */
-	protected function setTaxonomies( array $taxonomies ) {
+	protected function setTaxonomies(array $taxonomies) {
 		$this->taxonomies = $taxonomies;
 	}
 
@@ -176,7 +176,7 @@ 
 	/**
 	 * @param \EE_Secondary_Table $meta_table
 	 */
-	public function setMetaTable( \EE_Secondary_Table $meta_table ) {
+	public function setMetaTable(\EE_Secondary_Table $meta_table) {
 		$this->meta_table = $meta_table;
 	}
 
@@ -194,7 +194,7 @@ 
 	/**
 	 * @param \EEM_Base $CPT_model
 	 */
-	protected function setModel( \EEM_Base $CPT_model ) {
+	protected function setModel(\EEM_Base $CPT_model) {
 		$this->model = $CPT_model;
 	}
 
@@ -212,7 +212,7 @@ 
 	/**
 	 * @param \EE_Request_Handler $request
 	 */
-	protected function setRequest( \EE_Request_Handler $request ) {
+	protected function setRequest(\EE_Request_Handler $request) {
 		$this->request = $request;
 	}
 
@@ -230,7 +230,7 @@ 
 	/**
 	 * @param \WP_Query $wp_query
 	 */
-	public function setWpQuery( \WP_Query $wp_query ) {
+	public function setWpQuery(\WP_Query $wp_query) {
 		$this->wp_query = $wp_query;
 	}
 
@@ -245,22 +245,22 @@ 
 	protected function initializeTaxonomies() {
 		// check if taxonomies have already been set and that this CPT has taxonomies registered for it
 		if (
-			empty( $this->taxonomies )
-			&& isset( $this->cpt_details['args'], $this->cpt_details['args']['taxonomies'] )
+			empty($this->taxonomies)
+			&& isset($this->cpt_details['args'], $this->cpt_details['args']['taxonomies'])
 		) {
 			// if so then grab them, but we want the taxonomy name as the key
-			$taxonomies = array_flip( $this->cpt_details['args']['taxonomies'] );
+			$taxonomies = array_flip($this->cpt_details['args']['taxonomies']);
 			// then grab the list of ALL taxonomies
 			$all_taxonomies = \EE_Register_CPTs::get_taxonomies();
-			foreach ( $taxonomies as $taxonomy => &$details ) {
+			foreach ($taxonomies as $taxonomy => &$details) {
 				// add details to our taxonomies if they exist
-				$details = isset( $all_taxonomies[ $taxonomy ] )
-					? $all_taxonomies[ $taxonomy ]
+				$details = isset($all_taxonomies[$taxonomy])
+					? $all_taxonomies[$taxonomy]
 					: array();
 			}
 			// ALWAYS unset() variables that were passed by reference
-			unset( $details );
-			$this->setTaxonomies( $taxonomies );
+			unset($details);
+			$this->setTaxonomies($taxonomies);
 		}
 	}
 
@@ -270,11 +270,11 @@ 
 		$this->setAdditionalCptDetails();
 		$this->setRequestVarsIfCpt();
 		// convert post_type to model name
-		$model_name = str_replace( 'EE_', '', $this->cpt_details['class_name'] );
+		$model_name = str_replace('EE_', '', $this->cpt_details['class_name']);
 		// load all tables related to CPT
-		$this->setupModelsAndTables( $model_name );
+		$this->setupModelsAndTables($model_name);
 		// load and instantiate CPT_*_Strategy
-		$CPT_Strategy = $this->cptStrategyClass( $model_name );
+		$CPT_Strategy = $this->cptStrategyClass($model_name);
 		// !!!!!!!!!!  IMPORTANT !!!!!!!!!!!!
 		// here's the list of available filters in the WP_Query object
 		// 'posts_where_paged'
@@ -285,17 +285,17 @@ 
 		// 'post_limits'
 		// 'posts_fields'
 		// 'posts_join'
-		add_filter( 'posts_fields', array( $this, 'postsFields' ) );
-		add_filter( 'posts_join', array( $this, 'postsJoin' ) );
+		add_filter('posts_fields', array($this, 'postsFields'));
+		add_filter('posts_join', array($this, 'postsJoin'));
 		add_filter(
-			'get_' . $this->post_type . '_metadata',
-			array( $CPT_Strategy, 'get_EE_post_type_metadata' ),
+			'get_'.$this->post_type.'_metadata',
+			array($CPT_Strategy, 'get_EE_post_type_metadata'),
 			1,
 			4
 		);
-		add_filter( 'the_posts', array( $this, 'thePosts' ), 1, 1 );
-		if ( $this->wp_query->is_main_query() ) {
-			add_filter( 'get_edit_post_link', array( $this, 'getEditPostLink' ), 10, 2 );
+		add_filter('the_posts', array($this, 'thePosts'), 1, 1);
+		if ($this->wp_query->is_main_query()) {
+			add_filter('get_edit_post_link', array($this, 'getEditPostLink'), 10, 2);
 			$this->addTemplateFilters();
 		}
 	}
@@ -312,18 +312,18 @@ 
 		// the post or category or term that is triggering EE
 		$this->cpt_details['espresso_page'] = $this->request->is_espresso_page();
 		// requested post name
-		$this->cpt_details['post_name'] = $this->request->get( 'post_name' );
+		$this->cpt_details['post_name'] = $this->request->get('post_name');
 		// add support for viewing 'private', 'draft', or 'pending' posts
 		if (
-			isset( $this->wp_query->query_vars['p'] )
+			isset($this->wp_query->query_vars['p'])
 			&& $this->wp_query->query_vars['p'] !== 0
 			&& is_user_logged_in()
-			&& current_user_can( 'edit_post', $this->wp_query->query_vars['p'] )
+			&& current_user_can('edit_post', $this->wp_query->query_vars['p'])
 		) {
 			// we can just inject directly into the WP_Query object
-			$this->wp_query->query['post_status'] = array( 'publish', 'private', 'draft', 'pending' );
+			$this->wp_query->query['post_status'] = array('publish', 'private', 'draft', 'pending');
 			// now set the main 'ee' request var so that the appropriate module can load the appropriate template(s)
-			$this->request->set( 'ee', $this->cpt_details['singular_slug'] );
+			$this->request->set('ee', $this->cpt_details['singular_slug']);
 		}
 	}
 
@@ -340,15 +340,15 @@ 
 	 */
 	public function setRequestVarsIfCpt() {
 		// check if ee action var has been set
-		if ( ! $this->request->is_set( 'ee' ) ) {
+		if ( ! $this->request->is_set('ee')) {
 			// check that route exists for CPT archive slug
-			if ( is_archive() && \EE_Config::get_route( $this->cpt_details['plural_slug'] ) ) {
+			if (is_archive() && \EE_Config::get_route($this->cpt_details['plural_slug'])) {
 				// ie: set "ee" to "events"
-				$this->request->set( 'ee', $this->cpt_details['plural_slug'] );
+				$this->request->set('ee', $this->cpt_details['plural_slug']);
 				// or does it match a single page CPT like /event/
-			} else if ( is_single() && \EE_Config::get_route( $this->cpt_details['singular_slug'] ) ) {
+			} else if (is_single() && \EE_Config::get_route($this->cpt_details['singular_slug'])) {
 				// ie: set "ee" to "event"
-				$this->request->set( 'ee', $this->cpt_details['singular_slug'] );
+				$this->request->set('ee', $this->cpt_details['singular_slug']);
 			}
 		}
 	}
@@ -362,11 +362,11 @@ 
 	 * @param string $model_name
 	 * @throws \EE_Error
 	 */
-	protected function setupModelsAndTables( $model_name ) {
+	protected function setupModelsAndTables($model_name) {
 		// get CPT table data via CPT Model
-		$model = \EE_Registry::instance()->load_model( $model_name );
-		if ( ! $model instanceof \EEM_Base ) {
-			throw new \EE_Error (
+		$model = \EE_Registry::instance()->load_model($model_name);
+		if ( ! $model instanceof \EEM_Base) {
+			throw new \EE_Error(
 				sprintf(
 					__(
 						'The "%1$s" model could not be loaded.',
@@ -376,14 +376,14 @@ 
 				)
 			);
 		}
-		$this->setModel( $model );
-		$this->setModelTables( $this->model->get_tables() );
+		$this->setModel($model);
+		$this->setModelTables($this->model->get_tables());
 		// is there a Meta Table for this CPT?
 		if (
-			isset( $this->cpt_details['tables'][ $model_name . '_Meta' ] )
-			&& $this->cpt_details['tables'][ $model_name . '_Meta' ] instanceof \EE_Secondary_Table
+			isset($this->cpt_details['tables'][$model_name.'_Meta'])
+			&& $this->cpt_details['tables'][$model_name.'_Meta'] instanceof \EE_Secondary_Table
 		) {
-			$this->setMetaTable( $this->cpt_details['tables'][ $model_name . '_Meta' ] );
+			$this->setMetaTable($this->cpt_details['tables'][$model_name.'_Meta']);
 		}
 	}
 
@@ -396,18 +396,18 @@ 
 	 * @param  string $model_name
 	 * @return string
 	 */
-	protected function cptStrategyClass( $model_name ) {
+	protected function cptStrategyClass($model_name) {
 		// creates classname like:  CPT_Event_Strategy
-		$CPT_Strategy_class_name = 'CPT_' . $model_name . '_Strategy';
+		$CPT_Strategy_class_name = 'CPT_'.$model_name.'_Strategy';
 		// load and instantiate
 		$CPT_Strategy = \EE_Registry::instance()->load_core(
 			$CPT_Strategy_class_name,
-			array( 'WP_Query' => $this->wp_query, 'CPT' => $this->cpt_details )
+			array('WP_Query' => $this->wp_query, 'CPT' => $this->cpt_details)
 		);
-		if ( $CPT_Strategy === null ) {
+		if ($CPT_Strategy === null) {
 			$CPT_Strategy = \EE_Registry::instance()->load_core(
 				'CPT_Default_Strategy',
-				array( 'WP_Query' => $this->wp_query, 'CPT' => $this->cpt_details )
+				array('WP_Query' => $this->wp_query, 'CPT' => $this->cpt_details)
 			);
 		}
 		return $CPT_Strategy;
@@ -422,13 +422,13 @@ 
 	 * @param  $SQL
 	 * @return string
 	 */
-	public function postsFields( $SQL ) {
+	public function postsFields($SQL) {
 		// does this CPT have a meta table ?
-		if ( $this->meta_table instanceof \EE_Secondary_Table ) {
+		if ($this->meta_table instanceof \EE_Secondary_Table) {
 			// adds something like ", wp_esp_event_meta.* " to WP Query SELECT statement
-			$SQL .= ', ' . $this->meta_table->get_table_name() . '.* ';
+			$SQL .= ', '.$this->meta_table->get_table_name().'.* ';
 		}
-		remove_filter( 'posts_fields', array( $this, 'postsFields' ) );
+		remove_filter('posts_fields', array($this, 'postsFields'));
 		return $SQL;
 	}
 
@@ -441,9 +441,9 @@ 
 	 * @param  $SQL
 	 * @return string
 	 */
-	public function postsJoin( $SQL ) {
+	public function postsJoin($SQL) {
 		// does this CPT have a meta table ?
-		if ( $this->meta_table instanceof \EE_Secondary_Table ) {
+		if ($this->meta_table instanceof \EE_Secondary_Table) {
 			global $wpdb;
 			// adds something like " LEFT JOIN wp_esp_event_meta ON ( wp_esp_event_meta.EVT_ID = wp_posts.ID ) " to WP Query JOIN statement
 			$SQL .= ' LEFT JOIN '
@@ -456,7 +456,7 @@ 
 			        . $wpdb->posts
 			        . '.ID ) ';
 		}
-		remove_filter( 'posts_join', array( $this, 'postsJoin' ) );
+		remove_filter('posts_join', array($this, 'postsJoin'));
 		return $SQL;
 	}
 
@@ -469,17 +469,17 @@ 
 	 * @param  \WP_Post[] $posts
 	 * @return \WP_Post[]
 	 */
-	public function thePosts( $posts ) {
+	public function thePosts($posts) {
 		$CPT_class = $this->cpt_details['class_name'];
 		// loop thru posts
-		if ( is_array( $posts ) && $this->model instanceof \EEM_CPT_Base ) {
-			foreach ( $posts as $key => $post ) {
-				if ( $post->post_type === $this->post_type ) {
-					$post->{$CPT_class} = $this->model->instantiate_class_from_post_object( $post );
+		if (is_array($posts) && $this->model instanceof \EEM_CPT_Base) {
+			foreach ($posts as $key => $post) {
+				if ($post->post_type === $this->post_type) {
+					$post->{$CPT_class} = $this->model->instantiate_class_from_post_object($post);
 				}
 			}
 		}
-		remove_filter( 'the_posts', array( $this, 'thePosts' ), 1 );
+		remove_filter('the_posts', array($this, 'thePosts'), 1);
 		return $posts;
 	}
 
@@ -490,7 +490,7 @@ 
 	 * @param $ID
 	 * @return string
 	 */
-	public function getEditPostLink( $url, $ID ) {
+	public function getEditPostLink($url, $ID) {
 		// need to make sure we only edit links if our cpt
 		global $post;
 		//notice if the cpt is registered with `show_ee_ui` set to false, we take that to mean that the WordPress core ui
@@ -499,7 +499,7 @@ 
 			! $post instanceof \WP_Post
 			|| $post->post_type !== $this->post_type
 			|| (
-				isset( $this->cpt_details['args']['show_ee_ui'] )
+				isset($this->cpt_details['args']['show_ee_ui'])
 				&& ! $this->cpt_details['args']['show_ee_ui']
 			)
 		) {
@@ -508,8 +508,8 @@ 
 		//k made it here so all is good.
 		return wp_nonce_url(
 			add_query_arg(
-				array( 'page' => $this->post_type, 'post' => $ID, 'action' => 'edit' ),
-				admin_url( 'admin.php' )
+				array('page' => $this->post_type, 'post' => $ID, 'action' => 'edit'),
+				admin_url('admin.php')
 			),
 			'edit',
 			'edit_nonce'
@@ -526,9 +526,9 @@ 
 	 */
 	public function addTemplateFilters() {
 		// if requested cpt supports page_templates and it's the main query
-		if ( ! empty( $this->cpt_details['args']['page_templates'] ) && $this->wp_query->is_main_query() ) {
+		if ( ! empty($this->cpt_details['args']['page_templates']) && $this->wp_query->is_main_query()) {
 			// then let's hook into the appropriate query_template hook
-			add_filter( 'single_template', array( $this, 'singleCptTemplate' ) );
+			add_filter('single_template', array($this, 'singleCptTemplate'));
 		}
 	}
 
@@ -542,20 +542,20 @@ 
 	 * @param string $current_template Existing default template path derived for this page call.
 	 * @return string the path to the full template file.
 	 */
-	public function singleCptTemplate( $current_template ) {
+	public function singleCptTemplate($current_template) {
 		$object = get_queried_object();
 		//does this called object HAVE a page template set that is something other than the default.
-		$template = get_post_meta( $object->ID, '_wp_page_template', true );
+		$template = get_post_meta($object->ID, '_wp_page_template', true);
 		//exit early if default or not set or invalid path (accounts for theme changes)
 		if (
 			$template === 'default'
-			|| empty( $template )
-			|| ! is_readable( get_stylesheet_directory() . '/' . $template )
+			|| empty($template)
+			|| ! is_readable(get_stylesheet_directory().'/'.$template)
 		) {
 			return $current_template;
 		}
 		//made it here so we SHOULD be able to just locate the template and then return it.
-		return locate_template( array( $template ) );
+		return locate_template(array($template));
 	}
 
 

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

Spacing +17 added lines, -17 removed lines

@@ -1,4 +1,4 @@ 
-<?php  if ( ! defined( 'EVENT_ESPRESSO_VERSION' )) { exit( 'No direct script access allowed' ); }
+<?php  if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 /**
  * Class EE_Select_Reveal_Input
  *
@@ -11,7 +11,7 @@ 
  * @since 				4.6
  *
  */
-class EE_Select_Reveal_Input extends EE_Select_Input{
+class EE_Select_Reveal_Input extends EE_Select_Input {
 
 	/**
 	 * @param array $answer_options Array keys which match a sibling section's name
@@ -26,8 +26,8 @@ 
 	 *
 	 * @param array $input_settings
 	 */
-	public function __construct( $answer_options, $input_settings = array() ){
-		parent::__construct( $answer_options, $input_settings );
+	public function __construct($answer_options, $input_settings = array()) {
+		parent::__construct($answer_options, $input_settings);
 	}
 
 	/**
@@ -36,17 +36,17 @@ 
 	 */
 	public function sibling_sections_controlled() {
 		$sibling_sections = array();
-		foreach( $this->options() as $sibling_section_name => $sibling_section ) {
+		foreach ($this->options() as $sibling_section_name => $sibling_section) {
 			//if it's an empty string just leave it alone
-			if( empty( $sibling_section_name ) ) {
+			if (empty($sibling_section_name)) {
 				continue;
 			}
-			$sibling_section = $this->find_section_from_path( '../' . $sibling_section_name );
-			if(
+			$sibling_section = $this->find_section_from_path('../'.$sibling_section_name);
+			if (
 				$sibling_section instanceof EE_Form_Section_Base
-				&& ! empty( $sibling_section_name ) 
+				&& ! empty($sibling_section_name) 
 			) {
-				$sibling_sections[ $sibling_section_name ] = $sibling_section;
+				$sibling_sections[$sibling_section_name] = $sibling_section;
 			}
 		}
 		return $sibling_sections;
@@ -59,16 +59,16 @@ 
 	 * @param array $form_other_js_data
 	 * @return array
 	 */
-	public function get_other_js_data( $form_other_js_data = array() ) {
-		$form_other_js_data = parent::get_other_js_data( $form_other_js_data );
-		if( ! isset($form_other_js_data[ 'select_reveal_inputs' ] ) ) {
-			$form_other_js_data[ 'select_reveal_inputs' ] = array();
+	public function get_other_js_data($form_other_js_data = array()) {
+		$form_other_js_data = parent::get_other_js_data($form_other_js_data);
+		if ( ! isset($form_other_js_data['select_reveal_inputs'])) {
+			$form_other_js_data['select_reveal_inputs'] = array();
 		}
 		$sibling_input_to_html_id_map = array();
-		foreach( $this->sibling_sections_controlled() as $sibling_section_path => $sibling_section ) {
-			$sibling_input_to_html_id_map[ $sibling_section_path ] = $sibling_section->html_id();
+		foreach ($this->sibling_sections_controlled() as $sibling_section_path => $sibling_section) {
+			$sibling_input_to_html_id_map[$sibling_section_path] = $sibling_section->html_id();
 		}
-		$form_other_js_data[ 'select_reveal_inputs' ][ $this->html_id() ] = $sibling_input_to_html_id_map;
+		$form_other_js_data['select_reveal_inputs'][$this->html_id()] = $sibling_input_to_html_id_map;
 		return $form_other_js_data;
 	}
 

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

Spacing +14 added lines, -14 removed lines

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

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

Spacing +39 added lines, -39 removed lines

@@ -10,14 +10,14 @@ 
  * @since 				4.6.0
  *
  */
-class EE_Div_Per_Section_Layout extends EE_Form_Section_Layout_Base{
+class EE_Div_Per_Section_Layout extends EE_Form_Section_Layout_Base {
 
 	/**
 	 * opening div tag for a form
 	 * @return string
 	 */
 	public function layout_form_begin() {
-		return EEH_HTML::div( '', $this->_form_section->html_id(), $this->_form_section->html_class(), $this->_form_section->html_style() );
+		return EEH_HTML::div('', $this->_form_section->html_id(), $this->_form_section->html_class(), $this->_form_section->html_style());
 	}
 
 
@@ -26,38 +26,38 @@ 
 	 * @param EE_Form_Input_Base $input
 	 * @return string
 	 */
-	public function layout_input( $input ) {
+	public function layout_input($input) {
 		$html = '';
-		if ( $input instanceof EE_Hidden_Input  ) {
-			$html .= EEH_HTML::nl() . $input->get_html_for_input();
-		} else if ( $input instanceof EE_Submit_Input  ) {
-			$html .= EEH_HTML::div( $input->get_html_for_input(), $input->html_id() . '-submit-dv', $input->html_class() . '-submit-dv' );
-		} else if ( $input instanceof EE_Select_Input  ) {
+		if ($input instanceof EE_Hidden_Input) {
+			$html .= EEH_HTML::nl().$input->get_html_for_input();
+		} else if ($input instanceof EE_Submit_Input) {
+			$html .= EEH_HTML::div($input->get_html_for_input(), $input->html_id().'-submit-dv', $input->html_class().'-submit-dv');
+		} else if ($input instanceof EE_Select_Input) {
 			$html .= EEH_HTML::div(
-				EEH_HTML::nl(1) . $input->get_html_for_label() .
-				EEH_HTML::nl() . $input->get_html_for_errors() .
-				EEH_HTML::nl() . $input->get_html_for_input() .
-				EEH_HTML::nl() . $input->get_html_for_help(),
-				$input->html_id() . '-input-dv',
-				$input->html_class() . '-input-dv'
+				EEH_HTML::nl(1).$input->get_html_for_label().
+				EEH_HTML::nl().$input->get_html_for_errors().
+				EEH_HTML::nl().$input->get_html_for_input().
+				EEH_HTML::nl().$input->get_html_for_help(),
+				$input->html_id().'-input-dv',
+				$input->html_class().'-input-dv'
 			);
-		} else if ( $input instanceof EE_Form_Input_With_Options_Base  ) {
+		} else if ($input instanceof EE_Form_Input_With_Options_Base) {
 			$html .= EEH_HTML::div(
-				EEH_HTML::nl() . $this->_display_label_for_option_type_question( $input ) .
-				EEH_HTML::nl() . $input->get_html_for_errors() .
-				EEH_HTML::nl() . $input->get_html_for_input() .
-				EEH_HTML::nl() . $input->get_html_for_help(),
-				$input->html_id() . '-input-dv',
-				$input->html_class() . '-input-dv'
+				EEH_HTML::nl().$this->_display_label_for_option_type_question($input).
+				EEH_HTML::nl().$input->get_html_for_errors().
+				EEH_HTML::nl().$input->get_html_for_input().
+				EEH_HTML::nl().$input->get_html_for_help(),
+				$input->html_id().'-input-dv',
+				$input->html_class().'-input-dv'
 			);
 		} else {
 			$html .= EEH_HTML::div(
-				EEH_HTML::nl(1) . $input->get_html_for_label() .
-				EEH_HTML::nl() . $input->get_html_for_errors() .
-				EEH_HTML::nl() . $input->get_html_for_input() .
-				EEH_HTML::nl() . $input->get_html_for_help(),
-				$input->html_id() . '-input-dv',
-				$input->html_class() . '-input-dv'
+				EEH_HTML::nl(1).$input->get_html_for_label().
+				EEH_HTML::nl().$input->get_html_for_errors().
+				EEH_HTML::nl().$input->get_html_for_input().
+				EEH_HTML::nl().$input->get_html_for_help(),
+				$input->html_id().'-input-dv',
+				$input->html_class().'-input-dv'
 			);
 		}
 		return $html;
@@ -74,14 +74,14 @@ 
 	 * @param EE_Form_Input_With_Options_Base $input
 	 * @return string
 	 */
-	protected function _display_label_for_option_type_question( EE_Form_Input_With_Options_Base $input ){
-		if ( $input->display_html_label_text() != '' ) {
-			$class = $input->required() ? 'ee-required-label ' . $input->html_label_class() : $input->html_label_class();
-			$label_text = $input->required() ? $input->html_label_text() . '<span class="ee-asterisk">*</span>' : $input->html_label_text();
-			$html = '<div id="' . $input->html_label_id() . '"';
-			$html .= ' class="' . $class . '"';
-			$html .= ' style="' . $input->html_label_style() . '">';
-			$html .= $label_text . '</div>';
+	protected function _display_label_for_option_type_question(EE_Form_Input_With_Options_Base $input) {
+		if ($input->display_html_label_text() != '') {
+			$class = $input->required() ? 'ee-required-label '.$input->html_label_class() : $input->html_label_class();
+			$label_text = $input->required() ? $input->html_label_text().'<span class="ee-asterisk">*</span>' : $input->html_label_text();
+			$html = '<div id="'.$input->html_label_id().'"';
+			$html .= ' class="'.$class.'"';
+			$html .= ' style="'.$input->html_label_style().'">';
+			$html .= $label_text.'</div>';
 			return $html;
 		} else {
 			return '';
@@ -95,9 +95,9 @@ 
 	 * @param EE_Form_Section_Proper $form_section
 	 * @return string
 	 */
-	public function layout_subsection( $form_section ){
+	public function layout_subsection($form_section) {
 //		d( $form_section );
-		return EEH_HTML::nl(1) . $form_section->get_html() . EEH_HTML::nl(-1);
+		return EEH_HTML::nl(1).$form_section->get_html().EEH_HTML::nl(-1);
 	}
 
 
@@ -105,7 +105,7 @@ 
 	 * closing div tag for a form
 	 * @return string
 	 */
-	public function layout_form_end(){
-		return EEH_HTML::divx( $this->_form_section->html_id(), $this->_form_section->html_class() );
+	public function layout_form_end() {
+		return EEH_HTML::divx($this->_form_section->html_id(), $this->_form_section->html_class());
 	}
 }
\ No newline at end of file