eventespresso / event-espresso-core

caffeinated/admin/extend/events/templates/event_registration_options.template.php

Spacing +10 added lines, -10 removed lines

@@ -6,27 +6,27 @@
 <?php
 	$settings_array = array(
 		'max_registrants' => '<p>
-			<label for="max-registrants">' .  __('Maximum number of tickets allowed per order for this event: ', 'event_espresso') . '</label>
-			<input class="ee-numeric" type="text" id="max-registrants" name="additional_limit" value="' . $additional_limit . '" size="4" />
+			<label for="max-registrants">' .  __('Maximum number of tickets allowed per order for this event: ', 'event_espresso').'</label>
+			<input class="ee-numeric" type="text" id="max-registrants" name="additional_limit" value="' . $additional_limit.'" size="4" />
 			</p>',
 		'additional_registration_options' => $additional_registration_options,
 		'display_ticket_selector' => '<p>
-			<label>' . __('Display Ticket Selector', 'event_espresso') . '</label>' . $display_ticket_selector . '</p>',
+			<label>' . __('Display Ticket Selector', 'event_espresso').'</label>'.$display_ticket_selector.'</p>',
 		'alternative_registration_page' => '<p>
-			<label>' . __('Alternative Registration Page', 'event_espresso') . '</label>
-			<input name="externalURL" size="20" type="text" value="' . $_event->external_url() . '">
+			<label>' . __('Alternative Registration Page', 'event_espresso').'</label>
+			<input name="externalURL" size="20" type="text" value="' . $_event->external_url().'">
 			</p>',
 		'event_phone_number' => '<p>
-			<label>' . __('Event Phone Number', 'event_espresso') . '</label>
-			<input name="event_phone" size="20" type="text" value="' . $_event->phone() . '">
+			<label>' . __('Event Phone Number', 'event_espresso').'</label>
+			<input name="event_phone" size="20" type="text" value="' . $_event->phone().'">
 			</p>',
 		'default_registration_status' => '<p>
-			<label>' . __('Default Registration Status', 'event_espresso') . '</label>' . $EVT_default_registration_status . '</p>'
+			<label>' . __('Default Registration Status', 'event_espresso').'</label>'.$EVT_default_registration_status.'</p>'
 		);
 	//filter
-	$settings_array = apply_filters( 'FHEE__caffeinated_event_registration_options__template__settings', $settings_array );
+	$settings_array = apply_filters('FHEE__caffeinated_event_registration_options__template__settings', $settings_array);
 
 	//echo
-	foreach ( $settings_array as $item ) {
+	foreach ($settings_array as $item) {
 		echo $item;
 	}

caffeinated/admin/extend/events/templates/import_page.template.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <div class="import-area">
 	<div class="important-notice">
-		<?php _e( 'The import feature has been disabled because of bugs. It is expected to be put back in place soon.', 'event_espresso' );?>
+		<?php _e('The import feature has been disabled because of bugs. It is expected to be put back in place soon.', 'event_espresso'); ?>
 	</div>
 <?php // echo $form?>
 </div>

caffeinated/admin/extend/events/templates/template_settings.template.php

Spacing +1 added lines, -1 removed lines

@@ -5,6 +5,6 @@
 ?>
 <div class="padding">
 
-	<?php do_action( 'AHEE__template_settings__template__before_settings_form' ); ?>
+	<?php do_action('AHEE__template_settings__template__before_settings_form'); ?>
 
 </div>

caffeinated/admin/extend/general_settings/templates/debug_log_settings.template.php

Spacing +4 added lines, -4 removed lines

@@ -11,12 +11,12 @@ 
 				<?php echo EEH_Template::get_help_tab_link('full_logging_info'); ?>
 			</th>
 			<td>
-				<?php echo EEH_Form_Fields::select_input('use_full_logging', $values, $use_full_logging ); ?>
+				<?php echo EEH_Form_Fields::select_input('use_full_logging', $values, $use_full_logging); ?>
 				<p class="description">
 					<span class="reminder-spn">
 						<?php _e('Please use caution when using this feature. These files may be publicly available.', 'event_espresso'); ?>
 					</span><br/>
-					<?php echo sprintf( __('Once saved, this file will be available at: %s', 'event_espresso'), '<br /><b>/wp-content/uploads/espresso/logs/' . EE_Registry::instance()->CFG->admin->log_file_name() . '</b>' ); ?>
+					<?php echo sprintf(__('Once saved, this file will be available at: %s', 'event_espresso'), '<br /><b>/wp-content/uploads/espresso/logs/'.EE_Registry::instance()->CFG->admin->log_file_name().'</b>'); ?>
 				</p>
 
 			</td>
@@ -28,7 +28,7 @@ 
 				<?php echo EEH_Template::get_help_tab_link('remote_logging_info'); ?>
 			</th>
 			<td>
-				<?php echo EEH_Form_Fields::select_input('use_remote_logging', $values, $use_remote_logging ); ?>
+				<?php echo EEH_Form_Fields::select_input('use_remote_logging', $values, $use_remote_logging); ?>
 				<p class="description">
 					<?php _e('Send debugging data to the remote URL below.', 'event_espresso'); ?>
 				</p>
@@ -41,7 +41,7 @@ 
 				<?php echo EEH_Template::get_help_tab_link('remote_logging_url_info'); ?>
 			</th>
 			<td>
-				<input name="remote_logging_url" id="remote_logging_url" size="20" class="regular-text" type="text" value="<?php echo $remote_logging_url;?>" />
+				<input name="remote_logging_url" id="remote_logging_url" size="20" class="regular-text" type="text" value="<?php echo $remote_logging_url; ?>" />
 				<p class="description">
 					<?php _e('Example: http://requestb.in/MY_UNIQUE_ID', 'event_espresso'); ?>
 

caffeinated/admin/extend/messages/Extend_Messages_Admin_Page.core.php

Braces +5 added lines, -3 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
@@ -134,8 +135,9 @@ 
 		}
 
 		//first we consider whether this template has override set.  If it does then that means no custom templates can be created from this template as a base.  So let's just skip the button creation.
-		if ( $item->get('MTP_is_override' ) )
-			return '';
+		if ( $item->get('MTP_is_override' ) ) {
+					return '';
+		}
 
 
 		$create_args = array(

Spacing +22 added lines, -22 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -31,18 +31,18 @@ 
 
 
 
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
-		if ( !defined( 'EE_MSG_CAF_ASSETS_PATH' ) ) {
-			define( 'EE_MSG_CAF_ASSETS_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'messages/assets/' );
-			define( 'EE_MSG_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'messages/assets/' );
-			define( 'EE_MSG_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'messages/templates/' );
-			define( 'EE_MSG_CAF_TEMPLATE_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'messages/templates/' );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
+		if ( ! defined('EE_MSG_CAF_ASSETS_PATH')) {
+			define('EE_MSG_CAF_ASSETS_PATH', EE_CORE_CAF_ADMIN_EXTEND.'messages/assets/');
+			define('EE_MSG_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'messages/assets/');
+			define('EE_MSG_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'messages/templates/');
+			define('EE_MSG_CAF_TEMPLATE_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'messages/templates/');
 		}
 	}
 
 	protected function _extend_page_config() {
-		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'messages';
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'messages';
 		$this->_page_routes['custom_mtps'] = array(
 			'func' => '_ee_custom_messages_overview_list_table',
 			'capability' => 'ee_read_messages' );
@@ -70,7 +70,7 @@ 
 				'require_nonce' => FALSE
 				);
 
-		add_action( 'current_screen', array( $this, 'dynamic_screen_hooks' ), 10 );
+		add_action('current_screen', array($this, 'dynamic_screen_hooks'), 10);
 	}
 
 
@@ -87,12 +87,12 @@ 
 	public function dynamic_screen_hooks() {
 		global $admin_page_hooks;
 
-		if ( !empty( $admin_page_hooks['espresso_events'] ) ) {
+		if ( ! empty($admin_page_hooks['espresso_events'])) {
 			//we're on a EE specific page... good stuff!
 			$hook_prefix = $admin_page_hooks['espresso_events'];
-			$filter_ref = $hook_prefix . '_page_' . $this->page_slug;
-			add_filter( 'FHEE_manage_' . $filter_ref . '_columns', array( $this, 'add_custom_mtps_columns' ), 10, 2 );
-			add_action( 'AHEE__EE_Admin_List_Table__column_actions__' . $filter_ref, array( $this, 'custom_mtp_create_button_column'), 10, 2 );
+			$filter_ref = $hook_prefix.'_page_'.$this->page_slug;
+			add_filter('FHEE_manage_'.$filter_ref.'_columns', array($this, 'add_custom_mtps_columns'), 10, 2);
+			add_action('AHEE__EE_Admin_List_Table__column_actions__'.$filter_ref, array($this, 'custom_mtp_create_button_column'), 10, 2);
 		}
 	}
 
@@ -106,8 +106,8 @@ 
 	 * @param array  $columns   Original defined list of columns
 	 * @param string $screen_id The unique screen id for the page.
 	 */
-	public function add_custom_mtps_columns( $columns, $screen_id ) {
-		if ( $screen_id !== 'espresso_messages_global_mtps' ) {
+	public function add_custom_mtps_columns($columns, $screen_id) {
+		if ($screen_id !== 'espresso_messages_global_mtps') {
 			return $columns;
 		}
 
@@ -128,13 +128,13 @@ 
 	 *
 	 * @return string html content for the page.
 	 */
-	public function custom_mtp_create_button_column( $item, $screen_id ) {
-		if ( $screen_id !== 'espresso_messages_global_mtps' || ! EE_Registry::instance()->CAP->current_user_can( 'ee_edit_messages', 'espresso_messages_add_new_message_template' ) ) {
+	public function custom_mtp_create_button_column($item, $screen_id) {
+		if ($screen_id !== 'espresso_messages_global_mtps' || ! EE_Registry::instance()->CAP->current_user_can('ee_edit_messages', 'espresso_messages_add_new_message_template')) {
 			return '';
 		}
 
 		//first we consider whether this template has override set.  If it does then that means no custom templates can be created from this template as a base.  So let's just skip the button creation.
-		if ( $item->get('MTP_is_override' ) )
+		if ($item->get('MTP_is_override'))
 			return '';
 
 
@@ -144,8 +144,8 @@ 
 			'message_type' => $item->message_type(),
 			'action' => 'add_new_message_template'
 			);
-		$create_link = EE_Admin_Page::add_query_args_and_nonce( $create_args, EE_MSG_ADMIN_URL );
-		echo sprintf( '<a href="%s" class="button button-small">%s</a>', $create_link, __('Create Custom', 'event_espresso') );
+		$create_link = EE_Admin_Page::add_query_args_and_nonce($create_args, EE_MSG_ADMIN_URL);
+		echo sprintf('<a href="%s" class="button button-small">%s</a>', $create_link, __('Create Custom', 'event_espresso'));
 	}
 
 
@@ -178,7 +178,7 @@ 
 				)
 			)
 		);
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_messages', 'espresso_messages_trash_message_template' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_messages', 'espresso_messages_trash_message_template')) {
 			$this->_views['trashed'] = array(
 				'slug' => 'trashed',
 				'label' => __('Trash', 'event_espresso'),

caffeinated/admin/extend/registrations/EE_Registration_CheckIn_List_Table.class.php

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
  *
@@ -123,8 +125,9 @@ 
 		}
 
 		//if no reg id then get out cause need a reg id
-		if ( empty( $REG_ID ) || empty( $DTT_ID ) )
-			throw new EE_Error(__('This route cannot be viewed unless registration and datetime IDs are included in the request (via REG_ID and DTT_ID parameters)', 'event_espresso') );
+		if ( empty( $REG_ID ) || empty( $DTT_ID ) ) {
+					throw new EE_Error(__('This route cannot be viewed unless registration and datetime IDs are included in the request (via REG_ID and DTT_ID parameters)', 'event_espresso') );
+		}
 
 		//set orderby
 		$orderby = 'CHK_timestamp'; //note that with this table we're only providing the option to orderby the timestamp value.
@@ -147,8 +150,9 @@ 
 		$query_params = array( $_where, 'order_by' => array( $orderby => $order ), 'limit' => $limit );
 
 		//if no per_page value then we just want to return a count of all Check-ins
-		if ( $count )
-			return EEM_Checkin::instance()->count( array( $_where ) );
+		if ( $count ) {
+					return EEM_Checkin::instance()->count( array( $_where ) );
+		}
 
 		return $count ? EEM_Checkin::instance()->count( array( $_where ) ) : EEM_Checkin::instance()->get_all($query_params);
 	}

Spacing +28 added lines, -28 removed lines

@@ -28,7 +28,7 @@ 
 
 
 
-	public function __construct( $admin_page ) {
+	public function __construct($admin_page) {
 		parent::__construct($admin_page);
 	}
 
@@ -36,8 +36,8 @@ 
 
 
 	protected function _setup_data() {
-		$this->_data = $this->_get_checkins( $this->_per_page );
-		$this->_all_data_count = $this->_get_checkins(  $this->_per_page, TRUE );
+		$this->_data = $this->_get_checkins($this->_per_page);
+		$this->_all_data_count = $this->_get_checkins($this->_per_page, TRUE);
 	}
 
 
@@ -58,7 +58,7 @@ 
 			);
 
 		$this->_sortable_columns = array(
-			'CHK_timestamp' => array( 'CHK_timestamp' => TRUE )
+			'CHK_timestamp' => array('CHK_timestamp' => TRUE)
 			);
 
 		$this->_primary_column = 'CHK_in';
@@ -82,25 +82,25 @@ 
 	}
 
 
-	function column_cb($item ) {
-		return sprintf( '<input type="checkbox" name="checkbox[%1$s]" />', $item->ID() );
+	function column_cb($item) {
+		return sprintf('<input type="checkbox" name="checkbox[%1$s]" />', $item->ID());
 	}
 
 
-	function column_CHK_in( EE_Checkin $item ) {
+	function column_CHK_in(EE_Checkin $item) {
 		$checkinstatus = $item->get('CHK_in');
 		$checkinstatus = $checkinstatus ? EE_Registration::checkin_status_in : EE_Registration::checkin_status_out;
-		return '<span class="checkin-icons checkedin-status-' . $checkinstatus . '"></span><span class="show-on-mobile-view-only">' . $item->get_datetime('CHK_timestamp') . '</span>';
+		return '<span class="checkin-icons checkedin-status-'.$checkinstatus.'"></span><span class="show-on-mobile-view-only">'.$item->get_datetime('CHK_timestamp').'</span>';
 	}
 
 
 
-	function column_CHK_timestamp( EE_Checkin $item ) {
+	function column_CHK_timestamp(EE_Checkin $item) {
 		$actions = array();
-		$delete_url = EE_Admin_Page::add_query_args_and_nonce( array('action' => 'delete_checkin_row', 'DTT_ID' => $this->_req_data['DTT_ID'], '_REGID' => $this->_req_data['_REGID'], 'CHK_ID' => $item->ID() ) );
-		$actions['delete_checkin'] = EE_Registry::instance()->CAP->current_user_can( 'ee_delete_checkins', 'espresso_registrations_delete_checkin_row' ) ? '<a href="' . $delete_url . '" title="' . esc_attr__('Click here to delete this check-in record', 'event_espresso') . '">' . __('Delete', 'event_espresso') . '</a>' : '';
+		$delete_url = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'delete_checkin_row', 'DTT_ID' => $this->_req_data['DTT_ID'], '_REGID' => $this->_req_data['_REGID'], 'CHK_ID' => $item->ID()));
+		$actions['delete_checkin'] = EE_Registry::instance()->CAP->current_user_can('ee_delete_checkins', 'espresso_registrations_delete_checkin_row') ? '<a href="'.$delete_url.'" title="'.esc_attr__('Click here to delete this check-in record', 'event_espresso').'">'.__('Delete', 'event_espresso').'</a>' : '';
 
-		return sprintf( '%1$s %2$s', $item->get_datetime('CHK_timestamp'), $this->row_actions($actions) );
+		return sprintf('%1$s %2$s', $item->get_datetime('CHK_timestamp'), $this->row_actions($actions));
 	}
 
 
@@ -115,30 +115,30 @@ 
 	 * @param bool    $count        Whether to return a count or not
 	 * @return EE_Checkin[]|int
 	 */
-	protected function _get_checkins( $per_page = 10, $count = FALSE ) {
-		$REG_ID = isset( $this->_req_data['_REGID'] ) ? $this->_req_data['_REGID'] : FALSE;
-		$DTT_ID = isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : FALSE;
+	protected function _get_checkins($per_page = 10, $count = FALSE) {
+		$REG_ID = isset($this->_req_data['_REGID']) ? $this->_req_data['_REGID'] : FALSE;
+		$DTT_ID = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : FALSE;
 
 		//if user does not have the capability for the checkins for this registration then get out!
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_checkin', 'espresso_registrations_registration_checkins', $REG_ID ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_checkin', 'espresso_registrations_registration_checkins', $REG_ID)) {
 			return $count ? 0 : array();
 		}
 
 		//if no reg id then get out cause need a reg id
-		if ( empty( $REG_ID ) || empty( $DTT_ID ) )
-			throw new EE_Error(__('This route cannot be viewed unless registration and datetime IDs are included in the request (via REG_ID and DTT_ID parameters)', 'event_espresso') );
+		if (empty($REG_ID) || empty($DTT_ID))
+			throw new EE_Error(__('This route cannot be viewed unless registration and datetime IDs are included in the request (via REG_ID and DTT_ID parameters)', 'event_espresso'));
 
 		//set orderby
 		$orderby = 'CHK_timestamp'; //note that with this table we're only providing the option to orderby the timestamp value.
 
-		$order = !empty( $this->_req_data['order'] ) ? $this->_req_data['order'] : 'ASC';
+		$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;
 		$limit = NULL;
-		if ( !$count ) {
-			$offset = ($current_page-1)*$per_page;
-			$limit = array( $offset, $per_page );
+		if ( ! $count) {
+			$offset = ($current_page - 1) * $per_page;
+			$limit = array($offset, $per_page);
 		}
 
 		$_where = array(
@@ -146,13 +146,13 @@ 
 			'DTT_ID' => $DTT_ID
 			);
 
-		$query_params = array( $_where, 'order_by' => array( $orderby => $order ), 'limit' => $limit );
+		$query_params = array($_where, 'order_by' => array($orderby => $order), 'limit' => $limit);
 
 		//if no per_page value then we just want to return a count of all Check-ins
-		if ( $count )
-			return EEM_Checkin::instance()->count( array( $_where ) );
+		if ($count)
+			return EEM_Checkin::instance()->count(array($_where));
 
-		return $count ? EEM_Checkin::instance()->count( array( $_where ) ) : EEM_Checkin::instance()->get_all($query_params);
+		return $count ? EEM_Checkin::instance()->count(array($_where)) : EEM_Checkin::instance()->get_all($query_params);
 	}
 
 } //end class EE_Registration_CheckIn_List_Table

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 '';
 	}