eventespresso / event-espresso-core

core/libraries/line_item_display/EE_Admin_Table_Line_Item_Display_Strategy.strategy.php

Doc Comments +6 added lines, -6 removed lines

@@ -47,7 +47,7 @@ 
 	 * This is used to output a single
 	 * @param EE_Line_Item $line_item
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	public function display_line_item( EE_Line_Item $line_item, $options = array() ) {
 
@@ -163,7 +163,7 @@ 
 	 *
 	 * @param EE_Line_Item $line_item
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	protected function _item_row( EE_Line_Item $line_item, $options = array() ) {
 		$line_item_related_object = $line_item->get_object();
@@ -229,7 +229,7 @@ 
 	 *
 	 * @param EE_Line_Item $line_item
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	protected function _sub_item_row( EE_Line_Item $line_item, $options = array() ) {
 		//for now we're not showing sub-items
@@ -243,7 +243,7 @@ 
 	 *
 	 * @param EE_Line_Item $line_item
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	protected function _tax_row( EE_Line_Item $line_item, $options = array() ) {
 		// start of row
@@ -266,7 +266,7 @@ 
 	 * @param EE_Line_Item $line_item
 	 * @param string       $text
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	protected function _sub_total_row( EE_Line_Item $line_item, $text = '', $options = array() ) {
 		//currently not showing subtotal row
@@ -280,7 +280,7 @@ 
 	 *
 	 * @param EE_Line_Item $line_item
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	protected function _total_row( EE_Line_Item $line_item, $options = array() ) {
 		// start of row

Spacing +61 added lines, -61 removed lines

@@ -49,7 +49,7 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	public function display_line_item( EE_Line_Item $line_item, $options = array() ) {
+	public function display_line_item(EE_Line_Item $line_item, $options = array()) {
 
 		$html = '';
 		// set some default options and merge with incoming
@@ -60,43 +60,43 @@ 
 			'taxes_tr_css_class' => 'admin-primary-mbox-taxes-tr',
 			'total_tr_css_class' => 'admin-primary-mbox-total-tr'
 		);
-		$options = array_merge( $default_options, (array)$options );
+		$options = array_merge($default_options, (array) $options);
 
-		switch( $line_item->type() ) {
+		switch ($line_item->type()) {
 
 			case EEM_Line_Item::type_line_item:
 				// item row
-				$html .= $this->_item_row( $line_item, $options );
+				$html .= $this->_item_row($line_item, $options);
 				break;
 
 			case EEM_Line_Item::type_sub_line_item:
-				$html .= $this->_sub_item_row( $line_item, $options );
+				$html .= $this->_sub_item_row($line_item, $options);
 				break;
 
 			case EEM_Line_Item::type_sub_total:
-				if ( $line_item->quantity() === 0 ) {
+				if ($line_item->quantity() === 0) {
 					return $html;
 				}
 				//loop through children
 				$child_line_items = $line_item->children();
 				//loop through children
-				foreach ( $child_line_items as $child_line_item ) {
+				foreach ($child_line_items as $child_line_item) {
 					//recursively feed children back into this method
-					$html .= $this->display_line_item( $child_line_item, $options );
+					$html .= $this->display_line_item($child_line_item, $options);
 				}
-				$html .= $this->_sub_total_row( $line_item, $options );
+				$html .= $this->_sub_total_row($line_item, $options);
 				break;
 
 			case EEM_Line_Item::type_tax:
-				if ( $this->_show_taxes ) {
-					$this->_taxes_html .= $this->_tax_row( $line_item, $options );
+				if ($this->_show_taxes) {
+					$this->_taxes_html .= $this->_tax_row($line_item, $options);
 				}
 				break;
 
 			case EEM_Line_Item::type_tax_sub_total:
-				foreach( $line_item->children() as $child_line_item ) {
-					if ( $child_line_item->type() == EEM_Line_Item::type_tax ) {
-						$this->display_line_item( $child_line_item, $options );
+				foreach ($line_item->children() as $child_line_item) {
+					if ($child_line_item->type() == EEM_Line_Item::type_tax) {
+						$this->display_line_item($child_line_item, $options);
 					}
 				}
 				break;
@@ -108,14 +108,14 @@ 
 				$children = $line_item->children();
 
 				// loop thru all non-tax child line items
-				foreach( $children as $child_line_item ) {
-						$html .= $this->display_line_item( $child_line_item, $options );
+				foreach ($children as $child_line_item) {
+						$html .= $this->display_line_item($child_line_item, $options);
 				}
 
 				$html .= $this->_taxes_html;
-				$html .= $this->_total_row( $line_item, $options );
-				if ( $options['use_table_wrapper'] ) {
-					$html = $this->_table_header( $options ) . $html . $this->_table_footer( $options );
+				$html .= $this->_total_row($line_item, $options);
+				if ($options['use_table_wrapper']) {
+					$html = $this->_table_header($options).$html.$this->_table_footer($options);
 				}
 				break;
 
@@ -132,15 +132,15 @@ 
 	 * @param array $options
 	 * @return string
 	 */
-	protected function _table_header( $options ) {
-		$html = EEH_HTML::table( '','', $options['table_css_class'] );
+	protected function _table_header($options) {
+		$html = EEH_HTML::table('', '', $options['table_css_class']);
 		$html .= EEH_HTML::thead();
 		$html .= EEH_HTML::tr();
-		$html .= EEH_HTML::th( __( 'Name', 'event_espresso' ), '', 'jst-left' );
-		$html .= EEH_HTML::th( __( 'Type', 'event_espresso'), '', 'jst-left' );
-		$html .= EEH_HTML::th( __( 'Amount', 'event_espresso' ), '', 'jst-cntr' );
-		$html .= EEH_HTML::th( __( 'Qty', 'event_espresso' ), '', 'jst-cntr' );
-		$html .= EEH_HTML::th( __( 'Line Total', 'event_espresso'), '', 'jst-cntr' );
+		$html .= EEH_HTML::th(__('Name', 'event_espresso'), '', 'jst-left');
+		$html .= EEH_HTML::th(__('Type', 'event_espresso'), '', 'jst-left');
+		$html .= EEH_HTML::th(__('Amount', 'event_espresso'), '', 'jst-cntr');
+		$html .= EEH_HTML::th(__('Qty', 'event_espresso'), '', 'jst-cntr');
+		$html .= EEH_HTML::th(__('Line Total', 'event_espresso'), '', 'jst-cntr');
 		$html .= EEH_HTML::tbody();
 		return $html;
 	}
@@ -152,8 +152,8 @@ 
 	 * @param array $options array of options for the table.
 	 * @return string
 	 */
-	protected function _table_footer( $options ) {
-		return EEH_HTML::tbodyx() .  EEH_HTML::tablex();
+	protected function _table_footer($options) {
+		return EEH_HTML::tbodyx().EEH_HTML::tablex();
 	}
 
 
@@ -165,12 +165,12 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	protected function _item_row( EE_Line_Item $line_item, $options = array() ) {
+	protected function _item_row(EE_Line_Item $line_item, $options = array()) {
 		$line_item_related_object = $line_item->get_object();
 		$parent_line_item_related_object = $line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->get_object() : null;
 		// start of row
 		$row_class = $options['odd'] ? 'item odd' : 'item';
-		$html = EEH_HTML::tr( '', '', $row_class );
+		$html = EEH_HTML::tr('', '', $row_class);
 
 
 		//Name Column
@@ -178,45 +178,45 @@ 
 
 		//related object scope.
 		$parent_related_object_name = $parent_line_item_related_object instanceof EEI_Line_Item_Object ? $parent_line_item_related_object->name() : '';
-		$parent_related_object_name = empty( $parent_related_object_name ) && $line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->name() : $parent_related_object_name;
+		$parent_related_object_name = empty($parent_related_object_name) && $line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->name() : $parent_related_object_name;
 		$parent_related_object_link = $parent_line_item_related_object instanceof EEI_Admin_Links ? $parent_line_item_related_object->get_admin_details_link() : '';
 
 
 		$name_html = $line_item_related_object instanceof EEI_Line_Item_Object ? $line_item_related_object->name() : $line_item->name();
-		$name_html = $name_link ? '<a href="' . $name_link . '">' . $name_html . '</a>' : $name_html;
+		$name_html = $name_link ? '<a href="'.$name_link.'">'.$name_html.'</a>' : $name_html;
 		$name_html .= $line_item->is_taxable() ? ' *' : '';
 		//maybe preface with icon?
-		$name_html = $line_item_related_object instanceof EEI_Has_Icon ? $line_item_related_object->get_icon() . $name_html : $name_html;
-		$name_html = '<span class="ee-line-item-name linked">' . $name_html . '</span><br>';
-		$name_html .=  sprintf(
-			_x( '%1$sfor the %2$s: %3$s%4$s', 'eg. "for the Event: My Cool Event"', 'event_espresso'),
+		$name_html = $line_item_related_object instanceof EEI_Has_Icon ? $line_item_related_object->get_icon().$name_html : $name_html;
+		$name_html = '<span class="ee-line-item-name linked">'.$name_html.'</span><br>';
+		$name_html .= sprintf(
+			_x('%1$sfor the %2$s: %3$s%4$s', 'eg. "for the Event: My Cool Event"', 'event_espresso'),
 			'<span class="ee-line-item-related-parent-object">',
-			$line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->OBJ_type_i18n() : __( 'Item:', 'event_espresso' ),
-			$parent_related_object_link ? '<a href="' . $parent_related_object_link . '">' . $parent_related_object_name . '</a>' : $parent_related_object_name,
+			$line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->OBJ_type_i18n() : __('Item:', 'event_espresso'),
+			$parent_related_object_link ? '<a href="'.$parent_related_object_link.'">'.$parent_related_object_name.'</a>' : $parent_related_object_name,
 			'</span>'
 		);
-		$html .= EEH_HTML::td( $name_html, '', 'jst-left' );
+		$html .= EEH_HTML::td($name_html, '', 'jst-left');
 		//Type Column
 		$type_html = $line_item->OBJ_type() ? $line_item->OBJ_type_i18n() : '';
-		$type_html .= $this->_get_cancellations( $line_item );
+		$type_html .= $this->_get_cancellations($line_item);
 		$type_html .= $line_item->OBJ_type() ? '<br />' : '';
 		$code = $line_item_related_object instanceof EEI_Has_Code ? $line_item_related_object->code() : '';
-		$type_html .= ! empty( $code ) ? '<span class="ee-line-item-id">' . sprintf( __( 'Code: %s', 'event_espresso' ), $code ) . '</span>' : '';
-		$html .= EEH_HTML::td( $type_html, '', 'jst-left' );
+		$type_html .= ! empty($code) ? '<span class="ee-line-item-id">'.sprintf(__('Code: %s', 'event_espresso'), $code).'</span>' : '';
+		$html .= EEH_HTML::td($type_html, '', 'jst-left');
 
 
 		//Amount Column
-		if ( $line_item->is_percent() ) {
-			$html .= EEH_HTML::td( $line_item->percent() . '%', '', 'jst-rght' );
+		if ($line_item->is_percent()) {
+			$html .= EEH_HTML::td($line_item->percent().'%', '', 'jst-rght');
 		} else {
-			$html .= EEH_HTML::td( $line_item->unit_price_no_code(), '', 'jst-rght' );
+			$html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'jst-rght');
 		}
 
 		//QTY column
-		$html .= EEH_HTML::td( $line_item->quantity(), '', 'jst-rght' );
+		$html .= EEH_HTML::td($line_item->quantity(), '', 'jst-rght');
 
 		//total column
-		$html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'jst-rght' );
+		$html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght');
 
 		//finish things off and return
 		$html .= EEH_HTML::trx();
@@ -231,12 +231,12 @@ 
 	 * @param EE_Line_Item $line_item
 	 * @return string
 	 */
-	protected function _get_cancellations( EE_Line_Item $line_item ) {
+	protected function _get_cancellations(EE_Line_Item $line_item) {
 		$html = '';
 		$cancellations = $line_item->get_cancellations();
-		$cancellation = reset( $cancellations );
+		$cancellation = reset($cancellations);
 		// \EEH_Debug_Tools::printr( $cancellation, '$cancellation', __FILE__, __LINE__ );
-		if ( $cancellation instanceof EE_Line_Item ) {
+		if ($cancellation instanceof EE_Line_Item) {
 			$html .= ' <span class="ee-line-item-id">';
 			$html .= sprintf(
 				_n(
@@ -261,7 +261,7 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	protected function _sub_item_row( EE_Line_Item $line_item, $options = array() ) {
+	protected function _sub_item_row(EE_Line_Item $line_item, $options = array()) {
 		//for now we're not showing sub-items
 		return '';
 	}
@@ -275,13 +275,13 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	protected function _tax_row( EE_Line_Item $line_item, $options = array() ) {
+	protected function _tax_row(EE_Line_Item $line_item, $options = array()) {
 		// start of row
-		$html = EEH_HTML::tr( '', 'admin-primary-mbox-taxes-tr' );
+		$html = EEH_HTML::tr('', 'admin-primary-mbox-taxes-tr');
 		// name th
-		$html .= EEH_HTML::th(  $line_item->name() . '(' . $line_item->get_pretty( 'LIN_percent' ) . '%)', '',  'jst-rght', '', ' colspan="4"' );
+		$html .= EEH_HTML::th($line_item->name().'('.$line_item->get_pretty('LIN_percent').'%)', '', 'jst-rght', '', ' colspan="4"');
 		// total th
-		$html .= EEH_HTML::th( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'jst-rght' );
+		$html .= EEH_HTML::th(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght');
 		// end of row
 		$html .= EEH_HTML::trx();
 		return $html;
@@ -298,7 +298,7 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	protected function _sub_total_row( EE_Line_Item $line_item, $text = '', $options = array() ) {
+	protected function _sub_total_row(EE_Line_Item $line_item, $text = '', $options = array()) {
 		//currently not showing subtotal row
 		return '';
 	}
@@ -312,15 +312,15 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	protected function _total_row( EE_Line_Item $line_item, $options = array() ) {
+	protected function _total_row(EE_Line_Item $line_item, $options = array()) {
 		// start of row
-		$html = EEH_HTML::tr( '', '', 'admin-primary-mbox-total-tr' );
+		$html = EEH_HTML::tr('', '', 'admin-primary-mbox-total-tr');
 		// Total th label
-		$total_label = sprintf( __( 'Transaction Total %s', 'event_espresso' ),  '(' . EE_Registry::instance()->CFG->currency->code . ')' );
-		$html .= EEH_HTML::th( $total_label, '',  'jst-rght',  '',  ' colspan="4"' );
+		$total_label = sprintf(__('Transaction Total %s', 'event_espresso'), '('.EE_Registry::instance()->CFG->currency->code.')');
+		$html .= EEH_HTML::th($total_label, '', 'jst-rght', '', ' colspan="4"');
 		// total th
 
-		$html .= EEH_HTML::th( EEH_Template::format_currency( $line_item->total(), false, false ), '',  'jst-rght' );
+		$html .= EEH_HTML::th(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght');
 		// end of row
 		$html .= EEH_HTML::trx();
 		return $html;

core/libraries/line_item_display/EE_Receipt_Line_Item_Display_Strategy.strategy.php

Doc Comments +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 	/**
 	 * @param EE_Line_Item $line_item
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	public function display_line_item( EE_Line_Item $line_item, $options = array() ) {
 

Indentation +11 added lines, -11 removed lines

@@ -14,17 +14,17 @@
  * ------------------------------------------------------------------------
  */
  /**
- *
- * Class EE_Receipt_Line_Item_Display_Strategy
- *
- * Description
- *
- * @package         Event Espresso
- * @subpackage    core
- * @author				Brent Christensen
- * @since		 	   $VID:$
- *
- */
+  *
+  * Class EE_Receipt_Line_Item_Display_Strategy
+  *
+  * Description
+  *
+  * @package         Event Espresso
+  * @subpackage    core
+  * @author				Brent Christensen
+  * @since		 	   $VID:$
+  *
+  */
 
 class EE_Receipt_Line_Item_Display_Strategy  implements EEI_Line_Item_Display {
 

Spacing +7 added lines, -7 removed lines

@@ -33,7 +33,7 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	public function display_line_item( EE_Line_Item $line_item, $options = array() ) {
+	public function display_line_item(EE_Line_Item $line_item, $options = array()) {
 
 		$html = '';
 		// set some default options and merge with incoming
@@ -41,12 +41,12 @@ 
 			'show_desc' => TRUE,
 			'odd' => FALSE
 		);
-		$options = array_merge( $default_options, (array)$options );
-		switch( $line_item->type() ) {
+		$options = array_merge($default_options, (array) $options);
+		switch ($line_item->type()) {
 
 			case EEM_Line_Item::type_total:
 				// loop thru children
-				foreach( $line_item->children() as $child_line_item ) {
+				foreach ($line_item->children() as $child_line_item) {
 					// recursively feed children back into this method
 //					$html .= $this->display_line_item( $child_line_item, $options );
 				}
@@ -57,7 +57,7 @@ 
 
 			case EEM_Line_Item::type_sub_total:
 				// loop thru children
-				foreach( $line_item->children() as $child_line_item ) {
+				foreach ($line_item->children() as $child_line_item) {
 					// recursively feed children back into this method
 //					$html .= $this->display_line_item( $child_line_item, $options );
 				}
@@ -67,7 +67,7 @@ 
 
 			case EEM_Line_Item::type_tax_sub_total:
 				// loop thru children
-				foreach( $line_item->children() as $child_line_item ) {
+				foreach ($line_item->children() as $child_line_item) {
 					// recursively feed children back into this method
 //					$html .= $this->display_line_item( $child_line_item, $options );
 				}
@@ -79,7 +79,7 @@ 
 				// item row
 //				$html .= $this->_item_row( $line_item, $options );
 				// got any kids?
-				foreach( $line_item->children() as $child_line_item ) {
+				foreach ($line_item->children() as $child_line_item) {
 //					$this->display_line_item( $child_line_item, $options );
 				}
 				break;

core/libraries/qtips/EE_Qtip_Config.lib.php

Doc Comments +1 added lines, -1 removed lines

@@ -200,7 +200,7 @@
 	 * return the _qtips property contents
 	 *
 	 * @access public
-	 * @return EE_Qtip[]
+	 * @return EE_Qtip
 	 */
 	public function get_tips() {
 		return $this->_qtips;

Braces +6 added lines, -4 removed lines

@@ -177,8 +177,9 @@ 
 	protected function _construct_tips() {
 		foreach ( $this->_qtipsa as $qt ) {
 			//make sure we have what we need.
-			if ( !isset( $qt['content_id'] ) || !isset( $qt['target'] ) || !isset( $qt['content'] ) )
-				throw new EE_Error( sprintf( __('There is something wrong with the _qtipsa property setup for the %s qtip config class.  The dump of the current array index is: %s.<br /><br />Please check that it is setup correctly.', 'event_espresso'), get_class($this), var_export($qt, true) ) );
+			if ( !isset( $qt['content_id'] ) || !isset( $qt['target'] ) || !isset( $qt['content'] ) ) {
+							throw new EE_Error( sprintf( __('There is something wrong with the _qtipsa property setup for the %s qtip config class.  The dump of the current array index is: %s.<br /><br />Please check that it is setup correctly.', 'event_espresso'), get_class($this), var_export($qt, true) ) );
+			}
 
 			//make sure the options include defaults and just override via set config.
 			$options_override = isset( $qt['options'] ) ? (array) $qt['options'] : array();
@@ -266,8 +267,9 @@ 
 
 	public function __construct( $setup_array ) {
 		foreach ( $setup_array as $prop => $value ) {
-			if ( EEH_Class_Tools::has_property( $this, $prop ) )
-				$this->{$prop} = $value;
+			if ( EEH_Class_Tools::has_property( $this, $prop ) ) {
+							$this->{$prop} = $value;
+			}
 		}
 	}
 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -142,7 +142,7 @@ 
 				'event' => 'mouseleave', //similar as what you do for show.event.
 				'target' => false, //Options jQuery::#selector. which html element will trigger hide event. When false, the element the .qtip() method was called upon is used.
 				'delay' => 0, //set time in milliseconds for delaying the hide of the tooltip
-				'inactive' => false,  //if integer, time in millisecons in which the tooltip should be hidden if remains inactive (not interacted with)
+				'inactive' => false, //if integer, time in millisecons in which the tooltip should be hidden if remains inactive (not interacted with)
 				'fixed' => false, //when set to true, the tooltip will not hide if moused over.
 				'leave' => 'window', //specify whether the tooltip will hide when leaving the window it's conained within.
 				'distance' => false, //if integer, distance in pixels that the tooltip hides when the mouse is moved from the point it triggered the tooltip.
@@ -175,21 +175,21 @@ 
 	 * @return void
 	 */
 	protected function _construct_tips() {
-		foreach ( $this->_qtipsa as $qt ) {
+		foreach ($this->_qtipsa as $qt) {
 			//make sure we have what we need.
-			if ( !isset( $qt['content_id'] ) || !isset( $qt['target'] ) || !isset( $qt['content'] ) )
-				throw new EE_Error( sprintf( __('There is something wrong with the _qtipsa property setup for the %s qtip config class.  The dump of the current array index is: %s.<br /><br />Please check that it is setup correctly.', 'event_espresso'), get_class($this), var_export($qt, true) ) );
+			if ( ! isset($qt['content_id']) || ! isset($qt['target']) || ! isset($qt['content']))
+				throw new EE_Error(sprintf(__('There is something wrong with the _qtipsa property setup for the %s qtip config class.  The dump of the current array index is: %s.<br /><br />Please check that it is setup correctly.', 'event_espresso'), get_class($this), var_export($qt, true)));
 
 			//make sure the options include defaults and just override via set config.
-			$options_override = isset( $qt['options'] ) ? (array) $qt['options'] : array();
-			$options = array_merge( $this->_default_options, $options_override );
+			$options_override = isset($qt['options']) ? (array) $qt['options'] : array();
+			$options = array_merge($this->_default_options, $options_override);
 			$setup = array(
 				'content_id' => $qt['content_id'],
 				'options' => $options,
 				'target' => $qt['target'],
 				'content' => $qt['content']
 				);
-			$this->_qtips[] = new EE_Qtip( $setup );
+			$this->_qtips[] = new EE_Qtip($setup);
 		}
 	}
 
@@ -264,9 +264,9 @@ 
 	public $target;
 	public $content;
 
-	public function __construct( $setup_array ) {
-		foreach ( $setup_array as $prop => $value ) {
-			if ( EEH_Class_Tools::has_property( $this, $prop ) )
+	public function __construct($setup_array) {
+		foreach ($setup_array as $prop => $value) {
+			if (EEH_Class_Tools::has_property($this, $prop))
 				$this->{$prop} = $value;
 		}
 	}

core/libraries/shortcodes/EE_Event_Shortcodes.lib.php

Doc Comments +1 added lines

@@ -179,6 +179,7 @@
 	/**
 	 * returns the link to the event
 	 * @param  boolean $full_link if TRUE (default) we return the html for the name of the event linked to the event.  Otherwise we just return the url of the event.
+	 * @param EE_Event $event
 	 * @return string
 	 */
 	private function _get_event_link( $event, $full_link = TRUE ) {

Braces +11 added lines, -7 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -85,8 +86,9 @@ 
 
 
 		//If there is no event objecdt by now then get out.
-		if ( ! $this->_event instanceof EE_Event )
-			return '';
+		if ( ! $this->_event instanceof EE_Event ) {
+					return '';
+		}
 
 		switch ( $shortcode ) {
 
@@ -125,14 +127,16 @@ 
 
 			case '[VIRTUAL_URL]' :
 				$venue = $this->_event->get_first_related('Venue');
-				if ( empty( $venue ) )
-					return '';
+				if ( empty( $venue ) ) {
+									return '';
+				}
 				return $venue->get('VNU_virtual_url');
 
 			case '[VIRTUAL_PHONE]' :
 				$venue = $this->_event->get_first_related('Venue');
-				if ( empty( $venue ) )
-					return '';
+				if ( empty( $venue ) ) {
+									return '';
+				}
 				return $venue->get('VNU_virtual_phone');
 				break;
 

Spacing +39 added lines, -39 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -55,38 +55,38 @@ 
 			'[EVENT_NAME]' => __("This also can be used for the name of the event", 'event_espresso'),
 			'[EVENT_PHONE]' => __('The phone number for the event (usually an info number)', 'event_espresso'),
 			'[EVENT_DESCRIPTION]' => __('The description of the event', 'event_espresso'),
-			'[EVENT_EXCERPT]' => __( 'This gets parsed to the value for the excerpt field in the event or blank if there is no excerpt.', 'event_espresso' ),
+			'[EVENT_EXCERPT]' => __('This gets parsed to the value for the excerpt field in the event or blank if there is no excerpt.', 'event_espresso'),
 			'[EVENT_LINK]' => __('A link associated with the event', 'event_espresso'),
 			'[EVENT_URL]' => __('A link to the event set up on the host site.', 'event_espresso'),
 			'[VIRTUAL_URL]' => __('What was used for the "URL of Event" field in the Venue settings', 'event_espresso'),
 			'[VIRTUAL_PHONE]' => __('An alternate phone number for the event. Typically used as a "call-in" number', 'event_espresso'),
 			'[EVENT_IMAGE]' => __('This will parse to the Feature image for the event.', 'event_espresso'),
 			'[EVENT_IMAGE_*]' => sprintf(
-				__( 'This will parse to the Feature image for the event, %1$ssize%2$s can be set to determine the size of the image loaded by the shortcode. The %1$swidth%2$s and/or %1$sheight%2$s can also be set to determine the width and height of the image when output. By default the shortcode will load the %1$sthumbnail%2$s image size.', 'event_espresso' ),
+				__('This will parse to the Feature image for the event, %1$ssize%2$s can be set to determine the size of the image loaded by the shortcode. The %1$swidth%2$s and/or %1$sheight%2$s can also be set to determine the width and height of the image when output. By default the shortcode will load the %1$sthumbnail%2$s image size.', 'event_espresso'),
 				'<code>',
 				'</code>'
 				),
 			'[EVENT_TOTAL_AVAILABLE_SPACES_*]' => sprintf(
-				__( 'This will parse to the total available spaces for an event. Calculating total spaces is approximate because it is dependent on the complexity of limits on your event.  There are two methods of calculation (which can be indicated by the %1$smethod%2$s param on the shortcode).  %1$scurrent%2$s which will do a more accurate calculation of total available spaces based on current sales, and %1$sfull%2$s which will be the maximum total available spaces that is on the event in optimal conditions. The shortcode will default to current.', 'event_espresso' ),
+				__('This will parse to the total available spaces for an event. Calculating total spaces is approximate because it is dependent on the complexity of limits on your event.  There are two methods of calculation (which can be indicated by the %1$smethod%2$s param on the shortcode).  %1$scurrent%2$s which will do a more accurate calculation of total available spaces based on current sales, and %1$sfull%2$s which will be the maximum total available spaces that is on the event in optimal conditions. The shortcode will default to current.', 'event_espresso'),
 				'<code>',
 				'</code>'
 				),
-			'[EVENT_TOTAL_SPOTS_TAKEN]' => __( 'This shortcode will parse to the output the total approved registrations for this event', 'event_espresso' ),
+			'[EVENT_TOTAL_SPOTS_TAKEN]' => __('This shortcode will parse to the output the total approved registrations for this event', 'event_espresso'),
 			'[EVENT_FACEBOOK_URL]' => __('This will return the Facebook URL for the event if you have it set via custom field in your event, otherwise it will use the Facebook URL set in "Your Organization Settings". To set the facebook url in your event, add a custom field with the key as <code>event_facebook</code> and the value as your facebook url.', 'event_espresso'),
 			'[EVENT_TWITTER_URL]' => __('This will return the Twitter URL for the event if you have it set via custom field in your event, otherwise it will use the Twitter URL set in "Your Organization Settings". To set the facebook url in your event, add a custom field with the key as <code>event_twitter</code> and the value as your facebook url', 'event_espresso'),
 			'[EVENT_META_*]' => __('This is a special dynamic shortcode. After the "*", add the exact name for your custom field, if there is a value set for that custom field within the event then it will be output in place of this shortcode.', 'event_espresso'),
-			'[REGISTRATION_LIST_TABLE_FOR_EVENT_URL]' => __( 'This parses to the url for the registration list table filtered by registrations for this event.', 'event_espresso' ),
+			'[REGISTRATION_LIST_TABLE_FOR_EVENT_URL]' => __('This parses to the url for the registration list table filtered by registrations for this event.', 'event_espresso'),
 			);
 	}
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
 
 		$this->_event = $this->_data instanceof EE_Event ? $this->_data : null;
 
 		//if no event, then let's see if there is a reg_obj.  If there IS, then we'll try and grab the event from the reg_obj instead.
-		if ( empty( $this->_event ) ) {
+		if (empty($this->_event)) {
 			$aee = $this->_data instanceof EE_Messages_Addressee ? $this->_data : NULL;
 			$aee = $this->_extra_data instanceof EE_Messages_Addressee ? $this->_extra_data : $aee;
 
@@ -95,10 +95,10 @@ 
 
 
 		//If there is no event objecdt by now then get out.
-		if ( ! $this->_event instanceof EE_Event )
+		if ( ! $this->_event instanceof EE_Event)
 			return '';
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 
 			case '[EVENT_ID]' :
 				return $this->_event->ID();
@@ -131,41 +131,41 @@ 
 
 			case '[VIRTUAL_URL]' :
 				$venue = $this->_event->get_first_related('Venue');
-				if ( empty( $venue ) )
+				if (empty($venue))
 					return '';
 				return $venue->get('VNU_virtual_url');
 
 			case '[VIRTUAL_PHONE]' :
 				$venue = $this->_event->get_first_related('Venue');
-				if ( empty( $venue ) )
+				if (empty($venue))
 					return '';
 				return $venue->get('VNU_virtual_phone');
 				break;
 
 			case '[EVENT_IMAGE]' :
-				$image = $this->_event->feature_image_url(array(600,300) );
+				$image = $this->_event->feature_image_url(array(600, 300));
 				// @todo: eventually we should make this an attribute shortcode so that em can send along what size they want returned.
-				return ! empty( $image ) ? '<img src="' . $image . '" alt="' . sprintf( esc_attr__( '%s Feature Image', 'event_espresso'), $this->_event->get('EVT_name') ) . '" />' : '';
+				return ! empty($image) ? '<img src="'.$image.'" alt="'.sprintf(esc_attr__('%s Feature Image', 'event_espresso'), $this->_event->get('EVT_name')).'" />' : '';
 				break;
 
 			case '[EVENT_FACEBOOK_URL]' :
-				$facebook_url = $this->_event->get_post_meta('event_facebook', true );
-				return empty( $facebook_url ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'facebook' ) : $facebook_url;
+				$facebook_url = $this->_event->get_post_meta('event_facebook', true);
+				return empty($facebook_url) ? EE_Registry::instance()->CFG->organization->get_pretty('facebook') : $facebook_url;
 				break;
 
 			case '[EVENT_TWITTER_URL]' :
 				$twitter_url = $this->_event->get_post_meta('event_twitter', true);
-				return empty( $twitter_url ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'twitter' ) : $twitter_url;
+				return empty($twitter_url) ? EE_Registry::instance()->CFG->organization->get_pretty('twitter') : $twitter_url;
 				break;
 
 			case '[EVENT_AUTHOR_EMAIL]' :
 				$author_id = $this->_event->get('EVT_wp_user');
-				$user_data = get_userdata( (int) $author_id );
+				$user_data = get_userdata((int) $author_id);
 				return $user_data->user_email;
 				break;
 
 			case '[EVENT_TOTAL_SPOTS_TAKEN]' :
-				return EEM_Registration::instance()->count( array( array( 'EVT_ID' => $this->_event->ID(), 'STS_ID' => EEM_Registration::status_id_approved ) ), 'REG_ID', true );
+				return EEM_Registration::instance()->count(array(array('EVT_ID' => $this->_event->ID(), 'STS_ID' => EEM_Registration::status_id_approved)), 'REG_ID', true);
 				break;
 
 			case '[REGISTRATION_LIST_TABLE_FOR_EVENT_URL]' :
@@ -175,49 +175,49 @@ 
 						'page' => 'espresso_registrations',
 						'action' => 'default'
 					),
-					admin_url( 'admin.php' ),
+					admin_url('admin.php'),
 					true
 				);
 				break;
 		}
 
-		if ( strpos( $shortcode, '[EVENT_META_*' ) !== false ) {
-			$shortcode = str_replace( '[EVENT_META_*', '', $shortcode );
-			$shortcode = trim( str_replace( ']', '', $shortcode ) );
+		if (strpos($shortcode, '[EVENT_META_*') !== false) {
+			$shortcode = str_replace('[EVENT_META_*', '', $shortcode);
+			$shortcode = trim(str_replace(']', '', $shortcode));
 
 			//pull the meta value from the event post
-			$event_meta = $this->_event->get_post_meta( $shortcode, true );
+			$event_meta = $this->_event->get_post_meta($shortcode, true);
 
-			return ! empty( $event_meta ) ? $this->_event->get_post_meta( $shortcode, true ) : '';
+			return ! empty($event_meta) ? $this->_event->get_post_meta($shortcode, true) : '';
 
 		}
 
-		if ( strpos( $shortcode, '[EVENT_TOTAL_AVAILABLE_SPACES_*' ) !== false ) {
-			$attrs = $this->_get_shortcode_attrs( $shortcode );
-			$method = empty( $attrs['method'] ) ? 'current' : $attrs['method'];
+		if (strpos($shortcode, '[EVENT_TOTAL_AVAILABLE_SPACES_*') !== false) {
+			$attrs = $this->_get_shortcode_attrs($shortcode);
+			$method = empty($attrs['method']) ? 'current' : $attrs['method'];
 			$method = $method === 'current';
 			$available = $this->_event->total_available_spaces($method);
 			return $available === EE_INF ? '&infin;' : $available;
 		}
 
-		if ( strpos( $shortcode, '[EVENT_IMAGE_*' ) !== false ) {
-			$attrs = $this->_get_shortcode_attrs( $shortcode );
-			$width = empty( $attrs['width'] ) ? '' : ' width="' . $attrs['width'] . '"'; 
-			$height = empty( $attrs['height'] ) ? '' : ' height="'. $attrs['height'] .'"'; 
+		if (strpos($shortcode, '[EVENT_IMAGE_*') !== false) {
+			$attrs = $this->_get_shortcode_attrs($shortcode);
+			$width = empty($attrs['width']) ? '' : ' width="'.$attrs['width'].'"'; 
+			$height = empty($attrs['height']) ? '' : ' height="'.$attrs['height'].'"'; 
 
 			//Size may be set to a string such as 'tumbnail' or "width, height" eg - '200,200'
-			if ( ! empty( $attrs['size'] ) ) {
-				$size = explode( ',', $attrs['size'] );
-				if ( count($size) === 1 ) {
+			if ( ! empty($attrs['size'])) {
+				$size = explode(',', $attrs['size']);
+				if (count($size) === 1) {
 					$size = $size[0];
 				}
 			} else {
 				$size = 'thumbnail';
 			}
 
-			$image = $this->_event->feature_image_url( $size );
+			$image = $this->_event->feature_image_url($size);
 
-			return ! empty( $image ) ? '<img src="' . $image . '" alt="' . sprintf( esc_attr__( '%s Feature Image', 'event_espresso'), $this->_event->get('EVT_name') ) . '"' . $width . $height . '/>' : '';
+			return ! empty($image) ? '<img src="'.$image.'" alt="'.sprintf(esc_attr__('%s Feature Image', 'event_espresso'), $this->_event->get('EVT_name')).'"'.$width.$height.'/>' : '';
 		}
 
 		return '';
@@ -230,10 +230,10 @@ 
 	 * @param  boolean $full_link if TRUE (default) we return the html for the name of the event linked to the event.  Otherwise we just return the url of the event.
 	 * @return string
 	 */
-	private function _get_event_link( $event, $full_link = TRUE ) {
+	private function _get_event_link($event, $full_link = TRUE) {
 		$url = get_permalink($event->ID());
 
-		return $full_link ? '<a href="' . $url . '">' . $event->get('EVT_name') . '</a>' : $url;
+		return $full_link ? '<a href="'.$url.'">'.$event->get('EVT_name').'</a>' : $url;
 	}
 
 

core/libraries/shortcodes/EE_Primary_Registration_List_Shortcodes.lib.php

Doc Comments +6 added lines

@@ -109,6 +109,9 @@ 
 	}
 
 
+	/**
+	 * @param EE_Registration $reg
+	 */
 	private function _get_tickets_from_event( EE_Event $event, $reg = NULL ) {
 		$evt_tkts = isset($this->_extra_data['data']->events) ? $this->_extra_data['data']->events[$event->ID()]['tkt_objs'] : array();
 
@@ -177,6 +180,9 @@ 
 
 
 
+	/**
+	 * @param EE_Registration $reg
+	 */
 	private function _get_datetimes_from_event( EE_Event $event, $reg = NULL ) {
 		$evt_dtts = isset($this->_extra_data['data']->events) ? $this->_extra_data['data']->events[$event->ID()]['dtt_objs'] : array();
 

Spacing +40 added lines, -40 removed lines

@@ -43,15 +43,15 @@ 
 
 
 
-	protected function _parser( $shortcode ) {
-		switch ( $shortcode ) {
+	protected function _parser($shortcode) {
+		switch ($shortcode) {
 
 			case '[PRIMARY_REGISTRANT_TICKET_LIST]' :
-				return $this->_get_recipient_ticket_list( TRUE );
+				return $this->_get_recipient_ticket_list(TRUE);
 				break;
 
 			case '[PRIMARY_REGISTRANT_DATETIME_LIST]' :
-				return $this->_get_recipient_datetime_list( TRUE );
+				return $this->_get_recipient_datetime_list(TRUE);
 				break;
 		}
 		return '';
@@ -65,57 +65,57 @@ 
 	 * @param  boolean $primary whether we're getting the primary registrant ticket_list.
 	 * @return string
 	 */
-	private function _get_recipient_ticket_list( $primary = FALSE ) {
+	private function _get_recipient_ticket_list($primary = FALSE) {
 		$this->_validate_list_requirements();
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_ticket_list_parsed( $this->_data['data'], $primary );
+		if ($this->_data['data'] instanceof EE_Messages_Addressee)
+			return $this->_get_recipient_ticket_list_parsed($this->_data['data'], $primary);
 
-		else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_ticket_list_parsed( $this->_extra_data['data'], $primary );
+		else if ($this->_extra_data['data'] instanceof EE_Messages_Addressee)
+			return $this->_get_recipient_ticket_list_parsed($this->_extra_data['data'], $primary);
 
 		else
 			return '';
 	}
 
 
-	private function _get_recipient_ticket_list_parsed( EE_Messages_Addressee $data, $primary = FALSE ) {
+	private function _get_recipient_ticket_list_parsed(EE_Messages_Addressee $data, $primary = FALSE) {
 		$registration = $primary ? $data->primary_reg_obj : $data->reg_obj;
-			if ( ! $registration instanceof EE_Registration ) return '';
+			if ( ! $registration instanceof EE_Registration) return '';
 		//setup valid shortcodes depending on what the status of the $this->_data property is
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
-			$valid_shortcodes = array('ticket', 'event_list', 'attendee_list','datetime_list', 'registration_details', 'attendee');
+		if ($this->_data['data'] instanceof EE_Messages_Addressee) {
+			$valid_shortcodes = array('ticket', 'event_list', 'attendee_list', 'datetime_list', 'registration_details', 'attendee');
 			$template = $this->_data['template'];
 			$tkts = array($data->registrations[$registration->ID()]['tkt_obj']);
 			$data = $this->_data;
-		} elseif ( $this->_data['data'] instanceof EE_Event ) {
+		} elseif ($this->_data['data'] instanceof EE_Event) {
 			$valid_shortcodes = array('ticket', 'attendee_list', 'datetime_list', 'attendee');
-			$template = is_array($this->_data['template'] ) && isset($this->_data['template']['ticket_list']) ? $this->_data['template']['ticket_list'] : $this->_extra_data['template']['ticket_list'];
+			$template = is_array($this->_data['template']) && isset($this->_data['template']['ticket_list']) ? $this->_data['template']['ticket_list'] : $this->_extra_data['template']['ticket_list'];
 			//let's remove any existing [EVENT_LIST] shortcode from the ticket list template so that we don't get recursion.
 			$template = str_replace('[EVENT_LIST]', '', $template);
 			//data will be tickets for this event for this recipient.
-			$tkts = $this->_get_tickets_from_event( $this->_data['data'], $registration );
+			$tkts = $this->_get_tickets_from_event($this->_data['data'], $registration);
 			$data = $this->_extra_data;
 		} else {
 			return '';
 		}
 
 		$tktparsed = '';
-		foreach ( $tkts as $ticket ) {
-			$tktparsed .= $this->_shortcode_helper->parse_ticket_list_template( $template, $ticket, $valid_shortcodes, $data );
+		foreach ($tkts as $ticket) {
+			$tktparsed .= $this->_shortcode_helper->parse_ticket_list_template($template, $ticket, $valid_shortcodes, $data);
 		}
 		return $tktparsed;
 	}
 
 
-	private function _get_tickets_from_event( EE_Event $event, $reg = NULL ) {
+	private function _get_tickets_from_event(EE_Event $event, $reg = NULL) {
 		$evt_tkts = isset($this->_extra_data['data']->events) ? $this->_extra_data['data']->events[$event->ID()]['tkt_objs'] : array();
 
-		if ( $reg instanceof EE_Registration && $this->_extra_data['data'] instanceof EE_Messages_Addressee ) {
+		if ($reg instanceof EE_Registration && $this->_extra_data['data'] instanceof EE_Messages_Addressee) {
 			$adj_tkts = array();
 			//return only tickets for the given attendee
-			foreach ( $evt_tkts as $tkt ) {
-				if ( isset( $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj'] ) && $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj']->ID() == $tkt->ID() )
+			foreach ($evt_tkts as $tkt) {
+				if (isset($this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj']) && $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj']->ID() == $tkt->ID())
 					$adj_tkts[] = $tkt;
 			}
 			$evt_tkts = $adj_tkts;
@@ -132,57 +132,57 @@ 
 	 * @param  boolean $primary whether we're getting the primary registrant ticket_list.
 	 * @return string
 	 */
-	private function _get_recipient_datetime_list( $primary = FALSE ) {
+	private function _get_recipient_datetime_list($primary = FALSE) {
 		$this->_validate_list_requirements();
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_datetime_list_parsed( $this->_data['data'], $primary );
+		if ($this->_data['data'] instanceof EE_Messages_Addressee)
+			return $this->_get_recipient_datetime_list_parsed($this->_data['data'], $primary);
 
-		else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_datetime_list_parsed( $this->_extra_data['data'], $primary );
+		else if ($this->_extra_data['data'] instanceof EE_Messages_Addressee)
+			return $this->_get_recipient_datetime_list_parsed($this->_extra_data['data'], $primary);
 
 		else
 			return '';
 
-		return $this->_get_recipient_datetime_list_parsed( $this->_data['data'], $primary);
+		return $this->_get_recipient_datetime_list_parsed($this->_data['data'], $primary);
 	}
 
 
-	private function _get_recipient_datetime_list_parsed( EE_Messages_Addressee $data, $primary = FALSE ) {
+	private function _get_recipient_datetime_list_parsed(EE_Messages_Addressee $data, $primary = FALSE) {
 		$registration = $primary ? $data->primary_reg_obj : $data->reg_obj;
-		if ( ! $registration instanceof EE_Registration ) return '';
+		if ( ! $registration instanceof EE_Registration) return '';
 		//setup valid shortcodes depending on what the status of the $this->_data property is
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
+		if ($this->_data['data'] instanceof EE_Messages_Addressee) {
 			$valid_shortcodes = array('datetime', 'attendee');
 			$template = $this->_data['template'];
 			$dtts = $data->registrations[$registration->ID()]['dtt_objs'];
 			$data = $this->_data;
-		} elseif ( $this->_data['data'] instanceof EE_Event ) {
+		} elseif ($this->_data['data'] instanceof EE_Event) {
 			$valid_shortcodes = array('datetime', 'attendee');
-			$template = is_array($this->_data['template'] ) && isset($this->_data['template']['datetime_list']) ? $this->_data['template']['datetime_list'] : $this->_extra_data['template']['datetime_list'];
-			$dtts = $this->_get_datetimes_from_event( $this->_data['data'], $registration );
+			$template = is_array($this->_data['template']) && isset($this->_data['template']['datetime_list']) ? $this->_data['template']['datetime_list'] : $this->_extra_data['template']['datetime_list'];
+			$dtts = $this->_get_datetimes_from_event($this->_data['data'], $registration);
 			$data = $this->_extra_data;
 		} else {
 			return '';
 		}
 
 		$dtt_parsed = '';
-		foreach ( $dtts as $datetime ) {
-			$dtt_parsed .= $this->_shortcode_helper->parse_datetime_list_template( $template, $datetime, $valid_shortcodes, $this->_extra_data );
+		foreach ($dtts as $datetime) {
+			$dtt_parsed .= $this->_shortcode_helper->parse_datetime_list_template($template, $datetime, $valid_shortcodes, $this->_extra_data);
 		}
 		return $dtt_parsed;
 	}
 
 
 
-	private function _get_datetimes_from_event( EE_Event $event, $reg = NULL ) {
+	private function _get_datetimes_from_event(EE_Event $event, $reg = NULL) {
 		$evt_dtts = isset($this->_extra_data['data']->events) ? $this->_extra_data['data']->events[$event->ID()]['dtt_objs'] : array();
 
-		if ( $reg instanceof EE_Registration && $this->_extra_data['data'] instanceof EE_Messages_Addressee ) {
+		if ($reg instanceof EE_Registration && $this->_extra_data['data'] instanceof EE_Messages_Addressee) {
 			$adj_dtts = array();
 			//return only dtts for the given attendee
-			foreach ( $evt_dtts as $dtt ) {
-				if ( isset( $this->_extra_data['data']->registrations[$reg->ID()]['dtt_objs'][$dtt->ID()] ) )
+			foreach ($evt_dtts as $dtt) {
+				if (isset($this->_extra_data['data']->registrations[$reg->ID()]['dtt_objs'][$dtt->ID()]))
 					$adj_dtts[] = $dtt;
 			}
 			$evt_dtts = $adj_dtts;

Braces +26 added lines, -22 removed lines

@@ -68,20 +68,21 @@ 
 	private function _get_recipient_ticket_list( $primary = FALSE ) {
 		$this->_validate_list_requirements();
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_ticket_list_parsed( $this->_data['data'], $primary );
-
-		else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_ticket_list_parsed( $this->_extra_data['data'], $primary );
-
-		else
-			return '';
+		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
+					return $this->_get_recipient_ticket_list_parsed( $this->_data['data'], $primary );
+		} else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee ) {
+					return $this->_get_recipient_ticket_list_parsed( $this->_extra_data['data'], $primary );
+		} else {
+					return '';
+		}
 	}
 
 
 	private function _get_recipient_ticket_list_parsed( EE_Messages_Addressee $data, $primary = FALSE ) {
 		$registration = $primary ? $data->primary_reg_obj : $data->reg_obj;
-			if ( ! $registration instanceof EE_Registration ) return '';
+			if ( ! $registration instanceof EE_Registration ) {
+				return '';
+			}
 		//setup valid shortcodes depending on what the status of the $this->_data property is
 		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
 			$valid_shortcodes = array('ticket', 'event_list', 'attendee_list','datetime_list', 'registration_details', 'attendee');
@@ -115,8 +116,9 @@ 
 			$adj_tkts = array();
 			//return only tickets for the given attendee
 			foreach ( $evt_tkts as $tkt ) {
-				if ( isset( $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj'] ) && $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj']->ID() == $tkt->ID() )
-					$adj_tkts[] = $tkt;
+				if ( isset( $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj'] ) && $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj']->ID() == $tkt->ID() ) {
+									$adj_tkts[] = $tkt;
+				}
 			}
 			$evt_tkts = $adj_tkts;
 		}
@@ -135,14 +137,13 @@ 
 	private function _get_recipient_datetime_list( $primary = FALSE ) {
 		$this->_validate_list_requirements();
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_datetime_list_parsed( $this->_data['data'], $primary );
-
-		else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_datetime_list_parsed( $this->_extra_data['data'], $primary );
-
-		else
-			return '';
+		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
+					return $this->_get_recipient_datetime_list_parsed( $this->_data['data'], $primary );
+		} else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee ) {
+					return $this->_get_recipient_datetime_list_parsed( $this->_extra_data['data'], $primary );
+		} else {
+					return '';
+		}
 
 		return $this->_get_recipient_datetime_list_parsed( $this->_data['data'], $primary);
 	}
@@ -150,7 +151,9 @@ 
 
 	private function _get_recipient_datetime_list_parsed( EE_Messages_Addressee $data, $primary = FALSE ) {
 		$registration = $primary ? $data->primary_reg_obj : $data->reg_obj;
-		if ( ! $registration instanceof EE_Registration ) return '';
+		if ( ! $registration instanceof EE_Registration ) {
+			return '';
+		}
 		//setup valid shortcodes depending on what the status of the $this->_data property is
 		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
 			$valid_shortcodes = array('datetime', 'attendee');
@@ -182,8 +185,9 @@ 
 			$adj_dtts = array();
 			//return only dtts for the given attendee
 			foreach ( $evt_dtts as $dtt ) {
-				if ( isset( $this->_extra_data['data']->registrations[$reg->ID()]['dtt_objs'][$dtt->ID()] ) )
-					$adj_dtts[] = $dtt;
+				if ( isset( $this->_extra_data['data']->registrations[$reg->ID()]['dtt_objs'][$dtt->ID()] ) ) {
+									$adj_dtts[] = $dtt;
+				}
 			}
 			$evt_dtts = $adj_dtts;
 		}

core/libraries/shortcodes/EE_Venue_Shortcodes.lib.php

Doc Comments +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
 
 	/**
 	 * This retrieves the specified venue information
-	 * @param  string $what What to retrieve from database
+	 * @param string $db_ref
 	 * @return string       What was retrieved!
 	 */
 	private function _venue( $db_ref ) {

Braces +9 added lines, -5 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -155,13 +156,16 @@ 
 
 
 		//If there is no event objecdt by now then get out.
-		if ( ! $this->_event instanceof EE_Event )
-			return '';
+		if ( ! $this->_event instanceof EE_Event ) {
+					return '';
+		}
 
 		$venue = $this->_event->get_first_related('Venue');
 
-		if ( empty( $venue ) )
-			return ''; //no venue so get out.
+		if ( empty( $venue ) ) {
+					return '';
+		}
+		//no venue so get out.
 
 		switch ( $db_ref ) {
 			case 'title':

Spacing +16 added lines, -16 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -62,9 +62,9 @@ 
 	}
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 
 			case '[VENUE_TITLE]' :
 				return $this->_venue('title');
@@ -132,38 +132,38 @@ 
 	 * @param  string $what What to retrieve from database
 	 * @return string       What was retrieved!
 	 */
-	private function _venue( $db_ref ) {
+	private function _venue($db_ref) {
 
 		//we need the EE_Event object to get the venue.
 
 		$this->_event = $this->_data instanceof EE_Event ? $this->_data : null;
 
 		//if no event, then let's see if there is a reg_obj.  If there IS, then we'll try and grab the event from the reg_obj instead.
-		if ( empty( $this->_event ) ) {
+		if (empty($this->_event)) {
 			$aee = $this->_data instanceof EE_Messages_Addressee ? $this->_data : NULL;
 			$aee = $this->_extra_data instanceof EE_Messages_Addressee ? $this->_extra_data : $aee;
 
 			$this->_event = $aee instanceof EE_Messages_Addressee && $aee->reg_obj instanceof EE_Registration ? $aee->reg_obj->event() : NULL;
 
 			//if still empty do we have a ticket data item?
-			$this->_event = empty( $this->_event ) && $this->_data instanceof EE_Ticket && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data']->tickets[$this->_data->ID()]['EE_Event'] : $this->_event;
+			$this->_event = empty($this->_event) && $this->_data instanceof EE_Ticket && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data']->tickets[$this->_data->ID()]['EE_Event'] : $this->_event;
 
 			//if STILL empty event, let's try to get the first event in the list of events via EE_Messages_Addressee and use that.
-			$event = $aee instanceof EE_Messages_Addressee ? reset( $aee->events ) : array();
-			$this->_event = empty( $this->_event ) && !empty( $events ) ? $event : $this->_event;
+			$event = $aee instanceof EE_Messages_Addressee ? reset($aee->events) : array();
+			$this->_event = empty($this->_event) && ! empty($events) ? $event : $this->_event;
 		}
 
 
 		//If there is no event objecdt by now then get out.
-		if ( ! $this->_event instanceof EE_Event )
+		if ( ! $this->_event instanceof EE_Event)
 			return '';
 
 		$venue = $this->_event->get_first_related('Venue');
 
-		if ( empty( $venue ) )
+		if (empty($venue))
 			return ''; //no venue so get out.
 
-		switch ( $db_ref ) {
+		switch ($db_ref) {
 			case 'title':
 				return $venue->get('VNU_name');
 				break;
@@ -174,11 +174,11 @@ 
 
 			case 'url':
 				$url = $venue->get('VNU_url');
-				return empty( $url ) ? $venue->get_permalink() : $url;
+				return empty($url) ? $venue->get_permalink() : $url;
 				break;
 
 			case 'image':
-				return '<img src="' . $venue->feature_image_url(array(200,200) ) . '" alt="' . sprintf( esc_attr__( '%s Feature Image', 'event_espresso'), $venue->get('VNU_name') ) . '" />';
+				return '<img src="'.$venue->feature_image_url(array(200, 200)).'" alt="'.sprintf(esc_attr__('%s Feature Image', 'event_espresso'), $venue->get('VNU_name')).'" />';
 				break;
 
 			case 'phone':
@@ -212,7 +212,7 @@ 
 				break;
 
 			case 'formatted_address' :
-				return EEH_Address::format( $venue );
+				return EEH_Address::format($venue);
 				break;
 
 			case 'gmap_link':
@@ -223,9 +223,9 @@ 
 					'id' => $venue->ID(),
 					'address' => $venue->get('VNU_address'),
 					'city' => $venue->get('VNU_city'),
-					'state' => is_object( $state ) ? $state->get('STA_name') : '',
+					'state' => is_object($state) ? $state->get('STA_name') : '',
 					'zip' => $venue->get('VNU_zip'),
-					'country' => is_object( $country ) ? $country->get('CNT_name'): '',
+					'country' => is_object($country) ? $country->get('CNT_name') : '',
 					'type' => $db_ref == 'gmap_link' ? 'url' : 'map',
 					'map_w' => 200,
 					'map_h' => 200

modules/certificate/EED_Certificate.module.php

Doc Comments +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
 	 * 	the_content
 	 *
 	 *  @access 	public
-	 *  @return 	void
+	 *  @return 	string
 	 */
 	public function the_content( $content ) {
 		$content .= $this->ouput;

Spacing +5 added lines, -5 removed lines

@@ -29,7 +29,7 @@ 
 	 * @return EED_Module
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -60,7 +60,7 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 //		add_filter( 'FHEE_load_ee_config', '__return_true' );
 //		add_filter( 'FHEE_run_EE_wp', '__return_true' );
 //		add_filter( 'FHEE_load_EE_Session', '__return_true' );
@@ -79,8 +79,8 @@ 
 	 *  @return 	void
 	 */
 	public function certificate_launch() {
-		if ( EE_Registry::instance()->REQ->is_set( 'id' ) && EE_Registry::instance()->REQ->is_set( 'r_id' )) {
-			echo espresso_certificate_launch( EE_Registry::instance()->REQ->get( 'id' ), EE_Registry::instance()->REQ->get( 'r_id' ));
+		if (EE_Registry::instance()->REQ->is_set('id') && EE_Registry::instance()->REQ->is_set('r_id')) {
+			echo espresso_certificate_launch(EE_Registry::instance()->REQ->get('id'), EE_Registry::instance()->REQ->get('r_id'));
 		}
 	}
 
@@ -114,7 +114,7 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function the_content( $content ) {
+	public function the_content($content) {
 		$content .= $this->ouput;
 		return $content;
 	}

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/events_archive/EED_Events_Archive.module.php

Doc Comments +1 added lines, -1 removed lines

@@ -495,7 +495,7 @@
 	 *    display_description
 	 *
 	 * @access    public
-	 * @param $value
+	 * @param integer $value
 	 * @return    bool
 	 */
 	public static function display_description( $value ) {

Indentation +21 added lines, -21 removed lines

@@ -37,19 +37,19 @@ 
 	 */
 	protected static $using_get_the_excerpt = false;
 
-    /**
-     * Used to flag when the event list is being called from an external iframe.
-     *
-     * @var bool $iframe
-     */
-    protected static $iframe = false;
-
-    /**
+	/**
+	 * Used to flag when the event list is being called from an external iframe.
+	 *
+	 * @var bool $iframe
+	 */
+	protected static $iframe = false;
+
+	/**
 	 * @var \EventEspresso\core\libraries\iframe_display\EventListIframeEmbedButton $_iframe_embed_button
 	 */
 	private static $_iframe_embed_button;
 
-    /**
+	/**
 	 * @type EE_Template_Part_Manager $template_parts
 	 */
 	protected $template_parts;
@@ -233,26 +233,26 @@ 
 
 
 
-    /**
-     * @access    public
-     * @return    void
-     * @throws \EE_Error
-     * @throws \DomainException
-     */
+	/**
+	 * @access    public
+	 * @return    void
+	 * @throws \EE_Error
+	 * @throws \DomainException
+	 */
 	public function event_list_iframe() {
-        \EED_Events_Archive::$iframe = true;
+		\EED_Events_Archive::$iframe = true;
 		$event_list_iframe = new EventsArchiveIframe( $this );
 		$event_list_iframe->display();
 	}
 
 
 
-    /**
-     * @access public
-     * @return string
-     */
+	/**
+	 * @access public
+	 * @return string
+	 */
 	public static function link_target() {
-        return \EED_Events_Archive::$iframe ? ' target="_blank"' : '';
+		return \EED_Events_Archive::$iframe ? ' target="_blank"' : '';
 	}
 
 

Spacing +178 added lines, -178 removed lines

@@ -3,7 +3,7 @@ 
 use EventEspresso\core\libraries\iframe_display\EventListIframeEmbedButton;
 use EventEspresso\modules\events_archive\EventsArchiveIframe;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
  * Event Espresso
  *
@@ -60,7 +60,7 @@ 
 	 * @return EED_Events_Archive
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -72,10 +72,10 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-		EE_Config::register_route( EE_Registry::instance()->CFG->core->event_cpt_slug, 'Events_Archive', 'run' );
-		EE_Config::register_route( 'event_list', 'Events_Archive', 'event_list' );
-		EE_Config::register_route( 'iframe', 'Events_Archive', 'event_list_iframe', 'event_list' );
-		add_action( 'wp_loaded', array( 'EED_Events_Archive', 'set_definitions' ), 2 );
+		EE_Config::register_route(EE_Registry::instance()->CFG->core->event_cpt_slug, 'Events_Archive', 'run');
+		EE_Config::register_route('event_list', 'Events_Archive', 'event_list');
+		EE_Config::register_route('iframe', 'Events_Archive', 'event_list_iframe', 'event_list');
+		add_action('wp_loaded', array('EED_Events_Archive', 'set_definitions'), 2);
 	}
 
 	/**
@@ -85,12 +85,12 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks_admin() {
-		add_action( 'wp_loaded', array( 'EED_Events_Archive', 'set_definitions' ), 2 );
+		add_action('wp_loaded', array('EED_Events_Archive', 'set_definitions'), 2);
 		// hook into the end of the \EE_Admin_Page::_load_page_dependencies()
 		// to load assets for "espresso_events" page on the "default" route (action)
 		add_action(
 			'FHEE__EE_Admin_Page___load_page_dependencies__after_load__espresso_events__default',
-			array( 'EED_Events_Archive', 'event_list_iframe_embed_button' ),
+			array('EED_Events_Archive', 'event_list_iframe_embed_button'),
 			10
 		);
 	}
@@ -105,8 +105,8 @@ 
 	 *  @return 	void
 	 */
 	public static function set_definitions() {
-		define( 'EVENTS_ARCHIVE_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
-		define( 'EVENTS_ARCHIVE_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
+		define('EVENTS_ARCHIVE_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
+		define('EVENTS_ARCHIVE_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
 	}
 
 
@@ -114,10 +114,10 @@ 
 	/**
 	 * set up EE_Events_Archive_Config
 	 */
-	protected function set_config(){
-		$this->set_config_section( 'template_settings' );
-		$this->set_config_class( 'EE_Events_Archive_Config' );
-		$this->set_config_name( 'EED_Events_Archive' );
+	protected function set_config() {
+		$this->set_config_section('template_settings');
+		$this->set_config_class('EE_Events_Archive_Config');
+		$this->set_config_name('EED_Events_Archive');
 	}
 
 
@@ -126,7 +126,7 @@ 
 	 * @return EventListIframeEmbedButton
 	 */
 	public static function get_iframe_embed_button() {
-		if ( ! self::$_iframe_embed_button instanceof EventListIframeEmbedButton ) {
+		if ( ! self::$_iframe_embed_button instanceof EventListIframeEmbedButton) {
 			self::$_iframe_embed_button = new EventListIframeEmbedButton();
 		}
 		return self::$_iframe_embed_button;
@@ -152,35 +152,35 @@ 
 	 * @param \EE_Events_Archive_Config $config
 	 * @return \EE_Template_Part_Manager
 	 */
-	public function initialize_template_parts( EE_Events_Archive_Config $config = null ) {
+	public function initialize_template_parts(EE_Events_Archive_Config $config = null) {
 		$config = $config instanceof EE_Events_Archive_Config ? $config : $this->config();
 		EEH_Autoloader::instance()->register_template_part_autoloaders();
 		$template_parts = new EE_Template_Part_Manager();
 		$template_parts->add_template_part(
 			'tickets',
-			__( 'Ticket Selector', 'event_espresso' ),
+			__('Ticket Selector', 'event_espresso'),
 			'content-espresso_events-tickets.php',
 			$config->display_order_tickets
 		);
 		$template_parts->add_template_part(
 			'datetimes',
-			__( 'Dates and Times', 'event_espresso' ),
+			__('Dates and Times', 'event_espresso'),
 			'content-espresso_events-datetimes.php',
 			$config->display_order_datetimes
 		);
 		$template_parts->add_template_part(
 			'event',
-			__( 'Event Description', 'event_espresso' ),
+			__('Event Description', 'event_espresso'),
 			'content-espresso_events-details.php',
 			$config->display_order_event
 		);
 		$template_parts->add_template_part(
 			'venue',
-			__( 'Venue Information', 'event_espresso' ),
+			__('Venue Information', 'event_espresso'),
 			'content-espresso_events-venues.php',
 			$config->display_order_venue
 		);
-		do_action( 'AHEE__EED_Event_Archive__initialize_template_parts', $template_parts );
+		do_action('AHEE__EED_Event_Archive__initialize_template_parts', $template_parts);
 		return $template_parts;
 	}
 
@@ -193,8 +193,8 @@ 
 	 * @param WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {
-		do_action( 'AHEE__EED_Events_Archive__before_run' );
+	public function run($WP) {
+		do_action('AHEE__EED_Events_Archive__before_run');
 		// ensure valid EE_Events_Archive_Config() object exists
 		$this->set_config();
 		/** @type EE_Events_Archive_Config $config */
@@ -206,14 +206,14 @@ 
 		EEH_Event_Query::add_query_filters();
 		// set params that will get used by the filters
 		EEH_Event_Query::set_query_params(
-			'', 	// month
-			'', 	// category
-			$config->display_expired_events, 	// show_expired
-			'start_date', 	// orderby
+			'', // month
+			'', // category
+			$config->display_expired_events, // show_expired
+			'start_date', // orderby
 			'ASC' 	// sort
 		);
 		// check what template is loaded
-		add_filter( 'template_include',  array( $this, 'template_include' ), 999, 1 );
+		add_filter('template_include', array($this, 'template_include'), 999, 1);
 	}
 
 
@@ -241,7 +241,7 @@ 
      */
 	public function event_list_iframe() {
         \EED_Events_Archive::$iframe = true;
-		$event_list_iframe = new EventsArchiveIframe( $this );
+		$event_list_iframe = new EventsArchiveIframe($this);
 		$event_list_iframe->display();
 	}
 
@@ -269,32 +269,32 @@ 
 	 * @param string $template
 	 * @return    string
 	 */
-	public function template_include( $template = '' ) {
+	public function template_include($template = '') {
 		// don't add content filter for dedicated EE child themes or private posts
-		if ( ! EEH_Template::is_espresso_theme() ) {
+		if ( ! EEH_Template::is_espresso_theme()) {
 			/** @type EE_Events_Archive_Config $config */
 			$config = $this->config();
 			// add status banner ?
-			if ( $config->display_status_banner ) {
-				add_filter( 'the_title', array( 'EED_Events_Archive', 'the_title' ), 100, 2 );
+			if ($config->display_status_banner) {
+				add_filter('the_title', array('EED_Events_Archive', 'the_title'), 100, 2);
 			}
 			// if NOT a custom template
 			if (
-				EE_Registry::instance()->load_core( 'Front_Controller', array(), false, true )->get_selected_template() != 'archive-espresso_events.php'
-				|| apply_filters( 'FHEE__EED_Event_Archive__template_include__allow_custom_selected_template', FALSE )
+				EE_Registry::instance()->load_core('Front_Controller', array(), false, true)->get_selected_template() != 'archive-espresso_events.php'
+				|| apply_filters('FHEE__EED_Event_Archive__template_include__allow_custom_selected_template', FALSE)
 			) {
 				// don't display entry meta because the existing theme will take care of that
-				add_filter( 'FHEE__EED_Events_Archive__template_include__events_list_active', '__return_true' );
+				add_filter('FHEE__EED_Events_Archive__template_include__events_list_active', '__return_true');
 			// load functions.php file for the theme (loaded by WP if using child theme)
 				EEH_Template::load_espresso_theme_functions();
 				// because we don't know if the theme is using the_excerpt()
-				add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
+				add_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100, 1);
 				// or the_content
-				add_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
+				add_filter('the_content', array('EED_Events_Archive', 'event_details'), 100, 1);
 				// and just in case they are running get_the_excerpt() which DESTROYS things
-				add_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1, 1 );
+				add_filter('get_the_excerpt', array('EED_Events_Archive', 'get_the_excerpt'), 1, 1);
 				// don't display entry meta because the existing theme will take care of that
-				add_filter( 'FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false' );
+				add_filter('FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false');
 			}
 		}
 		return $template;
@@ -309,17 +309,17 @@ 
 	 * 	@param		string 	$excerpt
 	 * 	@return 		string
 	 */
-	public static function get_the_excerpt( $excerpt = '' ) {
-		if ( post_password_required() ) {
+	public static function get_the_excerpt($excerpt = '') {
+		if (post_password_required()) {
 			return $excerpt;
 		}
-		if ( apply_filters( 'FHEE__EED_Events_Archive__get_the_excerpt__theme_uses_get_the_excerpt', false ) ) {
-			remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100 );
-			remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100 );
-			$excerpt = EED_Events_Archive::event_details( $excerpt );
+		if (apply_filters('FHEE__EED_Events_Archive__get_the_excerpt__theme_uses_get_the_excerpt', false)) {
+			remove_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100);
+			remove_filter('the_content', array('EED_Events_Archive', 'event_details'), 100);
+			$excerpt = EED_Events_Archive::event_details($excerpt);
 		} else {
 			EED_Events_Archive::$using_get_the_excerpt = true;
-			add_filter( 'wp_trim_excerpt', array( 'EED_Events_Archive', 'end_get_the_excerpt' ), 999, 1 );
+			add_filter('wp_trim_excerpt', array('EED_Events_Archive', 'end_get_the_excerpt'), 999, 1);
 		}
 		return $excerpt;
 	}
@@ -333,7 +333,7 @@ 
 	 * @param  string $text
 	 * @return string
 	 */
-	public static function end_get_the_excerpt( $text = '' ) {
+	public static function end_get_the_excerpt($text = '') {
 		EED_Events_Archive::$using_get_the_excerpt = false;
 		return $text;
 	}
@@ -348,10 +348,10 @@ 
 	 * @param 		string 		$id
 	 * @return 		string
 	 */
-	public static function the_title( $title = '', $id = '' ) {
+	public static function the_title($title = '', $id = '') {
 	global $post;
-	if ( $post instanceof WP_Post ) {
-		return in_the_loop() && $post->ID == $id ? espresso_event_status_banner( $post->ID  ) . $title :  $title;
+	if ($post instanceof WP_Post) {
+		return in_the_loop() && $post->ID == $id ? espresso_event_status_banner($post->ID).$title : $title;
 	}
 	return $title;
 }
@@ -365,7 +365,7 @@ 
 	 * 	@param		string 	$content
 	 * 	@return 		string
 	 */
-	public static function event_details( $content ) {
+	public static function event_details($content) {
 		global $post;
 		static $current_post_ID = 0;
 		if (
@@ -374,8 +374,8 @@ 
 			&& ! EED_Events_Archive::$using_get_the_excerpt
 			&& ! post_password_required()
 			&& (
-				apply_filters( 'FHEE__EES_Espresso_Events__process_shortcode__true', false )
-				|| ! apply_filters( 'FHEE__content_espresso_events__template_loaded', false )
+				apply_filters('FHEE__EES_Espresso_Events__process_shortcode__true', false)
+				|| ! apply_filters('FHEE__content_espresso_events__template_loaded', false)
 			)
 		) {
 			// Set current post ID to prevent showing content twice, but only if headers have definitely been sent.
@@ -384,8 +384,8 @@ 
 			// We want to allow those plugins to still do their thing and have access to our content, but depending on
 			// how your event content is being displayed (shortcode, CPT route, etc), this filter can get applied twice,
 			// so the following allows this filter to be applied multiple times, but only once for real
-			$current_post_ID = did_action( 'loop_start' ) ? $post->ID : 0;
-			if ( EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->use_sortable_display_order ) {
+			$current_post_ID = did_action('loop_start') ? $post->ID : 0;
+			if (EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->use_sortable_display_order) {
 				$content = \EED_Events_Archive::use_sortable_display_order();
 			} else {
 				$content = \EED_Events_Archive::use_filterable_display_order();
@@ -404,20 +404,20 @@ 
 	 */
 	protected static function use_sortable_display_order() {
 		// no further password checks required atm
-		add_filter( 'FHEE__EED_Events_Archive__event_details__no_post_password_required', '__return_true' );
+		add_filter('FHEE__EED_Events_Archive__event_details__no_post_password_required', '__return_true');
 		// we need to first remove this callback from being applied to the_content() or the_excerpt() (otherwise it will recurse and blow up the interweb)
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100 );
-		remove_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1 );
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_details'), 100);
+		remove_filter('get_the_excerpt', array('EED_Events_Archive', 'get_the_excerpt'), 1);
 		// now add additional content depending on whether event is using the_excerpt() or the_content()
 		EED_Events_Archive::instance()->template_parts = EED_Events_Archive::instance()->initialize_template_parts();
-		$content = EEH_Template::locate_template( 'content-espresso_events-details.php' );
-		$content = EED_Events_Archive::instance()->template_parts->apply_template_part_filters( $content );
+		$content = EEH_Template::locate_template('content-espresso_events-details.php');
+		$content = EED_Events_Archive::instance()->template_parts->apply_template_part_filters($content);
 		// re-add our main filters (or else the next event won't have them)
-		add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
-		add_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
-		add_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1, 1 );
-		remove_filter( 'FHEE__EED_Events_Archive__event_details__no_post_password_required', '__return_true' );
+		add_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100, 1);
+		add_filter('the_content', array('EED_Events_Archive', 'event_details'), 100, 1);
+		add_filter('get_the_excerpt', array('EED_Events_Archive', 'get_the_excerpt'), 1, 1);
+		remove_filter('FHEE__EED_Events_Archive__event_details__no_post_password_required', '__return_true');
 		return $content;
 	}
 
@@ -432,22 +432,22 @@ 
 	protected static function use_filterable_display_order() {
 		// 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( 'EED_Events_Archive', 'event_details' ), 100 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100 );
-		remove_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1 );
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_details'), 100);
+		remove_filter('get_the_excerpt', array('EED_Events_Archive', 'get_the_excerpt'), 1);
 		//now add additional content depending on whether event is using the_excerpt() or the_content()
 		EED_Events_Archive::_add_additional_excerpt_filters();
 		EED_Events_Archive::_add_additional_content_filters();
-		do_action( 'AHEE__EED_Events_Archive__use_filterable_display_order__after_add_filters' );
+		do_action('AHEE__EED_Events_Archive__use_filterable_display_order__after_add_filters');
 		// now load our template
-		$content = EEH_Template::locate_template( 'content-espresso_events-details.php' );
+		$content = EEH_Template::locate_template('content-espresso_events-details.php');
 		// re-add our main filters (or else the next event won't have them)
-		add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
-		add_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
-		add_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1, 1 );
+		add_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100, 1);
+		add_filter('the_content', array('EED_Events_Archive', 'event_details'), 100, 1);
+		add_filter('get_the_excerpt', array('EED_Events_Archive', 'get_the_excerpt'), 1, 1);
 		// but remove the other filters so that they don't get applied to the next post
 		EED_Events_Archive::_remove_additional_events_archive_filters();
-		do_action( 'AHEE__EED_Events_Archive__use_filterable_display_order__after_remove_filters' );
+		do_action('AHEE__EED_Events_Archive__use_filterable_display_order__after_remove_filters');
 		// 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 $content;
@@ -462,11 +462,11 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		string
 	 */
-	public static function event_datetimes( $content ) {
-		if ( post_password_required() ) {
+	public static function event_datetimes($content) {
+		if (post_password_required()) {
 			return $content;
 		}
-		return EEH_Template::locate_template( 'content-espresso_events-datetimes.php' ) . $content;
+		return EEH_Template::locate_template('content-espresso_events-datetimes.php').$content;
 	}
 
 	/**
@@ -476,11 +476,11 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		string
 	 */
-	public static function event_tickets( $content ) {
-		if ( post_password_required() ) {
+	public static function event_tickets($content) {
+		if (post_password_required()) {
 			return $content;
 		}
-		return EEH_Template::locate_template( 'content-espresso_events-tickets.php' ) . $content;
+		return EEH_Template::locate_template('content-espresso_events-tickets.php').$content;
 	}
 
 
@@ -492,8 +492,8 @@ 
 	 * @param    string $content
 	 * @return    string
 	 */
-	public static function event_venue( $content ) {
-		return EED_Events_Archive::event_venues( $content );
+	public static function event_venue($content) {
+		return EED_Events_Archive::event_venues($content);
 	}
 
 	/**
@@ -503,11 +503,11 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		string
 	 */
-	public static function event_venues( $content ) {
-		if ( post_password_required() ) {
+	public static function event_venues($content) {
+		if (post_password_required()) {
 			return $content;
 		}
-		return $content . EEH_Template::locate_template( 'content-espresso_events-venues.php' );
+		return $content.EEH_Template::locate_template('content-espresso_events-venues.php');
 	}
 
 
@@ -519,9 +519,9 @@ 
 	 * @return        void
 	 */
 	private static function _add_additional_excerpt_filters() {
-		add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_datetimes' ), 110, 1 );
-		add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_tickets' ), 120, 1 );
-		add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_venues' ), 130, 1 );
+		add_filter('the_excerpt', array('EED_Events_Archive', 'event_datetimes'), 110, 1);
+		add_filter('the_excerpt', array('EED_Events_Archive', 'event_tickets'), 120, 1);
+		add_filter('the_excerpt', array('EED_Events_Archive', 'event_venues'), 130, 1);
 	}
 
 
@@ -533,9 +533,9 @@ 
 	 * @return        void
 	 */
 	private static function _add_additional_content_filters() {
-		add_filter( 'the_content', array( 'EED_Events_Archive', 'event_datetimes' ), 110, 1 );
-		add_filter( 'the_content', array( 'EED_Events_Archive', 'event_tickets' ), 120, 1 );
-		add_filter( 'the_content', array( 'EED_Events_Archive', 'event_venues' ), 130, 1 );
+		add_filter('the_content', array('EED_Events_Archive', 'event_datetimes'), 110, 1);
+		add_filter('the_content', array('EED_Events_Archive', 'event_tickets'), 120, 1);
+		add_filter('the_content', array('EED_Events_Archive', 'event_venues'), 130, 1);
 	}
 
 
@@ -547,12 +547,12 @@ 
 	 * @return        void
 	 */
 	private static function _remove_additional_events_archive_filters() {
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_datetimes' ), 110 );
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_tickets' ), 120 );
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_venues' ), 130 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_datetimes' ), 110 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_tickets' ), 120 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_venues' ), 130 );
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_datetimes'), 110);
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_tickets'), 120);
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_venues'), 130);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_datetimes'), 110);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_tickets'), 120);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_venues'), 130);
 	}
 
 
@@ -565,17 +565,17 @@ 
 	 */
 	public static function remove_all_events_archive_filters() {
 		//remove_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1 );
-		remove_filter( 'the_title', array( 'EED_Events_Archive', 'the_title' ), 100 );
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100 );
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_datetimes' ), 110 );
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_tickets' ), 120 );
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_venues' ), 130 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_datetimes' ), 110 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_tickets' ), 120 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_venues' ), 130 );
+		remove_filter('the_title', array('EED_Events_Archive', 'the_title'), 100);
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100);
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_datetimes'), 110);
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_tickets'), 120);
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_venues'), 130);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_details'), 100);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_datetimes'), 110);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_tickets'), 120);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_venues'), 130);
 		// don't display entry meta because the existing theme will take care of that
-		remove_filter( 'FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false' );
+		remove_filter('FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false');
 	}
 
 
@@ -590,12 +590,12 @@ 
 	 *  @return 	void
 	 */
 	public function load_event_list_assets() {
-		do_action( 'AHEE__EED_Events_Archive__before_load_assets' );
-		add_filter( 'FHEE_load_EE_Session', '__return_true' );
-		add_filter( 'FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true' );
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 10 );
-		if ( EE_Registry::instance()->CFG->map_settings->use_google_maps ) {
-			add_action('wp_enqueue_scripts', array( 'EEH_Maps', 'espresso_google_map_js' ), 11 );
+		do_action('AHEE__EED_Events_Archive__before_load_assets');
+		add_filter('FHEE_load_EE_Session', '__return_true');
+		add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true');
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
+		if (EE_Registry::instance()->CFG->map_settings->use_google_maps) {
+			add_action('wp_enqueue_scripts', array('EEH_Maps', 'espresso_google_map_js'), 11);
 		}
 	}
 
@@ -612,13 +612,13 @@ 
 	 */
 	public function wp_enqueue_scripts() {
 		// get some style
-		if ( apply_filters( 'FHEE_enable_default_espresso_css', FALSE ) ) {
+		if (apply_filters('FHEE_enable_default_espresso_css', FALSE)) {
 			// first check uploads folder
-			if ( EEH_File::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' ));
+			if (EEH_File::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 {
 		}
-		wp_enqueue_style( $this->theme );
+		wp_enqueue_style($this->theme);
 
 	}
 }
@@ -636,8 +636,8 @@ 
 	 */
 	public static function template_settings_form() {
 	$template_settings = EE_Registry::instance()->CFG->template_settings;
-	$template_settings->EED_Events_Archive = isset( $template_settings->EED_Events_Archive ) ? $template_settings->EED_Events_Archive : new EE_Events_Archive_Config();
-	$template_settings->EED_Events_Archive = apply_filters( 'FHEE__EED_Events_Archive__template_settings_form__event_list_config', $template_settings->EED_Events_Archive );
+	$template_settings->EED_Events_Archive = isset($template_settings->EED_Events_Archive) ? $template_settings->EED_Events_Archive : new EE_Events_Archive_Config();
+	$template_settings->EED_Events_Archive = apply_filters('FHEE__EED_Events_Archive__template_settings_form__event_list_config', $template_settings->EED_Events_Archive);
 	$events_archive_settings = array(
 		'display_status_banner' => 0,
 		'display_description' => 1,
@@ -646,8 +646,8 @@ 
 		'display_venue' => 0,
 		'display_expired_events' => 0
 	);
-	$events_archive_settings = array_merge( $events_archive_settings, (array)$template_settings->EED_Events_Archive );
-	EEH_Template::display_template( EVENTS_ARCHIVE_TEMPLATES_PATH . 'admin-event-list-settings.template.php', $events_archive_settings );
+	$events_archive_settings = array_merge($events_archive_settings, (array) $template_settings->EED_Events_Archive);
+	EEH_Template::display_template(EVENTS_ARCHIVE_TEMPLATES_PATH.'admin-event-list-settings.template.php', $events_archive_settings);
 }
 
 
@@ -663,16 +663,16 @@ 
 	 *  @param 	EE_Request_Handler $REQ
 	 *  @return 	EE_Template_Config
 	 */
-	public static function update_template_settings( $CFG, $REQ ) {
+	public static function update_template_settings($CFG, $REQ) {
 		$CFG->EED_Events_Archive = new EE_Events_Archive_Config();
 		// unless we are resetting the config...
-		if ( ! isset( $REQ['EED_Events_Archive_reset_event_list_settings'] ) || absint( $REQ['EED_Events_Archive_reset_event_list_settings'] ) !== 1 ) {
-			$CFG->EED_Events_Archive->display_status_banner = isset( $REQ['EED_Events_Archive_display_status_banner'] ) ? absint( $REQ['EED_Events_Archive_display_status_banner'] ) : 0;
-			$CFG->EED_Events_Archive->display_description = isset( $REQ['EED_Events_Archive_display_description'] ) ? absint( $REQ['EED_Events_Archive_display_description'] ) : 1;
-			$CFG->EED_Events_Archive->display_ticket_selector = isset( $REQ['EED_Events_Archive_display_ticket_selector'] ) ? absint( $REQ['EED_Events_Archive_display_ticket_selector'] ) : 0;
-			$CFG->EED_Events_Archive->display_datetimes = isset( $REQ['EED_Events_Archive_display_datetimes'] ) ? absint( $REQ['EED_Events_Archive_display_datetimes'] ) : 1;
-			$CFG->EED_Events_Archive->display_venue = isset( $REQ['EED_Events_Archive_display_venue'] ) ? absint( $REQ['EED_Events_Archive_display_venue'] ) : 0;
-			$CFG->EED_Events_Archive->display_expired_events = isset( $REQ['EED_Events_Archive_display_expired_events'] ) ? absint( $REQ['EED_Events_Archive_display_expired_events'] ) : 0;			}
+		if ( ! isset($REQ['EED_Events_Archive_reset_event_list_settings']) || absint($REQ['EED_Events_Archive_reset_event_list_settings']) !== 1) {
+			$CFG->EED_Events_Archive->display_status_banner = isset($REQ['EED_Events_Archive_display_status_banner']) ? absint($REQ['EED_Events_Archive_display_status_banner']) : 0;
+			$CFG->EED_Events_Archive->display_description = isset($REQ['EED_Events_Archive_display_description']) ? absint($REQ['EED_Events_Archive_display_description']) : 1;
+			$CFG->EED_Events_Archive->display_ticket_selector = isset($REQ['EED_Events_Archive_display_ticket_selector']) ? absint($REQ['EED_Events_Archive_display_ticket_selector']) : 0;
+			$CFG->EED_Events_Archive->display_datetimes = isset($REQ['EED_Events_Archive_display_datetimes']) ? absint($REQ['EED_Events_Archive_display_datetimes']) : 1;
+			$CFG->EED_Events_Archive->display_venue = isset($REQ['EED_Events_Archive_display_venue']) ? absint($REQ['EED_Events_Archive_display_venue']) : 0;
+			$CFG->EED_Events_Archive->display_expired_events = isset($REQ['EED_Events_Archive_display_expired_events']) ? absint($REQ['EED_Events_Archive_display_expired_events']) : 0; }
 		return $CFG;
 	}
 
@@ -685,10 +685,10 @@ 
 	 * @param string $extra_class
 	 * @return    string
 	 */
-	public static function event_list_css( $extra_class = '' ) {
-		$event_list_css = ! empty( $extra_class ) ? array( $extra_class ) : array();
+	public static function event_list_css($extra_class = '') {
+		$event_list_css = ! empty($extra_class) ? array($extra_class) : array();
 		$event_list_css[] = 'espresso-event-list-event';
-		return implode( ' ', $event_list_css );
+		return implode(' ', $event_list_css);
 	}
 
 
@@ -715,9 +715,9 @@ 
 	 * @param $value
 	 * @return    bool
 	 */
-	public static function display_description( $value ) {
+	public static function display_description($value) {
 		$config = EE_Registry::instance()->CFG->template_settings->EED_Events_Archive;
-		$display_description= isset( $config->display_description ) ? $config->display_description : 1;
+		$display_description = isset($config->display_description) ? $config->display_description : 1;
 		return $display_description === $value ? TRUE : FALSE;
 	}
 
@@ -730,7 +730,7 @@ 
 	 */
 	public static function display_ticket_selector() {
 		$config = EE_Registry::instance()->CFG->template_settings->EED_Events_Archive;
-		return isset( $config->display_ticket_selector ) && $config->display_ticket_selector ? TRUE : FALSE;
+		return isset($config->display_ticket_selector) && $config->display_ticket_selector ? TRUE : FALSE;
 	}
 
 
@@ -743,7 +743,7 @@ 
 	 */
 	public static function display_venue() {
 		$config = EE_Registry::instance()->CFG->template_settings->EED_Events_Archive;
-		return isset( $config->display_venue ) && $config->display_venue && EEH_Venue_View::venue_name() ? TRUE : FALSE;
+		return isset($config->display_venue) && $config->display_venue && EEH_Venue_View::venue_name() ? TRUE : FALSE;
 	}
 
 
@@ -755,7 +755,7 @@ 
 	 */
 	public static function display_datetimes() {
 		$config = EE_Registry::instance()->CFG->template_settings->EED_Events_Archive;
-		return isset( $config->display_datetimes ) && $config->display_datetimes ? TRUE : FALSE;
+		return isset($config->display_datetimes) && $config->display_datetimes ? TRUE : FALSE;
 }
 
 
@@ -770,7 +770,7 @@ 
 	 *  @return 	string
 	 */
 	public static function event_list_title() {
-		return apply_filters( 'FHEE__archive_espresso_events_template__upcoming_events_h1', __( 'Upcoming Events', 'event_espresso' ));
+		return apply_filters('FHEE__archive_espresso_events_template__upcoming_events_h1', __('Upcoming Events', 'event_espresso'));
 	}
 
 
@@ -779,11 +779,11 @@ 
 	/**
 	 * 	@since 4.4.0
 	 */
-	public static function _doing_it_wrong_notice( $function = '' ) {
+	public static function _doing_it_wrong_notice($function = '') {
 		EE_Error::doing_it_wrong(
 			__FUNCTION__,
 			sprintf(
-				__( 'EED_Events_Archive::%1$s was moved to EEH_Event_Query::%1$s:%2$sPlease update your existing code because the method it calls will be removed in version %3$s', 'event_espresso' ),
+				__('EED_Events_Archive::%1$s was moved to EEH_Event_Query::%1$s:%2$sPlease update your existing code because the method it calls will be removed in version %3$s', 'event_espresso'),
 				$function,
 				'<br />',
 				'4.6.0'
@@ -805,89 +805,89 @@ 
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public function posts_fields( $SQL, WP_Query $wp_query ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_fields( $SQL, $wp_query );
+	public function posts_fields($SQL, WP_Query $wp_query) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_fields($SQL, $wp_query);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_fields_sql_for_orderby( $orderby_params = array() ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_fields_sql_for_orderby( $orderby_params );
+	public static function posts_fields_sql_for_orderby($orderby_params = array()) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_fields_sql_for_orderby($orderby_params);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public function posts_join( $SQL, WP_Query $wp_query ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_join( $SQL, $wp_query );
+	public function posts_join($SQL, WP_Query $wp_query) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_join($SQL, $wp_query);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_join_sql_for_terms( $join_terms = NULL ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_join_sql_for_terms( $join_terms );
+	public static function posts_join_sql_for_terms($join_terms = NULL) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_join_sql_for_terms($join_terms);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_join_for_orderby( $orderby_params = array() ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_join_for_orderby( $orderby_params );
+	public static function posts_join_for_orderby($orderby_params = array()) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_join_for_orderby($orderby_params);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public function posts_where( $SQL, WP_Query $wp_query ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_where( $SQL, $wp_query );
+	public function posts_where($SQL, WP_Query $wp_query) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_where($SQL, $wp_query);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_where_sql_for_show_expired( $show_expired = FALSE ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_where_sql_for_show_expired( $show_expired );
+	public static function posts_where_sql_for_show_expired($show_expired = FALSE) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_where_sql_for_show_expired($show_expired);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_where_sql_for_event_category_slug( $event_category_slug = NULL ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_where_sql_for_event_category_slug( $event_category_slug );
+	public static function posts_where_sql_for_event_category_slug($event_category_slug = NULL) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_where_sql_for_event_category_slug($event_category_slug);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_where_sql_for_event_list_month( $month = NULL ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_where_sql_for_event_list_month( $month );
+	public static function posts_where_sql_for_event_list_month($month = NULL) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_where_sql_for_event_list_month($month);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public function posts_orderby( $SQL, WP_Query $wp_query ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_orderby( $SQL, $wp_query );
+	public function posts_orderby($SQL, WP_Query $wp_query) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_orderby($SQL, $wp_query);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_orderby_sql( $orderby_params = array(), $sort = 'ASC' ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_orderby_sql( $orderby_params, $sort );
+	public static function posts_orderby_sql($orderby_params = array(), $sort = 'ASC') {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_orderby_sql($orderby_params, $sort);
 	}
 
 
@@ -918,8 +918,8 @@ 
  * @param string $extra_class
  * @return string
  */
-function espresso_event_list_css( $extra_class = '' ) {
-	return EED_Events_Archive::event_list_css( $extra_class );
+function espresso_event_list_css($extra_class = '') {
+	return EED_Events_Archive::event_list_css($extra_class);
 }
 
 /**
@@ -933,14 +933,14 @@ 
  * @return bool
  */
 function espresso_display_full_description_in_event_list() {
-	return EED_Events_Archive::display_description( 2 );
+	return EED_Events_Archive::display_description(2);
 }
 
 /**
  * @return bool
  */
 function espresso_display_excerpt_in_event_list() {
-	return EED_Events_Archive::display_description( 1 );
+	return EED_Events_Archive::display_description(1);
 }
 
 /**

Braces +3 added lines, -1 removed lines

@@ -3,7 +3,9 @@
 use EventEspresso\core\libraries\iframe_display\EventListIframeEmbedButton;
 use EventEspresso\modules\events_archive\EventsArchiveIframe;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined( 'EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

modules/events_archive_filters/EED_Events_Archive_Filters.module.php

Doc Comments +14 added lines, -13 removed lines

@@ -271,6 +271,7 @@ 
 	 *
 	 *  @access 	public
 	 *  @param	mixed boolean|string	$join_terms pass TRUE or term string, doesn't really matter since this value doesn't really get used for anything yet
+	 * @param string $join_terms
 	 *  @return 	string
 	 */
 	public static function posts_join_sql_for_terms( $join_terms = NULL ) {
@@ -423,7 +424,7 @@ 
 	 * 	or else some of the table references below will result in MySQL errors
 	 *
 	 *  @access 	public
-	 *  @param	boolean	$orderby_params
+	 *  @param	string[]	$orderby_params
 	 *  @return 	string
 	 */
 	public static function posts_orderby_sql( $orderby_params = array(), $sort = 'ASC' ) {
@@ -534,7 +535,7 @@ 
 	 *
 	 *  	@access 	public
 	 * 	@param		string 	$content
-	 *  	@return 		void
+	 *  	@return 		string
 	 */
 	public function event_details( $content ) {
 		return EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-details.php', array( 'the_content' => $content ), TRUE );
@@ -546,7 +547,7 @@ 
 	 *
 	 *  	@access 	public
 	 * 	@param		string 	$content
-	 *  	@return 		void
+	 *  	@return 		string
 	 */
 	public function event_tickets( $content ) {
 		return $content . EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-tickets.php', array(), TRUE );
@@ -557,7 +558,7 @@ 
 	 *
 	 *  	@access 	public
 	 * 	@param		string 	$content
-	 *  	@return 		void
+	 *  	@return 		string
 	 */
 	public function event_datetimes( $content ) {
 		return $content . EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-datetimes.php', array(), TRUE );
@@ -568,7 +569,7 @@ 
 	 *
 	 *  	@access 	public
 	 * 	@param		string 	$content
-	 *  	@return 		void
+	 *  	@return 		string
 	 */
 	public function event_venues( $content ) {
 		return $content . EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-venues.php', array(), TRUE );
@@ -618,7 +619,7 @@ 
 	 * 	excerpt_length
 	 *
 	 *  @access 	public
-	 *  @return 	void
+	 *  @return 	integer|null
 	 */
 	public function excerpt_length( $length ) {
 
@@ -648,7 +649,7 @@ 
 	 * 	excerpt_more
 	 *
 	 *  @access 	public
-	 *  @return 	void
+	 *  @return 	string
 	 */
 	public function excerpt_more( $more ) {
 		return '…';
@@ -813,7 +814,7 @@ 
 	 * 	get_template_part
 	 *
 	 *  @access 	public
-	 *  @return 	void
+	 *  @return 	string|null
 	 */
 	public static function get_template_part() {
 		switch ( self::$_type ) {
@@ -857,7 +858,7 @@ 
 	 * 	event_list_css
 	 *
 	 *  @access 	public
-	 *  @return 	void
+	 *  @return 	string
 	 */
 	public static function event_list_css( $extra_class = '' ) {
 		$EE = EE_Registry::instance();
@@ -892,7 +893,7 @@ 
 	 * 	display_description
 	 *
 	 *  @access 	public
-	 *  @return 	void
+	 *  @return 	boolean
 	 */
 	public static function display_description( $value ) {
 		$EE = EE_Registry::instance();
@@ -906,7 +907,7 @@ 
 	 * 	display_venue_details
 	 *
 	 *  @access 	public
-	 *  @return 	void
+	 *  @return 	boolean
 	 */
 	public static function display_venue_details() {
 		$EE = EE_Registry::instance();
@@ -921,7 +922,7 @@ 
 	 * 	display_address
 	 *
 	 *  @access 	public
-	 *  @return 	void
+	 *  @return 	boolean
 	 */
 	public static function display_address() {
 		$EE = EE_Registry::instance();
@@ -937,7 +938,7 @@ 
 	 * 	pagination
 	 *
 	 *  @access 	public
-	 *  @return 	void
+	 *  @return 	string
 	 */
 	public static function pagination() {
 		global $wp_query;

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
  *

Spacing +167 added lines, -167 removed lines

@@ -29,7 +29,7 @@ 
 	 * @return EED_Events_Archive_Filters
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -71,7 +71,7 @@ 
 	 *	@var 	$_types
 	 * 	@access 	protected
 	 */
-	protected static $_types = array( 'grid', 'text', 'dates' );
+	protected static $_types = array('grid', 'text', 'dates');
 
 
 //	public static $espresso_event_list_ID = 0;
@@ -125,7 +125,7 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 //		do_action( 'AHEE__EED_Events_Archive_Filters__before_run' );
 //		// set config
 //		if ( ! isset( EE_Registry::instance()->CFG->template_settings->EED_Events_Archive_Filters ) || ! EE_Registry::instance()->CFG->template_settings->EED_Events_Archive_Filters instanceof EE_Events_Archive_Config ) {
@@ -170,9 +170,9 @@ 
 	 */
 	private function _filter_query_parts() {
 		// build event list query
-		add_filter( 'posts_join', array( $this, 'posts_join' ), 1, 2 );
-		add_filter( 'posts_where', array( $this, 'posts_where' ), 1, 2 );
-		add_filter( 'posts_orderby', array( $this, 'posts_orderby' ), 1, 2 );
+		add_filter('posts_join', array($this, 'posts_join'), 1, 2);
+		add_filter('posts_where', array($this, 'posts_where'), 1, 2);
+		add_filter('posts_orderby', array($this, 'posts_orderby'), 1, 2);
 	}
 
 	/**
@@ -182,13 +182,13 @@ 
 	 *  @return 	string
 	 */
 	public static function set_type() {
-		do_action( 'AHEE__EED_Events_Archive_Filters__before_set_type' );
-		EED_Events_Archive_Filters::$_types = apply_filters( 'EED_Events_Archive_Filters__set_type__types', EED_Events_Archive_Filters::$_types );
-		$view = isset( EE_Registry::instance()->CFG->EED_Events_Archive_Filters['default_type'] ) ? EE_Registry::instance()->CFG->EED_Events_Archive_Filters['default_type'] : 'grid';
-		$elf_type = EE_Registry::instance()->REQ->is_set( 'elf_type' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'elf_type' )) : '';
-		$view = ! empty( $elf_type ) ? $elf_type : $view;
-		$view = apply_filters( 'EED_Events_Archive_Filters__set_type__type', $view );
-		if ( ! empty( $view ) && in_array( $view, EED_Events_Archive_Filters::$_types )) {
+		do_action('AHEE__EED_Events_Archive_Filters__before_set_type');
+		EED_Events_Archive_Filters::$_types = apply_filters('EED_Events_Archive_Filters__set_type__types', EED_Events_Archive_Filters::$_types);
+		$view = isset(EE_Registry::instance()->CFG->EED_Events_Archive_Filters['default_type']) ? EE_Registry::instance()->CFG->EED_Events_Archive_Filters['default_type'] : 'grid';
+		$elf_type = EE_Registry::instance()->REQ->is_set('elf_type') ? sanitize_text_field(EE_Registry::instance()->REQ->get('elf_type')) : '';
+		$view = ! empty($elf_type) ? $elf_type : $view;
+		$view = apply_filters('EED_Events_Archive_Filters__set_type__type', $view);
+		if ( ! empty($view) && in_array($view, EED_Events_Archive_Filters::$_types)) {
 			self::$_type = $view;
 		}
 	}
@@ -200,11 +200,11 @@ 
 	 *  @param	boolean	$req_only if TRUE, then ignore defaults and only return $_POST value
 	 *  @return 	boolean
 	 */
-	private static function _show_expired( $req_only = FALSE ) {
+	private static function _show_expired($req_only = FALSE) {
 		// get default value for "display_expired_events" as set in the EE General Settings > Templates > Event Listings
-		$show_expired = ! $req_only && isset( EE_Registry::instance()->CFG->EED_Events_Archive_Filters['display_expired_events'] ) ? EE_Registry::instance()->CFG->EED_Events_Archive_Filters['display_expired_events'] : FALSE;
+		$show_expired = ! $req_only && isset(EE_Registry::instance()->CFG->EED_Events_Archive_Filters['display_expired_events']) ? EE_Registry::instance()->CFG->EED_Events_Archive_Filters['display_expired_events'] : FALSE;
 		// override default expired option if set via filter
-		$show_expired = EE_Registry::instance()->REQ->is_set( 'elf_expired_chk' ) ? absint( EE_Registry::instance()->REQ->get( 'elf_expired_chk' )) : $show_expired;
+		$show_expired = EE_Registry::instance()->REQ->is_set('elf_expired_chk') ? absint(EE_Registry::instance()->REQ->get('elf_expired_chk')) : $show_expired;
 		return $show_expired ? TRUE : FALSE;
 	}
 
@@ -215,7 +215,7 @@ 
 	 *  @return 	string
 	 */
 	private static function _event_category_slug() {
-		return EE_Registry::instance()->REQ->is_set( 'elf_category_dd' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'elf_category_dd' )) : '';
+		return EE_Registry::instance()->REQ->is_set('elf_category_dd') ? sanitize_text_field(EE_Registry::instance()->REQ->get('elf_category_dd')) : '';
 	}
 
 	/**
@@ -225,7 +225,7 @@ 
 	 *  @return 	string
 	 */
 	private static function _display_month() {
-		return EE_Registry::instance()->REQ->is_set( 'elf_month_dd' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'elf_month_dd' )) : '';
+		return EE_Registry::instance()->REQ->is_set('elf_month_dd') ? sanitize_text_field(EE_Registry::instance()->REQ->get('elf_month_dd')) : '';
 	}
 
 
@@ -239,7 +239,7 @@ 
 	public function get_post_data() {
 		$this->_elf_month = EED_Events_Archive_Filters::_display_month();
 		$this->_elf_category = EED_Events_Archive_Filters::_event_category_slug();
-		$this->_show_expired = EED_Events_Archive_Filters::_show_expired( TRUE );
+		$this->_show_expired = EED_Events_Archive_Filters::_show_expired(TRUE);
 //		EEH_Debug_Tools::printr( EE_Registry::instance()->REQ, 'EE_Registry::instance()->REQ  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 //		echo '<h4>$this->_elf_month : ' . $this->_elf_month . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 //		echo '<h4>$this->_elf_category : ' . $this->_elf_category . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
@@ -256,11 +256,11 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function posts_join( $SQL, WP_Query $wp_query ) {
-		if ( isset( $wp_query->query ) && isset( $wp_query->query['post_type'] ) && $wp_query->query['post_type'] == 'espresso_events' ) {
+	public function posts_join($SQL, WP_Query $wp_query) {
+		if (isset($wp_query->query) && isset($wp_query->query['post_type']) && $wp_query->query['post_type'] == 'espresso_events') {
 			// Category
 //			$elf_category = EE_Registry::instance()->REQ->is_set( 'elf_category_dd' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'elf_category_dd' )) : '';
-			$SQL .= EED_Events_Archive_Filters::posts_join_sql_for_terms( EED_Events_Archive_Filters::_event_category_slug() );
+			$SQL .= EED_Events_Archive_Filters::posts_join_sql_for_terms(EED_Events_Archive_Filters::_event_category_slug());
 		}
 		return $SQL;
 	}
@@ -273,9 +273,9 @@ 
 	 *  @param	mixed boolean|string	$join_terms pass TRUE or term string, doesn't really matter since this value doesn't really get used for anything yet
 	 *  @return 	string
 	 */
-	public static function posts_join_sql_for_terms( $join_terms = NULL ) {
-		$SQL= '';
-		if ( ! empty( $join_terms )) {
+	public static function posts_join_sql_for_terms($join_terms = NULL) {
+		$SQL = '';
+		if ( ! empty($join_terms)) {
 			global $wpdb;
 			$SQL .= " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id)";
 			$SQL .= " LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id)";
@@ -293,28 +293,28 @@ 
 	 *  @param	array	$orderby_params
 	 *  @return 	string
 	 */
-	public static function posts_join_for_orderby( $orderby_params = array() ) {
+	public static function posts_join_for_orderby($orderby_params = array()) {
 		global $wpdb;
-		$SQL= '';
-		$orderby_params = is_array( $orderby_params ) ? $orderby_params : array( $orderby_params );
-		foreach( $orderby_params as $orderby ) {
-			switch ( $orderby ) {
+		$SQL = '';
+		$orderby_params = is_array($orderby_params) ? $orderby_params : array($orderby_params);
+		foreach ($orderby_params as $orderby) {
+			switch ($orderby) {
 
 				case 'ticket_start' :
 				case 'ticket_end' :
-					$SQL .= ' LEFT JOIN ' . EEM_Datetime_Ticket::instance()->table() . ' ON (' . EEM_Datetime::instance()->table() . '.DTT_ID = ' . EEM_Datetime_Ticket::instance()->table() . '.DTT_ID )';
-					$SQL .= ' LEFT JOIN ' . EEM_Ticket::instance()->table() . ' ON (' . EEM_Datetime_Ticket::instance()->table() . '.TKT_ID = ' . EEM_Ticket::instance()->table() . '.TKT_ID )';
+					$SQL .= ' LEFT JOIN '.EEM_Datetime_Ticket::instance()->table().' ON ('.EEM_Datetime::instance()->table().'.DTT_ID = '.EEM_Datetime_Ticket::instance()->table().'.DTT_ID )';
+					$SQL .= ' LEFT JOIN '.EEM_Ticket::instance()->table().' ON ('.EEM_Datetime_Ticket::instance()->table().'.TKT_ID = '.EEM_Ticket::instance()->table().'.TKT_ID )';
 					break;
 
 				case 'venue_title' :
 				case 'city' :
-					$SQL .= ' LEFT JOIN ' . EEM_Event_Venue::instance()->table() . ' ON (' . $wpdb->posts . '.ID = ' . EEM_Event_Venue::instance()->table() . '.EVT_ID )';
-					$SQL .= ' LEFT JOIN ' . EEM_Venue::instance()->table() . ' ON (' . EEM_Event_Venue::instance()->table() . '.VNU_ID = ' . EEM_Venue::instance()->table() . '.VNU_ID )';
+					$SQL .= ' LEFT JOIN '.EEM_Event_Venue::instance()->table().' ON ('.$wpdb->posts.'.ID = '.EEM_Event_Venue::instance()->table().'.EVT_ID )';
+					$SQL .= ' LEFT JOIN '.EEM_Venue::instance()->table().' ON ('.EEM_Event_Venue::instance()->table().'.VNU_ID = '.EEM_Venue::instance()->table().'.VNU_ID )';
 					break;
 
 				case 'state' :
-					$SQL .= ' LEFT JOIN ' . EEM_Event_Venue::instance()->table() . ' ON (' . $wpdb->posts . '.ID = ' . EEM_Event_Venue::instance()->table() . '.EVT_ID )';
-					$SQL .= ' LEFT JOIN ' . EEM_Event_Venue::instance()->second_table() . ' ON (' . EEM_Event_Venue::instance()->table() . '.VNU_ID = ' . EEM_Event_Venue::instance()->second_table() . '.VNU_ID )';
+					$SQL .= ' LEFT JOIN '.EEM_Event_Venue::instance()->table().' ON ('.$wpdb->posts.'.ID = '.EEM_Event_Venue::instance()->table().'.EVT_ID )';
+					$SQL .= ' LEFT JOIN '.EEM_Event_Venue::instance()->second_table().' ON ('.EEM_Event_Venue::instance()->table().'.VNU_ID = '.EEM_Event_Venue::instance()->second_table().'.VNU_ID )';
 					break;
 
 				break;
@@ -331,16 +331,16 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function posts_where( $SQL, WP_Query $wp_query ) {
-		if ( isset( $wp_query->query_vars ) && isset( $wp_query->query_vars['post_type'] ) && $wp_query->query_vars['post_type'] == 'espresso_events'  ) {
+	public function posts_where($SQL, WP_Query $wp_query) {
+		if (isset($wp_query->query_vars) && isset($wp_query->query_vars['post_type']) && $wp_query->query_vars['post_type'] == 'espresso_events') {
 			// Show Expired ?
-			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_show_expired( EED_Events_Archive_Filters::_show_expired() );
+			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_show_expired(EED_Events_Archive_Filters::_show_expired());
 			// Category
 			//$elf_category = EED_Events_Archive_Filters::_event_category_slug();
-			$SQL .=  EED_Events_Archive_Filters::posts_where_sql_for_event_category_slug( EED_Events_Archive_Filters::_event_category_slug() );
+			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_event_category_slug(EED_Events_Archive_Filters::_event_category_slug());
 			// Start Date
 			//$elf_month = EED_Events_Archive_Filters::_display_month();
-			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_event_list_month( EED_Events_Archive_Filters::_display_month() );
+			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_event_list_month(EED_Events_Archive_Filters::_display_month());
 		}
 		return $SQL;
 	}
@@ -353,8 +353,8 @@ 
 	 *  @param	boolean	$show_expired if TRUE, then displayed past events
 	 *  @return 	string
 	 */
-	public static function posts_where_sql_for_show_expired( $show_expired = FALSE ) {
-		return  ! $show_expired ? ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end > "' . date('Y-m-d H:s:i') . '" ' : '';
+	public static function posts_where_sql_for_show_expired($show_expired = FALSE) {
+		return  ! $show_expired ? ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_end > "'.date('Y-m-d H:s:i').'" ' : '';
 	}
 
 
@@ -365,9 +365,9 @@ 
 	 *  @param	boolean	$event_category_slug
 	 *  @return 	string
 	 */
-	public static function posts_where_sql_for_event_category_slug( $event_category_slug = NULL ) {
+	public static function posts_where_sql_for_event_category_slug($event_category_slug = NULL) {
 		global $wpdb;
-		return  ! empty( $event_category_slug ) ? ' AND ' . $wpdb->terms . '.slug = "' . $event_category_slug . '" ' : '';
+		return  ! empty($event_category_slug) ? ' AND '.$wpdb->terms.'.slug = "'.$event_category_slug.'" ' : '';
 	}
 
 	/**
@@ -377,15 +377,15 @@ 
 	 *  @param	boolean	$month
 	 *  @return 	string
 	 */
-	public static function posts_where_sql_for_event_list_month( $month = NULL ) {
-		$SQL= '';
-		if ( ! empty( $month )) {
+	public static function posts_where_sql_for_event_list_month($month = NULL) {
+		$SQL = '';
+		if ( ! empty($month)) {
 			// event start date is LESS than the end of the month ( so nothing that doesn't start until next month )
-			$SQL = ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start';
-			$SQL .= ' <= "' . date('Y-m-t 23:59:59', \EEH_DTT_Helper::first_of_month_timestamp($month)) . '"';
+			$SQL = ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_start';
+			$SQL .= ' <= "'.date('Y-m-t 23:59:59', \EEH_DTT_Helper::first_of_month_timestamp($month)).'"';
 			// event end date is GREATER than the start of the month ( so nothing that ended before this month )
-			$SQL .= ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end';
-			$SQL .= ' >= "' . date('Y-m-d 0:0:00', \EEH_DTT_Helper::first_of_month_timestamp($month)) . '" ';
+			$SQL .= ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_end';
+			$SQL .= ' >= "'.date('Y-m-d 0:0:00', \EEH_DTT_Helper::first_of_month_timestamp($month)).'" ';
 		}
 		return $SQL;
 	}
@@ -397,9 +397,9 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function posts_orderby( $SQL, WP_Query $wp_query ) {
-		if ( isset( $wp_query->query ) && isset( $wp_query->query['post_type'] ) && $wp_query->query['post_type'] == 'espresso_events' ) {
-			$SQL = EED_Events_Archive_Filters::posts_orderby_sql( array( 'start_date' ));
+	public function posts_orderby($SQL, WP_Query $wp_query) {
+		if (isset($wp_query->query) && isset($wp_query->query['post_type']) && $wp_query->query['post_type'] == 'espresso_events') {
+			$SQL = EED_Events_Archive_Filters::posts_orderby_sql(array('start_date'));
 		}
 		return $SQL;
 	}
@@ -428,54 +428,54 @@ 
 	 *  @param	boolean	$orderby_params
 	 *  @return 	string
 	 */
-	public static function posts_orderby_sql( $orderby_params = array(), $sort = 'ASC' ) {
+	public static function posts_orderby_sql($orderby_params = array(), $sort = 'ASC') {
 		global $wpdb;
 		$SQL = '';
 		$cntr = 1;
-		$orderby_params = is_array( $orderby_params ) ? $orderby_params : array( $orderby_params );
-		foreach( $orderby_params as $orderby ) {
-			$glue = $cntr == 1 || $cntr == count( $orderby_params ) ? ' ' : ', ';
-			switch ( $orderby ) {
+		$orderby_params = is_array($orderby_params) ? $orderby_params : array($orderby_params);
+		foreach ($orderby_params as $orderby) {
+			$glue = $cntr == 1 || $cntr == count($orderby_params) ? ' ' : ', ';
+			switch ($orderby) {
 
 				case 'id' :
 				case 'ID' :
-					$SQL .= $glue . $wpdb->posts . '.ID ' . $sort;
+					$SQL .= $glue.$wpdb->posts.'.ID '.$sort;
 					break;
 
 				case 'start_date' :
-					$SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_start ' . $sort;
+					$SQL .= $glue.EEM_Datetime::instance()->table().'.DTT_EVT_start '.$sort;
 					break;
 
 				case 'end_date' :
-					$SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_end ' . $sort;
+					$SQL .= $glue.EEM_Datetime::instance()->table().'.DTT_EVT_end '.$sort;
 					break;
 
 				case 'event_name' :
-					$SQL .= $glue . $wpdb->posts . '.post_title ' . $sort;
+					$SQL .= $glue.$wpdb->posts.'.post_title '.$sort;
 					break;
 
 				case 'category_slug' :
-					$SQL .= $glue . $wpdb->terms . '.slug ' . $sort;
+					$SQL .= $glue.$wpdb->terms.'.slug '.$sort;
 					break;
 
 				case 'ticket_start' :
-					$SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_start_date ' . $sort;
+					$SQL .= $glue.EEM_Ticket::instance()->table().'.TKT_start_date '.$sort;
 					break;
 
 				case 'ticket_end' :
-					$SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_end_date ' . $sort;
+					$SQL .= $glue.EEM_Ticket::instance()->table().'.TKT_end_date '.$sort;
 					break;
 
 				case 'venue_title' :
-					$SQL .= $glue . 'venue_title ' . $sort;
+					$SQL .= $glue.'venue_title '.$sort;
 					break;
 
 				case 'city' :
-					$SQL .= $glue . EEM_Venue::instance()->second_table() . '.VNU_city ' . $sort;
+					$SQL .= $glue.EEM_Venue::instance()->second_table().'.VNU_city '.$sort;
 				break;
 
 				case 'state' :
-					$SQL .= $glue . EEM_State::instance()->table() . '.STA_name ' . $sort;
+					$SQL .= $glue.EEM_State::instance()->table().'.STA_name '.$sort;
 				break;
 
 			}
@@ -495,26 +495,26 @@ 
 	 */
 	public function template_redirect() {
 		// add event list filters
-		add_action( 'loop_start', array( $this, 'event_list_template_filters' ));
+		add_action('loop_start', array($this, 'event_list_template_filters'));
 		// and pagination
-		add_action( 'loop_start', array( $this, 'event_list_pagination' ));
-		add_action( 'loop_end', array( $this, 'event_list_pagination' ));
+		add_action('loop_start', array($this, 'event_list_pagination'));
+		add_action('loop_end', array($this, 'event_list_pagination'));
 		// if NOT a custom template
-		if ( EE_Registry::instance()->load_core( 'Front_Controller', array(), false, true )->get_selected_template() != 'archive-espresso_events.php' ) {
+		if (EE_Registry::instance()->load_core('Front_Controller', array(), false, true)->get_selected_template() != 'archive-espresso_events.php') {
 			// don't know if theme uses the_excerpt
-			add_filter( 'the_excerpt', array( $this, 'event_details' ), 100 );
-			add_filter( 'the_excerpt', array( $this, 'event_tickets' ), 110 );
-			add_filter( 'the_excerpt', array( $this, 'event_datetimes' ), 120 );
-			add_filter( 'the_excerpt', array( $this, 'event_venues' ), 130 );
+			add_filter('the_excerpt', array($this, 'event_details'), 100);
+			add_filter('the_excerpt', array($this, 'event_tickets'), 110);
+			add_filter('the_excerpt', array($this, 'event_datetimes'), 120);
+			add_filter('the_excerpt', array($this, 'event_venues'), 130);
 			// or the_content
-			add_filter( 'the_content', array( $this, 'event_details' ), 100 );
-			add_filter( 'the_content', array( $this, 'event_tickets' ), 110 );
-			add_filter( 'the_content', array( $this, 'event_datetimes' ), 120 );
-			add_filter( 'the_content', array( $this, 'event_venues' ), 130 );
+			add_filter('the_content', array($this, 'event_details'), 100);
+			add_filter('the_content', array($this, 'event_tickets'), 110);
+			add_filter('the_content', array($this, 'event_datetimes'), 120);
+			add_filter('the_content', array($this, 'event_venues'), 130);
 		} else {
-			remove_all_filters( 'excerpt_length' );
-			add_filter( 'excerpt_length', array( $this, 'excerpt_length' ), 10 );
-			add_filter( 'excerpt_more', array( $this, 'excerpt_more' ), 10 );
+			remove_all_filters('excerpt_length');
+			add_filter('excerpt_length', array($this, 'excerpt_length'), 10);
+			add_filter('excerpt_more', array($this, 'excerpt_more'), 10);
 		}
 	}
 
@@ -527,7 +527,7 @@ 
 	 *  	@return 		void
 	 */
 	public function event_list_pagination() {
-		echo '<div class="ee-pagination-dv clear">' . espresso_event_list_pagination() . '</div>';
+		echo '<div class="ee-pagination-dv clear">'.espresso_event_list_pagination().'</div>';
 	}
 
 
@@ -538,8 +538,8 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		void
 	 */
-	public function event_details( $content ) {
-		return EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-details.php', array( 'the_content' => $content ), TRUE );
+	public function event_details($content) {
+		return EEH_Template::display_template(EE_TEMPLATES.EE_Config::get_current_theme().DS.'content-espresso_events-details.php', array('the_content' => $content), TRUE);
 	}
 
 
@@ -550,8 +550,8 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		void
 	 */
-	public function event_tickets( $content ) {
-		return $content . EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-tickets.php', array(), TRUE );
+	public function event_tickets($content) {
+		return $content.EEH_Template::display_template(EE_TEMPLATES.EE_Config::get_current_theme().DS.'content-espresso_events-tickets.php', array(), TRUE);
 	}
 
 	/**
@@ -561,8 +561,8 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		void
 	 */
-	public function event_datetimes( $content ) {
-		return $content . EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-datetimes.php', array(), TRUE );
+	public function event_datetimes($content) {
+		return $content.EEH_Template::display_template(EE_TEMPLATES.EE_Config::get_current_theme().DS.'content-espresso_events-datetimes.php', array(), TRUE);
 	}
 
 	/**
@@ -572,8 +572,8 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		void
 	 */
-	public function event_venues( $content ) {
-		return $content . EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-venues.php', array(), TRUE );
+	public function event_venues($content) {
+		return $content.EEH_Template::display_template(EE_TEMPLATES.EE_Config::get_current_theme().DS.'content-espresso_events-venues.php', array(), TRUE);
 	}
 
 
@@ -588,12 +588,12 @@ 
 	 *  @return 	void
 	 */
 	private function _load_assests() {
-		do_action( 'AHEE__EED_Events_Archive_Filters__before_load_assests' );
-		add_filter( 'FHEE_load_css', '__return_true' );
-		add_filter( 'FHEE_load_EE_Session', '__return_true' );
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 10 );
-		if ( EE_Registry::instance()->CFG->map_settings->use_google_maps ) {
-			add_action('wp_enqueue_scripts', array( 'EEH_Maps', 'espresso_google_map_js' ), 11 );
+		do_action('AHEE__EED_Events_Archive_Filters__before_load_assests');
+		add_filter('FHEE_load_css', '__return_true');
+		add_filter('FHEE_load_EE_Session', '__return_true');
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
+		if (EE_Registry::instance()->CFG->map_settings->use_google_maps) {
+			add_action('wp_enqueue_scripts', array('EEH_Maps', 'espresso_google_map_js'), 11);
 		}
 		//add_filter( 'the_excerpt', array( $this, 'the_excerpt' ), 999 );
 	}
@@ -608,8 +608,8 @@ 
 	 *  @access 	private
 	 *  @return 	string
 	 */
-	private function _get_template( $which = 'part' ) {
-		return EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events.php';
+	private function _get_template($which = 'part') {
+		return EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events.php';
 	}
 
 
@@ -620,13 +620,13 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function excerpt_length( $length ) {
+	public function excerpt_length($length) {
 
-		if ( self::$_type == 'grid' ) {
+		if (self::$_type == 'grid') {
 			return 36;
 		}
 
-		switch ( EE_Registry::instance()->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size ) {
+		switch (EE_Registry::instance()->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size) {
 			case 'tiny' :
 				return 12;
 				break;
@@ -650,7 +650,7 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function excerpt_more( $more ) {
+	public function excerpt_more($more) {
 		return '&hellip;';
 	}
 
@@ -680,22 +680,22 @@ 
 	 */
 	public function wp_enqueue_scripts() {
 		// get some style
-		if ( apply_filters( 'FHEE_enable_default_espresso_css', FALSE ) ) {
+		if (apply_filters('FHEE_enable_default_espresso_css', FALSE)) {
 			// first check uploads folder
-			if ( is_readable( get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'archive-espresso_events.css' )) {
-				wp_register_style( 'archive-espresso_events', get_stylesheet_directory_uri() . EE_Config::get_current_theme() . DS . 'archive-espresso_events.css', array( 'dashicons', 'espresso_default' ));
+			if (is_readable(get_stylesheet_directory().EE_Config::get_current_theme().DS.'archive-espresso_events.css')) {
+				wp_register_style('archive-espresso_events', get_stylesheet_directory_uri().EE_Config::get_current_theme().DS.'archive-espresso_events.css', array('dashicons', 'espresso_default'));
 			} else {
-				wp_register_style( 'archive-espresso_events', EE_TEMPLATES_URL . EE_Config::get_current_theme() . DS . 'archive-espresso_events.css', array( 'dashicons', 'espresso_default' ));
+				wp_register_style('archive-espresso_events', EE_TEMPLATES_URL.EE_Config::get_current_theme().DS.'archive-espresso_events.css', array('dashicons', 'espresso_default'));
 			}
-			if ( is_readable( get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'archive-espresso_events.js' )) {
-				wp_register_script( 'archive-espresso_events', get_stylesheet_directory_uri() . EE_Config::get_current_theme() . DS . 'archive-espresso_events.js', array( 'jquery-masonry' ), '1.0', TRUE  );
+			if (is_readable(get_stylesheet_directory().EE_Config::get_current_theme().DS.'archive-espresso_events.js')) {
+				wp_register_script('archive-espresso_events', get_stylesheet_directory_uri().EE_Config::get_current_theme().DS.'archive-espresso_events.js', array('jquery-masonry'), '1.0', TRUE);
 			} else {
-				wp_register_script( 'archive-espresso_events', EVENTS_ARCHIVE_ASSETS_URL . 'archive-espresso_events.js', array( 'jquery-masonry' ), '1.0', TRUE );
+				wp_register_script('archive-espresso_events', EVENTS_ARCHIVE_ASSETS_URL.'archive-espresso_events.js', array('jquery-masonry'), '1.0', TRUE);
 			}
-			wp_enqueue_style( 'archive-espresso_events' );
-			wp_enqueue_script( 'jquery-masonry' );
-			wp_enqueue_script( 'archive-espresso_events' );
-			add_action( 'wp_footer', array( 'EED_Events_Archive_Filters', 'localize_grid_event_lists' ), 1 );
+			wp_enqueue_style('archive-espresso_events');
+			wp_enqueue_script('jquery-masonry');
+			wp_enqueue_script('archive-espresso_events');
+			add_action('wp_footer', array('EED_Events_Archive_Filters', 'localize_grid_event_lists'), 1);
 		}
 	}
 
@@ -710,7 +710,7 @@ 
 	 *  @return 	void
 	 */
 	public static function localize_grid_event_lists() {
-		wp_localize_script( 'archive-espresso_events', 'espresso_grid_event_lists', EED_Events_Archive_Filters::$espresso_grid_event_lists );
+		wp_localize_script('archive-espresso_events', 'espresso_grid_event_lists', EED_Events_Archive_Filters::$espresso_grid_event_lists);
 	}
 
 
@@ -725,9 +725,9 @@ 
 	 */
 	public static function template_settings_form() {
 		$EE = EE_Registry::instance();
-		$EE->CFG->template_settings->EED_Events_Archive_Filters = isset( $EE->CFG->template_settings->EED_Events_Archive_Filters ) ? $EE->CFG->template_settings->EED_Events_Archive_Filters : new EE_Events_Archive_Config();
-		$EE->CFG->template_settings->EED_Events_Archive_Filters = apply_filters( 'FHEE__Event_List__template_settings_form__event_list_config', $EE->CFG->template_settings->EED_Events_Archive_Filters );
-		EEH_Template::display_template( EVENTS_ARCHIVE_TEMPLATES_PATH . 'admin-event-list-settings.template.php', $EE->CFG->template_settings->EED_Events_Archive_Filters );
+		$EE->CFG->template_settings->EED_Events_Archive_Filters = isset($EE->CFG->template_settings->EED_Events_Archive_Filters) ? $EE->CFG->template_settings->EED_Events_Archive_Filters : new EE_Events_Archive_Config();
+		$EE->CFG->template_settings->EED_Events_Archive_Filters = apply_filters('FHEE__Event_List__template_settings_form__event_list_config', $EE->CFG->template_settings->EED_Events_Archive_Filters);
+		EEH_Template::display_template(EVENTS_ARCHIVE_TEMPLATES_PATH.'admin-event-list-settings.template.php', $EE->CFG->template_settings->EED_Events_Archive_Filters);
 	}
 
 
@@ -741,16 +741,16 @@ 
 	 *  @static
 	 *  @return 	void
 	 */
-	public static function set_default_settings( $CFG ) {
+	public static function set_default_settings($CFG) {
 		//EEH_Debug_Tools::printr( $CFG, '$CFG  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		$CFG->display_description = isset( $CFG->display_description ) && ! empty( $CFG->display_description ) ? $CFG->display_description : 1;
-		$CFG->display_address = isset( $CFG->display_address ) && ! empty( $CFG->display_address ) ? $CFG->display_address : TRUE;
-		$CFG->display_venue_details = isset( $CFG->display_venue_details ) && ! empty( $CFG->display_venue_details ) ? $CFG->display_venue_details : TRUE;
-		$CFG->display_expired_events = isset( $CFG->display_expired_events ) && ! empty( $CFG->display_expired_events ) ? $CFG->display_expired_events : FALSE;
-		$CFG->default_type = isset( $CFG->default_type ) && ! empty( $CFG->default_type ) ? $CFG->default_type : 'grid';
-		$CFG->event_list_grid_size = isset( $CFG->event_list_grid_size ) && ! empty( $CFG->event_list_grid_size ) ? $CFG->event_list_grid_size : 'medium';
-		$CFG->templates['full'] = isset( $CFG->templates['full'] ) && ! empty( $CFG->templates['full'] ) ? $CFG->templates['full'] : EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events.php';
-		$CFG->templates['part'] = isset( $CFG->templates['part'] ) && ! empty( $CFG->templates['part'] ) ? $CFG->templates['part'] : EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-grid-view.php';
+		$CFG->display_description = isset($CFG->display_description) && ! empty($CFG->display_description) ? $CFG->display_description : 1;
+		$CFG->display_address = isset($CFG->display_address) && ! empty($CFG->display_address) ? $CFG->display_address : TRUE;
+		$CFG->display_venue_details = isset($CFG->display_venue_details) && ! empty($CFG->display_venue_details) ? $CFG->display_venue_details : TRUE;
+		$CFG->display_expired_events = isset($CFG->display_expired_events) && ! empty($CFG->display_expired_events) ? $CFG->display_expired_events : FALSE;
+		$CFG->default_type = isset($CFG->default_type) && ! empty($CFG->default_type) ? $CFG->default_type : 'grid';
+		$CFG->event_list_grid_size = isset($CFG->event_list_grid_size) && ! empty($CFG->event_list_grid_size) ? $CFG->event_list_grid_size : 'medium';
+		$CFG->templates['full'] = isset($CFG->templates['full']) && ! empty($CFG->templates['full']) ? $CFG->templates['full'] : EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events.php';
+		$CFG->templates['part'] = isset($CFG->templates['part']) && ! empty($CFG->templates['part']) ? $CFG->templates['part'] : EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events-grid-view.php';
 		return $CFG;
 	}
 
@@ -762,7 +762,7 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function filter_config( $CFG ) {
+	public function filter_config($CFG) {
 		return $CFG;
 	}
 
@@ -775,32 +775,32 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public static function update_template_settings( $CFG, $REQ ) {
+	public static function update_template_settings($CFG, $REQ) {
 //		EEH_Debug_Tools::printr( $REQ, '$REQ  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 //		EEH_Debug_Tools::printr( $CFG, '$CFG  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 		//$CFG->template_settings->EED_Events_Archive_Filters = new stdClass();
-		$CFG->EED_Events_Archive_Filters->display_description = isset( $REQ['display_description_in_event_list'] ) ? absint( $REQ['display_description_in_event_list'] ) : 1;
-		$CFG->EED_Events_Archive_Filters->display_address = isset( $REQ['display_address_in_event_list'] ) ? absint( $REQ['display_address_in_event_list'] ) : TRUE;
-		$CFG->EED_Events_Archive_Filters->display_venue_details = isset( $REQ['display_venue_details_in_event_list'] ) ? absint( $REQ['display_venue_details_in_event_list'] ) : TRUE;
-		$CFG->EED_Events_Archive_Filters->display_expired_events = isset( $REQ['display_expired_events'] ) ? absint( $REQ['display_expired_events'] ) : FALSE;
-		$CFG->EED_Events_Archive_Filters->default_type = isset( $REQ['default_type'] ) ? sanitize_text_field( $REQ['default_type'] ) : 'grid';
-		$CFG->EED_Events_Archive_Filters->event_list_grid_size = isset( $REQ['event_list_grid_size'] ) ? sanitize_text_field( $REQ['event_list_grid_size'] ) : 'medium';
+		$CFG->EED_Events_Archive_Filters->display_description = isset($REQ['display_description_in_event_list']) ? absint($REQ['display_description_in_event_list']) : 1;
+		$CFG->EED_Events_Archive_Filters->display_address = isset($REQ['display_address_in_event_list']) ? absint($REQ['display_address_in_event_list']) : TRUE;
+		$CFG->EED_Events_Archive_Filters->display_venue_details = isset($REQ['display_venue_details_in_event_list']) ? absint($REQ['display_venue_details_in_event_list']) : TRUE;
+		$CFG->EED_Events_Archive_Filters->display_expired_events = isset($REQ['display_expired_events']) ? absint($REQ['display_expired_events']) : FALSE;
+		$CFG->EED_Events_Archive_Filters->default_type = isset($REQ['default_type']) ? sanitize_text_field($REQ['default_type']) : 'grid';
+		$CFG->EED_Events_Archive_Filters->event_list_grid_size = isset($REQ['event_list_grid_size']) ? sanitize_text_field($REQ['event_list_grid_size']) : 'medium';
 		$CFG->EED_Events_Archive_Filters->templates = array(
-				'full'  => EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events.php'
+				'full'  => EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events.php'
 			);
 
-		switch ( $CFG->EED_Events_Archive_Filters->default_type ) {
+		switch ($CFG->EED_Events_Archive_Filters->default_type) {
 			case 'dates' :
-					$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-dates-view.php';
+					$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events-dates-view.php';
 				break;
 			case 'text' :
-					$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-text-view.php';
+					$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events-text-view.php';
 				break;
 			default :
-					$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-grid-view.php';
+					$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events-grid-view.php';
 		}
 
-		$CFG->EED_Events_Archive_Filters = isset( $REQ['reset_event_list_settings'] ) && absint( $REQ['reset_event_list_settings'] ) == 1 ? new EE_Events_Archive_Config() : $CFG->EED_Events_Archive_Filters;
+		$CFG->EED_Events_Archive_Filters = isset($REQ['reset_event_list_settings']) && absint($REQ['reset_event_list_settings']) == 1 ? new EE_Events_Archive_Config() : $CFG->EED_Events_Archive_Filters;
 		return $CFG;
 	}
 
@@ -815,7 +815,7 @@ 
 	 *  @return 	void
 	 */
 	public static function get_template_part() {
-		switch ( self::$_type ) {
+		switch (self::$_type) {
 			case 'dates' :
 					return 'archive-espresso_events-dates-view.php';
 				break;
@@ -839,13 +839,13 @@ 
 	 */
 	public function event_list_template_filters() {
 		$args = array(
-			'form_url' => get_post_type_archive_link( 'espresso_events' ), //add_query_arg( array( 'post_type' => 'espresso_events' ), home_url() ),
+			'form_url' => get_post_type_archive_link('espresso_events'), //add_query_arg( array( 'post_type' => 'espresso_events' ), home_url() ),
 			'elf_month' => EED_Events_Archive_Filters::_display_month(),
 			'elf_category' => EED_Events_Archive_Filters::_event_category_slug(),
 			'elf_show_expired' => EED_Events_Archive_Filters::_show_expired(),
 			'elf_type' => self::$_type
 		);
-		EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-filters.php', $args );
+		EEH_Template::display_template(EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events-filters.php', $args);
 	}
 
 
@@ -858,16 +858,16 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public static function event_list_css( $extra_class = '' ) {
+	public static function event_list_css($extra_class = '') {
 		$EE = EE_Registry::instance();
-		$event_list_css = ! empty( $extra_class ) ? array( $extra_class ) : array();
+		$event_list_css = ! empty($extra_class) ? array($extra_class) : array();
 		$event_list_css[] = 'espresso-event-list-event';
-		if ( self::$_type == 'grid' ) {
-			$event_list_grid_size = isset( $EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size ) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size : 'medium';
-			$event_list_css[] = $event_list_grid_size . '-event-list-grid';
+		if (self::$_type == 'grid') {
+			$event_list_grid_size = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size : 'medium';
+			$event_list_css[] = $event_list_grid_size.'-event-list-grid';
 		}
-		$event_list_css = apply_filters( 'EED_Events_Archive_Filters__event_list_css__event_list_css_array', $event_list_css );
-		return implode( ' ', $event_list_css );
+		$event_list_css = apply_filters('EED_Events_Archive_Filters__event_list_css__event_list_css_array', $event_list_css);
+		return implode(' ', $event_list_css);
 	}
 
 
@@ -893,9 +893,9 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public static function display_description( $value ) {
+	public static function display_description($value) {
 		$EE = EE_Registry::instance();
-		$display_description= isset( $EE->CFG->template_settings->EED_Events_Archive_Filters->display_description ) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_description : 1;
+		$display_description = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->display_description) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_description : 1;
 		return $display_description === $value ? TRUE : FALSE;
 	}
 
@@ -909,9 +909,9 @@ 
 	 */
 	public static function display_venue_details() {
 		$EE = EE_Registry::instance();
-		$display_venue_details= isset( $EE->CFG->template_settings->EED_Events_Archive_Filters->display_venue_details ) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_venue_details : TRUE;
+		$display_venue_details = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->display_venue_details) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_venue_details : TRUE;
 		$venue_name = EEH_Venue_View::venue_name();
-		return $display_venue_details && ! empty( $venue_name ) ? TRUE : FALSE;
+		return $display_venue_details && ! empty($venue_name) ? TRUE : FALSE;
 	}
 
 
@@ -923,9 +923,9 @@ 
 	 */
 	public static function display_address() {
 		$EE = EE_Registry::instance();
-		$display_address= isset( $EE->CFG->template_settings->EED_Events_Archive_Filters->display_address ) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_address : FALSE;
+		$display_address = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->display_address) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_address : FALSE;
 		$venue_name = EEH_Venue_View::venue_name();
-		return $display_address && ! empty( $venue_name ) ? TRUE : FALSE;
+		return $display_address && ! empty($venue_name) ? TRUE : FALSE;
 	}
 
 
@@ -939,22 +939,22 @@ 
 	public static function pagination() {
 		global $wp_query;
 		$big = 999999999; // need an unlikely integer
-		$pagination = paginate_links( array(
-			'base' => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+		$pagination = paginate_links(array(
+			'base' => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
 			'format' => '?paged=%#%',
-			'current' => max( 1, get_query_var('paged') ),
+			'current' => max(1, get_query_var('paged')),
 			'total' => $wp_query->max_num_pages,
 			'show_all'     => TRUE,
 			'end_size'     => 10,
 			'mid_size'     => 6,
 			'prev_next'    => TRUE,
-			'prev_text'    => __( '&lsaquo; PREV', 'event_espresso' ),
-			'next_text'    => __( 'NEXT &rsaquo;', 'event_espresso' ),
+			'prev_text'    => __('&lsaquo; PREV', 'event_espresso'),
+			'next_text'    => __('NEXT &rsaquo;', 'event_espresso'),
 			'type'         => 'plain',
 			'add_args'     => FALSE,
 			'add_fragment' => ''
 		));
-		return ! empty( $pagination ) ? '<div class="ee-pagination-dv clear">' . $pagination . '</div>' : '';
+		return ! empty($pagination) ? '<div class="ee-pagination-dv clear">'.$pagination.'</div>' : '';
 	}
 
 
@@ -968,7 +968,7 @@ 
 	 *  @return 	void
 	 */
 	public static function event_list_title() {
-		return apply_filters( 'EED_Events_Archive_Filters__event_list_title__event_list_title', __( 'Upcoming Events', 'event_espresso' ));
+		return apply_filters('EED_Events_Archive_Filters__event_list_title__event_list_title', __('Upcoming Events', 'event_espresso'));
 	}