eventespresso / event-espresso-core

core/helpers/EEH_Template.helper.php

Spacing +196 added lines, -196 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);
 		}
 	}
 
@@ -182,26 +182,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
@@ -210,80 +210,80 @@ 
 			// 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 );
-			$templates = is_array( $templates ) ? $templates : array( $templates );
-			$template_folder_paths = is_array( $template_folder_paths ) ? $template_folder_paths : array( $template_folder_paths );
+			$template_folder_paths = apply_filters('FHEE__EEH_Template__locate_template__template_folder_paths', $template_folder_paths);
+			$templates = is_array($templates) ? $templates : array($templates);
+			$template_folder_paths = is_array($template_folder_paths) ? $template_folder_paths : array($template_folder_paths);
 			// array to hold all possible template paths
 			$full_template_paths = array();
 
 			EE_Registry::instance()->load_helper('File');
 			// loop through $templates
-			foreach ( $templates as $template ) {
+			foreach ($templates as $template) {
 				// normalize directory separators
-				$template = EEH_File::standardise_directory_separators( $template );
-				$file_name = basename( $template );
-				$template_path_minus_file_name = substr( $template, 0, ( strlen( $file_name ) * -1 ) );
+				$template = EEH_File::standardise_directory_separators($template);
+				$file_name = basename($template);
+				$template_path_minus_file_name = substr($template, 0, (strlen($file_name) * -1));
 				// while looping through all template folder paths
-				foreach ( $template_folder_paths as $template_folder_path ) {
+				foreach ($template_folder_paths as $template_folder_path) {
 					// normalize directory separators
-					$template_folder_path = EEH_File::standardise_directory_separators( $template_folder_path );
+					$template_folder_path = EEH_File::standardise_directory_separators($template_folder_path);
 					// determine if any common base path exists between the two paths
 					$common_base_path = EEH_Template::_find_common_base_path(
-						array( $template_folder_path, $template_path_minus_file_name )
+						array($template_folder_path, $template_path_minus_file_name)
 					);
-					if ( $common_base_path !== '' ) {
+					if ($common_base_path !== '') {
 						// both paths have a common base, so just tack the filename onto our search path
-						$resolved_path = EEH_File::end_with_directory_separator( $template_folder_path ) . $file_name;
+						$resolved_path = EEH_File::end_with_directory_separator($template_folder_path).$file_name;
 					} else {
 						// no common base path, so let's just concatenate
-						$resolved_path = EEH_File::end_with_directory_separator( $template_folder_path ) . $template;
+						$resolved_path = EEH_File::end_with_directory_separator($template_folder_path).$template;
 					}
 					// build up our template locations array by adding our resolved paths
 					$full_template_paths[] = $resolved_path;
 				}
 				// 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);
 				// path to the directory of the current theme: /wp-content/themes/(current WP theme)/
-				array_unshift( $full_template_paths, get_stylesheet_directory() . DS . $file_name );
+				array_unshift($full_template_paths, get_stylesheet_directory().DS.$file_name);
 			}
 			// filter final array of full template paths
-			$full_template_paths = apply_filters( 'FHEE__EEH_Template__locate_template__full_template_paths', $full_template_paths, $file_name );
+			$full_template_paths = apply_filters('FHEE__EEH_Template__locate_template__full_template_paths', $full_template_paths, $file_name);
 			// 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;
 	}
 
 
@@ -296,21 +296,21 @@ 
 	 * @param array $paths
 	 * @return string
 	 */
-	protected static function _find_common_base_path( $paths ) {
+	protected static function _find_common_base_path($paths) {
 		$last_offset = 0;
 		$common_base_path = '';
-		while ( ( $index = strpos( $paths[ 0 ], DS, $last_offset ) ) !== false ) {
+		while (($index = strpos($paths[0], DS, $last_offset)) !== false) {
 			$dir_length = $index - $last_offset + 1;
-			$directory = substr( $paths[ 0 ], $last_offset, $dir_length );
-			foreach ( $paths as $path ) {
-				if ( substr( $path, $last_offset, $dir_length ) != $directory ) {
+			$directory = substr($paths[0], $last_offset, $dir_length);
+			foreach ($paths as $path) {
+				if (substr($path, $last_offset, $dir_length) != $directory) {
 					return $common_base_path;
 				}
 			}
 			$common_base_path .= $directory;
 			$last_offset = $index + 1;
 		}
-		return substr( $common_base_path, 0, -1 );
+		return substr($common_base_path, 0, -1);
 	}
 
 
@@ -322,9 +322,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
@@ -335,26 +335,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 '';
 	}
@@ -372,27 +372,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;
 	}
 
 
@@ -408,50 +408,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;
 	}
@@ -466,11 +466,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];
 	}
 
 
@@ -483,9 +483,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;
 	}
 
@@ -502,21 +502,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>';
 	}
 
 
@@ -528,31 +528,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 {
@@ -560,7 +560,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>';
@@ -581,31 +581,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;
 	}
 
@@ -618,8 +618,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();
@@ -633,10 +633,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
@@ -650,7 +650,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
@@ -680,8 +680,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function paging_html( $total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array() ) {
-		echo self::get_paging_html( $total_items, $current, $per_page, $url, $show_num_field, $paged_arg_name, $items_label );
+	public static function paging_html($total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array()) {
+		echo self::get_paging_html($total_items, $current, $per_page, $url, $show_num_field, $paged_arg_name, $items_label);
 	}
 
 
@@ -705,13 +705,13 @@ 
 	 *                                 )
 	 * @return  string
 	 */
-	public static function get_paging_html( $total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array() ) {
+	public static function get_paging_html($total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array()) {
 		$page_links = array();
 		$disable_first = $disable_last = '';
 		$total_items = (int) $total_items;
 		$per_page = (int) $per_page;
 		$current = (int) $current;
-		$paged_arg_name = empty( $paged_arg_name ) ? 'paged' : sanitize_key( $paged_arg_name );
+		$paged_arg_name = empty($paged_arg_name) ? 'paged' : sanitize_key($paged_arg_name);
 
 		//filter items_label
 		$items_label = apply_filters(
@@ -719,68 +719,68 @@ 
 			$items_label
 		);
 
-		if ( empty( $items_label )
-		     || ! is_array( $items_label )
-		     || ! isset( $items_label['single'] )
-		     || ! isset( $items_label['plural'] ) ) {
+		if (empty($items_label)
+		     || ! is_array($items_label)
+		     || ! isset($items_label['single'])
+		     || ! isset($items_label['plural'])) {
 			$items_label = array(
-				'single' => __( '1 item', 'event_espresso' ),
-				'plural' => __( '%s items', 'event_espresso' )
+				'single' => __('1 item', 'event_espresso'),
+				'plural' => __('%s items', 'event_espresso')
 			);
 		} else {
 			$items_label = array(
-				'single' => '1 ' . esc_html( $items_label['single'] ),
-				'plural' => '%s ' . esc_html( $items_label['plural'] )
+				'single' => '1 '.esc_html($items_label['single']),
+				'plural' => '%s '.esc_html($items_label['plural'])
 			);
 		}
 
-		$total_pages = ceil( $total_items / $per_page );
+		$total_pages = ceil($total_items / $per_page);
 
-		if ( $total_pages <= 1 )
+		if ($total_pages <= 1)
 			return '';
 
-		$item_label = $total_items > 1 ? sprintf( $items_label['plural'], $total_items ) : $items_label['single'];
+		$item_label = $total_items > 1 ? sprintf($items_label['plural'], $total_items) : $items_label['single'];
 
-		$output = '<span class="displaying-num">' . $item_label . '</span>';
+		$output = '<span class="displaying-num">'.$item_label.'</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_arg_name, $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_arg_name, $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_arg_name, max( 1, $current-1 ), $url ) ),
+			'prev-page'.$disable_first,
+			esc_attr__('Go to the previous page'),
+			esc_url(add_query_arg($paged_arg_name, 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_arg_name value='%s' size='%d' />",
-				esc_attr__( 'Current page' ),
+			$html_current_page = sprintf("<input class='current-page' title='%s' type='text' name=$paged_arg_name 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 )
+			number_format_i18n($total_pages)
 		);
 		$page_links[] = sprintf(
-			_x( '%3$s%1$s of %2$s%4$s', 'paging' ),
+			_x('%3$s%1$s of %2$s%4$s', 'paging'),
 			$html_current_page,
 			$html_total_pages,
 			'<span class="paging-input">',
@@ -789,29 +789,29 @@ 
 
 		$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_arg_name, min( $total_pages, $current+1 ), $url ) ),
+			'next-page'.$disable_last,
+			esc_attr__('Go to the next page'),
+			esc_url(add_query_arg($paged_arg_name, 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_arg_name, $total_pages, $url ) ),
+			'last-page'.$disable_last,
+			esc_attr__('Go to the last page'),
+			esc_url(add_query_arg($paged_arg_name, $total_pages, $url)),
 			'&raquo;'
 		);
 
-		$output .= "\n" . '<span class="pagination-links">' . join( "\n", $page_links ) . '</span>';
+		$output .= "\n".'<span class="pagination-links">'.join("\n", $page_links).'</span>';
 		// set page class
-		if ( $total_pages ) {
+		if ($total_pages) {
 			$page_class = $total_pages < 2 ? ' one-page' : '';
 		} else {
 			$page_class = ' no-pages';
 		}
 
-		return '<div class="tablenav"><div class="tablenav-pages' . $page_class . '">' . $output . '</div></div>';
+		return '<div class="tablenav"><div class="tablenav-pages'.$page_class.'">'.$output.'</div></div>';
 	}
 
 

shortcodes/espresso_checkout/EES_Espresso_Checkout.shortcode.php

Spacing +6 added lines, -6 removed lines

@@ -51,17 +51,17 @@ 
 	 * @param WP $WP
 	 * @return    void
 	 */
-	public function run( WP $WP ) {
-		if ( did_action( 'pre_get_posts' ) && did_action( 'send_headers' ) ) {
+	public function run(WP $WP) {
+		if (did_action('pre_get_posts') && did_action('send_headers')) {
 			global $wp_query;
 			EED_Single_Page_Checkout::load_reg_steps();
-			EED_Single_Page_Checkout::init( $wp_query );
+			EED_Single_Page_Checkout::init($wp_query);
 		} else {
 			// hook into the top of pre_get_posts to set the reg step routing, which gives other modules or plugins a chance to modify the reg steps, but just before the routes get called
-			add_action( 'pre_get_posts', array( 'EED_Single_Page_Checkout', 'load_reg_steps' ), 1 );
+			add_action('pre_get_posts', array('EED_Single_Page_Checkout', 'load_reg_steps'), 1);
 			// this will trigger the EED_Single_Page_Checkout module's run() method during the pre_get_posts hook point,
 			// this allows us to initialize things, enqueue assets, etc,
-			add_action( 'pre_get_posts', array( 'EED_Single_Page_Checkout', 'init' ), 10, 1 );
+			add_action('pre_get_posts', array('EED_Single_Page_Checkout', 'init'), 10, 1);
 		}
 	}
 
@@ -74,7 +74,7 @@ 
 	 *  @param		array 	$attributes
 	 *  @return 	string
 	 */
-	public function process_shortcode( $attributes = array() ) {
+	public function process_shortcode($attributes = array()) {
 		return EE_Registry::instance()->REQ->get_output();
 	}
 

shortcodes/espresso_ticket_selector/EES_Espresso_Ticket_Selector.shortcode.php

Spacing +8 added lines, -8 removed lines

@@ -50,7 +50,7 @@ 
 	 * @access    public
 	 * @param \WP $WP
 	 */
-	public function run( WP $WP ) {
+	public function run(WP $WP) {
 	}
 
 	/**
@@ -60,14 +60,14 @@ 
 	 *  @param		array 	$attributes
 	 *  @return 	string
 	 */
-	public function process_shortcode( $attributes = array() ) {
-		extract( $attributes );
-		$event_id = isset( $event_id ) ? $event_id : 0;
-		$event = EE_Registry::instance()->load_model( 'Event' )->get_one_by_ID( $event_id );
+	public function process_shortcode($attributes = array()) {
+		extract($attributes);
+		$event_id = isset($event_id) ? $event_id : 0;
+		$event = EE_Registry::instance()->load_model('Event')->get_one_by_ID($event_id);
 		ob_start();
-		do_action( 'AHEE_event_details_before_post', $event_id );
-		espresso_ticket_selector( $event );
-		do_action( 'AHEE_event_details_after_post' );
+		do_action('AHEE_event_details_before_post', $event_id);
+		espresso_ticket_selector($event);
+		do_action('AHEE_event_details_after_post');
 		return ob_get_clean();
 	}
 

shortcodes/espresso_events/EES_Espresso_Events.shortcode.php

Spacing +36 added lines, -36 removed lines

@@ -50,14 +50,14 @@ 
 	 * @param WP $WP
 	 * @return    void
 	 */
-	public function run( WP $WP ) {
-		if ( did_action( 'pre_get_posts' ) && did_action( 'send_headers' ) ) {
+	public function run(WP $WP) {
+		if (did_action('pre_get_posts') && did_action('send_headers')) {
 			EED_Events_Archive::instance()->event_list();
 		} else {
 			// this will trigger the EED_Events_Archive module's event_list() method during the pre_get_posts hook point,
 			// this allows us to initialize things, enqueue assets, etc,
 			// as well, this saves an instantiation of the module in an array using 'espresso_events' as the key, so that we can retrieve it
-			add_action( 'pre_get_posts', array( EED_Events_Archive::instance(), 'event_list' ) );
+			add_action('pre_get_posts', array(EED_Events_Archive::instance(), 'event_list'));
 		}
 	}
 
@@ -79,13 +79,13 @@ 
 	 *  @param 	array 	$attributes
 	 *  @return 	string
 	 */
-	public function process_shortcode( $attributes = array() ) {
+	public function process_shortcode($attributes = array()) {
 		// make sure EED_Events_Archive is setup properly
-		if ( apply_filters( 'FHEE__fallback_shortcode_processor__EES_Espresso_Events', FALSE )) {
+		if (apply_filters('FHEE__fallback_shortcode_processor__EES_Espresso_Events', FALSE)) {
 			EED_Events_Archive::instance()->event_list();
 		}
 		// merge in any attributes passed via fallback shortcode processor
-		$attributes = array_merge( (array)$attributes, (array)$this->_attributes );
+		$attributes = array_merge((array) $attributes, (array) $this->_attributes);
 		//set default attributes
 		$default_espresso_events_shortcode_atts = array(
 			'title' => NULL,
@@ -99,26 +99,26 @@ 
 			'fallback_shortcode_processor' => FALSE
 		);
 		// allow the defaults to be filtered
-		$default_espresso_events_shortcode_atts = apply_filters( 'EES_Espresso_Events__process_shortcode__default_espresso_events_shortcode_atts', $default_espresso_events_shortcode_atts );
+		$default_espresso_events_shortcode_atts = apply_filters('EES_Espresso_Events__process_shortcode__default_espresso_events_shortcode_atts', $default_espresso_events_shortcode_atts);
 		// grab attributes and merge with defaults, then extract
-		$attributes = array_merge( $default_espresso_events_shortcode_atts, $attributes );
+		$attributes = array_merge($default_espresso_events_shortcode_atts, $attributes);
 		// make sure we use the_excerpt()
-		add_filter( 'FHEE__EES_Espresso_Events__process_shortcode__true', '__return_true' );
+		add_filter('FHEE__EES_Espresso_Events__process_shortcode__true', '__return_true');
 		// apply query filters
-		add_filter( 'FHEE__EEH_Event_Query__apply_query_filters', '__return_true' );
+		add_filter('FHEE__EEH_Event_Query__apply_query_filters', '__return_true');
 		// run the query
 		global $wp_query;
-		$wp_query = new EE_Event_List_Query( $attributes );
+		$wp_query = new EE_Event_List_Query($attributes);
 		// check what template is loaded and load filters accordingly
-		EED_Events_Archive::instance()->template_include( 'loop-espresso_events.php' );
+		EED_Events_Archive::instance()->template_include('loop-espresso_events.php');
 		// load our template
-		$event_list = EEH_Template::locate_template( 'loop-espresso_events.php', array(), TRUE, TRUE );
+		$event_list = EEH_Template::locate_template('loop-espresso_events.php', array(), TRUE, TRUE);
 		// now reset the query and postdata
 		wp_reset_query();
 		wp_reset_postdata();
 		EED_Events_Archive::remove_all_events_archive_filters();
 		// remove query filters
-		remove_filter( 'FHEE__EEH_Event_Query__apply_query_filters', '__return_true' );
+		remove_filter('FHEE__EEH_Event_Query__apply_query_filters', '__return_true');
 		// pull our content from the output buffer and return it
 		return $event_list;
 	}
@@ -163,46 +163,46 @@ 
 	 * @param array $args
 	 * @return \EE_Event_List_Query
 	 */
-	function __construct( $args = array() ) {
+	function __construct($args = array()) {
 //		EEH_Debug_Tools::printr( $args, '$args  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 		// incoming args could be a mix of WP query args + EE shortcode args
-		foreach ( $args as $key =>$value ) {
-			$property = '_' . $key;
+		foreach ($args as $key =>$value) {
+			$property = '_'.$key;
 			// if the arg is a property of this class, then it's an EE shortcode arg
-			if ( property_exists( $this, $property )) {
+			if (property_exists($this, $property)) {
 				// set the property value
 				$this->$property = $value;
 				// then remove it from the array of args that will later be passed to WP_Query()
-				unset( $args[ $key ] );
+				unset($args[$key]);
 			}
 		}
 		// setup the events list query
-		EE_Registry::instance()->load_helper( 'Event_Query' );
+		EE_Registry::instance()->load_helper('Event_Query');
 		//add query filters
 		EEH_Event_Query::add_query_filters();
 		// set params that will get used by the filters
-		EEH_Event_Query::set_query_params( $this->_month, $this->_category_slug, $this->_show_expired, $this->_order_by, $this->_sort );
+		EEH_Event_Query::set_query_params($this->_month, $this->_category_slug, $this->_show_expired, $this->_order_by, $this->_sort);
 		// first off, let's remove any filters from previous queries
-		remove_filter( 'FHEE__archive_espresso_events_template__upcoming_events_h1', array( $this, 'event_list_title' ));
-		remove_all_filters( 'FHEE__content_espresso_events__event_class' );
+		remove_filter('FHEE__archive_espresso_events_template__upcoming_events_h1', array($this, 'event_list_title'));
+		remove_all_filters('FHEE__content_espresso_events__event_class');
 		// Event List Title ?
-		add_filter( 'FHEE__archive_espresso_events_template__upcoming_events_h1', array( $this, 'event_list_title' ), 10, 1 );
+		add_filter('FHEE__archive_espresso_events_template__upcoming_events_h1', array($this, 'event_list_title'), 10, 1);
 		// add the css class
-		add_filter( 'FHEE__content_espresso_events__event_class', array( $this, 'event_list_css' ), 10, 1 );
+		add_filter('FHEE__content_espresso_events__event_class', array($this, 'event_list_css'), 10, 1);
 		// the current "page" we are viewing
-		$paged = max( 1, get_query_var( 'paged' ));
+		$paged = max(1, get_query_var('paged'));
 		// Force these args
-		$args = array_merge( $args, array(
+		$args = array_merge($args, array(
 			'post_type' => 'espresso_events',
 			'posts_per_page' => $this->_limit,
 			'update_post_term_cache' => FALSE,
 			'update_post_meta_cache' => FALSE,
 			'paged' => $paged,
-			'offset' => ( $paged - 1 ) * $this->_limit
+			'offset' => ($paged - 1) * $this->_limit
 		));
 
 		// run the query
-		parent::__construct( $args );
+		parent::__construct($args);
 	}
 
 
@@ -215,8 +215,8 @@ 
 	 * @param string $event_list_title
 	 * @return    string
 	 */
-	public function event_list_title( $event_list_title = '' ) {
-		if ( ! empty( $this->_title )) {
+	public function event_list_title($event_list_title = '') {
+		if ( ! empty($this->_title)) {
 			return $this->_title;
 		}
 		return $event_list_title;
@@ -231,11 +231,11 @@ 
 	 * @param string $event_list_css
 	 * @return    array
 	 */
-	public function event_list_css( $event_list_css = '' ) {
-		$event_list_css .=  ! empty( $event_list_css ) ? ' ' : '';
-		$event_list_css .=  ! empty( $this->_css_class ) ? $this->_css_class : '';
-		$event_list_css .=  ! empty( $event_list_css ) ? ' ' : '';
-		$event_list_css .=  ! empty( $this->_category_slug ) ? $this->_category_slug : '';
+	public function event_list_css($event_list_css = '') {
+		$event_list_css .= ! empty($event_list_css) ? ' ' : '';
+		$event_list_css .= ! empty($this->_css_class) ? $this->_css_class : '';
+		$event_list_css .= ! empty($event_list_css) ? ' ' : '';
+		$event_list_css .= ! empty($this->_category_slug) ? $this->_category_slug : '';
 		return $event_list_css;
 	}