eventespresso / event-espresso-core

core/libraries/line_item_display/EE_Admin_Table_Line_Item_Display_Strategy.strategy.php

Spacing +59 added lines, -59 removed lines

@@ -49,10 +49,10 @@ 
 	 * @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()) {
 
-		EE_Registry::instance()->load_helper( 'Template' );
-		EE_Registry::instance()->load_helper( 'HTML' );
+		EE_Registry::instance()->load_helper('Template');
+		EE_Registry::instance()->load_helper('HTML');
 
 		$html = '';
 		// set some default options and merge with incoming
@@ -63,40 +63,40 @@ 
 			'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:
 				//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,44 +178,44 @@ 
 
 		//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() : __( '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() : __('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() . '<br />' : '';
+		$type_html = $line_item->OBJ_type() ? $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,7 +231,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 '';
 	}
@@ -245,13 +245,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;
@@ -268,7 +268,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 '';
 	}
@@ -282,15 +282,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;

Doc Comments +6 added lines, -6 removed lines

@@ -16,7 +16,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() ) {
 
@@ -94,7 +94,7 @@ 
 	 *
 	 * @param EE_Line_Item $line_item
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	private function _item_row( EE_Line_Item $line_item, $options = array() ) {
 		// start of row
@@ -123,7 +123,7 @@ 
 	 *
 	 * @param EE_Line_Item $line_item
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	private function _sub_item_row( EE_Line_Item $line_item, $options = array() ) {
 		// start of row
@@ -153,7 +153,7 @@ 
 	 *
 	 * @param EE_Line_Item $line_item
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	private function _tax_row( EE_Line_Item $line_item, $options = array() ) {
 		// start of row
@@ -179,7 +179,7 @@ 
 	 * @param EE_Line_Item $line_item
 	 * @param string       $text
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	private function _total_row( EE_Line_Item $line_item, $text = '', $options = array() ) {
 		// colspan
@@ -203,7 +203,7 @@ 
 	 * 	_separator_row
 	 *
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	private function _separator_row( $options = array() ) {
 		// colspan

core/libraries/line_item_display/EE_Admin_Table_Registration_Line_Item_Display_Strategy.strategy.php

Indentation +7 added lines, -7 removed lines

@@ -154,13 +154,13 @@
 			$total_label = sprintf( __( 'This registration\'s approximate total %s', 'event_espresso' ), '(' . EE_Registry::instance()->CFG->currency->code . ')' );
 			$total_label .= '<br>';
 			$total_label .= '<p class="ee-footnote-text">'
-			                . sprintf(
-				                __( 'The registrations\' share of the transaction total is approximate because it might not be possible to evenly divide the transaction total among each registration, and so some registrations may need to pay a penny more than others.  This registration\'s final share is actually %1$s%2$s%3$s.', 'event_espresso' ),
-				                '<strong>',
-				                $registration_total,
-				                '</strong>'
-			                )
-			                . '</p>';
+							. sprintf(
+								__( 'The registrations\' share of the transaction total is approximate because it might not be possible to evenly divide the transaction total among each registration, and so some registrations may need to pay a penny more than others.  This registration\'s final share is actually %1$s%2$s%3$s.', 'event_espresso' ),
+								'<strong>',
+								$registration_total,
+								'</strong>'
+							)
+							. '</p>';
 		}
 		$html .= EEH_HTML::th( $total_label, '',  'jst-rght',  '',  ' colspan="3"' );
 		// total th

Spacing +42 added lines, -42 removed lines

@@ -10,7 +10,7 @@ 
  *
  */
 
-class EE_Admin_Table_Registration_Line_Item_Display_Strategy extends EE_Admin_Table_Line_Item_Display_Strategy  {
+class EE_Admin_Table_Registration_Line_Item_Display_Strategy extends EE_Admin_Table_Line_Item_Display_Strategy {
 
 	/**
 	 * Table header for display.
@@ -18,14 +18,14 @@ 
 	 * @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( __( 'Date(s)', 'event_espresso' ), '', 'jst-left' );
-		$html .= EEH_HTML::th( __( 'Amount', '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(__('Date(s)', 'event_espresso'), '', 'jst-left');
+		$html .= EEH_HTML::th(__('Amount', 'event_espresso'), '', 'jst-cntr');
 		$html .= EEH_HTML::tbody();
 		return $html;
 	}
@@ -41,12 +41,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
@@ -54,48 +54,48 @@ 
 
 		//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() : __( '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() : __('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() . '<br />' : '';
+		$type_html = $line_item->OBJ_type() ? $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');
 
 		//Date column
 		$datetime_content = '';
-		if ( $line_item_related_object instanceof EE_Ticket ) {
+		if ($line_item_related_object instanceof EE_Ticket) {
 			$datetimes = $line_item_related_object->datetimes();
-			foreach ( $datetimes as $datetime ) {
-				if ( $datetime instanceof EE_Datetime ) {
-					$datetime_content .= $datetime->get_dtt_display_name() . '<br>';
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
+					$datetime_content .= $datetime->get_dtt_display_name().'<br>';
 				}
 			}
 		}
-		$html .= EEH_HTML::td( $datetime_content, '', 'jst-left' );
+		$html .= EEH_HTML::td($datetime_content, '', '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');
 		}
 
 
@@ -113,13 +113,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="3"' );
+		$html .= EEH_HTML::th($line_item->name().'('.$line_item->get_pretty('LIN_percent').'%)', '', 'jst-rght', '', ' colspan="3"');
 		// 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;
@@ -136,9 +136,9 @@ 
 	 * @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()) {
 
-		$registration = isset( $options['EE_Registration'] ) ? $options['EE_Registration'] : null;
+		$registration = isset($options['EE_Registration']) ? $options['EE_Registration'] : null;
 		$registration_total = $registration instanceof EE_Registration ? $registration->pretty_final_price() : 0;
 		//if no valid registration object then we're not going to show the approximate text.
 		$total_match = $registration instanceof EE_Registration ? $registration->final_price() == $line_item->total() : true;
@@ -146,26 +146,26 @@ 
 
 
 		// start of row
-		$html = EEH_HTML::tr( '', '', 'admin-primary-mbox-total-tr' );
+		$html = EEH_HTML::tr('', '', 'admin-primary-mbox-total-tr');
 		// Total th label
-		if ( $total_match ) {
-			$total_label = sprintf( __( 'This registration\'s total %s:', 'event_espresso' ), '(' . EE_Registry::instance()->CFG->currency->code . ')' );
+		if ($total_match) {
+			$total_label = sprintf(__('This registration\'s total %s:', 'event_espresso'), '('.EE_Registry::instance()->CFG->currency->code.')');
 		} else {
-			$total_label = sprintf( __( 'This registration\'s approximate total %s', 'event_espresso' ), '(' . EE_Registry::instance()->CFG->currency->code . ')' );
+			$total_label = sprintf(__('This registration\'s approximate total %s', 'event_espresso'), '('.EE_Registry::instance()->CFG->currency->code.')');
 			$total_label .= '<br>';
 			$total_label .= '<p class="ee-footnote-text">'
 			                . sprintf(
-				                __( 'The registrations\' share of the transaction total is approximate because it might not be possible to evenly divide the transaction total among each registration, and so some registrations may need to pay a penny more than others.  This registration\'s final share is actually %1$s%2$s%3$s.', 'event_espresso' ),
+				                __('The registrations\' share of the transaction total is approximate because it might not be possible to evenly divide the transaction total among each registration, and so some registrations may need to pay a penny more than others.  This registration\'s final share is actually %1$s%2$s%3$s.', 'event_espresso'),
 				                '<strong>',
 				                $registration_total,
 				                '</strong>'
 			                )
 			                . '</p>';
 		}
-		$html .= EEH_HTML::th( $total_label, '',  'jst-rght',  '',  ' colspan="3"' );
+		$html .= EEH_HTML::th($total_label, '', 'jst-rght', '', ' colspan="3"');
 		// 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;

Doc Comments +3 added lines, -3 removed lines

@@ -55,7 +55,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() ) {
 
@@ -135,7 +135,7 @@ 
 	 *
 	 * @param EE_Line_Item $line_item
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	private function _item_row( EE_Line_Item $line_item, $options = array() ) {
 		// start of row
@@ -178,7 +178,7 @@ 
 	 *
 	 * @param EE_Line_Item $line_item
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	private function _sub_item_row( EE_Line_Item $line_item, $options = array() ) {
 		// start of row

core/libraries/line_item_display/EE_Line_Item_Display.class.php

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
  /**
- *
- * Class EE_Line_Item_Display
- *
- * Description
- *
- * @package         Event Espresso
- * @subpackage    core
- * @author				Brent Christensen
- * @since		 	   $VID:$
- *
- */
+  *
+  * Class EE_Line_Item_Display
+  *
+  * Description
+  *
+  * @package         Event Espresso
+  * @subpackage    core
+  * @author				Brent Christensen
+  * @since		 	   $VID:$
+  *
+  */
 class EE_Line_Item_Display {
 
 	private $strategy = NULL;

Spacing +7 added lines, -7 removed lines

@@ -21,9 +21,9 @@ 
 	 * @param string $context - where/how the line items are being displayed
 	 * @param string $other_line_item_display_strategy
 	 */
-	public function __construct( $context = '', $other_line_item_display_strategy = '' ) {
-		$context = strtolower( $context );
-		switch ( $context ) {
+	public function __construct($context = '', $other_line_item_display_strategy = '') {
+		$context = strtolower($context);
+		switch ($context) {
 			case 'invoice' :
 				$this->strategy = new EE_Invoice_Line_Item_Display_Strategy();
 				break;
@@ -35,8 +35,8 @@ 
 				break;
 			default :
 				if (
-					! empty( $other_line_item_display_strategy ) &&
-					class_exists( $other_line_item_display_strategy )
+					! empty($other_line_item_display_strategy) &&
+					class_exists($other_line_item_display_strategy)
 				) {
 					$this->strategy = new  $other_line_item_display_strategy();
 				} else {
@@ -50,8 +50,8 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	public function display_line_item( EE_Line_Item $line_item, $options = array() ) {
-		return $this->strategy->display_line_item( $line_item, $options );
+	public function display_line_item(EE_Line_Item $line_item, $options = array()) {
+		return $this->strategy->display_line_item($line_item, $options);
 	}
 
 

core/libraries/line_item_filters/EE_Billable_Line_Item_Filter.class.php

Spacing +11 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Class EE_Billable_Line_Item_Filter
@@ -25,8 +25,8 @@ 
 	 * EE_Billable_Line_Item_Filter constructor.
 	 * @param EE_Registration[] $registrations
 	 */
-	public function __construct( $registrations ) {
-		parent::__construct( $this->_remove_unbillable_registrations( $registrations ) );
+	public function __construct($registrations) {
+		parent::__construct($this->_remove_unbillable_registrations($registrations));
 	}
 
 
@@ -39,25 +39,24 @@ 
 	 * @param EE_Registration[] $registrations
 	 * @return mixed
 	 */
-	protected function _remove_unbillable_registrations( $registrations = array() ) {
-		if ( ! empty( $registrations ) ) {
+	protected function _remove_unbillable_registrations($registrations = array()) {
+		if ( ! empty($registrations)) {
 			// these reg statuses require payment (if event is not free)
 			$requires_payment = EEM_Registration::reg_statuses_that_allow_payment();
-			foreach ( $registrations as $key => $registration ) {
-				if ( ! $registration instanceof EE_Registration ) {
+			foreach ($registrations as $key => $registration) {
+				if ( ! $registration instanceof EE_Registration) {
 					continue;
 				}
 				// are we billing for this registration at this moment ?
-				if ( !
-					$registration->owes_monies_and_can_pay( $requires_payment ) &&
+				if ( ! $registration->owes_monies_and_can_pay($requires_payment) &&
 					! (
 						// free registration with valid reg status
 						$registration->final_price() == 0 &&
-						in_array( $registration->status_ID(), $requires_payment )
+						in_array($registration->status_ID(), $requires_payment)
 					)
 				) {
 					// not billable. remove it
-					unset( $registrations[ $key ] );
+					unset($registrations[$key]);
 				}
 			}
 		}

core/libraries/line_item_filters/EE_Line_Item_Filter_Collection.class.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Class EE_Line_Item_Filter_Collection

core/libraries/line_item_filters/EE_Line_Item_Filter_Processor.class.php

Spacing +18 added lines, -18 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Class EE_Line_Item_Filter_Processor
@@ -55,12 +55,12 @@ 
 	 * @param \EEI_Line_Item                  $grand_total_line_item
 	 * @throws \EE_Error
 	 */
-	public function __construct( EE_Line_Item_Filter_Collection $line_item_filters, EEI_Line_Item $grand_total_line_item ) {
+	public function __construct(EE_Line_Item_Filter_Collection $line_item_filters, EEI_Line_Item $grand_total_line_item) {
 		$this->line_item_filters = $line_item_filters;
-		if ( $grand_total_line_item->type() !== EEM_Line_Item::type_total ) {
-			throw new EE_Error( __( 'A Line Item of the type total is required', 'event_espresso' ) );
+		if ($grand_total_line_item->type() !== EEM_Line_Item::type_total) {
+			throw new EE_Error(__('A Line Item of the type total is required', 'event_espresso'));
 		}
-		$this->grand_total_line_item = $this->clone_and_reset_line_item_tree( $grand_total_line_item );
+		$this->grand_total_line_item = $this->clone_and_reset_line_item_tree($grand_total_line_item);
 	}
 
 
@@ -71,10 +71,10 @@ 
 	 * @param \EEI_Line_Item $line_item
 	 * @return \EEI_Line_Item
 	 */
-	protected function clone_and_reset_line_item_tree( EEI_Line_Item $line_item ) {
-		$cloned_line_item = $this->clone_and_reset_line_item( $line_item );
-		foreach ( $line_item->children() as $child_line_item ) {
-			$cloned_line_item->add_child_line_item( $this->clone_and_reset_line_item_tree( $child_line_item ) );
+	protected function clone_and_reset_line_item_tree(EEI_Line_Item $line_item) {
+		$cloned_line_item = $this->clone_and_reset_line_item($line_item);
+		foreach ($line_item->children() as $child_line_item) {
+			$cloned_line_item->add_child_line_item($this->clone_and_reset_line_item_tree($child_line_item));
 		}
 		return $cloned_line_item;
 	}
@@ -91,16 +91,16 @@ 
 	 * @param \EEI_Line_Item $line_item
 	 * @return \EEI_Line_Item
 	 */
-	protected function clone_and_reset_line_item( EEI_Line_Item $line_item ) {
+	protected function clone_and_reset_line_item(EEI_Line_Item $line_item) {
 		// we don't actually want to work with the original line item, so clone it
 		$cloned_line_item = clone $line_item;
-		$cloned_line_item->set( 'LIN_ID', null );
-		$cloned_line_item->set( 'LIN_parent', null );
+		$cloned_line_item->set('LIN_ID', null);
+		$cloned_line_item->set('LIN_parent', null);
 		$cloned_line_item->clear_related_line_item_cache();
-		foreach( array_keys( EEM_Line_Item::instance()->relation_settings() ) as $relation_name) {
-			$cloned_line_item->clear_cache( $relation_name, null, true );
+		foreach (array_keys(EEM_Line_Item::instance()->relation_settings()) as $relation_name) {
+			$cloned_line_item->clear_cache($relation_name, null, true);
 		}
-		$cloned_line_item->set_allow_persist( false );
+		$cloned_line_item->set_allow_persist(false);
 		return $cloned_line_item;
 	}
 
@@ -113,8 +113,8 @@ 
 	 */
 	public function process() {
 		$this->line_item_filters->rewind();
-		while ( $this->line_item_filters->valid() ) {
-			$this->grand_total_line_item = $this->line_item_filters->current()->process( $this->grand_total_line_item );
+		while ($this->line_item_filters->valid()) {
+			$this->grand_total_line_item = $this->line_item_filters->current()->process($this->grand_total_line_item);
 			$this->line_item_filters->next();
 		}
 		$this->grand_total_line_item->recalculate_total_including_taxes();

core/libraries/line_item_filters/EE_Non_Zero_Line_Item_Filter.class.php

Spacing +18 added lines, -18 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Class EE_Non_Zero_Line_Item_Filter
@@ -31,36 +31,36 @@ 
 	 * @param EEI_Line_Item $line_item
 	 * @return \EEI_Line_Item
 	 */
-	public function process( EEI_Line_Item $line_item ) {
-		$non_zero_line_item = $this->_filter_zero_line_item( $line_item );
-		if ( ! $non_zero_line_item instanceof EEI_Line_Item ) {
+	public function process(EEI_Line_Item $line_item) {
+		$non_zero_line_item = $this->_filter_zero_line_item($line_item);
+		if ( ! $non_zero_line_item instanceof EEI_Line_Item) {
 			return null;
 		}
 		//if this is an event subtotal, we want to only include it if it
 		//has a non-zero total and at least one ticket line item child
-		if( $line_item->children() ) {
+		if ($line_item->children()) {
 			$ticket_or_subtotals_with_tkt_children_count = 0;
-			foreach ( $line_item->children() as $child_line_item ) {
+			foreach ($line_item->children() as $child_line_item) {
 				$code = $child_line_item->code();
-				$child_line_item = $this->process( $child_line_item );
-				if( ! $child_line_item instanceof EEI_Line_Item ) {
-					$line_item->delete_child_line_item( $code );
+				$child_line_item = $this->process($child_line_item);
+				if ( ! $child_line_item instanceof EEI_Line_Item) {
+					$line_item->delete_child_line_item($code);
 					continue;
 				}
 				if (
-					( $child_line_item instanceof EEI_Line_Item &&
+					($child_line_item instanceof EEI_Line_Item &&
 					$child_line_item->type() === EEM_Line_Item::type_line_item &&
-					$child_line_item->OBJ_type() === 'Ticket' ) ||
-					( $child_line_item instanceof EEI_Line_Item &&
-					 $child_line_item->type() === EEM_Line_Item::type_sub_total )
+					$child_line_item->OBJ_type() === 'Ticket') ||
+					($child_line_item instanceof EEI_Line_Item &&
+					 $child_line_item->type() === EEM_Line_Item::type_sub_total)
 				) {
 					$ticket_or_subtotals_with_tkt_children_count++;
 				}
 			}
 			// if this is an event subtotal with NO ticket children
 			// we basically want to ignore it
-			return $this->_filter_zero_subtotal_line_item( $non_zero_line_item, $ticket_or_subtotals_with_tkt_children_count );
-		}else{
+			return $this->_filter_zero_subtotal_line_item($non_zero_line_item, $ticket_or_subtotals_with_tkt_children_count);
+		} else {
 			return $non_zero_line_item;
 		}
 	}
@@ -73,7 +73,7 @@ 
 	 * @param EEI_Line_Item $line_item
 	 * @return EEI_Line_Item
 	 */
-	protected function _filter_zero_line_item( EEI_Line_Item $line_item ) {
+	protected function _filter_zero_line_item(EEI_Line_Item $line_item) {
 		if (
 			$line_item->type() === EEM_Line_Item::type_line_item &&
 			$line_item->OBJ_type() === 'Ticket' &&
@@ -93,7 +93,7 @@ 
 	 * @param int           $ticket_children
 	 * @return \EEI_Line_Item
 	 */
-	protected function _filter_zero_subtotal_line_item( EEI_Line_Item $line_item, $ticket_children = 0 ) {
+	protected function _filter_zero_subtotal_line_item(EEI_Line_Item $line_item, $ticket_children = 0) {
 		if (
 			$line_item->type() === EEM_Line_Item::type_sub_total &&
 			$ticket_children === 0

Braces +1 added lines, -1 removed lines

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

core/libraries/line_item_filters/EE_Specific_Registrations_Line_Item_Filter.class.php

Indentation +4 added lines, -4 removed lines

@@ -18,10 +18,10 @@
  */
 class EE_Specific_Registrations_Line_Item_Filter extends EE_Line_Item_Filter_Base {
 /**
-	 * array of line item codes and their corresponding quantities for
-	 * registrations that owe money and can pay at this moment
-	 * @type array $_counts_per_line_item_code
-	 */
+ * array of line item codes and their corresponding quantities for
+ * registrations that owe money and can pay at this moment
+ * @type array $_counts_per_line_item_code
+ */
 	protected $_counts_per_line_item_code = array();
 
 	/**

Spacing +18 added lines, -18 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -36,9 +36,9 @@ 
 	 * EE_Billable_Line_Item_Filter constructor.
 	 * @param EE_Registration[] $registrations
 	 */
-	public function __construct( $registrations ) {
+	public function __construct($registrations) {
 		$this->_registrations = $registrations;
-		$this->_calculate_counts_per_line_item_code( $registrations );
+		$this->_calculate_counts_per_line_item_code($registrations);
 	}
 
 	/**
@@ -46,14 +46,14 @@ 
 	 * @param EE_Registration[] $registrations
 	 * @return void
 	 */
-	protected function _calculate_counts_per_line_item_code( $registrations ) {
-		foreach( $registrations as $registration ) {
-			$line_item_code = EEM_Line_Item::instance()->get_var( EEM_Line_Item::instance()->line_item_for_registration_query_params( $registration, array( 'limit' => 1 ) ), 'LIN_code' );
-			if( $line_item_code ) {
-				if( ! isset( $this->_counts_per_line_item_code[ $line_item_code ] ) ) {
-					$this->_counts_per_line_item_code[ $line_item_code ] = 1;
-				}else{
-					$this->_counts_per_line_item_code[ $line_item_code ]++;
+	protected function _calculate_counts_per_line_item_code($registrations) {
+		foreach ($registrations as $registration) {
+			$line_item_code = EEM_Line_Item::instance()->get_var(EEM_Line_Item::instance()->line_item_for_registration_query_params($registration, array('limit' => 1)), 'LIN_code');
+			if ($line_item_code) {
+				if ( ! isset($this->_counts_per_line_item_code[$line_item_code])) {
+					$this->_counts_per_line_item_code[$line_item_code] = 1;
+				} else {
+					$this->_counts_per_line_item_code[$line_item_code]++;
 				}
 			}
 		}
@@ -69,18 +69,18 @@ 
 	 * @param EEI_Line_Item $line_item
 	 * @return EEI_Line_Item
 	 */
-	protected function _adjust_line_item_quantity( EEI_Line_Item $line_item ) {
+	protected function _adjust_line_item_quantity(EEI_Line_Item $line_item) {
 		// is this a ticket ?
-		if ( $line_item->type() === EEM_Line_Item::type_line_item && $line_item->OBJ_type() == 'Ticket' ) {
+		if ($line_item->type() === EEM_Line_Item::type_line_item && $line_item->OBJ_type() == 'Ticket') {
 			// if this ticket is billable at this moment, then we should have a positive quantity
-			if ( isset( $this->_counts_per_line_item_code[ $line_item->code() ] )) {
+			if (isset($this->_counts_per_line_item_code[$line_item->code()])) {
 				// set quantity based on number of billable registrations for this ticket
-				$quantity = $this->_counts_per_line_item_code[ $line_item->code() ];
+				$quantity = $this->_counts_per_line_item_code[$line_item->code()];
 			} else {
 				$quantity = 0;
 			}
-			$line_item->set_quantity( $quantity );
-			$line_item->set_total( $line_item->unit_price() * $line_item->quantity() );
+			$line_item->set_quantity($quantity);
+			$line_item->set_total($line_item->unit_price() * $line_item->quantity());
 		}
 		return $line_item;
 	}

Braces +1 added lines, -1 removed lines

@@ -459,7 +459,7 @@
 				//must be explicit because schema could equal true.
 				if( $schema === 'no_html' ){
 					$timezone_string = ' (' . $DateTime->format( 'T' )  . ')';
-				}else{
+				} else{
 					$timezone_string = ' <span class="ee_dtt_timezone_string">(' . $DateTime->format( 'T' ) . ')</span>';
 				}
 			} else {

core/libraries/messages/EE_Messages_Base.lib.php

Spacing +14 added lines, -14 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -185,14 +185,14 @@ 
 	 * @access protected
 	 * @return void
 	 */
-	protected function _set_existing_admin_settings( $messenger = NULL ) {
+	protected function _set_existing_admin_settings($messenger = NULL) {
 		$active_messengers = EEH_MSG_Template::get_active_messengers_in_db();
-		$active_message_types = !empty( $messenger ) ? $active_messengers[$messenger]['settings'][$messenger . '-message_types'] : array();
+		$active_message_types = ! empty($messenger) ? $active_messengers[$messenger]['settings'][$messenger.'-message_types'] : array();
 
 
 		$actives = $this->_messages_item_type == 'messenger' ? $active_messengers : $active_message_types;
 
-		$this->_existing_admin_settings = isset($actives[$this->name]['settings'] ) ? $actives[$this->name]['settings'] : null;
+		$this->_existing_admin_settings = isset($actives[$this->name]['settings']) ? $actives[$this->name]['settings'] : null;
 	}
 
 
@@ -207,10 +207,10 @@ 
 	 * @access public
 	 * @return array          settings
 	 */
-	public function get_existing_admin_settings( $messenger = NULL ) {
+	public function get_existing_admin_settings($messenger = NULL) {
 		// if admin_settings property empty lets try setting it.
-		if ( method_exists($this, '_set_existing_admin_settings') && empty( $this->_existing_admin_settings ) )
-			$this->_set_existing_admin_settings( $messenger );
+		if (method_exists($this, '_set_existing_admin_settings') && empty($this->_existing_admin_settings))
+			$this->_set_existing_admin_settings($messenger);
 
 		return EEH_Class_Tools::has_property($this, '_existing_admin_settings') ? $this->_existing_admin_settings : null;
 	}
@@ -225,10 +225,10 @@ 
 	 * @return array   an array of valid shortcodes.
 	 */
 	public function get_valid_shortcodes() {
-		$valid_shortcodes = apply_filters( 'FHEE__' . get_class($this) . '__get_valid_shortcodes', $this->_valid_shortcodes, $this );
+		$valid_shortcodes = apply_filters('FHEE__'.get_class($this).'__get_valid_shortcodes', $this->_valid_shortcodes, $this);
 
 		//The below filter applies to ALL messengers and message types so use with care!
-		$valid_shortcodes = apply_filters( 'FHEE__EE_Messages_Base__get_valid_shortcodes', $valid_shortcodes, $this );
+		$valid_shortcodes = apply_filters('FHEE__EE_Messages_Base__get_valid_shortcodes', $valid_shortcodes, $this);
 		return $valid_shortcodes;
 	}
 
@@ -259,17 +259,17 @@ 
 	 * @access protected
 	 * @return string $content for page.
 	 */
-	protected function _get_admin_page_content( $page, $action, $extra, $actives ) {
+	protected function _get_admin_page_content($page, $action, $extra, $actives) {
 		//we can also further refine the context by action (if present).
-		if ( !empty($action) ) {
-			$page = $page . '_' . $action;
+		if ( ! empty($action)) {
+			$page = $page.'_'.$action;
 		}
 
-		if ( !isset( $this->admin_registered_pages[$page]) )
+		if ( ! isset($this->admin_registered_pages[$page]))
 			return false; //todo: a place to throw an exception?  We need to indicate there is no registered page so this function is not being called correctly.
 
 		//k made it here so let's call the method
-		if ( FALSE === ( $content = call_user_func_array( array( $this, '_get_admin_content_' . $page), array($actives, $extra) ) ) ) {
+		if (FALSE === ($content = call_user_func_array(array($this, '_get_admin_content_'.$page), array($actives, $extra)))) {
 			return false; //todo this needs to be an exception once we've got exceptions in place.
 		}
 		return $content;

Braces +9 added lines, -5 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -209,8 +210,9 @@ 
 	 */
 	public function get_existing_admin_settings( $messenger = NULL ) {
 		// if admin_settings property empty lets try setting it.
-		if ( method_exists($this, '_set_existing_admin_settings') && empty( $this->_existing_admin_settings ) )
-			$this->_set_existing_admin_settings( $messenger );
+		if ( method_exists($this, '_set_existing_admin_settings') && empty( $this->_existing_admin_settings ) ) {
+					$this->_set_existing_admin_settings( $messenger );
+		}
 
 		return EEH_Class_Tools::has_property($this, '_existing_admin_settings') ? $this->_existing_admin_settings : null;
 	}
@@ -265,8 +267,10 @@ 
 			$page = $page . '_' . $action;
 		}
 
-		if ( !isset( $this->admin_registered_pages[$page]) )
-			return false; //todo: a place to throw an exception?  We need to indicate there is no registered page so this function is not being called correctly.
+		if ( !isset( $this->admin_registered_pages[$page]) ) {
+					return false;
+		}
+		//todo: a place to throw an exception?  We need to indicate there is no registered page so this function is not being called correctly.
 
 		//k made it here so let's call the method
 		if ( FALSE === ( $content = call_user_func_array( array( $this, '_get_admin_content_' . $page), array($actives, $extra) ) ) ) {