eventespresso / event-espresso-core

caffeinated/admin/extend/registrations/Extend_Registrations_Admin_Page.core.php

Braces +6 added lines, -4 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
@@ -679,8 +680,9 @@ 
 			EE_Error::add_error(__('Missing some required data to toggle the Check-in', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__  );
 		}
 
-		if ( defined('DOING_AJAX' ) )
-			return $new_status;
+		if ( defined('DOING_AJAX' ) ) {
+					return $new_status;
+		}
 
 		$this->_redirect_after_action( FALSE,'', '', $query_args, TRUE );
 
@@ -918,7 +920,7 @@ 
 		$query_params['force_join'] = array('Attendee');//force join to attendee model so that it gets cached, because we're going to need the attendee for each registration
 		if($count){
 			$registrations = EEM_Registration::instance()->count(array($query_params[0]));
-		}else{
+		} else{
 			$registrations = EEM_Registration::instance()->get_all($query_params);
 
 

Doc Comments -2 removed lines

@@ -631,8 +631,6 @@
 	/**
 	 * 		handles toggleing the checkin status for the registration,
 	*		@access protected
-	*		@param boolean 	$check_in
-	*		@return void
 	*/
 	protected function _toggle_checkin_status() {
 		//first let's get the query args out of the way for the redirect

Indentation +15 added lines, -15 removed lines

@@ -453,9 +453,9 @@ 
 
 	/**
 	 * 		generates Business Reports regarding Registrations
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function _registration_reports() {
 		$template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php';
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_reports_template_data, true );
@@ -630,10 +630,10 @@ 
 
 	/**
 	 * 		handles toggleing the checkin status for the registration,
-	*		@access protected
-	*		@param boolean 	$check_in
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@param boolean 	$check_in
+	 *		@return void
+	 */
 	protected function _toggle_checkin_status() {
 		//first let's get the query args out of the way for the redirect
 		$query_args = array(
@@ -754,9 +754,9 @@ 
 
 	/**
 	 * 		generates HTML for the Event Registrations List Table
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function _event_registrations_list_table() {
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 		$this->_admin_page_title .= isset( $this->_req_data['event_id'] ) ? $this->get_action_link_or_button('new_registration', 'add-registrant', array('event_id' => $this->_req_data['event_id']), 'add-new-h2') : '';
@@ -786,11 +786,11 @@ 
 				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_approved,
 				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_approved, FALSE, 'sentence' )
 				),
-            'cancelled_status' => array(
+			'cancelled_status' => array(
 				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_cancelled,
 				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, FALSE, 'sentence' )
 				),
-            'declined_status' => array(
+			'declined_status' => array(
 				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_declined,
 				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_declined, FALSE, 'sentence' )
 				),
@@ -818,9 +818,9 @@ 
 	/**
 	 * 		get_attendees
 	 * 		@param bool $count whether to return count or data.
-	*		@access public
-	*		@return array
-	*/
+	 *		@access public
+	 *		@return array
+	 */
 	public function get_event_attendees( $per_page = 10, $count = FALSE, $trash = FALSE, $orderby = '' ) {
 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );

Spacing +234 added lines, -234 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -37,20 +37,20 @@ 
 	protected $_reports_template_data = array();
 
 
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
-		define( 'REG_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'registrations/templates/');
-		define( 'REG_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND . 'registrations/assets/');
-		define( 'REG_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'registrations/assets/');
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
+		define('REG_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'registrations/templates/');
+		define('REG_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND.'registrations/assets/');
+		define('REG_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'registrations/assets/');
 	}
 
 
 	protected function _extend_page_config() {
-		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'registrations';
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'registrations';
 
-		$reg_id = ! empty( $this->_req_data['_REG_ID'] ) && ! is_array( $this->_req_data['_REG_ID'] ) ? $this->_req_data['_REG_ID'] : 0;
-		$att_id = ! empty( $this->_req_data[ 'ATT_ID' ] ) ? ! is_array( $this->_req_data['ATT_ID'] ) : 0;
-		$att_id = ! empty( $this->_req_data['post'] ) && ! is_array( $this->_req_data['post'] ) ? $this->_req_data['post'] : $att_id;
+		$reg_id = ! empty($this->_req_data['_REG_ID']) && ! is_array($this->_req_data['_REG_ID']) ? $this->_req_data['_REG_ID'] : 0;
+		$att_id = ! empty($this->_req_data['ATT_ID']) ? ! is_array($this->_req_data['ATT_ID']) : 0;
+		$att_id = ! empty($this->_req_data['post']) && ! is_array($this->_req_data['post']) ? $this->_req_data['post'] : $att_id;
 
 		$new_page_routes = array(
 			'reports' => array(
@@ -89,7 +89,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(
@@ -134,8 +134,8 @@ 
 						'filename' => 'registrations_event_checkin_other'
 					)
 				),
-				'help_tour' => array( 'Event_Checkin_Help_Tour' ),
-				'qtips' => array('Registration_List_Table_Tips' ),
+				'help_tour' => array('Event_Checkin_Help_Tour'),
+				'qtips' => array('Registration_List_Table_Tips'),
 				'list_table' => 'EE_Event_Registrations_List_Table',
 				'metaboxes' => array(),
 				'require_nonce' => FALSE
@@ -153,7 +153,7 @@ 
 				),
 			);
 
-		$this->_page_config = array_merge( $this->_page_config, $new_page_config );
+		$this->_page_config = array_merge($this->_page_config, $new_page_config);
 		$this->_page_config['contact_list']['list_table'] = 'Extend_EE_Attendee_Contact_List_Table';
 		$this->_page_config['default']['list_table'] = 'Extend_EE_Registrations_List_Table';
 	}
@@ -162,7 +162,7 @@ 
 
 	protected function _ajax_hooks() {
 		parent::_ajax_hooks();
-		add_action( 'wp_ajax_get_newsletter_form_content', array( $this, 'get_newsletter_form_content' ) );
+		add_action('wp_ajax_get_newsletter_form_content', array($this, 'get_newsletter_form_content'));
 	}
 
 
@@ -171,20 +171,20 @@ 
 		parent::load_scripts_styles();
 
 		//if newsletter message type is active then let's add filter and load js for it.
-		if ( EEH_MSG_Template::is_mt_active('newsletter') ) {
+		if (EEH_MSG_Template::is_mt_active('newsletter')) {
 			//enqueue newsletter js
-			wp_enqueue_script( 'ee-newsletter-trigger', REG_CAF_ASSETS_URL . 'ee-newsletter-trigger.js', array( 'ee-dialog' ), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_enqueue_style( 'ee-newsletter-trigger-css', REG_CAF_ASSETS_URL . 'ee-newsletter-trigger.css', array(), EVENT_ESPRESSO_VERSION );
+			wp_enqueue_script('ee-newsletter-trigger', REG_CAF_ASSETS_URL.'ee-newsletter-trigger.js', array('ee-dialog'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_enqueue_style('ee-newsletter-trigger-css', REG_CAF_ASSETS_URL.'ee-newsletter-trigger.css', array(), EVENT_ESPRESSO_VERSION);
 			//hook in buttons for newsletter message type trigger.
-			add_action('AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', array( $this, 'add_newsletter_action_buttons'), 10 );
+			add_action('AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', array($this, 'add_newsletter_action_buttons'), 10);
 		}
 	}
 
 
 
 	public function load_scripts_styles_reports() {
-		wp_register_script( 'ee-reg-reports-js', REG_CAF_ASSETS_URL . 'ee-registration-admin-reports.js', array( 'google-charts' ), EVENT_ESPRESSO_VERSION, true );
-		wp_enqueue_script( 'ee-reg-reports-js' );
+		wp_register_script('ee-reg-reports-js', REG_CAF_ASSETS_URL.'ee-registration-admin-reports.js', array('google-charts'), EVENT_ESPRESSO_VERSION, true);
+		wp_enqueue_script('ee-reg-reports-js');
 		$this->_registration_reports_js_setup();
 	}
 
@@ -216,7 +216,7 @@ 
 				'slug' => 'all',
 				'label' => __('All', 'event_espresso'),
 				'count' => 0,
-				'bulk_action' => !isset( $this->_req_data['event_id'] ) ? array() : array(
+				'bulk_action' => ! isset($this->_req_data['event_id']) ? array() : array(
 					'toggle_checkin_status' => __('Toggle Check-In', 'event_espresso'),
 					//'trash_registrations' => __('Trash Registrations', 'event_espresso')
 					)
@@ -234,7 +234,7 @@ 
 				'slug' => 'all',
 				'label' => __('All', 'event_espresso'),
 				'count' => 0,
-				'bulk_action' => array( 'delete_checkin_rows' => __('Delete Check-In Rows', 'event_espresso') )
+				'bulk_action' => array('delete_checkin_rows' => __('Delete Check-In Rows', 'event_espresso'))
 				),
 			);
 	}
@@ -250,20 +250,20 @@ 
 	 */
 	public function get_newsletter_form_content() {
 		//do a nonce check cause we're not coming in from an normal route here.
-		$nonce = isset( $this->_req_data['get_newsletter_form_content_nonce'] ) ? sanitize_text_field( $this->_req_data['get_newsletter_form_content_nonce'] ) : '';
+		$nonce = isset($this->_req_data['get_newsletter_form_content_nonce']) ? sanitize_text_field($this->_req_data['get_newsletter_form_content_nonce']) : '';
 		$nonce_ref = 'get_newsletter_form_content_nonce';
 
-		$this->_verify_nonce( $nonce, $nonce_ref );
+		$this->_verify_nonce($nonce, $nonce_ref);
 		//let's get the mtp for the incoming MTP_ ID
-		if ( !isset( $this->_req_data['GRP_ID'] ) ) {
-			EE_Error::add_error( __('There must be something broken with the js or html structure because the required data for getting a message template group is not present (need an GRP_ID).', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! isset($this->_req_data['GRP_ID'])) {
+			EE_Error::add_error(__('There must be something broken with the js or html structure because the required data for getting a message template group is not present (need an GRP_ID).', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			$this->_template_args['success'] = FALSE;
 			$this->_template_args['error'] = TRUE;
 			$this->_return_json();
 		}
-		$MTPG = EEM_Message_Template_Group::instance()->get_one_by_ID( $this->_req_data['GRP_ID'] );
-		if ( ! $MTPG instanceof EE_Message_Template_Group ) {
-			EE_Error::add_error( sprintf( __('The GRP_ID given (%d) does not appear to have a corresponding row in the database.', 'event_espresso'), $this->_req_data['GRP_ID'] ), __FILE__, __FUNCTION__, __LINE__  );
+		$MTPG = EEM_Message_Template_Group::instance()->get_one_by_ID($this->_req_data['GRP_ID']);
+		if ( ! $MTPG instanceof EE_Message_Template_Group) {
+			EE_Error::add_error(sprintf(__('The GRP_ID given (%d) does not appear to have a corresponding row in the database.', 'event_espresso'), $this->_req_data['GRP_ID']), __FILE__, __FUNCTION__, __LINE__);
 			$this->_template_args['success'] = FALSE;
 			$this->_template_args['error'] = TRUE;
 			$this->_return_json();
@@ -272,11 +272,11 @@ 
 		$MTPs = $MTPG->context_templates();
 		$MTPs = $MTPs['attendee'];
 		$template_fields = array();
-		foreach ( $MTPs as $MTP ) {
+		foreach ($MTPs as $MTP) {
 			$field = $MTP->get('MTP_template_field');
-			if ( $field == 'content'  ) {
+			if ($field == 'content') {
 				$content = $MTP->get('MTP_content');
-				if ( !empty( $content['newsletter_content'] ) ) {
+				if ( ! empty($content['newsletter_content'])) {
 					$template_fields['newsletter_content'] = $content['newsletter_content'];
 					}
 				continue;
@@ -289,7 +289,7 @@ 
 		$this->_template_args['data'] = array(
 			'batch_message_from' => isset($template_fields['from']) ? $template_fields['from'] : '',
 			'batch_message_subject' => isset($template_fields['subject']) ? $template_fields['subject'] : '',
-			'batch_message_content' => isset( $template_fields['newsletter_content'] ) ? $template_fields['newsletter_content'] : ''
+			'batch_message_content' => isset($template_fields['newsletter_content']) ? $template_fields['newsletter_content'] : ''
 			);
 		$this->_return_json();
 	}
@@ -305,8 +305,8 @@ 
 	 * @param EE_Admin_List_Table $list_table
 	 * @return string html string for extra buttons
 	 */
-	public function add_newsletter_action_buttons( EE_Admin_List_Table $list_table ) {
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_registrations_newsletter_selected_send' ) ) {
+	public function add_newsletter_action_buttons(EE_Admin_List_Table $list_table) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_registrations_newsletter_selected_send')) {
 			return '';
 		}
 
@@ -315,13 +315,13 @@ 
 			'event_registrations',
 			'default'
 			);
-		if ( $this->_current_page == 'espresso_registrations' && in_array( $this->_req_action, $routes_to_add_to )  ) {
-			if ( ( $this->_req_action == 'event_registrations' && empty( $this->_req_data['event_id'] ) ) || ( isset( $this->_req_data['status'] ) && $this->_req_data['status'] == 'trash' ) ) {
+		if ($this->_current_page == 'espresso_registrations' && in_array($this->_req_action, $routes_to_add_to)) {
+			if (($this->_req_action == 'event_registrations' && empty($this->_req_data['event_id'])) || (isset($this->_req_data['status']) && $this->_req_data['status'] == 'trash')) {
 				echo '';
 			} else {
-				$button_text = sprintf( __('Send Batch Message (%s selected)', 'event_espresso'), '<span class="send-selected-newsletter-count">0</span>' );
-				echo '<button id="selected-batch-send-trigger" class="button secondary-button"><span class="dashicons dashicons-email "></span>' . $button_text . '</button>';
-				add_action('admin_footer', array( $this, 'newsletter_send_form_skeleton') );
+				$button_text = sprintf(__('Send Batch Message (%s selected)', 'event_espresso'), '<span class="send-selected-newsletter-count">0</span>');
+				echo '<button id="selected-batch-send-trigger" class="button secondary-button"><span class="dashicons dashicons-email "></span>'.$button_text.'</button>';
+				add_action('admin_footer', array($this, 'newsletter_send_form_skeleton'));
 			}
 		}
 	}
@@ -333,37 +333,37 @@ 
 		$list_table = $this->_list_table_object;
 		$codes = array();
 		//need to templates for the newsletter message type for the template selector.
-		$values[] = array( 'text' => __('Select Template to Use', 'event_espresso'), 'id' => 0 );
-		$mtps = EEM_Message_Template_Group::instance()->get_all( array( array( 'MTP_message_type' => 'newsletter', 'MTP_messenger' => 'email' ) ) );
-		foreach ( $mtps as $mtp ) {
+		$values[] = array('text' => __('Select Template to Use', 'event_espresso'), 'id' => 0);
+		$mtps = EEM_Message_Template_Group::instance()->get_all(array(array('MTP_message_type' => 'newsletter', 'MTP_messenger' => 'email')));
+		foreach ($mtps as $mtp) {
 			$name = $mtp->name();
 			$values[] = array(
-				'text' => empty( $name ) ? __('Global', 'event_espresso') : $name,
+				'text' => empty($name) ? __('Global', 'event_espresso') : $name,
 				'id' => $mtp->ID()
 				);
 		}
 
 		//need to get a list of shortcodes that are available for the newsletter message type.
-		$shortcodes = EEH_MSG_Template::get_shortcodes( 'newsletter', 'email', array(), 'attendee', FALSE );
-		foreach ( $shortcodes as $field => $shortcode_array ) {
-			$codes[$field] = implode(', ', array_keys($shortcode_array ) );
+		$shortcodes = EEH_MSG_Template::get_shortcodes('newsletter', 'email', array(), 'attendee', FALSE);
+		foreach ($shortcodes as $field => $shortcode_array) {
+			$codes[$field] = implode(', ', array_keys($shortcode_array));
 		}
 
 		$shortcodes = $codes;
 
-		$form_template = REG_CAF_TEMPLATE_PATH . 'newsletter-send-form.template.php';
+		$form_template = REG_CAF_TEMPLATE_PATH.'newsletter-send-form.template.php';
 		$form_template_args = array(
 			'form_action' => admin_url('admin.php?page=espresso_registrations'),
 			'form_route' => 'newsletter_selected_send',
 			'form_nonce_name' => 'newsletter_selected_send_nonce',
-			'form_nonce' => wp_create_nonce( 'newsletter_selected_send_nonce' ),
+			'form_nonce' => wp_create_nonce('newsletter_selected_send_nonce'),
 			'redirect_back_to' => $this->_req_action,
-			'ajax_nonce' => wp_create_nonce( 'get_newsletter_form_content_nonce'),
-			'template_selector' => EEH_Form_Fields::select_input('newsletter_mtp_selected', $values ),
+			'ajax_nonce' => wp_create_nonce('get_newsletter_form_content_nonce'),
+			'template_selector' => EEH_Form_Fields::select_input('newsletter_mtp_selected', $values),
 			'shortcodes' => $shortcodes,
 			'id_type' => $list_table instanceof EE_Attendee_Contact_List_Table ? 'contact' : 'registration'
 			);
-		EEH_Template::display_template( $form_template, $form_template_args );
+		EEH_Template::display_template($form_template, $form_template_args);
 	}
 
 
@@ -378,7 +378,7 @@ 
 	protected function _newsletter_selected_send() {
 		$success = TRUE;
 		//first we need to make sure we have a GRP_ID so we know what template we're sending and updating!
-		if ( empty( $this->_req_data['newsletter_mtp_selected'] ) ) {
+		if (empty($this->_req_data['newsletter_mtp_selected'])) {
 			EE_Error::add_error(
 				__(
 					'In order to send a message, a Message Template GRP_ID is needed. It was not provided so messages were not sent.',
@@ -389,7 +389,7 @@ 
 			$success = FALSE;
 		}
 
-		if ( $success ) {
+		if ($success) {
 			//update Message template in case there are any changes
 			$Message_Template_Group = EEM_Message_Template_Group::instance()->get_one_by_ID(
 				$this->_req_data['newsletter_mtp_selected']
@@ -397,7 +397,7 @@ 
 			$Message_Templates = $Message_Template_Group instanceof EE_Message_Template_Group
 				? $Message_Template_Group->context_templates()
 				: array();
-			if ( empty( $Message_Templates ) ) {
+			if (empty($Message_Templates)) {
 				EE_Error::add_error(
 					__(
 						'Unable to retrieve message template fields from the db. Messages not sent.',
@@ -408,25 +408,25 @@ 
 			}
 
 			//let's just update the specific fields
-			foreach ( $Message_Templates['attendee'] as $Message_Template ) {
-				if ( $Message_Template instanceof EE_Message_Template ) {
-					$field = $Message_Template->get( 'MTP_template_field' );
-					$content = $Message_Template->get( 'MTP_content' );
+			foreach ($Message_Templates['attendee'] as $Message_Template) {
+				if ($Message_Template instanceof EE_Message_Template) {
+					$field = $Message_Template->get('MTP_template_field');
+					$content = $Message_Template->get('MTP_content');
 					$new_content = $content;
-					switch ( $field ) {
+					switch ($field) {
 						case 'from' :
-							$new_content = ! empty( $this->_req_data['batch_message']['from'] )
+							$new_content = ! empty($this->_req_data['batch_message']['from'])
 								? $this->_req_data['batch_message']['from']
 								: $content;
 							break;
 						case 'subject' :
-							$new_content = ! empty( $this->_req_data['batch_message']['subject'] )
+							$new_content = ! empty($this->_req_data['batch_message']['subject'])
 								? $this->_req_data['batch_message']['subject']
 								: $content;
 							break;
 						case 'content' :
 							$new_content = $content;
-							$new_content['newsletter_content'] = ! empty( $this->_req_data['batch_message']['content'] )
+							$new_content['newsletter_content'] = ! empty($this->_req_data['batch_message']['content'])
 								? $this->_req_data['batch_message']['content']
 								: $content['newsletter_content'];
 							break;
@@ -434,35 +434,35 @@ 
 							continue;
 							break;
 					}
-					$Message_Template->set( 'MTP_content', $new_content );
+					$Message_Template->set('MTP_content', $new_content);
 					$Message_Template->save();
 				}
 			}
 
 			//great fields are updated!  now let's make sure we just have contact objects (EE_Attendee).
-			$id_type = ! empty( $this->_req_data['batch_message']['id_type'] )
+			$id_type = ! empty($this->_req_data['batch_message']['id_type'])
 				? $this->_req_data['batch_message']['id_type']
 				: 'registration';
 
 			//id_type will affect how we assemble the ids.
-			$ids = ! empty( $this->_req_data['batch_message']['ids'] )
-				? json_decode( stripslashes($this->_req_data['batch_message']['ids']) )
+			$ids = ! empty($this->_req_data['batch_message']['ids'])
+				? json_decode(stripslashes($this->_req_data['batch_message']['ids']))
 				: array();
 
 			$registrations_used_for_contact_data = array();
 			//using switch because eventually we'll have other contexts that will be used for generating messages.
-			switch ( $id_type ) {
+			switch ($id_type) {
 				case 'registration' :
 					$registrations_used_for_contact_data = EEM_Registration::instance()->get_all(
 						array(
 							array(
-								'REG_ID' => array( 'IN', $ids )
+								'REG_ID' => array('IN', $ids)
 							)
 						)
 					);
 					break;
 				case 'contact' :
-					$registrations_used_for_contact_data = EEM_Registration::instance()->get_latest_registration_for_each_of_given_contacts( $ids );
+					$registrations_used_for_contact_data = EEM_Registration::instance()->get_latest_registration_for_each_of_given_contacts($ids);
 					break;
 			}
 			do_action(
@@ -473,8 +473,8 @@ 
 			//kept for backward compat, internally we no longer use this action.
 			//@deprecated 4.8.36.rc.002
 			$contacts = $id_type == 'registration'
-				? EEM_Attendee::instance()->get_array_of_contacts_from_reg_ids( $ids )
-				: EEM_Attendee::instance()->get_all( array( array( 'ATT_ID' => array('in', $ids ) ) ) );
+				? EEM_Attendee::instance()->get_array_of_contacts_from_reg_ids($ids)
+				: EEM_Attendee::instance()->get_all(array(array('ATT_ID' => array('in', $ids))));
 			do_action(
 				'AHEE__Extend_Registrations_Admin_Page___newsletter_selected_send',
 				$contacts,
@@ -482,11 +482,11 @@ 
 			);
 		}
 		$query_args = array(
-			'action' => !empty( $this->_req_data['redirect_back_to'] )
+			'action' => ! empty($this->_req_data['redirect_back_to'])
 				? $this->_req_data['redirect_back_to']
 				: 'default'
 			);
-		$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 	}
 
 
@@ -508,8 +508,8 @@ 
 	*		@return void
 	*/
 	protected function _registration_reports() {
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php';
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_reports_template_data, true );
+		$template_path = EE_ADMIN_TEMPLATE.'admin_reports.template.php';
+		$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();
 
@@ -522,28 +522,28 @@ 
 	 *
 	 * @return string
 	 */
-	private function _registrations_per_day_report( $period = '-1 month' ) {
+	private function _registrations_per_day_report($period = '-1 month') {
 		$report_ID = 'reg-admin-registrations-per-day-report-dv';
 
-		$results = EEM_Registration::instance()->get_registrations_per_day_and_per_status_report( $period );
+		$results = EEM_Registration::instance()->get_registrations_per_day_and_per_status_report($period);
 
 		$results = (array) $results;
 		$regs = array();
 		$subtitle = '';
 
-		if( $results ) {
+		if ($results) {
 			$column_titles = array();
 			$tracker = 0;
-			foreach ( $results as $result ) {
+			foreach ($results as $result) {
 				$report_column_values = array();
-				foreach( $result as $property_name => $property_value ) {
+				foreach ($result as $property_name => $property_value) {
 					$property_value = $property_name == 'Registration_REG_date' ? $property_value : (int) $property_value;
 					$report_column_values[] = $property_value;
-					if ( $tracker === 0 ) {
-						if ( $property_name == 'Registration_REG_date' ) {
-							$column_titles[] = __( 'Date (only days with registrations are shown)', 'event_espresso' );
+					if ($tracker === 0) {
+						if ($property_name == 'Registration_REG_date') {
+							$column_titles[] = __('Date (only days with registrations are shown)', 'event_espresso');
 						} else {
-							$column_titles[] = EEH_Template::pretty_status( $property_name, false, 'sentence' );
+							$column_titles[] = EEH_Template::pretty_status($property_name, false, 'sentence');
 						}
 					}
 				}
@@ -552,36 +552,36 @@ 
 			}
 
 			//make sure the column_titles is pushed to the beginning of the array
-			array_unshift( $regs, $column_titles );
+			array_unshift($regs, $column_titles);
 			//setup the date range.
-			$DateTimeZone = new DateTimeZone( EEH_DTT_Helper::get_timezone() );
-			$beginning_date = new DateTime( "now " . $period, $DateTimeZone );
-			$ending_date = new DateTime( "now", $DateTimeZone );
+			$DateTimeZone = new DateTimeZone(EEH_DTT_Helper::get_timezone());
+			$beginning_date = new DateTime("now ".$period, $DateTimeZone);
+			$ending_date = new DateTime("now", $DateTimeZone);
 			$subtitle = sprintf(
-				_x( 'For the period: %1$s to %2$s', 'Used to give date range', 'event_espresso' ),
-				$beginning_date->format( 'Y-m-d' ),
-				$ending_date->format( 'Y-m-d' )
+				_x('For the period: %1$s to %2$s', 'Used to give date range', 'event_espresso'),
+				$beginning_date->format('Y-m-d'),
+				$ending_date->format('Y-m-d')
 			);
 		}
 
-		$report_title = __( 'Total Registrations per Day', 'event_espresso' );
+		$report_title = __('Total Registrations per Day', 'event_espresso');
 
 		$report_params = array(
 			'title' 	=> $report_title,
 			'subtitle' => $subtitle,
 			'id' 		=> $report_ID,
 			'regs' 	=> $regs,
-			'noResults' => empty( $regs ),
+			'noResults' => empty($regs),
 			'noRegsMsg' => sprintf(
 				__(
 					'%sThere are currently no registration records in the last month for this report.%s',
 					'event_espresso'
 				),
-				'<h2>' . $report_title . '</h2><p>',
+				'<h2>'.$report_title.'</h2><p>',
 				'</p>'
 			),
 		);
-		wp_localize_script( 'ee-reg-reports-js', 'regPerDay', $report_params );
+		wp_localize_script('ee-reg-reports-js', 'regPerDay', $report_params);
 
 		return $report_ID;
 	}
@@ -593,29 +593,29 @@ 
 	 *
 	 * @return string
 	 */
-	private function _registrations_per_event_report( $period = '-1 month' ) {
+	private function _registrations_per_event_report($period = '-1 month') {
 
 		$report_ID = 'reg-admin-registrations-per-event-report-dv';
 
-		$results = EEM_Registration::instance()->get_registrations_per_event_and_per_status_report( $period );
+		$results = EEM_Registration::instance()->get_registrations_per_event_and_per_status_report($period);
 
 		$results = (array) $results;
 		$regs = array();
 		$subtitle = '';
 
-		if ( $results ) {
+		if ($results) {
 			$column_titles = array();
 			$tracker = 0;
-			foreach ( $results as $result ) {
+			foreach ($results as $result) {
 				$report_column_values = array();
-				foreach( $result as $property_name => $property_value ) {
-					$property_value = $property_name == 'Registration_Event' ? wp_trim_words( $property_value, 4, '...' ) : (int) $property_value;
+				foreach ($result as $property_name => $property_value) {
+					$property_value = $property_name == 'Registration_Event' ? wp_trim_words($property_value, 4, '...') : (int) $property_value;
 					$report_column_values[] = $property_value;
-					if ( $tracker === 0 ) {
-						if ( $property_name == 'Registration_Event' ) {
-							$column_titles[] = __( 'Event', 'event_espresso' );
+					if ($tracker === 0) {
+						if ($property_name == 'Registration_Event') {
+							$column_titles[] = __('Event', 'event_espresso');
 						} else {
-							$column_titles[] = EEH_Template::pretty_status( $property_name, false, 'sentence' );
+							$column_titles[] = EEH_Template::pretty_status($property_name, false, 'sentence');
 						}
 					}
 				}
@@ -624,37 +624,37 @@ 
 			}
 
 			//make sure the column_titles is pushed to the beginning of the array
-			array_unshift( $regs, $column_titles );
+			array_unshift($regs, $column_titles);
 
 			//setup the date range.
-			$DateTimeZone = new DateTimeZone( EEH_DTT_Helper::get_timezone() );
-			$beginning_date = new DateTime( "now " . $period, $DateTimeZone );
-			$ending_date = new DateTime( "now", $DateTimeZone );
+			$DateTimeZone = new DateTimeZone(EEH_DTT_Helper::get_timezone());
+			$beginning_date = new DateTime("now ".$period, $DateTimeZone);
+			$ending_date = new DateTime("now", $DateTimeZone);
 			$subtitle = sprintf(
-				_x( 'For the period: %1$s to %2$s', 'Used to give date range', 'event_espresso' ),
-				$beginning_date->format( 'Y-m-d' ),
-				$ending_date->format( 'Y-m-d' )
+				_x('For the period: %1$s to %2$s', 'Used to give date range', 'event_espresso'),
+				$beginning_date->format('Y-m-d'),
+				$ending_date->format('Y-m-d')
 			);
 		}
 
-		$report_title = __( 'Total Registrations per Event', 'event_espresso' );
+		$report_title = __('Total Registrations per Event', 'event_espresso');
 
 		$report_params = array(
 			'title' 	=> $report_title,
 			'subtitle' => $subtitle,
 			'id' 		=> $report_ID,
 			'regs' 	=> $regs,
-			'noResults' => empty( $regs ),
+			'noResults' => empty($regs),
 			'noRegsMsg' => sprintf(
 				__(
 					'%sThere are currently no registration records in the last month for this report.%s',
 					'event_espresso'
 				),
-				'<h2>' . $report_title . '</h2><p>',
+				'<h2>'.$report_title.'</h2><p>',
 				'</p>'
 			),
 		);
-		wp_localize_script( 'ee-reg-reports-js', 'regPerEvent', $report_params );
+		wp_localize_script('ee-reg-reports-js', 'regPerEvent', $report_params);
 
 		return $report_ID;
 	}
@@ -668,8 +668,8 @@ 
 	 * @return void
 	 */
 	protected function _registration_checkin_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$reg_id = isset( $this->_req_data['_REGID'] ) ? $this->_req_data['_REGID'] : null;
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$reg_id = isset($this->_req_data['_REGID']) ? $this->_req_data['_REGID'] : null;
 		$reg = EEM_Registration::instance()->get_one_by_ID($reg_id);
 		$this->_admin_page_title .= $this->get_action_link_or_button('new_registration', 'add-registrant', array('event_id' => $reg->event_ID()), 'add-new-h2');
 
@@ -683,15 +683,15 @@ 
 				'desc' => __('This indicates the attendee has been checked out', 'event_espresso')
 				)
 			);
-		$this->_template_args['after_list_table'] = $this->_display_legend( $legend_items );
+		$this->_template_args['after_list_table'] = $this->_display_legend($legend_items);
 
 
-		$dtt_id = isset(  $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : NULL;
-		$go_back_url = !empty( $reg_id )  ? EE_Admin_Page::add_query_args_and_nonce(array('action' => 'event_registrations', 'event_id' => EEM_Registration::instance()->get_one_by_ID($reg_id)->get_first_related('Event')->ID(), 'DTT_ID' => $dtt_id ), $this->_admin_base_url ) : '';
+		$dtt_id = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : NULL;
+		$go_back_url = ! empty($reg_id) ? EE_Admin_Page::add_query_args_and_nonce(array('action' => 'event_registrations', 'event_id' => EEM_Registration::instance()->get_one_by_ID($reg_id)->get_first_related('Event')->ID(), 'DTT_ID' => $dtt_id), $this->_admin_base_url) : '';
 
-		$this->_template_args['before_list_table'] = !empty( $reg_id ) && !empty( $dtt_id ) ? '<h2>' . sprintf(__("%s's check in records for %s at the event, %s", 'event_espresso'), '<span id="checkin-attendee-name">' . EEM_Registration::instance()->get_one_by_ID($reg_id)->get_first_related('Attendee')->full_name() . '</span>', '<span id="checkin-dtt"><a href="' . $go_back_url . '">' . EEM_Datetime::instance()->get_one_by_ID($dtt_id)->start_date_and_time() . ' - ' . EEM_Datetime::instance()->get_one_by_ID($dtt_id)->end_date_and_time() . '</a></span>', '<span id="checkin-event-name">' . EEM_Datetime::instance()->get_one_by_ID($dtt_id)->get_first_related('Event')->get('EVT_name') . '</span>' ) . '</h2>' : '';
-		$this->_template_args['list_table_hidden_fields'] = !empty( $reg_id ) ? '<input type="hidden" name="_REGID" value="' . $reg_id . '">' : '';
-		$this->_template_args['list_table_hidden_fields'] .= !empty( $dtt_id ) ? '<input type="hidden" name="DTT_ID" value="' . $dtt_id . '">' : '';
+		$this->_template_args['before_list_table'] = ! empty($reg_id) && ! empty($dtt_id) ? '<h2>'.sprintf(__("%s's check in records for %s at the event, %s", 'event_espresso'), '<span id="checkin-attendee-name">'.EEM_Registration::instance()->get_one_by_ID($reg_id)->get_first_related('Attendee')->full_name().'</span>', '<span id="checkin-dtt"><a href="'.$go_back_url.'">'.EEM_Datetime::instance()->get_one_by_ID($dtt_id)->start_date_and_time().' - '.EEM_Datetime::instance()->get_one_by_ID($dtt_id)->end_date_and_time().'</a></span>', '<span id="checkin-event-name">'.EEM_Datetime::instance()->get_one_by_ID($dtt_id)->get_first_related('Event')->get('EVT_name').'</span>').'</h2>' : '';
+		$this->_template_args['list_table_hidden_fields'] = ! empty($reg_id) ? '<input type="hidden" name="_REGID" value="'.$reg_id.'">' : '';
+		$this->_template_args['list_table_hidden_fields'] .= ! empty($dtt_id) ? '<input type="hidden" name="DTT_ID" value="'.$dtt_id.'">' : '';
 
 		$this->display_admin_list_table_page_with_no_sidebar();
 	}
@@ -704,24 +704,24 @@ 
 	 */
 	public function toggle_checkin_status() {
 		//first make sure we have the necessary data
-		if ( !isset( $this->_req_data['_regid'] ) ) {
-			EE_Error::add_error( __('There must be something broken with the html structure because the required data for toggling the Check-in status is not being sent via ajax', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! isset($this->_req_data['_regid'])) {
+			EE_Error::add_error(__('There must be something broken with the html structure because the required data for toggling the Check-in status is not being sent via ajax', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			$this->_template_args['success'] = FALSE;
 			$this->_template_args['error'] = TRUE;
 			$this->_return_json();
 		};
 
 		//do a nonce check cause we're not coming in from an normal route here.
-		$nonce = isset( $this->_req_data['checkinnonce'] ) ? sanitize_text_field( $this->_req_data['checkinnonce'] ) : '';
+		$nonce = isset($this->_req_data['checkinnonce']) ? sanitize_text_field($this->_req_data['checkinnonce']) : '';
 		$nonce_ref = 'checkin_nonce';
 
-		$this->_verify_nonce( $nonce, $nonce_ref );
+		$this->_verify_nonce($nonce, $nonce_ref);
 
 		//beautiful! Made it this far so let's get the status.
 		$new_status = $this->_toggle_checkin_status();
 
 		//setup new class to return via ajax
-		$this->_template_args['admin_page_content'] = 'clickable trigger-checkin checkin-icons checkedin-status-' . $new_status;
+		$this->_template_args['admin_page_content'] = 'clickable trigger-checkin checkin-icons checkedin-status-'.$new_status;
 		$this->_template_args['success'] = TRUE;
 		$this->_return_json();
 	}
@@ -741,32 +741,32 @@ 
 		//first let's get the query args out of the way for the redirect
 		$query_args = array(
 			'action' => 'event_registrations',
-			'event_id' => isset( $this->_req_data['event_id'] ) ? $this->_req_data['event_id'] : NULL,
-			'DTT_ID' => isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : NULL
+			'event_id' => isset($this->_req_data['event_id']) ? $this->_req_data['event_id'] : NULL,
+			'DTT_ID' => isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : NULL
 			);
 		$new_status = FALSE;
 
 		// bulk action check in toggle
-		if ( ! empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] )) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			// cycle thru checkboxes
-			while ( list( $REG_ID, $value ) = each($this->_req_data['checkbox'])) {
-				$DTT_ID = isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : NULL;
+			while (list($REG_ID, $value) = each($this->_req_data['checkbox'])) {
+				$DTT_ID = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : NULL;
 				$new_status = $this->_toggle_checkin($REG_ID, $DTT_ID);
 			}
 
-		} elseif ( isset( $this->_req_data['_regid'] ) ) {
+		} elseif (isset($this->_req_data['_regid'])) {
 			//coming from ajax request
-			$DTT_ID = isset( $this->_req_data['dttid'] ) ? $this->_req_data['dttid'] : NULL;
+			$DTT_ID = isset($this->_req_data['dttid']) ? $this->_req_data['dttid'] : NULL;
 			$query_args['DTT_ID'] = $DTT_ID;
 			$new_status = $this->_toggle_checkin($this->_req_data['_regid'], $DTT_ID);
 		} else {
-			EE_Error::add_error(__('Missing some required data to toggle the Check-in', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__  );
+			EE_Error::add_error(__('Missing some required data to toggle the Check-in', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 
-		if ( defined('DOING_AJAX' ) )
+		if (defined('DOING_AJAX'))
 			return $new_status;
 
-		$this->_redirect_after_action( FALSE,'', '', $query_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 
 	}
 
@@ -782,11 +782,11 @@ 
 	 */
 	private function _toggle_checkin($REG_ID, $DTT_ID) {
 		$REG = EEM_Registration::instance()->get_one_by_ID($REG_ID);
-		$new_status = $REG->toggle_checkin_status( $DTT_ID );
-		if ( $new_status !== FALSE ) {
-			EE_Error::add_success($REG->get_checkin_msg($DTT_ID) );
+		$new_status = $REG->toggle_checkin_status($DTT_ID);
+		if ($new_status !== FALSE) {
+			EE_Error::add_success($REG->get_checkin_msg($DTT_ID));
 		} else {
-			EE_Error::add_error($REG->get_checkin_msg($DTT_ID, TRUE), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($REG->get_checkin_msg($DTT_ID, TRUE), __FILE__, __FUNCTION__, __LINE__);
 			$new_status = FALSE;
 		}
 		return $new_status;
@@ -802,28 +802,28 @@ 
 	protected function _delete_checkin_rows() {
 		$query_args = array(
 			'action' => 'registration_checkins',
-			'DTT_ID' => isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : 0,
-			'_REGID' => isset( $this->_req_data['_REGID'] ) ? $this->_req_data['_REGID'] : 0
+			'DTT_ID' => isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : 0,
+			'_REGID' => isset($this->_req_data['_REGID']) ? $this->_req_data['_REGID'] : 0
 			);
-		if ( !empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] ) ) {
-			while ( list( $CHK_ID, $value ) = each( $this->_req_data['checkbox'] ) ) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+			while (list($CHK_ID, $value) = each($this->_req_data['checkbox'])) {
 				$errors = 0;
-				if ( ! EEM_Checkin::instance()->delete_by_ID($CHK_ID ) ) {
+				if ( ! EEM_Checkin::instance()->delete_by_ID($CHK_ID)) {
 					$errors++;
 				}
 			}
 		} else {
-			EE_Error::add_error(__('So, something went wrong with the bulk delete because there was no data received for instructions on WHAT to delete!', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
-			$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+			EE_Error::add_error(__('So, something went wrong with the bulk delete because there was no data received for instructions on WHAT to delete!', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
+			$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 		}
 
-		if ( $errors > 0 ) {
-			EE_Error::add_error( sprintf( __('There were %d records that did not delete successfully', 'event_espresso'), $errors ), __FILE__, __FUNCTION__, __LINE__ );
+		if ($errors > 0) {
+			EE_Error::add_error(sprintf(__('There were %d records that did not delete successfully', 'event_espresso'), $errors), __FILE__, __FUNCTION__, __LINE__);
 		} else {
-			EE_Error::add_success( __('Records were successfully deleted', 'event_espresso') );
+			EE_Error::add_success(__('Records were successfully deleted', 'event_espresso'));
 		}
 
-		$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 	}
 
 
@@ -835,20 +835,20 @@ 
 	protected function _delete_checkin_row() {
 		$query_args = array(
 			'action' => 'registration_checkins',
-			'DTT_ID' => isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : 0,
-			'_REGID' => isset( $this->_req_data['_REGID'] ) ? $this->_req_data['_REGID'] : 0
+			'DTT_ID' => isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : 0,
+			'_REGID' => isset($this->_req_data['_REGID']) ? $this->_req_data['_REGID'] : 0
 			);
 
-		if ( !empty( $this->_req_data['CHK_ID'] ) ) {
-			if ( ! EEM_Checkin::instance()->delete_by_ID($this->_req_data['CHK_ID'] ) ) {
-				EE_Error::add_error(__('Something went wrong and this check-in record was not deleted', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! empty($this->_req_data['CHK_ID'])) {
+			if ( ! EEM_Checkin::instance()->delete_by_ID($this->_req_data['CHK_ID'])) {
+				EE_Error::add_error(__('Something went wrong and this check-in record was not deleted', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			} else {
-				EE_Error::add_success( __('Check-In record successfully deleted', 'event_espresso') );
+				EE_Error::add_success(__('Check-In record successfully deleted', 'event_espresso'));
 			}
 		} else {
-			EE_Error::add_error(__('In order to delete a Check-in record, there must be a Check-In ID available. There is not. It is not your fault, there is just a gremlin living in the code', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('In order to delete a Check-in record, there must be a Check-In ID available. There is not. It is not your fault, there is just a gremlin living in the code', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
-		$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 	}
 
 
@@ -861,8 +861,8 @@ 
 	*		@return void
 	*/
 	protected function _event_registrations_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$this->_admin_page_title .= isset( $this->_req_data['event_id'] ) ? $this->get_action_link_or_button('new_registration', 'add-registrant', array('event_id' => $this->_req_data['event_id']), 'add-new-h2') : '';
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$this->_admin_page_title .= isset($this->_req_data['event_id']) ? $this->get_action_link_or_button('new_registration', 'add-registrant', array('event_id' => $this->_req_data['event_id']), 'add-new-h2') : '';
 
 		$legend_items = array(
 			'star-icon' => array(
@@ -886,31 +886,31 @@ 
 				'desc' => __('View All Check-in Records for this Registrant', 'event_espresso')
 				),
 			'approved_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_approved,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_approved, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_approved,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence')
 				),
             'cancelled_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_cancelled,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_cancelled,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, FALSE, 'sentence')
 				),
             'declined_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_declined,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_declined, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_declined,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_declined, FALSE, 'sentence')
 				),
 			'not_approved' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_not_approved,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_not_approved,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, FALSE, 'sentence')
 				),
 			'pending_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_pending_payment,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_pending_payment,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, FALSE, 'sentence')
 				)/**/
 			);
-		$this->_template_args['after_list_table'] = $this->_display_legend( $legend_items );
+		$this->_template_args['after_list_table'] = $this->_display_legend($legend_items);
 
-		$event_id = isset( $this->_req_data['event_id'] ) ? $this->_req_data['event_id'] : null;
-		$this->_template_args['before_list_table'] = !empty( $event_id ) ? '<h2>' . sprintf(__('Viewing Registrations for Event: %s', 'event_espresso'), EEM_Event::instance()->get_one_by_ID($event_id)->get('EVT_name') ) . '</h2>' : '';
-		$this->_template_args['list_table_hidden_fields'] = !empty( $event_id ) ? '<input type="hidden" name="event_id" value="' . $event_id . '">' : '';
+		$event_id = isset($this->_req_data['event_id']) ? $this->_req_data['event_id'] : null;
+		$this->_template_args['before_list_table'] = ! empty($event_id) ? '<h2>'.sprintf(__('Viewing Registrations for Event: %s', 'event_espresso'), EEM_Event::instance()->get_one_by_ID($event_id)->get('EVT_name')).'</h2>' : '';
+		$this->_template_args['list_table_hidden_fields'] = ! empty($event_id) ? '<input type="hidden" name="event_id" value="'.$event_id.'">' : '';
 
 		$this->display_admin_list_table_page_with_no_sidebar();
 	}
@@ -924,15 +924,15 @@ 
 	*		@access public
 	*		@return array
 	*/
-	public function get_event_attendees( $per_page = 10, $count = FALSE, $trash = FALSE, $orderby = '' ) {
+	public function get_event_attendees($per_page = 10, $count = FALSE, $trash = FALSE, $orderby = '') {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		require_once(EE_MODELS . 'EEM_Attendee.model.php');
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		require_once(EE_MODELS.'EEM_Attendee.model.php');
 		//$ATT_MDL = EEM_Attendee::instance();
 
-		$EVT_ID = isset($this->_req_data['event_id']) ? absint( $this->_req_data['event_id'] ) : FALSE;
-		$CAT_ID = isset($this->_req_data['category_id']) ? absint( $this->_req_data['category_id'] ) : FALSE;
-		$DTT_ID = isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : NULL;
+		$EVT_ID = isset($this->_req_data['event_id']) ? absint($this->_req_data['event_id']) : FALSE;
+		$CAT_ID = isset($this->_req_data['category_id']) ? absint($this->_req_data['category_id']) : FALSE;
+		$DTT_ID = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : NULL;
 
 		$this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : $orderby;
 
@@ -945,94 +945,94 @@ 
 //				$orderby = 'reg.REG_final_price';
 		}
 
-		$sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'ASC';
+		$sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'ASC';
 
-		$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 = $count ? NULL : array( $offset, $per_page );
-		$query_params = array(array('Event.status'=>array('IN',  array_keys(EEM_Event::instance()->get_status_array()))));
-		if ($EVT_ID){
-			$query_params[0]['EVT_ID']=$EVT_ID;
+		$offset = ($current_page - 1) * $per_page;
+		$limit = $count ? NULL : array($offset, $per_page);
+		$query_params = array(array('Event.status'=>array('IN', array_keys(EEM_Event::instance()->get_status_array()))));
+		if ($EVT_ID) {
+			$query_params[0]['EVT_ID'] = $EVT_ID;
 		}
-		if($CAT_ID){
+		if ($CAT_ID) {
 			throw new EE_Error("You specified a Category Id for this query. Thats odd because we are now using terms and taxonomies. So did you mean the term taxonomy id o rthe term id?");
 		}
 
 		//if DTT is included we do multiple datetimes.
-		if ( $DTT_ID ) {
+		if ($DTT_ID) {
 			$query_params[0]['Ticket.Datetime.DTT_ID'] = $DTT_ID;
 		}
 
 		//make sure we only have default where on the current regs
 		$query_params['default_where_conditions'] = 'this_model_only';
 
-		$status_ids_array = apply_filters( 'FHEE__Extend_Registrations_Admin_Page__get_event_attendees__status_ids_array', array( EEM_Registration::status_id_pending_payment, EEM_Registration::status_id_approved ) );
+		$status_ids_array = apply_filters('FHEE__Extend_Registrations_Admin_Page__get_event_attendees__status_ids_array', array(EEM_Registration::status_id_pending_payment, EEM_Registration::status_id_approved));
 
-		$query_params[0]['STS_ID']= array('IN', $status_ids_array );
+		$query_params[0]['STS_ID'] = array('IN', $status_ids_array);
 
-		if($trash){
-			$query_params[0]['Attendee.status']=  EEM_CPT_Base::post_status_trashed;
+		if ($trash) {
+			$query_params[0]['Attendee.status'] = EEM_CPT_Base::post_status_trashed;
 		}
 
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$query_params[0]['OR'] = array(
-				'Event.EVT_name' => array( 'LIKE', $sstr),
-				'Event.EVT_desc' => array( 'LIKE', $sstr ),
-				'Event.EVT_short_desc' => array( 'LIKE' , $sstr ),
-				'Attendee.ATT_fname' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_lname' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_short_bio' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_email' => array('LIKE', $sstr ),
-				'Attendee.ATT_address' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_address2' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_city' => array( 'LIKE', $sstr ),
-				'REG_final_price' => array( 'LIKE', $sstr ),
-				'REG_code' => array( 'LIKE', $sstr ),
-				'REG_count' => array( 'LIKE' , $sstr ),
-				'REG_group_size' => array( 'LIKE' , $sstr ),
-				'Ticket.TKT_name' => array( 'LIKE', $sstr ),
-				'Ticket.TKT_description' => array( 'LIKE', $sstr )
+				'Event.EVT_name' => array('LIKE', $sstr),
+				'Event.EVT_desc' => array('LIKE', $sstr),
+				'Event.EVT_short_desc' => array('LIKE', $sstr),
+				'Attendee.ATT_fname' => array('LIKE', $sstr),
+				'Attendee.ATT_lname' => array('LIKE', $sstr),
+				'Attendee.ATT_short_bio' => array('LIKE', $sstr),
+				'Attendee.ATT_email' => array('LIKE', $sstr),
+				'Attendee.ATT_address' => array('LIKE', $sstr),
+				'Attendee.ATT_address2' => array('LIKE', $sstr),
+				'Attendee.ATT_city' => array('LIKE', $sstr),
+				'REG_final_price' => array('LIKE', $sstr),
+				'REG_code' => array('LIKE', $sstr),
+				'REG_count' => array('LIKE', $sstr),
+				'REG_group_size' => array('LIKE', $sstr),
+				'Ticket.TKT_name' => array('LIKE', $sstr),
+				'Ticket.TKT_description' => array('LIKE', $sstr)
 				);
 		}
 
 		$query_params['order_by'][$orderby] = $sort;
 		$query_params['limit'] = $limit;
-		$query_params['force_join'] = array('Attendee');//force join to attendee model so that it gets cached, because we're going to need the attendee for each registration
-		if($count){
-			$registrations = EEM_Registration::instance()->count(array($query_params[0], 'default_where_conditions' => 'this_model_only' ));
-		}else{
+		$query_params['force_join'] = array('Attendee'); //force join to attendee model so that it gets cached, because we're going to need the attendee for each registration
+		if ($count) {
+			$registrations = EEM_Registration::instance()->count(array($query_params[0], 'default_where_conditions' => 'this_model_only'));
+		} else {
 			$registrations = EEM_Registration::instance()->get_all($query_params);
 
 
 	//		$registrations = EEM_Registration::instance();
 	//		$all_attendees = EEM_Attendee::instance()->get_event_attendees( $EVT_ID, $CAT_ID, $reg_status, $trash, $orderby, $sort, $limit, $output );
-			if ( isset( $registrations[0] ) && $registrations[0] instanceof EE_Registration ) {
+			if (isset($registrations[0]) && $registrations[0] instanceof EE_Registration) {
 				//EEH_Debug_Tools::printr( $all_attendees[0], '$all_attendees[0]  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 				// name
 				$first_registration = $registrations[0];
 				$event_obj = $first_registration->event_obj();
-				if($event_obj){
+				if ($event_obj) {
 					$event_name = $first_registration->event_obj()->name();
-					$event_date = 'TODO: we need to get date from earliest price date or should this be the actual event date?';//$first_registration->date_obj()->reg_start_date_and_time('l F j, Y,', ' g:i:s a');// isset( $registrations[0]->DTT_EVT_start ) ? date( 'l F j, Y,    g:i:s a', $registrations[0]->DTT_EVT_start ) : '';
+					$event_date = 'TODO: we need to get date from earliest price date or should this be the actual event date?'; //$first_registration->date_obj()->reg_start_date_and_time('l F j, Y,', ' g:i:s a');// isset( $registrations[0]->DTT_EVT_start ) ? date( 'l F j, Y,    g:i:s a', $registrations[0]->DTT_EVT_start ) : '';
 					// edit event link
-					if ( $event_name != '' ) {
-						$edit_event_url = self::add_query_args_and_nonce( array( 'action'=>'edit_event', 'EVT_ID'=>$EVT_ID ), EVENTS_ADMIN_URL );
-						$edit_event_lnk = '<a href="'.$edit_event_url.'" title="' . esc_attr__( 'Edit ', 'event_espresso' ) . $event_name . '">' . __( 'Edit Event', 'event_espresso' ) . '</a>';
-						$event_name .= ' <span class="admin-page-header-edit-lnk not-bold">' . $edit_event_lnk . '</span>' ;
+					if ($event_name != '') {
+						$edit_event_url = self::add_query_args_and_nonce(array('action'=>'edit_event', 'EVT_ID'=>$EVT_ID), EVENTS_ADMIN_URL);
+						$edit_event_lnk = '<a href="'.$edit_event_url.'" title="'.esc_attr__('Edit ', 'event_espresso').$event_name.'">'.__('Edit Event', 'event_espresso').'</a>';
+						$event_name .= ' <span class="admin-page-header-edit-lnk not-bold">'.$edit_event_lnk.'</span>';
 					}
 
-					$back_2_reg_url = self::add_query_args_and_nonce( array( 'action'=>'default' ), REG_ADMIN_URL );
-					$back_2_reg_lnk = '<a href="'.$back_2_reg_url.'" title="' . esc_attr__( 'click to return to viewing all registrations ', 'event_espresso' ) . '">&laquo; ' . __( 'Back to All Registrations', 'event_espresso' ) . '</a>';
+					$back_2_reg_url = self::add_query_args_and_nonce(array('action'=>'default'), REG_ADMIN_URL);
+					$back_2_reg_lnk = '<a href="'.$back_2_reg_url.'" title="'.esc_attr__('click to return to viewing all registrations ', 'event_espresso').'">&laquo; '.__('Back to All Registrations', 'event_espresso').'</a>';
 
 					$this->_template_args['before_admin_page_content'] = '
 				<div id="admin-page-header">
-					<h1><span class="small-text not-bold">'.__( 'Event: ', 'event_espresso' ).'</span>'. $event_name .'</h1>
-					<h3><span class="small-text not-bold">'.__( 'Date: ', 'event_espresso' ). '</span>'. $event_date .'</h3>
-					<span class="admin-page-header-go-back-lnk not-bold">' . $back_2_reg_lnk . '</span>
+					<h1><span class="small-text not-bold">'.__('Event: ', 'event_espresso').'</span>'.$event_name.'</h1>
+					<h3><span class="small-text not-bold">'.__('Date: ', 'event_espresso').'</span>'.$event_date.'</h3>
+					<span class="admin-page-header-go-back-lnk not-bold">' . $back_2_reg_lnk.'</span>
 				</div>
 				';
 				}

caffeinated/admin/extend/registrations/templates/newsletter-send-form.template.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
                 <input type="hidden" id="get_newsletter_form_content_nonce" name="get_newsletter_form_content_nonce" value="<?php echo $ajax_nonce; ?>">
                 <input type="hidden" name="batch_message[id_type]" value="<?php echo $id_type; ?>">
                 <input id="newsletter-batch-ids" type="hidden" name="batch_message[ids]" value="">
-                <h3 class="newsletter-send-form-title"><?php printf( __('Sending batch message to %s people...', 'event_espresso'), '[NUMPEOPLE]' ); ?></h3>
+                <h3 class="newsletter-send-form-title"><?php printf(__('Sending batch message to %s people...', 'event_espresso'), '[NUMPEOPLE]'); ?></h3>
                 <label for="batch-message-template-selector"><?php _e('Select Template:', 'event_espresso'); ?></label>
                 <?php echo $template_selector; ?>
                 <div class="batch-message-edit-fields" style="display:none;">

caffeinated/admin/extend/support/templates/support_admin_details_faq.template.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 		</dt>
 		<dd>
             <p>
-            <?php printf( __('You can add the events or venues page as items to the navigation menu by going to Appearance --> Menus and check the boxes found under the %sEvent Espresso Pages%s section. Then click the Add to Menu button and finally click on the Save Menu button.', 'event_espresso'), '<strong>', '</strong>' ); ?>
+            <?php printf(__('You can add the events or venues page as items to the navigation menu by going to Appearance --> Menus and check the boxes found under the %sEvent Espresso Pages%s section. Then click the Add to Menu button and finally click on the Save Menu button.', 'event_espresso'), '<strong>', '</strong>'); ?>
             <br />
 			<?php _e('Quick Link:', 'event_espresso'); ?>
 			<a href="<?php echo site_url('/wp-admin/nav-menus.php'); ?>"><?php _e('Menu Manager', 'event_espresso'); ?></a>

caffeinated/admin/new/pricing/Price_Types_List_Table.class.php

Spacing +30 added lines, -30 removed lines

@@ -28,9 +28,9 @@ 
  */
 class Price_Types_List_Table extends EE_Admin_List_Table {
 
-	public function __construct( $admin_page ) {
+	public function __construct($admin_page) {
 		parent::__construct($admin_page);
-		require_once(EE_MODELS . 'EEM_Price_Type.model.php');
+		require_once(EE_MODELS.'EEM_Price_Type.model.php');
 		$this->_PRT = EEM_Price_Type::instance();
 	}
 
@@ -39,9 +39,9 @@ 
 
 	protected function _setup_data() {
 		$trashed = $this->_admin_page->get_view() == 'trashed' ? TRUE : FALSE;
-		$this->_data = $this->_admin_page->get_price_types_overview_data( $this->_per_page, FALSE, $trashed );
-		$this->_all_data_count = $this->_admin_page->get_price_types_overview_data( $this->_per_page, TRUE, FALSE );
-		$this->_trashed_count = $this->_admin_page->get_price_types_overview_data( $this->_per_page, TRUE, TRUE );
+		$this->_data = $this->_admin_page->get_price_types_overview_data($this->_per_page, FALSE, $trashed);
+		$this->_all_data_count = $this->_admin_page->get_price_types_overview_data($this->_per_page, TRUE, FALSE);
+		$this->_trashed_count = $this->_admin_page->get_price_types_overview_data($this->_per_page, TRUE, TRUE);
 	}
 
 
@@ -57,14 +57,14 @@ 
 		$this->_columns = array(
 				'cb' => '<input type="checkbox" />', //Render a checkbox instead of text
 				'name' => __('Name', 'event_espresso'),
-				'base_type' => '<div class="jst-cntr">' . __('Base Type', 'event_espresso') . '</div>',
-				'percent' => '<div class="jst-cntr">' . __('Applied', 'event_espresso') . '<br/>' . __('as ', 'event_espresso') . '<span class="big-text">' . __('%', 'event_espresso') . '</span>' . __(' or ', 'event_espresso') . '<span class="big-text">' . __('$', 'event_espresso') . '</span></div>',
-				'order' => '<div class="jst-cntr">' . __('Order of', 'event_espresso') . '<br/>' . __('Application', 'event_espresso') . '</div>'
+				'base_type' => '<div class="jst-cntr">'.__('Base Type', 'event_espresso').'</div>',
+				'percent' => '<div class="jst-cntr">'.__('Applied', 'event_espresso').'<br/>'.__('as ', 'event_espresso').'<span class="big-text">'.__('%', 'event_espresso').'</span>'.__(' or ', 'event_espresso').'<span class="big-text">'.__('$', 'event_espresso').'</span></div>',
+				'order' => '<div class="jst-cntr">'.__('Order of', 'event_espresso').'<br/>'.__('Application', 'event_espresso').'</div>'
 			);
 
 		$this->_sortable_columns = array(
 			// TRUE means its already sorted
-			'name' => array( 'name' => FALSE )
+			'name' => array('name' => FALSE)
 		);
 
 		$this->_hidden_columns = array();
@@ -82,7 +82,7 @@ 
 
 	protected function _add_view_counts() {
 		$this->_views['all']['count'] = $this->_all_data_count;
-		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']['count'] = $this->_trashed_count;
 		}
 	}
@@ -92,8 +92,8 @@ 
 
 
 	function column_cb($item) {
-		if ( $item->base_type() !== 1 )
-			return sprintf( '<input type="checkbox" name="checkbox[%1$s]" />', /* $1%s */ $item->ID() );
+		if ($item->base_type() !== 1)
+			return sprintf('<input type="checkbox" name="checkbox[%1$s]" />', /* $1%s */ $item->ID());
 		return '';
 	}
 
@@ -106,30 +106,30 @@ 
 		//Build row actions
 		$actions = array();
 		// edit price link
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_default_price_type', 'pricing_edit_price_type', $item->ID() ) ) {
-			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit_price_type', 'id'=>$item->ID() ), PRICING_ADMIN_URL );
-			$actions['edit'] = '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Price Type', 'event_espresso' ) . '">' . __( 'Edit', 'event_espresso' ) . '</a>';
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_default_price_type', 'pricing_edit_price_type', $item->ID())) {
+			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit_price_type', 'id'=>$item->ID()), PRICING_ADMIN_URL);
+			$actions['edit'] = '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Price Type', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>';
 		}
 
-		$name_link = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_default_price_type', 'pricing_edit_price_type', $item->ID() ) ? '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Price Type', 'event_espresso' ) . '">' . stripslashes( $item->name() ) . '</a>' : $item->name();
+		$name_link = EE_Registry::instance()->CAP->current_user_can('ee_edit_default_price_type', 'pricing_edit_price_type', $item->ID()) ? '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Price Type', 'event_espresso').'">'.stripslashes($item->name()).'</a>' : $item->name();
 
-		if ( $item->base_type() !== 1 ) {
-			if ( $this->_view == 'all' ) {
+		if ($item->base_type() !== 1) {
+			if ($this->_view == 'all') {
 				// trash price link
-				if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_price_type', 'pricing_trash_price_type', $item->ID() ) ) {
-					$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'trash_price_type', 'id'=>$item->ID(), 'noheader' => TRUE ), PRICING_ADMIN_URL );
-					$actions['trash'] = '<a href="'.$trash_lnk_url.'" title="' . esc_attr__( 'Move Price Type to Trash', 'event_espresso' ) . '">' . __( 'Move to Trash', 'event_espresso' ) . '</a>';
+				if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_price_type', 'pricing_trash_price_type', $item->ID())) {
+					$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'trash_price_type', 'id'=>$item->ID(), 'noheader' => TRUE), PRICING_ADMIN_URL);
+					$actions['trash'] = '<a href="'.$trash_lnk_url.'" title="'.esc_attr__('Move Price Type to Trash', 'event_espresso').'">'.__('Move to Trash', 'event_espresso').'</a>';
 				}
 			} else {
 				// restore price link
-				if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_price_type', 'pricing_restore_price_type', $item->ID() ) ) {
-					$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'restore_price_type', 'id'=>$item->ID(), 'noheader' => TRUE ), PRICING_ADMIN_URL );
-					$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="' . esc_attr__( 'Restore Price Type', 'event_espresso' ) . '">' . __( 'Restore', 'event_espresso' ) . '</a>';
+				if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_price_type', 'pricing_restore_price_type', $item->ID())) {
+					$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'restore_price_type', 'id'=>$item->ID(), 'noheader' => TRUE), PRICING_ADMIN_URL);
+					$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="'.esc_attr__('Restore Price Type', 'event_espresso').'">'.__('Restore', 'event_espresso').'</a>';
 				}
 				// delete price link
-				if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_price_type', 'pricing_delete_price_type', $item->ID() ) ) {
-					$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'delete_price_type', 'id'=>$item->ID(), 'noheader' => TRUE ), PRICING_ADMIN_URL );
-					$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="' . esc_attr__( 'Delete Price Type Permanently', 'event_espresso' ) . '">' . __( 'Delete Permanently', 'event_espresso' ) . '</a>';
+				if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_price_type', 'pricing_delete_price_type', $item->ID())) {
+					$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'delete_price_type', 'id'=>$item->ID(), 'noheader' => TRUE), PRICING_ADMIN_URL);
+					$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="'.esc_attr__('Delete Price Type Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>';
 				}
 			}
 		}
@@ -147,14 +147,14 @@ 
 
 
 	function column_base_type($item) {
-		return '<div class="jst-cntr">' . $item->base_type_name()  . '</div>';
+		return '<div class="jst-cntr">'.$item->base_type_name().'</div>';
 	}
 
 
 
 
 	function column_percent($item) {
-		return '<div class="jst-cntr">' . ( $item->is_percent() ? '%' : EE_Registry::instance()->CFG->currency->sign ) . '</div>';
+		return '<div class="jst-cntr">'.($item->is_percent() ? '%' : EE_Registry::instance()->CFG->currency->sign).'</div>';
 	}
 
 
@@ -162,7 +162,7 @@ 
 
 
 	function column_order($item) {
-		return '<div class="jst-cntr">' . $item->order() . '</div>';
+		return '<div class="jst-cntr">'.$item->order().'</div>';
 	}
 
 

Braces +6 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -92,8 +94,9 @@ 
 
 
 	function column_cb($item) {
-		if ( $item->base_type() !== 1 )
-			return sprintf( '<input type="checkbox" name="checkbox[%1$s]" />', /* $1%s */ $item->ID() );
+		if ( $item->base_type() !== 1 ) {
+					return sprintf( '<input type="checkbox" name="checkbox[%1$s]" />', /* $1%s */ $item->ID() );
+		}
 		return '';
 	}
 

caffeinated/admin/new/pricing/Prices_List_Table.class.php

Indentation +2 added lines, -2 removed lines

@@ -79,10 +79,10 @@
 						'amount' => array( 'amount' => FALSE )
 			);
 
-        $this->_hidden_columns = array(
+		$this->_hidden_columns = array(
 			);
 
-        $this->_ajax_sorting_callback = 'update_prices_order';
+		$this->_ajax_sorting_callback = 'update_prices_order';
 
 	}
 

Braces +9 added lines, -5 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -118,8 +120,9 @@ 
 
 		$new_row = $row_class;
 
-		if ( $item->type_obj()->base_type() !== 1 && $item->type_obj()->base_type() !== 4 )
-			$new_row .= ' rowsortable';
+		if ( $item->type_obj()->base_type() !== 1 && $item->type_obj()->base_type() !== 4 ) {
+					$new_row .= ' rowsortable';
+		}
 
 		return ' class="' . $new_row . '"';
 	}
@@ -131,8 +134,9 @@ 
 
 
 	function column_cb($item) {
-		if ( $item->type_obj()->base_type() !== 1 )
-			return sprintf( '<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', /* $1%s */ $item->ID() );
+		if ( $item->type_obj()->base_type() !== 1 ) {
+					return sprintf( '<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', /* $1%s */ $item->ID() );
+		}
 		return '';
 	}
 

Spacing +33 added lines, -33 removed lines

@@ -36,9 +36,9 @@ 
 	 */
 	protected $_price_types = array();
 
-	public function __construct( $admin_page ) {
+	public function __construct($admin_page) {
 		parent::__construct($admin_page);
-		require_once(EE_MODELS . 'EEM_Price_Type.model.php');
+		require_once(EE_MODELS.'EEM_Price_Type.model.php');
 		$this->_PRT = EEM_Price_Type::instance();
 		$this->_price_types = $this->_PRT->get_all_deleted_and_undeleted();
 	}
@@ -48,9 +48,9 @@ 
 
 	protected function _setup_data() {
 		$trashed = $this->_admin_page->get_view() == 'trashed' ? true : false;
-		$this->_data = $this->_admin_page->get_prices_overview_data( $this->_per_page, false, $trashed );
-		$this->_all_data_count = $this->_admin_page->get_prices_overview_data( $this->_per_page, true, false );
-		$this->_trashed_count = $this->_admin_page->get_prices_overview_data( $this->_per_page, true, true );
+		$this->_data = $this->_admin_page->get_prices_overview_data($this->_per_page, false, $trashed);
+		$this->_all_data_count = $this->_admin_page->get_prices_overview_data($this->_per_page, true, false);
+		$this->_trashed_count = $this->_admin_page->get_prices_overview_data($this->_per_page, true, true);
 	}
 
 
@@ -74,9 +74,9 @@ 
 
 			$this->_sortable_columns = array(
 						// true means its already sorted
-						'name' => array( 'name' => false ),
-						'type' => array( 'type' => false ),
-						'amount' => array( 'amount' => false )
+						'name' => array('name' => false),
+						'type' => array('type' => false),
+						'amount' => array('amount' => false)
 			);
 
         $this->_hidden_columns = array(
@@ -98,7 +98,7 @@ 
 
 	protected function _add_view_counts() {
 		$this->_views['all']['count'] = $this->_all_data_count;
-		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']['count'] = $this->_trashed_count;
 		}
 	}
@@ -112,16 +112,16 @@ 
 	 * @param  object $item the current item
 	 * @return string
 	 */
-	protected function _get_row_class( $item ) {
+	protected function _get_row_class($item) {
 		static $row_class = '';
-		$row_class = ( $row_class == '' ? 'alternate' : '' );
+		$row_class = ($row_class == '' ? 'alternate' : '');
 
 		$new_row = $row_class;
 
-		if ( $item->type_obj()->base_type() !== 1 && $item->type_obj()->base_type() !== 4 )
+		if ($item->type_obj()->base_type() !== 1 && $item->type_obj()->base_type() !== 4)
 			$new_row .= ' rowsortable';
 
-		return ' class="' . $new_row . '"';
+		return ' class="'.$new_row.'"';
 	}
 
 
@@ -131,8 +131,8 @@ 
 
 
 	function column_cb($item) {
-		if ( $item->type_obj()->base_type() !== 1 )
-			return sprintf( '<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', /* $1%s */ $item->ID() );
+		if ($item->type_obj()->base_type() !== 1)
+			return sprintf('<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', /* $1%s */ $item->ID());
 		return '';
 	}
 
@@ -145,31 +145,31 @@ 
 		//Build row actions
 		$actions = array();
 		// edit price link
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_default_price', 'pricing_edit_price', $item->ID() ) ) {
-			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit_price', 'id'=>$item->ID() ), PRICING_ADMIN_URL );
-			$actions['edit'] = '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Price', 'event_espresso' ) . '">' . __( 'Edit', 'event_espresso' ) . '</a>';
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_default_price', 'pricing_edit_price', $item->ID())) {
+			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit_price', 'id'=>$item->ID()), PRICING_ADMIN_URL);
+			$actions['edit'] = '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Price', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>';
 		}
 
-		$name_link = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_default_price', 'edit_price', $item->ID() ) ? '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Price', 'event_espresso' ) . '">' . stripslashes( $item->name() ) . '</a>' : $item->name();
+		$name_link = EE_Registry::instance()->CAP->current_user_can('ee_edit_default_price', 'edit_price', $item->ID()) ? '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Price', 'event_espresso').'">'.stripslashes($item->name()).'</a>' : $item->name();
 
-		if ( $item->type_obj()->base_type() !== 1 ) {
+		if ($item->type_obj()->base_type() !== 1) {
 			if ($this->_view == 'all') {
 				// trash price link
-				if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_price', 'pricing_trash_price', $item->ID() ) ) {
-					$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'trash_price', 'id'=>$item->ID(), 'noheader' => true ), PRICING_ADMIN_URL );
-					$actions['trash'] = '<a href="'.$trash_lnk_url.'" title="' . esc_attr__( 'Move Price to Trash', 'event_espresso' ) . '">' . __( 'Move to Trash', 'event_espresso' ) . '</a>';
+				if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_price', 'pricing_trash_price', $item->ID())) {
+					$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'trash_price', 'id'=>$item->ID(), 'noheader' => true), PRICING_ADMIN_URL);
+					$actions['trash'] = '<a href="'.$trash_lnk_url.'" title="'.esc_attr__('Move Price to Trash', 'event_espresso').'">'.__('Move to Trash', 'event_espresso').'</a>';
 				}
 			} else {
-				if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_price', 'pricing_restore_price', $item->ID() ) ) {
+				if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_price', 'pricing_restore_price', $item->ID())) {
 					// restore price link
-					$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'restore_price', 'id'=>$item->ID(), 'noheader' => true ), PRICING_ADMIN_URL );
-					$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="' . esc_attr__( 'Restore Price', 'event_espresso' ) . '">' . __( 'Restore', 'event_espresso' ) . '</a>';
+					$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'restore_price', 'id'=>$item->ID(), 'noheader' => true), PRICING_ADMIN_URL);
+					$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="'.esc_attr__('Restore Price', 'event_espresso').'">'.__('Restore', 'event_espresso').'</a>';
 				}
 
 				// delete price link
-				if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_price', 'pricing_delete_price', $item->ID() ) ) {
-					$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'delete_price', 'id'=>$item->ID(), 'noheader' => true ), PRICING_ADMIN_URL );
-					$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="' . esc_attr__( 'Delete Price Permanently', 'event_espresso' ) . '">' . __( 'Delete Permanently', 'event_espresso' ) . '</a>';
+				if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_price', 'pricing_delete_price', $item->ID())) {
+					$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'delete_price', 'id'=>$item->ID(), 'noheader' => true), PRICING_ADMIN_URL);
+					$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="'.esc_attr__('Delete Price Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>';
 				}
 			}
 		}
@@ -178,7 +178,7 @@ 
 		return sprintf('%1$s <span style="color:silver">(id:%2$s)</span>%3$s',
 										/* $1%s */ $name_link,
 										/* $2%s */ $item->ID(),
-										/* $3%s */ $this->row_actions( $actions )
+										/* $3%s */ $this->row_actions($actions)
 		);
 	}
 
@@ -195,7 +195,7 @@ 
 
 
 	function column_description($item) {
-		return stripslashes( $item->desc() );
+		return stripslashes($item->desc());
 	}
 
 
@@ -204,9 +204,9 @@ 
 
 	function column_amount($item) {
 		if ($this->_price_types[$item->type()]->is_percent()) {
-			return '<div class="pad-amnt-rght">' . number_format($item->amount(), 1) . '%</div>';
+			return '<div class="pad-amnt-rght">'.number_format($item->amount(), 1).'%</div>';
 		} else {
-			return '<div class="pad-amnt-rght">' . EEH_Template::format_currency( $item->amount() ) . '</div>';
+			return '<div class="pad-amnt-rght">'.EEH_Template::format_currency($item->amount()).'</div>';
 		}
 	}
 

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

Indentation +81 added lines, -81 removed lines

@@ -78,9 +78,9 @@ 
 
 	/**
 	 * 		an array for storing request actions and their corresponding methods
-	*		@access private
-	*		@return void
-	*/
+	 *		@access private
+	 *		@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;
@@ -200,7 +200,7 @@ 
 							'order' => 10
 						),
 					'list_table' => 'Prices_List_Table',
-                    'help_tabs' => array(
+					'help_tabs' => array(
 						'pricing_default_pricing_help_tab' => array(
 							'title' => __('Default Pricing', 'event_espresso'),
 							'filename' => 'pricing_default_pricing'
@@ -223,13 +223,13 @@ 
 							'order' => 20,
 							'persistent' => FALSE
 						),
-                    'help_tabs' => array(
+					'help_tabs' => array(
 						'add_new_default_price_help_tab' => array(
 							'title' => __('Add New Default Price', 'event_espresso'),
 							'filename' => 'pricing_add_new_default_price'
 							)
 						),
-                    'help_tour' => array('Pricing_Add_New_Default_Price_Help_Tour'),
+					'help_tour' => array('Pricing_Add_New_Default_Price_Help_Tour'),
 					'metaboxes' => array( '_publish_post_box', '_espresso_news_post_box', '_price_details_meta_boxes' ),
 					'require_nonce' => FALSE
 				),
@@ -241,7 +241,7 @@ 
 							'persistent' => FALSE
 						),
 					'metaboxes' => array( '_publish_post_box', '_espresso_news_post_box', '_price_details_meta_boxes' ),
-                    'help_tabs' => array(
+					'help_tabs' => array(
 						'edit_default_price_help_tab' => array(
 							'title' => __('Edit Default Price', 'event_espresso'),
 							'filename' => 'pricing_edit_default_price'
@@ -256,7 +256,7 @@ 
 							'order' => 30
 						),
 					'list_table' => 'Price_Types_List_Table',
-                    'help_tabs' => array(
+					'help_tabs' => array(
 						'pricing_price_types_help_tab' => array(
 							'title' => __('Price Types', 'event_espresso'),
 							'filename' => 'pricing_price_types'
@@ -280,13 +280,13 @@ 
 							'order' => 40,
 							'persistent' => FALSE
 						),
-                    'help_tabs' => array(
+					'help_tabs' => array(
 						'add_new_price_type_help_tab' => array(
 							'title' => __('Add New Price Type', 'event_espresso'),
 							'filename' => 'pricing_add_new_price_type'
 							)
 						),
-                    'help_tour' => array( 'Pricing_Add_New_Price_Type_Help_Tour' ),
+					'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
 				),
@@ -296,13 +296,13 @@ 
 							'order' => 40,
 							'persistent' => FALSE
 						),
-                    'help_tabs' => array(
+					'help_tabs' => array(
 						'edit_price_type_help_tab' => array(
 							'title' => __('Edit Price Type', 'event_espresso'),
 							'filename' => 'pricing_edit_price_type'
 							)
 						),
-                    'help_tour' => array( 'Pricing_Edit_Price_Type_Help_Tour' ),
+					'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
@@ -433,9 +433,9 @@ 
 
 	/**
 	 * 		generates HTML for main Prices Admin page
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function _price_overview_list_table() {
 		$this->_admin_page_title .= $this->get_action_link_or_button('add_new_price', 'add', array(), 'add-new-h2');
 		$this->admin_page_title .= $this->_learn_more_about_pricing_link();
@@ -449,13 +449,13 @@ 
 
 
 	/**
-	*	retrieve data for Prices List table
-	*	@access public
-	* 	@param  int  $per_page    how many prices displayed per page
-	* 	@param  boolean $count   return the count or objects
-	* 	@param  boolean $trashed   whether the current view is of the trash can - eww yuck!
-	* 	@return mixed (int|array)  int = count || array of price objects
-	*/
+	 *	retrieve data for Prices List table
+	 *	@access public
+	 * 	@param  int  $per_page    how many prices displayed per page
+	 * 	@param  boolean $count   return the count or objects
+	 * 	@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 ) {
 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
@@ -525,9 +525,9 @@ 
 
 	/**
 	 * 		_price_details
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function _edit_price_details() {
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 		// grab price ID
@@ -587,9 +587,9 @@ 
 
 	/**
 	 * 		declare price details page metaboxes
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@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' );
 	}
@@ -601,9 +601,9 @@ 
 
 	/**
 	 * 		_edit_price_details_meta_box
-	*		@access public
-	*		@return void
-	*/
+	 *		@access public
+	 *		@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 );
 	}
@@ -614,9 +614,9 @@ 
 
 	/**
 	 * 		set_price_column_values
-	*		@access protected
-	*		@return array
-	*/
+	 *		@access protected
+	 *		@return array
+	 */
 	protected function set_price_column_values() {
 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
@@ -643,10 +643,10 @@ 
 
 	/**
 	 * 		insert_or_update_price
-	*		@param boolean 		$insert - whether to insert or update
-	*		@access protected
-	*		@return void
-	*/
+	 *		@param boolean 		$insert - whether to insert or update
+	 *		@access protected
+	 *		@return void
+	 */
 	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>';
@@ -719,10 +719,10 @@ 
 
 	/**
 	 * 		_trash_or_restore_price
-	*		@param boolean 		$trash - whether to move item to trash (TRUE) or restore it (FALSE)
-	*		@access protected
-	*		@return void
-	*/
+	 *		@param boolean 		$trash - whether to move item to trash (TRUE) or restore it (FALSE)
+	 *		@access protected
+	 *		@return void
+	 */
 	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>';
@@ -802,9 +802,9 @@ 
 
 	/**
 	 * 		_delete_price
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function _delete_price() {
 
 		//echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
@@ -881,9 +881,9 @@ 
 
 	/**
 	 * 		generates HTML for main Prices Admin page
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function _price_types_overview_list_table() {
 		$this->_admin_page_title .= $this->get_action_link_or_button('add_new_price_type', 'add_type', array(), 'add-new-h2');
 		$this->admin_page_title .= $this->_learn_more_about_pricing_link();
@@ -897,13 +897,13 @@ 
 
 
 	/**
-	*	retrieve data for Price Types List table
-	*	@access public
-	* 	@param  int  $per_page    how many prices displayed per page
-	* 	@param  boolean $count   return the count or objects
-	* 	@param  boolean $trashed   whether the current view is of the trash can - eww yuck!
-	* 	@return mixed (int|array)  int = count || array of price objects
-	*/
+	 *	retrieve data for Price Types List table
+	 *	@access public
+	 * 	@param  int  $per_page    how many prices displayed per page
+	 * 	@param  boolean $count   return the count or objects
+	 * 	@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 ) {
 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
@@ -958,9 +958,9 @@ 
 
 	/**
 	 * 		_edit_price_type_details
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function _edit_price_type_details() {
 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
@@ -1015,9 +1015,9 @@ 
 
 	/**
 	 * 		declare price type details page metaboxes
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@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' );
 	}
@@ -1028,9 +1028,9 @@ 
 
 	/**
 	 * 		_edit_price_type_details_meta_box
-	*		@access public
-	*		@return void
-	*/
+	 *		@access public
+	 *		@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 );
 	}
@@ -1040,9 +1040,9 @@ 
 
 	/**
 	 * 		set_price_type_column_values
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function set_price_type_column_values() {
 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
@@ -1090,10 +1090,10 @@ 
 
 	/**
 	 * 		_insert_or_update_price_type
-	*		@param boolean 		$new_price_type - whether to insert or update
-	*		@access protected
-	*		@return void
-	*/
+	 *		@param boolean 		$new_price_type - whether to insert or update
+	 *		@access protected
+	 *		@return void
+	 */
 	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>';
@@ -1134,10 +1134,10 @@ 
 
 	/**
 	 * 		_trash_or_restore_price_type
-	*		@param boolean 		$trash - whether to move item to trash (TRUE) or restore it (FALSE)
-	*		@access protected
-	*		@return void
-	*/
+	 *		@param boolean 		$trash - whether to move item to trash (TRUE) or restore it (FALSE)
+	 *		@access protected
+	 *		@return void
+	 */
 	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>';
@@ -1191,9 +1191,9 @@ 
 
 	/**
 	 * 		_delete_price_type
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	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>';
@@ -1230,9 +1230,9 @@ 
 
 	/**
 	 * 		_learn_more_about_pricing_link
-	*		@access protected
-	*		@return string
-	*/
+	 *		@access protected
+	 *		@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>';
 	}

Braces +5 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -513,7 +515,7 @@ 
 
 		if($count){
 			return EEM_Price::instance()->count_deleted_and_undeleted(array($_where));
-		}else{
+		} else{
 			return EEM_Price::instance()->get_all_deleted_and_undeleted($query_params);
 		}
 	}
@@ -943,7 +945,7 @@ 
 			'limit'=>$limit);
 		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);
 		}
 

Spacing +184 added lines, -184 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,40 +529,40 @@ 
 	*		@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
-		$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) {
@@ -575,7 +575,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();
 	}
@@ -591,7 +591,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');
 	}
 
 
@@ -605,7 +605,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);
 	}
 
 
@@ -619,7 +619,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']),
@@ -647,12 +647,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 ???  : (
@@ -660,14 +660,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;
@@ -677,29 +677,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();
 				}
 			}
@@ -707,9 +707,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);
 
 	}
 
@@ -723,12 +723,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;
@@ -737,18 +737,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');
@@ -760,14 +760,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');
@@ -781,17 +781,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);
 
 	}
 
@@ -808,19 +808,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;
 				}
 			}
@@ -834,7 +834,7 @@ 
 
 		}
 
-		$this->_redirect_after_action( $success, 'Prices', 'deleted', array() );
+		$this->_redirect_after_action($success, 'Prices', 'deleted', array());
 
 	}
 
@@ -842,16 +842,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;
 				}
 			}
@@ -859,9 +859,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();
 	}
 
@@ -904,46 +904,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);
 		}
 
@@ -963,25 +963,25 @@ 
 	*/
 	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
-		$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;
@@ -990,19 +990,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();
 
@@ -1019,7 +1019,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');
 	}
 
 
@@ -1032,7 +1032,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);
 	}
 
 
@@ -1045,9 +1045,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) {
 
@@ -1094,12 +1094,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 ???  : (
@@ -1107,24 +1107,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);
 
 	}
 
@@ -1138,49 +1138,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);
 
 	}
 
@@ -1197,19 +1197,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;
 				}
 			}
@@ -1217,8 +1217,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);
 
 	}
 
@@ -1234,7 +1234,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/Pricing_Admin_Page_Init.core.php

Spacing +13 added lines, -13 removed lines

@@ -23,7 +23,7 @@ 
 *
 * ------------------------------------------------------------------------
 */
-class Pricing_Admin_Page_Init extends EE_Admin_Page_Init  {
+class Pricing_Admin_Page_Init extends EE_Admin_Page_Init {
 
 
 
@@ -36,20 +36,20 @@ 
 	 */
 	public function __construct() {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		define( 'PRICING_PG_SLUG', 'pricing' );
-		define( 'PRICING_LABEL', __('Pricing', 'event_espresso'));
-		define( 'PRICING_PG_NAME', ucwords( str_replace( '_', '', PRICING_PG_SLUG )));
-		define( 'PRICING_ADMIN', EE_CORE_CAF_ADMIN . 'new' . DS . PRICING_PG_SLUG . DS );
-		define( 'PRICING_ADMIN_URL', admin_url( 'admin.php?page=' . PRICING_PG_SLUG ));
-		define( 'PRICING_ASSETS_PATH', PRICING_ADMIN . 'assets' . DS );
-		define( 'PRICING_ASSETS_URL', EE_CORE_CAF_ADMIN_URL . 'new' . DS . PRICING_PG_SLUG .'/assets/' );
-		define( 'PRICING_TEMPLATE_PATH', PRICING_ADMIN . 'templates' . DS );
-		define( 'PRICING_TEMPLATE_URL', EE_CORE_CAF_ADMIN_URL . 'new' . DS . PRICING_PG_SLUG . DS . 'templates/' );
+		define('PRICING_PG_SLUG', 'pricing');
+		define('PRICING_LABEL', __('Pricing', 'event_espresso'));
+		define('PRICING_PG_NAME', ucwords(str_replace('_', '', PRICING_PG_SLUG)));
+		define('PRICING_ADMIN', EE_CORE_CAF_ADMIN.'new'.DS.PRICING_PG_SLUG.DS);
+		define('PRICING_ADMIN_URL', admin_url('admin.php?page='.PRICING_PG_SLUG));
+		define('PRICING_ASSETS_PATH', PRICING_ADMIN.'assets'.DS);
+		define('PRICING_ASSETS_URL', EE_CORE_CAF_ADMIN_URL.'new'.DS.PRICING_PG_SLUG.'/assets/');
+		define('PRICING_TEMPLATE_PATH', PRICING_ADMIN.'templates'.DS);
+		define('PRICING_TEMPLATE_URL', EE_CORE_CAF_ADMIN_URL.'new'.DS.PRICING_PG_SLUG.DS.'templates/');
 
 		parent::__construct();
-		$this->_folder_path = EE_CORE_CAF_ADMIN . 'new' . DS . $this->_folder_name . DS;
+		$this->_folder_path = EE_CORE_CAF_ADMIN.'new'.DS.$this->_folder_name.DS;
 
 	}
 
@@ -64,7 +64,7 @@ 
 
 
 	protected function _set_menu_map() {
-		$this->_menu_map = new EE_Admin_Page_Sub_Menu( array(
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(array(
 			'menu_group' => 'management',
 			'menu_order' => 20,
 			'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,

Braces +3 added lines, -1 removed lines

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

caffeinated/admin/new/pricing/help_tours/Pricing_Add_New_Default_Price_Help_Tour.class.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -78,25 +78,25 @@ 
 
 
 	protected function _start() {
-		$content = '<h3>' . __('Add New Default Price', 'event_espresso') . '</h3>';
-		$content .= '<p>' . __('This tour of the add new default price page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
+		$content = '<h3>'.__('Add New Default Price', 'event_espresso').'</h3>';
+		$content .= '<p>'.__('This tour of the add new default price page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso').'</p>';
 		return $content;
 	}
 
 	protected function _price_type_stop() {
-		return '<p>' . __('Price Types are a way of categorizing a price, discount, tax, or surcharge and indicating how it gets applied to a running total when a transaction occurs.', 'event_espresso') . '</p>';
+		return '<p>'.__('Price Types are a way of categorizing a price, discount, tax, or surcharge and indicating how it gets applied to a running total when a transaction occurs.', 'event_espresso').'</p>';
 	}
 
 	protected function _price_name_stop() {
-		return '<p>' . __('The name of the price, discount, tax, or surcharge that will be seen by your customers.', 'event_espresso') . '</p>';
+		return '<p>'.__('The name of the price, discount, tax, or surcharge that will be seen by your customers.', 'event_espresso').'</p>';
 	}
 
 	protected function _price_description_stop() {
-		return '<p>' . __('View the price type (price, discount, tax or surcharge) description.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the price type (price, discount, tax or surcharge) description.', 'event_espresso').'</p>';
 	}
 
 	protected function _price_amount_stop() {
-		return '<p>' . __('The ticket amount before any deductions.', 'event_espresso') . '</p>';
+		return '<p>'.__('The ticket amount before any deductions.', 'event_espresso').'</p>';
 	}
 
 }
\ No newline at end of file

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

caffeinated/admin/new/pricing/help_tours/Pricing_Add_New_Price_Type_Help_Tour.class.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -78,25 +78,25 @@ 
 
 
 	protected function _start() {
-		$content = '<h3>' . __('Add New Price Type', 'event_espresso') . '</h3>';
-		$content .= '<p>' . __('This tour of the Add New Price Type page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
+		$content = '<h3>'.__('Add New Price Type', 'event_espresso').'</h3>';
+		$content .= '<p>'.__('This tour of the Add New Price Type page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso').'</p>';
 		return $content;
 	}
 	
 	protected function _basic_type_stop() {
-		return '<p>' . __('Set a price type to be a discount, surcharge, or tax.', 'event_espresso') . '</p>';
+		return '<p>'.__('Set a price type to be a discount, surcharge, or tax.', 'event_espresso').'</p>';
 	}
 
 	protected function _price_type_name_stop() {
-		return '<p>' . __('The name of the price type.', 'event_espresso') . '</p>';
+		return '<p>'.__('The name of the price type.', 'event_espresso').'</p>';
 	}
 
 	protected function _percentage_dollar_amount_stop() {
-		return '<p>' . __('Set a price type to be percentage-based or a fixed amount.', 'event_espresso') . '</p>';
+		return '<p>'.__('Set a price type to be percentage-based or a fixed amount.', 'event_espresso').'</p>';
 	}
 
 	protected function _order_of_application_stop() {
-		return '<p>' . __('Set the order of application for a price type.', 'event_espresso') . '</p>';
+		return '<p>'.__('Set the order of application for a price type.', 'event_espresso').'</p>';
 	}
 
 }
\ No newline at end of file

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *