eventespresso / event-espresso-core

core/libraries/line_item_display/EE_SPCO_Line_Item_Display_Strategy.strategy.php

Spacing +118 added lines, -118 removed lines

@@ -69,101 +69,101 @@ 
 	 * @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
 		$default_options = array(
-			'show_desc' => true,  // 	true 		false
+			'show_desc' => true, // 	true 		false
 			'odd' => false
 		);
-		$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:
 				$this->_show_taxes = $line_item->is_taxable() ? true : $this->_show_taxes;
-				if ( $line_item->OBJ_type() == 'Ticket' ) {
+				if ($line_item->OBJ_type() == 'Ticket') {
 					// item row
-					$html .= $this->_ticket_row( $line_item, $options );
+					$html .= $this->_ticket_row($line_item, $options);
 					// got any kids?
-					foreach ( $line_item->children() as $child_line_item ) {
-						$this->display_line_item( $child_line_item, $options );
+					foreach ($line_item->children() as $child_line_item) {
+						$this->display_line_item($child_line_item, $options);
 					}
 				} else {
 					// item row
-					$html .= $this->_item_row( $line_item, $options );
+					$html .= $this->_item_row($line_item, $options);
 					// got any kids?
-					foreach ( $line_item->children() as $child_line_item ) {
-						$this->display_line_item( $child_line_item, $options );
+					foreach ($line_item->children() as $child_line_item) {
+						$this->display_line_item($child_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:
 				static $sub_total = 0;
 				$event_sub_total = 0;
-				$text = __( 'Sub-Total', 'event_espresso' );
-				if ( $line_item->OBJ_type() == 'Event' ) {
-					$options[ 'event_id' ] = $event_id = $line_item->OBJ_ID();
-					if ( ! isset( $this->_events[ $options[ 'event_id' ] ] ) ) {
-						$event = EEM_Event::instance()->get_one_by_ID( $options[ 'event_id' ] );
-						if ( $event instanceof EE_Event ) {
-							if ( $event->default_registration_status() == EEM_Registration::status_id_not_approved ) {
+				$text = __('Sub-Total', 'event_espresso');
+				if ($line_item->OBJ_type() == 'Event') {
+					$options['event_id'] = $event_id = $line_item->OBJ_ID();
+					if ( ! isset($this->_events[$options['event_id']])) {
+						$event = EEM_Event::instance()->get_one_by_ID($options['event_id']);
+						if ($event instanceof EE_Event) {
+							if ($event->default_registration_status() == EEM_Registration::status_id_not_approved) {
 								return '';
 							}
 						}
-						$this->_events[ $options[ 'event_id' ] ] = 0;
-						$html .= $this->_event_row( $line_item );
-						$text = __( 'Event Sub-Total', 'event_espresso' );
+						$this->_events[$options['event_id']] = 0;
+						$html .= $this->_event_row($line_item);
+						$text = __('Event Sub-Total', 'event_espresso');
 					}
 				}
 				$child_line_items = $line_item->children();
 				// loop thru 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);
 				}
-				$event_sub_total += isset( $options[ 'event_id' ] ) ? $this->_events[ $options[ 'event_id' ] ] : 0;
+				$event_sub_total += isset($options['event_id']) ? $this->_events[$options['event_id']] : 0;
 				$sub_total += $event_sub_total;
 				if (
 					(
 						// event subtotals
 						$line_item->code() != 'pre-tax-subtotal' &&
-						count( $child_line_items ) > 1
+						count($child_line_items) > 1
 					)
 					||
 					(
 						// pre-tax subtotals
 						$line_item->code() == 'pre-tax-subtotal' &&
-						count( $this->_events ) > 1
+						count($this->_events) > 1
 					)
 				) {
 					$options['sub_total'] = $line_item->OBJ_type() == 'Event' ? $event_sub_total : $sub_total;
-					$html .= $this->_sub_total_row( $line_item, $text, $options );
+					$html .= $this->_sub_total_row($line_item, $text, $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:
-				if ( $this->_show_taxes ) {
+				if ($this->_show_taxes) {
 					$child_line_items = $line_item->children();
 					// loop thru 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);
 					}
-					if ( count( $child_line_items ) > 1 ) {
-						$this->_taxes_html .= $this->_total_tax_row( $line_item, __( 'Tax Total', 'event_espresso' ) );
+					if (count($child_line_items) > 1) {
+						$this->_taxes_html .= $this->_total_tax_row($line_item, __('Tax Total', 'event_espresso'));
 					}
 				}
 				break;
@@ -172,25 +172,25 @@ 
 				// get all child line items
 				$children = $line_item->children();
 				// loop thru all non-tax child line items
-				foreach( $children as $child_line_item ) {
-					if ( $child_line_item->type() != EEM_Line_Item::type_tax_sub_total ) {
+				foreach ($children as $child_line_item) {
+					if ($child_line_item->type() != EEM_Line_Item::type_tax_sub_total) {
 						// 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);
 					}
 				}
 
 				// now loop thru  tax child line items
-				foreach( $children as $child_line_item ) {
-					if ( $child_line_item->type() == EEM_Line_Item::type_tax_sub_total ) {
+				foreach ($children as $child_line_item) {
+					if ($child_line_item->type() == EEM_Line_Item::type_tax_sub_total) {
 						// 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->_taxes_html;
-				$html .= $this->_total_row( $line_item, __('Total', 'event_espresso') );
+				$html .= $this->_total_row($line_item, __('Total', 'event_espresso'));
 
 
-				$html .= $this->_payments_and_amount_owing_rows( $line_item, $options );
+				$html .= $this->_payments_and_amount_owing_rows($line_item, $options);
 				break;
 
 		}
@@ -205,11 +205,11 @@ 
 	 * @param EE_Line_Item $line_item
 	 * @return mixed
 	 */
-	private function _event_row( EE_Line_Item $line_item ) {
+	private function _event_row(EE_Line_Item $line_item) {
 		// start of row
-		$html = EEH_HTML::tr( '', 'event-cart-total-row', 'total_tr odd' );
+		$html = EEH_HTML::tr('', 'event-cart-total-row', 'total_tr odd');
 		// event name td
-		$html .= EEH_HTML::td( EEH_HTML::strong( $line_item->name() ), '', 'event-header', '', ' colspan="4"' );
+		$html .= EEH_HTML::td(EEH_HTML::strong($line_item->name()), '', 'event-header', '', ' colspan="4"');
 		// end of row
 		$html .= EEH_HTML::trx();
 		return $html;
@@ -224,10 +224,10 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	private function _ticket_row( EE_Line_Item $line_item, $options = array() ) {
+	private function _ticket_row(EE_Line_Item $line_item, $options = array()) {
 		// start of row
 		$row_class = $options['odd'] ? 'item odd' : 'item';
-		$html = EEH_HTML::tr( '', '', $row_class );
+		$html = EEH_HTML::tr('', '', $row_class);
 		// name && desc
 		$name_and_desc = apply_filters(
 			'FHEE__EE_SPCO_Line_Item_Display_Strategy__item_row__name',
@@ -236,23 +236,23 @@ 
 		);
 		$name_and_desc .= apply_filters(
 			'FHEE__EE_SPCO_Line_Item_Display_Strategy__item_row__desc',
-			( $options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: ' . $line_item->desc() . '</span>' : '' ),
+			($options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: '.$line_item->desc().'</span>' : ''),
 			$line_item,
 			$options
 		);
 		$name_and_desc .= $line_item->is_taxable() ? ' * ' : '';
 		// name td
-		$html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '',  'item_l' );
+		$html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l' );
 		// price td
-		$html .= EEH_HTML::td( $line_item->unit_price_no_code(), '',  'item_c jst-rght' );
+		$html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'item_c jst-rght');
 		// quantity td
-		$html .= EEH_HTML::td( $line_item->quantity(), '', 'item_l jst-rght' );
+		$html .= EEH_HTML::td($line_item->quantity(), '', 'item_l jst-rght');
 		$this->_total_items += $line_item->quantity();
 		// determine total for line item
 		$total = $line_item->total();
-		$this->_events[ $options[ 'event_id' ] ] += $total;
+		$this->_events[$options['event_id']] += $total;
 		// total td
-		$html .= EEH_HTML::td( EEH_Template::format_currency( $total, false, false ), '',  'item_r jst-rght' );
+		$html .= EEH_HTML::td(EEH_Template::format_currency($total, false, false), '', 'item_r jst-rght');
 		// end of row
 		$html .= EEH_HTML::trx();
 		return $html;
@@ -267,41 +267,41 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	private function _item_row( EE_Line_Item $line_item, $options = array() ) {
+	private function _item_row(EE_Line_Item $line_item, $options = array()) {
 		// start of row
 		$row_class = $options['odd'] ? 'item odd' : 'item';
-		$html = EEH_HTML::tr( '', '', $row_class );
-		$obj_name = $line_item->OBJ_type() ? $line_item->OBJ_type_i18n() . ': ' : '';
+		$html = EEH_HTML::tr('', '', $row_class);
+		$obj_name = $line_item->OBJ_type() ? $line_item->OBJ_type_i18n().': ' : '';
 		// name && desc
 		$name_and_desc = apply_filters(
 			'FHEE__EE_SPCO_Line_Item_Display_Strategy__item_row__name',
-			 $obj_name . $line_item->name(),
+			 $obj_name.$line_item->name(),
 			$line_item
 		);
 		$name_and_desc .= apply_filters(
 			'FHEE__EE_SPCO_Line_Item_Display_Strategy__item_row__desc',
-			( $options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: ' . $line_item->desc() . '</span>' : '' ),
+			($options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: '.$line_item->desc().'</span>' : ''),
 			$line_item,
 			$options
 		);
 		$name_and_desc .= $line_item->is_taxable() ? ' * ' : '';
 		// name td
-		$html .= EEH_HTML::td( $name_and_desc, '',  'item_l' );
+		$html .= EEH_HTML::td($name_and_desc, '', 'item_l');
 		// price td
-		if ( $line_item->is_percent() ) {
-			$html .= EEH_HTML::td( $line_item->percent() . '%', '', 'item_c jst-rght' );
+		if ($line_item->is_percent()) {
+			$html .= EEH_HTML::td($line_item->percent().'%', '', 'item_c jst-rght');
 		} else {
-			$html .= EEH_HTML::td( $line_item->unit_price_no_code(), '', 'item_c jst-rght' );
+			$html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'item_c jst-rght');
 		}
 		// quantity td
-		$html .= EEH_HTML::td( $line_item->quantity(), '', 'item_l jst-rght' );
+		$html .= EEH_HTML::td($line_item->quantity(), '', 'item_l jst-rght');
 		//$total = $line_item->total() * $line_item->quantity();
 		$total = $line_item->total();
-		if( isset( $options[ 'event_id' ] ) && isset( $this->_events[ $options[ 'event_id' ] ] ) ) {
-			$this->_events[ $options[ 'event_id' ] ] += $total;
+		if (isset($options['event_id']) && isset($this->_events[$options['event_id']])) {
+			$this->_events[$options['event_id']] += $total;
 		}
 		// total td
-		$html .= EEH_HTML::td( EEH_Template::format_currency( $total, false, false ), '',  'item_r jst-rght' );
+		$html .= EEH_HTML::td(EEH_Template::format_currency($total, false, false), '', 'item_r jst-rght');
 		// end of row
 		$html .= EEH_HTML::trx();
 		return $html;
@@ -316,22 +316,22 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	private function _sub_item_row( EE_Line_Item $line_item, $options = array() ) {
+	private function _sub_item_row(EE_Line_Item $line_item, $options = array()) {
 		// start of row
-		$html = EEH_HTML::tr( '', 'item sub-item-row' );
+		$html = EEH_HTML::tr('', 'item sub-item-row');
 		// name && desc
 		$name_and_desc = $line_item->name();
-		$name_and_desc .= $options['show_desc'] ? '<span class="line-sub-item-desc-spn smaller-text">: ' . $line_item->desc() . '</span>' : '';
+		$name_and_desc .= $options['show_desc'] ? '<span class="line-sub-item-desc-spn smaller-text">: '.$line_item->desc().'</span>' : '';
 		// name td
-		$html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '',  'item_l sub-item' );
+		$html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l sub-item' );
 		// discount/surcharge td
-		if ( $line_item->is_percent() ) {
-			$html .= EEH_HTML::td( $line_item->percent() . '%', '',  'item_c' );
+		if ($line_item->is_percent()) {
+			$html .= EEH_HTML::td($line_item->percent().'%', '', 'item_c');
 		} else {
-			$html .= EEH_HTML::td( $line_item->unit_price_no_code(), '',  'item_c jst-rght' );
+			$html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'item_c jst-rght');
 		}
 		// total td
-		$html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '',  'item_r jst-rght' );
+		$html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'item_r jst-rght');
 		// end of row
 		$html .= EEH_HTML::trx();
 		return $html;
@@ -346,21 +346,21 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	private function _tax_row( EE_Line_Item $line_item, $options = array() ) {
+	private function _tax_row(EE_Line_Item $line_item, $options = array()) {
 		// start of row
-		$html = EEH_HTML::tr( '', 'item sub-item tax-total' );
+		$html = EEH_HTML::tr('', 'item sub-item tax-total');
 		// name && desc
 		$name_and_desc = $line_item->name();
-		$name_and_desc .= '<span class="smaller-text lt-grey-text" style="margin:0 0 0 2em;">' . __( ' * taxable items', 'event_espresso' ) . '</span>';
-		$name_and_desc .= $options[ 'show_desc' ] ? '<br/>' . $line_item->desc() : '';
+		$name_and_desc .= '<span class="smaller-text lt-grey-text" style="margin:0 0 0 2em;">'.__(' * taxable items', 'event_espresso').'</span>';
+		$name_and_desc .= $options['show_desc'] ? '<br/>'.$line_item->desc() : '';
 		// name td
-		$html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '',  'item_l sub-item' );
+		$html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l sub-item' );
 		// percent td
-		$html .= EEH_HTML::td( $line_item->percent() . '%', '',  ' jst-rght', '' );
+		$html .= EEH_HTML::td($line_item->percent().'%', '', ' jst-rght', '');
 		// empty td (price)
-		$html .= EEH_HTML::td( EEH_HTML::nbsp() );
+		$html .= EEH_HTML::td(EEH_HTML::nbsp());
 		// total td
-		$html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '',  'item_r jst-rght' );
+		$html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'item_r jst-rght');
 		// end of row
 		$html .= EEH_HTML::trx();
 		return $html;
@@ -375,17 +375,17 @@ 
 	 * @param string $text
 	 * @return mixed
 	 */
-	private function _total_tax_row( EE_Line_Item $line_item, $text = '' ) {
+	private function _total_tax_row(EE_Line_Item $line_item, $text = '') {
 		$html = '';
-		if ( $line_item->total() ) {
+		if ($line_item->total()) {
 			// start of row
-			$html = EEH_HTML::tr( '', '', 'total_tr odd' );
+			$html = EEH_HTML::tr('', '', 'total_tr odd');
 			// total td
-			$html .= EEH_HTML::td( $text, '', 'total_currency total jst-rght', '', ' colspan="2"' );
+			$html .= EEH_HTML::td($text, '', 'total_currency total jst-rght', '', ' colspan="2"');
 			// empty td (price)
-			$html .= EEH_HTML::td( EEH_HTML::nbsp() );
+			$html .= EEH_HTML::td(EEH_HTML::nbsp());
 			// total td
-			$html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'total jst-rght' );
+			$html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'total jst-rght');
 			// end of row
 			$html .= EEH_HTML::trx();
 		}
@@ -402,15 +402,15 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	private function _sub_total_row( EE_Line_Item $line_item, $text = '', $options = array() ) {
+	private function _sub_total_row(EE_Line_Item $line_item, $text = '', $options = array()) {
 		$html = '';
-		if ( $line_item->total() ) {
+		if ($line_item->total()) {
 			// start of row
-			$html = EEH_HTML::tr( '', '', 'total_tr odd' );
+			$html = EEH_HTML::tr('', '', 'total_tr odd');
 			// total td
-			$html .= EEH_HTML::td( $text, '', 'total_currency total jst-rght', '', ' colspan="3"' );
+			$html .= EEH_HTML::td($text, '', 'total_currency total jst-rght', '', ' colspan="3"');
 			// total td
-			$html .= EEH_HTML::td( EEH_Template::format_currency( $options[ 'sub_total' ], false, false ), '', 'total jst-rght' );
+			$html .= EEH_HTML::td(EEH_Template::format_currency($options['sub_total'], false, false), '', 'total jst-rght');
 			// end of row
 			$html .= EEH_HTML::trx();
 		}
@@ -427,13 +427,13 @@ 
 	 * @param string       $text
 	 * @return mixed
 	 */
-	private function _total_row( EE_Line_Item $line_item, $text = '' ) {
+	private function _total_row(EE_Line_Item $line_item, $text = '') {
 		// start of row
-		$html = EEH_HTML::tr( '', '', 'spco-grand-total total_tr odd' );
+		$html = EEH_HTML::tr('', '', 'spco-grand-total total_tr odd');
 		// total td
-		$html .= EEH_HTML::td( $text, '',  'total_currency total jst-rght',  '',  ' colspan="3"' );
+		$html .= EEH_HTML::td($text, '', 'total_currency total jst-rght', '', ' colspan="3"');
 		// total td
-		$html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '',  'total jst-rght' );
+		$html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'total jst-rght');
 		// end of row
 		$html .= EEH_HTML::trx();
 		return $html;
@@ -448,30 +448,30 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	private function _payments_and_amount_owing_rows( EE_Line_Item $line_item, $options = array() ) {
+	private function _payments_and_amount_owing_rows(EE_Line_Item $line_item, $options = array()) {
 		$html = '';
 		$owing = $line_item->total();
-		$transaction = EEM_Transaction::instance()->get_one_by_ID( $line_item->TXN_ID() );
-		if ( $transaction instanceof EE_Transaction ) {
+		$transaction = EEM_Transaction::instance()->get_one_by_ID($line_item->TXN_ID());
+		if ($transaction instanceof EE_Transaction) {
 			$registration_payments = array();
-			$registrations = ! empty( $options['registrations'] )
-				? $options[ 'registrations' ]
+			$registrations = ! empty($options['registrations'])
+				? $options['registrations']
 				: $transaction->registrations();
-			foreach ( $registrations as $registration ) {
-				if ( $registration instanceof EE_Registration && $registration->owes_monies_and_can_pay() ) {
+			foreach ($registrations as $registration) {
+				if ($registration instanceof EE_Registration && $registration->owes_monies_and_can_pay()) {
 					$registration_payments = $registration_payments + $registration->registration_payments();
 				}
 			}
-			if ( ! empty( $registration_payments )) {
-				foreach ( $registration_payments as $registration_payment ) {
-					if ( $registration_payment instanceof EE_Registration_Payment ) {
+			if ( ! empty($registration_payments)) {
+				foreach ($registration_payments as $registration_payment) {
+					if ($registration_payment instanceof EE_Registration_Payment) {
 						$owing = $owing - $registration_payment->amount();
 						$payment = $registration_payment->payment();
-						if ( $payment instanceof EE_Payment ) {
+						if ($payment instanceof EE_Payment) {
 							$payment_desc = sprintf(
-								__( 'Payment%1$s Received: %2$s', 'event_espresso' ),
+								__('Payment%1$s Received: %2$s', 'event_espresso'),
 								$payment->txn_id_chq_nmbr() != ''
-									? ' <span class="small-text">(#' . $payment->txn_id_chq_nmbr() . ')</span> '
+									? ' <span class="small-text">(#'.$payment->txn_id_chq_nmbr().')</span> '
 									: '',
 								$payment->timestamp()
 							);
@@ -479,12 +479,12 @@ 
 							$payment_desc = '';
 						}
 						// start of row
-						$html .= EEH_HTML::tr( '', '', 'total_tr odd' );
+						$html .= EEH_HTML::tr('', '', 'total_tr odd');
 						// payment desc
-						$html .= EEH_HTML::td( $payment_desc, '', '', '', ' colspan="3"' );
+						$html .= EEH_HTML::td($payment_desc, '', '', '', ' colspan="3"');
 						// total td
 						$html .= EEH_HTML::td(
-							EEH_Template::format_currency( $registration_payment->amount(), false, false ),
+							EEH_Template::format_currency($registration_payment->amount(), false, false),
 							'',
 							'total jst-rght'
 						);
@@ -492,17 +492,17 @@ 
 						$html .= EEH_HTML::trx();
 					}
 				}
-				if ( $line_item->total() ) {
+				if ($line_item->total()) {
 					// start of row
-					$html .= EEH_HTML::tr( '', '', 'total_tr odd' );
+					$html .= EEH_HTML::tr('', '', 'total_tr odd');
 					// total td
 					$html .= EEH_HTML::td(
 						__('Amount Owing', 'event_espresso'),
-						'',  'total_currency total jst-rght',  '',  ' colspan="3"'
+						'', 'total_currency total jst-rght', '', ' colspan="3"'
 					);
 					// total td
 					$html .= EEH_HTML::td(
-						EEH_Template::format_currency( $owing, false, false ), '',  'total jst-rght'
+						EEH_Template::format_currency($owing, false, false), '', 'total jst-rght'
 					);
 					// end of row
 					$html .= EEH_HTML::trx();

core/libraries/line_item_display/EE_Admin_Table_Line_Item_Display_Strategy.strategy.php

Spacing +57 added lines, -57 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,40 +60,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;
@@ -105,14 +105,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;
 
@@ -129,15 +129,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;
 	}
@@ -149,8 +149,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();
 	}
 
 
@@ -162,12 +162,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
@@ -175,44 +175,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_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() . '<br />' : '';
+		$type_html = $line_item->OBJ_type() ? $line_item->OBJ_type_i18n().'<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();
@@ -228,7 +228,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 '';
 	}
@@ -242,13 +242,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;
@@ -265,7 +265,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 '';
 	}
@@ -279,15 +279,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;

caffeinated/admin/extend/registration_form/Extend_Registration_Form_Admin_Page.core.php

Spacing +185 added lines, -185 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') ){
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('NO direct script access allowed');
 }
 /**
@@ -36,13 +36,13 @@ 
 	 * 		@param bool $routing indicate whether we want to just load the object and handle routing or just load the object.
 	 * 		@access public
 	 */
-	public function __construct( $routing = TRUE ) {
-		define( 'REGISTRATION_FORM_CAF_ADMIN', EE_CORE_CAF_ADMIN_EXTEND . 'registration_form' . DS );
-		define( 'REGISTRATION_FORM_CAF_ASSETS_PATH', REGISTRATION_FORM_CAF_ADMIN . 'assets' . DS );
-		define( 'REGISTRATION_FORM_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'registration_form/assets/' );
-		define( 'REGISTRATION_FORM_CAF_TEMPLATE_PATH', REGISTRATION_FORM_CAF_ADMIN . 'templates' . DS );
-		define( 'REGISTRATION_FORM_CAF_TEMPLATE_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'registration_form/templates/' );
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		define('REGISTRATION_FORM_CAF_ADMIN', EE_CORE_CAF_ADMIN_EXTEND.'registration_form'.DS);
+		define('REGISTRATION_FORM_CAF_ASSETS_PATH', REGISTRATION_FORM_CAF_ADMIN.'assets'.DS);
+		define('REGISTRATION_FORM_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'registration_form/assets/');
+		define('REGISTRATION_FORM_CAF_TEMPLATE_PATH', REGISTRATION_FORM_CAF_ADMIN.'templates'.DS);
+		define('REGISTRATION_FORM_CAF_TEMPLATE_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'registration_form/templates/');
+		parent::__construct($routing);
 	}
 
 
@@ -52,8 +52,8 @@ 
 
 	protected function _extend_page_config() {
 		$this->_admin_base_path = REGISTRATION_FORM_CAF_ADMIN;
-		$qst_id = ! empty( $this->_req_data['QST_ID'] ) && ! is_array( $this->_req_data['QST_ID'] ) ? $this->_req_data['QST_ID'] : 0;
-		$qsg_id = ! empty( $this->_req_data['QSG_ID'] ) && ! is_array( $this->_req_data['QSG_ID'] ) ? $this->_req_data['QSG_ID'] : 0;
+		$qst_id = ! empty($this->_req_data['QST_ID']) && ! is_array($this->_req_data['QST_ID']) ? $this->_req_data['QST_ID'] : 0;
+		$qsg_id = ! empty($this->_req_data['QSG_ID']) && ! is_array($this->_req_data['QSG_ID']) ? $this->_req_data['QSG_ID'] : 0;
 
 		$new_page_routes = array(
 			'question_groups' => array(
@@ -86,7 +86,7 @@ 
 				'func' => '_trash_or_restore_questions',
 				'capability' => 'ee_delete_question',
 				'obj_id' => $qst_id,
-				'args' => array( 'trash' => FALSE ),
+				'args' => array('trash' => FALSE),
 				'noheader' => TRUE
 				),
 
@@ -145,7 +145,7 @@ 
 
 			'trash_question_group' => array(
 				'func' => '_trash_or_restore_question_groups',
-				'args' => array( 'trash' => TRUE ),
+				'args' => array('trash' => TRUE),
 				'capability' => 'ee_delete_question_group',
 				'obj_id' => $qsg_id,
 				'noheader' => TRUE
@@ -153,7 +153,7 @@ 
 
 			'restore_question_group' => array(
 				'func' => '_trash_or_restore_question_groups',
-				'args' => array( 'trash' => FALSE ),
+				'args' => array('trash' => FALSE),
 				'capability' => 'ee_delete_question_group',
 				'obj_id' => $qsg_id,
 				'noheader' => TRUE
@@ -168,7 +168,7 @@ 
 
 			'update_question_group' => array(
 				'func' => '_insert_or_update_question_group',
-				'args' => array('new_question_group' => FALSE ),
+				'args' => array('new_question_group' => FALSE),
 				'capability' => 'ee_edit_question_group',
 				'obj_id' => $qsg_id,
 				'noheader' => TRUE,
@@ -206,7 +206,7 @@ 
 					'noheader' => TRUE
 				),
 			);
-		$this->_page_routes = array_merge( $this->_page_routes, $new_page_routes );
+		$this->_page_routes = array_merge($this->_page_routes, $new_page_routes);
 
 		$new_page_config = array(
 
@@ -230,7 +230,7 @@ 
 						'filename' => 'registration_form_question_groups_views_bulk_actions_search'
 						),
 					),
-				'help_tour' => array( 'Registration_Form_Question_Groups_Help_Tour'),
+				'help_tour' => array('Registration_Form_Question_Groups_Help_Tour'),
 				'metaboxes' => $this->_default_espresso_metaboxes,
 				'require_nonce' => FALSE,
 				'qtips' => array(
@@ -244,14 +244,14 @@ 
 					'order' => 5,
 					'persistent' => FALSE
 					),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
                 'help_tabs' => array(
 					'registration_form_add_question_help_tab' => array(
 						'title' => esc_html__('Add Question', 'event_espresso'),
 						'filename' => 'registration_form_add_question'
 						),
 					),
-                'help_tour' => array( 'Registration_Form_Add_Question_Help_Tour'),
+                'help_tour' => array('Registration_Form_Add_Question_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 
@@ -261,14 +261,14 @@ 
 					'order' => 5,
 					'persistent' => FALSE
 					),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'help_tabs' => array(
 					'registration_form_add_question_group_help_tab' => array(
 						'title' => esc_html__('Add Question Group', 'event_espresso'),
 						'filename' => 'registration_form_add_question_group'
 						),
 					),
-                'help_tour' => array( 'Registration_Form_Add_Question_Group_Help_Tour'),
+                'help_tour' => array('Registration_Form_Add_Question_Group_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 
@@ -277,16 +277,16 @@ 
 					'label' => esc_html__('Edit Question Group', 'event_espresso'),
 					'order' => 5,
 					'persistent' => FALSE,
-					'url' => isset($this->_req_data['question_group_id']) ? add_query_arg(array('question_group_id' => $this->_req_data['question_group_id'] ), $this->_current_page_view_url )  : $this->_admin_base_url
+					'url' => isset($this->_req_data['question_group_id']) ? add_query_arg(array('question_group_id' => $this->_req_data['question_group_id']), $this->_current_page_view_url) : $this->_admin_base_url
 					),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'help_tabs' => array(
 					'registration_form_edit_question_group_help_tab' => array(
 						'title' => esc_html__('Edit Question Group', 'event_espresso'),
 						'filename' => 'registration_form_edit_question_group'
 						),
 					),
-                'help_tour' => array( 'Registration_Form_Edit_Question_Group_Help_Tour'),
+                'help_tour' => array('Registration_Form_Edit_Question_Group_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 
@@ -298,19 +298,19 @@ 
 				'labels' => array(
 					'publishbox' => esc_html__('Update Settings', 'event_espresso')
 					),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'help_tabs' => array(
 					'registration_form_reg_form_settings_help_tab' => array(
 						'title' => esc_html__('Registration Form Settings', 'event_espresso'),
 						'filename' => 'registration_form_reg_form_settings'
 						),
 					),
-                'help_tour' => array( 'Registration_Form_Settings_Help_Tour'),
+                'help_tour' => array('Registration_Form_Settings_Help_Tour'),
 				'require_nonce' => FALSE
 				)
 
 			);
-		$this->_page_config = array_merge( $this->_page_config, $new_page_config );
+		$this->_page_config = array_merge($this->_page_config, $new_page_config);
 
 		//change the list table we're going to use so it's the NEW list table!
 		$this->_page_config['default']['list_table'] = 'Extend_Registration_Form_Questions_Admin_List_Table';
@@ -324,7 +324,7 @@ 
 			'edit_question_group' => esc_html__('Edit Question Group', 'event_espresso'),
 			'delete_question_group' => esc_html__('Delete Question Group', 'event_espresso'),
 			);
-		$this->_labels['buttons'] = array_merge( $this->_labels['buttons'], $new_labels );
+		$this->_labels['buttons'] = array_merge($this->_labels['buttons'], $new_labels);
 
 	}
 
@@ -333,14 +333,14 @@ 
 
 
 	protected function _ajax_hooks() {
-		add_action('wp_ajax_espresso_update_question_group_order', array( $this, 'update_question_group_order' ));
+		add_action('wp_ajax_espresso_update_question_group_order', array($this, 'update_question_group_order'));
 	}
 
 
 
 
 	public function load_scripts_styles_question_groups() {
-		wp_enqueue_script( 'espresso_ajax_table_sorting' );
+		wp_enqueue_script('espresso_ajax_table_sorting');
 	}
 
 
@@ -361,7 +361,7 @@ 
 	 * @return void
 	 */
 	public function load_sortable_question_script() {
-		wp_register_script('ee-question-sortable', REGISTRATION_FORM_CAF_ASSETS_URL . 'ee_question_order.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, true);
+		wp_register_script('ee-question-sortable', REGISTRATION_FORM_CAF_ASSETS_URL.'ee_question_order.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, true);
 		wp_enqueue_script('ee-question-sortable');
 	}
 
@@ -380,7 +380,7 @@ 
 				)
 		);
 
-		if ( EE_Registry::instance()->CAP->current_user_can('ee_delete_questions', 'espresso_registration_form_trash_questions' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_questions', 'espresso_registration_form_trash_questions')) {
 			$this->_views['trash'] = array(
 				'slug' => 'trash',
 				'label' => esc_html__('Trash', 'event_espresso'),
@@ -410,7 +410,7 @@ 
 				)
 		);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question_groups', 'espresso_registration_form_trash_question_groups' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_question_groups', 'espresso_registration_form_trash_question_groups')) {
 			$this->_views['trash'] = array(
 				'slug' => 'trash',
 				'label' => esc_html__('Trash', 'event_espresso'),
@@ -446,24 +446,24 @@ 
 
 
 
-	protected function _delete_question(){
-		$success = $this->_delete_items( $this->_question_model );
+	protected function _delete_question() {
+		$success = $this->_delete_items($this->_question_model);
 		$this->_redirect_after_action(
 			$success,
-			$this->_question_model->item_name( $success ),
+			$this->_question_model->item_name($success),
 			'deleted',
-			array( 'action' => 'default', 'status' => 'all' )
+			array('action' => 'default', 'status' => 'all')
 		);
 	}
 
 
 	protected function _delete_questions() {
-		$success = $this->_delete_items( $this->_question_model );
+		$success = $this->_delete_items($this->_question_model);
 		$this->_redirect_after_action(
 			$success,
-			$this->_question_model->item_name( $success ),
+			$this->_question_model->item_name($success),
 			'deleted permanently',
-			array( 'action' => 'default', 'status' => 'trash' )
+			array('action' => 'default', 'status' => 'trash')
 		);
 	}
 
@@ -474,26 +474,26 @@ 
  * @param EEM_Soft_Delete_Base $model
  * @return int number of items deleted permanently
  */
-	private function _delete_items(EEM_Soft_Delete_Base $model){
+	private function _delete_items(EEM_Soft_Delete_Base $model) {
 		$success = 0;
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		if (!empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			// if array has more than one element than success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 			// cycle thru bulk action checkboxes
-			while (list( $ID, $value ) = each($this->_req_data['checkbox'])) {
-				if ( ! $this->_delete_item( $ID, $model ) ) {
+			while (list($ID, $value) = each($this->_req_data['checkbox'])) {
+				if ( ! $this->_delete_item($ID, $model)) {
 					$success = 0;
 				}
 			}
 
-		}elseif( !empty($this->_req_data['QSG_ID'])){
-			$success = $this->_delete_item( $this->_req_data['QSG_ID'], $model );
+		}elseif ( ! empty($this->_req_data['QSG_ID'])) {
+			$success = $this->_delete_item($this->_req_data['QSG_ID'], $model);
 
-		}elseif( !empty($this->_req_data['QST_ID'])){
-			$success = $this->_delete_item( $this->_req_data['QST_ID'], $model );
-		}else{
-			EE_Error::add_error( sprintf(esc_html__("No Questions or Question Groups were selected for deleting. This error usually shows when you've attempted to delete via bulk action but there were no selections.", "event_espresso")), __FILE__, __FUNCTION__, __LINE__ );
+		}elseif ( ! empty($this->_req_data['QST_ID'])) {
+			$success = $this->_delete_item($this->_req_data['QST_ID'], $model);
+		} else {
+			EE_Error::add_error(sprintf(esc_html__("No Questions or Question Groups were selected for deleting. This error usually shows when you've attempted to delete via bulk action but there were no selections.", "event_espresso")), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return $success;
 	}
@@ -504,11 +504,11 @@ 
 	 * @param EEM_Soft_Delete_Base $model
 	 * @return boolean
 	 */
-	protected function _delete_item( $id, $model ) {
-		if( $model instanceof EEM_Question ) {
-			EEM_Question_Option::instance()->delete_permanently( array( array( 'QST_ID' => absint( $id ) ) ) );
+	protected function _delete_item($id, $model) {
+		if ($model instanceof EEM_Question) {
+			EEM_Question_Option::instance()->delete_permanently(array(array('QST_ID' => absint($id))));
 		}
-		return $model->delete_permanently_by_ID( absint( $id ) );
+		return $model->delete_permanently_by_ID(absint($id));
 	}
 
 
@@ -520,41 +520,41 @@ 
 
 
 
-	protected function _edit_question_group( $type = 'add' ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$ID=isset( $this->_req_data['QSG_ID'] ) && ! empty( $this->_req_data['QSG_ID'] ) ? absint( $this->_req_data['QSG_ID'] ) : FALSE;
+	protected function _edit_question_group($type = 'add') {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$ID = isset($this->_req_data['QSG_ID']) && ! empty($this->_req_data['QSG_ID']) ? absint($this->_req_data['QSG_ID']) : FALSE;
 		
-		switch( $this->_req_action ) {
+		switch ($this->_req_action) {
 			case 'add_question_group' :
-				$this->_admin_page_title = esc_html__( 'Add Question Group', 'event_espresso' );
+				$this->_admin_page_title = esc_html__('Add Question Group', 'event_espresso');
 				break;
 			case 'edit_question_group' :
-				$this->_admin_page_title = esc_html__( 'Edit Question Group', 'event_espresso' );
+				$this->_admin_page_title = esc_html__('Edit Question Group', 'event_espresso');
 				break;
 			default :
-				$this->_admin_page_title = ucwords( str_replace( '_', ' ', $this->_req_action ));
+				$this->_admin_page_title = ucwords(str_replace('_', ' ', $this->_req_action));
 		}
 		// add ID to title if editing
-		$this->_admin_page_title = $ID ? $this->_admin_page_title . ' # ' . $ID : $this->_admin_page_title;
-		if($ID){
+		$this->_admin_page_title = $ID ? $this->_admin_page_title.' # '.$ID : $this->_admin_page_title;
+		if ($ID) {
 			/** @var EE_Question_Group $questionGroup */
-			$questionGroup=$this->_question_group_model->get_one_by_ID( $ID);
-			$additional_hidden_fields=array('QSG_ID'=>array('type'=>'hidden','value'=>$ID));
+			$questionGroup = $this->_question_group_model->get_one_by_ID($ID);
+			$additional_hidden_fields = array('QSG_ID'=>array('type'=>'hidden', 'value'=>$ID));
 			$this->_set_add_edit_form_tags('update_question_group', $additional_hidden_fields);
-		}else{
+		} else {
 			/** @var EE_Question_Group $questionGroup */
 			$questionGroup = EEM_Question_Group::instance()->create_default_object();
 			$questionGroup->set_order_to_latest();
 			$this->_set_add_edit_form_tags('insert_question_group');
 		}
 		$this->_template_args['values'] = $this->_yes_no_values;
-		$this->_template_args['all_questions']=$questionGroup->questions_in_and_not_in_group();
-		$this->_template_args['QSG_ID']=$ID ? $ID : TRUE;
-		$this->_template_args['question_group']=$questionGroup;
+		$this->_template_args['all_questions'] = $questionGroup->questions_in_and_not_in_group();
+		$this->_template_args['QSG_ID'] = $ID ? $ID : TRUE;
+		$this->_template_args['question_group'] = $questionGroup;
 
-		$redirect_URL = add_query_arg( array( 'action' => 'question_groups'), $this->_admin_base_url );
-		$this->_set_publish_post_box_vars( 'id', $ID, FALSE, $redirect_URL  );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( REGISTRATION_FORM_CAF_TEMPLATE_PATH . 'question_groups_main_meta_box.template.php', $this->_template_args, TRUE );
+		$redirect_URL = add_query_arg(array('action' => 'question_groups'), $this->_admin_base_url);
+		$this->_set_publish_post_box_vars('id', $ID, FALSE, $redirect_URL);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(REGISTRATION_FORM_CAF_TEMPLATE_PATH.'question_groups_main_meta_box.template.php', $this->_template_args, TRUE);
 
 		// the details template wrapper
 		$this->display_admin_page_with_sidebar();
@@ -565,7 +565,7 @@ 
 
 	protected function _delete_question_groups() {
 		$success = $this->_delete_items($this->_question_group_model);
-		$this->_redirect_after_action( $success, $this->_question_group_model->item_name($success), 'deleted permanently', array( 'action'=>'question_groups', 'status'=>'trash' ));
+		$this->_redirect_after_action($success, $this->_question_group_model->item_name($success), 'deleted permanently', array('action'=>'question_groups', 'status'=>'trash'));
 	}
 
 
@@ -573,71 +573,71 @@ 
 	/**
 	 * @param bool $new_question_group
 	 */
-	protected function _insert_or_update_question_group( $new_question_group = TRUE) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$set_column_values=$this->_set_column_values_for($this->_question_group_model);
-		if ( $new_question_group ){
+	protected function _insert_or_update_question_group($new_question_group = TRUE) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$set_column_values = $this->_set_column_values_for($this->_question_group_model);
+		if ($new_question_group) {
 			$QSG_ID = $this->_question_group_model->insert($set_column_values);
 			$success = $QSG_ID ? 1 : 0;
 		} else {
 			$QSG_ID = absint($this->_req_data['QSG_ID']);
-			unset( $set_column_values[ 'QSG_ID' ] );
-			$success= $this->_question_group_model->update( $set_column_values, array( array( 'QSG_ID' => $QSG_ID )));
+			unset($set_column_values['QSG_ID']);
+			$success = $this->_question_group_model->update($set_column_values, array(array('QSG_ID' => $QSG_ID)));
 		}
-		$phone_question_id = EEM_Question::instance()->get_Question_ID_from_system_string( EEM_Attendee::system_question_phone );
+		$phone_question_id = EEM_Question::instance()->get_Question_ID_from_system_string(EEM_Attendee::system_question_phone);
 		// update the existing related questions
 		// BUT FIRST...  delete the phone question from the Question_Group_Question if it is being added to this question group (therefore removed from the existing group)
-		if ( isset( $this->_req_data['questions'], $this->_req_data['questions'][ $phone_question_id ] )) {
+		if (isset($this->_req_data['questions'], $this->_req_data['questions'][$phone_question_id])) {
 			// delete where QST ID = system phone question ID and Question Group ID is NOT this group
-			EEM_Question_Group_Question::instance()->delete( array( array( 'QST_ID' => $phone_question_id, 'QSG_ID' => array( '!=', $QSG_ID ))));
+			EEM_Question_Group_Question::instance()->delete(array(array('QST_ID' => $phone_question_id, 'QSG_ID' => array('!=', $QSG_ID))));
 		}
 		/** @type EE_Question_Group $question_group */
-		$question_group=$this->_question_group_model->get_one_by_ID( $QSG_ID );
+		$question_group = $this->_question_group_model->get_one_by_ID($QSG_ID);
 		$questions = $question_group->questions();
 		// make sure system phone question is added to list of questions for this group
-		if ( ! isset( $questions[$phone_question_id ] )) {
-			$questions[ $phone_question_id ] = EEM_Question::instance()->get_one_by_ID( $phone_question_id );
+		if ( ! isset($questions[$phone_question_id])) {
+			$questions[$phone_question_id] = EEM_Question::instance()->get_one_by_ID($phone_question_id);
 		}
 
-		foreach( $questions as $question_ID => $question ){
+		foreach ($questions as $question_ID => $question) {
 			// first we always check for order.
-			if ( ! empty( $this->_req_data['question_orders'][ $question_ID ] ) ){
+			if ( ! empty($this->_req_data['question_orders'][$question_ID])) {
 				//update question order
-				$question_group->update_question_order( $question_ID, $this->_req_data['question_orders'][ $question_ID ] );
+				$question_group->update_question_order($question_ID, $this->_req_data['question_orders'][$question_ID]);
 			}
 
 			// then we always check if adding or removing.
-			if ( isset( $this->_req_data['questions'], $this->_req_data['questions'][ $question_ID ] )) {
-				$question_group->add_question( $question_ID );
+			if (isset($this->_req_data['questions'], $this->_req_data['questions'][$question_ID])) {
+				$question_group->add_question($question_ID);
 			} else {
 				// not found, remove it (but only if not a system question for the personal group with the exception of lname system question - we allow removal of it)
 				if (
 					in_array(
 						$question->system_ID(),
-						EEM_Question::instance()->required_system_questions_in_system_question_group( $question_group->system_group() )
+						EEM_Question::instance()->required_system_questions_in_system_question_group($question_group->system_group())
 					)
 				) {
 					continue;
 				} else {
-					$question_group->remove_question( $question_ID );
+					$question_group->remove_question($question_ID);
 				}
 			}
 		}
 		// save new related questions
-		if ( isset( $this->_req_data['questions'] )) {
-			foreach( $this->_req_data['questions'] as $QST_ID ){
-				$question_group->add_question( $QST_ID );
-				if ( isset( $this->_req_data['question_orders'][ $QST_ID ] )) {
-					$question_group->update_question_order( $QST_ID, $this->_req_data['question_orders'][ $QST_ID ] );
+		if (isset($this->_req_data['questions'])) {
+			foreach ($this->_req_data['questions'] as $QST_ID) {
+				$question_group->add_question($QST_ID);
+				if (isset($this->_req_data['question_orders'][$QST_ID])) {
+					$question_group->update_question_order($QST_ID, $this->_req_data['question_orders'][$QST_ID]);
 				}
 			}
 		}
 
-		if ( $success !== FALSE ) {
-			$msg = $new_question_group ? sprintf( esc_html__('The %s has been created', 'event_espresso'), $this->_question_group_model->item_name() ) : sprintf( esc_html__('The %s has been updated', 'event_espresso' ), $this->_question_group_model->item_name() );
-			EE_Error::add_success( $msg );
+		if ($success !== FALSE) {
+			$msg = $new_question_group ? sprintf(esc_html__('The %s has been created', 'event_espresso'), $this->_question_group_model->item_name()) : sprintf(esc_html__('The %s has been updated', 'event_espresso'), $this->_question_group_model->item_name());
+			EE_Error::add_success($msg);
 		}
-		$this->_redirect_after_action(FALSE, '', '', array('action'=>'edit_question_group','QSG_ID'=>$QSG_ID), TRUE);
+		$this->_redirect_after_action(FALSE, '', '', array('action'=>'edit_question_group', 'QSG_ID'=>$QSG_ID), TRUE);
 
 	}
 
@@ -645,20 +645,20 @@ 
 	 * duplicates a question and all its question options and redirects to the new question.
 	 */
 	public function _duplicate_question() {
-		$question_ID = (int)$this->_req_data[ 'QST_ID' ];
-		$question = EEM_Question::instance()->get_one_by_ID( $question_ID );
-		if( $question instanceof EE_Question ) {
+		$question_ID = (int) $this->_req_data['QST_ID'];
+		$question = EEM_Question::instance()->get_one_by_ID($question_ID);
+		if ($question instanceof EE_Question) {
 			$new_question = $question->duplicate();
-			if( $new_question instanceof EE_Question ) {
-				$this->_redirect_after_action( true, esc_html__( 'Question', 'event_espresso' ), esc_html__( 'Duplicated', 'event_espresso' ), array('action'=>'edit_question', 'QST_ID' => $new_question->ID() ), TRUE);
+			if ($new_question instanceof EE_Question) {
+				$this->_redirect_after_action(true, esc_html__('Question', 'event_espresso'), esc_html__('Duplicated', 'event_espresso'), array('action'=>'edit_question', 'QST_ID' => $new_question->ID()), TRUE);
 			} else {
 				global $wpdb;
-				EE_Error::add_error( sprintf( esc_html__( 'Could not duplicate question with ID %1$d because: %2$s', 'event_espresso' ), $question_ID, $wpdb->last_error ), __FILE__, __FUNCTION__, __LINE__ );
-			$this->_redirect_after_action(false, '', '', array('action'=>'default'), false );
+				EE_Error::add_error(sprintf(esc_html__('Could not duplicate question with ID %1$d because: %2$s', 'event_espresso'), $question_ID, $wpdb->last_error), __FILE__, __FUNCTION__, __LINE__);
+			$this->_redirect_after_action(false, '', '', array('action'=>'default'), false);
 			}
 		} else {
-			EE_Error::add_error( sprintf( esc_html__( 'Could not duplicate question with ID %d because it didn\'t exist!', 'event_espresso' ), $question_ID ), __FILE__, __FUNCTION__, __LINE__ );
-			$this->_redirect_after_action( false, '', '', array( 'action' => 'default' ), false );
+			EE_Error::add_error(sprintf(esc_html__('Could not duplicate question with ID %d because it didn\'t exist!', 'event_espresso'), $question_ID), __FILE__, __FUNCTION__, __LINE__);
+			$this->_redirect_after_action(false, '', '', array('action' => 'default'), false);
 		}
 	}
 
@@ -667,8 +667,8 @@ 
 	/**
 	 * @param bool $trash
 	 */
-	protected function _trash_or_restore_question_groups( $trash = TRUE) {
-		$this->_trash_or_restore_items( $this->_question_group_model, $trash );
+	protected function _trash_or_restore_question_groups($trash = TRUE) {
+		$this->_trash_or_restore_items($this->_question_group_model, $trash);
 	}
 
 
@@ -676,9 +676,9 @@ 
 	/**
 	 *_trash_question
 	 */
-	protected function _trash_question(){
-		$success=$this->_question_model->delete_by_ID( (int)$this->_req_data['QST_ID'] );
-		$query_args=array('action'=>'default','status'=>'all');
+	protected function _trash_question() {
+		$success = $this->_question_model->delete_by_ID((int) $this->_req_data['QST_ID']);
+		$query_args = array('action'=>'default', 'status'=>'all');
 		$this->_redirect_after_action($success, $this->_question_model->item_name($success), 'trashed', $query_args);
 	}
 
@@ -687,8 +687,8 @@ 
 	/**
 	 * @param bool $trash
 	 */
-	protected function _trash_or_restore_questions( $trash=TRUE){
-		$this->_trash_or_restore_items( $this->_question_model, $trash );
+	protected function _trash_or_restore_questions($trash = TRUE) {
+		$this->_trash_or_restore_items($this->_question_model, $trash);
 	}
 
 
@@ -700,21 +700,21 @@ 
 *@param EEM_Soft_Delete_Base $model
 	 * @param boolean $trash whether to trash or restore
 	 */
-	private function _trash_or_restore_items( EEM_Soft_Delete_Base $model, $trash = TRUE ) {
+	private function _trash_or_restore_items(EEM_Soft_Delete_Base $model, $trash = TRUE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		$success = 1;
 		//Checkboxes
 		//echo "trash $trash";
 		//var_dump($this->_req_data['checkbox']);die;
-		if ( isset( $this->_req_data['checkbox'] )) {
-			if ( ! empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] )) {
+		if (isset($this->_req_data['checkbox'])) {
+			if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 				// if array has more than one element than success message should be plural
-				$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+				$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 				// cycle thru bulk action checkboxes
-				while (list( $ID, $value ) = each($this->_req_data['checkbox'])) {
-					if ( ! $model->delete_or_restore_by_ID($trash,absint($ID))) {
+				while (list($ID, $value) = each($this->_req_data['checkbox'])) {
+					if ( ! $model->delete_or_restore_by_ID($trash, absint($ID))) {
 						$success = 0;
 					}
 				}
@@ -722,7 +722,7 @@ 
 			} else {
 				// grab single id and delete
 				$ID = absint($this->_req_data['checkbox']);
-				if ( ! $model->delete_or_restore_by_ID($trash,$ID)) {
+				if ( ! $model->delete_or_restore_by_ID($trash, $ID)) {
 					$success = 0;
 				}
 			}
@@ -730,25 +730,25 @@ 
 		} else {
 			// delete via trash link
 			// grab single id and delete
-			$ID = absint($this->_req_data[ $model->primary_key_name() ]);
-			if ( ! $model->delete_or_restore_by_ID($trash,$ID)) {
+			$ID = absint($this->_req_data[$model->primary_key_name()]);
+			if ( ! $model->delete_or_restore_by_ID($trash, $ID)) {
 				$success = 0;
 			}
 
 		}
 
 
-		$action = $model instanceof EEM_Question ? 'default' : 'question_groups';//strtolower( $model->item_name(2) );
+		$action = $model instanceof EEM_Question ? 'default' : 'question_groups'; //strtolower( $model->item_name(2) );
 		//echo "action :$action";
 		//$action = 'questions' ? 'default' : $action;
-		if($trash){
+		if ($trash) {
 			$action_desc = 'trashed';
 			$status = 'trash';
-		}else{
+		} else {
 			$action_desc = 'restored';
 			$status = 'all';
 		}
-		$this->_redirect_after_action( $success, $model->item_name($success), $action_desc, array( 'action' => $action, 'status'=>$status ) );
+		$this->_redirect_after_action($success, $model->item_name($success), $action_desc, array('action' => $action, 'status'=>$status));
 	}
 
 
@@ -759,16 +759,16 @@ 
 	 * @param bool|false $count
 	 * @return \EE_Soft_Delete_Base_Class[]|int
 	 */
-	public function get_trashed_questions( $per_page, $current_page = 1, $count = FALSE ) {
+	public function get_trashed_questions($per_page, $current_page = 1, $count = FALSE) {
 		$query_params = $this->get_query_params(EEM_Question::instance(), $per_page, $current_page);
 
-		if( $count ){
+		if ($count) {
 			//note: this a subclass of EEM_Soft_Delete_Base, so this is actually only getting non-trashed items
-			$where = isset( $query_params[0] ) ? array( $query_params[0] ) : array();
-			$results=$this->_question_model->count_deleted($where);
-		}else{
+			$where = isset($query_params[0]) ? array($query_params[0]) : array();
+			$results = $this->_question_model->count_deleted($where);
+		} else {
 			//note: this a subclass of EEM_Soft_Delete_Base, so this is actually only getting non-trashed items
-			$results=$this->_question_model->get_all_deleted($query_params);
+			$results = $this->_question_model->get_all_deleted($query_params);
 		}
 		return $results;
 	}
@@ -781,13 +781,13 @@ 
 	 * @param bool|false $count
 	 * @return \EE_Soft_Delete_Base_Class[]
 	 */
-	public function get_question_groups( $per_page, $current_page = 1, $count = FALSE ) {
-		$questionGroupModel=EEM_Question_Group::instance();
-		$query_params=$this->get_query_params($questionGroupModel,$per_page,$current_page);
-		if ($count){
-			$where = isset( $query_params[0] ) ? array( $query_params[0] ) : array();
+	public function get_question_groups($per_page, $current_page = 1, $count = FALSE) {
+		$questionGroupModel = EEM_Question_Group::instance();
+		$query_params = $this->get_query_params($questionGroupModel, $per_page, $current_page);
+		if ($count) {
+			$where = isset($query_params[0]) ? array($query_params[0]) : array();
 			$results = $questionGroupModel->count($where);
-		}else{
+		} else {
 			$results = $questionGroupModel->get_all($query_params);
 		}
 		return $results;
@@ -801,14 +801,14 @@ 
 	 * @param bool $count
 	 * @return \EE_Soft_Delete_Base_Class[]|int
 	 */
-	public function get_trashed_question_groups( $per_page, $current_page = 1, $count = FALSE ) {
-		$questionGroupModel=EEM_Question_Group::instance();
-		$query_params=$this->get_query_params($questionGroupModel,$per_page,$current_page);
-		if($count){
-			$where = isset( $query_params[0] ) ? array($query_params[0]) : array();
+	public function get_trashed_question_groups($per_page, $current_page = 1, $count = FALSE) {
+		$questionGroupModel = EEM_Question_Group::instance();
+		$query_params = $this->get_query_params($questionGroupModel, $per_page, $current_page);
+		if ($count) {
+			$where = isset($query_params[0]) ? array($query_params[0]) : array();
 			$query_params['limit'] = NULL;
 			$results = $questionGroupModel->count_deleted($where);
-		}else{
+		} else {
 			$results = $questionGroupModel->get_all_deleted($query_params);
 		}
 		return $results;
@@ -821,32 +821,32 @@ 
 	 */
 	public function update_question_group_order() {
 
-		$success = esc_html__( 'Question group order was updated successfully.', 'event_espresso' );
+		$success = esc_html__('Question group order was updated successfully.', 'event_espresso');
 
 		// grab our row IDs
-		$row_ids = isset( $this->_req_data['row_ids'] ) && ! empty( $this->_req_data['row_ids'] )
-			? explode( ',', rtrim( $this->_req_data['row_ids'], ',' ))
+		$row_ids = isset($this->_req_data['row_ids']) && ! empty($this->_req_data['row_ids'])
+			? explode(',', rtrim($this->_req_data['row_ids'], ','))
 			: array();
 
-		$perpage = !empty( $this->_req_data['perpage'] )
+		$perpage = ! empty($this->_req_data['perpage'])
 			? (int) $this->_req_data['perpage']
 			: NULL;
-		$curpage = !empty( $this->_req_data['curpage'] )
+		$curpage = ! empty($this->_req_data['curpage'])
 			? (int) $this->_req_data['curpage']
 			: NULL;
 
-		if ( ! empty( $row_ids ) ) {
+		if ( ! empty($row_ids)) {
 			//figure out where we start the row_id count at for the current page.
-			$qsgcount = empty( $curpage ) ? 0 : ($curpage - 1 ) * $perpage;
+			$qsgcount = empty($curpage) ? 0 : ($curpage - 1) * $perpage;
 
-			$row_count = count( $row_ids );
-			for( $i = 0; $i < $row_count; $i++ ) {
+			$row_count = count($row_ids);
+			for ($i = 0; $i < $row_count; $i++) {
 				//Update the questions when re-ordering
 				$updated = EEM_Question_Group::instance()->update(
-					array( 'QSG_order' => $qsgcount ),
-					array( array( 'QSG_ID' => $row_ids[ $i ] ) )
+					array('QSG_order' => $qsgcount),
+					array(array('QSG_ID' => $row_ids[$i]))
 				);
-				if ( $updated === false ) {
+				if ($updated === false) {
 					$success = false;
 				}
 				$qsgcount++;
@@ -856,10 +856,10 @@ 
 		}
 
 		$errors = ! $success
-			? esc_html__( 'An error occurred. The question group order was not updated.', 'event_espresso' )
+			? esc_html__('An error occurred. The question group order was not updated.', 'event_espresso')
 			: false;
 
-		echo json_encode( array( 'return_data' => false, 'success' => $success, 'errors' => $errors ));
+		echo json_encode(array('return_data' => false, 'success' => $success, 'errors' => $errors));
 		die();
 
 	}
@@ -878,17 +878,17 @@ 
 		$this->_template_args['values'] = $this->_yes_no_values;
 		add_action(
 			'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template',
-			array( $this, 'email_validation_settings_form' ),
+			array($this, 'email_validation_settings_form'),
 			2
 		);
-		$this->_template_args = (array)apply_filters(
+		$this->_template_args = (array) apply_filters(
 			'FHEE__Extend_Registration_Form_Admin_Page___reg_form_settings___template_args',
 			$this->_template_args
 		);
-		$this->_set_add_edit_form_tags( 'update_reg_form_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
+		$this->_set_add_edit_form_tags('update_reg_form_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
-			REGISTRATION_FORM_CAF_TEMPLATE_PATH . 'reg_form_settings.template.php',
+			REGISTRATION_FORM_CAF_TEMPLATE_PATH.'reg_form_settings.template.php',
 			$this->_template_args,
 			TRUE
 		);
@@ -909,7 +909,7 @@ 
 			EE_Registry::instance()->CFG,
 			__FILE__, __FUNCTION__, __LINE__
 		);
-		$this->_redirect_after_action( $success, esc_html__('Registration Form Options', 'event_espresso'), 'updated', array( 'action' => 'view_reg_form_settings' ) );
+		$this->_redirect_after_action($success, esc_html__('Registration Form Options', 'event_espresso'), 'updated', array('action' => 'view_reg_form_settings'));
 	}
 
 
@@ -940,20 +940,20 @@ 
 				'layout_strategy' => new EE_Admin_Two_Column_Layout(),
 				'subsections'     => array(
 					'email_validation_hdr'           => new EE_Form_Section_HTML(
-						EEH_HTML::h2( esc_html__( 'Email Validation Settings', 'event_espresso' ) )
+						EEH_HTML::h2(esc_html__('Email Validation Settings', 'event_espresso'))
 					),
 					'email_validation_level' => new EE_Select_Input(
 						array(
-							'basic'      => esc_html__( 'Basic', 'event_espresso' ),
-							'wp_default' => esc_html__( 'WordPress Default', 'event_espresso' ),
-							'i18n'       => esc_html__( 'International', 'event_espresso' ),
-							'i18n_dns'   => esc_html__( 'International + DNS Check', 'event_espresso' ),
+							'basic'      => esc_html__('Basic', 'event_espresso'),
+							'wp_default' => esc_html__('WordPress Default', 'event_espresso'),
+							'i18n'       => esc_html__('International', 'event_espresso'),
+							'i18n_dns'   => esc_html__('International + DNS Check', 'event_espresso'),
 						),
 						array(
-							'html_label_text' => esc_html__( 'Email Validation Level', 'event_espresso' )
-							                     . EEH_Template::get_help_tab_link( 'email_validation_info' ),
-							'html_help_text'  => esc_html__( 'These levels range from basic validation ( ie: text@text.text ) to more advanced checks against international email addresses (ie: üñîçøðé@example.com ) with additional MX and A record checks to confirm the domain actually exists. More information on on each level can be found within the help section.', 'event_espresso'),
-							'default' => isset( EE_Registry::instance()->CFG->registration->email_validation_level )
+							'html_label_text' => esc_html__('Email Validation Level', 'event_espresso')
+							                     . EEH_Template::get_help_tab_link('email_validation_info'),
+							'html_help_text'  => esc_html__('These levels range from basic validation ( ie: text@text.text ) to more advanced checks against international email addresses (ie: üñîçøðé@example.com ) with additional MX and A record checks to confirm the domain actually exists. More information on on each level can be found within the help section.', 'event_espresso'),
+							'default' => isset(EE_Registry::instance()->CFG->registration->email_validation_level)
 								? EE_Registry::instance()->CFG->registration->email_validation_level
 								: 'wp_default',
 							'required'        => false
@@ -972,18 +972,18 @@ 
 	 * @param \EE_Registration_Config $EE_Registration_Config
 	 * @return \EE_Registration_Config
 	 */
-	public function update_email_validation_settings_form( EE_Registration_Config $EE_Registration_Config ) {
+	public function update_email_validation_settings_form(EE_Registration_Config $EE_Registration_Config) {
 		try {
 			$email_validation_settings_form = $this->_email_validation_settings_form();
 			// if not displaying a form, then check for form submission
-			if ( $email_validation_settings_form->was_submitted() ) {
+			if ($email_validation_settings_form->was_submitted()) {
 				// capture form data
 				$email_validation_settings_form->receive_form_submission();
 				// validate form data
-				if ( $email_validation_settings_form->is_valid() ) {
+				if ($email_validation_settings_form->is_valid()) {
 					// grab validated data from form
 					$valid_data = $email_validation_settings_form->valid_data();
-					if ( isset( $valid_data['email_validation_level'] ) ) {
+					if (isset($valid_data['email_validation_level'])) {
 						$EE_Registration_Config->email_validation_level = $valid_data['email_validation_level'];
 					} else {
 						EE_Error::add_error(
@@ -997,7 +997,7 @@ 
 						);
 					}
 				} else {
-					if ( $email_validation_settings_form->submission_error_message() !== '' ) {
+					if ($email_validation_settings_form->submission_error_message() !== '') {
 						EE_Error::add_error(
 							$email_validation_settings_form->submission_error_message(),
 							__FILE__,
@@ -1007,7 +1007,7 @@ 
 					}
 				}
 			}
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 		return $EE_Registration_Config;

caffeinated/admin/extend/transactions/Extend_Transactions_Admin_Page.core.php

Spacing +43 added lines, -43 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -42,11 +42,11 @@ 
 	 * @param bool $routing
 	 * @return \Extend_Transactions_Admin_Page
 	 */
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
-		define( 'TXN_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/templates/');
-		define( 'TXN_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/assets/');
-		define( 'TXN_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'transactions/assets/');
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
+		define('TXN_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'transactions/templates/');
+		define('TXN_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND.'transactions/assets/');
+		define('TXN_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'transactions/assets/');
 	}
 
 
@@ -58,7 +58,7 @@ 
 	 * @return void
 	 */
 	protected function _extend_page_config() {
-		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'transactions';
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'transactions';
 
 		$new_page_routes = array(
 			'reports' => array(
@@ -67,7 +67,7 @@ 
 			)
 		);
 
-		$this->_page_routes = array_merge( $this->_page_routes, $new_page_routes );
+		$this->_page_routes = array_merge($this->_page_routes, $new_page_routes);
 
 		$new_page_config = array(
 			'reports' => array(
@@ -85,7 +85,7 @@ 
 				'require_nonce' => FALSE
 			)
 		);
-		$this->_page_config = array_merge( $this->_page_config, $new_page_config );
+		$this->_page_config = array_merge($this->_page_config, $new_page_config);
 	}
 
 
@@ -97,8 +97,8 @@ 
 	 * @return void
 	 */
 	public function load_scripts_styles_reports() {
-		wp_register_script( 'ee-txn-reports-js', TXN_CAF_ASSETS_URL . 'ee-transaction-admin-reports.js', array( 'google-charts' ), EVENT_ESPRESSO_VERSION, true );
-		wp_enqueue_script( 'ee-txn-reports-js' );
+		wp_register_script('ee-txn-reports-js', TXN_CAF_ASSETS_URL.'ee-transaction-admin-reports.js', array('google-charts'), EVENT_ESPRESSO_VERSION, true);
+		wp_enqueue_script('ee-txn-reports-js');
 		$this->_transaction_reports_js_setup();
 		EE_Registry::$i18n_js_strings['currency_format'] = EEH_Money::get_format_for_google_charts();
 	}
@@ -125,9 +125,9 @@ 
 	* @return void
 	*/
 	protected function _transaction_reports() {
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php';
+		$template_path = EE_ADMIN_TEMPLATE.'admin_reports.template.php';
 		$this->_admin_page_title = __('Transactions', 'event_espresso');
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_reports_template_data, TRUE );
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_reports_template_data, TRUE);
 
 		// the final template wrapper
 		$this->display_admin_page_with_no_sidebar();
@@ -142,42 +142,42 @@ 
 	 * @param string $period The period (acceptable by PHP Datetime constructor) for which the report is generated.
 	 * @return string
 	 */
-	private function _revenue_per_day_report( $period = '-1 month' ) {
+	private function _revenue_per_day_report($period = '-1 month') {
 
 		$report_ID = 'txn-admin-revenue-per-day-report-dv';
 
 		$TXN = EEM_Transaction::instance();
 
-		$results = $TXN->get_revenue_per_day_report( $period );
+		$results = $TXN->get_revenue_per_day_report($period);
 		$results = (array) $results;
 		$revenue = array();
 		$subtitle = '';
 
-		if ( $results ) {
-			$revenue[] = array( __( 'Date (only shows dates that have a revenue greater than 1)', 'event_espresso' ), __( 'Total Revenue', 'event_espresso' ) );
-			foreach ( $results as $result ) {
-				if ( $result->revenue > 1 ) {
-					$revenue[] = array( $result->txnDate, (float) $result->revenue );
+		if ($results) {
+			$revenue[] = array(__('Date (only shows dates that have a revenue greater than 1)', 'event_espresso'), __('Total Revenue', 'event_espresso'));
+			foreach ($results as $result) {
+				if ($result->revenue > 1) {
+					$revenue[] = array($result->txnDate, (float) $result->revenue);
 				}
 			}
 
 			//setup the date range.
-			$beginning_date = new DateTime( 'now' . $period, new DateTimeZone( EEH_DTT_Helper::get_timezone() ) );
-			$ending_date = new DateTime( 'now', new DateTimeZone( EEH_DTT_Helper::get_timezone() ) );
-			$subtitle = sprintf( _x( 'For the period: %s to %s', 'Used to give date range', 'event_espresso' ), $beginning_date->format( 'Y-m-d' ), $ending_date->format( 'Y-m-d' ) );
+			$beginning_date = new DateTime('now'.$period, new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+			$ending_date = new DateTime('now', new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+			$subtitle = sprintf(_x('For the period: %s to %s', 'Used to give date range', 'event_espresso'), $beginning_date->format('Y-m-d'), $ending_date->format('Y-m-d'));
 		}
 
-		$report_title = esc_html__( 'Total Revenue per Day', 'event_espresso' );
+		$report_title = esc_html__('Total Revenue per Day', 'event_espresso');
 
 		$report_params = array(
 			'title' 		=> $report_title,
 			'subtitle' => $subtitle,
 			'id' 			=> $report_ID,
 			'revenue' => $revenue,
-			'noResults' => empty( $revenue ),
-			'noTxnMsg'	=> sprintf( __( '%sThere are currently no transaction records in the last month for this report.%s', 'event_espresso' ), '<h2>' . $report_title . '</h2><p>', '</p>' )
+			'noResults' => empty($revenue),
+			'noTxnMsg'	=> sprintf(__('%sThere are currently no transaction records in the last month for this report.%s', 'event_espresso'), '<h2>'.$report_title.'</h2><p>', '</p>')
 		);
-		wp_localize_script( 'ee-txn-reports-js', 'txnRevPerDay', $report_params );
+		wp_localize_script('ee-txn-reports-js', 'txnRevPerDay', $report_params);
 
 		return $report_ID;
 	}
@@ -191,43 +191,43 @@ 
 	 * @param string $period  The period (acceptable by PHP Datetime constructor) for which the report is generated.
 	 * @return int
 	 */
-	private function _revenue_per_event_report( $period = '-1 month' ) {
+	private function _revenue_per_event_report($period = '-1 month') {
 
 		$report_ID = 'txn-admin-revenue-per-event-report-dv';
 
 		$TXN = EEM_Transaction::instance();
-		$results = $TXN->get_revenue_per_event_report( $period );
+		$results = $TXN->get_revenue_per_event_report($period);
 		$results = (array) $results;
 		$revenue = array();
 		$subtitle = '';
 
-		if ( $results ) {
-			$revenue[] = array( __( 'Event (only events that have a revenue greater than 1 are shown)', 'event_espresso' ), __( 'Total Revenue', 'event_espresso' ) );
-			foreach ( $results as $result ) {
-				if ( $result->revenue > 1 ) {
-					$event_name = stripslashes( html_entity_decode( $result->event_name, ENT_QUOTES, 'UTF-8' ) );
-					$event_name = wp_trim_words( $event_name, 5, '...' );
-					$revenue[]  = array( $event_name, (float) $result->revenue );
+		if ($results) {
+			$revenue[] = array(__('Event (only events that have a revenue greater than 1 are shown)', 'event_espresso'), __('Total Revenue', 'event_espresso'));
+			foreach ($results as $result) {
+				if ($result->revenue > 1) {
+					$event_name = stripslashes(html_entity_decode($result->event_name, ENT_QUOTES, 'UTF-8'));
+					$event_name = wp_trim_words($event_name, 5, '...');
+					$revenue[]  = array($event_name, (float) $result->revenue);
 				}
 			}
 
 			//setup the date range.
-			$beginning_date = new DateTime( 'now' . $period, new DateTimeZone( EEH_DTT_Helper::get_timezone() ) );
-			$ending_date = new DateTime( 'now', new DateTimeZone( EEH_DTT_Helper::get_timezone() ) );
-			$subtitle = sprintf( _x( 'For the period: %s to %s', 'Used to give date range', 'event_espresso' ), $beginning_date->format( 'Y-m-d' ), $ending_date->format( 'Y-m-d' ) );
+			$beginning_date = new DateTime('now'.$period, new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+			$ending_date = new DateTime('now', new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+			$subtitle = sprintf(_x('For the period: %s to %s', 'Used to give date range', 'event_espresso'), $beginning_date->format('Y-m-d'), $ending_date->format('Y-m-d'));
 		}
 
-		$report_title = esc_html__( 'Total Revenue per Event', 'event_espresso' );
+		$report_title = esc_html__('Total Revenue per Event', 'event_espresso');
 
 		$report_params = array(
 			'title' 		=> $report_title,
 			'subtitle' => $subtitle,
 			'id' 			=> $report_ID,
 			'revenue' => $revenue,
-			'noResults' => empty( $revenue ),
-			'noTxnMsg'	=> sprintf( __( '%sThere are currently no transaction records in the last month for this report.%s', 'event_espresso' ), '<h2>' . $report_title . '</h2><p>', '</p>' )
+			'noResults' => empty($revenue),
+			'noTxnMsg'	=> sprintf(__('%sThere are currently no transaction records in the last month for this report.%s', 'event_espresso'), '<h2>'.$report_title.'</h2><p>', '</p>')
 		);
-		wp_localize_script( 'ee-txn-reports-js', 'txnRevPerEvent', $report_params );
+		wp_localize_script('ee-txn-reports-js', 'txnRevPerEvent', $report_params);
 
 		return $report_ID;
 	}

caffeinated/admin/new/pricing/Pricing_Admin_Page.core.php

Spacing +190 added lines, -190 removed lines

@@ -31,8 +31,8 @@ 
 	 * @param bool $routing
 	 * @return Pricing_Admin_Page
 	 */
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
 	}
 
 
@@ -49,7 +49,7 @@ 
 
 
 	protected function _ajax_hooks() {
-		add_action('wp_ajax_espresso_update_prices_order', array( $this, 'update_price_order' ));
+		add_action('wp_ajax_espresso_update_prices_order', array($this, 'update_price_order'));
 	}
 
 
@@ -82,8 +82,8 @@ 
 	*		@return void
 	*/
 	protected function _set_page_routes() {
-		$prc_id = ! empty( $this->_req_data['PRC_ID'] ) && ! is_array( $this->_req_data['PRC_ID'] ) ? $this->_req_data['PRC_ID'] : 0;
-		$prt_id =  ! empty( $this->_req_data['PRT_ID'] ) && ! is_array( $this->_req_data['PRT_ID'] ) ? $this->_req_data['PRT_ID'] : 0;
+		$prc_id = ! empty($this->_req_data['PRC_ID']) && ! is_array($this->_req_data['PRC_ID']) ? $this->_req_data['PRC_ID'] : 0;
+		$prt_id = ! empty($this->_req_data['PRT_ID']) && ! is_array($this->_req_data['PRT_ID']) ? $this->_req_data['PRT_ID'] : 0;
 		$this->_page_routes = array(
 			'default' => array(
 					'func' => '_price_overview_list_table',
@@ -91,38 +91,38 @@ 
 				),
 			'add_new_price'	=> array(
 					'func' => '_edit_price_details',
-					'args' => array( 'new_price' => TRUE ),
+					'args' => array('new_price' => TRUE),
 					'capability' => 'ee_edit_default_prices'
 				),
 			'edit_price'	=> array(
 					'func' => '_edit_price_details',
-					'args' => array( 'new_price' => FALSE ),
+					'args' => array('new_price' => FALSE),
 					'capability' => 'ee_edit_default_price',
 					'obj_id' => $prc_id
 				),
 			'insert_price'	=> array(
 					'func' => '_insert_or_update_price',
-					'args' => array( 'new_price' => TRUE ),
+					'args' => array('new_price' => TRUE),
 					'noheader' => TRUE,
 					'capability' => 'ee_edit_default_prices',
 				),
 			'update_price'	=> array(
 					'func' => '_insert_or_update_price',
-					'args' => array( 'new_price' => FALSE ),
+					'args' => array('new_price' => FALSE),
 					'noheader' => TRUE,
 					'capability' => 'ee_edit_default_price',
 					'obj_id' => $prc_id
 				),
 			'trash_price'	=> array(
 					'func' => '_trash_or_restore_price',
-					'args' => array( 'trash' => TRUE ),
+					'args' => array('trash' => TRUE),
 					'noheader' => TRUE,
 					'capability' => 'ee_delete_default_price',
 					'obj_id' => $prc_id
 				),
 			'restore_price'	=> array(
 					'func' => '_trash_or_restore_price',
-					'args' => array( 'trash' => FALSE ),
+					'args' => array('trash' => FALSE),
 					'noheader' => TRUE,
 					'capability' => 'ee_delete_default_price',
 					'obj_id' => $prc_id
@@ -154,27 +154,27 @@ 
 				),
 			'insert_price_type'	=> array(
 					'func' => '_insert_or_update_price_type',
-					'args' => array( 'new_price_type' => TRUE ),
+					'args' => array('new_price_type' => TRUE),
 					'noheader' => TRUE,
 					'capability' => 'ee_edit_default_price_types'
 				),
 			'update_price_type' => array(
 					'func' => '_insert_or_update_price_type',
-					'args' => array( 'new_price_type' => FALSE ),
+					'args' => array('new_price_type' => FALSE),
 					'noheader' => TRUE,
 					'capability' => 'ee_edit_default_price_type',
 					'obj_id' => $prt_id
 				),
 			'trash_price_type'	=> array(
 					'func' => '_trash_or_restore_price_type',
-					'args' => array( 'trash' => TRUE ),
+					'args' => array('trash' => TRUE),
 					'noheader' => TRUE,
 					'capability' => 'ee_delete_default_price_type',
 					'obj_id' => $prt_id
 				),
 			'restore_price_type'	=> array(
 					'func' => '_trash_or_restore_price_type',
-					'args' => array( 'trash' => FALSE ),
+					'args' => array('trash' => FALSE),
 					'noheader' => TRUE,
 					'capability' => 'ee_delete_default_price_type',
 					'obj_id' => $prt_id
@@ -214,7 +214,7 @@ 
 							'filename' => 'pricing_default_pricing_views_bulk_actions_search'
 							)
 						),
-					'help_tour' => array( 'Pricing_Default_Prices_Help_Tour'),
+					'help_tour' => array('Pricing_Default_Prices_Help_Tour'),
 					'require_nonce' => FALSE
 				),
 			'add_new_price' => array(
@@ -230,24 +230,24 @@ 
 							)
 						),
                     'help_tour' => array('Pricing_Add_New_Default_Price_Help_Tour'),
-					'metaboxes' => array( '_publish_post_box', '_espresso_news_post_box', '_price_details_meta_boxes' ),
+					'metaboxes' => array('_publish_post_box', '_espresso_news_post_box', '_price_details_meta_boxes'),
 					'require_nonce' => FALSE
 				),
 			'edit_price' => array(
 					'nav' => array(
 							'label' => __('Edit Default Price', 'event_espresso'),
 							'order' => 20,
-							'url' => isset($this->_req_data['id']) ? add_query_arg(array('id' => $this->_req_data['id'] ), $this->_current_page_view_url )  : $this->_admin_base_url,
+							'url' => isset($this->_req_data['id']) ? add_query_arg(array('id' => $this->_req_data['id']), $this->_current_page_view_url) : $this->_admin_base_url,
 							'persistent' => FALSE
 						),
-					'metaboxes' => array( '_publish_post_box', '_espresso_news_post_box', '_price_details_meta_boxes' ),
+					'metaboxes' => array('_publish_post_box', '_espresso_news_post_box', '_price_details_meta_boxes'),
                     'help_tabs' => array(
 						'edit_default_price_help_tab' => array(
 							'title' => __('Edit Default Price', 'event_espresso'),
 							'filename' => 'pricing_edit_default_price'
 							)
 						),
-					'help_tour' => array( 'Pricing_Edit_Default_Price_Help_Tour' ),
+					'help_tour' => array('Pricing_Edit_Default_Price_Help_Tour'),
 					'require_nonce' => FALSE
 				),
 			'price_types' => array(
@@ -270,7 +270,7 @@ 
 							'filename' => 'pricing_price_types_views_bulk_actions_search'
 							),
 						),
-					'help_tour' => array( 'Pricing_Price_Types_Default_Help_Tour' ),
+					'help_tour' => array('Pricing_Price_Types_Default_Help_Tour'),
 					'metaboxes' => array('_espresso_news_post_box', '_espresso_links_post_box'),
 					'require_nonce' => FALSE
 				),
@@ -286,8 +286,8 @@ 
 							'filename' => 'pricing_add_new_price_type'
 							)
 						),
-                    'help_tour' => array( 'Pricing_Add_New_Price_Type_Help_Tour' ),
-					'metaboxes' => array( '_publish_post_box', '_espresso_news_post_box', '_price_type_details_meta_boxes' ),
+                    'help_tour' => array('Pricing_Add_New_Price_Type_Help_Tour'),
+					'metaboxes' => array('_publish_post_box', '_espresso_news_post_box', '_price_type_details_meta_boxes'),
 					'require_nonce' => FALSE
 				),
 			'edit_price_type' => array(
@@ -302,8 +302,8 @@ 
 							'filename' => 'pricing_edit_price_type'
 							)
 						),
-                    'help_tour' => array( 'Pricing_Edit_Price_Type_Help_Tour' ),
-					'metaboxes' => array( '_publish_post_box', '_espresso_news_post_box', '_price_type_details_meta_boxes' ),
+                    'help_tour' => array('Pricing_Edit_Price_Type_Help_Tour'),
+					'metaboxes' => array('_publish_post_box', '_espresso_news_post_box', '_price_type_details_meta_boxes'),
 
 					'require_nonce' => FALSE
 				)
@@ -340,7 +340,7 @@ 
 	public function load_scripts_styles() {
 		//styles
 		wp_enqueue_style('espresso-ui-theme');
-		wp_register_style( 'espresso_PRICING', PRICING_ASSETS_URL . 'espresso_pricing_admin.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_style('espresso_PRICING', PRICING_ASSETS_URL.'espresso_pricing_admin.css', array(), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('espresso_PRICING');
 
 		//scripts
@@ -350,8 +350,8 @@ 
 		//wp_enqueue_script('jquery-ui-dialog');
 		//wp_enqueue_script('jquery-ui-draggable');
 		//wp_enqueue_script('jquery-ui-datepicker');
-		wp_register_script( 'espresso_PRICING', PRICING_ASSETS_URL . 'espresso_pricing_admin.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_enqueue_script( 'espresso_PRICING' );
+		wp_register_script('espresso_PRICING', PRICING_ASSETS_URL.'espresso_pricing_admin.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_enqueue_script('espresso_PRICING');
 	}
 
 
@@ -359,7 +359,7 @@ 
 
 
 	public function load_scripts_styles_default() {
-		wp_enqueue_script( 'espresso_ajax_table_sorting' );
+		wp_enqueue_script('espresso_ajax_table_sorting');
 	}
 
 
@@ -387,7 +387,7 @@ 
 				)
 		);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_prices', 'pricing_trash_price' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_prices', 'pricing_trash_price')) {
 			$this->_views['trashed'] = array(
 					'slug' => 'trashed',
 					'label' => __('Trash', 'event_espresso'),
@@ -417,7 +417,7 @@ 
 				)
 		);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_price_types', 'pricing_trash_price_type' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_price_types', 'pricing_trash_price_type')) {
 			 $this->_views['trashed'] = array(
 					'slug' => 'trashed',
 					'label' => __('Trash', 'event_espresso'),
@@ -456,18 +456,18 @@ 
 	* 	@param  boolean $trashed   whether the current view is of the trash can - eww yuck!
 	* 	@return mixed (int|array)  int = count || array of price objects
 	*/
-	public function get_prices_overview_data( $per_page = 10, $count = FALSE, $trashed = FALSE ) {
+	public function get_prices_overview_data($per_page = 10, $count = FALSE, $trashed = FALSE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		// start with an empty array
 		$event_pricing = array();
 
-		require_once( PRICING_ADMIN . 'Prices_List_Table.class.php' );
-		require_once(EE_MODELS . 'EEM_Price.model.php');
+		require_once(PRICING_ADMIN.'Prices_List_Table.class.php');
+		require_once(EE_MODELS.'EEM_Price.model.php');
 		//$PRC = EEM_Price::instance();
 
 		$this->_req_data['orderby'] = empty($this->_req_data['orderby']) ? '' : $this->_req_data['orderby'];
-		$order = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'ASC';
+		$order = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'ASC';
 
 		switch ($this->_req_data['orderby']) {
 			case 'name':
@@ -480,27 +480,27 @@ 
 				$orderby = array('PRC_amount'=>$order);
 				break;
 			default:
-				$orderby = array( 'PRC_order'=>$order, 'Price_Type.PRT_order'=>$order, 'PRC_ID'=>$order);
+				$orderby = array('PRC_order'=>$order, 'Price_Type.PRT_order'=>$order, 'PRC_ID'=>$order);
 		}
 
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page;
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page;
 
 		$_where = array(
 				'PRC_is_default' => 1,
 				'PRC_deleted' => $trashed
 				);
 
-		$offset = ($current_page-1)*$per_page;
-		$limit = array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = array($offset, $per_page);
 
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$_where['OR'] = array(
-				'PRC_name' => array('LIKE',$sstr ),
-				'PRC_desc' => array('LIKE',$sstr ),
-				'PRC_amount' => array( 'LIKE',$sstr ),
-				'Price_Type.PRT_name' => array( 'LIKE', $sstr )
+				'PRC_name' => array('LIKE', $sstr),
+				'PRC_desc' => array('LIKE', $sstr),
+				'PRC_amount' => array('LIKE', $sstr),
+				'Price_Type.PRT_name' => array('LIKE', $sstr)
 				);
 		}
 
@@ -511,9 +511,9 @@ 
 			'group_by'=>'PRC_ID'
 			);
 
-		if($count){
-			return $trashed ? EEM_Price::instance()->count( array( $_where ) ) : EEM_Price::instance()->count_deleted_and_undeleted(array($_where));
-		}else{
+		if ($count) {
+			return $trashed ? EEM_Price::instance()->count(array($_where)) : EEM_Price::instance()->count_deleted_and_undeleted(array($_where));
+		} else {
 			return EEM_Price::instance()->get_all_deleted_and_undeleted($query_params);
 		}
 	}
@@ -529,49 +529,49 @@ 
 	*		@return void
 	*/
 	protected function _edit_price_details() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		// grab price ID
-		$PRC_ID = isset( $this->_req_data['id'] ) && ! empty( $this->_req_data['id'] ) ? absint( $this->_req_data['id'] ) : FALSE;
+		$PRC_ID = isset($this->_req_data['id']) && ! empty($this->_req_data['id']) ? absint($this->_req_data['id']) : FALSE;
 		// change page title based on request action
-		switch( $this->_req_action ) {
+		switch ($this->_req_action) {
 			case 'add_new_price' :
-				$this->_admin_page_title = esc_html__( 'Add New Price', 'event_espresso' );
+				$this->_admin_page_title = esc_html__('Add New Price', 'event_espresso');
 				break;
 			case 'edit_price' :
-				$this->_admin_page_title = esc_html__( 'Edit Price', 'event_espresso' );
+				$this->_admin_page_title = esc_html__('Edit Price', 'event_espresso');
 				break;
 			default :
-				$this->_admin_page_title = ucwords( str_replace( '_', ' ', $this->_req_action ));
+				$this->_admin_page_title = ucwords(str_replace('_', ' ', $this->_req_action));
 		}
 		// add PRC_ID to title if editing
-		$this->_admin_page_title = $PRC_ID ? $this->_admin_page_title . ' # ' . $PRC_ID : $this->_admin_page_title;
+		$this->_admin_page_title = $PRC_ID ? $this->_admin_page_title.' # '.$PRC_ID : $this->_admin_page_title;
 
 		// get prices
-		require_once(EE_MODELS . 'EEM_Price.model.php');
+		require_once(EE_MODELS.'EEM_Price.model.php');
 		$PRC = EEM_Price::instance();
 
-		if ( $PRC_ID ) {
-			$price = $PRC->get_one_by_ID( $PRC_ID );
+		if ($PRC_ID) {
+			$price = $PRC->get_one_by_ID($PRC_ID);
 			$additional_hidden_fields = array(
-					'PRC_ID' => array( 'type' => 'hidden', 'value' => $PRC_ID )
+					'PRC_ID' => array('type' => 'hidden', 'value' => $PRC_ID)
 				);
-			$this->_set_add_edit_form_tags( 'update_price', $additional_hidden_fields );
+			$this->_set_add_edit_form_tags('update_price', $additional_hidden_fields);
 		} else {
 			$price = $PRC->get_new_price();
-			$this->_set_add_edit_form_tags( 'insert_price' );
+			$this->_set_add_edit_form_tags('insert_price');
 		}
 
 		$this->_template_args['PRC_ID'] = $PRC_ID;
 		$this->_template_args['price'] = $price;
 
 		// get price types
-		require_once(EE_MODELS . 'EEM_Price_Type.model.php');
+		require_once(EE_MODELS.'EEM_Price_Type.model.php');
 		$PRT = EEM_Price_Type::instance();
-		$price_types = $PRT->get_all( array( array('PBT_ID' => array('!=', 1 ) ) ) );
+		$price_types = $PRT->get_all(array(array('PBT_ID' => array('!=', 1))));
 		$price_type_names = array();
 		if (empty($price_types)) {
-			$msg = __( 'You have no price types defined. Please add a price type before adding a price.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			$msg = __('You have no price types defined. Please add a price type before adding a price.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			exit();
 		} else {
 			foreach ($price_types as $type) {
@@ -584,7 +584,7 @@ 
 		$this->_template_args['price_types'] = $price_type_names;
 		$this->_template_args['learn_more_about_pricing_link'] = $this->_learn_more_about_pricing_link();
 
-		$this->_set_publish_post_box_vars( 'id', $PRC_ID );
+		$this->_set_publish_post_box_vars('id', $PRC_ID);
 		// the details template wrapper
 		$this->display_admin_page_with_sidebar();
 	}
@@ -600,7 +600,7 @@ 
 	*		@return void
 	*/
 	protected function _price_details_meta_boxes() {
-		add_meta_box( 'edit-price-details-mbox', __( 'Default Price Details', 'event_espresso' ), array( $this, '_edit_price_details_meta_box' ), $this->wp_page_slug, 'normal', 'high' );
+		add_meta_box('edit-price-details-mbox', __('Default Price Details', 'event_espresso'), array($this, '_edit_price_details_meta_box'), $this->wp_page_slug, 'normal', 'high');
 	}
 
 
@@ -614,7 +614,7 @@ 
 	*		@return void
 	*/
 	public function _edit_price_details_meta_box() {
-		echo EEH_Template::display_template( PRICING_TEMPLATE_PATH . 'pricing_details_main_meta_box.template.php', $this->_template_args, TRUE );
+		echo EEH_Template::display_template(PRICING_TEMPLATE_PATH.'pricing_details_main_meta_box.template.php', $this->_template_args, TRUE);
 	}
 
 
@@ -628,7 +628,7 @@ 
 	*/
 	protected function set_price_column_values() {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		$set_column_values = array(
 				'PRT_ID' => absint($this->_req_data['PRT_ID']),
@@ -656,12 +656,12 @@ 
 	*		@access protected
 	*		@return void
 	*/
-	protected function _insert_or_update_price( $insert = FALSE ) {
+	protected function _insert_or_update_price($insert = FALSE) {
 
 		//echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		require_once(EE_MODELS . 'EEM_Price.model.php');
+		require_once(EE_MODELS.'EEM_Price.model.php');
 		$PRC = EEM_Price::instance();
 
 		// why be so pessimistic ???  : (
@@ -669,14 +669,14 @@ 
 
 		$set_column_values = $this->set_price_column_values();
 		// is this a new Price ?
-		if ( $insert ) {
+		if ($insert) {
 			// run the insert
-			if ( $PRC_ID = $PRC->insert( $set_column_values )) {
+			if ($PRC_ID = $PRC->insert($set_column_values)) {
 				//make sure this new price modifier is attached to the ticket but ONLY if it is not a tax type
 				$PR = EEM_price::instance()->get_one_by_ID($PRC_ID);
-				if ( $PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax ) {
+				if ($PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax) {
 					$ticket = EEM_Ticket::instance()->get_one_by_ID(1);
-					$ticket->_add_relation_to( $PR, 'Price' );
+					$ticket->_add_relation_to($PR, 'Price');
 					$ticket->save();
 				}
 				$success = 1;
@@ -686,29 +686,29 @@ 
 			}
 			$action_desc = 'created';
 		} else {
-			$PRC_ID = absint( $this->_req_data['PRC_ID'] );
+			$PRC_ID = absint($this->_req_data['PRC_ID']);
 			// run the update
-			$where_cols_n_values = array( 'PRC_ID' => $PRC_ID );
-			if ( $PRC->update( $set_column_values, array($where_cols_n_values))) {
+			$where_cols_n_values = array('PRC_ID' => $PRC_ID);
+			if ($PRC->update($set_column_values, array($where_cols_n_values))) {
 				$success = 1;
 			}
 
 			$PR = EEM_Price::instance()->get_one_by_ID($PRC_ID);
-			if ( $PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax ) {
+			if ($PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax) {
 
 				//if this is $PRC_ID == 1, then we need to update the default ticket attached to this price so the TKT_price value is updated.
-				if ( $PRC_ID === 1 ) {
+				if ($PRC_ID === 1) {
 					$ticket = $PR->get_first_related('Ticket');
-					if ( $ticket ) {
-						$ticket->set('TKT_price', $PR->get('PRC_amount') );
-						$ticket->set('TKT_name', $PR->get('PRC_name') );
+					if ($ticket) {
+						$ticket->set('TKT_price', $PR->get('PRC_amount'));
+						$ticket->set('TKT_name', $PR->get('PRC_name'));
 						$ticket->set('TKT_description', $PR->get('PRC_desc'));
 						$ticket->save();
 					}
 				} else {
 					//we make sure this price is attached to base ticket. but ONLY if its not a tax ticket type.
 					$ticket = EEM_Ticket::instance()->get_one_by_ID(1);
-					$ticket->_add_relation_to( $PRC_ID, 'Price' );
+					$ticket->_add_relation_to($PRC_ID, 'Price');
 					$ticket->save();
 				}
 			}
@@ -716,9 +716,9 @@ 
 			$action_desc = 'updated';
 		}
 
-		$query_args = array( 'action' => 'edit_price', 'id' => $PRC_ID );
+		$query_args = array('action' => 'edit_price', 'id' => $PRC_ID);
 
-		$this->_redirect_after_action( $success, 'Prices', $action_desc, $query_args );
+		$this->_redirect_after_action($success, 'Prices', $action_desc, $query_args);
 
 	}
 
@@ -732,12 +732,12 @@ 
 	*		@access protected
 	*		@return void
 	*/
-	protected function _trash_or_restore_price( $trash = TRUE ) {
+	protected function _trash_or_restore_price($trash = TRUE) {
 
 		//echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		require_once(EE_MODELS . 'EEM_Price.model.php');
+		require_once(EE_MODELS.'EEM_Price.model.php');
 		$PRC = EEM_Price::instance();
 
 		$success = 1;
@@ -746,18 +746,18 @@ 
 		//get base ticket for updating
 		$ticket = EEM_Ticket::instance()->get_one_by_ID(1);
 		//Checkboxes
-		if (!empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			// if array has more than one element than success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 			// cycle thru checkboxes
-			while (list( $PRC_ID, $value ) = each($this->_req_data['checkbox'])) {
-				if ( ! $PRC->update_by_ID(array('PRC_deleted' => $PRC_deleted), absint($PRC_ID) ) ) {
+			while (list($PRC_ID, $value) = each($this->_req_data['checkbox'])) {
+				if ( ! $PRC->update_by_ID(array('PRC_deleted' => $PRC_deleted), absint($PRC_ID))) {
 					$success = 0;
 				} else {
 					$PR = EEM_Price::instance()->get_one_by_ID($PRC_ID);
-					if ( $PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax ) {
+					if ($PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax) {
 						//if trashing then remove relations to base default ticket.  If restoring then add back to base default ticket
-						if ( $PRC_deleted ) {
+						if ($PRC_deleted) {
 							$ticket->_remove_relation_to($PRC_ID, 'Price');
 						} else {
 							$ticket->_add_relation_to($PRC_ID, 'Price');
@@ -769,14 +769,14 @@ 
 
 		} else {
 			// grab single id and delete
-			$PRC_ID = isset( $this->_req_data['id'] ) ? absint($this->_req_data['id']) : 0;
-			if ( empty( $PRC_ID ) || ! $PRC->update_by_ID(array('PRC_deleted' => $PRC_deleted), $PRC_ID) ) {
+			$PRC_ID = isset($this->_req_data['id']) ? absint($this->_req_data['id']) : 0;
+			if (empty($PRC_ID) || ! $PRC->update_by_ID(array('PRC_deleted' => $PRC_deleted), $PRC_ID)) {
 				$success = 0;
 			} else {
 				$PR = EEM_Price::instance()->get_one_by_ID($PRC_ID);
-				if ( $PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax ) {
+				if ($PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax) {
 					//if trashing then remove relations to base default ticket.  If restoring then add back to base default ticket
-					if ( $PRC_deleted ) {
+					if ($PRC_deleted) {
 						$ticket->_remove_relation_to($PRC_ID, 'Price');
 					} else {
 						$ticket->_add_relation_to($PRC_ID, 'Price');
@@ -790,17 +790,17 @@ 
 			'action' => 'default'
 			);
 
-		if ( $success ) {
-			if ( $trash ) {
+		if ($success) {
+			if ($trash) {
 				$msg = $success == 2 ? __('The Prices have been trashed.', 'event_espresso') : __('The Price has been trashed.', 'event_espresso');
 			} else {
 				$msg = $success == 2 ? __('The Prices have been restored.', 'event_espresso') : __('The Price has been restored.', 'event_espresso');
 			}
 
-			EE_Error::add_success( $msg );
+			EE_Error::add_success($msg);
 		}
 
-		$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 
 	}
 
@@ -817,19 +817,19 @@ 
 	protected function _delete_price() {
 
 		//echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		require_once(EE_MODELS . 'EEM_Price.model.php');
+		require_once(EE_MODELS.'EEM_Price.model.php');
 		$PRC = EEM_Price::instance();
 
 		$success = 1;
 		//Checkboxes
-		if (!empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			// if array has more than one element than success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 			// cycle thru bulk action checkboxes
-			while (list( $PRC_ID, $value ) = each($this->_req_data['checkbox'])) {
-				if (!$PRC->delete_permanently_by_ID(absint($PRC_ID))) {
+			while (list($PRC_ID, $value) = each($this->_req_data['checkbox'])) {
+				if ( ! $PRC->delete_permanently_by_ID(absint($PRC_ID))) {
 					$success = 0;
 				}
 			}
@@ -843,7 +843,7 @@ 
 
 		}
 
-		$this->_redirect_after_action( $success, 'Prices', 'deleted', array() );
+		$this->_redirect_after_action($success, 'Prices', 'deleted', array());
 
 	}
 
@@ -851,16 +851,16 @@ 
 
 
 	public function update_price_order() {
-		$success = __( 'Price order was updated successfully.', 'event_espresso' );
+		$success = __('Price order was updated successfully.', 'event_espresso');
 
 		// grab our row IDs
-		$row_ids = isset( $this->_req_data['row_ids'] ) && ! empty( $this->_req_data['row_ids'] ) ? explode( ',', rtrim( $this->_req_data['row_ids'], ',' )) : FALSE;
+		$row_ids = isset($this->_req_data['row_ids']) && ! empty($this->_req_data['row_ids']) ? explode(',', rtrim($this->_req_data['row_ids'], ',')) : FALSE;
 
-		if ( is_array( $row_ids )) {
-			for ( $i = 0; $i < count( $row_ids ); $i++ ) {
+		if (is_array($row_ids)) {
+			for ($i = 0; $i < count($row_ids); $i++) {
 				//Update the prices when re-ordering
 				$id = absint($row_ids[$i]);
-				if ( EEM_Price::instance()->update ( array( 'PRC_order' => $i+1 ), array(array( 'PRC_ID' => $id ) )) === FALSE ) {
+				if (EEM_Price::instance()->update(array('PRC_order' => $i + 1), array(array('PRC_ID' => $id))) === FALSE) {
 					$success = FALSE;
 				}
 			}
@@ -868,9 +868,9 @@ 
 			$success = FALSE;
 		}
 
-		$errors = ! $success ? __( 'An error occurred. The price order was not updated.', 'event_espresso' ) : FALSE;
+		$errors = ! $success ? __('An error occurred. The price order was not updated.', 'event_espresso') : FALSE;
 
-		echo json_encode( array( 'return_data' => FALSE, 'success' => $success, 'errors' => $errors ));
+		echo json_encode(array('return_data' => FALSE, 'success' => $success, 'errors' => $errors));
 		die();
 	}
 
@@ -913,46 +913,46 @@ 
 	* 	@param  boolean $trashed   whether the current view is of the trash can - eww yuck!
 	* 	@return mixed (int|array)  int = count || array of price objects
 	*/
-	public function get_price_types_overview_data( $per_page = 10, $count = FALSE, $trashed = FALSE ) {
+	public function get_price_types_overview_data($per_page = 10, $count = FALSE, $trashed = FALSE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		// start with an empty array
 
-		require_once( PRICING_ADMIN . 'Price_Types_List_Table.class.php' );
-		require_once( EE_MODELS . 'EEM_Price_Type.model.php' );
+		require_once(PRICING_ADMIN.'Price_Types_List_Table.class.php');
+		require_once(EE_MODELS.'EEM_Price_Type.model.php');
 
 		$this->_req_data['orderby'] = empty($this->_req_data['orderby']) ? '' : $this->_req_data['orderby'];
-		$order = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'ASC';
+		$order = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'ASC';
 		switch ($this->_req_data['orderby']) {
 			case 'name':
-				$orderby = array( 'PRT_name' => $order);
+				$orderby = array('PRT_name' => $order);
 				break;
 			default:
-				$orderby = array( 'PRT_order' => $order);
+				$orderby = array('PRT_order' => $order);
 		}
 
 
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page;
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page;
 
-		$offset = ($current_page-1)*$per_page;
-		$limit = array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = array($offset, $per_page);
 
-		$_where = array('PRT_deleted'=>$trashed, 'PBT_ID' => array('!=', 1 ) );
+		$_where = array('PRT_deleted'=>$trashed, 'PBT_ID' => array('!=', 1));
 
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$_where['OR'] = array(
-				'PRT_name' => array( 'LIKE', $sstr )
+				'PRT_name' => array('LIKE', $sstr)
 				);
 		}
 		$query_params = array(
 			$_where,
 			'order_by'=>$orderby,
 			'limit'=>$limit);
-		if($count){
+		if ($count) {
 			return EEM_Price_Type::instance()->count_deleted_and_undeleted($query_params);
-		}else{
+		} else {
 			return EEM_Price_Type::instance()->get_all_deleted_and_undeleted($query_params);
 		}
 
@@ -972,34 +972,34 @@ 
 	*/
 	protected function _edit_price_type_details() {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 
 		// grab price type ID
-		$PRT_ID = isset( $this->_req_data['id'] ) && ! empty( $this->_req_data['id'] ) ? absint( $this->_req_data['id'] ) : FALSE;
+		$PRT_ID = isset($this->_req_data['id']) && ! empty($this->_req_data['id']) ? absint($this->_req_data['id']) : FALSE;
 		// change page title based on request action
-		switch( $this->_req_action ) {
+		switch ($this->_req_action) {
 			case 'add_new_price_type' :
-				$this->_admin_page_title = esc_html__( 'Add New Price Type', 'event_espresso' );
+				$this->_admin_page_title = esc_html__('Add New Price Type', 'event_espresso');
 				break;
 			case 'edit_price_type' :
-				$this->_admin_page_title = esc_html__( 'Edit Price Type', 'event_espresso' );
+				$this->_admin_page_title = esc_html__('Edit Price Type', 'event_espresso');
 				break;
 			default :
-				$this->_admin_page_title = ucwords( str_replace( '_', ' ', $this->_req_action ));
+				$this->_admin_page_title = ucwords(str_replace('_', ' ', $this->_req_action));
 		}
 		// add PRT_ID to title if editing
-		$this->_admin_page_title = $PRT_ID ? $this->_admin_page_title . ' # ' . $PRT_ID : $this->_admin_page_title;
+		$this->_admin_page_title = $PRT_ID ? $this->_admin_page_title.' # '.$PRT_ID : $this->_admin_page_title;
 
 //		require_once(EE_MODELS . 'EEM_Price_Type.model.php');
 
-		if ( $PRT_ID ) {
-			$price_type = EEM_Price_Type::instance()->get_one_by_ID( $PRT_ID );
-			$additional_hidden_fields = array( 'PRT_ID' => array( 'type' => 'hidden', 'value' => $PRT_ID ));
-			$this->_set_add_edit_form_tags( 'update_price_type', $additional_hidden_fields );
+		if ($PRT_ID) {
+			$price_type = EEM_Price_Type::instance()->get_one_by_ID($PRT_ID);
+			$additional_hidden_fields = array('PRT_ID' => array('type' => 'hidden', 'value' => $PRT_ID));
+			$this->_set_add_edit_form_tags('update_price_type', $additional_hidden_fields);
 		} else {
 			$price_type = EEM_Price_Type::instance()->get_new_price_type();
-			$this->_set_add_edit_form_tags( 'insert_price_type' );
+			$this->_set_add_edit_form_tags('insert_price_type');
 		}
 
 		$this->_template_args['PRT_ID'] = $PRT_ID;
@@ -1008,19 +1008,19 @@ 
 
 		$base_types = EEM_Price_Type::instance()->get_base_types();
 		$select_values = array();
-		foreach ( $base_types as $ref => $text ) {
-			if ( $ref == EEM_Price_Type::base_type_base_price ) {
+		foreach ($base_types as $ref => $text) {
+			if ($ref == EEM_Price_Type::base_type_base_price) {
 				//do not allow creation of base_type_base_prices because that's a system only base type.
 				continue;
 			}
-			$values[] = array( 'id' => $ref, 'text' => $text );
+			$values[] = array('id' => $ref, 'text' => $text);
 		}
 
 
 		$this->_template_args['base_type_select'] = EEH_Form_Fields::select_input('base_type', $values, $price_type->base_type(), 'id="price-type-base-type-slct"');
 		$this->_template_args['learn_more_about_pricing_link'] = $this->_learn_more_about_pricing_link();
-		$redirect_URL = add_query_arg( array( 'action' => 'price_types'), $this->_admin_base_url );
-		$this->_set_publish_post_box_vars( 'id', $PRT_ID, FALSE, $redirect_URL );
+		$redirect_URL = add_query_arg(array('action' => 'price_types'), $this->_admin_base_url);
+		$this->_set_publish_post_box_vars('id', $PRT_ID, FALSE, $redirect_URL);
 		// the details template wrapper
 		$this->display_admin_page_with_sidebar();
 
@@ -1037,7 +1037,7 @@ 
 	*		@return void
 	*/
 	protected function _price_type_details_meta_boxes() {
-		add_meta_box( 'edit-price-details-mbox', __( 'Price Type Details', 'event_espresso' ), array( $this, '_edit_price_type_details_meta_box' ), $this->wp_page_slug, 'normal', 'high' );
+		add_meta_box('edit-price-details-mbox', __('Price Type Details', 'event_espresso'), array($this, '_edit_price_type_details_meta_box'), $this->wp_page_slug, 'normal', 'high');
 	}
 
 
@@ -1050,7 +1050,7 @@ 
 	*		@return void
 	*/
 	public function _edit_price_type_details_meta_box() {
-		echo EEH_Template::display_template( PRICING_TEMPLATE_PATH . 'pricing_type_details_main_meta_box.template.php', $this->_template_args, TRUE );
+		echo EEH_Template::display_template(PRICING_TEMPLATE_PATH.'pricing_type_details_main_meta_box.template.php', $this->_template_args, TRUE);
 	}
 
 
@@ -1063,9 +1063,9 @@ 
 	*/
 	protected function set_price_type_column_values() {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		$base_type = !empty( $this->_req_data['base_type'] ) ? $this->_req_data['base_type'] : EEM_Price_Type::base_type_base_price;
+		$base_type = ! empty($this->_req_data['base_type']) ? $this->_req_data['base_type'] : EEM_Price_Type::base_type_base_price;
 
 		switch ($base_type) {
 
@@ -1112,12 +1112,12 @@ 
 	*		@access protected
 	*		@return void
 	*/
-	protected function _insert_or_update_price_type( $new_price_type = FALSE ) {
+	protected function _insert_or_update_price_type($new_price_type = FALSE) {
 
 //		echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		require_once(EE_MODELS . 'EEM_Price_Type.model.php');
+		require_once(EE_MODELS.'EEM_Price_Type.model.php');
 		$PRT = EEM_Price_Type::instance();
 
 		// why be so pessimistic ???  : (
@@ -1125,24 +1125,24 @@ 
 
 		$set_column_values = $this->set_price_type_column_values();
 		// is this a new Price ?
-		if ( $new_price_type ) {
+		if ($new_price_type) {
 			// run the insert
-			if ( $PRT_ID = $PRT->insert( $set_column_values )) {
+			if ($PRT_ID = $PRT->insert($set_column_values)) {
 				$success = 1;
 			}
 			$action_desc = 'created';
 		} else {
 			$PRT_ID = absint($this->_req_data['PRT_ID']);
 			// run the update
-			$where_cols_n_values = array('PRT_ID' => $PRT_ID );
-			if ( $PRT->update( $set_column_values, array( $where_cols_n_values ))) {
+			$where_cols_n_values = array('PRT_ID' => $PRT_ID);
+			if ($PRT->update($set_column_values, array($where_cols_n_values))) {
 				$success = 1;
 			}
 			$action_desc = 'updated';
 		}
 
-		$query_args = array( 'action'=> 'edit_price_type', 'id' => $PRT_ID );
-		$this->_redirect_after_action( $success, 'Price Type', $action_desc, $query_args );
+		$query_args = array('action'=> 'edit_price_type', 'id' => $PRT_ID);
+		$this->_redirect_after_action($success, 'Price Type', $action_desc, $query_args);
 
 	}
 
@@ -1156,49 +1156,49 @@ 
 	*		@access protected
 	*		@return void
 	*/
-	protected function _trash_or_restore_price_type( $trash = TRUE ) {
+	protected function _trash_or_restore_price_type($trash = TRUE) {
 
 		//echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		require_once(EE_MODELS . 'EEM_Price_Type.model.php');
+		require_once(EE_MODELS.'EEM_Price_Type.model.php');
 		$PRT = EEM_Price_Type::instance();
 
 		$success = 1;
 		$PRT_deleted = $trash ? TRUE : FALSE;
 		//Checkboxes
-		if (!empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			// if array has more than one element than success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
-			$what = count( $this->_req_data['checkbox'] ) > 1 ? 'Price Types' : 'Price Type';
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
+			$what = count($this->_req_data['checkbox']) > 1 ? 'Price Types' : 'Price Type';
 			// cycle thru checkboxes
-			while (list( $PRT_ID, $value ) = each($this->_req_data['checkbox'])) {
-				if ( ! $PRT->update_by_ID(array('PRT_deleted' => $PRT_deleted), $PRT_ID ) ) {
+			while (list($PRT_ID, $value) = each($this->_req_data['checkbox'])) {
+				if ( ! $PRT->update_by_ID(array('PRT_deleted' => $PRT_deleted), $PRT_ID)) {
 					$success = 0;
 				}
 			}
 
 		} else {
 			// grab single id and delete
-			$PRT_ID = isset( $this->_req_data['id'] ) ? absint($this->_req_data['id']) : 0;
-			if ( empty( $PRT_ID ) || ! $PRT->update_by_ID(array('PRT_deleted' => $PRT_deleted), $PRT_ID )) {
+			$PRT_ID = isset($this->_req_data['id']) ? absint($this->_req_data['id']) : 0;
+			if (empty($PRT_ID) || ! $PRT->update_by_ID(array('PRT_deleted' => $PRT_deleted), $PRT_ID)) {
 				$success = 0;
 			}
 			$what = 'Price Type';
 
 		}
 
-		$query_args = array( 'action' => 'price_types' );
-		if ( $success ) {
-			if ( $trash ) {
+		$query_args = array('action' => 'price_types');
+		if ($success) {
+			if ($trash) {
 				$msg = $success > 1 ? __('The Price Types have been trashed.', 'event_espresso') : __('The Price Type has been trashed.', 'event_espresso');
 			} else {
 				$msg = $success > 1 ? __('The Price Types have been restored.', 'event_espresso') : __('The Price Type has been restored.', 'event_espresso');
 			}
-			EE_Error::add_success( $msg );
+			EE_Error::add_success($msg);
 		}
 
-		$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 
 	}
 
@@ -1215,19 +1215,19 @@ 
 	protected function _delete_price_type() {
 
 		//echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		$PRT = EEM_Price_Type::instance();
 
 		$success = 1;
 		//Checkboxes
-		if (!empty($this->_req_data['checkbox'])) {
+		if ( ! empty($this->_req_data['checkbox'])) {
 			// if array has more than one element than success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 			$what = $PRT->item_name($success);
 			// cycle thru bulk action checkboxes
-			while (list( $PRT_ID, $value ) = each($this->_req_data['checkbox'])) {
-				if (!$PRT->delete_permanently_by_ID($PRT_ID) ) {
+			while (list($PRT_ID, $value) = each($this->_req_data['checkbox'])) {
+				if ( ! $PRT->delete_permanently_by_ID($PRT_ID)) {
 					$success = 0;
 				}
 			}
@@ -1235,8 +1235,8 @@ 
 		}
 
 
-		$query_args = array( 'action'=> 'price_types' );
-		$this->_redirect_after_action( $success, $what, 'deleted', $query_args );
+		$query_args = array('action'=> 'price_types');
+		$this->_redirect_after_action($success, $what, 'deleted', $query_args);
 
 	}
 
@@ -1252,7 +1252,7 @@ 
 	*		@return string
 	*/
 	protected function _learn_more_about_pricing_link() {
-		return '<a class="hidden" style="margin:0 20px; cursor:pointer; font-size:12px;" >' . __('learn more about how pricing works', 'event_espresso') . '</a>';
+		return '<a class="hidden" style="margin:0 20px; cursor:pointer; font-size:12px;" >'.__('learn more about how pricing works', 'event_espresso').'</a>';
 	}
 
 

caffeinated/admin/new/pricing/templates/event_tickets_datetime_attached_tickets_row.template.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 				</table>
 				<div class="ee-editor-footer-container">
 					<div class="ee-editor-id-container">
-						<span class="ee-item-id"><?php echo $DTT_ID ? sprintf( esc_html__( 'Datetime ID: %d', 'event_espresso' ), $DTT_ID ) : ''; ?></span>
+						<span class="ee-item-id"><?php echo $DTT_ID ? sprintf(esc_html__('Datetime ID: %d', 'event_espresso'), $DTT_ID) : ''; ?></span>
 					</div>
 					<div class="save-cancel-button-container">
 						<button data-context="short-ticket" data-datetime-row="<?php echo $dtt_row; ?>" class="button-primary ee-create-button">

caffeinated/admin/new/pricing/templates/event_tickets_datetime_ticket_row.template.php

Spacing +16 added lines, -16 removed lines

@@ -3,7 +3,7 @@ 
 	<td class="ee-tkt-order-field"><span class="ee-status-strip-td ee-status-strip<?php echo $tkt_status_class; ?>"></span><input type="hidden" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_order]" class="edit-ticket-TKT_order" value ="<?php echo $TKT_order; ?>"></td>
 	<td><input maxlength="245" type="text" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_name]" class="edit-ticket-TKT_name ee-large-text-inp" placeholder="Ticket Title" value="<?php echo $TKT_name; ?>"></td>
 	<td>
-		<?php if ( $disabled ) : ?>
+		<?php if ($disabled) : ?>
 			<input type="hidden" id="edit-ticket-TKT_start_date-<?php echo $tkt_row; ?>"  name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_start_date]" class="edit-ticket-TKT_start_date ee-text-inp" value="<?php echo $TKT_start_date; ?>" >
 			<input type="text" name="archived_ticket[TKT_start_date]" class="edit-ticket-TKT_start_date ee-text-inp" value="<?php echo $TKT_start_date; ?>" disabled>
 		<?php else : ?>
@@ -11,7 +11,7 @@ 
 		<?php endif; ?>
 	</td>
 	<td>
-		<?php if ( $disabled ) : ?>
+		<?php if ($disabled) : ?>
 			<input type="hidden" id="edit-ticket-TKT_end_date-<?php echo $tkt_row; ?>"  name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_end_date]" class="edit-ticket-TKT_end_date ee-text-inp" value="<?php echo $TKT_end_date; ?>" >
 			<input type="text" name="archived_ticket[TKT_end_date]" class="edit-ticket-TKT_end_date ee-text-inp" value="<?php echo $TKT_end_date; ?>" disabled>
 		<?php else : ?>
@@ -19,7 +19,7 @@ 
 		<?php endif; ?>
 	</td>
 	<td>
-		<?php if ( $disabled ) : ?>
+		<?php if ($disabled) : ?>
 			<input id="edit-ticket-TKT_base_price-<?php echo $tkt_row; ?>" type="hidden" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_base_price]" class="edit-ticket-TKT_base_price ee-small-text-inp edit-price-PRC_amount ee-numeric" value="<?php echo $TKT_base_price; ?>">
 			<input type="text" name="archived_ticket[<?php echo $tkt_row; ?>][TKT_base_price]" class="edit-ticket-TKT_base_price ee-small-text-inp edit-price-PRC_amount ee-numeric" value="<?php echo $TKT_base_price; ?>" disabled>
 		<?php else : ?>
@@ -28,7 +28,7 @@ 
 		<input type="hidden" id="edit-ticket-TKT_base_price_ID-<?php echo $tkt_row; ?>" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_base_price_ID]" value="<?php echo $TKT_base_price_ID; ?>">
 	</td>
 	<td>
-		<?php if ( $disabled ) : ?>
+		<?php if ($disabled) : ?>
 			<input type="hidden" class="edit-ticket-TKT_qty ee-small-text-inp ee-numeric" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_qty]" value="<?php echo $TKT_qty_for_input; ?>">
 			<input type="text" class="edit-ticket-TKT_qty ee-small-text-inp ee-numeric" name="archived_ticket[<?php echo $tkt_row; ?>][TKT_qty]" value="<?php echo $TKT_qty_for_input; ?>" disabled>
 		<?php else : ?>
@@ -49,10 +49,10 @@ 
 			<input type="hidden" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_ID]" class="edit-ticket-TKT_ID" value="<?php echo $TKT_ID; ?>">
 			<input type="hidden" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_row]" class="edit-ticket-TKT_row" value="<?php echo $tkt_row; ?>">
 
-			<!--<div class="total-price-container"><?php printf( esc_html__('Total Final Price: %s', 'event_espresso'), '<span class="ticket-price-amount">' . $TKT_price . '</span>'); ?> </div>-->
+			<!--<div class="total-price-container"><?php printf(esc_html__('Total Final Price: %s', 'event_espresso'), '<span class="ticket-price-amount">'.$TKT_price.'</span>'); ?> </div>-->
 			<textarea name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_description]" class="edit-ticket-TKT_description ee-full-textarea-inp" placeholder="Ticket Description"><?php echo $TKT_description; ?></textarea>
 
-			<?php do_action( 'AHEE__event_tickets_datetime_ticket_row_template_after_desc', $tkt_row, $TKT_ID ); ?>
+			<?php do_action('AHEE__event_tickets_datetime_ticket_row_template_after_desc', $tkt_row, $TKT_ID); ?>
 
 			<div class="basic-ticket-container">
 				<h4 class="tickets-heading"><?php esc_html_e('Ticket Details', 'event_espresso'); ?></h4>
@@ -68,7 +68,7 @@ 
 					<tbody>
 						<tr>
 							<td>
-								<?php if ( $disabled ) : ?>
+								<?php if ($disabled) : ?>
 									<input type="hidden" class="edit-ticket-TKT_uses ee-small-text-inp ee-numeric" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_uses]" value="<?php echo $TKT_uses; ?>">
 									<input type="text" class="edit-ticket-TKT_uses ee-small-text-inp ee-numeric" name="archived_ticket[<?php echo $tkt_row; ?>][TKT_uses]" value="<?php echo $TKT_uses; ?>" disabled>
 								<?php else : ?>
@@ -76,7 +76,7 @@ 
 								<?php endif; ?>
 							</td>
 							<td>
-								<?php if ( $disabled ) : ?>
+								<?php if ($disabled) : ?>
 									<input type="hidden" class="edit-ticket-TKT_min ee-small-text-inp ee-numeric" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_min]" value="<?php echo $TKT_min; ?>">
 									<input type="text" class="edit-ticket-TKT_min ee-small-text-inp ee-numeric" name="archived_ticket[<?php echo $tkt_row; ?>][TKT_min]" value="<?php echo $TKT_min; ?>" disabled>
 								<?php else: ?>
@@ -84,7 +84,7 @@ 
 								<?php endif; ?>
 							</td>
 							<td>
-								<?php if ( $disabled ) : ?>
+								<?php if ($disabled) : ?>
 									<input type="hidden" class="edit-ticket-TKT_max ee-small-text-inp ee-numeric" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_max]" value="<?php echo $TKT_max; ?>">
 									<input type="text" class="edit-ticket-TKT_max ee-small-text-inp ee-numeric" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_max]" value="<?php echo $TKT_max; ?>" disabled>
 								<?php else : ?>
@@ -102,15 +102,15 @@ 
 					<label for="edit-ticket-TKT_required"><?php esc_html_e('This ticket is required (will appear first in frontend ticket lists).', 'event_espresso'); ?></label>
 				</div>
 				<div class="ticket-is-taxable-container">
-					<?php if ( !empty($tax_rows) ) { ?>
-						<?php if ( $disabled ) : ?>
+					<?php if ( ! empty($tax_rows)) { ?>
+						<?php if ($disabled) : ?>
 							<?php
-								$tax_value = !empty( $TKT_taxable ) ? 1 : 0;
+								$tax_value = ! empty($TKT_taxable) ? 1 : 0;
 							?>
-							<input class="TKT-taxable-checkbox" type="hidden" name="<?php echo $edit_tickets_name;?>[<?php echo $tkt_row; ?>][TKT_taxable]" value="<?php echo $tax_value; ?>">
+							<input class="TKT-taxable-checkbox" type="hidden" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_taxable]" value="<?php echo $tax_value; ?>">
 							<input class="TKT-taxable-checkbox" id="edit-ticket-TKT_taxable-<?php echo $tkt_row; ?>" type="checkbox" name="archived_ticket[<?php echo $tkt_row; ?>][TKT_taxable]" value="1"<?php echo $TKT_taxable; ?> disabled>
 						<?php else : ?>
-							<input class="TKT-taxable-checkbox" id="edit-ticket-TKT_taxable-<?php echo $tkt_row; ?>" type="checkbox" name="<?php echo $edit_tickets_name;?>[<?php echo $tkt_row; ?>][TKT_taxable]" value="1"<?php echo $TKT_taxable; ?>>
+							<input class="TKT-taxable-checkbox" id="edit-ticket-TKT_taxable-<?php echo $tkt_row; ?>" type="checkbox" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_taxable]" value="1"<?php echo $TKT_taxable; ?>>
 						<?php endif; ?>
 						<label for="edit-ticket-TKT_taxable-<?php echo $tkt_row; ?>"> <?php esc_html_e('This ticket is taxable.', 'event_espresso'); ?>
 					<?php } //end tax_rows check ?>
@@ -167,10 +167,10 @@ 
 				<?php echo $ticket_datetimes_list; ?>
 			</ul>
 
-			<?php do_action( 'AHEE__event_tickets_datetime_ticket_row_template__advanced_details_end', $tkt_row, $TKT_ID ); ?>
+			<?php do_action('AHEE__event_tickets_datetime_ticket_row_template__advanced_details_end', $tkt_row, $TKT_ID); ?>
 			<div class="ee-editor-footer-container">
 				<div class="ee-editor-id-container">
-					<span class="ee-item-id"><?php echo $TKT_ID ? sprintf( esc_html__( 'Ticket ID: %d', 'event_espresso' ), $TKT_ID ) : ''; ?></span>
+					<span class="ee-item-id"><?php echo $TKT_ID ? sprintf(esc_html__('Ticket ID: %d', 'event_espresso'), $TKT_ID) : ''; ?></span>
 				</div>
 				<div class="save-cancel-button-container">
 					<label for="edit-ticket-TKT_is_default_selector"><?php esc_html_e('use this new ticket as a default ticket for any new events', 'event_espresso'); ?></label>

admin_pages/messages/EE_Message_List_Table.class.php

Spacing +116 added lines, -116 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') ){
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('NO direct script access allowed');
 }
 /**
@@ -26,8 +26,8 @@ 
 
 
 	protected function _setup_data() {
-		$this->_data = $this->_get_messages( $this->_per_page, $this->_view );
-		$this->_all_data_count = $this->_get_messages( $this->_per_page, $this->_view, true );
+		$this->_data = $this->_get_messages($this->_per_page, $this->_view);
+		$this->_all_data_count = $this->_get_messages($this->_per_page, $this->_view, true);
 	}
 
 
@@ -35,32 +35,32 @@ 
 
 	protected function _set_properties() {
 		$this->_wp_list_args = array(
-			'singular' => __( 'Message', 'event_espresso' ),
-			'plural' => __( 'Messages', 'event_espresso' ),
+			'singular' => __('Message', 'event_espresso'),
+			'plural' => __('Messages', 'event_espresso'),
 			'ajax' => true,
 			'screen' => $this->get_admin_page()->get_current_screen()->id
 		);
 
 		$this->_columns = array(
 			'cb' => '<input type="checkbox" />',
-			'to' => __( 'To', 'event_espresso' ),
-			'from' => __( 'From', 'event_espresso' ),
-			'messenger' => __( 'Messenger', 'event_espresso' ),
-			'message_type' => __( 'Message Type', 'event_espresso' ),
-			'context' => __( 'Context', 'event_espresso' ),
-			'modified' => __( 'Modified', 'event_espresso' ),
-			'action' => __( 'Actions', 'event_espresso' ),
-			'msg_id' => __( 'ID', 'event_espresso' ),
+			'to' => __('To', 'event_espresso'),
+			'from' => __('From', 'event_espresso'),
+			'messenger' => __('Messenger', 'event_espresso'),
+			'message_type' => __('Message Type', 'event_espresso'),
+			'context' => __('Context', 'event_espresso'),
+			'modified' => __('Modified', 'event_espresso'),
+			'action' => __('Actions', 'event_espresso'),
+			'msg_id' => __('ID', 'event_espresso'),
 		);
 
 		$this->_sortable_columns = array(
-			'modified' => array( 'MSG_modified' => true ),
-			'message_type' => array( 'MSG_message_type' => false ),
-			'messenger' => array( 'MSG_messenger' => false ),
-			'to' => array( 'MSG_to' => false ),
-			'from' => array( 'MSG_from' => false ),
-			'context' => array( 'MSG_context' => false ),
-			'msg_id' => array( 'MSG_ID', false ),
+			'modified' => array('MSG_modified' => true),
+			'message_type' => array('MSG_message_type' => false),
+			'messenger' => array('MSG_messenger' => false),
+			'to' => array('MSG_to' => false),
+			'from' => array('MSG_from' => false),
+			'context' => array('MSG_context' => false),
+			'msg_id' => array('MSG_ID', false),
 		);
 
 		$this->_primary_column = 'to';
@@ -78,11 +78,11 @@ 
 	 * @param  object $item the current item
 	 * @return string
 	 */
-	protected function _get_row_class( $item ) {
-		$class = parent::_get_row_class( $item );
+	protected function _get_row_class($item) {
+		$class = parent::_get_row_class($item);
 		//add status class
-		$class .= ' ee-status-strip msg-status-' . $item->STS_ID();
-		if ( $this->_has_checkbox_column ) {
+		$class .= ' ee-status-strip msg-status-'.$item->STS_ID();
+		if ($this->_has_checkbox_column) {
 			$class .= ' has-checkbox-column';
 		}
 		return $class;
@@ -101,7 +101,7 @@ 
 	 */
 	protected function _get_table_filters() {
 		$filters = array();
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
+		EE_Registry::instance()->load_helper('Form_Fields');
 		//setup messengers for selects
 		$m_values = $this->get_admin_page()->get_messengers_for_list_table();
 		//lets do the same for message types
@@ -110,88 +110,88 @@ 
 		$contexts = $this->get_admin_page()->get_contexts_for_message_types_for_list_table();
 		$i = 1;
 		$labels = $c_values = array();
-		foreach ( $contexts as $context => $label ) {
+		foreach ($contexts as $context => $label) {
 			//some message types may have the same label for a different context, so we're grouping these together so the end user
 			//doesn't get confused.
-			if ( isset( $labels[ $label ] ) ) {
-				$c_values[ $labels[ $label ] ]['id'] .= ',' . $context;
+			if (isset($labels[$label])) {
+				$c_values[$labels[$label]]['id'] .= ','.$context;
 				continue;
 			}
-			$c_values[ $i ]['id'] = $context;
-			$c_values[ $i ]['text'] = $label;
-			$labels[ $label ] = $i;
+			$c_values[$i]['id'] = $context;
+			$c_values[$i]['text'] = $label;
+			$labels[$label] = $i;
 			$i++;
 		}
 
 		$msgr_default[0] = array(
 			'id' => 'none_selected',
-			'text' => __( 'All Messengers', 'event_espresso' )
+			'text' => __('All Messengers', 'event_espresso')
 		);
 
 		$mt_default[0] = array(
 			'id' => 'none_selected',
-			'text' => __( 'All Message Types', 'event_espresso' )
+			'text' => __('All Message Types', 'event_espresso')
 		);
 
 		$c_default[0] = array(
 			'id' => 'none_selected',
-			'text' => __( 'All Contexts', 'event_espresso' )
+			'text' => __('All Contexts', 'event_espresso')
 		);
 
-		$msgr_filters = count( $m_values ) > 1
-			? array_merge( $msgr_default, $m_values )
+		$msgr_filters = count($m_values) > 1
+			? array_merge($msgr_default, $m_values)
 			: $m_values;
-		$mt_filters = ! empty( $mt_values ) && count( $mt_values ) > 1
-			? array_merge( $mt_default, $mt_values )
+		$mt_filters = ! empty($mt_values) && count($mt_values) > 1
+			? array_merge($mt_default, $mt_values)
 			: (array) $mt_values;
-		$c_filters = ! empty( $c_values ) && count( $c_values ) > 1
-			? array_merge( $c_default, $c_values )
+		$c_filters = ! empty($c_values) && count($c_values) > 1
+			? array_merge($c_default, $c_values)
 			: (array) $c_values;
 
-		if ( empty( $msgr_filters ) ) {
+		if (empty($msgr_filters)) {
 			$msgr_filters[0] = array(
 				'id'   => 'none_selected',
-				'text' => __( 'No Messengers active', 'event_espresso' )
+				'text' => __('No Messengers active', 'event_espresso')
 			);
 		}
 
-		if ( empty( $mt_filters ) ) {
+		if (empty($mt_filters)) {
 			$mt_filters[0] = array(
 				'id'   => 'none_selected',
-				'text' => __( 'No Message Types active', 'event_espresso' )
+				'text' => __('No Message Types active', 'event_espresso')
 			);
 		}
 
-		if ( empty( $c_filters ) ) {
+		if (empty($c_filters)) {
 			$c_filters[0] = array(
 				'id'   => 'none_selected',
-				'text' => __( 'No Contexts (because no message types active)', 'event_espresso' )
+				'text' => __('No Contexts (because no message types active)', 'event_espresso')
 			);
 		}
 
-		if ( count ( $msgr_filters ) > 1 ) {
+		if (count($msgr_filters) > 1) {
 			$filters[] = EEH_Form_Fields::select_input(
 				'ee_messenger_filter_by',
-				array_values( $msgr_filters ),
-				isset( $this->_req_data['ee_messenger_filter_by'] )
-					? sanitize_title( $this->_req_data['ee_messenger_filter_by'] )
+				array_values($msgr_filters),
+				isset($this->_req_data['ee_messenger_filter_by'])
+					? sanitize_title($this->_req_data['ee_messenger_filter_by'])
 					: ''
 			);
 		}
-		if ( count( $mt_filters ) > 1 ) {
+		if (count($mt_filters) > 1) {
 		$filters[] = EEH_Form_Fields::select_input(
 				'ee_message_type_filter_by',
-				array_values( $mt_filters ),
-				isset( $this->_req_data['ee_message_type_filter_by'] ) ? sanitize_title(
+				array_values($mt_filters),
+				isset($this->_req_data['ee_message_type_filter_by']) ? sanitize_title(
 					$this->_req_data['ee_message_type_filter_by']
 				) : ''
 			);
 		}
-		if ( count( $c_filters ) > 1 ) {
+		if (count($c_filters) > 1) {
 			$filters[] = EEH_Form_Fields::select_input(
 				'ee_context_filter_by',
-				array_values( $c_filters ),
-				isset( $this->_req_data['ee_context_filter_by'] ) ? sanitize_text_field(
+				array_values($c_filters),
+				isset($this->_req_data['ee_context_filter_by']) ? sanitize_text_field(
 					$this->_req_data['ee_context_filter_by']
 				) : ''
 			);
@@ -202,8 +202,8 @@ 
 
 
 	protected function _add_view_counts() {
-		foreach ( $this->_views as $view => $args ) {
-			$this->_views[ $view ]['count'] = $this->_get_messages( $this->_per_page, $view, true, true );
+		foreach ($this->_views as $view => $args) {
+			$this->_views[$view]['count'] = $this->_get_messages($this->_per_page, $view, true, true);
 		}
 	}
 
@@ -214,8 +214,8 @@ 
 	 * @return string   checkbox
 	 * @throws \EE_Error
 	 */
-	public function column_cb( $message ) {
-		return sprintf( '<input type="checkbox" name="MSG_ID[%s]" value="1" />', $message->ID() );
+	public function column_cb($message) {
+		return sprintf('<input type="checkbox" name="MSG_ID[%s]" value="1" />', $message->ID());
 	}
 
 
@@ -225,7 +225,7 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function column_msg_id( EE_Message $message ) {
+	public function column_msg_id(EE_Message $message) {
 		return $message->ID();
 	}
 
@@ -236,8 +236,8 @@ 
 	 * @return string    The recipient of the message
 	 * @throws \EE_Error
 	 */
-	public function column_to( EE_Message $message ) {
-		EE_Registry::instance()->load_helper( 'URL' );
+	public function column_to(EE_Message $message) {
+		EE_Registry::instance()->load_helper('URL');
 		$actions = array();
 		$actions['delete'] = '<a href="'
 			. EEH_URL::add_query_args_and_nonce(
@@ -246,10 +246,10 @@ 
 					'action' => 'delete_ee_message',
 					'MSG_ID' => $message->ID()
 				),
-				admin_url( 'admin.php' )
+				admin_url('admin.php')
 			)
-			. '">' . __( 'Delete', 'event_espresso' ) . '</a>';
-		return $message->to() . $this->row_actions( $actions );
+			. '">'.__('Delete', 'event_espresso').'</a>';
+		return $message->to().$this->row_actions($actions);
 	}
 
 
@@ -257,7 +257,7 @@ 
 	 * @param EE_Message $message
 	 * @return string   The sender of the message
 	 */
-	public function column_from( EE_Message $message ) {
+	public function column_from(EE_Message $message) {
 		return $message->from();
 	}
 
@@ -267,8 +267,8 @@ 
 	 * @param EE_Message $message
 	 * @return string  The messenger used to send the message.
 	 */
-	public function column_messenger( EE_Message $message ) {
-		return ucwords( $message->messenger_label() );
+	public function column_messenger(EE_Message $message) {
+		return ucwords($message->messenger_label());
 	}
 
 
@@ -276,8 +276,8 @@ 
 	 * @param EE_Message $message
 	 * @return string  The message type used to generate the message.
 	 */
-	public function column_message_type( EE_Message $message ) {
-		return ucwords( $message->message_type_label() );
+	public function column_message_type(EE_Message $message) {
+		return ucwords($message->message_type_label());
 	}
 
 
@@ -285,7 +285,7 @@ 
 	 * @param EE_Message $message
 	 * @return string  The context the message was generated for.
 	 */
-	public function column_context( EE_Message $message ) {
+	public function column_context(EE_Message $message) {
 		return $message->context_label();
 	}
 
@@ -294,7 +294,7 @@ 
 	 * @param EE_Message $message
 	 * @return string    The timestamp when this message was last modified.
 	 */
-	public function column_modified( EE_Message $message ) {
+	public function column_modified(EE_Message $message) {
 		return $message->modified();
 	}
 
@@ -303,36 +303,36 @@ 
 	 * @param EE_Message $message
 	 * @return string   Actions that can be done on the current message.
 	 */
-	public function column_action( EE_Message $message ) {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+	public function column_action(EE_Message $message) {
+		EE_Registry::instance()->load_helper('MSG_Template');
 		$action_links = array(
-			'view' => EEH_MSG_Template::get_message_action_link( 'view', $message ),
-			'error' => EEH_MSG_Template::get_message_action_link( 'error', $message ),
-			'generate_now' => EEH_MSG_Template::get_message_action_link( 'generate_now', $message ),
-			'send_now' => EEH_MSG_Template::get_message_action_link( 'send_now', $message ),
-			'queue_for_resending' => EEH_MSG_Template::get_message_action_link( 'queue_for_resending', $message ),
-			'view_transaction' => EEH_MSG_Template::get_message_action_link( 'view_transaction', $message ),
+			'view' => EEH_MSG_Template::get_message_action_link('view', $message),
+			'error' => EEH_MSG_Template::get_message_action_link('error', $message),
+			'generate_now' => EEH_MSG_Template::get_message_action_link('generate_now', $message),
+			'send_now' => EEH_MSG_Template::get_message_action_link('send_now', $message),
+			'queue_for_resending' => EEH_MSG_Template::get_message_action_link('queue_for_resending', $message),
+			'view_transaction' => EEH_MSG_Template::get_message_action_link('view_transaction', $message),
 		);
 		$content = '';
-		switch ( $message->STS_ID() ) {
+		switch ($message->STS_ID()) {
 			case EEM_Message::status_sent :
-				$content = $action_links['view'] . $action_links['queue_for_resending'] . $action_links['view_transaction'];
+				$content = $action_links['view'].$action_links['queue_for_resending'].$action_links['view_transaction'];
 				break;
 			case EEM_Message::status_resend :
-				$content = $action_links['view'] . $action_links['send_now'] . $action_links['view_transaction'];
+				$content = $action_links['view'].$action_links['send_now'].$action_links['view_transaction'];
 				break;
 			case EEM_Message::status_retry :
-				$content = $action_links['view'] . $action_links['send_now'] . $action_links['error'] . $action_links['view_transaction'];
+				$content = $action_links['view'].$action_links['send_now'].$action_links['error'].$action_links['view_transaction'];
 				break;
 			case EEM_Message::status_failed :
 			case EEM_Message::status_debug_only :
-				$content = $action_links['error'] . $action_links['view_transaction'];
+				$content = $action_links['error'].$action_links['view_transaction'];
 				break;
 			case EEM_Message::status_idle :
-				$content = $action_links['view'] . $action_links['send_now'] . $action_links['view_transaction'];
+				$content = $action_links['view'].$action_links['send_now'].$action_links['view_transaction'];
 				break;
 			case EEM_Message::status_incomplete;
-				$content = $action_links['generate_now'] . $action_links['view_transaction'];
+				$content = $action_links['generate_now'].$action_links['view_transaction'];
 				break;
 		}
 		return $content;
@@ -350,54 +350,54 @@ 
 	 * @return int | EE_Message[]
 	 * @throws \EE_Error
 	 */
-	protected function _get_messages( $perpage = 10, $view = 'all', $count = false, $all = false ) {
+	protected function _get_messages($perpage = 10, $view = 'all', $count = false, $all = false) {
 
-		$current_page = isset( $this->_req_data['paged'] ) && ! empty( $this->_req_data['paged'] )
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged'])
 			? $this->_req_data['paged']
 			: 1;
 
-		$per_page = isset( $this->_req_data['perpage'] ) && ! empty( $this->_req_data['perpage'] )
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage'])
 			? $this->_req_data['perpage']
 			: $perpage;
 
-		$offset = ( $current_page - 1 ) * $per_page;
-		$limit = $all || $count ? null : array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = $all || $count ? null : array($offset, $per_page);
 		$query_params = array(
-			'order_by' => empty( $this->_req_data[ 'orderby' ] ) ? 'MSG_modified' : $this->_req_data[ 'orderby' ],
-			'order'    => empty( $this->_req_data[ 'order' ] ) ? 'DESC' : $this->_req_data[ 'order' ],
+			'order_by' => empty($this->_req_data['orderby']) ? 'MSG_modified' : $this->_req_data['orderby'],
+			'order'    => empty($this->_req_data['order']) ? 'DESC' : $this->_req_data['order'],
 			'limit'    => $limit,
 		);
 
 		/**
 		 * Any filters coming in from other routes?
 		 */
-		if ( isset( $this->_req_data['filterby'] ) ) {
-			$query_params = array_merge( $query_params, EEM_Message::instance()->filter_by_query_params() );
-			if ( ! $count ) {
+		if (isset($this->_req_data['filterby'])) {
+			$query_params = array_merge($query_params, EEM_Message::instance()->filter_by_query_params());
+			if ( ! $count) {
 				$query_params['group_by'] = 'MSG_ID';
 			}
 		}
 
 		//view conditionals
-		if ( $view !== 'all' && $count && $all ) {
+		if ($view !== 'all' && $count && $all) {
 			$query_params[0]['AND*view_conditional'] = array(
-				'STS_ID' => strtoupper( $view ),
+				'STS_ID' => strtoupper($view),
 			);
 		}
 
-		if ( ! $all && ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] !== 'all' ) {
+		if ( ! $all && ! empty($this->_req_data['status']) && $this->_req_data['status'] !== 'all') {
 			$query_params[0]['AND*view_conditional'] = array(
-				'STS_ID' => strtoupper( $this->_req_data['status'] ),
+				'STS_ID' => strtoupper($this->_req_data['status']),
 			);
 		}
 
-		if ( ! $all && ! empty( $this->_req_data['s'] ) ) {
-			$search_string = '%' . $this->_req_data['s'] . '%';
+		if ( ! $all && ! empty($this->_req_data['s'])) {
+			$search_string = '%'.$this->_req_data['s'].'%';
 			$query_params[0]['OR'] = array(
-				'MSG_to' => array( 'LIKE', $search_string ),
-				'MSG_from' => array( 'LIKE', $search_string ),
-				'MSG_subject' => array( 'LIKE', $search_string ),
-				'MSG_content' => array( 'LIKE', $search_string ),
+				'MSG_to' => array('LIKE', $search_string),
+				'MSG_from' => array('LIKE', $search_string),
+				'MSG_subject' => array('LIKE', $search_string),
+				'MSG_content' => array('LIKE', $search_string),
 			);
 		}
 
@@ -405,16 +405,16 @@ 
 		//the messages system is in debug mode.
 		//Note: for backward compat with previous iterations, this is necessary because there may be EEM_Message::status_debug_only
 		//messages in the database.
-		if ( ! EEM_Message::debug() ) {
+		if ( ! EEM_Message::debug()) {
 			$query_params[0]['AND*debug_only_conditional'] = array(
-				'STS_ID' => array( '!=', EEM_Message::status_debug_only )
+				'STS_ID' => array('!=', EEM_Message::status_debug_only)
 			);
 		}
 
 		//account for filters
 		if (
 			! $all
-			&& isset( $this->_req_data['ee_messenger_filter_by'] )
+			&& isset($this->_req_data['ee_messenger_filter_by'])
 			&& $this->_req_data['ee_messenger_filter_by'] !== 'none_selected'
 		) {
 			$query_params[0]['AND*messenger_filter'] = array(
@@ -423,7 +423,7 @@ 
 		}
 		if (
 			! $all
-			&& ! empty( $this->_req_data['ee_message_type_filter_by'] )
+			&& ! empty($this->_req_data['ee_message_type_filter_by'])
 			&& $this->_req_data['ee_message_type_filter_by'] !== 'none_selected'
 		) {
 			$query_params[0]['AND*message_type_filter'] = array(
@@ -433,17 +433,17 @@ 
 
 		if (
 			! $all
-			&& ! empty( $this->_req_data['ee_context_filter_by'] )
+			&& ! empty($this->_req_data['ee_context_filter_by'])
 			&& $this->_req_data['ee_context_filter_by'] !== 'none_selected'
 		) {
 			$query_params[0]['AND*context_filter'] = array(
-				'MSG_context' => array( 'IN', explode( ',', $this->_req_data['ee_context_filter_by'] ) )
+				'MSG_context' => array('IN', explode(',', $this->_req_data['ee_context_filter_by']))
 			);
 		}
 
 		return $count
-			? EEM_Message::instance()->count( $query_params, null, true )
-			: EEM_Message::instance()->get_all( $query_params );
+			? EEM_Message::instance()->count($query_params, null, true)
+			: EEM_Message::instance()->get_all($query_params);
 
 	}
 } //end EE_Message_List_Table class
\ No newline at end of file

caffeinated/admin/extend/events/Extend_Events_Admin_Page.core.php

Spacing +216 added lines, -216 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,25 +30,25 @@ 
 class Extend_Events_Admin_Page extends Events_Admin_Page {
 
 
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
-		define( 'EVENTS_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'events/templates/');
-		define( 'EVENTS_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND . 'events/assets/');
-		define( 'EVENTS_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'events/assets/');
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
+		define('EVENTS_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'events/templates/');
+		define('EVENTS_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND.'events/assets/');
+		define('EVENTS_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'events/assets/');
 	}
 
 
 	protected function _extend_page_config() {
 
-		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'events';
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'events';
 		$default_espresso_boxes = $this->_default_espresso_metaboxes;
 
 		//is there a evt_id in the request?
-		$evt_id = ! empty( $this->_req_data['EVT_ID'] ) && ! is_array( $this->_req_data['EVT_ID'] ) ? $this->_req_data['EVT_ID'] : 0;
-		$evt_id = ! empty( $this->_req_data['post'] ) ? $this->_req_data['post'] : $evt_id;
+		$evt_id = ! empty($this->_req_data['EVT_ID']) && ! is_array($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : 0;
+		$evt_id = ! empty($this->_req_data['post']) ? $this->_req_data['post'] : $evt_id;
 
 		//tkt_id?
-		$tkt_id = !empty( $this->_req_data['TKT_ID'] ) && ! is_array( $this->_req_data['TKT_ID'] ) ? $this->_req_data['TKT_ID'] : 0;
+		$tkt_id = ! empty($this->_req_data['TKT_ID']) && ! is_array($this->_req_data['TKT_ID']) ? $this->_req_data['TKT_ID'] : 0;
 
 		$new_page_routes = array(
 			'duplicate_event' => array(
@@ -66,13 +66,13 @@ 
 				'capability' => 'ee_delete_default_ticket',
 				'obj_id' => $tkt_id,
 				'noheader' => TRUE,
-				'args' => array( 'trash' => TRUE )
+				'args' => array('trash' => TRUE)
 				),
 			'trash_tickets' => array(
 				'func' => '_trash_or_restore_ticket',
 				'capability' => 'ee_delete_default_tickets',
 				'noheader' => TRUE,
-				'args' => array( 'trash' => TRUE )
+				'args' => array('trash' => TRUE)
 				),
 			'restore_ticket' => array(
 				'func' => '_trash_or_restore_ticket',
@@ -132,7 +132,7 @@ 
 				)
 			);
 
-		$this->_page_routes = array_merge( $this->_page_routes, $new_page_routes );
+		$this->_page_routes = array_merge($this->_page_routes, $new_page_routes);
 
 
 		//partial route/config override
@@ -144,8 +144,8 @@ 
 		$this->_page_config['default']['list_table'] = 'Extend_Events_Admin_List_Table';
 
 		//add tickets tab but only if there are more than one default ticket!
-		$tkt_count = EEM_Ticket::instance()->count_deleted_and_undeleted(array( array('TKT_is_default' => 1 ) ), 'TKT_ID', TRUE );
-		if ( $tkt_count > 1 ) {
+		$tkt_count = EEM_Ticket::instance()->count_deleted_and_undeleted(array(array('TKT_is_default' => 1)), 'TKT_ID', TRUE);
+		if ($tkt_count > 1) {
 			$new_page_config = array(
 				'ticket_list_table' => array(
 					'nav' => array(
@@ -164,14 +164,14 @@ 
 				'label' => esc_html__('Templates', 'event_espresso'),
 				'order' => 30
 			),
-			'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ),
+			'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 			'help_tabs' => array(
 				'general_settings_templates_help_tab' => array(
 					'title' => __('Templates', 'event_espresso'),
 					'filename' => 'general_settings_templates'
 				)
 			),
-			'help_tour' => array( 'Templates_Help_Tour' ),
+			'help_tour' => array('Templates_Help_Tour'),
 			'require_nonce' => FALSE
 		);
 
@@ -190,26 +190,26 @@ 
 //				'metaboxes' => $default_espresso_boxes,
 //				'require_nonce' => FALSE
 //		);
-		$this->_page_config = array_merge( $this->_page_config, $new_page_config );
+		$this->_page_config = array_merge($this->_page_config, $new_page_config);
 
 		//add filters and actions
 		//modifying _views
-		add_filter('FHEE_event_datetime_metabox_add_additional_date_time_template', array( $this, 'add_additional_datetime_button' ), 10, 2 );
-		add_filter('FHEE_event_datetime_metabox_clone_button_template', array( $this, 'add_datetime_clone_button' ), 10, 2 );
-		add_filter('FHEE_event_datetime_metabox_timezones_template', array( $this, 'datetime_timezones_template'), 10, 2 );
+		add_filter('FHEE_event_datetime_metabox_add_additional_date_time_template', array($this, 'add_additional_datetime_button'), 10, 2);
+		add_filter('FHEE_event_datetime_metabox_clone_button_template', array($this, 'add_datetime_clone_button'), 10, 2);
+		add_filter('FHEE_event_datetime_metabox_timezones_template', array($this, 'datetime_timezones_template'), 10, 2);
 
 
 		//filters for event list table
-		add_filter('FHEE__Extend_Events_Admin_List_Table__filters', array( $this, 'list_table_filters'), 10, 2);
-		add_filter('FHEE__Events_Admin_List_Table__column_actions__action_links', array( $this, 'extra_list_table_actions'), 10, 2 );
+		add_filter('FHEE__Extend_Events_Admin_List_Table__filters', array($this, 'list_table_filters'), 10, 2);
+		add_filter('FHEE__Events_Admin_List_Table__column_actions__action_links', array($this, 'extra_list_table_actions'), 10, 2);
 
 		//legend item
-		add_filter('FHEE__Events_Admin_Page___event_legend_items__items', array( $this, 'additional_legend_items') );
+		add_filter('FHEE__Events_Admin_Page___event_legend_items__items', array($this, 'additional_legend_items'));
 
-		add_action('admin_init', array( $this, 'admin_init') );
+		add_action('admin_init', array($this, 'admin_init'));
 
 		//heartbeat stuff
-		add_filter( 'heartbeat_received', array( $this, 'heartbeat_response' ), 10, 2 );
+		add_filter('heartbeat_received', array($this, 'heartbeat_response'), 10, 2);
 
 	}
 
@@ -222,12 +222,12 @@ 
 		EE_Registry::$i18n_js_strings = array_merge(
 			EE_Registry::$i18n_js_strings,
 			array(
-				'image_confirm'          => __( 'Do you really want to delete this image? Please remember to update your event to complete the removal.', 'event_espresso' ),
-				'event_starts_on'        => __( 'Event Starts on', 'event_espresso' ),
-				'event_ends_on'          => __( 'Event Ends on', 'event_espresso' ),
-				'event_datetime_actions' => __( 'Actions', 'event_espresso' ),
-				'event_clone_dt_msg'     => __( 'Clone this Event Date and Time', 'event_espresso' ),
-				'remove_event_dt_msg'    => __( 'Remove this Event Time', 'event_espresso' )
+				'image_confirm'          => __('Do you really want to delete this image? Please remember to update your event to complete the removal.', 'event_espresso'),
+				'event_starts_on'        => __('Event Starts on', 'event_espresso'),
+				'event_ends_on'          => __('Event Ends on', 'event_espresso'),
+				'event_datetime_actions' => __('Actions', 'event_espresso'),
+				'event_clone_dt_msg'     => __('Clone this Event Date and Time', 'event_espresso'),
+				'remove_event_dt_msg'    => __('Remove this Event Time', 'event_espresso')
 			)
 		);
 	}
@@ -242,12 +242,12 @@ 
 	 *
 	 * @return array  possibly appended response.
 	 */
-	public function heartbeat_response( $response, $data ) {
+	public function heartbeat_response($response, $data) {
 		/**
 		 * check whether count of tickets is approaching the potential
 		 * limits for the server.
 		 */
-		if ( ! empty( $data['input_count'] ) ) {
+		if ( ! empty($data['input_count'])) {
 			$response['max_input_vars_check'] = EE_Registry::instance()->CFG->environment->max_input_vars_limit_check($data['input_count']);
 		}
 
@@ -262,13 +262,13 @@ 
 
 
 
-	public function extra_permalink_field_buttons( $return, $id, $new_title, $new_slug ) {
-		$return = parent::extra_permalink_field_buttons( $return, $id, $new_title, $new_slug );
+	public function extra_permalink_field_buttons($return, $id, $new_title, $new_slug) {
+		$return = parent::extra_permalink_field_buttons($return, $id, $new_title, $new_slug);
 		//make sure this is only when editing
-		if ( !empty( $id ) ) {
-			$href = EE_Admin_Page::add_query_args_and_nonce( array('action' => 'duplicate_event', 'EVT_ID' => $id), $this->_admin_base_url );
+		if ( ! empty($id)) {
+			$href = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'duplicate_event', 'EVT_ID' => $id), $this->_admin_base_url);
 			$title = esc_attr__('Duplicate Event', 'event_espresso');
-			$return .= '<a href="' . $href . '" title="' . $title . '" id="ee-duplicate-event-button" class="button button-small"  value="duplicate_event">' . $title  . '</button>';
+			$return .= '<a href="'.$href.'" title="'.$title.'" id="ee-duplicate-event-button" class="button button-small"  value="duplicate_event">'.$title.'</button>';
 		}
 		return $return;
 	}
@@ -291,7 +291,7 @@ 
 				'label' => __('Trash', 'event_espresso'),
 				'count' => 0,
 				'bulk_action' => array(
-					'restore_tickets' => __('Restore from Trash' , 'event_espresso'),
+					'restore_tickets' => __('Restore from Trash', 'event_espresso'),
 					'delete_tickets' => __('Delete Permanently', 'event_espresso')
 					)
 				)
@@ -301,7 +301,7 @@ 
 
 
 	public function load_scripts_styles_edit() {
-		wp_register_script( 'ee-event-editor-heartbeat', EVENTS_CAF_ASSETS_URL . 'event-editor-heartbeat.js', array( 'ee_admin_js', 'heartbeat' ), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_register_script('ee-event-editor-heartbeat', EVENTS_CAF_ASSETS_URL.'event-editor-heartbeat.js', array('ee_admin_js', 'heartbeat'), EVENT_ESPRESSO_VERSION, TRUE);
 
 		/**
 		 * load accounting js.
@@ -320,20 +320,20 @@ 
 
 
 
-	public function add_additional_datetime_button( $template, $template_args ) {
-		return EEH_Template::display_template( EVENTS_CAF_TEMPLATE_PATH . 'event_datetime_add_additional_time.template.php', $template_args, TRUE);
+	public function add_additional_datetime_button($template, $template_args) {
+		return EEH_Template::display_template(EVENTS_CAF_TEMPLATE_PATH.'event_datetime_add_additional_time.template.php', $template_args, TRUE);
 	}
 
 
 
-	public function add_datetime_clone_button( $template, $template_args ) {
-		return EEH_Template::display_template( EVENTS_CAF_TEMPLATE_PATH . 'event_datetime_metabox_clone_button.template.php', $template_args, TRUE );
+	public function add_datetime_clone_button($template, $template_args) {
+		return EEH_Template::display_template(EVENTS_CAF_TEMPLATE_PATH.'event_datetime_metabox_clone_button.template.php', $template_args, TRUE);
 	}
 
 
 
-	public function datetime_timezones_template( $template, $template_args ) {
-		return EEH_Template::display_template( EVENTS_CAF_TEMPLATE_PATH . 'event_datetime_timezones.template.php', $template_args, TRUE );
+	public function datetime_timezones_template($template, $template_args) {
+		return EEH_Template::display_template(EVENTS_CAF_TEMPLATE_PATH.'event_datetime_timezones.template.php', $template_args, TRUE);
 	}
 
 
@@ -342,11 +342,11 @@ 
 	protected function _set_list_table_views_default() {
 		parent::_set_list_table_views_default();
 		$export_label = __('Export Events', 'event_espresso');
-		if ( EE_Registry::instance()->CAP->current_user_can( 'export', 'espresso_events_export' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('export', 'espresso_events_export')) {
 //			$this->_views['all']['bulk_action']['export_events'] = $export_label;
 //			$this->_views['draft']['bulk_action']['export_events'] = $export_label;
 
-			if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_events', 'espresso_events_trash_events' ) ) {
+			if (EE_Registry::instance()->CAP->current_user_can('ee_delete_events', 'espresso_events_trash_events')) {
 //				$this->_views['trash']['bulk_action']['export_events'] = $export_label;
 			}
 		}
@@ -372,7 +372,7 @@ 
 			)
 		);
 
-		$this->_views = array_merge( $this->_views, $new_views);
+		$this->_views = array_merge($this->_views, $new_views);
 	}
 
 
@@ -386,17 +386,17 @@ 
 
 
 
-	public function extra_list_table_actions( $actionlinks, $event ) {
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'espresso_registrations_reports', $event->ID() ) ) {
+	public function extra_list_table_actions($actionlinks, $event) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'espresso_registrations_reports', $event->ID())) {
 			$reports_query_args = array(
 					'action' => 'reports',
 					'EVT_ID' => $event->ID()
 				);
-			$reports_link = EE_Admin_Page::add_query_args_and_nonce( $reports_query_args, REG_ADMIN_URL );
-			$actionlinks[] = '<a href="' . $reports_link . '" title="' .  esc_attr__('View Report', 'event_espresso') . '"><div class="dashicons dashicons-chart-bar"></div></a>' . "\n\t";
+			$reports_link = EE_Admin_Page::add_query_args_and_nonce($reports_query_args, REG_ADMIN_URL);
+			$actionlinks[] = '<a href="'.$reports_link.'" title="'.esc_attr__('View Report', 'event_espresso').'"><div class="dashicons dashicons-chart-bar"></div></a>'."\n\t";
 		}
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_global_messages', 'view_filtered_messages' ) ) {
-			EE_Registry::instance()->load_helper( 'MSG_Template' );
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_global_messages', 'view_filtered_messages')) {
+			EE_Registry::instance()->load_helper('MSG_Template');
 			$actionlinks[] = EEH_MSG_Template::get_message_action_link(
 				'see_notifications_for',
 				null,
@@ -411,15 +411,15 @@ 
 
 
 	public function additional_legend_items($items) {
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'espresso_registrations_reports' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'espresso_registrations_reports')) {
 			$items['reports'] = array(
 					'class' => 'dashicons dashicons-chart-bar',
 					'desc' => __('Event Reports', 'event_espresso')
 				);
 		}
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_global_messages', 'view_filtered_messages' ) ) {
-			$related_for_icon = EEH_MSG_Template::get_message_action_icon( 'see_notifications_for' );
-			if ( isset( $related_for_icon['css_class']) && isset( $related_for_icon['label'] ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_global_messages', 'view_filtered_messages')) {
+			$related_for_icon = EEH_MSG_Template::get_message_action_icon('see_notifications_for');
+			if (isset($related_for_icon['css_class']) && isset($related_for_icon['label'])) {
 				$items['view_related_messages'] = array(
 					'class' => $related_for_icon['css_class'],
 					'desc' => $related_for_icon['label'],
@@ -444,17 +444,17 @@ 
 	 */
 	protected function _duplicate_event() {
 		//first make sure the ID for the event is in the request.  If it isnt' then we need to bail and redirect back to overview list table (cause how did we get here?)
-		if ( !isset( $this->_req_data['EVT_ID'] ) ) {
-			EE_Error::add_error( __('In order to duplicate an event an Event ID is required.  None was given.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
-			$this->_redirect_after_action( FALSE, '', '', array(), TRUE );
+		if ( ! isset($this->_req_data['EVT_ID'])) {
+			EE_Error::add_error(__('In order to duplicate an event an Event ID is required.  None was given.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
+			$this->_redirect_after_action(FALSE, '', '', array(), TRUE);
 			return;
 		}
 
 		//k we've got EVT_ID so let's use that to get the event we'll duplicate
-		$orig_event = EEM_Event::instance()->get_one_by_ID( $this->_req_data['EVT_ID'] );
+		$orig_event = EEM_Event::instance()->get_one_by_ID($this->_req_data['EVT_ID']);
 
-		if ( ! $orig_event instanceof EE_Event )
-			throw new EE_Error( sprintf( __('An EE_Event object could not be retrieved for the given ID (%s)', 'event_espresso'), $this->_req_data['EVT_ID'] ) );
+		if ( ! $orig_event instanceof EE_Event)
+			throw new EE_Error(sprintf(__('An EE_Event object could not be retrieved for the given ID (%s)', 'event_espresso'), $this->_req_data['EVT_ID']));
 
 		//k now let's clone the $orig_event before getting relations
 		$new_event = clone $orig_event;
@@ -467,43 +467,43 @@ 
 
 
 		//reset the ID and modify other details to make it clear this is a dupe
-		$new_event->set( 'EVT_ID', 0 );
-		$new_name = $new_event->name() . ' ' . __('**DUPLICATE**', 'event_espresso');
-		$new_event->set( 'EVT_name',  $new_name );
-		$new_event->set( 'EVT_slug',  wp_unique_post_slug( sanitize_title( $orig_event->name() ), 0, 'publish', 'espresso_events', 0 ) );
-		$new_event->set( 'status', 'draft' );
+		$new_event->set('EVT_ID', 0);
+		$new_name = $new_event->name().' '.__('**DUPLICATE**', 'event_espresso');
+		$new_event->set('EVT_name', $new_name);
+		$new_event->set('EVT_slug', wp_unique_post_slug(sanitize_title($orig_event->name()), 0, 'publish', 'espresso_events', 0));
+		$new_event->set('status', 'draft');
 
 		//duplicate discussion settings
-		$new_event->set( 'comment_status', $orig_event->get('comment_status') );
-		$new_event->set( 'ping_status', $orig_event->get( 'ping_status' ) );
+		$new_event->set('comment_status', $orig_event->get('comment_status'));
+		$new_event->set('ping_status', $orig_event->get('ping_status'));
 
 		//save the new event
 		$new_event->save();
 
 		//venues
-		foreach( $orig_ven as $ven ) {
-			$new_event->_add_relation_to( $ven, 'Venue' );
+		foreach ($orig_ven as $ven) {
+			$new_event->_add_relation_to($ven, 'Venue');
 		}
 		$new_event->save();
 
 
 		//now we need to get the question group relations and handle that
 		//first primary question groups
-		$orig_primary_qgs = $orig_event->get_many_related('Question_Group', array( array('Event_Question_Group.EQG_primary' => 1 ) ) );
-		if ( !empty( $orig_primary_qgs ) ) {
-			foreach ( $orig_primary_qgs as $id => $obj ) {
-				if ( $obj instanceof EE_Question_Group ) {
-					$new_event->_add_relation_to( $obj, 'Question_Group', array( 'EQG_primary' => 1 ) );
+		$orig_primary_qgs = $orig_event->get_many_related('Question_Group', array(array('Event_Question_Group.EQG_primary' => 1)));
+		if ( ! empty($orig_primary_qgs)) {
+			foreach ($orig_primary_qgs as $id => $obj) {
+				if ($obj instanceof EE_Question_Group) {
+					$new_event->_add_relation_to($obj, 'Question_Group', array('EQG_primary' => 1));
 				}
 			}
 		}
 
 		//next additional attendee question groups
-		$orig_additional_qgs = $orig_event->get_many_related('Question_Group', array( array('Event_Question_Group.EQG_primary' => 0 ) ) );
-		if ( !empty( $orig_additional_qgs ) ) {
-			foreach ( $orig_additional_qgs as $id => $obj ) {
-				if ( $obj instanceof EE_Question_Group ) {
-					$new_event->_add_relation_to( $obj, 'Question_Group', array( 'EQG_primary' => 0 ) );
+		$orig_additional_qgs = $orig_event->get_many_related('Question_Group', array(array('Event_Question_Group.EQG_primary' => 0)));
+		if ( ! empty($orig_additional_qgs)) {
+			foreach ($orig_additional_qgs as $id => $obj) {
+				if ($obj instanceof EE_Question_Group) {
+					$new_event->_add_relation_to($obj, 'Question_Group', array('EQG_primary' => 0));
 				}
 			}
 		}
@@ -514,7 +514,7 @@ 
 
 		//k now that we have the new event saved we can loop through the datetimes and start adding relations.
 		$cloned_tickets = array();
-		foreach ( $orig_datetimes as $orig_dtt ) {
+		foreach ($orig_datetimes as $orig_dtt) {
 			$new_dtt = clone $orig_dtt;
 			$orig_tkts = $orig_dtt->tickets();
 
@@ -522,22 +522,22 @@ 
 			$new_dtt->set('DTT_ID', 0);
 			$new_dtt->set('DTT_sold', 0);
 			$new_dtt->save();
-			$new_event->_add_relation_to( $new_dtt, 'Datetime');
+			$new_event->_add_relation_to($new_dtt, 'Datetime');
 			$new_event->save();
 
 			//now let's get the ticket relations setup.
-			foreach ( (array) $orig_tkts as $orig_tkt ) {
+			foreach ((array) $orig_tkts as $orig_tkt) {
 				//it's possible a datetime will have no tickets so let's verify we HAVE a ticket first.
-				if ( ! $orig_tkt instanceof EE_Ticket )
+				if ( ! $orig_tkt instanceof EE_Ticket)
 					continue;
 
 				//is this ticket archived?  If it is then let's skip
-				if ( $orig_tkt->get( 'TKT_deleted' ) ) {
+				if ($orig_tkt->get('TKT_deleted')) {
 					continue;
 				}
 
 				//does this original ticket already exist in the clone_tickets cache?  If so we'll just use the new ticket from it.
-				if ( isset( $cloned_tickets[$orig_tkt->ID()] ) ) {
+				if (isset($cloned_tickets[$orig_tkt->ID()])) {
 					$new_tkt = $cloned_tickets[$orig_tkt->ID()];
 				} else {
 					$new_tkt = clone $orig_tkt;
@@ -549,7 +549,7 @@ 
 					$new_tkt->save(); //make sure new ticket has ID.
 
 					//price relations on new ticket need to be setup.
-					foreach ( $orig_prices as $orig_price ) {
+					foreach ($orig_prices as $orig_price) {
 						$new_price = clone $orig_price;
 						$new_price->set('PRC_ID', 0);
 						$new_price->save();
@@ -566,39 +566,39 @@ 
 		}
 
 		//clone taxonomy information
-		$taxonomies_to_clone_with = apply_filters( 'FHEE__Extend_Events_Admin_Page___duplicate_event__taxonomies_to_clone', array( 'espresso_event_categories', 'espresso_event_type', 'post_tag' ) );
+		$taxonomies_to_clone_with = apply_filters('FHEE__Extend_Events_Admin_Page___duplicate_event__taxonomies_to_clone', array('espresso_event_categories', 'espresso_event_type', 'post_tag'));
 
 		//get terms for original event (notice)
-		$orig_terms = wp_get_object_terms( $orig_event->ID(), $taxonomies_to_clone_with );
+		$orig_terms = wp_get_object_terms($orig_event->ID(), $taxonomies_to_clone_with);
 
 		//loop through terms and add them to new event.
-		foreach ( $orig_terms as $term ) {
-			wp_set_object_terms( $new_event->ID(), $term->term_id, $term->taxonomy, true );
+		foreach ($orig_terms as $term) {
+			wp_set_object_terms($new_event->ID(), $term->term_id, $term->taxonomy, true);
 		}
 
 
-		do_action( 'AHEE__Extend_Events_Admin_Page___duplicate_event__after', $new_event, $orig_event );
+		do_action('AHEE__Extend_Events_Admin_Page___duplicate_event__after', $new_event, $orig_event);
 
 		//now let's redirect to the edit page for this duplicated event if we have a new event id.
-		if ( $new_event->ID() ) {
+		if ($new_event->ID()) {
 			$redirect_args = array(
 				'post' => $new_event->ID(),
 				'action' => 'edit'
 			);
-			EE_Error::add_success( __('Event successfully duplicated.  Please review the details below and make any necessary edits', 'event_espresso') );
+			EE_Error::add_success(__('Event successfully duplicated.  Please review the details below and make any necessary edits', 'event_espresso'));
 		} else {
 			$redirect_args = array(
 				'action' => 'default'
 				);
-			EE_Error::add_error( __('Not able to duplicate event.  Something went wrong.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('Not able to duplicate event.  Something went wrong.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 
-		$this->_redirect_after_action(FALSE, '', '', $redirect_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $redirect_args, TRUE);
 	}
 
 
 
-	protected function _import_page(){
+	protected function _import_page() {
 
 		$title = __('Import', 'event_espresso');
 		$intro = __('If you have a previously exported Event Espresso 4 information in a Comma Separated Value (CSV) file format, you can upload the file here: ', 'event_espresso');
@@ -606,8 +606,8 @@ 
 		$action = 'import_events';
 		$type = 'csv';
 		$this->_template_args['form'] = EE_Import::instance()->upload_form($title, $intro, $form_url, $action, $type);
-		$this->_template_args['sample_file_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'sample_export_file'),$this->_admin_base_url);
-		$content = EEH_Template::display_template(EVENTS_CAF_TEMPLATE_PATH . 'import_page.template.php',$this->_template_args,true);
+		$this->_template_args['sample_file_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'sample_export_file'), $this->_admin_base_url);
+		$content = EEH_Template::display_template(EVENTS_CAF_TEMPLATE_PATH.'import_page.template.php', $this->_template_args, true);
 
 
 		$this->_template_args['admin_page_content'] = $content;
@@ -620,9 +620,9 @@ 
 	 * @return string html
 	 */
 	protected function _import_events() {
-		require_once(EE_CLASSES . 'EE_Import.class.php');
+		require_once(EE_CLASSES.'EE_Import.class.php');
 		$success = EE_Import::instance()->import();
-		$this->_redirect_after_action($success, 'Import File', 'ran', array('action' => 'import_page'),true);
+		$this->_redirect_after_action($success, 'Import File', 'ran', array('action' => 'import_page'), true);
 
 	}
 
@@ -636,23 +636,23 @@ 
 	 * @return file
 	 */
 	protected function _events_export() {
-		if(isset($this->_req_data['EVT_ID'])){
+		if (isset($this->_req_data['EVT_ID'])) {
 			$event_ids = $this->_req_data['EVT_ID'];
-		}elseif(isset($this->_req_data['EVT_IDs'])){
+		}elseif (isset($this->_req_data['EVT_IDs'])) {
 			$event_ids = $this->_req_data['EVT_IDs'];
-		}else{
+		} else {
 			$event_ids = NULL;
 		}
 		//todo: I don't like doing this but it'll do until we modify EE_Export Class.
 		$new_request_args = array(
 			'export' => 'report',
 			'action' => 'all_event_data',
-			'EVT_ID' => $event_ids ,
+			'EVT_ID' => $event_ids,
 		);
 		$this->_req_data = array_merge($this->_req_data, $new_request_args);
 
-		if ( is_readable(EE_CLASSES . 'EE_Export.class.php')) {
-			require_once(EE_CLASSES . 'EE_Export.class.php');
+		if (is_readable(EE_CLASSES.'EE_Export.class.php')) {
+			require_once(EE_CLASSES.'EE_Export.class.php');
 			$EE_Export = EE_Export::instance($this->_req_data);
 			$EE_Export->export();
 		}
@@ -674,11 +674,11 @@ 
 			'category_ids' => $this->_req_data['EVT_CAT_ID']
 			);
 
-		$this->_req_data = array_merge( $this->_req_data, $new_request_args );
+		$this->_req_data = array_merge($this->_req_data, $new_request_args);
 
-		if ( is_readable( EE_CLASSES . 'EE_Export.class.php') ) {
-			require_once( EE_CLASSES . 'EE_Export.class.php');
-			$EE_Export = EE_Export::instance( $this->_req_data );
+		if (is_readable(EE_CLASSES.'EE_Export.class.php')) {
+			require_once(EE_CLASSES.'EE_Export.class.php');
+			$EE_Export = EE_Export::instance($this->_req_data);
 			$EE_Export->export();
 		}
 
@@ -689,7 +689,7 @@ 
 	/**
 	 * Creates a sample CSV file for importing
 	 */
-	protected function _sample_export_file(){
+	protected function _sample_export_file() {
 //		require_once(EE_CLASSES . 'EE_Export.class.php');
 		EE_Export::instance()->export_sample();
 	}
@@ -706,10 +706,10 @@ 
 		 * Note leaving this filter in for backward compatibility this was moved in 4.6.x
 		 * from General_Settings_Admin_Page to here.
 		 */
-		$this->_template_args = apply_filters( 'FHEE__General_Settings_Admin_Page__template_settings__template_args', $this->_template_args );
-		$this->_set_add_edit_form_tags( 'update_template_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( EVENTS_CAF_TEMPLATE_PATH . 'template_settings.template.php', $this->_template_args, TRUE );
+		$this->_template_args = apply_filters('FHEE__General_Settings_Admin_Page__template_settings__template_args', $this->_template_args);
+		$this->_set_add_edit_form_tags('update_template_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(EVENTS_CAF_TEMPLATE_PATH.'template_settings.template.php', $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
 	}
 
@@ -721,24 +721,24 @@ 
 		 * Note leaving this filter in for backward compatibility this was moved in 4.6.x
 		 * from General_Settings_Admin_Page to here.
 		 */
-		EE_Registry::instance()->CFG->template_settings = apply_filters( 'FHEE__General_Settings_Admin_Page__update_template_settings__data', EE_Registry::instance()->CFG->template_settings, $this->_req_data );
+		EE_Registry::instance()->CFG->template_settings = apply_filters('FHEE__General_Settings_Admin_Page__update_template_settings__data', EE_Registry::instance()->CFG->template_settings, $this->_req_data);
 
 
 		//update custom post type slugs and detect if we need to flush rewrite rules
 		$old_slug = EE_Registry::instance()->CFG->core->event_cpt_slug;
-		EE_Registry::instance()->CFG->core->event_cpt_slug = empty( $this->_req_data['event_cpt_slug'] ) ? EE_Registry::instance()->CFG->core->event_cpt_slug : sanitize_title_with_dashes( $this->_req_data['event_cpt_slug'] );
+		EE_Registry::instance()->CFG->core->event_cpt_slug = empty($this->_req_data['event_cpt_slug']) ? EE_Registry::instance()->CFG->core->event_cpt_slug : sanitize_title_with_dashes($this->_req_data['event_cpt_slug']);
 
 
 		$what = 'Template Settings';
-		$success = $this->_update_espresso_configuration( $what, EE_Registry::instance()->CFG->template_settings, __FILE__, __FUNCTION__, __LINE__ );
+		$success = $this->_update_espresso_configuration($what, EE_Registry::instance()->CFG->template_settings, __FILE__, __FUNCTION__, __LINE__);
 
 
-		if ( EE_Registry::instance()->CFG->core->event_cpt_slug != $old_slug ) {
-			update_option( 'ee_flush_rewrite_rules', true );
+		if (EE_Registry::instance()->CFG->core->event_cpt_slug != $old_slug) {
+			update_option('ee_flush_rewrite_rules', true);
 		}
 
 
-		$this->_redirect_after_action( $success, $what, 'updated', array( 'action' => 'template_settings' ) );
+		$this->_redirect_after_action($success, $what, 'updated', array('action' => 'template_settings'));
 
 	}
 
@@ -756,7 +756,7 @@ 
 
 		$this->verify_cpt_object();
 
-		add_meta_box('espresso_event_editor_event_options', __('Event Registration Options', 'event_espresso'), array( $this, 'registration_options_meta_box' ), $this->page_slug, 'side', 'core');
+		add_meta_box('espresso_event_editor_event_options', __('Event Registration Options', 'event_espresso'), array($this, 'registration_options_meta_box'), $this->page_slug, 'side', 'core');
 		//add_meta_box('espresso_event_types', __('Event Type', 'event_espresso'), array( $this, 'event_type_meta_box' ), $this->page_slug, 'side', 'default' ); //add this back in when the feature is ready.
 
 		//todo feature in progress
@@ -780,16 +780,16 @@ 
 			array('id' => true, 'text' => __('Yes', 'event_espresso')),
 			array('id' => false, 'text' => __('No', 'event_espresso'))
 		);
-		$default_reg_status_values = EEM_Registration::reg_status_array(array(EEM_Registration::status_id_cancelled, EEM_Registration::status_id_declined, EEM_Registration::status_id_incomplete ), TRUE);
+		$default_reg_status_values = EEM_Registration::reg_status_array(array(EEM_Registration::status_id_cancelled, EEM_Registration::status_id_declined, EEM_Registration::status_id_incomplete), TRUE);
 		$template_args['active_status'] = $this->_cpt_model_obj->pretty_active_status(FALSE);
 		$template_args['_event'] = $this->_cpt_model_obj;
 		$template_args['additional_limit'] = $this->_cpt_model_obj->additional_limit();
 		$template_args['default_registration_status'] = EEH_Form_Fields::select_input('default_reg_status', $default_reg_status_values, $this->_cpt_model_obj->default_registration_status());
 		$template_args['display_description'] = EEH_Form_Fields::select_input('display_desc', $yes_no_values, $this->_cpt_model_obj->display_description());
 		$template_args['display_ticket_selector'] = EEH_Form_Fields::select_input('display_ticket_selector', $yes_no_values, $this->_cpt_model_obj->display_ticket_selector(), '', '', false);
-		$template_args['EVT_default_registration_status'] = EEH_Form_Fields::select_input('EVT_default_registration_status', $default_reg_status_values, $this->_cpt_model_obj->default_registration_status() );
-		$template_args['additional_registration_options'] = apply_filters( 'FHEE__Events_Admin_Page__registration_options_meta_box__additional_registration_options', '', $template_args, $yes_no_values, $default_reg_status_values );
-		$templatepath = EVENTS_CAF_TEMPLATE_PATH . 'event_registration_options.template.php';
+		$template_args['EVT_default_registration_status'] = EEH_Form_Fields::select_input('EVT_default_registration_status', $default_reg_status_values, $this->_cpt_model_obj->default_registration_status());
+		$template_args['additional_registration_options'] = apply_filters('FHEE__Events_Admin_Page__registration_options_meta_box__additional_registration_options', '', $template_args, $yes_no_values, $default_reg_status_values);
+		$templatepath = EVENTS_CAF_TEMPLATE_PATH.'event_registration_options.template.php';
 		EEH_Template::display_template($templatepath, $template_args);
 	}
 
@@ -802,9 +802,9 @@ 
 	 * @param  array  $box  metabox args
 	 * @return string       metabox contents
 	 */
-	public function event_type_meta_box( $post, $box ) {
-		$template_args['radio_list'] = $this->wp_terms_radio($post->ID, array( 'taxonomy' => 'espresso_event_type' ) );
-		$template = EVENTS_CAF_TEMPLATE_PATH . 'event_type_metabox_contents.template.php';
+	public function event_type_meta_box($post, $box) {
+		$template_args['radio_list'] = $this->wp_terms_radio($post->ID, array('taxonomy' => 'espresso_event_type'));
+		$template = EVENTS_CAF_TEMPLATE_PATH.'event_type_metabox_contents.template.php';
 		EEH_Template::display_template($template, $template_args);
 	}
 
@@ -814,7 +814,7 @@ 
 
 
 
-	public function wp_terms_radio( $post_id = 0, $args = array() ) {
+	public function wp_terms_radio($post_id = 0, $args = array()) {
 		$defaults = array(
 			'descendants_and_self' => 0,
 			'selected_cats' => false,
@@ -823,11 +823,11 @@ 
 			'taxonomy' => 'category',
 			'checked_ontop' => true
 		);
-		$args = apply_filters( 'wp_terms_checklist_args', $args, $post_id );
+		$args = apply_filters('wp_terms_checklist_args', $args, $post_id);
 
-		extract( wp_parse_args($args, $defaults), EXTR_SKIP );
+		extract(wp_parse_args($args, $defaults), EXTR_SKIP);
 
-		if ( empty($walker) || !is_a($walker, 'Walker') )
+		if (empty($walker) || ! is_a($walker, 'Walker'))
 			$walker = new Walker_Radio_Checklist;
 
 		$descendants_and_self = (int) $descendants_and_self;
@@ -835,37 +835,37 @@ 
 		$args = array('taxonomy' => $taxonomy);
 
 		$tax = get_taxonomy($taxonomy);
-		$args['disabled'] = !current_user_can($tax->cap->assign_terms);
+		$args['disabled'] = ! current_user_can($tax->cap->assign_terms);
 
-		if ( is_array( $selected_cats ) )
+		if (is_array($selected_cats))
 			$args['selected_cats'] = $selected_cats;
-		elseif ( $post_id )
+		elseif ($post_id)
 			$args['selected_cats'] = wp_get_object_terms($post_id, $taxonomy, array_merge($args, array('fields' => 'ids')));
 		else
 			$args['selected_cats'] = array();
 
-		if ( is_array( $popular_cats ) )
+		if (is_array($popular_cats))
 			$args['popular_cats'] = $popular_cats;
 		else
-			$args['popular_cats'] = get_terms( $taxonomy, array( 'fields' => 'ids', 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) );
+			$args['popular_cats'] = get_terms($taxonomy, array('fields' => 'ids', 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false));
 
-		if ( $descendants_and_self ) {
-			$categories = (array) get_terms($taxonomy, array( 'child_of' => $descendants_and_self, 'hierarchical' => 0, 'hide_empty' => 0 ) );
-			$self = get_term( $descendants_and_self, $taxonomy );
-			array_unshift( $categories, $self );
+		if ($descendants_and_self) {
+			$categories = (array) get_terms($taxonomy, array('child_of' => $descendants_and_self, 'hierarchical' => 0, 'hide_empty' => 0));
+			$self = get_term($descendants_and_self, $taxonomy);
+			array_unshift($categories, $self);
 		} else {
 			$categories = (array) get_terms($taxonomy, array('get' => 'all'));
 		}
 
-		if ( $checked_ontop ) {
+		if ($checked_ontop) {
 			// Post process $categories rather than adding an exclude to the get_terms() query to keep the query the same across all posts (for any query cache)
 			$checked_categories = array();
-			$keys = array_keys( $categories );
+			$keys = array_keys($categories);
 
-			foreach( $keys as $k ) {
-				if ( in_array( $categories[$k]->term_id, $args['selected_cats'] ) ) {
+			foreach ($keys as $k) {
+				if (in_array($categories[$k]->term_id, $args['selected_cats'])) {
 					$checked_categories[] = $categories[$k];
-					unset( $categories[$k] );
+					unset($categories[$k]);
 				}
 			}
 
@@ -890,18 +890,18 @@ 
 	 * @param  array  $list_table_obj the list table object
 	 * @return array                  new filters
 	 */
-	public function list_table_filters( $oldfilters, $list_table_obj ) {
+	public function list_table_filters($oldfilters, $list_table_obj) {
 		$filters = array();
 
 		//first month/year filters
 		$filters[] = $this->espresso_event_months_dropdown();
 
 
-		$status = isset( $this->_req_data['status'] ) ? $this->_req_data['status'] : NULL;
+		$status = isset($this->_req_data['status']) ? $this->_req_data['status'] : NULL;
 
 		//active status dropdown
-		if ( $status !== 'draft' )
-			$filter[] = $this->active_status_dropdown( isset( $this->_req_data['active_status'] ) ? $this->_req_data['active_status'] : '' );
+		if ($status !== 'draft')
+			$filter[] = $this->active_status_dropdown(isset($this->_req_data['active_status']) ? $this->_req_data['active_status'] : '');
 
 		//category filter
 		$filters[] = $this->category_dropdown();
@@ -923,17 +923,17 @@ 
 	 */
 	public function espresso_event_months_dropdown() {
 		//what we need to do is get all PRIMARY datetimes for all events to filter on. Note we need to include any other filters that are set!
-		$status = isset( $this->_req_data['status'] ) ? $this->_req_data['status'] : NULL;
+		$status = isset($this->_req_data['status']) ? $this->_req_data['status'] : NULL;
 
 		//categories?
-		$category = isset( $this->_req_data['EVT_CAT'] ) && $this->_req_data['EVT_CAT'] > 0 ? $this->_req_data['EVT_CAT'] : NULL;
+		$category = isset($this->_req_data['EVT_CAT']) && $this->_req_data['EVT_CAT'] > 0 ? $this->_req_data['EVT_CAT'] : NULL;
 
 		//active status?
-		$active_status = isset( $this->_req_data['active_status'] ) ? $this->_req_data['active_status'] : NULL;
+		$active_status = isset($this->_req_data['active_status']) ? $this->_req_data['active_status'] : NULL;
 
 		$cur_date = isset($this->_req_data['month_range']) ? $this->_req_data['month_range'] : '';
 
-		return EEH_Form_Fields::generate_event_months_dropdown( $cur_date, $status, $category, $active_status );
+		return EEH_Form_Fields::generate_event_months_dropdown($cur_date, $status, $category, $active_status);
 	}
 
 
@@ -944,12 +944,12 @@ 
 	 * @param  string $current_value whatever the ucrrent active status is
 	 * @return string                html dropdown.
 	 */
-	public function  active_status_dropdown( $current_value = '' ) {
+	public function  active_status_dropdown($current_value = '') {
 		$select_name = 'active_status';
-		$values = array('none' => __('Show Active/Inactive', 'event_espresso'), 'active' => __('Active', 'event_espresso'), 'upcoming' => __('Upcoming', 'event_espresso'), 'expired' => __('Expired', 'event_espresso'), 'inactive' => __('Inactive', 'event_espresso') );
+		$values = array('none' => __('Show Active/Inactive', 'event_espresso'), 'active' => __('Active', 'event_espresso'), 'upcoming' => __('Upcoming', 'event_espresso'), 'expired' => __('Expired', 'event_espresso'), 'inactive' => __('Inactive', 'event_espresso'));
 		$id = 'id="espresso-active-status-dropdown-filter"';
 		$class = 'wide';
-		echo EEH_Form_Fields::select_input( $select_name, $values, $current_value, $id, $class );
+		echo EEH_Form_Fields::select_input($select_name, $values, $current_value, $id, $class);
 	}
 
 
@@ -961,9 +961,9 @@ 
 	 * @return string html
 	 */
 	public function category_dropdown() {
-		$cur_cat = isset( $this->_req_data['EVT_CAT'] ) ? $this->_req_data['EVT_CAT'] : -1;
+		$cur_cat = isset($this->_req_data['EVT_CAT']) ? $this->_req_data['EVT_CAT'] : -1;
 
-		return EEH_Form_Fields::generate_event_category_dropdown( $cur_cat );
+		return EEH_Form_Fields::generate_event_category_dropdown($cur_cat);
 	}
 
 
@@ -975,14 +975,14 @@ 
 	 * @return int
 	 */
 	public function total_events_today() {
-		$start = EEM_Datetime::instance()->convert_datetime_for_query( 'DTT_EVT_start', date('Y-m-d' ) . ' 00:00:00', 'Y-m-d H:i:s', 'UTC' );
-		$end = EEM_Datetime::instance()->convert_datetime_for_query( 'DTT_EVT_start', date('Y-m-d' ) . ' 23:59:59', 'Y-m-d H:i:s', 'UTC' );
+		$start = EEM_Datetime::instance()->convert_datetime_for_query('DTT_EVT_start', date('Y-m-d').' 00:00:00', 'Y-m-d H:i:s', 'UTC');
+		$end = EEM_Datetime::instance()->convert_datetime_for_query('DTT_EVT_start', date('Y-m-d').' 23:59:59', 'Y-m-d H:i:s', 'UTC');
 
 		$where = array(
-			'Datetime.DTT_EVT_start' => array( 'BETWEEN', array($start, $end ) )
+			'Datetime.DTT_EVT_start' => array('BETWEEN', array($start, $end))
 			);
 
-		$count = EEM_Event::instance()->count( array( $where, 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array($where, 'caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -997,14 +997,14 @@ 
 		$this_year_r = date('Y');
 		$this_month_r = date('m');
 		$days_this_month = date('t');
-		$start = EEM_Datetime::instance()->convert_datetime_for_query( 'DTT_EVT_start', $this_year_r . '-' . $this_month_r . '-01 00:00:00', 'Y-m-d H:i:s', 'UTC' );
-		$end = EEM_Datetime::instance()->convert_datetime_for_query( 'DTT_EVT_start', $this_year_r . '-' . $this_month_r . '-' . $days_this_month . ' 23:59:59', 'Y-m-d H:i:s', 'UTC' );
+		$start = EEM_Datetime::instance()->convert_datetime_for_query('DTT_EVT_start', $this_year_r.'-'.$this_month_r.'-01 00:00:00', 'Y-m-d H:i:s', 'UTC');
+		$end = EEM_Datetime::instance()->convert_datetime_for_query('DTT_EVT_start', $this_year_r.'-'.$this_month_r.'-'.$days_this_month.' 23:59:59', 'Y-m-d H:i:s', 'UTC');
 
 		$where = array(
-			'Datetime.DTT_EVT_start' => array( 'BETWEEN', array($start, $end ) )
+			'Datetime.DTT_EVT_start' => array('BETWEEN', array($start, $end))
 			);
 
-		$count = EEM_Event::instance()->count( array( $where, 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array($where, 'caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -1021,53 +1021,53 @@ 
 
 
 
-	public function get_default_tickets( $per_page = 10, $count = FALSE, $trashed = FALSE ) {
+	public function get_default_tickets($per_page = 10, $count = FALSE, $trashed = FALSE) {
 
-		$orderby= empty( $this->_req_data['orderby'] ) ? 'TKT_name' : $this->_req_data['orderby'];
-		$order = empty( $this->_req_data['order'] ) ? 'ASC' : $this->_req_data['order'];
+		$orderby = empty($this->_req_data['orderby']) ? 'TKT_name' : $this->_req_data['orderby'];
+		$order = empty($this->_req_data['order']) ? 'ASC' : $this->_req_data['order'];
 
-		switch ( $orderby ) {
+		switch ($orderby) {
 			case 'TKT_name' :
-				$orderby = array( 'TKT_name' => $order );
+				$orderby = array('TKT_name' => $order);
 				break;
 
 			case 'TKT_price' :
-				$orderby = array( 'TKT_price' => $order );
+				$orderby = array('TKT_price' => $order);
 				break;
 
 			case 'TKT_uses' :
-				$orderby = array( 'TKT_uses' => $order );
+				$orderby = array('TKT_uses' => $order);
 				break;
 
 			case 'TKT_min' :
-				$orderby = array( 'TKT_min' => $order );
+				$orderby = array('TKT_min' => $order);
 				break;
 
 			case 'TKT_max' :
-				$orderby = array( 'TKT_max' => $order );
+				$orderby = array('TKT_max' => $order);
 				break;
 
 			case 'TKT_qty' :
-				$orderby = array( 'TKT_qty' => $order );
+				$orderby = array('TKT_qty' => $order);
 				break;
 		}
 
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page;
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page;
 
 		$_where = array(
 			'TKT_is_default' => 1,
 			'TKT_deleted' => $trashed
 			);
 
-		$offset = ($current_page-1)*$per_page;
-		$limit = array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = array($offset, $per_page);
 
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$_where['OR'] = array(
-				'TKT_name' => array('LIKE',$sstr ),
-				'TKT_description' => array('LIKE',$sstr )
+				'TKT_name' => array('LIKE', $sstr),
+				'TKT_description' => array('LIKE', $sstr)
 				);
 		}
 
@@ -1078,9 +1078,9 @@ 
 			'group_by'=>'TKT_ID'
 			);
 
-		if($count){
+		if ($count) {
 			return EEM_Ticket::instance()->count_deleted_and_undeleted(array($_where));
-		}else{
+		} else {
 			return EEM_Ticket::instance()->get_all_deleted_and_undeleted($query_params);
 		}
 
@@ -1090,35 +1090,35 @@ 
 
 
 
-	protected function _trash_or_restore_ticket(  $trash = FALSE ) {
+	protected function _trash_or_restore_ticket($trash = FALSE) {
 		$success = 1;
 
 		$TKT = EEM_Ticket::instance();
 
 		//checkboxes?
-		if ( !empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] ) ) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			//if array has more than one element then success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 
 			//cycle thru the boxes
-			while ( list( $TKT_ID, $value ) = each( $this->_req_data['checkbox'] ) ) {
-				if ( $trash ) {
-					if ( ! $TKT->delete_by_ID( $TKT_ID ) )
+			while (list($TKT_ID, $value) = each($this->_req_data['checkbox'])) {
+				if ($trash) {
+					if ( ! $TKT->delete_by_ID($TKT_ID))
 						$success = 0;
 				} else {
-					if ( ! $TKT->restore_by_ID( $TKT_ID ) )
+					if ( ! $TKT->restore_by_ID($TKT_ID))
 						$success = 0;
 				}
 			}
 		} else {
 			//grab single id and trash
-			$TKT_ID = absint( $this->_req_data['TKT_ID'] );
+			$TKT_ID = absint($this->_req_data['TKT_ID']);
 
-			if ( $trash ) {
-				if ( ! $TKT->delete_by_ID( $TKT_ID ) )
+			if ($trash) {
+				if ( ! $TKT->delete_by_ID($TKT_ID))
 					$success = 0;
 			} else {
-				if ( ! $TKT->restore_by_ID( $TKT_ID ) )
+				if ( ! $TKT->restore_by_ID($TKT_ID))
 					$success = 0;
 			}
 		}
@@ -1128,7 +1128,7 @@ 
 			'action' => 'ticket_list_table',
 			'status' => $trash ? '' : 'trashed'
 			);
-		$this->_redirect_after_action( $success, 'Tickets', $action_desc, $query_args );
+		$this->_redirect_after_action($success, 'Tickets', $action_desc, $query_args);
 	}
 
 
@@ -1141,21 +1141,21 @@ 
 		$TKT = EEM_Ticket::instance();
 
 		//checkboxes?
-		if ( !empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] ) ) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			//if array has more than one element then success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 
 			//cycle thru the boxes
-			while ( list( $TKT_ID, $value ) = each( $this->_req_data['checkbox'] ) ) {
+			while (list($TKT_ID, $value) = each($this->_req_data['checkbox'])) {
 				//delete
-				if ( ! $this->_delete_the_ticket( $TKT_ID ) ) {
+				if ( ! $this->_delete_the_ticket($TKT_ID)) {
 					$success = 0;
 				}
 			}
 		} else {
 			//grab single id and trash
-			$TKT_ID = absint( $this->_req_data['TKT_ID'] );
-			if ( ! $this->_delete_the_ticket( $TKT_ID ) ) {
+			$TKT_ID = absint($this->_req_data['TKT_ID']);
+			if ( ! $this->_delete_the_ticket($TKT_ID)) {
 					$success = 0;
 				}
 		}
@@ -1167,16 +1167,16 @@ 
 			);
 
 		//failsafe.  If the default ticket count === 1 then we need to redirect to event overview.
-		if ( EEM_Ticket::instance()->count_deleted_and_undeleted( array( array( 'TKT_is_default' => 1 ) ), 'TKT_ID', TRUE ) )
+		if (EEM_Ticket::instance()->count_deleted_and_undeleted(array(array('TKT_is_default' => 1)), 'TKT_ID', TRUE))
 			$query_args = array();
-		$this->_redirect_after_action( $success, 'Tickets', $action_desc, $query_args );
+		$this->_redirect_after_action($success, 'Tickets', $action_desc, $query_args);
 	}
 
 
 
 
-	protected function _delete_the_ticket( $TKT_ID ) {
-		$tkt = EEM_Ticket::instance()->get_one_by_ID( $TKT_ID );
+	protected function _delete_the_ticket($TKT_ID) {
+		$tkt = EEM_Ticket::instance()->get_one_by_ID($TKT_ID);
 		$tkt->_remove_relations('Datetime');
 		//delete all related prices first
 		$tkt->delete_related_permanently('Price');

Braces +44 added lines, -32 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
@@ -453,8 +454,9 @@ 
 		//k we've got EVT_ID so let's use that to get the event we'll duplicate
 		$orig_event = EEM_Event::instance()->get_one_by_ID( $this->_req_data['EVT_ID'] );
 
-		if ( ! $orig_event instanceof EE_Event )
-			throw new EE_Error( sprintf( __('An EE_Event object could not be retrieved for the given ID (%s)', 'event_espresso'), $this->_req_data['EVT_ID'] ) );
+		if ( ! $orig_event instanceof EE_Event ) {
+					throw new EE_Error( sprintf( __('An EE_Event object could not be retrieved for the given ID (%s)', 'event_espresso'), $this->_req_data['EVT_ID'] ) );
+		}
 
 		//k now let's clone the $orig_event before getting relations
 		$new_event = clone $orig_event;
@@ -528,8 +530,9 @@ 
 			//now let's get the ticket relations setup.
 			foreach ( (array) $orig_tkts as $orig_tkt ) {
 				//it's possible a datetime will have no tickets so let's verify we HAVE a ticket first.
-				if ( ! $orig_tkt instanceof EE_Ticket )
-					continue;
+				if ( ! $orig_tkt instanceof EE_Ticket ) {
+									continue;
+				}
 
 				//is this ticket archived?  If it is then let's skip
 				if ( $orig_tkt->get( 'TKT_deleted' ) ) {
@@ -638,9 +641,9 @@ 
 	protected function _events_export() {
 		if(isset($this->_req_data['EVT_ID'])){
 			$event_ids = $this->_req_data['EVT_ID'];
-		}elseif(isset($this->_req_data['EVT_IDs'])){
+		} elseif(isset($this->_req_data['EVT_IDs'])){
 			$event_ids = $this->_req_data['EVT_IDs'];
-		}else{
+		} else{
 			$event_ids = NULL;
 		}
 		//todo: I don't like doing this but it'll do until we modify EE_Export Class.
@@ -827,8 +830,9 @@ 
 
 		extract( wp_parse_args($args, $defaults), EXTR_SKIP );
 
-		if ( empty($walker) || !is_a($walker, 'Walker') )
-			$walker = new Walker_Radio_Checklist;
+		if ( empty($walker) || !is_a($walker, 'Walker') ) {
+					$walker = new Walker_Radio_Checklist;
+		}
 
 		$descendants_and_self = (int) $descendants_and_self;
 
@@ -837,17 +841,19 @@ 
 		$tax = get_taxonomy($taxonomy);
 		$args['disabled'] = !current_user_can($tax->cap->assign_terms);
 
-		if ( is_array( $selected_cats ) )
-			$args['selected_cats'] = $selected_cats;
-		elseif ( $post_id )
-			$args['selected_cats'] = wp_get_object_terms($post_id, $taxonomy, array_merge($args, array('fields' => 'ids')));
-		else
-			$args['selected_cats'] = array();
+		if ( is_array( $selected_cats ) ) {
+					$args['selected_cats'] = $selected_cats;
+		} elseif ( $post_id ) {
+					$args['selected_cats'] = wp_get_object_terms($post_id, $taxonomy, array_merge($args, array('fields' => 'ids')));
+		} else {
+					$args['selected_cats'] = array();
+		}
 
-		if ( is_array( $popular_cats ) )
-			$args['popular_cats'] = $popular_cats;
-		else
-			$args['popular_cats'] = get_terms( $taxonomy, array( 'fields' => 'ids', 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) );
+		if ( is_array( $popular_cats ) ) {
+					$args['popular_cats'] = $popular_cats;
+		} else {
+					$args['popular_cats'] = get_terms( $taxonomy, array( 'fields' => 'ids', 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) );
+		}
 
 		if ( $descendants_and_self ) {
 			$categories = (array) get_terms($taxonomy, array( 'child_of' => $descendants_and_self, 'hierarchical' => 0, 'hide_empty' => 0 ) );
@@ -900,8 +906,9 @@ 
 		$status = isset( $this->_req_data['status'] ) ? $this->_req_data['status'] : NULL;
 
 		//active status dropdown
-		if ( $status !== 'draft' )
-			$filter[] = $this->active_status_dropdown( isset( $this->_req_data['active_status'] ) ? $this->_req_data['active_status'] : '' );
+		if ( $status !== 'draft' ) {
+					$filter[] = $this->active_status_dropdown( isset( $this->_req_data['active_status'] ) ? $this->_req_data['active_status'] : '' );
+		}
 
 		//category filter
 		$filters[] = $this->category_dropdown();
@@ -1080,7 +1087,7 @@ 
 
 		if($count){
 			return EEM_Ticket::instance()->count_deleted_and_undeleted(array($_where));
-		}else{
+		} else{
 			return EEM_Ticket::instance()->get_all_deleted_and_undeleted($query_params);
 		}
 
@@ -1103,11 +1110,13 @@ 
 			//cycle thru the boxes
 			while ( list( $TKT_ID, $value ) = each( $this->_req_data['checkbox'] ) ) {
 				if ( $trash ) {
-					if ( ! $TKT->delete_by_ID( $TKT_ID ) )
-						$success = 0;
+					if ( ! $TKT->delete_by_ID( $TKT_ID ) ) {
+											$success = 0;
+					}
 				} else {
-					if ( ! $TKT->restore_by_ID( $TKT_ID ) )
-						$success = 0;
+					if ( ! $TKT->restore_by_ID( $TKT_ID ) ) {
+											$success = 0;
+					}
 				}
 			}
 		} else {
@@ -1115,11 +1124,13 @@ 
 			$TKT_ID = absint( $this->_req_data['TKT_ID'] );
 
 			if ( $trash ) {
-				if ( ! $TKT->delete_by_ID( $TKT_ID ) )
-					$success = 0;
+				if ( ! $TKT->delete_by_ID( $TKT_ID ) ) {
+									$success = 0;
+				}
 			} else {
-				if ( ! $TKT->restore_by_ID( $TKT_ID ) )
-					$success = 0;
+				if ( ! $TKT->restore_by_ID( $TKT_ID ) ) {
+									$success = 0;
+				}
 			}
 		}
 
@@ -1167,8 +1178,9 @@ 
 			);
 
 		//failsafe.  If the default ticket count === 1 then we need to redirect to event overview.
-		if ( EEM_Ticket::instance()->count_deleted_and_undeleted( array( array( 'TKT_is_default' => 1 ) ), 'TKT_ID', TRUE ) )
-			$query_args = array();
+		if ( EEM_Ticket::instance()->count_deleted_and_undeleted( array( array( 'TKT_is_default' => 1 ) ), 'TKT_ID', TRUE ) ) {
+					$query_args = array();
+		}
 		$this->_redirect_after_action( $success, 'Tickets', $action_desc, $query_args );
 	}